[packages/aegisub] - updated to 3.4.2
qboosh
qboosh at pld-linux.org
Thu Apr 10 20:42:08 CEST 2025
commit 34c67d022e349d2979b6927052d0658ebf431dba
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Apr 10 20:30:02 2025 +0200
- updated to 3.4.2
aegisub.spec | 90 +++++++++++++++++++++++++++++++++-----------------------
boost-1.87.patch | 76 -----------------------------------------------
2 files changed, 54 insertions(+), 112 deletions(-)
---
diff --git a/aegisub.spec b/aegisub.spec
index aa48313..00af1f5 100644
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -4,48 +4,46 @@
# - our cxxflags
# Conditional build:
-%bcond_without ffms2 # build ffms2 A/V provider
+%bcond_without ffms2 # ffms2 A/V provider
Summary: Subtitle editor
Summary(pl.UTF-8): Edytor napisów
Name: aegisub
-Version: 3.4.0
-Release: 4
+Version: 3.4.2
+Release: 1
License: BSD
Group: X11/Applications
#Source0Download: https://aegisub.org/downloads/
-Source0: https://github.com/TypesettingTools/Aegisub/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 850643f17021294aa14891a3fb200888
+Source0: https://github.com/TypesettingTools/Aegisub/releases/download/v%{version}/Aegisub-%{version}.tar.xz
+# Source0-md5: d60c9942d1c211b266e29fdde689e3e8
+#Source0: https://github.com/TypesettingTools/Aegisub/archive/v%{version}/Aegisub-%{version}.tar.gz
Patch0: no-tests.patch
-Patch1: boost-1.87.patch
Patch2: luajit-5.2.patch
URL: https://aegisub.org/
-# AC_AGI_COMPILE tries to run test program which tries to open device and most likely fails
-#BuildRequires: OpenAL-devel >= 0.0.8
+BuildRequires: OpenAL-devel >= 0.0.8
BuildRequires: OpenGL-devel
BuildRequires: alsa-lib-devel
-BuildRequires: boost-devel >= 1.50.0
-%{?with_ffms2:BuildRequires: ffms2-devel >= 2.16}
+# chrono, thread, locale, regex, system
+BuildRequires: boost-devel >= 1.70.0
+%{?with_ffms2:BuildRequires: ffms2-devel >= 2.22}
BuildRequires: fftw3-devel >= 3.3
BuildRequires: fontconfig-devel >= 1:2.4
-# pkgconfig(freetype2) >= 9.7.0
-BuildRequires: freetype-devel >= 1:2.1.9
BuildRequires: gettext-tools >= 0.18.1
-BuildRequires: gmock-devel
-BuildRequires: gtest-devel
+BuildRequires: gmock-devel >= 1.14.0
+BuildRequires: gtest-devel >= 1.14.0
BuildRequires: hunspell-devel >= 1.2.0
-BuildRequires: intltool
BuildRequires: libass-devel >= 0.9.7
BuildRequires: libicu-devel >= 4.8.1.1
-BuildRequires: libstdc++-devel
+# C++20
+BuildRequires: libstdc++-devel >= 6:8
BuildRequires: lua51-devel
BuildRequires: luajit52-devel
BuildRequires: meson >= 0.57.0
-BuildRequires: ninja
+BuildRequires: ninja >= 1.5
BuildRequires: pkgconfig >= 1:0.20
BuildRequires: portaudio-devel >= 19
BuildRequires: pulseaudio-devel >= 0.5
-BuildRequires: rpmbuild(macros) >= 1.736
+BuildRequires: rpmbuild(macros) >= 2.042
BuildRequires: sed >= 4.0
BuildRequires: tar >= 1:1.22
BuildRequires: uchardet-devel
@@ -56,10 +54,9 @@ BuildRequires: xz
BuildRequires: zlib-devel
Requires(post,postun): desktop-file-utils
Requires(post,postun): gtk-update-icon-cache
-Requires: ffms2 >= 2.16
+Requires: ffms2 >= 2.22
Requires: fftw3 >= 3.3
Requires: fontconfig-libs >= 1:2.4
-Requires: freetype >= 1:2.1.9
Requires: hunspell >= 1.2.0
Requires: libass >= 0.9.7
Requires: libicu >= 4.8.1.1
@@ -93,30 +90,49 @@ obsługa tych zaawansowanych funkcji.
%prep
%setup -q -n Aegisub-%{version}
%patch -P 0 -p1
-%patch -P 1 -p1
%patch -P 2 -p1
+cat >meson-native.ini <<EOF
+[binaries]
+wx-config = 'wx-gtk3-unicode-config'
+EOF
+
%build
-ln -sf %{_bindir}/wx-gtk3-unicode-config ./wx-config
-export PATH=".:$PATH"
-%meson build \
+# avisynth,csri are Windows-specific in Aegisub (as of 3.4.2)
+# directsound is Windows-only
+%meson \
+ --native-file meson-native.ini \
+ -Dalsa=enabled \
+ -Davisynth=disabled \
+ -Dcsri=disabled \
+ -Ddirectsound=disabled \
-Denable_update_checker=false \
- -Dsystem_luajit=true
-
+ -Dffms2=%{__enabled_disabled ffms2} \
+ -Dfftw3=enabled \
+ -Dhunspell=enabled \
+ -Dopenal=enabled \
+ -Dlibpulse=enabled \
+ -Dportaudio=enabled \
+ -Dsystem_luajit=true \
+ -Duchardet=enabled
+
+%if 0
+# not required for dist tarballs
cat <<'EOF' >build/git_version.h
-#define BUILD_GIT_VERSION_NUMBER 9366
-#define BUILD_GIT_VERSION_STRING "9366-v3.4.0-b0fc74109"
-#define TAGGED_RELEASE 0
-#define INSTALLER_VERSION "0.0.0"
-#define RESOURCE_BASE_VERSION 0, 0, 0
+#define BUILD_GIT_VERSION_NUMBER 9426
+#define BUILD_GIT_VERSION_STRING "%{version}"
+#define TAGGED_RELEASE 1
+#define INSTALLER_VERSION "%{version}"
+#define RESOURCE_BASE_VERSION 3, 4, 2
EOF
+%endif
-%ninja_build -C build
+%meson_build
%install
rm -rf $RPM_BUILD_ROOT
-%ninja_install -C build
+%meson_install
%{__mv} $RPM_BUILD_ROOT%{_localedir}/{fr_FR,fr}
%{__mv} $RPM_BUILD_ROOT%{_localedir}/{pt_PT,pt}
@@ -141,6 +157,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc LICENCE README.md
%attr(755,root,root) %{_bindir}/aegisub
-%{_datadir}/%{name}
-%{_desktopdir}/aegisub.desktop
-%{_iconsdir}/hicolor/*/apps/aegisub.*
+%{_datadir}/aegisub
+%{_datadir}/metainfo/org.aegisub.Aegisub.metainfo.xml
+%{_desktopdir}/org.aegisub.Aegisub.desktop
+%{_iconsdir}/hicolor/*x*/apps/org.aegisub.Aegisub.png
+%{_iconsdir}/hicolor/scalable/apps/org.aegisub.Aegisub.svg
diff --git a/boost-1.87.patch b/boost-1.87.patch
deleted file mode 100644
index 67bbed9..0000000
--- a/boost-1.87.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From e89ace7d26081c6227c06f18da1bc0421126042c Mon Sep 17 00:00:00 2001
-From: 0tkl <118708188+0tkl at users.noreply.github.com>
-Date: Sun, 22 Dec 2024 17:08:15 +0800
-Subject: [PATCH] Replace some deprecated facilities from Boost.Asio
-
----
- libaegisub/common/dispatch.cpp | 21 +++++++++++----------
- 1 file changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/libaegisub/common/dispatch.cpp b/libaegisub/common/dispatch.cpp
-index 424d60e555..ebb9fc769c 100644
---- a/libaegisub/common/dispatch.cpp
-+++ b/libaegisub/common/dispatch.cpp
-@@ -19,14 +19,15 @@
- #include "libaegisub/util.h"
-
- #include <atomic>
--#include <boost/asio/io_service.hpp>
-+#include <boost/asio/executor_work_guard.hpp>
-+#include <boost/asio/io_context.hpp>
- #include <boost/asio/strand.hpp>
- #include <condition_variable>
- #include <mutex>
- #include <thread>
-
- namespace {
-- boost::asio::io_service *service;
-+ boost::asio::io_context *service;
- std::function<void (agi::dispatch::Thunk)> invoke_main;
- std::atomic<uint_fast32_t> threads_running;
-
-@@ -38,28 +39,28 @@ namespace {
-
- class BackgroundQueue final : public agi::dispatch::Queue {
- void DoInvoke(agi::dispatch::Thunk&& thunk) override {
-- service->post(thunk);
-+ boost::asio::post(*service, std::move(thunk));
- }
- };
-
- class SerialQueue final : public agi::dispatch::Queue {
-- boost::asio::io_service::strand strand;
-+ boost::asio::io_context::strand strand;
-
- void DoInvoke(agi::dispatch::Thunk&& thunk) override {
-- strand.post(thunk);
-+ boost::asio::post(strand, std::move(thunk));
- }
- public:
- SerialQueue() : strand(*service) { }
- };
-
- struct IOServiceThreadPool {
-- boost::asio::io_service io_service;
-- std::unique_ptr<boost::asio::io_service::work> work;
-+ boost::asio::io_context io_context;
-+ boost::asio::executor_work_guard<boost::asio::io_context::executor_type> work_guard;
- std::vector<std::thread> threads;
-
-- IOServiceThreadPool() : work(new boost::asio::io_service::work(io_service)) { }
-+ IOServiceThreadPool() : work_guard(boost::asio::make_work_guard(io_context)) { }
- ~IOServiceThreadPool() {
-- work.reset();
-+ work_guard.reset();
- #ifndef _WIN32
- for (auto& thread : threads) thread.join();
- #else
-@@ -76,7 +77,7 @@ namespace agi::dispatch {
-
- void Init(std::function<void (Thunk)>&& invoke_main) {
- static IOServiceThreadPool thread_pool;
-- ::service = &thread_pool.io_service;
-+ ::service = &thread_pool.io_context;
- ::invoke_main = invoke_main;
-
- thread_pool.threads.reserve(std::max<unsigned>(4, std::thread::hardware_concurrency()));
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/aegisub.git/commitdiff/34c67d022e349d2979b6927052d0658ebf431dba
More information about the pld-cvs-commit
mailing list