[arch-commits] Commit in lib32-gstreamer0.10/trunk (PKGBUILD bison3.patch)

[Maxime Gauduin]

    Date: Wednesday, July 2, 2014 @ 11:31:35
  Author: alucryd
Revision: 114617

upgpkg: lib32-gstreamer0.10 0.10.36-3

Added:
  lib32-gstreamer0.10/trunk/bison3.patch
Modified:
  lib32-gstreamer0.10/trunk/PKGBUILD

--------------+
 PKGBUILD     |   41 +++++++++++++++++++++++++----------------
 bison3.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-02 09:12:59 UTC (rev 114616)
+++ PKGBUILD	2014-07-02 09:31:35 UTC (rev 114617)
@@ -4,34 +4,43 @@
 
 pkgname=lib32-gstreamer0.10
 pkgver=0.10.36
-pkgrel=2
-pkgdesc="GStreamer Multimedia Framework"
+pkgrel=3
+pkgdesc='GStreamer Multimedia Framework'
 arch=('x86_64')
 license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
+url='http://gstreamer.freedesktop.org/'
 depends=("${pkgname#*-}" 'lib32-glib2' 'lib32-libxml2')
-makedepends=('gcc-multilib' 'intltool')
-options=('!libtool')
-source=("http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${pkgver}.tar.xz")
-sha256sums=('9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da')
+makedepends=('gcc-multilib' 'git' 'gobject-introspection' 'intltool')
+source=("git://anongit.freedesktop.org/gstreamer-sdk/gstreamer#commit=3ddc31eaa18c3be1613e43430eca78a3e445639e"
+'bison3.patch')
+sha256sums=('SKIP'
+            'ed154e280abf59b24d98a8ab0fe868b449b26aa61f7ae3813fab8ac615fcaefa')
 
+prepare() {
+  cd gstreamer
+
+  patch -Np1 -i ../bison3.patch
+  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac
+}
+
 build() {
-  cd "${srcdir}"/gstreamer-${pkgver}
+  cd gstreamer
 
-# Multilib
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-# Build
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32 --libexecdir=/usr/lib32 --with-package-{name="GStreamer (Archlinux Multilib)",origin="http://www.archlinux.org/"} --disable-{examples,static,tests}
+  NOCONFIGURE=1 ./autogen.sh
+  ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' \
+              --libdir='/usr/lib32' --libexecdir='/usr/lib32' \
+              --with-package-{name="GStreamer (Archlinux Multilib)",origin="http://www.archlinux.org/"} \
+              --disable-{examples,gtk-doc,static,tests}
   make
 }
 
 package() {
-  cd "${srcdir}"/gstreamer-${pkgver}
+  cd gstreamer
 
-# Install
   make DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/{bin,include,share}
 }

Added: bison3.patch
===================================================================
--- bison3.patch	                        (rev 0)
+++ bison3.patch	2014-07-02 09:31:35 UTC (rev 114617)
@@ -0,0 +1,31 @@
+From bd2a01cfe222367493a71f3269f12250c8972db0 Mon Sep 17 00:00:00 2001
+From: Kerrick Staley <kerrick at kerrickstaley.com>
+Date: Wed, 21 Aug 2013 06:59:29 +0000
+Subject: parse: make grammar.y work with Bison 3
+
+YYLEX_PARAM is no longer supported in Bison 3.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=706462
+---
+diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
+index 8a9019c..f533389 100644
+--- a/gst/parse/grammar.y
++++ b/gst/parse/grammar.y
+@@ -26,7 +26,6 @@
+  */
+ 
+ #define YYERROR_VERBOSE 1
+-#define YYLEX_PARAM scanner
+ 
+ #define YYENABLE_NLS 0
+ 
+@@ -659,6 +658,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s);
+ %right '.'
+ %left '!' '='
+ 
++%lex-param { void *scanner }
+ %parse-param { void *scanner }
+ %parse-param { graph_t *graph }
+ %pure-parser
+--
+cgit v0.9.0.2-2-gbebe


Property changes on: lib32-gstreamer0.10/trunk/bison3.patch
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property