Accepting request 1045757 from home:elimat:branches:multimedia:apps
- Update to version 3.3.3
* Pass storage size to libass to fix rendering
* This changes how subtitle is rendered in certain cases when using
libass as subtitle renderer. The behavior now matches
ffmpeg>=5.0.1 and VLC nightly (not included in VLC=3.0.17.4 yet)
* Added CoreAudio player for macOS, which supports multi channel output
* Allow choosing between wxStyledTextCtrl and wxTextCtrl for subtitle
edit box
* wxSTC provides syntax highlighting
* wxTextCtrl is the native text editor provided by system, and may
have better support for IME, right-to-left languages, etc.
* Shift + right-click gives native context menu when using wxTextCtrl
* Support for negative margin (@petzku)
* Fix timestamp issue when loading subtitle from MKS
* Fix support for embedded font in ass (@Kienyew)
* Fix build issues with boost>=1.76, M1 Mac, etc.
- Add patch: aegisub-buildfix_autotools.patch to fix build with autotools
- Drop patch: ax_boost-files.patch which is fixed upstream
- Drop aegisub-rpmlintrc not needed anymore
OBS-URL: https://build.opensuse.org/request/show/1045757
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=78
This commit is contained in:
Martin Pluskal
Git OBS Bridge
parent
40a0283300
commit
048a513059
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9aaab8e66cef2a72368c6b7f79b2f99700321a7b9a1ca623c5e6be0e65418db5
|
|
||||||
size 6574289
|
|
||||||
3
Aegisub-3.3.3.tar.gz
Normal file
3
Aegisub-3.3.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b73518ee6576abf9716dc436fb76086de83d2a387a6b41b5051e0e1b7860e9aa
|
||||||
|
size 6580314
|
||||||
11
aegisub-buildfix_autotools.patch
Normal file
11
aegisub-buildfix_autotools.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- Aegisub-3.3.3/build/version.sh.orig 2022-08-21 04:36:22.130688059 +0100
|
||||||
|
+++ Aegisub-3.3.3/build/version.sh 2022-08-21 04:36:30.535680238 +0100
|
||||||
|
@@ -12,7 +12,7 @@ if ! test -d "${srcdir}/.git"; then
|
||||||
|
done < "${version_h_path}"
|
||||||
|
if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != x; then
|
||||||
|
export VERSION_SOURCE="from cached git_version.h"
|
||||||
|
- exit 0
|
||||||
|
+ return 0
|
||||||
|
else
|
||||||
|
echo "invalid git_version.h"
|
||||||
|
exit 2
|
||||||
@ -1,2 +0,0 @@
|
|||||||
# this is a false positive
|
|
||||||
addFilter(".*macro-in-comment.*%{version}.*")
|
|
||||||
@ -1,3 +1,26 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 29 22:16:54 UTC 2022 - Matthias Eliasson <elimat@opensuse.org>
|
||||||
|
|
||||||
|
- Update to version 3.3.3
|
||||||
|
* Pass storage size to libass to fix rendering
|
||||||
|
* This changes how subtitle is rendered in certain cases when using
|
||||||
|
libass as subtitle renderer. The behavior now matches
|
||||||
|
ffmpeg>=5.0.1 and VLC nightly (not included in VLC=3.0.17.4 yet)
|
||||||
|
* Added CoreAudio player for macOS, which supports multi channel output
|
||||||
|
* Allow choosing between wxStyledTextCtrl and wxTextCtrl for subtitle
|
||||||
|
edit box
|
||||||
|
* wxSTC provides syntax highlighting
|
||||||
|
* wxTextCtrl is the native text editor provided by system, and may
|
||||||
|
have better support for IME, right-to-left languages, etc.
|
||||||
|
* Shift + right-click gives native context menu when using wxTextCtrl
|
||||||
|
* Support for negative margin (@petzku)
|
||||||
|
* Fix timestamp issue when loading subtitle from MKS
|
||||||
|
* Fix support for embedded font in ass (@Kienyew)
|
||||||
|
* Fix build issues with boost>=1.76, M1 Mac, etc.
|
||||||
|
- Add patch: aegisub-buildfix_autotools.patch to fix build with autotools
|
||||||
|
- Drop patch: ax_boost-files.patch which is fixed upstream
|
||||||
|
- Drop aegisub-rpmlintrc not needed anymore
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Jun 26 11:31:45 UTC 2022 - Berthold Gunreben <azouhr@opensuse.org>
|
Sun Jun 26 11:31:45 UTC 2022 - Berthold Gunreben <azouhr@opensuse.org>
|
||||||
|
|
||||||
|
|||||||
25
aegisub.spec
25
aegisub.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package aegisub
|
# spec file for package aegisub
|
||||||
#
|
#
|
||||||
# Copyright (c) 2021 SUSE LLC
|
# Copyright (c) 2022 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -15,19 +15,15 @@
|
|||||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define version_split 3,3,2
|
|
||||||
Name: aegisub
|
Name: aegisub
|
||||||
Version: 3.3.2
|
Version: 3.3.3
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Subtitle editor
|
Summary: Subtitle editor
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
Group: Productivity/Multimedia/Video/Editors and Convertors
|
Group: Productivity/Multimedia/Video/Editors and Convertors
|
||||||
URL: http://www.aegisub.org/
|
URL: http://www.aegisub.org/
|
||||||
Source0: https://github.com/wangqr/Aegisub/archive/refs/tags/v3.3.2.tar.gz#/Aegisub-%{version}.tar.gz
|
Source0: https://github.com/wangqr/Aegisub/archive/refs/tags/v%{version}.tar.gz#/Aegisub-%{version}.tar.gz
|
||||||
Source99: %{name}-rpmlintrc
|
Patch0: aegisub-buildfix_autotools.patch
|
||||||
# PATCH-FIX-UPSTREAM ax_boost-files.patch -- https://github.com/wangqr/Aegisub/pull/102
|
|
||||||
Patch0: ax_boost-files.patch
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -63,17 +59,12 @@ As upstream is orphaned, this version is the wangqr fork.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n Aegisub-%{version}
|
%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
|
export FORCE_GIT_VERSION=%{version}
|
||||||
#define BUILD_GIT_VERSION_NUMBER 0
|
./build/version.sh .
|
||||||
#define BUILD_GIT_VERSION_STRING "%{version}"
|
./autogen.sh
|
||||||
#define TAGGED_RELEASE 1
|
|
||||||
#define INSTALLER_VERSION "%{version}"
|
|
||||||
#define RESOURCE_BASE_VERSION %{version_split}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -fiv
|
|
||||||
%configure \
|
%configure \
|
||||||
--disable-update-checker \
|
--disable-update-checker \
|
||||||
--with-player-audio=PulseAudio \
|
--with-player-audio=PulseAudio \
|
||||||
|
|||||||
@ -1,217 +0,0 @@
|
|||||||
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;
|
|
||||||
Loading…
x
Reference in New Issue
Block a user