[chromium-freeworld/el7] REVERT: Re-adjust the patch to make the auto sync script happy. Refer: https://src.fedoraproject.org
by Akarshan Biswas
commit 8f46c499f71bb9aec5da5a2cd168f4c160959a48
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Fri Mar 22 21:58:51 2019 +0530
REVERT: Re-adjust the patch to make the auto sync script happy. Refer: https://src.fedoraproject.org/rpms/chromium/blob/7ccede1e1c9540468ce6fb36...
chromium-freeworld.spec | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index e7797b5..fc43772 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -309,8 +309,7 @@ Patch123: relax-libva-version.patch
Patch124: chromium-71.0.3578.98-vaapi-libva1-compatibility.patch
# From gentoo
Patch125: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files...
-# For el7: error: function 'gpu::GPUInfo::GPUDevice& gpu::GPUInfo::GPUDevice::operator=(gpu::GPUInfo::GPUDevice&&)' defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ''
-Patch126: chromium-71.0.3578.98-el7-fix-noexcept.patch
+
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
@@ -344,10 +343,6 @@ Source15: http://download.savannah.nongnu.org/releases/freebangfont/MuktiNarrow-
Source16: https://github.com/web-platform-tests/wpt/raw/master/fonts/Ahem.ttf
Source17: GardinerModBug.ttf
Source18: GardinerModCat.ttf
-# RHEL needs newer nodejs
-%if 0%{?rhel}
-Source19: node-v8.9.1-linux-x64.tar.gz
-%endif
# We can assume gcc and binutils.
BuildRequires: gcc-c++
@@ -377,7 +372,6 @@ BuildRequires: libdrm-devel
%endif
BuildRequires: libgcrypt-devel
BuildRequires: libudev-devel
-BuildRequires: libuuid-devel
BuildRequires: libusb-devel
BuildRequires: libXdamage-devel
BuildRequires: libXScrnSaver-devel
@@ -387,10 +381,7 @@ BuildRequires: minizip-compat-devel
%else
BuildRequires: minizip-devel
%endif
-# RHEL 7's nodejs is too old
-%if 0%{?fedora}
BuildRequires: nodejs
-%endif
BuildRequires: nss-devel >= 3.26
BuildRequires: pciutils-devel
BuildRequires: pulseaudio-libs-devel
@@ -873,9 +864,7 @@ udev.
%patch123 -p1 -b .relaxva
%patch124 -p1 -b .va1compat
%patch125 -p1 -b .gcc-overloaded
-%if 0%{?rhel} == 7
-%patch126 -p1 -b .fix-noexcept
-%endif
+
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works
5 years, 8 months
[chromium-freeworld/el7] REVERT: "need to use devtoolset-8-*. I love hardcoded versions in package names." Commit mysterious
by Akarshan Biswas
commit 392a3703a161eeaa03c6684d118f07296a57f112
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Fri Mar 22 21:35:06 2019 +0530
REVERT: "need to use devtoolset-8-*. I love hardcoded versions in package names." Commit mysteriously vanished from Fedora repository!!
chromium-freeworld.spec | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 60eee50..e7797b5 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -152,7 +152,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3578.98
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -1852,9 +1852,6 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
-* Wed Dec 19 2018 Tom Callaway <spot(a)fedoraproject.org> - 71.0.3578.98-2
-- need to use devtoolset-8-*. I love hardcoded versions in package names.
-
* Fri Dec 14 2018 Tom Callaway <spot(a)fedoraproject.org> - 71.0.3578.98-1
- update to 71.0.3578.98
5 years, 8 months
[chromium-freeworld] disable vaapi on epel7
by Akarshan Biswas
commit 65f3bf1ac4a2ec472fce81ac12676ccf26bff6e3
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Mar 19 15:18:34 2019 -0400
disable vaapi on epel7
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
chromium-freeworld.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index bda43fb..dd79815 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -1089,7 +1089,9 @@ CHROMIUM_BROWSER_GN_DEFINES+=' is_component_ffmpeg=false is_component_build=fals
CHROMIUM_BROWSER_GN_DEFINES+=' remove_webcore_debug_symbols=true enable_hangout_services_extension=true'
CHROMIUM_BROWSER_GN_DEFINES+=' use_aura=true'
CHROMIUM_BROWSER_GN_DEFINES+=' enable_widevine=true'
+%if 0%{?fedora} >= 28
CHROMIUM_BROWSER_GN_DEFINES+=' use_vaapi=true'
+%endif
%if 0%{?fedora}
CHROMIUM_BROWSER_GN_DEFINES+=' rtc_use_pipewire=true rtc_link_pipewire=true'
%endif
5 years, 8 months
[chromium-freeworld] do not package pyproto/protoc
by Akarshan Biswas
commit c5b981d09cf27c689c1dd75e6030f81250092f22
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Mar 19 09:31:47 2019 -0400
do not package pyproto/protoc
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
chromium-freeworld.spec | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 568e50b..bda43fb 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -160,7 +160,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3683.75
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -1500,7 +1500,10 @@ cp -a *.pak locales resources icudtl.dat %{buildroot}%{chromium_path}
cp -a nacl_helper* *.nexe pnacl tls_edit %{buildroot}%{chromium_path}
chmod -x %{buildroot}%{chromium_path}/nacl_helper_bootstrap* *.nexe
%endif
+# Reasonably sure we don't need this anymore. Chrome doesn't include it.
+%if 0
cp -a protoc pyproto %{buildroot}%{chromium_path}
+%endif
%ifarch x86_64 i686 aarch64
cp -a swiftshader %{buildroot}%{chromium_path}
%endif
@@ -1732,7 +1735,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/tls_edit
%endif
%dir %{chromium_path}/PepperFlash/
+%if 0
%{chromium_path}/protoc
+%endif
# %%{chromium_path}/remoting_locales/
# %%{chromium_path}/pseudo_locales/
# %%{chromium_path}/plugins/
@@ -1750,7 +1755,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/headless_lib.pak
%endif
# %%{chromium_path}/mus_app_resources_*.pak
+%if 0
%{chromium_path}/pyproto/
+%endif
%{chromium_path}/resources/
%dir %{chromium_path}/locales/
%lang(am) %{chromium_path}/locales/am.pak*
@@ -1865,6 +1872,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Tue Mar 19 2019 Tom Callaway <spot(a)fedoraproject.org> - 73.0.3683.75-2
+- do not include pyproto/protoc files in package
+
* Tue Mar 12 2019 Tom Callaway <spot(a)fedoraproject.org> - 73.0.3683.75-1
- update to 73.0.3683.75
5 years, 8 months
[VirtualBox-kmod] (4 commits) ...Merge branch 'master' into el7
by Sérgio M. Basto
Summary of changes:
9dfd45f... removed fixes_for_4.17.patch (*)
908ceed... Update to 5.2.24 (*)
40f66d7... Rebase and squash el7 (*)
eb5dd49... Merge branch 'master' into el7 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 8 months
[VirtualBox-kmod/el7: 7/8] Rebase and squash el7
by Sérgio M. Basto
commit 40f66d76f1e56cd3b4fcaf5a00399916d4e3390b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Mar 22 14:24:30 2019 +0000
Rebase and squash el7
.gitignore | 1 +
...on_of_host_modules_on_Linux_kernel_5.0.v1.patch | 12 ++
VirtualBox-kmod.spec | 44 ++++++--
changeset_75402.diff | 125 ---------------------
efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch | 86 ++++++++++++++
...dekernel-filter.txt => excludekernel-filter.txt | 0
sources | 2 +-
7 files changed, 132 insertions(+), 138 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a45aca6..dafd410 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/master.zip
+/fb36032.zip
diff --git a/Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch b/Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch
new file mode 100644
index 0000000..bd80c59
--- /dev/null
+++ b/Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch
@@ -0,0 +1,12 @@
+--- ./VirtualBox-kmod-6.0.2/vboxsf/vfsmod.c.orig 2019-01-27 03:29:18.138159346 +0000
++++ ./VirtualBox-kmod-6.0.2/vboxsf/vfsmod.c 2019-01-27 03:54:08.850764196 +0000
+@@ -43,6 +43,9 @@
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+ # include <linux/mount.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
++# include <uapi/linux/mount.h>
++#endif
+ #include <linux/seq_file.h>
+
+ MODULE_DESCRIPTION(VBOX_PRODUCT " VFS Module for Host File System Access");
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index f14736a..7cf67b2 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -9,6 +9,11 @@
%bcond_with newvboxsf
%endif
+# newvboxsf
+# globals for https://github.com/jwrdegoede/vboxsf/archive/fb360320b7d5c2dc74cb958c9b27...
+%global commit1 fb360320b7d5c2dc74cb958c9b27e8708c1c9bc2
+%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
+
# Allow only root to access vboxdrv regardless of the file mode
# use only for debugging!
%bcond_without hardening
@@ -31,26 +36,28 @@
# major version number, while the kernel module abi is not guaranteed
# to be stable. This is so that we force the module update in sync with
# userspace.
-#global prerel 106108
-%global prereltag %{?prerel:-%(awk 'BEGIN {print toupper("%{prerel}")}')}
+#global prerel RC1
+%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
%global vboxrel 1
%global vboxreltag %{?vboxrel:-%{vboxrel}}
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
-Version: 5.2.24
-#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 1%{?dist}
+Version: 6.0.4
+Release: 3%{?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
+Source1: excludekernel-filter.txt
+Source2: https://github.com/jwrdegoede/vboxsf/archive/%{shortcommit1}.zip
+Patch1: Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch
+Patch2: efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch
-#Patch1: changeset_75402.diff
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
@@ -74,11 +81,12 @@ Kernel module for VirtualBox
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
pushd %{name}-%{version}
-#patch1 -p1 -b .rhel76_fix
+%patch1 -p2 -b .kernel_5.0
+%patch2 -p1 -b .kernel_5.1
%if %{with newvboxsf}
rm -rf vboxsf/
unzip %{SOURCE2}
-mv vboxsf-master/ vboxsf/
+mv vboxsf-%{commit1}/ vboxsf/
%endif
popd
@@ -139,8 +147,20 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
-* Mon Jan 21 2019 Sérgio Basto <sergio(a)serjux.com> - 5.2.24-1
-- Update to 5.2.24
+* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 6.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Feb 13 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.4-2
+- Fixes for upcoming kernel 5.1 and update of new vboxsf
+
+* Tue Jan 29 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.4-1
+- Update to 6.0.4
+
+* Thu Jan 17 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 6.0.2-1
+- Update to 6.0.2
+
+* Wed Dec 19 2018 Sérgio Basto <sergio(a)serjux.com> - 6.0.0-1
+- VirtualBox 6.0
* Thu Dec 13 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.22-3
- Fix vboxvideo.ko build on rhel76
diff --git a/efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch b/efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch
new file mode 100644
index 0000000..31aac7e
--- /dev/null
+++ b/efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch
@@ -0,0 +1,86 @@
+From efc7d3081f77ad8507070beecb84fe2d3b62cd74 Mon Sep 17 00:00:00 2001
+From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
+Date: Thu, 7 Feb 2019 15:15:22 +0000
+Subject: [PATCH] Drivers/Linux: fixes for upcoming Linux 5.1 kernel.
+ bugref:4567: Linux kernel driver maintenance. Linux 5.1 moves MAP_SHARED to
+ uapi/linux/mman.h. Thank you Valdis Kletnieks.
+
+git-svn-id: http://www.virtualbox.org/svn/vbox@77198 cfe28804-0f27-0410-a406-dd0f0b0b656f
+---
+ trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+index e7c75ec677..de22ee6cd6 100644
+--- ./vboxnetflt/r0drv/linux/the-linux-kernel.h
++++ ./vboxnetflt/r0drv/linux/the-linux-kernel.h
+@@ -128,6 +128,9 @@
+ # include <linux/cpu.h>
+ # include <linux/notifier.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++# include <uapi/linux/mman.h>
++#endif
+ /* For the basic additions module */
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+--- ./vboxguest/r0drv/linux/the-linux-kernel.h
++++ ./vboxguest/r0drv/linux/the-linux-kernel.h
+@@ -128,6 +128,9 @@
+ # include <linux/cpu.h>
+ # include <linux/notifier.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++# include <uapi/linux/mman.h>
++#endif
+ /* For the basic additions module */
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+--- ./vboxdrv/r0drv/linux/the-linux-kernel.h
++++ ./vboxdrv/r0drv/linux/the-linux-kernel.h
+@@ -128,6 +128,9 @@
+ # include <linux/cpu.h>
+ # include <linux/notifier.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++# include <uapi/linux/mman.h>
++#endif
+ /* For the basic additions module */
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+--- ./vboxpci/r0drv/linux/the-linux-kernel.h
++++ ./vboxpci/r0drv/linux/the-linux-kernel.h
+@@ -128,6 +128,9 @@
+ # include <linux/cpu.h>
+ # include <linux/notifier.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++# include <uapi/linux/mman.h>
++#endif
+ /* For the basic additions module */
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+--- ./vboxsf/r0drv/linux/the-linux-kernel.h
++++ ./vboxsf/r0drv/linux/the-linux-kernel.h
+@@ -128,6 +128,9 @@
+ # include <linux/cpu.h>
+ # include <linux/notifier.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++# include <uapi/linux/mman.h>
++#endif
+ /* For the basic additions module */
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+--- ./vboxnetadp/r0drv/linux/the-linux-kernel.h
++++ ./vboxnetadp/r0drv/linux/the-linux-kernel.h
+@@ -128,6 +128,9 @@
+ # include <linux/cpu.h>
+ # include <linux/notifier.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++# include <uapi/linux/mman.h>
++#endif
+ /* For the basic additions module */
+ #include <linux/pci.h>
+ #include <linux/delay.h>
diff --git a/VirtualBox-kmod-excludekernel-filter.txt b/excludekernel-filter.txt
similarity index 100%
rename from VirtualBox-kmod-excludekernel-filter.txt
rename to excludekernel-filter.txt
diff --git a/sources b/sources
index e95182d..15d2646 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a91d18197f3f0b46120899ec38acf4ea master.zip
+a2346e84a310259c4877b577ea0d93dc fb36032.zip
5 years, 8 months
[VirtualBox-kmod/el7] (8 commits) ...Merge branch 'master' into el7
by Sérgio M. Basto
Summary of changes:
729a728... simplify filename and avoid a weird problem on rpm of F28 (*)
ae7a20d... VirtualBox 6.0 (*)
45d43a4... Update to 6.0.2. (*)
2efdc6b... Update to 6.0.4 (*)
0d16ad7... Fixes for upcoming kernel 5.1 and update of new vboxsf (*)
d5e07f0... - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass (*)
40f66d7... Rebase and squash el7
eb5dd49... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
5 years, 8 months
[VirtualBox-kmod/f28] (10 commits) ...Merge branch 'master' into f29
by Sérgio M. Basto
Summary of changes:
01855cf... Rebuilt (*)
e09dd61... Fix vboxvideo.ko build on rhel76 (*)
729a728... simplify filename and avoid a weird problem on rpm of F28 (*)
ae7a20d... VirtualBox 6.0 (*)
45d43a4... Update to 6.0.2. (*)
2efdc6b... Update to 6.0.4 (*)
0d16ad7... Fixes for upcoming kernel 5.1 and update of new vboxsf (*)
d5e07f0... - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass (*)
00d177b... Reabse and squash f29 (*)
6ef7533... Merge branch 'master' into f29 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 8 months