[cinelerra-gg] Fix all interdependency tests, enable pulseaudio
by Frank R Dana
commit d244ca8b6e90cd855bebc57f99de2c852210ec69
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Tue Jul 7 21:22:03 2020 -0400
Fix all interdependency tests, enable pulseaudio
0001-Fix-interdependency-checks.patch | 86 +++++++++++++++++++++++++++++++++++
0001-Fix-lv2-dep-logic.patch | 38 ----------------
cinelerra-gg.spec | 19 ++++++--
3 files changed, 101 insertions(+), 42 deletions(-)
---
diff --git a/0001-Fix-interdependency-checks.patch b/0001-Fix-interdependency-checks.patch
new file mode 100644
index 0000000..0ea3737
--- /dev/null
+++ b/0001-Fix-interdependency-checks.patch
@@ -0,0 +1,86 @@
+From 219896331c151b147b405f27570ee5521709e2d1 Mon Sep 17 00:00:00 2001
+From: "FeRD (Frank Dana)" <ferdnyc(a)gmail.com>
+Date: Tue, 7 Jul 2020 20:07:30 -0400
+Subject: [PATCH] Fix mutual-exclusion logic
+
+---
+ cinelerra-5.1/configure.ac | 42 +++++++++++++++++++++++---------------
+ 1 file changed, 25 insertions(+), 17 deletions(-)
+
+diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
+index daa267f0..7a2dc0db 100644
+--- a/cinelerra-5.1/configure.ac
++++ b/cinelerra-5.1/configure.ac
+@@ -673,10 +673,12 @@ test "x$HAVE_libavc1394" = "xyes" && \
+ test "x$HAVE_libiec61883" = "xyes" && \
+ test "x$HAVE_libraw1394" = "xyes" && \
+ HAVE_FIREWIRE=yes || \
+-HAVE_libavc1394=no && \
+-HAVE_libiec61883=no && \
+-HAVE_libraw1394=no && \
+- HAVE_FIREWIRE=no
++( \
++ HAVE_libavc1394=no && \
++ HAVE_libiec61883=no && \
++ HAVE_libraw1394=no && \
++ HAVE_FIREWIRE=no \
++)
+
+ CHECK_WANT([DV], [auto], [use dv], [
+ CHECK_LIB([libdv], [dv], [dv_init])
+@@ -700,9 +702,11 @@ CHECK_WANT([ESOUND], [no], [use esd], [
+ test "x$HAVE_esound" = "xyes" && \
+ test "x$HAVE_audiofile" = "xyes" && \
+ HAVE_ESOUND=yes || \
+-HAVE_esound=no && \
+-HAVE_audiofile=no && \
+- HAVE_ESOUND=no
++( \
++ HAVE_esound=no && \
++ HAVE_audiofile=no && \
++ HAVE_ESOUND=no \
++)
+
+ CHECK_WANT([PULSE], [auto], [use pulseaudio], [
+ CHECK_LIB([pulse_simple], [pulse-simple], [pa_simple_new])
+@@ -749,13 +753,15 @@ test "x$HAVE_serd" = "xyes" && \
+ test "x$HAVE_sratom" = "xyes" && \
+ test "x$HAVE_suil" = "xyes" && \
+ HAVE_LV2=yes || \
+-HAVE_lv2=no && \
+-HAVE_lilv=no && \
+-HAVE_sord=no && \
+-HAVE_serd=no && \
+-HAVE_sratom=no && \
+-HAVE_suil=no && \
+- HAVE_LV2=no
++( \
++ HAVE_lv2=no && \
++ HAVE_lilv=no && \
++ HAVE_sord=no && \
++ HAVE_serd=no && \
++ HAVE_sratom=no && \
++ HAVE_suil=no && \
++ HAVE_LV2=no \
++)
+
+ CHECK_WANT([CUDA], [auto], [build cuda plugins], [
+ CHECK_HEADERS([CUDA], [cuda sdk], [${CUDA_PATH:-/usr/local/cuda}/include/cuda.h])])
+@@ -813,9 +819,11 @@ AC_SUBST([HAVE_OPENEXR])
+ test "x$HAVE_openexr" = "xyes" && \
+ test "x$HAVE_ilmbase" = "xyes" && \
+ HAVE_OPENEXR=yes || \
+-HAVE_openexr=no && \
+-HAVE_ilmbase=no &&
+- HAVE_OPENEXR=no
++( \
++ HAVE_openexr=no && \
++ HAVE_ilmbase=no && \
++ HAVE_OPENEXR=no \
++)
+
+ # build global_config
+ OBJDIR=`uname -m`
+--
+2.26.2
+
diff --git a/cinelerra-gg.spec b/cinelerra-gg.spec
index 22ed32b..259f2e7 100644
--- a/cinelerra-gg.spec
+++ b/cinelerra-gg.spec
@@ -3,7 +3,7 @@
Name: cinelerra-gg
Version: 5.1%{?tag_version:.%{tag_version}}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A non linear video editor and effects processor
# The Cinelerra-GG codebase is licensed GPLv2+
# The GREYcstoration plugin is licensed CeCILL v2.0
@@ -18,7 +18,7 @@ Source0: https://git.cinelerra-gg.org/git/?p=goodguy/cinelerra.git;a=snap
Patch0: cinelerra-gg-Disable-crystalhd-in-ffmpeg.patch
# Fix configure logic for lv2 dependencies
# Submitted upstream: https://www.cinelerra-gg.org/bugtracker/view.php?id=473
-Patch1: 0001-Fix-lv2-dep-logic.patch
+Patch1: 0001-Fix-interdependency-checks.patch
# Only tested on x86_64
ExclusiveArch: x86_64
@@ -53,9 +53,12 @@ BuildRequires: pkgconfig(flac)
BuildRequires: pkgconfig(fftw3)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(gl)
+BuildRequires: pkgconfig(IlmBase)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libdv)
BuildRequires: pkgconfig(libjpeg)
+BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(libpulse-simple)
BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libusb)
@@ -121,7 +124,7 @@ BuildArch: noarch
%setup -q -n cinelerra-%{git_tag}/cinelerra-5.1
%patch0 -p2 -b.crystal
-%patch1 -p2 -b.lv2_deps
+%patch1 -p2 -b.all_or_none
./autogen.sh
@@ -142,6 +145,7 @@ sed -i 's/\<python\>/python3/' guicast/Makefile
--enable-dav1d=auto \
--enable-flac=yes \
--enable-fftw=auto \
+ --enable-ilmBase=shared \
--enable-lame=auto \
--enable-libaom=auto \
--enable-libdv=auto \
@@ -155,6 +159,8 @@ sed -i 's/\<python\>/python3/' guicast/Makefile
--enable-lilv=shared \
--enable-lv2=shared \
--enable-openjpeg=auto \
+ --enable-openexr=shared \
+ --enable-openExr=shared \
--enable-opus=auto \
--enable-serd=shared \
--enable-sord=shared \
@@ -171,6 +177,7 @@ sed -i 's/\<python\>/python3/' guicast/Makefile
--with-ladspa-dir=%{_libdir}/ladspa \
--without-opencv \
--with-openexr \
+ --with-pulse \
# WIP
# --with-dv=no \
@@ -181,7 +188,6 @@ sed -i 's/\<python\>/python3/' guicast/Makefile
# --with-thirdparty=no \
# --with-commercial=no \
# --with-libzmpeg=no \
-# --enable-static-build=no \
# Re-enable hardening
%define _hardened_build 1
@@ -218,6 +224,11 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%changelog
+* Tue Jul 07 2020 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 5.1.2020.06-3
+- Update configure.ac patch to fix all interdependency checks
+- Use shared libs for some parts of IlmBase (OpenEXR dependency)
+- Enable pulseaudio support
+
* Tue Jul 07 2020 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 5.1.2020.06-2
- Switch to shared liblilv (also removes its build dependencies from
the build: serd, sord, sratom, suil)
3 years, 11 months
[cinelerra-gg] Actually commit patch file
by Frank R Dana
commit 6dd61d1c0b9ddc7ec75fac5226f41478efd39783
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Tue Jul 7 19:26:04 2020 -0400
Actually commit patch file
0001-Fix-lv2-dep-logic.patch | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
---
diff --git a/0001-Fix-lv2-dep-logic.patch b/0001-Fix-lv2-dep-logic.patch
new file mode 100644
index 0000000..ef2f864
--- /dev/null
+++ b/0001-Fix-lv2-dep-logic.patch
@@ -0,0 +1,38 @@
+From 2eaebaa4151529fef14c72b2e724e54b8f74ae23 Mon Sep 17 00:00:00 2001
+From: "FeRD (Frank Dana)" <ferdnyc(a)gmail.com>
+Date: Tue, 7 Jul 2020 18:39:32 -0400
+Subject: [PATCH] Fix lv2 dep logic
+
+---
+ cinelerra-5.1/configure.ac | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
+index daa267f..4350127 100644
+--- a/cinelerra-5.1/configure.ac
++++ b/cinelerra-5.1/configure.ac
+@@ -741,21 +741,6 @@ CHECK_WANT([LV2], [auto], [use lv2], [
+ CFLAGS="-I/usr/include/suil-0 -I/usr/local/include/suil-0"
+ CHECK_HEADERS([lv2], [suil headers], [suil/suil.h])
+ CFLAGS="$saved_CFLAGS"])
+-# have all or none
+-test "x$HAVE_lv2" = "xyes" && \
+-test "x$HAVE_lilv" = "xyes" && \
+-test "x$HAVE_sord" = "xyes" && \
+-test "x$HAVE_serd" = "xyes" && \
+-test "x$HAVE_sratom" = "xyes" && \
+-test "x$HAVE_suil" = "xyes" && \
+- HAVE_LV2=yes || \
+-HAVE_lv2=no && \
+-HAVE_lilv=no && \
+-HAVE_sord=no && \
+-HAVE_serd=no && \
+-HAVE_sratom=no && \
+-HAVE_suil=no && \
+- HAVE_LV2=no
+
+ CHECK_WANT([CUDA], [auto], [build cuda plugins], [
+ CHECK_HEADERS([CUDA], [cuda sdk], [${CUDA_PATH:-/usr/local/cuda}/include/cuda.h])])
+--
+2.26.2
+
3 years, 11 months
[cinelerra-gg] Switch to shared lv2 dependencies
by Frank R Dana
commit dfa2edd41bebb203d98a74cca207c904bbf7bd0f
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Tue Jul 7 16:38:34 2020 -0400
Switch to shared lv2 dependencies
cinelerra-gg.spec | 22 +-
waf-python3.patch | 9816 -----------------------------------------------------
2 files changed, 16 insertions(+), 9822 deletions(-)
---
diff --git a/cinelerra-gg.spec b/cinelerra-gg.spec
index a817122..b76e2c3 100644
--- a/cinelerra-gg.spec
+++ b/cinelerra-gg.spec
@@ -3,7 +3,7 @@
Name: cinelerra-gg
Version: 5.1%{?tag_version:.%{tag_version}}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A non linear video editor and effects processor
# The Cinelerra-GG codebase is licensed GPLv2+
# The GREYcstoration plugin is licensed CeCILL v2.0
@@ -16,8 +16,8 @@ Source0: https://git.cinelerra-gg.org/git/?p=goodguy/cinelerra.git;a=snap
# CrystalHD is fouling the ffmpeg build
Patch0: cinelerra-gg-Disable-crystalhd-in-ffmpeg.patch
-# Insert patches for various thirdparty libs' 'waflib' shebangs
-Patch1: waf-python3.patch
+# Fix configure logic for lv2 dependencies
+Patch1: 0001-Fix-lv2-dep-logic.patch
# Only tested on x86_64
ExclusiveArch: x86_64
@@ -41,7 +41,6 @@ BuildRequires: CImg-devel
BuildRequires: jbigkit-devel
BuildRequires: kernel-headers
BuildRequires: lame-devel
-BuildRequires: lilv-devel
BuildRequires: pulseaudio-utils
BuildRequires: perl(XML::LibXML)
BuildRequires: perl(XML::Parser)
@@ -63,6 +62,7 @@ BuildRequires: pkgconfig(libv4l2)
BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libwebp)
+BuildRequires: pkgconfig(lilv-0)
BuildRequires: pkgconfig(lv2)
BuildRequires: pkgconfig(mjpegtools)
BuildRequires: pkgconfig(ncurses)
@@ -70,7 +70,9 @@ BuildRequires: pkgconfig(numa)
#BuildRequires: pkgconfig(opencv)
BuildRequires: pkgconfig(OpenEXR)
BuildRequires: pkgconfig(opus)
+BuildRequires: pkgconfig(serd-0)
BuildRequires: pkgconfig(sndfile)
+BuildRequires: pkgconfig(sord-0)
BuildRequires: pkgconfig(sratom-0)
BuildRequires: pkgconfig(suil-0)
BuildRequires: pkgconfig(theora)
@@ -118,7 +120,7 @@ BuildArch: noarch
%setup -q -n cinelerra-%{git_tag}/cinelerra-5.1
%patch0 -p2 -b.crystal
-%patch1 -p2 -b.waf_python
+%patch1 -p2 -b.lv2_deps
./autogen.sh
@@ -149,10 +151,14 @@ sed -i 's/\<python\>/python3/' guicast/Makefile
--enable-libvorbis=auto \
--enable-libvpx=auto \
--enable-libwebp=auto \
- --enable-lilv=auto \
+ --enable-lilv=shared \
--enable-lv2=shared \
--enable-openjpeg=auto \
--enable-opus=auto \
+ --enable-serd=shared \
+ --enable-sord=shared \
+ --enable-sratom=shared \
+ --enable-suil=shared \
--enable-tiff=auto \
--enable-twolame=auto \
--enable-x264=auto \
@@ -211,6 +217,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%changelog
+* Tue Jul 07 2020 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 5.1.2020.06-2
+- Switch to shared liblilv (also removes its build dependencies from
+ the build: serd, sord, sratom, suil)
+
* Sat Jul 04 2020 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 5.1.2020.06-1
- New upstream release, migrate to new package versioning
- Patch all bundled Python code to run with python3
3 years, 11 months
[avidemux/f32] (3 commits) ...Update to 2.7.6.
by Richard Shaw
Summary of changes:
11e0b4f... Rebuild for new x265 version (*)
877603b... Mass rebuild for x264 (*)
c46fdc4... Update to 2.7.6. (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 11 months
[avidemux] Update to 2.7.6.
by Richard Shaw
commit c46fdc48726811732bf8553f801516a541f111ea
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Jul 7 07:33:05 2020 -0500
Update to 2.7.6.
.gitignore | 1 +
avidemux-2.7.6-external-libass.patch | 18 ++++++++++++++++++
avidemux.spec | 18 ++++++++++++------
sources | 2 +-
4 files changed, 32 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 96bab0f..4e1f5b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ avidemux_2.6.10.tar.gz
/avidemux_2.7.1.tar.gz
/avidemux_2.7.3.tar.gz
/avidemux_2.7.4.tar.gz
+/avidemux_2.7.6.tar.gz
diff --git a/avidemux-2.7.6-external-libass.patch b/avidemux-2.7.6-external-libass.patch
new file mode 100644
index 0000000..c080393
--- /dev/null
+++ b/avidemux-2.7.6-external-libass.patch
@@ -0,0 +1,18 @@
+commit a1d969d47a5d2e49a7c3a0a0b6c7e6ed9fd46622
+Author: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Sun Jul 5 23:21:25 2020 +0200
+
+ [ass] Use the right header when building with system libass
+
+diff --git a/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt b/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
+index af432d455..c2f31ef2b 100644
+--- a/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
++++ b/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
+@@ -16,6 +16,7 @@ IF ((USE_FREETYPE AND USE_FRIBIDI) OR MSVC)
+ MESSAGE(STATUS "Checking libass external lib ...")
+ PKG_CHECK_MODULES(LIBASS libass)
+ IF (LIBASS_FOUND)
++ ADD_DEFINITIONS("-DUSE_EXTERNAL_LIBASS")
+ ADD_DEFINITIONS(${LIBASS_CFLAGS})
+ SET(LIBASS_LIBRARIES ${LIBASS_LDFLAGS})
+ MESSAGE(STATUS " found, lib is ${LIBASS_LIBRARIES}")
diff --git a/avidemux.spec b/avidemux.spec
index 2c7da64..8e04c81 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -4,14 +4,16 @@
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
Name: avidemux
-Version: 2.7.4
-Release: 7%{?dist}
+Version: 2.7.6
+Release: 1%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
URL: http://www.avidemux.org
Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
+Patch0: avidemux-2.7.6-external-libass.patch
+
# Don't try to build on arm, aarch64 or ppc
ExclusiveArch: i686 x86_64
@@ -34,8 +36,10 @@ BuildRequires: fribidi-devel
BuildRequires: libXv-devel
BuildRequires: libXmu-devel
BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: libaom-devel
BuildRequires: libass-devel
BuildRequires: libmp4v2-devel
+BuildRequires: vapoursynth-devel
# Sound out
BuildRequires: alsa-lib-devel >= 1.0.3
@@ -49,7 +53,7 @@ BuildRequires: libva-devel
# Audio Codecs
BuildRequires: a52dec-devel >= 0.7.4
%{?_with_faac:BuildRequires: faac-devel >= 1.24}
-BuildRequires: faad2-devel >= 2.0
+%{?_with_fdk_aac:BuildRequires: fdk-aac-devel >= 0.1.6}
BuildRequires: lame-devel >= 3.96.1
BuildRequires: libmad-devel >= 0.15.1
BuildRequires: libogg-devel >= 1.1
@@ -169,7 +173,6 @@ rm -rf build_plugins_common && mkdir build_plugins_common && pushd build_plugins
-DUSE_EXTERNAL_MP4V2=TRUE \
../avidemux_plugins
%make_build V=1
-make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
# Build avidemux_plugins_cli
@@ -185,7 +188,6 @@ rm -rf build_plugins_cli && mkdir build_plugins_cli && pushd build_plugins_cli
-DUSE_EXTERNAL_MP4V2=TRUE \
../avidemux_plugins
%make_build V=1
-make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
# Build avidemux_plugins_qt5
@@ -201,7 +203,6 @@ rm -rf build_plugins_qt5 && mkdir build_plugins_qt5 && pushd build_plugins_qt5
-DUSE_EXTERNAL_MP4V2=TRUE \
../avidemux_plugins
%make_build V=1
-make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
@@ -269,12 +270,14 @@ fi
%files cli -f build_plugins_cli/install_manifest.txt
%{_bindir}/avidemux3_cli
+%{_bindir}/vsProxy
%{_libdir}/libADM_UI_Cli*.so
%{_libdir}/libADM_render6_cli.so
%files qt
%{_bindir}/avidemux3_qt5
%{_bindir}/avidemux3_jobs_qt5
+%{_bindir}/vsProxy_gui_qt5
%{_libdir}/libADM_openGLQT*.so
%{_libdir}/libADM_UIQT*.so
%{_libdir}/libADM_render6_QT5.so
@@ -291,6 +294,9 @@ fi
%changelog
+* Tue Jul 7 2020 Richard Shaw <hobbes1069(a)gmail.com> - 2.7.6-1
+- Update to 2.7.6.
+
* Tue Jul 07 2020 Sérgio Basto <sergio(a)serjux.com> - 2.7.4-7
- Mass rebuild for x264
diff --git a/sources b/sources
index b0a8988..b243a08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87b4dd1ef3a1f695b3d0f9971da8abde avidemux_2.7.4.tar.gz
+SHA512 (avidemux_2.7.6.tar.gz) = 7f40b48a6c688a5a847e46118aef822a0f5f1dfb50b6223ce8a825d9e3817a9114bc3400aa7b7286a495051912b4b54cf1b86ea7064e6164f7ca7455e5a714ee
3 years, 11 months
[nvidia-kmod] Patch for 5.8rc kernel
by Leigh Scott
commit 97fac8d0030641810ac5a5f0318f6d7e7545b9a8
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jul 7 10:17:06 2020 +0100
Patch for 5.8rc kernel
kernel-5.8.patch | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-kmod.spec | 7 +++-
2 files changed, 109 insertions(+), 1 deletion(-)
---
diff --git a/kernel-5.8.patch b/kernel-5.8.patch
new file mode 100644
index 0000000..6f7702e
--- /dev/null
+++ b/kernel-5.8.patch
@@ -0,0 +1,103 @@
+diff -uNrp a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+--- a/kernel/common/inc/nv-linux.h 2020-06-16 04:34:04.000000000 +0100
++++ b/kernel/common/inc/nv-linux.h 2020-07-07 09:57:20.583132487 +0100
+@@ -505,7 +505,13 @@ extern NvBool nvos_is_chipset_io_coheren
+
+ static inline void *nv_vmalloc(unsigned long size)
+ {
++#if NV_VMALLOC_ARGUMENT_COUNT_ARGUMENT_COUNT == 3
+ void *ptr = __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);
++#elif NV_VMALLOC_ARGUMENT_COUNT_ARGUMENT_COUNT == 2
++ void *ptr = __vmalloc(size, GFP_KERNEL);
++#else
++#error "NV_VMALLOC_ARGUMENT_COUNT_ARGUMENT_COUNT value unrecognized!"
++#endif
+ if (ptr)
+ NV_MEMDBG_ADD(ptr, size);
+ return ptr;
+diff -uNrp a/kernel/common/inc/nv-mm.h b/kernel/common/inc/nv-mm.h
+--- a/kernel/common/inc/nv-mm.h 2020-06-16 04:34:04.000000000 +0100
++++ b/kernel/common/inc/nv-mm.h 2020-07-07 09:57:20.583132487 +0100
+@@ -25,6 +25,10 @@
+
+ #include "conftest.h"
+
++#if defined(NV_MM_STRUCT_HAS_MMAP_LOCK)
++#define mmap_sem mmap_lock
++#endif
++
+ #if !defined(NV_VM_FAULT_T_IS_PRESENT)
+ typedef int vm_fault_t;
+ #endif
+diff -uNrp a/kernel/conftest.sh b/kernel/conftest.sh
+--- a/kernel/conftest.sh 2020-06-12 12:58:59.000000000 +0100
++++ b/kernel/conftest.sh 2020-07-07 09:57:20.585132471 +0100
+@@ -2191,6 +2191,49 @@ compile_test() {
+ compile_check_conftest "$CODE" "NV_VZALLOC_PRESENT" "" "functions"
+ ;;
+
++ vmalloc_argument_count)
++ #
++ # Determine how many arguments __vmalloc takes.
++ #
++ # Changed by commit fc3af83c4fca ("mm: remove the pgprot argument
++ # to __vmalloc")
++ #
++ echo "$CONFTEST_PREAMBLE
++ #include <linux/mm.h>
++ #include <linux/vmalloc.h>
++ void conftest_vmalloc_argument_count(void) {
++ __vmalloc(0, GFP_KERNEL, PAGE_KERNEL);
++ }" > conftest$$.c
++
++ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
++ rm -f conftest$$.c
++
++ if [ -f conftest$$.o ]; then
++ echo "#define NV_VMALLOC_ARGUMENT_COUNT_ARGUMENT_COUNT 3" | append_conftest "functions"
++ else
++ echo "#define NV_VMALLOC_ARGUMENT_COUNT_ARGUMENT_COUNT 2" | append_conftest "functions"
++ fi
++
++ rm -f conftest$$.o
++ ;;
++
++ mm_struct_has_mmap_lock)
++ #
++ # Determine if the mm_struct structure has 'mmap_lock'.
++ #
++ # Changed by commit ea7b54944ef9 ("mmap locking API: rename mmap_sem
++ # to mmap_lock")
++ #
++ CODE="
++ #include <linux/mm.h>
++
++ int conftest_mm_struct_has_mmap_lock(void) {
++ return offsetof(struct mm_struct, mmap_lock);
++ }"
++
++ compile_check_conftest "$CODE" "NV_MM_STRUCT_HAS_MMAP_LOCK" "" "types"
++ ;;
++
+ drm_driver_has_set_busid)
+ #
+ # Determine if the drm_driver structure has a 'set_busid' callback
+diff -uNrp a/kernel/nvidia/nvidia.Kbuild b/kernel/nvidia/nvidia.Kbuild
+--- a/kernel/nvidia/nvidia.Kbuild 2020-06-16 04:30:02.000000000 +0100
++++ b/kernel/nvidia/nvidia.Kbuild 2020-07-07 09:57:20.585132471 +0100
+@@ -146,6 +146,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += vm
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += jiffies_to_timespec
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += ktime_get_raw_ts64
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += ktime_get_real_ts64
++NV_CONFTEST_FUNCTION_COMPILE_TESTS += vmalloc_argument_count
+
+ NV_CONFTEST_SYMBOL_COMPILE_TESTS += is_export_symbol_gpl_of_node_to_nid
+ NV_CONFTEST_SYMBOL_COMPILE_TESTS += is_export_symbol_present_swiotlb_map_sg_attrs
+@@ -177,6 +178,7 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += kmem_c
+ NV_CONFTEST_TYPE_COMPILE_TESTS += sysfs_slab_unlink
+ NV_CONFTEST_TYPE_COMPILE_TESTS += proc_ops
+ NV_CONFTEST_TYPE_COMPILE_TESTS += timeval
++NV_CONFTEST_TYPE_COMPILE_TESTS += mm_struct_has_mmap_lock
+
+ NV_CONFTEST_GENERIC_COMPILE_TESTS += dom0_kernel_present
+ NV_CONFTEST_GENERIC_COMPILE_TESTS += nvidia_vgpu_hyperv_available
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index fdcd785..96b8990 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -12,12 +12,13 @@ Name: nvidia-kmod
Epoch: 3
Version: 450.51
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
+Patch0: kernel-5.8.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: x86_64
@@ -41,6 +42,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%%___*}
@@ -68,6 +70,9 @@ done
%changelog
+* Tue Jul 07 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3:450.51-2
+- Patch for 5.8rc kernel
+
* Wed Jun 24 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3:450.51-1
- Update to 450.51 beta
3 years, 11 months
[qmplay2/f31] Update to 20.07.04
by Martin Gansser
Summary of changes:
5ad9b12... Update to 20.07.04 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 11 months
