Date: Sat, 21 Feb 2015 21:08:49 +0000 (UTC) From: Dominic Fandrey <kami@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379552 - in head/multimedia/libbluray: . files Message-ID: <201502212108.t1LL8nGU071593@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kami Date: Sat Feb 21 21:08:48 2015 New Revision: 379552 URL: https://svnweb.freebsd.org/changeset/ports/379552 QAT: https://qat.redports.org/buildarchive/r379552/ Log: Update libbluray 0.5.0 -> 0.7.0 - Add fontconfig dependency - Add libbdplus dependency - Add plist target, because mkplist does not handle options PR: 190958 Differential Revision: https://reviews.freebsd.org/D1754 Reviewed by: Carlo Strub <cs@freebsd.org> Approved by: Carlo Strub <cs@freebsd.org> Added: head/multimedia/libbluray/files/patch-src-Makefile.am (contents, props changed) Deleted: head/multimedia/libbluray/files/patch-util-refcnt.h Modified: head/multimedia/libbluray/Makefile head/multimedia/libbluray/distinfo head/multimedia/libbluray/pkg-plist Modified: head/multimedia/libbluray/Makefile ============================================================================== --- head/multimedia/libbluray/Makefile Sat Feb 21 21:08:25 2015 (r379551) +++ head/multimedia/libbluray/Makefile Sat Feb 21 21:08:48 2015 (r379552) @@ -2,29 +2,31 @@ # $FreeBSD$ PORTNAME= libbluray -PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTVERSION= 0.7.0 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \ http://blu.opsec.eu/ -MAINTAINER= kamikaze@bsdforen.de +MAINTAINER= kami@freebsd.org COMMENT= Blu-Ray discs playback library for media players LICENSE= LGPL21 -LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 -# dlopen dependencies, libbdplus not yet available -LIB_DEPENDS+= libaacs.so:${PORTSDIR}/multimedia/libaacs +LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig +# dlopen dependencies +LIB_DEPENDS+= libaacs.so:${PORTSDIR}/multimedia/libaacs \ + libbdplus.so:${PORTSDIR}/multimedia/libbdplus -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-debug INSTALL_TARGET= install-strip +USE_AUTOTOOLS= autoconf aclocal automake USES= iconv libtool pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes USE_GNOME= libxml2 +.include "Makefile.include" + OPTIONS_DEFINE= JAVA OPTIONS_SUB= yes JAVA_DESC= Enable Blu-Ray Java support @@ -42,7 +44,37 @@ CONFIGURE_ARGS+= --enable-bdjava --with- CONFIGURE_ENV+= JDK_HOME="${JAVA_HOME}" .endif -post-patch: - @${REINPLACE_CMD} '/^SET_FEATURES =/d' ${WRKSRC}/src/Makefile.in +# +# NOTE: +# makeplist has no support for options, leave this in place +# + +# Create PLIST_SUB definitions for options +.for _option in ${OPTIONS_DEFINE} +.if ${PORT_OPTIONS:M${_option}} +PLIST_SUB+= ${_option}="" +.else +PLIST_SUB+= ${_option}="@comment " +.endif +.endfor + +plist: + @${ECHO} "===> Rebuilding PLIST." +.for _option in "" ${OPTIONS_DEFINE} + @${MAKE} clean stage OPTIONS_EXCLUDE="${OPTIONS_DEFINE:N${_option}}" \ + WITH=${_option} + @${MTREE_CMD} -cp "${STAGEDIR}${PREFIX}/" > "${WRKDIR}/mtree.${_option}" + @${MTREE_CMD} -Sf "${WRKDIR}/mtree.${_option}" -f "${MTREE_FILE}" \ + | ${SED} -e '/share\/licenses/d' -e '/ dir /d' -e 's/ .*//' \ + > "plist.${_option}" +.endfor +.for _option in ${OPTIONS_DEFINE} + @${GREP} -vFx "$$(${CAT} "plist.")" "plist.${_option}" \ + | ${SED} 's/^/%%${_option}%%/' > "plist.add.${_option}" + @${RM} "plist.${_option}" +.endfor + @${CAT} plist. ${OPTIONS_DEFINE:C/^/plist.add./} \ + | ${SED} "${PLIST_SUB_SED}" > ${PLIST} + @${RM} plist. ${OPTIONS_DEFINE:C/^/plist.add./} .include <bsd.port.mk> Modified: head/multimedia/libbluray/distinfo ============================================================================== --- head/multimedia/libbluray/distinfo Sat Feb 21 21:08:25 2015 (r379551) +++ head/multimedia/libbluray/distinfo Sat Feb 21 21:08:48 2015 (r379552) @@ -1,2 +1,2 @@ -SHA256 (libbluray-0.5.0.tar.bz2) = 19213e193e1abc5ed2de65edfb539deda1dbf6cc64dfef03e405524c9c6f7216 -SIZE (libbluray-0.5.0.tar.bz2) = 559639 +SHA256 (libbluray-0.7.0.tar.bz2) = f79beb9fbb24117cbb1264c919e686ae9e6349c0ad08b48c4b6233b2887eb68d +SIZE (libbluray-0.7.0.tar.bz2) = 597266 Added: head/multimedia/libbluray/files/patch-src-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/libbluray/files/patch-src-Makefile.am Sat Feb 21 21:08:48 2015 (r379552) @@ -0,0 +1,7 @@ +--- src/Makefile.am.orig 2015-01-26 10:44:55.000000000 +0100 ++++ src/Makefile.am 2015-01-29 13:10:02.000000000 +0100 +@@ -1,4 +1,3 @@ +-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT + SET_INCLUDES = -I$(top_srcdir) -Ifile -Ilibbluray -Ilibbluray/bdnav $(BDJAVA_CFLAGS) + + AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) Modified: head/multimedia/libbluray/pkg-plist ============================================================================== --- head/multimedia/libbluray/pkg-plist Sat Feb 21 21:08:25 2015 (r379551) +++ head/multimedia/libbluray/pkg-plist Sat Feb 21 21:08:48 2015 (r379552) @@ -7,9 +7,10 @@ include/libbluray/keys.h include/libbluray/log_control.h include/libbluray/meta_data.h include/libbluray/overlay.h +include/libbluray/player_settings.h lib/libbluray.a lib/libbluray.so lib/libbluray.so.1 -lib/libbluray.so.1.5.0 +lib/libbluray.so.1.7.0 libdata/pkgconfig/libbluray.pc -%%JAVA%%lib/libbluray/libbluray.jar +%%JAVA%%%%JAVASHAREDIR%%/libbluray-j2se-0.7.0.jar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502212108.t1LL8nGU071593>