From 524f0318a72bb5f30376a3de534fe39efa599451 Mon Sep 17 00:00:00 2001
From: "Maxin B. John" <maxin.john@intel.com>
Date: Mon, 21 Dec 2015 18:41:14 +0200
Subject: gstreamer1.0: upgrade to version 1.6.2

1.6.1 -> 1.6.2

Removed "fix-install-hook.patch" which was backported.

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../gstreamer/gstreamer1.0/fix-install-hook.patch  | 48 ----------------------
 .../gstreamer/gstreamer1.0_1.6.1.bb                | 15 -------
 .../gstreamer/gstreamer1.0_1.6.2.bb                | 14 +++++++
 3 files changed, 14 insertions(+), 63 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.1.bb
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.2.bb

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch
deleted file mode 100644
index 9e38f662e3..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-The hooks need to be split into install-data-hook and install-exec-hook as the
-hook fiddles with binaries that are installed by install-data and install-exec,
-otherwise there'll be occasional install failures due to the build racing.
-
-Upstream-Status: Backport (0c6be6604aafa84b525088d1ef4a4486d907743c)
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/libs/gst/helpers/Makefile.am b/libs/gst/helpers/Makefile.am
-index 0ae9ab0..0067779 100644
---- a/libs/gst/helpers/Makefile.am
-+++ b/libs/gst/helpers/Makefile.am
-@@ -23,17 +23,8 @@ gst_ptp_helper_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS)
- gst_ptp_helper_LDADD = $(GST_OBJ_LIBS) $(GIO_LIBS) $(CAP_LIBS)
- endif
- 
--install-exec-hook: install-helpersPROGRAMS
--if HAVE_PTP
--if HAVE_PTP_HELPER_SETUID
--	- chown root $(DESTDIR)$(helpersdir)/gst-ptp-helper
--	- chmod u+s $(DESTDIR)$(helpersdir)/gst-ptp-helper
--endif
--if HAVE_PTP_HELPER_CAPABILITIES
--	- $(SETCAP) cap_net_bind_service,cap_net_admin+ep $(DESTDIR)$(helpersdir)/gst-ptp-helper
--endif
--endif
- if ENABLE_BASH_COMPLETION
-+install-exec-hook:
- 	$(MKDIR_P) $(DESTDIR)$(BASH_HELPERS_DIR) && \
- 	cd $(DESTDIR)$(bindir) && \
- 	$(INSTALL) `echo "gst-completion-helper-" | sed '$(transform)'`@GST_API_VERSION@$(EXEEXT) \
-@@ -44,6 +35,17 @@ uninstall-hook:
- 	rm -f $(DESTDIR)$(BASH_HELPERS_DIR)/gst-completion-helper-@GST_API_VERSION@$(EXEEXT)
- endif
- 
-+install-data-hook:
-+if HAVE_PTP
-+if HAVE_PTP_HELPER_SETUID
-+	- chown root $(DESTDIR)$(helpersdir)/gst-ptp-helper
-+	- chmod u+s $(DESTDIR)$(helpersdir)/gst-ptp-helper
-+endif
-+if HAVE_PTP_HELPER_CAPABILITIES
-+	- $(SETCAP) cap_net_bind_service,cap_net_admin+ep $(DESTDIR)$(helpersdir)/gst-ptp-helper
-+endif
-+endif
-+
- # clean out the old one to make sure everything is udpated correctly
- # remove again after release
- CLEANFILES = plugin-scanner
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.1.bb
deleted file mode 100644
index 9618eaf2a8..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-include gstreamer1.0.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
-                    file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
-
-SRC_URI = " \
-    http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
-    file://0001-Fix-crash-with-gst-inspect.patch \
-    file://fix-install-hook.patch \
-"
-SRC_URI[md5sum] = "e72e2dc2ee06bfc045bb6010c89de520"
-SRC_URI[sha256sum] = "973a3f213c8d41d6dd0e4e7e38fd6cccacd5ae1ac09e1179a8d5d869ef0a5c9c"
-
-S = "${WORKDIR}/gstreamer-${PV}"
-
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.2.bb
new file mode 100644
index 0000000000..ba46c77b4d
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.2.bb
@@ -0,0 +1,14 @@
+include gstreamer1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
+                    file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
+
+SRC_URI = " \
+    http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
+    file://0001-Fix-crash-with-gst-inspect.patch \
+"
+SRC_URI[md5sum] = "5e610b5a94c209487310739b39b6c464"
+SRC_URI[sha256sum] = "5896716bd8e089dba452932a2eff2bb6f6c9d58ff64a96635d157f1ffaf8feb2"
+
+S = "${WORKDIR}/gstreamer-${PV}"
+
-- 
cgit 1.2.3-korg