Date: Sunday, October 9, 2016 @ 13:52:47 Author: heftig Revision: 277959
1.9.90+8+g6542edd-1 Added: gst-plugins-good/trunk/0001-tests-Fix-level-test-in-CK_FORK-no-mode.patch Modified: gst-plugins-good/trunk/PKGBUILD ----------------------------------------------------+ 0001-tests-Fix-level-test-in-CK_FORK-no-mode.patch | 91 +++++++++++++++++++ PKGBUILD | 54 +++++++---- 2 files changed, 129 insertions(+), 16 deletions(-) Added: 0001-tests-Fix-level-test-in-CK_FORK-no-mode.patch =================================================================== --- 0001-tests-Fix-level-test-in-CK_FORK-no-mode.patch (rev 0) +++ 0001-tests-Fix-level-test-in-CK_FORK-no-mode.patch 2016-10-09 13:52:47 UTC (rev 277959) @@ -0,0 +1,91 @@ +From 944e86db955fa48137a1ac6ee593f2d23681c8f6 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <[email protected]> +Date: Sun, 9 Oct 2016 15:23:51 +0200 +Subject: [PATCH] tests: Fix level test in CK_FORK=no mode + +The tests accumulate buffers in GstCheck's buffers list, and the list is +not (consistently) reset between tests. Do that and remove the now +conflicting unrefs for outbuffers. +--- + tests/check/elements/level.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/tests/check/elements/level.c b/tests/check/elements/level.c +index f05370f0ff72709a..b17ea167f42b3291 100644 +--- a/tests/check/elements/level.c ++++ b/tests/check/elements/level.c +@@ -96,6 +96,7 @@ cleanup_level (GstElement * level) + { + GST_DEBUG ("cleanup_level"); + ++ gst_check_drop_buffers (); + gst_pad_set_active (mysrcpad, FALSE); + gst_pad_set_active (mysinkpad, FALSE); + gst_check_teardown_src_pad (level); +@@ -194,7 +195,6 @@ GST_START_TEST (test_ref_counts) + gst_element_set_bus (level, NULL); + ASSERT_OBJECT_REFCOUNT (bus, "bus", 1); + gst_object_unref (bus); +- gst_buffer_unref (outbuffer); + fail_unless (gst_element_set_state (level, + GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null"); + ASSERT_OBJECT_REFCOUNT (level, "level", 1); +@@ -241,7 +241,6 @@ GST_START_TEST (test_message_is_valid) + gst_object_unref (bus); + gst_element_set_state (level, GST_STATE_NULL); + cleanup_level (level); +- gst_check_drop_buffers (); + } + + GST_END_TEST; +@@ -298,7 +297,6 @@ GST_START_TEST (test_int16) + gst_message_unref (message); + gst_element_set_bus (level, NULL); + gst_object_unref (bus); +- gst_buffer_unref (outbuffer); + gst_element_set_state (level, GST_STATE_NULL); + cleanup_level (level); + } +@@ -377,7 +375,6 @@ GST_START_TEST (test_int16_panned) + gst_bus_set_flushing (bus, TRUE); + gst_element_set_bus (level, NULL); + gst_object_unref (bus); +- gst_buffer_unref (outbuffer); + gst_element_set_state (level, GST_STATE_NULL); + cleanup_level (level); + } +@@ -436,7 +433,6 @@ GST_START_TEST (test_float) + gst_message_unref (message); + gst_element_set_bus (level, NULL); + gst_object_unref (bus); +- gst_buffer_unref (outbuffer); + gst_element_set_state (level, GST_STATE_NULL); + cleanup_level (level); + } +@@ -503,7 +499,6 @@ GST_START_TEST (test_message_on_eos) + gst_message_unref (message); + gst_element_set_bus (level, NULL); + gst_object_unref (bus); +- gst_buffer_unref (outbuffer); + gst_element_set_state (level, GST_STATE_NULL); + cleanup_level (level); + } +@@ -543,7 +538,6 @@ GST_START_TEST (test_message_count) + + gst_element_set_bus (level, NULL); + gst_object_unref (bus); +- gst_buffer_unref (outbuffer); + gst_element_set_state (level, GST_STATE_NULL); + cleanup_level (level); + } +@@ -591,7 +585,6 @@ GST_START_TEST (test_message_timestamps) + + gst_element_set_bus (level, NULL); + gst_object_unref (bus); +- gst_buffer_unref (outbuffer); + gst_element_set_state (level, GST_STATE_NULL); + cleanup_level (level); + } +-- +2.10.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-10-09 12:09:25 UTC (rev 277958) +++ PKGBUILD 2016-10-09 13:52:47 UTC (rev 277959) @@ -3,26 +3,48 @@ # Contributor: Jan de Groot <[email protected]> pkgname=gst-plugins-good -pkgver=1.8.3 +pkgver=1.9.90+8+g6542edd pkgrel=1 pkgdesc="GStreamer Multimedia Framework Good Plugins" +url="https://gstreamer.freedesktop.org/"; arch=(i686 x86_64) license=(LGPL) -url="https://gstreamer.freedesktop.org/"; depends=(libpulse jack libsoup gst-plugins-base-libs wavpack aalib taglib libdv libshout libvpx gdk-pixbuf2 libcaca libavc1394 libiec61883 libxdamage v4l-utils cairo libgudev) -makedepends=(gstreamer speex flac libraw1394 python gtk-doc) +makedepends=(gstreamer speex flac libraw1394 python gtk-doc autoconf-archive git) options=(!emptydirs) -source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('a1d6579ba203a7734927c24b90bf6590d846c5a5fcec01a48201018c8ad2827a') +_commit=6542edd9098aad98c0ac18f0ba5a4650932e14e1 # master +source=("git://anongit.freedesktop.org/gstreamer/gst-plugins-good#commit=$_commit" + "gst-common::git://anongit.freedesktop.org/gstreamer/common" + 0001-tests-Fix-level-test-in-CK_FORK-no-mode.patch) +sha256sums=('SKIP' + 'SKIP' + 'bff7a50820ddd3696c8a3bdb2e556c74aaf2eeac3be633801544cb4a48b5eeca') +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd $pkgname + + patch -Np1 -i ../0001-tests-Fix-level-test-in-CK_FORK-no-mode.patch + + git submodule init + git config --local submodule.common.url "$srcdir/gst-common" + git submodule update + + NOCONFIGURE=1 ./autogen.sh +} + build() { - cd $pkgname-$pkgver + cd $pkgname - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental --enable-gtk-doc \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ --with-package-name="GStreamer Good Plugins (Arch Linux)" \ - --with-package-origin="http://www.archlinux.org/"; + --with-package-origin="http://www.archlinux.org/"; \ + --enable-experimental --enable-gtk-doc --disable-static # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool @@ -30,13 +52,13 @@ make } -# Disabled for now: souphttpsrc times out, and takes a damn long time to do so -#check() { -# cd $pkgname-$pkgver -# make check -#} +check() { + cd $pkgname + # souphttpsrc tests break when libcheck forks + CK_FORK=no make check +} package() { - cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install + cd $pkgname + make DESTDIR="$pkgdir" install }
