[xtables-addons/f31] Release 3.7
by Leigh Scott
Summary of changes:
dc5f409... Release 3.7 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 11 months
[xtables-addons] Release 3.7
by Leigh Scott
commit dc5f409d3c3c1975d204ccf0859262d8f50049ac
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Dec 20 09:16:33 2019 +0000
Release 3.7
sources | 2 +-
xtables-addons.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index 5adb024..13cca1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xtables-addons-3.5.tar.xz) = 25f7d71558773f4eb9a21956b5e60f9243e9049d4cc169823d06c71970ea01e16fc6799b555e6b4e09008b5869647f3f22b9cb869f8c158d71ccb12f67ee46e8
+SHA512 (xtables-addons-3.7.tar.xz) = 336f19596251507a88d7c399f9a3e6f517e4b72787ff7e7108e20e42e68932bca0eed79c54ddfa92112daae73a94a7349a874bcf993bd4abea1d875d7f2b8565
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 8d51043..3d34a5c 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -1,6 +1,6 @@
Name: xtables-addons
Summary: Extensions targets and matches for iptables
-Version: 3.5
+Version: 3.7
Release: 1%{?dist}
# The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2
License: GPLv2 and LGPLv2
@@ -50,6 +50,9 @@ rm -f %{buildroot}%{_libdir}/*.{la,so}
%{_mandir}/man?/*
%changelog
+* Fri Dec 20 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3.7-1
+- Release 3.7
+
* Sun Oct 20 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3.5-1
- Release 3.5
4 years, 11 months
[VirtualBox] Update VBox to 6.1.0
by Sérgio M. Basto
commit 83d6711b4a66da87e87157b24309b7d78cea7b1e
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Dec 20 06:05:21 2019 +0000
Update VBox to 6.1.0
.gitignore | 1 +
...strings.patch => VirtualBox-6.1.0-strings.patch | 41 +++++++++++++++-------
VirtualBox.spec | 34 +++++++++++-------
sources | 2 +-
update_vbox.sh | 10 +-----
5 files changed, 54 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d6d302e..0b6ed47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ VirtualBox-5.0.16.tar.bz2
/VirtualBox-6.0.10.tar.bz2
/VirtualBox-6.0.12.tar.bz2
/VirtualBox-6.0.14.tar.bz2
+/VirtualBox-6.1.0.tar.bz2
diff --git a/VirtualBox-6.0.6-strings.patch b/VirtualBox-6.1.0-strings.patch
similarity index 74%
rename from VirtualBox-6.0.6-strings.patch
rename to VirtualBox-6.1.0-strings.patch
index d40542c..1f9ee37 100644
--- a/VirtualBox-6.0.6-strings.patch
+++ b/VirtualBox-6.1.0-strings.patch
@@ -1,7 +1,6 @@
-diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-6.0.6_new/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-6.0.6_orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2019-04-16 13:16:21.000000000 +0300
-+++ VirtualBox-6.0.6_new/src/VBox/Frontends/VirtualBox/src/main.cpp 2019-04-17 11:53:03.382274383 +0300
-@@ -86,10 +86,12 @@
+--- ./src/VBox/Frontends/VirtualBox/src/main.cpp.orig 2019-12-19 22:58:49.615873442 +0000
++++ ./src/VBox/Frontends/VirtualBox/src/main.cpp 2019-12-19 23:03:23.696288683 +0000
+@@ -86,10 +86,12 @@ QString g_QStrHintLinuxNoMemory = QAppli
);
QString g_QStrHintLinuxNoDriver = QApplication::tr(
@@ -18,7 +17,7 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Frontends/VirtualBox/src/main.cpp Virt
"If your system has EFI Secure Boot enabled you may also need to sign "
"the kernel modules (vboxdrv, vboxnetflt, vboxnetadp, vboxpci) before "
"you can load them. Please see your Linux system's documentation for "
-@@ -99,9 +101,12 @@
+@@ -99,26 +101,29 @@ QString g_QStrHintLinuxNoDriver = QAppli
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
"The VirtualBox kernel modules do not match this version of "
"VirtualBox. The installation of VirtualBox was apparently not "
@@ -34,7 +33,17 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Frontends/VirtualBox/src/main.cpp Virt
QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
"The VirtualBox kernel modules do not match this version of "
-@@ -116,9 +121,9 @@
+ "VirtualBox. The installation of VirtualBox was apparently not "
+ "successful. Executing<br/><br/>"
+- " <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
+- "may correct this. Make sure that you are not mixing builds "
+- "of VirtualBox from different sources."
++ " <font color=blue>rmmod vboxnetadp vboxnetflt vboxpci vboxdrv; systemctl restart systemd-modules-load.service</font> as root<br/><br/>"
++ "may correct this. Make sure that you do not mix the "
++ "RPMFusion version and the Oracle version of VirtualBox."
+ );
+
+ QString g_QStrHintOtherNoDriver = QApplication::tr(
"Make sure the kernel module has been loaded successfully."
);
@@ -78,10 +87,18 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Installer/linux/VBox.sh VirtualBox-6.0
You will not be able to start VMs until this problem is fixed.
EOF
-diff -uNdr VirtualBox-6.0.6_orig/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-6.0.6_new/src/VBox/VMM/VMMR3/VM.cpp
---- VirtualBox-6.0.6_orig/src/VBox/VMM/VMMR3/VM.cpp 2019-04-16 13:17:42.000000000 +0300
-+++ VirtualBox-6.0.6_new/src/VBox/VMM/VMMR3/VM.cpp 2019-04-17 11:53:03.396273870 +0300
-@@ -342,9 +342,9 @@
+--- ./src/VBox/VMM/VMMR3/VM.cpp.orig 2019-12-19 22:54:59.342051984 +0000
++++ ./src/VBox/VMM/VMMR3/VM.cpp 2019-12-19 23:14:50.172146453 +0000
+@@ -266,7 +266,7 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
+ "Secure Boot that the modules are signed if necessary in the right "
+ "way for your host system. Then try to recompile and reload the "
+ "kernel modules by executing "
+- "'/sbin/vboxconfig' as root");
++ "'akmods && systemctl restart systemd-modules-load.service' as root");
+ break;
+ #endif
+
+@@ -332,9 +332,9 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
"was either not loaded, /dev/vboxdrv is not set up properly, "
"or you are using EFI Secure Boot and the module is not signed "
@@ -94,7 +111,7 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-6.0.6_new/
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
-@@ -386,9 +386,9 @@
+@@ -376,9 +376,9 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
pszError = N_("VirtualBox kernel driver not Installed. The vboxdrv kernel module "
"was either not loaded, /dev/vboxdrv is not set up properly, "
"or you are using EFI Secure Boot and the module is not signed "
@@ -103,7 +120,7 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-6.0.6_new/
- "'/sbin/vboxconfig' as root");
+ "in the right way for your system."
+ "Install the kernel module by executing 'dnf install akmod-VirtualBox kernel-devel-$(uname -r)'"
-+ "and 'akmods --kernels $(uname -r) && systemctl restart systemd-modules-load.service' as root");
++ "and 'akmods && systemctl restart systemd-modules-load.service' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 2a02509..212e187 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -45,16 +45,15 @@
%endif
Name: VirtualBox
-Version: 6.0.14
-Release: 2%{?dist}
+Version: 6.1.0
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
URL: http://www.virtualbox.org/wiki/VirtualBox
-ExclusiveArch: i686 x86_64
+ExclusiveArch: x86_64
-Group: System/Emulators/PC
Requires: %{name}-server%{?isa} = %{version}
Obsoletes: %{name}-qt < 5.1.8
@@ -72,7 +71,7 @@ Source10: vboxweb.service
Source20: os_mageia.png
Source21: os_mageia_64.png
Patch1: VirtualBox-6.0.0-noupdate.patch
-Patch2: VirtualBox-6.0.6-strings.patch
+Patch2: VirtualBox-6.1.0-strings.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch27: VirtualBox-gcc.patch
Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch
@@ -302,8 +301,7 @@ rm -r tools/
# Remove bundle X11 sources and some lib sources, before patching.
rm -r src/VBox/Additions/x11/x11include/
rm -r src/VBox/Additions/x11/x11stubs/
-rm include/VBox/HostServices/glext.h
-rm include/VBox/HostServices/glxext.h
+rm -r src/VBox/Additions/3D/mesa/mesa-17.3.9/
# wglext.h has typedefs for Windows-specific extensions
#rm include/VBox/HostServices/wglext.h
# src/VBox/GuestHost/OpenGL/include/GL/glext.h have VBOX definitions
@@ -324,7 +322,7 @@ rm -r src/libs/zlib-1.2.*/
%if 0%{?fedora} < 28 || 0%{?rhel}
%patch29 -p2 -R -b .gsoap3
%endif
-%patch30 -p1 -b .python37
+#patch30 -p1 -b .python37
%patch32 -p1 -b .vnc
%patch40 -p1 -b .python2_path
# mageia support not ready for 6.0
@@ -418,6 +416,7 @@ install -d %{buildroot}%{_sbindir}
install -d %{buildroot}%{_libdir}
install -d %{buildroot}%{_libdir}/virtualbox
install -d %{buildroot}%{_libdir}/virtualbox/components
+install -d %{buildroot}%{_libdir}/virtualbox/UnattendedTemplates
install -d %{buildroot}%{_libdir}/virtualbox/nls
install -d %{buildroot}%{_libdir}/virtualbox/ExtensionPacks
install -d %{buildroot}%{_libdir}/virtualbox/sdk
@@ -433,7 +432,6 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/VBoxEFI*.fd \
- obj/bin/*.rc \
obj/bin/*.r0
# Binaries
@@ -462,6 +460,7 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/VBoxVMMPreload \
obj/bin/VBoxXPCOMIPCD \
obj/bin/VBoxSysInfo.sh \
+ obj/bin/vboxweb-service.sh \
%if %{with python2} || %{with python3}
obj/bin/vboxshell.py \
%endif
@@ -492,6 +491,8 @@ ln -s VBox %{buildroot}%{_bindir}/VBoxBalloonCtrl
ln -s VBox %{buildroot}%{_bindir}/vboxballoonctrl
ln -s VBox %{buildroot}%{_bindir}/VBoxAutostart
ln -s VBox %{buildroot}%{_bindir}/vboxautostart
+ln -s VBox %{buildroot}%{_bindir}/VirtualBoxVM
+ln -s VBox %{buildroot}%{_bindir}/virtualboxvm
%if %{with webservice}
ln -s VBox %{buildroot}%{_bindir}/vboxwebsrv
%endif
@@ -502,6 +503,7 @@ ln -s ../..%{_libdir}/virtualbox/vbox-img %{buildroot}%{_bindir}/vbox-img
# Components, preserve symlinks
cp -a obj/bin/components/* %{buildroot}%{_libdir}/virtualbox/components/
+cp obj/bin/UnattendedTemplates/* %{buildroot}%{_libdir}/virtualbox/UnattendedTemplates
# Language files
install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox/nls \
@@ -571,9 +573,9 @@ install -m 0755 -t %{buildroot}%{_bindir} \
# Guest libraries
install -m 0755 -t %{buildroot}%{_libdir}/security \
obj/bin/additions/pam_vbox.so
-install -m 0755 -t %{buildroot}%{_libdir}/VBoxGuestAdditions \
- obj/bin/additions/VBoxOGL*.so
-ln -s VBoxOGL.so %{buildroot}%{_libdir}/VBoxGuestAdditions/libGL.so.1
+#install -m 0755 -t %{buildroot}%{_libdir}/VBoxGuestAdditions \
+# obj/bin/additions/VBoxOGL*.so
+#ln -s VBoxOGL.so %{buildroot}%{_libdir}/VBoxGuestAdditions/libGL.so.1
# init/vboxadd-x11 code near call the function install_x11_startup_app
install -p -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
@@ -760,6 +762,8 @@ getent passwd vboxadd >/dev/null || \
%dir %{_libdir}/virtualbox
%{_libdir}/virtualbox/*.[^p]*
%exclude %{_libdir}/virtualbox/VBoxDbg.so
+%exclude %{_libdir}/virtualbox/UICommon.so
+%exclude %{_libdir}/virtualbox/VirtualBoxVM.so
%if %{with python2}
%exclude %{_libdir}/virtualbox/VBoxPython2_7.so
%endif
@@ -775,6 +779,7 @@ getent passwd vboxadd >/dev/null || \
%{_libdir}/virtualbox/SUPInstall
%{_libdir}/virtualbox/SUPLoggerCtl
%{_libdir}/virtualbox/SUPUninstall
+%{_libdir}/virtualbox/UnattendedTemplates
%{_libdir}/virtualbox/VBoxAutostart
%{_libdir}/virtualbox/VBoxVMMPreload
%{_libdir}/virtualbox/VBoxBugReport
@@ -806,6 +811,8 @@ getent passwd vboxadd >/dev/null || \
%{_bindir}/virtualbox
%{_libdir}/virtualbox/VBoxTestOGL
%{_libdir}/virtualbox/VBoxDbg.so
+%{_libdir}/virtualbox/UICommon.so
+%{_libdir}/virtualbox/VirtualBoxVM.so
%{_libdir}/virtualbox/nls
%{_datadir}/pixmaps/*.png
%{_datadir}/applications/*.desktop
@@ -862,6 +869,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Wed Dec 18 2019 Sérgio Monteiro Basto <sergio(a)serjux.com> - 6.1.0-1
+- Update VBox to 6.1.0
+
* Tue Oct 29 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.14-2
- Add appstream file (copied from openSUSE)
diff --git a/sources b/sources
index 78e7928..5a18108 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (VirtualBox-6.0.14.tar.bz2) = e1a64c6633987e178b368dc17e738c6fbef4ab262c574188819f1186bf33f38d8c5accd6a566279a12ccd3544bab4ee5a1f8dce7c8c56d7373489c5ff7f8556d
+SHA512 (VirtualBox-6.1.0.tar.bz2) = 3709d54861e75efc5b4998bda82ebb868790228f4e19f5e64221322efd8f17916872afa89cc2494faa445fed9ae01ef97af16e4ad111a0a04552f0fac5db3618
SHA512 (UserManual.pdf) = 20aa696821faf2c87a76d2c93a5fdd29e79d42d712774b50ae5876e899c6399fac7c0edbe66fed0d8adfec933ebe4d12ecdc4240796c327c3224cd92b52704ca
diff --git a/update_vbox.sh b/update_vbox.sh
index 76c2ae0..453b574 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,4 +1,4 @@
-VERSION=6.0.14
+VERSION=6.1.0
REL=1
RAWHIDE=32
if [ -z "$1" ]
@@ -46,12 +46,4 @@ fi
echo Press enter to continue; read dummy;
git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master
-cd ../VirtualBox-kmod/
-if test $stage -le 5
-then
-echo STAGE 5
-git pull
-rpmdev-bumpspec -n $VERSION -c "Update VBox to $VERSION" VirtualBox-kmod.spec
-rfpkg srpm && copr-cli build sergiomb/vboxfor23 VirtualBox-kmod-$VERSION-$REL.fc$RAWHIDE.src.rpm
-fi
echo "Continue in ../VirtualBox-kmod/update_vbox.sh"
4 years, 11 months
[nvidia-340xx-kmod] patch for kernel-5.4.0
by Leigh Scott
commit e7754f543dd3a48a1301446a2e42534479f633f2
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Dec 20 01:18:47 2019 +0000
patch for kernel-5.4.0
buildfix_kernel_5.4.patch | 117 ++++++++++++++++++++++++++++++++++++++++++++++
nvidia-340xx-kmod.spec | 9 ++--
2 files changed, 123 insertions(+), 3 deletions(-)
---
diff --git a/buildfix_kernel_5.4.patch b/buildfix_kernel_5.4.patch
new file mode 100644
index 0000000..49b8559
--- /dev/null
+++ b/buildfix_kernel_5.4.patch
@@ -0,0 +1,117 @@
+From f90c388c755a6bd9b72cb51c712a0ae686e0b377 Mon Sep 17 00:00:00 2001
+From: Alberto Milone <alberto.milone(a)canonical.com>
+Date: Wed, 27 Nov 2019 13:01:18 +0100
+Subject: [PATCH 1/1] Add support for Linux 5.4
+
+---
+ conftest.sh | 46 ++++++++++++++++++++++++++++++++++++++++
+ nv-drm.c | 9 +++++---
+ nvidia-modules-common.mk | 2 +-
+ 3 files changed, 53 insertions(+), 4 deletions(-)
+
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index fb0bf60..babbb50 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -265,6 +265,23 @@ build_cflags() {
+ if [ -n "$BUILD_PARAMS" ]; then
+ CFLAGS="$CFLAGS -D$BUILD_PARAMS"
+ fi
++
++ # Check if gcc supports asm goto and set CC_HAVE_ASM_GOTO if it does.
++ # Older kernels perform this check and set this flag in Kbuild, and since
++ # conftest.sh runs outside of Kbuild it ends up building without this flag.
++ # Starting with commit e9666d10a5677a494260d60d1fa0b73cc7646eb3 this test
++ # is done within Kconfig, and the preprocessor flag is no longer needed.
++
++ GCC_GOTO_SH="$SOURCES/build/gcc-goto.sh"
++
++ if [ -f "$GCC_GOTO_SH" ]; then
++ # Newer versions of gcc-goto.sh don't print anything on success, but
++ # this is okay, since it's no longer necessary to set CC_HAVE_ASM_GOTO
++ # based on the output of those versions of gcc-goto.sh.
++ if [ `/bin/sh "$GCC_GOTO_SH" "$CC"` = "y" ]; then
++ CFLAGS="$CFLAGS -DCC_HAVE_ASM_GOTO"
++ fi
++ fi
+ }
+
+ CONFTEST_PREAMBLE="#include \"conftest.h\"
+@@ -1521,6 +1538,35 @@ compile_test() {
+ compile_check_conftest "$CODE" "NV_DRM_AVAILABLE" "" "generic"
+ ;;
+
++ drm_driver_prime_flag_present)
++ #
++ # Determine whether driver feature flag DRIVER_PRIME is present.
++ #
++ # The DRIVER_PRIME flag was added by commit 3248877ea179 (drm:
++ # base prime/dma-buf support (v5)) in v3.4 (2011-11-25) and is
++ # removed by commit 0424fdaf883a (drm/prime: Actually remove
++ # DRIVER_PRIME everywhere) on 2019-06-17.
++ #
++ # DRIVER_PRIME definition moved from drmP.h to drm_drv.h by
++ # commit 85e634bce01a (drm: Extract drm_drv.h) in v4.10
++ # (2016-11-14).
++ #
++ # DRIVER_PRIME define is changed to enum value by commit
++ # 0e2a933b02c9 (drm: Switch DRIVER_ flags to an enum) in v5.1
++ # (2019-01-29).
++ #
++ CODE="
++ #include <drm/drmP.h>
++ #if defined(NV_DRM_DRM_DRV_H_PRESENT)
++ #include <drm/drm_drv.h>
++ #endif
++ unsigned int drm_driver_prime_flag_present_conftest(void) {
++ return DRIVER_PRIME;
++ }"
++
++ compile_check_conftest "$CODE" "NV_DRM_DRIVER_PRIME_FLAG_PRESENT" "" "types"
++ ;;
++
+ proc_create_data)
+ #
+ # Determine if the proc_create_data() function is present.
+diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
+index 76719bb..12f7029 100644
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -156,11 +156,14 @@
+ };
+
+ static struct drm_driver nv_drm_driver = {
+-#if defined(DRIVER_LEGACY)
+- .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY,
+-#else
+- .driver_features = DRIVER_GEM | DRIVER_PRIME,
+-#endif
++ .driver_features =
++#if defined(NV_DRM_DRIVER_PRIME_FLAG_PRESENT)
++ DRIVER_PRIME |
++#endif
++#if defined(DRIVER_LEGACY) || LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++ DRIVER_LEGACY |
++#endif
++ DRIVER_GEM,
+ .load = nv_drm_load,
+ .unload = nv_drm_unload,
+ .fops = &nv_drm_fops,
+
+diff --git a/kernel/nvidia-modules-common.mk b/kernel/nvidia-modules-common.mk
+index 8ac7058..7418005 100644
+--- a/kernel/nvidia-modules-common.mk
++++ b/kernel/nvidia-modules-common.mk
+@@ -176,7 +176,7 @@ ifndef NV_VERBOSE
+ endif
+
+ KBUILD_PARAMS += KBUILD_VERBOSE=$(NV_VERBOSE)
+-KBUILD_PARAMS += -C $(KERNEL_SOURCES) SUBDIRS=$(PWD)
++KBUILD_PARAMS += -C $(KERNEL_SOURCES) M=$(PWD)
+ KBUILD_PARAMS += ARCH=$(ARCH)
+
+ #
+--
+2.20.1
+
+
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 6997025..c77dca3 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-340xx-kmod
Epoch: 1
Version: 340.107
# Taken over by kmodtool
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,8 +19,8 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: buildfix_kernel_5.0.patch
-Patch2: xf86-video-nvidia-legacy-02-fix-linux-5.1.patch
-Patch3: buildfix_kernel_5.3.patch
+Patch2: buildfix_kernel_5.3.patch
+Patch3: buildfix_kernel_5.4.patch
%if 0%{?fedora} > 30
ExclusiveArch: x86_64
@@ -81,6 +81,9 @@ done
%{?akmod_install}
%changelog
+* Fri Dec 20 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1:340.107-12
+- patch for kernel-5.4.0
+
* Sun Nov 24 2019 João Carlos Mendes Luís <redhat(a)jonny.eng.br> - 1:340.107-11
- patch for kernel-5.3.0
4 years, 11 months
[chromium-browser-privacy/f30] Use system minizip
by qvint
commit 35940e4aba7142cfaddb3f33c402ec5c5ed8c877
Author: qvint <dotqvint(a)gmail.com>
Date: Fri Dec 20 00:17:18 2019 +0300
Use system minizip
chromium-browser-privacy.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/chromium-browser-privacy.spec b/chromium-browser-privacy.spec
index 5d4501a..9da2de1 100644
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@ -54,7 +54,7 @@
%bcond_with system_ffmpeg
#Allow minizip to be unbundled
#mini-compat is going to be removed from fedora 30!
-%bcond_with system_minizip
+%bcond_without system_minizip
%endif
# Need re2 ver. 2016.07.21 for re2::LazyRE2
4 years, 11 months
[vlc] Update libplacebo patch
by Leigh Scott
commit 2c95fdb03d0b6d9597c011e0ada3b956bd796edd
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Dec 19 15:18:25 2019 +0000
Update libplacebo patch
libplacebo_patch_1.patch | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/libplacebo_patch_1.patch b/libplacebo_patch_1.patch
index c8a73a0..f47fce3 100644
--- a/libplacebo_patch_1.patch
+++ b/libplacebo_patch_1.patch
@@ -1,13 +1,13 @@
-From 78dff2f7ec405d423da4431fc873cd5182e594c8 Mon Sep 17 00:00:00 2001
+From 2215a98fbb1f11e5df8e58eba2ea15733cff7905 Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux(a)gmail.com>
-Date: Fri, 7 Jun 2019 22:24:42 +0100
-Subject: Adapt patch from videolan mailing list
- https://mailman.videolan.org/pipermail/vlc-devel/2019-May/124293.html
+Date: Thu, 19 Dec 2019 15:03:32 +0000
+Subject: [PATCH] Adapt patch from videolan mailing list
---
.../video_output/opengl/fragment_shaders.c | 6 +++++
+ modules/video_output/opengl/vout_helper.c | 4 ++-
modules/video_output/opengl/vout_helper.h | 27 +++++++++++++++++--
- 2 files changed, 31 insertions(+), 2 deletions(-)
+ 3 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c
index 8c1f67ee7a..f6fb2be6c5 100644
@@ -27,6 +27,21 @@ index 8c1f67ee7a..f6fb2be6c5 100644
color_params.gamut_warning = var_InheritBool(tc->gl, "tone-mapping-warn");
struct pl_color_space dst_space = pl_color_space_unknown;
+diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
+index 919560e603..12308e2060 100644
+--- a/modules/video_output/opengl/vout_helper.c
++++ b/modules/video_output/opengl/vout_helper.c
+@@ -628,7 +628,9 @@ opengl_init_program(vout_display_opengl_t *vgl, struct prgm *prgm,
+ .log_level = PL_LOG_INFO,
+ });
+ if (tc->pl_ctx) {
+-# if PL_API_VER >= 6
++# if PL_API_VER >= 20
++ tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL);
++# elif PL_API_VER >= 6
+ tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0);
+ # else
+ tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0, 0);
diff --git a/modules/video_output/opengl/vout_helper.h b/modules/video_output/opengl/vout_helper.h
index 978669f89c..cfc256530e 100644
--- a/modules/video_output/opengl/vout_helper.h
@@ -82,5 +97,5 @@ index 978669f89c..cfc256530e 100644
set_section("Dithering", NULL) \
add_integer("dither-algo", -1, DITHER_TEXT, DITHER_LONGTEXT, false) \
--
-2.21.0
+2.24.1
4 years, 11 months
[vlc] Rebuild for new libplacebo version
by Leigh Scott
commit 23b19ea22d9d9574ed4270d44655618c0ca01a6f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Dec 19 14:22:37 2019 +0000
Rebuild for new libplacebo version
vlc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index a8c95c1..4e06baf 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -54,7 +54,7 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.9
-Release: 25%{?dist}
+Release: 26%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -560,6 +560,9 @@ fi || :
%changelog
+* Thu Dec 19 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1:3.0.9-26
+- Rebuild for new libplacebo version
+
* Tue Dec 17 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1:3.0.9-25
- Mass rebuild for x264
4 years, 11 months
