Thu Dec 19 22:45:31 UTC 2024

x/mesa-24.3.2-x86_64-1.txz:  Upgraded.
  Dropping the reverted patch since upstream must have handled that.
This commit is contained in:
Patrick J Volkerding 2024-12-19 22:45:31 +00:00 committed by Eric Hameleers
parent c55183b7c9
commit e981c7a189
5 changed files with 48 additions and 126 deletions

View file

@ -11,9 +11,21 @@
<description>Tracking Slackware development in git.</description>
<language>en-us</language>
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
<pubDate>Thu, 19 Dec 2024 21:02:40 GMT</pubDate>
<lastBuildDate>Thu, 19 Dec 2024 21:55:36 GMT</lastBuildDate>
<pubDate>Thu, 19 Dec 2024 22:45:31 GMT</pubDate>
<lastBuildDate>Thu, 19 Dec 2024 23:07:44 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.17</generator>
<item>
<title>Thu, 19 Dec 2024 22:45:31 GMT</title>
<pubDate>Thu, 19 Dec 2024 22:45:31 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20241219224531</link>
<guid isPermaLink="false">20241219224531</guid>
<description>
<![CDATA[<pre>
x/mesa-24.3.2-x86_64-1.txz: Upgraded.
Dropping the reverted patch since upstream must have handled that.
</pre>]]>
</description>
</item>
<item>
<title>Thu, 19 Dec 2024 21:02:40 GMT</title>
<pubDate>Thu, 19 Dec 2024 21:02:40 GMT</pubDate>

View file

@ -1,3 +1,7 @@
Thu Dec 19 22:45:31 UTC 2024
x/mesa-24.3.2-x86_64-1.txz: Upgraded.
Dropping the reverted patch since upstream must have handled that.
+--------------------------+
Thu Dec 19 21:02:40 UTC 2024
a/kernel-firmware-20241219_b3300bb-noarch-1.txz: Upgraded.
a/kernel-generic-6.12.6-x86_64-1.txz: Upgraded.

View file

