From owner-svn-ports-all@freebsd.org Fri May 24 09:14:43 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F8B115A4DE3; Fri, 24 May 2019 09:14:43 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 03FFA847F8; Fri, 24 May 2019 09:14:43 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D4E6A1AAF1; Fri, 24 May 2019 09:14:42 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4O9EgD3043384; Fri, 24 May 2019 09:14:42 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4O9Egmu043382; Fri, 24 May 2019 09:14:42 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201905240914.x4O9Egmu043382@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Fri, 24 May 2019 09:14:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r502435 - branches/2019Q2/multimedia/libbluray X-SVN-Group: ports-branches X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: branches/2019Q2/multimedia/libbluray X-SVN-Commit-Revision: 502435 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 03FFA847F8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.96)[-0.956,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 May 2019 09:14:43 -0000 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 [1] Submitted by: VVD [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