svn commit: r499532 - head/multimedia/libbluray
Kubilay Kocak
koobs at FreeBSD.org
Sun Apr 21 10:44:28 UTC 2019
Author: koobs
Date: Sun Apr 21 10:44:27 2019
New Revision: 499532
URL: https://svnweb.freebsd.org/changeset/ports/499532
Log:
multimedia/libbluray: Fix environment variable conflict with portmaster
libbluray (> 1.0.2,1) uses the PACKAGES variable in its configure scripts
that contains the names of packages it depends on. Portmaster also uses the
PACKAGES environment variable.
Using portmaster to install libbluray results in a corrupted libbluray
pkgconfig file containing portmasters PACKAGES path:
Requires.private: /usr/home/koobs/repos/freebsd/ports/packages libxml-2.0 freetype2 fontconfig
This breaks libbluray consumers such as ffmpeg.
This change nulls out the PACKAGES variable during the configure stage of
the build to prevent the issue. [1]
While I'm here,
- Sort JAVA_* and USE_* entries.
PR: 226009
Reported by: Martin Birgmeier <d8zNeCFG aon at> [1]
Submitted by: VVD <vvd unislabs com> [1]
Approved by: portmgr (unmaintained port)
MFH: 2019Q2 (blanket: runtime bugfix)
Modified:
head/multimedia/libbluray/Makefile
Modified: head/multimedia/libbluray/Makefile
==============================================================================
--- head/multimedia/libbluray/Makefile Sun Apr 21 09:44:53 2019 (r499531)
+++ head/multimedia/libbluray/Makefile Sun Apr 21 10:44:27 2019 (r499532)
@@ -3,6 +3,7 @@
PORTNAME= libbluray
DISTVERSION= 1.1.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= multimedia
MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \
@@ -20,25 +21,29 @@ LIB_DEPENDS+= libaacs.so:multimedia/libaacs \
libbdplus.so:multimedia/libbdplus
USES= gnome iconv libtool pathfix pkgconfig tar:bzip2
-USE_LDCONFIG= yes
USE_GNOME= libxml2
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
+
CONFIGURE_ARGS= --disable-static
+CONFIGURE_ENV= PACKAGES="" # Bug #226009
+
INSTALL_TARGET= install-strip
.include "Makefile.include"
OPTIONS_DEFINE= JAVA
OPTIONS_SUB= yes
+
JAVA_DESC= Enable Blu-Ray Java support
JAVA_BUILD_DEPENDS= ant:devel/apache-ant
JAVA_CATEGORIES= java
-JAVA_USE= JAVA=yes
-JAVA_VARS= JAVA_VERSION=1.6+ JAVA_BUILD=yes JAVA_RUN=yes
JAVA_CONFIGURE_ENABLE= bdjava-jar
JAVA_CONFIGURE_ENV= JDK_HOME="${JAVA_HOME}"
+JAVA_USE= JAVA=yes
+JAVA_VARS= JAVA_VERSION=1.6+ JAVA_BUILD=yes JAVA_RUN=yes
post-patch:
@${RLN} ${WRKSRC}/jni/linux ${WRKSRC}/jni/freebsd
More information about the svn-ports-all
mailing list