Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e2aa46c3ce88d0f709d1ab5c260dbef14398b0f0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (e2aa46c3ce88d0f709d1ab5c260dbef14398b0f0)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e2aa46c3ce88d0f709d1ab5c260dbef14398b0f0)
  • Date: Sat, 26 Mar 2022 12:15:19 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

collab/openldap/DETAILS
| 5
collab/openldap/HISTORY
| 7 -
collab/openldap/PREPARE
| 4
xorg-driver/xf86-video-nouveau/0001-remove-obsolete-dri1-include.patch
| 23 ---
xorg-driver/xf86-video-nouveau/DETAILS
| 4
xorg-driver/xf86-video-nouveau/HISTORY
| 7 +
xorg-driver/xf86-video-nouveau/PRE_BUILD
| 4

xorg-driver/xf86-video-nouveau/patches/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch
| 64 ++++++++++

xorg-driver/xf86-video-nouveau/patches/0001-remove-obsolete-dri1-include.patch
| 23 +++
9 files changed, 103 insertions(+), 38 deletions(-)

New commits:
commit e2aa46c3ce88d0f709d1ab5c260dbef14398b0f0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

openldap: Remove branches

commit bc8a86d03040a52cccef799392ed7920f3cdee3c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xf86-video-nouveau 1.0.17

commit 4bf996dbf306503bdba93a054b0837001b1260c1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xf86-video-nouveau: Use apply_patch_dir

diff --git a/collab/openldap/DETAILS b/collab/openldap/DETAILS
index 2f6bf6c..bec21dc 100755
--- a/collab/openldap/DETAILS
+++ b/collab/openldap/DETAILS
@@ -1,11 +1,6 @@
SPELL=openldap
-if [[ $OPENLDAP_BRANCH == stable ]]; then
VERSION=2.6.1

SOURCE_HASH=sha512:bdb961225313bc2717aabac7ba1dfcaabba7c933ab1c28959315b5e88074af0575f082c329fdfc0adde61b6b0e56315305156cee7eb879bc8e48b47cb9f5cd58
-else
- VERSION=2.6.1
-
SOURCE_HASH=sha512:bdb961225313bc2717aabac7ba1dfcaabba7c933ab1c28959315b5e88074af0575f082c329fdfc0adde61b6b0e56315305156cee7eb879bc8e48b47cb9f5cd58
-fi
SOURCE=$SPELL-$VERSION.tgz
SECURITY_PATCH=3
SOURCE_URI=$SPELL-release/$SOURCE
diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index e33eba6..bf53299 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,7 +1,10 @@
-2022-01-29 Florian Franzmann <bwlf AT bandrate.org>
+2022-03-26 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: removed OPENLDAP_BRANCH
+
+2022-01-29 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 2.6.1

-2021-07-08 Florian Franzmann <bwlf AT bandrate.org>
+2021-07-08 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 2.4.59

2020-11-24 Ismael Luceno <ismael AT sourcemage.org>
diff --git a/collab/openldap/PREPARE b/collab/openldap/PREPARE
index 16b338c..fabecdd 100755
--- a/collab/openldap/PREPARE
+++ b/collab/openldap/PREPARE
@@ -1,3 +1 @@
-config_query_list OPENLDAP_BRANCH "Select which branch to build:" \
- stable \
- release
+persistent_remove OPENLDAP_BRANCH
diff --git
a/xorg-driver/xf86-video-nouveau/0001-remove-obsolete-dri1-include.patch
b/xorg-driver/xf86-video-nouveau/0001-remove-obsolete-dri1-include.patch
deleted file mode 100644
index 222c146..0000000
--- a/xorg-driver/xf86-video-nouveau/0001-remove-obsolete-dri1-include.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 316c66eda8d60618c61a4684f00f7f8a91c10124 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Sun, 18 Dec 2016 11:51:15 +0100
-Subject: [PATCH] remove obsolete dri1 include
-
----
- src/nv_include.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/nv_include.h b/src/nv_include.h
-index de55570..eee8c5d 100644
---- a/src/nv_include.h
-+++ b/src/nv_include.h
-@@ -69,6 +69,5 @@
- #include "nv_type.h"
- #include "nv_proto.h"
- #include "nv_dma.h"
--#include "sarea.h"
-
- #endif /* __NV_INCLUDE_H__ */
---
-2.11.0
-
diff --git a/xorg-driver/xf86-video-nouveau/DETAILS
b/xorg-driver/xf86-video-nouveau/DETAILS
index f868c2e..843eb04 100755
--- a/xorg-driver/xf86-video-nouveau/DETAILS
+++ b/xorg-driver/xf86-video-nouveau/DETAILS
@@ -1,8 +1,8 @@
SPELL=xf86-video-nouveau
- VERSION=1.0.16
+ VERSION=1.0.17
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=https://xorg.freedesktop.org/archive/individual/driver/$SOURCE
-
SOURCE_HASH=sha512:41b7839c37372660968ab7da2bc3d9feef3cab4e994d05d4ba6e59071f0d1b1f8d7dcdbcb15a42a375a556d28dc067f9ffe45d73c1d121ad307d199107ade3e0
+
SOURCE_HASH=sha512:adba58ba5298d1a5b3f9f8540f9ef2cb2e10e47bba8e374103ec2e1f92e915f5f4393ed0021168cd649646e12315135a1efcdf77e8fb1648e1295914d87279b2
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-$VERSION"
WEB_SITE="https://nouveau.freedesktop.org";
LICENSE[0]=XCL
diff --git a/xorg-driver/xf86-video-nouveau/HISTORY
b/xorg-driver/xf86-video-nouveau/HISTORY
index 71b6b68..dbb570d 100644
--- a/xorg-driver/xf86-video-nouveau/HISTORY
+++ b/xorg-driver/xf86-video-nouveau/HISTORY
@@ -1,3 +1,10 @@
+2022-03-25 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: switched to apply_patch_dir
+ * *.patch: moved into patches/
+ * DETAILS: updated spell to 1.0.17
+ * patches/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch:
+ fix build against xserver 1.21+
+
2020-12-23 Ismael Luceno <ismael AT iodev.co.uk>
* DETAILS: switched to SOURCE_HASH

