Index: multimedia/libaacs/Makefile =================================================================== --- multimedia/libaacs/Makefile +++ multimedia/libaacs/Makefile @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= libaacs -PORTVERSION= 0.7.0 -PORTREVISION= 3 +PORTVERSION= 0.8.0 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= Advanced Access Content System implementation LICENSE= LGPL21 @@ -17,11 +16,12 @@ LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libgpg-error.so:${PORTSDIR}/security/libgpg-error -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-debug CONFIGURE_ENV= LEX="${LOCALBASE}/bin/flex" INSTALL_TARGET= install-strip +USE_AUTOTOOLS= autoconf aclocal automake USES= bison gettext iconv libtool pathfix tar:bzip2 USE_LDCONFIG= yes +.include "${.CURDIR}/../libbluray/Makefile.include" + .include Index: multimedia/libaacs/distinfo =================================================================== --- multimedia/libaacs/distinfo +++ multimedia/libaacs/distinfo @@ -1,2 +1,2 @@ -SHA256 (libaacs-0.7.0.tar.bz2) = f0ecc8e9b2ed531da5f06d6e686992e5281eb906ab418577276e74d8f9a143c0 -SIZE (libaacs-0.7.0.tar.bz2) = 311337 +SHA256 (libaacs-0.8.0.tar.bz2) = 5e44545c7c4cb48bea49ff6b19d148416663593d6125ac8734776df21154ba94 +SIZE (libaacs-0.8.0.tar.bz2) = 311904 Index: multimedia/libaacs/files/patch-src-file-mmc_device_linux.c =================================================================== --- multimedia/libaacs/files/patch-src-file-mmc_device_linux.c +++ multimedia/libaacs/files/patch-src-file-mmc_device_linux.c @@ -0,0 +1,20 @@ +--- src/file/mmc_device_linux.c.orig 2015-01-29 11:40:32.000000000 +0100 ++++ src/file/mmc_device_linux.c 2015-01-29 11:42:00.000000000 +0100 +@@ -32,6 +32,7 @@ + #include "util/strutl.h" + + #include ++#include + #include + #include + #include +@@ -180,8 +181,8 @@ + } else { + BD_DEBUG(DBG_MMC | DBG_CRIT, "Error opening /proc/mounts\n"); + } +-#endif + } ++#endif + + if (fd >= 0) { + dev = calloc(1, sizeof(MMCDEV)); Index: multimedia/libaacs/pkg-plist =================================================================== --- multimedia/libaacs/pkg-plist +++ multimedia/libaacs/pkg-plist @@ -5,5 +5,5 @@ lib/libaacs.a lib/libaacs.so lib/libaacs.so.0 -lib/libaacs.so.0.4.0 +lib/libaacs.so.0.5.0 libdata/pkgconfig/libaacs.pc Index: multimedia/libbdplus/Makefile =================================================================== --- multimedia/libbdplus/Makefile +++ multimedia/libbdplus/Makefile @@ -0,0 +1,26 @@ +# Created by: kamikaze@bsdforen.de +# $FreeBSD$ + +PORTNAME= libbdplus +PORTVERSION= 0.1.2 +CATEGORIES= multimedia +MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \ + http://blu.opsec.eu/ + +MAINTAINER= kami@freebsd.org +COMMENT= BD+ System research implementation + +LICENSE= LGPL21 + +LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ + libgpg-error.so:${PORTSDIR}/security/libgpg-error + +USE_LDCONFIG= yes +USE_AUTOTOOLS= autoconf aclocal automake +USES= tar:bzip2 pkgconfig libtool + +CONFIGURE_ARGS= --without-libaacs + +.include "${.CURDIR}/../libbluray/Makefile.include" + +.include Index: multimedia/libbdplus/distinfo =================================================================== --- multimedia/libbdplus/distinfo +++ multimedia/libbdplus/distinfo @@ -0,0 +1,2 @@ +SHA256 (libbdplus-0.1.2.tar.bz2) = a631cae3cd34bf054db040b64edbfc8430936e762eb433b1789358ac3d3dc80a +SIZE (libbdplus-0.1.2.tar.bz2) = 319828 Index: multimedia/libbdplus/pkg-descr =================================================================== --- multimedia/libbdplus/pkg-descr +++ multimedia/libbdplus/pkg-descr @@ -0,0 +1,6 @@ +libbdplus is a research project to implement the BD+ System Specifications. + +This research project provides, through an open-source library, a way to +understand how the BD+ works. + +WWW: http://www.videolan.org/developers/libbdplus.html Index: multimedia/libbdplus/pkg-plist =================================================================== --- multimedia/libbdplus/pkg-plist +++ multimedia/libbdplus/pkg-plist @@ -0,0 +1,7 @@ +include/libbdplus/bdplus-version.h +include/libbdplus/bdplus.h +lib/libbdplus.a +lib/libbdplus.so +lib/libbdplus.so.0 +lib/libbdplus.so.0.1.0 +libdata/pkgconfig/libbdplus.pc Index: multimedia/libbluray/Makefile =================================================================== --- multimedia/libbluray/Makefile +++ multimedia/libbluray/Makefile @@ -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_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 Index: multimedia/libbluray/Makefile.include =================================================================== --- multimedia/libbluray/Makefile.include +++ multimedia/libbluray/Makefile.include @@ -0,0 +1,7 @@ +HAS_CONFIGURE= yes +CONFIGURE_ARGS+= --prefix="${PREFIX}" +CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig" + +MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ + CFLAGS=${CFLAGS:Q} + Index: multimedia/libbluray/distinfo =================================================================== --- multimedia/libbluray/distinfo +++ multimedia/libbluray/distinfo @@ -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 Index: multimedia/libbluray/files/patch-src-Makefile.am =================================================================== --- multimedia/libbluray/files/patch-src-Makefile.am +++ multimedia/libbluray/files/patch-src-Makefile.am @@ -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) Index: multimedia/libbluray/files/patch-util-refcnt.h =================================================================== --- multimedia/libbluray/files/patch-util-refcnt.h +++ multimedia/libbluray/files/patch-util-refcnt.h @@ -1,11 +0,0 @@ ---- src/util/refcnt.h.orig 2014-04-13 17:52:33.000000000 +0200 -+++ src/util/refcnt.h 2014-04-13 17:52:43.000000000 +0200 -@@ -18,7 +18,7 @@ - */ - - #ifndef BD_REFCNT_H_ --#define BD_FEFCNT_H_ -+#define BD_REFCNT_H_ - - #include "attributes.h" - Index: multimedia/libbluray/pkg-plist =================================================================== --- multimedia/libbluray/pkg-plist +++ multimedia/libbluray/pkg-plist @@ -7,9 +7,10 @@ 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