commit 7b88fed4add7a4d12eeefb78e00b42846eef4986 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Fri Jan 3 21:17:21 2025 +0000 Update to 3.4.1 3.4.1_git_version.h | 5 ++++ aegisub-buildfix_autotools.patch | 11 -------- aegisub.spec | 59 ++++++++++++++++------------------------ boost-1.81.0.patch | 56 -------------------------------------- sources | 2 +- 5 files changed, 30 insertions(+), 103 deletions(-) --- diff --git a/3.4.1_git_version.h b/3.4.1_git_version.h new file mode 100644 index 0000000..4d3117f --- /dev/null +++ b/3.4.1_git_version.h @@ -0,0 +1,5 @@ +#define BUILD_GIT_VERSION_NUMBER 341 +#define BUILD_GIT_VERSION_STRING "3.4.1" +#define TAGGED_RELEASE 0 +#define INSTALLER_VERSION "0.0.0" +#define RESOURCE_BASE_VERSION 0, 0, 0 diff --git a/aegisub.spec b/aegisub.spec index d2779df..b29809b 100644 --- a/aegisub.spec +++ b/aegisub.spec @@ -1,14 +1,8 @@ -%global gituser Aegisub -%global gituser wangqr -%global gitname Aegisub -%global commit 6f546951b4f004da16ce19ba638bf3eedefb9f31 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global gitdate 20191006 +%global gitname Aegisub Name: aegisub -Version: 3.3.3 -#Release: 25.%%{gitdate}.git%%{shortcommit}%%{?dist} -Release: 7%{?dist} +Version: 3.4.1 +Release: 1%{?dist} Summary: Tool for creating and modifying subtitles #src/gl/ - MIT license. See src/gl/glext.h @@ -16,11 +10,8 @@ Summary: Tool for creating and modifying subtitles #universalchardet/ - MPL 1.1 License: BSD and MIT and MPLv1.1 URL: http://www.aegisub.org -# https://github.com/Aegisub/Aegisub -#Source0: https://github.com/%%{gituser}/%%{gitname}/archive/%%{commit}/%%{name}-%%... -Source0: https://github.com/%{gituser}/%{gitname}/archive/v%{version}/%{name}-%{ve... -Patch0: aegisub-buildfix_autotools.patch -Patch1: https://raw.githubusercontent.com/archlinux/svntogit-community/packages/a... +Source0: https://github.com/TypesettingTools/%{gitname}/archive/v%{version}/%{name... +Source1: %{version}_git_version.h # luajit isn't available on powerpc # boost m4 detection is failing on i686 and armv7hl @@ -28,8 +19,9 @@ ExcludeArch: %{power64} %{ix86} %{arm} BuildRequires: desktop-file-utils BuildRequires: gcc-c++ -BuildRequires: libtool - +BuildRequires: gmock-devel +BuildRequires: gtest-devel +BuildRequires: meson BuildRequires: alsa-lib-devel BuildRequires: boost-devel # To be enabled @@ -37,17 +29,16 @@ BuildRequires: boost-devel BuildRequires: ffms2-devel >= 2.40 BuildRequires: fftw-devel BuildRequires: hunspell-devel -BuildRequires: intltool BuildRequires: libappstream-glib BuildRequires: libass-devel #Used for OpenAL tests during configure -#BuildRequires: libcxx-devel -BuildRequires: libGL-devel +BuildRequires: libcurl-devel BuildRequires: libICE-devel BuildRequires: libX11-devel BuildRequires: lua-devel BuildRequires: luajit-devel -#BuildRequires: openal-devel +BuildRequires: mesa-libGL-devel +BuildRequires: openal-devel BuildRequires: portaudio-devel BuildRequires: pulseaudio-libs-devel BuildRequires: uchardet-devel @@ -74,25 +65,20 @@ including a built-in real-time video preview. %prep %autosetup -p1 -n %{gitname}-%{version} +cp %{SOURCE1} git_version.h %build -export CXXFLAGS="%{optflags} -Wno-deprecated-declarations -Wno-deprecated-copy" -export FORCE_GIT_VERSION=%{version} -./build/version.sh . -./autogen.sh -%configure \ - --disable-update-checker \ - --with-player-audio=PulseAudio \ - --without-oss -%make_build +%meson \ + -Denable_update_checker=false +%meson_build %install -%make_install +%meson_install -desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop -appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/aegisub.appdata.xml +desktop-file-validate %{buildroot}/%{_datadir}/applications/org.aegisub.Aegisub.desktop +appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.aegisub.Aegisub.metainfo.xml %find_lang %{name} @@ -101,12 +87,15 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/aegisub.appda %doc docs/* %{_bindir}/%{name}* %{_datadir}/%{name}/ -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.* -%{_metainfodir}/aegisub.appdata.xml +%{_datadir}/applications/org.aegisub.Aegisub.desktop +%{_datadir}/icons/hicolor/*/apps/org.aegisub.Aegisub.* +%{_metainfodir}/org.aegisub.Aegisub.metainfo.xml %changelog +* Fri Jan 03 2025 Leigh Scott <leigh123linux(a)gmail.com&gt; - 3.4.1-1 +- Update to 3.4.1 + * Thu Aug 01 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 3.3.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 53fc192..d27214a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aegisub-3.3.3.tar.gz) = 19e44667ad8742560559387c15f6c00339194cd26e1140624c63f34c6b4da6bb0b80be0f636a2d1cd0b15f1598e0580218d648e0622635b12eeaad3a40df9abc +SHA512 (aegisub-3.4.1.tar.gz) = dfe34cc291057f082c8034667762b8d7a9d6c27546979e42191ff4327f9bac6cd69a09e0a3b25537e5e209dbccbf2f9ac0fcb91e6e2677fa81fd0eb97ce2f12b