[138604] trunk/dports/multimedia

[devans at macports.org]

Revision: 138604
          https://trac.macports.org/changeset/138604
Author:   devans at macports.org
Date:     2015-07-13 16:51:32 -0700 (Mon, 13 Jul 2015)
Log Message:
-----------
ffmpeg, ffmpeg-devel: make libx265 support optional via +libx265 variant, only defined for non-universal builds on 10.6 or greater (#48336, #48338, #48331).

Modified Paths:
--------------
    trunk/dports/multimedia/ffmpeg/Portfile
    trunk/dports/multimedia/ffmpeg-devel/Portfile

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2015-07-13 23:29:32 UTC (rev 138603)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2015-07-13 23:51:32 UTC (rev 138604)
@@ -11,7 +11,7 @@
 conflicts       ffmpeg-devel
 epoch           1
 version         2.7.1
-revision        1
+revision        2
 license         LGPL-2.1+
 categories      multimedia
 maintainers     devans jeremyhu openmaintainer
@@ -246,15 +246,27 @@
     depends_lib-append      port:rtmpdump
 }
 
+# x265 currently does not support OS X < 10.6 (#48336, #48338)
+# x265 cmake issues cause universal build to fail (#48331)
+# make libx265 support optional via +libx265 variant
+# only define variant for non-universal builds on 10.6 or greater
+
+platform darwin {
+    if {${os.major} > 8 && [variant_isset gpl2] && ![variant_isset universal]} {
+        variant libx265 description {Build with support for encoding HEVC video using libx265} {
+            configure.args-append   --enable-libx265
+            depends_lib-append      port:x265
+        }
+    }
+}
+
 variant gpl2 description {Enable GPL code, license will be GPL-2+} {
     configure.args-append   --enable-gpl \
                             --enable-postproc \
                             --enable-libx264 \
-                            --enable-libx265 \
                             --enable-libxvid
     depends_lib-append      port:XviD \
-                            port:x264 \
-                            port:x265
+                            port:x264
 
     license                 GPL-2+
 }

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2015-07-13 23:29:32 UTC (rev 138603)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2015-07-13 23:51:32 UTC (rev 138604)
@@ -12,6 +12,7 @@
 name            ffmpeg-devel
 conflicts       ffmpeg
 version         20150711
+revision        1
 license         LGPL-2.1+
 categories      multimedia
 maintainers     devans jeremyhu openmaintainer
@@ -245,15 +246,27 @@
     depends_lib-append      port:rtmpdump
 }
 
+# x265 currently does not support OS X < 10.6 (#48336, #48338)
+# x265 cmake issues cause universal build to fail (#48331)
+# make libx265 support optional via +libx265 variant
+# only define variant for non-universal builds on 10.6 or greater
+
+platform darwin {
+    if {${os.major} > 8 && [variant_isset gpl2] && ![variant_isset universal]} {
+        variant libx265 description {Build with support for encoding HEVC video using libx265} {
+            configure.args-append   --enable-libx265
+            depends_lib-append      port:x265
+        }
+    }
+}
+
 variant gpl2 description {Enable GPL code, license will be GPL-2+} {
     configure.args-append   --enable-gpl \
                             --enable-postproc \
                             --enable-libx264 \
-                            --enable-libx265 \
                             --enable-libxvid
     depends_lib-append      port:XviD \
-                            port:x264 \
-                            port:x265
+                            port:x264
 
     license                 GPL-2+
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150713/cea78dea/attachment.html>