gentoo auto-resync : 09:08:2024 - 11:04:52

4 files changed, 189 insertions, 4 deletions

diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 0a39e0e53848..29a26bd86dbb 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -10,8 +10,10 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-luaL_Reg-not-luaL_reg.patch 996 BLAK
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch 2186 BLAKE2B 67558c0d8a1227e03d6ab97e4f417ec0ef557609be908b403ea5d4c4b12b58dd33822611b98e42afdbc3e65741094ef52d19812fd4eea5611f12a7e109b0986f SHA512 8584f8b6822642f5afdbe1fb9a1e77b32fa4eefebb473d6a501147d328ca38ecb2f88f4247a7ad06a8dfe3d9cc6695f60652dbc122237a17d097bae2f29a6a7e
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2452 BLAKE2B 96b3712ec2f01eecff986b6e7fa8f2844b194e4cf139c0195d87fc7bd7aa77734c1b603c23081179fcbc4699e3c887fbb8069e58a23c44d706d79233a5418a1e SHA512 c3c8e5d13f73257278323bc2bba97b3abf838af0c727dc77aa8ba76b16440354d8d450ac9f6b5ab89cac3b1f44cc883a3ef80f22cf4f3ddd7ade05ee06c59cbb
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch 505 BLAKE2B d92ab5c7604b9c04296ea82d3c5b093a900bb9345289539262e5d057bf21d003ce1fdfce7e6f57b8dad3cb62c3e604ada6e9bd596a3673afbbced338230ba638 SHA512 71bc5511bc0fcb9d55e893300066f7e755da5bad04f74e0ba103e622cac6ebf99d1fa7b1ca9f08d2b5169d305a4bee6a7782cb14304352ca108d126931851a5b
+AUX 3.3.3/aegisub-3.3.3-support-icu-75.patch 763 BLAKE2B d816a88c954d3153a3c1ee6b313fff700107489d0d8c88a480030ab82dc74a646f270e93507740d088e3e7f1855e9dc108a5d487e274e6f7bfc85b03ffcc81eb SHA512 d80549dbcf4292af53230b6bc4fdf12d6b6d1efc3e9bbf5322a38aa623677e138ffdb2d867d46093cda7f89101e01545fddaf37338b1d38c5f88136f229be471
 AUX 3.3.3/aegisub-3.3.3-support-system-gtest.patch 2932 BLAKE2B e05519e4734f7532f605d63d27fd9386fba7eb0b36055235701ad65ee704f86424fbfc89fa36da6137c11fb149d11e793f37ae1e3c1e7820eaf236a774d2fa83 SHA512 643b7525e6f170d552551b6ebeffc9a5b37b8a38570f654fb93d523d2ccce355403ce50ddb337ee1761a4997235e12440d86684f296619196c418183989727cd
 DIST aegisub-3.3.3.tar.gz 6580314 BLAKE2B b6a6b6d9a805fb1aec943f00452e5f074c050d7d8970e0fa57da54a7a3c12b86241eafafd957577625bcce395c9f909fe60a22c9d76fcf8f018a4ea03921dacf SHA512 19e44667ad8742560559387c15f6c00339194cd26e1140624c63f34c6b4da6bb0b80be0f636a2d1cd0b15f1598e0580218d648e0622635b12eeaad3a40df9abc
+EBUILD aegisub-3.3.3-r1.ebuild 3971 BLAKE2B 9e87a96bc66a9ef52337f0e76dace3cbba68b3bc7a1fee75a3341be6db2f637dc83fcbc841b9fa44409a64b7a8bc6f1c7bb681574ce9b1fad937c3d85726ae86 SHA512 52cca502f798cf3c246477319dcb49c44d4b95b8c7e38f7c8a31a7c21595e818a1255169fed589ffa8897932ffc2bd291cb5a3f11204de6044992c1881af23a6
 EBUILD aegisub-3.3.3.ebuild 3915 BLAKE2B e23ce10ea46e06315826b446d3f4f00368271432e9ad3d235c7d413c69cf83bebf65e43de5354bb5f52cce57be10963346d6c3abf42713ea10f4a66924d7fad3 SHA512 ddf52ad9a4bb353a048a6c5b406173d6389a65ab1fd5e5765acf785e0f48dcd57f7397ffcafe1153a928e9e225e9bbef76fa1b44d30577f93bf296fecc54e224
