GNOME.org
 

[gtk-osx] Upgrade GStreamer versions

commit 85371ea6b2082bcc792d73c1db4372b4b9877cda
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Oct 5 23:29:26 2014 -0700

    Upgrade GStreamer versions
    
    This upgrades all GStreamer modules in modulesets-stable to the latest
    releases on the stable branches, and all in modulesets to the latest
    stable branches.

 modulesets-stable/gtk-osx-gstreamer.modules        |   38 ++++++++++---------
 modulesets/gtk-osx-gstreamer.modules               |   19 +++++-----
 .../gstreamer-680428-Fix-flex-version-check.patch  |   24 ++++++++++++
 patches/patch status                               |    1 +
 4 files changed, 55 insertions(+), 27 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-gstreamer.modules b/modulesets-stable/gtk-osx-gstreamer.modules
index 756b58b..317d8f8 100644
--- a/modulesets-stable/gtk-osx-gstreamer.modules
+++ b/modulesets-stable/gtk-osx-gstreamer.modules
@@ -4,12 +4,12 @@
 <moduleset>
   <repository type="tarball" name="ftp.gnome.org" default="yes"
               href="http://ftp.gnome.org/pub/GNOME/sources/"/>
+  <repository type="tarball" name="gstreamer"
+              href="http://gstreamer.freedesktop.org/src/"/>
   <repository type="tarball" name="liboil"
               href="http://liboil.freedesktop.org/download/"/>
   <repository type="tarball" name="sourceforge"
               href="http://iweb.dl.sf.net/project/"/>
-  <repository type="tarball" name="entropywave"
-             href="http://code.entropywave.com/download/"/>
 
   <autotools id="liboil" autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/configure --prefix 
%(prefix)s --libdir %(libdir)s %(autogenargs)s"
             makeargs=' CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE"'>
@@ -19,8 +19,7 @@
   </autotools>
 
   <autotools id="liborc" autogen-sh="configure">
-    <branch module="orc/orc-0.4.16.tar.gz"
-           repo="entropywave" version="0.4.16"/>
+    <branch repo="gstreamer" module="orc/orc-0.4.22.tar.xz" version="0.4.22"/>
   </autotools>
 
   <autotools id="faad2" autogen-sh="autoreconf"
@@ -33,10 +32,11 @@
 
   <autotools id="gstreamer" autogenargs="--disable-tests" supports-non-srcdir-builds="no"
     makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gstreamer/0.10/gstreamer-0.10.35.tar.bz2" version="0.10.35"
-            hash="sha256:817bfea2cd46e2487b97e2ed9218f0299b32a3de1e5e80b4c7868d17e9089786">
+    <branch module="gstreamer/0.10/gstreamer-0.10.36.tar.xz" version="0.10.36"
+            hash="sha256:9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-fix-includes-in-gstdatetime.patch"; 
strip="1"/>
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-706462-Make-grammar-y-work-with-Bison-3.patch";
 strip="1"/>
+      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-680428-Fix-flex-version-check.patch"; 
strip="1"/>
     </branch>
     <after>
       <dep package="glib"/>
@@ -45,20 +45,19 @@
 
   <autotools id="gstreamer-1.0" autogenargs="--disable-tests" supports-non-srcdir-builds="no"
     makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gstreamer/1.0/gstreamer-1.0.2.tar.xz" version="1.0.2"
-            hash="sha256:10c59112bb01a274eb33950300da13d25fd23a7494781bf1b2328372fdb6ee06">
-      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-fix-includes-in-gstdatetime.patch"; 
strip="1"/>
+    <branch module="gstreamer/1.4/gstreamer-1.4.3.tar.xz" version="1.4.3"
+            hash="sha256:11f155784d28b85a12b50d2fc8f91c6b75d9ca325cc76aaffba1a58d4c9549c9">
     </branch>
     <after>
       <dep package="glib"/>
     </after>
   </autotools>
 
-<!-- This doesn't build: see https://bugzilla.gnome.org/show_bug.cgi?id=660302-->
   <autotools id="gst-plugins-base" autogenargs="--disable-tests --disable-x --disable-xvideo" 
supports-non-srcdir-builds="no"
     makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gst-plugins-base/0.10/gst-plugins-base-0.10.35.tar.bz2"
