[gtk-osx] Several faad2 fixes

[John Ralls <jralls src gnome org>]

commit d8dbd1ecac0b9b669bce682a0268d7f830f0383c
Author: Philip Chimento <philip chimento gmail com>
Date:   Tue Mar 11 23:43:38 2014 -0700

    Several faad2 fixes
    
    - CVS isn't shipped in OSX Mavericks, so build faad2 from tarball.
      (There hasn't been much activity at all on the CVS repository.)
    - It needs a patch to change AM_CONFIG_HEADER into AC_CONFIG_HEADERS.
    - Update the repository URLs in gtk-osx-gstreamer.modules.

 modulesets-stable/gtk-osx-gstreamer.modules   |    8 +++++---
 modulesets-unstable/gtk-osx-gstreamer.modules |   12 ++++++------
 modulesets/gtk-osx-gstreamer.modules          |   10 +++++-----
 patches/faad2-2.7-ac-config-headers.patch     |   12 ++++++++++++
 patches/patch status                          |    4 ++++
 5 files changed, 32 insertions(+), 14 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-gstreamer.modules b/modulesets-stable/gtk-osx-gstreamer.modules
index 2bf643e..f213371 100644
--- a/modulesets-stable/gtk-osx-gstreamer.modules
+++ b/modulesets-stable/gtk-osx-gstreamer.modules
@@ -7,7 +7,7 @@
   <repository type="tarball" name="liboil"
               href="http://liboil.freedesktop.org/download/"/>
   <repository type="tarball" name="sourceforge"
-              href="http://downloads.sourceforge.net/sourceforge/"/>
+              href="http://downloads.sf.net/p/"/>
   <repository type="tarball" name="entropywave"
              href="http://code.entropywave.com/download/"/>
 
@@ -25,8 +25,10 @@
 
   <autotools id="faad2" autogen-sh="autoreconf"
              autogenargs="-without-bmp --without-xmms --without-drm --without-mpeg4ip">
-    <branch repo="sourceforge" module="faac/faad2-2.7.tar.gz"
-            version="2.7" />
+    <branch repo="sourceforge" version="2.7"
+            module="faac/faad2-src/faad2-2.7/faad2-2.7.tar.bz2">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/faad2-2.7-ac-config-headers.patch"; 
strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="gstreamer" autogenargs="--disable-tests" supports-non-srcdir-builds="no"
diff --git a/modulesets-unstable/gtk-osx-gstreamer.modules b/modulesets-unstable/gtk-osx-gstreamer.modules
index 41969e1..308a674 100644
--- a/modulesets-unstable/gtk-osx-gstreamer.modules
+++ b/modulesets-unstable/gtk-osx-gstreamer.modules
@@ -4,13 +4,10 @@
 <moduleset>
  <repository type="git" name="gstreamer" default="yes"
               href="git://anongit.freedesktop.org/gstreamer/"/>
-  <repository type="tarball" name="sourceforge" 
-              href="http://downloads.sourceforge.net/sourceforge/"; />
+  <repository type="tarball" name="sourceforge"
+              href="http://downloads.sf.net/p/"; />
   <repository type="git" name="liboil"
               href="git://anongit.freedesktop.org/"/>
-  <repository type="cvs" name="faac.sourceforge.net" 
-              cvsroot=":pserver:anonymous faac cvs sourceforge net:/cvsroot/faac/"
-              password=""/>
 
   <!-- The GStreamer project maintains its own moduleset at
        git://anongit.freedesktop.org/gstreamer/jhbuild/. The modules
@@ -24,7 +21,10 @@
 
   <autotools id="faad2" autogen-sh="autoreconf"
              autogenargs="-without-bmp --without-xmms --without-drm --without-mpeg4ip">
-    <branch repo="faac.sourceforge.net" module="faad2"  />
+    <branch repo="sourceforge" version="2.7"
+            module="faac/faad2-src/faad2-2.7/faad2-2.7.tar.bz2">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/faad2-2.7-ac-config-headers.patch"; 
strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="gstreamer" autogenargs="-- --disable-tests" 
diff --git a/modulesets/gtk-osx-gstreamer.modules b/modulesets/gtk-osx-gstreamer.modules
index 142773e..71b6726 100644
--- a/modulesets/gtk-osx-gstreamer.modules
+++ b/modulesets/gtk-osx-gstreamer.modules
@@ -5,12 +5,9 @@
  <repository type="git" name="gstreamer" default="yes"
               href="git://anongit.freedesktop.org/gstreamer/"/>
   <repository type="tarball" name="sourceforge"
-              href="http://downloads.sourceforge.net/sourceforge/"; />
+              href="http://downloads.sf.net/p/"/>
   <repository type="git" name="liboil"
               href="git://anongit.freedesktop.org/"/>
-  <repository type="cvs" name="faac.sourceforge.net"
-              cvsroot=":pserver:anonymous faac cvs sourceforge net:/cvsroot/faac/"
-              password=""/>
 
   <!-- The GStreamer project maintains its own moduleset at
        git://anongit.freedesktop.org/gstreamer/jhbuild/. The modules
@@ -24,7 +21,10 @@
 
   <autotools id="faad2" autogen-sh="autoreconf"
              autogenargs="-without-bmp --without-xmms --without-drm --without-mpeg4ip">
-    <branch repo="faac.sourceforge.net" module="faad2" tag="FAAD2_2_7" />
+    <branch repo="sourceforge" version="2.7"
+            module="faac/faad2-src/faad2-2.7/faad2-2.7.tar.bz2">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/faad2-2.7-ac-config-headers.patch"; 
strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="gstreamer" autogenargs="--disable-tests"
diff --git a/patches/faad2-2.7-ac-config-headers.patch b/patches/faad2-2.7-ac-config-headers.patch
new file mode 100644
index 0000000..4d2b3e5
--- /dev/null
+++ b/patches/faad2-2.7-ac-config-headers.patch
@@ -0,0 +1,12 @@
+diff -Naur faad2-2.7-orig/configure.in faad2-2.7/configure.in
+--- faad2-2.7-orig/configure.in        2014-03-11 23:26:03.000000000 -0700
++++ faad2-2.7/configure.in     2014-03-11 23:26:59.000000000 -0700
+@@ -25,7 +25,7 @@
+ AC_PROG_MAKE_SET
+ AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ AC_ARG_WITH(xmms,[  --with-xmms             compile XMMS-1 plugin],
+            WITHXMMS=$withval, WITHXMMS=no)
diff --git a/patches/patch status b/patches/patch status
index e0e0d0c..ca7e15e 100644
--- a/patches/patch status      
+++ b/patches/patch status      
@@ -58,3 +58,7 @@ dbus:         dbus-install.patch
                dbus-msg-nosignal.patch
 
 gjs:           gjs-Fix-uint-type-in-variable.patch Bug 712242, fixed in master.
+
+faad2:         faad2-2.7-ac-config-headers.patch
+               Reported at https://sourceforge.net/p/faac/bugs/190/ but there hasn't
+               been much activity in the last few years