Группа :: Система/X11
Пакет: xorg-drv-nouveau
навигация по пакетам
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: xorg-drv-nouveau-1.0.17-alt2.patch
Скачать
Скачать
.gear/rules | 2 +
.../tags/32ce6eb21534e7850173a2147b33a98cab4b9167 | 17 +++
.gear/tags/list | 1 +
src/compat-api.h | 4 +
src/nouveau_exa.c | 2 +-
src/nv_driver.c | 6 +-
src/nv_include.h | 1 -
xorg-drv-nouveau.spec | 161 +++++++++++++++++++++
8 files changed, 189 insertions(+), 5 deletions(-)
diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 0000000..8290b11
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,2 @@
+tar: xf86-video-nouveau-@version@:.
+diff: xf86-video-nouveau-@version@:. .
diff --git a/.gear/tags/32ce6eb21534e7850173a2147b33a98cab4b9167 b/.gear/tags/32ce6eb21534e7850173a2147b33a98cab4b9167
new file mode 100644
index 0000000..7c54518
--- /dev/null
+++ b/.gear/tags/32ce6eb21534e7850173a2147b33a98cab4b9167
@@ -0,0 +1,17 @@
+object c39897466573aabd6a3b4e63e8e5fb42ac5971f8
+type commit
+tag xf86-video-nouveau-1.0.17
+tagger Ilia Mirkin <imirkin@alum.mit.edu> 1611426334 -0500
+
+xf86-video-nouveau-1.0.17
+-----BEGIN PGP SIGNATURE-----
+
+iQFJBAABCAAzFiEEv7mwwnbVdnxxAIbvsXi+TqB13gcFAmAMah4VHGltaXJraW5A
+YWx1bS5taXQuZWR1AAoJELF4vk6gdd4H3R8H+wT7/zMD/PRSN+cqy6qjGPTqjTvG
+ghZvxCkXiiLK+9vokj2OoNigrwgIOK1OapqStQIvo/KJKW21s02a6xu0jywAhB69
+9ste+hn5pyY2Epv3WayaX6+t703idIMioMCGqmGzUSYLxf+ML8QqGWi+n7SUasPC
+dFBzhmcisyfSh8hs6I8NjD3t4SzO1sYQeelD3A3tdQsdsX5dhCrMz7eVwV/u3xfh
+TxBmPYsXkFzIUsMKhxxO2L6C2u1xZwJLPSZc00Wocp2me8m+ZqEDcvxXvT9Lx9Gt
+TK5fNrc3lunWBlJ04HU2Juat4rhLmjuZekJoohQZSUcAqyujnPFTLHrnSAQ=
+=TK1G
+-----END PGP SIGNATURE-----
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 0000000..c3e4109
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+32ce6eb21534e7850173a2147b33a98cab4b9167 xf86-video-nouveau-1.0.17
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);
}
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__ */
diff --git a/xorg-drv-nouveau.spec b/xorg-drv-nouveau.spec
new file mode 100644
index 0000000..2e4d9db
--- /dev/null
+++ b/xorg-drv-nouveau.spec
@@ -0,0 +1,161 @@
+Name: xorg-drv-nouveau
+Version: 1.0.17
+Release: alt2
+Epoch: 2
+Summary: NVIDIA video driver
+License: MIT/X11
+Group: System/X11
+Url: http://xorg.freedesktop.org
+Packager: Valery Inozemtsev <shrek@altlinux.ru>
+
+PreReq: xorg-dri-nouveau
+Requires: XORG_ABI_VIDEODRV = %get_xorg_abi_videodrv
+
+Source: %name-%version.tar
+Patch: %name-%version-%release.patch
+
+BuildRequires(Pre): xorg-sdk
+BuildRequires: libGL-devel xorg-proto-devel libudev-devel
+
+%description
+nouveau is an Xorg driver for NVIDIA video cards. The
+driver supports 2D acceleration and provides support for the following
+framebuffer depths: (15,) 16 and 24. TrueColor visuals are supported
+for these depths
+
+%prep
+%setup -q
+%patch -p1
+
+%build
+%autoreconf
+%configure \
+ --with-xorg-module-dir=%_x11modulesdir \
+ --disable-static
+%make_build
+
+%install
+%make DESTDIR=%buildroot install
+
+%files
+%_x11modulesdir/drivers/*.so
+%_man4dir/*
+
+%changelog
+* Tue Nov 09 2021 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.17-alt2
+- requires XORG_ABI_VIDEODRV = 25.2
+
+* Mon Jan 25 2021 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.17-alt1
+- 1.0.17
+
+* Tue Jan 29 2019 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.16-alt1
+- 1.0.16
+
+* Thu May 31 2018 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.15-alt1
+- 1.0.15
+
+* Thu Mar 16 2017 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.14-alt1
+- 1.0.14
+
+* Thu Dec 01 2016 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.13-alt2
+- git snapshot master.1516d35
+
+* Thu Oct 06 2016 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.13-alt1
+- 1.0.13
+
+* Mon Apr 25 2016 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.12-alt1
+- 1.0.12
+
+* Fri Nov 27 2015 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.11-alt4
+- git snapshot master.6e6d8ac
+
+* Thu Feb 05 2015 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.11-alt3
+- requires XORG_ABI_VIDEODRV = 19.0
+
+* Fri Oct 10 2014 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.11-alt2
+- requires XORG_ABI_VIDEODRV = 18.0
+
+* Sun Sep 07 2014 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.11-alt1
+- 1.0.11
+
+* Thu Jan 09 2014 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.10-alt2
+- requires XORG_ABI_VIDEODRV = 15.0
+
+* Thu Nov 07 2013 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.10-alt1
+- 1.0.10
+
+* Sun Aug 04 2013 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.9-alt1
+- 1.0.9
+
+* Sat Jun 15 2013 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.8-alt1
+- 1.0.8
+
+* Thu Mar 28 2013 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.7-alt1
+- 1.0.7
+
+* Wed Mar 06 2013 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.6-alt3
+- requires XORG_ABI_VIDEODRV = 14.1
+
+* Fri Jan 18 2013 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.6-alt2
+- requires XORG_ABI_VIDEODRV = 13.1
+
+* Tue Jan 08 2013 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.6-alt1
+- 1.0.6
+
+* Fri Nov 09 2012 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.4-alt1
+- 1.0.4
+
+* Fri Oct 26 2012 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.3-alt1
+- 1.0.3
+
+* Wed Sep 12 2012 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.2-alt1
+- 1.0.2
+
+* Mon Sep 10 2012 Valery Inozemtsev <shrek@altlinux.ru> 2:1.0.1-alt1
+- 1.0.1
+
+* Mon Aug 27 2012 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.16-alt10
+- requires XORG_ABI_VIDEODRV = 12.1
+
+* Mon Mar 05 2012 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.16-alt9
+- requires XORG_ABI_VIDEODRV = 12.0
+
+* Thu Dec 29 2011 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.16-alt8
+- update to master git.3d9f6b32
+
+* Tue Nov 22 2011 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.16-alt7
+- updated to master git.9fa0c6c
+
+* Mon Aug 29 2011 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.16-alt6
+- updated to master git.169512f
+
+* Tue Jul 19 2011 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.16-alt5
+- updated to master git.de9d1ba
+
+* Thu Apr 28 2011 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.16-alt4
+- updated to master git.8378443
+
+* Mon Feb 28 2011 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.16-alt3.bc5dec2
+- updated to master git.bc5dec2
+
+* Thu Feb 17 2011 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.16-alt3.c123618
+- updated to master git.c123618
+
+* Sat Jan 08 2011 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.16-alt3
+- updated to master git.b795ca6
+
+* Tue Aug 17 2010 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.16-alt2
+- GIT snapshot 2010-08-13 (00d390952c912d4e9fc2c962caaeb90bf563d5b1)
+
+* Sat Mar 06 2010 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.16-alt1
+- GIT snapshot 2010-03-05 (c642b9f7a13bdeecd0a83ddcbf6d6d4f2c287501)
+
+* Thu Feb 25 2010 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.15-alt3
+- don't requires firmware
+
+* Sat Feb 13 2010 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.15-alt2
+- GIT snapshot 2010-02-10 (9b4118d6d1fa488db86cd7d2875beea9cdefb096)
+
+* Mon Feb 01 2010 Valery Inozemtsev <shrek@altlinux.ru> 2:0.0.15-alt1
+- initial release
+