Merge pull request #8435 from neheb/gst

gstreamer fixes
2019-03-26 14:43:45 -07:00 · 2019-03-26 14:43:45 -07:00 · 60e1f29bb0
parent 98ec089556 1fe66bf8c2
commit 60e1f29bb0
17 changed files with 72 additions and 366 deletions
--- a/multimedia/gst1-libav/Makefile
+++ b/multimedia/gst1-libav/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=gst1-libav
 PKG_VERSION:=1.15.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
 		Ted Hess <thess@kitschensync.net>
@ -146,12 +146,27 @@ LIBAV_CONFIGURE_PROTOCOLS:=$(call FILTER_CONFIG,PROTOCOL,protocol,$(LIBAV_PROTOC
 REAL_CPU_TYPE:=$(firstword $(subst +, ,$(CONFIG_CPU_TYPE)))

 CONFIGURE_ARGS += \
+	--disable-Bsymbolic \
+	--disable-fatal-warnings \
+	--disable-glib-asserts \
+	--disable-gobject-cast-checks \
+	--disable-gtk-doc-html \
+	--disable-valgrind \
 	--without-system-libav \
+	--with-pic \
 	--with-libav-extra-configure=" \
 	$(if $(REAL_CPU_TYPE),--cpu=$(call qstrip,$(REAL_CPU_TYPE)),) \
 	--disable-bsfs \
 	--disable-programs \
 	--disable-devices \
+	--disable-debug \
+	--disable-doc \
+	--disable-extra-warnings \
+	--disable-htmlpages \
+	--disable-manpages \
+	--disable-podpages \
+	--disable-txtpages \
+	--disable-runtime-cpudetect \
 	--disable-encoders \
 	$(LIBAV_CONFIGURE_ENCODERS) \
 	--disable-decoders \
@ -182,11 +197,7 @@ CONFIGURE_ARGS += \
 	--disable-fma4 \
 	--disable-avx2 \
 	--disable-inline-asm \
-	--disable-yasm"
-
-TARGET_CFLAGS += -D_GNU_SOURCE -Wno-format-nonliteral
-
-TARGET_LDFLAGS += $(FPIC)
+	--disable-x86asm"

 define Package/gst1-libav/install
 	$(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION)
--- a/multimedia/gst1-plugins-bad/Makefile
+++ b/multimedia/gst1-plugins-bad/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=gst1-plugins-bad
 PKG_VERSION:=1.15.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
 		Ted Hess <thess@kitschensync.net>
@ -23,6 +23,7 @@ PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/
 PKG_HASH:=eafbb705190ca6dbf0e5dfbe1bc3d0f217fbc2a828037b5ede12d3611b9f9bd7

 PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1

 include $(INCLUDE_DIR)/package.mk
@ -96,9 +97,16 @@ endef
 GST_VERSION:=1.0

 CONFIGURE_ARGS += \
+	--disable-Bsymbolic \
 	--disable-debug \
 	--disable-examples \
-	--disable-nls	\
+	--disable-fatal-warnings \
+	--disable-glib-asserts \
+	--disable-gobject-cast-checks \
+	--disable-gtk-doc-html \
+	--disable-introspection \
+	--disable-valgrind \
+	--disable-rpath \
 	\
 	--disable-directsound \
 	--disable-directdraw \
@ -147,17 +155,11 @@ CONFIGURE_ARGS += \
 	--disable-zbar \
 	--disable-srtp \
 	\
+	--without-html-dir \
 	--without-libiconv-prefix \
 	--without-libintl-prefix \
 	--with-libgcrypt-prefix="$(STAGING_DIR)/usr" \
-	--without-x \
-
-TARGET_CFLAGS+= -std=gnu99
-
-EXTRA_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	$(if $(ICONV_FULL),-liconv) \
-
+	--with-pic

 define Package/gst1-plugins-bad/install
 	/bin/true
--- a/multimedia/gst1-plugins-bad/patches/002-no-tests.patch
+++ b/multimedia/gst1-plugins-bad/patches/002-no-tests.patch
@ -1,44 +0,0 @@
-diff -u --recursive gst-plugins-bad-1.15.2-vanilla/configure.ac gst-plugins-bad-1.15.2/configure.ac
--- gst-plugins-bad-1.15.2-vanilla/configure.ac	2019-03-16 19:01:31.866656521 -0400
-+++ gst-plugins-bad-1.15.2/configure.ac	2019-03-16 19:02:41.864809432 -0400
-@@ -2609,23 +2609,6 @@
- sys/wasapi/Makefile
- sys/winks/Makefile
- sys/winscreencap/Makefile
-tests/Makefile
-tests/check/Makefile
-tests/files/Makefile
-tests/examples/Makefile
-tests/examples/avsamplesink/Makefile
-tests/examples/camerabin2/Makefile
-tests/examples/codecparsers/Makefile
-tests/examples/directfb/Makefile
-tests/examples/audiomixmatrix/Makefile
-tests/examples/ipcpipeline/Makefile
-tests/examples/mpegts/Makefile
-tests/examples/mxf/Makefile
-tests/examples/opencv/Makefile
-tests/examples/uvch264/Makefile
-tests/examples/waylandsink/Makefile
-tests/examples/webrtc/Makefile
-tests/icles/Makefile
- ext/voamrwbenc/Makefile
- ext/voaacenc/Makefile
- ext/assrender/Makefile
-diff -u --recursive gst-plugins-bad-1.15.2-vanilla/Makefile.am gst-plugins-bad-1.15.2/Makefile.am
--- gst-plugins-bad-1.15.2-vanilla/Makefile.am	2019-03-16 19:01:31.865656518 -0400
-+++ gst-plugins-bad-1.15.2/Makefile.am	2019-03-16 19:02:34.694793766 -0400
-@@ -2,11 +2,11 @@
- 
- SUBDIRS = \
- 	gst-libs gst sys ext pkgconfig \
-	m4 common docs tests tools
-+	m4 common docs tools
- 
- DIST_SUBDIRS = \
- 	gst gst-libs sys ext pkgconfig \
-	m4 common docs tests tools
-+	m4 common docs tools
- 
- EXTRA_DIST = \
- 	depcomp \
--- a/multimedia/gst1-plugins-base/Makefile
+++ b/multimedia/gst1-plugins-base/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=gst1-plugins-base
 PKG_VERSION:=1.15.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
 		Ted Hess <thess@kitschensync.net>
@ -40,6 +40,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_libgst1app \

 PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1

 include $(INCLUDE_DIR)/package.mk
@ -117,6 +118,15 @@ GST_VERSION:=1.0
 CONFIGURE_ARGS += \
 	--disable-debug \
 	--disable-examples \
+	--disable-fatal-warnings \
+	--disable-glib-asserts \
+	--disable-gobject-cast-checks \
+	--disable-gtk-doc-html \
+	--disable-introspection \
+	--disable-rpath \
+	--disable-valgrind \
+	--without-html-dir \
+	--with-pic \
 	\
 	$(call GST_COND_SELECT,alsa) \
 	$(call GST_COND_SELECT,app) \
@ -125,7 +135,6 @@ CONFIGURE_ARGS += \
 	$(call GST_COND_SELECT,audioresample) \
 	$(call GST_COND_SELECT,audiotestsrc) \
 	--disable-cdparanoia \
-	--disable-freetypetest \
 	$(call GST_COND_SELECT,gio) \
 	--disable-libvisual \
 	$(call GST_COND_SELECT,ogg) \
@ -145,16 +154,9 @@ CONFIGURE_ARGS += \
 	\
 	--without-libiconv-prefix \
 	--without-libintl-prefix \
-	--without-x \
 	\
 	--with-audioresample-format=int \

-TARGET_CFLAGS += -Wno-format-nonliteral
-
-EXTRA_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	$(if $(ICONV_FULL),-liconv) \
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION)
 	( cd $(PKG_INSTALL_DIR); $(CP) \
--- a/multimedia/gst1-plugins-base/patches/002-no-tests.patch
+++ b/multimedia/gst1-plugins-base/patches/002-no-tests.patch
@ -1,64 +0,0 @@
-diff -u --recursive gst-plugins-base-1.15.2-vanilla/configure.ac gst-plugins-base-1.15.2/configure.ac
--- gst-plugins-base-1.15.2-vanilla/configure.ac	2019-03-16 13:40:28.843441622 -0400
-+++ gst-plugins-base-1.15.2/configure.ac	2019-03-16 13:41:14.880578949 -0400
-@@ -1005,41 +1005,6 @@
- pkgconfig/gstreamer-gl-uninstalled.pc
- pkgconfig/gstreamer-plugins-base.pc
- pkgconfig/gstreamer-plugins-base-uninstalled.pc
-tests/Makefile
-tests/check/Makefile
-tests/examples/Makefile
-tests/examples/app/Makefile
-tests/examples/audio/Makefile
-tests/examples/compositor/Makefile
-tests/examples/decodebin_next/Makefile
-tests/examples/dynamic/Makefile
-tests/examples/encoding/Makefile
-tests/examples/fft/Makefile
-tests/examples/gio/Makefile
-tests/examples/gl/Makefile
-tests/examples/gl/generic/Makefile
-tests/examples/gl/generic/cube/Makefile
-tests/examples/gl/generic/doublecube/Makefile
-tests/examples/gl/generic/recordgraphic/Makefile
-tests/examples/gl/generic/cubeyuv/Makefile
-tests/examples/gl/qt/Makefile
-tests/examples/gl/gtk/Makefile
-tests/examples/gl/gtk/fxtest/Makefile
-tests/examples/gl/gtk/3dvideo/Makefile
-tests/examples/gl/gtk/switchvideooverlay/Makefile
-tests/examples/gl/gtk/filternovideooverlay/Makefile
-tests/examples/gl/gtk/filtervideooverlay/Makefile
-tests/examples/gl/cocoa/Makefile
-tests/examples/gl/sdl/Makefile
-tests/examples/overlay/Makefile
-tests/examples/overlaycomposition/Makefile
-tests/examples/seek/Makefile
-tests/examples/snapshot/Makefile
-tests/examples/playback/Makefile
-tests/examples/playrec/Makefile
-tests/files/Makefile
-tests/icles/Makefile
-tests/icles/playback/Makefile
- docs/Makefile
- docs/libs/Makefile
- docs/plugins/Makefile
-diff -u --recursive gst-plugins-base-1.15.2-vanilla/Makefile.am gst-plugins-base-1.15.2/Makefile.am
--- gst-plugins-base-1.15.2-vanilla/Makefile.am	2019-03-16 13:40:28.864441684 -0400
-+++ gst-plugins-base-1.15.2/Makefile.am	2019-03-16 13:41:27.970617996 -0400
-@@ -11,7 +11,6 @@
- 	gst-libs 		\
- 	gst sys $(SUBDIRS_EXT) 	\
- 	tools 			\
-	tests 			\
- 	docs			\
- 	common 			\
- 	m4
-@@ -22,7 +21,6 @@
- 	gst-libs		\
- 	gst sys ext		\
- 	tools 			\
-	tests 			\
- 	common 			\
- 	m4
- 
--- a/multimedia/gst1-plugins-base/patches/003-no-docs.patch
+++ b/multimedia/gst1-plugins-base/patches/003-no-docs.patch
@ -1,29 +0,0 @@
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,13 +11,11 @@ SUBDIRS = 			\
- 	gst-libs 		\
- 	gst sys $(SUBDIRS_EXT) 	\
- 	tools 			\
-	docs			\
- 	common 			\
- 	m4
- 
- DIST_SUBDIRS = 			\
- 	pkgconfig		\
-	docs			\
- 	gst-libs		\
- 	gst sys ext		\
- 	tools 			\
--- a/configure.ac
-+++ b/configure.ac
-@@ -992,10 +992,6 @@ pkgconfig/gstreamer-gl.pc
- pkgconfig/gstreamer-gl-uninstalled.pc
- pkgconfig/gstreamer-plugins-base.pc
- pkgconfig/gstreamer-plugins-base-uninstalled.pc
-docs/Makefile
-docs/libs/Makefile
-docs/plugins/Makefile
-docs/version.entities
- common/Makefile
- common/m4/Makefile
- m4/Makefile
--- a/multimedia/gst1-plugins-good/Makefile
+++ b/multimedia/gst1-plugins-good/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=gst1-plugins-good
 PKG_VERSION:=1.15.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
 		Ted Hess <thess@kitschensync.net>
@ -27,6 +27,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_gst1-mod-mpg123 \

 PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1

 include $(INCLUDE_DIR)/package.mk
@ -97,8 +98,15 @@ CONFIGURE_ARGS += \
 	$(call GST_COND_SELECT,lame) \
        $(call GST_COND_SELECT,mpg123) \
 	\
+	--disable-Bsymbolic \
 	--disable-debug \
 	--disable-examples \
+	--disable-fatal-warnings \
+	--disable-glib-asserts \
+	--disable-gobject-cast-checks \
+	--disable-gtk-doc-html \
+	--disable-rpath \
+	--disable-valgrind \
 	\
 	--disable-aalib \
 	--disable-annodex \
@ -127,16 +135,10 @@ CONFIGURE_ARGS += \
 	--disable-y4m \
 	--disable-zlib \
 	\
+	--without-gudev \
+	--without-libv4l2 \
 	--without-libiconv-prefix \
-	--without-libintl-prefix \
-	--without-x \
-
-TARGET_CFLAGS += -Wno-incompatible-pointer-types
-
-EXTRA_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	$(if $(ICONV_FULL),-liconv) \
-
+	--without-libintl-prefix

 define Package/gst1-plugins-good/install
 	/bin/true
--- a/multimedia/gst1-plugins-good/patches/002-no-tests.patch
+++ b/multimedia/gst1-plugins-good/patches/002-no-tests.patch
@ -1,35 +0,0 @@
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,6 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
- 
- ALWAYS_SUBDIRS =		\
- 	gst sys ext 		\
-	tests			\
- 	docs			\
- 	common			\
- 	m4			\
--- a/configure.ac
-+++ b/configure.ac
-@@ -1292,22 +1292,6 @@ sys/osxvideo/Makefile
- sys/v4l2/Makefile
- sys/waveform/Makefile
- sys/ximage/Makefile
-tests/Makefile
-tests/check/Makefile
-tests/examples/Makefile
-tests/examples/audiofx/Makefile
-tests/examples/cairo/Makefile
-tests/examples/equalizer/Makefile
-tests/examples/gtk/Makefile
-tests/examples/jack/Makefile
-tests/examples/level/Makefile
-tests/examples/rtp/Makefile
-tests/examples/rtsp/Makefile
-tests/examples/shapewipe/Makefile
-tests/examples/spectrum/Makefile
-tests/examples/v4l2/Makefile
-tests/files/Makefile
-tests/icles/Makefile
- common/Makefile
- common/m4/Makefile
- m4/Makefile
--- a/multimedia/gst1-plugins-good/patches/003-no-docs.patch
+++ b/multimedia/gst1-plugins-good/patches/003-no-docs.patch
@ -1,22 +0,0 @@
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,6 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
- 
- ALWAYS_SUBDIRS =		\
- 	gst sys ext 		\
-	docs			\
- 	common			\
- 	m4			\
- 	pkgconfig
--- a/configure.ac
-+++ b/configure.ac
-@@ -1295,9 +1295,6 @@ sys/ximage/Makefile
- common/Makefile
- common/m4/Makefile
- m4/Makefile
-docs/Makefile
-docs/plugins/Makefile
-docs/version.entities
- pkgconfig/Makefile
- pkgconfig/gstreamer-plugins-good-uninstalled.pc
- )
--- a/multimedia/gst1-plugins-ugly/Makefile
+++ b/multimedia/gst1-plugins-ugly/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=gst1-plugins-ugly
 PKG_VERSION:=1.15.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
 		Ted Hess <thess@kitschensync.net>
@ -27,6 +27,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_gst1-mod-mpeg2dec \

 PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1

 include $(INCLUDE_DIR)/package.mk
@ -96,6 +97,12 @@ GST_VERSION:=1.0
 CONFIGURE_ARGS += \
 	--disable-debug \
 	--disable-examples \
+	--disable-fatal-warnings \
+	--disable-glib-asserts \
+	--disable-gobject-cast-checks \
+	--disable-gtk-doc-html \
+	--disable-valgrind \
+	--disable-rpath \
 	\
 	--disable-a52dec \
 	--disable-amrnb \
@ -117,13 +124,7 @@ CONFIGURE_ARGS += \
 	\
 	--without-libiconv-prefix \
 	--without-libintl-prefix \
-
-TARGET_CFLAGS += -Wno-format-nonliteral
-
-EXTRA_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	$(if $(ICONV_FULL),-liconv) \
-
+	--with-pic

 define Package/gst1-plugins-ugly/install
 	/bin/true
--- a/multimedia/gst1-plugins-ugly/patches/002-no-tests.patch
+++ b/multimedia/gst1-plugins-ugly/patches/002-no-tests.patch
@ -1,23 +0,0 @@
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
- 
- SUBDIRS = \
-	gst-libs gst ext docs m4 tests common pkgconfig
-+	gst-libs gst ext docs m4 common pkgconfig
- 	
- EXTRA_DIST = \
- 	depcomp \
--- a/configure.ac
-+++ b/configure.ac
-@@ -423,9 +423,6 @@ ext/x264/Makefile
- docs/Makefile
- docs/plugins/Makefile
- docs/version.entities
-tests/Makefile
-tests/check/Makefile
-tests/files/Makefile
- m4/Makefile
- pkgconfig/Makefile
- pkgconfig/gstreamer-plugins-ugly-uninstalled.pc
--- a/multimedia/gst1-plugins-ugly/patches/003-no-docs.patch
+++ b/multimedia/gst1-plugins-ugly/patches/003-no-docs.patch
@ -1,23 +0,0 @@
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
- 
- SUBDIRS = \
-	gst-libs gst ext docs m4 common pkgconfig
-+	gst-libs gst ext m4 common pkgconfig
- 	
- EXTRA_DIST = \
- 	depcomp \
--- a/configure.ac
-+++ b/configure.ac
-@@ -420,9 +420,6 @@ ext/dvdread/Makefile
- ext/mpeg2dec/Makefile
- ext/sidplay/Makefile
- ext/x264/Makefile
-docs/Makefile
-docs/plugins/Makefile
-docs/version.entities
- m4/Makefile
- pkgconfig/Makefile
- pkgconfig/gstreamer-plugins-ugly-uninstalled.pc
--- a/multimedia/gstreamer1/Makefile
+++ b/multimedia/gstreamer1/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=gstreamer1
 PKG_VERSION:=1.15.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
 		Ted Hess <thess@kitschensync.net>
@ -25,6 +25,7 @@ PKG_HASH:=27a3211eb5c3f6929c5f123ffecaac0ea6e9ed6b93be879c033a7d5af13ad7e6
 PKG_FIXUP:=autoreconf
 PKG_REMOVE_FILES:=autogen.sh aclocal.m4

+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1

 include $(INCLUDE_DIR)/package.mk
@ -118,13 +119,20 @@ GST_VERSION:=1.0

 CONFIGURE_ARGS += \
 	--enable-static \
+	--disable-Bsymbolic \
 	--disable-benchmarks \
+	--disable-debug \
 	--disable-examples \
 	--disable-failing-tests \
 	--disable-fatal-warnings \
 	--disable-introspection \
+	--disable-glib-asserts \
+	--disable-gobject-cast-checks \
 	--disable-gst-tracer-hooks \
+	--disable-gst-debug \
 	--disable-gtk-doc-html \
+	--disable-option-parsing \
+	--disable-rpath \
 	--disable-tests \
 	--disable-valgrind \
 	--without-dw \
@ -132,10 +140,6 @@ CONFIGURE_ARGS += \
 	--without-libintl-prefix \
 	--without-unwind

-EXTRA_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	$(if $(ICONV_FULL),-liconv)
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION)
 	( cd $(PKG_INSTALL_DIR); $(CP) \
--- a/multimedia/gstreamer1/patches/001-no-translations.patch
+++ b/multimedia/gstreamer1/patches/001-no-translations.patch
@ -18,7 +18,7 @@
 	data
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1086,7 +1086,6 @@ libs/gst/net/Makefile
+@@ -1108,7 +1108,6 @@ libs/gst/net/Makefile
 plugins/Makefile
 plugins/elements/Makefile
 plugins/tracers/Makefile
--- a/multimedia/gstreamer1/patches/002-no-tests.patch
+++ b/multimedia/gstreamer1/patches/002-no-tests.patch
@ -1,43 +0,0 @@
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -7,7 +7,7 @@ aclocaldir = $(datadir)/aclocal
- aclocal_DATA = gst-element-check-1.0.m4
- 
- SUBDIRS = pkgconfig \
-	gst libs plugins tests \
-+	gst libs plugins \
- 	docs \
- 	m4 \
- 	common \
-@@ -19,7 +19,7 @@ endif
- 
- # These are all the possible subdirs
- DIST_SUBDIRS = pkgconfig \
-	gst libs plugins tools tests \
-+	gst libs plugins tools \
- 	docs \
- 	m4 \
- 	common \
--- a/configure.ac
-+++ b/configure.ac
-@@ -1086,20 +1086,6 @@ libs/gst/net/Makefile
- plugins/Makefile
- plugins/elements/Makefile
- plugins/tracers/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/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
--- a/multimedia/gstreamer1/patches/003-no-docs.patch
+++ b/multimedia/gstreamer1/patches/003-no-docs.patch
@ -1,33 +0,0 @@
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,7 +8,6 @@ aclocal_DATA = gst-element-check-1.0.m4
- 
- SUBDIRS = pkgconfig \
- 	gst libs plugins \
-	docs \
- 	m4 \
- 	common \
- 	data
-@@ -20,7 +19,6 @@ endif
- # These are all the possible subdirs
- DIST_SUBDIRS = pkgconfig \
- 	gst libs plugins tools \
-	docs \
- 	m4 \
- 	common \
- 	data
--- a/configure.ac
-+++ b/configure.ac
-@@ -1089,12 +1089,6 @@ plugins/tracers/Makefile
- tools/Makefile
- common/Makefile
- common/m4/Makefile
-docs/Makefile
-docs/gst/Makefile
-docs/gst/gstreamer.types
-docs/libs/Makefile
-docs/plugins/Makefile
-docs/version.entities
- m4/Makefile
- pkgconfig/Makefile
- stamp.h
--- 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,6 @@
 --- a/gst/gstplugin.c
 +++ b/gst/gstplugin.c
-@@ -776,15 +776,8 @@ _priv_gst_plugin_load_file_for_registry (const gchar * filename,
+@@ -777,15 +777,8 @@ _priv_gst_plugin_load_file_for_registry (const gchar * filename,
     goto return_error;
   }