[kaffeine] remove kf5-kinit requires
by Leigh Scott
commit b00bcf29c9508c0a0604f8e3171fabd48f6ab1ad
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 8 14:46:33 2016 +0100
remove kf5-kinit requires
kaffeine.spec | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/kaffeine.spec b/kaffeine.spec
index 45fceb0..4bd12af 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
Name: kaffeine
Version: 2.0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
Summary: KDE media player
@@ -30,7 +30,6 @@ BuildRequires: pkgconfig(libvlc)
BuildRequires: pkgconfig(libdvbv5)
BuildRequires: pkgconfig(xscrnsaver)
-Requires: kf5-kinit
Requires: kio-extras
%description
@@ -91,6 +90,9 @@ fi
%{_kf5_mandir}/man1/kaffeine.1.*
%changelog
+* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-5
+- rebuilt
+
* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.4-4
- revert last commit
8 years, 4 months
[nvidia-kmod/f24: 3/3] Merge branch 'master' into f24
by Leigh Scott
commit 8512ae506a5243cc8056640a6dd4ffd528fd1157
Merge: 5119729 52cadb0
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 8 14:42:08 2016 +0100
Merge branch 'master' into f24
nvidia-4.7_kernel.patch | 61 +++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-kmod.spec | 9 ++++++--
2 files changed, 68 insertions(+), 2 deletions(-)
---
8 years, 4 months
[nvidia-kmod] switch to akmods build
by Leigh Scott
commit 52cadb0401a80d4c95563880f154d45506f18b9e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 8 14:40:21 2016 +0100
switch to akmods build
nvidia-kmod.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index c8858e5..798d790 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#global buildforkernels newest
+%global buildforkernels akmods
Name: nvidia-kmod
Epoch: 1
8 years, 4 months
[avidemux] More gcc 6 fixes.
by Richard Shaw
commit 4940e192700f26dd2e7d56820da8136177438ee1
Author: Richard M. Shaw <hobbes1069(a)gmail.com>
Date: Fri Jul 8 08:26:48 2016 -0500
More gcc 6 fixes.
avidemux-2.6.12-gcc6.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
---
diff --git a/avidemux-2.6.12-gcc6.patch b/avidemux-2.6.12-gcc6.patch
index f3ea7f9..aa62abd 100644
--- a/avidemux-2.6.12-gcc6.patch
+++ b/avidemux-2.6.12-gcc6.patch
@@ -45,3 +45,14 @@
default:
break;
}
+--- a/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp
++++ b/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp
+@@ -433,7 +433,7 @@ nextPack3:
+ /**
+ \fn decodePesHeader
+ */
+-#define fail(x) {printf("[Ts Demuxer]*********"x"*******\n");return false;}
++#define fail(x) {printf("[Ts Demuxer]*********" x "*******\n");return false;}
+ bool tsPacket::decodePesHeader(TS_PESpacket *pes)
+ {
+ uint8_t *start=pes->payload+6;
8 years, 4 months
[nvidia-kmod] patch for 4.7rc kernel
by Leigh Scott
commit bba03e6f43e104e2cc9c9aca1d30ee6b99646dcb
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 8 14:02:25 2016 +0100
patch for 4.7rc kernel
nvidia-4.7_kernel.patch | 61 +++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-kmod.spec | 7 +++++-
2 files changed, 67 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-4.7_kernel.patch b/nvidia-4.7_kernel.patch
new file mode 100644
index 0000000..11a53da
--- /dev/null
+++ b/nvidia-4.7_kernel.patch
@@ -0,0 +1,61 @@
+--- a/kernel/nvidia-uvm/uvm_linux.h
++++ b/kernel/nvidia-uvm/uvm_linux.h
+@@ -563,7 +563,11 @@
+ INIT_RADIX_TREE(tree, GFP_NOWAIT);
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++static bool radix_tree_is_empty(struct radix_tree_root *tree)
++#else
+ static bool radix_tree_empty(struct radix_tree_root *tree)
++#endif
+ {
+ void *dummy;
+ return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0;
+
+--- a/kernel/nvidia-drm/nvidia-drm-fb.c
++++ b/kernel/nvidia-drm/nvidia-drm-fb.c
+@@ -24,6 +24,7 @@
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+
++#include <linux/version.h>
+ #include "nvidia-drm-priv.h"
+ #include "nvidia-drm-ioctl.h"
+ #include "nvidia-drm-fb.h"
+@@ -114,7 +115,11 @@
+ * We don't support any planar format, pick up first buffer only.
+ */
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ gem = drm_gem_object_lookup(file, cmd->handles[0]);
++#else
+ gem = drm_gem_object_lookup(dev, file, cmd->handles[0]);
++#endif
+
+ if (gem == NULL)
+ {
+
+--- a/kernel/nvidia-drm/nvidia-drm-gem.c
++++ b/kernel/nvidia-drm/nvidia-drm-gem.c
+@@ -24,6 +24,7 @@
+
+ #if defined(NV_DRM_AVAILABLE)
+
++#include <linux/version.h>
+ #include "nvidia-drm-priv.h"
+ #include "nvidia-drm-ioctl.h"
+ #include "nvidia-drm-gem.h"
+@@ -408,7 +409,11 @@
+
+ mutex_lock(&dev->struct_mutex);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++ gem = drm_gem_object_lookup(file, handle);
++#else
+ gem = drm_gem_object_lookup(dev, file, handle);
++#endif
+
+ if (gem == NULL)
+ {
+
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index a566629..c8858e5 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -9,7 +9,7 @@ Name: nvidia-kmod
Epoch: 1
Version: 367.27
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,6 +18,7 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: nv-linux-arm2.patch
+Patch2: nvidia-4.7_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +46,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
# patch loop
%patch0 -p1
%patch1 -p1
+%patch2 -p1
for kernel_version in %{?kernel_versions} ; do
@@ -77,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 08 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:367.27-2
+- patch for 4.7rc kernel
+
* Fri Jul 01 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:367.27-1
- Update to 367.27
8 years, 4 months
[devede/f23] (2 commits) ...Readd Requires: vcdimager
by Sérgio M. Basto
Summary of changes:
bea6d2e... Remove Requires: vcdimager ; package retired in F24 (*)
395c8c4... Readd Requires: vcdimager (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
[devede] Readd Requires: vcdimager
by Sérgio M. Basto
Summary of changes:
395c8c4... Readd Requires: vcdimager (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
