diff options
-rw-r--r-- | conf/distro/b2qt.conf | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bbappend | 4 | ||||
-rw-r--r-- | recipes/fonts/otf-noto.bb | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index ce00d12..bf0a05b 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf | |||
@@ -57,7 +57,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit" | |||
57 | FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache" | 57 | FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache" |
58 | 58 | ||
59 | # backport from oe/krogoth, needed by meta-qt5 | 59 | # backport from oe/krogoth, needed by meta-qt5 |
60 | PACKAGECONFIG_CONFARGS = "${EXTRA_OECONF}" | 60 | PACKAGECONFIG_CONFARGS += "${EXTRA_OECONF}" |
61 | 61 | ||
62 | # use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10 | 62 | # use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10 |
63 | DISTRO_FEATURES += "gstreamer" | 63 | DISTRO_FEATURES += "gstreamer" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index c17ad80..16561f8 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend | |||
@@ -27,6 +27,8 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}" | 30 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ |
31 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ | ||
32 | ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" | ||
31 | 33 | ||
32 | SRCREV = "f2b9fb776b78fc10424c0325ab4316a45360130e" | 34 | SRCREV = "f2b9fb776b78fc10424c0325ab4316a45360130e" |
diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb index 468516b..c868329 100644 --- a/recipes/fonts/otf-noto.bb +++ b/recipes/fonts/otf-noto.bb | |||
@@ -31,17 +31,17 @@ SUMMARY = "Noto Sans CJK" | |||
31 | SECTION = "fonts" | 31 | SECTION = "fonts" |
32 | HOMEPAGE = "http://www.google.com/get/noto" | 32 | HOMEPAGE = "http://www.google.com/get/noto" |
33 | LICENSE = "OFL-1.1" | 33 | LICENSE = "OFL-1.1" |
34 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE_CJK.txt;md5=55719faa0112708e946b820b24b14097" | 34 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE_OFL.txt;md5=55719faa0112708e946b820b24b14097" |
35 | 35 | ||
36 | INHIBIT_DEFAULT_DEPS = "1" | 36 | INHIBIT_DEFAULT_DEPS = "1" |
37 | 37 | ||
38 | inherit allarch fontcache | 38 | inherit allarch fontcache |
39 | 39 | ||
40 | PV = "1.004" | 40 | PV = "1.004" |
41 | SRC_URI = "https://noto-website.storage.googleapis.com/pkgs/NotoSansCJKSC-hinted.zip" | 41 | SRC_URI = "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKsc-hinted.zip" |
42 | 42 | ||
43 | SRC_URI[md5sum] = "c0fa6153aa826ee96041ba4470a1f51f" | 43 | SRC_URI[md5sum] = "3a2e70a4cd1f4ca4b546146b8556dffb" |
44 | SRC_URI[sha256sum] = "31459f6d8c36a1136bec3f8d720b2b637e4dded681b7bb610186c9986be25848" | 44 | SRC_URI[sha256sum] = "89646c86a48c1d5d25d435c31d673695bbd5751534004e9746f7d4aa71402a8f" |
45 | 45 | ||
46 | S = "${WORKDIR}" | 46 | S = "${WORKDIR}" |
47 | 47 | ||