[dvdstyler] Move to wxGTK3 as request in rfbz#5068
by Sérgio M. Basto
commit 456d65f9532ff5ec2cec2cbbb95b09c6be02234f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Dec 25 20:51:42 2018 +0000
Move to wxGTK3 as request in rfbz#5068
dvdstyler.spec | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/dvdstyler.spec b/dvdstyler.spec
index fcf27e8..156cb05 100644
--- a/dvdstyler.spec
+++ b/dvdstyler.spec
@@ -1,11 +1,11 @@
#global prerel_real .beta3
#global prerel b2
-%global wxsvg_ver 1.5.12
+%global wxsvg_ver 1.5.15
Name: dvdstyler
Epoch: 1
Version: 3.0.4
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Cross-platform DVD authoring application
Group: Applications/Multimedia
@@ -16,10 +16,11 @@ Patch1: dvdstyler-wxwin.m4.patch
Patch2: ffmpeg35_buildfix.patch
# build
BuildRequires: automake autoconf
+BuildRequires: gcc-c++
BuildRequires: gettext
BuildRequires: byacc
# libraries
-BuildRequires: compat-wxGTK3-gtk2-devel >= 3.0
+BuildRequires: wxGTK3-devel >= 3.0
# wxsvg version with wxGTK3
BuildRequires: wxsvg-devel >= %{wxsvg_ver}
BuildRequires: ffmpeg-devel
@@ -44,6 +45,7 @@ Requires: dvd+rw-tools
Requires: dvdauthor
Requires: mjpegtools
Requires: genisoimage
+Requires: dvdisaster
# wxsvg version with wxGTK3
Requires: wxsvg >= %{wxsvg_ver}
# note: do not add Require: totem-backend or another DVD player - see
@@ -57,7 +59,7 @@ create navigational DVD menus similar to those found on most commercial DVDs.
%prep
%setup -q -n DVDStyler-%{version}%{?prerel}
-%patch1 -p1
+#patch1 -p1
%patch2 -p1
#{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
@@ -65,16 +67,16 @@ create navigational DVD menus similar to those found on most commercial DVDs.
rm -f install-sh depcomp missing mkinstalldirs compile config.guess config.sub install-sh
rm -f aclocal.m4 Makefile.in
#rm -f m4_ax_cxx_compile_stdcxx.m4 m4_ax_cxx_compile_stdcxx.m4 wxwin.m4
-touch NEWS
-#./autogen.sh
-sed -i 's/WX_CONFIG_CHECK.\[3.0\]/WX_CONFIG_CHECK([3.0.0]/' configure.ac
-autoreconf -i
+#touch NEWS
+./autogen.sh
+#sed -i 's/WX_CONFIG_CHECK.\[3.0\]/WX_CONFIG_CHECK([3.0.0]/' configure.ac
+#autoreconf -i
#sed -i 's/min_wx_version=3.0/min_wx_version=3.0.0/' configure
%configure \
--disable-dependency-tracking \
- %if (0%{?fedora} && 0%{?fedora} < 28)
- --with-wx-config=/usr/bin/wx-config-3.0-gtk2 \
- %endif
+# %if (0%{?fedora} && 0%{?fedora} < 28)
+# --with-wx-config=/usr/bin/wx-config-3.0-gtk2 \
+# %endif
# docs folder is not smp_mflags safe
make -C docs
@@ -105,6 +107,9 @@ desktop-file-install \
%{_mandir}/*/*.gz
%changelog
+* Tue Dec 25 2018 Sérgio Basto <sergio(a)serjux.com> - 1:3.0.4-6
+- Move to wxGTK3 as request in rfbz#5068
+
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:3.0.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
5 years, 4 months
[wxsvg] Add BuildRequires: gcc-c++
by Sérgio M. Basto
commit d8f053d8e678d176fbd7b505e47fe9d3d59bf1c6
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Dec 25 19:08:30 2018 +0000
Add BuildRequires: gcc-c++
wxsvg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/wxsvg.spec b/wxsvg.spec
index 08f3e30..dbccb69 100644
--- a/wxsvg.spec
+++ b/wxsvg.spec
@@ -9,6 +9,7 @@ URL: http://sourceforge.net/projects/wxsvg
Source0: http://downloads.sourceforge.net/wxsvg/wxsvg-%{version}.tar.bz2
Patch1: wxsvg-wxwin.m4.patch
BuildRequires: autoconf automake libtool gettext
+BuildRequires: gcc-c++
BuildRequires: expat-devel
BuildRequires: ffmpeg-devel
BuildRequires: freetype-devel
5 years, 4 months
[wxsvg] Update to 1.5.15 Move to wxGTK3 as request in rfbz#5068
by Sérgio M. Basto
commit 7f27d14cfab1d2a83861b7414a8bd7a1807c2523
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Dec 25 18:06:40 2018 +0000
Update to 1.5.15
Move to wxGTK3 as request in rfbz#5068
.gitignore | 1 +
sources | 2 +-
wxsvg.spec | 20 +++++++++++---------
3 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bafec0a..01f395d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ wxsvg-1.5.5.tar.bz2
/wxsvg-1.5.10.tar.bz2
/wxsvg-1.5.11.tar.bz2
/wxsvg-1.5.12.tar.bz2
+/wxsvg-1.5.15.tar.bz2
diff --git a/sources b/sources
index 39b019e..b30797d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c822e0b7ea4a690b30e7b6711ce674fd wxsvg-1.5.12.tar.bz2
+e4834ccd4a077f0d3ef7c85931624957 wxsvg-1.5.15.tar.bz2
diff --git a/wxsvg.spec b/wxsvg.spec
index 7f9010f..08f3e30 100644
--- a/wxsvg.spec
+++ b/wxsvg.spec
@@ -1,6 +1,6 @@
Name: wxsvg
-Version: 1.5.12
-Release: 7%{?dist}
+Version: 1.5.15
+Release: 1%{?dist}
Summary: C++ library to create, manipulate and render SVG files
Group: System Environment/Libraries
@@ -14,7 +14,7 @@ BuildRequires: ffmpeg-devel
BuildRequires: freetype-devel
BuildRequires: libart_lgpl-devel
BuildRequires: pango-devel
-BuildRequires: compat-wxGTK3-gtk2-devel
+BuildRequires: wxGTK3-devel
BuildRequires: libexif-devel
%description
@@ -30,7 +30,8 @@ provides the files required to develop programs that use wxsvg.
%prep
%setup -q
-%patch1 -p1
+# IIRC we just need patch1 if we use compat-wxGTK3-gtk2
+#patch1 -p1
%build
#clean autogenerated files before run autoreconf
@@ -39,18 +40,15 @@ rm m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
autoreconf -i
%configure \
--disable-dependency-tracking \
- %if (0%{?fedora} && 0%{?fedora} < 28)
- --with-wx-config=/usr/bin/wx-config-3.0-gtk2 \
- %endif
--disable-static
%{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
%{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-%{__make} %{?_smp_mflags}
+%make_build
%install
-%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+%make_install
# Get rid of those .la files
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -72,6 +70,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_libdir}/pkgconfig/lib%{name}.pc
%changelog
+* Tue Dec 25 2018 Sérgio Basto <sergio(a)serjux.com> - 1.5.15-1
+- Update to 1.5.15
+- Move to wxGTK3 as request in rfbz#5068
+
* Sun Aug 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.5.12-7
- Rebuilt for Fedora 29 Mass Rebuild binutils issue
5 years, 4 months
[kodi/f29] Upload patches
by Michael Cronenworth
Summary of changes:
592fc0d... Upload patches (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 4 months
[kodi] Upload patches
by Michael Cronenworth
commit 592fc0d35f889f0f5d4ff80ec1c21928a9f24e71
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Dec 25 12:06:35 2018 -0600
Upload patches
kodi-18-rc3-cxx-assertions.patch | 66 ++++++++++++++++++++++++++++++++++++++++
kodi-18-rc3-cxx-debug.patch | 42 +++++++++++++++++++++++++
2 files changed, 108 insertions(+)
---
diff --git a/kodi-18-rc3-cxx-assertions.patch b/kodi-18-rc3-cxx-assertions.patch
new file mode 100644
index 0000000..301c982
--- /dev/null
+++ b/kodi-18-rc3-cxx-assertions.patch
@@ -0,0 +1,66 @@
+From 9605e2ff352b0785c52ac135b35b1ed914b57e21 Mon Sep 17 00:00:00 2001
+From: Philipp Kerling <pkerling(a)casix.org>
+Date: Fri, 21 Dec 2018 11:15:43 +0100
+Subject: [PATCH] [guilib] Fix out-of-bounds vector access when "drawing" empty
+ text
+
+If the text to draw is empty, the vertex vector in CGUIFontTTFBase::
+DrawTextInternal stays empty and is handed like that to the lib-specific
+functions which might not handle that. Specifically, CGUIFontTTFGL::
+CreateVertexBuffer accessed the vertex vector without bounds checking
+(detected by `-D_GLIBCXX_ASSERTIONS`). As there is nothing to do for
+drawing an empty text anyway, just bail out early.
+Also add some extra checking to be safe in the future.
+---
+ xbmc/guilib/GUIFontTTF.cpp | 5 +++++
+ xbmc/guilib/GUIFontTTFGL.cpp | 7 ++++++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/xbmc/guilib/GUIFontTTF.cpp b/xbmc/guilib/GUIFontTTF.cpp
+index acad2fcb76f3..906db44dadff 100644
+--- a/xbmc/guilib/GUIFontTTF.cpp
++++ b/xbmc/guilib/GUIFontTTF.cpp
+@@ -352,6 +352,11 @@ void CGUIFontTTFBase::End()
+
+ void CGUIFontTTFBase::DrawTextInternal(float x, float y, const std::vector<UTILS::Color> &colors, const vecText &text, uint32_t alignment, float maxPixelWidth, bool scrolling)
+ {
++ if (text.empty())
++ {
++ return;
++ }
++
+ Begin();
+
+ uint32_t rawAlignment = alignment;
+diff --git a/xbmc/guilib/GUIFontTTFGL.cpp b/xbmc/guilib/GUIFontTTFGL.cpp
+index db51eb4bdd7d..f87afae0afac 100644
+--- a/xbmc/guilib/GUIFontTTFGL.cpp
++++ b/xbmc/guilib/GUIFontTTFGL.cpp
+@@ -23,6 +23,8 @@
+ #endif
+ #include "rendering/MatrixGL.h"
+
++#include <cassert>
++
+ // stuff for freetype
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+@@ -280,6 +282,9 @@ void CGUIFontTTFGL::LastEnd()
+
+ CVertexBuffer CGUIFontTTFGL::CreateVertexBuffer(const std::vector<SVertex> &vertices) const
+ {
++ assert(!vertices.empty());
++ assert(vertices.size() % 4 == 0);
++
+ // Generate a unique buffer object name and put it in bufferHandle
+ GLuint bufferHandle;
+ glGenBuffers(1, &bufferHandle);
+@@ -288,7 +293,7 @@ CVertexBuffer CGUIFontTTFGL::CreateVertexBuffer(const std::vector<SVertex> &vert
+ // Create a data store for the buffer object bound to the GL_ARRAY_BUFFER
+ // binding point (i.e. our buffer object) and initialise it from the
+ // specified client-side pointer
+- glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof (SVertex), &vertices[0], GL_STATIC_DRAW);
++ glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof (SVertex), vertices.data(), GL_STATIC_DRAW);
+ // Unbind GL_ARRAY_BUFFER
+ glBindBuffer(GL_ARRAY_BUFFER, 0);
+
diff --git a/kodi-18-rc3-cxx-debug.patch b/kodi-18-rc3-cxx-debug.patch
new file mode 100644
index 0000000..4f24eae
--- /dev/null
+++ b/kodi-18-rc3-cxx-debug.patch
@@ -0,0 +1,42 @@
+From b3cd094fc4cf5386d76541ba159bbac438a3c715 Mon Sep 17 00:00:00 2001
+From: Philipp Kerling <pkerling(a)casix.org>
+Date: Fri, 21 Dec 2018 11:18:13 +0100
+Subject: [PATCH] [wayland] Fix unsafe iterator copy
+
+Copying the buffer iterator like this is actually unsafe since it might
+get invalidated by a later modification of the `std::set`. Instead,
+use the C pointer for lookup.
+
+Found with `-D_GLIBCXX_DEBUG`
+---
+ xbmc/windowing/wayland/WindowDecorator.cpp | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/xbmc/windowing/wayland/WindowDecorator.cpp b/xbmc/windowing/wayland/WindowDecorator.cpp
+index 874aaff13bcf..a44c6357b743 100644
+--- a/xbmc/windowing/wayland/WindowDecorator.cpp
++++ b/xbmc/windowing/wayland/WindowDecorator.cpp
+@@ -967,10 +967,21 @@ void CWindowDecorator::CommitAllBuffers()
+ if (emplaceResult.second)
+ {
+ // Buffer was not pending already
+- auto iter = emplaceResult.first;
+- wlBuffer.on_release() = [this, iter]()
++ auto wlBufferC = reinterpret_cast<wl_buffer*> (wlBuffer.c_ptr());
++ // We can refer to the buffer neither by iterator (might be invalidated) nor by
++ // capturing the C++ instance in the lambda (would create a reference loop and
++ // never allow the object to be freed), so use the raw pointer for now
++ wlBuffer.on_release() = [this, wlBufferC]()
+ {
+ CSingleLock lock(m_pendingBuffersMutex);
++ // Construct a dummy object for searching the set
++ wayland::buffer_t findDummy(wlBufferC, wayland::proxy_t::wrapper_type::foreign);
++ auto iter = m_pendingBuffers.find(findDummy);
++ if (iter == m_pendingBuffers.end())
++ {
++ throw std::logic_error("Cannot release buffer that is not pending");
++ }
++
+ // Do not erase again until buffer is reattached (should not happen anyway, just to be safe)
+ // const_cast is OK since changing the function pointer does not affect
+ // the key in the set
5 years, 4 months
[kodi] Add upstream patches to fix a few crashers
by Michael Cronenworth
commit 0b724d402174925f57a2523e77fad19564724c3d
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Dec 25 11:53:56 2018 -0600
Add upstream patches to fix a few crashers
kodi.spec | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/kodi.spec b/kodi.spec
index 66f3bee..371e0a4 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -30,7 +30,7 @@
Name: kodi
Version: 18.0
-Release: 0.21.rc3%{?dist}
+Release: 0.22.rc3%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -67,6 +67,11 @@ Patch1: kodi-18.0-versioning.patch
# Prevent trousers from being linked, which breaks Samba
Patch2: kodi-18-trousers.patch
+# Fix a few crashers due to Fedora c++ compiler flags. Will be included in rc4 / final.
+# https://github.com/xbmc/xbmc/pull/15104
+Patch100: kodi-18-rc3-cxx-assertions.patch
+Patch101: kodi-18-rc3-cxx-debug.patch
+
%ifarch x86_64 i686
%global _with_crystalhd 1
%endif
@@ -334,6 +339,8 @@ This package contains the Kodi binary for X11 servers.
%setup -q -n %{name}-%{DIRVERSION}
%patch1 -p1 -b.versioning
%patch2 -p1 -b.trousers
+%patch100 -p1 -b.cxx-assertions
+%patch101 -p1 -b.cxx-debug
# Fix up Python shebangs
pathfix.py -pni "%{__python2} %{py2_shbang_opts}" \
tools/EventClients/lib/python/zeroconf.py \
@@ -481,6 +488,9 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/
%changelog
+* Tue Dec 25 2018 Michael Cronenworth <mike(a)cchtml.com> - 18.0-0.22.rc3
+- Add upstream patches to fix a few crashers
+
* Sun Dec 16 2018 Michael Cronenworth <mike(a)cchtml.com> - 18.0-0.21.rc3
- Kodi 18.0 RC3
5 years, 4 months
[mixxx] New upstream release 2.2.0
by Uwe Klotz
Summary of changes:
1d719b7... New upstream release 2.2.0 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 4 months
[mixxx/f29] New upstream release 2.2.0
by Uwe Klotz
commit 1d719b7c01a111988619ba3e7e9ffd5981d5caad
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Mon Dec 24 19:57:09 2018 +0100
New upstream release 2.2.0
.gitignore | 2 +-
mixxx.spec | 11 +++++++----
sources | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6cc695a..89b660d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mixxx-bd4218904e6a0be00d9c0ff614903677bdd3ee87.tar.gz
+/mixxx-release-2.2.0.tar.gz
diff --git a/mixxx.spec b/mixxx.spec
index e0ac4be..8389f8d 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -1,10 +1,10 @@
# Optional: Package version suffix for pre-releases, e.g. "beta" or "rc"
-%global extraver rc
+#global extraver rc
# Optional: Only used for untagged snapshot versions
-%global gitcommit bd4218904e6a0be00d9c0ff614903677bdd3ee87
+#global gitcommit d9d7ea6404de71c86beacfc86f9087dc8db0fc58
# Format: <yyyymmdd>
-%global gitcommitdate 20181212
+#global gitcommitdate 20181224
%if "%{?gitcommit}" == ""
# (Pre-)Releases
@@ -17,7 +17,7 @@
Name: mixxx
Version: 2.2.0
-Release: 0.7%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
@@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Mon Dec 24 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.0-1
+- New upstream release 2.2.0
+
* Wed Dec 12 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.0-0.7.rc.20181212gitbd42189
- 7th upstream release candidate snapshot for 2.2.0
- Remove remaining Qt4 dependencies (QtKeychain)
diff --git a/sources b/sources
index 808ccce..f6b3f18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ce6762023cb28c72b094ad648cd0071 mixxx-bd4218904e6a0be00d9c0ff614903677bdd3ee87.tar.gz
+8b6b2afd1f7bfe6ae90ad17155199925 mixxx-release-2.2.0.tar.gz
5 years, 4 months
[nvidia-390xx-kmod] Build fix for 4.20 kernel (untested)
by Leigh Scott
commit 17e4eb48b8e11b8638233e1cb5aad2ec32c695cc
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Mon Dec 24 08:55:07 2018 +0000
Build fix for 4.20 kernel (untested)
4.20_kernel.patch | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-390xx-kmod.spec | 7 ++++++-
2 files changed, 63 insertions(+), 1 deletion(-)
---
diff --git a/4.20_kernel.patch b/4.20_kernel.patch
new file mode 100644
index 0000000..546ea5a
--- /dev/null
+++ b/4.20_kernel.patch
@@ -0,0 +1,57 @@
+--- a/kernel/nvidia/os-interface.c
++++ b/kernel/nvidia/os-interface.c
+@@ -13,6 +13,7 @@
+
+ #include "os-interface.h"
+ #include "nv-linux.h"
++#include <linux/version.h>
+
+ #include "nv-gpu-numa.h"
+
+@@ -1697,7 +1698,11 @@ void NV_API_CALL os_free_pages_phys
+
+ struct nv_ipmi_softc
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+ ipmi_user_t p_user; // ptr to ipmi_msghandler user structure
++#else
++ struct ipmi_user *p_user;
++#endif
+ spinlock_t msg_lock;
+ struct list_head msgs;
+ NvU32 seqNum; //request sequence number
+@@ -1706,7 +1711,11 @@ struct nv_ipmi_softc
+ static inline int
+ nv_ipmi_set_my_address
+ (
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+ ipmi_user_t user,
++#else
++ struct ipmi_user *user,
++#endif
+ unsigned char address
+ )
+ {
+--- a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
++++ b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
+@@ -20,6 +20,8 @@
+ * DEALINGS IN THE SOFTWARE.
+ */
+
++#include <linux/version.h>
++
+ #include "nvidia-drm-conftest.h"
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+@@ -237,7 +239,11 @@ static int __nv_drm_vma_fault(struct vm_
+
+ page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+ ret = vm_insert_pfn(vma, address, pfn + page_offset);
++#else
++ ret = vmf_insert_pfn(vma, address, pfn + page_offset);
++#endif
+
+ switch (ret) {
+ case 0:
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index 5e4c14d..74125f1 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-390xx-kmod
Epoch: 3
Version: 390.87
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA 390xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -20,6 +20,7 @@ Source11: nvidia-390xx-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: nv-linux-arm2.patch
Patch2: 4.19_kernel.patch
+Patch3: 4.20_kernel.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64 armv7hl
@@ -46,6 +47,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -73,6 +75,9 @@ done
%changelog
+* Mon Dec 24 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.87-4
+- Build fix for 4.20 kernel (untested)
+
* Thu Oct 25 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3:390.87-3
- Drop obsoletes nvidia-kmod
5 years, 4 months