[gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/3.2.2_p20160518/, media-video/aegisub/

[Nick Sarnie]

commit:     f943cce85e79f7cf011979d40a17444aa68e0450
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  5 14:31:27 2022 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Mar  5 14:31:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f943cce8

media-video/aegisub: Fix build

Closes: https://bugs.gentoo.org/834086
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 .../aegisub/aegisub-3.2.2_p20160518-r103.ebuild    | 159 +++++++++++++++++++++
 ...sub-3.2.2_p20160518-luaL_Reg-not-luaL_reg.patch |  35 +++++
 2 files changed, 194 insertions(+)

diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r103.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r103.ebuild
new file mode 100644
index 000000000000..0ac1ff04d08e
--- /dev/null
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r103.ebuild
@@ -0,0 +1,159 @@
+# 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? ( 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"
+)
+
+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-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
new file mode 100644
index 000000000000..1704630ea53f
--- /dev/null
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-luaL_Reg-not-luaL_reg.patch
@@ -0,0 +1,35 @@
+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 },