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

[Ian Delaney]

commit:     c2677e5cfc8e1dd211890be4159fc5d604e9b434
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Nov  2 08:26:28 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Nov  2 08:56:58 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2677e5c

media-video/aegisub: version bump to 3.0.4

Add the last aegisub version that has:
- dependency on <wxGTK-3.0
- no dependency on boost
- no dependency on icu
- optional libass dependency
- optional lua dependency

It also has the similar changes as 3.2.2 ebuild:
- proper compiler flags handling
- minor lua issues fixed
- cleaned up dependencies

 media-video/aegisub/Manifest                       |   1 +
 media-video/aegisub/aegisub-3.0.4.ebuild           | 108 +++++++++++++++++++++
 .../files/aegisub-3.0.4-fix-lua-macro.patch        |  13 +++
 ...aegisub-3.0.4-respect-user-compiler-flags.patch |  30 ++++++
 4 files changed, 152 insertions(+)

diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index a493a82..661bb74 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,4 +1,5 @@
 DIST aegisub-2.1.9.tar.xz 1670496 SHA256 e0591c96183f7713bb14f9d357a2e12bdd3478e4d0a8fad77f14f87a4fc22db7 SHA512 bdb02e3d29db2b7ed165eaf1d541515c15f22199bb209d517089e2c35289b7fc22f6159589004c7f8667a57d26eb7ab6211f9d85ca4bbcd076c5856ac10a3d4f WHIRLPOOL 4ac402e067ff0d863042a8f314c1e55154bacfcc13103772e7c4036b7d927f687b2172003eb51e35469f7af2b640e20f224ff1fa5be83f729eacfaac89c73144
+DIST aegisub-3.0.4.tar.xz 4155728 SHA256 7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a SHA512 2917195a61d16578a83ce0b69006dd0269c086c6eff2f622c47d9880697e4e531a7c0c0232c187f9023635c9d3857a1d6a0cee4f6251e49d22e2b625ac5dda7f WHIRLPOOL 60bd3e0374a60f6af62fe450488e8c68e18957283fff59d704f40e192da624bdf90d68c3cea41122e5b9ca440d218c3bd6d9d8091ed5226a2e9d1b9fdc2ce689
 DIST aegisub-3.1.2.tar.xz 4126244 SHA256 36ebfd05cc642b050da1e91ce2d2082b317a37bdfab109e191f861170d7cff86 SHA512 d15e16f9f98c01447b72cde1998c915a2bfc1aa918a4380b54303de8e88ef881f46c3896ab9dc5eddaf4f1376f0908abd8427dbf6af395e6e0b3969ddca402ab WHIRLPOOL fa7afa1a3e736a410d686bc14d173518267e4b1570a468d9871334f06af821040fe7f40d6ba3b1bece9350a70dd43613c4aedfe8480629a283c9a16a2f54ab6d
 DIST aegisub-3.1.3.tar.xz 4215196 SHA256 efea5bc2bc5e0651ada4f65cfdd8af1b422a15f87933710d11287bf51e2b5e58 SHA512 c406925623e7b8425df47d1cd31ef77d536861335d25c626ecb916ef091341a8156879430f094ffa1d27490a65f79e2edb84593609d589834f3411b2c2841297 WHIRLPOOL 12e40c2ce78e1659046d093d7d34b68b7ceda2744c36be0e15a71a379cc3ced4fb8cde2c364bbd3b7efa803f78229794d5d417c601ae140d79e0c0a9a2711fb0
 DIST aegisub-3.2.2.tar.xz 5252052 SHA256 c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885 SHA512 54f825e52f238fef8d5cc31c37436e21355aee27883347f905271e5d2a8ff2a77e1b67d5aef38b0f8468bd0bad851fe944e02de27ec96310b902fbe5b1086722 WHIRLPOOL fe948edbb01f11385e14d1912b73942605df18325fcd95f4284a3c2edb73778d90d73038ac4a062e211fd56879590040e3c558fe1e361ec9fe2eee6a5c016448

