[mixxx/f41] (5 commits) ...New upstream release 2.5.0
by Luís Correia
Summary of changes:
e5cf2b1... use tar.gz source instead of zip for libkeyfinder (*)
20881c1... Revert "use tar.gz source instead of zip for libkeyfinder" (*)
923cf18... Test removing some packages (*)
f25641b... Fully remove ffmpeg from build (*)
850d1f0... New upstream release 2.5.0 (*)
(*) This commit already existed in another branch; no separate mail sent
1 week, 1 day
[mixxx] New upstream release 2.5.0
by Luís Correia
commit 850d1f0c3bdeb10001ae70e7462131d3f0ad9171
Author: Luís Correia <luis.f.correia(a)gmail.com>
Date: Sat Dec 28 18:03:33 2024 +0000
New upstream release 2.5.0
mixxx.spec | 19 ++++++++-----------
sources | 2 +-
2 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 18aed55..a5774d4 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -27,8 +27,8 @@
%endif
Name: mixxx
-Version: 2.4.2
-Release: 3%{?dist}
+Version: 2.5.0
+Release: 0%{?dist}
Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
@@ -54,14 +54,8 @@ BuildRequires: google-benchmark-devel
# Build Requirements
BuildRequires: chrpath
# The runtime libraries of FAAD2 are needed during the build for testing
-# START FEDORA BLOCK
-#BuildRequires: faad2
-#BuildRequires: ffmpeg-devel
-pkgconfig(libavcodec)
-pkgconfig(libavformat)
-pkgconfig(libavutil)
-pkgconfig(libswresample)
-# END FEDORA BLOCK
+BuildRequires: faad2
+BuildRequires: ffmpeg-devel
BuildRequires: flac-devel
BuildRequires: hidapi-devel
BuildRequires: lame-devel
@@ -144,7 +138,7 @@ cp %{SOURCE2} %{__cmake_builddir}/downloads
-DBULK=ON \
-DENGINEPRIME=ON \
-DFAAD=ON \
-# -DFFMPEG=ON \
+ -DFFMPEG=ON \
-DHID=ON \
-DKEYFINDER=ON \
-DLOCALECOMPARE=ON \
@@ -228,6 +222,9 @@ appstreamcli \
%{_udevrulesdir}/69-%{name}-usb-uaccess.rules
%changelog
+* Sat Dec 28 2024 Luís Correia <luis.f.correia(a)gmail.com> - 2.5.0-0
+- New upstream release 2.5.0
+
* Thu Nov 28 2024 Luís Correia <luis.f.correia(a)gmail.com> - 2.4.2-3
- New upstream release 2.4.2
diff --git a/sources b/sources
index 234a604..4dd8122 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (mixxx-2.4.2.tar.gz) = f6478012ba5fbfd4125838e78657d681ace7d9e4eb3f18534d550cd90ce2663952d7780675993d2cb2ff81683004f9cea19827dd2d6ead87b5029326689e6b3a
+SHA512 (mixxx-2.5.0.tar.gz) = ee3c682d40267358025aba5bfdc378fee1cb6691dc899280132f7e69d315b9ce3d8568ca182752bac96a38310c2f2d71ddc80eea4448b8b32bf6ec6a61a9d608
SHA512 (libkeyfinder-2.2.8.zip) = 0fd5c566430f5ffeca4e8a01e925c384ee8206d12b90eeb21c479baf822e741f2d1ac583a0355c380817994232deca314a40c0f65acb3cea84b173627948f3e3
SHA512 (libdjinterop-0.22.1.tar.gz) = 1c35d8609342f133cf002d1908d5746c411a9d5e74b42a7ec045545f07a3f4b8a89ce9a95d2fc17edd8970facafbee1b6d8a9283fcd8c74c9cb96ff61f15d47d
1 week, 1 day
[mixxx] Fully remove ffmpeg from build
by Luís Correia
commit f25641bf017a2aae1658016d9c63966a63d42655
Author: Luís Correia <luis.f.correia(a)gmail.com>
Date: Mon Dec 2 19:49:52 2024 +0000
Fully remove ffmpeg from build
mixxx.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 38dbb9d..18aed55 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -61,7 +61,7 @@ pkgconfig(libavcodec)
pkgconfig(libavformat)
pkgconfig(libavutil)
pkgconfig(libswresample)
-# END BLOCK
+# END FEDORA BLOCK
BuildRequires: flac-devel
BuildRequires: hidapi-devel
BuildRequires: lame-devel
@@ -99,7 +99,7 @@ BuildRequires: wavpack-devel
BuildRequires: zlib-devel
# Runtime Requirements
-Requires: faad2
+#Requires: faad2
Requires: open-sans-fonts
Requires: qt5-qttranslations
@@ -144,7 +144,7 @@ cp %{SOURCE2} %{__cmake_builddir}/downloads
-DBULK=ON \
-DENGINEPRIME=ON \
-DFAAD=ON \
- -DFFMPEG=ON \
+# -DFFMPEG=ON \
-DHID=ON \
-DKEYFINDER=ON \
-DLOCALECOMPARE=ON \
1 week, 1 day
[mixxx] Test removing some packages
by Luís Correia
commit 923cf1874e74585b4d5353996b798899e36dde66
Author: Luís Correia <luis.f.correia(a)gmail.com>
Date: Mon Dec 2 19:33:40 2024 +0000
Test removing some packages
mixxx.spec | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 41c9bf4..38dbb9d 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -54,8 +54,14 @@ BuildRequires: google-benchmark-devel
# Build Requirements
BuildRequires: chrpath
# The runtime libraries of FAAD2 are needed during the build for testing
-BuildRequires: faad2
-BuildRequires: ffmpeg-devel
+# START FEDORA BLOCK
+#BuildRequires: faad2
+#BuildRequires: ffmpeg-devel
+pkgconfig(libavcodec)
+pkgconfig(libavformat)
+pkgconfig(libavutil)
+pkgconfig(libswresample)
+# END BLOCK
BuildRequires: flac-devel
BuildRequires: hidapi-devel
BuildRequires: lame-devel
1 week, 1 day
[olive] Moved to Fedora.
by Dominik Mierzejewski
commit 18794a5519ab2d0718f89a2aaebfe910904d611f
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Dec 27 00:44:50 2024 +0100
Moved to Fedora.
.gitignore | 5 --
armv7_build_fix.patch | 13 ----
dead.package | 1 +
olive.spec | 186 --------------------------------------------------
sources | 1 -
5 files changed, 1 insertion(+), 205 deletions(-)
---
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..768badb
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Moved to Fedora.
1 week, 2 days
[vice/f41] New upstream release 3.9
by Andrea Musuruane
Summary of changes:
e7d6762... New upstream release 3.9 (*)
(*) This commit already existed in another branch; no separate mail sent
1 week, 4 days
[vice] New upstream release 3.9
by Andrea Musuruane
commit e7d676248a6fcaa1f96614b0d999283bbfd5627c
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Wed Dec 25 19:10:20 2024 +0100
New upstream release 3.9
.gitignore | 4 ++++
sources | 2 +-
vice-gtk3-help.patch | 12 +++++++++++
vice.spec | 57 +++++++++++++++++++---------------------------------
4 files changed, 38 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cf3d0e2..d7c00b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,7 @@ vice-2.4.28.tar.gz
/vice-3.2.tar.gz
/vice-3.4.tar.gz
/vice-3.6.1.tar.gz
+/vice-3.7.tar.gz
+/vice-3.7.1.tar.gz
+/vice-3.8.tar.gz
+/vice-3.9.tar.gz
diff --git a/sources b/sources
index 800343e..88cec00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vice-3.6.1.tar.gz) = 9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
+SHA512 (vice-3.9.tar.gz) = 4a349dfe3e4310f1799cc705dffd01243df5b6ecfdb05b5f2ca3213fe6468831735dd3abcd6a34627e8ac2202bcb8ab617b81224c5a41cd83782868dd70b1fb8
diff --git a/vice-gtk3-help.patch b/vice-gtk3-help.patch
new file mode 100644
index 0000000..610d4e8
--- /dev/null
+++ b/vice-gtk3-help.patch
@@ -0,0 +1,12 @@
+diff -durN vice-3.9.orig/src/arch/gtk3/actions-help.c vice-3.9/src/arch/gtk3/actions-help.c
+--- vice-3.9.orig/src/arch/gtk3/actions-help.c 2024-12-24 20:12:44.000000000 +0100
++++ vice-3.9/src/arch/gtk3/actions-help.c 2024-12-25 11:50:31.580165198 +0100
+@@ -65,7 +65,7 @@
+ */
+ path = archdep_get_vice_docsdir();
+
+- uri = util_join_paths(path, "vice.pdf", NULL);
++ uri = util_join_paths(path, "html/vice_toc.html", NULL);
+ debug_gtk3("URI before GTK3: %s", uri);
+ final_uri = g_filename_to_uri(uri, NULL, &error);
+ debug_gtk3("final URI (pdf): %s", final_uri);
diff --git a/vice.spec b/vice.spec
index 5681e81..31fd5d6 100644
--- a/vice.spec
+++ b/vice.spec
@@ -1,8 +1,6 @@
-%define _legacy_common_support 1
-
Name: vice
-Version: 3.6.1
-Release: 7%{?dist}
+Version: 3.9
+Release: 1%{?dist}
Summary: Emulator for a variety of Commodore 8bit machines
Group: Applications/Emulators
License: GPLv2+
@@ -15,6 +13,8 @@ Source4: xpet.metainfo.xml
Source5: xplus4.metainfo.xml
Source6: xvic.metainfo.xml
Patch0: vice-cflags-ldflags-mixup.patch
+# Open HTML docs in GTK3 version
+Patch1: vice-gtk3-help.patch
BuildRequires: gcc-c++
BuildRequires: automake
@@ -26,14 +26,7 @@ BuildRequires: libXrandr-devel
BuildRequires: libGL-devel
BuildRequires: glew-devel
BuildRequires: giflib-devel
-BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
-# The video recording code does not work with the new ffmpeg in F36
-%if 0%{?fedora} >= 36
-BuildRequires: compat-ffmpeg4-devel
-%else
-BuildRequires: ffmpeg-devel
-%endif
BuildRequires: x264-devel
BuildRequires: lame-devel
BuildRequires: flac-devel
@@ -46,11 +39,11 @@ BuildRequires: libpcap-devel
BuildRequires: libieee1284-devel
BuildRequires: libcurl-devel
BuildRequires: pciutils-devel
+BuildRequires: libevdev-devel
BuildRequires: bison
BuildRequires: flex
BuildRequires: perl
BuildRequires: gettext
-BuildRequires: info
BuildRequires: texinfo
BuildRequires: texinfo-tex
BuildRequires: xa
@@ -175,20 +168,17 @@ sed -i "s/\([a-zA-Z0-9]*\)_[0-9]*\.svg/\1/" \
# works around this, but this breaks LTO. So lets just disable LTO for now.
%define _lto_cflags %{nil}
-# The video recording code does not work with the new ffmpeg in F36
-# https://sourceforge.net/p/vice-emu/bugs/1697/
-COMMON_FLAGS="--enable-x64 --enable-ethernet --enable-libieee1284 --disable-arch --enable-external-ffmpeg --enable-lame --with-mpg123 --with-flac --with-vorbis --with-jpeg --with-gif --with-libcurl"
+# The old FFMPEG support was deprecated and is disabled by default. New
+# experimental code was added that will work with external ffmpeg executable
+# instead.
+COMMON_FLAGS="--enable-x64 --enable-ethernet --disable-arch --enable-external-ffmpeg --enable-html-docs --with-libieee1284 --with-lame --with-mpg123 --with-flac --with-vorbis --with-gif --with-libcurl"
# Some of the code uses GNU / XOPEN libc extensions
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE=1"
export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE=1"
-%if 0%{?fedora} >= 36
-export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg4/pkgconfig
-%endif
-
# Build SDL version
-%configure --enable-sdlui2 $COMMON_FLAGS
+%configure --enable-sdl2ui $COMMON_FLAGS
%make_build
# Rename / save SDL binaries
for i in src/x*; do
@@ -199,7 +189,7 @@ done
make distclean
# Build GTK version
-%configure --enable-native-gtk3ui --enable-desktop-files $COMMON_FLAGS
+%configure --enable-gtk3ui --enable-desktop-files $COMMON_FLAGS
%make_build
@@ -216,17 +206,6 @@ pushd data
cp -a --parents $i $RPM_BUILD_ROOT%{_datadir}/%{name}
done
popd
-# We cannot do this in %%prep because the autogen code for infocontrib.h expects
-# vice.texi to still be in ISO-8859-15
-FILE=$RPM_BUILD_ROOT%{_docdir}/%{name}/vice.texi
-iconv -f ISO-8859-15 -t UTF8 $FILE > $FILE.tmp
-touch -r $FILE $FILE.tmp
-mv $FILE.tmp $FILE
-
-# vice installs a bunch of docs under /usr/share/doc/vice which are not really
-# end user oriented. Remove these.
-rm $RPM_BUILD_ROOT%{_docdir}/%{name}/*.txt
-rm $RPM_BUILD_ROOT%{_docdir}/%{name}/GTK3-*.md
# for use of the -data package with libsidplay bases sid players
mkdir -p $RPM_BUILD_ROOT%{_datadir}/sidplayfp
@@ -234,6 +213,11 @@ for i in basic chargen kernal; do
ln -s ../vice/C64/$i $RPM_BUILD_ROOT%{_datadir}/sidplayfp/$i
done
+# Install HTML docs
+mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/html
+cp -a doc/html/{fonts/,images/,vice_*.html,*.css} \
+ $RPM_BUILD_ROOT%{_pkgdocdir}/html
+
# Patch desktop files
sed -i 's!Exec=/usr/bin/!Exec=!' \
src/arch/gtk3/data/unix/vice-org-*.desktop
@@ -244,8 +228,6 @@ sed -i 's!Icon=/usr/share/vice/common/!Icon=!' \
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
for i in src/arch/gtk3/data/unix/vice-org-*.desktop; do
desktop-file-install \
- --add-category=Game \
- --add-category=Emulator \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$i
done
@@ -257,7 +239,7 @@ for c in C128 C64 CBM2 DTV PET Plus4 SCPU SID VIC20; do
install -p -m 644 data/common/${c}_${i}.png \
%{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/${c}.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
- install -p -m 0644 data/common/${c}_*.svg \
+ install -p -m 0644 data/common/${c}_1024.svg \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/${c}.svg
done
done
@@ -275,7 +257,7 @@ done
%files
%files common
-%doc %{_docdir}/%{name}
+%doc %{_pkgdocdir}
%license COPYING
%{_bindir}/c1541
%{_bindir}/cartconv
@@ -330,6 +312,9 @@ done
%changelog
+* Wed Dec 25 2024 Andrea Musuruane <musuruan(a)gmail.com> - 3.9-1
+- New upstream release 3.9
+
* Sat Aug 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3.6.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
1 week, 4 days
[vdr-softhddevice] Update to 2.4.1
by Martin Gansser
commit ab232ee346ca7e8a65adb1b4eddecd9fdd98155b
Author: Martin Gansser <mgansser(a)netcom-mail.de>
Date: Wed Dec 25 08:53:25 2024 +0100
Update to 2.4.1
.gitignore | 1 +
sources | 2 +-
vdr-softhddevice.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c05eead..0ee46e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@
/vdr-softhddevice-2.3.7.tar.gz
/vdr-softhddevice-2.3.8.tar.gz
/vdr-softhddevice-2.4.0.tar.gz
+/vdr-softhddevice-2.4.1.tar.gz
diff --git a/sources b/sources
index 62ecde9..20a8b2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-softhddevice-2.4.0.tar.gz) = 2831b5f3c4123ee13f2b6660f1f503433ce56bd89c1ccd9d7756919614275b298dfb1baaf523228f54835167faea8cbcf5fbf4dd73a02aba441befc568e07df0
+SHA512 (vdr-softhddevice-2.4.1.tar.gz) = 2842727d2a1b5aa22a4cf5b7334178e062244503c8777b3bd6b593b9fdfd16f7fcd77e83630a43f2038992e167c83e3dfeacbd4bb10ffccb44a2178f57593b15
diff --git a/vdr-softhddevice.spec b/vdr-softhddevice.spec
index ea931dd..c266541 100644
--- a/vdr-softhddevice.spec
+++ b/vdr-softhddevice.spec
@@ -8,7 +8,7 @@
%endif
Name: vdr-softhddevice
-Version: 2.4.0
+Version: 2.4.1
Release: 1%{?dist}
Summary: A software and GPU emulated HD output device plugin for VDR
@@ -89,6 +89,9 @@ install -Dpm 644 %{SOURCE1} \
%license AGPL-3.0.txt
%changelog
+* Wed Dec 25 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 2.4.1-1
+- Update to 2.4.1
+
* Tue Dec 17 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 2.4.0-1
- Update to 2.4.0
1 week, 4 days
