Browse Source

Merge pull request #5592 from MikePetullo/gstreamer1

gstreamer1: update to 1.12.4
lilik-openwrt-22.03
Hannu Nyman 7 years ago
committed by GitHub
parent
commit
b5e066fb3b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 53 deletions
  1. +3
    -2
      multimedia/gstreamer1/Makefile
  2. +9
    -7
      multimedia/gstreamer1/patches/001-no-translations.patch
  3. +9
    -8
      multimedia/gstreamer1/patches/002-no-tests.patch
  4. +9
    -13
      multimedia/gstreamer1/patches/003-no-docs.patch
  5. +0
    -23
      multimedia/gstreamer1/patches/004-no-unwind.patch

+ 3
- 2
multimedia/gstreamer1/Makefile View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gstreamer1 PKG_NAME:=gstreamer1
PKG_VERSION:=1.10.5
PKG_VERSION:=1.12.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \ PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
@ -20,7 +20,7 @@ PKG_LICENSE_FILES:=COPYING
PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION)
PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gstreamer/ PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gstreamer/
PKG_HASH:=bc06243600817f637029da29d089d5908d1d266542f68bf6626a10c5f05f1f1d
PKG_HASH:=5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=autogen.sh aclocal.m4 PKG_REMOVE_FILES:=autogen.sh aclocal.m4
@ -122,6 +122,7 @@ CONFIGURE_ARGS += \
--disable-tests \ --disable-tests \
--disable-valgrind \ --disable-valgrind \
--disable-gst-tracer-hooks \ --disable-gst-tracer-hooks \
--with-unwind=no \
--without-libiconv-prefix \ --without-libiconv-prefix \
--without-libintl-prefix \ --without-libintl-prefix \
--without-x \ --without-x \


+ 9
- 7
multimedia/gstreamer1/patches/001-no-translations.patch View File

@ -1,6 +1,7 @@
--- a/configure.ac
+++ b/configure.ac
@@ -1047,7 +1047,6 @@ libs/gst/net/Makefile
diff -u --recursive gstreamer-1.12.4-vanilla/configure.ac gstreamer-1.12.4/configure.ac
--- gstreamer-1.12.4-vanilla/configure.ac 2018-02-10 17:37:16.379378242 -0500
+++ gstreamer-1.12.4/configure.ac 2018-02-10 17:40:18.742109326 -0500
@@ -1083,7 +1083,6 @@
plugins/Makefile plugins/Makefile
plugins/elements/Makefile plugins/elements/Makefile
plugins/tracers/Makefile plugins/tracers/Makefile
@ -8,9 +9,10 @@
tests/Makefile tests/Makefile
tests/benchmarks/Makefile tests/benchmarks/Makefile
tests/check/Makefile tests/check/Makefile
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ aclocal_DATA = gst-element-check-@GST_AP
diff -u --recursive gstreamer-1.12.4-vanilla/Makefile.am gstreamer-1.12.4/Makefile.am
--- gstreamer-1.12.4-vanilla/Makefile.am 2018-02-10 17:37:16.390378286 -0500
+++ gstreamer-1.12.4/Makefile.am 2018-02-10 17:40:29.112150898 -0500
@@ -9,7 +9,6 @@
SUBDIRS = pkgconfig \ SUBDIRS = pkgconfig \
gst libs plugins tests \ gst libs plugins tests \
docs \ docs \
@ -18,7 +20,7 @@
m4 \ m4 \
common \ common \
data data
@@ -22,7 +21,6 @@ endif
@@ -22,7 +21,6 @@
DIST_SUBDIRS = pkgconfig \ DIST_SUBDIRS = pkgconfig \
gst libs plugins tools tests \ gst libs plugins tools tests \
docs \ docs \


+ 9
- 8
multimedia/gstreamer1/patches/002-no-tests.patch View File

