1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00

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>
This commit is contained in:
Maxin B. John
2015-12-21 18:41:14 +02:00
committed by Richard Purdie
parent dd5756b353
commit a8eb77bbb0
2 changed files with 2 additions and 51 deletions
@@ -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
@@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
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"
SRC_URI[md5sum] = "5e610b5a94c209487310739b39b6c464"
SRC_URI[sha256sum] = "5896716bd8e089dba452932a2eff2bb6f6c9d58ff64a96635d157f1ffaf8feb2"
S = "${WORKDIR}/gstreamer-${PV}"