summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2015-12-21 18:41:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-28 09:25:18 +0000
commita8eb77bbb074c45214c746683e2fc81264ae7af4 (patch)
treeb1a7993e1b81c37faf38fd149958655df0fae37f
parentdd5756b3532008dc4df7c0bfbff5270353929258 (diff)
downloadpoky-a8eb77bbb074c45214c746683e2fc81264ae7af4.tar.gz
gstreamer1.0: upgrade to version 1.6.2
1.6.1 -> 1.6.2 Removed "fix-install-hook.patch" which was backported. (From OE-Core rev: 524f0318a72bb5f30376a3de534fe39efa599451) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0/fix-install-hook.patch48
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.2.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.1.bb)5
2 files changed, 2 insertions, 51 deletions
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 @@
1The hooks need to be split into install-data-hook and install-exec-hook as the
2hook fiddles with binaries that are installed by install-data and install-exec,
3otherwise there'll be occasional install failures due to the build racing.
4
5Upstream-Status: Backport (0c6be6604aafa84b525088d1ef4a4486d907743c)
6Signed-off-by: Ross Burton <ross.burton@intel.com>
7
8diff --git a/libs/gst/helpers/Makefile.am b/libs/gst/helpers/Makefile.am
9index 0ae9ab0..0067779 100644
10--- a/libs/gst/helpers/Makefile.am
11+++ b/libs/gst/helpers/Makefile.am
12@@ -23,17 +23,8 @@ gst_ptp_helper_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS)
13 gst_ptp_helper_LDADD = $(GST_OBJ_LIBS) $(GIO_LIBS) $(CAP_LIBS)
14 endif
15
16-install-exec-hook: install-helpersPROGRAMS
17-if HAVE_PTP
18-if HAVE_PTP_HELPER_SETUID
19- - chown root $(DESTDIR)$(helpersdir)/gst-ptp-helper
20- - chmod u+s $(DESTDIR)$(helpersdir)/gst-ptp-helper
21-endif
22-if HAVE_PTP_HELPER_CAPABILITIES
23- - $(SETCAP) cap_net_bind_service,cap_net_admin+ep $(DESTDIR)$(helpersdir)/gst-ptp-helper
24-endif
25-endif
26 if ENABLE_BASH_COMPLETION
27+install-exec-hook:
28 $(MKDIR_P) $(DESTDIR)$(BASH_HELPERS_DIR) && \
29 cd $(DESTDIR)$(bindir) && \
30 $(INSTALL) `echo "gst-completion-helper-" | sed '$(transform)'`@GST_API_VERSION@$(EXEEXT) \
31@@ -44,6 +35,17 @@ uninstall-hook:
32 rm -f $(DESTDIR)$(BASH_HELPERS_DIR)/gst-completion-helper-@GST_API_VERSION@$(EXEEXT)
33 endif
34
35+install-data-hook:
36+if HAVE_PTP
37+if HAVE_PTP_HELPER_SETUID
38+ - chown root $(DESTDIR)$(helpersdir)/gst-ptp-helper
39+ - chmod u+s $(DESTDIR)$(helpersdir)/gst-ptp-helper
40+endif
41+if HAVE_PTP_HELPER_CAPABILITIES
42+ - $(SETCAP) cap_net_bind_service,cap_net_admin+ep $(DESTDIR)$(helpersdir)/gst-ptp-helper
43+endif
44+endif
45+
46 # clean out the old one to make sure everything is udpated correctly
47 # remove again after release
48 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.2.bb
index 9618eaf2a8..ba46c77b4d 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.2.bb
@@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
6SRC_URI = " \ 6SRC_URI = " \
7 http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ 7 http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
8 file://0001-Fix-crash-with-gst-inspect.patch \ 8 file://0001-Fix-crash-with-gst-inspect.patch \
9 file://fix-install-hook.patch \
10" 9"
11SRC_URI[md5sum] = "e72e2dc2ee06bfc045bb6010c89de520" 10SRC_URI[md5sum] = "5e610b5a94c209487310739b39b6c464"
12SRC_URI[sha256sum] = "973a3f213c8d41d6dd0e4e7e38fd6cccacd5ae1ac09e1179a8d5d869ef0a5c9c" 11SRC_URI[sha256sum] = "5896716bd8e089dba452932a2eff2bb6f6c9d58ff64a96635d157f1ffaf8feb2"
13 12
14S = "${WORKDIR}/gstreamer-${PV}" 13S = "${WORKDIR}/gstreamer-${PV}"
15 14