From 43c3f03b7e9e1daf7ba408c704062a16c632a7da Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 31 Mar 2015 10:15:32 +0300 Subject: gstreamer: make gstreamer version a DISTRO_FEATURE GStreamer version can now be changed using a DISTRO_FEATURE: 'gstreamer010' for GStreamer 0.10 and 'gstreamer' for GStreamer 1.0 This can also be used to remove all gstreamer packages from image and toolchain. Default version is still the old 0.10 Change-Id: I54b19962ccd0dfd2f71bb44e231bf5af43ccfab9 Reviewed-by: Eirik Aavitsland --- conf/distro/b2qt.conf | 6 +-- conf/distro/include/apalis-imx6.conf | 3 +- conf/distro/include/colibri-imx6.conf | 2 + conf/distro/include/imx6qsabresd.conf | 3 +- conf/distro/include/nitrogen6x.conf | 3 +- conf/distro/include/tibidabo.conf | 3 +- recipes-qt/images/b2qt-embedded-qt5-image.bb | 3 +- recipes-qt/qt5/qtmultimedia_%.bbappend | 2 +- .../gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 1 + .../gstreamer/gstreamer1.0-plugins-ugly_%.bbappend | 1 + recipes/images/b2qt-embedded-image.bb | 3 +- .../packagegroup-b2qt-embedded-gstreamer.bb | 32 +++--------- .../packagegroup-b2qt-embedded-gstreamer010.bb | 59 ++++++++++++++++++++++ .../packagegroup-b2qt-embedded-toolchain-target.bb | 4 +- 14 files changed, 89 insertions(+), 36 deletions(-) create mode 100644 recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend create mode 100644 recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend create mode 100644 recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 1cfcac2..ac635d8 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -42,12 +42,12 @@ DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch" DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" +# use GStreamer 0.10, optionally change to "gstreamer" to use GStreamer 1.0 +DISTRO_FEATURES += "gstreamer010" + PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo" PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native" -COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" -COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" - MACHINE_EXTRA_INSTALL ?= "" MACHINE_EXTRA_INSTALL_SDK ?= "" MACHINE_EXTRA_INSTALL_SDK_HOST ?= "" diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index c1e9c1b..2ceb4fe 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf @@ -39,7 +39,8 @@ MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ libgles2-mx6 \ - gst-fsl-plugin \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \ " MACHINE_EXTRA_INSTALL_SDK = " \ diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index 8a048b1..f0b6179 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf @@ -37,6 +37,8 @@ MACHINE_EXTRA_INSTALL = "\ libegl-mx6 \ libgles2-mx6 \ gst-fsl-plugin \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \ " MACHINE_EXTRA_INSTALL_SDK = " \ diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 74b22d3..c677500 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf @@ -40,7 +40,8 @@ MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ libgles2-mx6 \ - gst-fsl-plugin \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \ libopencv-core \ libopencv-imgproc \ libopencv-objdetect \ diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index d9a11ab..819960d 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -54,7 +54,8 @@ MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ libgles2-mx6 \ - gst-fsl-plugin \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \ bcm4330-nvram-config \ libopencv-core \ libopencv-imgproc \ diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf index cb8e019..cec9fd5 100644 --- a/conf/distro/include/tibidabo.conf +++ b/conf/distro/include/tibidabo.conf @@ -34,7 +34,8 @@ MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ libgles2-mx6 \ - gst-fsl-plugin \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \ " MACHINE_EXTRA_INSTALL_SDK = " \ diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/recipes-qt/images/b2qt-embedded-qt5-image.bb index daaa6e4..924ba61 100644 --- a/recipes-qt/images/b2qt-embedded-qt5-image.bb +++ b/recipes-qt/images/b2qt-embedded-qt5-image.bb @@ -42,7 +42,8 @@ IMAGE_INSTALL += "\ ${MACHINE_EXTRA_INSTALL_QT} \ packagegroup-b2qt-embedded-base \ packagegroup-b2qt-embedded-tools \ - packagegroup-b2qt-embedded-gstreamer \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \ packagegroup-b2qt-embedded-qt5 \ packagegroup-b2qt-embedded-qt5-addons \ " diff --git a/recipes-qt/qt5/qtmultimedia_%.bbappend b/recipes-qt/qt5/qtmultimedia_%.bbappend index cb1dc53..0c2560a 100644 --- a/recipes-qt/qt5/qtmultimedia_%.bbappend +++ b/recipes-qt/qt5/qtmultimedia_%.bbappend @@ -20,4 +20,4 @@ ## ############################################################################# -PACKAGECONFIG += "gstreamer010" +PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}" diff --git a/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend new file mode 100644 index 0000000..1c5cc7c --- /dev/null +++ b/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG_append = " faad" diff --git a/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend b/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend new file mode 100644 index 0000000..eee313b --- /dev/null +++ b/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG_append = " x264" diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index 9b452c6..d8e55ef 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb @@ -38,5 +38,6 @@ inherit bootfs-image IMAGE_INSTALL += "\ packagegroup-b2qt-embedded-base \ packagegroup-b2qt-embedded-tools \ - packagegroup-b2qt-embedded-gstreamer \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \ " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb index f9892dc..b76304e 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb @@ -27,28 +27,12 @@ PR = "r0" inherit packagegroup RDEPENDS_${PN} = "\ - gst-meta-video \ - gst-meta-audio \ - gst-plugins-good \ - gst-plugins-base-app \ - gst-plugins-base-audiorate \ - gst-plugins-base-videorate \ - gst-plugins-base-encodebin \ - gst-plugins-good-videofilter \ - gst-plugins-good-id3demux \ - gst-plugins-good-auparse \ - gst-plugins-good-isomp4 \ - gst-plugins-good-icydemux \ - gst-plugins-good-video4linux2 \ - gst-plugins-good-multifile \ - gst-plugins-good-videocrop \ - gst-plugins-good-jpeg \ - gst-plugins-ugly-rmdemux \ - gst-plugins-ugly-asf \ - gst-plugins-ugly-a52dec \ - gst-plugins-bad-mpegdemux \ - gst-plugins-bad-faad \ - gst-plugins-bad-camerabin2 \ - gst-plugins-bad-jpegformat \ - gst-ffmpeg \ + gstreamer1.0-meta-base \ + gstreamer1.0-meta-video \ + gstreamer1.0-meta-audio \ + gstreamer1.0-plugins-base-meta \ + gstreamer1.0-plugins-good-meta \ + gstreamer1.0-plugins-ugly-meta \ + gstreamer1.0-plugins-bad-meta \ + gstreamer1.0-libav \ " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb new file mode 100644 index 0000000..5567303 --- /dev/null +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb @@ -0,0 +1,59 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Additional gstreamer packagegroup for B2Qt embedded Linux image" +LICENSE = "CLOSED" +PR = "r0" + +inherit packagegroup + +RDEPENDS_${PN} = "\ + gst-meta-video \ + gst-meta-audio \ + gst-plugins-good \ + gst-plugins-base-app \ + gst-plugins-base-audiorate \ + gst-plugins-base-videorate \ + gst-plugins-base-encodebin \ + gst-plugins-good-videofilter \ + gst-plugins-good-id3demux \ + gst-plugins-good-auparse \ + gst-plugins-good-isomp4 \ + gst-plugins-good-icydemux \ + gst-plugins-good-video4linux2 \ + gst-plugins-good-multifile \ + gst-plugins-good-videocrop \ + gst-plugins-good-jpeg \ + gst-plugins-ugly-rmdemux \ + gst-plugins-ugly-asf \ + gst-plugins-ugly-a52dec \ + gst-plugins-bad-mpegdemux \ + gst-plugins-bad-faad \ + gst-plugins-bad-camerabin2 \ + gst-plugins-bad-jpegformat \ + gst-plugins-ugly-mad \ + gst-plugins-ugly-mpegaudioparse \ + gst-plugins-ugly-mpeg2dec \ + gst-plugins-ugly-mpegstream \ + gst-plugins-bad-mpegvideoparse \ + gst-ffmpeg \ + " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb index 4d24c1e..b0b35d0 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb @@ -37,8 +37,8 @@ RDEPENDS_${PN} += "\ dbus-dev \ freetype-dev \ fontconfig-dev \ - gstreamer-dev \ - gst-plugins-base-dev \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer-dev gst-plugins-base-dev", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-dev gstreamer1.0-plugins-base-dev", "", d)} \ icu-dev \ libxslt-dev \ udev-dev \ -- cgit v1.2.3-54-g00ecf