From f1e4bc92340a5973874aee7eba3b67ac7958ca98 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Mon, 1 Aug 2016 15:38:17 -0400 Subject: [PATCH] gstreamer - Upgrade to 1.8.2. Refresh patches, fix dependencies. Fix cpu build issues in gst-libav. Opus moved to plugins-base. Add opusparse and hls to plugins-bad. Add myself as co-maintainer Signed-off-by: Ted Hess --- multimedia/gst1-libav/Makefile | 24 ++++++------------ multimedia/gst1-plugins-bad/Makefile | 25 +++++++++++-------- .../patches/001-no-translations.patch | 14 +++++------ .../patches/002-no-tests.patch | 15 ++++++----- multimedia/gst1-plugins-base/Makefile | 12 +++++---- .../patches/001-no-translations.patch | 16 ++++++------ .../patches/002-no-tests.patch | 16 ++++++------ .../patches/003-no-docs.patch | 14 +++++------ multimedia/gst1-plugins-good/Makefile | 13 +++++----- .../patches/001-no-translations.patch | 14 +++++------ .../patches/002-no-tests.patch | 14 +++++------ .../patches/003-no-docs.patch | 14 +++++------ multimedia/gst1-plugins-ugly/Makefile | 9 ++++--- .../patches/002-no-tests.patch | 13 +++++----- .../patches/003-no-docs.patch | 12 ++++----- multimedia/gstreamer1/Makefile | 9 ++++--- .../patches/001-no-translations.patch | 18 ++++++------- .../gstreamer1/patches/002-no-tests.patch | 18 ++++++------- .../gstreamer1/patches/003-no-docs.patch | 16 ++++++------ ...10-gstplugin-use-lazy-symbol-binding.patch | 7 +++--- 20 files changed, 134 insertions(+), 159 deletions(-) diff --git a/multimedia/gst1-libav/Makefile b/multimedia/gst1-libav/Makefile index 4bbd23c23e..6017310e24 100644 --- a/multimedia/gst1-libav/Makefile +++ b/multimedia/gst1-libav/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,14 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-libav -PKG_VERSION:=1.6.2 +PKG_VERSION:=1.8.2 PKG_RELEASE:=1 -PKG_MAINTAINER:=W. Michael Petullo +PKG_MAINTAINER:=W. Michael Petullo \ + Ted Hess PKG_SOURCE:=gst-libav-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-libav -PKG_MD5SUM:=09644a38827d233f53edeac815dd0ec0 +PKG_MD5SUM:=b5f3c7a27b39b5f5c2f0bfd546b0c655020faf6b38d27b64b346c43e5ebf687a PKG_LICENSE:=GPL-2.0 LGPL-2.0 PKG_LICENSE_FILES:=COPYING COPYING.LIB @@ -53,7 +54,6 @@ LIBAV_DECODERS:= \ mpeg1video \ mpeg2video \ mpeg4 \ - mpeg4aac \ mpegvideo \ pcm_s16be \ pcm_s16le \ @@ -121,7 +121,7 @@ define Package/gst1-libav URL:=http://www.gstreamer.net/modules/gst-libav.html DEPENDS:= +libgstreamer1 +gstreamer1-plugins-base \ +gst1-mod-alsa +libgst1audio +libgst1pbutils +libgst1video \ - +libbz2 + +libbz2 +liblzma endef define Package/gst1-libav/description @@ -146,7 +146,7 @@ LIBAV_CONFIGURE_PROTOCOLS:=$(call FILTER_CONFIG,PROTOCOL,protocol,$(LIBAV_PROTOC CONFIGURE_ARGS += \ --without-system-libav \ - --with-libav-extra-configure="--target-os=linux \ + --with-libav-extra-configure="--target-os=linux --cpu=$(CONFIG_CPU_TYPE) \ --disable-bsfs \ --disable-programs \ --disable-devices \ @@ -179,21 +179,13 @@ CONFIGURE_ARGS += \ --disable-fma3 \ --disable-fma4 \ --disable-avx2 \ - --disable-vfp \ - --disable-neon \ --disable-inline-asm \ --disable-yasm" -# XXX: trick to force use of embedded Libav headers -TARGET_CFLAGS += $(TARGET_CPPFLAGS) -D_GNU_SOURCE -TARGET_CPPFLAGS := +TARGET_CFLAGS += -D_GNU_SOURCE TARGET_LDFLAGS += $(FPIC) -define Build/Prepare -$(call Build/Prepare/Default) -endef - define Package/gst1-libav/install $(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION) ( cd $(PKG_INSTALL_DIR); $(CP) \ diff --git a/multimedia/gst1-plugins-bad/Makefile b/multimedia/gst1-plugins-bad/Makefile index d6e1fb600b..a284145833 100644 --- a/multimedia/gst1-plugins-bad/Makefile +++ b/multimedia/gst1-plugins-bad/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2011-2015 OpenWrt.org +# Copyright (C) 2011-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,10 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-bad -PKG_VERSION:=1.6.2 +PKG_VERSION:=1.8.2 PKG_RELEASE:=1 -PKG_MAINTAINER:=W. Michael Petullo +PKG_MAINTAINER:=W. Michael Petullo \ + Ted Hess PKG_LICENSE:=LGPLv2 GPLv2 PKG_LICENSE_FILES:=COPYING.LIB COPYING @@ -19,7 +20,7 @@ PKG_LICENSE_FILES:=COPYING.LIB COPYING PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-bad-$(PKG_VERSION) PKG_SOURCE:=gst-plugins-bad-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/ -PKG_MD5SUM:=7c73bec1d389f0e184ebbbbb9e9f883d +PKG_MD5SUM:=d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97 PKG_BUILD_DEPENDS:= libgstreamer1 gstreamer1-plugins-base @@ -147,7 +148,6 @@ CONFIGURE_ARGS += \ --disable-schro \ --disable-zbar \ --disable-srtp \ - --disable-hls \ \ --without-libiconv-prefix \ --without-libintl-prefix \ @@ -198,8 +198,11 @@ define GstBuildLibrary $$(eval $$(call BuildPackage,libgst1$(1))) endef +$(eval $(call GstBuildLibrary,adaptivedemux,adaptivedemux,app uridownloader,)) $(eval $(call GstBuildLibrary,photography,photography,,)) $(eval $(call GstBuildLibrary,basecamerabinsrc,basecamerabinsrc,app,)) +$(eval $(call GstBuildLibrary,uridownloader,uridownloader,,)) +$(eval $(call GstBuildLibrary,badbase,badbase,,)) # 1: short name # 2: description @@ -242,22 +245,22 @@ $(eval $(call GstBuildPlugin,aiff,aiff support,audio tag,,)) $(eval $(call GstBuildPlugin,asfmux,asf muxing support,rtp,,)) $(eval $(call GstBuildPlugin,autoconvert,autoconvert support,,,)) $(eval $(call GstBuildPlugin,bayer,bayer support,video,,)) -$(eval $(call GstBuildPlugin,camerabin2,camerabin support,basecamerabinsrc photography tag pbutils app,,)) +$(eval $(call GstBuildPlugin,camerabin2,camerabin support,basecamerabinsrc photography pbutils app,,)) $(eval $(call GstBuildPlugin,dataurisrc,dataurisrc support,,,)) $(eval $(call GstBuildPlugin,debugutilsbad,debugutils support,video,,)) $(eval $(call GstBuildPlugin,dvdspu,dvdspu support,video,,)) $(eval $(call GstBuildPlugin,fbdevsink,fbdev support,video,,)) $(eval $(call GstBuildPlugin,festival,festival support,audio,,)) +$(eval $(call GstBuildPlugin,hls,HLS support,pbutils adaptivedemux,multifile,+libnettle)) $(eval $(call GstBuildPlugin,frei0r,frei0r support,controller video,,)) $(eval $(call GstBuildPlugin,id3tag,id3tag support,tag,,)) $(eval $(call GstBuildPlugin,jpegformat,jpegformat support,tag,,)) -$(eval $(call GstBuildPlugin,liveadder,liveadder support,audio,,)) -$(eval $(call GstBuildPlugin,mpegpsdemux,mpegpsdemux support,pbutils tag,,)) +$(eval $(call GstBuildPlugin,mpegpsdemux,mpegpsdemux support,pbutils,,)) $(eval $(call GstBuildPlugin,mpegpsmux,mpegpsmux support,,,)) -#$(eval $(call GstBuildPlugin,mpegtsdemux,mpegtsdemux support,mpegts pbutils tag,,)) +#$(eval $(call GstBuildPlugin,mpegtsdemux,mpegtsdemux support,mpegts pbutils,,)) #$(eval $(call GstBuildPlugin,mpegtsmux,mpegtsmux support,video,,)) -$(eval $(call GstBuildPlugin,mxf,mxf support,audio video,,)) -$(eval $(call GstBuildPlugin,opus,OPUS plugin library,audio tag rtp,,+libopus)) +$(eval $(call GstBuildPlugin,mxf,mxf support,badbase audio video,,)) +$(eval $(call GstBuildPlugin,opusparse,OPUS streams library,pbutils,,+libopus)) $(eval $(call GstBuildPlugin,pcapparse,pcapparse support,,,)) $(eval $(call GstBuildPlugin,pnm,pnm support,video,,)) $(eval $(call GstBuildPlugin,rawparse,rawparse support,audio video,,)) diff --git a/multimedia/gst1-plugins-bad/patches/001-no-translations.patch b/multimedia/gst1-plugins-bad/patches/001-no-translations.patch index 8ea31a7210..ee5d05b3f0 100644 --- a/multimedia/gst1-plugins-bad/patches/001-no-translations.patch +++ b/multimedia/gst1-plugins-bad/patches/001-no-translations.patch @@ -1,7 +1,6 @@ -diff -u --recursive gst-plugins-bad-1.6.2-vanilla/configure.ac gst-plugins-bad-1.6.2/configure.ac ---- gst-plugins-bad-1.6.2-vanilla/configure.ac 2016-01-01 10:40:17.883755147 -0500 -+++ gst-plugins-bad-1.6.2/configure.ac 2016-01-01 10:41:14.832426692 -0500 -@@ -3455,7 +3455,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -3717,7 +3717,6 @@ ext/x265/Makefile ext/xvid/Makefile ext/zbar/Makefile ext/dtls/Makefile @@ -9,10 +8,9 @@ diff -u --recursive gst-plugins-bad-1.6.2-vanilla/configure.ac gst-plugins-bad-1 docs/Makefile docs/plugins/Makefile docs/libs/Makefile -diff -u --recursive gst-plugins-bad-1.6.2-vanilla/Makefile.am gst-plugins-bad-1.6.2/Makefile.am ---- gst-plugins-bad-1.6.2-vanilla/Makefile.am 2016-01-01 10:40:17.883755147 -0500 -+++ gst-plugins-bad-1.6.2/Makefile.am 2016-01-01 10:41:47.607858580 -0500 -@@ -2,11 +2,11 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,11 +2,11 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-d SUBDIRS = \ gst-libs gst sys ext pkgconfig \ diff --git a/multimedia/gst1-plugins-bad/patches/002-no-tests.patch b/multimedia/gst1-plugins-bad/patches/002-no-tests.patch index 5d69bb1ece..3bef421c3d 100644 --- a/multimedia/gst1-plugins-bad/patches/002-no-tests.patch +++ b/multimedia/gst1-plugins-bad/patches/002-no-tests.patch @@ -1,7 +1,6 @@ -diff -u --recursive gst-plugins-bad-1.6.2-vanilla/configure.ac gst-plugins-bad-1.6.2/configure.ac ---- gst-plugins-bad-1.6.2-vanilla/configure.ac 2016-01-01 11:58:54.503551141 -0500 -+++ gst-plugins-bad-1.6.2/configure.ac 2016-01-01 11:50:38.388185503 -0500 -@@ -3355,37 +3355,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -3617,38 +3617,6 @@ sys/wasapi/Makefile sys/wininet/Makefile sys/winks/Makefile sys/winscreencap/Makefile @@ -35,14 +34,14 @@ diff -u --recursive gst-plugins-bad-1.6.2-vanilla/configure.ac gst-plugins-bad-1 -tests/examples/mxf/Makefile -tests/examples/opencv/Makefile -tests/examples/uvch264/Makefile +-tests/examples/waylandsink/Makefile -tests/icles/Makefile ext/voamrwbenc/Makefile ext/voaacenc/Makefile ext/assrender/Makefile -diff -u --recursive gst-plugins-bad-1.6.2-vanilla/Makefile.am gst-plugins-bad-1.6.2/Makefile.am ---- gst-plugins-bad-1.6.2-vanilla/Makefile.am 2016-01-01 11:58:54.504551169 -0500 -+++ gst-plugins-bad-1.6.2/Makefile.am 2016-01-01 11:50:06.848314203 -0500 -@@ -2,11 +2,11 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,11 +2,11 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-d SUBDIRS = \ gst-libs gst sys ext pkgconfig \ diff --git a/multimedia/gst1-plugins-base/Makefile b/multimedia/gst1-plugins-base/Makefile index 34ae605673..53686fdd80 100644 --- a/multimedia/gst1-plugins-base/Makefile +++ b/multimedia/gst1-plugins-base/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2015 OpenWrt.org +# Copyright (C) 2008-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,10 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-base -PKG_VERSION:=1.6.2 +PKG_VERSION:=1.8.2 PKG_RELEASE:=1 -PKG_MAINTAINER:=W. Michael Petullo +PKG_MAINTAINER:=W. Michael Petullo \ + Ted Hess PKG_LICENSE:=LGPLv2 GPLv2 PKG_LICENSE_FILES:=COPYING.LIB COPYING @@ -19,7 +20,7 @@ PKG_LICENSE_FILES:=COPYING.LIB COPYING PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-base-$(PKG_VERSION) PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-base/ -PKG_MD5SUM:=f530fbbe287edce79c55a37bd1a39fe2 +PKG_MD5SUM:=9d7109c8fb0a5dec8edb17b0053c59a46aba7ddf48dc48ea822ebbbd4339d38d PKG_BUILD_DEPENDS:= libgstreamer1 PKG_CONFIG_DEPENDS:= \ @@ -227,7 +228,7 @@ $(eval $(call GstBuildLibrary,pbutils,utils,audio tag video,)) $(eval $(call GstBuildLibrary,riff,RIFF media,audio tag,,)) $(eval $(call GstBuildLibrary,rtp,RTP,,)) $(eval $(call GstBuildLibrary,rtsp,RTSP,,)) -$(eval $(call GstBuildLibrary,sdp,SDP,,)) +$(eval $(call GstBuildLibrary,sdp,SDP,rtp,)) $(eval $(call GstBuildLibrary,tag,tag support,,)) $(eval $(call GstBuildLibrary,video,video,,)) @@ -275,6 +276,7 @@ $(eval $(call GstBuildPlugin,audiotestsrc,audio test,audio tag controller,,)) $(eval $(call GstBuildPlugin,playback,media decoder (v2),pbutils,,)) $(eval $(call GstBuildPlugin,gio,GIO,,,)) $(eval $(call GstBuildPlugin,ogg,Ogg,riff tag pbutils video,,+libogg)) +$(eval $(call GstBuildPlugin,opus,OPUS plugin library,pbutils video,,+libopus)) $(eval $(call GstBuildPlugin,tcp,TCP,net,,)) $(eval $(call GstBuildPlugin,theora,Theora,tag video,,+libogg +libtheora)) $(eval $(call GstBuildPlugin,typefindfunctions,'typefind' functions,audio pbutils tag video,,)) diff --git a/multimedia/gst1-plugins-base/patches/001-no-translations.patch b/multimedia/gst1-plugins-base/patches/001-no-translations.patch index 9a9ec776b6..d495606247 100644 --- a/multimedia/gst1-plugins-base/patches/001-no-translations.patch +++ b/multimedia/gst1-plugins-base/patches/001-no-translations.patch @@ -1,7 +1,6 @@ -diff -u --recursive gst-plugins-base-1.6.2-vanilla/configure.ac gst-plugins-base-1.6.2/configure.ac ---- gst-plugins-base-1.6.2-vanilla/configure.ac 2016-01-01 10:40:17.931759357 -0500 -+++ gst-plugins-base-1.6.2/configure.ac 2016-01-01 10:43:44.374351388 -0500 -@@ -921,7 +921,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -929,7 +929,6 @@ docs/design/Makefile docs/libs/Makefile docs/plugins/Makefile docs/version.entities @@ -9,10 +8,9 @@ diff -u --recursive gst-plugins-base-1.6.2-vanilla/configure.ac gst-plugins-base common/Makefile common/m4/Makefile m4/Makefile -diff -u --recursive gst-plugins-base-1.6.2-vanilla/Makefile.am gst-plugins-base-1.6.2/Makefile.am ---- gst-plugins-base-1.6.2-vanilla/Makefile.am 2016-01-01 10:40:17.931759357 -0500 -+++ gst-plugins-base-1.6.2/Makefile.am 2016-01-01 10:44:17.403209313 -0500 -@@ -13,7 +13,6 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -13,7 +13,6 @@ SUBDIRS = \ tools \ tests \ docs \ @@ -20,7 +18,7 @@ diff -u --recursive gst-plugins-base-1.6.2-vanilla/Makefile.am gst-plugins-base- common \ m4 -@@ -24,7 +23,6 @@ +@@ -24,7 +23,6 @@ DIST_SUBDIRS = \ gst sys ext \ tools \ tests \ diff --git a/multimedia/gst1-plugins-base/patches/002-no-tests.patch b/multimedia/gst1-plugins-base/patches/002-no-tests.patch index 7754a2c75e..f177d18322 100644 --- a/multimedia/gst1-plugins-base/patches/002-no-tests.patch +++ b/multimedia/gst1-plugins-base/patches/002-no-tests.patch @@ -1,7 +1,6 @@ -diff -u --recursive gst-plugins-base-1.6.2-vanilla/configure.ac gst-plugins-base-1.6.2/configure.ac ---- gst-plugins-base-1.6.2-vanilla/configure.ac 2016-01-01 12:00:43.489564691 -0500 -+++ gst-plugins-base-1.6.2/configure.ac 2016-01-01 12:02:24.452371618 -0500 -@@ -899,23 +899,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -907,23 +907,6 @@ pkgconfig/gstreamer-video.pc pkgconfig/gstreamer-video-uninstalled.pc pkgconfig/gstreamer-plugins-base.pc pkgconfig/gstreamer-plugins-base-uninstalled.pc @@ -25,10 +24,9 @@ diff -u --recursive gst-plugins-base-1.6.2-vanilla/configure.ac gst-plugins-base docs/Makefile docs/design/Makefile docs/libs/Makefile -diff -u --recursive gst-plugins-base-1.6.2-vanilla/Makefile.am gst-plugins-base-1.6.2/Makefile.am ---- gst-plugins-base-1.6.2-vanilla/Makefile.am 2016-01-01 12:00:43.489564691 -0500 -+++ gst-plugins-base-1.6.2/Makefile.am 2016-01-01 12:01:54.055525170 -0500 -@@ -11,7 +11,6 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -11,7 +11,6 @@ SUBDIRS = \ gst-libs \ gst sys $(SUBDIRS_EXT) \ tools \ @@ -36,7 +34,7 @@ diff -u --recursive gst-plugins-base-1.6.2-vanilla/Makefile.am gst-plugins-base- docs \ common \ m4 -@@ -22,7 +21,6 @@ +@@ -22,7 +21,6 @@ DIST_SUBDIRS = \ gst-libs \ gst sys ext \ tools \ diff --git a/multimedia/gst1-plugins-base/patches/003-no-docs.patch b/multimedia/gst1-plugins-base/patches/003-no-docs.patch index 6fa663dec9..a12c7e75ef 100644 --- a/multimedia/gst1-plugins-base/patches/003-no-docs.patch +++ b/multimedia/gst1-plugins-base/patches/003-no-docs.patch @@ -1,7 +1,6 @@ -diff -u --recursive gst-plugins-base-1.6.2-vanilla/configure.ac gst-plugins-base-1.6.2/configure.ac ---- gst-plugins-base-1.6.2-vanilla/configure.ac 2016-01-01 12:10:41.158319142 -0500 -+++ gst-plugins-base-1.6.2/configure.ac 2016-01-01 12:07:36.271107197 -0500 -@@ -899,11 +899,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -907,11 +907,6 @@ pkgconfig/gstreamer-video.pc pkgconfig/gstreamer-video-uninstalled.pc pkgconfig/gstreamer-plugins-base.pc pkgconfig/gstreamer-plugins-base-uninstalled.pc @@ -13,10 +12,9 @@ diff -u --recursive gst-plugins-base-1.6.2-vanilla/configure.ac gst-plugins-base common/Makefile common/m4/Makefile m4/Makefile -diff -u --recursive gst-plugins-base-1.6.2-vanilla/Makefile.am gst-plugins-base-1.6.2/Makefile.am ---- gst-plugins-base-1.6.2-vanilla/Makefile.am 2016-01-01 12:10:41.159319170 -0500 -+++ gst-plugins-base-1.6.2/Makefile.am 2016-01-01 12:07:32.869011473 -0500 -@@ -11,13 +11,11 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -11,13 +11,11 @@ SUBDIRS = \ gst-libs \ gst sys $(SUBDIRS_EXT) \ tools \ diff --git a/multimedia/gst1-plugins-good/Makefile b/multimedia/gst1-plugins-good/Makefile index 8e7fcbe903..27b4e6983f 100644 --- a/multimedia/gst1-plugins-good/Makefile +++ b/multimedia/gst1-plugins-good/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2015 OpenWrt.org +# Copyright (C) 2009-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,10 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-good -PKG_VERSION:=1.6.2 +PKG_VERSION:=1.8.2 PKG_RELEASE:=1 -PKG_MAINTAINER:=W. Michael Petullo +PKG_MAINTAINER:=W. Michael Petullo \ + Ted Hess PKG_LICENSE:=LGPLv2 PKG_LICENSE_FILES:=COPYING @@ -19,7 +20,7 @@ PKG_LICENSE_FILES:=COPYING PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION) PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-good/ -PKG_MD5SUM:=ef4f5bc4f31f706832a234b0f603967b +PKG_MD5SUM:=8d7549118a3b7a009ece6bb38a05b66709c551d32d2adfd89eded4d1d7a23944 PKG_BUILD_DEPENDS:= libgstreamer1 gstreamer1-plugins-base @@ -189,8 +190,8 @@ $(eval $(call GstBuildPlugin,flac,FLAC codec,audio pbutils tag,,+libflac)) $(eval $(call GstBuildPlugin,flv,flv codec,audio pbutils tag video,,)) $(eval $(call GstBuildPlugin,flxdec,flx codec,,,)) #$(eval $(call GstBuildPlugin,gdkpixbuf,gdkpixbuf support,video,,)) -$(eval $(call GstBuildPlugin,goom2k1,goom support,audio video,,)) -$(eval $(call GstBuildPlugin,goom,goom support,audio video,,)) +$(eval $(call GstBuildPlugin,goom2k1,goom support,audio video pbutils,,)) +$(eval $(call GstBuildPlugin,goom,goom support,audio video pbutils,,)) $(eval $(call GstBuildPlugin,icydemux,icy demuxer,audio tag,,)) $(eval $(call GstBuildPlugin,id3demux,ID3v1/v2 demuxer,pbutils tag,,)) $(eval $(call GstBuildPlugin,imagefreeze,imagefreeze support,,,)) diff --git a/multimedia/gst1-plugins-good/patches/001-no-translations.patch b/multimedia/gst1-plugins-good/patches/001-no-translations.patch index 6d3ace8e16..1411875005 100644 --- a/multimedia/gst1-plugins-good/patches/001-no-translations.patch +++ b/multimedia/gst1-plugins-good/patches/001-no-translations.patch @@ -1,7 +1,6 @@ -diff -u --recursive gst-plugins-good-1.6.2-vanilla/configure.ac gst-plugins-good-1.6.2/configure.ac ---- gst-plugins-good-1.6.2-vanilla/configure.ac 2016-01-01 10:40:17.994764882 -0500 -+++ gst-plugins-good-1.6.2/configure.ac 2016-01-01 10:45:25.668599823 -0500 -@@ -1014,7 +1014,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1049,7 +1049,6 @@ sys/sunaudio/Makefile sys/v4l2/Makefile sys/waveform/Makefile sys/ximage/Makefile @@ -9,10 +8,9 @@ diff -u --recursive gst-plugins-good-1.6.2-vanilla/configure.ac gst-plugins-good tests/Makefile tests/check/Makefile tests/examples/Makefile -diff -u --recursive gst-plugins-good-1.6.2-vanilla/Makefile.am gst-plugins-good-1.6.2/Makefile.am ---- gst-plugins-good-1.6.2-vanilla/Makefile.am 2016-01-01 10:40:17.994764882 -0500 -+++ gst-plugins-good-1.6.2/Makefile.am 2016-01-01 10:45:19.923089598 -0500 -@@ -4,7 +4,6 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,7 +4,6 @@ ALWAYS_SUBDIRS = \ gst sys ext \ tests \ docs \ diff --git a/multimedia/gst1-plugins-good/patches/002-no-tests.patch b/multimedia/gst1-plugins-good/patches/002-no-tests.patch index 58ad738657..b7a7dc7610 100644 --- a/multimedia/gst1-plugins-good/patches/002-no-tests.patch +++ b/multimedia/gst1-plugins-good/patches/002-no-tests.patch @@ -1,7 +1,6 @@ -diff -u --recursive gst-plugins-good-1.6.2-vanilla/configure.ac gst-plugins-good-1.6.2/configure.ac ---- gst-plugins-good-1.6.2-vanilla/configure.ac 2016-01-01 12:00:52.525815362 -0500 -+++ gst-plugins-good-1.6.2/configure.ac 2016-01-01 12:03:22.198982586 -0500 -@@ -1014,21 +1014,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1049,21 +1049,6 @@ sys/sunaudio/Makefile sys/v4l2/Makefile sys/waveform/Makefile sys/ximage/Makefile @@ -23,10 +22,9 @@ diff -u --recursive gst-plugins-good-1.6.2-vanilla/configure.ac gst-plugins-good common/Makefile common/m4/Makefile m4/Makefile -diff -u --recursive gst-plugins-good-1.6.2-vanilla/Makefile.am gst-plugins-good-1.6.2/Makefile.am ---- gst-plugins-good-1.6.2-vanilla/Makefile.am 2016-01-01 12:00:52.525815362 -0500 -+++ gst-plugins-good-1.6.2/Makefile.am 2016-01-01 12:03:06.921556033 -0500 -@@ -2,7 +2,6 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,6 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-d ALWAYS_SUBDIRS = \ gst sys ext \ diff --git a/multimedia/gst1-plugins-good/patches/003-no-docs.patch b/multimedia/gst1-plugins-good/patches/003-no-docs.patch index c844d1a5ff..38a876f216 100644 --- a/multimedia/gst1-plugins-good/patches/003-no-docs.patch +++ b/multimedia/gst1-plugins-good/patches/003-no-docs.patch @@ -1,7 +1,6 @@ -diff -u --recursive gst-plugins-good-1.6.2-vanilla/configure.ac gst-plugins-good-1.6.2/configure.ac ---- gst-plugins-good-1.6.2-vanilla/configure.ac 2016-01-01 12:10:51.392608142 -0500 -+++ gst-plugins-good-1.6.2/configure.ac 2016-01-01 12:08:39.568889466 -0500 -@@ -1017,9 +1017,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1052,9 +1052,6 @@ sys/ximage/Makefile common/Makefile common/m4/Makefile m4/Makefile @@ -11,10 +10,9 @@ diff -u --recursive gst-plugins-good-1.6.2-vanilla/configure.ac gst-plugins-good pkgconfig/Makefile pkgconfig/gstreamer-plugins-good-uninstalled.pc gst-plugins-good.spec -diff -u --recursive gst-plugins-good-1.6.2-vanilla/Makefile.am gst-plugins-good-1.6.2/Makefile.am ---- gst-plugins-good-1.6.2-vanilla/Makefile.am 2016-01-01 12:10:51.393608170 -0500 -+++ gst-plugins-good-1.6.2/Makefile.am 2016-01-01 12:08:35.442773216 -0500 -@@ -2,7 +2,6 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,6 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-d ALWAYS_SUBDIRS = \ gst sys ext \ diff --git a/multimedia/gst1-plugins-ugly/Makefile b/multimedia/gst1-plugins-ugly/Makefile index 78dfaf791c..2f6c334c34 100644 --- a/multimedia/gst1-plugins-ugly/Makefile +++ b/multimedia/gst1-plugins-ugly/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2015 OpenWrt.org +# Copyright (C) 2009-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,10 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-ugly -PKG_VERSION:=1.6.2 +PKG_VERSION:=1.8.2 PKG_RELEASE:=1 -PKG_MAINTAINER:=W. Michael Petullo +PKG_MAINTAINER:=W. Michael Petullo \ + Ted Hess PKG_LICENSE:=LGPLv2 PKG_LICENSE_FILES:=COPYING @@ -19,7 +20,7 @@ PKG_LICENSE_FILES:=COPYING PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-ugly-$(PKG_VERSION) PKG_SOURCE:=gst-plugins-ugly-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/ -PKG_MD5SUM:=0f0e30336e3155443cd5bfec5c215d56 +PKG_MD5SUM:=9c5b33a2a98fc1d6d6c99a1b536b1fb2de45f53cc8bf8ab85a8b8141fed1a8ac PKG_BUILD_DEPENDS:= libgstreamer1 gstreamer1-plugins-base PKG_CONFIG_DEPENDS:= \ diff --git a/multimedia/gst1-plugins-ugly/patches/002-no-tests.patch b/multimedia/gst1-plugins-ugly/patches/002-no-tests.patch index 993d4f30b2..26cd48a3d8 100644 --- a/multimedia/gst1-plugins-ugly/patches/002-no-tests.patch +++ b/multimedia/gst1-plugins-ugly/patches/002-no-tests.patch @@ -1,18 +1,17 @@ -diff -u --recursive gst-plugins-ugly-1.6.2-vanilla/configure.ac gst-plugins-ugly-1.6.2/configure.ac ---- gst-plugins-ugly-1.6.2-vanilla/configure.ac 2016-01-01 12:01:01.547065731 -0500 -+++ gst-plugins-ugly-1.6.2/configure.ac 2016-01-01 12:04:18.111545715 -0500 -@@ -467,8 +467,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -478,9 +478,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 -diff -u --recursive gst-plugins-ugly-1.6.2-vanilla/Makefile.am gst-plugins-ugly-1.6.2/Makefile.am ---- gst-plugins-ugly-1.6.2-vanilla/Makefile.am 2016-01-01 12:01:01.547065731 -0500 -+++ gst-plugins-ugly-1.6.2/Makefile.am 2016-01-01 12:04:12.087377153 -0500 +--- a/Makefile.am ++++ b/Makefile.am @@ -1,7 +1,7 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc diff --git a/multimedia/gst1-plugins-ugly/patches/003-no-docs.patch b/multimedia/gst1-plugins-ugly/patches/003-no-docs.patch index 21093f7853..3ef1255ade 100644 --- a/multimedia/gst1-plugins-ugly/patches/003-no-docs.patch +++ b/multimedia/gst1-plugins-ugly/patches/003-no-docs.patch @@ -1,7 +1,6 @@ -diff -u --recursive gst-plugins-ugly-1.6.2-vanilla/configure.ac gst-plugins-ugly-1.6.2/configure.ac ---- gst-plugins-ugly-1.6.2-vanilla/configure.ac 2016-01-01 12:11:03.267943540 -0500 -+++ gst-plugins-ugly-1.6.2/configure.ac 2016-01-01 12:13:30.992120335 -0500 -@@ -464,9 +464,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -475,9 +475,6 @@ ext/mpg123/Makefile ext/sidplay/Makefile ext/twolame/Makefile ext/x264/Makefile @@ -11,9 +10,8 @@ diff -u --recursive gst-plugins-ugly-1.6.2-vanilla/configure.ac gst-plugins-ugly m4/Makefile pkgconfig/Makefile pkgconfig/gstreamer-plugins-ugly-uninstalled.pc -diff -u --recursive gst-plugins-ugly-1.6.2-vanilla/Makefile.am gst-plugins-ugly-1.6.2/Makefile.am ---- gst-plugins-ugly-1.6.2-vanilla/Makefile.am 2016-01-01 12:11:03.268943568 -0500 -+++ gst-plugins-ugly-1.6.2/Makefile.am 2016-01-01 12:13:28.110038773 -0500 +--- a/Makefile.am ++++ b/Makefile.am @@ -1,7 +1,7 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile index cf11d9dbea..c75ac0ddd5 100644 --- a/multimedia/gstreamer1/Makefile +++ b/multimedia/gstreamer1/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2015 OpenWrt.org +# Copyright (C) 2008-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,10 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gstreamer1 -PKG_VERSION:=1.6.2 +PKG_VERSION:=1.8.2 PKG_RELEASE:=1 -PKG_MAINTAINER:=W. Michael Petullo +PKG_MAINTAINER:=W. Michael Petullo \ + Ted Hess PKG_LICENSE:=LGPLv2 PKG_LICENSE_FILES:=COPYING @@ -19,7 +20,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:=5e610b5a94c209487310739b39b6c464 +PKG_MD5SUM:=9dbebe079c2ab2004ef7f2649fa317cabea1feb4fb5605c24d40744b90918341 PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=autogen.sh aclocal.m4 diff --git a/multimedia/gstreamer1/patches/001-no-translations.patch b/multimedia/gstreamer1/patches/001-no-translations.patch index f933ee0403..9c5b590fdb 100644 --- a/multimedia/gstreamer1/patches/001-no-translations.patch +++ b/multimedia/gstreamer1/patches/001-no-translations.patch @@ -1,18 +1,16 @@ -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 +--- a/configure.ac ++++ b/configure.ac +@@ -998,7 +998,6 @@ libs/gst/net/Makefile plugins/Makefile plugins/elements/Makefile + plugins/tracers/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 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -9,7 +9,6 @@ aclocal_DATA = gst-element-check-@GST_AP SUBDIRS = pkgconfig \ gst libs plugins tests \ docs \ @@ -20,7 +18,7 @@ diff -u --recursive gstreamer-1.6.2-vanilla/Makefile.am gstreamer-1.6.2/Makefile m4 \ common \ data -@@ -22,7 +21,6 @@ +@@ -22,7 +21,6 @@ endif DIST_SUBDIRS = pkgconfig \ gst libs plugins tools tests \ docs \ diff --git a/multimedia/gstreamer1/patches/002-no-tests.patch b/multimedia/gstreamer1/patches/002-no-tests.patch index d2bf13d8e0..42874100b8 100644 --- a/multimedia/gstreamer1/patches/002-no-tests.patch +++ b/multimedia/gstreamer1/patches/002-no-tests.patch @@ -1,10 +1,9 @@ -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 +--- a/configure.ac ++++ b/configure.ac +@@ -998,21 +998,6 @@ libs/gst/net/Makefile plugins/Makefile plugins/elements/Makefile + plugins/tracers/Makefile -tests/Makefile -tests/benchmarks/Makefile -tests/check/Makefile @@ -23,10 +22,9 @@ diff -u --recursive gstreamer-1.6.2-vanilla/configure.ac gstreamer-1.6.2/configu 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 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,7 @@ aclocaldir = $(datadir)/aclocal aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4 SUBDIRS = pkgconfig \ @@ -35,7 +33,7 @@ diff -u --recursive gstreamer-1.6.2-vanilla/Makefile.am gstreamer-1.6.2/Makefile docs \ m4 \ common \ -@@ -19,7 +19,7 @@ +@@ -19,7 +19,7 @@ endif # These are all the possible subdirs DIST_SUBDIRS = pkgconfig \ diff --git a/multimedia/gstreamer1/patches/003-no-docs.patch b/multimedia/gstreamer1/patches/003-no-docs.patch index cd96d4c38a..3d1187ae64 100644 --- a/multimedia/gstreamer1/patches/003-no-docs.patch +++ b/multimedia/gstreamer1/patches/003-no-docs.patch @@ -1,7 +1,6 @@ -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 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1001,18 +1001,6 @@ plugins/tracers/Makefile tools/Makefile common/Makefile common/m4/Makefile @@ -20,10 +19,9 @@ diff -u --recursive gstreamer-1.6.2-vanilla/configure.ac gstreamer-1.6.2/configu 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 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,7 +8,6 @@ aclocal_DATA = gst-element-check-@GST_AP SUBDIRS = pkgconfig \ gst libs plugins \ @@ -31,7 +29,7 @@ diff -u --recursive gstreamer-1.6.2-vanilla/Makefile.am gstreamer-1.6.2/Makefile m4 \ common \ data -@@ -20,7 +19,6 @@ +@@ -20,7 +19,6 @@ endif # These are all the possible subdirs DIST_SUBDIRS = pkgconfig \ gst libs plugins tools \ diff --git a/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch b/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch index d5b317eddb..8454061819 100644 --- a/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch +++ b/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch @@ -1,7 +1,6 @@ -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 @@ +--- a/gst/gstplugin.c ++++ b/gst/gstplugin.c +@@ -732,15 +732,8 @@ _priv_gst_plugin_load_file_for_registry goto return_error; } -- 2.30.2