From b48e0cf9571ebd0e3626a32b60f94d824ac44246 Mon Sep 17 00:00:00 2001 From: zlice Date: Mon, 2 May 2022 15:26:37 -0400 Subject: [PATCH] mesa: update to 22.0.2 --- srcpkgs/claws-mail/patches/gmail_sux.patch | 40 +++++++++++++++++++ srcpkgs/fluxbox/patches/fsbs.patch | 27 +++++++++++++ srcpkgs/fluxbox/patches/relative.patch | 15 +++++++ ...ch64-force-persistent-buffers-to-GTT.patch | 38 ------------------ srcpkgs/mesa/patches/add-use-elf-tls.patch | 34 ---------------- srcpkgs/mesa/patches/mesa_meson_tls.patch | 16 ++++++++ srcpkgs/mesa/template | 12 +++--- 7 files changed, 104 insertions(+), 78 deletions(-) create mode 100644 srcpkgs/claws-mail/patches/gmail_sux.patch create mode 100644 srcpkgs/fluxbox/patches/fsbs.patch create mode 100644 srcpkgs/fluxbox/patches/relative.patch delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch delete mode 100644 srcpkgs/mesa/patches/add-use-elf-tls.patch create mode 100644 srcpkgs/mesa/patches/mesa_meson_tls.patch diff --git a/srcpkgs/claws-mail/patches/gmail_sux.patch b/srcpkgs/claws-mail/patches/gmail_sux.patch new file mode 100644 index 000000000000..1fd99d0af0c1 --- /dev/null +++ b/srcpkgs/claws-mail/patches/gmail_sux.patch @@ -0,0 +1,40 @@ +--- a/src/plugins/notification/notification_core.c ++++ a/src/plugins/notification/notification_core.c +@@ -295,7 +296,8 @@ gboolean notification_notified_hash_msginfo_update(MsgInfoUpdate *msg_update) + g_return_val_if_fail(msg_update != NULL, FALSE); + + if((msg_update->flags & MSGINFO_UPDATE_FLAGS) && +- !MSG_IS_NEW(msg_update->msginfo->flags)) { ++ !MSG_IS_NEW(msg_update->msginfo->flags) && ++ !MSG_IS_UNREAD(msg_update->msginfo->flags)) { + + MsgInfo *msg; + gchar *msgid; +@@ -353,15 +354,15 @@ static gboolean notification_traverse_hash_startup(GNode *node, gpointer data) + FolderItem *item = (FolderItem*) node->data; + gint new_msgs_left; + +- if(!(item->new_msgs)) ++ if(!(item->new_msgs + item->unread_msgs)) + return FALSE; + +- new_msgs_left = item->new_msgs; ++ new_msgs_left = item->new_msgs + item->unread_msgs; + msg_list = folder_item_get_msg_list(item); + + for(walk = msg_list; walk; walk = g_slist_next(walk)) { + MsgInfo *msg = (MsgInfo*) walk->data; +- if(MSG_IS_NEW(msg->flags)) { ++ if(MSG_IS_NEW(msg->flags) || MSG_IS_UNREAD(msg->flags)) { + gchar *msgid; + + if(msg->msgid) +@@ -412,7 +413,7 @@ void notification_new_unnotified_msgs(FolderItemUpdateData *update_data) + MsgInfo *msg; + msg = (MsgInfo*) walk->data; + +- if(MSG_IS_NEW(msg->flags)) { ++ if(MSG_IS_NEW(msg->flags) || MSG_IS_UNREAD(msg->flags)) { + gchar *msgid; + + if(msg->msgid) diff --git a/srcpkgs/fluxbox/patches/fsbs.patch b/srcpkgs/fluxbox/patches/fsbs.patch new file mode 100644 index 000000000000..9e574184285a --- /dev/null +++ b/srcpkgs/fluxbox/patches/fsbs.patch @@ -0,0 +1,27 @@ +--- a/src/Window.cc 2022-04-18 15:59:33.000000000 -0400 ++++ b/src/Window.cc 2022-05-02 09:14:10.092678272 -0400 +@@ -532,19 +532,19 @@ + if (!m_state.fullscreen) { + unsigned int new_width = 0, new_height = 0; + if (m_client->width() >= screen().width()) { +- m_state.maximized |= WindowState::MAX_HORZ; ++ //m_state.maximized |= WindowState::MAX_HORZ; + new_width = 2 * screen().width() / 3; + } + if (m_client->height() >= screen().height()) { +- m_state.maximized |= WindowState::MAX_VERT; ++ //m_state.maximized |= WindowState::MAX_VERT; + new_height = 2 * screen().height() / 3; + } + if (new_width || new_height) { +- const int maximized = m_state.maximized; +- m_state.maximized = WindowState::MAX_NONE; ++ //const int maximized = m_state.maximized; ++ //m_state.maximized = WindowState::MAX_NONE; + resize(new_width ? new_width : width(), new_height ? new_height : height()); + m_placed = false; +- m_state.maximized = maximized; ++ //m_state.maximized = maximized; + } + } + diff --git a/srcpkgs/fluxbox/patches/relative.patch b/srcpkgs/fluxbox/patches/relative.patch new file mode 100644 index 000000000000..dc3ddb5181b5 --- /dev/null +++ b/srcpkgs/fluxbox/patches/relative.patch @@ -0,0 +1,15 @@ +diff --git a/src/FbTk/Container.cc b/src/FbTk/Container.cc +index cea761b3..0e050a0b 100644 +--- a/src/FbTk/Container.cc ++++ b/src/FbTk/Container.cc +@@ -365,6 +365,9 @@ void Container::repositionItems() { + const ItemList::iterator it_end = end(); + + int rounding_error = 0; ++ if (align == RELATIVE || total_width == m_max_total_size) { ++ rounding_error = total_width - ((max_width_per_client + borderW)* num_items - borderW); ++ } + + int next_x = -borderW; // zero so the border of the first shows + int extra = 0; + diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch deleted file mode 100644 index 125e36f5e2f5..000000000000 --- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001 -From: Jon Nettleton -Date: Fri, 14 Aug 2020 13:36:08 +0200 -Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT - -This fixes a glamore corruption issue on the HoneyComb and by -internet reports should also fix problems seen on Huaweii -Kunpeng hardware. - -The root cause of the corruption needs to be worked out, but -this patch also adds a noticable performance improvement. The -aquarium webgl demo under chromium increases from 39-49 FPS -when 5000 fish being rendered is selected. Glmark scores also -improve by ~200 with no specific tests showing any regression. - -Signed-off-by: Jon Nettleton ---- - src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c -index 6b58aebee2d..c9e983367a0 100644 ---- a/src/gallium/drivers/radeonsi/si_buffer.c -+++ b/src/gallium/drivers/radeonsi/si_buffer.c -@@ -100,6 +100,11 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res, - */ - if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu) - res->domains = RADEON_DOMAIN_GTT; -+ -+#if defined(PIPE_ARCH_AARCH64) -+ if (size <= 1024 * 1024) -+ res->domains = RADEON_DOMAIN_GTT; -+#endif - } - - /* Tiled textures are unmappable. Always put them in VRAM. */ --- -2.26.2 diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-use-elf-tls.patch deleted file mode 100644 index 420665ea8377..000000000000 --- a/srcpkgs/mesa/patches/add-use-elf-tls.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966 -Status: Not fixed upstream - -diff --git meson.build meson.build -index e1e94e71049..96ab3fb3e45 100644 ---- a/meson.build -+++ b/meson.build -@@ -447,7 +447,8 @@ endif - - # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. - use_elf_tls = false --if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and -+with_use_elf_tls = get_option('use-elf-tls') -+if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and with_use_elf_tls and - (not with_platform_android or get_option('platform-sdk-version') >= 29) and - (not with_platform_windows or not with_shared_glapi)) - pre_args += '-DUSE_ELF_TLS' -diff --git meson_options.txt meson_options.txt -index a7030aba31e..966cfeca298 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -446,6 +446,12 @@ option( - value : 25, - description : 'Android Platform SDK version. Default: Nougat version.' - ) -+option( -+ 'use-elf-tls', -+ type : 'boolean', -+ value : true, -+ description : 'Build support for initial-exec TLS model' -+) - option( - 'zstd', - type : 'combo', diff --git a/srcpkgs/mesa/patches/mesa_meson_tls.patch b/srcpkgs/mesa/patches/mesa_meson_tls.patch new file mode 100644 index 000000000000..a041acd4e939 --- /dev/null +++ b/srcpkgs/mesa/patches/mesa_meson_tls.patch @@ -0,0 +1,16 @@ +--- a/src/meson.build 2022-05-02 16:58:59.796354436 -0400 ++++ b/src/meson.build 2022-05-02 16:58:48.477355379 -0400 +@@ -490,8 +490,10 @@ + pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper()) + endforeach + +-use_elf_tls = true +-pre_args += '-DUSE_ELF_TLS' ++#use_elf_tls = true ++use_elf_tls = get_option('use-elf-tls') ++if use_elf_tls ++ pre_args += '-DUSE_ELF_TLS' ++endif + + if with_platform_android and get_option('platform-sdk-version') >= 29 + # By default the NDK compiler, at least, emits emutls references instead of diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index c90500de7416..e1bd0f4c997e 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,6 +1,6 @@ # Template file for 'mesa' pkgname=mesa -version=21.3.7 +version=22.0.2 revision=1 build_style=meson configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled @@ -22,7 +22,7 @@ license="MIT, LGPL-2.1-or-later" homepage="https://www.mesa3d.org/" changelog="https://docs.mesa3d.org/relnotes/${version}.html" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d +checksum=df4fa560dcce6680133067cd15b0505fc424ca703244ce9ab247c74d2fab6885 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then configure_args+=" -Duse-elf-tls=false" @@ -83,7 +83,7 @@ if [ "$_have_amd" ]; then _have_vulkan=yes _gallium_drivers+=",r300,r600,radeonsi" _vulkan_drivers+=",amd" - _dri_drivers+=",r100,r200" + #_dri_drivers+=",r100,r200" subpackages+=" mesa-vulkan-radeon" # transitional dummy packages subpackages+=" mesa-ati-dri" @@ -93,7 +93,7 @@ if [ "$_have_intel" ]; then _have_vulkan=yes _gallium_drivers+=",crocus,iris" _vulkan_drivers+=",intel" - _dri_drivers+=",i915,i965" + #_dri_drivers+=",i915,i965" subpackages+=" mesa-vulkan-intel" # transitional dummy packages subpackages+=" mesa-intel-dri" @@ -105,8 +105,8 @@ if [ "$_have_nv" ]; then _gallium_drivers+=",tegra" # transitional dummy packages subpackages+=" mesa-tegra-dri" - else - _dri_drivers+=",nouveau" + #else + # _dri_drivers+=",nouveau" fi # transitional dummy packages subpackages+=" mesa-nouveau-dri"