GNOME.org
 

[frogr] Re-enable GStreamer (0.10) support for OS X bundles of frogr

commit 9b24123754d1636f519ba83da0598105cbc39b3c
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Fri May 30 23:52:21 2014 +0100

    Re-enable GStreamer (0.10) support for OS X bundles of frogr

 osx/frogr.bundle                                   |    8 ++
 osx/jhbuild/frogr.modules                          |   97 ++++++++++++++++++++
 .../gstreamer-fix-includes-in-gstdatetime.patch    |   12 +++
 .../liboil-use-ac-config-headers-macro.patch       |   11 ++
 .../libtheora-dont-use-fforce-addr-cflag.patch     |   11 ++
 .../libtheora-use-ac-config-headers-macro.patch    |   11 ++
 6 files changed, 150 insertions(+), 0 deletions(-)
---
diff --git a/osx/frogr.bundle b/osx/frogr.bundle
index 71fac55..278c8c2 100644
--- a/osx/frogr.bundle
+++ b/osx/frogr.bundle
@@ -31,6 +31,14 @@
     ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so
   </binary>
 
+  <!-- Gstreamer plugins and scanner -->
+  <binary>
+    ${prefix}/lib/gstreamer-0.10/*.so
+  </binary>
+  <binary>
+    ${prefix}/libexec/gstreamer-0.10/gst-plugin-scanner
+  </binary>
+
   <!-- Translation filenames, one for each program or library -->
   <translations name="gtk30">
     ${prefix}/share/locale
diff --git a/osx/jhbuild/frogr.modules b/osx/jhbuild/frogr.modules
index 625bba9..d7174bf 100644
--- a/osx/jhbuild/frogr.modules
+++ b/osx/jhbuild/frogr.modules
@@ -7,6 +7,9 @@
   <repository type="git" name="git.gnome.org" href="git://git.gnome.org/"/>
   <repository type="tarball" name="sourceforge.net" href="http://sourceforge.net/projects/"/>
   <repository type="tarball" name="itstool.org" href="http://files.itstool.org/itstool/"/>
+  <repository type="tarball" name="xiph.org" href="http://downloads.xiph.org/releases/"/>
+  <repository type="tarball" name="gstreamer" href="http://gstreamer.freedesktop.org/src/"/>
+  <repository type="tarball" name="liboil" href="http://liboil.freedesktop.org/download/"/>
 
   <autotools id="libexif" autogen-sh='configure'>
     <branch module="libexif/files/libexif/0.6.21/libexif-0.6.21.tar.gz" version="0.6.21"
@@ -69,6 +72,90 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gstreamer" autogenargs="--disable-tests --disable-introspection" 
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">
+      <patch 
file="http://git.gnome.org/browse/frogr/plain/osx/jhbuild/patches/gstreamer-configure-flex.patch"; strip="1"/>
+      <patch 
file="http://git.gnome.org/browse/frogr/plain/osx/jhbuild/patches/gstreamer-fix-includes-in-gstdatetime.patch";
 strip="1"/>
+    </branch>
+    <after>
+      <dep package="glib"/>
+    </after>
+  </autotools>
+
+  <autotools id="libogg">
+    <branch module="ogg/libogg-1.3.0.tar.gz" version="1.3.0"
+            repo="xiph.org">
+    </branch>
+  </autotools>
+
+  <autotools id="libtheora">
+    <branch module="theora/libtheora-1.1.1.tar.bz2" version="1.1.1"
+            repo="xiph.org">
+      <patch 
file="http://git.gnome.org/browse/frogr/plain/osx/jhbuild/patches/libtheora-use-ac-config-headers-macro.patch";
 strip="1"/>
+      <patch 
file="http://git.gnome.org/browse/frogr/plain/osx/jhbuild/patches/libtheora-dont-use-fforce-addr-cflag.patch"; 
strip="1"/>
+    </branch>
+  </autotools>
+
+  <autotools id="libvorbis">
+    <branch module="vorbis/libvorbis-1.3.3.tar.gz" version="1.3.3"
+            repo="xiph.org">
+    </branch>
+  </autotools>
+
+  <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"'>
+    <branch repo="liboil" module="liboil-0.3.17.tar.gz" version="0.3.17">
+      <patch 
file="http://git.gnome.org/browse/frogr/plain/osx/jhbuild/patches/liboil-use-ac-config-headers-macro.patch"; 
strip="1"/>
+    </branch>
+  </autotools>
+
+  <autotools id="gst-plugins-base" autogenargs="-- --disable-tests --disable-x --disable-xvideo 
--disable-introspection" 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"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="liboil"/>
+    </dependencies>
+    <after>
+    </after>
+  </autotools>
+
+  <autotools id="gst-ffmpeg" autogen-sh="configure">
+    <branch module="gst-ffmpeg/gst-ffmpeg-0.10.13.tar.gz" version="0.10.13"
+            repo="gstreamer">
+    </branch>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-good"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-bad" autogen-sh="configure">
+    <branch module="gst-plugins-bad/gst-plugins-bad-0.10.22.tar.gz" version="0.10.22"
+            repo="gstreamer">
+    </branch>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-good"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-ugly" autogen-sh="configure">
+    <branch module="gst-plugins-ugly/gst-plugins-ugly-0.10.18.tar.gz" version="0.10.18"
+            repo="gstreamer">
+    </branch>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-bad"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="frogr">
     <branch repo="git.gnome.org" module="frogr"/>
     <dependencies>
@@ -101,6 +188,16 @@
       <dep package="yelp-xsl"/>
       <dep package="yelp-tools"/>
       <dep package="shared-mime-info"/>
+      <dep package="gstreamer"/>
+      <dep package="libogg"/>
+      <dep package="libvorbis"/>
+      <dep package="libtheora"/>
+      <dep package="liborc"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-good"/>
+      <dep package="gst-ffmpeg"/>
+      <dep package="gst-plugins-bad"/>
+      <dep package="gst-plugins-ugly"/>
     </dependencies>
   </autotools>
 
diff --git a/osx/jhbuild/patches/gstreamer-fix-includes-in-gstdatetime.patch 
b/osx/jhbuild/patches/gstreamer-fix-includes-in-gstdatetime.patch
new file mode 100644
index 0000000..8c3b4cd
--- /dev/null
+++ b/osx/jhbuild/patches/gstreamer-fix-includes-in-gstdatetime.patch
@@ -0,0 +1,12 @@
+--- a/gst/gstdatetime.c        2014-05-30 21:36:32.000000000 +0100
++++ b/gst/gstdatetime.c        2014-05-30 21:36:46.000000000 +0100
+@@ -21,8 +21,8 @@
+ #include "config.h"
+ #endif
+ 
+-#include "glib-compat-private.h"
+ #include "gst_private.h"
++#include "glib-compat-private.h"
+ #include "gstdatetime.h"
+ #include <glib.h>
+ #include <math.h>
diff --git a/osx/jhbuild/patches/liboil-use-ac-config-headers-macro.patch 
b/osx/jhbuild/patches/liboil-use-ac-config-headers-macro.patch
new file mode 100644
index 0000000..09537db
--- /dev/null
+++ b/osx/jhbuild/patches/liboil-use-ac-config-headers-macro.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac     2014-06-04 23:41:48.000000000 +0100
++++ b/configure.ac     2014-06-04 23:39:49.000000000 +0100
+@@ -11,7 +11,7 @@
+ #LIBOIL_MAJORMINOR=0.3
+ #AC_SUBST(LIBOIL_MAJORMINOR)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ dnl CURRENT, REVISION, AGE
+ dnl - library source changed -> increment REVISION
diff --git a/osx/jhbuild/patches/libtheora-dont-use-fforce-addr-cflag.patch 
b/osx/jhbuild/patches/libtheora-dont-use-fforce-addr-cflag.patch
new file mode 100644
index 0000000..62cd6e2
--- /dev/null
+++ b/osx/jhbuild/patches/libtheora-dont-use-fforce-addr-cflag.patch
@@ -0,0 +1,11 @@
+--- libtheora-1.1.1/configure.ac       2014-06-04 23:27:25.000000000 +0100
++++ libtheora-1.1.1/configure.ac       2014-06-04 23:29:04.000000000 +0100
+@@ -168,7 +168,7 @@
+         case $host in 
+         *)
+                 DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
+-                CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions 
-funroll-loops"
++                CFLAGS="-Wall -Wno-parentheses -O3 -fomit-frame-pointer -finline-functions -funroll-loops"
+                 PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
+         esac
+ fi
diff --git a/osx/jhbuild/patches/libtheora-use-ac-config-headers-macro.patch 
b/osx/jhbuild/patches/libtheora-use-ac-config-headers-macro.patch
new file mode 100644
index 0000000..986bbcb
--- /dev/null
+++ b/osx/jhbuild/patches/libtheora-use-ac-config-headers-macro.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac     2014-06-04 23:27:25.000000000 +0100
++++ b/configure.ac     2014-06-04 23:27:36.000000000 +0100
+@@ -9,7 +9,7 @@
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+ 
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_SRCDIR([lib/fdct.c])
+ AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]