From b03107f88d31f245434fc148de5c69020e62f4ec Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Thu, 15 May 2014 10:41:21 +0000 Subject: multimedia/libdvdcss: - USES=gmake libtool pathfix tar:bzip2. - INSTALL_TARGET=install-strip. - Use options. - Staging. - Simplify post-patch commands. - This update changes the library version but this allows removing libdvdcss related patches from dependent ports. multimedia/libxine: [1] - Add USES=libtool:keepla and remove libtool related patches and post-patch commands. - Move bsd.port.pre.mk include down and remove WANT_GNOME. - Remove USE_XORG=sm. libxine doesn't link to it. - Remove CONFIGURE_ENV. Not needed. - Clean up CPPFLAGS and CFLAGS. - Rename the GTK2 option PIXBUF and depend on gdkpixbuf2 instead of gtk20. - Remove PATCH_DIST_ARGS. Leftover from when there were external patches. - Remove -fno-force-addr clang hack. Modern gcc does not support the flag either and it was only added in case the user has -fforce-addr in CFLAGS in make.conf. - Fix IMAGEMAGICK option. - Merge pre-configure with post-patch and remove most commands because they don't do anything. multimedia/libdvdread: - USES=libtool:oldver pathfix. - INSTALL_TARGET=install-strip. multimedia/handbrake: - Add build dependency on devel/libtool because configure script expects to find existing libtool program. - Turn dependency on libdvdcss into library dependency such that headers are available during build. - Add USES=libtool to patch libtool scripts in contrib code. - Remove run-autotools-aclocal target and replace USE_AUTOTOOLS=aclocal with "autoconf:env automake:env" to indicate only build dependencies are needed and the tools don't have to be run. Approved by: nox [1] --- multimedia/handbrake/Makefile | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'multimedia/handbrake/Makefile') diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index 5fc6b6c14c33..8d1ab31fed3a 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -28,7 +28,8 @@ COMMENT= Versatile DVD ripper and video transcoder LICENSE= GPLv2 -BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm +BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool \ + yasm:${PORTSDIR}/devel/yasm LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfribidi.so:${PORTSDIR}/converters/fribidi \ @@ -40,13 +41,15 @@ LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libtheoradec.so:${PORTSDIR}/multimedia/libtheora \ libtheoraenc.so:${PORTSDIR}/multimedia/libtheora \ libsamplerate.so:${PORTSDIR}/audio/libsamplerate -RUN_DEPENDS= ${LOCALBASE}/lib/libdvdcss.so:${PORTSDIR}/multimedia/libdvdcss +.if !defined(PACKAGE_BUILDING) +# DVDCSS version hardcoded in contrib/libdvdread/libdvdread/src/dvd_input.c (dlopen'ed) +LIB_DEPENDS+= ${LOCALBASE}/lib/libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss +.endif -USES= gmake pkgconfig iconv -USE_AUTOTOOLS= libtool aclocal -LIBTOOLFILES= configure +GNU_CONFIGURE= yes +USES= gmake iconv libtool pkgconfig +USE_AUTOTOOLS= autoconf:env automake:env USE_PYTHON_BUILD= yes -WANT_GNOME= yes WRKSRC= ${WRKDIR}/HandBrake-${PORTVERSION} PLIST_FILES= bin/HandBrakeCLI @@ -65,22 +68,22 @@ OPTIONS_DEFINE= X11 X11_DESC= Build GTK+2 based GUI program OPTIONS_DEFAULT= X11 -.include +.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} || ${OSVERSION} < 802509 || \ ${OSVERSION} >= 900000 && ${OSVERSION} < 900033 BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:${PORTSDIR}/devel/binutils -CONFIGURE_ENV= COMPILER_PATH=${LOCALBASE}/bin -MAKE_ENV= COMPILER_PATH=${LOCALBASE}/bin +CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif .if ${PORT_OPTIONS:MX11} CONFIGURE_ARGS+= --disable-gtk-update-checks --disable-gst LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libnotify.so:${PORTSDIR}/devel/libnotify -USE_GNOME= gtk20 +USE_GNOME+= gtk20 PLIST_FILES+= bin/HandBrake .else CONFIGURE_ARGS+= --disable-gtk @@ -93,9 +96,6 @@ LDFLAGS+= -lc++ LDFLAGS+= -lstdc++ .endif -run-autotools-aclocal: - @${DO_NADA} - # 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 @@ -135,8 +135,6 @@ post-patch: @${REINPLACE_CMD} -e 's|-ldl|-lc| ; s|\[dl\]|[c]|' \ ${BUILD_WRKSRC}/contrib/libbluray/libbluray-0.2.3/configure.ac @${REINPLACE_CMD} -e 's| +.include -- cgit v1.2.3