From 4921f12d049de1487e17383a32da50a03ea90d65 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Dec 2022 01:58:14 +0000 Subject: gentoo auto-resync : 23:12:2022 - 01:58:14 --- media-video/aegisub/Manifest | 2 + .../aegisub/aegisub-3.2.2_p20160518-r105.ebuild | 161 +++++++++++++++++++++ ...gisub-3.2.2_p20160518-fix-boost-181-build.patch | 56 +++++++ 3 files changed, 219 insertions(+) create mode 100644 media-video/aegisub/aegisub-3.2.2_p20160518-r105.ebuild create mode 100644 media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost-181-build.patch (limited to 'media-video/aegisub') diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest index dc7852587ce4..8b1a0f6f9479 100644 --- a/media-video/aegisub/Manifest +++ b/media-video/aegisub/Manifest @@ -1,5 +1,6 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-avoid-conveying-positional-parameters-to-source-builtin.patch 1831 BLAKE2B f46889a5140423f29095e79a0a5778dd1b21d812570c8c5e444473266527ee3808a07d578b8aff4ce91d6ca665c230d66bcbf810851fa31a95e625c32e8c0fc6 SHA512 97623b47828b0db7dfcde2f8d9f00d835cb98dd8be2d9b727f1d4a3b73b13b5e3bc0c3f40ae41d6b21fadaab14b019a788a2b55a84fb365ad23bb75e76387df8 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-ffmpegsource-2.40-compat2.patch 3842 BLAKE2B 8e03d10f2cc1231ee6c89a81b3eec93a5b4c9bd2100aae0fe2eeb903bef08d9f6704010085e6f7a666ed9269130ecf01345cd109cf4d2796de2b1b65dc8813dc SHA512 35d8f0d2f7bf1bcd6602be9e53914e430ed64e779233245e8d0d8ea4ea8ebdccee23a405f92956e641052f6243027cf34d1ffa7ae47f3d15ed35d625be5fe2cd +AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost-181-build.patch 2243 BLAKE2B 5b6874ebb89f6ed3ab7929796bd1f59e1748c418ae5397df265fe3007d9f971eec7388f5f6a2dcac020d71c9cffece931a1ae5eb78f8ff4ab61fdc4c5e65328a SHA512 b9bfb48172f35c0b08ee5bae6ecef3c73a6210321d74c2510da4258901ec9eac523a30c10de4e8d025352961a98956478606dadb662a40ddbf70413bf77dedab AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost170-build.patch 1490 BLAKE2B 6b3fb8f98348585dc15fd92e992b231fb83f94dffd3ed97cf0d41323e28bd6c48a77e6e7eecd9e79a1f85ab933eee93f31feebf08ed2d18488d519dbe47b57a3 SHA512 59ec5d28424f9b2ab1d63b00c2e237263f6816d42baef977ab9494fa696aace7d3b7e949c672aa77c799dbb255c69fcd3acdc289413dd5b3f8569e28ba528cef AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch 496 BLAKE2B 33e646f71ced61c5411ddc871ff42fb61d5e89d068441e72c33a99927a27cad206068eab70563db94d21f4aa9516e69da8c34d0e78c46f15b1561b2170d8d5ff SHA512 58c8acc766751b6f9122821b5958ef3756c4802e91ed7ed8915c54eb7c8c960c46734a8d76cc200c064e0dab5a1f0008f99a5dd4a1c51ecda7983bb84ef6d645 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch 2369 BLAKE2B edbada9d9bb3fbd4ffcd3f8f6aa640132163e0127baada7d40eb39312479602cf57b80e9314b8d3a92aff74764a9ed8336b055cf9c2d387c27595553f1f01185 SHA512 7963b76652126e1aa574e89f56c09e6008afd745c9198a2b081ed65c8697a15cbd7e611d6aeae0e2513b0eb79409665fd78885ef3599ff6f0d074b42bb461a8a @@ -12,5 +13,6 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch 505 AUX aegisub-9999-git.patch 1602 BLAKE2B ae40661da657c303eaaefc8b2d850e810ca506b60eb023bb34b6fe9839205dec15c7f781ab0e886f52e3c1d721338bf9bd9ec29814c65f236c8d5b99156a8a45 SHA512 7e4c1be034543b887b9ee6b84e686c2f1c26e6138a9aee997a0eab2dd5256a918c4ccfda41b0cc71a88fc0856f1726cee413e16fa4aef260faacb0803e01732d DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6 EBUILD aegisub-3.2.2_p20160518-r104.ebuild 4225 BLAKE2B 2cda2b96b73e67fdb2891e198720bb21fa8968f0be833731033778360d120311eeb17d42c4df7967e547a99a598c3b7c1f65fe35530005c8a2584eff676f453d SHA512 2109821673748c026bf3316718c10e866ea77f0d27ff392d02d38e0ed64cc2cafecc841b57f659512232d66bab136f47e815edd56bc6d969b99fa535e63c7fac +EBUILD aegisub-3.2.2_p20160518-r105.ebuild 4279 BLAKE2B 96d9d274ae7914276e2a4d5c0bd08a22573b492dfe29dbe3a050d83646fc3ebc1e1a85506ed94359d3c16dfd701ab32db9964af6d6b0fed4eff1b0bf2bfdaa28 SHA512 e21264ab48cc71a1e67195a63c6b8279d84f5fe332402798da5218573103fd9d937b61cbf641a887ebd50e892ce82b4b4e178a2865d4cf7f8d26a8da8e84b7a8 EBUILD aegisub-9999.ebuild 2861 BLAKE2B d9f0a07dc04e1b220e3346ad27480ce9c2854ddcc25a73c30e9eba8bc4a6507ef7e37bea5db70defbab336a6ffaa634f2bb0a82338eada2af5263ca7898caf7b SHA512 c2031bcd77f9980f7eade7548cc2821220fe4a42f91b5b0ddc76e67c2e6b77db794a8068372e6dee92458fbd4b2bda79940c45ca72ec7d3558c72f1bfa4de9ad MISC metadata.xml 490 BLAKE2B 1f9546d336e50825e1490d8f0b54a21c076ec000427f0c319781e702ec0a58966bd4193e26c0c7cc4e677bea67a865a9a2f040fd4f58356d8e5539c5c7592665 SHA512 7717dcf3bbe125775a8a93682cde4477294649cbd6d01dcccc132b51880d7a58a61314134cb83f7ffd43e104f4818d9d27c1b90685f988ebe78ecdd9156db9eb diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r105.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r105.ebuild new file mode 100644 index 000000000000..f9b435cd6a74 --- /dev/null +++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r105.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2022 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.0 +PLOCALES="ar 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" +COMMIT_ID="b118fe7e7a5c37540e2f0aa75af105e272bad234" + +inherit autotools flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot + +DESCRIPTION="Advanced subtitle editor" +HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub" +SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +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-sound/pulseaudio ) + 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}/${PV}/${P}-fix-system-luajit-build.patch" + "${FILESDIR}/${PV}/${P}-respect-compiler-flags.patch" + "${FILESDIR}/${PV}/${P}-support-system-gtest.patch" + "${FILESDIR}/${PV}/${P}-fix-icu59-build.patch" + "${FILESDIR}/${PV}/${P}-fix-icu62-build.patch" + "${FILESDIR}/${PV}/${P}-fix-boost170-build.patch" + "${FILESDIR}/${PV}/${P}-fix-makefile-for-make4.3.patch" + "${FILESDIR}/${PV}/${P}-tests_luarocks_lua_version.patch" + "${FILESDIR}/${PV}/${P}-avoid-conveying-positional-parameters-to-source-builtin.patch" + "${FILESDIR}/${PV}/${P}-luaL_Reg-not-luaL_reg.patch" + "${FILESDIR}/${PV}/${P}-ffmpegsource-2.40-compat2.patch" + "${FILESDIR}/${PV}/${P}-fix-boost-181-build.patch" +) + +aegisub_check_compiler() { + if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then + die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3." + 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 + + cat <<- EOF > build/git_version.h || die + #define BUILD_GIT_VERSION_NUMBER 8897 + #define BUILD_GIT_VERSION_STRING "${PV}" + #define TAGGED_RELEASE 0 + EOF +} + +src_configure() { + # 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) + ) + 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/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost-181-build.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost-181-build.patch new file mode 100644 index 000000000000..ac264bc70676 --- /dev/null +++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost-181-build.patch @@ -0,0 +1,56 @@ +diff --git a/libaegisub/include/libaegisub/lua/utils.h b/libaegisub/include/libaegisub/lua/utils.h +index c5a65d6e4..f4921d582 100644 +--- a/libaegisub/include/libaegisub/lua/utils.h ++++ b/libaegisub/include/libaegisub/lua/utils.h +@@ -87,7 +87,10 @@ int exception_wrapper(lua_State *L) { + + template + void set_field(lua_State *L, const char *name, T value) { +- push_value(L, value); ++ if constexpr(std::is_convertible::value) ++ push_value(L, static_cast(value)); ++ else ++ push_value(L, value); + lua_setfield(L, -2, name); + } + +diff --git a/src/auto4_lua.cpp b/src/auto4_lua.cpp +index 245689679..6d479b2c3 100644 +--- a/src/auto4_lua.cpp ++++ b/src/auto4_lua.cpp +@@ -115,7 +115,8 @@ namespace { + int get_translation(lua_State *L) + { + wxString str(check_wxstring(L, 1)); +- push_value(L, _(str).utf8_str()); ++ const char* val = static_cast( _(str).utf8_str()); ++ push_value(L, val); + return 1; + } + +diff --git a/src/command/video.cpp b/src/command/video.cpp +index fb2bcb0ba..77e3e9ca7 100644 +--- a/src/command/video.cpp ++++ b/src/command/video.cpp +@@ -475,7 +475,7 @@ static void save_snapshot(agi::Context *c, bool raw) { + // If where ever that is isn't defined, we can't save there + if ((basepath == "\\") || (basepath == "/")) { + // So save to the current user's home dir instead +- basepath = wxGetHomeDir().c_str(); ++ basepath = static_cast(wxGetHomeDir().c_str()); + } + } + // Actual fixed (possibly relative) path, decode it +diff --git a/src/dialog_attachments.cpp b/src/dialog_attachments.cpp +index 38ff53027..e30339f81 100644 +--- a/src/dialog_attachments.cpp ++++ b/src/dialog_attachments.cpp +@@ -161,7 +161,7 @@ void DialogAttachments::OnExtract(wxCommandEvent &) { + + // Multiple or single? + if (listView->GetNextSelected(i) != -1) +- path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str(); ++ path = static_cast(wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str()); + else { + path = SaveFileSelector( + _("Select the path to save the file to:"), -- cgit v1.2.3