@ -1,20 +1,20 @@
Thu Dec 19 21:06:32 UTC 2024
Thu Dec 19 22:49:09 UTC 2024
Here is the file list for this directory. If you are using a
mirror site and find missing or extra files in the disk
subdirectories, please have the archive administrator refresh
the mirror.
drwxr-xr-x 12 root root 4096 2024-12-19 21:02 .
drwxr-xr-x 12 root root 4096 2024-12-19 22:45 .
-rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0
-rw-r--r-- 1 root root 16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT
-rw-r--r-- 1 root root 1166149 2024-12-18 22:17 ./CHECKSUMS.md5
-rw-r--r-- 1 root root 195 2024-12-18 22:17 ./CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 1166149 2024-12-19 21:06 ./CHECKSUMS.md5
-rw-r--r-- 1 root root 195 2024-12-19 21:06 ./CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING
-rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3
-rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT
-rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT
-rw-r--r-- 1 root root 1275266 2024-12-19 21:02 ./ChangeLog.txt
-rw-r--r-- 1 root root 1275432 2024-12-19 22:45 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2024-12-19 21:01 ./EFI/BOOT
-rw-r--r-- 1 root root 1200128 2024-12-13 04:26 ./EFI/BOOT/bootx64.efi
@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2024-12-19 21:01 ./EFI/BOOT
-rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh
-rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
-rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
-rw-r--r-- 1 root root 1529776 2024-12-18 22:17 ./FILELIST.TXT
-rw-r--r-- 1 root root 1529776 2024-12-19 21:06 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
-rw-r--r-- 1 root root 920266 2024-12-19 21:05 ./PACKAGES.TXT
-rw-r--r-- 1 root root 920266 2024-12-19 22:48 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT
-rw-r--r-- 1 root root 2640 2024-12-19 20:49 ./README.initrd
-rw-r--r-- 1 root root 34114 2023-12-11 20:35 ./README_CRYPT.TXT
@ -662,11 +662,11 @@ drwxr-xr-x 2 root root 4096 2022-02-03 07:02 ./patches
-rw-r--r-- 1 root root 575 2022-02-03 07:02 ./patches/FILE_LIST
-rw-r--r-- 1 root root 14 2022-02-03 07:02 ./patches/MANIFEST.bz2
-rw-r--r-- 1 root root 224 2022-02-03 07:02 ./patches/PACKAGES.TXT
drwxr-xr-x 17 root root 4096 2024-12-19 21:06 ./slackware64
-rw-r--r-- 1 root root 359073 2024-12-19 21:06 ./slackware64/CHECKSUMS.md5
-rw-r--r-- 1 root root 195 2024-12-19 21:06 ./slackware64/CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 446068 2024-12-19 21:05 ./slackware64/FILE_LIST
-rw-r--r-- 1 root root 4837618 2024-12-19 21:05 ./slackware64/MANIFEST.bz2
drwxr-xr-x 17 root root 4096 2024-12-19 22:48 ./slackware64
-rw-r--r-- 1 root root 359073 2024-12-19 22:48 ./slackware64/CHECKSUMS.md5
-rw-r--r-- 1 root root 195 2024-12-19 22:48 ./slackware64/CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 446068 2024-12-19 22:47 ./slackware64/FILE_LIST
-rw-r--r-- 1 root root 4835899 2024-12-19 22:48 ./slackware64/MANIFEST.bz2
lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
drwxr-xr-x 2 root root 32768 2024-12-19 21:05 ./slackware64/a
-rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt
@ -4649,7 +4649,7 @@ drwxr-xr-x 2 root root 4096 2024-12-05 21:43 ./slackware64/tcl
-rw-r--r-- 1 root root 227 2024-09-17 23:06 ./slackware64/tcl/tk-8.6.15-x86_64-1.txt
-rw-r--r-- 1 root root 1813700 2024-09-17 23:06 ./slackware64/tcl/tk-8.6.15-x86_64-1.txz
-rw-r--r-- 1 root root 195 2024-09-17 23:06 ./slackware64/tcl/tk-8.6.15-x86_64-1.txz.asc
drwxr-xr-x 2 root root 65536 2024-12-18 22:15 ./slackware64/x
drwxr-xr-x 2 root root 65536 2024-12-19 22:47 ./slackware64/x
-rw-r--r-- 1 root root 440 2024-08-09 18:16 ./slackware64/x/OpenCC-1.1.9-x86_64-1.txt
-rw-r--r-- 1 root root 649604 2024-08-09 18:16 ./slackware64/x/OpenCC-1.1.9-x86_64-1.txz
-rw-r--r-- 1 root root 195 2024-08-09 18:16 ./slackware64/x/OpenCC-1.1.9-x86_64-1.txz.asc
@ -5119,9 +5119,9 @@ drwxr-xr-x 2 root root 65536 2024-12-18 22:15 ./slackware64/x
-rw-r--r-- 1 root root 485 2024-11-22 01:11 ./slackware64/x/marisa-0.2.6-x86_64-12.txt
-rw-r--r-- 1 root root 162636 2024-11-22 01:11 ./slackware64/x/marisa-0.2.6-x86_64-12.txz
-rw-r--r-- 1 root root 195 2024-11-22 01:11 ./slackware64/x/marisa-0.2.6-x86_64-12.txz.asc
-rw-r--r-- 1 root root 362 2024-12-06 20:13 ./slackware64/x/mesa-24.3.1-x86_64-2.txt
-rw-r--r-- 1 root root 39246864 2024-12-06 20:13 ./slackware64/x/mesa-24.3.1-x86_64-2.txz
-rw-r--r-- 1 root root 195 2024-12-06 20:13 ./slackware64/x/mesa-24.3.1-x86_64-2.txz.asc
-rw-r--r-- 1 root root 362 2024-12-19 22:36 ./slackware64/x/mesa-24.3.2-x86_64-1.txt
-rw-r--r-- 1 root root 39250572 2024-12-19 22:36 ./slackware64/x/mesa-24.3.2-x86_64-1.txz
-rw-r--r-- 1 root root 195 2024-12-19 22:36 ./slackware64/x/mesa-24.3.2-x86_64-1.txz.asc
-rw-r--r-- 1 root root 425 2022-04-04 18:48 ./slackware64/x/mkcomposecache-1.2.2-x86_64-1.txt
-rw-r--r-- 1 root root 13532 2022-04-04 18:48 ./slackware64/x/mkcomposecache-1.2.2-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-04-04 18:48 ./slackware64/x/mkcomposecache-1.2.2-x86_64-1.txz.asc
@ -5831,11 +5831,11 @@ drwxr-xr-x 2 root root 4096 2024-11-10 20:41 ./slackware64/y
-rw-r--r-- 1 root root 1488844 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz
-rw-r--r-- 1 root root 195 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz.asc
-rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile
drwxr-xr-x 18 root root 4096 2024-12-19 21:06 ./source
-rw-r--r-- 1 root root 629857 2024-12-19 21:06 ./source/CHECKSUMS.md5
-rw-r--r-- 1 root root 195 2024-12-19 21:06 ./source/CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 882099 2024-12-19 21:06 ./source/FILE_LIST
-rw-r--r-- 1 root root 31708990 2024-12-19 21:06 ./source/MANIFEST.bz2
drwxr-xr-x 18 root root 4096 2024-12-19 22:49 ./source
-rw-r--r-- 1 root root 629752 2024-12-19 22:49 ./source/CHECKSUMS.md5
-rw-r--r-- 1 root root 195 2024-12-19 22:49 ./source/CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 881977 2024-12-19 22:48 ./source/FILE_LIST
-rw-r--r-- 1 root root 31709413 2024-12-19 22:48 ./source/MANIFEST.bz2
-rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT
drwxr-xr-x 125 root root 4096 2024-12-18 19:37 ./source/a
-rw-r--r-- 1 root root 339 2023-09-28 19:06 ./source/a/FTBFSlog
@ -14226,7 +14226,7 @@ drwxr-xr-x 2 root root 4096 2024-11-21 21:52 ./source/x/marisa
-rwxr-xr-x 1 root root 4686 2024-11-21 21:52 ./source/x/marisa/marisa.SlackBuild
-rw-r--r-- 1 root root 38 2020-12-08 18:39 ./source/x/marisa/marisa.url
-rw-r--r-- 1 root root 972 2020-11-28 00:57 ./source/x/marisa/slack-desc
drwxr-xr-x 5 root root 4096 2024-12-06 19:29 ./source/x/mesa
drwxr-xr-x 5 root root 4096 2024-12-19 22:31 ./source/x/mesa
drwxr-xr-x 4 root root 4096 2022-08-08 18:18 ./source/x/mesa/amber
-rw-r--r-- 1 root root 16607716 2022-06-08 18:26 ./source/x/mesa/amber/mesa-21.3.9.tar.xz
-rw-r--r-- 1 root root 119 2022-06-08 18:26 ./source/x/mesa/amber/mesa-21.3.9.tar.xz.sig
@ -14236,17 +14236,16 @@ drwxr-xr-x 2 root root 4096 2021-03-12 01:31 ./source/x/mesa/amber/patch
-rw-r--r-- 1 root root 1259 2021-03-12 01:31 ./source/x/mesa/amber/patches-revert/80817b6e344258ac9b955f824ebf9019a0fc1610.patch
-rw-r--r-- 1 root root 388 2018-12-07 19:28 ./source/x/mesa/doinst.sh.gz
-rwxr-xr-x 1 root root 720 2015-12-11 03:09 ./source/x/mesa/get-mesa.sh
-rw-r--r-- 1 root root 30611028 2024-12-04 22:32 ./source/x/mesa/mesa-24.3.1.tar.xz
-rw-r--r-- 1 root root 119 2024-12-04 22:32 ./source/x/mesa/mesa-24.3.1.tar.xz.sig
-rw-r--r-- 1 root root 30640276 2024-12-19 21:04 ./source/x/mesa/mesa-24.3.2.tar.xz
-rw-r--r-- 1 root root 119 2024-12-19 21:04 ./source/x/mesa/mesa-24.3.2.tar.xz.sig
-rwxr-xr-x 1 root root 2901 2024-06-09 18:30 ./source/x/mesa/mesa-amber.build
-rw-r--r-- 1 root root 7322153 2022-05-30 14:26 ./source/x/mesa/mesa-demos-8.5.0.tar.lz
-rwxr-xr-x 1 root root 1590 2023-08-24 13:39 ./source/x/mesa/mesa-demos.build
-rw-r--r-- 1 root root 935733 2024-12-06 19:29 ./source/x/mesa/mesa-subprojects.tar.lz
-rwxr-xr-x 1 root root 6874 2024-12-06 19:27 ./source/x/mesa/mesa.SlackBuild
-rw-r--r-- 1 root root 935806 2024-12-19 22:31 ./source/x/mesa/mesa-subprojects.tar.lz
-rwxr-xr-x 1 root root 6874 2024-12-19 22:30 ./source/x/mesa/mesa.SlackBuild
-rw-r--r-- 1 root root 78 2010-10-01 04:23 ./source/x/mesa/mesa.url
drwxr-xr-x 2 root root 4096 2024-09-18 17:39 ./source/x/mesa/patches
drwxr-xr-x 2 root root 4096 2024-12-06 19:27 ./source/x/mesa/patches-revert
-rw-r--r-- 1 root root 3712 2024-12-06 19:27 ./source/x/mesa/patches-revert/4c065158927d7bacc5eb1e4f2491b1db93f1dc12.patch
drwxr-xr-x 2 root root 4096 2024-12-19 22:31 ./source/x/mesa/patches-revert
-rw-r--r-- 1 root root 814 2019-09-25 19:15 ./source/x/mesa/slack-desc
drwxr-xr-x 2 root root 4096 2022-09-06 18:27 ./source/x/motif
-rw-r--r-- 1 root root 735 2014-06-07 14:12 ./source/x/motif/motif-2.3.4-bindings.patch.gz

