aboutsummaryrefslogtreecommitdiffstats
path: root/main/gst-plugins-good
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-12-20 08:09:42 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-12-20 08:09:42 +0000
commitf15daafa413d519cc9d3a46c871d8dcc382106be (patch)
tree175266006ac88c7f0c10cf8093db6bfd7e11f522 /main/gst-plugins-good
parent549aad0333b887b9852ec2128306188beb2481c2 (diff)
downloadaports-f15daafa413d519cc9d3a46c871d8dcc382106be.tar.bz2
aports-f15daafa413d519cc9d3a46c871d8dcc382106be.tar.xz
main/gst-plugins-good: build fix for new kernel headers
Diffstat (limited to 'main/gst-plugins-good')
-rw-r--r--main/gst-plugins-good/APKBUILD13
-rw-r--r--main/gst-plugins-good/drop-v4l2_buffer-input.patch15
2 files changed, 24 insertions, 4 deletions
diff --git a/main/gst-plugins-good/APKBUILD b/main/gst-plugins-good/APKBUILD
index 6928672c1b..66cae73267 100644
--- a/main/gst-plugins-good/APKBUILD
+++ b/main/gst-plugins-good/APKBUILD
@@ -14,7 +14,8 @@ makedepends="gstreamer-dev glib-dev liboil-dev gst-plugins-base-dev
orc-dev libxext libsm-dev libice-dev libxv-dev"
replaces="gst-plugins-bad"
-source="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.bz2"
+source="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.bz2
+ drop-v4l2_buffer-input.patch"
depends_dev="gstreamer-dev gst-plugins-base-dev"
@@ -22,8 +23,11 @@ _builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
- # fix building with gnu make 3.82
- find -name Makefile.in | xargs sed -i -e "s/^ /\t/" || return 1
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
}
build() {
@@ -56,4 +60,5 @@ gnome() {
mv "$pkgdir"/usr/lib/gstreamer-0.10/libgstgconfelements.so "$subpkgdir"/usr/lib/gstreamer-0.10/libgstgconfelements.so
}
-md5sums="24f98a294a2b521e1b29412bdadae2e6 gst-plugins-good-0.10.31.tar.bz2"
+md5sums="24f98a294a2b521e1b29412bdadae2e6 gst-plugins-good-0.10.31.tar.bz2
+2a41119f95d623ae7fc960ae12b951de drop-v4l2_buffer-input.patch"
diff --git a/main/gst-plugins-good/drop-v4l2_buffer-input.patch b/main/gst-plugins-good/drop-v4l2_buffer-input.patch
new file mode 100644
index 0000000000..5db1da7b1a
--- /dev/null
+++ b/main/gst-plugins-good/drop-v4l2_buffer-input.patch
@@ -0,0 +1,15 @@
+Fixes build on newer linux kernel headers
+
+Based on:
+http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=9f2aa8d47f835ea155aaf635f618c0fc1ca87012
+
+--- ./sys/v4l2/gstv4l2bufferpool.c.orig
++++ ./sys/v4l2/gstv4l2bufferpool.c
+@@ -181,7 +181,6 @@
+ GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u",
+ ret->vbuffer.m.offset);
+ GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length);
+- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input);
+
+ data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
+ PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd,