[packages/xorg-driver-video-nvidia] up to 418.43
atler
atler at pld-linux.org
Fri Feb 22 22:08:09 CET 2019
commit 7dca426e5838576c16424e7f255bb15a0629ef34
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Feb 22 22:02:44 2019 +0100
up to 418.43
- 4.4.169 patch no longer needed
kernel-4.4.169.patch | 103 ------------------------------------------
xorg-driver-video-nvidia.spec | 13 ++----
2 files changed, 3 insertions(+), 113 deletions(-)
---
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index dbd9364..eee80f7 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -40,19 +40,18 @@ Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez
Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
# when updating version here, keep nvidia-settings.spec in sync as well
-Version: 415.27
+Version: 418.43
Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
Epoch: 1
License: nVidia Binary
Group: X11
Source0: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run
-# Source0-md5: f4777691c4673c808d82e37695367f6d
+# Source0-md5: 33d6f5f282f0ae9b919a6da6a5bd346a
Source2: %{pname}-xinitrc.sh
Source3: gl.pc.in
Source4: 10-nvidia.conf
Source5: 10-nvidia-modules.conf
Patch0: X11-driver-nvidia-desktop.patch
-Patch1: kernel-4.4.169.patch
URL: http://www.nvidia.com/object/unix.html
BuildRequires: rpmbuild(macros) >= 1.701
%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.32}}
@@ -260,7 +259,6 @@ rm -rf NVIDIA-Linux-x86_64-%{version}
/bin/sh %{SOURCE0} --extract-only
%setup -qDT -n NVIDIA-Linux-x86_64-%{version}
%patch0 -p1
-%patch1 -p1
echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
%build
@@ -323,7 +321,7 @@ for f in \
%{srcdir}/libGLESv1_CM_nvidia.so.%{version} \
%{srcdir}/libGLESv2_nvidia.so.%{version} \
%ifarch %{x8664}
- %{srcdir}/libnvidia-egl-wayland.so.1.1.0 \
+ %{srcdir}/libnvidia-egl-wayland.so.1.1.2 \
%{srcdir}/libnvidia-eglcore.so.%{version} \
%endif
%else
@@ -360,8 +358,6 @@ install -p libglxserver_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modu
ln -s libglxserver_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglxserver_nvidia.so
install -p nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version}
ln -s nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
-install -p libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia
-ln -s libnvidia-wfb.so.1 $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so
%endif
/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/nvidia
@@ -445,9 +441,6 @@ EOF
%defattr(644,root,root,755)
%doc LICENSE NVIDIA_Changelog README.txt
%dir %{_libdir}/xorg/modules/extensions/nvidia
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.*.*
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.1
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libglxserver_nvidia.so.*
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libglxserver_nvidia.so
%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so.*
diff --git a/kernel-4.4.169.patch b/kernel-4.4.169.patch
deleted file mode 100644
index 6034674..0000000
--- a/kernel-4.4.169.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/conftest.sh~ 2018-08-22 06:47:57.000000000 +0900
-+++ NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/conftest.sh 2018-12-29 09:33:30.537541114 +0900
-@@ -2725,6 +2725,32 @@
- return
- fi
-
-+ # Conftest #3: Check if get_user_pages has gup_flags instead of write and force parameters.
-+ # Return if available.
-+ # Fall through to default case if absent.
-+
-+ echo "$CONFTEST_PREAMBLE
-+ #include <linux/mm.h>
-+ long get_user_pages(struct task_struct *tsk,
-+ struct mm_struct *mm,
-+ unsigned long start,
-+ unsigned long nr_pages,
-+ unsigned int gup_flags,
-+ struct page **pages,
-+ struct vm_area_struct **vmas) {
-+ return 0;
-+ }" > conftest$$.c
-+
-+ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+ rm -f conftest$$.c
-+
-+ if [ -f conftest$$.o ]; then
-+ echo "#undef NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS" | append_conftest "functions"
-+ echo "#define NV_GET_USER_PAGES_HAS_TASK_STRUCT" | append_conftest "functions"
-+ rm -f conftest$$.o
-+ return
-+ fi
-+
- echo "#define NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS" | append_conftest "functions"
- echo "#define NV_GET_USER_PAGES_HAS_TASK_STRUCT" | append_conftest "functions"
-
---- NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/common/inc/nv-mm.h~ 2018-08-22 09:55:23.000000000 +0900
-+++ NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/common/inc/nv-mm.h 2018-12-29 09:30:55.797962776 +0900
-@@ -40,8 +40,31 @@
- */
-
- #if defined(NV_GET_USER_PAGES_HAS_TASK_STRUCT)
-+ #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS)
- #define NV_GET_USER_PAGES(start, nr_pages, write, force, pages, vmas) \
- get_user_pages(current, current->mm, start, nr_pages, write, force, pages, vmas)
-+ #else
-+ #include <asm/current.h>
-+ #include <linux/mm.h>
-+ #include <linux/sched.h>
-+
-+ static inline long NV_GET_USER_PAGES(unsigned long start,
-+ unsigned long nr_pages,
-+ int write,
-+ int force,
-+ struct page **pages,
-+ struct vm_area_struct **vmas)
-+ {
-+ unsigned int flags = 0;
-+
-+ if (write)
-+ flags |= FOLL_WRITE;
-+ if (force)
-+ flags |= FOLL_FORCE;
-+
-+ return get_user_pages(current, current->mm, start, nr_pages, flags, pages, vmas);
-+ }
-+ #endif
- #else
- #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS)
- #define NV_GET_USER_PAGES get_user_pages
-@@ -147,7 +147,32 @@
- }
- #endif
- #else
-- #define NV_GET_USER_PAGES_REMOTE get_user_pages
-+ #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS)
-+ #define NV_GET_USER_PAGES_REMOTE get_user_pages
-+ #else
-+ #include <asm/current.h>
-+ #include <linux/mm.h>
-+ #include <linux/sched.h>
-+
-+ static inline long NV_GET_USER_PAGES_REMOTE(struct task_struct *tsk,
-+ struct mm_struct *mm,
-+ unsigned long start,
-+ unsigned long nr_pages,
-+ int write,
-+ int force,
-+ struct page **pages,
-+ struct vm_area_struct **vmas)
-+ {
-+ unsigned int flags = 0;
-+
-+ if (write)
-+ flags |= FOLL_WRITE;
-+ if (force)
-+ flags |= FOLL_FORCE;
-+
-+ return get_user_pages(tsk, mm, start, nr_pages, flags, pages, vmas);
-+ }
-+ #endif
- #endif
-
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia.git/commitdiff/7dca426e5838576c16424e7f255bb15a0629ef34
More information about the pld-cvs-commit
mailing list