@ -1,6 +1,7 @@
--- a/configure.ac
+++ b/configure.ac
@@ -1047,21 +1047,6 @@ libs/gst/net/Makefile
diff -u --recursive gstreamer-1.12.4-vanilla/configure.ac gstreamer-1.12.4/configure.ac
--- gstreamer-1.12.4-vanilla/configure.ac 2018-02-10 17:43:59.957864211 -0500
+++ gstreamer-1.12.4/configure.ac 2018-02-10 17:44:19.772930084 -0500
@@ -1083,20 +1083,6 @@
plugins/Makefile plugins/Makefile
plugins/elements/Makefile plugins/elements/Makefile
plugins/tracers/Makefile plugins/tracers/Makefile
@ -13,7 +14,6 @@
-tests/examples/controller/Makefile -tests/examples/controller/Makefile
-tests/examples/stepping/Makefile -tests/examples/stepping/Makefile
-tests/examples/helloworld/Makefile -tests/examples/helloworld/Makefile
-tests/examples/manual/Makefile
-tests/examples/memory/Makefile -tests/examples/memory/Makefile
-tests/examples/netclock/Makefile -tests/examples/netclock/Makefile
-tests/examples/ptp/Makefile -tests/examples/ptp/Makefile
@ -22,9 +22,10 @@
tools/Makefile tools/Makefile
common/Makefile common/Makefile
common/m4/Makefile common/m4/Makefile
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ aclocaldir = $(datadir)/aclocal
diff -u --recursive gstreamer-1.12.4-vanilla/Makefile.am gstreamer-1.12.4/Makefile.am
--- gstreamer-1.12.4-vanilla/Makefile.am 2018-02-10 17:43:59.959864217 -0500
+++ gstreamer-1.12.4/Makefile.am 2018-02-10 17:44:30.298965075 -0500
@@ -7,7 +7,7 @@
aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4 aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4
SUBDIRS = pkgconfig \ SUBDIRS = pkgconfig \
@ -33,7 +34,7 @@
docs \ docs \
m4 \ m4 \
common \ common \
@@ -19,7 +19,7 @@ endif
@@ -19,7 +19,7 @@
# These are all the possible subdirs # These are all the possible subdirs
DIST_SUBDIRS = pkgconfig \ DIST_SUBDIRS = pkgconfig \


+ 9
- 13
multimedia/gstreamer1/patches/003-no-docs.patch View File

@ -1,27 +1,23 @@
--- a/configure.ac
+++ b/configure.ac
@@ -1050,18 +1050,6 @@ plugins/tracers/Makefile
diff -u --recursive gstreamer-1.12.4-vanilla/configure.ac gstreamer-1.12.4/configure.ac
--- gstreamer-1.12.4-vanilla/configure.ac 2018-02-10 17:45:28.053157030 -0500
+++ gstreamer-1.12.4/configure.ac 2018-02-10 17:45:47.703222322 -0500
@@ -1086,12 +1086,6 @@
tools/Makefile tools/Makefile
common/Makefile common/Makefile
common/m4/Makefile common/m4/Makefile
-docs/Makefile -docs/Makefile
-docs/design/Makefile
-docs/faq/Makefile
-docs/gst/Makefile -docs/gst/Makefile
-docs/gst/gstreamer.types -docs/gst/gstreamer.types
-docs/libs/Makefile -docs/libs/Makefile
-docs/plugins/Makefile -docs/plugins/Makefile
-docs/manual/Makefile
-docs/pwg/Makefile
-docs/slides/Makefile
-docs/xsl/Makefile
-docs/version.entities -docs/version.entities
m4/Makefile m4/Makefile
pkgconfig/Makefile pkgconfig/Makefile
stamp.h stamp.h
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,6 @@ aclocal_DATA = gst-element-check-@GST_AP
diff -u --recursive gstreamer-1.12.4-vanilla/Makefile.am gstreamer-1.12.4/Makefile.am
--- gstreamer-1.12.4-vanilla/Makefile.am 2018-02-10 17:45:28.053157030 -0500
+++ gstreamer-1.12.4/Makefile.am 2018-02-10 17:45:58.940259656 -0500
@@ -8,7 +8,6 @@
SUBDIRS = pkgconfig \ SUBDIRS = pkgconfig \
gst libs plugins \ gst libs plugins \
@ -29,7 +25,7 @@
m4 \ m4 \
common \ common \
data data
@@ -20,7 +19,6 @@ endif
@@ -20,7 +19,6 @@
# These are all the possible subdirs # These are all the possible subdirs
DIST_SUBDIRS = pkgconfig \ DIST_SUBDIRS = pkgconfig \
gst libs plugins tools \ gst libs plugins tools \


+ 0
- 23
multimedia/gstreamer1/patches/004-no-unwind.patch View File

@ -1,23 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -826,20 +826,6 @@ if test "x$BUILD_EXAMPLES" = "xyes"; the
fi
AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
-dnl libunwind is optionally used by the leaks tracer
-PKG_CHECK_MODULES(UNWIND, libunwind, HAVE_UNWIND=yes, HAVE_UNWIND=no)
-
-dnl Check for backtrace() from libc
-AC_CHECK_FUNC(backtrace, [
- AC_CHECK_HEADERS([execinfo.h], [
- AC_DEFINE(HAVE_BACKTRACE,1,[Have backtrace])
- ], [], [])
-])
-
-if test "x$HAVE_UNWIND" = "xyes"; then
- AC_DEFINE(HAVE_UNWIND, 1, [libunwind available])
-fi
-
dnl building of unit test libraries
AC_ARG_ENABLE(check,
AS_HELP_STRING([--disable-check],[disable building unit test libraries]),

Loading…
Cancel
Save