diff --git a/xorg-driver/xf86-video-nouveau/PRE_BUILD
b/xorg-driver/xf86-video-nouveau/PRE_BUILD
index f70d5e3..32c0555 100755
--- a/xorg-driver/xf86-video-nouveau/PRE_BUILD
+++ b/xorg-driver/xf86-video-nouveau/PRE_BUILD
@@ -1,5 +1,3 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SPELL_DIRECTORY/0001-remove-obsolete-dri1-include.patch"
-
+apply_patch_dir patches
diff --git
a/xorg-driver/xf86-video-nouveau/patches/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch

b/xorg-driver/xf86-video-nouveau/patches/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch
new file mode 100644
index 0000000..d3d02bf
--- /dev/null
+++
b/xorg-driver/xf86-video-nouveau/patches/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch
@@ -0,0 +1,64 @@
+From e80e73ced69b15662103d0fd6837db4ce6c6eb5b Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied AT redhat.com>
+Date: Mon, 13 Jul 2020 09:20:15 +1000
+Subject: [PATCH] nouveau: fixup driver for new X server ABI
+
+---
+ src/compat-api.h | 4 ++++
+ src/nouveau_exa.c | 2 +-
+ src/nv_driver.c | 6 +++---
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index fde2f4b..8a1fcf9 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -102,4 +102,8 @@
+
+ #endif
+
++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
++#define secondary_dst slave_dst
++#endif
++
+ #endif
+diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
+index 55df6f8..db3b112 100644
+--- a/src/nouveau_exa.c
++++ b/src/nouveau_exa.c
+@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv)
+
+ #ifdef NOUVEAU_PIXMAP_SHARING
+ static Bool
+-nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void
**handle_p)
++nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void
**handle_p)
+ {
+ struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
+ struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix);
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index e72a6b6..f9ab4af 100644
+--- a/src/nv_driver.c
++++ b/src/nv_driver.c
+@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr
dirty)
+ {
+ RegionRec pixregion;
+
+- PixmapRegionInit(&pixregion, dirty->slave_dst);
++ PixmapRegionInit(&pixregion, dirty->secondary_dst);
+
+- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
++ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion);
+ #ifdef HAS_DIRTYTRACKING_ROTATION
+ PixmapSyncDirtyHelper(dirty);
+ #else
+ PixmapSyncDirtyHelper(dirty, &pixregion);
+ #endif
+
+- DamageRegionProcessPending(&dirty->slave_dst->drawable);
++ DamageRegionProcessPending(&dirty->secondary_dst->drawable);
+ RegionUninit(&pixregion);
+ }
+
+--
+GitLab
+
diff --git
a/xorg-driver/xf86-video-nouveau/patches/0001-remove-obsolete-dri1-include.patch

b/xorg-driver/xf86-video-nouveau/patches/0001-remove-obsolete-dri1-include.patch
new file mode 100644
index 0000000..222c146
--- /dev/null
+++
b/xorg-driver/xf86-video-nouveau/patches/0001-remove-obsolete-dri1-include.patch
@@ -0,0 +1,23 @@
+From 316c66eda8d60618c61a4684f00f7f8a91c10124 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sun, 18 Dec 2016 11:51:15 +0100
+Subject: [PATCH] remove obsolete dri1 include
+
+---
+ src/nv_include.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/nv_include.h b/src/nv_include.h
+index de55570..eee8c5d 100644
+--- a/src/nv_include.h
++++ b/src/nv_include.h
+@@ -69,6 +69,5 @@
+ #include "nv_type.h"
+ #include "nv_proto.h"
+ #include "nv_dma.h"
+-#include "sarea.h"
+
+ #endif /* __NV_INCLUDE_H__ */
+--
+2.11.0
+


  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e2aa46c3ce88d0f709d1ab5c260dbef14398b0f0), Ismael Luceno, 03/26/2022

Archive powered by MHonArc 2.6.24.

Top of Page