Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77testing.git;a=commitdiff;h=8b81de9929742824c691977c010e6027e8231860
commit 8b81de9929742824c691977c010e6027e8231860 Author: Baste <[email protected]> Date: Tue Apr 15 17:00:19 2014 +0200 gst-plugins-good-0.10.31-2-x86_64 - Add v4l2.patch - Remove subpackage-doc diff --git a/source/xmultimedia/gst-plugins-good/FrugalBuild b/source/xmultimedia/gst-plugins-good/FrugalBuild index 7767794..ba0fa04 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=1 +pkgrel=2 pkgdesc="Plugins for GStreamer (Good)" url="http://gstreamer.freedesktop.org/"; depends=('gst-plugins-base>=0.10.36' 'gstreamer>=0.10.36' 'zlib') @@ -20,11 +20,11 @@ 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 v4l2.patch) subpkgs=("$pkgname-gconf" "$pkgname-esd" "$pkgname-speex" "$pkgname-aalib" "$pkgname-shout" "$pkgname-jpeg" \ "$pkgname-flac" "$pkgname-avc1394" "$pkgname-png" "$pkgname-dv" "$pkgname-cairo" \ - "$pkgname-videobox" "$pkgname-taglib" "$pkgname-caca" "$pkgname-docs" \ + "$pkgname-videobox" "$pkgname-taglib" "$pkgname-caca" \ "$pkgname-video4linux2" "$pkgname-gdkpixbuf" "$pkgname-annodex" "$pkgname-wavpack" "$pkgname-ximage" "$pkgname-pulseaudio" \ "$pkgname-libsoup" "$pkgname-jack") subdescs=('GStreamer gconf plugin (Good).' 'GStreamer esd plugin (Good).' 'GStreamer speex plugin (Good).' \ @@ -32,7 +32,7 @@ subdescs=('GStreamer gconf plugin (Good).' 'GStreamer esd plugin (Good).' 'GStre 'GStreamer flac plugin (Good).' 'GStreamer avc1394 plugin (Good).' 'GStreamer png plugin (Good).' \ 'GStreamer dv plugin (Good).' 'GStreamer cairo plugin (Good).' \ 'GStreamer videobox plugin (Good).' 'GStreamer taglib plugin (Good).' \ - 'GStreamer libcaca plugin (Good).' 'GStreamer Plugins Documentation.' 'GStreamer video4linux2 plugin (Good).' \ + 'GStreamer libcaca plugin (Good).' 'GStreamer video4linux2 plugin (Good).' \ 'GStreamer gdkpixbuf plugin (Good).' 'GStreamer annodex plugin (Good).' 'GStreamer wavpack plugin (Good).' \ 'GStreamer ximage plugin (Good).' 'GStreamer pulseaudio plugin (Good).' 'GStreamer libsoup plugin (Good).' \ 'GStreamer jack plugin (Good).') @@ -40,25 +40,25 @@ subdepends=("gconf>=2.28.0" "esd" "speex>=1.2beta3.2" "aalib>=1.4rc5-3" \ "libshout" "libjpeg>=8a" "flac" "libavc1394 libiec61883" \ "libpng" "libdv" "cairo" \ "liboil>=0.3.14" "taglib" \ - "libcaca" '' "" "gtk+2>=2.20.0-2" "libxml2>=2.7.8" \ + "libcaca" "" "gtk+2>=2.20.0-2" "libxml2>=2.7.8" \ "wavpack" "libsm libice libxext libxdamage libxfixes libx11 libxdmcp libxau libxcb" \ "pulseaudio-x11>=2.1" "libsoup" "jack>=0.118.O") subrodepends=("$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ - "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ + "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver") _F_gnome_schemas=('/etc/gconf/schemas/gstreamer-0.10.schemas') Finclude gnome-scriptlet unset install -subreplaces=('' '' '' '' '' '' '' '' '' '' '' '' '' '' '' 'gst-plugins-bad-video4linux2' '' '' 'gst-plugins-bad-wavpack' '' '' '' 'gst-plugins-bad-jack') -subinstall=("src/gnome-scriptlet.install" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') +subreplaces=('' '' '' '' '' '' '' '' '' '' '' '' '' '' 'gst-plugins-bad-video4linux2' '' '' 'gst-plugins-bad-wavpack' '' '' '' 'gst-plugins-bad-jack') +subinstall=("src/gnome-scriptlet.install" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') subgroups=('gnome' 'xmultimedia-extra' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' \ 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia-extra' \ - 'docs-extra' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia-extra' 'xmultimedia' 'xmultimedia') + 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia-extra' 'xmultimedia' 'xmultimedia') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ - 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ + 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ 'i686 x86_64' 'i686 x86_64') build() { @@ -69,7 +69,7 @@ build() { Fpatchall #autoreconf || Fdie Fmake \ - --enable-gtk-doc \ +# --enable-gtk-doc \ --disable-debug \ --with-gnu-ld \ --with-package-name='Frugalware gstreamer-plugins-good package' \ @@ -101,8 +101,9 @@ build() { Fsplit $pkgname-pulseaudio usr/lib/gstreamer-0.10/libgstpulse.* Fsplit $pkgname-libsoup usr/lib/gstreamer-0.10/libgstsouphttpsrc.* Fsplit $pkgname-jack usr/lib/gstreamer-0.10/libgstjack.* - Fsplit $pkgname-docs usr/share/gtk-doc + #Fsplit $pkgname-docs usr/share/gtk-doc } -sha1sums=('b45fc01b133fc23617fa501dd9307a90f467b396') +sha1sums=('b45fc01b133fc23617fa501dd9307a90f467b396' \ + 'ba3d621cc71aa3ca8c4251b5847d3ca786fe1c27') # optimization OK diff --git a/source/xmultimedia/gst-plugins-good/v4l2.patch b/source/xmultimedia/gst-plugins-good/v4l2.patch new file mode 100644 index 0000000..e03fdac --- /dev/null +++ b/source/xmultimedia/gst-plugins-good/v4l2.patch @@ -0,0 +1,57 @@ +From fa21c0bb253213c9dc48ce72faaf7090dc8a3554 Mon Sep 17 00:00:00 2001 +From: Colin Walters <[email protected]> +Date: Thu, 2 May 2013 16:16:46 -0400 +Subject: [PATCH] sys/v4l2: Some blind compilation fixes + +--- + sys/v4l2/gstv4l2bufferpool.c | 1 - + sys/v4l2/v4l2_calls.c | 12 ++++-------- + 2 files changed, 4 insertions(+), 9 deletions(-) + +diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c +index a0b4c84..3916815 100644 +--- a/sys/v4l2/gstv4l2bufferpool.c ++++ b/sys/v4l2/gstv4l2bufferpool.c +@@ -182,7 +182,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); + + ret->mmap_length = ret->vbuffer.length; + data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, +diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c +index 309bfb6..ee3ff9f 100644 +--- a/sys/v4l2/v4l2_calls.c ++++ b/sys/v4l2/v4l2_calls.c +@@ -53,14 +53,6 @@ + + #include "gst/gst-i18n-plugin.h" + +-/* Those are ioctl calls */ +-#ifndef V4L2_CID_HCENTER +-#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED +-#endif +-#ifndef V4L2_CID_VCENTER +-#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED +-#endif +- + GST_DEBUG_CATEGORY_EXTERN (v4l2_debug); + #define GST_CAT_DEFAULT v4l2_debug + +@@ -294,8 +286,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) + break; + case V4L2_CID_HFLIP: + case V4L2_CID_VFLIP: ++#ifdef V4L2_CID_HCENTER + case V4L2_CID_HCENTER: ++#endif ++#ifdef V4L2_CID_VCENTER + case V4L2_CID_VCENTER: ++#endif + #ifdef V4L2_CID_PAN_RESET + case V4L2_CID_PAN_RESET: + #endif +-- +1.7.1 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
