[138544] trunk/dports/multimedia/ffmpeg/Portfile

[devans at macports.org]

Revision: 138544
          https://trac.macports.org/changeset/138544
Author:   devans at macports.org
Date:     2015-07-11 14:40:03 -0700 (Sat, 11 Jul 2015)
Log Message:
-----------
ffmpeg: add x265 (HEVC) video support, use license-replace to fix licensing for +gpl2/+gpl3.

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

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2015-07-11 20:39:26 UTC (rev 138543)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2015-07-11 21:40:03 UTC (rev 138544)
@@ -11,6 +11,7 @@
 conflicts       ffmpeg-devel
 epoch           1
 version         2.7.1
+revision        1
 license         LGPL-2.1+
 categories      multimedia
 maintainers     devans jeremyhu openmaintainer
@@ -249,11 +250,13 @@
     configure.args-append   --enable-gpl \
                             --enable-postproc \
                             --enable-libx264 \
+                            --enable-libx265 \
                             --enable-libxvid
     depends_lib-append      port:XviD \
-                            port:x264
-    license-delete          LGPL-2.1+
-    license-append          GPL-2+
+                            port:x264 \
+                            port:x265
+
+    license-replace         LGPL-2.1+ GPL-2+
 }
 
 # libsmbclient causes build failure when +gpl3 is selected (#46244)
@@ -268,8 +271,7 @@
     depends_lib-append      port:opencore-amr \
                             port:samba3
 
-    license-delete          LGPL-2.1+
-    license-append          GPL-3+
+    license-replace         GPL-2+ GPL-3+
 }
 
 # the build server uses the default variants, and we want distributable binaries
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150711/30e2b52b/attachment.html>