[arch-commits] Commit in gstreamer0.10/trunk (PKGBUILD bison3.patch)
Jan de Groot
jgc at nymeria.archlinux.org
Tue Dec 10 10:18:28 UTC 2013
Date: Tuesday, December 10, 2013 @ 11:18:28
Author: jgc
Revision: 201379
upgpkg: gstreamer0.10 0.10.36-3
Update to latest branch snapshot, add patch to compile with bison 3
Added:
gstreamer0.10/trunk/bison3.patch
Modified:
gstreamer0.10/trunk/PKGBUILD
--------------+
PKGBUILD | 22 ++++++++++++++--------
bison3.patch | 31 +++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-12-10 10:09:05 UTC (rev 201378)
+++ PKGBUILD 2013-12-10 10:18:28 UTC (rev 201379)
@@ -3,7 +3,7 @@
pkgname=gstreamer0.10
pkgver=0.10.36
-pkgrel=2
+pkgrel=3
pkgdesc="GStreamer Multimedia Framework"
arch=('i686' 'x86_64')
license=('LGPL')
@@ -11,15 +11,21 @@
depends=('libxml2' 'glib2')
optdepends=('sh: feedback script')
makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection' 'git')
-source=("git://anongit.freedesktop.org/gstreamer-sdk/gstreamer#commit=ce96cff8e2bf1772dc330387fa98e94f187fc2ab"
- tests-remove-silly-test_fail_abstract_new-check.patch)
+source=("git://anongit.freedesktop.org/gstreamer-sdk/gstreamer#commit=3ddc31eaa18c3be1613e43430eca78a3e445639e"
+ tests-remove-silly-test_fail_abstract_new-check.patch
+ bison3.patch)
sha256sums=('SKIP'
- 'd3d3f4f04453831fdb4244bfe174a38c4e6f9f4da5c8c9050dcfa1a6097aad52')
+ 'd3d3f4f04453831fdb4244bfe174a38c4e6f9f4da5c8c9050dcfa1a6097aad52'
+ 'ed154e280abf59b24d98a8ab0fe868b449b26aa61f7ae3813fab8ac615fcaefa')
-build() {
- cd "${srcdir}/gstreamer"
+prepare() {
+ cd gstreamer
patch -Np1 -i ../tests-remove-silly-test_fail_abstract_new-check.patch
+ patch -Np1 -i ../bison3.patch
sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac
+}
+build() {
+ cd gstreamer
NOCONFIGURE=1 ./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
--with-package-name="GStreamer (Archlinux)" \
@@ -29,12 +35,12 @@
}
check() {
- cd "${srcdir}/gstreamer"
+ cd gstreamer
make check
}
package() {
- cd "${srcdir}/gstreamer"
+ cd gstreamer
make DESTDIR="${pkgdir}" install
#Remove unversioned gst-* binaries to get rid of conflicts
Added: bison3.patch
===================================================================
--- bison3.patch (rev 0)
+++ bison3.patch 2013-12-10 10:18:28 UTC (rev 201379)
@@ -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
More information about the arch-commits
mailing list