* [Buildroot] [PATCH v1 1/2] package/x11r7/xorgproto: bump version to 2024.1 @ 2024-10-18 21:52 Raphael Pavlidis 2024-10-18 21:52 ` [Buildroot] [PATCH v1 2/2] package/xwayland: bump to version 24.1.3 Raphael Pavlidis 2024-12-29 22:11 ` [Buildroot] [PATCH v1 1/2] package/x11r7/xorgproto: bump version to 2024.1 Thomas Petazzoni via buildroot 0 siblings, 2 replies; 4+ messages in thread From: Raphael Pavlidis @ 2024-10-18 21:52 UTC (permalink / raw) To: buildroot; +Cc: Raphael Pavlidis Release notes: https://lists.x.org/archives/xorg-announce/2024-March/003495.html Signed-off-by: Raphael Pavlidis <raphael.pavlidis@gmail.com> --- package/x11r7/xorgproto/xorgproto.hash | 8 +++++--- package/x11r7/xorgproto/xorgproto.mk | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xorgproto/xorgproto.hash b/package/x11r7/xorgproto/xorgproto.hash index 37ad9c7c04..941ceabd49 100644 --- a/package/x11r7/xorgproto/xorgproto.hash +++ b/package/x11r7/xorgproto/xorgproto.hash @@ -1,6 +1,8 @@ -# From https://lists.x.org/archives/xorg-announce/2023-June/003408.html -sha256 b61fbc7db82b14ce2dc705ab590efc32b9ad800037113d1973811781d5118c2c xorgproto-2023.2.tar.xz -sha512 af0a8c8094fc6a490a886a8c048175762b6334798f2e48b6f6e19a7bb39ddbef05fa1237c4e9d9f1d870d24f5ca7a7c463044c41ceebd108f8ab0816677a582d xorgproto-2023.2.tar.xz +# Verified from https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2024.1.tar.xz.sig +# with key 67DC86F2623FC5FD4BB5225D14706DBE1E4B4540 +# From https://lists.x.org/archives/xorg-announce/2024-March/003495.html +sha256 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59 xorgproto-2024.1.tar.xz +sha512 63955cb604ff831575af2193548857c1b99e52d00206ea9421ce99e145094bcd907388c4574bc32174a01cbe2c940b0377bf75ae7d2c0f953157dc9c32e5a07f xorgproto-2024.1.tar.xz # Locally computed sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto diff --git a/package/x11r7/xorgproto/xorgproto.mk b/package/x11r7/xorgproto/xorgproto.mk index f6e5a5a434..0253167372 100644 --- a/package/x11r7/xorgproto/xorgproto.mk +++ b/package/x11r7/xorgproto/xorgproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -XORGPROTO_VERSION = 2023.2 +XORGPROTO_VERSION = 2024.1 XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.xz XORGPROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XORGPROTO_LICENSE = MIT -- 2.47.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v1 2/2] package/xwayland: bump to version 24.1.3 2024-10-18 21:52 [Buildroot] [PATCH v1 1/2] package/x11r7/xorgproto: bump version to 2024.1 Raphael Pavlidis @ 2024-10-18 21:52 ` Raphael Pavlidis 2024-12-29 22:08 ` Thomas Petazzoni via buildroot 2024-12-29 22:11 ` [Buildroot] [PATCH v1 1/2] package/x11r7/xorgproto: bump version to 2024.1 Thomas Petazzoni via buildroot 1 sibling, 1 reply; 4+ messages in thread From: Raphael Pavlidis @ 2024-10-18 21:52 UTC (permalink / raw) To: buildroot; +Cc: Raphael Pavlidis Additionally, make libdrm an optional dependency. Also, xlib_libxshmfence is not a required dependency. Release notes: https://lists.x.org/archives/xorg-announce/2024-October/003532.html Signed-off-by: Raphael Pavlidis <raphael.pavlidis@gmail.com> --- package/x11r7/xwayland/Config.in | 12 ++++-------- package/x11r7/xwayland/xwayland.hash | 8 +++++--- package/x11r7/xwayland/xwayland.mk | 21 +++++++++++++++------ 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in index 311dae25ec..a4e4a4e46f 100644 --- a/package/x11r7/xwayland/Config.in +++ b/package/x11r7/xwayland/Config.in @@ -3,12 +3,10 @@ config BR2_PACKAGE_XWAYLAND depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # wayland depends on BR2_TOOLCHAIN_HAS_THREADS # wayland - # We need a SHA1 implementation. If either openssl or - # libgcrypt are already part of the build, we'll use one of - # them, otherwise, use the small libsha1 library. - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) + # We need a SHA1 implementation. If either openssl, libgcrypt, nettle or + # libsha1 are already part of the build, we'll use one of them, + # otherwise, use the small libmd library. + select BR2_PACKAGE_LIBMD if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT && !BR2_PACKAGE_NETTLE && !BR2_PACKAGE_LIBSHA1) select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_WAYLAND_PROTOCOLS @@ -16,7 +14,6 @@ config BR2_PACKAGE_XWAYLAND select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XLIB_LIBXKBFILE select BR2_PACKAGE_XLIB_LIBXRANDR - select BR2_PACKAGE_XLIB_LIBXSHMFENCE select BR2_PACKAGE_XLIB_XTRANS select BR2_PACKAGE_XORGPROTO help @@ -26,5 +23,4 @@ config BR2_PACKAGE_XWAYLAND comment "xwayland needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash index 5bb26bf17e..c7fd2c2ff8 100644 --- a/package/x11r7/xwayland/xwayland.hash +++ b/package/x11r7/xwayland/xwayland.hash @@ -1,6 +1,8 @@ -# From https://lists.x.org/archives/xorg-announce/2024-January/003443.html -sha256 a99e159b6d0d33098b3b6ab22a88bfcece23c8b9d0ca72c535c55dcb0681b46b xwayland-23.2.4.tar.xz -sha512 ac3ff208cbef5bbe4637c335cfda226489c93b0a3768f2f4fb0201c588485ede38262fbce77ef1425b3d2a0be61b6580df53341c7b95e6072c8b6371ad29d187 xwayland-23.2.4.tar.xz +# Verified from https://xorg.freedesktop.org/archive/individual/xserver/xwayland-24.1.3.tar.xz.sig +# with key 67DC86F2623FC5FD4BB5225D14706DBE1E4B4540 +# From https://lists.x.org/archives/xorg-announce/2024-October/003532.html +sha256 dcdb57a66cc9b124c8f936760592628ac4e744a7d7b3179aa86189ad7ea4cb10 xwayland-24.1.3.tar.xz +sha512 7e0e11b07408f41a81bafa7bc519d02ed9bdc36e11be16abe255a7d779d04824af23d79323f1602119b046c545cdd43ea91b93e23feb0ffe411aa6989b462c1d xwayland-24.1.3.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index c66dd471ac..0621e3547a 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -XWAYLAND_VERSION = 23.2.4 +XWAYLAND_VERSION = 24.1.3 XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver XWAYLAND_LICENSE = MIT @@ -12,7 +12,6 @@ XWAYLAND_LICENSE_FILES = COPYING XWAYLAND_CPE_ID_VENDOR = x.org XWAYLAND_INSTALL_STAGING = YES XWAYLAND_DEPENDENCIES = \ - libdrm \ pixman \ wayland \ wayland-protocols \ @@ -20,22 +19,26 @@ XWAYLAND_DEPENDENCIES = \ xlib_libXfont2 \ xlib_libxkbfile \ xlib_libXrandr \ - xlib_libxshmfence \ xlib_xtrans \ xorgproto XWAYLAND_CONF_OPTS = \ - -Ddri3=true \ - -Dxwayland_eglstream=false \ + -Dxwayland_ei=false \ -Dxvfb=false \ -Ddefault_font_path=/usr/share/fonts/X11/ \ -Ddtrace=false \ -Ddocs=false +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_XLIB_LIBXSHMFENCE),yy) +XWAYLAND_CONF_OPTS += -Ddri3=true +XWAYLAND_DEPENDENCIES += libdrm xlib_libxshmfence ifeq ($(BR2_PACKAGE_LIBEPOXY),y) XWAYLAND_CONF_OPTS += -Dglamor=true XWAYLAND_DEPENDENCIES += libepoxy else XWAYLAND_CONF_OPTS += -Dglamor=false +endif # BR2_PACKAGE_LIBEPOXY +else +XWAYLAND_CONF_OPTS += -Ddri3=false endif ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) @@ -76,9 +79,15 @@ XWAYLAND_DEPENDENCIES += openssl else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) XWAYLAND_CONF_OPTS += -Dsha1=libgcrypt XWAYLAND_DEPENDENCIES += libgcrypt -else +else ifeq ($(BR2_PACKAGE_NETTLE),y) +XWAYLAND_CONF_OPTS += -Dsha1=libnettle +XWAYLAND_DEPENDENCIES += nettle +else ifeq ($(BR2_PACKAGE_LIBSHA1),y) XWAYLAND_CONF_OPTS += -Dsha1=libsha1 XWAYLAND_DEPENDENCIES += libsha1 +else +XWAYLAND_CONF_OPTS += -Dsha1=libmd +XWAYLAND_DEPENDENCIES += libmd endif ifeq ($(BR2_PACKAGE_LIBUNWIND),y) -- 2.47.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH v1 2/2] package/xwayland: bump to version 24.1.3 2024-10-18 21:52 ` [Buildroot] [PATCH v1 2/2] package/xwayland: bump to version 24.1.3 Raphael Pavlidis @ 2024-12-29 22:08 ` Thomas Petazzoni via buildroot 0 siblings, 0 replies; 4+ messages in thread From: Thomas Petazzoni via buildroot @ 2024-12-29 22:08 UTC (permalink / raw) To: Raphael Pavlidis; +Cc: buildroot Hello Raphael, On Fri, 18 Oct 2024 21:52:14 +0000 Raphael Pavlidis <raphael.pavlidis@gmail.com> wrote: > Additionally, make libdrm an optional dependency. Also, > xlib_libxshmfence is not a required dependency. Could you clarify whether those "additions" are related to the bump, i.e made possible by the bump, or are unrelated, and could be done separately? > Release notes: > https://lists.x.org/archives/xorg-announce/2024-October/003532.html This is not entirely useful, as it's only the release notes for 24.1.3, but we're bumping from 23.2.4 so there were many other changes. > diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in > index 311dae25ec..a4e4a4e46f 100644 > --- a/package/x11r7/xwayland/Config.in > +++ b/package/x11r7/xwayland/Config.in > @@ -3,12 +3,10 @@ config BR2_PACKAGE_XWAYLAND > depends on BR2_USE_MMU # fork() > depends on !BR2_STATIC_LIBS # wayland > depends on BR2_TOOLCHAIN_HAS_THREADS # wayland > - # We need a SHA1 implementation. If either openssl or > - # libgcrypt are already part of the build, we'll use one of > - # them, otherwise, use the small libsha1 library. > - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence > - select BR2_PACKAGE_LIBDRM > - select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) > + # We need a SHA1 implementation. If either openssl, libgcrypt, nettle or > + # libsha1 are already part of the build, we'll use one of them, > + # otherwise, use the small libmd library. > + select BR2_PACKAGE_LIBMD if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT && !BR2_PACKAGE_NETTLE && !BR2_PACKAGE_LIBSHA1) Could you explain this change? There's no explanation of it in the commit log. > diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash > index 5bb26bf17e..c7fd2c2ff8 100644 > --- a/package/x11r7/xwayland/xwayland.hash > +++ b/package/x11r7/xwayland/xwayland.hash > @@ -1,6 +1,8 @@ > -# From https://lists.x.org/archives/xorg-announce/2024-January/003443.html > -sha256 a99e159b6d0d33098b3b6ab22a88bfcece23c8b9d0ca72c535c55dcb0681b46b xwayland-23.2.4.tar.xz > -sha512 ac3ff208cbef5bbe4637c335cfda226489c93b0a3768f2f4fb0201c588485ede38262fbce77ef1425b3d2a0be61b6580df53341c7b95e6072c8b6371ad29d187 xwayland-23.2.4.tar.xz > +# Verified from https://xorg.freedesktop.org/archive/individual/xserver/xwayland-24.1.3.tar.xz.sig > +# with key 67DC86F2623FC5FD4BB5225D14706DBE1E4B4540 > +# From https://lists.x.org/archives/xorg-announce/2024-October/003532.html > +sha256 dcdb57a66cc9b124c8f936760592628ac4e744a7d7b3179aa86189ad7ea4cb10 xwayland-24.1.3.tar.xz > +sha512 7e0e11b07408f41a81bafa7bc519d02ed9bdc36e11be16abe255a7d779d04824af23d79323f1602119b046c545cdd43ea91b93e23feb0ffe411aa6989b462c1d xwayland-24.1.3.tar.xz > > # Locally calculated > sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING > diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk > index c66dd471ac..0621e3547a 100644 > --- a/package/x11r7/xwayland/xwayland.mk > +++ b/package/x11r7/xwayland/xwayland.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -XWAYLAND_VERSION = 23.2.4 > +XWAYLAND_VERSION = 24.1.3 > XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz > XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver > XWAYLAND_LICENSE = MIT > @@ -12,7 +12,6 @@ XWAYLAND_LICENSE_FILES = COPYING > XWAYLAND_CPE_ID_VENDOR = x.org > XWAYLAND_INSTALL_STAGING = YES > XWAYLAND_DEPENDENCIES = \ > - libdrm \ > pixman \ > wayland \ > wayland-protocols \ > @@ -20,22 +19,26 @@ XWAYLAND_DEPENDENCIES = \ > xlib_libXfont2 \ > xlib_libxkbfile \ > xlib_libXrandr \ > - xlib_libxshmfence \ > xlib_xtrans \ > xorgproto > XWAYLAND_CONF_OPTS = \ > - -Ddri3=true \ > - -Dxwayland_eglstream=false \ > + -Dxwayland_ei=false \ > -Dxvfb=false \ > -Ddefault_font_path=/usr/share/fonts/X11/ \ > -Ddtrace=false \ > -Ddocs=false > > +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_XLIB_LIBXSHMFENCE),yy) > +XWAYLAND_CONF_OPTS += -Ddri3=true > +XWAYLAND_DEPENDENCIES += libdrm xlib_libxshmfence > ifeq ($(BR2_PACKAGE_LIBEPOXY),y) > XWAYLAND_CONF_OPTS += -Dglamor=true > XWAYLAND_DEPENDENCIES += libepoxy > else > XWAYLAND_CONF_OPTS += -Dglamor=false > +endif # BR2_PACKAGE_LIBEPOXY > +else > +XWAYLAND_CONF_OPTS += -Ddri3=false > endif A few more explanations about this in the commit log would also be good to convince the casual reviewer (like me!) that this makes sense would be very useful. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH v1 1/2] package/x11r7/xorgproto: bump version to 2024.1 2024-10-18 21:52 [Buildroot] [PATCH v1 1/2] package/x11r7/xorgproto: bump version to 2024.1 Raphael Pavlidis 2024-10-18 21:52 ` [Buildroot] [PATCH v1 2/2] package/xwayland: bump to version 24.1.3 Raphael Pavlidis @ 2024-12-29 22:11 ` Thomas Petazzoni via buildroot 1 sibling, 0 replies; 4+ messages in thread From: Thomas Petazzoni via buildroot @ 2024-12-29 22:11 UTC (permalink / raw) To: Raphael Pavlidis; +Cc: buildroot On Fri, 18 Oct 2024 21:52:13 +0000 Raphael Pavlidis <raphael.pavlidis@gmail.com> wrote: > Release notes: > https://lists.x.org/archives/xorg-announce/2024-March/003495.html > > Signed-off-by: Raphael Pavlidis <raphael.pavlidis@gmail.com> > --- > package/x11r7/xorgproto/xorgproto.hash | 8 +++++--- > package/x11r7/xorgproto/xorgproto.mk | 2 +- > 2 files changed, 6 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-12-29 22:11 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-10-18 21:52 [Buildroot] [PATCH v1 1/2] package/x11r7/xorgproto: bump version to 2024.1 Raphael Pavlidis 2024-10-18 21:52 ` [Buildroot] [PATCH v1 2/2] package/xwayland: bump to version 24.1.3 Raphael Pavlidis 2024-12-29 22:08 ` Thomas Petazzoni via buildroot 2024-12-29 22:11 ` [Buildroot] [PATCH v1 1/2] package/x11r7/xorgproto: bump version to 2024.1 Thomas Petazzoni via buildroot
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox