[VirtualBox/f41] (4 commits) ...Fix License and cleanups
by Sérgio M. Basto
Summary of changes:
d412329... Update VirtualBox to 7.1.0 (*)
2104475... Also drop VirtualBox-python3.12.patch (*)
c969b03... Drop support to enable the build of old vboxvideo (guest dr (*)
b7f6683... Fix License and cleanups (*)
(*) This commit already existed in another branch; no separate mail sent
1 day, 1 hour
[VirtualBox] Fix License and cleanups
by Sérgio M. Basto
commit b7f6683f7489c66f7061aa77b43f7c788e005e31
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Sep 17 19:51:31 2024 +0100
Fix License and cleanups
VirtualBox.spec | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index ca34376..02848c3 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -53,8 +53,8 @@ Version: 7.1.0
Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
-License: GPLv2 or (GPLv2 and CDDL)
-URL: http://www.virtualbox.org/wiki/VirtualBox
+License: GPL-3.0-only AND (GPL-3.0-only OR CDDL-1.0)
+URL: https://www.virtualbox.org/wiki/VirtualBox
ExclusiveArch: x86_64
@@ -293,7 +293,6 @@ rm -r src/VBox/Additions/WINNT
rm -r src/VBox/Additions/os2
rm -r kBuild/
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/3D/mesa/mesa-21.3.8/
@@ -371,24 +370,24 @@ umask 0022
# really been installed to. Therefore we do not override any of
# the installation paths, but install the tree with the default
# layout under 'obj' and shuffle files around in %%install.
-kmk %{_smp_mflags} \
- KBUILD_VERBOSE=2 \
- PATH_OUT="$PWD/obj" \
- TOOL_YASM_AS=yasm \
+kmk %{_smp_mflags} \
+ KBUILD_VERBOSE=2 \
+ PATH_OUT="$PWD/obj" \
+ TOOL_YASM_AS=yasm \
VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \
VBOX_PATH_APP_DOCS=%{_docdir}/VirtualBox \
VBOX_WITH_VBOX_IMG=1 \
VBOX_WITH_VBOXIMGMOUNT=1 \
VBOX_WITH_SYSFS_BY_DEFAULT=1 \
- VBOX_USE_SYSTEM_XORG_HEADERS=1 \
+ VBOX_USE_SYSTEM_XORG_HEADERS=1 \
VBOX_USE_SYSTEM_GL_HEADERS=1 \
- VBOX_NO_LEGACY_XORG_X11=1 \
+ VBOX_NO_LEGACY_XORG_X11=1 \
SDK_VBoxLibPng_INCS=/usr/include/libpng16 \
SDK_VBoxLibXml2_INCS=/usr/include/libxml2 \
SDK_VBoxLzf_LIBS="lzf" \
SDK_VBoxLzf_INCS="/usr/include/liblzf" \
- SDK_VBOX_OPENSSL_INCS="" \
- SDK_VBOX_OPENSSL_LIBS="ssl crypto" \
+ SDK_VBoxOpenSslStatic_INCS="/usr/include/openssl" \
+ SDK_VBoxOpenSslStatic_LIBS="ssl crypto" \
SDK_VBoxZlib_INCS="" \
%{?with_system_libtpms: SDK_VBOX_LIBTPMS_INCS="/usr/include/libtpms"} \
SDK_VBoxLibVorbis_INCS="/usr/include/vorbis" \
1 day, 2 hours
[VirtualBox] Drop support to enable the build of old vboxvideo (guest drive)
by Sérgio M. Basto
commit c969b032411cbe85455c2e52482573a142833451
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Sep 17 18:35:03 2024 +0100
Drop support to enable the build of old vboxvideo (guest drive)
This is disabled with VBOX_NO_LEGACY_XORG_X11=1 , no need to patch the code !
https://www.virtualbox.org/changeset/64270/vbox
VirtualBox.spec | 31 +++++--------------------------
1 file changed, 5 insertions(+), 26 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 833db86..ca34376 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -22,7 +22,6 @@
# Now we use upstream pdf
%bcond_with docs
%bcond_without vnc
-%bcond_with legacy_vboxvideo_drv
%if 0%{?fedora} > 27 || 0%{?rhel} >= 9
%bcond_with guest_additions
@@ -51,7 +50,7 @@
Name: VirtualBox
Version: 7.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -161,10 +160,6 @@ BuildRequires: libstdc++-static
# For the X11 module
BuildRequires: libdrm-devel
-%if %{with legacy_vboxvideo_drv}
-BuildRequires: libpciaccess-devel
-BuildRequires: pixman-devel
-%endif
BuildRequires: xorg-x11-proto-devel
BuildRequires: libXcomposite-devel
BuildRequires: libXcursor-devel
@@ -387,7 +382,7 @@ kmk %{_smp_mflags} \
VBOX_WITH_SYSFS_BY_DEFAULT=1 \
VBOX_USE_SYSTEM_XORG_HEADERS=1 \
VBOX_USE_SYSTEM_GL_HEADERS=1 \
-%{!?legacy_vboxvideo_drv: VBOX_NO_LEGACY_XORG_X11=1 } \
+ VBOX_NO_LEGACY_XORG_X11=1 \
SDK_VBoxLibPng_INCS=/usr/include/libpng16 \
SDK_VBoxLibXml2_INCS=/usr/include/libxml2 \
SDK_VBoxLzf_LIBS="lzf" \
@@ -575,22 +570,6 @@ install -p -m 0644 obj/bin/virtualbox.xml %{buildroot}%{_datadir}/mime/packages
# Guest X.Org drivers
mkdir -p %{buildroot}%{_libdir}/security
-# Michael Thayer from Oracle wrote: I have applied the patch [1] I posted so that you
-# can build with VBOX_USE_SYSTEM_XORG_HEADERS=1 set in future to only
-# build the X.Org drivers against the installed system headers.
-# also wrote:
-# As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not
-# build it in this case.
-# and
-# Build using local X.Org headers. We assume X.Org Server 1.7 or later.
-#
-# [1] https://www.virtualbox.org/changeset/43588/vbox
-
-%if %{with legacy_vboxvideo_drv}
-install -m 0755 -D obj/bin/additions/vboxvideo_drv_system.so \
- %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
-%endif
-
# Guest-additions tools
install -m 0755 -t %{buildroot}%{_sbindir} \
obj/bin/additions/VBoxService \
@@ -861,9 +840,6 @@ getent passwd vboxadd >/dev/null || \
%{_sbindir}/VBoxService
%{_sbindir}/mount.vboxsf
%{_libdir}/security/pam_vbox.so
-%if %{with legacy_vboxvideo_drv}
-%{_libdir}/xorg/modules/drivers/*
-%endif
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
%{_unitdir}/vboxclient.service
@@ -878,6 +854,9 @@ getent passwd vboxadd >/dev/null || \
%changelog
* Tue Sep 17 2024 Sérgio Basto <sergio(a)serjux.com> - 7.1.0-2
- Also drop VirtualBox-python3.12.patch
+- Drop support to enable the build of old vboxvideo (guest drive)
+ is disabled with VBOX_NO_LEGACY_XORG_X11=1 , no need to patch the code !
+ https://www.virtualbox.org/changeset/64270/vbox
* Mon Sep 16 2024 Sérgio Basto <sergio(a)serjux.com> - 7.1.0-1
- Update VirtualBox to 7.1.0
1 day, 2 hours
[VirtualBox] Also drop VirtualBox-python3.12.patch
by Sérgio M. Basto
commit 210447527b4f8657905e6d2775214e2cd1b6b39e
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Sep 17 18:34:35 2024 +0100
Also drop VirtualBox-python3.12.patch
VirtualBox-python3.12.patch | 129 --------------------------------------------
VirtualBox.spec | 6 ++-
2 files changed, 4 insertions(+), 131 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 5d4c3a3..833db86 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -43,6 +43,7 @@
%endif
%if 0%{?fedora} > 40
+# Python is not detected, yet
%bcond_with python3
%else
%bcond_without python3
@@ -94,7 +95,6 @@ Patch60: VirtualBox-7.0.2-xclient-cleanups.patch
# from Arch
Patch70: 009-properly-handle-i3wm.patch
-Patch90: VirtualBox-python3.12.patch
BuildRequires: gcc-c++
BuildRequires: kBuild >= 0.1.9998.r3093
@@ -336,7 +336,6 @@ rm -r src/libs/libtpms-0.9.*/
%patch -P 60 -p1 -b .xclient
%patch -P 70 -p1 -b .i3wm
-#patch -P 90 -p1 -b .python3.12
%build
@@ -877,6 +876,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Tue Sep 17 2024 Sérgio Basto <sergio(a)serjux.com> - 7.1.0-2
+- Also drop VirtualBox-python3.12.patch
+
* Mon Sep 16 2024 Sérgio Basto <sergio(a)serjux.com> - 7.1.0-1
- Update VirtualBox to 7.1.0
1 day, 2 hours
[motion/f41] Update to 4.7.0
by Leigh Scott
Summary of changes:
46411ed... Update to 4.7.0 (*)
(*) This commit already existed in another branch; no separate mail sent
1 day, 10 hours
[xroar/f41] new version
by Andrea Musuruane
Summary of changes:
967e9ba... new version (*)
(*) This commit already existed in another branch; no separate mail sent
1 day, 10 hours
[xroar] new version
by Andrea Musuruane
commit 967e9badc36df4132573cd90eec794ac71e529d6
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Tue Sep 17 16:15:38 2024 +0200
new version
.gitignore | 1 +
sources | 2 +-
xroar.spec | 9 ++++++---
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 08ecff8..48f0d06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ dragon.rom
/xroar-1.5.3.tar.gz
/xroar-1.5.4.tar.gz
/xroar-1.5.5.tar.gz
+/xroar-1.6.3.tar.gz
diff --git a/sources b/sources
index f8c9d54..70eeb6f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (dragon.rom) = bbe3dc286a828acd745155ad8b2f8f1dc7d674c10deae619758662a4f45feefd1d1aea6b8b09f4c4db8b40cbaf475ab540d88d8286e1e4f8478692ad08979285
-SHA512 (xroar-1.5.5.tar.gz) = 3ffee8609939c1c73fd50020f9bb90c37375c7676078b6128453b048ce367458548de505a27fc16d31bcb05a866927f13503aafb7af7b2f90d3d22eb6739ec49
+SHA512 (xroar-1.6.3.tar.gz) = 1d077e2157fda27323be3b4210f671c10a017d00099dd437bc84a20a4050712e05a9cf1d40f9f00bfd02a1f4283d3791deccd50ba66d294166880b059c2d41bd
diff --git a/xroar.spec b/xroar.spec
index a9d41f7..c58a8fc 100644
--- a/xroar.spec
+++ b/xroar.spec
@@ -1,6 +1,6 @@
Name: xroar
-Version: 1.5.5
-Release: 2%{?dist}
+Version: 1.6.3
+Release: 1%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
License: GPLv3+
URL: http://www.6809.org.uk/xroar/
@@ -94,11 +94,14 @@ rm -f %{buildroot}%{_infodir}/dir
%{_mandir}/man1/%{name}.1*
%license COPYING.GPL COPYING.LGPL
%doc ChangeLog README README.SDS
-%doc doc/%{name}.html doc/%{name}-screens.png doc/%{name}-timebandit-af.png
+%doc doc/%{name}.html doc/*.png
%doc doc/%{name}.pdf
%changelog
+* Mon Sep 16 2024 Andrea Musuruane <musuruan(a)gmail.com> - 1.6.3-1
+- new version
+
* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.5.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
1 day, 10 hours
