Date: Fri, 24 May 2019 09:14:42 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r502435 - branches/2019Q2/multimedia/libbluray Message-ID: <201905240914.x4O9Egmu043382@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Fri May 24 09:14:42 2019 New Revision: 502435 URL: https://svnweb.freebsd.org/changeset/ports/502435 Log: MFH: multimedia/libbluray: r498276 r499532 Update to upstream release 1.1.1 While on it: - Pet portlint - Fix missing USES=gnome 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) Approved by: ports-secteam (blanket: bugfix release(s), runtime bugfix, missing dependencies) Modified: branches/2019Q2/multimedia/libbluray/Makefile branches/2019Q2/multimedia/libbluray/distinfo branches/2019Q2/multimedia/libbluray/pkg-plist Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/multimedia/libbluray/Makefile ============================================================================== --- branches/2019Q2/multimedia/libbluray/Makefile Fri May 24 09:05:37 2019 (r502434) +++ branches/2019Q2/multimedia/libbluray/Makefile Fri May 24 09:14:42 2019 (r502435) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= libbluray -DISTVERSION= 1.0.2 +DISTVERSION= 1.1.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \ @@ -19,25 +20,30 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ LIB_DEPENDS+= libaacs.so:multimedia/libaacs \ libbdplus.so:multimedia/libbdplus -USES= iconv libtool pathfix pkgconfig tar:bzip2 +USES= gnome iconv libtool pathfix pkgconfig tar:bzip2 +USE_GNOME= libxml2 +USE_LDCONFIG= yes + GNU_CONFIGURE= yes + CONFIGURE_ARGS= --disable-static -USE_LDCONFIG= yes -USE_GNOME= libxml2 +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 Modified: branches/2019Q2/multimedia/libbluray/distinfo ============================================================================== --- branches/2019Q2/multimedia/libbluray/distinfo Fri May 24 09:05:37 2019 (r502434) +++ branches/2019Q2/multimedia/libbluray/distinfo Fri May 24 09:14:42 2019 (r502435) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518820606 -SHA256 (libbluray-1.0.2.tar.bz2) = 6d9e7c4e416f664c330d9fa5a05ad79a3fb39b95adfc3fd6910cbed503b7aeff -SIZE (libbluray-1.0.2.tar.bz2) = 733058 +TIMESTAMP = 1554632967 +SHA256 (libbluray-1.1.1.tar.bz2) = 106478a17c8bcac8c7b4174e7432b2bad5a1e6dd2926c4224791fd4669472338 +SIZE (libbluray-1.1.1.tar.bz2) = 746034 Modified: branches/2019Q2/multimedia/libbluray/pkg-plist ============================================================================== --- branches/2019Q2/multimedia/libbluray/pkg-plist Fri May 24 09:05:37 2019 (r502434) +++ branches/2019Q2/multimedia/libbluray/pkg-plist Fri May 24 09:14:42 2019 (r502435) @@ -10,6 +10,7 @@ include/libbluray/overlay.h include/libbluray/player_settings.h lib/libbluray.so lib/libbluray.so.2 -lib/libbluray.so.2.0.2 +lib/libbluray.so.2.1.1 libdata/pkgconfig/libbluray.pc -%%JAVA%%%%JAVASHAREDIR%%/libbluray-j2se-1.0.2.jar +%%JAVA%%%%JAVASHAREDIR%%/libbluray-j2se-1.1.1.jar +%%JAVA%%%%JAVASHAREDIR%%/libbluray-awt-j2se-1.1.1.jar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905240914.x4O9Egmu043382>