Date: Sun, 13 Apr 2014 21:56:16 GMT From: Dominic Fandrey <kamikaze@bsdforen.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/188573: [maintainer-update] multimedia/libaacs multimedia/libbluray Message-ID: <201404132156.s3DLuGsB082894@cgiserv.freebsd.org> Resent-Message-ID: <201404132200.s3DM00SC034350@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 188573 >Category: ports >Synopsis: [maintainer-update] multimedia/libaacs multimedia/libbluray >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Apr 13 22:00:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Dominic Fandrey >Release: stable/10 >Organization: private >Environment: FreeBSD AprilRyan.norad 10.0-STABLE FreeBSD 10.0-STABLE #1 r264294: Wed Apr 9 09:39:01 CEST 2014 root@AprilRyan.norad:/usr/obj/S403/amd64/usr/src/sys/S403 amd64 >Description: Update libaacs from 0.6.0 to 0.7.0 - Library version was bumped, may require relinking of dependencies Update libbluray from 0.3.0 to 0.5.0 - Unbreak JAVA options - Library version was bumped, may require relinking of dependencies >How-To-Repeat: >Fix: Patch attached with submission follows: Index: multimedia/libaacs/Makefile =================================================================== --- multimedia/libaacs/Makefile (revision 351220) +++ multimedia/libaacs/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libaacs -PORTVERSION= 0.6.0 +PORTVERSION= 0.7.0 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \ http://blu.opsec.eu/ @@ -30,18 +30,11 @@ run-autotools: @cd ${WRKSRC} && ${SH} bootstrap -plist: build +plist: stage @${ECHO} "===> Rebuilding PLIST." - @${MKDIR} "${WRKDIR}/plist" - @cd ${WRKSRC} && ( \ - ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} --prefix="${WRKDIR}/plist" && \ - ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} pkgconfigdir="${WRKDIR}/plist/libdata/pkgconfig" ${INSTALL_TARGET} ; \ - ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} \ - ) - @${FIND} -ds "${WRKDIR}/plist/" -not -type d \ - | ${SED} "s|${WRKDIR}/plist/||1" > ${PLIST} - @${FIND} -ds "${WRKDIR}/plist/" -type d -mindepth 2 \ - | ${SED} -e "/pkgconfig/d" -e "s|${WRKDIR}/plist/|@dirrm |1" >> ${PLIST} - @${RM} -rf "${WRKDIR}/plist" + @${MTREE_CMD} -cp "${STAGEDIR}${PREFIX}/" > "${WRKDIR}/plist.mtree" + @${MTREE_CMD} -Sf "${WRKDIR}/plist.mtree" -f "${MTREE_FILE}" \ + | ${SED} -ne '/ dir /{s/ .*//;s/^/@dirrm /;H;};t dirs' \ + -e 's/ .*//p;:dirs' -e '$${g;s/^\n//p;}' > ${PLIST} .include <bsd.port.mk> Index: multimedia/libaacs/distinfo =================================================================== --- multimedia/libaacs/distinfo (revision 351220) +++ multimedia/libaacs/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (libaacs-0.6.0.tar.bz2) = 8f1dadef40257280e5aff4242cca5bb81a0267921c7402f474156e3eb45ec1d9 -SIZE (libaacs-0.6.0.tar.bz2) = 331318 +SHA256 (libaacs-0.7.0.tar.bz2) = f0ecc8e9b2ed531da5f06d6e686992e5281eb906ab418577276e74d8f9a143c0 +SIZE (libaacs-0.7.0.tar.bz2) = 311337 Index: multimedia/libaacs/pkg-plist =================================================================== --- multimedia/libaacs/pkg-plist (revision 351220) +++ multimedia/libaacs/pkg-plist (working copy) @@ -5,6 +5,6 @@ lib/libaacs.a lib/libaacs.la lib/libaacs.so -lib/libaacs.so.3 +lib/libaacs.so.4 libdata/pkgconfig/libaacs.pc @dirrm include/libaacs Index: multimedia/libbluray/Makefile =================================================================== --- multimedia/libbluray/Makefile (revision 351220) +++ multimedia/libbluray/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libbluray -PORTVERSION= 0.3.0 +PORTVERSION= 0.5.0 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \ @@ -33,11 +33,10 @@ .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MJAVA} -BROKEN= Does not build with JAVA BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant CATEGORIES+= java USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.6+ JAVA_BUILD= yes JAVA_RUN= yes CONFIGURE_ARGS+= --enable-bdjava --with-bdj-type=j2se @@ -44,21 +43,36 @@ CONFIGURE_ENV+= JDK_HOME="${JAVA_HOME}" .endif +# 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 + run-autotools: @cd ${WRKSRC} && ${SH} bootstrap -plist: build +plist: @${ECHO} "===> Rebuilding PLIST." - @${MKDIR} "${WRKDIR}/plist" - @cd ${WRKSRC} && ( \ - ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} --prefix="${WRKDIR}/plist" && \ - ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} pkgconfigdir="${WRKDIR}/plist/libdata/pkgconfig" ${INSTALL_TARGET} ; \ - ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} \ - ) - @${FIND} -ds "${WRKDIR}/plist/" -not -type d \ - | ${SED} "s|${WRKDIR}/plist/||1" > ${PLIST} - @${FIND} -ds "${WRKDIR}/plist/" -type d -mindepth 2 \ - | ${SED} -e "/pkgconfig/d" -e "s|${WRKDIR}/plist/|@dirrm |1" >> ${PLIST} - @${RM} -rf "${WRKDIR}/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} -ne '/share\/licenses/b dirs' \ + -e '/ dir /{s/ .*//;s/^/@dirrm /;H;};t dirs' \ + -e 's/ .*//p;:dirs' -e '$${g;s/^\n//p;}' \ + > "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./} > ${PLIST} + @${RM} plist. ${OPTIONS_DEFINE:C/^/plist.add./} .include <bsd.port.mk> Index: multimedia/libbluray/distinfo =================================================================== --- multimedia/libbluray/distinfo (revision 351220) +++ multimedia/libbluray/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (libbluray-0.3.0.tar.bz2) = dc73ad618052ddd2d72bb847c8e5b9a1c9175db7b18d0456b21f484836c30038 -SIZE (libbluray-0.3.0.tar.bz2) = 510993 +SHA256 (libbluray-0.5.0.tar.bz2) = 19213e193e1abc5ed2de65edfb539deda1dbf6cc64dfef03e405524c9c6f7216 +SIZE (libbluray-0.5.0.tar.bz2) = 559639 Index: multimedia/libbluray/files/patch-src-Makefile.am =================================================================== --- multimedia/libbluray/files/patch-src-Makefile.am (revision 0) +++ multimedia/libbluray/files/patch-src-Makefile.am (working copy) @@ -0,0 +1,7 @@ +--- src/Makefile.am.orig 2014-04-13 18:08:03.000000000 +0200 ++++ src/Makefile.am 2014-04-13 18:08:10.000000000 +0200 +@@ -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 + + AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) $(FT2_CFLAGS) Property changes on: multimedia/libbluray/files/patch-src-Makefile.am ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: multimedia/libbluray/files/patch-util-refcnt.h =================================================================== --- multimedia/libbluray/files/patch-util-refcnt.h (revision 0) +++ multimedia/libbluray/files/patch-util-refcnt.h (working copy) @@ -0,0 +1,11 @@ +--- 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" + Property changes on: multimedia/libbluray/files/patch-util-refcnt.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: multimedia/libbluray/pkg-plist =================================================================== --- multimedia/libbluray/pkg-plist (revision 351220) +++ multimedia/libbluray/pkg-plist (working copy) @@ -10,6 +10,8 @@ lib/libbluray.a lib/libbluray.la lib/libbluray.so -lib/libbluray.so.4 +lib/libbluray.so.6 libdata/pkgconfig/libbluray.pc @dirrm include/libbluray +%%JAVA%%lib/libbluray/libbluray.jar +%%JAVA%%@dirrm lib/libbluray >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404132156.s3DLuGsB082894>