diff --git a/media-video/aegisub/aegisub-3.0.4.ebuild b/media-video/aegisub/aegisub-3.0.4.ebuild
new file mode 100644
index 0000000..f94961a
--- /dev/null
+++ b/media-video/aegisub/aegisub-3.0.4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+PLOCALES="ar ca cs da de el es eu fa fi fr_FR hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW"
+WX_GTK_VER="2.9"
+
+inherit autotools-utils fdo-mime gnome2-utils l10n wxwidgets
+
+DESCRIPTION="Advanced subtitle editor"
+HOMEPAGE="http://www.aegisub.org/"
+SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug +ffmpeg +fftw +libass lua openal oss portaudio pulseaudio spell"
+
+# configure.ac specifies minimal versions for some of the dependencies below.
+# However, most of these minimal versions date back to 2006-2010 yy.
+# Such version specifiers are meaningless nowadays, so they are omitted.
+RDEPEND="
+	>=x11-libs/wxGTK-2.9.3:${WX_GTK_VER}[X,opengl,debug?]
+	media-libs/fontconfig
+	media-libs/freetype
+	virtual/libiconv
+	virtual/opengl
+
+	alsa? ( media-libs/alsa-lib )
+	openal? ( media-libs/openal )
+	portaudio? ( =media-libs/portaudio-19* )
+	pulseaudio? ( media-sound/pulseaudio )
+
+	ffmpeg? ( >=media-libs/ffmpegsource-2.16:= )
+	fftw? ( >=sci-libs/fftw-3.3:= )
+
+	libass? ( media-libs/libass[fontconfig] )
+	lua? ( =dev-lang/lua-5.1*:= )
+	spell? ( app-text/hunspell )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+REQUIRED_USE="
+	|| ( alsa openal oss portaudio pulseaudio )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-lua-macro.patch"
+	"${FILESDIR}/${P}-respect-user-compiler-flags.patch"
+)
+
+S="${WORKDIR}/${PN}/${PN}"
+
+src_prepare() {
+	cp /usr/share/gettext/config.rpath . || die
+
+	remove_locale() {
+		sed -i -e "s/${1}\.po//" po/Makefile || die
+	}
+
+	l10n_find_plocales_changes 'po' '' '.po'
+	l10n_for_each_disabled_locale_do remove_locale
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# Prevent sandbox violation from OpenAL detection. Gentoo bug #508184.
+	use openal && export agi_cv_with_openal="yes"
+	local myeconfargs=(
+		--disable-crash-reporter
+		--disable-update-checker
+		$(use_enable debug)
+		$(use_with alsa)
+		$(use_with ffmpeg ffms2)
+		$(use_with fftw fftw3)
+		$(use_with libass)
+		$(use_with lua)
+		$(use_with openal)
+		$(use_with oss)
+		$(use_with portaudio)
+		$(use_with pulseaudio libpulse)
+		$(use_with spell hunspell)
+	)
+	autotools-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}

diff --git a/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch b/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch
new file mode 100644
index 0000000..c7f7e32
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch
@@ -0,0 +1,13 @@
+diff --git a/aegisub/configure.ac b/aegisub/configure.ac
+index d961bd6..17df012 100644
+--- a/aegisub/configure.ac
++++ b/aegisub/configure.ac
+@@ -369,7 +369,7 @@ AC_ARG_WITH(lua,
+             AS_HELP_STRING([--without-lua],
+                            [build without lua 5.1 (auto4)]))
+ 
+-AS_IF([test x$with_lua = xno], [$with_auto4_lua="no"; lua_disabled="(disabled)"], [
++AS_IF([test x$with_lua = xno], [with_auto4_lua="no"; lua_disabled="(disabled)"], [
+   # First try pkg-config with several names
+   PKG_CHECK_MODULES(LUA, lua5.1  >= 5.1 lua5.1  < 5.2, [with_auto4_lua="yes"], [
+   PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1 lua-5.1 < 5.2, [with_auto4_lua="yes"], [

diff --git a/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch
new file mode 100644
index 0000000..80e1eb9
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch
@@ -0,0 +1,30 @@
+diff --git a/aegisub/configure.ac b/aegisub/configure.ac
+index d961bd6..8922042 100644
+--- a/aegisub/configure.ac
++++ b/aegisub/configure.ac
+@@ -157,23 +157,17 @@ AS_IF([test x$enable_compiler_flags != xno], [
+   AC_C_FLAG([-Wextra],[AC_C_FLAG([-W])])
+   AC_C_FLAG([-Wno-unused-parameter])
+   AC_C_FLAG([-std=gnu99])
+-  AC_C_FLAG([-pipe])
+-  AC_C_FLAG([-g])
+   AC_CXX_FLAG([-Wall])
+   AC_CXX_FLAG([-Wextra],[AC_CXX_FLAG([-W])])
+   AC_CXX_FLAG([-Wno-unused-parameter])
+   AC_CXX_FLAG([-Wno-long-long])
+-  AC_CXX_FLAG([-fno-strict-aliasing])
+-  AC_CXX_FLAG([-pipe])
+-  AC_CXX_FLAG([-g])
+ 
+   # -O* messes with debugging.
+   AS_IF([test x$enable_debug = xyes], [
+     AC_C_FLAG([-O0])
++    AC_C_FLAG([-g])
+     AC_CXX_FLAG([-O0])
+-  ], [
+-    AC_C_FLAG([-O2])
+-    AC_CXX_FLAG([-O2])
++    AC_CXX_FLAG([-g])
+   ])
+ ])
+