[mpd/f30] (2 commits) ...Update to 0.21.21
by Leigh Scott
Summary of changes:
94ecbff... - Rebuild for ffmpeg-4.3 git (*)
44461cf... Update to 0.21.21 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 8 months
[mpd/f31] (2 commits) ...Update to 0.21.21
by Leigh Scott
Summary of changes:
94ecbff... - Rebuild for ffmpeg-4.3 git (*)
44461cf... Update to 0.21.21 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 8 months
[mpd/f32] (2 commits) ...Update to 0.21.21
by Leigh Scott
Summary of changes:
94ecbff... - Rebuild for ffmpeg-4.3 git (*)
44461cf... Update to 0.21.21 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 8 months
[mpd] Update to 0.21.21
by Leigh Scott
commit 44461cfa281e6278fe7d2e2e71f1f53c9d3a5bd2
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Mar 19 23:50:05 2020 +0000
Update to 0.21.21
mpd.spec | 7 +++++--
sources | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/mpd.spec b/mpd.spec
index 1c6183b..1e01d7b 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -16,8 +16,8 @@
Name: mpd
Epoch: 1
-Version: 0.21.20
-Release: 2%{?dist}
+Version: 0.21.21
+Release: 1%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
URL: https://www.musicpd.org
@@ -228,6 +228,9 @@ fi
%changelog
+* Thu Mar 19 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1:0.21.21-1
+- Update to 0.21.21
+
* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1:0.21.20-2
- Rebuild for ffmpeg-4.3 git
diff --git a/sources b/sources
index 073f446..29e27f6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (mpd-0.21.20.tar.xz.sig) = 2e73607c5998b3c8cbf3417355eb1d3a532aff4f5b71d394af2397d2facfdacc00374f8d45c76453cf929012a63770cc56840c2881cd75c214cc68bd619250f1
-SHA512 (mpd-0.21.20.tar.xz) = 9dd49190ba4c85014d24e88cdb02a4649e8fb687a49fc9ea019f23725eda483980008e9abebf0ad3960bd310b693c56999699d7c7ddee3ca18e9b2aa6d5a2176
+SHA512 (mpd-0.21.21.tar.xz) = 1780a24f341dec1cbc3d9170cc2fc8249081cac8f677ff17df15fc959787cf43d30696eefba9b8a44824da14eee3d58e2ee78b34db1335c0a182b4c2a89e6b3a
+SHA512 (mpd-0.21.21.tar.xz.sig) = 620d52a7b38e257fa96609a765588d08a03ce135d515456c8c27b1089233378c06e9c41bcbb97d41bb7c59b642c6e160e0822eca2a5114b95c851abc2a3c4a4f
4 years, 8 months
[VirtualBox/f32] Add Clipboard.patch for guest in epel7
by Sérgio M. Basto
commit e83731c138e911a104e6f682917e9c3da8fd7496
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Mar 19 17:35:50 2020 +0000
Add Clipboard.patch for guest in epel7
Clipboard.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
VirtualBox.spec | 2 ++
2 files changed, 54 insertions(+)
---
diff --git a/Clipboard.patch b/Clipboard.patch
new file mode 100644
index 0000000..6df543f
--- /dev/null
+++ b/Clipboard.patch
@@ -0,0 +1,52 @@
+Shared Clipboard: ticketref:19336 Linux guest: shared clipboard doesn't work (on fresh VirtualBox-6.1.4-136177)
+
+git-svn-id: http://www.virtualbox.org/svn/vbox@83184 cfe28804-0f27-0410-a406-dd0f0b0b656f
+diff --git trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp b/trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
+index ad9e3bf69c..9063b212cd 100644
+--- trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
++++ trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
+@@ -107,7 +107,7 @@ DECLCALLBACK(int) ShClX11RequestDataForX11Callback(PSHCLCONTEXT pCtx, SHCLFORMAT
+ else
+ #endif
+ {
+- uint32_t cbData = _4K; /** @ŧodo Make this dynamic. */
++ uint32_t cbData = _4K; /** @todo Make this dynamic. */
+ void *pvData = RTMemAlloc(cbData);
+ if (pvData)
+ {
+@@ -215,7 +215,6 @@ DECLCALLBACK(void) ShClX11RequestFromX11CompleteCallback(PSHCLCONTEXT pCtx, int
+ *
+ * @returns VBox status code.
+ */
+-#if 0
+ static int vboxClipboardConnect(void)
+ {
+ LogFlowFuncEnter();
+@@ -245,7 +244,6 @@ static int vboxClipboardConnect(void)
+ LogFlowFuncLeaveRC(rc);
+ return rc;
+ }
+-#endif
+
+ /**
+ * The main loop of our clipboard reader.
+@@ -469,7 +467,7 @@ static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
+ RT_NOREF(ppInterface, fDaemonised);
+
+ /* Initialise the guest library. */
+- int rc = 0; //vboxClipboardConnect();
++ int rc = vboxClipboardConnect();
+ if (RT_SUCCESS(rc))
+ {
+ #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
+@@ -477,9 +475,7 @@ static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
+ if (RT_SUCCESS(rc))
+ {
+ #endif
+- RTThreadSleep(60 * 1000);
+-
+- //rc = vboxClipboardMain();
++ rc = vboxClipboardMain();
+
+ #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
+ int rc2 = vboxClipboardFUSEStop();
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 4ee4c2f..0eb03c7 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -92,6 +92,7 @@ Patch70: vbox-python-detection.diff
Patch80: VirtualBox-6.1.4-hacks.patch
Patch81: fixes_for_5.6.patch
+Patch82: Clipboard.patch
BuildRequires: kBuild >= 0.1.9998.r3093
BuildRequires: SDL-devel
@@ -341,6 +342,7 @@ rm -r src/libs/zlib-1.2.*/
%patch70 -p1 -b .python-detection
%patch80 -p1 -b .hack
%patch81 -p1 -b .kernel5.6
+%patch82 -p1 -b .clipboard
%build
./configure --disable-kmods \
4 years, 8 months
[VirtualBox-kmod] Since Fedora kernel 5.5.6 , Backport Virtual Box Guest shared folder support from 5.6, so we don't
by Sérgio M. Basto
commit c2eecd23ae2124d2442ff0e5f0f53e3ba4619045
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Mar 19 12:59:39 2020 +0000
Since Fedora kernel 5.5.6 , Backport Virtual Box Guest shared folder support
from 5.6, so we don't need build "new" vboxsf code, also fix kernel 5.6
akmods build.
VirtualBox-kmod.spec | 37 +++++++++++++++----------------------
1 file changed, 15 insertions(+), 22 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index c941f76..44e8c2e 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -1,18 +1,10 @@
%if 0%{?fedora}
%bcond_with vboxvideo
+%bcond_with vboxguest
%else
%bcond_without vboxvideo
+%bcond_without vboxguest
%endif
-%if 0%{?fedora} > 27
-%bcond_without newvboxsf
-%else
-%bcond_with newvboxsf
-%endif
-
-# newvboxsf
-# globals for https://github.com/jwrdegoede/vboxsf/archive/5aba938bcabd978e4615186ad7d8...
-%global commit1 5aba938bcabd978e4615186ad7d8617d633e6f30
-%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
# Allow only root to access vboxdrv regardless of the file mode
# use only for debugging!
@@ -39,13 +31,13 @@
#global prerel RC1
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%global vboxrel 1
+%global vboxrel 2
%global vboxreltag %{?vboxrel:-%{vboxrel}}
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
Version: 6.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -53,7 +45,6 @@ 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: excludekernel-filter.txt
-Source2: https://github.com/jwrdegoede/vboxsf/archive/%{shortcommit1}.tar.gz
Patch2: kernel-5.patch
@@ -75,15 +66,11 @@ Kernel module for VirtualBox
%prep
-%setup -T -c -a2
+%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
pushd %{name}-%{version}
%patch2 -p1
-%if %{with newvboxsf}
-rm -rf vboxsf/
-mv ../vboxsf-%{commit1}/ vboxsf/
-%endif
popd
@@ -104,13 +91,13 @@ done
%build
for kernel_version in %{?kernel_versions}; do
- for module in vboxdrv %{!?with_newvboxsf:vboxguest}; do
+ for module in vboxdrv %{?with_vboxguest:vboxguest}; do
make VBOX_USE_INSERT_PAGE=1 %{?_smp_mflags} KERN_DIR="${kernel_version##*___}" -C "${kernel_version##*___}" M="${PWD}/_kmod_build_${kernel_version%%___*}/${module}" modules
done
- %if ! %{with newvboxsf}
+ %if %{with vboxguest}
export KBUILD_EXTRA_SYMBOLS=${PWD}/kmod_build_${kernel_version%%___*}/vboxguest/Module.symvers
+ make %{?_smp_mflags} KERN_DIR="${kernel_version##*___}" -C "${kernel_version##*___}" M="${PWD}/_kmod_build_${kernel_version%%___*}/vboxsf" modules
%endif
- make %{?_smp_mflags} KERN_DIR="${kernel_version##*___}" -C "${kernel_version##*___}" M="${PWD}/_kmod_build_${kernel_version%%___*}/vboxsf" modules
for module in vbox{netadp,netflt}; do
export KBUILD_EXTRA_SYMBOLS=${PWD}/_kmod_build_${kernel_version%%___*}/vboxdrv/Module.symvers
make VBOX_USE_INSERT_PAGE=1 %{?_smp_mflags} KERN_DIR="${kernel_version##*___}" -C "${kernel_version##*___}" M="${PWD}/_kmod_build_${kernel_version%%___*}/${module}" modules
@@ -137,14 +124,20 @@ MODS=$(find $(ls -d %{buildroot}%{_prefix}/lib/modules/* |head -n1) -name '*.ko'
%if ! %{with vboxvideo}
rm -rf %{name}-%{version}/vboxvideo
%endif
-%if %{with newvboxsf}
+%if ! %{with vboxguest}
rm -rf %{name}-%{version}/vboxguest
+rm -rf %{name}-%{version}/vboxsf
%endif
DIRS=$(ls %{name}-%{version} |wc -l)
[ $MODS = $DIRS ] || [ $MODS = 0 ]
%changelog
+* Thu Mar 19 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.4-2
+- Since Fedora kernel 5.5.6 , Backport Virtual Box Guest shared folder support
+ from 5.6, so we don't need build "new" vboxsf code, also fix kernel 5.6
+ akmods build.
+
* Fri Feb 21 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.4-1
- Update to 6.1.4
4 years, 8 months
[clipgrab/f30] Update to 3.8.11
by Martin Gansser
Summary of changes:
5934541... Update to 3.8.11 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 8 months
