[VirtualBox/f33] (2 commits) ...Update changelog
by Sérgio M. Basto
Summary of changes:
f36c46b... Use upstreamd patch to build webservice on F33+ (*)
f6f6399... Update changelog (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 7 months
[VirtualBox] Update changelog
by Sérgio M. Basto
commit f6f6399bf5302b1dee0565afb5705d35e2cf214d
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Sep 12 18:02:44 2020 +0100
Update changelog
VirtualBox.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 2cd63b6..54e81ad 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -887,7 +887,8 @@ getent passwd vboxadd >/dev/null || \
%changelog
* Fri Sep 11 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.14-4
-- Use upstreamd patch to build webservice on F33+
+- Use upstreamd patch to build webservice on F33+ and more synchronizations
+ with the debian package.
* Thu Sep 10 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.14-3
- Fixes for kernel 4.9
3 years, 7 months
[VirtualBox] Use upstreamd patch to build webservice on F33+
by Sérgio M. Basto
commit f36c46ba3282a62dbe5782353ad164350b7ccc2b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Sep 12 13:31:03 2020 +0100
Use upstreamd patch to build webservice on F33+
and more synchronizations with the debian package
02-gsoap-build-fix.patch | 14 --------------
7001af05d63c9019d583ad6c4a079995c4a0ba5a.patch | 25 +++++++++++++++++++++++++
VBoxVNC.fix.patch | 17 -----------------
VirtualBox.spec | 23 ++++++++---------------
4 files changed, 33 insertions(+), 46 deletions(-)
---
diff --git a/7001af05d63c9019d583ad6c4a079995c4a0ba5a.patch b/7001af05d63c9019d583ad6c4a079995c4a0ba5a.patch
new file mode 100644
index 0000000..2d0911c
--- /dev/null
+++ b/7001af05d63c9019d583ad6c4a079995c4a0ba5a.patch
@@ -0,0 +1,25 @@
+commit 7001af05d63c9019d583ad6c4a079995c4a0ba5a
+Author: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
+Date: Mon Sep 7 11:21:41 2020 +0000
+
+ Main/webservice: Adjust to allow building with gsoap 2.8.103 and later. Thank you Gianfranco Costamagna for the patch.
+
+
+ git-svn-id: http://www.virtualbox.org/svn/vbox@86039 cfe28804-0f27-0410-a406-dd0f0b0b656f
+
+diff --git a/trunk/src/VBox/Main/webservice/vboxweb.cpp b/trunk/src/VBox/Main/webservice/vboxweb.cpp
+index 53acd0c771..9e74c274f1 100644
+--- trunk/src/VBox/Main/webservice/vboxweb.cpp
++++ trunk/src/VBox/Main/webservice/vboxweb.cpp
+@@ -944,7 +944,11 @@ static void doQueuesLoop()
+ if (rv == 0)
+ continue; // timeout, not necessary to bother gsoap
+ // r < 0, errno
++#if GSOAP_VERSION >= 208103
++ if (soap_socket_errno == SOAP_EINTR)
++#else
+ if (soap_socket_errno(soap.master) == SOAP_EINTR)
++#endif
+ rv = 0; // re-check if we should terminate
+ break;
+ }
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 8e79065..2cd63b6 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -16,11 +16,6 @@
#global prerel RC1
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%if 0%{?fedora} > 32
- %bcond_with webservice
-%else
- %bcond_without webservice
-%endif
# Now we use upstream pdf
%bcond_with docs
%bcond_without vnc
@@ -46,7 +41,7 @@
Name: VirtualBox
Version: 6.1.14
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -73,12 +68,9 @@ Source21: os_mageia_64.png
Patch1: VirtualBox-6.0.0-noupdate.patch
Patch2: VirtualBox-6.1.0-strings.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
-Patch27: VirtualBox-gcc.patch
+#Patch27: VirtualBox-gcc.patch
Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch
Patch30: VirtualBox-python.patch
-# from Debian
-Patch31: 02-gsoap-build-fix.patch
-Patch32: VBoxVNC.fix.patch
# from ArchLinux
Patch40: 007-python2-path.patch
# from Mageia
@@ -96,7 +88,8 @@ Patch70: vbox-python-detection.diff
Patch80: VirtualBox-6.1.4-gcc10.patch
Patch86: VirtualBox-6.1.0-VBoxRem.patch
Patch88: fixes_for_5.9_withoutdrm.patch
-
+# from Debian
+Patch89: 7001af05d63c9019d583ad6c4a079995c4a0ba5a.patch
BuildRequires: kBuild >= 0.1.9998.r3093
BuildRequires: SDL-devel
@@ -327,10 +320,6 @@ rm -r src/libs/zlib-1.2.*/
%patch29 -p2 -R -b .gsoap3
%endif
%patch30 -p1 -b .python39
-%if 0%{?fedora} > 20 || 0%{?rhel} > 7
-%patch31 -p1 -b .gsoap2
-%endif
-%patch32 -p1 -b .vnc
%if %{with python3}
%patch40 -p1 -b .python2_path
%endif
@@ -343,6 +332,7 @@ rm -r src/libs/zlib-1.2.*/
%patch80 -p1 -b .gcc10
%patch86 -p1 -b .vboxrem
%patch88 -p1 -b .kernel-4.9
+%patch89 -p1 -b .webservice
%build
@@ -896,6 +886,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Fri Sep 11 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.14-4
+- Use upstreamd patch to build webservice on F33+
+
* Thu Sep 10 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.14-3
- Fixes for kernel 4.9
3 years, 7 months
[plex-media-player] Rebuild for libcec
by Leigh Scott
commit 0354a28713da9a19c1d197ef51101989c10dc552
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Sep 12 11:11:41 2020 +0100
Rebuild for libcec
plex-media-player.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/plex-media-player.spec b/plex-media-player.spec
index b3e3701..a2ab3ed 100644
--- a/plex-media-player.spec
+++ b/plex-media-player.spec
@@ -9,7 +9,7 @@
Name: plex-media-player
Version: 2.58.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Plex Media Player
License: GPLv2+
@@ -209,6 +209,9 @@ exit 0
%{_unitdir}/%{name}.target
%changelog
+* Sat Sep 12 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-5
+- Rebuild for libcec
+
* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.58.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
3 years, 7 months
[VirtualBox/f33] Fixes for kernel 4.9
by Sérgio M. Basto
Summary of changes:
f45f6e1... Fixes for kernel 4.9 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 7 months
[VirtualBox] Fixes for kernel 4.9
by Sérgio M. Basto
commit f45f6e102cf9bab0e3e95ec78df2cfbe8074bcd8
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Sep 10 02:46:29 2020 +0100
Fixes for kernel 4.9
VirtualBox.spec | 9 +++++--
fixes_for_5.9_withoutdrm.patch | 58 ++++++++++++++++++++++++++++++++++++++++++
update_vbox.sh | 6 +----
3 files changed, 66 insertions(+), 7 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index f878e48..8e79065 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -46,7 +46,7 @@
Name: VirtualBox
Version: 6.1.14
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -95,6 +95,7 @@ Patch70: vbox-python-detection.diff
Patch80: VirtualBox-6.1.4-gcc10.patch
Patch86: VirtualBox-6.1.0-VBoxRem.patch
+Patch88: fixes_for_5.9_withoutdrm.patch
BuildRequires: kBuild >= 0.1.9998.r3093
@@ -312,7 +313,7 @@ rm -r src/VBox/Additions/3D/mesa/mesa-17.3.9/
# src/VBox/GuestHost/OpenGL/include/GL/glext.h have VBOX definitions
#rm -r src/VBox/GuestHost/OpenGL/include/GL
-#rm -rf src/libs/liblzf-3.4/
+#rm -r src/libs/liblzf-3.*/
rm -r src/libs/libpng-1.6.*/
rm -r src/libs/libxml2-2.9.*/
rm -r src/libs/openssl-1.*/
@@ -341,6 +342,7 @@ rm -r src/libs/zlib-1.2.*/
%patch70 -p1 -b .python-detection
%patch80 -p1 -b .gcc10
%patch86 -p1 -b .vboxrem
+%patch88 -p1 -b .kernel-4.9
%build
@@ -894,6 +896,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Thu Sep 10 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.14-3
+- Fixes for kernel 4.9
+
* Tue Sep 08 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.14-2
- Update to VirtualBox-6.1.14a rfbz (#5747)
diff --git a/fixes_for_5.9_withoutdrm.patch b/fixes_for_5.9_withoutdrm.patch
new file mode 100644
index 0000000..5dc00b0
--- /dev/null
+++ b/fixes_for_5.9_withoutdrm.patch
@@ -0,0 +1,58 @@
+This patch file contains the changes needed to compile the VirtualBox
+modules for kernel 5.9.0+.
+
+The changes are as follows:
+1. The kernel headers no longer define HAVE_UNLOCKED_IOCTL; however,
+ this symbol is needed for compilation of VB.
+2. The calling sequence for get_user_pages_remote() is changed.
+3. Routine sched_setscheduler() is replaced by sched_set_fifo_low().
+4. The type of vbox_master_set() is changed from int to void.
+5. Routine drm_gem_object_put_unlocked() is replaced by drm_gem_object_put().
+6. Member offset is removed from struct ttm_buffer_object.
+
+Index: VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+===================================================================
+--- VirtualBox-6.1.14.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
++++ VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+@@ -137,7 +137,10 @@
+ #include <linux/interrupt.h>
+ #include <linux/completion.h>
+ #include <linux/compiler.h>
+-#ifndef HAVE_UNLOCKED_IOCTL /* linux/fs.h defines this */
++#if RTLNX_VER_MIN(5, 9, 0)
++#define HAVE_UNLOCKED_IOCTL 1 /* defined in linux/fs.h for kernels before 5.9 */
++#endif
++#ifndef HAVE_UNLOCKED_IOCTL
+ # include <linux/smp_lock.h>
+ #endif
+ /* For the shared folders module */
+===================================================================
+--- VirtualBox-6.1.14.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
++++ VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+@@ -1181,7 +1181,9 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
+ */
+ else
+ rc = get_user_pages_remote(
++#if RTLNX_VER_MAX(5, 9, 0)
+ pTask, /* Task for fault accounting. */
++#endif
+ pTask->mm, /* Whose pages. */
+ R3Ptr, /* Where from. */
+ cPages, /* How many pages. */
+Index: VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
+===================================================================
+--- VirtualBox-6.1.14.orig/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
++++ VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
+@@ -92,8 +92,12 @@ DECLHIDDEN(int) rtThreadNativeSetPriorit
+ return VERR_INVALID_PARAMETER;
+ }
+
++#if RTLNX_VER_MAX(5, 9, 0)
+ sched_setscheduler(current, iSchedClass, &Param);
+ #else
++ sched_set_fifo_low(current);
++#endif
++#else
+ RT_NOREF_PV(enmType);
+ #endif
+ RT_NOREF_PV(pThread);
diff --git a/update_vbox.sh b/update_vbox.sh
index 0faaa5a..01c7eda 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,5 +1,5 @@
VERSION=6.1.14
-REL=2
+REL=3
RAWHIDE=34
REPOS="f33 f32 f31 el8 el7"
if [ -z "$1" ]
@@ -28,11 +28,7 @@ fi
if test $stage -le 1
then
echo STAGE 1
-if test $REL -eq 1
-then
-echo Press enter to upload sources; read dummy;
rfpkg ci -c && git show
-fi
echo Press enter to push and build on rawhide; read dummy;
rfpkg push && rfpkg build --nowait
fi
3 years, 7 months
[discord/f32] * Updated to 0.0.12
by seancallaway
commit 72cfbb1f7182a98abefec0c98e456d81a3d1c0e8
Author: Sean Callaway <seancallaway(a)gmail.com>
Date: Fri Sep 11 08:48:12 2020 -0700
* Updated to 0.0.12
.gitignore | 1 +
discord.spec | 8 +++++++-
sources | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dfb37ef..50bc1ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/discord-0.0.9.tar.gz
/discord-0.0.10.tar.gz
/discord-0.0.11.tar.gz
+/discord-0.0.12.tar.gz
diff --git a/discord.spec b/discord.spec
index ac8371f..2663813 100644
--- a/discord.spec
+++ b/discord.spec
@@ -3,7 +3,7 @@
%global __requires_exclude libffmpeg.so
Name: discord
-Version: 0.0.11
+Version: 0.0.12
Release: 1%{?dist}
Summary: All-in-one voice and text chat for gamers
@@ -63,6 +63,12 @@ discord.desktop
%changelog
+* Fri Sep 11 2020 Sean Callaway <seancallaway(a)fedoraproject.org> - 0.0.12-1
+* Updated to 0.0.12
+
+* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.0.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Fri Aug 07 2020 Sean Callaway <seancallaway(a)fedoraproject.org> - 0.0.11-1
- Updated to 0.0.11
diff --git a/sources b/sources
index 1d59abd..cdd93d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (discord-0.0.11.tar.gz) = aac728bd514b2d3467bf21291fc96192cc3024b41471cd220e6fd74792a4131a1448cd2e0f5092e476b472be8d12c4deebcc46d2b0908e21b1626215ec7c4d5f
+SHA512 (discord-0.0.12.tar.gz) = c5009e022cac0b76d39cc125a98b9dd3d7a5827dd7d733c5578237b99b746aeccc1cd253aafa99e2a237bd82ef71ee42011f864059aa5ee62812488dbd82f511
3 years, 7 months
[discord/f33] * Updated to 0.0.12
by seancallaway
commit 4ebe90026949fd14bb4b9544b205e03b6969c1f2
Author: Sean Callaway <seancallaway(a)gmail.com>
Date: Fri Sep 11 08:46:17 2020 -0700
* Updated to 0.0.12
.gitignore | 1 +
discord.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dfb37ef..50bc1ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/discord-0.0.9.tar.gz
/discord-0.0.10.tar.gz
/discord-0.0.11.tar.gz
+/discord-0.0.12.tar.gz
diff --git a/discord.spec b/discord.spec
index 17c8b55..2663813 100644
--- a/discord.spec
+++ b/discord.spec
@@ -3,8 +3,8 @@
%global __requires_exclude libffmpeg.so
Name: discord
-Version: 0.0.11
-Release: 2%{?dist}
+Version: 0.0.12
+Release: 1%{?dist}
Summary: All-in-one voice and text chat for gamers
# License Information: https://bugzilla.rpmfusion.org/show_bug.cgi?id=4441#c14
@@ -63,6 +63,9 @@ discord.desktop
%changelog
+* Fri Sep 11 2020 Sean Callaway <seancallaway(a)fedoraproject.org> - 0.0.12-1
+* Updated to 0.0.12
+
* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.0.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 1d59abd..cdd93d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (discord-0.0.11.tar.gz) = aac728bd514b2d3467bf21291fc96192cc3024b41471cd220e6fd74792a4131a1448cd2e0f5092e476b472be8d12c4deebcc46d2b0908e21b1626215ec7c4d5f
+SHA512 (discord-0.0.12.tar.gz) = c5009e022cac0b76d39cc125a98b9dd3d7a5827dd7d733c5578237b99b746aeccc1cd253aafa99e2a237bd82ef71ee42011f864059aa5ee62812488dbd82f511
3 years, 7 months
[discord] * Updated to 0.0.12
by seancallaway
commit 8600718bbdeda3401628382743c0fe83329fdd71
Author: Sean Callaway <seancallaway(a)gmail.com>
Date: Fri Sep 11 08:44:41 2020 -0700
* Updated to 0.0.12
.gitignore | 1 +
discord.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dfb37ef..50bc1ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/discord-0.0.9.tar.gz
/discord-0.0.10.tar.gz
/discord-0.0.11.tar.gz
+/discord-0.0.12.tar.gz
diff --git a/discord.spec b/discord.spec
index 17c8b55..2663813 100644
--- a/discord.spec
+++ b/discord.spec
@@ -3,8 +3,8 @@
%global __requires_exclude libffmpeg.so
Name: discord
-Version: 0.0.11
-Release: 2%{?dist}
+Version: 0.0.12
+Release: 1%{?dist}
Summary: All-in-one voice and text chat for gamers
# License Information: https://bugzilla.rpmfusion.org/show_bug.cgi?id=4441#c14
@@ -63,6 +63,9 @@ discord.desktop
%changelog
+* Fri Sep 11 2020 Sean Callaway <seancallaway(a)fedoraproject.org> - 0.0.12-1
+* Updated to 0.0.12
+
* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.0.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 1d59abd..cdd93d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (discord-0.0.11.tar.gz) = aac728bd514b2d3467bf21291fc96192cc3024b41471cd220e6fd74792a4131a1448cd2e0f5092e476b472be8d12c4deebcc46d2b0908e21b1626215ec7c4d5f
+SHA512 (discord-0.0.12.tar.gz) = c5009e022cac0b76d39cc125a98b9dd3d7a5827dd7d733c5578237b99b746aeccc1cd253aafa99e2a237bd82ef71ee42011f864059aa5ee62812488dbd82f511
3 years, 7 months
