[138547] trunk/dports/multimedia/ffmpeg-devel/Portfile

[devans at macports.org]

Revision: 138547
          https://trac.macports.org/changeset/138547
Author:   devans at macports.org
Date:     2015-07-11 15:25:48 -0700 (Sat, 11 Jul 2015)
Log Message:
-----------
ffmpeg-devel: add x265 (HEVC) video support, use license-replace to fix licensing for +gpl2/+gpl3, notes, update to git master as of 20150711.

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

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2015-07-11 22:20:56 UTC (rev 138546)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2015-07-11 22:25:48 UTC (rev 138547)
@@ -8,10 +8,10 @@
 PortGroup       active_variants 1.1
 PortGroup       github 1.0
 
-github.setup    FFmpeg FFmpeg 8575d960fe
+github.setup    FFmpeg FFmpeg f8db81074a
 name            ffmpeg-devel
 conflicts       ffmpeg
-version         20150622
+version         20150711
 license         LGPL-2.1+
 categories      multimedia
 maintainers     devans jeremyhu openmaintainer
@@ -50,8 +50,8 @@
 platforms       darwin
 homepage        http://www.ffmpeg.org/
 
-checksums       rmd160  8e18793e0083fd816310285498c26b20bac3bd87 \
-                sha256  ee08c73661287a2a135a9fe1a0a399620ebf36c15426d5c9c4e37d1fd0f272ad
+checksums       rmd160  4c2d11ca4c7dc14396859bdbb578adaf0f0f2013 \
+                sha256  627f1d4faedc371e93cec5cbfe5237ae282c06cf42979ffedc1661ca9d10697c
 
 depends_build   port:pkgconfig \
                 port:gmake \
@@ -208,7 +208,7 @@
 }
 
 variant x11 {
-#   
+#
 # enable x11grab_xcb input device
 #
     depends_lib-append      port:xorg-libxcb \
@@ -249,11 +249,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+
 }
 
 variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+} {
@@ -265,8 +267,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
@@ -313,6 +314,7 @@
 *******      postproc
 *******      libsambaclient
 *******      libx264
+*******      libx265
 *******      libxvid
 *******      opencore-amr
 *******
@@ -331,6 +333,7 @@
 *******
 *******      postproc
 *******      libx264
+*******      libx265
 *******      libxvid
 *******
 ******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150711/f784e364/attachment.html>