diff options
-rw-r--r-- | rules/gst-plugins-good1.in | 194 | ||||
-rw-r--r-- | rules/gst-plugins-good1.make | 129 | ||||
-rwxr-xr-x | scripts/migrate/migrate_ptx | 40 |
3 files changed, 233 insertions, 130 deletions
diff --git a/rules/gst-plugins-good1.in b/rules/gst-plugins-good1.in index 61c69d83f..d0da571b3 100644 --- a/rules/gst-plugins-good1.in +++ b/rules/gst-plugins-good1.in @@ -2,37 +2,40 @@ menuconfig GST_PLUGINS_GOOD1 tristate + select HOST_MESON + select GLIB select GSTREAMER1 select GST_PLUGINS_BASE1 select ORC - select LIBPNG if GST_PLUGINS_GOOD1_LIBPNG - select LIBJPEG if GST_PLUGINS_GOOD1_JPEG - select ZLIB if GST_PLUGINS_GOOD1_ZLIB select BZIP2 if GST_PLUGINS_GOOD1_BZ2 select BZIP2_LIBBZ2 if GST_PLUGINS_GOOD1_BZ2 - select LIBCACA if GST_PLUGINS_GOOD1_LIBCACA - select XORG_LIB_X11 if GST_PLUGINS_GOOD1_X - select XORG_LIB_XDAMAGE if GST_PLUGINS_GOOD1_X - select XORG_LIB_XEXT if GST_PLUGINS_GOOD1_X - select XORG_LIB_XFIXES if GST_PLUGINS_GOOD1_X + select CAIRO if GST_PLUGINS_GOOD1_CAIRO + select FLAC if GST_PLUGINS_GOOD1_FLAC select GDK_PIXBUF if GST_PLUGINS_GOOD1_GDK_PIXBUF select GTK if GST_PLUGINS_GOOD1_GTK3 + select LIBJPEG if GST_PLUGINS_GOOD1_JPEG select LAME if GST_PLUGINS_GOOD1_LAME + select LIBCACA if GST_PLUGINS_GOOD1_LIBCACA + select MPG123 if GST_PLUGINS_GOOD1_MPG123 + select LIBPNG if GST_PLUGINS_GOOD1_PNG + select PULSEAUDIO if GST_PLUGINS_GOOD1_PULSE + select QT5 if GST_PLUGINS_GOOD1_QT5 + select QT5_GUI if GST_PLUGINS_GOOD1_QT5 + select QT5_MODULE_QTDECLARATIVE if GST_PLUGINS_GOOD1_QT5 + select LIBSHOUT if GST_PLUGINS_GOOD1_SHOUT2 select LIBSOUP if GST_PLUGINS_GOOD1_SOUP select SPEEX if GST_PLUGINS_GOOD1_SPEEX - select FLAC if GST_PLUGINS_GOOD1_FLAC - select CAIRO if GST_PLUGINS_GOOD1_CAIRO - select UDEV if GST_PLUGINS_GOOD1_GST_V4L2 - select LIBGUDEV if GST_PLUGINS_GOOD1_GST_V4L2 - select V4L_UTILS if GST_PLUGINS_GOOD1_GST_V4L2_LIBV4L2 - select V4L_UTILS_LIBV4L2 if GST_PLUGINS_GOOD1_GST_V4L2_LIBV4L2 - select LIBSHOUT if GST_PLUGINS_GOOD1_SHOUT2 - select PULSEAUDIO if GST_PLUGINS_GOOD1_PULSE - select QT5 if GST_PLUGINS_GOOD1_QT - select QT5_GUI if GST_PLUGINS_GOOD1_QT - select QT5_MODULE_QTDECLARATIVE if GST_PLUGINS_GOOD1_QT select TWOLAME if GST_PLUGINS_GOOD1_TWOLAME + select LIBGUDEV if GST_PLUGINS_GOOD1_V4L2 + select UDEV if GST_PLUGINS_GOOD1_V4L2 + select V4L_UTILS if GST_PLUGINS_GOOD1_V4L2_LIBV4L2 + select V4L_UTILS_LIBV4L2 if GST_PLUGINS_GOOD1_V4L2_LIBV4L2 + select XORG_LIB_X11 if GST_PLUGINS_GOOD1_XIMAGESRC + select XORG_LIB_XDAMAGE if GST_PLUGINS_GOOD1_XIMAGESRC + select XORG_LIB_XEXT if GST_PLUGINS_GOOD1_XIMAGESRC + select XORG_LIB_XFIXES if GST_PLUGINS_GOOD1_XIMAGESRC + select ZLIB if GST_PLUGINS_GOOD1_ZLIB prompt "gst-plugins-good " help @@ -44,9 +47,7 @@ menuconfig GST_PLUGINS_GOOD1 if GST_PLUGINS_GOOD1 -# ------------------------------ comment "dependency-less plugins" -# ------------------------------ config GST_PLUGINS_GOOD1_ALPHA bool @@ -132,7 +133,7 @@ config GST_PLUGINS_GOOD1_INTERLEAVE bool prompt "interleave" -config GST_PLUGINS_GOOD1_QTDEMUX +config GST_PLUGINS_GOOD1_ISOMP4 bool prompt "isomp4" @@ -220,140 +221,195 @@ config GST_PLUGINS_GOOD1_Y4M bool prompt "y4m" -# --------------------------------- comment "plugins with dependencies" -# --------------------------------- - -config GST_PLUGINS_GOOD1_OSS - bool - prompt "oss" - -config GST_PLUGINS_GOOD1_OSS4 - bool - prompt "oss4" - -config GST_PLUGINS_GOOD1_GST_V4L2 - bool - prompt "gst_v4l2" - -config GST_PLUGINS_GOOD1_GST_V4L2_LIBV4L2 - bool - depends on GST_PLUGINS_GOOD1_GST_V4L2 - prompt "build v4l2 plugin with libv4l2 support" - -config GST_PLUGINS_GOOD1_X - bool - prompt "x" config GST_PLUGINS_GOOD1_AALIB bool + # needs libaa depends on BROKEN prompt "aalib" + help + aalib text console video sink plugin config GST_PLUGINS_GOOD1_CAIRO bool prompt "cairo" + help + Cairo overlay plugin + +config GST_PLUGINS_GOOD1_DV + bool + # needs libdv + depends on BROKEN + prompt "dv" + help + Digital video decoder and demuxer plugin + +config GST_PLUGINS_GOOD1_DV1394 + bool + # needs libraw1394, libavc1394, libiec61883 + depends on BROKEN + prompt "dv1394" + help + Digital IEEE1394 interface video source plugin config GST_PLUGINS_GOOD1_FLAC bool prompt "flac" + help + FLAC audio codec plugin config GST_PLUGINS_GOOD1_GDK_PIXBUF bool - prompt "gdk_pixbuf" + prompt "gdk-pixbuf" + help + gdk-pixbuf image decoder, overlay, and sink plugin config GST_PLUGINS_GOOD1_GTK3 bool prompt "gtk3" + help + GTK+ video sink plugin config GST_PLUGINS_GOOD1_JACK bool - prompt "jack" + # needs libjack depends on BROKEN + prompt "jack" + help + JACK audio source/sink plugin config GST_PLUGINS_GOOD1_JPEG bool prompt "jpeg" + help + JPEG image codec plugin config GST_PLUGINS_GOOD1_LAME bool prompt "lame" + help + LAME mp3 audio encoder plugin config GST_PLUGINS_GOOD1_LIBCACA bool prompt "libcaca" + help + libcaca text console video sink plugin -config GST_PLUGINS_GOOD1_LIBDV +config GST_PLUGINS_GOOD1_MPG123 bool - depends on BROKEN - prompt "libdv" + prompt "mpg123" + help + mpg123 mp3 audio decoder plugin -config GST_PLUGINS_GOOD1_LIBPNG +config GST_PLUGINS_GOOD1_OSS bool - prompt "libpng" + prompt "oss" + help + OSS audio source/sink plugin -config GST_PLUGINS_GOOD1_MPG123 +config GST_PLUGINS_GOOD1_OSS4 bool - prompt "mpg123" - # needs libmpg123 - depends on BROKEN + prompt "oss4" + help + OSSv4 audio source/sink plugin -config GST_PLUGINS_GOOD1_PULSE +config GST_PLUGINS_GOOD1_PNG bool - prompt "pulse" + prompt "png" + help + PNG image codec plugin -config GST_PLUGINS_GOOD1_DV1394 +config GST_PLUGINS_GOOD1_PULSE bool - depends on BROKEN - prompt "dv1394" + prompt "pulse" + help + Pulseaudio audio source/sink plugin -config GST_PLUGINS_GOOD1_QT +config GST_PLUGINS_GOOD1_QT5 bool - prompt "qt" + prompt "qt5" + help + Qt5 QML video sink plugin config GST_PLUGINS_GOOD1_SHOUT2 bool prompt "shout2" + help + Shout-casting network sink plugin based on libshout2 config GST_PLUGINS_GOOD1_SOUP bool prompt "soup" + help + libsoup HTTP client source/sink plugin config GST_PLUGINS_GOOD1_SPEEX bool prompt "speex" + help + Speex audio codec plugin config GST_PLUGINS_GOOD1_TAGLIB bool + # needs libtag depends on BROKEN prompt "taglib" + help + Tag-writing plugin based on taglib config GST_PLUGINS_GOOD1_TWOLAME bool prompt "twolame" + help + twolame mp2 audio encoder plugin + +config GST_PLUGINS_GOOD1_V4L2 + bool + prompt "v4l2" + help + Build video4linux2 source/sink plugin + +config GST_PLUGINS_GOOD1_V4L2_LIBV4L2 + bool + depends on GST_PLUGINS_GOOD1_V4L2 + prompt "build v4l2 plugin with libv4l2 support" config GST_PLUGINS_GOOD1_VPX bool + # needs libvpx depends on BROKEN prompt "vpx" + help + VP8 and VP9 video codec plugin config GST_PLUGINS_GOOD1_WAVPACK bool + # needs wavpack depends on BROKEN prompt "wavpack" + help + Wavpack audio codec plugin -comment "Support options" - -config GST_PLUGINS_GOOD1_ZLIB +config GST_PLUGINS_GOOD1_XIMAGESRC bool - prompt "zlib" + prompt "ximagesrc" help - zlib support for id3demux/qtdemux/matroska + X11 ximagesrc plugin + +comment "Support options" config GST_PLUGINS_GOOD1_BZ2 bool prompt "bz2" help - bz2 support for matroska + libbz2 support in the matroska plugin + +config GST_PLUGINS_GOOD1_ZLIB + bool + prompt "zlib" + help + zlib support for isomp4/matroska endif diff --git a/rules/gst-plugins-good1.make b/rules/gst-plugins-good1.make index 008bc9a92..8409e3199 100644 --- a/rules/gst-plugins-good1.make +++ b/rules/gst-plugins-good1.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_GOOD1) += gst-plugins-good1 # # Paths and names # -GST_PLUGINS_GOOD1_VERSION := 1.14.4 -GST_PLUGINS_GOOD1_MD5 := 6e3b247097366cf2639f22abfece7113 +GST_PLUGINS_GOOD1_VERSION := 1.16.0 +GST_PLUGINS_GOOD1_MD5 := d1a7b442994d9522418de4af4330e034 GST_PLUGINS_GOOD1 := gst-plugins-good-$(GST_PLUGINS_GOOD1_VERSION) GST_PLUGINS_GOOD1_SUFFIX := tar.xz GST_PLUGINS_GOOD1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-good/$(GST_PLUGINS_GOOD1).$(GST_PLUGINS_GOOD1_SUFFIX) @@ -29,6 +29,7 @@ GST_PLUGINS_GOOD1_LICENSE := LGPL-2.1-or-later # Prepare # ---------------------------------------------------------------------------- +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_AALIB) += aalib GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_ALPHA) += alpha GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_ALPHA) += alpha alphacolor GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_APETAG) += apetag @@ -37,100 +38,112 @@ GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_AUDIOPARSERS) += audioparse GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_AUPARSE) += auparse GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_AUTODETECT) += autodetect GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_AVI) += avi +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_CAIRO) += cairo GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_CUTTER) += cutter GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_DEBUGUTILS) += debugutils -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_DEBUGUTILS) += debug navigationtest +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_DEBUGUTILS) += navigationtest debug GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_DEINTERLACE) += deinterlace GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_DTMF) += dtmf +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_DV) += dv +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_DV1394) += dv1394 GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_EFFECTV) += effectv GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_EQUALIZER) += equalizer +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_FLAC) += flac GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_FLV) += flv GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_FLX) += flx GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_FLX) += flxdec +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_GDK_PIXBUF) += gdk-pixbuf +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_GDK_PIXBUF) += gdkpixbuf GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_GOOM) += goom GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_GOOM2K1) += goom2k1 +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_GTK3) += gtk3 +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_GTK3) += gtk GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_ICYDEMUX) += icydemux GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_ID3DEMUX) += id3demux GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_IMAGEFREEZE) += imagefreeze GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_INTERLEAVE) += interleave -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_QTDEMUX) += isomp4 +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_ISOMP4) += isomp4 +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_JACK) += jack +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_JPEG) += jpeg +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_LAME) += lame GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_LAW) += law GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_LAW) += alaw mulaw GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_LEVEL) += level +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_LIBCACA) += libcaca +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_LIBCACA) += cacasink GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_MATROSKA) += matroska GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_MONOSCOPE) += monoscope +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_MPG123) += mpg123 GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_MULTIFILE) += multifile GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_MULTIPART) += multipart +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_OSS) += oss +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_OSS) += ossaudio +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_OSS4) += oss4 +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_PNG) += png +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_PULSE) += pulse +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_PULSE) += pulseaudio +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_QT5) += qt5 +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_QT5) += qmlgl GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_REPLAYGAIN) += replaygain GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_RTP) += rtp GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_RTPMANAGER) += rtpmanager GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_RTSP) += rtsp GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SHAPEWIPE) += shapewipe +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SHOUT2) += shout2 GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SMPTE) += smpte +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SOUP) += soup GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SPECTRUM) += spectrum +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SPEEX) += speex +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_TAGLIB) += taglib +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_TWOLAME) += twolame GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_UDP) += udp +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_V4L2) += v4l2 +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_V4L2) += video4linux2 +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_V4L2_LIBV4L2) += v4l2-libv4l2 GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_VIDEOBOX) += videobox GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_VIDEOCROP) += videocrop GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_VIDEOFILTER) += videofilter GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_VIDEOMIXER) += videomixer +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_VPX) += vpx GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_WAVENC) += wavenc +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_WAVPACK) += wavpack GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_WAVPARSE) += wavparse +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_XIMAGESRC) += ximagesrc GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_Y4M) += y4m GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_Y4M) += y4menc -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_OSS) += oss -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_OSS) += ossaudio -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_OSS4) += oss4 -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_GST_V4L2) += gst_v4l2 v4l2-probe -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_GST_V4L2) += video4linux2 -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_X) += x -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_X) += ximagesrc -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_AALIB) += aalib -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_CAIRO) += cairo -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_FLAC) += flac -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_GDK_PIXBUF) += gdk_pixbuf -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_GDK_PIXBUF) += gdkpixbuf -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_GTK3) += gtk3 -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_GTK3) += gtk -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_JACK) += jack -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_JPEG) += jpeg -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_LAME) += lame -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_LIBCACA) += libcaca -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_LIBCACA) += cacasink -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_LIBDV) += libdv -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_LIBPNG) += libpng -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_LIBPNG) += png -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_MPG123) += mpg123 -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_PULSE) += pulse -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_PULSE) += pulseaudio -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_QT) += qt -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_QT) += qmlgl -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_DV1394) += dv1394 -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SHOUT2) += shout2 -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SOUP) += soup -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SPEEX) += speex -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_TAGLIB) += taglib -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_TWOLAME) += twolame -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_VPX) += vpx -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_WAVPACK) += wavpack -GST_PLUGINS_GOOD1_ENABLEC-y += $(GST_PLUGINS_GOOD1_ENABLE-y) GST_PLUGINS_GOOD1_ENABLEC- += $(GST_PLUGINS_GOOD1_ENABLE-) +GST_PLUGINS_GOOD1_ENABLEC-y += $(GST_PLUGINS_GOOD1_ENABLE-y) GST_PLUGINS_GOOD1_ENABLEP-y += $(GST_PLUGINS_GOOD1_ENABLE-y) ifdef PTXCONF_KERNEL_HEADER # for new linux/videodev2.h from kernel headers -GST_PLUGINS_GOOD1_CONF_ENV := \ - $(CROSS_ENV) \ - CPPFLAGS="$(CROSS_CPPFLAGS) -isystem $(KERNEL_HEADERS_INCLUDE_DIR)" +GST_PLUGINS_GOOD1_CPPFLAGS := -isystem $(KERNEL_HEADERS_INCLUDE_DIR) +endif +ifdef PTXCONF_GST_PLUGINS_GOOD1_QT5 +GST_PLUGINS_GOOD1_PATH := PATH=$(PTXDIST_SYSROOT_CROSS)/bin/qt5:$(CROSS_PATH) endif # -# autoconf +# meson # -GST_PLUGINS_GOOD1_CONF_TOOL := autoconf +GST_PLUGINS_GOOD1_CONF_TOOL = meson GST_PLUGINS_GOOD1_CONF_OPT = \ - $(CROSS_AUTOCONF_USR) \ - $(GSTREAMER1_GENERIC_CONF_OPT) \ + $(CROSS_MESON_USR) \ + $(call GSTREAMER1_GENERIC_CONF_OPT,GStreamer Good Plug-ins) \ + -Dbz2=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_BZ2)d \ + -Ddirectsound=disabled \ + -Dorc=enabled \ + -Dosxaudio=disabled \ + -Dosxvideo=disabled \ + -Dv4l2-gudev=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_V4L2)d \ + -Dv4l2-probe=$(call ptx/truefalse,PTXCONF_GST_PLUGINS_GOOD1_V4L2) \ + -Dwaveform=disabled \ + -Dximagesrc-xdamage=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_XIMAGESRC)d \ + -Dximagesrc-xfixes=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_XIMAGESRC)d \ + -Dximagesrc-xshm=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_XIMAGESRC)d \ + +foo = \ --enable-external \ --enable-experimental \ \ @@ -143,25 +156,19 @@ GST_PLUGINS_GOOD1_CONF_OPT = \ --disable-aalibtest \ --$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_ZLIB)-zlib \ --$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_BZ2)-bz2 \ - --$(call ptx/wwo,PTXCONF_GST_PLUGINS_GOOD1_GST_V4L2)-gudev \ + --$(call ptx/wwo,PTXCONF_GST_PLUGINS_GOOD1_V4L2)-gudev \ --without-jpeg-mmx \ - --$(call ptx/wwo,PTXCONF_GST_PLUGINS_GOOD1_GST_V4L2_LIBV4L2)-libv4l2 + --$(call ptx/wwo,PTXCONF_GST_PLUGINS_GOOD1_V4L2_LIBV4L2)-libv4l2 -# -# the --with-plugins sadly only applies to depencyless plugings -# and when no plugins are sellected it builds them all. So -# --with-plugins is useless, so we generate a --enable-* -# and --disable-* below -# ifneq ($(call remove_quotes,$(GST_PLUGINS_GOOD1_ENABLEC-y)),) -GST_PLUGINS_GOOD1_CONF_OPT += --enable-$(subst $(space),$(space)--enable-,$(strip $(GST_PLUGINS_GOOD1_ENABLEC-y))) +GST_PLUGINS_GOOD1_CONF_OPT += $(addsuffix =enabled, $(addprefix -D, $(GST_PLUGINS_GOOD1_ENABLEC-y))) endif ifneq ($(call remove_quotes,$(GST_PLUGINS_GOOD1_ENABLEC-)),) -GST_PLUGINS_GOOD1_CONF_OPT += --disable-$(subst $(space),$(space)--disable-,$(strip $(GST_PLUGINS_GOOD1_ENABLEC-))) +GST_PLUGINS_GOOD1_CONF_OPT += $(addsuffix =disabled, $(addprefix -D, $(GST_PLUGINS_GOOD1_ENABLEC-))) endif -ifdef PTXCONF_GST_PLUGINS_GOOD1_QT +ifdef PTXCONF_GST_PLUGINS_GOOD1_QT5 GST_PLUGINS_GOOD1_MAKE_ENV := \ ICECC_REMOTE_CPP=0 endif @@ -179,10 +186,10 @@ $(STATEDIR)/gst-plugins-good1.targetinstall: @$(call install_fixup, gst-plugins-good1,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup, gst-plugins-good1,DESCRIPTION,missing) - @for plugin in $(GST_PLUGINS_GOOD1_ENABLEP-y); do \ +# # install all activated plugins + @$(foreach plugin,$(GST_PLUGINS_GOOD1_ENABLEP-y), \ $(call install_copy, gst-plugins-good1, 0, 0, 0644, -, \ - /usr/lib/gstreamer-1.0/libgst$${plugin}.so); \ - done + /usr/lib/gstreamer-1.0/libgst$(plugin).so)$(ptx/nl)) @$(call install_finish, gst-plugins-good1) diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx index 313afbb42..ad5d228df 100755 --- a/scripts/migrate/migrate_ptx +++ b/scripts/migrate/migrate_ptx @@ -346,3 +346,43 @@ s/^\(\(# \)\?PTXCONF_GST_PLUGINS_BASE1_\)IVORBIS\>/\1TREMOR/ # reason : plugin moved from bad to base # s/^\(\(# \)\?PTXCONF_GST_PLUGINS_\)BAD1_COMPOSITOR\>/\1BASE1_COMPOSITOR/ + +# +# from : ptxdist-2019.04.0 +# to : ptxdist-2019.05.0 +# symbol : GST_PLUGINS_GOOD1_QTDEMUX -> GST_PLUGINS_GOOD1_ISOMP4 +# reason : option was rename +# +s/^\(\(# \)\?PTXCONF_GST_PLUGINS_GOOD1_\)QTDEMUX\>/\1ISOMP4/ + +# +# from : ptxdist-2019.04.0 +# to : ptxdist-2019.05.0 +# symbol : GST_PLUGINS_GOOD1_LIBPNG -> GST_PLUGINS_GOOD1_PNG +# reason : option was rename +# +s/^\(\(# \)\?PTXCONF_GST_PLUGINS_GOOD1_\)LIBPNG\>/\1PNG/ + +# +# from : ptxdist-2019.04.0 +# to : ptxdist-2019.05.0 +# symbol : GST_PLUGINS_GOOD1_QT -> GST_PLUGINS_GOOD1_QT5 +# reason : option was rename +# +s/^\(\(# \)\?PTXCONF_GST_PLUGINS_GOOD1_\)QT\>/\1QT5/ + +# +# from : ptxdist-2019.04.0 +# to : ptxdist-2019.05.0 +# symbol : GST_PLUGINS_GOOD1_GST_V4L2 -> GST_PLUGINS_GOOD1_V4L2 +# reason : option was rename +# +s/^\(\(# \)\?PTXCONF_GST_PLUGINS_GOOD1_\)GST_V4L2\(_LIBV4L2\)\?\>/\1V4L2\3/ + +# +# from : ptxdist-2019.04.0 +# to : ptxdist-2019.05.0 +# symbol : GST_PLUGINS_GOOD1_X -> GST_PLUGINS_GOOD1_XIMAGESRC +# reason : option was rename +# +s/^\(\(# \)\?PTXCONF_GST_PLUGINS_GOOD1_\)X\>/\1XIMAGESRC/ |