Skip to contentSkip to conversation

webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements

PATCH In review Adrian Bunk 4 participants 16 messages Feb 23, 2020 – Feb 26, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/6 webkitgtk: Remove unnecessary REQUIRED_DISTRO_FEATURES requirements

opengl is optional.
x11 can be replaced with wayland.

---
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +1 -1
index a48a976f94..51fba94964 100644
@@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
 
-REQUIRED_DISTRO_FEATURES = "x11 opengl"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
 CVE_PRODUCT = "webkitgtk webkitgtk\+"
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 2/6 webkitgtk: Remove unused DEPENDS on pulseaudio

---
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +1 -1
index 51fba94964..80ed427352 100644
@@ -33,7 +33,7 @@ CVE_PRODUCT = "webkitgtk webkitgtk\+"
 DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \
            gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \
 	   pango icu bison-native gawk intltool-native libwebp \
-	   atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \
+	   atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \
 	   ruby-native libnotify gstreamer1.0-plugins-bad \
 	   gettext-native glib-2.0 glib-2.0-native libtasn1 \
           "
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 3/6 webkitgtk: Remove obsolete gtk2 packageconfig

In reply to Adrian Bunk

Upstream no longer supports GTK2 plugins.

---
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -1
index 80ed427352..a9c00862c3 100644
@@ -48,7 +48,6 @@ PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF
 PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11"
 PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
 PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
-PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+"
 PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2"
 PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl"
 PACKAGECONFIG[opengl] = "-DENABLE_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl"
Signature · 1 line
2.17.1
#3 lore raw

PATCH v2 4/6 webkitgtk: Remove the unused DEPENDS on libidn

In reply to Adrian Bunk
---
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +1 -1
index a9c00862c3..7b3d16d8cb 100644
@@ -30,7 +30,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
 CVE_PRODUCT = "webkitgtk webkitgtk\+"
 
-DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \
+DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libgcrypt \
            gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \
 	   pango icu bison-native gawk intltool-native libwebp \
 	   atk udev harfbuzz jpeg libpng librsvg libtheora libvorbis libxcomposite libxtst \
Signature · 1 line
2.17.1
#4 lore raw

PATCH v2 5/6 systemd: Add a PACKAGECONFIG for libidn2

In reply to Adrian Bunk
---
 meta/recipes-core/systemd/systemd_244.3.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-core/systemd/systemd_244.3.bb +1 -0
index b686519482..5d863410b8 100644
@@ -138,6 +138,7 @@ PACKAGECONFIG[journal-upload] = "-Dlibcurl=true,-Dlibcurl=false,curl"
 PACKAGECONFIG[kmod] = "-Dkmod=true,-Dkmod=false,kmod"
 PACKAGECONFIG[ldconfig] = "-Dldconfig=true,-Dldconfig=false,,ldconfig"
 PACKAGECONFIG[libidn] = "-Dlibidn=true,-Dlibidn=false,libidn"
+PACKAGECONFIG[libidn2] = "-Dlibidn2=true,-Dlibidn2=false,libidn2"
 PACKAGECONFIG[localed] = "-Dlocaled=true,-Dlocaled=false"
 PACKAGECONFIG[logind] = "-Dlogind=true,-Dlogind=false"
 PACKAGECONFIG[lz4] = "-Dlz4=true,-Dlz4=false,lz4"
Signature · 1 line
2.17.1
#5 lore raw

PATCH v2 6/6 libidn: Move to meta-oe

In reply to Adrian Bunk

There are no users left in OE-core.

---
 meta/conf/distro/include/maintainers.inc      |   1 -
 .../0001-idn-format-security-warnings.patch   | 181 ------------------
 ...R_P_warning_error_with_automake_1.12.patch |  34 ----
 .../libidn/dont-depend-on-help2man.patch      |  23 ---
 .../libidn/libidn_fix_for_automake-1.12.patch |  35 ----
 meta/recipes-extended/libidn/libidn_1.35.bb   |  42 ----
 6 files changed, 316 deletions(-)
 delete mode 100644 meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch
 delete mode 100644 meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
 delete mode 100644 meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
 delete mode 100644 meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
 delete mode 100644 meta/recipes-extended/libidn/libidn_1.35.bb
