* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/
@ 2015-11-03 9:42 Ian Delaney
0 siblings, 0 replies; 12+ messages in thread
From: Ian Delaney @ 2015-11-03 9:42 UTC (permalink / raw
To: gentoo-commits
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])
+ ])
+ ])
+
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/
@ 2015-12-22 0:07 Ian Delaney
0 siblings, 0 replies; 12+ messages in thread
From: Ian Delaney @ 2015-12-22 0:07 UTC (permalink / raw
To: gentoo-commits
commit: d7810e2c933d6630efe6ab54471ef3b65cd1a357
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Dec 21 15:01:31 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 15:01:31 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7810e2c
media-video/aegisub: add missing pthread flags
This also fixes build with GCC-5.
Gentoo-Bug: 568878
Package-Manager: portage-2.2.24
media-video/aegisub/aegisub-3.2.2.ebuild | 1 +
media-video/aegisub/aegisub-9999.ebuild | 1 +
.../files/aegisub-3.2.2-add-missing-pthread-flags.patch | 16 ++++++++++++++++
.../files/aegisub-9999-add-missing-pthread-flags.patch | 14 ++++++++++++++
4 files changed, 32 insertions(+)
diff --git a/media-video/aegisub/aegisub-3.2.2.ebuild b/media-video/aegisub/aegisub-3.2.2.ebuild
index 185e7f1..19b2dc6 100644
--- a/media-video/aegisub/aegisub-3.2.2.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2.ebuild
@@ -63,6 +63,7 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}/${P}-fix-lua-regexp.patch"
"${FILESDIR}/${P}-unbundle-luajit.patch"
+ "${FILESDIR}/${P}-add-missing-pthread-flags.patch"
"${FILESDIR}/${P}-respect-user-compiler-flags.patch"
)
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index c678b5f..6f6eb8c 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -60,6 +60,7 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}/${PN}-3.2.2-fix-lua-regexp.patch"
"${FILESDIR}/${P}-unbundle-luajit.patch"
+ "${FILESDIR}/${P}-add-missing-pthread-flags.patch"
"${FILESDIR}/${P}-respect-user-compiler-flags.patch"
)
diff --git a/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
new file mode 100644
index 0000000..c1aa14a
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
@@ -0,0 +1,16 @@
+diff --git a/tools/Makefile b/tools/Makefile
+index 81bcef3..f9a6cd3 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -7,8 +7,9 @@ PROGRAM += $(d)osx-bundle-restart-helper
+ endif
+
+ repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
+-repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU)
+-repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
++repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
++repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include \
++ $(CFLAGS_ICU) $(CFLAGS_PTHREAD)
+
+ PROGRAM += $(d)repack-thes-dict
+
diff --git a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
new file mode 100644
index 0000000..1d709fe
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
@@ -0,0 +1,14 @@
+diff --git a/tools/Makefile b/tools/Makefile
+index d9f64b8..f9a6cd3 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -8,7 +8,8 @@ endif
+
+ repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
+ repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
+-repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
++repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include \
++ $(CFLAGS_ICU) $(CFLAGS_PTHREAD)
+
+ PROGRAM += $(d)repack-thes-dict
+
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/
@ 2015-12-28 9:53 Patrice Clement
0 siblings, 0 replies; 12+ messages in thread
From: Patrice Clement @ 2015-12-28 9:53 UTC (permalink / raw
To: gentoo-commits
commit: 077cb0bcdea76ee5473363de5c5f66077aba6768
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sun Dec 27 23:21:00 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 23:36:15 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=077cb0bc
media-video/aegisub: reuse patch for 3.2.2 in live ebuild
Package-Manager: portage-2.2.24
media-video/aegisub/aegisub-9999.ebuild | 2 +-
.../aegisub-9999-respect-user-compiler-flags.patch | 50 ----------------------
2 files changed, 1 insertion(+), 51 deletions(-)
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index f7d6889..4474823 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -61,7 +61,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.2.2-fix-lua-regexp.patch"
"${FILESDIR}/${P}-unbundle-luajit.patch"
"${FILESDIR}/${P}-add-missing-pthread-flags.patch"
- "${FILESDIR}/${P}-respect-user-compiler-flags.patch"
+ "${FILESDIR}/${PN}-3.2.2-respect-user-compiler-flags.patch"
)
pkg_pretend() {
diff --git a/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch
deleted file mode 100644
index ae1f5c1..0000000
--- a/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d0b5152..2609161 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -136,20 +136,17 @@ AS_IF([test x$build_darwin != xyes], [
- AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]]))
-
- AS_IF([test x$enable_compiler_flags != xno], [
-- CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-- CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-+ CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
-+ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter"
-+ AC_C_FLAG([-std=gnu99])
- AC_CXX_FLAG([-std=c++11])
-- AC_CXX_FLAG([-Wno-c++11-narrowing])
- AC_C_FLAG([-Wno-unused-local-typedefs])
- AC_CXX_FLAG([-Wno-unused-local-typedefs])
-
- # -O* messes with debugging.
- AS_IF([test x$enable_debug = xyes], [
-- CFLAGS="$CFLAGS -O0"
-- CXXFLAGS="$CXXFLAGS -O0"
-- ], [
-- CFLAGS="$CFLAGS -O3"
-- CXXFLAGS="$CXXFLAGS -O3"
-+ CFLAGS="$CFLAGS -O0 -g"
-+ CXXFLAGS="$CXXFLAGS -O0 -g"
- ])
- ])
-
-diff --git a/src/Makefile b/src/Makefile
-index 08f9216..e2e5602 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -182,14 +182,13 @@ endif
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
--$(d)MatroskaParser.o_FLAGS := -Wno-sometimes-uninitialized
- $(d)audio_player.o_FLAGS := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
- $(d)audio_provider_factory.o_FLAGS := $(CFLAGS_FFMS2)
- $(d)auto4_base.o_FLAGS := $(CFLAGS_FREETYPE)
- $(d)charset_detect.o_FLAGS := -D_X86_
- $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG)
- $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS)
--$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
-+$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS)
- $(d)text_file_reader.o_FLAGS := -D_X86_
- $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2)
- $(d)auto4_lua.o_FLAGS := -I$(TOP)vendor/luajit/include
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/
@ 2016-01-01 7:55 Ian Delaney
0 siblings, 0 replies; 12+ messages in thread
From: Ian Delaney @ 2016-01-01 7:55 UTC (permalink / raw
To: gentoo-commits
commit: 68efac96d646a880a0941040b53290275e8bb85e
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Fri Jan 1 02:53:07 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Fri Jan 1 07:55:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68efac96
media-video/aegisub: fix installation of 3.0.4 with empty LINGUAS
3.2.2 and live are not affected.
Package-Manager: portage-2.2.24
media-video/aegisub/aegisub-3.0.4.ebuild | 3 ++-
...isub-3.0.4-fix-install-with-empty-LINGUAS.patch | 23 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/media-video/aegisub/aegisub-3.0.4.ebuild b/media-video/aegisub/aegisub-3.0.4.ebuild
index 6320424..93bc4fe 100644
--- a/media-video/aegisub/aegisub-3.0.4.ebuild
+++ b/media-video/aegisub/aegisub-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -57,6 +57,7 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}/${P}-fix-lua-macro.patch"
+ "${FILESDIR}/${P}-fix-install-with-empty-LINGUAS.patch"
"${FILESDIR}/${P}-respect-user-compiler-flags.patch"
)
diff --git a/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
new file mode 100644
index 0000000..59927d3
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
@@ -0,0 +1,23 @@
+Upstream always installs all available localization files. We workaround it by
+sed'ing out unneeded languages from PO variable in aegisub/po/Makefile file.
+This can lead to an empty PO definition and in this case install target fails.
+Thus a simple guard is introduced to prevent this fail.
+
+diff --git a/aegisub/po/Makefile b/aegisub/po/Makefile
+index 0b73bde..957c123 100644
+--- a/aegisub/po/Makefile
++++ b/aegisub/po/Makefile
+@@ -38,11 +38,13 @@ all: $(MO)
+ $(BIN_MSGFMT) -o $@ $<
+
+ install:
++ifdef PO
+ @$(BIN_MKDIR) -p $(addsuffix /LC_MESSAGES/, $(addprefix $(DESTDIR)$(P_LOCALE)/, $(basename $(PO))))
+ @for i in $(basename $(PO)); do \
+ echo $(BIN_INSTALL) $$i.mo $(DESTDIR)$(P_LOCALE)/$$i/LC_MESSAGES/$(AEGISUB_CATALOG).mo; \
+ $(BIN_INSTALL) $$i.mo $(DESTDIR)$(P_LOCALE)/$$i/LC_MESSAGES/$(AEGISUB_CATALOG).mo; \
+ done
++endif
+
+
+ CLEANFILES = $(MO)
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/
@ 2016-02-10 16:26 Patrice Clement
0 siblings, 0 replies; 12+ messages in thread
From: Patrice Clement @ 2016-02-10 16:26 UTC (permalink / raw
To: gentoo-commits
commit: b6b27ad742a9770b78fad3ee853388f9d1846825
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Wed Feb 10 16:17:55 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 16:19:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6b27ad7
media-video/aegisub: revbump to 3.0.4-r1 to restore -fno-strict-aliasing
Package-Manager: portage-2.2.27
.../aegisub/{aegisub-3.0.4.ebuild => aegisub-3.0.4-r1.ebuild} | 0
.../files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch | 6 +++---
media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch | 2 +-
.../files/aegisub-3.0.4-respect-user-compiler-flags.patch | 10 +++++-----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/media-video/aegisub/aegisub-3.0.4.ebuild b/media-video/aegisub/aegisub-3.0.4-r1.ebuild
similarity index 100%
rename from media-video/aegisub/aegisub-3.0.4.ebuild
rename to media-video/aegisub/aegisub-3.0.4-r1.ebuild
diff --git a/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
index 59927d3..3eda0da 100644
--- a/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
+++ b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
@@ -9,7 +9,7 @@ index 0b73bde..957c123 100644
+++ b/aegisub/po/Makefile
@@ -38,11 +38,13 @@ all: $(MO)
$(BIN_MSGFMT) -o $@ $<
-
+
install:
+ifdef PO
@$(BIN_MKDIR) -p $(addsuffix /LC_MESSAGES/, $(addprefix $(DESTDIR)$(P_LOCALE)/, $(basename $(PO))))
@@ -18,6 +18,6 @@ index 0b73bde..957c123 100644
$(BIN_INSTALL) $$i.mo $(DESTDIR)$(P_LOCALE)/$$i/LC_MESSAGES/$(AEGISUB_CATALOG).mo; \
done
+endif
-
-
+
+
CLEANFILES = $(MO)
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
index c7f7e32..253fb3e 100644
--- 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
@@ -5,7 +5,7 @@ index d961bd6..17df012 100644
@@ -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
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
index 80e1eb9..408fb8d 100644
--- 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
@@ -1,8 +1,8 @@
diff --git a/aegisub/configure.ac b/aegisub/configure.ac
-index d961bd6..8922042 100644
+index d961bd6..e0bdc46 100644
--- a/aegisub/configure.ac
+++ b/aegisub/configure.ac
-@@ -157,23 +157,17 @@ AS_IF([test x$enable_compiler_flags != xno], [
+@@ -157,23 +157,18 @@ 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])
@@ -12,10 +12,10 @@ index d961bd6..8922042 100644
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([-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])
@@ -27,4 +27,4 @@ index d961bd6..8922042 100644
+ AC_CXX_FLAG([-g])
])
])
-
+
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/
@ 2016-02-10 22:04 Patrice Clement
0 siblings, 0 replies; 12+ messages in thread
From: Patrice Clement @ 2016-02-10 22:04 UTC (permalink / raw
To: gentoo-commits
commit: 9b3ff52664e5ddda63f2a0ddfb243fb69bb02d25
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Wed Feb 10 17:00:15 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 17:29:23 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b3ff526
media-video/aegisub: revbump to 3.2.2-r1 to restore -fno-strict-aliasing
Also backport ff9648f and 9f158e9 changes from the live ebuild.
Package-Manager: portage-2.2.27
...aegisub-9999.ebuild => aegisub-3.2.2-r1.ebuild} | 14 +++---
media-video/aegisub/aegisub-9999.ebuild | 2 +-
.../aegisub-3.2.2-add-missing-pthread-flags.patch | 10 ++---
.../files/aegisub-3.2.2-fix-lua-regexp.patch | 2 +-
...isub-3.2.2-r1-respect-user-compiler-flags.patch | 50 ++++++++++++++++++++++
.../files/aegisub-3.2.2-unbundle-luajit.patch | 32 +++++++-------
6 files changed, 82 insertions(+), 28 deletions(-)
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-3.2.2-r1.ebuild
similarity index 90%
copy from media-video/aegisub/aegisub-9999.ebuild
copy to media-video/aegisub/aegisub-3.2.2-r1.ebuild
index e554a3d..79bc20d 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2-r1.ebuild
@@ -9,22 +9,25 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
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@latin sr_RS uk_UA vi zh_CN zh_TW"
WX_GTK_VER="3.0"
-inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets git-2
+inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets
DESCRIPTION="Advanced subtitle editor"
HOMEPAGE="http://www.aegisub.org/"
-EGIT_REPO_URI="git://github.com/Aegisub/Aegisub.git"
+SRC_URI="
+ http://ftp.aegisub.org/pub/releases/${P}.tar.xz
+ ftp://ftp.aegisub.org/pub/releases/${P}.tar.xz
+"
LICENSE="BSD"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE="alsa debug +ffmpeg +fftw 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="
- >=dev-lang/luajit-2.0.4:2[lua52compat]
+ >=dev-lang/luajit-2.0.3:2[lua52compat]
>=dev-libs/boost-1.50.0:=[icu,nls,threads]
>=dev-libs/icu-4.8.1.1:=
>=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?]
@@ -58,9 +61,10 @@ REQUIRED_USE="
# Unfortunately, luabins upstream is dead since 2011.
# Thus unbundling luabins is not worth the effort.
PATCHES=(
+ "${FILESDIR}/${P}-fix-lua-regexp.patch"
"${FILESDIR}/${P}-unbundle-luajit.patch"
"${FILESDIR}/${P}-add-missing-pthread-flags.patch"
- "${FILESDIR}/${PN}-3.2.2-respect-user-compiler-flags.patch"
+ "${FILESDIR}/${PF}-respect-user-compiler-flags.patch"
)
pkg_pretend() {
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index e554a3d..2d5050e 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -60,7 +60,7 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}/${P}-unbundle-luajit.patch"
"${FILESDIR}/${P}-add-missing-pthread-flags.patch"
- "${FILESDIR}/${PN}-3.2.2-respect-user-compiler-flags.patch"
+ "${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch"
)
pkg_pretend() {
diff --git a/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
index ed45de7..a5a6fc0 100644
--- a/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
+++ b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
@@ -8,7 +8,7 @@ index c93b9dc..8c5678a 100644
LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
-LIBS_PTHREAD = @PTHREAD_LIBS@
+LIBS_PTHREAD = @PTHREAD_LIBS@ -lpthread
-
+
ifeq (yes, $(BUILD_DARWIN))
LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
diff --git a/libaegisub/Makefile b/libaegisub/Makefile
@@ -17,12 +17,12 @@ index 64204ef..178044d 100644
+++ b/libaegisub/Makefile
@@ -41,7 +41,8 @@ aegisub_OBJ += $(d)common/dispatch.o
endif
-
+
aegisub_PCH := $(d)lagi_pre.h
-aegisub_CPPFLAGS := -I$(d)include -I$(TOP) -fPIC $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
+aegisub_CPPFLAGS := -I$(d)include -I$(TOP) -fPIC \
+ $(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
-
+
$(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV)
$(d)common/parser.o_FLAGS := -ftemplate-depth=256
diff --git a/tools/Makefile b/tools/Makefile
@@ -31,10 +31,10 @@ index 81bcef3..d9f64b8 100644
+++ b/tools/Makefile
@@ -7,7 +7,7 @@ PROGRAM += $(d)osx-bundle-restart-helper
endif
-
+
repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
-repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU)
+repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
-
+
PROGRAM += $(d)repack-thes-dict
diff --git a/media-video/aegisub/files/aegisub-3.2.2-fix-lua-regexp.patch b/media-video/aegisub/files/aegisub-3.2.2-fix-lua-regexp.patch
index a05ed2d..e3b620b 100644
--- a/media-video/aegisub/files/aegisub-3.2.2-fix-lua-regexp.patch
+++ b/media-video/aegisub/files/aegisub-3.2.2-fix-lua-regexp.patch
@@ -9,5 +9,5 @@ index 85955d1..1281ac2 100755
- local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
+ local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
out_cpp:write("const unsigned char " .. id .. "[] = {")
-
+
local len = 0
diff --git a/media-video/aegisub/files/aegisub-3.2.2-r1-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.2.2-r1-respect-user-compiler-flags.patch
new file mode 100644
index 0000000..7c01832
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.2.2-r1-respect-user-compiler-flags.patch
@@ -0,0 +1,50 @@
+diff --git a/configure.ac b/configure.ac
+index be657b0..de8184f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -139,20 +139,17 @@ CC="$PTHREAD_CC"
+ AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]]))
+
+ AS_IF([test x$enable_compiler_flags != xno], [
+- CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
+- CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
++ CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
++ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing"
++ AC_C_FLAG([-std=gnu99])
+ AC_CXX_FLAG([-std=c++11])
+- AC_CXX_FLAG([-Wno-c++11-narrowing])
+ AC_C_FLAG([-Wno-unused-local-typedefs])
+ AC_CXX_FLAG([-Wno-unused-local-typedefs])
+
+ # -O* messes with debugging.
+ AS_IF([test x$enable_debug = xyes], [
+- CFLAGS="$CFLAGS -O0"
+- CXXFLAGS="$CXXFLAGS -O0"
+- ], [
+- CFLAGS="$CFLAGS -O3"
+- CXXFLAGS="$CXXFLAGS -O3"
++ CFLAGS="$CFLAGS -O0 -g"
++ CXXFLAGS="$CXXFLAGS -O0 -g"
+ ])
+ ])
+
+diff --git a/src/Makefile b/src/Makefile
+index 60d7101..1f7b2bc 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -182,14 +182,13 @@ endif
+ #####################
+ # SOURCE-LEVEL CFLAGS
+ #####################
+-$(d)MatroskaParser.o_FLAGS := -Wno-sometimes-uninitialized
+ $(d)audio_player.o_FLAGS := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
+ $(d)audio_provider_factory.o_FLAGS := $(CFLAGS_FFMS2)
+ $(d)auto4_base.o_FLAGS := $(CFLAGS_FREETYPE)
+ $(d)charset_detect.o_FLAGS := -D_X86_
+ $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG)
+ $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS)
+-$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
++$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS)
+ $(d)text_file_reader.o_FLAGS := -D_X86_
+ $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2)
+ $(d)auto4_lua.o_FLAGS := -I$(TOP)vendor/luajit/include
diff --git a/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch
index ff033cb..ec561b2 100644
--- a/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch
+++ b/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch
@@ -20,13 +20,13 @@ index c93b9dc..ae018c3 100644
LIBS_OPENAL = @OPENAL_LIBS@
LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
LIBS_PTHREAD = @PTHREAD_LIBS@
-
+
-ifeq (yes, $(BUILD_DARWIN))
-LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
-endif
-
FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
-
+
#####################
diff --git a/automation/Makefile b/automation/Makefile
index 45a5ce2..db51a61 100644
@@ -35,15 +35,15 @@ index 45a5ce2..db51a61 100644
@@ -12,9 +12,9 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_
$(DESTDIR)$(P_DATA)/automation/%: $(d)%
$(MKDIR_INSTALL)
-
+
-aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA)
+aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a
aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
-aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU)
+aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_LUA)
-
+
PROGRAM += $(d)aegisub-lua
-
+
diff --git a/configure.ac b/configure.ac
index be657b0..de586d5 100644
--- a/configure.ac
@@ -54,7 +54,7 @@ index be657b0..de586d5 100644
m4_define([wx_required_version], [3.0.0])
+# Same version as the bundled one
+m4_define([luajit_required_version], [2.0.3])
-
+
#######
# Setup
@@ -205,6 +207,7 @@ AC_SUBST(GL_LIBS)
@@ -62,7 +62,7 @@ index be657b0..de586d5 100644
PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version)
PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version)
+PKG_CHECK_MODULES(LUAJIT, luajit >= luajit_required_version)
-
+
FONTCONFIG_CONF_DIR=$($PKG_CONFIG --variable=confdir fontconfig)
AC_SUBST(FONTCONFIG_CONF_DIR)
diff --git a/header.mk b/header.mk
@@ -75,7 +75,7 @@ index 61c8ba1..050472d 100644
vendor/luabins \
- vendor/luajit \
vendor/universalchardet
-
+
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
diff --git a/src/Makefile b/src/Makefile
index 60d7101..1d4779c 100644
@@ -90,7 +90,7 @@ index 60d7101..1d4779c 100644
+ $(LIBS_ICU) $(LIBS_LUA)
src_PCH := $(d)agi_pre.h
src_INSTALLNAME := $(AEGISUB_COMMAND)
-
+
@@ -112,7 +113,6 @@ src_OBJ := \
$(d)video_provider_yuv4mpeg.o \
$(d)video_slider.o \
@@ -111,20 +111,20 @@ index 60d7101..1d4779c 100644
+$(d)auto4_lua_assfile.o_FLAGS := $(CFLAGS_LUA)
+$(d)auto4_lua_dialog.o_FLAGS := $(CFLAGS_LUA)
+$(d)auto4_lua_progresssink.o_FLAGS := $(CFLAGS_LUA)
-
+
$(src_OBJ): $(d)libresrc/bitmap.h $(d)libresrc/default_config.h
-
+
diff --git a/src/libresrc/Makefile b/src/libresrc/Makefile
index 6441856..0562eb1 100644
--- a/src/libresrc/Makefile
+++ b/src/libresrc/Makefile
@@ -10,7 +10,7 @@ resrc_OBJ := \
-
+
$(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
-
+
-RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
+RESPACK := cd $(TOP)src/libresrc; luajit $(TOP)tools/respack.lua
-
+
$(d)bitmap.cpp: $(d)bitmap.h
$(d)default_config.cpp: $(d)default_config.h
diff --git a/tools/Makefile b/tools/Makefile
@@ -132,9 +132,9 @@ index 81bcef3..0834ac2 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
-
+
PROGRAM += $(d)repack-thes-dict
-
+
-$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
-
include $(TOP)Makefile.target
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/
@ 2016-03-08 2:16 Ian Delaney
0 siblings, 0 replies; 12+ messages in thread
From: Ian Delaney @ 2016-03-08 2:16 UTC (permalink / raw
To: gentoo-commits
commit: 07146ec002decac6cf35c0762d33cd14a627efec
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Mar 7 15:11:13 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 16:25:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07146ec0
media-video/aegisub: remove unneeded unbundle-luajit patch from 9999
Mostly merged upstream. Upstream now supports building with system
luajit. There are still some problems left, see [1]. But it's already
a major improvement.
[1]: http://devel.aegisub.org/ticket/1904#comment:10
Package-Manager: portage-2.2.27
media-video/aegisub/aegisub-9999.ebuild | 4 +-
.../files/aegisub-9999-unbundle-luajit.patch | 153 ---------------------
2 files changed, 2 insertions(+), 155 deletions(-)
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 7a83307..2d555ef 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -55,11 +55,10 @@ REQUIRED_USE="
|| ( alsa openal oss portaudio pulseaudio )
"
-# aegisub also bundles luabins (https://github.com/agladysh/luabins).
+# aegisub bundles luabins (https://github.com/agladysh/luabins).
# Unfortunately, luabins upstream is dead since 2011.
# Thus unbundling luabins is not worth the effort.
PATCHES=(
- "${FILESDIR}/${P}-unbundle-luajit.patch"
"${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch"
)
@@ -87,6 +86,7 @@ src_configure() {
use openal && export agi_cv_with_openal="yes"
local myeconfargs=(
--disable-update-checker
+ --with-system-luajit
$(use_enable debug)
$(use_with alsa)
$(use_with ffmpeg ffms2)
diff --git a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
deleted file mode 100644
index c7e3e94..0000000
--- a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-http://devel.aegisub.org/ticket/1904
-
-diff --git a/Makefile.inc.in b/Makefile.inc.in
-index 5a52d25..6cd16f1 100644
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -79,7 +79,7 @@ CFLAGS_ICONV = @ICONV_CFLAGS@
- CFLAGS_ICU = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@
--CFLAGS_LUA = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL = @OPENAL_CFLAGS@
- CFLAGS_OSS = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@
-@@ -97,16 +97,12 @@ LIBS_ICONV = @ICONV_LIBS@
- LIBS_ICU = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS = @LIBASS_LIBS@
- LIBS_LIBPULSE = @LIBPULSE_LIBS@
--LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA = @LUAJIT_LIBS@
- LIBS_OPENAL = @OPENAL_LIBS@
- LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
- LIBS_PTHREAD = @PTHREAD_LIBS@
- LIBS_UCHARDET = @UCHARDET_LIBS@
-
--ifeq (yes, $(BUILD_DARWIN))
--LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
--endif
--
- FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
-
- #####################
-diff --git a/automation/Makefile b/automation/Makefile
-index d5425b7..121aae7 100644
---- a/automation/Makefile
-+++ b/automation/Makefile
-@@ -12,9 +12,9 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_
- $(DESTDIR)$(P_DATA)/automation/%: $(d)%
- $(MKDIR_INSTALL)
-
--aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA)
-+aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a
- aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
--aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU)
-+aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_LUA)
-
- PROGRAM += $(d)aegisub-lua
-
-diff --git a/configure.ac b/configure.ac
-index 7492568..2c77fcf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -16,6 +16,8 @@ m4_define([libpulse_required_version], [0.5])
- m4_define([pkgconfig_required_version], [0.20])
- m4_define([portaudio_required_version], [19])
- m4_define([wx_required_version], [3.0.0])
-+# Same version as the bundled one
-+m4_define([luajit_required_version], [2.0.4])
-
- #######
- # Setup
-@@ -209,6 +211,7 @@ AS_IF([test x$build_darwin != xyes], [
- ])
-
- PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version)
-+PKG_CHECK_MODULES(LUAJIT, luajit >= luajit_required_version)
-
- AX_BOOST_BASE([boost_required_version])
- AX_BOOST_LIB(chrono, BOOST_CHRONO_LIB, [chrono.hpp], [boost::chrono::system_clock::time_point time])
-diff --git a/header.mk b/header.mk
-index 613b38f..873d4ce 100644
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@ subdirs := \
- tests \
- tools \
- vendor/luabins \
-- vendor/luajit
-
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
-
-diff --git a/src/Makefile b/src/Makefile
-index 1fb983c..1fb0acb 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui
- $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CPPFLAGS_BOOST)
- src_CXXFLAGS := $(CXXFLAGS_WX)
- src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
-- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU)
-+ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \
-+ $(LIBS_ICU) $(LIBS_LUA)
- src_PCH := $(d)agi_pre.h
- src_INSTALLNAME := $(AEGISUB_COMMAND)
-
-@@ -111,7 +112,6 @@ src_OBJ := \
- $(d)video_provider_yuv4mpeg.o \
- $(d)video_slider.o \
- $(d)visual_feature.o \
-- $(LIBS_LUA) \
- $(TOP)lib/libaegisub.a \
- $(TOP)lib/libluabins.a \
- $(TOP)lib/libresrc.a \
-@@ -198,10 +198,10 @@ $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS)
- $(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
- $(d)text_file_reader.o_FLAGS := -D_X86_
- $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2)
--$(d)auto4_lua.o_FLAGS := -I$(TOP)vendor/luajit/include
--$(d)auto4_lua_assfile.o_FLAGS := -I$(TOP)vendor/luajit/include
--$(d)auto4_lua_dialog.o_FLAGS := -I$(TOP)vendor/luajit/include
--$(d)auto4_lua_progresssink.o_FLAGS := -I$(TOP)vendor/luajit/include
-+$(d)auto4_lua.o_FLAGS := $(CFLAGS_LUA)
-+$(d)auto4_lua_assfile.o_FLAGS := $(CFLAGS_LUA)
-+$(d)auto4_lua_dialog.o_FLAGS := $(CFLAGS_LUA)
-+$(d)auto4_lua_progresssink.o_FLAGS := $(CFLAGS_LUA)
-
- $(src_OBJ): $(d)libresrc/bitmap.h $(d)libresrc/default_config.h
-
-diff --git a/src/libresrc/Makefile b/src/libresrc/Makefile
-index 6441856..0562eb1 100644
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@ resrc_OBJ := \
-
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
-
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; luajit $(TOP)tools/respack.lua
-
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
-diff --git a/tools/Makefile b/tools/Makefile
-index cbf985a..da1d3ef 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
-
- PROGRAM += $(d)repack-thes-dict
-
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
-diff --git a/tools/respack.lua b/tools/respack.lua
-index 1281ac2..35630a2 100755
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -1,4 +1,4 @@
--#!../vendor/luajit/src/host/minilua
-+#!/usr/bin/env luajit
- -- Copyright (c) 2014, Thomas Goyne <plorkyeran@aegisub.org>
- --
- -- Permission to use, copy, modify, and distribute this software for any
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/
@ 2016-03-08 2:16 Ian Delaney
0 siblings, 0 replies; 12+ messages in thread
From: Ian Delaney @ 2016-03-08 2:16 UTC (permalink / raw
To: gentoo-commits
commit: 70ee8e9fac24055830b264113bd86841ffd2fed1
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Mar 7 15:05:40 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 16:25:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70ee8e9f
media-video/aegisub: remove unneeded pthread-flags patch from 9999
Merged upstream.
Package-Manager: portage-2.2.27
media-video/aegisub/aegisub-9999.ebuild | 1 -
.../aegisub-9999-add-missing-pthread-flags.patch | 44 ----------------------
2 files changed, 45 deletions(-)
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 6677686..7a83307 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -60,7 +60,6 @@ REQUIRED_USE="
# Thus unbundling luabins is not worth the effort.
PATCHES=(
"${FILESDIR}/${P}-unbundle-luajit.patch"
- "${FILESDIR}/${P}-add-missing-pthread-flags.patch"
"${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch"
)
diff --git a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
deleted file mode 100644
index 9f41ee5..0000000
--- a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-http://devel.aegisub.org/ticket/1902
-http://devel.aegisub.org/ticket/1903
-http://devel.aegisub.org/ticket/1911
-
-diff --git a/Makefile.inc.in b/Makefile.inc.in
-index 5a52d25..86f93d1 100644
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -100,7 +100,7 @@ LIBS_LIBPULSE = @LIBPULSE_LIBS@
- LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a
- LIBS_OPENAL = @OPENAL_LIBS@
- LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
--LIBS_PTHREAD = @PTHREAD_LIBS@
-+LIBS_PTHREAD = @PTHREAD_LIBS@ -lpthread
- LIBS_UCHARDET = @UCHARDET_LIBS@
-
- ifeq (yes, $(BUILD_DARWIN))
-diff --git a/libaegisub/Makefile b/libaegisub/Makefile
-index b021523..77a18ec 100644
---- a/libaegisub/Makefile
-+++ b/libaegisub/Makefile
-@@ -44,7 +44,8 @@ aegisub_OBJ += $(d)common/dispatch.o
- endif
-
- aegisub_PCH := $(d)lagi_pre.h
--aegisub_CPPFLAGS := -I$(d)include -I$(TOP) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
-+aegisub_CPPFLAGS := -I$(d)include -I$(TOP) \
-+ $(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
-
- $(d)common/charset.o_FLAGS := $(CFLAGS_UCHARDET)
- $(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV)
-diff --git a/tools/Makefile b/tools/Makefile
-index cbf985a..d9f64b8 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -7,7 +7,7 @@ PROGRAM += $(d)osx-bundle-restart-helper
- endif
-
- repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
--repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(PTHREAD_LIBS)
-+repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
- repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
-
- PROGRAM += $(d)repack-thes-dict
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/
@ 2016-03-08 2:16 Ian Delaney
0 siblings, 0 replies; 12+ messages in thread
From: Ian Delaney @ 2016-03-08 2:16 UTC (permalink / raw
To: gentoo-commits
commit: 878010e4b5fca1db2520cefa2e40ae16d110b3c1
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Mar 7 15:40:24 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 18:35:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=878010e4
media-video/aegisub: verbump to 3.2.2_p20160306
New snapshot release with most of our Gentoo patches merged upstream.
Package-Manager: portage-2.2.27
media-video/aegisub/Manifest | 1 +
...-9999.ebuild => aegisub-3.2.2_p20160306.ebuild} | 10 +-
media-video/aegisub/aegisub-9999.ebuild | 3 +-
...sub-3.2.2_p20160306-fix-luajit-unbundling.patch | 127 +++++++++++++++++++++
...2.2_p20160306-respect-user-compiler-flags.patch | 53 +++++++++
5 files changed, 189 insertions(+), 5 deletions(-)
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index e696d2d..9589891 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,2 +1,3 @@
DIST aegisub-3.0.4.tar.xz 4155728 SHA256 7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a SHA512 2917195a61d16578a83ce0b69006dd0269c086c6eff2f622c47d9880697e4e531a7c0c0232c187f9023635c9d3857a1d6a0cee4f6251e49d22e2b625ac5dda7f WHIRLPOOL 60bd3e0374a60f6af62fe450488e8c68e18957283fff59d704f40e192da624bdf90d68c3cea41122e5b9ca440d218c3bd6d9d8091ed5226a2e9d1b9fdc2ce689
DIST aegisub-3.2.2.tar.xz 5252052 SHA256 c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885 SHA512 54f825e52f238fef8d5cc31c37436e21355aee27883347f905271e5d2a8ff2a77e1b67d5aef38b0f8468bd0bad851fe944e02de27ec96310b902fbe5b1086722 WHIRLPOOL fe948edbb01f11385e14d1912b73942605df18325fcd95f4284a3c2edb73778d90d73038ac4a062e211fd56879590040e3c558fe1e361ec9fe2eee6a5c016448
+DIST aegisub-3.2.2_p20160306.tar.gz 7436713 SHA256 1b70f67c3b3d6ecce482bc1f4beb1ceffd4c523aa060556658e403ea98fcc58c SHA512 815775b64b1ad5cd09eda6106561a8a0d4dc129d4c2e08e057eab881289526a7b67bab2f4d2f48748ef2015ea21f2839ed8f84d168bf9127c62c9a35caa1abd5 WHIRLPOOL caaa6b1d69c7e4d1da4abfd0382d263585c5216d9ed5e63f515d8bce98b2e0dad2848552f3f097a8db9e39dad5d2c00d3b752f0407490d0d2c777aaa8fc6dc38
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild
similarity index 90%
copy from media-video/aegisub/aegisub-9999.ebuild
copy to media-video/aegisub/aegisub-3.2.2_p20160306.ebuild
index 09c7389..1c21ae6 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild
@@ -8,16 +8,17 @@ AUTOTOOLS_AUTORECONF=1
AUTOTOOLS_IN_SOURCE_BUILD=1
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@latin sr_RS uk_UA vi zh_CN zh_TW"
WX_GTK_VER="3.0"
+COMMIT_ID="26fea0e123246b4f122beb54559c8dcd82925071"
-inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets git-2
+inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets vcs-snapshot
DESCRIPTION="Advanced subtitle editor"
HOMEPAGE="http://www.aegisub.org/"
-EGIT_REPO_URI="git://github.com/Aegisub/Aegisub.git"
+SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell +uchardet"
# configure.ac specifies minimal versions for some of the dependencies below.
@@ -59,7 +60,8 @@ REQUIRED_USE="
# Unfortunately, luabins upstream is dead since 2011.
# Thus unbundling luabins is not worth the effort.
PATCHES=(
- "${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch"
+ "${FILESDIR}/${P}-fix-luajit-unbundling.patch"
+ "${FILESDIR}/${P}-respect-user-compiler-flags.patch"
)
pkg_pretend() {
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 09c7389..a356fa8 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -59,7 +59,8 @@ REQUIRED_USE="
# Unfortunately, luabins upstream is dead since 2011.
# Thus unbundling luabins is not worth the effort.
PATCHES=(
- "${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch"
+ "${FILESDIR}/${PN}-3.2.2_p20160306-fix-luajit-unbundling.patch"
+ "${FILESDIR}/${PN}-3.2.2_p20160306-respect-user-compiler-flags.patch"
)
pkg_pretend() {
diff --git a/media-video/aegisub/files/aegisub-3.2.2_p20160306-fix-luajit-unbundling.patch b/media-video/aegisub/files/aegisub-3.2.2_p20160306-fix-luajit-unbundling.patch
new file mode 100644
index 0000000..a3649c7
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.2.2_p20160306-fix-luajit-unbundling.patch
@@ -0,0 +1,127 @@
+From 11bd157747ebb855d56d2bc59952a1093cfd9ddc Mon Sep 17 00:00:00 2001
+From: Ilya Tumaykin <itumaykin@gmail.com>
+Date: Mon, 7 Mar 2016 11:21:10 +0300
+Subject: Properly separate bundled and system luajit builds
+
+Build bundled luajit bits only when using bundled luajit.
+Properly set up linker flags when using system luajit.
+
+Closes #1904.
+
+Bug: http://devel.aegisub.org/ticket/1904
+---
+ Makefile.inc.in | 1 +
+ automation/Makefile | 8 +++++++-
+ configure.ac | 2 ++
+ header.mk | 5 ++++-
+ src/Makefile | 9 +++++++--
+ tools/Makefile | 2 ++
+ 6 files changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index d8b3f4a..52e4cf6 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -9,6 +9,7 @@ HAVE_OPENAL = @with_openal@
+ HAVE_OSS = @with_oss@
+ HAVE_PORTAUDIO = @with_portaudio@
+ HAVE_UCHARDET = @with_uchardet@
++SYSTEM_LUAJIT = @with_system_luajit@
+
+ ##############
+ # BUILD OUTPUT
+diff --git a/automation/Makefile b/automation/Makefile
+index 5483dbd..1231aab 100644
+--- a/automation/Makefile
++++ b/automation/Makefile
+@@ -12,10 +12,16 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_
+ $(DESTDIR)$(P_DATA)/automation/%: $(d)%
+ $(MKDIR_INSTALL)
+
+-aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA)
++aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a
+ aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
+ aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
+
++ifeq (no, $(SYSTEM_LUAJIT))
++aegisub-lua_OBJ += $(LIBS_LUA)
++else
++aegisub-lua_LIBS += $(LIBS_LUA)
++endif
++
+ PROGRAM += $(d)aegisub-lua
+
+ test-automation: $(PROGRAM)
+diff --git a/configure.ac b/configure.ac
+index 1649efc..7ebe9d8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -429,6 +429,8 @@ AS_IF([test $with_system_luajit = no],
+ [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
+ AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
+
++AC_SUBST(with_system_luajit)
++
+ # We also need a Lua binary to run part of the build system
+ # Which version doesn't matter as the scripts are portable between them
+ AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
+diff --git a/header.mk b/header.mk
+index 613b38f..a9ce1d7 100644
+--- a/header.mk
++++ b/header.mk
+@@ -13,7 +13,10 @@ subdirs := \
+ tests \
+ tools \
+ vendor/luabins \
+- vendor/luajit
++
++ifeq (no, $(SYSTEM_LUAJIT))
++subdirs += vendor/luajit
++endif
+
+ subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
+
+diff --git a/src/Makefile b/src/Makefile
+index 0ee6c84..1a6f015 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -6,7 +6,7 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui
+ $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CPPFLAGS_BOOST)
+ src_CXXFLAGS := $(CXXFLAGS_WX)
+ src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
+- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU)
++ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU)
+ src_PCH := $(d)agi_pre.h
+ src_INSTALLNAME := $(AEGISUB_COMMAND)
+
+@@ -111,11 +111,16 @@ src_OBJ := \
+ $(d)video_provider_yuv4mpeg.o \
+ $(d)video_slider.o \
+ $(d)visual_feature.o \
+- $(LIBS_LUA) \
+ $(TOP)lib/libaegisub.a \
+ $(TOP)lib/libluabins.a \
+ $(TOP)lib/libresrc.a \
+
++ifeq (no, $(SYSTEM_LUAJIT))
++src_OBJ += $(LIBS_LUA)
++else
++src_LIBS += $(LIBS_LUA)
++endif
++
+ ifeq (yes, $(BUILD_DARWIN))
+ src_OBJ += $(d)font_file_lister_coretext.o
+ src_OBJ += $(subst .mm,.o,$(wildcard $(d)osx/*.mm))
+diff --git a/tools/Makefile b/tools/Makefile
+index de6166a..e17eaa2 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -12,6 +12,8 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
+
+ PROGRAM += $(d)repack-thes-dict
+
++ifeq (no, $(SYSTEM_LUAJIT))
+ $(TOP)tools/respack.lua: $(shell command -v "$(BIN_LUA)")
++endif
+
+ include $(TOP)Makefile.target
diff --git a/media-video/aegisub/files/aegisub-3.2.2_p20160306-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.2.2_p20160306-respect-user-compiler-flags.patch
new file mode 100644
index 0000000..4cd4790
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.2.2_p20160306-respect-user-compiler-flags.patch
@@ -0,0 +1,53 @@
+http://devel.aegisub.org/ticket/1899
+http://devel.aegisub.org/ticket/1900
+
+diff --git a/configure.ac b/configure.ac
+index 1649efc..2f4470b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -133,20 +133,17 @@ AS_IF([test x$build_darwin != xyes], [
+ AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]]))
+
+ AS_IF([test x$enable_compiler_flags != xno], [
+- CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
+- CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
++ CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
++ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing"
++ AC_C_FLAG([-std=gnu99])
+ AC_CXX_FLAG([-std=c++11])
+- AC_CXX_FLAG([-Wno-c++11-narrowing])
+ AC_C_FLAG([-Wno-unused-local-typedefs])
+ AC_CXX_FLAG([-Wno-unused-local-typedefs])
+
+ # -O* messes with debugging.
+ AS_IF([test x$enable_debug = xyes], [
+- CFLAGS="$CFLAGS -O0"
+- CXXFLAGS="$CXXFLAGS -O0"
+- ], [
+- CFLAGS="$CFLAGS -O3"
+- CXXFLAGS="$CXXFLAGS -O3"
++ CFLAGS="$CFLAGS -O0 -g"
++ CXXFLAGS="$CXXFLAGS -O0 -g"
+ ])
+ ])
+
+diff --git a/src/Makefile b/src/Makefile
+index 0ee6c84..cad213b 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -188,14 +188,13 @@ endif
+ #####################
+ # SOURCE-LEVEL CFLAGS
+ #####################
+-$(d)MatroskaParser.o_FLAGS := -Wno-sometimes-uninitialized
+ $(d)audio_player.o_FLAGS := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
+ $(d)audio_provider_factory.o_FLAGS := $(CFLAGS_FFMS2)
+ $(d)auto4_base.o_FLAGS := $(CFLAGS_FREETYPE)
+ $(d)charset_detect.o_FLAGS := -D_X86_
+ $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG)
+ $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS)
+-$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
++$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS)
+ $(d)text_file_reader.o_FLAGS := -D_X86_
+ $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2)
+ $(d)auto4_lua.o_FLAGS := $(CFLAGS_LUA)
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/
@ 2016-06-28 18:06 Patrice Clement
0 siblings, 0 replies; 12+ messages in thread
From: Patrice Clement @ 2016-06-28 18:06 UTC (permalink / raw
To: gentoo-commits
commit: 88dd32ed15fabd7a46dbfa06524620952b0b9200
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sat Jun 4 18:15:22 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 17:38:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88dd32ed
media-video/aegisub: remove old
Closes: https://github.com/gentoo/gentoo/pull/1781
Package-Manager: portage-2.3.0_rc1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
media-video/aegisub/Manifest | 1 -
media-video/aegisub/aegisub-3.2.2_p20160306.ebuild | 126 --------------------
...sub-3.2.2_p20160306-fix-luajit-unbundling.patch | 127 ---------------------
...2.2_p20160306-respect-user-compiler-flags.patch | 53 ---------
4 files changed, 307 deletions(-)
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 2db679d..dc56fe5 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,3 +1,2 @@
DIST aegisub-3.2.2.tar.xz 5252052 SHA256 c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885 SHA512 54f825e52f238fef8d5cc31c37436e21355aee27883347f905271e5d2a8ff2a77e1b67d5aef38b0f8468bd0bad851fe944e02de27ec96310b902fbe5b1086722 WHIRLPOOL fe948edbb01f11385e14d1912b73942605df18325fcd95f4284a3c2edb73778d90d73038ac4a062e211fd56879590040e3c558fe1e361ec9fe2eee6a5c016448
-DIST aegisub-3.2.2_p20160306.tar.gz 7436713 SHA256 1b70f67c3b3d6ecce482bc1f4beb1ceffd4c523aa060556658e403ea98fcc58c SHA512 815775b64b1ad5cd09eda6106561a8a0d4dc129d4c2e08e057eab881289526a7b67bab2f4d2f48748ef2015ea21f2839ed8f84d168bf9127c62c9a35caa1abd5 WHIRLPOOL caaa6b1d69c7e4d1da4abfd0382d263585c5216d9ed5e63f515d8bce98b2e0dad2848552f3f097a8db9e39dad5d2c00d3b752f0407490d0d2c777aaa8fc6dc38
DIST aegisub-3.2.2_p20160518.tar.gz 7438734 SHA256 744318ce8be1afb21fbd6b0ce6d407a6f42c442db0df10c7cf89692a5bc8ca31 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6 WHIRLPOOL 0d46799009c72cac1d6df89f4ffe5110d904e671175380e20605683b6a2f3ccdd46855cf98ebac8f0088c7a928b82547557afc8214b2fce85aed759aa5e9e4ab
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild
deleted file mode 100644
index ef73e9d..0000000
--- a/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 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 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@latin sr_RS uk_UA vi zh_CN zh_TW"
-WX_GTK_VER="3.0"
-COMMIT_ID="26fea0e123246b4f122beb54559c8dcd82925071"
-
-inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets vcs-snapshot
-
-DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/"
-SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell +uchardet"
-
-# configure.ac specifies minimal versions for some of the dependencies below.
-# However, most of these minimal versions date back to 2006-2012 yy.
-# Such version specifiers are meaningless nowadays, so they are omitted.
-#
-# aegisub bundles luabins (https://github.com/agladysh/luabins).
-# Unfortunately, luabins upstream is practically dead since 2010.
-# Thus unbundling luabins is not worth the effort.
-RDEPEND="
- dev-lang/luajit:2[lua52compat]
- dev-libs/boost:=[icu,nls,threads]
- dev-libs/icu:=
- media-libs/fontconfig
- media-libs/freetype
- media-libs/libass:=[fontconfig]
- virtual/libiconv
- virtual/opengl
- x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
-
- alsa? ( media-libs/alsa-lib )
- openal? ( media-libs/openal )
- portaudio? ( =media-libs/portaudio-19* )
- pulseaudio? ( media-sound/pulseaudio )
-
- ffmpeg? ( media-libs/ffmpegsource:= )
- fftw? ( >=sci-libs/fftw-3.3:= )
-
- spell? ( app-text/hunspell )
- uchardet? ( dev-libs/uchardet )
-"
-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-luajit-unbundling.patch"
- "${FILESDIR}/${P}-respect-user-compiler-flags.patch"
-)
-
-pkg_pretend() {
- 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
-}
-
-src_prepare() {
- remove_locale() {
- rm "po/${1}.po" || die
- }
-
- l10n_find_plocales_changes 'po' '' '.po'
- l10n_for_each_disabled_locale_do remove_locale
-
- # See http://devel.aegisub.org/ticket/1914
- config_rpath_update "${S}/config.rpath"
-
- autotools-utils_src_prepare
-
- cat <<- EOF > "${S}/build/git_version.h" || die
- #define BUILD_GIT_VERSION_NUMBER 8880
- #define BUILD_GIT_VERSION_STRING "${PV}"
- #define TAGGED_RELEASE 0
- EOF
-}
-
-src_configure() {
- # Prevent sandbox violation from OpenAL detection. Gentoo bug #508184.
- use openal && export agi_cv_with_openal="yes"
- local myeconfargs=(
- --disable-update-checker
- --with-system-luajit
- $(use_enable debug)
- $(use_with alsa)
- $(use_with ffmpeg ffms2)
- $(use_with fftw fftw3)
- $(use_with openal)
- $(use_with oss)
- $(use_with portaudio)
- $(use_with pulseaudio libpulse)
- $(use_with spell hunspell)
- $(use_with uchardet)
- )
- 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.2.2_p20160306-fix-luajit-unbundling.patch b/media-video/aegisub/files/aegisub-3.2.2_p20160306-fix-luajit-unbundling.patch
deleted file mode 100644
index a3649c7..0000000
--- a/media-video/aegisub/files/aegisub-3.2.2_p20160306-fix-luajit-unbundling.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 11bd157747ebb855d56d2bc59952a1093cfd9ddc Mon Sep 17 00:00:00 2001
-From: Ilya Tumaykin <itumaykin@gmail.com>
-Date: Mon, 7 Mar 2016 11:21:10 +0300
-Subject: Properly separate bundled and system luajit builds
-
-Build bundled luajit bits only when using bundled luajit.
-Properly set up linker flags when using system luajit.
-
-Closes #1904.
-
-Bug: http://devel.aegisub.org/ticket/1904
----
- Makefile.inc.in | 1 +
- automation/Makefile | 8 +++++++-
- configure.ac | 2 ++
- header.mk | 5 ++++-
- src/Makefile | 9 +++++++--
- tools/Makefile | 2 ++
- 6 files changed, 23 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.inc.in b/Makefile.inc.in
-index d8b3f4a..52e4cf6 100644
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -9,6 +9,7 @@ HAVE_OPENAL = @with_openal@
- HAVE_OSS = @with_oss@
- HAVE_PORTAUDIO = @with_portaudio@
- HAVE_UCHARDET = @with_uchardet@
-+SYSTEM_LUAJIT = @with_system_luajit@
-
- ##############
- # BUILD OUTPUT
-diff --git a/automation/Makefile b/automation/Makefile
-index 5483dbd..1231aab 100644
---- a/automation/Makefile
-+++ b/automation/Makefile
-@@ -12,10 +12,16 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_
- $(DESTDIR)$(P_DATA)/automation/%: $(d)%
- $(MKDIR_INSTALL)
-
--aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA)
-+aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a
- aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
- aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
-
-+ifeq (no, $(SYSTEM_LUAJIT))
-+aegisub-lua_OBJ += $(LIBS_LUA)
-+else
-+aegisub-lua_LIBS += $(LIBS_LUA)
-+endif
-+
- PROGRAM += $(d)aegisub-lua
-
- test-automation: $(PROGRAM)
-diff --git a/configure.ac b/configure.ac
-index 1649efc..7ebe9d8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -429,6 +429,8 @@ AS_IF([test $with_system_luajit = no],
- [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
- AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-
-+AC_SUBST(with_system_luajit)
-+
- # We also need a Lua binary to run part of the build system
- # Which version doesn't matter as the scripts are portable between them
- AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-diff --git a/header.mk b/header.mk
-index 613b38f..a9ce1d7 100644
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,10 @@ subdirs := \
- tests \
- tools \
- vendor/luabins \
-- vendor/luajit
-+
-+ifeq (no, $(SYSTEM_LUAJIT))
-+subdirs += vendor/luajit
-+endif
-
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
-
-diff --git a/src/Makefile b/src/Makefile
-index 0ee6c84..1a6f015 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -6,7 +6,7 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui
- $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CPPFLAGS_BOOST)
- src_CXXFLAGS := $(CXXFLAGS_WX)
- src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
-- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU)
-+ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU)
- src_PCH := $(d)agi_pre.h
- src_INSTALLNAME := $(AEGISUB_COMMAND)
-
-@@ -111,11 +111,16 @@ src_OBJ := \
- $(d)video_provider_yuv4mpeg.o \
- $(d)video_slider.o \
- $(d)visual_feature.o \
-- $(LIBS_LUA) \
- $(TOP)lib/libaegisub.a \
- $(TOP)lib/libluabins.a \
- $(TOP)lib/libresrc.a \
-
-+ifeq (no, $(SYSTEM_LUAJIT))
-+src_OBJ += $(LIBS_LUA)
-+else
-+src_LIBS += $(LIBS_LUA)
-+endif
-+
- ifeq (yes, $(BUILD_DARWIN))
- src_OBJ += $(d)font_file_lister_coretext.o
- src_OBJ += $(subst .mm,.o,$(wildcard $(d)osx/*.mm))
-diff --git a/tools/Makefile b/tools/Makefile
-index de6166a..e17eaa2 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,8 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
-
- PROGRAM += $(d)repack-thes-dict
-
-+ifeq (no, $(SYSTEM_LUAJIT))
- $(TOP)tools/respack.lua: $(shell command -v "$(BIN_LUA)")
-+endif
-
- include $(TOP)Makefile.target
diff --git a/media-video/aegisub/files/aegisub-3.2.2_p20160306-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.2.2_p20160306-respect-user-compiler-flags.patch
deleted file mode 100644
index 4cd4790..0000000
--- a/media-video/aegisub/files/aegisub-3.2.2_p20160306-respect-user-compiler-flags.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-http://devel.aegisub.org/ticket/1899
-http://devel.aegisub.org/ticket/1900
-
-diff --git a/configure.ac b/configure.ac
-index 1649efc..2f4470b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -133,20 +133,17 @@ AS_IF([test x$build_darwin != xyes], [
- AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]]))
-
- AS_IF([test x$enable_compiler_flags != xno], [
-- CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-- CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-+ CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
-+ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing"
-+ AC_C_FLAG([-std=gnu99])
- AC_CXX_FLAG([-std=c++11])
-- AC_CXX_FLAG([-Wno-c++11-narrowing])
- AC_C_FLAG([-Wno-unused-local-typedefs])
- AC_CXX_FLAG([-Wno-unused-local-typedefs])
-
- # -O* messes with debugging.
- AS_IF([test x$enable_debug = xyes], [
-- CFLAGS="$CFLAGS -O0"
-- CXXFLAGS="$CXXFLAGS -O0"
-- ], [
-- CFLAGS="$CFLAGS -O3"
-- CXXFLAGS="$CXXFLAGS -O3"
-+ CFLAGS="$CFLAGS -O0 -g"
-+ CXXFLAGS="$CXXFLAGS -O0 -g"
- ])
- ])
-
-diff --git a/src/Makefile b/src/Makefile
-index 0ee6c84..cad213b 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -188,14 +188,13 @@ endif
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
--$(d)MatroskaParser.o_FLAGS := -Wno-sometimes-uninitialized
- $(d)audio_player.o_FLAGS := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
- $(d)audio_provider_factory.o_FLAGS := $(CFLAGS_FFMS2)
- $(d)auto4_base.o_FLAGS := $(CFLAGS_FREETYPE)
- $(d)charset_detect.o_FLAGS := -D_X86_
- $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG)
- $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS)
--$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
-+$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS)
- $(d)text_file_reader.o_FLAGS := -D_X86_
- $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2)
- $(d)auto4_lua.o_FLAGS := $(CFLAGS_LUA)
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/
@ 2020-08-05 16:10 Nick Sarnie
0 siblings, 0 replies; 12+ messages in thread
From: Nick Sarnie @ 2020-08-05 16:10 UTC (permalink / raw
To: gentoo-commits
commit: f1efe67d2c8cdc8ebbf688b587bd86146a054c60
Author: Jan Seeger <jan.seeger <AT> thenybble <DOT> de>
AuthorDate: Mon Aug 3 13:00:08 2020 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Wed Aug 5 16:09:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1efe67d
media-video/aegisub-9999: Updated git ebuild.
Closes: https://bugs.gentoo.org/734916
Signed-off-by: Jan Seeger <jan.seeger <AT> thenybble.de>
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
media-video/aegisub/aegisub-9999.ebuild | 12 ++--
media-video/aegisub/files/aegisub-9999-git.patch | 78 ++++++++++++++++++++++++
2 files changed, 84 insertions(+), 6 deletions(-)
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 1e6debce1e8..c1f73d3373a 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
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"
+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 gnome2-utils l10n wxwidgets xdg-utils git-r3
@@ -52,9 +52,7 @@ DEPEND="${RDEPEND}
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.2.2_p20160518/${PN}-3.2.2_p20160518-respect-compiler-flags.patch"
- "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-boost170-build.patch"
+ "${FILESDIR}/${P}-git.patch"
)
src_prepare() {
@@ -94,12 +92,14 @@ src_configure() {
$(use_with pulseaudio libpulse)
$(use_with spell hunspell)
$(use_with uchardet)
+ --disable-compiler-flags
)
econf "${myeconfargs[@]}"
}
src_compile() {
- emake
+ # Concurrent builds seem to break the build process.
+ emake -j1
}
src_test() {
diff --git a/media-video/aegisub/files/aegisub-9999-git.patch b/media-video/aegisub/files/aegisub-9999-git.patch
new file mode 100644
index 00000000000..80fd243703b
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-9999-git.patch
@@ -0,0 +1,78 @@
+diff --git a/Makefile.target b/Makefile.target
+index 516ef3c24..65de0e767 100644
+--- a/Makefile.target
++++ b/Makefile.target
+@@ -79,13 +79,13 @@ endif
+ all: $(LIB_TARGETS)
+
+ clean:
+- $(BIN_RM) -f $(OBJ) $(CLEANFILES) $(LIB_TARGETS)
++ $(BIN_RM) -f -- $(OBJ) $(CLEANFILES) $(LIB_TARGETS)
+
+ distclean: clean
+- $(BIN_RM) -rf $(DISTCLEANFILES) $(DEP)
++ $(BIN_RM) -rf -- $(DISTCLEANFILES) $(DEP)
+
+ depclean: clean
+- $(BIN_RM) -rf $(DEP)
++ $(BIN_RM) -rf -- $(DEP)
+
+ install:
+
+diff --git a/header.mk b/header.mk
+index 613b38ff1..2c238e125 100644
+--- a/header.mk
++++ b/header.mk
+@@ -5,15 +5,13 @@ TOP := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))/
+ include $(TOP)Makefile.inc
+
+ subdirs := \
+- automation \
+ libaegisub \
+ packages/desktop \
+ po \
+ src \
+ tests \
+- tools \
+ vendor/luabins \
+- vendor/luajit
++ tools
+
+ subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
+
+diff --git a/m4macros/ac_agi.m4 b/m4macros/ac_agi.m4
+index e45a54767..1bd0120ed 100644
+--- a/m4macros/ac_agi.m4
++++ b/m4macros/ac_agi.m4
+@@ -20,12 +20,14 @@ AC_DEFUN([AC_AGI_LINK],[
+ aegisub_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $4"
+ LIBS="$LIBS $5"
++ AC_LANG_PUSH(C++)
+ AC_CHECK_HEADER([$3], [agi_cv_header="yes"], [agi_cv_header="no"])
+ AS_IF([test "x$agi_cv_header" = xyes],
+ [AC_CACHE_CHECK(
+ [whether $1 works], [agi_cv_with_$2],
+ [AC_LINK_IFELSE([AC_LANG_SOURCE([$6])], [eval agi_cv_with_$2="yes"], [eval agi_cv_with_$2="no"])])]
+ [eval agi_cv_with_$2="no"])
++ AC_LANG_POP(C++)
+ CPPFLAGS="$aegisub_save_CPPFLAGS"
+ LIBS="$aegisub_save_LIBS"
+ ])
+diff --git a/src/libresrc/libresrc.cpp b/src/libresrc/libresrc.cpp
+index 79dc0f16c..8648d2987 100644
+--- a/src/libresrc/libresrc.cpp
++++ b/src/libresrc/libresrc.cpp
+@@ -22,9 +22,10 @@
+
+ wxBitmap libresrc_getimage(const unsigned char *buff, size_t size, double scale, int dir) {
+ wxMemoryInputStream mem(buff, size);
++ auto img = wxImage(mem);
+ if (dir != wxLayout_RightToLeft)
+- return wxBitmap(wxImage(mem), -1, scale);
+- return wxBitmap(wxImage(mem).Mirror(), -1, scale);
++ return wxBitmap(img.Scale(img.GetHeight() * scale, img.GetWidth() * scale));
++ return wxBitmap(img.Mirror().Scale(img.GetHeight() * scale, img.GetWidth() * scale));
+ }
+
+ wxIcon libresrc_geticon(const unsigned char *buff, size_t size) {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/
@ 2021-01-15 17:11 Nick Sarnie
0 siblings, 0 replies; 12+ messages in thread
From: Nick Sarnie @ 2021-01-15 17:11 UTC (permalink / raw
To: gentoo-commits
commit: 21ffb11f616da44099e8b0b311d5176ede6c7be7
Author: Matthew White <mehw.is.me <AT> inventati <DOT> org>
AuthorDate: Fri Jan 15 12:01:10 2021 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 17:10:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21ffb11f
media-video/aegisub-9999: use wangqr repo to fix make 4.3 build
The bug presents itself during compilation as unresolved dependencies.
The official Aegisub repo isn't actively updated... That leaves now a
problem when make is updated to sys-devel/make-4.3.
In Makefile.target it is required to use the automatic variable $(*F),
rather than $*, to compile the Aegisub .a libraries with make 4.3.
References about make 4.3 bug:
- GNU make Automatic Variables
https://www.gnu.org/software/make/manual/make.html#Automatic-Variables
- Failing to compile on make 4.3
https://github.com/Aegisub/Aegisub/issues/171
- Use target name without directory in $*_OBJ macro
https://github.com/wangqr/Aegisub/commit/6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39
Closes: https://bugs.gentoo.org/765133
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Matteo Bianco <mehw.is.me <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/19065
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
media-video/aegisub/aegisub-9999.ebuild | 4 ++--
media-video/aegisub/files/aegisub-9999-git.patch | 17 -----------------
2 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index bcc8a14c9a3..58b02287943 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -12,8 +12,8 @@ PLOCALES="ar be bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_B
inherit autotools l10n lua-single wxwidgets xdg-utils git-r3
DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
-EGIT_REPO_URI="https://github.com/${PN^}/${PN^}.git"
+HOMEPAGE="http://www.aegisub.org/ https://github.com/wangqr/Aegisub"
+EGIT_REPO_URI="https://github.com/wangqr/${PN^}.git"
# Submodules are used to pull bundled libraries.
EGIT_SUBMODULES=()
diff --git a/media-video/aegisub/files/aegisub-9999-git.patch b/media-video/aegisub/files/aegisub-9999-git.patch
index 80fd243703b..a5883336757 100644
--- a/media-video/aegisub/files/aegisub-9999-git.patch
+++ b/media-video/aegisub/files/aegisub-9999-git.patch
@@ -59,20 +59,3 @@ index e45a54767..1bd0120ed 100644
CPPFLAGS="$aegisub_save_CPPFLAGS"
LIBS="$aegisub_save_LIBS"
])
-diff --git a/src/libresrc/libresrc.cpp b/src/libresrc/libresrc.cpp
-index 79dc0f16c..8648d2987 100644
---- a/src/libresrc/libresrc.cpp
-+++ b/src/libresrc/libresrc.cpp
-@@ -22,9 +22,10 @@
-
- wxBitmap libresrc_getimage(const unsigned char *buff, size_t size, double scale, int dir) {
- wxMemoryInputStream mem(buff, size);
-+ auto img = wxImage(mem);
- if (dir != wxLayout_RightToLeft)
-- return wxBitmap(wxImage(mem), -1, scale);
-- return wxBitmap(wxImage(mem).Mirror(), -1, scale);
-+ return wxBitmap(img.Scale(img.GetHeight() * scale, img.GetWidth() * scale));
-+ return wxBitmap(img.Mirror().Scale(img.GetHeight() * scale, img.GetWidth() * scale));
- }
-
- wxIcon libresrc_geticon(const unsigned char *buff, size_t size) {
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-01-15 17:11 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-28 18:06 [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2021-01-15 17:11 Nick Sarnie
2020-08-05 16:10 Nick Sarnie
2016-03-08 2:16 Ian Delaney
2016-03-08 2:16 Ian Delaney
2016-03-08 2:16 Ian Delaney
2016-02-10 22:04 Patrice Clement
2016-02-10 16:26 Patrice Clement
2016-01-01 7:55 Ian Delaney
2015-12-28 9:53 Patrice Clement
2015-12-22 0:07 Ian Delaney
2015-11-03 9:42 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox