From 013678718cd795ce9f67712104d3e867f2f3d180 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 15 Dec 2014 20:51:10 +0000 Subject: gstreamer0.10: update 0.10.36-4 --- abs/extra/community/gstreamer0.10/PKGBUILD | 33 +++++++----- abs/extra/community/gstreamer0.10/bison3.patch | 31 +++++++++++ ...remove-silly-test_fail_abstract_new-check.patch | 60 ++++++++++++++++++++++ 3 files changed, 112 insertions(+), 12 deletions(-) create mode 100644 abs/extra/community/gstreamer0.10/bison3.patch create mode 100644 abs/extra/community/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch diff --git a/abs/extra/community/gstreamer0.10/PKGBUILD b/abs/extra/community/gstreamer0.10/PKGBUILD index 07299a4..d856335 100644 --- a/abs/extra/community/gstreamer0.10/PKGBUILD +++ b/abs/extra/community/gstreamer0.10/PKGBUILD @@ -1,36 +1,45 @@ -# $Id: PKGBUILD 153252 2012-03-12 14:53:39Z jgc $ +# $Id$ # Maintainer: Jan de Groot pkgname=gstreamer0.10 pkgver=0.10.36 -pkgrel=1 +pkgrel=4 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64') license=('LGPL') -url="http://gstreamer.freedesktop.org/" +url="http://gstreamer.com" depends=('libxml2' 'glib2') -optdepends=('sh: feedback script') -makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') -options=('!libtool') -source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -md5sums=('15389c73e091b1dda915279c388b9cb2') +makedepends=('intltool' 'pkgconfig' 'gobject-introspection' 'git') +source=("git://anongit.freedesktop.org/gstreamer-sdk/gstreamer#commit=3ddc31eaa18c3be1613e43430eca78a3e445639e" + tests-remove-silly-test_fail_abstract_new-check.patch + bison3.patch) +sha256sums=('SKIP' + 'd3d3f4f04453831fdb4244bfe174a38c4e6f9f4da5c8c9050dcfa1a6097aad52' + 'ed154e280abf59b24d98a8ab0fe868b449b26aa61f7ae3813fab8ac615fcaefa') +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 "${srcdir}/gstreamer-${pkgver}" + cd gstreamer + NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ --with-package-name="GStreamer (Archlinux)" \ --with-package-origin="http://www.archlinux.org/" \ - --enable-gtk-doc --disable-static + --disable-gtk-doc --disable-static make } check() { - cd "${srcdir}/gstreamer-${pkgver}" + cd gstreamer make check } package() { - cd "${srcdir}/gstreamer-${pkgver}" + cd gstreamer make DESTDIR="${pkgdir}" install #Remove unversioned gst-* binaries to get rid of conflicts diff --git a/abs/extra/community/gstreamer0.10/bison3.patch b/abs/extra/community/gstreamer0.10/bison3.patch new file mode 100644 index 0000000..4f4f521 --- /dev/null +++ b/abs/extra/community/gstreamer0.10/bison3.patch @@ -0,0 +1,31 @@ +From bd2a01cfe222367493a71f3269f12250c8972db0 Mon Sep 17 00:00:00 2001 +From: Kerrick Staley +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 diff --git a/abs/extra/community/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch b/abs/extra/community/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch new file mode 100644 index 0000000..7524e8f --- /dev/null +++ b/abs/extra/community/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch @@ -0,0 +1,60 @@ +From 5bff3ba949d2ac0a9946c1240e6d4a5bb53fda99 Mon Sep 17 00:00:00 2001 +From: Tim-Philipp Müller +Date: Wed, 08 Aug 2012 13:49:23 +0000 +Subject: tests: remove silly test_fail_abstract_new check + +Our check would make sure that GLib segfaults when +someone tries to instantiate an abstract type, which +is an extremely useful thing to check for. + +In newer GLibs this is fixed and we get an abort with +a g_error() now it seems, so let's just remove this +check entirely. +--- +(limited to 'tests/check/gst/gstobject.c') + +diff --git a/tests/check/gst/gstobject.c b/tests/check/gst/gstobject.c +index 6f7ccb8..ce2ed3e 100644 +--- a/tests/check/gst/gstobject.c ++++ b/tests/check/gst/gstobject.c +@@ -72,19 +72,6 @@ gst_fake_object_get_type (void) + return fake_object_type; + } + +-#ifndef HAVE_OSX +-/* g_object_new on abstract GstObject should fail */ +-GST_START_TEST (test_fail_abstract_new) +-{ +- GstObject *object; +- +- ASSERT_CRITICAL (object = g_object_new (gst_object_get_type (), NULL)); +- fail_unless (object == NULL, "Created an instance of abstract GstObject"); +-} +- +-GST_END_TEST; +-#endif +- + /* g_object_new on GstFakeObject should succeed */ + GST_START_TEST (test_fake_object_new) + { +@@ -529,18 +516,6 @@ gst_object_suite (void) + tcase_add_test (tc_chain, test_fake_object_has_ancestor); + //tcase_add_checked_fixture (tc_chain, setup, teardown); + +- /* FIXME: GLib shouldn't crash here, but issue a warning and return a NULL +- * object, or at least g_error() and then abort properly ... (tpm) */ +-#ifndef HAVE_OSX +- /* Disabled for OS/X because a) it's a pretty silly test anyway and +- * b) different OS/X versions raise different signals and it isn't worth +- * the effort to try and detect which one should be producing which +- */ +- /* SEGV tests go last so we can debug the others */ +- if (g_getenv ("CK_FORK") == NULL || strcmp (g_getenv ("CK_FORK"), "no") != 0) +- tcase_add_test_raise_signal (tc_chain, test_fail_abstract_new, SIGSEGV); +-#endif +- + return s; + } + +-- +cgit v0.9.0.2-2-gbebe -- cgit v0.12