* [PATCH 01/15] gtkmm3: upgrade 3.24.1 -> 3.24.2
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
@ 2019-10-25 7:20 ` Andreas Müller
2019-10-25 7:21 ` [PATCH 02/15] geany: upgrade 1.34.1 -> 1.36 Andreas Müller
` (14 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:20 UTC (permalink / raw)
To: openembedded-devel
This is a bugfix release - most notable memory leaks.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../recipes-gnome/gtk+/{gtkmm3_3.24.1.bb => gtkmm3_3.24.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-gnome/gtk+/{gtkmm3_3.24.1.bb => gtkmm3_3.24.2.bb} (78%)
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.1.bb b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb
similarity index 78%
rename from meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.1.bb
rename to meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb
index 6dd051337..4ded67901 100644
--- a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.1.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb
@@ -14,8 +14,8 @@ inherit gnomebase distro_features_check
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI[archive.md5sum] = "9524ed4e5c821d13eeda49ba2a78f024"
-SRC_URI[archive.sha256sum] = "ddfe42ed2458a20a34de252854bcf4b52d3f0c671c045f56b42aa27c7542d2fd"
+SRC_URI[archive.md5sum] = "e311db484ca9c53f1689d35f5f58a06b"
+SRC_URI[archive.sha256sum] = "6d71091bcd1863133460d4188d04102810e9123de19706fb656b7bb915b4adc3"
SRC_URI += "file://0001-do-not-build-demos.patch"
EXTRA_OECONF = " --disable-documentation "
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 02/15] geany: upgrade 1.34.1 -> 1.36
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
2019-10-25 7:20 ` [PATCH 01/15] gtkmm3: upgrade 3.24.1 -> 3.24.2 Andreas Müller
@ 2019-10-25 7:21 ` Andreas Müller
2019-10-25 7:21 ` [PATCH 03/15] geany-plugins: upgrade 1.34 " Andreas Müller
` (13 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../geany/{geany_1.34.1.bb => geany_1.36.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-devtools/geany/{geany_1.34.1.bb => geany_1.36.bb} (69%)
diff --git a/meta-oe/recipes-devtools/geany/geany_1.34.1.bb b/meta-oe/recipes-devtools/geany/geany_1.36.bb
similarity index 69%
rename from meta-oe/recipes-devtools/geany/geany_1.34.1.bb
rename to meta-oe/recipes-devtools/geany/geany_1.36.bb
index aab535d85..193c198a1 100644
--- a/meta-oe/recipes-devtools/geany/geany_1.34.1.bb
+++ b/meta-oe/recipes-devtools/geany/geany_1.36.bb
@@ -9,9 +9,9 @@ inherit distro_features_check autotools pkgconfig perlnative pythonnative gettex
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI = "http://download.geany.org/${BP}.tar.bz2"
-SRC_URI[md5sum] = "87220f4a0e03623ab9d86820f6be7b5d"
-SRC_URI[sha256sum] = "e765efd89e759defe3fd797d8a2052afbb4b23522efbcc72e3a72b7f1093ec11"
+SRC_URI = "https://download.geany.org/${BP}.tar.bz2"
+SRC_URI[md5sum] = "53216a43345e2b6dbefa02ac24885753"
+SRC_URI[sha256sum] = "9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e"
FILES_${PN} += "${datadir}/icons"
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 03/15] geany-plugins: upgrade 1.34 -> 1.36
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
2019-10-25 7:20 ` [PATCH 01/15] gtkmm3: upgrade 3.24.1 -> 3.24.2 Andreas Müller
2019-10-25 7:21 ` [PATCH 02/15] geany: upgrade 1.34.1 -> 1.36 Andreas Müller
@ 2019-10-25 7:21 ` Andreas Müller
2019-10-25 7:21 ` [PATCH 04/15] libstemmer: initial add 2.0.0 Andreas Müller
` (12 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../geany/{geany-plugins_1.34.bb => geany-plugins_1.36.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-devtools/geany/{geany-plugins_1.34.bb => geany-plugins_1.36.bb} (98%)
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.34.bb b/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb
similarity index 98%
rename from meta-oe/recipes-devtools/geany/geany-plugins_1.34.bb
rename to meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb
index 84adc7abe..f76899845 100644
--- a/meta-oe/recipes-devtools/geany/geany-plugins_1.34.bb
+++ b/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb
@@ -29,11 +29,11 @@ inherit distro_features_check autotools pkgconfig gtk-icon-cache
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI = " \
- http://plugins.geany.org/${BPN}/${BP}.tar.bz2 \
+ https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \
file://0001-Use-pkg-config-to-find-gpgme.patch \
"
-SRC_URI[md5sum] = "bf5fdd50727ad8bbbfe00027ccf2dac5"
-SRC_URI[sha256sum] = "244417c681636e82a63cf6f9901b5b7f3889168f7d9b5ba9b45601767a589c3b"
+SRC_URI[md5sum] = "91fb4634953702f914d9105da7048a33"
+SRC_URI[sha256sum] = "ebe18dd699292174622e8cb8745b020ada8a5be3b604ab980af36e8518df7ce6"
do_configure_prepend() {
rm -f ${S}/build/cache/glib-gettext.m4
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 04/15] libstemmer: initial add 2.0.0
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
` (2 preceding siblings ...)
2019-10-25 7:21 ` [PATCH 03/15] geany-plugins: upgrade 1.34 " Andreas Müller
@ 2019-10-25 7:21 ` Andreas Müller
2019-10-25 7:21 ` [PATCH 05/15] appstream-glib: initial add 0.7.16 Andreas Müller
` (11 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:21 UTC (permalink / raw)
To: openembedded-devel
It is a dependency for upcoming appstream-glib
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../libstemmer/0001-Build-so-lib.patch | 63 +++++++++++++++++++
...ds-do-link-with-LDFLAGS-set-by-build.patch | 46 ++++++++++++++
.../libstemmer/libstemmer_git.bb | 39 ++++++++++++
3 files changed, 148 insertions(+)
create mode 100644 meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch
create mode 100644 meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch
create mode 100644 meta-gnome/recipes-support/libstemmer/libstemmer_git.bb
diff --git a/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch b/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch
new file mode 100644
index 000000000..73ebeb484
--- /dev/null
+++ b/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch
@@ -0,0 +1,63 @@
+From eacc9e9c62a3857ce1e2e24b81fc22d8ae91f422 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 9 May 2019 22:06:48 +0200
+Subject: [PATCH] Build so-lib
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Stolen from [1]
+
+[1] https://aur.archlinux.org/cgit/aur.git/commit/dynamiclib.patch?h=snowball-git&id=a9cbf4f42f3661e4b8f791cd4374233821716ea1
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ GNUmakefile | 7 +++++--
+ libstemmer/symbol.map | 6 ++++++
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+ create mode 100644 libstemmer/symbol.map
+
+diff --git a/GNUmakefile b/GNUmakefile
+index cbd6ff7..a85230b 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -142,10 +142,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o)
+ JAVA_CLASSES = $(JAVA_SOURCES:.java=.class)
+ JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class)
+
+-CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
++CFLAGS=-O2 -fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.o libstemmer.so stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+
+ clean:
+ rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -192,6 +192,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS)
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ $(AR) -cru $@ $^
+
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ $(CC) $(CFLAGS) -o $@ $^
+
+diff --git a/libstemmer/symbol.map b/libstemmer/symbol.map
+new file mode 100644
+index 0000000..7a3d423
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++ global:
++ sb_stemmer_*;
++ local:
++ *;
++};
+--
+2.20.1
+
diff --git a/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch b/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch
new file mode 100644
index 000000000..69c1d670e
--- /dev/null
+++ b/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch
@@ -0,0 +1,46 @@
+From 23eacfbcc10c777ce47283a5285455ec83c8aa41 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 6 Oct 2019 13:05:08 +0200
+Subject: [PATCH] snowball/stemwords: do link with LDFLAGS set by build
+ environment
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some (cross-)build systems as OpeneEmbedded are picky (for certain reasons) if
+their LDFLAGS are ignored.
+
+Upstream-Status: Submitted [1]
+
+[1] https://github.com/snowballstem/snowball/pull/120
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ GNUmakefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 76f6ae9..47c6077 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -179,7 +179,7 @@ clean:
+ -rmdir $(js_output_dir)
+
+ snowball: $(COMPILER_OBJECTS)
+- $(CC) $(CFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+
+ $(COMPILER_OBJECTS): $(COMPILER_HEADERS)
+
+@@ -204,7 +204,7 @@ libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^
+
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+- $(CC) $(CFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+
+ csharp_stemwords: $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES)
+ $(MCS) -unsafe -target:exe -out:$@ $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES)
+--
+2.21.0
+
diff --git a/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb b/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb
new file mode 100644
index 000000000..96dd880b6
--- /dev/null
+++ b/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb
@@ -0,0 +1,39 @@
+SUMMARY = "Snowball compiler and stemming algorithms"
+HOMEPAGE = "https://snowballstem.org/"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2750797da77c1d784e7626b3f7d7ff3e"
+
+DEPENDS_class-target = "${BPN}-native"
+
+SRC_URI = "\
+ git://github.com/snowballstem/snowball.git \
+ file://0001-Build-so-lib.patch \
+ file://0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch \
+"
+SRCREV = "c70ed64f9d41c1032fba4e962b054f8e9d489a74"
+S = "${WORKDIR}/git"
+PV = "2.0.0"
+LIBVER = "0.0.0"
+
+inherit lib_package
+
+BBCLASSEXTEND = "native"
+
+do_compile_prepend_class-target() {
+ # use native tools
+ sed -i 's:./snowball :snowball :g' ${S}/GNUmakefile
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 755 ${S}/snowball ${D}${bindir}
+ install -m 755 ${S}/stemwords ${D}${bindir}
+
+ install -d ${D}${libdir}
+ install -m 755 ${S}/libstemmer.so.${LIBVER} ${D}${libdir}/
+ ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so.0
+ ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so
+
+ install -d ${D}${includedir}
+ install -m 644 ${S}/include/*.h ${D}${includedir}
+}
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 05/15] appstream-glib: initial add 0.7.16
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
` (3 preceding siblings ...)
2019-10-25 7:21 ` [PATCH 04/15] libstemmer: initial add 2.0.0 Andreas Müller
@ 2019-10-25 7:21 ` Andreas Müller
2019-10-25 7:21 ` [PATCH 06/15] yelp-xsl: initial add 3.34.0 Andreas Müller
` (10 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:21 UTC (permalink / raw)
To: openembedded-devel
It is a dependency for upcoming gnome recipes
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../appstream-glib/appstream-glib_0.7.16.bb | 37 +++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.16.bb
diff --git a/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.16.bb b/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.16.bb
new file mode 100644
index 000000000..ec3e4a3d3
--- /dev/null
+++ b/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.16.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Objects and helper methods to help reading and writing AppStream metadata"
+HOMEPAGE = "https://people.freedesktop.org/~hughsient/appstream-glib/index.htm"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = " \
+ gperf-native \
+ glib-2.0 \
+ gtk+3 \
+ libyaml \
+ libarchive \
+ libsoup-2.4 \
+ json-glib \
+ gdk-pixbuf \
+ freetype \
+ fontconfig \
+ libstemmer \
+"
+
+inherit meson gobject-introspection gettext bash-completion
+
+SRC_URI = "https://people.freedesktop.org/~hughsient/${BPN}/releases/${BP}.tar.xz"
+SRC_URI[md5sum] = "78306049412396a72746186452abdf66"
+SRC_URI[sha256sum] = "04f290d73bc865071112076b8a3345df2730783a16af976fe3becfd2f50d5992"
+
+EXTRA_OEMESON = " \
+ -Drpm=false \
+"
+
+FILES_${PN} += "${libdir}/asb-plugins-5"
+
+FILES_${PN}-dev += " \
+ ${datadir}/installed-tests \
+ ${datadir}/gettext \
+"
+
+BBCLASSEXTEND = "native"
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 06/15] yelp-xsl: initial add 3.34.0
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
` (4 preceding siblings ...)
2019-10-25 7:21 ` [PATCH 05/15] appstream-glib: initial add 0.7.16 Andreas Müller
@ 2019-10-25 7:21 ` Andreas Müller
2019-10-25 7:21 ` [PATCH 07/15] yelp-tools: initial add 3.32.2 Andreas Müller
` (9 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:21 UTC (permalink / raw)
To: openembedded-devel
It is a dependecy for upcoming yelp-tools.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../recipes-gnome/yelp/yelp-xsl_3.34.0.bb | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb
diff --git a/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb b/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb
new file mode 100644
index 000000000..17994414e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb
@@ -0,0 +1,18 @@
+SUMMARY = "XSL stylesheets for the yelp help browser"
+LICENSE = "LGPLv2.1 & GPLv2"
+LIC_FILES_CHKSUM = " \
+ file://COPYING;md5=3e2bad3c5e3990988f9fa1bc5785b147 \
+ file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
+ file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 \
+"
+
+inherit gnomebase gettext
+
+DEPENDS += "libxml2 itstool-native"
+
+SRC_URI[archive.md5sum] = "f8c4e777aee8b055251c333ef48a0cd0"
+SRC_URI[archive.sha256sum] = "e8063aee67d1df634f3d062f1c28130b2dabb3c0c66396b1af90388f34e14ee2"
+
+RDEPENDS_${PN} += "libxml2 itstool"
+
+BBCLASSEXTEND = "native"
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 07/15] yelp-tools: initial add 3.32.2
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
` (5 preceding siblings ...)
2019-10-25 7:21 ` [PATCH 06/15] yelp-xsl: initial add 3.34.0 Andreas Müller
@ 2019-10-25 7:21 ` Andreas Müller
2019-10-25 7:21 ` [PATCH 08/15] yelp: initial add 3.34.0 Andreas Müller
` (8 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:21 UTC (permalink / raw)
To: openembedded-devel
yelp-tools is necessary to build gnome-help files
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../recipes-gnome/yelp/yelp-tools_3.32.2.bb | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb
diff --git a/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb b/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb
new file mode 100644
index 000000000..6a6397cee
--- /dev/null
+++ b/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Collection of scripts and build utilities for documentation"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = " \
+ file://COPYING;md5=d67c6f9f1515506abfea4f0d920c0774 \
+ file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
+"
+
+inherit gnomebase
+
+DEPENDS += " \
+ libxslt-native \
+ libxml2-native \
+ itstool-native \
+ yelp-xsl \
+"
+
+SRC_URI[archive.md5sum] = "7856f9ad0492aaf9adf097f5058bfc2e"
+SRC_URI[archive.sha256sum] = "183856b5ed0b0bb2c05dd1204af023946ed436943e35e789afb0295e5e71e8f9"
+
+RDEPENDS_${PN} += "yelp-xsl"
+
+BBCLASSEXTEND = "native"
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 08/15] yelp: initial add 3.34.0
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
` (6 preceding siblings ...)
2019-10-25 7:21 ` [PATCH 07/15] yelp-tools: initial add 3.32.2 Andreas Müller
@ 2019-10-25 7:21 ` Andreas Müller
2019-10-25 7:21 ` [PATCH 09/15] zenity: pretify recipe a bit Andreas Müller
` (7 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb | 33 ++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb
diff --git a/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb b/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb
new file mode 100644
index 000000000..13c4e52bf
--- /dev/null
+++ b/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb
@@ -0,0 +1,33 @@
+SUMMARY = "Help browser for the GNOME desktop"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = " \
+ file://COPYING;md5=6e1b9cb787e76d7e6946887a65caa754 \
+"
+
+inherit gnomebase autotools-brokensep gsettings gettext gtk-doc
+
+SRC_URI[archive.md5sum] = "776e29bd16424c8712cbf340cfe6429b"
+SRC_URI[archive.sha256sum] = "e3d6527c5963d73206891b32f1f23363164be57de248555513bd0be77a7bd045"
+
+DEPENDS += " \
+ libxml2-native \
+ glib-2.0-native \
+ itstool-native \
+ gtk+3 \
+ appstream-glib \
+ libxslt \
+ sqlite3 \
+ webkitgtk \
+ yelp-xsl \
+"
+
+do_configure_prepend() {
+ export ITSTOOL=${STAGING_BINDIR_NATIVE}/itstool
+}
+
+FILES_${PN} += " \
+ ${datadir}/metainfo \
+ ${datadir}/yelp-xsl \
+"
+
+RDEPENDS_${PN} += "yelp-xsl"
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 09/15] zenity: pretify recipe a bit
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
` (7 preceding siblings ...)
2019-10-25 7:21 ` [PATCH 08/15] yelp: initial add 3.34.0 Andreas Müller
@ 2019-10-25 7:21 ` Andreas Müller
2019-10-25 11:45 ` Adrian Bunk
2019-10-25 7:21 ` [PATCH 10/15] glibmm: upgrade 2.60.0 -> 2.62.0 Andreas Müller
` (6 subsequent siblings)
15 siblings, 1 reply; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:21 UTC (permalink / raw)
To: openembedded-devel
"xz" is default for GNOME_COMPRESS_TYPE
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb b/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb
index 295288bfb..707f78c6b 100644
--- a/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb
+++ b/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb
@@ -10,13 +10,12 @@ DEPENDS = "gtk+3"
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
+SRC_URI = " \
+ ${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
file://0001-build-don-t-generate-manual.patch \
"
-
SRC_URI[archive.md5sum] = "ba2b2a13248773b4ec0fd323d95e6d5a"
SRC_URI[archive.sha256sum] = "e786e733569c97372c3ef1776e71be7e7599ebe87e11e8ad67dcc2e63a82cd95"
-GNOME_COMPRESS_TYPE="xz"
do_install_append() {
# Remove gdialog compatibility helper - we don't want to pull in perl
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 09/15] zenity: pretify recipe a bit
2019-10-25 7:21 ` [PATCH 09/15] zenity: pretify recipe a bit Andreas Müller
@ 2019-10-25 11:45 ` Adrian Bunk
2019-10-25 12:07 ` Andreas Müller
0 siblings, 1 reply; 25+ messages in thread
From: Adrian Bunk @ 2019-10-25 11:45 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembedded-devel
On Fri, Oct 25, 2019 at 09:21:07AM +0200, Andreas Müller wrote:
>...
> -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
> +SRC_URI = " \
> + ${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
> file://0001-build-don-t-generate-manual.patch \
> "
>...
This should also stop overwriting the gnomebase SRC_URI, replace with:
SRC_URI += " \
file://0001-build-don-t-generate-manual.patch \
"
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 09/15] zenity: pretify recipe a bit
2019-10-25 11:45 ` Adrian Bunk
@ 2019-10-25 12:07 ` Andreas Müller
2019-10-25 17:50 ` Randy MacLeod
0 siblings, 1 reply; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 12:07 UTC (permalink / raw)
To: Adrian Bunk; +Cc: openembedded-devel
On Fri, Oct 25, 2019 at 1:45 PM Adrian Bunk <bunk@stusta.de> wrote:
>
> On Fri, Oct 25, 2019 at 09:21:07AM +0200, Andreas Müller wrote:
> >...
> > -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
> > +SRC_URI = " \
> > + ${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
> > file://0001-build-don-t-generate-manual.patch \
> > "
> >...
>
> This should also stop overwriting the gnomebase SRC_URI, replace with:
>
> SRC_URI += " \
> file://0001-build-don-t-generate-manual.patch \
> "
>
> cu
> Adrian
LOL - V2 will come
Andreas
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 09/15] zenity: pretify recipe a bit
2019-10-25 12:07 ` Andreas Müller
@ 2019-10-25 17:50 ` Randy MacLeod
0 siblings, 0 replies; 25+ messages in thread
From: Randy MacLeod @ 2019-10-25 17:50 UTC (permalink / raw)
To: Andreas Müller, Adrian Bunk; +Cc: openembedded-devel
On 10/25/19 8:07 AM, Andreas Müller wrote:
> On Fri, Oct 25, 2019 at 1:45 PM Adrian Bunk <bunk@stusta.de> wrote:
>>
>> On Fri, Oct 25, 2019 at 09:21:07AM +0200, Andreas Müller wrote:
>>> ...
>>> -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
>>> +SRC_URI = " \
>>> + ${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
>>> file://0001-build-don-t-generate-manual.patch \
>>> "
>>> ...
>>
>> This should also stop overwriting the gnomebase SRC_URI, replace with:
>>
>> SRC_URI += " \
>> file://0001-build-don-t-generate-manual.patch \
>> "
>>
>> cu
>> Adrian
> LOL - V2 will come
Since you're doing a V2: s/pretify/prettify/ in the subject please.
../Randy
>
> Andreas
>
--
# Randy MacLeod
# Wind River Linux
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 10/15] glibmm: upgrade 2.60.0 -> 2.62.0
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
` (8 preceding siblings ...)
2019-10-25 7:21 ` [PATCH 09/15] zenity: pretify recipe a bit Andreas Müller
@ 2019-10-25 7:21 ` Andreas Müller
2019-10-25 7:21 ` [PATCH 11/15] libsigc++-3: initial add 3.0.0 Andreas Müller
` (5 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:21 UTC (permalink / raw)
To: openembedded-devel
This version corresponds to glib-2.0 2.62.1 in oe-core master
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../glib-2.0/{glibmm_2.60.0.bb => glibmm_2.62.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-core/glib-2.0/{glibmm_2.60.0.bb => glibmm_2.62.0.bb} (87%)
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.60.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb
similarity index 87%
rename from meta-oe/recipes-core/glib-2.0/glibmm_2.60.0.bb
rename to meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb
index 7163212b5..75eea4e58 100644
--- a/meta-oe/recipes-core/glib-2.0/glibmm_2.60.0.bb
+++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb
@@ -13,8 +13,8 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
SRC_URI += " \
file://remove-examples.patch \
"
-SRC_URI[archive.md5sum] = "0f6180d185c067bdb2aa30d035f9b867"
-SRC_URI[archive.sha256sum] = "a3a1b1c9805479a16c0018acd84b3bfff23a122aee9e3c5013bb81231aeef2bc"
+SRC_URI[archive.md5sum] = "7da228e3f0c6a10024b9a7708c53691e"
+SRC_URI[archive.sha256sum] = "36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe"
do_install_append() {
install -d ${D}${datadir}/glibmm-2.4
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 11/15] libsigc++-3: initial add 3.0.0
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
` (9 preceding siblings ...)
2019-10-25 7:21 ` [PATCH 10/15] glibmm: upgrade 2.60.0 -> 2.62.0 Andreas Müller
@ 2019-10-25 7:21 ` Andreas Müller
2019-10-25 7:21 ` [PATCH 12/15] ibus: initial add 1.5.21 Andreas Müller
` (4 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:21 UTC (permalink / raw)
To: openembedded-devel
It can be installed parallel with libsigc++-2-0
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../libsigc++-2.0/libsigc++-3_3.0.0.bb | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.0.bb
diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.0.bb b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.0.bb
new file mode 100644
index 000000000..3c0330f50
--- /dev/null
+++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.0.bb
@@ -0,0 +1,20 @@
+SUMMARY = "A library for loose coupling of C++ method calls"
+SECTION = "libs"
+LICENSE = "LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=959bffe2993816eb32ec4bc1ec1d5875"
+
+DEPENDS = "mm-common"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/3.0/libsigc++-${PV}.tar.xz"
+SRC_URI[md5sum] = "6ffe924f1d8624b5716468cde67dc03f"
+SRC_URI[sha256sum] = "50a0855c1eb26e6044ffe888dbe061938ab4241f96d8f3754ea7ead38ab8ed06"
+
+S = "${WORKDIR}/libsigc++-${PV}"
+
+inherit autotools
+
+FILES_${PN}-dev += "${libdir}/sigc++-*/"
+FILES_${PN}-doc += "${datadir}/devhelp"
+
+BBCLASSEXTEND = "native"
+SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 12/15] ibus: initial add 1.5.21
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
` (10 preceding siblings ...)
2019-10-25 7:21 ` [PATCH 11/15] libsigc++-3: initial add 3.0.0 Andreas Müller
@ 2019-10-25 7:21 ` Andreas Müller
2019-10-25 21:37 ` Khem Raj
2019-10-25 7:21 ` [PATCH 13/15] libgusb: initial add 0.3.0+ Andreas Müller
` (3 subsequent siblings)
15 siblings, 1 reply; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:21 UTC (permalink / raw)
To: openembedded-devel
It is a depency for gnome-shell
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../recipes-support/ibus/ibus-native.bb | 28 +++++++++++++
meta-gnome/recipes-support/ibus/ibus.bb | 33 ++++++++++++++++
meta-gnome/recipes-support/ibus/ibus.inc | 33 ++++++++++++++++
...start-dbus-we-do-not-have-dbus-lauch.patch | 39 +++++++++++++++++++
4 files changed, 133 insertions(+)
create mode 100644 meta-gnome/recipes-support/ibus/ibus-native.bb
create mode 100644 meta-gnome/recipes-support/ibus/ibus.bb
create mode 100644 meta-gnome/recipes-support/ibus/ibus.inc
create mode 100644 meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
diff --git a/meta-gnome/recipes-support/ibus/ibus-native.bb b/meta-gnome/recipes-support/ibus/ibus-native.bb
new file mode 100644
index 000000000..0c095f15e
--- /dev/null
+++ b/meta-gnome/recipes-support/ibus/ibus-native.bb
@@ -0,0 +1,28 @@
+require ${BPN}.inc
+
+inherit native
+
+DEPENDS = " \
+ glib-2.0-native \
+ dbus-native \
+ iso-codes \
+"
+
+PACKAGECONFIG = ""
+
+# for allarch iso-codes
+EXTRA_NATIVE_PKGCONFIG_PATH = ":${RECIPE_SYSROOT}${datadir_native}/pkgconfig"
+
+do_compile() {
+ cd src
+ oe_runmake ibusenumtypes.h ibusenumtypes.c
+ oe_runmake unicode-parser
+}
+
+do_install() {
+ install -d ${D}/${libdir}
+ install -m 755 ${S}/src/.libs/libibus-*.so* ${D}/${libdir}
+
+ install -d ${D}/${bindir}
+ install -m 755 ${S}/src/.libs/unicode-parser ${D}/${bindir}
+}
diff --git a/meta-gnome/recipes-support/ibus/ibus.bb b/meta-gnome/recipes-support/ibus/ibus.bb
new file mode 100644
index 000000000..28f572ee7
--- /dev/null
+++ b/meta-gnome/recipes-support/ibus/ibus.bb
@@ -0,0 +1,33 @@
+require ${BPN}.inc
+
+DEPENDS = " \
+ ${BPN}-native \
+ glib-2.0-native \
+ glib-2.0 \
+ dbus \
+ iso-codes \
+"
+
+inherit gtk-icon-cache bash-completion
+
+PACKAGECONFIG ??= " \
+ dconf gtk3 vala \
+ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
+"
+
+do_configure_prepend() {
+ # run native unicode-parser
+ sed -i 's:$(builddir)/unicode-parser:unicode-parser:g' ${S}/src/Makefile.am
+}
+
+FILES_${PN} += " \
+ ${datadir}/dbus-1 \
+ ${datadir}/GConf \
+ ${datadir}/glib-2.0 \
+ ${libdir}/gtk-3.0 \
+"
+
+FILES_${PN}-dev += " \
+ ${datadir}/gettext \
+"
+
diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc
new file mode 100644
index 000000000..8b98b892a
--- /dev/null
+++ b/meta-gnome/recipes-support/ibus/ibus.inc
@@ -0,0 +1,33 @@
+SUMMARY = "Intelligent Input Bus for Linux/Unix"
+HOMEPAGE = "https://github.com/ibus/ibus/wiki"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+
+inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala
+
+PV = "1.5.21"
+SRC_URI = " \
+ git://github.com/ibus/ibus.git \
+ file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \
+"
+SRCREV = "ae0040c73466bb6e78fce5e669a55fcce6ffd16d"
+S = "${WORKDIR}/git"
+
+PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase"
+PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf"
+PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+"
+PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
+PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland"
+PACKAGECONFIG[vala] = "--enable-vala,--disable-vala"
+PACKAGECONFIG[x11] = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11"
+
+EXTRA_OECONF = " \
+ --disable-tests \
+ --disable-emoji-dict \
+ --disable-python2 \
+"
+
+do_configure_prepend() {
+ touch ${S}/ChangeLog
+ touch ${S}/ABOUT-NLS
+}
diff --git a/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
new file mode 100644
index 000000000..3701d19f5
--- /dev/null
+++ b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
@@ -0,0 +1,39 @@
+From f567bcbc2108d722faa90afeb03d3a3bcdf5f58b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 10 May 2019 14:30:08 +0200
+Subject: [PATCH] Do not try to start dbus - we do not have dbus-lauch
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ data/dconf/make-dconf-override-db.sh | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
+index 9c650e97..02fbf059 100755
+--- a/data/dconf/make-dconf-override-db.sh
++++ b/data/dconf/make-dconf-override-db.sh
+@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache"
+ export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas"
+ mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR
+
+-eval `dbus-launch --sh-syntax`
+-
+-trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR
+-
+ # in case that schema is not installed on the system
+ glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD"
+
+@@ -46,5 +42,3 @@ for schema in $schemas; do
+ done
+
+ rm -rf $TMPDIR
+-
+-kill $DBUS_SESSION_BUS_PID
+--
+2.20.1
+
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 12/15] ibus: initial add 1.5.21
2019-10-25 7:21 ` [PATCH 12/15] ibus: initial add 1.5.21 Andreas Müller
@ 2019-10-25 21:37 ` Khem Raj
0 siblings, 0 replies; 25+ messages in thread
From: Khem Raj @ 2019-10-25 21:37 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembeded-devel
Fails
https://errors.yoctoproject.org/Errors/Details/274650/
On Fri, Oct 25, 2019 at 8:23 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> It is a depency for gnome-shell
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> .../recipes-support/ibus/ibus-native.bb | 28 +++++++++++++
> meta-gnome/recipes-support/ibus/ibus.bb | 33 ++++++++++++++++
> meta-gnome/recipes-support/ibus/ibus.inc | 33 ++++++++++++++++
> ...start-dbus-we-do-not-have-dbus-lauch.patch | 39 +++++++++++++++++++
> 4 files changed, 133 insertions(+)
> create mode 100644 meta-gnome/recipes-support/ibus/ibus-native.bb
> create mode 100644 meta-gnome/recipes-support/ibus/ibus.bb
> create mode 100644 meta-gnome/recipes-support/ibus/ibus.inc
> create mode 100644 meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
>
> diff --git a/meta-gnome/recipes-support/ibus/ibus-native.bb b/meta-gnome/recipes-support/ibus/ibus-native.bb
> new file mode 100644
> index 000000000..0c095f15e
> --- /dev/null
> +++ b/meta-gnome/recipes-support/ibus/ibus-native.bb
> @@ -0,0 +1,28 @@
> +require ${BPN}.inc
> +
> +inherit native
> +
> +DEPENDS = " \
> + glib-2.0-native \
> + dbus-native \
> + iso-codes \
> +"
> +
> +PACKAGECONFIG = ""
> +
> +# for allarch iso-codes
> +EXTRA_NATIVE_PKGCONFIG_PATH = ":${RECIPE_SYSROOT}${datadir_native}/pkgconfig"
> +
> +do_compile() {
> + cd src
> + oe_runmake ibusenumtypes.h ibusenumtypes.c
> + oe_runmake unicode-parser
> +}
> +
> +do_install() {
> + install -d ${D}/${libdir}
> + install -m 755 ${S}/src/.libs/libibus-*.so* ${D}/${libdir}
> +
> + install -d ${D}/${bindir}
> + install -m 755 ${S}/src/.libs/unicode-parser ${D}/${bindir}
> +}
> diff --git a/meta-gnome/recipes-support/ibus/ibus.bb b/meta-gnome/recipes-support/ibus/ibus.bb
> new file mode 100644
> index 000000000..28f572ee7
> --- /dev/null
> +++ b/meta-gnome/recipes-support/ibus/ibus.bb
> @@ -0,0 +1,33 @@
> +require ${BPN}.inc
> +
> +DEPENDS = " \
> + ${BPN}-native \
> + glib-2.0-native \
> + glib-2.0 \
> + dbus \
> + iso-codes \
> +"
> +
> +inherit gtk-icon-cache bash-completion
> +
> +PACKAGECONFIG ??= " \
> + dconf gtk3 vala \
> + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
> +"
> +
> +do_configure_prepend() {
> + # run native unicode-parser
> + sed -i 's:$(builddir)/unicode-parser:unicode-parser:g' ${S}/src/Makefile.am
> +}
> +
> +FILES_${PN} += " \
> + ${datadir}/dbus-1 \
> + ${datadir}/GConf \
> + ${datadir}/glib-2.0 \
> + ${libdir}/gtk-3.0 \
> +"
> +
> +FILES_${PN}-dev += " \
> + ${datadir}/gettext \
> +"
> +
> diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc
> new file mode 100644
> index 000000000..8b98b892a
> --- /dev/null
> +++ b/meta-gnome/recipes-support/ibus/ibus.inc
> @@ -0,0 +1,33 @@
> +SUMMARY = "Intelligent Input Bus for Linux/Unix"
> +HOMEPAGE = "https://github.com/ibus/ibus/wiki"
> +LICENSE = "LGPLv2.1"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
> +
> +inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala
> +
> +PV = "1.5.21"
> +SRC_URI = " \
> + git://github.com/ibus/ibus.git \
> + file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \
> +"
> +SRCREV = "ae0040c73466bb6e78fce5e669a55fcce6ffd16d"
> +S = "${WORKDIR}/git"
> +
> +PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase"
> +PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf"
> +PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+"
> +PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
> +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland"
> +PACKAGECONFIG[vala] = "--enable-vala,--disable-vala"
> +PACKAGECONFIG[x11] = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11"
> +
> +EXTRA_OECONF = " \
> + --disable-tests \
> + --disable-emoji-dict \
> + --disable-python2 \
> +"
> +
> +do_configure_prepend() {
> + touch ${S}/ChangeLog
> + touch ${S}/ABOUT-NLS
> +}
> diff --git a/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
> new file mode 100644
> index 000000000..3701d19f5
> --- /dev/null
> +++ b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
> @@ -0,0 +1,39 @@
> +From f567bcbc2108d722faa90afeb03d3a3bcdf5f58b Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Fri, 10 May 2019 14:30:08 +0200
> +Subject: [PATCH] Do not try to start dbus - we do not have dbus-lauch
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Inappropriate [OE specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + data/dconf/make-dconf-override-db.sh | 6 ------
> + 1 file changed, 6 deletions(-)
> +
> +diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
> +index 9c650e97..02fbf059 100755
> +--- a/data/dconf/make-dconf-override-db.sh
> ++++ b/data/dconf/make-dconf-override-db.sh
> +@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache"
> + export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas"
> + mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR
> +
> +-eval `dbus-launch --sh-syntax`
> +-
> +-trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR
> +-
> + # in case that schema is not installed on the system
> + glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD"
> +
> +@@ -46,5 +42,3 @@ for schema in $schemas; do
> + done
> +
> + rm -rf $TMPDIR
> +-
> +-kill $DBUS_SESSION_BUS_PID
> +--
> +2.20.1
> +
> --
> 2.21.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 13/15] libgusb: initial add 0.3.0+
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
` (11 preceding siblings ...)
2019-10-25 7:21 ` [PATCH 12/15] ibus: initial add 1.5.21 Andreas Müller
@ 2019-10-25 7:21 ` Andreas Müller
2019-10-25 7:21 ` [PATCH 14/15] colord: initial add 1.4.4 Andreas Müller
` (2 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:21 UTC (permalink / raw)
To: openembedded-devel
* It is a dependency for upcoming colord. That is used by GNOME and KDE [1] so
move it to meta-oe
* 0.3.0 failed build and gobject-introspection was not configurable -> use
latest master sources
[1] https://www.freedesktop.org/software/colord/intro.html
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meta-oe/recipes-support/libgusb/libgusb_git.bb | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 meta-oe/recipes-support/libgusb/libgusb_git.bb
diff --git a/meta-oe/recipes-support/libgusb/libgusb_git.bb b/meta-oe/recipes-support/libgusb/libgusb_git.bb
new file mode 100644
index 000000000..e3c0bdd15
--- /dev/null
+++ b/meta-oe/recipes-support/libgusb/libgusb_git.bb
@@ -0,0 +1,12 @@
+SUMMARY = "GUsb is a GObject wrapper for libusb1"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+DEPENDS = "glib-2.0 libusb"
+
+inherit meson gobject-introspection gtk-doc gettext vala
+
+SRC_URI = "git://github.com/hughsie/libgusb.git"
+SRCREV = "636efc0624aa2a88174220fcabc9764c13d7febf"
+PV = "0.3.0+git${SRCPV}"
+S = "${WORKDIR}/git"
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 14/15] colord: initial add 1.4.4
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
` (12 preceding siblings ...)
2019-10-25 7:21 ` [PATCH 13/15] libgusb: initial add 0.3.0+ Andreas Müller
@ 2019-10-25 7:21 ` Andreas Müller
2019-10-25 21:37 ` Khem Raj
2019-10-25 7:21 ` [PATCH 15/15] colord-gtk: initial add 0.2.0 Andreas Müller
2019-10-27 15:33 ` [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
15 siblings, 1 reply; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:21 UTC (permalink / raw)
To: openembedded-devel
* It is a dependency for upcoming gnome-settings-daemon
* It is used by GNOME and KDE [1] so move it to meta-oe
* Getting it to build was a bit tricky. Udev (systemd) is a mandatory
dependency and for native we do not support build. To get around native build
was stripped down to what's necessary only. Native build is done with the
help of configuration in recipe and (old-school) Makefile. This solution was
chosen to avoid massive patching of meson build which tends to be a
maintenance burden (as experienced at KDE recipes in meta-qt5-extra).
[1] https://www.freedesktop.org/software/colord/intro.html
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../recipes-support/colord/colord-native.bb | 64 +++++++
...n-cd_icc_create_from_edid-to-avoid-u.patch | 166 ++++++++++++++++++
.../colord/colord-native/Makefile | 48 +++++
meta-oe/recipes-support/colord/colord.bb | 45 +++++
meta-oe/recipes-support/colord/colord.inc | 13 ++
...Run-native-cd_idt8-cd_create_profile.patch | 59 +++++++
6 files changed, 395 insertions(+)
create mode 100644 meta-oe/recipes-support/colord/colord-native.bb
create mode 100644 meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
create mode 100644 meta-oe/recipes-support/colord/colord-native/Makefile
create mode 100644 meta-oe/recipes-support/colord/colord.bb
create mode 100644 meta-oe/recipes-support/colord/colord.inc
create mode 100644 meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
diff --git a/meta-oe/recipes-support/colord/colord-native.bb b/meta-oe/recipes-support/colord/colord-native.bb
new file mode 100644
index 000000000..845041cc4
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord-native.bb
@@ -0,0 +1,64 @@
+require ${BPN}.inc
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-native:"
+
+inherit meson native
+
+DEPENDS += " \
+ meson-native \
+ glib-2.0-native \
+ lcms-native \
+"
+
+SRC_URI += " \
+ file://0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch \
+ file://Makefile;subdir=${BPN}-${PV} \
+"
+
+do_configure() {
+ # we expect meson to fail - but before it extracts project's version in log file
+ meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON} > /dev/null 2>&1 || true
+
+ # extract and split version
+ version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'`
+ major=`echo $version | cut -d. -f1`
+ minor=`echo $version | cut -d. -f2`
+ micro=`echo $version | cut -d. -f3`
+ echo "Project version: $major.$minor.$micro"
+
+ # extract project name
+ proj_name=`grep 'Project name:' ${B}/meson-logs/meson-log.txt | sed 's|Project name: ||'`
+
+ # create cd-version.h
+ mkdir -p ${B}/colord
+ sed ${S}/lib/colord/cd-version.h.in \
+ -e 's:@CD_MAJOR_VERSION_PRIVATE@:1:g' \
+ -e 's:@CD_MINOR_VERSION_PRIVATE@:4:g' \
+ -e 's:@CD_MICRO_VERSION_PRIVATE@:4:g' \
+ > ${B}/colord/cd-version.h
+
+ # create config.h based on target build and add what's necessary only
+ localedir=`echo ${datadir}/locale | sed 's:${prefix}/::g'`
+ echo "#define LOCALEDIR \"$localedir\"" >> ${B}/config.h
+ echo "#define GETTEXT_PACKAGE \"colord\"" >> ${B}/config.h
+ echo "#define PACKAGE_NAME \"$proj_name\"" >> ${B}/config.h
+ echo "#define PACKAGE_VERSION \"$version\"" >> ${B}/config.h
+}
+
+do_compile() {
+ oe_runmake -C${S} DESTDIR=${B}
+}
+
+do_install() {
+ version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'`
+ major=`echo $version | cut -d. -f1`
+
+ install -d ${D}${libdir}
+ install -m 755 ${B}/libcolord.so ${D}${libdir}/libcolord.so.$version
+ ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so"
+ ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so.$major"
+
+ install -d ${D}${bindir}
+ install -m 755 ${B}/cd_create_profile ${D}${bindir}/
+ install -m 755 ${B}/cd_idt8 ${D}${bindir}/
+}
diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
new file mode 100644
index 000000000..278b90e07
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
@@ -0,0 +1,166 @@
+From cbb8f5c05fce1d56ae2e5fa9f57fc49c47bed5ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 12 May 2019 21:58:02 +0200
+Subject: [PATCH] Move the function cd_icc_create_from_edid to avoid udev
+ dependeny
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We do not have udev-native so it is a dependeny we cannot satisfy
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ lib/colord/cd-edid.c | 63 ++++++++++++++++++++++++++++++++++++++++++++
+ lib/colord/cd-icc.c | 62 -------------------------------------------
+ 2 files changed, 63 insertions(+), 62 deletions(-)
+
+diff --git a/lib/colord/cd-edid.c b/lib/colord/cd-edid.c
+index a5e2328..dec509a 100644
+--- a/lib/colord/cd-edid.c
++++ b/lib/colord/cd-edid.c
+@@ -687,3 +687,66 @@ cd_edid_new (void)
+ edid = g_object_new (CD_TYPE_EDID, NULL);
+ return CD_EDID (edid);
+ }
++
++/**
++ * cd_icc_create_from_edid_data:
++ * @icc: A valid #CdIcc
++ * @edid: EDID data
++ * @error: A #GError, or %NULL
++ *
++ * Creates an ICC profile from EDID data.
++ *
++ * Return value: %TRUE for success
++ *
++ * Since: 1.1.2
++ **/
++gboolean
++cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error)
++{
++ CdIccPrivate *priv = GET_PRIVATE (icc);
++ const gchar *data;
++
++ /* not loaded */
++ if (priv->lcms_profile != NULL) {
++ g_set_error_literal (error,
++ CD_ICC_ERROR,
++ CD_ICC_ERROR_FAILED_TO_CREATE,
++ "already loaded or generated");
++ return FALSE;
++ }
++
++ /* create from parsed object */
++ if (!cd_icc_create_from_edid (icc,
++ cd_edid_get_gamma (edid),
++ cd_edid_get_red (edid),
++ cd_edid_get_green (edid),
++ cd_edid_get_blue (edid),
++ cd_edid_get_white (edid),
++ error)) {
++ return FALSE;
++ }
++
++ /* set copyright */
++ cd_icc_set_copyright (icc, NULL,
++ /* deliberately not translated */
++ "This profile is free of known copyright restrictions.");
++
++ /* set 'ICC meta Tag for Monitor Profiles' data */
++ data = cd_edid_get_checksum (edid);
++ if (data != NULL)
++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data);
++ data = cd_edid_get_monitor_name (edid);
++ if (data != NULL)
++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data);
++ data = cd_edid_get_serial_number (edid);
++ if (data != NULL)
++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data);
++ data = cd_edid_get_pnp_id (edid);
++ if (data != NULL)
++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data);
++ data = cd_edid_get_vendor_name (edid);
++ if (data != NULL)
++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data);
++ return TRUE;
++}
++
+diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c
+index f231814..2c8fe77 100644
+--- a/lib/colord/cd-icc.c
++++ b/lib/colord/cd-icc.c
+@@ -3094,68 +3094,6 @@ out:
+ return ret;
+ }
+
+-/**
+- * cd_icc_create_from_edid_data:
+- * @icc: A valid #CdIcc
+- * @edid: EDID data
+- * @error: A #GError, or %NULL
+- *
+- * Creates an ICC profile from EDID data.
+- *
+- * Return value: %TRUE for success
+- *
+- * Since: 1.1.2
+- **/
+-gboolean
+-cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error)
+-{
+- CdIccPrivate *priv = GET_PRIVATE (icc);
+- const gchar *data;
+-
+- /* not loaded */
+- if (priv->lcms_profile != NULL) {
+- g_set_error_literal (error,
+- CD_ICC_ERROR,
+- CD_ICC_ERROR_FAILED_TO_CREATE,
+- "already loaded or generated");
+- return FALSE;
+- }
+-
+- /* create from parsed object */
+- if (!cd_icc_create_from_edid (icc,
+- cd_edid_get_gamma (edid),
+- cd_edid_get_red (edid),
+- cd_edid_get_green (edid),
+- cd_edid_get_blue (edid),
+- cd_edid_get_white (edid),
+- error)) {
+- return FALSE;
+- }
+-
+- /* set copyright */
+- cd_icc_set_copyright (icc, NULL,
+- /* deliberately not translated */
+- "This profile is free of known copyright restrictions.");
+-
+- /* set 'ICC meta Tag for Monitor Profiles' data */
+- data = cd_edid_get_checksum (edid);
+- if (data != NULL)
+- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data);
+- data = cd_edid_get_monitor_name (edid);
+- if (data != NULL)
+- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data);
+- data = cd_edid_get_serial_number (edid);
+- if (data != NULL)
+- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data);
+- data = cd_edid_get_pnp_id (edid);
+- if (data != NULL)
+- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data);
+- data = cd_edid_get_vendor_name (edid);
+- if (data != NULL)
+- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data);
+- return TRUE;
+-}
+-
+ /**
+ * cd_icc_create_from_edid:
+ * @icc: A valid #CdIcc
+--
+2.20.1
+
diff --git a/meta-oe/recipes-support/colord/colord-native/Makefile b/meta-oe/recipes-support/colord/colord-native/Makefile
new file mode 100644
index 000000000..ca265ca6f
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord-native/Makefile
@@ -0,0 +1,48 @@
+# For native build cd_idt8, cd_create_profile and a tiny version of libcolord.so
+# only. By reducing the library to what's necessary, we avoid dependencies on
+# naitve udev and libgudev
+
+CFLAGS+=$(shell pkg-config --cflags gio-2.0)
+CFLAGS+=$(shell pkg-config --cflags lcms2)
+CFLAGS+=-I./lib -I./lib/colord -I$(DESTDIR) -DCD_COMPILATION
+
+LDFLAGS+=$(shell pkg-config --libs gio-2.0)
+LDFLAGS+=$(shell pkg-config --libs lcms2)
+LDFLAGS+=-lm
+
+all: cd_idt8 cd_create_profile
+
+LIBSOURCES = \
+ lib/colord/cd-it8.c \
+ lib/colord/cd-color.c \
+ lib/colord/cd-spectrum.c \
+ lib/colord/cd-math.c \
+ lib/colord/cd-interp-akima.c \
+ lib/colord/cd-context-lcms.c \
+ lib/colord/cd-interp.c \
+ lib/colord/cd-interp-linear.c \
+ lib/colord/cd-it8-utils.c \
+ lib/colord/cd-enum.c \
+ lib/colord/cd-icc.c \
+ lib/colord/cd-icc-utils.c \
+ lib/colord/cd-dom.c
+
+libcolord.so: $(LIBSOURCES)
+ $(CC) $(CFLAGS) -fPIC -shared -Wl,-soname,$@ $^ -o $(DESTDIR)/$@
+
+cd_idt8.o: client/cd-it8.c
+ $(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@
+
+cd_idt8: libcolord.so cd_idt8.o
+ $(CC) $(LDFLAGS) -L$(DESTDIR) -lcolord $(DESTDIR)/cd_idt8.o -o $(DESTDIR)/$@
+
+cd_create_profile.o: client/cd-create-profile.c
+ $(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@
+
+cd_create_profile: libcolord.so cd_create_profile.o
+ $(CC) $(LDFLAGS) -L$(DESTDIR) -lcolord $(DESTDIR)/cd_create_profile.o -o $(DESTDIR)/$@
+
+.PHONY: clean
+
+clean:
+ rm -f $(DESTDIR)/libcolord.so $(DESTDIR)/*.o $(DESTDIR)/cd_idt8 $(DESTDIR)/cd_create_profile
diff --git a/meta-oe/recipes-support/colord/colord.bb b/meta-oe/recipes-support/colord/colord.bb
new file mode 100644
index 000000000..5c691e463
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord.bb
@@ -0,0 +1,45 @@
+require ${BPN}.inc
+
+inherit meson gobject-introspection gsettings gettext bash-completion systemd distro_features_check useradd
+
+# polkit and gobject-introspection are mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
+
+DEPENDS += " \
+ ${BPN}-native \
+ glib-2.0 \
+ lcms \
+ sqlite3 \
+ libgusb \
+ libgudev \
+ polkit \
+"
+
+SRC_URI += " \
+ file://0001-Run-native-cd_idt8-cd_create_profile.patch \
+"
+
+EXTRA_OEMESON = " \
+ -Dman=false \
+ -Ddocs=false \
+"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=true, systemd"
+
+SYSTEMD_SERVICE_${PN} = "colord.service"
+
+FILES_${PN} += " \
+ ${datadir}/dbus-1 \
+ ${datadir}/polkit-1 \
+ ${datadir}/glib-2.0 \
+ ${datadir}/color \
+ ${systemd_user_unitdir} \
+ ${libdir}/tmpfiles.d \
+ ${libdir}/colord-plugins \
+ ${libdir}/colord-sensors \
+"
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord"
diff --git a/meta-oe/recipes-support/colord/colord.inc b/meta-oe/recipes-support/colord/colord.inc
new file mode 100644
index 000000000..7497fed51
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord.inc
@@ -0,0 +1,13 @@
+SUMMARY = "Making color management just work"
+HOMEPAGE = "https://www.freedesktop.org/software/colord/"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \
+"
+
+PV = "1.4.4"
+SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "32c2709a6002d9ee750483aaed6379c8"
+SRC_URI[sha256sum] = "9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5"
+
diff --git a/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch b/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
new file mode 100644
index 000000000..4b52aa337
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
@@ -0,0 +1,59 @@
+From 5aad8831c0fb71940d6c4f982b0b30ffb6ae33b3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 12 May 2019 22:47:05 +0200
+Subject: [PATCH] Run native cd_idt8/cd_create_profile
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ data/cmf/meson.build | 2 +-
+ data/illuminant/meson.build | 2 +-
+ data/profiles/meson.build | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/data/cmf/meson.build b/data/cmf/meson.build
+index a693cd7..1ae3613 100644
+--- a/data/cmf/meson.build
++++ b/data/cmf/meson.build
+@@ -2,7 +2,7 @@ foreach arg: [ 'CIE1964-10deg-XYZ', 'CIE1931-2deg-XYZ' ]
+ custom_target(arg,
+ input: arg + '.csv',
+ output: arg + '.cmf',
+- command: [ cd_idt8, 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ],
++ command: [ 'cd_idt8', 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ],
+ install: true,
+ install_dir: join_paths(datadir, 'colord', 'cmf')
+ )
+diff --git a/data/illuminant/meson.build b/data/illuminant/meson.build
+index f8dfa07..ad7dced 100644
+--- a/data/illuminant/meson.build
++++ b/data/illuminant/meson.build
+@@ -24,7 +24,7 @@ foreach arg: generated_spectra
+ custom_target(arg,
+ input: arg + '.csv',
+ output: arg + '.sp',
+- command: [ cd_idt8, 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ],
++ command: [ 'cd_idt8', 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ],
+ install: true,
+ install_dir: join_paths(datadir, 'colord', 'illuminant')
+ )
+diff --git a/data/profiles/meson.build b/data/profiles/meson.build
+index 591b97d..2cef011 100644
+--- a/data/profiles/meson.build
++++ b/data/profiles/meson.build
+@@ -59,7 +59,7 @@ foreach arg: icc_profiles
+ generated_icc = custom_target(arg + '.icc',
+ input: xml_i18n,
+ output: arg + '.icc',
+- command: [ cd_create_profile, '--output=@OUTPUT@', '@INPUT@' ],
++ command: [ 'cd_create_profile', '--output=@OUTPUT@', '@INPUT@' ],
+ install: true,
+ install_dir: join_paths(datadir, 'color', 'icc', 'colord'),
+ )
+--
+2.20.1
+
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 14/15] colord: initial add 1.4.4
2019-10-25 7:21 ` [PATCH 14/15] colord: initial add 1.4.4 Andreas Müller
@ 2019-10-25 21:37 ` Khem Raj
2019-10-25 22:48 ` Andreas Müller
0 siblings, 1 reply; 25+ messages in thread
From: Khem Raj @ 2019-10-25 21:37 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembeded-devel
Native build fails
https://errors.yoctoproject.org/Errors/Details/274649/
On Fri, Oct 25, 2019 at 8:23 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> * It is a dependency for upcoming gnome-settings-daemon
> * It is used by GNOME and KDE [1] so move it to meta-oe
> * Getting it to build was a bit tricky. Udev (systemd) is a mandatory
> dependency and for native we do not support build. To get around native build
> was stripped down to what's necessary only. Native build is done with the
> help of configuration in recipe and (old-school) Makefile. This solution was
> chosen to avoid massive patching of meson build which tends to be a
> maintenance burden (as experienced at KDE recipes in meta-qt5-extra).
>
> [1] https://www.freedesktop.org/software/colord/intro.html
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> .../recipes-support/colord/colord-native.bb | 64 +++++++
> ...n-cd_icc_create_from_edid-to-avoid-u.patch | 166 ++++++++++++++++++
> .../colord/colord-native/Makefile | 48 +++++
> meta-oe/recipes-support/colord/colord.bb | 45 +++++
> meta-oe/recipes-support/colord/colord.inc | 13 ++
> ...Run-native-cd_idt8-cd_create_profile.patch | 59 +++++++
> 6 files changed, 395 insertions(+)
> create mode 100644 meta-oe/recipes-support/colord/colord-native.bb
> create mode 100644 meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
> create mode 100644 meta-oe/recipes-support/colord/colord-native/Makefile
> create mode 100644 meta-oe/recipes-support/colord/colord.bb
> create mode 100644 meta-oe/recipes-support/colord/colord.inc
> create mode 100644 meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
>
> diff --git a/meta-oe/recipes-support/colord/colord-native.bb b/meta-oe/recipes-support/colord/colord-native.bb
> new file mode 100644
> index 000000000..845041cc4
> --- /dev/null
> +++ b/meta-oe/recipes-support/colord/colord-native.bb
> @@ -0,0 +1,64 @@
> +require ${BPN}.inc
> +
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-native:"
> +
> +inherit meson native
> +
> +DEPENDS += " \
> + meson-native \
> + glib-2.0-native \
> + lcms-native \
> +"
> +
> +SRC_URI += " \
> + file://0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch \
> + file://Makefile;subdir=${BPN}-${PV} \
> +"
> +
> +do_configure() {
> + # we expect meson to fail - but before it extracts project's version in log file
> + meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON} > /dev/null 2>&1 || true
> +
> + # extract and split version
> + version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'`
> + major=`echo $version | cut -d. -f1`
> + minor=`echo $version | cut -d. -f2`
> + micro=`echo $version | cut -d. -f3`
> + echo "Project version: $major.$minor.$micro"
> +
> + # extract project name
> + proj_name=`grep 'Project name:' ${B}/meson-logs/meson-log.txt | sed 's|Project name: ||'`
> +
> + # create cd-version.h
> + mkdir -p ${B}/colord
> + sed ${S}/lib/colord/cd-version.h.in \
> + -e 's:@CD_MAJOR_VERSION_PRIVATE@:1:g' \
> + -e 's:@CD_MINOR_VERSION_PRIVATE@:4:g' \
> + -e 's:@CD_MICRO_VERSION_PRIVATE@:4:g' \
> + > ${B}/colord/cd-version.h
> +
> + # create config.h based on target build and add what's necessary only
> + localedir=`echo ${datadir}/locale | sed 's:${prefix}/::g'`
> + echo "#define LOCALEDIR \"$localedir\"" >> ${B}/config.h
> + echo "#define GETTEXT_PACKAGE \"colord\"" >> ${B}/config.h
> + echo "#define PACKAGE_NAME \"$proj_name\"" >> ${B}/config.h
> + echo "#define PACKAGE_VERSION \"$version\"" >> ${B}/config.h
> +}
> +
> +do_compile() {
> + oe_runmake -C${S} DESTDIR=${B}
> +}
> +
> +do_install() {
> + version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'`
> + major=`echo $version | cut -d. -f1`
> +
> + install -d ${D}${libdir}
> + install -m 755 ${B}/libcolord.so ${D}${libdir}/libcolord.so.$version
> + ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so"
> + ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so.$major"
> +
> + install -d ${D}${bindir}
> + install -m 755 ${B}/cd_create_profile ${D}${bindir}/
> + install -m 755 ${B}/cd_idt8 ${D}${bindir}/
> +}
> diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
> new file mode 100644
> index 000000000..278b90e07
> --- /dev/null
> +++ b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
> @@ -0,0 +1,166 @@
> +From cbb8f5c05fce1d56ae2e5fa9f57fc49c47bed5ab Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Sun, 12 May 2019 21:58:02 +0200
> +Subject: [PATCH] Move the function cd_icc_create_from_edid to avoid udev
> + dependeny
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +We do not have udev-native so it is a dependeny we cannot satisfy
> +
> +Upstream-Status: Inappropriate [OE specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + lib/colord/cd-edid.c | 63 ++++++++++++++++++++++++++++++++++++++++++++
> + lib/colord/cd-icc.c | 62 -------------------------------------------
> + 2 files changed, 63 insertions(+), 62 deletions(-)
> +
> +diff --git a/lib/colord/cd-edid.c b/lib/colord/cd-edid.c
> +index a5e2328..dec509a 100644
> +--- a/lib/colord/cd-edid.c
> ++++ b/lib/colord/cd-edid.c
> +@@ -687,3 +687,66 @@ cd_edid_new (void)
> + edid = g_object_new (CD_TYPE_EDID, NULL);
> + return CD_EDID (edid);
> + }
> ++
> ++/**
> ++ * cd_icc_create_from_edid_data:
> ++ * @icc: A valid #CdIcc
> ++ * @edid: EDID data
> ++ * @error: A #GError, or %NULL
> ++ *
> ++ * Creates an ICC profile from EDID data.
> ++ *
> ++ * Return value: %TRUE for success
> ++ *
> ++ * Since: 1.1.2
> ++ **/
> ++gboolean
> ++cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error)
> ++{
> ++ CdIccPrivate *priv = GET_PRIVATE (icc);
> ++ const gchar *data;
> ++
> ++ /* not loaded */
> ++ if (priv->lcms_profile != NULL) {
> ++ g_set_error_literal (error,
> ++ CD_ICC_ERROR,
> ++ CD_ICC_ERROR_FAILED_TO_CREATE,
> ++ "already loaded or generated");
> ++ return FALSE;
> ++ }
> ++
> ++ /* create from parsed object */
> ++ if (!cd_icc_create_from_edid (icc,
> ++ cd_edid_get_gamma (edid),
> ++ cd_edid_get_red (edid),
> ++ cd_edid_get_green (edid),
> ++ cd_edid_get_blue (edid),
> ++ cd_edid_get_white (edid),
> ++ error)) {
> ++ return FALSE;
> ++ }
> ++
> ++ /* set copyright */
> ++ cd_icc_set_copyright (icc, NULL,
> ++ /* deliberately not translated */
> ++ "This profile is free of known copyright restrictions.");
> ++
> ++ /* set 'ICC meta Tag for Monitor Profiles' data */
> ++ data = cd_edid_get_checksum (edid);
> ++ if (data != NULL)
> ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data);
> ++ data = cd_edid_get_monitor_name (edid);
> ++ if (data != NULL)
> ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data);
> ++ data = cd_edid_get_serial_number (edid);
> ++ if (data != NULL)
> ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data);
> ++ data = cd_edid_get_pnp_id (edid);
> ++ if (data != NULL)
> ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data);
> ++ data = cd_edid_get_vendor_name (edid);
> ++ if (data != NULL)
> ++ cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data);
> ++ return TRUE;
> ++}
> ++
> +diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c
> +index f231814..2c8fe77 100644
> +--- a/lib/colord/cd-icc.c
> ++++ b/lib/colord/cd-icc.c
> +@@ -3094,68 +3094,6 @@ out:
> + return ret;
> + }
> +
> +-/**
> +- * cd_icc_create_from_edid_data:
> +- * @icc: A valid #CdIcc
> +- * @edid: EDID data
> +- * @error: A #GError, or %NULL
> +- *
> +- * Creates an ICC profile from EDID data.
> +- *
> +- * Return value: %TRUE for success
> +- *
> +- * Since: 1.1.2
> +- **/
> +-gboolean
> +-cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error)
> +-{
> +- CdIccPrivate *priv = GET_PRIVATE (icc);
> +- const gchar *data;
> +-
> +- /* not loaded */
> +- if (priv->lcms_profile != NULL) {
> +- g_set_error_literal (error,
> +- CD_ICC_ERROR,
> +- CD_ICC_ERROR_FAILED_TO_CREATE,
> +- "already loaded or generated");
> +- return FALSE;
> +- }
> +-
> +- /* create from parsed object */
> +- if (!cd_icc_create_from_edid (icc,
> +- cd_edid_get_gamma (edid),
> +- cd_edid_get_red (edid),
> +- cd_edid_get_green (edid),
> +- cd_edid_get_blue (edid),
> +- cd_edid_get_white (edid),
> +- error)) {
> +- return FALSE;
> +- }
> +-
> +- /* set copyright */
> +- cd_icc_set_copyright (icc, NULL,
> +- /* deliberately not translated */
> +- "This profile is free of known copyright restrictions.");
> +-
> +- /* set 'ICC meta Tag for Monitor Profiles' data */
> +- data = cd_edid_get_checksum (edid);
> +- if (data != NULL)
> +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data);
> +- data = cd_edid_get_monitor_name (edid);
> +- if (data != NULL)
> +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data);
> +- data = cd_edid_get_serial_number (edid);
> +- if (data != NULL)
> +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data);
> +- data = cd_edid_get_pnp_id (edid);
> +- if (data != NULL)
> +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data);
> +- data = cd_edid_get_vendor_name (edid);
> +- if (data != NULL)
> +- cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data);
> +- return TRUE;
> +-}
> +-
> + /**
> + * cd_icc_create_from_edid:
> + * @icc: A valid #CdIcc
> +--
> +2.20.1
> +
> diff --git a/meta-oe/recipes-support/colord/colord-native/Makefile b/meta-oe/recipes-support/colord/colord-native/Makefile
> new file mode 100644
> index 000000000..ca265ca6f
> --- /dev/null
> +++ b/meta-oe/recipes-support/colord/colord-native/Makefile
> @@ -0,0 +1,48 @@
> +# For native build cd_idt8, cd_create_profile and a tiny version of libcolord.so
> +# only. By reducing the library to what's necessary, we avoid dependencies on
> +# naitve udev and libgudev
> +
> +CFLAGS+=$(shell pkg-config --cflags gio-2.0)
> +CFLAGS+=$(shell pkg-config --cflags lcms2)
> +CFLAGS+=-I./lib -I./lib/colord -I$(DESTDIR) -DCD_COMPILATION
> +
> +LDFLAGS+=$(shell pkg-config --libs gio-2.0)
> +LDFLAGS+=$(shell pkg-config --libs lcms2)
> +LDFLAGS+=-lm
> +
> +all: cd_idt8 cd_create_profile
> +
> +LIBSOURCES = \
> + lib/colord/cd-it8.c \
> + lib/colord/cd-color.c \
> + lib/colord/cd-spectrum.c \
> + lib/colord/cd-math.c \
> + lib/colord/cd-interp-akima.c \
> + lib/colord/cd-context-lcms.c \
> + lib/colord/cd-interp.c \
> + lib/colord/cd-interp-linear.c \
> + lib/colord/cd-it8-utils.c \
> + lib/colord/cd-enum.c \
> + lib/colord/cd-icc.c \
> + lib/colord/cd-icc-utils.c \
> + lib/colord/cd-dom.c
> +
> +libcolord.so: $(LIBSOURCES)
> + $(CC) $(CFLAGS) -fPIC -shared -Wl,-soname,$@ $^ -o $(DESTDIR)/$@
> +
> +cd_idt8.o: client/cd-it8.c
> + $(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@
> +
> +cd_idt8: libcolord.so cd_idt8.o
> + $(CC) $(LDFLAGS) -L$(DESTDIR) -lcolord $(DESTDIR)/cd_idt8.o -o $(DESTDIR)/$@
> +
> +cd_create_profile.o: client/cd-create-profile.c
> + $(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@
> +
> +cd_create_profile: libcolord.so cd_create_profile.o
> + $(CC) $(LDFLAGS) -L$(DESTDIR) -lcolord $(DESTDIR)/cd_create_profile.o -o $(DESTDIR)/$@
> +
> +.PHONY: clean
> +
> +clean:
> + rm -f $(DESTDIR)/libcolord.so $(DESTDIR)/*.o $(DESTDIR)/cd_idt8 $(DESTDIR)/cd_create_profile
> diff --git a/meta-oe/recipes-support/colord/colord.bb b/meta-oe/recipes-support/colord/colord.bb
> new file mode 100644
> index 000000000..5c691e463
> --- /dev/null
> +++ b/meta-oe/recipes-support/colord/colord.bb
> @@ -0,0 +1,45 @@
> +require ${BPN}.inc
> +
> +inherit meson gobject-introspection gsettings gettext bash-completion systemd distro_features_check useradd
> +
> +# polkit and gobject-introspection are mandatory and cannot be configured
> +REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data"
> +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
> +
> +DEPENDS += " \
> + ${BPN}-native \
> + glib-2.0 \
> + lcms \
> + sqlite3 \
> + libgusb \
> + libgudev \
> + polkit \
> +"
> +
> +SRC_URI += " \
> + file://0001-Run-native-cd_idt8-cd_create_profile.patch \
> +"
> +
> +EXTRA_OEMESON = " \
> + -Dman=false \
> + -Ddocs=false \
> +"
> +
> +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
> +PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=true, systemd"
> +
> +SYSTEMD_SERVICE_${PN} = "colord.service"
> +
> +FILES_${PN} += " \
> + ${datadir}/dbus-1 \
> + ${datadir}/polkit-1 \
> + ${datadir}/glib-2.0 \
> + ${datadir}/color \
> + ${systemd_user_unitdir} \
> + ${libdir}/tmpfiles.d \
> + ${libdir}/colord-plugins \
> + ${libdir}/colord-sensors \
> +"
> +
> +USERADD_PACKAGES = "${PN}"
> +USERADD_PARAM_${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord"
> diff --git a/meta-oe/recipes-support/colord/colord.inc b/meta-oe/recipes-support/colord/colord.inc
> new file mode 100644
> index 000000000..7497fed51
> --- /dev/null
> +++ b/meta-oe/recipes-support/colord/colord.inc
> @@ -0,0 +1,13 @@
> +SUMMARY = "Making color management just work"
> +HOMEPAGE = "https://www.freedesktop.org/software/colord/"
> +LICENSE = "GPLv2 & LGPLv2.1"
> +LIC_FILES_CHKSUM = " \
> + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> + file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \
> +"
> +
> +PV = "1.4.4"
> +SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz"
> +SRC_URI[md5sum] = "32c2709a6002d9ee750483aaed6379c8"
> +SRC_URI[sha256sum] = "9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5"
> +
> diff --git a/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch b/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
> new file mode 100644
> index 000000000..4b52aa337
> --- /dev/null
> +++ b/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
> @@ -0,0 +1,59 @@
> +From 5aad8831c0fb71940d6c4f982b0b30ffb6ae33b3 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Sun, 12 May 2019 22:47:05 +0200
> +Subject: [PATCH] Run native cd_idt8/cd_create_profile
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Inappropriate [OE specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + data/cmf/meson.build | 2 +-
> + data/illuminant/meson.build | 2 +-
> + data/profiles/meson.build | 2 +-
> + 3 files changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/data/cmf/meson.build b/data/cmf/meson.build
> +index a693cd7..1ae3613 100644
> +--- a/data/cmf/meson.build
> ++++ b/data/cmf/meson.build
> +@@ -2,7 +2,7 @@ foreach arg: [ 'CIE1964-10deg-XYZ', 'CIE1931-2deg-XYZ' ]
> + custom_target(arg,
> + input: arg + '.csv',
> + output: arg + '.cmf',
> +- command: [ cd_idt8, 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ],
> ++ command: [ 'cd_idt8', 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ],
> + install: true,
> + install_dir: join_paths(datadir, 'colord', 'cmf')
> + )
> +diff --git a/data/illuminant/meson.build b/data/illuminant/meson.build
> +index f8dfa07..ad7dced 100644
> +--- a/data/illuminant/meson.build
> ++++ b/data/illuminant/meson.build
> +@@ -24,7 +24,7 @@ foreach arg: generated_spectra
> + custom_target(arg,
> + input: arg + '.csv',
> + output: arg + '.sp',
> +- command: [ cd_idt8, 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ],
> ++ command: [ 'cd_idt8', 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ],
> + install: true,
> + install_dir: join_paths(datadir, 'colord', 'illuminant')
> + )
> +diff --git a/data/profiles/meson.build b/data/profiles/meson.build
> +index 591b97d..2cef011 100644
> +--- a/data/profiles/meson.build
> ++++ b/data/profiles/meson.build
> +@@ -59,7 +59,7 @@ foreach arg: icc_profiles
> + generated_icc = custom_target(arg + '.icc',
> + input: xml_i18n,
> + output: arg + '.icc',
> +- command: [ cd_create_profile, '--output=@OUTPUT@', '@INPUT@' ],
> ++ command: [ 'cd_create_profile', '--output=@OUTPUT@', '@INPUT@' ],
> + install: true,
> + install_dir: join_paths(datadir, 'color', 'icc', 'colord'),
> + )
> +--
> +2.20.1
> +
> --
> 2.21.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 15/15] colord-gtk: initial add 0.2.0
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
` (13 preceding siblings ...)
2019-10-25 7:21 ` [PATCH 14/15] colord: initial add 1.4.4 Andreas Müller
@ 2019-10-25 7:21 ` Andreas Müller
2019-10-27 15:33 ` [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
15 siblings, 0 replies; 25+ messages in thread
From: Andreas Müller @ 2019-10-25 7:21 UTC (permalink / raw)
To: openembedded-devel
it is a dependency for upcoming gnome-control-center
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../colord-gtk/colord-gtk_0.2.0.bb | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb
diff --git a/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb b/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb
new file mode 100644
index 000000000..c960b99c4
--- /dev/null
+++ b/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb
@@ -0,0 +1,21 @@
+SUMMARY = "GTK support library for colord"
+HOMEPAGE = "https://www.freedesktop.org/software/colord/"
+LICENSE = "LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
+
+inherit meson gobject-introspection gettext gtk-doc distro_features_check
+
+DEPENDS = " \
+ gtk+3 \
+ colord \
+"
+
+SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "66d048803c8b89e5e63da4b461484933"
+SRC_URI[sha256sum] = "2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717"
+
+EXTRA_OEMESON = "-Dman=false"
+
+# gobject-introspection is mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
--
2.21.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 00/15] Upgrades & GNOME preparations
2019-10-25 7:20 [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
` (14 preceding siblings ...)
2019-10-25 7:21 ` [PATCH 15/15] colord-gtk: initial add 0.2.0 Andreas Müller
@ 2019-10-27 15:33 ` Andreas Müller
2019-10-27 15:56 ` Khem Raj
15 siblings, 1 reply; 25+ messages in thread
From: Andreas Müller @ 2019-10-27 15:33 UTC (permalink / raw)
To: openembeded-devel, Khem Raj
On Fri, Oct 25, 2019 at 9:21 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> Upgrades & tiny preparations for GNOME crusade
>
> Andreas Müller (15):
> gtkmm3: upgrade 3.24.1 -> 3.24.2
> geany: upgrade 1.34.1 -> 1.36
> geany-plugins: upgrade 1.34 -> 1.36
> libstemmer: initial add 2.0.0
> appstream-glib: initial add 0.7.16
> yelp-xsl: initial add 3.34.0
> yelp-tools: initial add 3.32.2
> yelp: initial add 3.34.0
> zenity: pretify recipe a bit
> glibmm: upgrade 2.60.0 -> 2.62.0
> libsigc++-3: initial add 3.0.0
> ibus: initial add 1.5.21
> libgusb: initial add 0.3.0+
> colord: initial add 1.4.4
> colord-gtk: initial add 0.2.0
>
Hi Khem,
Just saw you added some of this series to master. Since the
zenity/itstool issue [1] requires rework on many recipes please
ignore/remove ALL the pending from this series in master-next - I'll
come back with a reworked series addressing all issues.
Thanks for your support and patience
[1] https://errors.yoctoproject.org/Errors/Details/274743/
Andreas
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 00/15] Upgrades & GNOME preparations
2019-10-27 15:33 ` [PATCH 00/15] Upgrades & GNOME preparations Andreas Müller
@ 2019-10-27 15:56 ` Khem Raj
0 siblings, 0 replies; 25+ messages in thread
From: Khem Raj @ 2019-10-27 15:56 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembeded-devel
On Sun, Oct 27, 2019 at 4:33 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Fri, Oct 25, 2019 at 9:21 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
> >
> > Upgrades & tiny preparations for GNOME crusade
> >
> > Andreas Müller (15):
> > gtkmm3: upgrade 3.24.1 -> 3.24.2
> > geany: upgrade 1.34.1 -> 1.36
> > geany-plugins: upgrade 1.34 -> 1.36
> > libstemmer: initial add 2.0.0
> > appstream-glib: initial add 0.7.16
> > yelp-xsl: initial add 3.34.0
> > yelp-tools: initial add 3.32.2
> > yelp: initial add 3.34.0
> > zenity: pretify recipe a bit
> > glibmm: upgrade 2.60.0 -> 2.62.0
> > libsigc++-3: initial add 3.0.0
> > ibus: initial add 1.5.21
> > libgusb: initial add 0.3.0+
> > colord: initial add 1.4.4
> > colord-gtk: initial add 0.2.0
> >
> Hi Khem,
>
> Just saw you added some of this series to master. Since the
> zenity/itstool issue [1] requires rework on many recipes please
> ignore/remove ALL the pending from this series in master-next - I'll
> come back with a reworked series addressing all issues.
>
> Thanks for your support and patience
>
no worries I have removed ibus, colord colord-gtk and zenity which I
am expecting new revs
others all look fine so they are merged.
> [1] https://errors.yoctoproject.org/Errors/Details/274743/
>
> Andreas
^ permalink raw reply [flat|nested] 25+ messages in thread