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

[Jan de Groot]

    Date: Tuesday, June 2, 2015 @ 10:30:31
  Author: jgc
Revision: 240183

upgpkg: gstreamer0.10-good 0.10.31-7

Testsuite fix

Added:
  gstreamer0.10-good/trunk/souptest.patch
Modified:
  gstreamer0.10-good/trunk/PKGBUILD

----------------+
 PKGBUILD       |   11 +++++++----
 souptest.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-02 08:11:32 UTC (rev 240182)
+++ PKGBUILD	2015-06-02 08:30:31 UTC (rev 240183)
@@ -4,7 +4,7 @@
 pkgbase=gstreamer0.10-good
 pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
 pkgver=0.10.31
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'git' 'cairo')
@@ -11,9 +11,11 @@
 url="http://gstreamer.freedesktop.org/"
 options=(!emptydirs)
 source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-good#commit=e28fd8886f05bb51c147f871f3a1db2fc2b735a9"
-        test-rtp-payloading.patch)
+        test-rtp-payloading.patch
+        souptest.patch)
 sha256sums=('SKIP'
-            'c2f7f07f9bf5ca3afddc81d0a44665d2d54b1e9aea0ef1b25d219cf34bf7bb29')
+            'c2f7f07f9bf5ca3afddc81d0a44665d2d54b1e9aea0ef1b25d219cf34bf7bb29'
+            '3a74492c3d2939efabe7e22211c2350084e0a8cc3af23f553130f1e774c5f1e1')
 
 prepare() {
   cd gst-plugins-good
@@ -21,7 +23,8 @@
   sed -i '/AC_PATH_XTRA/d' configure.ac
   sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
 
-  patch -p1 -i ../test-rtp-payloading.patch
+  patch -Np1 -i ../test-rtp-payloading.patch
+  patch -Np1 -i ../souptest.patch
 }
 
 build() {

Added: souptest.patch
===================================================================
--- souptest.patch	                        (rev 0)
+++ souptest.patch	2015-06-02 08:30:31 UTC (rev 240183)
@@ -0,0 +1,28 @@
+From 5765db50a19498e3d1576b4279cb2ca984da9dcd Mon Sep 17 00:00:00 2001
+From: Edward Hervey <bilboed at bilboed.com>
+Date: Tue, 23 Sep 2014 09:47:31 +0200
+Subject: check/soup: Temporarily disable G_ENABLE_DIAGNOSTIC
+
+The SOUP_SERVER_PORT property has been deprecated in recent libsoup
+versions.
+
+diff --git a/tests/check/elements/souphttpsrc.c b/tests/check/elements/souphttpsrc.c
+index 33431ac..dfb682b 100644
+--- a/tests/check/elements/souphttpsrc.c
++++ b/tests/check/elements/souphttpsrc.c
+@@ -602,7 +602,12 @@ run_server (guint * http_port, guint * https_port)
+ 
+   *http_port = *https_port = 0;
+ 
++  /* The G_ENABLE_DIAGNOSTIC is temporarily overriden to avoid
++   * property deprecation warnings (for the SOUP_SERVER_PORT
++   * property) */
++  g_setenv ("G_ENABLE_DIAGNOSTIC", "0", TRUE);
+   server = soup_server_new (SOUP_SERVER_PORT, port, NULL);
++  g_setenv ("G_ENABLE_DIAGNOSTIC", "1", TRUE);
+   if (!server) {
+     GST_DEBUG ("Unable to bind to server port %u", port);
+     return FALSE;
+-- 
+cgit v0.10.2
+