[arch-commits] Commit in gstreamer0.10-ugly/trunk (PKGBUILD opencore-amr.patch)

[Jan de Groot]

    Date: Monday, March 12, 2012 @ 13:04:23
  Author: jgc
Revision: 153260

upgpkg: gstreamer0.10-ugly 0.10.19-1

Update to 0.10.19, fix build with opencore-amr 0.1.3

Added:
  gstreamer0.10-ugly/trunk/opencore-amr.patch
Modified:
  gstreamer0.10-ugly/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   20 ++++++++++++++------
 opencore-amr.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-12 16:05:31 UTC (rev 153259)
+++ PKGBUILD	2012-03-12 17:04:23 UTC (rev 153260)
@@ -3,18 +3,21 @@
 
 pkgbase=gstreamer0.10-ugly
 pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
-pkgver=0.10.18
-pkgrel=6
+pkgver=0.10.19
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
+makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
 url="http://gstreamer.freedesktop.org/"
 options=(!libtool)
-source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2)
-md5sums=('04a7009a4efea2844075949c111f5e4d')
+source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz
+        opencore-amr.patch)
+md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c'
+         'd8feb6c99bfaff8be6b2c48ea4e98e47')
 
 build() {
   cd "${srcdir}/gst-plugins-ugly-${pkgver}"
+  patch -Np0 -i "${srcdir}/opencore-amr.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
     --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
@@ -23,6 +26,11 @@
   sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile
 }
 
+check() {
+  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
+  make check
+}
+
 package_gstreamer0.10-ugly() {
   pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries"
   depends=('gstreamer0.10-base>=0.10.34')
@@ -33,7 +41,7 @@
 
 package_gstreamer0.10-ugly-plugins() {
   pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
-  depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
+  depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
   groups=('gstreamer0.10-plugins')
   replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
   conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')

Added: opencore-amr.patch
===================================================================
--- opencore-amr.patch	                        (rev 0)
+++ opencore-amr.patch	2012-03-12 17:04:23 UTC (rev 153260)
@@ -0,0 +1,35 @@
+--- ext/amrnb/amrnbdec.h.orig	2012-03-12 16:49:14.417405139 +0000
++++ ext/amrnb/amrnbdec.h	2012-03-12 16:49:35.393899419 +0000
+@@ -22,7 +22,7 @@
+ 
+ #include <gst/gst.h>
+ #include <gst/audio/gstaudiodecoder.h>
+-#include <interf_dec.h>
++#include <opencore-amrnb/interf_dec.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- ext/amrnb/amrnbenc.h.orig	2012-03-12 16:49:23.833996062 +0000
++++ ext/amrnb/amrnbenc.h	2012-03-12 16:49:46.597141876 +0000
+@@ -21,7 +21,7 @@
+ #define __GST_AMRNBENC_H__
+ 
+ #include <gst/gst.h>
+-#include <interf_enc.h>
++#include <opencore-amrnb/interf_enc.h>
+ #include <gst/audio/gstaudioencoder.h>
+ 
+ G_BEGIN_DECLS
+--- ext/amrwbdec/amrwbdec.h.orig	2012-03-12 16:47:48.658100992 +0000
++++ ext/amrwbdec/amrwbdec.h	2012-03-12 16:48:12.177910733 +0000
+@@ -22,8 +22,8 @@
+ 
+ #include <gst/gst.h>
+ #include <gst/audio/gstaudiodecoder.h>
+-#include <dec_if.h>
+-#include <if_rom.h>
++#include <opencore-amrwb/dec_if.h>
++#include <opencore-amrwb/if_rom.h>
+ 
+ G_BEGIN_DECLS
+