Index: head/multimedia/handbrake/Makefile =================================================================== --- head/multimedia/handbrake/Makefile (revision 438109) +++ head/multimedia/handbrake/Makefile (revision 438110) @@ -1,127 +1,127 @@ # Created by: Andrew Thompson # $FreeBSD$ PORTNAME= handbrake PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Versatile DVD ripper and video transcoder LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash \ yasm:devel/yasm \ cmake:devel/cmake LIB_DEPENDS= libdbus-1.so:devel/dbus \ libharfbuzz.so:print/harfbuzz \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libfribidi.so:converters/fribidi \ libxml2.so:textproc/libxml2 \ libass.so:multimedia/libass \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis \ libvorbisenc.so:audio/libvorbis \ libtheoradec.so:multimedia/libtheora \ libtheoraenc.so:multimedia/libtheora \ libsamplerate.so:audio/libsamplerate \ libx264.so:multimedia/libx264 \ libmp3lame.so:audio/lame \ libopus.so:audio/opus \ libjansson.so:devel/jansson BROKEN_aarch64= Fails to build: invokes x86 asm BROKEN_armv6= Fails to build: invokes x86 asm USE_GITHUB= yes XGH_ACCOUNT= HandBrake XGH_PROJECT= HandBrake CONTRIB_FILES= fdk-aac-0.1.4.tar.gz \ libav-12.tar.gz \ libbluray-0.9.3.tar.bz2 \ libdvdnav-5.0.1.tar.bz2 \ libdvdread-5.0.0-6-gcb1ae87.tar.gz \ libvpx-1.5.0.tar.bz2 \ x265_2.1-1.tar.gz MASTER_SITES+= http://download.handbrake.fr/contrib/:contrib DISTFILES+= ${CONTRIB_FILES:S/$/:contrib/} .if !defined(PACKAGE_BUILDING) # DVDCSS version hardcoded in contrib/libdvdread/libdvdread-5.0.0-6-gcb1ae87/src/dvd_input.c (dlopen'ed) LIB_DEPENDS+= libdvdcss.so:multimedia/libdvdcss .endif GNU_CONFIGURE= yes USE_GCC= yes USES= autoreconf:build compiler:features gmake iconv \ libtool:build localbase:ldflags pkgconfig python:build MAKE_ENV= V=1 ACLOCAL=${LOCALBASE}/bin/aclocal WRKSRC= ${WRKDIR}/HandBrake-${PORTVERSION} CONFIGURE_ARGS= --force --enable-x265 CONFIGURE_TARGET= build BUILD_WRKSRC= ${WRKSRC}/build INSTALL_WRKSRC= ${WRKSRC}/build MAKEFILE= GNUmakefile ALL_TARGET= # INSTALL_TARGET= install-strip NOPRECIOUSMAKEVARS= yes # for ffmpeg and x264 # Enforce linking to bundled libraries instead of system libraries LDFLAGS+= -L${BUILD_WRKSRC}/contrib/lib # Enforce linking to the system c++ standard lib LDFLAGS+= -l${COMPILER_FEATURES:Mlib*c++:S/lib//} OPTIONS_DEFINE= FDK_AAC X11 OPTIONS_DEFAULT= X11 OPTIONS_SUB= yes 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= ${WRKDIR}/${DISTFILES:Mfdk*:R:R}/NOTICE LICENSE_PERMS_FDK_AAC= dist-mirror pkg-mirror auto-accept .include # Recent GNU binutils are required to handle inline SSSE3 asm (in x264), and # to support --exclude-libs option for ld(1) when building GUI program .if ${PORT_OPTIONS:MX11} CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin CONFIGURE_ARGS+= --disable-gtk-update-checks --disable-gst BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils LIB_DEPENDS+= libvpx.so:multimedia/libvpx \ libdbus-glib-1.so:devel/dbus-glib \ libnotify.so:devel/libnotify -USES+= gettext +USES+= gettext desktop-file-utils USE_GNOME+= gtk30 intltool cairo gdkpixbuf2 .else CONFIGURE_ARGS+= --disable-gtk .endif # HandBrake tries to fetch its dependencies during build phase, which is not # considered good in FreeBSD. Instead, we will provided the downloaded files. post-extract: .SILENT ${MKDIR} ${WRKSRC}/download .for f in ${CONTRIB_FILES} ${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSRC}/download .endfor post-install-X11-on: ${LN} -sf ghb ${STAGEDIR}${PREFIX}/bin/HandBrake .include Index: head/multimedia/handbrake/files/patch-contrib_libbluray_A02-expose-clip__id.patch =================================================================== --- head/multimedia/handbrake/files/patch-contrib_libbluray_A02-expose-clip__id.patch (revision 438109) +++ head/multimedia/handbrake/files/patch-contrib_libbluray_A02-expose-clip__id.patch (revision 438110) @@ -1,17 +1,18 @@ ---- contrib/libbluray/A02-expose-clip_id.patch.orig 2017-02-25 20:56:19 UTC +--- contrib/libbluray/A02-expose-clip_id.patch.orig 2017-02-25 +20:56:19 UTC +++ contrib/libbluray/A02-expose-clip_id.patch @@ -35,3 +35,14 @@ index 3cd7118..177b3d4 100644 - -- + -- 2.5.5 - -+--- Makefile.in.orig 2017-03-25 19:30:14 UTC -++++ Makefile.in 2017-03-25 19:30:36 UTC + ++--- a/Makefile.in.orig 2017-03-25 19:30:14 UTC +++++ b/Makefile.in 2017-03-25 19:30:36 UTC +@@ -772,7 +772,7 @@ + MOSTLYCLEANFILES = $(DX_CLEANFILES) + @ENABLE_UDF_FALSE@POSIX_C_SOURCE = 200112L + @ENABLE_UDF_TRUE@POSIX_C_SOURCE = 200809L +-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE) -D_REENTRANT ++SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE) -D_REENTRANT -D_XOPEN_SOURCE=700 + SET_INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/libbluray -I$(top_builddir)/src/libbluray $(BDJAVA_CFLAGS) + AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) \ -+ $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(UDF_CFLAGS) \ ++ $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(UDF_CFLAGS) \