From 05173a519f202f59d402b0afa2e8600d1172c030 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 9 Dec 2022 11:31:54 +0100 Subject: [PATCH 1/3] xf86-video-nouveau: Update version from 1.0.16 to 1.0.17 https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/commits/xf86-video-nouveau-1.0.17/ This also rebuilds the driver against the latest X.Org X Server and avoids the error below: (EE) nouveau: module ABI major version (24) doesn't match the server's version (25) --- xf86-video-nouveau.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xf86-video-nouveau.be0 b/xf86-video-nouveau.be0 index d8f4b41fa..b50da2867 100755 --- a/xf86-video-nouveau.be0 +++ b/xf86-video-nouveau.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION xf86-video-nouveau-1.0.16-0 +# BEE_VERSION xf86-video-nouveau-1.0.17-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 03b3e1f00f29acaf4ea9eddb1f96837f18f3d970 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 9 Dec 2022 11:37:38 +0100 Subject: [PATCH 2/3] xf86-video-nouveau: Download source archive from beehive.molgen.mpg.de --- xf86-video-nouveau.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xf86-video-nouveau.be0 b/xf86-video-nouveau.be0 index b50da2867..23a4dbd5e 100755 --- a/xf86-video-nouveau.be0 +++ b/xf86-video-nouveau.be0 @@ -9,7 +9,8 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="https://www.x.org/releases/individual/driver/xf86-video-nouveau-${PKGVERSION}.tar.gz" +#SRCURL[0]="https://www.x.org/releases/individual/driver/xf86-video-nouveau-${PKGVERSION}.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/e4fe1a12f9cbc075b2200773099df96f/xf86-video-nouveau-1.0.17.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 0a0d207b8ee204b2c91bcc1d0314f69b5f1c4c75 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 9 Dec 2022 11:47:06 +0100 Subject: [PATCH 3/3] xf86-video-nouveau: Fix up driver for new X server ABI Instead of applying [the commit][1] patch the source. [1]: https://cgit.freedesktop.org/nouveau/xf86-video-nouveau/commit/?id=e80e73ced69b15662103d0fd6837db4ce6c6eb5b --- xf86-video-nouveau.be0 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xf86-video-nouveau.be0 b/xf86-video-nouveau.be0 index 23a4dbd5e..b54f5bc0b 100755 --- a/xf86-video-nouveau.be0 +++ b/xf86-video-nouveau.be0 @@ -50,9 +50,12 @@ SRCURL[0]="https://beehive.molgen.mpg.de/e4fe1a12f9cbc075b2200773099df96f/xf86-v # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + bee_patch "${@}" + # https://cgit.freedesktop.org/nouveau/xf86-video-nouveau/commit/?id=e80e73ced69b15662103d0fd6837db4ce6c6eb5b + # https://www.linuxfromscratch.org/blfs/view/svn/x/x7driver.html#xorg-nouveau-driver + start_cmd grep -rl slave | xargs sed -i s/slave/secondary/ +} #mee_configure() { # bee_configure