diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-16 13:15:26 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-18 12:07:34 +0200 |
commit | 18741e483851e1a6aae79992b130aee34ad48879 (patch) | |
tree | c6523af371af79a48d726578217d6b3b1570beb0 /recipes-qt/qt5/qtmultimedia_git.bb | |
parent | d2c05c81e8230358dca80cf9df67e49f9f672a29 (diff) | |
download | meta-qt5-18741e483851e1a6aae79992b130aee34ad48879.tar.gz |
recipes-git: upgrade to 5.5
* based on my WIP patch + fixes from John Mullen
* I was trying to get rhid of 0003-Add-external-hostbindir-option.patch
and 0010-Add-external-hostbindir-option-for-native-sdk.patch by using
upstream configure parameter added in some previous version, but I've
failed, so now good-old -external-hostbindir parameter is back
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index bab9bee3..5c05145e 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -4,9 +4,9 @@ require qt5-git.inc | |||
4 | # There are no LGPLv3-only licensed files in this component. | 4 | # There are no LGPLv3-only licensed files in this component. |
5 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 5 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
6 | LIC_FILES_CHKSUM = " \ | 6 | LIC_FILES_CHKSUM = " \ |
7 | file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 7 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ |
8 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ | 8 | file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ |
9 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | 9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
11 | " | 11 | " |
12 | 12 | ||
@@ -30,8 +30,4 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer010', 'G | |||
30 | # Disable GStreamer if completely disabled | 30 | # Disable GStreamer if completely disabled |
31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', 'CONFIG+=done_config_gstreamer', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', 'CONFIG+=done_config_gstreamer', d)}" |
32 | 32 | ||
33 | SRC_URI += "\ | 33 | SRCREV = "3f15c1b17e55b5b118d11621f85fa74f7cc74ae6" |
34 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ | ||
35 | " | ||
36 | |||
37 | SRCREV = "cc0569a038f6116df559508518b6dacb15be8520" | ||