[VirtualBox/f28] (2 commits) ...Fix build
by Sérgio M. Basto
Summary of changes:
84eba00... Don't build guest-additions for F28+ (now it is available o (*)
3d2e8bf... Fix build (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 11 months
[VirtualBox] Fix build
by Sérgio M. Basto
commit 3d2e8bffa3fe27205dc119ca0a1a38320a88bee9
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Apr 26 16:20:54 2018 +0100
Fix build
VirtualBox.spec | 2 --
1 file changed, 2 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index d023483..e207020 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -177,7 +177,6 @@ Provides: %{name}-kmod-common = %{version}-%{release}
%{name} without Qt GUI part.
-%if %{with webservice}
%package webservice
Summary: WebService GUI part for %{name}
Group: System/Emulators/PC
@@ -185,7 +184,6 @@ Requires: %{name}-server%{?isa} = %{version}
%description webservice
webservice GUI part for %{name}.
-%endif
%package devel
5 years, 11 months
[VirtualBox] Don't build guest-additions for F28+ (now it is available on Fedora proper)
by Sérgio M. Basto
commit 84eba007f8b42e388aca342b70825ed2ea9d54a0
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Apr 26 03:45:07 2018 +0100
Don't build guest-additions for F28+ (now it is available on Fedora proper)
VirtualBox.spec | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 45adae4..d023483 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -29,11 +29,16 @@
%endif
%bcond_without vnc
%bcond_with legacy_vboxvideo_drv
+%if 0%{?fedora} > 27
+ %bcond_with guest_additions
+%else
+ %bcond_without guest_additions
+%endif
Name: VirtualBox
Version: 5.2.10
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -466,6 +471,7 @@ do
done
install -p -m 0644 obj/bin/virtualbox.xml %{buildroot}%{_datadir}/mime/packages
+%if %{with guest_additions}
# Guest X.Org drivers
mkdir -p %{buildroot}%{_libdir}/security
mkdir -p %{buildroot}%{_libdir}/VBoxGuestAdditions
@@ -524,6 +530,7 @@ sed -i 's/vboxvideo/#vboxvideo/' %{buildroot}%{_prefix}/lib/modules-load.d/%{nam
#sed -i s/vboxguest/d %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
sed -i 's/vboxguest/#vboxguest/' %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
%endif
+%endif
# Module Source Code
mkdir -p %{name}-kmod-%{version}
@@ -589,15 +596,11 @@ fi
# should be in kmod package, not here
/bin/systemctl restart systemd-modules-load.service >/dev/null 2>&1 || :
-%if %{with webservice}
%post webservice
- %systemd_post vboxweb-httpd.service
-%endif
+%systemd_post vboxweb-httpd.service
-%if %{with webservice}
%preun webservice
- %systemd_preun vboxweb.service
-%endif
+%systemd_preun vboxweb.service
%postun
if [ $1 -eq 0 ] ; then
@@ -609,10 +612,8 @@ if [ $1 -eq 0 ] ; then
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
fi
-%if %{with webservice}
%postun webservice
- %systemd_postun_with_restart vboxweb.service
-%endif
+%systemd_postun_with_restart vboxweb.service
# Desktop databases F23 and F24 only
/usr/bin/update-desktop-database &> /dev/null || :
@@ -751,6 +752,7 @@ getent passwd vboxadd >/dev/null || \
%{_libdir}/virtualbox/VBoxPython2_7.so
%{_libdir}/virtualbox/sdk/bindings/xpcom/python
+%if %{with guest_additions}
%files guest-additions
%license COPYING*
%{_bindir}/VBoxClient
@@ -770,11 +772,15 @@ getent passwd vboxadd >/dev/null || \
%{_prefix}/lib/modules-load.d/%{name}-guest.conf
%{_unitdir}/vboxservice.service
%{_presetdir}/96-vbox.preset
+%endif
%files kmodsrc
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Thu Apr 26 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.10-2
+- Don't build guest-additions for F28+ (now it is available on Fedora proper)
+
* Thu Apr 19 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.10-1
- Update VBox to 5.2.10
5 years, 11 months
[vdr-mpv] Rebuilt for vdr-2.4.0
by Martin Gansser
commit 929caee6c446f1b39f37d07ad9575c0a1cf78764
Author: Martin Gansser <mgansser(a)online.de>
Date: Thu Apr 26 15:10:41 2018 +0200
Rebuilt for vdr-2.4.0
clog | 2 --
vdr-mpv.spec | 5 ++++-
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/vdr-mpv.spec b/vdr-mpv.spec
index c501ec7..886fdd6 100644
--- a/vdr-mpv.spec
+++ b/vdr-mpv.spec
@@ -2,7 +2,7 @@
Name: vdr-%{pname}
Version: 0.0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A mpv player plugin for VDR
Group: Applications/Multimedia
License: AGPLv3+
@@ -38,6 +38,9 @@ make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
%changelog
+* Wed Apr 18 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 0.0.4-5
+- Rebuilt for vdr-2.4.0
+
* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 0.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
5 years, 11 months
[vdr-xineliboutput] Rebuilt for vdr-2.4.0
by Martin Gansser
commit 6fc50f1a7cef1c409e1774fd72c7029841664c72
Author: Martin Gansser <mgansser(a)online.de>
Date: Thu Apr 26 08:27:17 2018 +0200
Rebuilt for vdr-2.4.0
vdr-xineliboutput.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/vdr-xineliboutput.spec b/vdr-xineliboutput.spec
index c82b556..152c8c7 100644
--- a/vdr-xineliboutput.spec
+++ b/vdr-xineliboutput.spec
@@ -10,7 +10,7 @@
Name: vdr-%{pname}
Version: 2.1.0
-Release: 4.%{gitdate}git%{gitrev}%{?dist}
+Release: 5.%{gitdate}git%{gitrev}%{?dist}
Summary: Plugins for watching VDR over Xine
Group: Applications/Multimedia
License: GPLv2+
@@ -105,7 +105,6 @@ install -dm 755 %{buildroot}%{_datadir}/vdr/xineliboutput
install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/vdr-plugins.d/xineliboutput.conf
install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/vdr/plugins/%{pname}/
-#make install DESTDIR=%{buildroot}
%make_install
install -pm 755 mpg2c %{buildroot}%{_bindir}/mpg2c
@@ -144,11 +143,12 @@ find %{buildroot}%{xineplugindir} -name '*.so' -exec chmod +x '{}' ';'
%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
%{vdr_plugindir}/libxineliboutput-fbfe.so.%{xinepluginver}
-#%%{vdr_plugindir}/libxineliboutput-fbfe.so.%%{xinepluginver}-git
%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}
-#%%{vdr_plugindir}/libxineliboutput-sxfe.so.%%{xinepluginver}-git
%changelog
+* Wed Apr 18 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 2.1.0-5.20180226git747f03e
+- Rebuilt for vdr-2.4.0
+
* Sat Mar 10 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 2.1.0-4.20180226git747f03e
- Update to 2.1.0-4.20180226git747f03e
5 years, 11 months
[VirtualBox/el7] (2 commits) ...Update VBox to 5.2.10
by Sérgio M. Basto
Summary of changes:
2a1aef5... Add patches from virtualbox-guest-additions of Fedora prope (*)
e0535f5... Update VBox to 5.2.10 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 12 months
[VirtualBox/f26] (2 commits) ...Update VBox to 5.2.10
by Sérgio M. Basto
Summary of changes:
2a1aef5... Add patches from virtualbox-guest-additions of Fedora prope (*)
e0535f5... Update VBox to 5.2.10 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 12 months
[VirtualBox/f27] (2 commits) ...Update VBox to 5.2.10
by Sérgio M. Basto
Summary of changes:
2a1aef5... Add patches from virtualbox-guest-additions of Fedora prope (*)
e0535f5... Update VBox to 5.2.10 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 12 months
[VirtualBox-kmod] Add fix for kernel 4.17
by Sérgio M. Basto
commit 0d2973dcb6776085238044694866a229061d1ef3
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Apr 26 00:38:10 2018 +0100
Add fix for kernel 4.17
VirtualBox-kmod.spec | 5 ++++-
fixes_for_4.17.patch | 29 +++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 1ed13c8..7f0b698 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -36,7 +36,7 @@
Name: VirtualBox-kmod
Version: 5.2.10
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -122,6 +122,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Wed Apr 25 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.10-2
+- Add fix for kernel 4.17
+
* Tue Apr 24 2018 Sérgio Basto <sergio(a)serjux.com> - 5.2.10-1
- Update to 5.2.10
diff --git a/fixes_for_4.17.patch b/fixes_for_4.17.patch
new file mode 100644
index 0000000..89cecf9
--- /dev/null
+++ b/fixes_for_4.17.patch
@@ -0,0 +1,29 @@
+In kernel 4.17, pci_get_bus_and_slot() has been removed in favor of
+pci_get_domain_bus_and_slot(). It appears that VirtualBox only uses
+domain number 0, thus pci_get_domain_bus_and_slot(0, bus, devfn)
+is a suitable replacement for pci_get_bus_and_slot(bus, devfn).
+
+The resulting code compiles; however, I do not use PCI passthru, which
+I think means that I have not actually tested the code.
+
+This patch released under a combined MIT/GPLv2 license.
+
+Signed-off-by: Larry Finger <Larry.Finger(a)lwfinger.net>
+
+--- VirtualBox-kmod-5.2.10/vboxpci/linux/VBoxPci-linux.c.orig 2018-04-26 00:28:06.691593982 +0100
++++ VirtualBox-kmod-5.2.10/vboxpci/linux/VBoxPci-linux.c 2018-04-26 00:28:32.171875664 +0100
+@@ -89,7 +89,14 @@ MODULE_VERSION(VBOX_VERSION_STRING " r"
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
+ # define PCI_DEV_GET(v,d,p) pci_get_device(v,d,p)
+ # define PCI_DEV_PUT(x) pci_dev_put(x)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
++/* assume the domain number to be zero - exactly the same assumption of
++ * pci_get_bus_and_slot()
++ */
++# define PCI_DEV_GET_SLOT(bus, devfn) pci_get_domain_bus_and_slot(0, bus, devfn)
++#else
+ # define PCI_DEV_GET_SLOT(bus, devfn) pci_get_bus_and_slot(bus, devfn)
++#endif
+ #else
+ # define PCI_DEV_GET(v,d,p) pci_find_device(v,d,p)
+ # define PCI_DEV_PUT(x) do { } while (0)
5 years, 12 months
[vdr-softhddevice-openglosd] Rebuilt for vdr-2.4.0
by Martin Gansser
commit c0860be5d97dfee3f4a5ccd81fb2889a027616e1
Author: Martin Gansser <mgansser(a)online.de>
Date: Wed Apr 25 13:25:50 2018 +0200
Rebuilt for vdr-2.4.0
vdr-softhddevice-openglosd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vdr-softhddevice-openglosd.spec b/vdr-softhddevice-openglosd.spec
index c149d12..3fe2f43 100644
--- a/vdr-softhddevice-openglosd.spec
+++ b/vdr-softhddevice-openglosd.spec
@@ -11,7 +11,7 @@
Name: vdr-softhddevice-openglosd
Version: 0.6.1
-Release: 15.%{gitdate}git%{shortcommit}%{?dist}
+Release: 16.%{gitdate}git%{shortcommit}%{?dist}
Summary: A software and GPU emulated HD output device plugin for VDR
License: AGPLv3
@@ -108,6 +108,9 @@ install -Dpm 644 %{SOURCE1} \
%license AGPL-3.0.txt
%changelog
+* Wed Apr 18 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.1-16.20160717git569fde5
+- Rebuilt for vdr-2.4.0
+
* Mon Feb 26 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.6.1-15.20160717git569fde5
- Use compat-ffmpeg28 for F28
5 years, 12 months