[nvidia-304xx-kmod/f26] disable -Wsign-compare because of ./include/linux/cpumask.h:213:9: warning: comparison between signe
by Nerijus Baliūnas
commit b15ff11ddc474ef0467d338a25a39c85cc95a7cf
Author: Nerijus Baliūnas <nerijus(a)users.sourceforge.net>
Date: Wed Dec 6 20:11:08 2017 +0200
disable -Wsign-compare because of ./include/linux/cpumask.h:213:9: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
disable-warnings.patch | 12 ++++++++++++
nvidia-304xx-kmod.spec | 11 ++++++++---
2 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/disable-warnings.patch b/disable-warnings.patch
new file mode 100644
index 0000000..f793757
--- /dev/null
+++ b/disable-warnings.patch
@@ -0,0 +1,12 @@
+diff -ur a/kernel/Makefile.kbuild b/kernel/Makefile.kbuild
+--- a/kernel/Makefile.kbuild 2017-09-14 23:51:09.000000003 +0300
++++ b/kernel/Makefile.kbuild 2017-12-06 18:16:36.884825684 +0200
+@@ -64,7 +64,7 @@
+ #
+
+ EXTRA_CFLAGS += -I$(src)
+-EXTRA_CFLAGS += -Wall -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
++EXTRA_CFLAGS += -Wall -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error
+
+ #
+ # We rely on these two definitions below; if they aren't set, we set them to
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index ea9641b..e47f611 100644
--- a/nvidia-304xx-kmod.spec
+++ b/nvidia-304xx-kmod.spec
@@ -9,7 +9,7 @@
Name: nvidia-304xx-kmod
Version: 304.137
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -21,7 +21,8 @@ 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
+Patch0: disable-warnings.patch
+Patch1: 4.14_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,7 +49,8 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterf
for arch in x86 x64
do
pushd nvidiapkg-${arch}
-#patch0 -p0
+%patch0 -p1
+%patch1 -p1
popd
done
@@ -82,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Dec 06 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-3
+- patch for kernel-4.14
+
* Fri Sep 22 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-2
- remove no longer needed 4.12_kernel.patch
6 years, 4 months
[nvidia-304xx-kmod/f27] patch for kernel-4.14
by Nerijus Baliūnas
commit 83eb1e11e8d3c4a93945a7a1941f98ce2ae1d8e3
Author: Nerijus Baliūnas <nerijus(a)users.sourceforge.net>
Date: Wed Dec 6 19:58:06 2017 +0200
patch for kernel-4.14
nvidia-304xx-kmod.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index cb1c696..e47f611 100644
--- a/nvidia-304xx-kmod.spec
+++ b/nvidia-304xx-kmod.spec
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Dec 06 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-3
+- patch for kernel-4.14
+
* Fri Sep 22 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-2
- remove no longer needed 4.12_kernel.patch
6 years, 4 months
[nvidia-304xx-kmod/f27] patch for kernel-4.14
by Nerijus Baliūnas
commit 1e89b9fd494a237d415ab45a59bf7b83a76e80a2
Author: Nerijus Baliūnas <nerijus(a)users.sourceforge.net>
Date: Wed Dec 6 19:55:18 2017 +0200
patch for kernel-4.14
4.14_kernel.patch | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
---
diff --git a/4.14_kernel.patch b/4.14_kernel.patch
new file mode 100644
index 0000000..6642189
--- /dev/null
+++ b/4.14_kernel.patch
@@ -0,0 +1,26 @@
+diff -ur a/kernel/nv-drm.c b/kernel/nv-drm.c
+--- a/kernel/nv-drm.c 2017-09-14 23:51:09.000000003 +0300
++++ b/kernel/nv-drm.c 2017-12-06 18:47:48.279729889 +0200
+@@ -121,7 +121,11 @@
+ {
+ int ret = 0;
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ ret = drm_pci_init(&nv_drm_driver, pci_driver);
++#else
++ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
++#endif
+ #endif
+ return ret;
+ }
+@@ -131,6 +135,10 @@
+ )
+ {
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ drm_pci_exit(&nv_drm_driver, pci_driver);
++#else
++ drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
++#endif
+ #endif
+ }
6 years, 4 months
[nvidia-304xx-kmod/f27] disable -Wsign-compare because of ./include/linux/cpumask.h:213:9: warning: comparison between signe
by Nerijus Baliūnas
commit a41dd55436c2ebcc3098e9e79e7d608abb874c39
Author: Nerijus Baliūnas <nerijus(a)users.sourceforge.net>
Date: Wed Dec 6 19:53:09 2017 +0200
disable -Wsign-compare because of ./include/linux/cpumask.h:213:9: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
disable-warnings.patch | 12 ++++++++++++
nvidia-304xx-kmod.spec | 8 +++++---
2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/disable-warnings.patch b/disable-warnings.patch
new file mode 100644
index 0000000..f793757
--- /dev/null
+++ b/disable-warnings.patch
@@ -0,0 +1,12 @@
+diff -ur a/kernel/Makefile.kbuild b/kernel/Makefile.kbuild
+--- a/kernel/Makefile.kbuild 2017-09-14 23:51:09.000000003 +0300
++++ b/kernel/Makefile.kbuild 2017-12-06 18:16:36.884825684 +0200
+@@ -64,7 +64,7 @@
+ #
+
+ EXTRA_CFLAGS += -I$(src)
+-EXTRA_CFLAGS += -Wall -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
++EXTRA_CFLAGS += -Wall -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error
+
+ #
+ # We rely on these two definitions below; if they aren't set, we set them to
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index ea9641b..cb1c696 100644
--- a/nvidia-304xx-kmod.spec
+++ b/nvidia-304xx-kmod.spec
@@ -9,7 +9,7 @@
Name: nvidia-304xx-kmod
Version: 304.137
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -21,7 +21,8 @@ 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
+Patch0: disable-warnings.patch
+Patch1: 4.14_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,7 +49,8 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterf
for arch in x86 x64
do
pushd nvidiapkg-${arch}
-#patch0 -p0
+%patch0 -p1
+%patch1 -p1
popd
done
6 years, 4 months
[audacity-freeworld] Temporay build fix.
by Sérgio M. Basto
commit eecddbf21bdaa9323d80f7931b9d85e2b18588ae
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Dec 5 22:08:50 2017 +0000
Temporay build fix.
audacity-freeworld.spec | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index 9c33187..19e5efe 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -51,7 +51,7 @@ BuildRequires: taglib-devel
BuildRequires: libogg-devel
BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel
-BuildRequires: portaudio-devel >= 19-16
+#BuildRequires: portaudio-devel >= 19-16
BuildRequires: soundtouch-devel
BuildRequires: soxr-devel
BuildRequires: vamp-plugin-sdk-devel >= 2.0
@@ -125,7 +125,6 @@ export WX_CONFIG=wx-config-3.0-gtk2
--with-expat=system \
--with-soundtouch=system \
--with-libvamp=system \
- --with-portaudio=system \
--with-ffmpeg=system \
--with-libmad=system \
%if %{with mp3}
@@ -142,7 +141,7 @@ export WX_CONFIG=wx-config-3.0-gtk2
# ensure we use the system headers for these, note we do this after
# configure as it wants to run sub-configures in these dirs
-for i in ffmpeg libresample libsoxr libvamp portaudio-v19; do
+for i in ffmpeg libresample libsoxr libvamp; do
rm -rf lib-src/$i
done
6 years, 4 months
[audacity-freeworld] Update to 2.2.0
by Sérgio M. Basto
commit 3281fe0bde5f2ca7ea254ca6809df08f48c68fc3
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Dec 3 17:36:45 2017 +0000
Update to 2.2.0
.gitignore | 1 +
audacity-freeworld.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b26873..f3bcc48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ audacity-minsrc-2.1.1.tar.xz
audacity-minsrc-2.1.2.tar.xz
/audacity-53a5c930a4b5b053ab06a8b975458fc51cf41f6c.tar.gz
/audacity-minsrc-2.1.3.tar.xz
+/audacity-minsrc-2.2.0.tar.xz
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index ed88772..9c33187 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -6,8 +6,8 @@
Name: audacity-freeworld
-Version: 2.1.3
-Release: 5%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -216,6 +216,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
+* Sun Dec 03 2017 Sérgio Basto <sergio(a)serjux.com> - 2.2.0-1
+- Update to 2.2.0
+
* Mon Oct 16 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.1.3-5
- Rebuild for ffmpeg update
diff --git a/sources b/sources
index 690bb41..baf3f1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8c8225739bc7eecec9fae68a0ced471 audacity-minsrc-2.1.3.tar.xz
+b3b81c7378b1602e9982b7836eb052e5 audacity-minsrc-2.2.0.tar.xz
6 years, 4 months
[vidcutter/f26] Update to 5.0.5
by Martin Gansser
Summary of changes:
f683963... Update to 5.0.5 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[vidcutter/f27] Update to 5.0.5
by Martin Gansser
Summary of changes:
f683963... Update to 5.0.5 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[vidcutter] Update to 5.0.5
by Martin Gansser
commit f6839639493b3369599abe4c0e8ae0d9dbc771b3
Author: martinkg <martinkg(a)fedoraproject.org>
Date: Sun Dec 3 18:10:17 2017 +0100
Update to 5.0.5
.gitignore | 1 +
sources | 2 +-
vidcutter.spec | 12 +++++++++---
3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aeb6545..668d85a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/vidcutter-4.0.0.tar.gz
/shotcut-17.11.tar.gz
/vidcutter-4.0.5.tar.gz
+/vidcutter-5.0.5.tar.gz
diff --git a/sources b/sources
index 2ec3d12..b94a89e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-943811052c8221d0806c6ee27d80ac9b vidcutter-4.0.5.tar.gz
+7aeb01be0b2e557e57a0d1dcfc913488 vidcutter-5.0.5.tar.gz
diff --git a/vidcutter.spec b/vidcutter.spec
index d27c839..50d5767 100644
--- a/vidcutter.spec
+++ b/vidcutter.spec
@@ -1,6 +1,8 @@
+%global unique_name com.ozmartians
+
Name: vidcutter
-Version: 4.0.5
-Release: 2%{?dist}
+Version: 5.0.5
+Release: 1%{?dist}
Summary: The simplest + fastest video cutter & joiner
License: GPLv3+
Url: http://vidcutter.ozmartians.com
@@ -63,13 +65,17 @@ fi
%{_bindir}/%{name}
%{python3_sitearch}/%{name}
%{python3_sitearch}/vidcutter-*-py?.?.egg-info
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{unique_name}.VidCutter.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/mime/packages/x-vidcutter.xml
+%{_datadir}/appdata/%{unique_name}.VidCutter.appdata.xml
%{_datadir}/pixmaps/%{name}.svg
%changelog
+* Sun Dec 03 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 5.0.5-1
+- Update to 5.0.5
+
* Sun Nov 05 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 4.0.5-2
- Remove mime scriptlets as they are obsolete in f25 and greater
6 years, 4 months
[VirtualBox-kmod] Add fixes for kernel 4.15
by Sérgio M. Basto
commit 537199a60822fa58d937f09f56a1f5f5a861a1c1
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Dec 3 16:46:06 2017 +0000
Add fixes for kernel 4.15
Patch_for_kernel_4.15-rc1.patch | 219 ++++++++++++++++++++++++++++++++++++++++
VirtualBox-kmod.spec | 7 +-
2 files changed, 225 insertions(+), 1 deletion(-)
---
diff --git a/Patch_for_kernel_4.15-rc1.patch b/Patch_for_kernel_4.15-rc1.patch
new file mode 100644
index 0000000..2a73c5c
--- /dev/null
+++ b/Patch_for_kernel_4.15-rc1.patch
@@ -0,0 +1,219 @@
+This patch file makes the necessary changes to the VirtualBox 5.1.30 sources
+to allow the kernel modules to build with kernel 4.15.
+
+The API changes are of several types:
+
+1. The timer initialization routine init_timer_pinned() no longer exists, and
+ is replaced by timer_setup().
+2. The timer callback routine calling sequence is changed as is the technique
+ for getting the timer information from the callback parameters.
+3. The calling sequence for drm_encoder_find() is changed.
+4. The calling sequence for the .get and .set members of the module_param_call()
+ calls have changed.
+
+This patch is released under the MIT license when appropriate, GPLv2 otherwise.
+
+Signed-off-by: Larry Finger <Larry.Finger(a)lwfinger.net>
+
+--- ./VirtualBox-kmod-5.1.30/vboxdrv/r0drv/linux/timer-r0drv-linux.c.orig 2017-12-01 19:02:19.075998155 +0000
++++ ./VirtualBox-kmod-5.1.30/vboxdrv/r0drv/linux/timer-r0drv-linux.c 2017-12-01 19:06:14.396334418 +0000
+@@ -715,6 +715,14 @@ static enum hrtimer_restart rtTimerLinux
+ #endif /* RTTIMER_LINUX_WITH_HRTIMER */
+
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++/**
++ * Timer callback for kernels 4.15 and later
++ */
++static void rtTimerLinuxStdCallback(struct timer_list *t)
++{
++ PRTTIMERLNXSUBTIMER pSubTimer = from_timer(pSubTimer, t, u.Std.LnxTimer);
++#else
+ /**
+ * Timer callback function for standard timers.
+ *
+@@ -723,6 +731,7 @@ static enum hrtimer_restart rtTimerLinux
+ static void rtTimerLinuxStdCallback(unsigned long ulUser)
+ {
+ PRTTIMERLNXSUBTIMER pSubTimer = (PRTTIMERLNXSUBTIMER)ulUser;
++#endif
+ PRTTIMER pTimer = pSubTimer->pParent;
+
+ RTTIMERLNX_LOG(("stdcallback %p\n", pTimer));
+@@ -1584,13 +1593,17 @@ RTDECL(int) RTTimerCreateEx(PRTTIMER *pp
+ else
+ #endif
+ {
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++ timer_setup(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer,rtTimerLinuxStdCallback, TIMER_PINNED);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
+ init_timer_pinned(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer);
+ #else
+ init_timer(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer);
+ #endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ pTimer->aSubTimers[iCpu].u.Std.LnxTimer.data = (unsigned long)&pTimer->aSubTimers[iCpu];
+ pTimer->aSubTimers[iCpu].u.Std.LnxTimer.function = rtTimerLinuxStdCallback;
++#endif
+ pTimer->aSubTimers[iCpu].u.Std.LnxTimer.expires = jiffies;
+ pTimer->aSubTimers[iCpu].u.Std.u64NextTS = 0;
+ }
+--- ./VirtualBox-kmod-5.1.30/vboxguest/r0drv/linux/timer-r0drv-linux.c.orig 2017-12-01 19:02:19.075998155 +0000
++++ ./VirtualBox-kmod-5.1.30/vboxguest/r0drv/linux/timer-r0drv-linux.c 2017-12-01 19:06:14.396334418 +0000
+@@ -715,6 +715,14 @@ static enum hrtimer_restart rtTimerLinux
+ #endif /* RTTIMER_LINUX_WITH_HRTIMER */
+
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++/**
++ * Timer callback for kernels 4.15 and later
++ */
++static void rtTimerLinuxStdCallback(struct timer_list *t)
++{
++ PRTTIMERLNXSUBTIMER pSubTimer = from_timer(pSubTimer, t, u.Std.LnxTimer);
++#else
+ /**
+ * Timer callback function for standard timers.
+ *
+@@ -723,6 +731,7 @@ static enum hrtimer_restart rtTimerLinux
+ static void rtTimerLinuxStdCallback(unsigned long ulUser)
+ {
+ PRTTIMERLNXSUBTIMER pSubTimer = (PRTTIMERLNXSUBTIMER)ulUser;
++#endif
+ PRTTIMER pTimer = pSubTimer->pParent;
+
+ RTTIMERLNX_LOG(("stdcallback %p\n", pTimer));
+@@ -1584,13 +1593,17 @@ RTDECL(int) RTTimerCreateEx(PRTTIMER *pp
+ else
+ #endif
+ {
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++ timer_setup(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer,rtTimerLinuxStdCallback, TIMER_PINNED);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
+ init_timer_pinned(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer);
+ #else
+ init_timer(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer);
+ #endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ pTimer->aSubTimers[iCpu].u.Std.LnxTimer.data = (unsigned long)&pTimer->aSubTimers[iCpu];
+ pTimer->aSubTimers[iCpu].u.Std.LnxTimer.function = rtTimerLinuxStdCallback;
++#endif
+ pTimer->aSubTimers[iCpu].u.Std.LnxTimer.expires = jiffies;
+ pTimer->aSubTimers[iCpu].u.Std.u64NextTS = 0;
+ }
+--- ./VirtualBox-kmod-5.1.30/vboxguest/VBoxGuest-linux.c.orig
++++ ./VirtualBox-kmod-5.1.30/vboxguest/VBoxGuest-linux.c
+@@ -958,7 +958,11 @@ EXPORT_SYMBOL(VBoxGuestIDCCall);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+
+ /** log and dbg_log parameter setter. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
++#else
+ static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
++#endif
+ {
+ if (g_fLoggerCreated)
+ {
+@@ -973,7 +973,11 @@ static int vgdrvLinuxParamLogGrpSet(cons
+ }
+
+ /** log and dbg_log parameter getter. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
++#else
+ static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
++#endif
+ {
+ PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+ *pszBuf = '\0';
+@@ -984,7 +984,11 @@ static int vgdrvLinuxParamLogGrpGet(char
+
+
+ /** log and dbg_log_flags parameter setter. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
++#else
+ static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
++#endif
+ {
+ if (g_fLoggerCreated)
+ {
+@@ -998,7 +998,11 @@ static int vgdrvLinuxParamLogFlagsSet(co
+ }
+
+ /** log and dbg_log_flags parameter getter. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
++#else
+ static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
++#endif
+ {
+ PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+ *pszBuf = '\0';
+@@ -1009,7 +1009,11 @@ static int vgdrvLinuxParamLogFlagsGet(ch
+
+
+ /** log and dbg_log_dest parameter setter. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
++#else
+ static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
++#endif
+ {
+ if (g_fLoggerCreated)
+ {
+@@ -1023,7 +1023,11 @@ static int vgdrvLinuxParamLogDstSet(cons
+ }
+
+ /** log and dbg_log_dest parameter getter. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
++#else
+ static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
++#endif
+ {
+ PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+ *pszBuf = '\0';
+@@ -1034,7 +1034,11 @@ static int vgdrvLinuxParamLogDstGet(char
+
+
+ /** r3_log_to_host parameter setter. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
++#else
+ static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
++#endif
+ {
+ if ( pszValue == NULL
+ || *pszValue == '\0'
+@@ -1052,7 +1052,11 @@ static int vgdrvLinuxParamR3LogToHostSet
+ }
+
+ /** r3_log_to_host parameter getter. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
++#else
+ static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
++#endif
+ {
+ strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
+ return strlen(pszBuf);
+--- ./VirtualBox-kmod-5.1.30/vboxvideo/vbox_mode.c.orig
++++ ./VirtualBox-kmod-5.1.30/vboxvideo/vbox_mode.c
+@@ -369,7 +369,12 @@ static struct drm_encoder *vbox_best_sin
+ LogFunc(("vboxvideo: %d: connector=%p\n", __LINE__, connector));
+ /* pick the encoder ids */
+ if (enc_id)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++ return drm_encoder_find(connector->dev, NULL, enc_id);
++#else
+ return drm_encoder_find(connector->dev, enc_id);
++#endif
++
+ LogFunc(("vboxvideo: %d\n", __LINE__));
+ return NULL;
+ }
+
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 0832488..b29f920 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -29,7 +29,7 @@
Name: VirtualBox-kmod
Version: 5.1.30
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -38,6 +38,7 @@ URL: http://www.virtualbox.org/wiki/VirtualBox
# This filters out the XEN kernel, since we don't run on XEN
Source1: VirtualBox-kmod-excludekernel-filter.txt
Patch1: fixes_for_4.14.patch
+Patch2: Patch_for_kernel_4.15-rc1.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
@@ -61,6 +62,7 @@ Kernel module for VirtualBox
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
%patch1 -p1 -b .kernel_4.14
+%patch2 -p1 -b .kernel_4.15
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
@@ -109,6 +111,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Fri Dec 01 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.30-4
+- Add fixes for kernel 4.15
+
* Sun Nov 19 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.30-3
- Add more fixes for kernel 4.14
6 years, 4 months