meta/conf/distro/include/maintainers.inc +0 -1
index 5f1dae9a34..8f612ace39 100644
@@ -340,7 +340,6 @@ RECIPE_MAINTAINER_pn-libgudev = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-libical = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-libice = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-libid3tag = "Tanu Kaskinen <[email protected]>"
-RECIPE_MAINTAINER_pn-libidn = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-libidn2 = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-libinput = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-libjitterentropy = "Ross Burton <[email protected]>"
meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch deleted +0 -181

181 lines not on this page · raw message

meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch deleted +0 -34
deleted file mode 100644
index 43bd232944..0000000000
@@ -1,34 +0,0 @@
-From cdd9e2e960eeb4eda7b08f0113d0cd03524c1d45 Mon Sep 17 00:00:00 2001
-From: Nitin A Kamble <[email protected]>
-Date: Tue, 10 Jul 2012 02:44:30 -0700
-Subject: [PATCH] libidn: fix build with automake 1.12
-
-Upstream-Status: Inappropriate
-
-automake 1.12.x has deprecated AM_PROG_MKDIR_P , and throws a warning for that,
-and the warnings are treated as errors because of the -Werror parameter.
-
-These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not
-eliminated these deprecated macros yet. So disable the treatment of warnings
-as errors until gettext is updated to remove the deprecated macros.
-
-Signed-off-by: Nitin A Kamble <[email protected]>
-2012/07/10
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 261dad2..c4f935e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,7 +22,7 @@ AC_INIT([GNU Libidn], [1.34], [[email protected]])
- AC_CONFIG_AUX_DIR([build-aux])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_HEADERS(config.h)
--AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
-+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
- # Library code modified:                              REVISION++
meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch deleted +0 -23
deleted file mode 100644
index 0863530f29..0000000000
@@ -1,23 +0,0 @@
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Marko Lindqvist <[email protected]>
-diff -Nurdd libidn-1.26/doc/Makefile.am libidn-1.26/doc/Makefile.am
---- libidn-1.26/doc/Makefile.am	2012-09-18 11:25:45.000000000 +0300
-+++ libidn-1.26/doc/Makefile.am	2013-02-08 07:41:24.591431462 +0200
-@@ -49,15 +49,9 @@
-
- # Man pages.
-
--dist_man_MANS = idn.1 $(gdoc_MANS)
-+dist_man_MANS = $(gdoc_MANS)
- MAINTAINERCLEANFILES = $(dist_man_MANS)
-
--idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo \
--		$(top_srcdir)/configure.ac
--	$(HELP2MAN) \
--		--name="Internationalized Domain Names command line tool" \
--		--output=$@ $(top_builddir)/src/idn$(EXEEXT)
--
- # GDOC
-
- GDOC_BIN = $(srcdir)/gdoc
meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch deleted +0 -35
deleted file mode 100644
index 3c0559e34f..0000000000
@@ -1,35 +0,0 @@
-From d4f64b78419139eda3c0e1c6ee116bb5f70ea67c Mon Sep 17 00:00:00 2001
-From: Nitin A Kamble <[email protected]>
-Date: Wed, 2 May 2012 18:05:19 -0700
-Subject: [PATCH] libtasn1: fix build with automake 1.12
-
-Upstream-Status: Pending
-
-This patch fixes following issue with automake 1.12
-
-| automake: warnings are treated as errors
-| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libidn.la': linking libtool libraries using a non-POSIX
-| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
-
-Signed-off-by: Nitin A Kamble <[email protected]>
-2012/05/03
-
----
- configure.ac | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 8297649..7b9626e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 18)
- AC_SUBST(LT_REVISION, 0)
- AC_SUBST(LT_AGE, 6)
- 
-+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
-+m4_pattern_allow([AM_PROG_AR])
-+AM_PROG_AR
-+
- AC_PROG_CC
- gl_EARLY
- lgl_EARLY
meta/recipes-extended/libidn/libidn_1.35.bb deleted +0 -42

