From 1681b1fa6de82cd8eaa6a70a3bd9b35592eba873 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 10 Oct 2013 16:57:51 +0200
Subject: [PATCH] meta-digi-dey: removed not needed gst-plugins-good bbappend

We are now using the standard yocto kernel headers so the patch to build
the plugin with new kernel headers is not needed.

The rest of the changes in the bbappend (removing gconf dependence) were
needed in yocto-danny, but not in yocto-dylan because the gconf package
does not depend on libx11 anymore.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 ...tion-against-newer-kernel-headers-as.patch | 25 -----------
 .../gst-plugins-good_0.10.31.bbappend         | 43 -------------------
 2 files changed, 68 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good/0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch
 delete mode 100644 meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good_0.10.31.bbappend

diff --git a/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good/0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch b/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good/0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch
deleted file mode 100644
index 78c58a275..000000000
--- a/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good/0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 18 Mar 2013 14:59:35 +0000
-Subject: [PATCH] v4l2: fix compilation against newer kernel headers as on FC19
-
----
- sys/v4l2/v4l2_calls.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
-index 309bfb6..ca10bc4 100644
---- a/sys/v4l2/v4l2_calls.c
-+++ b/sys/v4l2/v4l2_calls.c
-@@ -294,8 +294,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
diff --git a/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good_0.10.31.bbappend b/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good_0.10.31.bbappend
deleted file mode 100644
index 17b082c3c..000000000
--- a/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-good_0.10.31.bbappend
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (C) 2013 Digi International.
-
-PRINC := "${@int(PRINC) + 1}"
-PR_append = "+${DISTRO}"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " \
-    file://0001-v4l2-fix-compilation-against-newer-kernel-headers-as.patch \
-"
-
-PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
-PACKAGECONFIG[x11] = ",--disable-gconf --disable-x --disable-xshm --disable-xvideo,"
-
-DEPENDS_no_X := "${@oe_filter_out('gconf', '${DEPENDS}', d)}"
-DEPENDS := "${@base_contains('DISTRO_FEATURES', 'x11', '${DEPENDS}', '${DEPENDS_no_X}', d)}"
-
-EXTRA_OECONF += " \
-    --disable-aalibtest \
-    --disable-audiofx \
-    --disable-cairo \
-    --disable-cutter \
-    --disable-debug \
-    --disable-debugutils \
-    --disable-directsound \
-    --disable-dv1394 \
-    --disable-effectv \
-    --disable-esdtest \
-    --disable-examples \
-    --disable-goom \
-    --disable-goom2k1 \
-    --disable-gtk-doc \
-    --disable-libdv \
-    --disable-libpng \
-    --disable-osx_audio \
-    --disable-osx_video \
-    --disable-rpath \
-    --disable-shout2test \
-    --disable-spectrum \
-    --disable-speex \
-    --disable-sunaudio \
-    --disable-valgrind \
-"