Date: Sunday, October 9, 2016 @ 15:02:27 Author: heftig Revision: 277961
1.9.90+14+gfb36608-1 Modified: gst-plugins-bad/trunk/PKGBUILD Deleted: gst-plugins-bad/trunk/wildmidi-0.4.patch --------------------+ PKGBUILD | 46 ++++++++++++++++++++++++++++------------------ wildmidi-0.4.patch | 24 ------------------------ 2 files changed, 28 insertions(+), 42 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-10-09 13:53:00 UTC (rev 277960) +++ PKGBUILD 2016-10-09 15:02:27 UTC (rev 277961) @@ -3,12 +3,12 @@ # Contributor: Jan de Groot <[email protected]> pkgname=gst-plugins-bad -pkgver=1.8.3 -pkgrel=2 +pkgver=1.9.90+14+gfb36608 +pkgrel=1 pkgdesc="GStreamer Multimedia Framework Bad Plugins" +url="https://gstreamer.freedesktop.org/"; arch=(i686 x86_64) license=(LGPL) -url="http://gstreamer.freedesktop.org/"; depends=(mjpegtools gst-plugins-base-libs curl chromaprint libmms faad2 faac celt libdca soundtouch spandsp libdvdnav libmodplug libgme wayland neon libofa fluidsynth openjpeg2 libwebp libsrtp gnutls wildmidi glu sbc rtmpdump libgudev graphene) @@ -15,27 +15,37 @@ makedepends=(schroedinger libexif libdvdread libvdpau libmpeg2 python valgrind wildmidi librsvg gobject-introspection gtk-doc gtk3 clutter libtiger ladspa openal libusb qt5-declarative qt5-x11extras qt5-wayland vulkan-headers vulkan-icd-loader - zbar) + zbar autoconf-archive git) options=(!emptydirs) -source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz - wildmidi-0.4.patch) -sha256sums=('7899fcb18e6a1af2888b19c90213af018a57d741c6e72ec56b133bc73ec8509b' - 'b234c5d1a8b33342d9f807a46c26623e21f3d1b33a9b2903a41fadd53e0cac47') +_commit=fb36608ccd95004b3c2b38d6451c009fbad899b6 # master +source=("git://anongit.freedesktop.org/gstreamer/gst-plugins-bad#commit=$_commit" + "gst-common::git://anongit.freedesktop.org/gstreamer/common") +sha256sums=('SKIP' + 'SKIP') +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../wildmidi-0.4.patch - autoreconf -vi + cd $pkgname + + 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 Bad Plugins (Arch Linux)" \ --with-package-origin="http://www.archlinux.org/"; \ - --with-gtk=3.0 + --with-gtk=3.0 \ + --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 @@ -44,12 +54,12 @@ } check() { - cd $pkgname-$pkgver + cd $pkgname # don't have a camera for the camerabin test make -k check || : } package() { - cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install + cd $pkgname + make DESTDIR="$pkgdir" install } Deleted: wildmidi-0.4.patch =================================================================== --- wildmidi-0.4.patch 2016-10-09 13:53:00 UTC (rev 277960) +++ wildmidi-0.4.patch 2016-10-09 15:02:27 UTC (rev 277961) @@ -1,24 +0,0 @@ -From 04199db2aeea966c2c879b1764427c87433570f1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <[email protected]> -Date: Tue, 16 Aug 2016 10:37:28 +0300 -Subject: wildmidi: Fix compilation with wildmidi 0.4 - -Old versions used char* for the data, new versions use int8_t*. They're often -not the same and differ in signedness. - -diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c -index 3e82ca2..f52ea9d 100644 ---- a/ext/timidity/gstwildmidi.c -+++ b/ext/timidity/gstwildmidi.c -@@ -672,7 +672,7 @@ gst_wildmidi_get_buffer (GstWildmidi * wildmidi) - gst_buffer_map (buffer, &info, GST_MAP_READWRITE); - - GST_OBJECT_LOCK (wildmidi); -- size = WildMidi_GetOutput (wildmidi->song, (char *) info.data, -+ size = WildMidi_GetOutput (wildmidi->song, (gpointer) info.data, - (unsigned long int) info.size); - GST_OBJECT_UNLOCK (wildmidi); - --- -cgit v0.10.2 -
