From e1f26dd922b37c8b45d9f1be000806edf0eee742 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 1 Jan 2016 13:19:01 -0500 Subject: [PATCH] gstreamer1: update to 1.6.2 Signed-off-by: W. Michael Petullo --- multimedia/gstreamer1/Makefile | 9 +++- .../patches/001-no-translations.patch | 30 ++++++++++++ .../gstreamer1/patches/001-no_docs.patch | 35 -------------- .../gstreamer1/patches/002-no-tests.patch | 46 +++++++++++++++++++ .../gstreamer1/patches/002-no_tests.patch | 37 --------------- .../gstreamer1/patches/003-no-docs.patch | 41 +++++++++++++++++ .../patches/003-no_translations.patch | 45 ------------------ ...0-gstplugin-use-lazy-symbol-binding.patch} | 7 +-- 8 files changed, 128 insertions(+), 122 deletions(-) create mode 100644 multimedia/gstreamer1/patches/001-no-translations.patch delete mode 100644 multimedia/gstreamer1/patches/001-no_docs.patch create mode 100644 multimedia/gstreamer1/patches/002-no-tests.patch delete mode 100644 multimedia/gstreamer1/patches/002-no_tests.patch create mode 100644 multimedia/gstreamer1/patches/003-no-docs.patch delete mode 100644 multimedia/gstreamer1/patches/003-no_translations.patch rename multimedia/gstreamer1/patches/{010-gstplugin_use_lazy_symbol_binding.patch => 010-gstplugin-use-lazy-symbol-binding.patch} (67%) diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile index 0ab4629fb0..cf11d9dbea 100644 --- a/multimedia/gstreamer1/Makefile +++ b/multimedia/gstreamer1/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gstreamer1 -PKG_VERSION:=1.4.5 +PKG_VERSION:=1.6.2 PKG_RELEASE:=1 PKG_MAINTAINER:=W. Michael Petullo @@ -19,7 +19,7 @@ PKG_LICENSE_FILES:=COPYING PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION) PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gstreamer/ -PKG_MD5SUM:=88a9289c64a4950ebb4f544980234289 +PKG_MD5SUM:=5e610b5a94c209487310739b39b6c464 PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=autogen.sh aclocal.m4 @@ -134,6 +134,11 @@ define Build/InstallDev ./usr/include/gstreamer-$(GST_VERSION)/* \ $(1)/usr/include/gstreamer-$(GST_VERSION)/ \ ) + $(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION)/include/gst + ( cd $(PKG_INSTALL_DIR); $(CP) \ + ./usr/lib/gstreamer-$(GST_VERSION)/include/gst/*.h \ + $(1)/usr/lib/gstreamer-$(GST_VERSION)/include/gst \ + ) $(INSTALL_DIR) $(1)/usr/lib ( cd $(PKG_INSTALL_DIR); $(CP) \ ./usr/lib/libgst*-$(GST_VERSION).{a,la,so*} \ diff --git a/multimedia/gstreamer1/patches/001-no-translations.patch b/multimedia/gstreamer1/patches/001-no-translations.patch new file mode 100644 index 0000000000..f933ee0403 --- /dev/null +++ b/multimedia/gstreamer1/patches/001-no-translations.patch @@ -0,0 +1,30 @@ +diff -u --recursive gstreamer-1.6.2-vanilla/configure.ac gstreamer-1.6.2/configure.ac +--- gstreamer-1.6.2-vanilla/configure.ac 2016-01-01 10:40:18.040768907 -0500 ++++ gstreamer-1.6.2/configure.ac 2016-01-01 10:48:24.160887684 -0500 +@@ -980,7 +980,6 @@ + libs/gst/net/Makefile + plugins/Makefile + plugins/elements/Makefile +-po/Makefile.in + tests/Makefile + tests/benchmarks/Makefile + tests/check/Makefile +diff -u --recursive gstreamer-1.6.2-vanilla/Makefile.am gstreamer-1.6.2/Makefile.am +--- gstreamer-1.6.2-vanilla/Makefile.am 2016-01-01 10:40:18.040768907 -0500 ++++ gstreamer-1.6.2/Makefile.am 2016-01-01 10:48:19.150568341 -0500 +@@ -9,7 +9,6 @@ + SUBDIRS = pkgconfig \ + gst libs plugins tests \ + docs \ +- po \ + m4 \ + common \ + data +@@ -22,7 +21,6 @@ + DIST_SUBDIRS = pkgconfig \ + gst libs plugins tools tests \ + docs \ +- po \ + m4 \ + common \ + data diff --git a/multimedia/gstreamer1/patches/001-no_docs.patch b/multimedia/gstreamer1/patches/001-no_docs.patch deleted file mode 100644 index fb0e034f1d..0000000000 --- a/multimedia/gstreamer1/patches/001-no_docs.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,7 +8,6 @@ aclocal_DATA = gst-element-check-@GST_AP - - SUBDIRS = pkgconfig \ - gst libs plugins tests \ -- docs \ - po \ - m4 \ - common -@@ -20,7 +19,6 @@ endif - # These are all the possible subdirs - DIST_SUBDIRS = pkgconfig \ - gst libs plugins tools tests \ -- docs \ - po \ - m4 \ - common ---- a/Makefile.in -+++ b/Makefile.in -@@ -554,13 +554,12 @@ top_srcdir = @top_srcdir@ - DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-docbook - aclocaldir = $(datadir)/aclocal - aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4 --SUBDIRS = pkgconfig gst libs plugins tests docs po m4 common \ -+SUBDIRS = pkgconfig gst libs plugins tests po m4 common \ - $(am__append_1) - - # These are all the possible subdirs - DIST_SUBDIRS = pkgconfig \ - gst libs plugins tools tests \ -- docs \ - po \ - m4 \ - common diff --git a/multimedia/gstreamer1/patches/002-no-tests.patch b/multimedia/gstreamer1/patches/002-no-tests.patch new file mode 100644 index 0000000000..d2bf13d8e0 --- /dev/null +++ b/multimedia/gstreamer1/patches/002-no-tests.patch @@ -0,0 +1,46 @@ +diff -u --recursive gstreamer-1.6.2-vanilla/configure.ac gstreamer-1.6.2/configure.ac +--- gstreamer-1.6.2-vanilla/configure.ac 2016-01-01 12:01:10.863324404 -0500 ++++ gstreamer-1.6.2/configure.ac 2016-01-01 12:05:07.794937166 -0500 +@@ -980,21 +980,6 @@ + libs/gst/net/Makefile + plugins/Makefile + plugins/elements/Makefile +-tests/Makefile +-tests/benchmarks/Makefile +-tests/check/Makefile +-tests/misc/Makefile +-tests/examples/Makefile +-tests/examples/adapter/Makefile +-tests/examples/controller/Makefile +-tests/examples/stepping/Makefile +-tests/examples/helloworld/Makefile +-tests/examples/manual/Makefile +-tests/examples/memory/Makefile +-tests/examples/netclock/Makefile +-tests/examples/ptp/Makefile +-tests/examples/streamiddemux/Makefile +-tests/examples/streams/Makefile + tools/Makefile + common/Makefile + common/m4/Makefile +diff -u --recursive gstreamer-1.6.2-vanilla/Makefile.am gstreamer-1.6.2/Makefile.am +--- gstreamer-1.6.2-vanilla/Makefile.am 2016-01-01 12:01:10.862324377 -0500 ++++ gstreamer-1.6.2/Makefile.am 2016-01-01 12:05:03.190808129 -0500 +@@ -7,7 +7,7 @@ + aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4 + + SUBDIRS = pkgconfig \ +- gst libs plugins tests \ ++ gst libs plugins \ + docs \ + m4 \ + common \ +@@ -19,7 +19,7 @@ + + # These are all the possible subdirs + DIST_SUBDIRS = pkgconfig \ +- gst libs plugins tools tests \ ++ gst libs plugins tools \ + docs \ + m4 \ + common \ diff --git a/multimedia/gstreamer1/patches/002-no_tests.patch b/multimedia/gstreamer1/patches/002-no_tests.patch deleted file mode 100644 index 384dd0addc..0000000000 --- a/multimedia/gstreamer1/patches/002-no_tests.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -7,7 +7,7 @@ aclocaldir = $(datadir)/aclocal - aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4 - - SUBDIRS = pkgconfig \ -- gst libs plugins tests \ -+ gst libs plugins \ - po \ - m4 \ - common -@@ -18,7 +18,7 @@ endif - - # These are all the possible subdirs - DIST_SUBDIRS = pkgconfig \ -- gst libs plugins tools tests \ -+ gst libs plugins tools \ - po \ - m4 \ - common ---- a/Makefile.in -+++ b/Makefile.in -@@ -554,12 +554,12 @@ top_srcdir = @top_srcdir@ - DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-docbook - aclocaldir = $(datadir)/aclocal - aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4 --SUBDIRS = pkgconfig gst libs plugins tests po m4 common \ -+SUBDIRS = pkgconfig gst libs plugins po m4 common \ - $(am__append_1) - - # These are all the possible subdirs - DIST_SUBDIRS = pkgconfig \ -- gst libs plugins tools tests \ -+ gst libs plugins tools \ - po \ - m4 \ - common diff --git a/multimedia/gstreamer1/patches/003-no-docs.patch b/multimedia/gstreamer1/patches/003-no-docs.patch new file mode 100644 index 0000000000..cd96d4c38a --- /dev/null +++ b/multimedia/gstreamer1/patches/003-no-docs.patch @@ -0,0 +1,41 @@ +diff -u --recursive gstreamer-1.6.2-vanilla/configure.ac gstreamer-1.6.2/configure.ac +--- gstreamer-1.6.2-vanilla/configure.ac 2016-01-01 12:11:19.150392204 -0500 ++++ gstreamer-1.6.2/configure.ac 2016-01-01 12:06:49.611795028 -0500 +@@ -983,18 +983,6 @@ + tools/Makefile + common/Makefile + common/m4/Makefile +-docs/Makefile +-docs/design/Makefile +-docs/faq/Makefile +-docs/gst/Makefile +-docs/gst/gstreamer.types +-docs/libs/Makefile +-docs/plugins/Makefile +-docs/manual/Makefile +-docs/pwg/Makefile +-docs/slides/Makefile +-docs/xsl/Makefile +-docs/version.entities + m4/Makefile + pkgconfig/Makefile + stamp.h +diff -u --recursive gstreamer-1.6.2-vanilla/Makefile.am gstreamer-1.6.2/Makefile.am +--- gstreamer-1.6.2-vanilla/Makefile.am 2016-01-01 12:11:19.151392233 -0500 ++++ gstreamer-1.6.2/Makefile.am 2016-01-01 12:06:41.546568365 -0500 +@@ -8,7 +8,6 @@ + + SUBDIRS = pkgconfig \ + gst libs plugins \ +- docs \ + m4 \ + common \ + data +@@ -20,7 +19,6 @@ + # These are all the possible subdirs + DIST_SUBDIRS = pkgconfig \ + gst libs plugins tools \ +- docs \ + m4 \ + common \ + data diff --git a/multimedia/gstreamer1/patches/003-no_translations.patch b/multimedia/gstreamer1/patches/003-no_translations.patch deleted file mode 100644 index 7e918dd7e0..0000000000 --- a/multimedia/gstreamer1/patches/003-no_translations.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -780,7 +780,6 @@ libs/gst/helpers/Makefile - libs/gst/net/Makefile - plugins/Makefile - plugins/elements/Makefile --po/Makefile.in - tests/Makefile - tests/benchmarks/Makefile - tests/check/Makefile ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,7 +8,6 @@ aclocal_DATA = gst-element-check-@GST_AP - - SUBDIRS = pkgconfig \ - gst libs plugins \ -- po \ - m4 \ - common - -@@ -19,7 +18,6 @@ endif - # These are all the possible subdirs - DIST_SUBDIRS = pkgconfig \ - gst libs plugins tools \ -- po \ - m4 \ - common - ---- a/Makefile.in -+++ b/Makefile.in -@@ -554,13 +554,12 @@ top_srcdir = @top_srcdir@ - DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-docbook - aclocaldir = $(datadir)/aclocal - aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4 --SUBDIRS = pkgconfig gst libs plugins po m4 common \ -+SUBDIRS = pkgconfig gst libs plugins m4 common \ - $(am__append_1) - - # These are all the possible subdirs - DIST_SUBDIRS = pkgconfig \ - gst libs plugins tools \ -- po \ - m4 \ - common - diff --git a/multimedia/gstreamer1/patches/010-gstplugin_use_lazy_symbol_binding.patch b/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch similarity index 67% rename from multimedia/gstreamer1/patches/010-gstplugin_use_lazy_symbol_binding.patch rename to multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch index 603e57c115..d5b317eddb 100644 --- a/multimedia/gstreamer1/patches/010-gstplugin_use_lazy_symbol_binding.patch +++ b/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch @@ -1,6 +1,7 @@ ---- a/gst/gstplugin.c -+++ b/gst/gstplugin.c -@@ -723,15 +723,8 @@ gst_plugin_load_file (const gchar * file +diff -u --recursive gstreamer-1.6.2-vanilla/gst/gstplugin.c gstreamer-1.6.2/gst/gstplugin.c +--- gstreamer-1.6.2-vanilla/gst/gstplugin.c 2016-01-01 12:37:38.178990140 -0500 ++++ gstreamer-1.6.2/gst/gstplugin.c 2016-01-01 12:38:30.431328737 -0500 +@@ -732,15 +732,8 @@ goto return_error; }