42 lines not on this page · raw message

Signature · 1 line
2.17.1
#6 lore raw
In reply to Adrian Bunk
Quoted 13 lines · Adrian Bunk

opengl is optional.
x11 can be replaced with wayland.

---
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -0
index a48a976f94..51fba94964 100644

meta/recipes-sato/webkit/webkitgtk_2.26.4.bb SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 · line 31

Quoted 7 lines
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +1 -1
@@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
 
-REQUIRED_DISTRO_FEATURES = "x11 opengl"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
 CVE_PRODUCT = "webkitgtk webkitgtk\+"

The autobuilder no-x11 build seems unhappy with this patch series unfortunately :(

https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/1616

Cheers,

Richard

#7 lore raw
Quoted 20 lines · Richard Purdie
Quoted 19 lines · Adrian Bunk

opengl is optional.
x11 can be replaced with wayland.

---
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +1 -1
index a48a976f94..51fba94964 100644
@@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
 
-REQUIRED_DISTRO_FEATURES = "x11 opengl"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
Quoted 6 lines

meta/recipes-sato/webkit/webkitgtk_2.26.4.bb SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 · line 31

Quoted 1 line
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -0
 CVE_PRODUCT = "webkitgtk webkitgtk\+"

The autobuilder no-x11 build seems unhappy with this patch series unfortunately :(

https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/1616

Sorry for that, I did not test a wayland-only build of webkitgtk.

I'll take care of that this evening, until then please drop either this first patch or the whole series.

Quoted 3 lines

Cheers,

Richard

cu
Adrian

#8 lore raw
Quoted 26 lines · Adrian Bunk
Quoted 25 lines · Richard Purdie
Quoted 13 lines · Adrian Bunk

opengl is optional.
x11 can be replaced with wayland.

---
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -0
index a48a976f94..51fba94964 100644

meta/recipes-sato/webkit/webkitgtk_2.26.4.bb SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993 · line 31

Quoted 7 lines
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +1 -1
@@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4386900713dfadf9741177210b32623cab22562a79ffd0d446b6656993
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
 
-REQUIRED_DISTRO_FEATURES = "x11 opengl"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
 CVE_PRODUCT = "webkitgtk webkitgtk\+"

The autobuilder no-x11 build seems unhappy with this patch series unfortunately :(

Quoted 6 lines
Quoted 1 line

https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/1616

Sorry for that, I did not test a wayland-only build of webkitgtk.

I'll take care of that this evening, until then please drop either this first patch or the whole series.

OK, the short-term solution is to drop the first patch.

The original failure is easy to fix (I'll send a patch that moves the X libraries from DEPENDS to the x11 config), but the next one is not:

Alexander, wayland support in webkitgtk requires mesa built with x11 support (otherwise gl.pc is not available).

cu
Adrian

#9 lore raw
Quoted 2 lines · Adrian Bunk

Alexander, wayland support in webkitgtk requires mesa built with x11 support (otherwise gl.pc is not available).

Can you provide links where this happens please? Specifically, where mesa makes that decision, and where webkit asks for that file?
So it's easier for me to look into it.

Alex

#10 lore raw
In reply to Adrian Bunk
Quoted 4 lines · Adrian Bunk

Alexander, wayland support in webkitgtk requires mesa built with x11 support (otherwise gl.pc is not available).

I had a look; I'm not sure I understood the options correctly, but the issue is due to this:

                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl

opengl', '' ,d)} \

The above works if both opengl and x11 are enabled as DISTRO_FEATURES, but if x11 is not enabled, then it should be "webgl gles2". Can you try that?

Alex

#11 lore raw
Quoted 5 lines · Alexander Kanavin
Quoted 2 lines · Adrian Bunk

Alexander, wayland support in webkitgtk requires mesa built with x11 support (otherwise gl.pc is not available).

Quoted 8 lines

I had a look; I'm not sure I understood the options correctly, but the issue is due to this:

                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl

opengl', '' ,d)} \

The above works if both opengl and x11 are enabled as DISTRO_FEATURES, but if x11 is not enabled, then it should be "webgl gles2". Can you try that?

Thanks, that did the trick.

Expressing everything might still be problematic, is there a way to set REQUIRED_DISTRO_FEATURES to
x11 || (wayland && opengl)
?

Using webkitgtk with x11 without opengl might not be common, but it is explicitly supported upstream.

Quoted 1 line

Alex

cu
Adrian

#12 lore raw

I would probably look into how REQUIRED_DISTRO_FEATURE/ANY_OF_DISTRO_FEATURS is actually implemented, and see if you can convince it to do the right thing, or maybe write a custom re-implementation.

Alex

Quoted 32 lines · Adrian Bunk
Quoted 9 lines · Alexander Kanavin
Quoted 2 lines · Adrian Bunk

Alexander, wayland support in webkitgtk requires mesa built with x11 support (otherwise gl.pc is not available).

I had a look; I'm not sure I understood the options correctly, but the issue is due to this:

                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl',

'webgl

Quoted 3 lines

opengl', '' ,d)} \

The above works if both opengl and x11 are enabled as DISTRO_FEATURES,

but

Quoted 1 line

if x11 is not enabled, then it should be "webgl gles2". Can you try that?

Thanks, that did the trick.

Expressing everything might still be problematic, is there a way to set REQUIRED_DISTRO_FEATURES to
x11 || (wayland && opengl)
?

Using webkitgtk with x11 without opengl might not be common, but it is explicitly supported upstream.

Quoted 1 line

Alex

cu
Adrian

#13 lore raw
Quoted 4 lines · Alexander Kanavin

I would probably look into how REQUIRED_DISTRO_FEATURE/ANY_OF_DISTRO_FEATURS is actually implemented, and see if you can convince it to do the right thing, or maybe write a custom re-implementation.

I did already check meta/classes/features_check.bbclass, there is no obvious simple way for expressing more complicated dependencies.

The low-effort way forward will be to keep opengl required even for x11, with a comment why.

Quoted 1 line

Alex

cu
Adrian

#14 lore raw
Quoted 8 lines · Adrian Bunk
Quoted 4 lines · Alexander Kanavin

I would probably look into how REQUIRED_DISTRO_FEATURE/ANY_OF_DISTRO_FEATURS is actually implemented, and see if you can convince it to do the right thing, or maybe write a custom re-implementation.

I did already check meta/classes/features_check.bbclass, there is no obvious simple way for expressing more complicated dependencies.

Doesn't this do what you wanted?

REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland opengl', 'x11', d)}"

Quoted 13 lines

The low-effort way forward will be to keep opengl required even for x11, with a comment why.

Quoted 1 line

Alex

cu
Adrian

Signature · 4 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
#15 lore raw
Quoted 7 lines · Martin Jansa
Quoted 6 lines · Adrian Bunk
Quoted 4 lines · Alexander Kanavin

I would probably look into how REQUIRED_DISTRO_FEATURE/ANY_OF_DISTRO_FEATURS is actually implemented, and see if you can convince it to do the right thing, or maybe write a custom re-implementation.

Quoted 6 lines
Quoted 2 lines

I did already check meta/classes/features_check.bbclass, there is no obvious simple way for expressing more complicated dependencies.

Doesn't this do what you wanted?

REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland opengl', 'x11', d)}"

Thanks, I now have a v3.

cu
Adrian