From d3fc35858ba4bc0c8038a8c536246b00fe648358 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Aug 2022 10:46:12 +0100 Subject: gentoo auto-resync : 29:08:2022 - 10:46:12 --- media-video/Manifest.gz | Bin 25863 -> 25865 bytes media-video/aegisub/Manifest | 4 +- .../aegisub/aegisub-3.2.2_p20160518-r102.ebuild | 158 -------------------- .../aegisub/aegisub-3.2.2_p20160518-r103.ebuild | 159 -------------------- .../aegisub/aegisub-3.2.2_p20160518-r104.ebuild | 160 +++++++++++++++++++++ ...3.2.2_p20160518-ffmpegsource-2.40-compat2.patch | 106 ++++++++++++++ 6 files changed, 268 insertions(+), 319 deletions(-) delete mode 100644 media-video/aegisub/aegisub-3.2.2_p20160518-r102.ebuild delete mode 100644 media-video/aegisub/aegisub-3.2.2_p20160518-r103.ebuild create mode 100644 media-video/aegisub/aegisub-3.2.2_p20160518-r104.ebuild create mode 100644 media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-ffmpegsource-2.40-compat2.patch (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index fe9249b015ab..dd521e5d4a3e 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest index 75c5ba1e7651..faaca4eb0a4d 100644 --- a/media-video/aegisub/Manifest +++ b/media-video/aegisub/Manifest @@ -1,4 +1,5 @@ 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-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 @@ -10,7 +11,6 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2452 BLAK AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch 505 BLAKE2B d92ab5c7604b9c04296ea82d3c5b093a900bb9345289539262e5d057bf21d003ce1fdfce7e6f57b8dad3cb62c3e604ada6e9bd596a3673afbbced338230ba638 SHA512 71bc5511bc0fcb9d55e893300066f7e755da5bad04f74e0ba103e622cac6ebf99d1fa7b1ca9f08d2b5169d305a4bee6a7782cb14304352ca108d126931851a5b 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-r102.ebuild 4135 BLAKE2B 1ec4c91862a27fd6997048724488c867d1f7ce689d71cdcb3efee366fe6e4c02de75d5f97b27f3d338c22bfad209ac3816d7de53f0e52c14def33588ddd5ce54 SHA512 50e82d347ac0171589c75c753be393bca249b14cd540b74de6573bb39dfdecdb578a2d1545f516173d334110e7df2504909bf8cee8ab5043176c0939c3bd52a0 -EBUILD aegisub-3.2.2_p20160518-r103.ebuild 4184 BLAKE2B 79bca74372ae8a6aded4a26dde795dcdff7202d8d2a9ad7d0e753cbe11619f039348d19132c9615149788163717a65c9e891d66328412a99d329b02c0e2f7d17 SHA512 84d1475bae544b5ab779078bbc2a6ee4cb217844dea7eda8e3cea0c3fa47c9b960488d53cc4fbb6471cdd6017a8812df07c9e74601f1c2872caa7ccbdde86f50 +EBUILD aegisub-3.2.2_p20160518-r104.ebuild 4236 BLAKE2B 3b9e22096eb5c3a25bf2440c70cccd97a4d609cf22b990be1f57f7ff14411d93b13ba4e54bf68df3d04885c6e58d53d5b7570ca6ee49b58e36263c0baf9e5b86 SHA512 a270f24e6de85fe0683e7723d4ff8460b03aba23cf12db9d4625ba58ab9fc7a80c77aed615d9e0422c8424cd319a2348cf59b88753e15a01a92c89cdbdfc324f EBUILD aegisub-9999.ebuild 2872 BLAKE2B ce61183420d6421c5f4ca0da927d766be7eec273495cac2823d69a511a1a75850d680592b6902d346da69f1b1998396bdd32cff847ee2b142e2120737110a30b SHA512 4f8ffb4fc3c95a07e1ef9f3c9d6b5f5a43f01c189a26efbcd1200d52141c93508dce31d92442617db26416b3e0ac107cf371cb7a0ae3200008cba57383b01638 MISC metadata.xml 490 BLAKE2B 1f9546d336e50825e1490d8f0b54a21c076ec000427f0c319781e702ec0a58966bd4193e26c0c7cc4e677bea67a865a9a2f040fd4f58356d8e5539c5c7592665 SHA512 7717dcf3bbe125775a8a93682cde4477294649cbd6d01dcccc132b51880d7a58a61314134cb83f7ffd43e104f4818d9d27c1b90685f988ebe78ecdd9156db9eb diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r102.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r102.ebuild deleted file mode 100644 index a9ce3414a7ab..000000000000 --- a/media-video/aegisub/aegisub-3.2.2_p20160518-r102.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2021 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? ( 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,threads(+)] - 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" -) - -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/aegisub-3.2.2_p20160518-r103.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r103.ebuild deleted file mode 100644 index a9c7d950a82c..000000000000 --- a/media-video/aegisub/aegisub-3.2.2_p20160518-r103.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# 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,threads(+)] - dev-libs/icu:= - ~media-libs/ffmpegsource-2.23:= - 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" -) - -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/aegisub-3.2.2_p20160518-r104.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r104.ebuild new file mode 100644 index 000000000000..e37b9b04b183 --- /dev/null +++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r104.ebuild @@ -0,0 +1,160 @@ +# 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,threads(+)] + 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" +) + +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-ffmpegsource-2.40-compat2.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-ffmpegsource-2.40-compat2.patch new file mode 100644 index 000000000000..17dc3f2dbabc --- /dev/null +++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-ffmpegsource-2.40-compat2.patch @@ -0,0 +1,106 @@ +commit 89c4e8d34ab77c3322f097b91fd9de22cbea7a37 +Author: Thomas Goyne +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 + + 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 + -- cgit v1.2.3