View file

@ -26,7 +26,7 @@ PKGNAM=mesa
VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
AMBERVERS=${AMBERVERS:-21.3.9}
DEMOVERS=${DEMOVERS:-8.5.0}
BUILD=${BUILD:-2}
BUILD=${BUILD:-1}
BUILD_AMBER=${BUILD_AMBER:-YES}
BUILD_DEMOS=${BUILD_DEMOS:-YES}
CODECS=${CODECS:-h264dec,h264enc,h265dec,h265enc,vc1dec,av1dec,av1enc,vp9dec}

View file

@ -1,93 +0,0 @@
From 4c065158927d7bacc5eb1e4f2491b1db93f1dc12 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Thu, 28 Nov 2024 16:54:47 +0100
Subject: [PATCH] dri: revert INVALID modifier special-casing
Commit 361f3622587e ("dri: Unify createImage and createImageWithModifiers")
has introduced new behavior for drivers which don't support explicit
format modifiers. Before this commit, INVALID was not special-cased
and any call to dri_create_image() with one or more modifiers returned
NULL. After this commit, INVALID gained a special meaning: it indicates
that the implicit modifier is accepted by the caller. This is surprising
and is an API break.
This causes further API breaks: for instance, before this commit a BO
created via gbm_bo_create_with_modifiers() was guaranteed to always
return a non-INVALID modifier in gbm_bo_get_modifier().
This is inconsistent with gbm_dri_surface_create(): that function
treats INVALID as a bad entry in the modifier list, and fails if
it's the only acceptable modifier.
Additionally, drivers don't special-case INVALID and just ignore it
if they see it in a modifier list. This causes more inconsistencies.
For instance, let's say that a library user passes the modifier list
{ INVALID, FOO } to GBM. If a driver supports explicit modifiers and
doesn't support FOO for scanout, it'll return NULL. If a driver
doesn't support explicit modifiers, the current logic would return
a non-NULL BO with an INVALID modifier. This discrepency makes it
harder to reason about the system: half of the API ignores INVALID,
while the other half assumes INVALID indicates an implicit modifier.
To fix these issues, revert to the behavior before the commit, and
require use of the dedicated API without supplying any modifier for
implicit modifiers.
Signed-off-by: Simon Ser <contact@emersion.fr>
Fixes: 361f3622587e ("dri: Unify createImage and createImageWithModifiers")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32396>
(cherry picked from commit 105fcb9cfdb4fc28de99f9647ed3d370393058f0)
---
.pick_status.json | 2 +-
src/gallium/frontends/dri/dri2.c | 22 ++--------------------
2 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index 7df28ed34279b..954649af5bdbe 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -474,7 +474,7 @@
"description": "dri: revert INVALID modifier special-casing",
"nominated": true,
"nomination_type": 2,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "361f3622587e5bc452a62dbd671969b713273b79",
"notes": null
diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c
index d8ee9536479eb..18baf444f82c7 100644
--- a/src/gallium/frontends/dri/dri2.c
+++ b/src/gallium/frontends/dri/dri2.c
@@ -1130,26 +1130,8 @@ dri_create_image(struct dri_screen *screen,
if (!map)
return NULL;
- if (count == 1 && modifiers[0] == DRM_FORMAT_MOD_INVALID) {
- count = 0;
- modifiers = NULL;
- }
-
- if (!pscreen->resource_create_with_modifiers && count > 0) {
- bool invalid_ok = false;
-
- for (unsigned i = 0; i < _count; i++) {
- if (modifiers[i] == DRM_FORMAT_MOD_INVALID)
- invalid_ok = true;
- }
-
- if (invalid_ok) {
- count = 0;
- modifiers = NULL;
- } else {
- return NULL;
- }
- }
+ if (!pscreen->resource_create_with_modifiers && count > 0)
+ return NULL;
if (pscreen->is_format_supported(pscreen, map->pipe_format, screen->target,
0, 0, PIPE_BIND_RENDER_TARGET))
--
GitLab