-EBUILD aegisub-9999.ebuild 3917 BLAKE2B 3bcc249ae52755ed55e06bc5422532bf460988af45b0da1028e4f22e5531e1d806962a0b13e506e2ba88283edcec550d68bf2dc37882752feb6ad4b6dd334e9c SHA512 648b0a44500379c6be599acef5b53a5dbc5af283b46c783aaeacdf2e4da2844007c41648be3da9c673341675f986d1407c5efa86e98cb8114702f6b2b5f95397
+EBUILD aegisub-9999.ebuild 3971 BLAKE2B 9e87a96bc66a9ef52337f0e76dace3cbba68b3bc7a1fee75a3341be6db2f637dc83fcbc841b9fa44409a64b7a8bc6f1c7bb681574ce9b1fad937c3d85726ae86 SHA512 52cca502f798cf3c246477319dcb49c44d4b95b8c7e38f7c8a31a7c21595e818a1255169fed589ffa8897932ffc2bd291cb5a3f11204de6044992c1881af23a6
 MISC metadata.xml 490 BLAKE2B dd77320afb5975e48eae5240c165ed9470fe5ae1ed917b8ba022a9c63d1b446c75b820eafef914c885afb9c32c8634bf6ee55e1340a1efce91d0fe019a589cc8 SHA512 deee9b5cbcbd3fa37a665b333094334c3a298face98c7deb992127191d77cbe0f7781945fd8297ce9f26ca34988539a4abc27877c4dff79228d64dc1c4bfeddd
diff --git a/media-video/aegisub/aegisub-3.3.3-r1.ebuild b/media-video/aegisub/aegisub-3.3.3-r1.ebuild
new file mode 100644
index 000000000000..530606341ba5
--- /dev/null
+++ b/media-video/aegisub/aegisub-3.3.3-r1.ebuild
@@ -0,0 +1,156 @@
+# 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"
+	"${FILESDIR}/3.3.3/${PN}-3.3.3-support-icu-75.patch"
+)
+
+aegisub_check_compiler() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++17; then
+		die "Your compiler lacks C++17 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-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 208e6b0e5adb..530606341ba5 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -75,11 +75,12 @@ PATCHES=(
 	"${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"
+	"${FILESDIR}/3.3.3/${PN}-3.3.3-support-icu-75.patch"
 )
 
 aegisub_check_compiler() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++14; then
-		die "Your compiler lacks C++14 support."
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++17; then
+		die "Your compiler lacks C++17 support."
 	fi
 }
 
diff --git a/media-video/aegisub/files/3.3.3/aegisub-3.3.3-support-icu-75.patch b/media-video/aegisub/files/3.3.3/aegisub-3.3.3-support-icu-75.patch
new file mode 100644
index 000000000000..0287527117ba
--- /dev/null
+++ b/media-video/aegisub/files/3.3.3/aegisub-3.3.3-support-icu-75.patch
@@ -0,0 +1,26 @@
+From 5ef040ffe2fc743ecff0d744b82a24e5c9b521a8 Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <sarnex@gentoo.org>
+Date: Thu, 8 Aug 2024 17:21:31 -0400
+Subject: [PATCH] Fix build with icu 75
+
+Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 197d0a788..02cb56052 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -144,7 +144,7 @@ AS_IF([test x$enable_compiler_flags != xno], [
+   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing"
+ 
+   # For mac compiler which still stuck on c++98
+-  AC_CXX_FLAG([-std=c++14])
++  AC_CXX_FLAG([-std=c++17])
+ 
+   # -O* messes with debugging.
+   AS_IF([test x$enable_debug = xyes], [
+-- 
+2.45.2
+