commit: bbc28a5783b46ad50841c8753ad7829a41def418 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat May 17 08:06:10 2025 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat May 17 08:06:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc28a57
media-video/aegisub: drop 3.3.3, 3.4.0 Signed-off-by: David Seifert <soap <AT> gentoo.org> media-video/aegisub/Manifest | 1 - media-video/aegisub/aegisub-3.3.3.ebuild | 155 --------------------- media-video/aegisub/aegisub-3.4.0.ebuild | 145 ------------------- ...g-positional-parameters-to-source-builtin.patch | 47 ------- ...3.2.2_p20160518-ffmpegsource-2.40-compat2.patch | 106 -------------- ...egisub-3.2.2_p20160518-fix-boost170-build.patch | 61 -------- .../aegisub-3.2.2_p20160518-fix-icu59-build.patch | 18 --- .../aegisub-3.2.2_p20160518-fix-icu62-build.patch | 59 -------- ...-3.2.2_p20160518-fix-makefile-for-make4.3.patch | 21 --- ...sub-3.2.2_p20160518-luaL_Reg-not-luaL_reg.patch | 35 ----- ...ub-3.2.2_p20160518-respect-compiler-flags.patch | 53 ------- ...isub-3.2.2_p20160518-support-system-gtest.patch | 75 ---------- media-video/aegisub/files/3.4.0/git_version.h | 5 - 13 files changed, 781 deletions(-) diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest index 6cf6375b6a12..0d1a95a6aa2f 100644 --- a/media-video/aegisub/Manifest +++ b/media-video/aegisub/Manifest @@ -1,3 +1,2 @@ DIST aegisub-3.3.3.tar.gz 6580314 BLAKE2B b6a6b6d9a805fb1aec943f00452e5f074c050d7d8970e0fa57da54a7a3c12b86241eafafd957577625bcce395c9f909fe60a22c9d76fcf8f018a4ea03921dacf SHA512 19e44667ad8742560559387c15f6c00339194cd26e1140624c63f34c6b4da6bb0b80be0f636a2d1cd0b15f1598e0580218d648e0622635b12eeaad3a40df9abc -DIST aegisub-3.4.0.tar.gz 6294724 BLAKE2B 6ab466a33082107f509675eb062a679c68da5b3ec9d97847d0c50ad43d717ff50efcb4fb59a2e8c23f57e893de846b651b7a80a117f047734e6d54ccf6522ef3 SHA512 364f56aece74b14f37d796e364ffcc5b9d8ab5816f8e118b7f44d2d4e3bdf8afa0731c36995269dd953d2f532e7a905729bcbfa907c672a8eb91b68565c1ade0 DIST aegisub-3.4.2.tar.gz 6602618 BLAKE2B 38b2d2d0bb5dd4d3a7fe9e16bfe47f36120bc54d6b60dfa796906ce5699f584c350faf2e0de55879c32aa13ea87ae96d5365071082920d777d8ae4a4aea04361 SHA512 225f97a59feda2ddd7a65e967c19eb074c2f961cbdfbd5e743e4b622f8fb54ec85b679e5b9f30333965e98a19bf6b56cd54cc10417f67771c9661999483dacca diff --git a/media-video/aegisub/aegisub-3.3.3.ebuild b/media-video/aegisub/aegisub-3.3.3.ebuild deleted file mode 100644 index 1fcbd9356d02..000000000000 --- a/media-video/aegisub/aegisub-3.3.3.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( luajit ) -LUA_REQ_USE="lua52compat" - -WX_GTK_VER=3.2-gtk3 -PLOCALES="ar be bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS sr_RS@latin uk_UA vi zh_CN zh_TW" - -inherit autotools flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot toolchain-funcs - -DESCRIPTION="Advanced subtitle editor" -HOMEPAGE="http://www.aegisub.org/ https://github.com/wangqr/Aegisub"; - -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://github.com/wangqr/${PN^}.git"; - # Submodules are used to pull bundled libraries. - EGIT_SUBMODULES=() - inherit git-r3 -else - SRC_URI="https://github.com/wangqr/Aegisub/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" -fi -LICENSE="BSD MIT" -SLOT="0" -IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet" -RESTRICT="test" - -# aegisub bundles luabins (https://github.com/agladysh/luabins). -# Unfortunately, luabins upstream is practically dead since 2010. -# Thus unbundling luabins isn't worth the effort. -RDEPEND="${LUA_DEPS} - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?] - dev-libs/boost:=[icu,nls] - dev-libs/icu:= - media-libs/ffmpegsource:= - media-libs/fontconfig - media-libs/freetype - media-libs/libass:=[fontconfig] - sys-libs/zlib - virtual/libiconv - virtual/opengl - alsa? ( media-libs/alsa-lib ) - fftw? ( >=sci-libs/fftw-3.3:= ) - openal? ( media-libs/openal ) - portaudio? ( =media-libs/portaudio-19* ) - pulseaudio? ( media-libs/libpulse ) - spell? ( app-text/hunspell:= ) - uchardet? ( app-i18n/uchardet ) -" -DEPEND="${RDEPEND}" -# luarocks is only used as a command-line tool so there is no need to enforce -# LUA_SINGLE_USEDEP on it. On the other hand, this means we must use version -# bounds in order to make sure we use a version migrated to Lua eclasses. -BDEPEND="dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - test? ( - ${RDEPEND} - >=dev-cpp/gtest-1.8.1 - >=dev-lua/luarocks-3.4.0-r100 - $(lua_gen_cond_dep ' - dev-lua/busted[${LUA_USEDEP}] - ') - ) -" - -REQUIRED_USE="${LUA_REQUIRED_USE} - || ( alsa openal oss portaudio pulseaudio )" - -PATCHES=( - "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-system-luajit-build.patch" - "${FILESDIR}/3.3.3/${PN}-3.3.3-support-system-gtest.patch" - "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-tests_luarocks_lua_version.patch" - "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-boost-181-build.patch" -) - -aegisub_check_compiler() { - if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++14; then - die "Your compiler lacks C++14 support." - fi -} - -pkg_pretend() { - aegisub_check_compiler -} - -pkg_setup() { - aegisub_check_compiler - lua-single_pkg_setup -} - -src_prepare() { - default_src_prepare - - # Remove tests that require unavailable uuid Lua module. - rm automation/tests/modules/lfs.moon || die - - remove_locale() { - rm "po/${1}.po" || die - } - - plocale_find_changes 'po' '' '.po' - plocale_for_each_disabled_locale remove_locale - - # See http://devel.aegisub.org/ticket/1914 - config_rpath_update "${S}"/config.rpath - - eautoreconf -} - -src_configure() { - tc-export PKG_CONFIG - # Prevent access violations from OpenAL detection. See Gentoo bug 508184. - use openal && export agi_cv_with_openal="yes" - - setup-wxwidgets - local myeconfargs=( - --disable-update-checker - --with-ffms2 - --with-system-luajit - $(use_enable debug) - $(use_with alsa) - $(use_with fftw fftw3) - $(use_with openal) - $(use_with oss) - $(use_with portaudio) - $(use_with pulseaudio libpulse) - $(use_with spell hunspell) - $(use_with uchardet) - ) - export FORCE_GIT_VERSION="v${PV}" - econf "${myeconfargs[@]}" -} - -src_compile() { - emake WITH_SYSTEM_GTEST=$(usex test) -} - -src_test() { - emake test-automation - emake test-libaegisub -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/media-video/aegisub/aegisub-3.4.0.ebuild b/media-video/aegisub/aegisub-3.4.0.ebuild deleted file mode 100644 index 82d80b7054ce..000000000000 --- a/media-video/aegisub/aegisub-3.4.0.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( luajit ) -LUA_REQ_USE="lua52compat" - -WX_GTK_VER=3.2-gtk3 -PLOCALES="ar be bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS sr_RS@latin uk_UA vi zh_CN zh_TW" - -inherit meson flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot toolchain-funcs - -DESCRIPTION="Advanced subtitle editor" -HOMEPAGE="http://www.aegisub.org/ https://github.com/TypesettingTools/Aegisub"; - -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://github.com/TypesettingTools/${PN^}.git"; - # Submodules are used to pull bundled libraries. - EGIT_SUBMODULES=() - inherit git-r3 -else - SRC_URI="https://github.com/TypesettingTools/Aegisub/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi -LICENSE="BSD MIT" -SLOT="0" -IUSE="+alsa debug +fftw openal portaudio pulseaudio spell test +uchardet" -RESTRICT="test" - -# aegisub bundles luabins (https://github.com/agladysh/luabins). -# Unfortunately, luabins upstream is practically dead since 2010. -# Thus unbundling luabins isn't worth the effort. -RDEPEND="${LUA_DEPS} - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?] - dev-libs/boost:=[icu,nls] - dev-libs/icu:= - media-libs/ffmpegsource:= - media-libs/fontconfig - media-libs/freetype - media-libs/libass:=[fontconfig] - sys-libs/zlib - virtual/libiconv - virtual/opengl - alsa? ( media-libs/alsa-lib ) - fftw? ( >=sci-libs/fftw-3.3:= ) - openal? ( media-libs/openal ) - portaudio? ( =media-libs/portaudio-19* ) - pulseaudio? ( media-libs/libpulse ) - spell? ( app-text/hunspell:= ) - uchardet? ( app-i18n/uchardet ) -" -DEPEND="${RDEPEND}" -# luarocks is only used as a command-line tool so there is no need to enforce -# LUA_SINGLE_USEDEP on it. On the other hand, this means we must use version -# bounds in order to make sure we use a version migrated to Lua eclasses. -BDEPEND="dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - test? ( - ${RDEPEND} - >=dev-cpp/gtest-1.8.1 - >=dev-lua/luarocks-3.4.0-r100 - $(lua_gen_cond_dep ' - dev-lua/busted[${LUA_USEDEP}] - ') - ) -" - -REQUIRED_USE="${LUA_REQUIRED_USE} - || ( alsa openal portaudio pulseaudio )" - -BUILD_DIR="${WORKDIR}/${P}-build" - -PATCHES=( -"${FILESDIR}/3.4.0/Fix-build-without-pch.patch" -"${FILESDIR}/3.4.0/Use-generated-git-version.patch" -) - -aegisub_check_compiler() { - if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++20; then - die "Your compiler lacks C++20 support." - fi -} - -pkg_pretend() { - aegisub_check_compiler -} - -pkg_setup() { - aegisub_check_compiler - lua-single_pkg_setup -} - -src_prepare() { - default_src_prepare - - # Remove tests that require unavailable uuid Lua module. - rm automation/tests/modules/lfs.moon || die - - remove_locale() { - rm "po/${1}.po" || die - } - - plocale_find_changes 'po' '' '.po' - plocale_for_each_disabled_locale remove_locale - - use test || sed -i "s|subdir('tests')||g" "${S}"/meson.build || die - - mkdir "${BUILD_DIR}" || die - cp "${FILESDIR}/${PV}"/git_version.h "${BUILD_DIR}"/git_version.h || die -} - -src_configure() { - tc-export PKG_CONFIG - use debug && EMESON_BUILDTYPE=debug - setup-wxwidgets - local emesonargs=( - -Denable_update_checker=false - -Dffms2=enabled - -Dsystem_luajit=true - $(meson_feature alsa) - $(meson_feature fftw fftw3) - $(meson_feature openal) - $(meson_feature portaudio) - $(meson_feature pulseaudio libpulse) - $(meson_feature spell hunspell) - $(meson_feature uchardet) - ) - meson_src_configure -} - -src_test() { - meson_src_test test-libaegisub -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-avoid-conveying-positional-parameters-to-source-builtin.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-avoid-conveying-positional-parameters-to-source-builtin.patch deleted file mode 100644 index bc0a669fda63..000000000000 --- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-avoid-conveying-positional-parameters-to-source-builtin.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit c663944bb4a9040e49811037fc3984d2d15764be -Author: Kerin Millar <k...@plushkava.net> -Date: Sun Jan 10 22:52:26 2021 +0000 - - Don't convey positional parameters to the . builtin - - To do so is a bashism; POSIX makes no provision for it. Fortunately, there - is no need to begin with. The srcdir variable is already defined at the - point that build/version.sh is sourced from the configure script and, thus, - does not need to be passed. - - As version.sh is only ever sourced, that would be a valid fix in and as of - itself. However, because version.sh has the executable bit set, there is an - implication that the original author may have intended for it to be so; for - testing purposes, perhaps. So as to continue to support this potential use - case, have the script retain the ability to assign the value of $1 to - srcdir, provided that srcdir is empty and provided that at least one - positional parameter was specified. - - Signed-off-by: Kerin Millar <k...@plushkava.net> - Closes: https://bugs.gentoo.org/764881 - -diff --git a/build/version.sh b/build/version.sh -index 8cea0a3f3..614c74615 100755 ---- a/build/version.sh -+++ b/build/version.sh -@@ -1,4 +1,6 @@ --srcdir="$1" -+if [ -z "$srcdir" ] && [ $# -gt 0 ]; then -+ srcdir=$1 -+fi - - # If no git repo try to read from the existing git_version.h, for building from tarballs - if ! test -d "${srcdir}/.git"; then -diff --git a/configure.ac b/configure.ac -index 1d8c93067..d50541f40 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -117,7 +117,7 @@ PKG_PROG_PKG_CONFIG([pkgconfig_required_version]) - # Developers only - ################# - AC_MSG_CHECKING([for version]) --. $srcdir/build/version.sh "$srcdir" -+. $srcdir/build/version.sh - AC_MSG_RESULT([$BUILD_GIT_VERSION_STRING $VERSION_SOURCE]) - - AC_MSG_CHECKING([for build date]) diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-ffmpegsource-2.40-compat2.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-ffmpegsource-2.40-compat2.patch deleted file mode 100644 index 17dc3f2dbabc..000000000000 --- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-ffmpegsource-2.40-compat2.patch +++ /dev/null @@ -1,106 +0,0 @@ -commit 89c4e8d34ab77c3322f097b91fd9de22cbea7a37 -Author: Thomas Goyne <plorkye...@aegisub.org> -Date: Wed Nov 21 16:41:05 2018 -0800 - - Update ffmpeg and ffms2 - -diff --git a/src/video_provider_ffmpegsource.cpp b/src/video_provider_ffmpegsource.cpp -index 8bd68fbbf..f4ed6a2f2 100644 ---- a/src/video_provider_ffmpegsource.cpp -+++ b/src/video_provider_ffmpegsource.cpp -@@ -44,6 +44,23 @@ - #include <libaegisub/make_unique.h> - - namespace { -+typedef enum AGI_ColorSpaces { -+ AGI_CS_RGB = 0, -+ AGI_CS_BT709 = 1, -+ AGI_CS_UNSPECIFIED = 2, -+ AGI_CS_FCC = 4, -+ AGI_CS_BT470BG = 5, -+ AGI_CS_SMPTE170M = 6, -+ AGI_CS_SMPTE240M = 7, -+ AGI_CS_YCOCG = 8, -+ AGI_CS_BT2020_NCL = 9, -+ AGI_CS_BT2020_CL = 10, -+ AGI_CS_SMPTE2085 = 11, -+ AGI_CS_CHROMATICITY_DERIVED_NCL = 12, -+ AGI_CS_CHROMATICITY_DERIVED_CL = 13, -+ AGI_CS_ICTCP = 14 -+} AGI_ColorSpaces; -+ - /// @class FFmpegSourceVideoProvider - /// @brief Implements video loading through the FFMS library. - class FFmpegSourceVideoProvider final : public VideoProvider, FFmpegSourceProvider { -@@ -78,7 +95,7 @@ public: - if (matrix == RealColorSpace) - FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr); - else if (matrix == "TV.601") -- FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr); -+ FFMS_SetInputFormatV(VideoSource, AGI_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr); - else - return; - ColorSpace = matrix; -@@ -103,16 +120,16 @@ std::string colormatrix_description(int cs, int cr) { - std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV"; - - switch (cs) { -- case FFMS_CS_RGB: -+ case AGI_CS_RGB: - return "None"; -- case FFMS_CS_BT709: -+ case AGI_CS_BT709: - return str + ".709"; -- case FFMS_CS_FCC: -+ case AGI_CS_FCC: - return str + ".FCC"; -- case FFMS_CS_BT470BG: -- case FFMS_CS_SMPTE170M: -+ case AGI_CS_BT470BG: -+ case AGI_CS_SMPTE170M: - return str + ".601"; -- case FFMS_CS_SMPTE240M: -+ case AGI_CS_SMPTE240M: - return str + ".240M"; - default: - throw VideoOpenError("Unknown video color space"); -@@ -206,8 +223,10 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st - - // set thread count - int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt(); -+#if FFMS_VERSION < ((2 << 24) | (30 << 16) | (0 << 8) | 0) - if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF) - Threads = 1; -+#endif - - // set seekmode - // TODO: give this its own option? -@@ -235,18 +254,22 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st - else - DAR = double(Width) / Height; - -- CS = TempFrame->ColorSpace; -+ int VideoCS = CS = TempFrame->ColorSpace; - CR = TempFrame->ColorRange; - -- if (CS == FFMS_CS_UNSPECIFIED) -- CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG; -+ if (CS == AGI_CS_UNSPECIFIED) -+ CS = Width > 1024 || Height >= 600 ? AGI_CS_BT709 : AGI_CS_BT470BG; - RealColorSpace = ColorSpace = colormatrix_description(CS, CR); - - #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0) -- if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) { -- if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo)) -+ if (CS != AGI_CS_RGB && CS != AGI_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) { -+ CS = AGI_CS_BT470BG; -+ ColorSpace = colormatrix_description(AGI_CS_BT470BG, CR); -+ } -+ -+ if (CS != VideoCS) { -+ if (FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), &ErrInfo)) - throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer); -- ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR); - } - #endif - diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost170-build.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost170-build.patch deleted file mode 100644 index 30473e4828d1..000000000000 --- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost170-build.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff a/src/colour_button.cpp b/src/colour_button.cpp ---- a/src/colour_button.cpp -+++ b/src/colour_button.cpp -@@ -18,7 +18,11 @@ - - #include "dialogs.h" - -+#if BOOST_VERSION >= 106900 -+#include <boost/gil.hpp> -+#else - #include <boost/gil/gil_all.hpp> -+#endif - - AGI_DEFINE_EVENT(EVT_COLOR, agi::Color); - -diff a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp ---- a/src/subtitles_provider_libass.cpp -+++ b/src/subtitles_provider_libass.cpp -@@ -46,7 +46,11 @@ - #include <libaegisub/util.h> - - #include <atomic> -+#if BOOST_VERSION >= 106900 -+#include <boost/gil.hpp> -+#else - #include <boost/gil/gil_all.hpp> -+#endif - #include <memory> - #include <mutex> - -diff a/src/video_frame.cpp b/src/video_frame.cpp ---- a/src/video_frame.cpp -+++ b/src/video_frame.cpp -@@ -16,7 +16,11 @@ - - #include "video_frame.h" - -+#if BOOST_VERSION >= 106900 -+#include <boost/gil.hpp> -+#else - #include <boost/gil/gil_all.hpp> -+#endif - #include <wx/image.h> - - namespace { -diff a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp ---- a/src/video_provider_dummy.cpp -+++ b/src/video_provider_dummy.cpp -@@ -45,7 +45,11 @@ - #include <boost/algorithm/string/predicate.hpp> - #include <boost/filesystem/path.hpp> - #include <libaegisub/format.h> -+#if BOOST_VERSION >= 106900 -+#include <boost/gil.hpp> -+#else - #include <boost/gil/gil_all.hpp> -+#endif - - DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern) - : framecount(frames) - diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch deleted file mode 100644 index a6564def1b84..000000000000 --- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit dd67db47cb2203e7a14058e52549721f6ff16a49 -Author: Maxime Gauduin <aluc...@archlinux.org> -Date: Tue May 9 04:01:47 2017 +0200 - -Fix compilation against icu 59.1 (#46) - -diff --git a/src/utils.cpp b/src/utils.cpp -index e1cde5e83..876c4c011 100644 ---- a/src/utils.cpp -+++ b/src/utils.cpp -@@ -44,6 +44,7 @@ - #include <boost/filesystem/path.hpp> - #include <map> - #include <unicode/locid.h> -+#include <unicode/unistr.h> - #include <wx/clipbrd.h> - #include <wx/filedlg.h> - #include <wx/stdpaths.h> diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch deleted file mode 100644 index 47508951e452..000000000000 --- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch +++ /dev/null @@ -1,59 +0,0 @@ -From d4461f65be5aa440506bd23e90e71aaf8f0ebada Mon Sep 17 00:00:00 2001 -From: sidneys <sidneys.github...@outlook.com> -Date: Sat, 31 Mar 2018 02:57:19 +0200 -Subject: [PATCH] fix(updated-macos-build): prefix icu method calls - (icu::BreakIterator, icu::Locale, icu::UnicodeString) - ---- - libaegisub/common/character_count.cpp | 6 +++--- - src/utils.cpp | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libaegisub/common/character_count.cpp b/libaegisub/common/character_count.cpp -index 0b8c70b31..1276f74fb 100644 ---- a/libaegisub/common/character_count.cpp -+++ b/libaegisub/common/character_count.cpp -@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) { - static std::once_flag token; - std::call_once(token, [&] { - UErrorCode status = U_ZERO_ERROR; -- bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status)); -+ bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status)); - if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator"); - }); - -@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) { - - size_t count = 0; - auto pos = character_bi.first(); -- for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) { -+ for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) { - if (!mask) - ++count; - else { -@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) { - auto& bi = get_break_iterator(&str[0], str.size()); - - for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) { -- if (end == BreakIterator::DONE) -+ if (end == icu::BreakIterator::DONE) - return str.size(); - if (n == 0) - return pos; -diff --git a/src/utils.cpp b/src/utils.cpp -index 876c4c011..2416aa7a2 100644 ---- a/src/utils.cpp -+++ b/src/utils.cpp -@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio - } - - wxString LocalizedLanguageName(wxString const& lang) { -- Locale iculoc(lang.c_str()); -+ icu::Locale iculoc(lang.c_str()); - if (!iculoc.isBogus()) { -- UnicodeString ustr; -+ icu::UnicodeString ustr; - iculoc.getDisplayName(iculoc, ustr); - #ifdef _MSC_VER - return wxString(ustr.getBuffer()); - diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-makefile-for-make4.3.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-makefile-for-make4.3.patch deleted file mode 100644 index 8f94c5a10d5b..000000000000 --- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-makefile-for-make4.3.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit f4cc905c69ca69c68cb95674cefce4abc37ce046 -Author: wangqr <wan...@wangqr.tk> -Date: Mon Feb 17 14:42:07 2020 +0800 - - Use target name without directory in $*_OBJ macro - - Fix Aegisub/Aegisub#171 - -diff --git a/Makefile.target b/Makefile.target -index 516ef3c24..5c4c5d259 100644 ---- a/Makefile.target -+++ b/Makefile.target -@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $< - # Libraries contain all object files they depend on (but they may depend on other files) - # Not using libtool on OS X because it has an unsilenceable warning about a - # compatibility issue with BSD 4.3 (wtf) --lib%.a: $$($$*_OBJ) -+lib%.a: $$($$(*F)_OBJ) - @$(BIN_MKDIR_P) $(dir $@) - $(BIN_AR) cru $@ $(filter %.o,$^) - $(BIN_RANLIB) $@ diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-luaL_Reg-not-luaL_reg.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-luaL_Reg-not-luaL_reg.patch deleted file mode 100644 index 1704630ea53f..000000000000 --- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-luaL_Reg-not-luaL_reg.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/libaegisub/lua/modules/lpeg.c b/libaegisub/lua/modules/lpeg.c -index 8d67335ab..5261c2061 100644 ---- a/libaegisub/lua/modules/lpeg.c -+++ b/libaegisub/lua/modules/lpeg.c -@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) { - } - - --static struct luaL_reg pattreg[] = { -+static struct luaL_Reg pattreg[] = { - {"match", matchl}, - {"print", printpat_l}, - {"locale", locale_l}, -@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = { - }; - - --static struct luaL_reg metapattreg[] = { -+static struct luaL_Reg metapattreg[] = { - {"__add", union_l}, - {"__pow", star_l}, - {"__sub", diff_l}, -diff --git a/vendor/luabins/src/luabins.c b/vendor/luabins/src/luabins.c -index 60668213f..35b177629 100644 ---- a/vendor/luabins/src/luabins.c -+++ b/vendor/luabins/src/luabins.c -@@ -54,7 +54,7 @@ static int l_load(lua_State * L) - } - - /* luabins Lua module API */ --static const struct luaL_reg R[] = -+static const struct luaL_Reg R[] = - { - { "save", l_save }, - { "load", l_load }, diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch deleted file mode 100644 index 90e57f178dc4..000000000000 --- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch +++ /dev/null @@ -1,53 +0,0 @@ -See http://devel.aegisub.org/ticket/1899 -and http://devel.aegisub.org/ticket/1900 - -diff --git a/configure.ac b/configure.ac -index 1649efc..2f4470b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -133,20 +133,17 @@ AS_IF([test x$build_darwin != xyes], [ - AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]])) - - AS_IF([test x$enable_compiler_flags != xno], [ -- CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g" -- CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g" -+ CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter" -+ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing" -+ AC_C_FLAG([-std=gnu99]) - AC_CXX_FLAG([-std=c++11]) -- AC_CXX_FLAG([-Wno-c++11-narrowing]) - AC_C_FLAG([-Wno-unused-local-typedefs]) - AC_CXX_FLAG([-Wno-unused-local-typedefs]) - - # -O* messes with debugging. - AS_IF([test x$enable_debug = xyes], [ -- CFLAGS="$CFLAGS -O0" -- CXXFLAGS="$CXXFLAGS -O0" -- ], [ -- CFLAGS="$CFLAGS -O3" -- CXXFLAGS="$CXXFLAGS -O3" -+ CFLAGS="$CFLAGS -O0 -g" -+ CXXFLAGS="$CXXFLAGS -O0 -g" - ]) - ]) - -diff --git a/src/Makefile b/src/Makefile -index 0ee6c84..cad213b 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -188,14 +188,13 @@ endif - ##################### - # SOURCE-LEVEL CFLAGS - ##################### --$(d)MatroskaParser.o_FLAGS := -Wno-sometimes-uninitialized - $(d)audio_player.o_FLAGS := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL) - $(d)audio_provider_factory.o_FLAGS := $(CFLAGS_FFMS2) - $(d)auto4_base.o_FLAGS := $(CFLAGS_FREETYPE) - $(d)charset_detect.o_FLAGS := -D_X86_ - $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG) - $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS) --$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing -+$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) - $(d)text_file_reader.o_FLAGS := -D_X86_ - $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2) - $(d)auto4_lua.o_FLAGS := $(CFLAGS_LUA) diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch deleted file mode 100644 index 3c6c108e1738..000000000000 --- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch +++ /dev/null @@ -1,75 +0,0 @@ -commit 83f868ea8decbbe97891631fe142e84c883ee33d -Author: Ilya Tumaykin <itumay...@gmail.com> -Date: Wed Jun 1 20:00:37 2016 +0300 - -Allow to build and run tests with a system copy of gtest (googletest) - -Also add LIBS_UCHARDET to the mix only when uchardet is requested. - -Closes #1923 - -Bug: http://devel.aegisub.org/ticket/1923 ---- - -diff --git a/tests/Makefile b/tests/Makefile -index 8c30c1d..c5bf049 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -1,24 +1,45 @@ - include $(dir $(lastword $(MAKEFILE_LIST)))../header.mk - -+WITH_SYSTEM_GTEST ?= no -+ -+ifeq (no, $(WITH_SYSTEM_GTEST)) - GTEST_ROOT ?= $(TOP)vendor/googletest - GTEST_FILE := ${GTEST_ROOT}/src/gtest-all -+GTEST_CPPFLAGS := -I$(GTEST_ROOT) -I$(GTEST_ROOT)/include -+GTEST_LIBS := $(LIBS_PTHREAD) -+else -+GTEST_CPPFLAGS := $(shell ${PKG_CONFIG} --cflags-only-I gtest) -+GTEST_LIBS := $(shell ${PKG_CONFIG} --libs gtest) -+endif -+ -+GTEST_CXXFLAGS := $(CFLAGS_PTHREAD) - - run_PCH := $(d)support/tests_pre.h - run_CPPFLAGS := -I$(TOP)libaegisub/include -I$(TOP) -I$(d)support \ -- -I$(GTEST_ROOT) -I$(GTEST_ROOT)/include $(CPPFLAGS_BOOST) $(CFLAGS_LUA) --run_CXXFLAGS := -Wno-unused-value -Wno-sign-compare --run_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_UCHARDET) $(LIBS_PTHREAD) -+ $(CPPFLAGS_BOOST) $(CFLAGS_ICU) $(CFLAGS_LUA) $(GTEST_CPPFLAGS) -+run_CXXFLAGS := -Wno-unused-value -Wno-sign-compare $(GTEST_CXXFLAGS) -+run_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(GTEST_LIBS) - run_OBJ := \ - $(subst .cpp,.o,$(wildcard $(d)tests/*.cpp)) \ - $(d)support/main.o \ - $(d)support/util.o \ -- $(TOP)lib/libaegisub.a \ -- $(GTEST_FILE).o -+ $(TOP)lib/libaegisub.a - -+ifeq (yes, $(HAVE_UCHARDET)) -+run_LIBS += $(LIBS_UCHARDET) -+endif -+ -+ifeq (no, $(WITH_SYSTEM_GTEST)) -+run_OBJ += $(GTEST_FILE).o - # This bit of goofiness is to make it only try to build the tests if google - # test can be found and silently skip it if not, by using $(wildcard) to check - # for file existence - PROGRAM += $(subst $(GTEST_FILE).cc,$(d)run,$(wildcard $(GTEST_FILE).cc)) -+test: $(subst $(GTEST_FILE).cc,test-libaegisub,$(wildcard $(GTEST_FILE).cc)) -+else -+PROGRAM += $(d)run -+test: test-libaegisub -+endif - - ifeq (yes, $(BUILD_DARWIN)) - run_LIBS += -framework ApplicationServices -framework Foundation -@@ -31,6 +52,4 @@ gtest_filter ?= * - test-libaegisub: $(d)run $(d)data - cd $(TOP)tests; ./run --gtest_filter="$(gtest_filter)" - --test: $(subst $(GTEST_FILE).cc,test-libaegisub,$(wildcard $(GTEST_FILE).cc)) -- - include $(TOP)Makefile.target diff --git a/media-video/aegisub/files/3.4.0/git_version.h b/media-video/aegisub/files/3.4.0/git_version.h deleted file mode 100644 index 1e0344e9ca99..000000000000 --- a/media-video/aegisub/files/3.4.0/git_version.h +++ /dev/null @@ -1,5 +0,0 @@ -#define BUILD_GIT_VERSION_NUMBER 340 -#define BUILD_GIT_VERSION_STRING "3.4.0" -#define TAGGED_RELEASE 0 -#define INSTALLER_VERSION "0.0.0" -#define RESOURCE_BASE_VERSION 0, 0, 0
