[nvidia-304xx-kmod] patch for kernel-4.12
by Leigh Scott
commit a393c00e134a2e78d4c462357d015e90b711214e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Aug 12 16:31:55 2017 +0100
patch for kernel-4.12
kernel_4.10.patch => 4.10_kernel.patch | 0
4.12_kernel.patch | 41 ++++++++++++++++++++++++++++++++++
4.9.0_kernel.patch => 4.9_kernel.patch | 0
nvidia-304xx-kmod.spec | 11 ++++++---
4 files changed, 49 insertions(+), 3 deletions(-)
---
diff --git a/kernel_4.10.patch b/4.10_kernel.patch
similarity index 100%
rename from kernel_4.10.patch
rename to 4.10_kernel.patch
diff --git a/4.12_kernel.patch b/4.12_kernel.patch
new file mode 100644
index 0000000..c3aee15
--- /dev/null
+++ b/4.12_kernel.patch
@@ -0,0 +1,41 @@
+From 5c46c537c864f08b22c6db4c187755c66bfcaa70 Mon Sep 17 00:00:00 2001
+From: Seth Forshee <seth.forshee(a)canonical.com>
+Date: Tue, 25 Jul 2017 08:05:39 -0500
+Subject: [PATCH] Add support for Linux 4.12
+
+---
+ nv-linux.h | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
+index 3081c065992b..c22b103c7c1f 100644
+--- a/kernel/nv-linux.h
++++ b/kernel/nv-linux.h
+@@ -1378,7 +1378,23 @@ typedef void irqreturn_t;
+ })
+ #define NV_PMD_UNMAP(pmd) pmd_unmap(pmd);
+ #else
+-#if defined(PUD_SHIFT) /* 4-level pgtable */
++#if defined(P4D_SHIFT) /* 5-level pgtable */
++#define NV_PMD_OFFSET(address, pgd) \
++ ({ \
++ pmd_t *__pmd; \
++ p4d_t *__p4d; \
++ pud_t *__pud; \
++ __p4d = p4d_offset(pgd, address); \
++ if (__p4d == NULL || \
++ (p4d_bad(*__p4d) || p4d_none(*__p4d))) \
++ return NULL; \
++ __pud = pud_offset(__p4d, address); \
++ if (__pud == NULL || \
++ (pud_bad(*__pud) || pud_none(*__pud))) \
++ return NULL; \
++ __pmd = pmd_offset(__pud, address); \
++ })
++#elif defined(PUD_SHIFT) /* 4-level pgtable */
+ #define NV_PMD_OFFSET(address, pgd) \
+ ({ \
+ pmd_t *__pmd = NULL; \
+--
+2.11.0
+
diff --git a/4.9.0_kernel.patch b/4.9_kernel.patch
similarity index 100%
rename from 4.9.0_kernel.patch
rename to 4.9_kernel.patch
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index d986b14..217187c 100644
--- a/nvidia-304xx-kmod.spec
+++ b/nvidia-304xx-kmod.spec
@@ -9,7 +9,7 @@
Name: nvidia-304xx-kmod
Version: 304.135
# Taken over by kmodtool
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -22,9 +22,10 @@ Source0: nvidia-kmod-data-%{version}.tar.xz
Source11: nvidia-304xx-kmodtool-excludekernel-filterfile
# https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-dri...
#Patch0: disable-mtrr.patch
-Patch1: 4.9.0_kernel.patch
-Patch2: kernel_4.10.patch
+Patch1: 4.9_kernel.patch
+Patch2: 4.10_kernel.patch
Patch3: 4.11_kernel.patch
+Patch4: 4.12_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,6 +56,7 @@ pushd nvidiapkg-${arch}
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
popd
done
@@ -88,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Aug 12 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 304.135-5
+- patch for kernel-4.12
+
* Sun Apr 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 304.135-4
- patch for kernel-4.11rc
6 years, 8 months
[mpv] Enable Samba support (rfbz#4624)
by Leigh Scott
commit 3cf593ea17c488e7c00b3081e1accc0454ce587f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Aug 11 14:19:53 2017 +0100
Enable Samba support (rfbz#4624)
mpv.spec | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index 0ab5113..7bb9718 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,6 +1,6 @@
Name: mpv
Version: 0.26.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+
URL: http://%{name}.io/
@@ -108,10 +108,14 @@ waf configure \
--disable-build-date \
--enable-libmpv-shared \
--enable-sdl2 \
+ --enable-libsmbclient \
--enable-encoding \
--enable-dvdread \
--enable-dvdnav \
- --enable-cdda
+ --enable-cdda \
+ --enable-tv \
+ --enable-dvbin
+
waf -v build %{?_smp_mflags}
@@ -160,6 +164,10 @@ fi
%{_libdir}/pkgconfig/mpv.pc
%changelog
+* Fri Aug 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 0.26.0-3
+- Enable Samba support (rfbz#4624)
+- Enable TV and DVB support
+
* Wed Aug 09 2017 Miro Hrončok <mhroncok(a)redhat.com> - 0.26.0-2
- Enable DVD and CDDA support (rfbz#4622)
6 years, 8 months
[obs-studio/f26] Updated to 20.0.0
by Momcilo Medic
Summary of changes:
5ade2d4... Updated to 20.0.0 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 8 months
[obs-studio/f25: 2/2] Updated to 20.0.0
by Momcilo Medic
commit 005a2b2d8cb89ffd7ffc57355a7ac9c1d6d5937b
Merge: 584ffce 5ade2d4
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Thu Aug 10 21:31:09 2017 +0200
Updated to 20.0.0
obs-studio.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
6 years, 8 months
[obs-studio/f24] Updated to 20.0.0
by Momcilo Medic
Summary of changes:
5ade2d4... Updated to 20.0.0 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 8 months
[obs-studio] Updated to 20.0.0
by Momcilo Medic
commit 5ade2d47bdaa7d21448e84723f5cbae57b35992c
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Thu Aug 10 21:27:28 2017 +0200
Updated to 20.0.0
obs-studio.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index 878dbe6..e5f14c8 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -1,5 +1,5 @@
Name: obs-studio
-Version: 19.0.3
+Version: 20.0.0
Release: 1%{?dist}
Summary: Open Broadcaster Software Studio
@@ -131,6 +131,9 @@ fi
%changelog
+* Thu Aug 10 2017 Momcilo Medic <fedorauser(a)fedoraproject.org> - 20.0.0-1
+- Updated to 20.0.0
+
* Sat Jul 08 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 19.0.3-1
- Updated to 19.0.3
diff --git a/sources b/sources
index fa7e3d7..ff7a73d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0e2b4f7a18a9a4e1e15ab4c71dc95e7 obs-studio-19.0.3.tar.gz
+cb443ee4c3783200f93d4271962e65ad obs-studio-20.0.0.tar.gz
6 years, 8 months
