Date: Mon, 31 Oct 2011 14:47:18 +0100 (CET) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: martymac@FreeBSD.org Subject: ports/162197: [PATCH] multimedia/libdvdread: add option for libdvdcss Message-ID: <201110311347.p9VDlI1Y063862@backoffice.colby.local> Resent-Message-ID: <201110311350.p9VDoCKO015423@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 162197
>Category: ports
>Synopsis: [PATCH] multimedia/libdvdread: add option for libdvdcss
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 31 13:50:12 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Jimmy Olgeni
>Release: FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD backoffice 8.2-STABLE FreeBSD 8.2-STABLE #1: Wed Oct 12 21:16:42 CEST 2011
>Description:
Add libdvdcss option, thus allowing tinderbox builds with libdvdcss enabled.
The default behavior was not changed.
Port maintainer (martymac@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- libdvdread-4.1.4.r1219.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/libdvdread/Makefile,v
retrieving revision 1.39
diff -u -u -r1.39 Makefile
--- Makefile 3 Dec 2010 13:11:46 -0000 1.39
+++ Makefile 31 Oct 2011 13:44:45 -0000
@@ -22,10 +22,6 @@
MAINTAINER= martymac@FreeBSD.org
COMMENT= MPlayer version of the libdvdread project
-.if !defined(PACKAGE_BUILDING)
-LIB_DEPENDS= dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
-.endif
-
LICENSE= GPLv2
USE_BZIP2= yes
@@ -42,6 +38,20 @@
USE_GMAKE= yes
USE_LDCONFIG= yes
+.if defined(PACKAGE_BUILDING)
+DVDCSS_OPTION= off
+.else
+DVDCSS_OPTION= on
+.endif
+
+OPTIONS= DVDCSS "Include libdvdcss support" ${DVDCSS_OPTION}
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITH_DVDCSS)
+LIB_DEPENDS= dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
+.endif
+
# DVDCSS version hardcoded in src/dvd_input.c (dlopen'ed)
DVDCSS_LIBVERSION= 3
@@ -51,4 +61,4 @@
@${REINPLACE_CMD} -E -e 's|(libdvdcss.so)\.2|\1.${DVDCSS_LIBVERSION}|' \
${WRKSRC}/src/dvd_input.c
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- libdvdread-4.1.4.r1219.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110311347.p9VDlI1Y063862>