From owner-svn-ports-all@freebsd.org Mon Dec 19 01:08:41 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA376C8329C; Mon, 19 Dec 2016 01:08:41 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 C4FAC1E01; Mon, 19 Dec 2016 01:08:41 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBJ18equ073772; Mon, 19 Dec 2016 01:08:40 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBJ18doU073760; Mon, 19 Dec 2016 01:08:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201612190108.uBJ18doU073760@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 19 Dec 2016 01:08:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428896 - in head/multimedia: avidemux avidemux/files ffmpeg ffmpeg/files ffmpeg0 ffmpeg0/files gstreamer-ffmpeg libav libav/files mplayer mplayer/files 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.23 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, 19 Dec 2016 01:08:42 -0000 Author: jbeich Date: Mon Dec 19 01:08:39 2016 New Revision: 428896 URL: https://svnweb.freebsd.org/changeset/ports/428896 Log: multimedia/ffmpeg: simplify ARCH workaround ARCH is clobbered via .MAKEFLAGS in Mk/bsd.port.mk since r20327. Approved by: portmgr blanket Deleted: head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch head/multimedia/ffmpeg/files/patch-Makefile head/multimedia/ffmpeg/files/patch-libavcodec-Makefile head/multimedia/ffmpeg/files/patch-tests_checkasm_Makefile head/multimedia/ffmpeg0/files/patch-libavcodec-Makefile head/multimedia/ffmpeg0/files/patch-libavfilter-Makefile head/multimedia/libav/files/patch-Makefile head/multimedia/libav/files/patch-common.mak head/multimedia/libav/files/patch-libavcodec_Makefile head/multimedia/mplayer/files/patch-ffmpeg_Makefile head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile head/multimedia/mplayer/files/patch-ffmpeg_tests_checkasm_Makefile Modified: head/multimedia/avidemux/Makefile.common (contents, props changed) head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch (contents, props changed) head/multimedia/ffmpeg/Makefile (contents, props changed) head/multimedia/ffmpeg/files/patch-configure (contents, props changed) head/multimedia/ffmpeg0/Makefile (contents, props changed) head/multimedia/ffmpeg0/files/patch-configure (contents, props changed) head/multimedia/gstreamer-ffmpeg/Makefile (contents, props changed) head/multimedia/libav/Makefile (contents, props changed) head/multimedia/libav/files/patch-configure (contents, props changed) head/multimedia/mplayer/Makefile.common (contents, props changed) head/multimedia/mplayer/files/patch-configure (contents, props changed) Modified: head/multimedia/avidemux/Makefile.common ============================================================================== --- head/multimedia/avidemux/Makefile.common Mon Dec 19 01:08:21 2016 (r428895) +++ head/multimedia/avidemux/Makefile.common Mon Dec 19 01:08:39 2016 (r428896) @@ -27,6 +27,7 @@ CMAKE_ARGS+= -DAVIDEMUX_PACKAGER=none CMAKE_ARGS+= -DQT5:BOOL=OFF CXXFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes +NOPRECIOUSMAKEVARS= yes # ARCH BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin Modified: head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch ============================================================================== --- head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch Mon Dec 19 01:08:21 2016 (r428895) +++ head/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch Mon Dec 19 01:08:39 2016 (r428896) @@ -1,6 +1,6 @@ --- avidemux_core/ffmpeg_package/patches/configure.patch.orig 2015-06-01 05:59:45 UTC +++ avidemux_core/ffmpeg_package/patches/configure.patch -@@ -0,0 +1,25 @@ +@@ -0,0 +1,16 @@ +--- configure.orig 2015-03-16 20:26:04.000000000 +0100 ++++ configure +@@ -2733,12 +2733,7 @@ @@ -17,12 +17,3 @@ + cpu="generic" + intrinsics="none" + -+@@ -5621,7 +5616,7 @@ -+ SRC_PATH:=\$(SRC_PATH:.%=..%) -+ endif -+ CC_IDENT=$cc_ident -+-ARCH=$arch -++FFMPEG_ARCH=$arch -+ INTRINSICS=$intrinsics -+ CC=$cc -+ CXX=$cxx Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Mon Dec 19 01:08:21 2016 (r428895) +++ head/multimedia/ffmpeg/Makefile Mon Dec 19 01:08:39 2016 (r428896) @@ -22,6 +22,7 @@ USES= compiler:c11 cpe gmake localbase USE_LDCONFIG= yes USE_PERL5= build SHEBANG_FILES= doc/texi2pod.pl +NOPRECIOUSMAKEVARS= yes # ARCH PORTSCOUT= limit:^3\. Modified: head/multimedia/ffmpeg/files/patch-configure ============================================================================== --- head/multimedia/ffmpeg/files/patch-configure Mon Dec 19 01:08:21 2016 (r428895) +++ head/multimedia/ffmpeg/files/patch-configure Mon Dec 19 01:08:39 2016 (r428896) @@ -24,15 +24,6 @@ check_cflags -Qunused-arguments check_cflags -Werror=implicit-function-declaration check_cflags -Werror=missing-prototypes -@@ -6562,7 +6560,7 @@ ifndef MAIN_MAKEFILE - SRC_PATH:=\$(SRC_PATH:.%=..%) - endif - CC_IDENT=$cc_ident --ARCH=$arch -+FFMPEG_ARCH=$arch - INTRINSICS=$intrinsics - CC=$cc - CXX=$cxx @@ -6799,7 +6797,7 @@ exec_prefix=\${prefix} libdir=$libdir includedir=$incdir Modified: head/multimedia/ffmpeg0/Makefile ============================================================================== --- head/multimedia/ffmpeg0/Makefile Mon Dec 19 01:08:21 2016 (r428895) +++ head/multimedia/ffmpeg0/Makefile Mon Dec 19 01:08:39 2016 (r428896) @@ -27,6 +27,7 @@ USES= cpe gmake perl5 pkgconfig tar:bzi USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX} USE_PERL5= build SHEBANG_FILES= doc/texi2pod.pl +NOPRECIOUSMAKEVARS= yes # ARCH FFMPEG_SUFFIX= 0 HAS_CONFIGURE= yes Modified: head/multimedia/ffmpeg0/files/patch-configure ============================================================================== --- head/multimedia/ffmpeg0/files/patch-configure Mon Dec 19 01:08:21 2016 (r428895) +++ head/multimedia/ffmpeg0/files/patch-configure Mon Dec 19 01:08:39 2016 (r428896) @@ -28,12 +28,3 @@ check_cflags -Qunused-arguments elif enabled armcc; then # 2523: use of inline assembler is deprecated -@@ -3322,7 +3322,7 @@ - SRC_PATH="$source_path" - SRC_PATH_BARE=$source_path - CC_IDENT=$cc_ident --ARCH=$arch -+FFMPEG_ARCH=$arch - CC=$cc - AS=$as - LD=$ld Modified: head/multimedia/gstreamer-ffmpeg/Makefile ============================================================================== --- head/multimedia/gstreamer-ffmpeg/Makefile Mon Dec 19 01:08:21 2016 (r428895) +++ head/multimedia/gstreamer-ffmpeg/Makefile Mon Dec 19 01:08:39 2016 (r428896) @@ -33,6 +33,7 @@ FFMPEG_DESC?= Use system ffmpeg instead FFMPEG_LIB_DEPENDS=libavcodec0.so:multimedia/ffmpeg0 FFMPEG_CONFIGURE_WITH=system-ffmpeg +FFMPEG_VARS_OFF=NOPRECIOUSMAKEVARS=yes # ARCH FFMPEG_DISTFILES_OFF=libav-${LIBAV_VERSION}.tar.xz:libav FFMPEG_BUILD_DEPENDS_OFF=yasm:devel/yasm @@ -91,11 +92,5 @@ post-patch: @${REINPLACE_CMD} -Ee '/sleep 15/d; /PKG_CONFIG/\ s/lib(av(format|codec|util)|postproc|swscale)/&0/g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/LIBAV_ARCH/' \ - ${WRKSRC}/gst-libs/ext/libav/Makefile \ - ${WRKSRC}/gst-libs/ext/libav/common.mak \ - ${WRKSRC}/gst-libs/ext/libav/configure \ - ${WRKSRC}/gst-libs/ext/libav/libavcodec/Makefile \ - ${WRKSRC}/gst-libs/ext/libav/libavfilter/Makefile .include Modified: head/multimedia/libav/Makefile ============================================================================== --- head/multimedia/libav/Makefile Mon Dec 19 01:08:21 2016 (r428895) +++ head/multimedia/libav/Makefile Mon Dec 19 01:08:39 2016 (r428896) @@ -20,6 +20,7 @@ USE_XORG= x11 HAS_CONFIGURE= yes USE_PERL5= build USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} +NOPRECIOUSMAKEVARS= yes # ARCH CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --prefix="${PREFIX}" \ Modified: head/multimedia/libav/files/patch-configure ============================================================================== --- head/multimedia/libav/files/patch-configure Mon Dec 19 01:08:21 2016 (r428895) +++ head/multimedia/libav/files/patch-configure Mon Dec 19 01:08:39 2016 (r428896) @@ -19,15 +19,6 @@ check_cflags -Qunused-arguments check_cflags -Werror=implicit-function-declaration check_cflags -Werror=missing-prototypes -@@ -4644,7 +4644,7 @@ DOCDIR=\$(DESTDIR)$docdir - MANDIR=\$(DESTDIR)$mandir - SRC_PATH=$source_path - CC_IDENT=$cc_ident --ARCH=$arch -+LIBAV_ARCH=$arch - INTRINSICS=$intrinsics - CC=$cc - AS=$as @@ -4821,7 +4821,7 @@ pkgconfig_generate(){ requires=${requires%, } enabled ${name#lib} || return 0 Modified: head/multimedia/mplayer/Makefile.common ============================================================================== --- head/multimedia/mplayer/Makefile.common Mon Dec 19 01:08:21 2016 (r428895) +++ head/multimedia/mplayer/Makefile.common Mon Dec 19 01:08:39 2016 (r428896) @@ -18,6 +18,7 @@ LIB_DEPENDS= libpng.so:graphics/png \ libfreetype.so:print/freetype2 USES= compiler:c11 gmake iconv ncurses tar:xz +NOPRECIOUSMAKEVARS= yes # ARCH GNU_CONFIGURE= yes CONFIGURE_ENV= TMPDIR="${WRKSRC}" CONFIGURE_ARGS= --cc="${CC}" \ Modified: head/multimedia/mplayer/files/patch-configure ============================================================================== --- head/multimedia/mplayer/files/patch-configure Mon Dec 19 01:08:21 2016 (r428895) +++ head/multimedia/mplayer/files/patch-configure Mon Dec 19 01:08:39 2016 (r428896) @@ -167,12 +167,3 @@ CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" -@@ -8375,7 +8386,7 @@ TIMER = $_timer - EXESUF = $_exesuf - EXESUFS_ALL = .exe - --ARCH = $arch -+MPLAYER_ARCH = $arch - $(mak_enable "$arch_all" "$arch" ARCH) - $(mak_enable "$subarch_all" "$subarch" ARCH) - $(mak_enable "$cpuexts_all" "$cpuexts" HAVE)