[112948] trunk/dports/multimedia
cal at macports.org
cal at macports.org
Mon Nov 4 17:19:09 PST 2013
Revision: 112948
https://trac.macports.org/changeset/112948
Author: cal at macports.org
Date: 2013-11-04 17:19:09 -0800 (Mon, 04 Nov 2013)
Log Message:
-----------
ffmpeg{,-devel}: move block calling configure.args-delete after line that sets configure.args, see #41143
Modified Paths:
--------------
trunk/dports/multimedia/ffmpeg/Portfile
trunk/dports/multimedia/ffmpeg-devel/Portfile
Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile 2013-11-05 00:49:51 UTC (rev 112947)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2013-11-05 01:19:09 UTC (rev 112948)
@@ -92,17 +92,6 @@
compiler.blacklist-append {clang < 422.1.7} macports-clang-3.1
}
-# And similarly, disable asm on Tiger
-# libblueray doesn't build on Tiger so disable for now (#39442)
-platform darwin {
- if {${os.major} < 9} {
- depends_lib-delete port:libbluray
- configure.args-delete --enable-libbluray
- configure.args-append --disable-libbluray
- configure.args-append --disable-asm
- }
-}
-
# The old ffmpeg port was GPL-2+ as base and had a no_gpl variant, so this keeps us consistent
# Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
default_variants-append +gpl2
@@ -130,6 +119,17 @@
--enable-shared --enable-pthreads \
--cc=${configure.cc}
+# disable asm on Tiger
+# libblueray doesn't build on Tiger so disable for now (#39442)
+platform darwin {
+ if {${os.major} < 9} {
+ depends_lib-delete port:libbluray
+ configure.args-delete --enable-libbluray
+ configure.args-append --disable-libbluray
+ configure.args-append --disable-asm
+ }
+}
+
test.run yes
#
Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile 2013-11-05 00:49:51 UTC (rev 112947)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile 2013-11-05 01:19:09 UTC (rev 112948)
@@ -98,17 +98,6 @@
compiler.blacklist-append {clang < 422.1.7} macports-clang-3.1
}
-# And similarly, disable asm on Tiger
-# libblueray doesn't build on Tiger so disable for now (#39442)
-platform darwin {
- if {${os.major} < 9} {
- depends_lib-delete port:libbluray
- configure.args-delete --enable-libbluray
- configure.args-append --disable-libbluray
- configure.args-append --disable-asm
- }
-}
-
# The old ffmpeg port was GPL-2+ as base and had a no_gpl variant, so this keeps us consistent
# Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
default_variants-append +gpl2
@@ -136,6 +125,17 @@
--enable-shared --enable-pthreads \
--cc=${configure.cc}
+# disable asm on Tiger
+# libblueray doesn't build on Tiger so disable for now (#39442)
+platform darwin {
+ if {${os.major} < 9} {
+ depends_lib-delete port:libbluray
+ configure.args-delete --enable-libbluray
+ configure.args-append --disable-libbluray
+ configure.args-append --disable-asm
+ }
+}
+
test.run yes
#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131104/3c329aeb/attachment.html>
More information about the macports-changes
mailing list