Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mcirstabumps.git;a=commitdiff;h=999d9fbf6b114fe5185127089485d2d1ba07e313
commit 999d9fbf6b114fe5185127089485d2d1ba07e313 Author: Marius Cirsta <[email protected]> Date: Sun Feb 2 22:49:58 2014 +0200 gst-plugins-good-0.10.31-3-x86_64 * add patch to fix build diff --git a/source/xmultimedia/gst-plugins-good/0002-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch b/source/xmultimedia/gst-plugins-good/0002-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch new file mode 100644 index 0000000..c529552 --- /dev/null +++ b/source/xmultimedia/gst-plugins-good/0002-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch @@ -0,0 +1,58 @@ +From: Matthias Clasen <[email protected]> +Date: Thu, 9 Aug 2012 08:35:23 +0100 +Subject: [PATCH] v4l2: fix build with recent kernels, the v4l2_buffer input + field was removed + +This was unused apparently and removed in the kernel in commit: + + From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001 + From: Sakari Ailus <[email protected]> + Date: Wed, 2 May 2012 09:40:03 -0300 + Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT + + Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which + tells the former is valid. The flag is used by no driver currently. + +https://bugzilla.gnome.org/show_bug.cgi?id=681491 +--- + sys/v4l2/gstv4l2bufferpool.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c +index b81c6a4..51cc0ce 100644 +--- a/sys/v4l2/gstv4l2bufferpool.c ++++ b/sys/v4l2/gstv4l2bufferpool.c +@@ -181,7 +181,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps) + 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, + +From 8e633d2059cb835448021cf79becb487aff10975 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <[email protected]> +Date: Mon, 18 Mar 2013 14:59:35 +0000 +Subject: v4l2: fix compilation against newer kernel headers as on FC19 + +--- +diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c +index 07d390a..4c10f4f 100644 +--- a/sys/v4l2/v4l2_calls.c ++++ b/sys/v4l2/v4l2_calls.c +@@ -291,8 +291,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) + break; + case V4L2_CID_HFLIP: + case V4L2_CID_VFLIP: ++#ifndef V4L2_CID_PAN_RESET + case V4L2_CID_HCENTER: ++#endif ++#ifndef V4L2_CID_TILT_RESET + case V4L2_CID_VCENTER: ++#endif + #ifdef V4L2_CID_PAN_RESET + case V4L2_CID_PAN_RESET: + #endif +-- +cgit v0.9.0.2-2-gbebe diff --git a/source/xmultimedia/gst-plugins-good/FrugalBuild b/source/xmultimedia/gst-plugins-good/FrugalBuild index b2825e8..ea8bbf9 100644 --- a/source/xmultimedia/gst-plugins-good/FrugalBuild +++ b/source/xmultimedia/gst-plugins-good/FrugalBuild @@ -5,7 +5,7 @@ pkgname=gst-plugins-good pkgver=0.10.31 -pkgrel=2 +pkgrel=3 pkgdesc="Plugins for GStreamer (Good)" url="http://gstreamer.freedesktop.org/"; depends=('gst-plugins-base>=0.10.36' 'gstreamer>=0.10.36' 'zlib') @@ -20,7 +20,7 @@ archs=('i686' 'x86_64') options=('scriptlet' 'force') #up2date="lynx -dump $url/src/$pkgname/|grep '.tar.bz2$'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" up2date=$pkgver -source=($url/src/$pkgname/$pkgname-$pkgver.tar.bz2) +source=($url/src/$pkgname/$pkgname-$pkgver.tar.bz2 0002-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch) subpkgs=("$pkgname-gconf" "$pkgname-esd" "$pkgname-speex" "$pkgname-aalib" "$pkgname-shout" "$pkgname-jpeg" \ "$pkgname-flac" "$pkgname-avc1394" "$pkgname-png" "$pkgname-dv" "$pkgname-cairo" \ @@ -103,6 +103,7 @@ build() { Fsplit $pkgname-jack usr/lib/gstreamer-0.10/libgstjack.* Fsplit $pkgname-docs usr/share/gtk-doc } -sha1sums=('b45fc01b133fc23617fa501dd9307a90f467b396') +sha1sums=('b45fc01b133fc23617fa501dd9307a90f467b396' \ + 'a7f7045d58300c4358818cb85684cc57821ca23c') # optimization OK diff --git a/source/xmultimedia/gst-plugins-good/gst-png14.patch b/source/xmultimedia/gst-plugins-good/gst-png14.patch deleted file mode 100644 index 051ca0d..0000000 --- a/source/xmultimedia/gst-plugins-good/gst-png14.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru gst-plugins-good-0.10.17/configure gst-plugins-good-0.10.17.png14/configure ---- gst-plugins-good-0.10.17/configure 2009-11-16 23:40:59.000000000 +0100 -+++ gst-plugins-good-0.10.17.png14/configure 2010-01-17 14:18:30.000000000 +0100 -@@ -30924,7 +30924,7 @@ - HAVE_LIBPNG=no - - -- which="libpng12" -+ which="libpng14" - required="no" - - -diff -ru gst-plugins-good-0.10.17/configure.ac gst-plugins-good-0.10.17.png14/configure.ac ---- gst-plugins-good-0.10.17/configure.ac 2009-11-16 23:38:14.000000000 +0100 -+++ gst-plugins-good-0.10.17.png14/configure.ac 2010-01-17 14:18:22.000000000 +0100 -@@ -749,7 +749,7 @@ - dnl *** libpng *** - translit(dnm, m, l) AM_CONDITIONAL(USE_LIBPNG, true) - AG_GST_CHECK_FEATURE(LIBPNG, [Portable Network Graphics library], png, [ -- AG_GST_PKG_CHECK_MODULES(LIBPNG, libpng12) -+ AG_GST_PKG_CHECK_MODULES(LIBPNG, libpng14) - ]) - - dnl *** pulseaudio *** _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
