* [Buildroot] [PATCH 1/7] package/supertux: bump to version 0.6.3
@ 2021-12-30 13:56 Romain Naour
2021-12-30 13:56 ` [Buildroot] [PATCH 2/7] package/supertuxkart: bump to version 1.3 Romain Naour
` (6 more replies)
0 siblings, 7 replies; 10+ messages in thread
From: Romain Naour @ 2021-12-30 13:56 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Remove upstream patch 0001-CMakeLists.txt-compile-squirrel-with-fPIC.patch
Add new glm dependency added by:
https://github.com/SuperTux/supertux/commit/7187e3f6d7ce2ccc25bcc96e9bee25c24416d545
Add new zlib dependency added by:
https://github.com/SuperTux/supertux/commit/100bc052bc693c2e4978fffe34c9aa4376f8f8c6
Update data/AUTHORS hash since several new assets has been added since
version 0.6.2:
https://github.com/SuperTux/supertux/commit/ec5e2f52137bba2ea7533e020cd8bf4b85e6b904
https://github.com/SuperTux/supertux/commit/1ff490d32206289c72d31c7f78bfeca2956e136b
https://github.com/SuperTux/supertux/commit/14ac958c711837c6cbd1e9362768ababc38effc5
https://github.com/SuperTux/supertux/commit/392320b79006ad1fb99b3f5dd9e771d9ba6a4668
https://github.com/SuperTux/supertux/commit/2fd5ed445c8b00e4c50d0da456543d64015a4681
https://github.com/SuperTux/supertux/commit/e45b5f7f8635e1749eee7a74a9fc9fde13d8344e
See:
https://www.supertux.org/news/2021/12/23/0.6.3
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
...Lists.txt-compile-squirrel-with-fPIC.patch | 35 -------------------
package/supertux/Config.in | 2 ++
package/supertux/supertux.hash | 4 +--
package/supertux/supertux.mk | 6 ++--
4 files changed, 7 insertions(+), 40 deletions(-)
delete mode 100644 package/supertux/0001-CMakeLists.txt-compile-squirrel-with-fPIC.patch
diff --git a/package/supertux/0001-CMakeLists.txt-compile-squirrel-with-fPIC.patch b/package/supertux/0001-CMakeLists.txt-compile-squirrel-with-fPIC.patch
deleted file mode 100644
index 9fac20a3f8..0000000000
--- a/package/supertux/0001-CMakeLists.txt-compile-squirrel-with-fPIC.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 23d0bb0ef0fde52d1cffe235edead09287326fb4 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sun, 4 Oct 2020 01:11:30 +0200
-Subject: [PATCH] CMakeLists.txt: compile squirrel with -fPIC
-
-Ensure that squirrel is compiled with -fPIC to allow linking the static
-libraries with dynamically linked programs. This is not a requirement
-for most architectures but is mandatory for ARM.
-
-Fixes:
-x86_64-buildroot-linux-musl/bin/ld: CMakeFiles/sq_static.dir/sq.c.o: relocation R_X86_64_32 against `.rodata.str1.8' can not be used when making a PIE object; recompile with -fPIC
-x86_64-buildroot-linux-musl/bin/ld: final link failed: nonrepresentable section on output
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8b1dafa1e..07c603cce 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -412,7 +412,8 @@ ExternalProject_Add(squirrel
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX}
-- -DINSTALL_INC_DIR=include)
-+ -DINSTALL_INC_DIR=include
-+ -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
-
- if(WIN32)
- add_library(squirrel_lib SHARED IMPORTED)
---
-2.25.4
-
diff --git a/package/supertux/Config.in b/package/supertux/Config.in
index 285f19694b..e8e96a3ae5 100644
--- a/package/supertux/Config.in
+++ b/package/supertux/Config.in
@@ -16,6 +16,7 @@ config BR2_PACKAGE_SUPERTUX
select BR2_PACKAGE_BOOST_LOCALE
select BR2_PACKAGE_BOOST_SYSTEM
select BR2_PACKAGE_FREETYPE
+ select BR2_PACKAGE_GLM
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_LIBGLEW
select BR2_PACKAGE_LIBOGG
@@ -26,6 +27,7 @@ config BR2_PACKAGE_SUPERTUX
select BR2_PACKAGE_SDL2
select BR2_PACKAGE_SDL2_IMAGE
select BR2_PACKAGE_SDL2_OPENGL
+ select BR2_PACKAGE_ZLIB
help
SuperTux is a free classic 2D jump'n run sidescroller game in
a style similar to the original Super Mario games covered
diff --git a/package/supertux/supertux.hash b/package/supertux/supertux.hash
index a6a515f912..f28c06b5e7 100644
--- a/package/supertux/supertux.hash
+++ b/package/supertux/supertux.hash
@@ -1,4 +1,4 @@
# Locally calculated
-sha256 26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598 SuperTux-v0.6.2-Source.tar.gz
+sha256 f7940e6009c40226eb34ebab8ffb0e3a894892d891a07b35d0e5762dd41c79f6 SuperTux-v0.6.3-Source.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.txt
-sha256 09645215102c1013a1ef8c16a30bacdb9a78924ca064372290405fabd3e7074d data/AUTHORS
+sha256 a000d91146a61b44bdb79c3d2737e82d488b6cd65a23e0415e56915233def0a0 data/AUTHORS
diff --git a/package/supertux/supertux.mk b/package/supertux/supertux.mk
index 3587aefe3a..3941632f51 100644
--- a/package/supertux/supertux.mk
+++ b/package/supertux/supertux.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SUPERTUX_VERSION = 0.6.2
+SUPERTUX_VERSION = 0.6.3
SUPERTUX_SITE = https://github.com/SuperTux/supertux/releases/download/v$(SUPERTUX_VERSION)
SUPERTUX_SOURCE = SuperTux-v$(SUPERTUX_VERSION)-Source.tar.gz
@@ -15,8 +15,8 @@ SUPERTUX_LICENSE_FILES = LICENSE.txt data/AUTHORS
# Use bundled squirrel, tinygettext sexp-cpp packages which are hardcoded in
# the CMake build system.
-SUPERTUX_DEPENDENCIES = host-pkgconf boost freetype libcurl libgl libglew \
- libogg libpng libvorbis openal physfs sdl2 sdl2_image
+SUPERTUX_DEPENDENCIES = host-pkgconf boost freetype glm libcurl libgl libglew \
+ libogg libpng libvorbis openal physfs sdl2 sdl2_image zlib
# CMAKE_BUILD_TYPE=Release: disable profiling code (-pg)
# ENABLE_BOOST_STATIC_LIBS=OFF: use boost shared libraries since supertux
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 2/7] package/supertuxkart: bump to version 1.3 2021-12-30 13:56 [Buildroot] [PATCH 1/7] package/supertux: bump to version 0.6.3 Romain Naour @ 2021-12-30 13:56 ` Romain Naour 2021-12-30 13:56 ` [Buildroot] [PATCH 3/7] package/efl: bump to version 1.26.0 Romain Naour ` (5 subsequent siblings) 6 siblings, 0 replies; 10+ messages in thread From: Romain Naour @ 2021-12-30 13:56 UTC (permalink / raw) To: buildroot; +Cc: Romain Naour Switch to github to download the release archive. Add sdl2 dependency added by [1]. Remove FriBidi dependency replaced by SheenBidi library (bundled) for better unicode support [2] [3]. Remove libglew removed by [4]. Replace MbedTLS instead of Nettle [5]. [1] https://github.com/supertuxkart/stk-code/commit/00cb6c2d480d99785f52e0352bc3a21a803a467d [2] https://github.com/supertuxkart/stk-code/commit/13db1b83c1e7160276c87b1faa8b573bb390cce3 [3] https://github.com/supertuxkart/stk-code/commit/dc0a5a9c661a676941d202500713a7d736071838 [4] https://github.com/supertuxkart/stk-code/commit/3f0eb215f73e4edf8a91309e6de6db926f8dfa54 [5] https://github.com/supertuxkart/stk-code/commit/d753393f4dcec79f2bd5a60a853247b9d854e240 Signed-off-by: Romain Naour <romain.naour@gmail.com> --- package/supertuxkart/Config.in | 5 ++--- package/supertuxkart/supertuxkart.hash | 7 +------ package/supertuxkart/supertuxkart.mk | 16 ++++++++-------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in index a18b9c1a0a..8e8eafb51c 100644 --- a/package/supertuxkart/Config.in +++ b/package/supertuxkart/Config.in @@ -15,14 +15,13 @@ config BR2_PACKAGE_SUPERTUXKART select BR2_PACKAGE_HARFBUZZ select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBFRIBIDI - select BR2_PACKAGE_LIBGLEW select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBSQUISH select BR2_PACKAGE_LIBVORBIS - select BR2_PACKAGE_NETTLE if !BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_MBEDTLS if !BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENAL + select BR2_PACKAGE_SDL2 select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_ZLIB select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime diff --git a/package/supertuxkart/supertuxkart.hash b/package/supertuxkart/supertuxkart.hash index 9654ad24a2..306634d28e 100644 --- a/package/supertuxkart/supertuxkart.hash +++ b/package/supertuxkart/supertuxkart.hash @@ -1,8 +1,3 @@ # Locally computed -sha256 e9b02b0b11ab68aacaec38306903feffe59a501224805cd3645cebf10e880ae8 supertuxkart-1.1-src.tar.xz -# From https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/1.1/ -sha1 68be26f4b15d30dede26563cbcc6de999036c5e0 supertuxkart-1.1-src.tar.xz -md5 731569c58428f32a0e46943fad7ba1e3 supertuxkart-1.1-src.tar.xz - -# Locally computed +sha256 eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd SuperTuxKart-1.3-src.tar.xz sha256 d27207a5213f746aac53893e9ecc18456e9595d3ffa662bd1ec9eb10787c214a COPYING diff --git a/package/supertuxkart/supertuxkart.mk b/package/supertuxkart/supertuxkart.mk index 97cd2a40b8..8ec366f792 100644 --- a/package/supertuxkart/supertuxkart.mk +++ b/package/supertuxkart/supertuxkart.mk @@ -4,9 +4,11 @@ # ################################################################################ -SUPERTUXKART_VERSION = 1.1 -SUPERTUXKART_SOURCE = supertuxkart-$(SUPERTUXKART_VERSION)-src.tar.xz -SUPERTUXKART_SITE = http://downloads.sourceforge.net/project/supertuxkart/SuperTuxKart/$(SUPERTUXKART_VERSION) +SUPERTUXKART_VERSION = 1.3 +SUPERTUXKART_SOURCE = SuperTuxKart-$(SUPERTUXKART_VERSION)-src.tar.xz +# Do not use the github helper here, the generated tarball is *NOT* +# the same as the one uploaded by upstream for the release. +SUPERTUXKART_SITE = https://github.com/supertuxkart/stk-code/releases/download/$(SUPERTUXKART_VERSION) # Supertuxkart itself is GPL-3.0+, but it bundles a few libraries with different # licenses. Irrlicht, bullet and angelscript have Zlib license, while glew is @@ -21,14 +23,13 @@ SUPERTUXKART_DEPENDENCIES = \ harfbuzz \ jpeg \ libcurl \ - libfribidi \ libgl \ - libglew \ libogg \ libpng \ libsquish \ libvorbis \ openal \ + sdl2 \ xlib_libXrandr \ zlib @@ -37,7 +38,6 @@ SUPERTUXKART_DEPENDENCIES = \ # Disable In-game recorder (there is no libopenglrecorder package) SUPERTUXKART_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF \ -DBUILD_RECORDER=OFF \ - -DUSE_SYSTEM_GLEW=ON \ -DUSE_SYSTEM_ENET=ON \ -DUSE_SYSTEM_SQUISH=ON @@ -49,12 +49,12 @@ else SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=OFF endif -# Prefer openssl (the default) over nettle. +# Prefer openssl (the default) over mbedtls ifeq ($(BR2_PACKAGE_OPENSSL),y) SUPERTUXKART_DEPENDENCIES += openssl SUPERTUXKART_CONF_OPTS += -DUSE_CRYPTO_OPENSSL=ON else -SUPERTUXKART_DEPENDENCIES += nettle +SUPERTUXKART_DEPENDENCIES += mbedtls SUPERTUXKART_CONF_OPTS += -DUSE_CRYPTO_OPENSSL=OFF endif -- 2.31.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 3/7] package/efl: bump to version 1.26.0 2021-12-30 13:56 [Buildroot] [PATCH 1/7] package/supertux: bump to version 0.6.3 Romain Naour 2021-12-30 13:56 ` [Buildroot] [PATCH 2/7] package/supertuxkart: bump to version 1.3 Romain Naour @ 2021-12-30 13:56 ` Romain Naour 2021-12-30 13:56 ` [Buildroot] [PATCH 4/7] package/enlightenment: bump to version 0.25.0 Romain Naour ` (4 subsequent siblings) 6 siblings, 0 replies; 10+ messages in thread From: Romain Naour @ 2021-12-30 13:56 UTC (permalink / raw) To: buildroot; +Cc: Romain Naour efl disable libinput efl disable heif (there is no libheif package in Buildroot) See: https://www.enlightenment.org/news/2021-12-26-efl-1.26.0 Signed-off-by: Romain Naour <romain.naour@gmail.com> --- ...e_evas-engines-drm-meson.build-use-gl_deps-as-en.patch | 4 ++-- ...e_evas-engines-drm-meson.build-fix-gl_drm-includ.patch | 4 ++-- package/efl/0003-ecore_fb-fix-build-with-tslib.patch | 4 ++-- package/efl/efl.hash | 4 ++-- package/efl/efl.mk | 8 +++++--- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/package/efl/0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch b/package/efl/0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch index 185926ac46..8fa4658f06 100644 --- a/package/efl/0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch +++ b/package/efl/0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch @@ -1,4 +1,4 @@ -From 51dfe1863ddc8c5dd576405a9bbb8bca875c1142 Mon Sep 17 00:00:00 2001 +From 00833baac6935bd1e3e9856211bc165c5b02a7bd Mon Sep 17 00:00:00 2001 From: Romain Naour <romain.naour@gmail.com> Date: Sat, 1 Aug 2020 02:25:47 +0200 Subject: [PATCH] ecore_evas/engines/drm/meson.build: use "gl_deps" as engine @@ -32,5 +32,5 @@ index 58071010d0..0741d7fccd 100644 engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'drm')) -- -2.25.4 +2.31.1 diff --git a/package/efl/0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch b/package/efl/0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch index 89ec838a72..3465fc50aa 100644 --- a/package/efl/0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch +++ b/package/efl/0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch @@ -1,4 +1,4 @@ -From 8548b02c487ba7e9d78489c6db58812ee5cfb197 Mon Sep 17 00:00:00 2001 +From a21e71cc2284a19a34c913aff757e656e3a8c14a Mon Sep 17 00:00:00 2001 From: Romain Naour <romain.naour@gmail.com> Date: Sat, 1 Aug 2020 01:01:00 +0200 Subject: [PATCH] ecore_evas/engines/drm/meson.build: fix "gl_drm" include @@ -33,5 +33,5 @@ index 0741d7fccd..edda1abd71 100644 shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir], -- -2.25.4 +2.31.1 diff --git a/package/efl/0003-ecore_fb-fix-build-with-tslib.patch b/package/efl/0003-ecore_fb-fix-build-with-tslib.patch index 8eb159505f..2756e0932d 100644 --- a/package/efl/0003-ecore_fb-fix-build-with-tslib.patch +++ b/package/efl/0003-ecore_fb-fix-build-with-tslib.patch @@ -1,4 +1,4 @@ -From 9a785396a7940ec541cf4793f9c9f92548c99d4c Mon Sep 17 00:00:00 2001 +From 836b13de08980d89fc13690284efd355c1b43218 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine <fontaine.fabrice@gmail.com> Date: Sat, 10 Jul 2021 22:38:03 +0200 Subject: [PATCH] ecore_fb: fix build with tslib @@ -31,5 +31,5 @@ index 6d50e0f146..7c7f6786c3 100644 install: true, version : meson.project_version() -- -2.30.2 +2.31.1 diff --git a/package/efl/efl.hash b/package/efl/efl.hash index 69008cde23..6364d276c0 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,5 +1,5 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.25.1.tar.xz.sha256sum -sha256 351ca0211ca000234527a503585f039f985607ec9439e34b49d8b8bbf35a7e6b efl-1.25.1.tar.xz +# From https://www.enlightenment.org/news/2021-12-26-efl-1.26.0 +sha256 a4a9bce45fd27f8541874e44a130f64550bee1f2f72feaa6c8a758d92eaf204c efl-1.26.0.tar.xz sha256 d666b6b2df9f5b791f85c299c65516cb55528b02a807603de246f65f4918ae22 COMPLIANCE sha256 5bceb52d65debe420bc520f2992807740dc928b7fdc3c2e9a74b5889177ddf4c COPYING diff --git a/package/efl/efl.mk b/package/efl/efl.mk index cdb05aa551..46bce29305 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.25.1 +EFL_VERSION = 1.26.0 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT @@ -209,7 +209,7 @@ EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) # json evas loader is disabled by default by upstream. # Disable libspectre (ps). # Keep all other evas loader enabled or handled below. -EFL_EVAS_LOADERS_DISABLER = avif gst json ps +EFL_EVAS_LOADERS_DISABLER = avif gst heif json ps # efl already depends on jpeg. ifeq ($(BR2_PACKAGE_EFL_JPEG),y) @@ -302,6 +302,7 @@ HOST_EFL_DEPENDENCIES = \ # Configure options: # audio=false: remove libsndfile dependency. # eeze=false: remove libudev dependency. +# input=false: remove libinput dependency. # libmount=false: remove dependency on host-util-linux libmount. # elua=true: build elua for the host. # physics=false: remove Bullet dependency. @@ -324,6 +325,7 @@ HOST_EFL_CONF_OPTS += \ -Dglib=true \ -Dgstreamer=false \ -Dharfbuzz=false \ + -Dinput=false \ -Dlibmount=false \ -Dlua-interpreter=luajit \ -Dnetwork-backend=none \ @@ -340,7 +342,7 @@ HOST_EFL_CONF_OPTS += \ -Dxinput22=false # List of modular image/vector loaders to disable in efl -HOST_EFL_EVAS_LOADERS_DISABLER = avif bmp dds eet generic gst ico json \ +HOST_EFL_EVAS_LOADERS_DISABLER = avif bmp dds eet generic gst heif ico json \ jp2k pdf pmaps ps psd raw rsvg tga tgv tiff wbmp webp xcf xpm HOST_EFL_CONF_OPTS += -Devas-loaders-disabler=$(subst $(space),$(comma),$(HOST_EFL_EVAS_LOADERS_DISABLER)) -- 2.31.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 4/7] package/enlightenment: bump to version 0.25.0 2021-12-30 13:56 [Buildroot] [PATCH 1/7] package/supertux: bump to version 0.6.3 Romain Naour 2021-12-30 13:56 ` [Buildroot] [PATCH 2/7] package/supertuxkart: bump to version 1.3 Romain Naour 2021-12-30 13:56 ` [Buildroot] [PATCH 3/7] package/efl: bump to version 1.26.0 Romain Naour @ 2021-12-30 13:56 ` Romain Naour 2021-12-30 13:56 ` [Buildroot] [PATCH 5/7] package/minetest: add missing header "memory" required since gcc 11 Romain Naour ` (3 subsequent siblings) 6 siblings, 0 replies; 10+ messages in thread From: Romain Naour @ 2021-12-30 13:56 UTC (permalink / raw) To: buildroot; +Cc: Romain Naour Update license file hash due to a tree-wide trailing whitespace removal [1]. Disable optional dependency on libexif [2]. See: https://www.enlightenment.org/news/2021-12-26-enlightenment-0.25.0 [1] https://git.enlightenment.org/core/enlightenment.git/commit/?id=01fd3da2a33c411b41eea3b175c496c14777b358 [2] https://git.enlightenment.org/core/enlightenment.git/commit/?id=10ac9fb3277e599d1ac4d54c0d59faebc064b186 Signed-off-by: Romain Naour <romain.naour@gmail.com> --- package/enlightenment/enlightenment.hash | 8 ++++---- package/enlightenment/enlightenment.mk | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index 7f0f3f3e7b..dd4c4d78c0 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,4 +1,4 @@ -# From https://www.enlightenment.org/news/e24.2 -sha256 be18e2f18d6c0b058f633e769863d3cbc4c07b629058ae670dec74cd7906dff1 enlightenment-0.24.2.tar.xz -sha256 17dda7902d3e1a743f91cf2545f474be93f612768a9e9022593d788ecc83935a COPYING -sha256 f4ba47ef8f4ff588202e721ab10f0208a3fa678147e7f928e6b2820f2e646e13 src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt +# From https://www.enlightenment.org/news/2021-12-26-enlightenment-0.25.0 +sha256 7d6e72ceed5aca135b7a49c2a1c1eb9d8fde1318613517401d0418e0e5f6df06 enlightenment-0.25.0.tar.xz +sha256 8d2fbc393e967cd6f5b8559d1744881a6a1ceb3ec6e1c2368c3916809ffccb8d COPYING +sha256 cdc77ee1732455b203610f923fe4196046b3f7509038c48dc0b0c7e3492c23f3 src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 969b391cdc..640d5a62bb 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.24.2 +ENLIGHTENMENT_VERSION = 0.25.0 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) @@ -22,6 +22,7 @@ ENLIGHTENMENT_CONF_OPTS = \ -Dedje-cc=$(HOST_DIR)/bin/edje_cc \ -Deet=$(HOST_DIR)/bin/eet \ -Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \ + -Dlibexif=false \ -Dpam=false \ -Dpolkit=false -- 2.31.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 5/7] package/minetest: add missing header "memory" required since gcc 11 2021-12-30 13:56 [Buildroot] [PATCH 1/7] package/supertux: bump to version 0.6.3 Romain Naour ` (2 preceding siblings ...) 2021-12-30 13:56 ` [Buildroot] [PATCH 4/7] package/enlightenment: bump to version 0.25.0 Romain Naour @ 2021-12-30 13:56 ` Romain Naour 2021-12-30 13:56 ` [Buildroot] [PATCH 6/7] package/x11r7/xdriver_xf86-video-ati: update to the new API/ABI introduced in xserver > 21.0 Romain Naour ` (2 subsequent siblings) 6 siblings, 0 replies; 10+ messages in thread From: Romain Naour @ 2021-12-30 13:56 UTC (permalink / raw) To: buildroot; +Cc: Romain Naour Backport from upstream. Fixes: minetest-5.4.1/src/clientiface.h:444:36: error: ‘shared_ptr’ in namespace ‘std’ does not name a template type 444 | ClientInterface(const std::shared_ptr<con::Connection> &con); Signed-off-by: Romain Naour <romain.naour@gmail.com> --- ...uild-for-newer-versions-of-GCC-11246.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/minetest/0001-Fix-build-for-newer-versions-of-GCC-11246.patch diff --git a/package/minetest/0001-Fix-build-for-newer-versions-of-GCC-11246.patch b/package/minetest/0001-Fix-build-for-newer-versions-of-GCC-11246.patch new file mode 100644 index 0000000000..35102a077b --- /dev/null +++ b/package/minetest/0001-Fix-build-for-newer-versions-of-GCC-11246.patch @@ -0,0 +1,35 @@ +From a327c06f5dee9f432666b503203fd15e4ccafc1b Mon Sep 17 00:00:00 2001 +From: lhofhansl <larsh@apache.org> +Date: Thu, 6 May 2021 10:24:30 -0700 +Subject: [PATCH] Fix build for newer versions of GCC (#11246) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit 7c2826cbc0f36027d4a9781f433150d1c5d0d03f) + +Fixes: + +minetest-5.4.1/src/clientiface.h:444:36: error: ‘shared_ptr’ in namespace ‘std’ does not name a template type + 444 | ClientInterface(const std::shared_ptr<con::Connection> &con); + +Signed-off-by: Romain Naour <romain.naour@gmail.com> +--- + src/clientiface.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/clientiface.h b/src/clientiface.h +index cc5292b71..dfd976741 100644 +--- a/src/clientiface.h ++++ b/src/clientiface.h +@@ -31,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., + #include <list> + #include <vector> + #include <set> ++#include <memory> + #include <mutex> + + class MapBlock; +-- +2.31.1 + -- 2.31.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 6/7] package/x11r7/xdriver_xf86-video-ati: update to the new API/ABI introduced in xserver > 21.0 2021-12-30 13:56 [Buildroot] [PATCH 1/7] package/supertux: bump to version 0.6.3 Romain Naour ` (3 preceding siblings ...) 2021-12-30 13:56 ` [Buildroot] [PATCH 5/7] package/minetest: add missing header "memory" required since gcc 11 Romain Naour @ 2021-12-30 13:56 ` Romain Naour 2021-12-30 13:56 ` [Buildroot] [PATCH 7/7] package/x11r7/xdriver_xf86-video-ati: Guard local variable priv only used with glamor Romain Naour 2021-12-30 14:07 ` [Buildroot] [PATCH 1/7] package/supertux: bump to version 0.6.3 Thomas Petazzoni 6 siblings, 0 replies; 10+ messages in thread From: Romain Naour @ 2021-12-30 13:56 UTC (permalink / raw) To: buildroot; +Cc: Bernd Kuhls, Romain Naour Fixes: In file included from radeon_textured_video.c:37: radeon.h: In function ‘radeon_master_screen’: radeon.h:187:15: error: ‘struct _Screen’ has no member named ‘current_master’ 187 | if (screen->current_master) | ^~ The API/ABI have changed in xserver 21.0 due to "some badly named variables/APIs" [1]. [1] https://gitlab.freedesktop.org/xorg/xserver/-/commit/ea47af87f692b291a988834c6f14d73a08cb1d75 Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Bernd Kuhls <bernd.kuhls@t-online.de> --- ...terminology-to-use-primary-secondary.patch | 371 ++++++++++++++++++ 1 file changed, 371 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-video-ati/0002-ati-cleanup-terminology-to-use-primary-secondary.patch diff --git a/package/x11r7/xdriver_xf86-video-ati/0002-ati-cleanup-terminology-to-use-primary-secondary.patch b/package/x11r7/xdriver_xf86-video-ati/0002-ati-cleanup-terminology-to-use-primary-secondary.patch new file mode 100644 index 0000000000..ed8413b0cd --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-ati/0002-ati-cleanup-terminology-to-use-primary-secondary.patch @@ -0,0 +1,371 @@ +From d96815a32431e0f434964a786013083bc0d835fc Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Mon, 13 Jul 2020 09:11:28 +1000 +Subject: [PATCH] ati: cleanup terminology to use primary/secondary + +The X server changed some API/ABIs here. + +Based on amdgpu patch by Michel + +(cherry picked from commit 8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680) +Signed-off-by: Romain Naour <romain.naour@gmail.com> +--- + man/radeon.man | 2 +- + src/compat-api.h | 6 ++++ + src/drmmode_display.c | 4 +-- + src/evergreen_state.h | 2 +- + src/r600_state.h | 2 +- + src/radeon.h | 10 +++--- + src/radeon_exa.c | 2 +- + src/radeon_glamor.c | 2 +- + src/radeon_kms.c | 74 +++++++++++++++++++++---------------------- + 9 files changed, 55 insertions(+), 49 deletions(-) + +diff --git a/man/radeon.man b/man/radeon.man +index dcebf537..247dcdb7 100644 +--- a/man/radeon.man ++++ b/man/radeon.man +@@ -290,7 +290,7 @@ on. If this option is set, the default value of the property is 'on' or 'off' + accordingly. If this option isn't set, the default value of the property is + .B auto, + which means that TearFree is on for rotated outputs, outputs with RandR +-transforms applied and for RandR 1.4 slave outputs, otherwise off. ++transforms applied and for RandR 1.4 secondary outputs, otherwise off. + .TP + .BI "Option \*qAccelMethod\*q \*q" "string" \*q + Chooses between available acceleration architectures. Valid values are +diff --git a/src/compat-api.h b/src/compat-api.h +index f4e7524f..def6d3e4 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -34,4 +34,10 @@ + #define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask + #endif + ++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) ++#define current_primary current_master ++#define primary_pixmap master_pixmap ++#define secondary_dst slave_dst ++#endif ++ + #endif +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index 0e9e2474..3dec91e8 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -720,7 +720,7 @@ drmmode_crtc_prime_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode, + xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, + ent) { + if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { +- dirty->slave_dst = ++ dirty->secondary_dst = + drmmode_crtc->scanout[scanout_id].pixmap; + break; + } +@@ -1356,7 +1356,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix) + + xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) { + if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { +- PixmapStopDirtyTracking(dirty->src, dirty->slave_dst); ++ PixmapStopDirtyTracking(dirty->src, dirty->secondary_dst); + break; + } + } +diff --git a/src/evergreen_state.h b/src/evergreen_state.h +index 7e54e1c7..34ba87b6 100644 +--- a/src/evergreen_state.h ++++ b/src/evergreen_state.h +@@ -350,7 +350,7 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, + int *new_pitch); + extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv); + extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix); +-extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p); ++extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p); + extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle); + + #endif +diff --git a/src/r600_state.h b/src/r600_state.h +index 34345996..567c3ca2 100644 +--- a/src/r600_state.h ++++ b/src/r600_state.h +@@ -321,6 +321,6 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, + int *new_pitch); + extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv); + extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix); +-extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p); ++extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p); + extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle); + #endif +diff --git a/src/radeon.h b/src/radeon.h +index 2c913466..85fd0217 100644 +--- a/src/radeon.h ++++ b/src/radeon.h +@@ -182,18 +182,18 @@ typedef enum { + + + static inline ScreenPtr +-radeon_master_screen(ScreenPtr screen) ++radeon_primary_screen(ScreenPtr screen) + { +- if (screen->current_master) +- return screen->current_master; ++ if (screen->current_primary) ++ return screen->current_primary; + + return screen; + } + + static inline ScreenPtr +-radeon_dirty_master(PixmapDirtyUpdatePtr dirty) ++radeon_dirty_primary(PixmapDirtyUpdatePtr dirty) + { +- return radeon_master_screen(dirty->slave_dst->drawable.pScreen); ++ return radeon_primary_screen(dirty->secondary_dst->drawable.pScreen); + } + + static inline DrawablePtr +diff --git a/src/radeon_exa.c b/src/radeon_exa.c +index 268155ed..320ff992 100644 +--- a/src/radeon_exa.c ++++ b/src/radeon_exa.c +@@ -282,7 +282,7 @@ void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv) + free(driverPriv); + } + +-Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **fd_handle) ++Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr seconndary, void **fd_handle) + { + struct radeon_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(ppix); + +diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c +index f1098381..ccf99941 100644 +--- a/src/radeon_glamor.c ++++ b/src/radeon_glamor.c +@@ -366,7 +366,7 @@ radeon_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap) + + + static Bool +-radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave, ++radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary, + void **handle_p) + { + ScreenPtr screen = pixmap->drawable.pScreen; +diff --git a/src/radeon_kms.c b/src/radeon_kms.c +index b3db7c41..62962d61 100644 +--- a/src/radeon_kms.c ++++ b/src/radeon_kms.c +@@ -559,8 +559,8 @@ dirty_region(PixmapDirtyUpdatePtr dirty) + if (dirty->rotation != RR_Rotate_0) { + dstregion = transform_region(damageregion, + &dirty->f_inverse, +- dirty->slave_dst->drawable.width, +- dirty->slave_dst->drawable.height); ++ dirty->secondary_dst->drawable.width, ++ dirty->secondary_dst->drawable.height); + } else + #endif + { +@@ -568,7 +568,7 @@ dirty_region(PixmapDirtyUpdatePtr dirty) + + dstregion = RegionDuplicate(damageregion); + RegionTranslate(dstregion, -dirty->x, -dirty->y); +- PixmapRegionInit(&pixregion, dirty->slave_dst); ++ PixmapRegionInit(&pixregion, dirty->secondary_dst); + RegionIntersect(dstregion, dstregion, &pixregion); + RegionUninit(&pixregion); + } +@@ -585,8 +585,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region) + if (RegionNil(region)) + goto out; + +- if (dirty->slave_dst->master_pixmap) +- DamageRegionAppend(&dirty->slave_dst->drawable, region); ++ if (dirty->secondary_dst->primary_pixmap) ++ DamageRegionAppend(&dirty->secondary_dst->drawable, region); + + #ifdef HAS_DIRTYTRACKING_ROTATION + PixmapSyncDirtyHelper(dirty); +@@ -595,8 +595,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region) + #endif + + radeon_cs_flush_indirect(src_scrn); +- if (dirty->slave_dst->master_pixmap) +- DamageRegionProcessPending(&dirty->slave_dst->drawable); ++ if (dirty->secondary_dst->primary_pixmap) ++ DamageRegionProcessPending(&dirty->secondary_dst->drawable); + + out: + DamageEmpty(dirty->damage); +@@ -613,12 +613,12 @@ radeon_prime_scanout_update_abort(xf86CrtcPtr crtc, void *event_data) + void + radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) + { +- ScreenPtr master_screen = radeon_dirty_master(dirty); ++ ScreenPtr primary_screen = radeon_dirty_primary(dirty); + PixmapDirtyUpdatePtr ent; + RegionPtr region; + +- xorg_list_for_each_entry(ent, &master_screen->pixmap_dirty_list, ent) { +- if (!radeon_dirty_src_equals(dirty, ent->slave_dst)) ++ xorg_list_for_each_entry(ent, &primary_screen->pixmap_dirty_list, ent) { ++ if (!radeon_dirty_src_equals(dirty, ent->secondary_dst)) + continue; + + region = dirty_region(ent); +@@ -631,45 +631,45 @@ radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) + #if HAS_SYNC_SHARED_PIXMAP + + static Bool +-master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) ++primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) + { +- ScreenPtr master_screen = radeon_dirty_master(dirty); ++ ScreenPtr primary_screen = radeon_dirty_primary(dirty); + +- return !!master_screen->SyncSharedPixmap; ++ return !!primary_screen->SyncSharedPixmap; + } + + static Bool +-slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) ++secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) + { +- ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen; ++ ScreenPtr secondary_screen = dirty->secondary_dst->drawable.pScreen; + +- return !!slave_screen->SyncSharedPixmap; ++ return !!secondary_screen->SyncSharedPixmap; + } + + static void + call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) + { +- ScreenPtr master_screen = radeon_dirty_master(dirty); ++ ScreenPtr primary_screen = radeon_dirty_primary(dirty); + +- master_screen->SyncSharedPixmap(dirty); ++ primary_screen->SyncSharedPixmap(dirty); + } + + #else /* !HAS_SYNC_SHARED_PIXMAP */ + + static Bool +-master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) ++primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) + { +- ScrnInfoPtr master_scrn = xf86ScreenToScrn(radeon_dirty_master(dirty)); ++ ScrnInfoPtr primary_scrn = xf86ScreenToScrn(radeon_dirty_primary(dirty)); + +- return master_scrn->driverName == scrn->driverName; ++ return primary_scrn->driverName == scrn->driverName; + } + + static Bool +-slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) ++secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) + { +- ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen); ++ ScrnInfoPtr secondary_scrn = xf86ScreenToScrn(dirty->secondary_dst->drawable.pScreen); + +- return slave_scrn->driverName == scrn->driverName; ++ return secondary_scrn->driverName == scrn->driverName; + } + + static void +@@ -684,12 +684,12 @@ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) + static xf86CrtcPtr + radeon_prime_dirty_to_crtc(PixmapDirtyUpdatePtr dirty) + { +- ScreenPtr screen = dirty->slave_dst->drawable.pScreen; ++ ScreenPtr screen = dirty->secondary_dst->drawable.pScreen; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); + int c; + +- /* Find the CRTC which is scanning out from this slave pixmap */ ++ /* Find the CRTC which is scanning out from this secondary pixmap */ + for (c = 0; c < xf86_config->num_crtc; c++) { + xf86CrtcPtr xf86_crtc = xf86_config->crtc[c]; + drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private; +@@ -714,7 +714,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id) + if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { + RegionPtr region; + +- if (master_has_sync_shared_pixmap(scrn, dirty)) ++ if (primary_has_sync_shared_pixmap(scrn, dirty)) + call_sync_shared_pixmap(dirty); + + region = dirty_region(dirty); +@@ -727,7 +727,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id) + radeon_cs_flush_indirect(scrn); + RegionCopy(&drmmode_crtc->scanout_last_region, region); + RegionTranslate(region, -crtc->x, -crtc->y); +- dirty->slave_dst = drmmode_crtc->scanout[scanout_id].pixmap; ++ dirty->secondary_dst = drmmode_crtc->scanout[scanout_id].pixmap; + } + + redisplay_dirty(dirty, region); +@@ -754,7 +754,7 @@ radeon_prime_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t u + static void + radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty) + { +- ScreenPtr screen = dirty->slave_dst->drawable.pScreen; ++ ScreenPtr screen = dirty->secondary_dst->drawable.pScreen; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); + xf86CrtcPtr xf86_crtc = radeon_prime_dirty_to_crtc(dirty); +@@ -818,7 +818,7 @@ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty) + static void + radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent) + { +- ScreenPtr screen = ent->slave_dst->drawable.pScreen; ++ ScreenPtr screen = ent->secondary_dst->drawable.pScreen; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); + xf86CrtcPtr crtc = radeon_prime_dirty_to_crtc(ent); +@@ -893,11 +893,11 @@ radeon_dirty_update(ScrnInfoPtr scrn) + if (screen->isGPU) { + PixmapDirtyUpdatePtr region_ent = ent; + +- if (master_has_sync_shared_pixmap(scrn, ent)) { +- ScreenPtr master_screen = radeon_dirty_master(ent); ++ if (primary_has_sync_shared_pixmap(scrn, ent)) { ++ ScreenPtr primary_screen = radeon_dirty_primary(ent); + +- xorg_list_for_each_entry(region_ent, &master_screen->pixmap_dirty_list, ent) { +- if (radeon_dirty_src_equals(ent, region_ent->slave_dst)) ++ xorg_list_for_each_entry(region_ent, &primary_screen->pixmap_dirty_list, ent) { ++ if (radeon_dirty_src_equals(ent, region_ent->secondary_dst)) + break; + } + } +@@ -921,7 +921,7 @@ radeon_dirty_update(ScrnInfoPtr scrn) + + RegionDestroy(region); + } else { +- if (slave_has_sync_shared_pixmap(scrn, ent)) ++ if (secondary_has_sync_shared_pixmap(scrn, ent)) + continue; + + region = dirty_region(ent); +@@ -1216,7 +1216,7 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL) + (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS); + pScreen->BlockHandler = RADEONBlockHandler_KMS; + +- if (!xf86ScreenToScrn(radeon_master_screen(pScreen))->vtSema) ++ if (!xf86ScreenToScrn(radeon_primary_screen(pScreen))->vtSema) + return; + + if (!pScreen->isGPU) +@@ -2584,7 +2584,7 @@ CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, pointer data) + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); + int c; + +- if (xf86ScreenToScrn(radeon_master_screen(screen))->vtSema) ++ if (xf86ScreenToScrn(radeon_primary_screen(screen))->vtSema) + return 0; + + /* Unreference the all-black FB created by RADEONLeaveVT_KMS. After +-- +2.31.1 + -- 2.31.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 7/7] package/x11r7/xdriver_xf86-video-ati: Guard local variable priv only used with glamor 2021-12-30 13:56 [Buildroot] [PATCH 1/7] package/supertux: bump to version 0.6.3 Romain Naour ` (4 preceding siblings ...) 2021-12-30 13:56 ` [Buildroot] [PATCH 6/7] package/x11r7/xdriver_xf86-video-ati: update to the new API/ABI introduced in xserver > 21.0 Romain Naour @ 2021-12-30 13:56 ` Romain Naour 2022-01-26 12:24 ` Peter Korsgaard 2021-12-30 14:07 ` [Buildroot] [PATCH 1/7] package/supertux: bump to version 0.6.3 Thomas Petazzoni 6 siblings, 1 reply; 10+ messages in thread From: Romain Naour @ 2021-12-30 13:56 UTC (permalink / raw) To: buildroot; +Cc: Bernd Kuhls, Romain Naour Fixes: radeon_present.c: In function ‘radeon_present_check_flip’: radeon_present.c:281:21: error: invalid use of undefined type ‘struct radeon_pixmap’ 281 | if (priv && priv->fb_failed) | ^~ Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Bernd Kuhls <bernd.kuhls@t-online.de> --- ...-variable-priv-only-used-with-glamor.patch | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-video-ati/0003-Guard-local-variable-priv-only-used-with-glamor.patch diff --git a/package/x11r7/xdriver_xf86-video-ati/0003-Guard-local-variable-priv-only-used-with-glamor.patch b/package/x11r7/xdriver_xf86-video-ati/0003-Guard-local-variable-priv-only-used-with-glamor.patch new file mode 100644 index 0000000000..0a23c54cce --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-ati/0003-Guard-local-variable-priv-only-used-with-glamor.patch @@ -0,0 +1,66 @@ +From a78e31b5fffadd73b00483f21e54bd144f1b439a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com> +Date: Fri, 26 Mar 2021 17:42:10 +0100 +Subject: [PATCH] Guard local variable priv only used with glamor +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes compile errors with glamor disabled: + +../../src/radeon_present.c: In function ‘radeon_present_check_flip’: +../../src/radeon_present.c:281:21: error: invalid use of undefined type ‘struct radeon_pixmap’ + 281 | if (priv && priv->fb_failed) + | ^~ +../../src/radeon_present.c:288:19: error: invalid use of undefined type ‘struct radeon_pixmap’ + 288 | if (priv && !priv->fb_failed) { + | ^~ +../../src/radeon_present.c:292:10: error: invalid use of undefined type ‘struct radeon_pixmap’ + 292 | priv->fb_failed = TRUE; + | ^~ + +(cherry picked from commit 3c7c84ed49564907a148ae99b03200e0be350060) +Signed-off-by: Romain Naour <romain.naour@gmail.com> +--- + src/radeon_present.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/radeon_present.c b/src/radeon_present.c +index 494655c9..d010aa19 100644 +--- a/src/radeon_present.c ++++ b/src/radeon_present.c +@@ -254,7 +254,9 @@ radeon_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap, + xf86CrtcPtr xf86_crtc = crtc->devPrivate; + ScreenPtr screen = window->drawable.pScreen; + ScrnInfoPtr scrn = xf86_crtc->scrn; ++#ifdef USE_GLAMOR + struct radeon_pixmap *priv = radeon_get_pixmap_private(pixmap); ++#endif + xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); + RADEONInfoPtr info = RADEONPTR(scrn); + PixmapPtr screen_pixmap = screen->GetScreenPixmap(screen); +@@ -278,10 +280,13 @@ radeon_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap, + return FALSE; + #endif + ++#ifdef USE_GLAMOR + if (priv && priv->fb_failed) + return FALSE; ++#endif + + if (!radeon_pixmap_get_fb(pixmap)) { ++#ifdef USE_GLAMOR + if (!priv) + priv = radeon_get_pixmap_private(pixmap); + +@@ -291,6 +296,7 @@ radeon_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap, + "normal if using PRIME render offloading)\n"); + priv->fb_failed = TRUE; + } ++#endif + + return FALSE; + } +-- +2.31.1 + -- 2.31.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 7/7] package/x11r7/xdriver_xf86-video-ati: Guard local variable priv only used with glamor 2021-12-30 13:56 ` [Buildroot] [PATCH 7/7] package/x11r7/xdriver_xf86-video-ati: Guard local variable priv only used with glamor Romain Naour @ 2022-01-26 12:24 ` Peter Korsgaard 2022-01-26 22:49 ` Romain Naour 0 siblings, 1 reply; 10+ messages in thread From: Peter Korsgaard @ 2022-01-26 12:24 UTC (permalink / raw) To: Romain Naour; +Cc: Bernd Kuhls, buildroot >>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes: > Fixes: > radeon_present.c: In function ‘radeon_present_check_flip’: > radeon_present.c:281:21: error: invalid use of undefined type ‘struct radeon_pixmap’ > 281 | if (priv && priv->fb_failed) > | ^~ > Signed-off-by: Romain Naour <romain.naour@gmail.com> > Cc: Bernd Kuhls <bernd.kuhls@t-online.de> Is this only needed for xserver 21.x or does it also need to be backported to 2021.02.x / 2021.11.x? -- Bye, Peter Korsgaard _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 7/7] package/x11r7/xdriver_xf86-video-ati: Guard local variable priv only used with glamor 2022-01-26 12:24 ` Peter Korsgaard @ 2022-01-26 22:49 ` Romain Naour 0 siblings, 0 replies; 10+ messages in thread From: Romain Naour @ 2022-01-26 22:49 UTC (permalink / raw) To: Peter Korsgaard, Romain Naour; +Cc: Bernd Kuhls, buildroot Peter, Le 26/01/2022 à 13:24, Peter Korsgaard a écrit : >>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes: > > > Fixes: > > radeon_present.c: In function ‘radeon_present_check_flip’: > > radeon_present.c:281:21: error: invalid use of undefined type ‘struct radeon_pixmap’ > > 281 | if (priv && priv->fb_failed) > > | ^~ > > > Signed-off-by: Romain Naour <romain.naour@gmail.com> > > Cc: Bernd Kuhls <bernd.kuhls@t-online.de> > > Is this only needed for xserver 21.x or does it also need to be > backported to 2021.02.x / 2021.11.x? > I haven't tried with previous xserver release but I don't think it's related to the xserver version. The issue has been introduced with xf86-video-ati-19.1.0 [1] which is available in Buildroot since 2019.11. [1] https://cgit.freedesktop.org/xorg/driver/xf86-video-ati/commit/?id=33803c85f761d343aa7300311b8e9489b1a89495 Best regards, Romain _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 1/7] package/supertux: bump to version 0.6.3 2021-12-30 13:56 [Buildroot] [PATCH 1/7] package/supertux: bump to version 0.6.3 Romain Naour ` (5 preceding siblings ...) 2021-12-30 13:56 ` [Buildroot] [PATCH 7/7] package/x11r7/xdriver_xf86-video-ati: Guard local variable priv only used with glamor Romain Naour @ 2021-12-30 14:07 ` Thomas Petazzoni 6 siblings, 0 replies; 10+ messages in thread From: Thomas Petazzoni @ 2021-12-30 14:07 UTC (permalink / raw) To: Romain Naour; +Cc: buildroot On Thu, 30 Dec 2021 14:56:15 +0100 Romain Naour <romain.naour@gmail.com> wrote: > Remove upstream patch 0001-CMakeLists.txt-compile-squirrel-with-fPIC.patch > > Add new glm dependency added by: > > https://github.com/SuperTux/supertux/commit/7187e3f6d7ce2ccc25bcc96e9bee25c24416d545 > > Add new zlib dependency added by: > > https://github.com/SuperTux/supertux/commit/100bc052bc693c2e4978fffe34c9aa4376f8f8c6 > > Update data/AUTHORS hash since several new assets has been added since > version 0.6.2: > > https://github.com/SuperTux/supertux/commit/ec5e2f52137bba2ea7533e020cd8bf4b85e6b904 > https://github.com/SuperTux/supertux/commit/1ff490d32206289c72d31c7f78bfeca2956e136b > https://github.com/SuperTux/supertux/commit/14ac958c711837c6cbd1e9362768ababc38effc5 > https://github.com/SuperTux/supertux/commit/392320b79006ad1fb99b3f5dd9e771d9ba6a4668 > https://github.com/SuperTux/supertux/commit/2fd5ed445c8b00e4c50d0da456543d64015a4681 > https://github.com/SuperTux/supertux/commit/e45b5f7f8635e1749eee7a74a9fc9fde13d8344e > > See: > https://www.supertux.org/news/2021/12/23/0.6.3 > > Signed-off-by: Romain Naour <romain.naour@gmail.com> > --- > ...Lists.txt-compile-squirrel-with-fPIC.patch | 35 ------------------- > package/supertux/Config.in | 2 ++ > package/supertux/supertux.hash | 4 +-- > package/supertux/supertux.mk | 6 ++-- > 4 files changed, 7 insertions(+), 40 deletions(-) > delete mode 100644 package/supertux/0001-CMakeLists.txt-compile-squirrel-with-fPIC.patch Series applied, 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] 10+ messages in thread
end of thread, other threads:[~2022-01-26 22:49 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-12-30 13:56 [Buildroot] [PATCH 1/7] package/supertux: bump to version 0.6.3 Romain Naour 2021-12-30 13:56 ` [Buildroot] [PATCH 2/7] package/supertuxkart: bump to version 1.3 Romain Naour 2021-12-30 13:56 ` [Buildroot] [PATCH 3/7] package/efl: bump to version 1.26.0 Romain Naour 2021-12-30 13:56 ` [Buildroot] [PATCH 4/7] package/enlightenment: bump to version 0.25.0 Romain Naour 2021-12-30 13:56 ` [Buildroot] [PATCH 5/7] package/minetest: add missing header "memory" required since gcc 11 Romain Naour 2021-12-30 13:56 ` [Buildroot] [PATCH 6/7] package/x11r7/xdriver_xf86-video-ati: update to the new API/ABI introduced in xserver > 21.0 Romain Naour 2021-12-30 13:56 ` [Buildroot] [PATCH 7/7] package/x11r7/xdriver_xf86-video-ati: Guard local variable priv only used with glamor Romain Naour 2022-01-26 12:24 ` Peter Korsgaard 2022-01-26 22:49 ` Romain Naour 2021-12-30 14:07 ` [Buildroot] [PATCH 1/7] package/supertux: bump to version 0.6.3 Thomas Petazzoni
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.