[VirtualBox/el9] Update VirtualBox to 6.1.34
by Sérgio M. Basto
commit aa4868f7f6630339feaf1dbc67e19b6d5fba2d79
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Apr 19 22:09:18 2022 +0100
Update VirtualBox to 6.1.34
Fix rfbz #6254
Don't build virtualbox-guest-additions on EL-9 because is already provided by
kmod SIG
VirtualBox-60-vboxdrv.rules | 6 +++---
VirtualBox.spec | 12 +++++++++---
sources | 4 ++--
update_vbox.sh | 6 +++---
4 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/VirtualBox-60-vboxdrv.rules b/VirtualBox-60-vboxdrv.rules
index f147ccd..8d8d2aa 100644
--- a/VirtualBox-60-vboxdrv.rules
+++ b/VirtualBox-60-vboxdrv.rules
@@ -1,6 +1,6 @@
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
-KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0666"
-KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="root", MODE="0600"
+KERNEL=="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
+KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666"
+KERNEL=="vboxnetctl", OWNER="root", GROUP="root", MODE="0600"
SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 9a7a0d8..a8c32fe 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -26,7 +26,7 @@
%bcond_without vnc
%bcond_with legacy_vboxvideo_drv
-%if 0%{?fedora} > 27
+%if 0%{?fedora} > 27 || 0%{?rhel} >= 9
%bcond_with guest_additions
%else
%bcond_without guest_additions
@@ -38,8 +38,8 @@
%bcond_without python3
Name: VirtualBox
-Version: 6.1.32
-Release: 5%{?dist}
+Version: 6.1.34
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -901,6 +901,12 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Tue Apr 19 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.34-1
+- Update VirtualBox to 6.1.34
+- Fix rfbz #6254
+- Don't build virtualbox-guest-additions on EL-9 because is already provided by
+ kmod SIG
+
* Mon Feb 21 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.32-5
- Re-enable webservice
diff --git a/sources b/sources
index ad6ee84..ba903b0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (VirtualBox-6.1.32.tar.bz2) = 8bf7af6b8b4d3ba90f0e91589cf26400648436eb9da6d31c1a760460bfe5eb7311ac3220b4c9a98ac50e559641d3d5f559134be65288821038255de1c2c7ce1e
-SHA512 (UserManual.pdf) = b8b41be4647b3f629135c479407b024d77062cf9ad2bb11c7306c70b60fb5aa3563818a06752a8fa623c6de8d5f770d50582a9a73fa18df0c2045027fe956686
+SHA512 (VirtualBox-6.1.34.tar.bz2) = 46d63a9fd9df76af654af59fab5cf555858bc2c4b5dc34e2378d85ae784e6380b6def4aab06909a9b5e114a7297269f90cfb2c3d8d6529b423d703afbad18c64
+SHA512 (UserManual.pdf) = 64d8dc6af48656fef8f8621c86bb80541add6a1d71b41d33bfbf38bb5748b62c05ce0a685926698635b67d154477e0b77066e7e52d4a1fbe2f05a805f7d46c19
diff --git a/update_vbox.sh b/update_vbox.sh
index edd367f..fa9f5ee 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,7 +1,7 @@
-VERSION=6.1.32
+VERSION=6.1.34
REL=1
-RAWHIDE=36
-REPOS="f35 f34 el8 el7"
+RAWHIDE=37
+REPOS="f36 f35 f34 el9 el8 el7"
if [ -z "$1" ]
then
stage=0
2 years, 7 months
[mpv/f36: 2/2] Make sure we're using the full ffmpeg-libs version.
by Vitaly Zaitsev
commit bf71e798864c878720eb5704c46bbb18be536e68
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Apr 19 11:12:19 2022 +0200
Make sure we're using the full ffmpeg-libs version.
mpv.spec | 16 +++++++++++-----
ppc_fix.patch | 20 --------------------
2 files changed, 11 insertions(+), 25 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index ef373de..1ce0247 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,16 +1,12 @@
Name: mpv
Version: 0.34.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+ and LGPLv2+
Summary: Movie player playing most video formats and DVDs
URL: https://%{name}.io/
Source0: https://github.com/%{name}-player/%{name}/archive/v%{version}/%{name}-%{v...
-# Fix ppc as upstream refuse to fix the issue
-# https://github.com/mpv-player/mpv/issues/3776
-Patch1: ppc_fix.patch
-
BuildRequires: pkgconfig(alsa)
BuildRequires: desktop-file-utils
BuildRequires: gcc
@@ -85,6 +81,12 @@ BuildRequires: perl(Encode)
%{?_with_rpi:BuildRequires: raspberrypi-vc-devel}
%endif
+# Fedora now has a stripped ffmpeg. Make sure we're using the full version.
+%if 0%{?fedora} && 0%{?fedora} >= 36
+BuildRequires: ffmpeg-devel
+Requires: ffmpeg-libs%{?_isa}
+%endif
+
# Obsoletes older ci/cd
Obsoletes: %{name}-master < %{version}-100
Provides: %{name}-master = %{version}-100
@@ -179,6 +181,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Tue Apr 19 2022 Vitaly Zaitsev <vitaly(a)easycoding.org> - 0.34.1-5
+- Make sure we're using the full ffmpeg-libs version.
+- Removed no longer required patch.
+
* Fri Mar 04 2022 Leigh Scott <leigh123linux(a)gmail.com> - 0.34.1-4
- Rebuild for new vapoursynth
2 years, 7 months
[performous] Update performous to 1.2.0
by Sérgio M. Basto
commit c1f0af1245cd138f2c155b53713a88abb1207b88
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Apr 19 00:05:58 2022 +0100
Update performous to 1.2.0
This new version is not 2.0.0 as someone wrote, so we need add a new epoch
.gitignore | 1 +
performous-ced-offline.patch | 7 -------
performous-ffmpeg.patch | 11 +++++++++++
performous-gcc12.patch | 16 ++++++++++++++++
performous.spec | 15 +++++++++++----
sources | 2 +-
6 files changed, 40 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 78bdc86..1f2ec62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/performous-57ad2fc.tar.gz
/performous-e0a28a6.tar.gz
/ced-0fe8be4.tar.gz
+/performous-1.2.0.tar.gz
diff --git a/performous-ced-offline.patch b/performous-ced-offline.patch
index e092b15..f8aad7d 100644
--- a/performous-ced-offline.patch
+++ b/performous-ced-offline.patch
@@ -10,10 +10,3 @@
SOURCE_DIR ced-src
)
-@@ -175,4 +172,4 @@ set(CPACK_NSIS_MUI_HEADERIMAGE "${CMAKE_
- set(CPACK_NSIS_MANIFEST_DPI_AWARE ON)
- set(CPACK_NSIS_BRANDING_TEXT "Performous installer ${PROJECT_VERSION} 2009-${YEAR}")
-
--include(CPack)
-\ No newline at end of file
-+include(CPack)
diff --git a/performous-ffmpeg.patch b/performous-ffmpeg.patch
new file mode 100644
index 0000000..cf0d05d
--- /dev/null
+++ b/performous-ffmpeg.patch
@@ -0,0 +1,11 @@
+--- performous-1.2.0/game/ffmpeg.cc.orig 2022-04-18 23:50:35.461091985 +0100
++++ performous-1.2.0/game/ffmpeg.cc 2022-04-18 23:51:44.772857009 +0100
+@@ -251,7 +251,7 @@ FFmpeg::FFmpeg(fs::path const& _filename
+ if (err < 0) throw Error(*this, err);
+ m_formatContext->flags |= AVFMT_FLAG_GENPTS;
+ // Find a track and open the codec
+- AVCodec* codec = nullptr;
++ const AVCodec* codec = nullptr;
+ m_streamId = av_find_best_stream(m_formatContext.get(), static_cast<AVMediaType>(mediaType), -1, -1, &codec, 0);
+ if (m_streamId < 0) throw Error(*this, m_streamId);
+
diff --git a/performous-gcc12.patch b/performous-gcc12.patch
new file mode 100644
index 0000000..31ea6e2
--- /dev/null
+++ b/performous-gcc12.patch
@@ -0,0 +1,16 @@
+--- performous-1.2.0/game/libda/sample.hpp.orig 2022-04-15 01:54:03.737378256 +0100
++++ performous-1.2.0/game/libda/sample.hpp 2022-04-15 01:55:05.137168373 +0100
+@@ -62,10 +62,12 @@ namespace da {
+ static inline int conv_to_s24_fast(sample_t s) { return static_cast<int>(s * max_s24); }
+ static inline int conv_to_s32_fast(sample_t s) { return static_cast<int>(s * max_s32); }
+
+- template <typename ValueType> class step_iterator: public std::iterator<std::random_access_iterator_tag, ValueType> {
++ template <typename ValueType> class step_iterator {
+ ValueType* m_pos;
+ std::ptrdiff_t m_step;
+ public:
++ using iterator_category = std::random_access_iterator_tag;
++ using value_type = ValueType;
+ step_iterator(ValueType* pos, std::ptrdiff_t step): m_pos(pos), m_step(step) {}
+ ValueType& operator*() { return *m_pos; }
+ step_iterator operator+(std::ptrdiff_t rhs) { return step_iterator(m_pos + m_step * rhs, m_step); }
diff --git a/performous.spec b/performous.spec
index 5af7ec7..30ed69c 100644
--- a/performous.spec
+++ b/performous.spec
@@ -7,17 +7,20 @@
%undefine __cmake_in_source_build
Name: performous
-Version: 2.0.0
-Release: 0.9.%{gitdate}git%{shortcommit0}%{?dist}
+Epoch: 1
+Version: 1.2.0
+Release: 1%{?dist}
Summary: Free cross-platform music and rhythm / party game
# The main code is GPLv2+, and there are fonts under ASL 2.0 and SIL licenses
License: GPLv2+ and ASL 2.0 and OFL
URL: https://performous.org
-Source0: https://github.com/performous/performous/archive/%{commit0}/%{name}-%{sho...
+Source0: https://github.com/performous/performous/archive/refs/tags/%{version}/%{n...
Source1: https://github.com/performous/compact_enc_det/archive/%{commit1}/ced-%{sh...
Source3: performous.appdata.xml
Patch0: performous-ced-offline.patch
+Patch1: performous-gcc12.patch
+Patch2: performous-ffmpeg.patch
BuildRequires: alsa-lib-devel
BuildRequires: aubio-devel
@@ -80,7 +83,7 @@ package.
%prep
-%autosetup -p1 -n %{name}-%{commit0}
+%autosetup -p1 -n %{name}-%{version}
mkdir -p %{__cmake_builddir}/ced-src
tar -xf %{SOURCE1} -C %{__cmake_builddir}/ced-src/ --strip 1
cp -p "docs/license/SIL OFL Font License New Rocker.txt" SIL-OFL.txt
@@ -126,6 +129,10 @@ rm -rf %buildroot%{_libdir}/*.{a,la}
%changelog
+* Thu Apr 14 2022 Sérgio Basto <sergio(a)serjux.com> - 1:1.2.0-1
+- Update performous to 1.2.0
+- This new version is not 2.0.0 as someone wrote, so we need add a new epoch
+
* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.0.0-0.9.20210814gite0a28a6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index 8c5f65d..9ec3c2d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (performous-e0a28a6.tar.gz) = 76130c7d25544660a93350cae5f3aa72a39534c574b034836ea9e2149d36d586820e86f1a8033d1ce8dfd9e74283bc4fbe0195f56f705929511caf088055d55b
+SHA512 (performous-1.2.0.tar.gz) = a8fbbe3768f46915eacb65adcc1592295e4c6a84775ca55def01ebcff2218b1860daee0d4d5fcccc407d8df71da1ac25da667b47dd4a17239041a3d5fbfa1c56
SHA512 (ced-0fe8be4.tar.gz) = 9bcd762cda771ba8c2792cd48c8135904127082e10542616e69a257a1e717e71e2b6b50c6590c21392d4e459fd61094c7696893c8f531bcf23f56e6f50f075fe
2 years, 7 months
