commit 9a7ec645d7a8aa6bc85b9a5b6280410b7c27232b Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Wed Apr 20 18:10:56 2022 +0100 Update aegisub to 3.3.2 using wangqr fork (as opensuse) .gitignore | 1 + Makefile.inc.in.patch | 26 ---- Restrict-the-usage-of-undocumented-wxBitmap.patch | 35 ----- aegisub-fix_build_with_make4.3.patch | 23 --- aegisub-git-version.patch | 4 +- aegisub-no-optimize.patch | 16 -- aegisub.spec | 25 ++- luabins.patch | 182 ---------------------- remove-vendor-luajit-dependency.patch | 81 ---------- sources | 2 +- 10 files changed, 15 insertions(+), 380 deletions(-) --- diff --git a/.gitignore b/.gitignore index 0025dbf..fdf66fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ aegisub-*.tar.gz +/aegisub-3.3.2-89.42.src.rpm diff --git a/aegisub-git-version.patch b/aegisub-git-version.patch index 18e70e4..3c8e5fd 100644 --- a/aegisub-git-version.patch +++ b/aegisub-git-version.patch @@ -1,6 +1,6 @@ --- /dev/null +++ a/build/git_version.h @@ -0,0 +1,3 @@ -+#define BUILD_GIT_VERSION_NUMBER 7897 -+#define BUILD_GIT_VERSION_STRING "3.2.2+git20191006" ++#define BUILD_GIT_VERSION_NUMBER 7898 ++#define BUILD_GIT_VERSION_STRING "3.3.2" +#define TAGGED_RELEASE 0 diff --git a/aegisub.spec b/aegisub.spec index 0931462..6ca8548 100644 --- a/aegisub.spec +++ b/aegisub.spec @@ -1,12 +1,14 @@ %global gituser Aegisub +%global gituser wangqr %global gitname Aegisub %global commit 6f546951b4f004da16ce19ba638bf3eedefb9f31 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global gitdate 20191006 Name: aegisub -Version: 3.2.2 -Release: 25.%{gitdate}.git%{shortcommit}%{?dist} +Version: 3.3.2 +#Release: 25.%%{gitdate}.git%%{shortcommit}%%{?dist} +Release: 1%{?dist} Summary: Tool for creating and modifying subtitles #src/gl/ - MIT license. See src/gl/glext.h @@ -15,16 +17,10 @@ Summary: Tool for creating and modifying subtitles 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}-%{shor... -Patch1: Makefile.inc.in.patch -Patch2: remove-vendor-luajit-dependency.patch -Patch3: aegisub-no-optimize.patch -Patch4: luabins.patch +#Source0: https://github.com/%%{gituser}/%%{gitname}/archive/%%{commit}/%%{name}-%%... +Source0: https://github.com/%{gituser}/%{gitname}/archive/v%{version}/%{name}-%{ve... #PATCH-FIX-OPENSUSE - davejplater(a)gmail.com - aegisub-git-version.patch - Create git_version.h which is missing in git. Patch5: aegisub-git-version.patch -# https://github.com/wangqr/Aegisub/commit/f4cc905c69ca69c68cb95674cefce4ab... -Patch6: aegisub-fix_build_with_make4.3.patch -Patch7: Restrict-the-usage-of-undocumented-wxBitmap.patch # luajit isn't available on powerpc # boost m4 detection is failing on i686 and armv7hl @@ -77,18 +73,16 @@ subtitles to audio, and features many powerful tools for styling them, including a built-in real-time video preview. %prep -%autosetup -p1 -n %{gitname}-%{commit} +%autosetup -p1 -n %{gitname}-%{version} %build export CXXFLAGS="%{optflags} -Wno-deprecated-declarations -Wno-deprecated-copy" ./autogen.sh %configure \ - --disable-gcc-prec \ --disable-update-checker \ --with-player-audio=PulseAudio \ - --without-oss \ - --with-wx-config=wx-config-3.0 + --without-oss %make_build @@ -111,6 +105,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/aegisub.appda %changelog +* Wed Apr 20 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 3.3.2-1 +- Update aegisub to 3.3.2 using wangqr fork (as opensuse) + * Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 3.2.2-25.20191006.git6f54695 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 7ea20b8..93e3d48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aegisub-6f54695.tar.gz) = fad96a5794d78fd268bb87323e523175f179d1dc950f76be2f823c9803eb2b6e89e99d14b1c6ed3ac28b05d0509001fad329f8f3159c34b06311054d3a04ee4a +SHA512 (aegisub-3.3.2.tar.gz) = 7ecd463382e0534cd063e3adb887d14bd797e796f0e7de4b4254cd7f5188308c3bec5b4b1055c74231046069e11034a9e97939a17d66c3d0d6f08b4f24bce4b5