-            version="0.10.15" 
hash="sha256:cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103"/>
+    <branch module="gst-plugins-base/0.10/gst-plugins-base-0.10.36.tar.xz"
+            version="0.10.36"
+            hash="sha256:1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="liboil"/>
@@ -69,8 +68,9 @@
 
   <autotools id="gst-plugins-base-1.0" autogenargs="--disable-tests --disable-x --disable-xvideo" 
supports-non-srcdir-builds="no"
     makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gst-plugins-base/1.0/gst-plugins-base-1.0.2.tar.xz"
-            version="1.0.2" hash="sha256:7ce2c4462ff89f62a82b4503a3788ce2e5077f886e535796fecc223397acf78d"/>
+    <branch module="gst-plugins-base/1.4/gst-plugins-base-1.4.3.tar.xz"
+            version="1.4.3"
+            hash="sha256:f7b4d2b3ba2bcac485896e2c1c36459cb091ebe8b49e91635c27d40f66792d9d"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="liborc"/>
@@ -81,8 +81,9 @@
 
   <autotools id="gst-plugins-good" autogenargs="--disable-tests --disable-x --disable-xvideo 
--disable-osx-video" supports-non-srcdir-builds="no"
     makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gst-plugins-good/0.10/gst-plugins-good-0.10.30.tar.bz2"
-            version="0.10.30" 
hash="sha256:b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6"/>
+    <branch module="gst-plugins-good/0.10/gst-plugins-good-0.10.31.tar.xz"
+            version="0.10.31"
+            hash="sha256:77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -91,8 +92,9 @@
 
   <autotools id="gst-plugins-good-1.0" autogenargs="--disable-tests --disable-x --disable-xvideo 
--disable-osx-video" supports-non-srcdir-builds="no"
     makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gst-plugins-good/1.0/gst-plugins-good-1.0.2.tar.xz"
-            version="1.0.2" hash="sha256:34762dbd1462dd31b6ca2a01cf6477843c9dc7112e5819cc9d6dd7396b79244c"/>
+    <branch module="gst-plugins-good/1.4/gst-plugins-good-1.4.3.tar.xz"
+            version="1.4.3"
+            hash="sha256:5876a74402f2a24d1d3ae9163c32466bdc7a565696dddeef65e6a9a93efc5537"/>
     <dependencies>
       <dep package="gstreamer-1.0"/>
       <dep package="gst-plugins-base-1.0"/>
diff --git a/modulesets/gtk-osx-gstreamer.modules b/modulesets/gtk-osx-gstreamer.modules
index 802287e..c9408b3 100644
--- a/modulesets/gtk-osx-gstreamer.modules
+++ b/modulesets/gtk-osx-gstreamer.modules
@@ -49,9 +49,7 @@
    <autotools id="gstreamer-1.0" autogenargs="--disable-tests"
              supports-non-srcdir-builds="no"
             makeargs="ERROR_CFLAGS=" >
-    <branch module="gstreamer" revision="1.0" checkoutdir="gstreamer-1.0">
-      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-fix-includes-in-gstdatetime.patch"; 
strip="1"/>
-    </branch>
+    <branch module="gstreamer" revision="1.4" checkoutdir="gstreamer-1.0"/>
     <after>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -73,7 +71,7 @@
   <autotools id="gst-plugins-base-1.0" supports-non-srcdir-builds="no"
              autogenargs="--disable-tests --disable-x --disable-xvideo"
              makeargs="ERROR_CFLAGS=" >
-    <branch module="gst-plugins-base" revision="1.0"
+    <branch module="gst-plugins-base" revision="1.4"
             checkoutdir="gst-plugins-base-1.0"/>
     <dependencies>
       <dep package="gstreamer-1.0"/>
@@ -96,7 +94,7 @@
   <autotools id="gst-plugins-good-1.0" supports-non-srcdir-builds="no"
             autogenargs="--disable-tests --disable-x --disable-xvideo --disable-osx-video"
              makeargs="ERROR_CFLAGS=" >
-    <branch module="gst-plugins-good" revision="1.0"
+    <branch module="gst-plugins-good" revision="1.4"
             checkoutdir="gst-plugins-good-1.0"/>
     <dependencies>
       <dep package="gstreamer-1.0"/>
@@ -115,7 +113,7 @@
 
   <autotools id="gst-plugins-ugly-1.0" autogenargs="--disable-tests"
             supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS=" >
