From ae5ef832d12554f2f5cd7b7985e5688016674e0f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 9 Mar 2020 21:07:44 -0700 Subject: [PATCH] gst1-plugins-bad: update to 1.16.2 Switched to meson. Fixed license information. Several Makefile cleanups for consistency between packages. Enabled and added packages for a bunch of plugins. Signed-off-by: Rosen Penev --- multimedia/gst1-plugins-bad/Makefile | 283 +++++++++++++----- .../patches/001-no-translations.patch | 26 -- 2 files changed, 207 insertions(+), 102 deletions(-) delete mode 100644 multimedia/gst1-plugins-bad/patches/001-no-translations.patch diff --git a/multimedia/gst1-plugins-bad/Makefile b/multimedia/gst1-plugins-bad/Makefile index 34c297941d..ea29e1ea3e 100644 --- a/multimedia/gst1-plugins-bad/Makefile +++ b/multimedia/gst1-plugins-bad/Makefile @@ -8,26 +8,24 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-bad -PKG_VERSION:=1.16.1 -PKG_RELEASE:=2 - -PKG_MAINTAINER:=W. Michael Petullo \ - Ted Hess - -PKG_LICENSE:=LGPLv2 GPLv2 -PKG_LICENSE_FILES:=COPYING.LIB COPYING +PKG_VERSION:=1.16.2 +PKG_RELEASE:=1 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_HASH:=56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5 +PKG_HASH:=f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74 + +PKG_MAINTAINER:=W. Michael Petullo \ + Ted Hess +PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later +PKG_LICENSE_FILES:=COPYING.LIB COPYING -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk +include ../../devel/meson/meson.mk GST_BAD_LIBS:= GST_BAD_MODULES:= @@ -94,73 +92,168 @@ define Package/gstreamer1-plugins-bad/config endef +GST_COND_SELECT = -D$(1)=$(if $(CONFIG_PACKAGE_gst1-mod-$(1)),en,dis)abled + GST_VERSION:=1.0 -CONFIGURE_ARGS += \ - --disable-Bsymbolic \ - --disable-debug \ - --disable-examples \ - --disable-fatal-warnings \ - --disable-glib-asserts \ - --disable-gobject-cast-checks \ - --disable-gtk-doc-html \ - --disable-introspection \ - --disable-valgrind \ - --disable-rpath \ +MESON_ARGS += \ + $(call GST_COND_SELECT,adpcmdec) \ + $(call GST_COND_SELECT,adpcmenc) \ + $(call GST_COND_SELECT,aiff) \ + $(call GST_COND_SELECT,asfmux) \ + $(call GST_COND_SELECT,audiobuffersplit) \ + $(call GST_COND_SELECT,audiofxbad) \ + $(call GST_COND_SELECT,audiolatency) \ + $(call GST_COND_SELECT,audiomixmatrix) \ + $(call GST_COND_SELECT,audiovisualizers) \ + $(call GST_COND_SELECT,autoconvert) \ + $(call GST_COND_SELECT,bayer) \ + -Dcamerabin2=$(if $(CONFIG_PACKAGE_gst1-mod-camerabin),en,dis)abled \ + $(call GST_COND_SELECT,coloreffects) \ + -Ddebugutils=$(if $(CONFIG_PACKAGE_gst1-mod-debugutilsbad),en,dis)abled \ + $(call GST_COND_SELECT,dvbsuboverlay) \ + $(call GST_COND_SELECT,dvdspu) \ + $(call GST_COND_SELECT,faceoverlay) \ + $(call GST_COND_SELECT,festival) \ + $(call GST_COND_SELECT,fieldanalysis) \ + $(call GST_COND_SELECT,freeverb) \ + $(call GST_COND_SELECT,frei0r) \ + $(call GST_COND_SELECT,gaudieffects) \ + $(call GST_COND_SELECT,gdp) \ + $(call GST_COND_SELECT,geometrictransform) \ + $(call GST_COND_SELECT,id3tag) \ + $(call GST_COND_SELECT,inter) \ + $(call GST_COND_SELECT,interlace) \ + $(call GST_COND_SELECT,ivfparse) \ + $(call GST_COND_SELECT,ivtc) \ + $(call GST_COND_SELECT,jp2kdecimator) \ + $(call GST_COND_SELECT,jpegformat) \ + -Dlibrfb=$(if $(CONFIG_PACKAGE_gst1-mod-rfbsrc),en,dis)abled \ + $(call GST_COND_SELECT,midi) \ + -Dmpegdemux=$(if $(CONFIG_PACKAGE_gst1-mod-mpegpsdemux),en,dis)abled \ + $(call GST_COND_SELECT,mpegpsmux) \ + $(call GST_COND_SELECT,mpegtsdemux) \ + $(call GST_COND_SELECT,mpegtsmux) \ + $(call GST_COND_SELECT,mxf) \ + $(call GST_COND_SELECT,netsim) \ + -Donvif=$(if $(CONFIG_PACKAGE_gst1-mod-rtponvif),en,dis)abled \ + $(call GST_COND_SELECT,pcapparse) \ + $(call GST_COND_SELECT,pnm) \ + $(call GST_COND_SELECT,proxy) \ + -Drawparse=$(if $(CONFIG_PACKAGE_gst1-mod-legacyrawparse),en,dis)abled \ + $(call GST_COND_SELECT,removesilence) \ + -Dsdp=$(if $(CONFIG_PACKAGE_gst1-mod-sdpelem),en,dis)abled \ + $(call GST_COND_SELECT,segmentclip) \ + $(call GST_COND_SELECT,siren) \ + $(call GST_COND_SELECT,smooth) \ + $(call GST_COND_SELECT,speed) \ + $(call GST_COND_SELECT,subenc) \ + $(call GST_COND_SELECT,timecode) \ + -Dvideofilters=$(if $(CONFIG_PACKAGE_gst1-mod-videofiltersbad),en,dis)abled \ + $(call GST_COND_SELECT,videoframe_audiolevel) \ + -Dvideoparsers=$(if $(CONFIG_PACKAGE_gst1-mod-videoparsersbad),en,dis)abled \ + $(call GST_COND_SELECT,videosignal) \ + $(call GST_COND_SELECT,vmnc) \ + -Dy4m=$(if $(CONFIG_PACKAGE_gst1-mod-y4mdec),en,dis)abled \ + $(call GST_COND_SELECT,yadif) \ \ - --disable-directsound \ - --disable-directdraw \ - --disable-osx_video \ - --disable-quicktime \ - --disable-vcd \ - --disable-assrender \ - --disable-apexsink \ - --disable-bz2 \ - --disable-dc1394 \ - --disable-directfb \ - --disable-dts \ - --disable-resindvd \ - --disable-faac \ - --disable-faad \ - --disable-flite \ - --disable-gsm \ - --disable-kate \ - --disable-ladspa \ - --disable-lv2 \ - --disable-modplug \ - --disable-mimic \ - --disable-libmms \ - --disable-mpeg2enc \ - --disable-mplex \ - --disable-musepack \ - --disable-mythtv \ - --disable-nas \ - --disable-neon \ - --disable-ofa \ - --disable-rsvg \ - --disable-timidity \ - --disable-wildmidi \ - --disable-sdl \ - --disable-sdltest \ - --disable-sndfile \ - --disable-soundtouch \ - --disable-spc \ - --disable-gme \ - --disable-xvid \ - --disable-dvb \ - --disable-wininet \ - --disable-acm \ - --disable-vdpau \ - --disable-schro \ - --disable-zbar \ - --disable-srtp \ + -Dopencv=disabled \ + -Dwayland=disabled \ + -Dx11=disabled \ \ - --with-hls-crypto=nettle \ - --without-html-dir \ - --without-libiconv-prefix \ - --without-libintl-prefix \ - --with-libgcrypt-prefix="$(STAGING_DIR)/usr" \ - --with-pic + -Daom=disabled \ + -Dandroidmedia=disabled \ + -Dapplemedia=disabled \ + -Dassrender=disabled \ + $(call GST_COND_SELECT,bluez) \ + -Dbs2b=disabled \ + $(call GST_COND_SELECT,bz2) \ + -Dchromaprint=disabled \ + -Dclosedcaption=disabled \ + -Dcolormanagement=disabled \ + -Dcurl=disabled \ + -Dcurl-ssh2=disabled \ + -Dd3dvideosink=disabled \ + -Ddash=disabled \ + -Ddc1394=disabled \ + -Ddecklink=disabled \ + -Ddirectfb=disabled \ + -Ddirectsound=disabled \ + $(call GST_COND_SELECT,dtls) \ + -Ddts=disabled \ + -Ddvb=disabled \ + -Dfaac=disabled \ + $(call GST_COND_SELECT,faad) \ + -Dfbdev=$(if $(CONFIG_PACKAGE_gst1-mod-fbdevsink),en,dis)abled \ + -Dfdkaac=disabled \ + -Dflite=disabled \ + -Dfluidsynth=disabled \ + -Dgl=disabled \ + -Dgme=disabled \ + -Dgsm=disabled \ + -Dipcpipeline=disabled \ + -Diqa=disabled \ + -Dkate=disabled \ + -Dladspa=disabled \ + -Dlibde265=disabled \ + -Dlibmms=disabled \ + -Dlv2=disabled \ + -Dmodplug=disabled \ + -Dmpeg2enc=disabled \ + -Dmplex=disabled \ + -Dmsdk=disabled \ + -Dmusepack=disabled \ + -Dneon=disabled \ + -Dnvdec=disabled \ + -Dnvenc=disabled \ + -Dofa=disabled \ + -Dopenal=disabled \ + -Dopenexr=disabled \ + -Dopenh264=disabled \ + -Dopenjpeg=disabled \ + -Dopenmpt=disabled \ + -Dopenni2=disabled \ + -Dopensles=disabled \ + -Dopus=$(if $(CONFIG_PACKAGE_gst1-mod-opusparse),en,dis)abled \ + -Dresindvd=disabled \ + -Drsvg=disabled \ + -Drtmp=disabled \ + $(call GST_COND_SELECT,sbc) \ + -Dsctp=disabled \ + -Dsmoothstreaming=disabled \ + $(call GST_COND_SELECT,sndfile) \ + -Dsoundtouch=disabled \ + -Dspandsp=disabled \ + -Dsrt=disabled \ + -Dsrtp=disabled \ + -Dteletext=disabled \ + -Dtinyalsa=disabled \ + -Dttml=disabled \ + -Duvch264=disabled \ + -Dvdpau=disabled \ + -Dvoaacenc=disabled \ + -Dvoamrwbenc=disabled \ + -Dvulkan=disabled \ + -Dwasapi=disabled \ + $(call GST_COND_SELECT,webp) \ + -Dwebrtc=disabled \ + -Dwebrtcdsp=disabled \ + -Dwildmidi=disabled \ + -Dwinks=disabled \ + -Dwinscreencap=disabled \ + -Dx265=disabled \ + -Dzbar=disabled \ + -Dwpe=disabled \ + \ + $(call GST_COND_SELECT,hls) \ + -Dhls-crypto=nettle \ + -Dexamples=disabled \ + -Dtests=disabled \ + -Dintrospection=disabled \ + -Dorc=disabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled define Package/gst1-plugins-bad/install /bin/true @@ -243,36 +336,74 @@ $(eval $(call GstBuildPlugin,adpcmdec,adpcm decoding support,audio,,)) $(eval $(call GstBuildPlugin,adpcmenc,adpcm encoding support,audio,,)) $(eval $(call GstBuildPlugin,aiff,aiff support,audio tag,,)) $(eval $(call GstBuildPlugin,asfmux,asf muxing support,rtp,,)) +$(eval $(call GstBuildPlugin,audiobuffersplit,audiobuffersplit support,audio,,)) +$(eval $(call GstBuildPlugin,audiofxbad,audiofxbad support,audio,,)) +$(eval $(call GstBuildPlugin,audiolatency,audiolatency support,audio,,)) +$(eval $(call GstBuildPlugin,audiomixmatrix,audiomixmatrix support,audio,,)) +$(eval $(call GstBuildPlugin,audiovisualizers,audiovisualizers support,audio,,)) $(eval $(call GstBuildPlugin,autoconvert,autoconvert support,,,)) $(eval $(call GstBuildPlugin,bayer,bayer support,video,,)) +$(eval $(call GstBuildPlugin,bluez,bluez support,,,+bluez-libs)) +$(eval $(call GstBuildPlugin,bz2,bzip2 support,,,+libbz2)) $(eval $(call GstBuildPlugin,camerabin,camerabin support,basecamerabinsrc photography pbutils app,,)) +$(eval $(call GstBuildPlugin,coloreffects,coloreffects support,video,,)) #$(eval $(call GstBuildPlugin,dataurisrc,dataurisrc support,,,)) $(eval $(call GstBuildPlugin,debugutilsbad,debugutils support,video,,)) $(eval $(call GstBuildPlugin,dtls,DTLS support,,,+libopenssl)) +$(eval $(call GstBuildPlugin,dvbsuboverlay,dvbsuboverlay support,video,,)) $(eval $(call GstBuildPlugin,dvdspu,dvdspu support,video,,)) +$(eval $(call GstBuildPlugin,faad,faad support,audio,,+libfaad2)) +$(eval $(call GstBuildPlugin,faceoverlay,faceoverlay support,pbutils,,)) $(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,fieldanalysis,fieldanalysis support,audio,,)) +$(eval $(call GstBuildPlugin,freeverb,freeverb support,,,)) $(eval $(call GstBuildPlugin,frei0r,frei0r support,controller video,,)) +$(eval $(call GstBuildPlugin,gaudieffects,gaudieffects support,audio,,)) +$(eval $(call GstBuildPlugin,gdp,gdp support,,,)) +$(eval $(call GstBuildPlugin,geometrictransform,geometrictransform support,,,)) +$(eval $(call GstBuildPlugin,hls,HLS support,pbutils adaptivedemux,multifile,+libnettle)) $(eval $(call GstBuildPlugin,id3tag,id3tag support,tag,,)) +$(eval $(call GstBuildPlugin,inter,inter support,,,)) +$(eval $(call GstBuildPlugin,interlace,interlace support,,,)) +$(eval $(call GstBuildPlugin,ivfparse,ivfparse support,,,)) +$(eval $(call GstBuildPlugin,ivtc,ivtc support,,,)) +$(eval $(call GstBuildPlugin,jp2kdecimator,jp2kdecimator support,,,)) $(eval $(call GstBuildPlugin,jpegformat,jpegformat support,tag,,)) +$(eval $(call GstBuildPlugin,legacyrawparse,rawparse support,audio video,,)) +$(eval $(call GstBuildPlugin,midi,midi support,audio,,)) $(eval $(call GstBuildPlugin,mpegpsdemux,mpegpsdemux support,pbutils,,)) $(eval $(call GstBuildPlugin,mpegpsmux,mpegpsmux support,,,)) #$(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,netsim,netsim support,,,)) $(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,,)) +$(eval $(call GstBuildPlugin,proxy,proxy support,,,)) +$(eval $(call GstBuildPlugin,removesilence,removesilence support,audio,,)) $(eval $(call GstBuildPlugin,rfbsrc,librfb support,video,,)) +$(eval $(call GstBuildPlugin,rtponvif,rtponvif support,,,)) +$(eval $(call GstBuildPlugin,sbc,sbc support,audio,,+sbc)) $(eval $(call GstBuildPlugin,sdpelem,sdp support,rtp sdp,,)) $(eval $(call GstBuildPlugin,segmentclip,segmentclip support,audio,,)) $(eval $(call GstBuildPlugin,shm,POSIX shared memory source and sink,,,+librt)) $(eval $(call GstBuildPlugin,siren,siren support,audio rtp,,)) +$(eval $(call GstBuildPlugin,smooth,smooth support,,,)) +$(eval $(call GstBuildPlugin,sndfile,sndfile support,audio,,+libsndfile)) $(eval $(call GstBuildPlugin,speed,speed support,audio,,)) $(eval $(call GstBuildPlugin,subenc,subenc support,controller,,)) #$(eval $(call GstBuildPlugin,srtp,srtp support,rtp,,+libsrtp)) +$(eval $(call GstBuildPlugin,timecode,timecode support,,,)) +$(eval $(call GstBuildPlugin,videofiltersbad,videofiltersbad support,,,)) +$(eval $(call GstBuildPlugin,videoframe_audiolevel,videoframe_audiolevel support,,,)) +#$(eval $(call GstBuildPlugin,videoparsersbad,videoparsersbad support,,,)) +$(eval $(call GstBuildPlugin,videosignal,videosignal support,,,)) +$(eval $(call GstBuildPlugin,vmnc,vmnc support,,,)) +$(eval $(call GstBuildPlugin,webp,webp support,,,+libwebp)) +$(eval $(call GstBuildPlugin,y4mdec,y4mdec support,,,)) +$(eval $(call GstBuildPlugin,yadif,yadif support,,,)) $(eval $(call BuildPackage,gstreamer1-plugins-bad)) $(eval $(call BuildPackage,gst1-plugins-bad)) diff --git a/multimedia/gst1-plugins-bad/patches/001-no-translations.patch b/multimedia/gst1-plugins-bad/patches/001-no-translations.patch deleted file mode 100644 index 90489c7262..0000000000 --- a/multimedia/gst1-plugins-bad/patches/001-no-translations.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,11 +2,11 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc - - SUBDIRS = \ - gst-libs gst sys ext pkgconfig \ -- m4 common docs tests po tools -+ m4 common docs tests tools - - DIST_SUBDIRS = \ - gst gst-libs sys ext pkgconfig \ -- m4 common docs tests po tools -+ m4 common docs tests tools - - EXTRA_DIST = \ - depcomp \ ---- a/configure.ac -+++ b/configure.ac -@@ -2686,7 +2686,6 @@ ext/dtls/Makefile - ext/webrtc/Makefile - ext/webrtcdsp/Makefile - ext/ttml/Makefile --po/Makefile.in - docs/Makefile - docs/plugins/Makefile - docs/libs/Makefile