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

[devans at macports.org]

Revision: 131260
          https://trac.macports.org/changeset/131260
Author:   devans at macports.org
Date:     2015-01-07 13:32:56 -0800 (Wed, 07 Jan 2015)
Log Message:
-----------
ffmpeg-devel: update to git master as of 20150106, videolan.org no longer supports git snapshots so use github mirror instead, merge X11 frame grabbing changes from r131259.

Revision Links:
--------------
    https://trac.macports.org/changeset/131259

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

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2015-01-07 21:26:04 UTC (rev 131259)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2015-01-07 21:32:56 UTC (rev 131260)
@@ -6,11 +6,12 @@
 PortGroup       muniversal 1.0
 PortGroup       compiler_blacklist_versions 1.0
 PortGroup       active_variants 1.1
+PortGroup       github 1.0
 
+github.setup    FFmpeg FFmpeg ad465e7897
 name            ffmpeg-devel
 conflicts       ffmpeg
-version         20141216
-set git_branch  91ea466551c148bd897706a1b6a168e783761a06
+version         20150106
 license         LGPL-2.1+
 categories      multimedia
 maintainers     devans jeremyhu openmaintainer
@@ -48,11 +49,9 @@
 
 platforms       darwin
 homepage        http://www.ffmpeg.org/
-master_sites    "http://git.videolan.org/gitweb.cgi?p=ffmpeg.git;a=snapshot;h=${git_branch};sf=tgz;dummy="
-dist_subdir     ffmpeg
 
-checksums       rmd160  a688245f5032c6e4c1601da08fdce4629f2f5f5c \
-                sha256  f3d1d977420e3c7a30c9d9617201ecf078d67a93857e9a7269fb440771c0a751
+checksums       rmd160  ada1cf42f9749f350ae8d9601d0dc03cc46c1d8f \
+                sha256  e2eab866a7c65b9f78039a4b92d7d721111bb6526e3e907f2dd3a31fc506e317
 
 depends_build   port:pkgconfig \
                 port:gmake \
@@ -80,13 +79,6 @@
                 port:xz \
                 port:zlib
 
-if {[string length "${git_branch}"] >= 7} {
-    set filetag [string range "${git_branch}" 0 6]
-    distname ffmpeg-${filetag}
-} else {
-    error "git branch hash must be at least 7 characters long."
-}
-
 patchfiles      patch-libdc1394.diff \
                 patch-shlibdir.diff
 
@@ -214,11 +206,19 @@
     }
 }
 
-# this dummy variant is used to mark whether ffmpeg is built with
-# libsdl +x11 and hence has a binary dependency on xorg-libX11
-# or libsdl -x11 and does not
+variant x11 {
+#   
+# enable x11grab_xcb input device
+#
+    depends_lib-append      port:xorg-libxcb \
+                            port:xorg-libXext \
+                            port:xorg-libXfixes
 
-variant x11 {}
+    configure.args-delete   --disable-libxcb \
+                            --disable-libxcb-shm \
+                            --disable-libxcb-xfixes \
+}
+
 default_variants +x11
 
 if {[variant_isset x11]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150107/7ddd5847/attachment.html>