summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD18
-rw-r--r--wildmidi-0.4.patch16
3 files changed, 30 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cd2bef368f70..436949da3ed1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Aug 13 15:26:37 UTC 2016
+# Sat Aug 20 14:33:21 UTC 2016
pkgbase = lib32-gstreamer0.10-bad
pkgdesc = GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad) (32 bit)
pkgver = 0.10.23
- pkgrel = 13
+ pkgrel = 14
url = http://gstreamer.freedesktop.org/
arch = x86_64
license = LGPL
@@ -44,12 +44,14 @@ pkgbase = lib32-gstreamer0.10-bad
source = disable-assrender-test.patch
source = disable-camerabin-test.patch
source = faad2-version-check.patch
+ source = wildmidi-0.4.patch
md5sums = SKIP
md5sums = 447c12a784b13aac9e47e48741d26a67
md5sums = 476a02484af2e9bdc1cb4a703b531cec
md5sums = 025438e630b571bfa90171e36d4240e5
md5sums = 2e17f524b0db1469cfa36703bf459153
md5sums = dfa7e5723542d0fabebf509cb321535b
+ md5sums = 41db4f6e8c62e431bc2f5deb41dad16f
pkgname = lib32-gstreamer0.10-bad
pkgdesc = GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad, lib32)
diff --git a/PKGBUILD b/PKGBUILD
index 54578c9da8a0..127b3ff17b80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _pkgbase=gstreamer0.10-bad
pkgbase=lib32-$_pkgbase
pkgname=('lib32-gstreamer0.10-bad' 'lib32-gstreamer0.10-bad-plugins')
pkgver=0.10.23
-pkgrel=13
+pkgrel=14
arch=('x86_64')
license=('LGPL' 'GPL')
pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad) (32 bit)"
@@ -15,18 +15,19 @@ makedepends=('gcc-multilib' 'lib32-libvdpau' 'lib32-libass' 'lib32-libcdaudio' '
url="http://gstreamer.freedesktop.org/"
options=(!libtool !emptydirs)
source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-bad#commit=57569a4854a0f2d14ef19a8264a4ae9a7a1d1125"
-fix-libmodplug-include.patch
-drop-vpx-compat-defs.patch
-disable-assrender-test.patch
-disable-camerabin-test.patch
-faad2-version-check.patch)
-
+ "fix-libmodplug-include.patch"
+ "drop-vpx-compat-defs.patch"
+ "disable-assrender-test.patch"
+ "disable-camerabin-test.patch"
+ "faad2-version-check.patch"
+ "wildmidi-0.4.patch")
md5sums=('SKIP'
'447c12a784b13aac9e47e48741d26a67'
'476a02484af2e9bdc1cb4a703b531cec'
'025438e630b571bfa90171e36d4240e5'
'2e17f524b0db1469cfa36703bf459153'
- 'dfa7e5723542d0fabebf509cb321535b')
+ 'dfa7e5723542d0fabebf509cb321535b'
+ '41db4f6e8c62e431bc2f5deb41dad16f')
prepare() {
cd gst-plugins-bad
@@ -36,6 +37,7 @@ patch -Np1 -i ../drop-vpx-compat-defs.patch
patch -Np1 -i ../disable-assrender-test.patch
patch -Np1 -i ../disable-camerabin-test.patch
patch -Np1 -i ../faad2-version-check.patch
+patch -Np1 -i ../wildmidi-0.4.patch
}
build() {
diff --git a/wildmidi-0.4.patch b/wildmidi-0.4.patch
new file mode 100644
index 000000000000..ac7deb04ab17
--- /dev/null
+++ b/wildmidi-0.4.patch
@@ -0,0 +1,16 @@
+Old versions used char* for the data, new versions use int8_t*. They're often
+not the same and differ in signedness.
+
+(backported from 04199db2aeea966c2c879b1764427c87433570f1)
+
+--- a/ext/timidity/gstwildmidi.c
++++ b/ext/timidity/gstwildmidi.c
+@@ -631,7 +631,7 @@
+ size = GST_BUFFER_SIZE (buffer);
+
+ GST_OBJECT_LOCK (wildmidi);
+- bytes_read = WildMidi_GetOutput (wildmidi->song, (char *) data,
++ bytes_read = WildMidi_GetOutput (wildmidi->song, (gpointer *) data,
+ (unsigned long int) size);
+ GST_OBJECT_UNLOCK (wildmidi);
+