Skip to contentSkip to conversation

fwts: Bump SRCREV to latest past 17.03.00 release

PATCH Superseded Khem Raj 2 participants 4 messages May 18, 2017 – Jun 5, 2017

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 fwts: Bump SRCREV to latest past 17.03.00 release

Helps fixing build issues with gcc7

---
 meta-oe/recipes-test/fwts/fwts_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-test/fwts/fwts_git.bb +2 -2
index 4c4ae66d6..7c8deb3ed 100644
@@ -5,9 +5,9 @@ HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519"
 
-PV = "17.03.00"
+PV = "17.03.00+git${SRCPV}"
 
-SRCREV = "e3e9d1442b4cc70f5b30199f584cec8e25aeaad4"
+SRCREV = "0153ea51cb648b3067a1b327eee6a075b6cfa330"
 SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git \
            file://0001-ignore-constant-logical-operand-warning-with-clang.patch \
            "
Signature · 1 line
2.13.0
author
#1 lore raw

PATCH 2/3 espeak, espeak-data: Update to 1.48.04 release

Disable audio codecs

---
 .../{espeak-data_1.37.bb => espeak-data_1.48.04.bb}   |  3 ---
 meta-oe/recipes-support/espeak/espeak.inc             |  6 ++++--
 .../espeak/{espeak_1.37.bb => espeak_1.48.04.bb}      |  3 ---
 .../espeak/files/fix-gcc6-errors.patch                | 19 -------------------
 4 files changed, 4 insertions(+), 27 deletions(-)
 rename meta-oe/recipes-support/espeak/{espeak-data_1.37.bb => espeak-data_1.48.04.bb} (82%)
 rename meta-oe/recipes-support/espeak/{espeak_1.37.bb => espeak_1.48.04.bb} (89%)
 delete mode 100644 meta-oe/recipes-support/espeak/files/fix-gcc6-errors.patch
meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb renamed from meta-oe/recipes-support/espeak/espeak-data_1.37.bb +0 -3
similarity index 82%
rename from meta-oe/recipes-support/espeak/espeak-data_1.37.bb
rename to meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb
index 914bf3601..79b2cc1f4 100644
@@ -22,6 +22,3 @@ do_install() {
     install -d ${D}${layout_datadir}/espeak-data
     install -m 0644 ${S}/espeak-data/phon* ${D}${layout_datadir}/espeak-data
 }
-
-SRC_URI[md5sum] = "5c7b292d0537232868b4ac1317d76c02"
-SRC_URI[sha256sum] = "77f406c345362185ec4f362bf49f61d202e01ac9b9cd5c14f803195a544ce6d3"
meta-oe/recipes-support/espeak/espeak.inc +4 -2
index 5d0b40308..97873f22e 100644
@@ -3,8 +3,10 @@ SECTION = "base"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://License.txt;md5=cb7a20edb4c9f5f478de6523dcd7362c"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/espeak/espeak-${PV}-source.zip \
-           file://fix-gcc6-errors.patch"
+SRC_URI = "http://downloads.sourceforge.net/espeak/espeak-1.48.04-source.zip \
+"
+SRC_URI[md5sum] = "cadd7482eaafe9239546bdc09fa244c3"
+SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659"
 
 S = "${WORKDIR}/espeak-${PV}-source"
 
meta-oe/recipes-support/espeak/espeak_1.48.04.bb renamed from meta-oe/recipes-support/espeak/espeak_1.37.bb +0 -3
similarity index 89%
rename from meta-oe/recipes-support/espeak/espeak_1.37.bb
rename to meta-oe/recipes-support/espeak/espeak_1.48.04.bb
index 273fe340e..552f40413 100644
@@ -4,9 +4,6 @@ inherit siteinfo
 EXTRA_PHONEMES = '${@bb.utils.contains("SITEINFO_ENDIANNESS", "be",  "espeak-data (= ${PV})", "", d)}'
 RDEPENDS_${PN} = "portaudio-v19 ${EXTRA_PHONEMES}"
 
-SRC_URI[md5sum] = "5c7b292d0537232868b4ac1317d76c02"
-SRC_URI[sha256sum] = "77f406c345362185ec4f362bf49f61d202e01ac9b9cd5c14f803195a544ce6d3"
-
 CXXFLAGS += "-DUSE_PORTAUDIO"
 TARGET_CC_ARCH += "${LDFLAGS}"
 
meta-oe/recipes-support/espeak/files/fix-gcc6-errors.patch deleted +0 -19
deleted file mode 100644
index 9cf23cf03..000000000
@@ -1,19 +0,0 @@
-Fix gcc6 errors with narrowing
-
-| tr_languages.cpp:462:73: error: narrowing conversion of '171' from 'int' to 'char' inside { } [-Wnarrowing]
-|     static const char ko_voiced[] = {0x02,0x05,0x06,0xab,0xaf,0xb7,0xbc,0};  // voiced consonants, l,m,n,N
-
-Upstream-Status: Backport
-
-Signed-off-by: Derek Straka <[email protected]>
---- a/src/tr_languages.cpp
-+++ b/src/tr_languages.cpp
-@@ -459,7 +459,7 @@
- 	case L('k','o'):   // Korean, TEST
- 		{
- 			static const char ko_ivowels[] = {0x63,0x64,0x67,0x68,0x6d,0x72,0x74,0x75,0};  // y and i vowels
--			static const char ko_voiced[] = {0x02,0x05,0x06,0xab,0xaf,0xb7,0xbc,0};  // voiced consonants, l,m,n,N
-+			static const char ko_voiced[] = {0x02,0x05,0x06,(char)0xab,(char)0xaf,(char)0xb7,(char)0xbc,0};  // voiced consonants, l,m,n,N
- 			tr = new Translator();
- 
- 			tr->letter_bits_offset = OFFSET_KOREAN;
Signature · 1 line
2.13.0
author
#2 lore raw

PATCH v2 3/3 rygel: Update to 0.34.0

In reply to Khem Raj

Fix build without X
Licence is more consistent now see

https://github.com/GNOME/rygel/commit/cdcb6bd55efd0c3b7a2fd4ae5c3d8556f69f8402

---
 .../rygel/{rygel_0.28.2.bb => rygel_0.34.0.bb}     | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)
 rename meta-multimedia/recipes-connectivity/rygel/{rygel_0.28.2.bb => rygel_0.34.0.bb} (74%)
meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb renamed from meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb +16 -8
similarity index 74%
rename from meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb
rename to meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb
index 38fac65d5..d2eda6bf9 100644
@@ -5,26 +5,27 @@ Additionally, media player software may use Rygel to become a MediaRenderer \
 that may be controlled remotely by a UPnP or DLNA Controller."
 HOMEPAGE = "http://live.gnome.org/Rygel"
 
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-                    file://src/rygel/rygel-main.vala;endline=27;md5=99324118da4c012d25edae2f779ae9b3"
+LICENSE = "LGPL1.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 gstreamer1.0-plugins-base ossp-uuid libgee libsoup-2.4 libmediaart-2.0 libunistring sqlite3 intltool-native"
 RDEPENDS_${PN} = "gstreamer1.0-plugins-base-playback shared-mime-info"
 RRECOMMENDS_${PN} = "rygel-plugin-media-export"
 
 GNOME_COMPRESS_TYPE = "xz"
-SRC_URI[archive.md5sum] = "9fbe4fb53b6cfa2f3f3723b7649a2215"
-SRC_URI[archive.sha256sum] = "9ea23df7186caac5f1aad3137edf6d507d339b9a469fc3133df4043fa66b61f5"
+SRC_URI[archive.md5sum] = "7d8923324b280cd5452803d61176a34a"
+SRC_URI[archive.sha256sum] = "fbb2d46cbe4e750df6610b4c66b2278f06d1f71a257c7903e676ccb394dad418"
 
-inherit gnomebase vala gobject-introspection
+inherit gnomebase vala gobject-introspection gettext systemd
 
 EXTRA_OECONF = "--disable-tracker-plugin --with-media-engine=gstreamer"
 
-PACKAGECONFIG ?= "external mpris mediathek ruih media-export gst-launch gtk+3"
+PACKAGECONFIG ?= "external mpris ruih media-export gst-launch"
+
+PACKAGECONFIG_append = "${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk+3", "", d)}"
+
 PACKAGECONFIG[external] = "--enable-external-plugin,--disable-external-plugin"
 PACKAGECONFIG[mpris] = "--enable-mpris-plugin,--disable-mpris-plugin"
-PACKAGECONFIG[mediathek] = "--enable-mediathek-plugin,--disable-mediathek-plugin"
 PACKAGECONFIG[ruih] = "--enable-ruih-plugin,--disable-ruih-plugin"
 PACKAGECONFIG[media-export] = "--enable-media-export-plugin,--disable-media-export-plugin"
 PACKAGECONFIG[gst-launch] = "--enable-gst-launch-plugin,--disable-gst-launch-plugin"
@@ -36,6 +37,11 @@ do_install_append() {
        # Remove .la files for loadable modules
        rm -f ${D}/${libdir}/rygel-${LIBV}/engines/*.la
        rm -f ${D}/${libdir}/rygel-${LIBV}/plugins/*.la
+       if [ -e ${D}${libdir}/systemd/user/rygel.service ]; then
+               mkdir -p ${D}${systemd_unitdir}/system
+               mv ${D}${libdir}/systemd/user/rygel.service ${D}${systemd_unitdir}/system
+               rmdir ${D}${libdir}/systemd/user ${D}${libdir}/systemd
+       fi
 }
 
 FILES_${PN} += "${libdir}/rygel-${LIBV}/engines ${datadir}/dbus-1 ${datadir}/icons"
@@ -46,6 +52,8 @@ ALLOW_EMPTY_${PN}-meta = "1"
 
 PACKAGES_DYNAMIC = "${PN}-plugin-*"
 
+SYSTEMD_SERVICE_${PN} = "rygel.service"
+
 python populate_packages_prepend () {
     rygel_libdir = d.expand('${libdir}/rygel-${LIBV}')
     postinst = d.getVar('plugin_postinst')
Signature · 1 line
2.13.0
#3 lore raw
In reply to Khem Raj

Fails to build for qemux86 now:
http://errors.yoctoproject.org/Errors/Details/143592/

Quoted 35 lines · Khem Raj

Helps fixing build issues with gcc7

---
 meta-oe/recipes-test/fwts/fwts_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-test/fwts/fwts_git.bb +0 -0
index 4c4ae66d6..7c8deb3ed 100644
@@ -5,9 +5,9 @@ HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=

31da590f3e9f3bd34dcdb9e4db568519"

meta-oe/recipes-test/fwts/fwts_git.bb +2 -2
-PV = "17.03.00"
+PV = "17.03.00+git${SRCPV}"
 
-SRCREV = "e3e9d1442b4cc70f5b30199f584cec8e25aeaad4"
+SRCREV = "0153ea51cb648b3067a1b327eee6a075b6cfa330"
 SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git \
            file://0001-ignore-constant-logical-operand-warning-with-clang.patch
\
            "

--
2.13.0

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel