Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package aegisub for openSUSE:Factory checked in at 2021-04-14 10:11:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aegisub (Old) and /work/SRC/openSUSE:Factory/.aegisub.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aegisub" Wed Apr 14 10:11:32 2021 rev:35 rq:885217 version:3.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/aegisub/aegisub.changes 2020-08-10 15:04:01.916191626 +0200 +++ /work/SRC/openSUSE:Factory/.aegisub.new.2401/aegisub.changes 2021-04-14 10:12:01.449599569 +0200 @@ -1,0 +2,21 @@ +Tue Apr 13 19:13:10 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de> + +- Upstream orphaned (or at least inactive), use active wangqr fork +- Updated to fork version 3.3.2 + * Show a notice when reaching 32bit memory limit instead of crash + * Fix OpenGL color depth issue with some GPU drivers + * Fix eyedropper not working + * Fix alt-drag behavior in audio window + * Fix saving audio clip with float samples + * Added support for AviSynth+ on linux + * Fix video rendering performance issue with visual tools + * Added the "align to hardsub in video" function + * Allow user change color for visual typesetting tool + * Bug fixes about HiDPI display issues + * Bug fixes about timing calculation for video frame and audio FFT +- Added ax_boost-files.patch for fix build with boost >= 1.70 +- Dropped outdated patches Makefile.inc.in.patch, + remove-vendor-luajit-dependency.patch, aegisub-no-optimize.patch, + luaL_Reg-not-luaL_reg.patch, aegisub-fix_build_with_make4.3.patch + +------------------------------------------------------------------- Old: ---- Makefile.inc.in.patch _service aegisub-3.2.2+git20191006.tar.xz aegisub-fix_build_with_make4.3.patch aegisub-no-optimize.patch changelog.txt luaL_Reg-not-luaL_reg.patch remove-vendor-luajit-dependency.patch New: ---- Aegisub-3.3.2.tar.gz ax_boost-files.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aegisub.spec ++++++ --- /var/tmp/diff_new_pack.Hg1BKY/_old 2021-04-14 10:12:02.021600534 +0200 +++ /var/tmp/diff_new_pack.Hg1BKY/_new 2021-04-14 10:12:02.021600534 +0200 @@ -1,7 +1,7 @@ # # spec file for package aegisub # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,19 @@ # +%define version_split 3,3,2 Name: aegisub -Version: 3.2.2+git20191006 +Version: 3.3.2 Release: 0 Summary: Subtitle editor License: BSD-3-Clause Group: Productivity/Multimedia/Video/Editors and Convertors URL: http://www.aegisub.org/ -Source0: %{name}-%{version}.tar.xz -Source99: changelog.txt -Source100: %{name}-rpmlintrc -Patch1: Makefile.inc.in.patch -Patch2: remove-vendor-luajit-dependency.patch -Patch3: aegisub-no-optimize.patch -Patch4: luaL_Reg-not-luaL_reg.patch -#luabins.patch -# PATCH-FIX-UPSTREAM aegisub-fix_build_with_make4.3.patch -Patch8: aegisub-fix_build_with_make4.3.patch +Source0: https://github.com/wangqr/Aegisub/archive/refs/tags/v3.3.2.tar.gz#/Aegisub-%{version}.tar.gz +Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM ax_boost-files.patch -- https://github.com/wangqr/Aegisub/pull/102 +Patch0: ax_boost-files.patch +BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: intltool @@ -56,16 +52,25 @@ BuildRequires: pkgconfig(libpulse) >= 0.5 BuildRequires: pkgconfig(luajit) BuildRequires: pkgconfig(zlib) -ExcludeArch: ppc ppc64 ppc64le i586 +ExcludeArch: ppc ppc64 ppc64le %description Aegisub is a subtitle editor. It works with the Advanced SubStation Alpha format (aptly abbreviated ASS) which allows for many advanced effects in the subtitles, apart from just basic timed text. +As upstream is orphaned, this version is the wangqr fork. + %prep -%autosetup -p1 -cp %{SOURCE99} . +%autosetup -p1 -n Aegisub-%{version} +# Add "cached" version (as we do not build from git) +[ -f "build/version.h" ] || cat > build/git_version.h << EOF +#define BUILD_GIT_VERSION_NUMBER 0 +#define BUILD_GIT_VERSION_STRING "%{version}" +#define TAGGED_RELEASE 1 +#define INSTALLER_VERSION "%{version}" +#define RESOURCE_BASE_VERSION %{version_split} +EOF %build autoreconf -fiv @@ -80,10 +85,9 @@ %find_lang %{name} %files -f %{name}.lang -%defattr(0644, root, root, 0755) %license LICENCE -%doc README.md changelog.txt -%attr(0755,root,root) %{_bindir}/aegisub +%doc README.md +%{_bindir}/aegisub %{_datadir}/aegisub/ %{_datadir}/applications/aegisub.desktop %{_datadir}/icons/hicolor/*/apps/aegisub.* ++++++ ax_boost-files.patch ++++++ diff -Nur Aegisub-3.3.2/m4macros/ax_boost_base.m4 new/m4macros/ax_boost_base.m4 --- Aegisub-3.3.2/m4macros/ax_boost_base.m4 2020-12-19 15:20:15.000000000 +0100 +++ new/m4macros/ax_boost_base.m4 2021-04-13 22:19:25.017774629 +0200 @@ -33,7 +33,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 42 +#serial 49 # example boost program (need to pass version) m4_define([_AX_BOOST_BASE_PROGRAM], @@ -113,8 +113,9 @@ dnl are found, e.g. when only header-only libraries are installed! AS_CASE([${host_cpu}], [x86_64],[libsubdirs="lib64 libx32 lib lib64"], - [ppc64|s390x|sparc64|aarch64|ppc64le],[libsubdirs="lib64 lib lib64"], - [libsubdirs="lib"], + [mips*64*],[libsubdirs="lib64 lib32 lib lib64"], + [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k],[libsubdirs="lib64 lib lib64"], + [libsubdirs="lib"] ) dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give @@ -122,6 +123,7 @@ dnl are almost assuredly the ones desired. AS_CASE([${host_cpu}], [i?86],[multiarch_libsubdir="lib/i386-${host_os}"], + [armv7l],[multiarch_libsubdir="lib/arm-${host_os}"], [multiarch_libsubdir="lib/${host_cpu}-${host_os}"] ) @@ -298,4 +300,4 @@ CPPFLAGS="$CPPFLAGS_SAVED" LDFLAGS="$LDFLAGS_SAVED" -]) \ Kein Zeilenumbruch am Dateiende. +]) diff -Nur Aegisub-3.3.2/m4macros/ax_boost_chrono.m4 new/m4macros/ax_boost_chrono.m4 --- Aegisub-3.3.2/m4macros/ax_boost_chrono.m4 2020-12-19 15:20:15.000000000 +0100 +++ new/m4macros/ax_boost_chrono.m4 2021-04-13 22:19:25.877782628 +0200 @@ -29,7 +29,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 4 +#serial 5 AC_DEFUN([AX_BOOST_CHRONO], [ @@ -105,7 +105,7 @@ fi if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) + AC_MSG_ERROR(Could not find a version of the Boost::Chrono library!) fi if test "x$link_chrono" = "xno"; then AC_MSG_ERROR(Could not link against $ax_lib !) diff -Nur Aegisub-3.3.2/m4macros/ax_boost_filesystem.m4 new/m4macros/ax_boost_filesystem.m4 --- Aegisub-3.3.2/m4macros/ax_boost_filesystem.m4 2020-12-19 15:20:15.000000000 +0100 +++ new/m4macros/ax_boost_filesystem.m4 2021-04-13 22:19:26.849791671 +0200 @@ -31,7 +31,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 27 +#serial 28 AC_DEFUN([AX_BOOST_FILESYSTEM], [ @@ -104,7 +104,7 @@ fi if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) + AC_MSG_ERROR(Could not find a version of the Boost::Filesystem library!) fi if test "x$link_filesystem" != "xyes"; then AC_MSG_ERROR(Could not link against $ax_lib !) diff -Nur Aegisub-3.3.2/m4macros/ax_boost_locale.m4 new/m4macros/ax_boost_locale.m4 --- Aegisub-3.3.2/m4macros/ax_boost_locale.m4 2020-12-19 15:20:15.000000000 +0100 +++ new/m4macros/ax_boost_locale.m4 2021-04-13 22:19:27.869801159 +0200 @@ -29,7 +29,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 2 +#serial 3 AC_DEFUN([AX_BOOST_LOCALE], [ @@ -106,7 +106,7 @@ fi if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) + AC_MSG_ERROR(Could not find a version of the Boost::Locale library!) fi if test "x$link_locale" = "xno"; then AC_MSG_ERROR(Could not link against $ax_lib !) diff -Nur Aegisub-3.3.2/m4macros/ax_boost_system.m4 new/m4macros/ax_boost_system.m4 --- Aegisub-3.3.2/m4macros/ax_boost_system.m4 2020-12-19 15:20:15.000000000 +0100 +++ new/m4macros/ax_boost_system.m4 2021-04-13 22:19:30.397824673 +0200 @@ -31,7 +31,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 19 +#serial 20 AC_DEFUN([AX_BOOST_SYSTEM], [ @@ -108,7 +108,7 @@ fi if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) + AC_MSG_ERROR(Could not find a version of the Boost::System library!) fi if test "x$link_system" = "xno"; then AC_MSG_ERROR(Could not link against $ax_lib !) diff -Nur Aegisub-3.3.2/m4macros/ax_boost_thread.m4 new/m4macros/ax_boost_thread.m4 --- Aegisub-3.3.2/m4macros/ax_boost_thread.m4 2020-12-19 15:20:15.000000000 +0100 +++ new/m4macros/ax_boost_thread.m4 2021-04-13 22:19:31.365833679 +0200 @@ -30,7 +30,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 31 +#serial 33 AC_DEFUN([AX_BOOST_THREAD], [ @@ -67,13 +67,24 @@ [AC_LANG_PUSH([C++]) CXXFLAGS_SAVE=$CXXFLAGS - if test "x$host_os" = "xsolaris" ; then - CXXFLAGS="-pthreads $CXXFLAGS" - elif test "x$host_os" = "xmingw32" ; then - CXXFLAGS="-mthreads $CXXFLAGS" - else - CXXFLAGS="-pthread $CXXFLAGS" - fi + case "x$host_os" in + xsolaris ) + CXXFLAGS="-pthreads $CXXFLAGS" + break; + ;; + xmingw32 ) + CXXFLAGS="-mthreads $CXXFLAGS" + break; + ;; + *android* ) + break; + ;; + * ) + CXXFLAGS="-pthread $CXXFLAGS" + break; + ;; + esac + AC_COMPILE_IFELSE([ AC_LANG_PROGRAM( [[@%:@include <boost/thread/thread.hpp>]], @@ -84,13 +95,23 @@ AC_LANG_POP([C++]) ]) if test "x$ax_cv_boost_thread" = "xyes"; then - if test "x$host_os" = "xsolaris" ; then - BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS" - elif test "x$host_os" = "xmingw32" ; then - BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS" - else - BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS" - fi + case "x$host_os" in + xsolaris ) + BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS" + break; + ;; + xmingw32 ) + BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS" + break; + ;; + *android* ) + break; + ;; + * ) + BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS" + break; + ;; + esac AC_SUBST(BOOST_CPPFLAGS) @@ -130,7 +151,7 @@ fi if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) + AC_MSG_ERROR(Could not find a version of the Boost::Thread library!) fi if test "x$link_thread" = "xno"; then AC_MSG_ERROR(Could not link against $ax_lib !) @@ -148,6 +169,9 @@ xmingw32 ) break; ;; + *android* ) + break; + ;; * ) BOOST_THREAD_LIB="$BOOST_THREAD_LIB -lpthread" break;
