[vcmi: 6/6] Update changelog
by runlevel5
commit 8c2da46d21e8092365817a80e66406f6a329cbee
Author: Trung Lê <8(a)tle.id.au>
Date: Mon Jul 8 12:44:21 2024 +1000
Update changelog
vcmi.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vcmi.spec b/vcmi.spec
index c7a639b..7e77887 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -7,7 +7,7 @@ URL: https://vcmi.eu/
%global fuzzylite_version 6.0
Version: 1.5.2
-Release: 0%{?dist}
+Release: 1%{?dist}
# vcmi is GPL-2.0-or-later, fuzzylight is GPL-3.0-only
License: GPL-2.0-or-later AND GPL-3.0-only
@@ -128,6 +128,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
%changelog
+* Mon Jul 8 2024 Peter Lemenkov <lemenkov(a)gmail.com> - 1.5.2-1
+- Refactoring
+
* Wed Jun 5 2024 Trung Lê <8(a)tle.id.au> - 1.5.2-0
- New upstream release
4 months, 2 weeks
[vcmi] (6 commits) ...Update changelog
by runlevel5
Summary of changes:
c965fb1... This patch is no longer required (*)
f973172... Avoid using git commit hash (*)
2be5a39... boost-devel pulls in these deps (*)
a29398a... Can be built with ffmpeg-free-devel as well (*)
2ab69d4... Switch to SPDX license identifiers (*)
8c2da46... Update changelog
(*) This commit already existed in another branch; no separate mail sent
4 months, 2 weeks
[vcmi/f40] Update changelog
by runlevel5
commit 1949c9d443bc40041390b2f90a4f7cd0515afba3
Author: Trung Lê <8(a)tle.id.au>
Date: Mon Jul 8 12:44:21 2024 +1000
Update changelog
vcmi.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vcmi.spec b/vcmi.spec
index c7a639b..7e77887 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -7,7 +7,7 @@ URL: https://vcmi.eu/
%global fuzzylite_version 6.0
Version: 1.5.2
-Release: 0%{?dist}
+Release: 1%{?dist}
# vcmi is GPL-2.0-or-later, fuzzylight is GPL-3.0-only
License: GPL-2.0-or-later AND GPL-3.0-only
@@ -128,6 +128,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
%changelog
+* Mon Jul 8 2024 Peter Lemenkov <lemenkov(a)gmail.com> - 1.5.2-1
+- Refactoring
+
* Wed Jun 5 2024 Trung Lê <8(a)tle.id.au> - 1.5.2-0
- New upstream release
4 months, 2 weeks
[vcmi/f40] Can be built with ffmpeg-free-devel as well
by runlevel5
commit a29398a4ed39d21d0677097fedefdb63d76afe64
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Thu Jul 4 21:07:06 2024 +0200
Can be built with ffmpeg-free-devel as well
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
vcmi.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vcmi.spec b/vcmi.spec
index ff29584..adb9a18 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -32,7 +32,10 @@ BuildRequires: luajit-devel
BuildRequires: minizip-ng-devel
BuildRequires: tbb-devel
BuildRequires: zlib-devel
-BuildRequires: ffmpeg-devel
+BuildRequires: pkgconfig(libavcodec)
+BuildRequires: pkgconfig(libavformat)
+BuildRequires: pkgconfig(libavutil)
+BuildRequires: pkgconfig(libswscale)
BuildRequires: qt6-qtbase-devel
BuildRequires: qt6-qttools-devel
BuildRequires: qt6-linguist
4 months, 2 weeks
[vcmi/f40] boost-devel pulls in these deps
by runlevel5
commit 2be5a39672dcd5991dd2a6ba2be2472b0da8de26
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Thu Jul 4 21:06:05 2024 +0200
boost-devel pulls in these deps
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
vcmi.spec | 7 -------
1 file changed, 7 deletions(-)
---
diff --git a/vcmi.spec b/vcmi.spec
index dbe65f0..ff29584 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -23,14 +23,7 @@ BuildRequires: SDL2-devel
BuildRequires: SDL2_image-devel
BuildRequires: SDL2_ttf-devel
BuildRequires: SDL2_mixer-devel
-BuildRequires: boost >= 1.51
BuildRequires: boost-devel >= 1.51
-BuildRequires: boost-filesystem >= 1.51
-BuildRequires: boost-iostreams >= 1.51
-BuildRequires: boost-system >= 1.51
-BuildRequires: boost-thread >= 1.51
-BuildRequires: boost-program-options >= 1.51
-BuildRequires: boost-locale >= 1.51
BuildRequires: libappstream-glib
%ifnarch ppc64le
# luajit does not support ppc64le
4 months, 2 weeks
[vcmi/f40] Avoid using git commit hash
by runlevel5
commit f97317289497657212aeea985deb10f32c0f9e52
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Thu Jul 4 20:34:55 2024 +0200
Avoid using git commit hash
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
vcmi.spec | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/vcmi.spec b/vcmi.spec
index 05086e6..dbe65f0 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -75,9 +75,6 @@ tar -xf %{SOURCE1} -C AI/FuzzyLite --strip-components=1
dos2unix license.txt ChangeLog.md
-# Don't show GITDIR-NOTFOUND in the window title
-sed -i 's/GITDIR-NOTFOUND/%{version}/' cmake_modules/*
-
%build
%cmake -Wno-dev \
@@ -86,7 +83,8 @@ sed -i 's/GITDIR-NOTFOUND/%{version}/' cmake_modules/*
-UCMAKE_INSTALL_LIBDIR \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
-DCMAKE_INSTALL_RPATH=%{_libdir}/%{name} \
- -DENABLE_INNOEXTRACT='FALSE'
+ -DENABLE_INNOEXTRACT='FALSE' \
+ -DENABLE_GOLDMASTER=ON
%ifnarch %{ix86} x86_64 aarch64
# not enough memory in Koji for parallel build
4 months, 2 weeks
[audacious-plugins-freeworld] Update to 4.4
by Sérgio M. Basto
commit bb6aa2b861d6a747b499b5148eab83a3a3feab46
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jul 7 15:33:52 2024 +0100
Update to 4.4
Sync with Fedora and use Meson build system.
.gitignore | 1 +
audacious-plugins-freeworld.spec | 95 ++++++++++++++++++++++++++++++++++++----
sources | 2 +-
3 files changed, 89 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e081362..ee8a5ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ audacious-plugins-3.7.2.tar.bz2
/audacious-plugins-4.2.tar.bz2
/audacious-plugins-4.3-beta1.tar.bz2
/audacious-plugins-4.3.1.tar.bz2
+/audacious-plugins-4.4.tar.bz2
diff --git a/audacious-plugins-freeworld.spec b/audacious-plugins-freeworld.spec
index 4478207..fd05c4d 100644
--- a/audacious-plugins-freeworld.spec
+++ b/audacious-plugins-freeworld.spec
@@ -1,22 +1,27 @@
+%bcond_without meson
+
%global aud_plugin_api %(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\\+' %{_includedir}/libaudcore/plugin.h 2>/dev/null | sed 's!.*_AUD_PLUGIN_VERSION[ ]*\\([0-9]\\+\\).*!\\1!')
%if 0%{aud_plugin_api} > 0
%global aud_plugin_dep Requires: audacious(plugin-api)%{?_isa} = %{aud_plugin_api}
%endif
%{?aud_plugin_dep}
-Name: audacious-plugins-freeworld
-Version: 4.3.1
-Release: 3%{?dist}
-Summary: Additional plugins for the Audacious media player
-License: GPLv3
+
+Name: audacious-plugins-freeworld
+Version: 4.4
+Release: 1%{?dist}
+Summary: Additional plugins for the Audacious media player
+License: GPLv3
URL: https://audacious-media-player.org/
Source0: https://distfiles.audacious-media-player.org/audacious-plugins-%{version}...
BuildRequires: audacious-devel >= %{version}
BuildRequires: gcc-c++
+BuildRequires: meson
+BuildRequires: make
BuildRequires: zlib-devel
BuildRequires: libxml2-devel
-BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt6Core)
BuildRequires: taglib-devel >= 1.4
BuildRequires: gettext
BuildRequires: libbinio-devel
@@ -24,7 +29,7 @@ BuildRequires: dbus-devel >= 0.60
BuildRequires: dbus-glib-devel >= 0.60
# ffaudio plugin
BuildRequires: faad2-devel
-# we need to have configure detect atleast one audio output to make it happy
+# we need to have configure detect at least one audio output to make it happy
BuildRequires: alsa-lib-devel
# require all the plugins
@@ -53,11 +58,69 @@ This is the plugin needed to play AAC audio files.
%prep
%autosetup -p1 -n audacious-plugins-%{version}
+%if %{without meson}
sed -i '\,^.SILENT:,d' buildsys.mk.in
sed -i 's!MAKE} -s!MAKE} !' buildsys.mk.in
+%endif
%build
+%if %{with meson}
+%meson \
+ -Daac=true \
+ -Dadplug=false \
+ -Dalsa=false \
+ -Damidiplug=false \
+ -Dampache=false \
+ -Daosd=false \
+ -Dbs2b=false \
+ -Dcdaudio=false \
+ -Dconsole=false \
+ -Dcoreaudio=false \
+ -Dcue=false \
+ -Dffaudio=false \
+ -Dfilewriter=false \
+ -Dfilewriter-flac=false \
+ -Dfilewriter-mp3=false \
+ -Dfilewriter-ogg=false \
+ -Dflac=false \
+ -Dgl-spectrum=false \
+ -Dgtk=false \
+ -Dhotkey=false \
+ -Djack=false \
+ -Dlirc=false \
+ -Dmac-media-keys=false \
+ -Dmms=false \
+ -Dmodplug=false \
+ -Dmoonstone=false \
+ -Dmpg123=false \
+ -Dmpris2=false \
+ -Dneon=false \
+ -Dnotify=false \
+ -Dopenmpt=false \
+ -Dopus=false \
+ -Doss=false \
+ -Dpulse=false \
+ -Dpipewire=false \
+ -Dqt=false \
+ -Dqtaudio=false \
+ -Dresample=false \
+ -Dscrobbler2=false \
+ -Dsdlout=false \
+ -Dsid=false \
+ -Dsndfile=false \
+ -Dsndio=false \
+ -Dsongchange=false \
+ -Dsoxr=false \
+ -Dspeedpitch=false \
+ -Dstreamtuner=false \
+ -Dvorbis=false \
+ -Dvumeter=false \
+ -Dwavpack=false
+
+%meson_build
+#%%{__meson} compile -C %%{_vpath_builddir} -j %%{_smp_build_ncpus} --verbose
+%else
%configure \
--disable-rpath \
--disable-vorbis \
@@ -68,11 +131,23 @@ sed -i 's!MAKE} -s!MAKE} !' buildsys.mk.in
--disable-mms \
--disable-opus
%make_build -C src/aac
+%endif
%install
+%if %{with meson}
+%meson_install
+rm -rf %{buildroot}%{_libdir}/audacious/Container
+rm -rf %{buildroot}%{_libdir}/audacious/Effect
+rm -rf %{buildroot}%{_libdir}/audacious/Transport
+pushd %{buildroot}%{_libdir}/audacious/Input
+shopt -s extglob
+rm !(aac-raw.so)
+popd
+rm -rf %{buildroot}%{_datadir}/locale/
+%else
%make_install -C src/aac
-find %buildroot -type f -name "*.la" -exec rm -f {} ';'
+%endif
%files
@@ -83,6 +158,10 @@ find %buildroot -type f -name "*.la" -exec rm -f {} ';'
%changelog
+* Sat Jul 06 2024 Sérgio Basto <sergio(a)serjux.com> - 4.4-1
+- Update to 4.4
+- Sync with Fedora and use Meson build system.
+
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 4.3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/sources b/sources
index 65ad12d..a192d0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (audacious-plugins-4.3.1.tar.bz2) = ca065b4558406702e4f2aa2ac085ea02d3215e689e09e9c0b6a740970a469297910df52cd222997e8a4206a68d3a064ac3f6d94c6412830ce8bd34a5b42c30da
+SHA512 (audacious-plugins-4.4.tar.bz2) = 67c1b5880ad1c53e4407536677a06f7fbe9e9701f98106bf33e7f9dafcbb93200b670de8120442d197315f6c1f30b05936e358724c0b22baded4b3a258ea2563
4 months, 2 weeks
[nemo-dropbox/f40] Update to 6.2.0
by Leigh Scott
Summary of changes:
60ed874... Update to 6.2.0 (*)
(*) This commit already existed in another branch; no separate mail sent
4 months, 2 weeks
