Skip to content
Snippets Groups Projects
Commit 09de476e authored by donoban's avatar donoban Committed by Natanael Copa
Browse files

community/xf86-video-nouveau: upgrade to 1.0.18

Reverted last build fix
Removed xorg-server-21.1.patch
parent 55e28d32
No related branches found
No related tags found
2 merge requests!79570community/firefox-esr: upgrade to 128.7.0,!78815community/xf86-video-nouveau: upgrade to 1.0.18
Pipeline #293172 skipped
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-nouveau
pkgver=1.0.17
pkgrel=6
pkgver=1.0.18
pkgrel=0
pkgdesc="Open-source X.org drivers for nVidia video cards"
url="https://nouveau.freedesktop.org/"
arch="all"
......@@ -10,18 +10,16 @@ license="MIT"
depends="mesa-dri-gallium"
makedepends="libdrm-dev xorg-server-dev util-macros eudev-dev xorgproto"
subpackages="$pkgname-doc"
source="https://www.x.org/archive/individual/driver/xf86-video-nouveau-$pkgver.tar.bz2
xorg-server-21.1.patch
source="https://www.x.org/archive/individual/driver/xf86-video-nouveau-$pkgver.tar.xz
"
prepare() {
default_prepare
update_config_sub
}
build() {
export CFLAGS="${CFLAGS/-fno-plt} -DFB_ACCESS_WRAPPER"
export CXXFLAGS="${CXXFLAGS/-fno-plt} -DFB_ACCESS_WRAPPER"
export CFLAGS="${CFLAGS/-fno-plt}"
export CXXFLAGS="${CXXFLAGS/-fno-plt}"
export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
./configure \
--build=$CBUILD \
......@@ -42,6 +40,5 @@ package() {
}
sha512sums="
adba58ba5298d1a5b3f9f8540f9ef2cb2e10e47bba8e374103ec2e1f92e915f5f4393ed0021168cd649646e12315135a1efcdf77e8fb1648e1295914d87279b2 xf86-video-nouveau-1.0.17.tar.bz2
6c1bc0a2197a0fdaa3f669ce96ab2bc0167642168da01a86c712e1a77692244ad7b68a5c71d47b62abb6fa9b74f0495226133b7eff4badbd6dda56994bba74c8 xorg-server-21.1.patch
1330fa72f76a6fdc13e7bfa932627091d2735ddb277f6a24d4fefa79fad5f354c6bb661093f26b33770275deca435c3b018f451a6e6254fe35892c59c13e28dc xf86-video-nouveau-1.0.18.tar.xz
"
diff --git a/src/compat-api.h b/src/compat-api.h
index fde2f4b1cfde75875c07bfe13524dc6ba2661382..8a1fcf9be1c5d1ceb48a50f2ed533d93ec7ff4c7 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 55df6f8f11c9e14b1891e5c841faef10c17f0a35..db3b112a2db70f8e902e54aa3af99e51e7d0c6f7 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 e72a6b65a81119f12f3608295a4547762a866ad7..f9ab4af19361d99d74f580d1ff3f28d49843e8b0 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);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment