[124863] trunk/dports/multimedia/ffmpeg-devel

29 Aug 2014

Revision: 124863
          https://trac.macports.org/changeset/124863
Author:   devans@macports.org
Date:     2014-08-29 13:35:02 -0700 (Fri, 29 Aug 2014)
Log Message:
-----------
ffmpeg-devel: update to recent git master, add +x11 variant to indicate binary dependency on libX11 when building with libsdl +x11, ensures appropriate rebuilding when -x11 is asserted.

Modified Paths:
--------------
    trunk/dports/multimedia/ffmpeg-devel/Portfile
    trunk/dports/multimedia/ffmpeg-devel/files/patch-libdc1394.diff

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

--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2014-08-29 20:34:07 UTC (rev 124862)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2014-08-29 20:35:02 UTC (rev 124863)
@@ -1,15 +1,16 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup xcodeversion 1.0
-PortGroup muniversal 1.0
-PortGroup compiler_blacklist_versions 1.0
+PortSystem      1.0
+PortGroup       xcodeversion 1.0
+PortGroup       muniversal 1.0
+PortGroup       compiler_blacklist_versions 1.0
+PortGroup       active_variants 1.1
 
 name            ffmpeg-devel
 conflicts       ffmpeg
-version         20140818
-set git_branch  90b2f3136778311fb5e097b8ee1f527518231c23
+version         20140828
+set git_branch  9b8eedd736ea443c4829baaca1ede4e146ebc024
 license         LGPL-2.1+
 categories      multimedia
 maintainers     devans jeremyhu openmaintainer
@@ -50,8 +51,8 @@
 master_sites    "http://git.videolan.org/gitweb.cgi?p=ffmpeg.git;a=snapshot;h=${git_branch};sf=tgz;dummy="
 dist_subdir     ffmpeg
 
-checksums       rmd160  5bb9a8153e0184b11c8adb19b2c2699bfeaf82bc \
-                sha256  f3754923f74fd3046949745f27597bda071bc42faf8ed4a2a887c403a4b22e29
+checksums       rmd160  35873730831b6eabb5e9e8d36e249c77474ed2be \
+                sha256  5999a6b4be3fa1a3458940e44930ec5d8ff44cb026084a6ffa2f289e1a71d616
 
 depends_build   port:pkgconfig \
                 port:gmake \
@@ -206,6 +207,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 {}
+default_variants +x11
+
+if {[variant_isset x11]} {
+    require_active_variants libsdl x11
+} else {
+    require_active_variants libsdl "" x11
+}
+
 variant libdc1394 description {Enable IIDC-1394 frame grabbing using libdc1394 (experimental)} {
     depends_lib-append port:libdc1394
     configure.args-append --enable-libdc1394

Modified: trunk/dports/multimedia/ffmpeg-devel/files/patch-libdc1394.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/files/patch-libdc1394.diff	2014-08-29 20:34:07 UTC (rev 124862)
+++ trunk/dports/multimedia/ffmpeg-devel/files/patch-libdc1394.diff	2014-08-29 20:35:02 UTC (rev 124863)
@@ -1,6 +1,6 @@
---- configure.orig	2014-08-18 03:32:57.000000000 -0700
-+++ configure	2014-08-18 04:11:41.000000000 -0700
-@@ -4881,9 +4881,12 @@
+--- configure.orig	2014-08-29 05:00:58.000000000 -0700
++++ configure	2014-08-29 11:48:58.000000000 -0700
+@@ -4890,9 +4890,12 @@
  fi
  
  # libdc1394 check

    

devans＠macports.org

tags

participants (1)