Wed May 1 00:10:21 PDT 2013

2 files changed, 74 insertions, 9 deletions

diff --git a/extra/gstreamer0.10/PKGBUILD b/extra/gstreamer0.10/PKGBUILD
index 07299a4d7..38deaae91 100644
--- a/extra/gstreamer0.10/PKGBUILD
+++ b/extra/gstreamer0.10/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 153252 2012-03-12 14:53:39Z jgc $
+# $Id: PKGBUILD 184011 2013-04-30 20:11:04Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer0.10
 pkgver=0.10.36
-pkgrel=1
+pkgrel=2
 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')
+makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection' 'git')
 options=('!libtool')
-source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
-md5sums=('15389c73e091b1dda915279c388b9cb2')
+source=("git://anongit.freedesktop.org/gstreamer-sdk/gstreamer#commit=ce96cff8e2bf1772dc330387fa98e94f187fc2ab"
+        tests-remove-silly-test_fail_abstract_new-check.patch)
+sha256sums=('SKIP'
+            'd3d3f4f04453831fdb4244bfe174a38c4e6f9f4da5c8c9050dcfa1a6097aad52')
 
 build() {
-  cd "${srcdir}/gstreamer-${pkgver}"
+  cd "${srcdir}/gstreamer"
+  patch -Np1 -i ../tests-remove-silly-test_fail_abstract_new-check.patch
+  sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac
+  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/" \
@@ -25,12 +30,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/gstreamer-${pkgver}"
+  cd "${srcdir}/gstreamer"
   make check
 }
 
 package() {
-  cd "${srcdir}/gstreamer-${pkgver}"
+  cd "${srcdir}/gstreamer"
   make DESTDIR="${pkgdir}" install
 
   #Remove unversioned gst-* binaries to get rid of conflicts
diff --git a/extra/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch b/extra/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch
new file mode 100644
index 000000000..7524e8fea
--- /dev/null
+++ b/extra/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 <tim.muller@collabora.co.uk>
+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