Re: [OE-core] [PATCH 04/24] xserver-xorg: update 1.20.13 -> 21.1.1
Patch already sent ;)
Alex
On Thu, 11 Nov 2021 at 11:27, Richard Purdie <
richard.pur...@linuxfoundation.org> wrote:
> On Thu, 2021-11-11 at 10:26 +, Richard Purdie via
> lists.openembedded.org
> wrote:
> > On Wed, 2021-11-10 at 20:39 +0100, Alexander Kanavin wrote:
> > > libxcvt is a new dependency (thanks Oleksandr!).
> > >
> > > Include ${libdir}/xorg/modules/input/*.so into the main
> > > package (if for someone separate packaging matters, please
> > > investigate what they do).
> > >
> > > Remove options no longer present upstream.
> > >
> > > Remove patches available upstream; drop a chunk as well.
> > >
> > > Signed-off-by: Alexander Kanavin
> > > ---
> > > .../xorg-xserver/xserver-xorg.inc | 7 +--
> > > ...-duplicate-definitions-of-IOPortBase.patch | 24 ++---
> > > ...probing-a-non-PCI-platform-device-on.patch | 34 -
> > > ...t-xtest-Initialize-array-with-braces.patch | 36 -
> > > .../xorg-xserver/xserver-xorg/pkgconfig.patch | 34 -
> > > .../xserver-xorg/sdksyms-no-build-path.patch | 50 ---
> > > ...xorg_1.20.13.bb => xserver-xorg_21.1.1.bb} | 6 +--
> > > 7 files changed, 7 insertions(+), 184 deletions(-)
> > > delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
> > > delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
> > > delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
> > > delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
> > > rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.13.bb
> => xserver-xorg_21.1.1.bb} (77%)
> > >
> >
> > I think there is some dependency issue:
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/4349
> >
> > but I'm wondering why this only showed up on this rebuild and not
> previously
> > too...
>
> Sorry, it did and the buildbot UI let me miss it, it also failed here:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/4344
>
> Cheers,
>
> Richard
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#158161):
https://lists.openembedded.org/g/openembedded-core/message/158161
Mute This Topic: https://lists.openembedded.org/mt/86965697/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 04/24] xserver-xorg: update 1.20.13 -> 21.1.1
On Thu, 2021-11-11 at 10:26 +, Richard Purdie via lists.openembedded.org
wrote:
> On Wed, 2021-11-10 at 20:39 +0100, Alexander Kanavin wrote:
> > libxcvt is a new dependency (thanks Oleksandr!).
> >
> > Include ${libdir}/xorg/modules/input/*.so into the main
> > package (if for someone separate packaging matters, please
> > investigate what they do).
> >
> > Remove options no longer present upstream.
> >
> > Remove patches available upstream; drop a chunk as well.
> >
> > Signed-off-by: Alexander Kanavin
> > ---
> > .../xorg-xserver/xserver-xorg.inc | 7 +--
> > ...-duplicate-definitions-of-IOPortBase.patch | 24 ++---
> > ...probing-a-non-PCI-platform-device-on.patch | 34 -
> > ...t-xtest-Initialize-array-with-braces.patch | 36 -
> > .../xorg-xserver/xserver-xorg/pkgconfig.patch | 34 -
> > .../xserver-xorg/sdksyms-no-build-path.patch | 50 ---
> > ...xorg_1.20.13.bb => xserver-xorg_21.1.1.bb} | 6 +--
> > 7 files changed, 7 insertions(+), 184 deletions(-)
> > delete mode 100644
> > meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
> > delete mode 100644
> > meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
> > delete mode 100644
> > meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
> > delete mode 100644
> > meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.13.bb =>
> > xserver-xorg_21.1.1.bb} (77%)
> >
>
> I think there is some dependency issue:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/4349
>
> but I'm wondering why this only showed up on this rebuild and not previously
> too...
Sorry, it did and the buildbot UI let me miss it, it also failed here:
https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/4344
Cheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#158160):
https://lists.openembedded.org/g/openembedded-core/message/158160
Mute This Topic: https://lists.openembedded.org/mt/86965697/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 04/24] xserver-xorg: update 1.20.13 -> 21.1.1
On Wed, 2021-11-10 at 20:39 +0100, Alexander Kanavin wrote:
> libxcvt is a new dependency (thanks Oleksandr!).
>
> Include ${libdir}/xorg/modules/input/*.so into the main
> package (if for someone separate packaging matters, please
> investigate what they do).
>
> Remove options no longer present upstream.
>
> Remove patches available upstream; drop a chunk as well.
>
> Signed-off-by: Alexander Kanavin
> ---
> .../xorg-xserver/xserver-xorg.inc | 7 +--
> ...-duplicate-definitions-of-IOPortBase.patch | 24 ++---
> ...probing-a-non-PCI-platform-device-on.patch | 34 -
> ...t-xtest-Initialize-array-with-braces.patch | 36 -
> .../xorg-xserver/xserver-xorg/pkgconfig.patch | 34 -
> .../xserver-xorg/sdksyms-no-build-path.patch | 50 ---
> ...xorg_1.20.13.bb => xserver-xorg_21.1.1.bb} | 6 +--
> 7 files changed, 7 insertions(+), 184 deletions(-)
> delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
> delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
> delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
> delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
> rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.13.bb =>
> xserver-xorg_21.1.1.bb} (77%)
>
I think there is some dependency issue:
https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/4349
but I'm wondering why this only showed up on this rebuild and not previously
too...
Cheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#158159):
https://lists.openembedded.org/g/openembedded-core/message/158159
Mute This Topic: https://lists.openembedded.org/mt/86965697/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 04/24] xserver-xorg: update 1.20.13 -> 21.1.1
lgtm
On Wed, Nov 10, 2021 at 11:39 AM Alexander Kanavin
wrote:
>
> libxcvt is a new dependency (thanks Oleksandr!).
>
> Include ${libdir}/xorg/modules/input/*.so into the main
> package (if for someone separate packaging matters, please
> investigate what they do).
>
> Remove options no longer present upstream.
>
> Remove patches available upstream; drop a chunk as well.
>
> Signed-off-by: Alexander Kanavin
> ---
> .../xorg-xserver/xserver-xorg.inc | 7 +--
> ...-duplicate-definitions-of-IOPortBase.patch | 24 ++---
> ...probing-a-non-PCI-platform-device-on.patch | 34 -
> ...t-xtest-Initialize-array-with-braces.patch | 36 -
> .../xorg-xserver/xserver-xorg/pkgconfig.patch | 34 -
> .../xserver-xorg/sdksyms-no-build-path.patch | 50 ---
> ...xorg_1.20.13.bb => xserver-xorg_21.1.1.bb} | 6 +--
> 7 files changed, 7 insertions(+), 184 deletions(-)
> delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
> delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
> delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
> delete mode 100644
> meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
> rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.13.bb =>
> xserver-xorg_21.1.1.bb} (77%)
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> index e1fc0a06dc..6a5f274046 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> @@ -28,7 +28,7 @@ inherit autotools pkgconfig
> inherit features_check
> REQUIRED_DISTRO_FEATURES = "x11"
>
> -LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm
> libxkbfile libpciaccess"
> +LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm
> libxkbfile libpciaccess libxcvt"
> DEPENDS = "xorgproto ${LIB_DEPS} font-util"
>
> # Split out some modules and extensions from the main package
> @@ -78,7 +78,7 @@ RRECOMMENDS:${PN}-xwayland += "${XSERVER_RRECOMMENDS}"
> RDEPENDS:${PN}-xvfb += "xkeyboard-config"
> RDEPENDS:${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
>
> -FILES:${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards
> ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so
> ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt
> ${datadir}/X11/xorg.conf.d"
> +FILES:${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards
> ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so
> ${libdir}/xorg/modules/input/*.so ${libdir}/xorg/modules/*.so /etc/X11
> ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
> FILES:${PN}-dev += "${libdir}/xorg/modules/*.la
> ${libdir}/xorg/modules/*/*.la"
> FILES:${PN}-doc += "${libdir}/X11/doc
> ${datadir}/X11/xkb/compiled/README.compiled
> ${localstatedir}/lib/xkb/README.compiled"
> FILES:${PN}-sdl = "${bindir}/Xsdl"
> @@ -109,7 +109,6 @@ EXTRA_OECONF += "--with-fop=no \
> --with-pic \
> --disable-static \
> --disable-record \
> - --disable-dmx \
> --disable-xnest \
> --enable-xvfb \
> --enable-composite \
> @@ -118,7 +117,6 @@ EXTRA_OECONF += "--with-fop=no \
> --sysconfdir=/etc/X11 \
> --localstatedir=/var \
> --with-xkb-output=/var/lib/xkb \
> - --with-os-name=Linux \
> "
>
> OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
> @@ -141,7 +139,6 @@ PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto,
> xmlto-native docbook-xml-
> PACKAGECONFIG[systemd-logind] =
> "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
> PACKAGECONFIG[systemd] =
> "--with-systemd-daemon,--without-systemd-daemon,systemd"
> PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama"
> -PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland
> wayland-native wayland-protocols libepoxy"
>
> # Xorg requires a SHA1 implementation, pick one
> XORG_CRYPTO ??= "openssl"
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
>
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
> index 4737040675..11d5546537 100644
> ---
> a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
> +++
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
> @@ -1,4 +1,4 @@
> -From fc04acfd948ac99d04a5dc08c78f3b13bc0c5c41 Mon Sep 17 00:00:00 2001
> +From ce3b8a230a3805c9b557c1f106795675bd034860 Mon Sep 17 00:00:00 2001
> From: Khem
[OE-core] [PATCH 04/24] xserver-xorg: update 1.20.13 -> 21.1.1
libxcvt is a new dependency (thanks Oleksandr!).
Include ${libdir}/xorg/modules/input/*.so into the main
package (if for someone separate packaging matters, please
investigate what they do).
Remove options no longer present upstream.
Remove patches available upstream; drop a chunk as well.
Signed-off-by: Alexander Kanavin
---
.../xorg-xserver/xserver-xorg.inc | 7 +--
...-duplicate-definitions-of-IOPortBase.patch | 24 ++---
...probing-a-non-PCI-platform-device-on.patch | 34 -
...t-xtest-Initialize-array-with-braces.patch | 36 -
.../xorg-xserver/xserver-xorg/pkgconfig.patch | 34 -
.../xserver-xorg/sdksyms-no-build-path.patch | 50 ---
...xorg_1.20.13.bb => xserver-xorg_21.1.1.bb} | 6 +--
7 files changed, 7 insertions(+), 184 deletions(-)
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.13.bb =>
xserver-xorg_21.1.1.bb} (77%)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index e1fc0a06dc..6a5f274046 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -28,7 +28,7 @@ inherit autotools pkgconfig
inherit features_check
REQUIRED_DISTRO_FEATURES = "x11"
-LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile
libpciaccess"
+LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile
libpciaccess libxcvt"
DEPENDS = "xorgproto ${LIB_DEPS} font-util"
# Split out some modules and extensions from the main package
@@ -78,7 +78,7 @@ RRECOMMENDS:${PN}-xwayland += "${XSERVER_RRECOMMENDS}"
RDEPENDS:${PN}-xvfb += "xkeyboard-config"
RDEPENDS:${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
-FILES:${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards
${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so
${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt
${datadir}/X11/xorg.conf.d"
+FILES:${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards
${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so
${libdir}/xorg/modules/input/*.so ${libdir}/xorg/modules/*.so /etc/X11
${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
FILES:${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
FILES:${PN}-doc += "${libdir}/X11/doc
${datadir}/X11/xkb/compiled/README.compiled
${localstatedir}/lib/xkb/README.compiled"
FILES:${PN}-sdl = "${bindir}/Xsdl"
@@ -109,7 +109,6 @@ EXTRA_OECONF += "--with-fop=no \
--with-pic \
--disable-static \
--disable-record \
- --disable-dmx \
--disable-xnest \
--enable-xvfb \
--enable-composite \
@@ -118,7 +117,6 @@ EXTRA_OECONF += "--with-fop=no \
--sysconfdir=/etc/X11 \
--localstatedir=/var \
--with-xkb-output=/var/lib/xkb \
- --with-os-name=Linux \
"
OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
@@ -141,7 +139,6 @@ PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto,
xmlto-native docbook-xml-
PACKAGECONFIG[systemd-logind] =
"--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
PACKAGECONFIG[systemd] =
"--with-systemd-daemon,--without-systemd-daemon,systemd"
PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama"
-PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland
wayland-native wayland-protocols libepoxy"
# Xorg requires a SHA1 implementation, pick one
XORG_CRYPTO ??= "openssl"
diff --git
a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
index 4737040675..11d5546537 100644
---
a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
+++
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
@@ -1,4 +1,4 @@
-From fc04acfd948ac99d04a5dc08c78f3b13bc0c5c41 Mon Sep 17 00:00:00 2001
+From ce3b8a230a3805c9b557c1f106795675bd034860 Mon Sep 17 00:00:00 2001
From: Khem Raj
Date: Mon, 17 Aug 2020 10:50:51 -0700
Subject: [PATCH] Avoid duplicate definitions of IOPortBase
@@ -10,26 +10,13 @@ compiler.h:528: multiple definition of `IOPortBase';
Upstream-Status: Pending
Signed-off-by: Khem Raj
+
---
-
