diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2015-02-07 18:39:55 -0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-02-13 10:16:12 -0200 |
| commit | 98740e63b06f3a156c27769b4d28004f07d8f8a9 (patch) | |
| tree | 92bf9272e7b9f57969fd1b3882c179821b6416d5 /recipes-qt/qt5/qtmultimedia | |
| parent | 0732449ee42bb3582e5c141fa2363e18beb43a9f (diff) | |
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.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia')
| -rw-r--r-- | recipes-qt/qt5/qtmultimedia/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/recipes-qt/qt5/qtmultimedia/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch b/recipes-qt/qt5/qtmultimedia/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch deleted file mode 100644 index 1654e00d..00000000 --- a/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 - |