diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2015-02-07 18:39:55 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-07-24 13:42:09 -0300 |
| commit | e2288c950a7a50b509df53395e82844b2614a46d (patch) | |
| tree | a49cc393cad5de8056329d8f3bd5fd4a7d2bcd3c | |
| parent | b5cc46075699e10ed393742c2c46bf7664385cae (diff) | |
| download | tizen-distro-e2288c950a7a50b509df53395e82844b2614a46d.tar.gz tizen-distro-e2288c950a7a50b509df53395e82844b2614a46d.tar.bz2 tizen-distro-e2288c950a7a50b509df53395e82844b2614a46d.zip | |
qtmultimedia: Use 'qtCompileTest' mechanism for GStreamer
We can use the 'done_config_openal' and 'done_config_gstreamer' trick
to avoid the respective features it to be enabled.
(From meta-qt5 rev: 98740e63b06f3a156c27769b4d28004f07d8f8a9)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| -rw-r--r-- | meta-qt5/recipes-qt/qt5/qtmultimedia.inc | 5 | ||||
| -rw-r--r-- | meta-qt5/recipes-qt/qt5/qtmultimedia/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch | 53 |
2 files changed, 2 insertions, 56 deletions
diff --git a/meta-qt5/recipes-qt/qt5/qtmultimedia.inc b/meta-qt5/recipes-qt/qt5/qtmultimedia.inc index e85d202bd7..cd8958335e 100644 --- a/meta-qt5/recipes-qt/qt5/qtmultimedia.inc +++ b/meta-qt5/recipes-qt/qt5/qtmultimedia.inc @@ -11,12 +11,11 @@ PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base gst-plugins-bad" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'alsa', '', 'CONFIG+=done_config_alsa', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'pulseaudio', '', 'CONFIG+=done_config_pulseaudio', d)}" -EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}" -EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', '', 'CONFIG+=done_config_openal', d)}" +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'GST_VERSION=0.10', 'done_config_gstreamer', d)}" SRC_URI += "\ file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ - file://0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch \ " LICENSE += "| GPL-2.0" diff --git a/meta-qt5/recipes-qt/qt5/qtmultimedia/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch b/meta-qt5/recipes-qt/qt5/qtmultimedia/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch deleted file mode 100644 index 1654e00d8a..0000000000 --- a/meta-qt5/recipes-qt/qt5/qtmultimedia/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch +++ /dev/null @@ -1,53 +0,0 @@ -From b5c058f62a79efa213e4492ac7209b3a92f45e3b Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sat, 5 Jul 2014 09:10:02 +0200 -Subject: [PATCH 2/2] qtmultimedia.pro: Respect - OE_GSTREAMER_ENABLED,OE_GSTREAMER010_ENABLED and OE_OPENAL_ENABLED - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - qtmultimedia.pro | 21 ++++++++++++--------- - 1 file changed, 12 insertions(+), 9 deletions(-) - -diff --git a/qtmultimedia.pro b/qtmultimedia.pro -index 109dd81..54b67a8 100644 ---- a/qtmultimedia.pro -+++ b/qtmultimedia.pro -@@ -1,7 +1,7 @@ - requires(qtHaveModule(gui)) - - load(configure) --qtCompileTest(openal) -+OE_OPENAL_ENABLED:qtCompileTest(openal) - win32 { - qtCompileTest(directshow) { - qtCompileTest(wshellitem) -@@ -18,14 +18,17 @@ win32 { - qtCompileTest(alsa) - qtCompileTest(pulseaudio) - !done_config_gstreamer { -- gstver=1.0 -- cache(GST_VERSION, set, gstver); -- qtCompileTest(gstreamer) { -- qtCompileTest(gstreamer_photography) -- qtCompileTest(gstreamer_encodingprofiles) -- qtCompileTest(gstreamer_appsrc) -- qtCompileTest(linux_v4l) -- } else { -+ OE_GSTREAMER_ENABLED { -+ gstver=1.0 -+ cache(GST_VERSION, set, gstver); -+ qtCompileTest(gstreamer) { -+ qtCompileTest(gstreamer_photography) -+ qtCompileTest(gstreamer_encodingprofiles) -+ qtCompileTest(gstreamer_appsrc) -+ qtCompileTest(linux_v4l) -+ } -+ } -+ !OE_GSTREAMER_ENABLED:OE_GSTREAMER010_ENABLED { - gstver=0.10 - cache(GST_VERSION, set, gstver); - # Force a re-run of the test --- -2.1.3 - |