-    <branch module="gst-plugins-ugly" revision="1.0"
+    <branch module="gst-plugins-ugly" revision="1.4"
             checkoutdir="gst-plugins-ugly-1.0"/>
     <dependencies>
       <dep package="gstreamer-1.0"/>
@@ -135,7 +133,7 @@
 
   <autotools id="gst-plugins-bad-1.0" autogenargs="--disable-tests --disable-x --disable-xvid"
             supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS=" >
-    <branch module="gst-plugins-bad" revision="1.0"
+    <branch module="gst-plugins-bad" revision="1.4"
             checkoutdir="gst-plugins-bad-1.0"/>
     <dependencies>
       <dep package="gstreamer-1.0"/>
@@ -154,9 +152,12 @@
     </dependencies>
   </autotools>
 
+  <!-- disable-yasm: gst-libav's version of libav (10.5) on the 1.4 branch
+  requires yasm 0.8.0 or nasm 2.0.3; OSX 10.9 has nasm 0.98.40. (Oddly, the
+  version of libav on master (10.3) does not.) -->
   <autotools id="gst-libav" supports-non-srcdir-builds="no"
-             autogenargs="--disable-tests --disable-mmx">
-    <branch module="gst-libav" revision="1.0"/>
+             autogenargs="--disable-tests --disable-mmx --with-libav-extra-configure='--disable-yasm'">
+    <branch module="gst-libav" revision="1.4"/>
     <dependencies>
       <dep package="gstreamer-1.0"/>
       <dep package="gst-plugins-base-1.0"/>
diff --git a/patches/gstreamer-680428-Fix-flex-version-check.patch 
b/patches/gstreamer-680428-Fix-flex-version-check.patch
new file mode 100644
index 0000000..1b0e34e
--- /dev/null
+++ b/patches/gstreamer-680428-Fix-flex-version-check.patch
@@ -0,0 +1,24 @@
+diff -Naur gstreamer-0.10.36-orig/common/m4/gst-parser.m4 gstreamer-0.10.36/common/m4/gst-parser.m4
+--- gstreamer-0.10.36-orig/common/m4/gst-parser.m4     2014-10-05 21:03:23.000000000 -0700
++++ gstreamer-0.10.36/common/m4/gst-parser.m4  2014-10-05 21:04:42.000000000 -0700
+@@ -34,7 +34,7 @@
+   dnl we need version >= 2.5.31 for the reentrancy support
+   dnl in the parser.
+   flex_min_version=2.5.31
+-  flex_version=`$FLEX_PATH --version | head -n 1 | sed 's/^.* //' | sed 's/[[a-zA-Z]]*$//' | cut -d' ' -f1`
++  flex_version=`$FLEX_PATH --version | head -n 1 | awk '{print $2}'`
+   AC_MSG_CHECKING([flex version $flex_version >= $flex_min_version])
+   if perl -w <<EOF
+     (\$min_version_major, \$min_version_minor, \$min_version_micro ) = "$flex_min_version" =~ 
/(\d+)\.(\d+)\.(\d+)/;
+diff -Naur gstreamer-0.10.36-orig/configure gstreamer-0.10.36/configure
+--- gstreamer-0.10.36-orig/configure   2014-10-05 21:03:23.000000000 -0700
++++ gstreamer-0.10.36/configure        2014-10-05 21:07:24.000000000 -0700
+@@ -21304,7 +21304,7 @@
+   fi
+ 
+         flex_min_version=2.5.31
+-  flex_version=`$FLEX_PATH --version | head -n 1 | sed 's/^.* //' | sed 's/[a-zA-Z]*$//' | cut -d' ' -f1`
++  flex_version=`$FLEX_PATH --version | head -n 1 | awk '{print $2}'`
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking flex version $flex_version >= $flex_min_version" >&5
+ $as_echo_n "checking flex version $flex_version >= $flex_min_version... " >&6; }
+   if perl -w <<EOF
diff --git a/patches/patch status b/patches/patch status
index eb25a17..c22041b 100644
--- a/patches/patch status      
+++ b/patches/patch status      
@@ -64,5 +64,6 @@ faad2:                faad2-2.7-ac-config-headers.patch
                been much activity in the last few years
 
 gstreamer:      gstreamer-fix-includes-in-gst-datetime.patch
+                gstreamer-680428-Fix-flex-version-check.patch
                 gstreamer-706462-Make-grammar-y-work-with-Bison-3.patch
                 All fixed on 0.10 branch, only needed for modulesets-stable.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]