From owner-svn-ports-all@FreeBSD.ORG Mon Apr 13 16:00:50 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F205D12B; Mon, 13 Apr 2015 16:00:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD53DE29; Mon, 13 Apr 2015 16:00:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3DG0nkD066612; Mon, 13 Apr 2015 16:00:49 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3DG0nHD066611; Mon, 13 Apr 2015 16:00:49 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201504131600.t3DG0nHD066611@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Mon, 13 Apr 2015 16:00:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383927 - head/multimedia/handbrake X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2015 16:00:50 -0000 Author: pi Date: Mon Apr 13 16:00:49 2015 New Revision: 383927 URL: https://svnweb.freebsd.org/changeset/ports/383927 Log: multimedia/handbrake: fix build on 10.1a, 9.3a (and probably others) PR: 199126 Submitted by: kwhite@site.uottawa.ca Modified: head/multimedia/handbrake/Makefile Modified: head/multimedia/handbrake/Makefile ============================================================================== --- head/multimedia/handbrake/Makefile Mon Apr 13 14:49:37 2015 (r383926) +++ head/multimedia/handbrake/Makefile Mon Apr 13 16:00:49 2015 (r383927) @@ -3,7 +3,7 @@ PORTNAME= handbrake PORTVERSION= 0.10.1 -#PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://download.handbrake.fr/releases/${PORTVERSION}/ \ http://download.handbrake.fr/handbrake/contrib/:contrib \ @@ -14,7 +14,6 @@ DISTFILES= HandBrake-${PORTVERSION}.tar. faad2-2.7.tar.gz:contrib \ fdk-aac-v0.1.1-6-gbae4553.tar.bz2:contrib \ libav-v10.1.tar.bz2:contrib \ - lame-3.98.tar.gz:contrib \ libbluray-0.5.0.tar.bz2:contrib \ libdca-r81-strapped.tar.gz:contrib \ libdvdnav-5.0.1-0-gaa3659d.tar.gz:contrib \ @@ -29,9 +28,8 @@ COMMENT= Versatile DVD ripper and video LICENSE= GPLv2 -BROKEN= Fails to build - -BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm +BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ + cmake:${PORTSDIR}/devel/cmake LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfribidi.so:${PORTSDIR}/converters/fribidi \ @@ -43,8 +41,10 @@ LIB_DEPENDS= libfontconfig.so:${PORTSDIR libtheoradec.so:${PORTSDIR}/multimedia/libtheora \ libtheoraenc.so:${PORTSDIR}/multimedia/libtheora \ libsamplerate.so:${PORTSDIR}/audio/libsamplerate \ - libvpx.so:${PORTSDIR}/multimedia/libvpx \ - libx264.so:${PORTSDIR}/multimedia/libx264 + libx264.so:${PORTSDIR}/multimedia/libx264 \ + libmp3lame.so:${PORTSDIR}/audio/lame + + .if !defined(PACKAGE_BUILDING) # DVDCSS version hardcoded in contrib/libdvdread/libdvdread/src/dvd_input.c (dlopen'ed) LIB_DEPENDS+= libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss @@ -78,6 +78,7 @@ OPTIONS_DEFAULT= X11 BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:${PORTSDIR}/devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +LIB_DEPENDS+= libvpx.so:${PORTSDIR}/multimedia/libvpx .endif CC!=/usr/bin/which ${CC} MAKE_ENV+=ACLOCAL=${LOCALBASE}/bin/aclocal @@ -106,7 +107,7 @@ LDFLAGS+= -lstdc++ # considered good in FreeBSD. Instead, we will prepare everything manually. post-extract: .SILENT # Unversioned directories can be copied in a loop -.for d in a52dec lame libdca x264 +.for d in a52dec libdca x264 ${MKDIR} ${BUILD_WRKSRC}/contrib/${d} ${MV} ${WRKDIR}/${d} ${BUILD_WRKSRC}/contrib/${d} .endfor @@ -130,7 +131,6 @@ post-extract: .SILENT ${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/lame/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/libbluray/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/libdca/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/libdvdnav/.stamp.extract @@ -151,6 +151,7 @@ post-patch: @${REINPLACE_CMD} \ -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' \ ${WRKSRC}/gtk/configure.ac @${REINPLACE_CMD} -e 's| ${WRKDIR}/A06-frame-threading-state.patch @${MV} ${WRKDIR}/A06-frame-threading-state.patch ${WRKSRC}/contrib/ffmpeg/ @@ -171,6 +173,11 @@ post-patch: -e 's|%%REP_ARCHS%%|${CPUTYPE}|g' \ -e 's|%%REP_ICONV%%|${ICONV_LIB:S/-l//}|g' \ ${WRKSRC}/custom.defs +.if !${PORT_OPTIONS:MX11} + @${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 do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${STAGEDIR}${PREFIX}/bin