[VirtualBox/f28] Revert "git add VirtualBox-6.0.0-noupdate.patch"
by Vasiliy Glazov
commit 9fda7053adf6286502a734b1d9706ecef5f74da2
Author: Vasiliy Glazov <v.glazov(a)javad.com>
Date: Fri Jan 18 09:27:57 2019 +0300
Revert "git add VirtualBox-6.0.0-noupdate.patch"
This reverts commit 68e2dc760e3292588ff30dde072aa61bcb2f4089.
VirtualBox-6.0.0-noupdate.patch | 11 -----------
1 file changed, 11 deletions(-)
5 years, 10 months
[VirtualBox/f28] Revert "Enable Python3 support, move all SDK python files to devel sub-package, they"
by Vasiliy Glazov
commit 27d05ba9b3db9038aeffff4da20cd2a418a12fcd
Author: Vasiliy Glazov <v.glazov(a)javad.com>
Date: Fri Jan 18 09:27:53 2019 +0300
Revert "Enable Python3 support, move all SDK python files to devel sub-package, they"
This reverts commit 16ead04897a9bbc2e588055c379d7670b338cf0b.
007-python2-path.patch | 9 ---------
37-python-3.7-support.patch | 17 -----------------
VBoxVNC.fix.patch | 17 -----------------
VirtualBox.spec | 46 +++++++++++----------------------------------
4 files changed, 11 insertions(+), 78 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index e53a62e..bb05c83 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -34,7 +34,7 @@
Name: VirtualBox
Version: 6.0.0
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -64,10 +64,6 @@ Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch27: VirtualBox-gcc.patch
# from Debian
Patch28: 02-gsoap-build-fix.patch
-Patch30: 37-python-3.7-support.patch
-Patch32: VBoxVNC.fix.patch
-# from ArchLinux
-Patch40: 007-python2-path.patch
# from Mageia
Patch50: VirtualBox-5.1.0-add-Mageia-support.patch
Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
@@ -89,7 +85,6 @@ BuildRequires: libIDL-devel
BuildRequires: yasm
BuildRequires: pulseaudio-libs-devel
BuildRequires: python2-devel
-BuildRequires: python3-devel
BuildRequires: desktop-file-utils
BuildRequires: libcap-devel
BuildRequires: qt5-qtbase-devel
@@ -213,15 +208,6 @@ Obsoletes: python-VirtualBox < %{version}-%{release}
Python XPCOM bindings to %{name}.
-%package -n python3-%{name}
-Summary: Python3 bindings for %{name}
-Group: Development/Libraries
-Requires: %{name}-server%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python3-%{name}}
-
-%description -n python3-%{name}
-Python3 XPCOM bindings to %{name}.
-
%package guest-additions
Summary: %{name} Guest Additions
Group: System Environment/Base
@@ -288,9 +274,6 @@ rm -r src/libs/zlib-1.2.8/
%if 0%{?fedora} > 20
%patch28 -p1 -b .gsoap2
%endif
-%patch30 -p1
-%patch32 -p1
-%patch40 -p1
# mageia support not ready for 6.0
#patch50 -p1 -b .mageia-support
%patch51 -p1 -b .revert-VBox.sh
@@ -338,6 +321,7 @@ kmk %{_smp_mflags} \
VBOX_PATH_APP_DOCS=%{_docdir}/VirtualBox \
VBOX_WITH_TESTCASES= \
VBOX_WITH_VALIDATIONKIT= \
+ VBOX_WITH_EXTPACK_VBOXDTRACE= \
VBOX_WITH_VBOX_IMG=1 \
VBOX_WITH_SYSFS_BY_DEFAULT=1 \
VBOX_USE_SYSTEM_XORG_HEADERS=1 \
@@ -386,6 +370,7 @@ install -d %{buildroot}%{_datadir}/pixmaps
install -d %{buildroot}%{_datadir}/mime/packages
install -d %{buildroot}%{_datadir}/icons
install -d %{buildroot}%{_prefix}/src/%{name}-kmod-%{version}
+install -d %{buildroot}%{python2_sitelib}/virtualbox
# Libs
install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
@@ -401,6 +386,9 @@ install -p -m 0755 obj/bin/VBox.sh %{buildroot}%{_bindir}/VBox
install -p -m 0755 -t %{buildroot}%{_bindir} \
obj/bin/VBoxTunctl
+# Fixes ERROR: ambiguous python shebang in F30
+sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' obj/bin/vboxshell.py
+
# Executables
install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/VirtualBox \
@@ -465,15 +453,11 @@ cp -a obj/bin/components/* %{buildroot}%{_libdir}/virtualbox/components/
install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox/nls \
obj/bin/nls/*
-# Python
+# SDK
pushd obj/bin/sdk/installer
VBOX_INSTALL_PATH=%{_libdir}/virtualbox \
%{__python2} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
-VBOX_INSTALL_PATH=%{_libdir}/virtualbox \
- %{__python3} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
popd
-
-# SDK
cp -rp obj/bin/sdk/. %{buildroot}%{_libdir}/virtualbox/sdk
rm -rf %{buildroot}%{_libdir}/virtualbox/sdk/installer
@@ -587,7 +571,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/virtualbox.desktop
# vboxautostart-service
install -d %{buildroot}%{_libdir}/virtualbox/rdesktop-vrdp-keymaps
-install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox/rdesktop-vrdp-keymaps obj/bin/rdesktop-vrdp-keymaps/*
+install -D obj/bin/rdesktop-vrdp-keymaps/* %{buildroot}%{_libdir}/virtualbox/rdesktop-vrdp-keymaps
install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox obj/bin/rdesktop-vrdp.tar.gz
install -p -m 0755 -t %{buildroot}%{_bindir} obj/bin/rdesktop-vrdp
@@ -765,16 +749,14 @@ getent passwd vboxadd >/dev/null || \
%files devel
%{_libdir}/virtualbox/sdk
+%exclude %{_libdir}/virtualbox/sdk/bindings/xpcom/python
%files -n python2-%{name}
%{_libdir}/virtualbox/*.py*
+%{python2_sitelib}/virtualbox
%{python2_sitelib}/vboxapi*
%{_libdir}/virtualbox/VBoxPython2_7.so
-
-%files -n python3-%{name}
-%{_libdir}/virtualbox/*.py*
-%{python3_sitelib}/vboxapi*
-%{_libdir}/virtualbox/VBoxPython3*.so
+%{_libdir}/virtualbox/sdk/bindings/xpcom/python
%if %{with guest_additions}
%files guest-additions
@@ -802,12 +784,6 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
-* Mon Jan 07 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.0-2
-- Enable Python3 support, move all SDK python files to devel sub-package, they
- may be used by python2 and 3.
-- Add patch VBoxVNC.fix.patch from Debian
-- Issue with EXTPACK_VBOXDTRACE was fix some time ago.
-
* Sun Dec 30 2018 Sérgio Basto <sergio(a)serjux.com> - 6.0.0-1
- VirtualBox 6.0
- Patch23 was applied upstream.
5 years, 10 months
[xpra-codecs-freeworld] Update to 2.4.3
by Antonio
commit 66a81e8fede13857ecf3e30c776d18cd25a9ff0c
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Jan 17 17:50:55 2019 +0100
Update to 2.4.3
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f27241b..f1e5324 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ xpra-0.16.3.tar.xz
/xpra-2.4.tar.xz
/xpra-2.4.1.tar.xz
/xpra-2.4.2.tar.xz
+/xpra-2.4.3.tar.xz
diff --git a/sources b/sources
index 348b87d..d376e20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f007f05e50d80e625bd69668d912fb76 xpra-2.4.2.tar.xz
+c35cea9a2e11435ca7708de478cfa541 xpra-2.4.3.tar.xz
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 15874a9..f1f5d78 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -35,7 +35,7 @@
%endif
Name: xpra-codecs-freeworld
-Version: 2.4.2
+Version: 2.4.3
Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
@@ -130,6 +130,9 @@ find %{buildroot}%{pythonx_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Thu Jan 17 2019 Antonio Trande <sagitter(a)fedoraproject.org> - 2.4.3-1
+- Update to 2.4.3
+
* Sat Nov 24 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.4.2-1
- Update to 2.4.2
5 years, 10 months
[VirtualBox-kmod/f29] Update to 5.2.24.
by Vasiliy Glazov
commit dbaa4403f5aae1d12aaee0b38e2917f1dcab9bd1
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Thu Jan 17 16:51:33 2019 +0300
Update to 5.2.24.
VirtualBox-kmod.spec | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 5a4fe49..a46fd36 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -39,19 +39,17 @@
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
-Version: 5.2.22
+Version: 5.2.24
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Release: 1%{?dist}
Summary: Kernel module for VirtualBox
-Group: System Environment/Kernel
License: GPLv2 or CDDL
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
Source2: https://github.com/jwrdegoede/vboxsf/archive/master.zip
-#Patch1: kernel-4.18.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
5 years, 10 months
[VirtualBox/f29] Update to 5.2.24.
by Vasiliy Glazov
commit 2ea721aba4588c0d3503be9a48dea664a5895c46
Author: Vasiliy Glazov <v.glazov(a)javad.com>
Date: Thu Jan 17 16:34:50 2019 +0300
Update to 5.2.24.
.gitignore | 1 +
VirtualBox-5.0.18-xserver_guest.patch | 54 ---------
VirtualBox-5.1.0-add-Mageia-support.patch | 16 ---
VirtualBox-5.2.24-xpcom18a4-fix.patch | 12 ++
VirtualBox.spec | 13 +-
fixes_for_4.20.patch | 193 ------------------------------
sources | 2 +-
7 files changed, 21 insertions(+), 270 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d50a20c..d719926 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ VirtualBox-5.0.16.tar.bz2
/VirtualBox-5.2.18.tar.bz2
/VirtualBox-5.2.20.tar.bz2
/VirtualBox-5.2.22.tar.bz2
+/VirtualBox-5.2.24.tar.bz2
diff --git a/VirtualBox-5.1.0-add-Mageia-support.patch b/VirtualBox-5.1.0-add-Mageia-support.patch
index 9e9682b..3efb046 100644
--- a/VirtualBox-5.1.0-add-Mageia-support.patch
+++ b/VirtualBox-5.1.0-add-Mageia-support.patch
@@ -40,22 +40,6 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIcon
m_guestOSTypeIconNames.insert("Mandriva", ":/os_mandriva.png");
m_guestOSTypeIconNames.insert("Mandriva_64", ":/os_mandriva_64.png");
m_guestOSTypeIconNames.insert("RedHat", ":/os_redhat.png");
-diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
---- VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2017-12-19 09:27:51.000000000 +0000
-+++ VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2018-01-16 01:33:36.647056070 +0000
-@@ -138,8 +138,10 @@ static const osTypePattern gs_OSTypePatt
- { QRegExp("Fe.*32", Qt::CaseInsensitive), "Fedora" },
- { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
- { QRegExp("((Gen)|(Sab)).*32", Qt::CaseInsensitive), "Gentoo" },
-- { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
-- { QRegExp("((Man)|(Mag)).*32", Qt::CaseInsensitive), "Mandriva" },
-+ { QRegExp("Mag.*64", Qt::CaseInsensitive), "Mageia_64" },
-+ { QRegExp("Mag", Qt::CaseInsensitive), "Mageia" },
-+ { QRegExp("Man.*64", Qt::CaseInsensitive), "Mandriva_64" },
-+ { QRegExp("Man", Qt::CaseInsensitive), "Mandriva" },
- { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
- { QRegExp("((Red)|(rhel)|(cen)).*32", Qt::CaseInsensitive), "RedHat" },
- { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc
--- VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2017-12-19 09:27:33.000000000 +0000
+++ VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2018-01-16 01:33:36.653056131 +0000
diff --git a/VirtualBox-5.2.24-xpcom18a4-fix.patch b/VirtualBox-5.2.24-xpcom18a4-fix.patch
new file mode 100644
index 0000000..9822ae2
--- /dev/null
+++ b/VirtualBox-5.2.24-xpcom18a4-fix.patch
@@ -0,0 +1,12 @@
+Index: trunk/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+===================================================================
+--- a/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
++++ b/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+@@ -441,5 +441,6 @@
+ char *tempResult = PyString_AsString(obResult);
+ #else
+- char *tempResult = PyUnicode_AsUTF8(obResult);
++ /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */
++ const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult);
+ #endif
+ result = (char *)PyMem_Malloc(strlen(tempResult)+1);
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 4f502bf..eb1e49a 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -36,7 +36,7 @@
%endif
Name: VirtualBox
-Version: 5.2.22
+Version: 5.2.24
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -46,7 +46,6 @@ URL: http://www.virtualbox.org/wiki/VirtualBox
ExclusiveArch: i686 x86_64
-Group: System/Emulators/PC
Requires: %{name}-server%{?isa} = %{version}
Obsoletes: %{name}-qt
@@ -64,7 +63,6 @@ Source21: os_mageia_64.png
Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
Patch2: VirtualBox-5.1.0-strings.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
-Patch23: VirtualBox-5.0.18-xserver_guest.patch
Patch27: VirtualBox-gcc.patch
# from Debian
Patch28: 02-gsoap-build-fix.patch
@@ -74,7 +72,8 @@ Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
# from Fedora
Patch60: VirtualBox-5.2.10-xclient.patch
Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
-Patch70: fixes_for_4.20.patch
+# https://www.virtualbox.org/changeset/73153/vbox
+Patch65: VirtualBox-5.2.24-xpcom18a4-fix.patch
BuildRequires: kBuild >= 0.1.9998.r3093
@@ -274,7 +273,6 @@ rm -r src/libs/zlib-1.2.8/
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch18 -p1 -b .aiobug
-%patch23 -p1 -b .xserver_guest
#patch27 -p1 -b .gcc
%if 0%{?fedora} > 20
%patch28 -p1 -b .gsoap2
@@ -283,7 +281,7 @@ rm -r src/libs/zlib-1.2.8/
%patch51 -p1 -b .revert-VBox.sh
%patch60 -p1 -b .xclient
%patch61 -p1 -b .automount
-%patch70 -p1 -b .kernel_4.20.patch
+%patch65 -p1 -b .xpcom18a4-fix
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -777,6 +775,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Thu Jan 17 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 5.2.24-1
+- Update to 5.2.24
+
* Fri Nov 09 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.22-1
- Update VBox to 5.2.22
- Reenable noupdate.patch
diff --git a/sources b/sources
index 343ea52..74770f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c9c2f162ac5f99d28d8c0ca43b19ed01 VirtualBox-5.2.22.tar.bz2
+798c39b9fc84b826e99a1b0b19a650dd VirtualBox-5.2.24.tar.bz2
5 years, 10 months
[nvidia-kmod] Patch for 5.0rc kernel
by Leigh Scott
commit 21aa249d95c31c79a353f30a08cbf3cd8bdb63bc
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Jan 17 12:22:08 2019 +0000
Patch for 5.0rc kernel
5.0_kernel.patch | 258 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-kmod.spec | 7 +-
2 files changed, 264 insertions(+), 1 deletion(-)
---
diff --git a/5.0_kernel.patch b/5.0_kernel.patch
new file mode 100644
index 0000000..f82c66b
--- /dev/null
+++ b/5.0_kernel.patch
@@ -0,0 +1,258 @@
+--- a/kernel/nvidia-drm/nvidia-drm-gem.h
++++ b/kernel/nvidia-drm/nvidia-drm-gem.h
+@@ -23,6 +23,7 @@
+ #ifndef __NVIDIA_DRM_GEM_H__
+ #define __NVIDIA_DRM_GEM_H__
+
++#include <linux/version.h>
+ #include "nvidia-drm-conftest.h"
+
+ #if defined(NV_DRM_AVAILABLE)
+@@ -78,9 +79,11 @@
+ int ret = drm_gem_handle_create(file_priv, &nv_gem->base, handle);
+
+ /* drop reference from allocate - handle holds it now */
+-
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+ drm_gem_object_unreference_unlocked(&nv_gem->base);
+-
++#else
++ drm_gem_object_put_unlocked(&nv_gem->base);
++#endif
+ return ret;
+ }
+
+@@ -148,13 +151,21 @@
+ static inline void
+ nv_drm_gem_object_unreference_unlocked(struct nv_drm_gem_object *nv_gem)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+ drm_gem_object_unreference_unlocked(&nv_gem->base);
++#else
++ drm_gem_object_put_unlocked(&nv_gem->base);
++#endif
+ }
+
+ static inline void
+ nv_drm_gem_object_unreference(struct nv_drm_gem_object *nv_gem)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+ drm_gem_object_unreference(&nv_gem->base);
++#else
++ drm_gem_object_put(&nv_gem->base);
++#endif
+ }
+
+ static inline int nv_drm_gem_handle_create(struct drm_file *filp,
+
+--- a/kernel/nvidia-drm/nvidia-drm-helper.h
++++ b/kernel/nvidia-drm/nvidia-drm-helper.h
+@@ -23,6 +23,7 @@
+ #ifndef __NVIDIA_DRM_HELPER_H__
+ #define __NVIDIA_DRM_HELPER_H__
+
++#include <linux/version.h>
+ #include "nvidia-drm-conftest.h"
+
+ #if defined(NV_DRM_AVAILABLE)
+@@ -39,7 +40,11 @@
+ #if defined(NV_DRM_DEV_UNREF_PRESENT)
+ drm_dev_unref(dev);
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+ drm_dev_free(dev);
++#else
++ drm_dev_put(dev);
++#endif
+ #endif
+ }
+
+
+--- a/kernel/nvidia-drm/nvidia-drm-helper.c
++++ b/kernel/nvidia-drm/nvidia-drm-helper.c
+@@ -27,6 +27,7 @@
+ * present simplifies nvidia-drm.ko source.
+ */
+
++#include <linux/version.h>
+ #include "nvidia-drm-helper.h"
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+@@ -149,12 +150,21 @@
+ if (ret == 0) {
+ struct drm_framebuffer *new_fb = plane->state->fb;
+ if (new_fb)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+ drm_framebuffer_reference(new_fb);
+ plane->fb = new_fb;
+ plane->crtc = plane->state->crtc;
+
+ if (plane->old_fb)
+ drm_framebuffer_unreference(plane->old_fb);
++#else
++ drm_framebuffer_get(new_fb);
++ plane->fb = new_fb;
++ plane->crtc = plane->state->crtc;
++
++ if (plane->old_fb)
++ drm_framebuffer_put(plane->old_fb);
++#endif
+ }
+ plane->old_fb = NULL;
+ }
+
+--- a/kernel/nvidia/os-interface.c
++++ b/kernel/nvidia/os-interface.c
+@@ -11,6 +11,7 @@
+ #define __NO_VERSION__
+ #include "nv-misc.h"
+
++#include <linux/version.h>
+ #include "os-interface.h"
+ #include "nv-linux.h"
+
+@@ -19,6 +20,19 @@
+ nv_spinlock_t nv_error_string_lock;
+
+ extern nv_linux_state_t nv_ctl_device;
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
++static void
++do_gettimeofday(struct timeval *tm)
++{
++ struct timespec64 ts;
++
++ ktime_get_real_ts64(&ts);
++
++ tm->tv_sec = ts.tv_sec;
++ tm->tv_usec = ts.tv_nsec/1000;
++}
++#endif
+
+ NV_STATUS NV_API_CALL os_disable_console_access(void)
+ {
+
+--- a/kernel/nvidia/nvlink_linux.c
++++ b/kernel/nvidia/nvlink_linux.c
+@@ -30,6 +30,7 @@
+ #include "nv-linux.h"
+ #include "nv-procfs.h"
+
++#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/major.h>
+ #include <linux/cdev.h>
+@@ -541,6 +542,19 @@
+ result->tv_usec += 1000000;
+ }
+ }
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
++static void
++do_gettimeofday(struct timeval *tm)
++{
++ struct timespec64 ts;
++
++ ktime_get_real_ts64(&ts);
++
++ tm->tv_sec = ts.tv_sec;
++ tm->tv_usec = ts.tv_nsec/1000;
++}
++#endif
+
+ /*
+ * Sleep for specified milliseconds. Yields the CPU to scheduler.
+
+--- a/kernel/nvidia-drm/nvidia-drm-linux.c
++++ b/kernel/nvidia-drm/nvidia-drm-linux.c
+@@ -20,6 +20,7 @@
+ * DEALINGS IN THE SOFTWARE.
+ */
+
++#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/slab.h>
+ #include <linux/err.h>
+@@ -149,6 +150,19 @@
+ vunmap(address);
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
++static void
++do_gettimeofday(struct timeval *tm)
++{
++ struct timespec64 ts;
++
++ ktime_get_real_ts64(&ts);
++
++ tm->tv_sec = ts.tv_sec;
++ tm->tv_usec = ts.tv_nsec/1000;
++}
++#endif
++
+ uint64_t nv_drm_get_time_usec(void)
+ {
+ struct timeval tv;
+
+--- a/kernel/nvidia-modeset/nvidia-modeset-linux.c
++++ b/kernel/nvidia-modeset/nvidia-modeset-linux.c
+@@ -8,6 +8,7 @@
+ * _NVRM_COPYRIGHT_END_
+ */
+
++#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+@@ -207,6 +208,19 @@
+ msleep(msec);
+ }
+ }
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
++static void
++do_gettimeofday(struct timeval *tm)
++{
++ struct timespec64 ts;
++
++ ktime_get_real_ts64(&ts);
++
++ tm->tv_sec = ts.tv_sec;
++ tm->tv_usec = ts.tv_nsec/1000;
++}
++#endif
+
+ NvU64 NVKMS_API_CALL nvkms_get_usec(void)
+ {
+
+--- a/kernel/nvidia-uvm/uvm_linux.h
++++ b/kernel/nvidia-uvm/uvm_linux.h
+@@ -32,6 +32,7 @@
+ #ifndef _UVM_LINUX_H
+ #define _UVM_LINUX_H
+
++#include <linux/version.h>
+ #include "nv-misc.h"
+ #include "nvtypes.h"
+
+@@ -332,11 +333,19 @@
+ * available non-GPL symbols. */
+ static inline NvU64 NV_GETTIME(void)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+ struct timeval tv = {0};
+
+ do_gettimeofday(&tv);
+
+ return (tv.tv_sec * 1000000000ULL + tv.tv_usec * 1000ULL);
++#else
++ struct timespec64 tv;
++
++ ktime_get_real_ts64(&tv);
++
++ return (tv.tv_sec * 1000000000ULL + tv.tv_nsec);
++#endif
+ }
+ #endif
+
+
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 8ed721a..9b85a57 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -10,12 +10,13 @@ Name: nvidia-kmod
Epoch: 3
Version: 415.27
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
+Patch0: 5.0_kernel.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: x86_64
@@ -39,6 +40,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterf
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# patch loop
+%patch0 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -66,6 +68,9 @@ done
%changelog
+* Thu Jan 17 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.27-3
+- Patch for 5.0rc kernel
+
* Wed Jan 16 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.27-1
- Update to 415.27 release
5 years, 10 months
[vlc/el7: 3/3] Merge branch 'master' into el7
by Nicolas Chauvet
commit ae16e2b589952acdf5ae4ee437c8e7b3f2c61ea5
Merge: 7c73642 43e0e04
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jan 17 12:36:41 2019 +0100
Merge branch 'master' into el7
vlc.spec | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
---
5 years, 10 months
[vlc/el7] (3 commits) ...Merge branch 'master' into el7
by Nicolas Chauvet
Summary of changes:
b02fbfc... Update main/core packaging split (*)
43e0e04... Update changelog (*)
ae16e2b... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
5 years, 10 months
[vlc/f28: 3/3] Merge branch 'master' into f28
by Nicolas Chauvet
commit 0d9f316733c6065338eac5d5e33dbb693cb40cb1
Merge: 135e35d 43e0e04
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jan 17 12:36:17 2019 +0100
Merge branch 'master' into f28
vlc.spec | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
---
5 years, 10 months
