Date: Sun, 24 Apr 2016 15:11:56 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413944 - head/multimedia/handbrake Message-ID: <201604241511.u3OFBunV052015@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sun Apr 24 15:11:56 2016 New Revision: 413944 URL: https://svnweb.freebsd.org/changeset/ports/413944 Log: Update to upstream version 0.10.5, turning FDK_AAC into an OPTION PR: 208334 Submitted by: woodsb02@gmail.com Reviewed by: riggs, jbeich Differential Revision: https://reviews.freebsd.org/D6077 Modified: head/multimedia/handbrake/Makefile head/multimedia/handbrake/distinfo Modified: head/multimedia/handbrake/Makefile ============================================================================== --- head/multimedia/handbrake/Makefile Sun Apr 24 13:57:21 2016 (r413943) +++ head/multimedia/handbrake/Makefile Sun Apr 24 15:11:56 2016 (r413944) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= handbrake -PORTVERSION= 0.10.2 -PORTREVISION= 2 +PORTVERSION= 0.10.5 CATEGORIES= multimedia MASTER_SITES= http://download.handbrake.fr/releases/${PORTVERSION}/ \ http://download.handbrake.fr/handbrake/contrib/:contrib \ @@ -20,13 +19,14 @@ DISTFILES= HandBrake-${PORTVERSION}.tar. libdvdread-5.0.0-6-gcb1ae87.tar.gz:contrib \ libvpx-v1.3.0.tar.bz2:contrib \ x264-r2479-dd79a61.tar.gz:contrib \ - x265-9329-0d30d2641875-1.5.tar.bz2:contrib + x265_1.9.tar.gz:contrib DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Versatile DVD ripper and video transcoder LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= yasm:devel/yasm \ cmake:devel/cmake @@ -46,12 +46,13 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/ CONFLICTS_BUILD= x265 .if !defined(PACKAGE_BUILDING) -# DVDCSS version hardcoded in contrib/libdvdread/libdvdread/src/dvd_input.c (dlopen'ed) +# DVDCSS version hardcoded in contrib/libdvdread/libdvdread-5.0.0-6-gcb1ae87/src/dvd_input.c (dlopen'ed) LIB_DEPENDS+= libdvdcss.so.2:multimedia/libdvdcss .endif GNU_CONFIGURE= yes -USES= autoreconf:build gmake iconv libtool:build pkgconfig python:build +USES= autoreconf:build compiler:features gmake iconv \ + libtool:build localbase pkgconfig python:build WRKSRC= ${WRKDIR}/HandBrake-${PORTVERSION} PLIST_FILES= bin/HandBrakeCLI @@ -66,10 +67,21 @@ MAKE_JOBS_UNSAFE= yes NOPRECIOUSMAKEVARS= yes # for ffmpeg and x264 -OPTIONS_DEFINE= X11 -X11_DESC= Build GTK+3 based GUI program +# Enforce linking to the system c++ standard lib +LDFLAGS+= -l${COMPILER_FEATURES:Mlib*c++:S/lib//} + +OPTIONS_DEFINE= FDK_AAC X11 OPTIONS_DEFAULT= X11 +FDK_AAC_DESC= Enable non-free Fraunhofer FDK AAC codec +X11_DESC= Build GTK+3 based GUI program + +FDK_AAC_CONFIGURE_ENABLE= fdk-aac +FDK_AAC_VARS= LICENSE+=FDK_AAC LICENSE_COMB=multi +LICENSE_NAME_FDK_AAC= Software License for The Fraunhofer FDK AAC Codec Library for Android +LICENSE_FILE_FDK_AAC= ${BUILD_WRKSRC}/contrib/fdkaac/${DISTFILES:Mfdk*:R:R}/NOTICE +LICENSE_PERMS_FDK_AAC= dist-mirror pkg-mirror auto-accept + .include <bsd.port.options.mk> # Recent GNU binutils are required to handle inline SSSE3 asm (in x264), and @@ -85,8 +97,6 @@ MAKE_ENV+=ACLOCAL=${LOCALBASE}/bin/acloc .if ${PORT_OPTIONS:MX11} CONFIGURE_ARGS+= --disable-gtk-update-checks --disable-gst -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib LIB_DEPENDS+= libdbus-glib-1.so:devel/dbus-glib \ libnotify.so:devel/libnotify USES+= gettext @@ -103,13 +113,6 @@ DESKTOP_ENTRIES="HandBrake" \ CONFIGURE_ARGS+= --disable-gtk .endif -# Enforce linking to the system c++ standard lib -.if ${OSVERSION} >= 1000054 -LDFLAGS+= -lc++ -.else -LDFLAGS+= -lstdc++ -.endif - # HandBrake tries to fetch its dependencies during build phase, which is not # considered good in FreeBSD. Instead, we will prepare everything manually. post-extract: .SILENT @@ -119,24 +122,22 @@ post-extract: .SILENT ${MV} ${WRKDIR}/${d} ${BUILD_WRKSRC}/contrib/${d} .endfor # Others had to be processed one by one due to irregular (versioned) names - cd ${BUILD_WRKSRC}/contrib && ${MKDIR} faac faad2 fdkaac ffmpeg libbluray libdvdnav \ + cd ${BUILD_WRKSRC}/contrib && ${MKDIR} faac faad2 ffmpeg libbluray libdvdnav \ libdvdread libvpx x265 ${MV} ${WRKDIR}/faac-1.28 ${BUILD_WRKSRC}/contrib/faac ${MV} ${WRKDIR}/faad2-2.7 ${BUILD_WRKSRC}/contrib/faad2 - ${MV} ${WRKDIR}/fdk-aac-v0.1.1-6-gbae4553 ${BUILD_WRKSRC}/contrib/fdkaac ${MV} ${WRKDIR}/libav-v10.1 ${BUILD_WRKSRC}/contrib/ffmpeg/libav-v10.1 ${MV} ${WRKDIR}/libbluray-0.5.0 ${BUILD_WRKSRC}/contrib/libbluray ${MV} ${WRKDIR}/libdvdnav-5.0.1-0-gaa3659d ${BUILD_WRKSRC}/contrib/libdvdnav ${MV} ${WRKDIR}/libdvdread-5.0.0-6-gcb1ae87 ${BUILD_WRKSRC}/contrib/libdvdread ${MV} ${WRKDIR}/libvpx-v1.3.0 ${BUILD_WRKSRC}/contrib/libvpx - ${MV} ${WRKDIR}/x265-9329-0d30d2641875-1.5 ${BUILD_WRKSRC}/contrib/x265 + ${MV} ${WRKDIR}/x265_1.9 ${BUILD_WRKSRC}/contrib/x265 # Avoid conflict with `print/harfbuzz' (also installs "hb.h") ${MV} ${WRKSRC}/libhb/hb.h ${WRKSRC}/libhb/hb-of-handbrake.h # Mark all bundled dependencies as extracted ${TOUCH} ${BUILD_WRKSRC}/contrib/a52dec/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/faac/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/faad2/.stamp.extract - ${TOUCH} ${BUILD_WRKSRC}/contrib/fdkaac/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/ffmpeg/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/libbluray/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/libdca/.stamp.extract @@ -146,6 +147,11 @@ post-extract: .SILENT ${TOUCH} ${BUILD_WRKSRC}/contrib/x264/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/x265/.stamp.extract +post-extract-FDK_AAC-on: + ${MKDIR} ${BUILD_WRKSRC}/contrib/fdkaac + ${MV} ${WRKDIR}/fdk-aac-v0.1.1-6-gbae4553 ${BUILD_WRKSRC}/contrib/fdkaac + ${TOUCH} ${BUILD_WRKSRC}/contrib/fdkaac/.stamp.extract + post-patch: @${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|' \ ${BUILD_WRKSRC}/contrib/a52dec/a52dec/libao/audio_out_oss.c @@ -159,7 +165,7 @@ post-patch: -e '/GHB_PACKAGES=/s/gthread-2.0/& gmodule-2.0/' \ -e 's/-lhb/& ${ICONV_LIB}/' \ -e 's/-lhandbrake/& ${ICONV_LIB}/' \ - -e 's:-lxml2:& ../../contrib/lib/libx265.a ../../contrib/lib/libfdk-aac.a:g' \ + -e 's:-lxml2:& ../../contrib/lib/libx265.a:g' \ ${WRKSRC}/gtk/configure.ac @${REINPLACE_CMD} -e 's|<malloc|<stdlib|' ${WRKSRC}/libhb/fifo.c @${FIND} ${WRKSRC} -type f -name '*.[ch]' -print0 | ${XARGS} -0 \ @@ -171,7 +177,6 @@ post-patch: ${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs @${TR} -d '\r' < ${WRKSRC}/contrib/ffmpeg/A06-frame-threading-state.patch > ${WRKDIR}/A06-frame-threading-state.patch @${MV} ${WRKDIR}/A06-frame-threading-state.patch ${WRKSRC}/contrib/ffmpeg/ - @${REINPLACE_CMD} -e 's:/lib/cpp:${CPP}:g' ${BUILD_WRKSRC}/contrib/fdkaac/fdk-aac-v0.1.1-6-gbae4553/configure @${REINPLACE_CMD} -E \ -e 's|%%REP_CC%%|${CC}|g' \ -e 's|%%REP_CXX%%|${CXX}|g' \ @@ -180,16 +185,21 @@ post-patch: -e 's|%%REP_ARCHS%%|${CPUTYPE}|g' \ -e 's|%%REP_ICONV%%|${ICONV_LIB:S/-l//}|g' \ ${WRKSRC}/custom.defs -.if !${PORT_OPTIONS:MX11} + +post-patch-X11-off: @${REINPLACE_CMD} -e 's:--enable-libvpx:--disable-libvpx:' ${WRKSRC}/contrib/ffmpeg/module.defs @${REINPLACE_CMD} -e 's| vpx | |' \ ${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs -.endif + +post-patch-FDK_AAC-on: + @${REINPLACE_CMD} -e 's:/lib/cpp:${CPP}:g' ${BUILD_WRKSRC}/contrib/fdkaac/fdk-aac-v0.1.1-6-gbae4553/configure + @${REINPLACE_CMD} -e 's:-lxml2:& ../../contrib/lib/libfdk-aac.a:g' \ + ${WRKSRC}/gtk/configure.ac do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MX11} + +do-install-X11-on: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gtk/src/ghb ${STAGEDIR}${PREFIX}/bin/HandBrake -.endif .include <bsd.port.mk> Modified: head/multimedia/handbrake/distinfo ============================================================================== --- head/multimedia/handbrake/distinfo Sun Apr 24 13:57:21 2016 (r413943) +++ head/multimedia/handbrake/distinfo Sun Apr 24 15:11:56 2016 (r413944) @@ -1,5 +1,5 @@ -SHA256 (handbrake/HandBrake-0.10.2.tar.bz2) = 4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699 -SIZE (handbrake/HandBrake-0.10.2.tar.bz2) = 10442635 +SHA256 (handbrake/HandBrake-0.10.5.tar.bz2) = fb9230dd121b456f6829d1d25ac8bbf76e503b51c4efc70f0a7fd2bb8607e2f0 +SIZE (handbrake/HandBrake-0.10.5.tar.bz2) = 10452839 SHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47 SIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978 SHA256 (handbrake/faac-1.28.tar.gz) = c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df @@ -22,5 +22,5 @@ SHA256 (handbrake/libvpx-v1.3.0.tar.bz2) SIZE (handbrake/libvpx-v1.3.0.tar.bz2) = 2084229 SHA256 (handbrake/x264-r2479-dd79a61.tar.gz) = 7307a83085f4110f8ae690748f00b5acb4882ec34b83ef260fec264c018c49e9 SIZE (handbrake/x264-r2479-dd79a61.tar.gz) = 785781 -SHA256 (handbrake/x265-9329-0d30d2641875-1.5.tar.bz2) = ff9ef4c9aae3b20497b4d1630bd89c1079a7904ac01227ba35366b9c5f9586d4 -SIZE (handbrake/x265-9329-0d30d2641875-1.5.tar.bz2) = 588124 +SHA256 (handbrake/x265_1.9.tar.gz) = 3e4654133ed957a98708fdb4cb9a154d9e80922b84e26e43fc462a101c5b15c8 +SIZE (handbrake/x265_1.9.tar.gz) = 956101
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604241511.u3OFBunV052015>