* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/
@ 2015-12-28 9:53 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2015-12-28 9:53 UTC (permalink / raw
To: gentoo-commits
commit: bf6592979744792bbad470b69c8003955df6bebb
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sun Dec 27 23:08:00 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 23:28:13 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf659297
media-video/aegisub: adjust LIBS_LUA placement in luajit unbundle patch
LIBS_LUA (aka '-lluajit-5.x') is included in OBJ list in automation
build. This is why linking to luajit works properly.
However, the expected behaviour is to include LIBS_LUA in LIBS list.
Package-Manager: portage-2.2.24
.../files/aegisub-3.2.2-unbundle-luajit.patch | 22 +++++++++++++++++++---
.../files/aegisub-9999-unbundle-luajit.patch | 22 +++++++++++++++++++---
2 files changed, 38 insertions(+), 6 deletions(-)
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 de09072..ff033cb 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
@@ -28,6 +28,22 @@ index c93b9dc..ae018c3 100644
FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
#####################
+diff --git a/automation/Makefile b/automation/Makefile
+index 45a5ce2..db51a61 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 be657b0..de586d5 100644
--- a/configure.ac
@@ -62,7 +78,7 @@ index 61c8ba1..050472d 100644
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
diff --git a/src/Makefile b/src/Makefile
-index 60d7101..757bdc6 100644
+index 60d7101..1d4779c 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
@@ -70,8 +86,8 @@ index 60d7101..757bdc6 100644
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)
++ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \
++ $(LIBS_ICU) $(LIBS_LUA)
src_PCH := $(d)agi_pre.h
src_INSTALLNAME := $(AEGISUB_COMMAND)
diff --git a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
index 4eea654..cfae62a 100644
--- a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
+++ b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
@@ -28,6 +28,22 @@ index d1e1da4..aa26b81 100644
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 d0b5152..ecec4de 100644
--- a/configure.ac
@@ -62,7 +78,7 @@ index 61c8ba1..050472d 100644
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
diff --git a/src/Makefile b/src/Makefile
-index 08f9216..bb9233b 100644
+index 08f9216..53c60b6 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
@@ -70,8 +86,8 @@ index 08f9216..bb9233b 100644
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)
++ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \
++ $(LIBS_ICU) $(LIBS_LUA)
src_PCH := $(d)agi_pre.h
src_INSTALLNAME := $(AEGISUB_COMMAND)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/
@ 2015-12-28 9:53 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2015-12-28 9:53 UTC (permalink / raw
To: gentoo-commits
commit: d4f22fa39b1eb118214466b1a22b007e078c009f
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sun Dec 27 23:18:40 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 23:34:32 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4f22fa3
media-video/aegisub: remove clang-only options to avoid warnings on gcc
These options only suppress compilation warnings and do not alter
compilation itself, so it is safe to remove them.
Package-Manager: portage-2.2.24
.../aegisub-3.2.2-respect-user-compiler-flags.patch | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch
index caecf82..3cb2686 100644
--- a/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch
+++ b/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch
@@ -28,3 +28,23 @@ index be657b0..fca48e0 100644
])
])
+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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/
@ 2015-12-28 9:53 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2015-12-28 9:53 UTC (permalink / raw
To: gentoo-commits
commit: 4da8aa027a5cc89f46190a0374b04b1cdc182ff5
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sun Dec 27 22:49:39 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 23:24:47 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da8aa02
media-video/aegisub: adjust pthread patch wrt bug 568878
- Always append '-lpthread' to LIBS_PTHREAD since build system fails to
do so when needed.
- Add CFLAGS_PTHREAD to libaegisub build since it uses pthreads.
- Remove CFLAGS_PTHREAD from tools build since it does not use pthreads,
but only links with archive that includes pthread symbols.
Gentoo-Bug: 568878
Package-Manager: portage-2.2.24
.../aegisub-3.2.2-add-missing-pthread-flags.patch | 36 ++++++++++++++++++----
.../aegisub-9999-add-missing-pthread-flags.patch | 35 ++++++++++++++-------
2 files changed, 54 insertions(+), 17 deletions(-)
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 c1aa14a..ed45de7 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
@@ -1,16 +1,40 @@
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index c93b9dc..8c5678a 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -99,7 +99,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
+
+ ifeq (yes, $(BUILD_DARWIN))
+ LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
+diff --git a/libaegisub/Makefile b/libaegisub/Makefile
+index 64204ef..178044d 100644
+--- a/libaegisub/Makefile
++++ 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
-index 81bcef3..f9a6cd3 100644
+index 81bcef3..d9f64b8 100644
--- a/tools/Makefile
+++ b/tools/Makefile
-@@ -7,8 +7,9 @@ PROGRAM += $(d)osx-bundle-restart-helper
+@@ -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_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)
+ 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-9999-add-missing-pthread-flags.patch b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
index 1d709fe..3631361 100644
--- a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
+++ b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
@@ -1,14 +1,27 @@
-diff --git a/tools/Makefile b/tools/Makefile
-index d9f64b8..f9a6cd3 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -8,7 +8,8 @@ endif
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index d1e1da4..699ac77 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -99,7 +99,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
- 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)
+ ifeq (yes, $(BUILD_DARWIN))
+ LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
+diff --git a/libaegisub/Makefile b/libaegisub/Makefile
+index 4efb685..f53c372 100644
+--- a/libaegisub/Makefile
++++ b/libaegisub/Makefile
+@@ -44,7 +44,8 @@ aegisub_OBJ += $(d)common/dispatch.o
+ endif
- PROGRAM += $(d)repack-thes-dict
+ 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_conv.o_FLAGS := $(CFLAGS_ICONV)
+ $(d)common/parser.o_FLAGS := -ftemplate-depth=256
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/
@ 2016-02-10 22:04 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-02-10 22:04 UTC (permalink / raw
To: gentoo-commits
commit: 3c8ea82d5159978f7b5de17d43fff3cfb5ddc512
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Wed Feb 10 17:04:30 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=3c8ea82d
media-video/aegisub: update 9999 patchset
Package-Manager: portage-2.2.27
.../aegisub-9999-add-missing-pthread-flags.patch | 16 +++---
.../files/aegisub-9999-unbundle-luajit.patch | 67 +++++++++++-----------
2 files changed, 42 insertions(+), 41 deletions(-)
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
index 3631361..720211a 100644
--- a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
+++ b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
@@ -1,27 +1,27 @@
diff --git a/Makefile.inc.in b/Makefile.inc.in
-index d1e1da4..699ac77 100644
+index 5a52d25..86f93d1 100644
--- a/Makefile.inc.in
+++ b/Makefile.inc.in
-@@ -99,7 +99,7 @@ LIBS_LIBPULSE = @LIBPULSE_LIBS@
+@@ -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))
- LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
diff --git a/libaegisub/Makefile b/libaegisub/Makefile
-index 4efb685..f53c372 100644
+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)
- $(d)common/parser.o_FLAGS := -ftemplate-depth=256
diff --git a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
index cfae62a..3fa9143 100644
--- a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
+++ b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
@@ -1,8 +1,8 @@
diff --git a/Makefile.inc.in b/Makefile.inc.in
-index d1e1da4..aa26b81 100644
+index 5a52d25..6cd16f1 100644
--- a/Makefile.inc.in
+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@ CFLAGS_ICONV = @ICONV_CFLAGS@
+@@ -79,7 +79,7 @@ CFLAGS_ICONV = @ICONV_CFLAGS@
CFLAGS_ICU = @ICU_I18N_CFLAGS@
CFLAGS_LIBASS = @LIBASS_CFLAGS@
CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@
@@ -11,7 +11,7 @@ index d1e1da4..aa26b81 100644
CFLAGS_OPENAL = @OPENAL_CFLAGS@
CFLAGS_OSS = @OSS_CFLAGS@
CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@
-@@ -96,15 +96,11 @@ LIBS_ICONV = @ICONV_LIBS@
+@@ -97,16 +97,12 @@ LIBS_ICONV = @ICONV_LIBS@
LIBS_ICU = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
LIBS_LIBASS = @LIBASS_LIBS@
LIBS_LIBPULSE = @LIBPULSE_LIBS@
@@ -20,13 +20,14 @@ index d1e1da4..aa26b81 100644
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
@@ -35,17 +36,17 @@ index d5425b7..121aae7 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 d0b5152..ecec4de 100644
+index 7492568..2c77fcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,8 @@ m4_define([libpulse_required_version], [0.5])
@@ -54,31 +55,31 @@ index d0b5152..ecec4de 100644
m4_define([wx_required_version], [3.0.0])
+# Same version as the bundled one
+m4_define([luajit_required_version], [2.0.4])
-
+
#######
# Setup
-@@ -206,6 +208,7 @@ AC_SUBST(GL_LIBS)
- PKG_CHECK_MODULES(FREETYPE, freetype2 >= freetype_required_version)
- PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version)
+@@ -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)
-
- FONTCONFIG_CONF_DIR=$($PKG_CONFIG --variable=confdir fontconfig)
- AC_SUBST(FONTCONFIG_CONF_DIR)
+
+ 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 61c8ba1..050472d 100644
+index 613b38f..873d4ce 100644
--- a/header.mk
+++ b/header.mk
@@ -13,7 +13,6 @@ subdirs := \
tests \
tools \
vendor/luabins \
-- vendor/luajit \
- vendor/universalchardet
-
+- vendor/luajit
+
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
+
diff --git a/src/Makefile b/src/Makefile
-index 08f9216..53c60b6 100644
+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
@@ -90,8 +91,8 @@ index 08f9216..53c60b6 100644
+ $(LIBS_ICU) $(LIBS_LUA)
src_PCH := $(d)agi_pre.h
src_INSTALLNAME := $(AEGISUB_COMMAND)
-
-@@ -112,7 +113,6 @@ src_OBJ := \
+
+@@ -111,7 +112,6 @@ src_OBJ := \
$(d)video_provider_yuv4mpeg.o \
$(d)video_slider.o \
$(d)visual_feature.o \
@@ -99,7 +100,7 @@ index 08f9216..53c60b6 100644
$(TOP)lib/libaegisub.a \
$(TOP)lib/libluabins.a \
$(TOP)lib/libresrc.a \
-@@ -192,10 +192,10 @@ $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS)
+@@ -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)
@@ -111,35 +112,35 @@ index 08f9216..53c60b6 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
-index d9f64b8..d56ef63 100644
+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 85955d1..11af2f4 100755
+index 1281ac2..35630a2 100755
--- a/tools/respack.lua
+++ b/tools/respack.lua
@@ -1,4 +1,4 @@
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/
@ 2016-02-10 22:04 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2016-02-10 22:04 UTC (permalink / raw
To: gentoo-commits
commit: bb7d025fe33277e5b32e795201dbfb2b0469d133
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Wed Feb 10 17:10:34 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=bb7d025f
media-video/aegisub: include links to upstream bugreports in patches
Package-Manager: portage-2.2.27
.../aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch | 3 +++
media-video/aegisub/files/aegisub-3.2.2-fix-lua-regexp.patch | 2 ++
.../aegisub/files/aegisub-3.2.2-r1-respect-user-compiler-flags.patch | 3 +++
.../aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch | 3 +++
media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch | 2 ++
media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch | 3 +++
media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch | 2 ++
7 files changed, 18 insertions(+)
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 a5a6fc0..d119409 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
@@ -1,3 +1,6 @@
+http://devel.aegisub.org/ticket/1902
+http://devel.aegisub.org/ticket/1903
+
diff --git a/Makefile.inc.in b/Makefile.inc.in
index c93b9dc..8c5678a 100644
--- a/Makefile.inc.in
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 e3b620b..4d2050c 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
@@ -1,3 +1,5 @@
+http://devel.aegisub.org/ticket/1898
+
diff --git a/tools/respack.lua b/tools/respack.lua
index 85955d1..1281ac2 100755
--- a/tools/respack.lua
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
index 7c01832..5178983 100644
--- 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
@@ -1,3 +1,6 @@
+http://devel.aegisub.org/ticket/1899
+http://devel.aegisub.org/ticket/1900
+
diff --git a/configure.ac b/configure.ac
index be657b0..de8184f 100644
--- a/configure.ac
diff --git a/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch
index 3cb2686..eeeeab3 100644
--- a/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch
+++ b/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch
@@ -1,3 +1,6 @@
+http://devel.aegisub.org/ticket/1899
+http://devel.aegisub.org/ticket/1900
+
diff --git a/configure.ac b/configure.ac
index be657b0..fca48e0 100644
--- a/configure.ac
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 ec561b2..c301b37 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
@@ -1,3 +1,5 @@
+http://devel.aegisub.org/ticket/1904
+
diff --git a/Makefile.inc.in b/Makefile.inc.in
index c93b9dc..ae018c3 100644
--- a/Makefile.inc.in
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
index 720211a..920989a 100644
--- a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
+++ b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
@@ -1,3 +1,6 @@
+http://devel.aegisub.org/ticket/1902
+http://devel.aegisub.org/ticket/1903
+
diff --git a/Makefile.inc.in b/Makefile.inc.in
index 5a52d25..86f93d1 100644
--- a/Makefile.inc.in
diff --git a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
index 3fa9143..c7e3e94 100644
--- a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
+++ b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
@@ -1,3 +1,5 @@
+http://devel.aegisub.org/ticket/1904
+
diff --git a/Makefile.inc.in b/Makefile.inc.in
index 5a52d25..6cd16f1 100644
--- a/Makefile.inc.in
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/
@ 2016-02-13 3:56 Ian Delaney
0 siblings, 0 replies; 7+ messages in thread
From: Ian Delaney @ 2016-02-13 3:56 UTC (permalink / raw
To: gentoo-commits
commit: 26d620f7ca03252db6a17f4ec15ea3430268b95c
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Fri Feb 12 09:16:01 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 09:18:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d620f7
media-video/aegisub: update 9999 patchset
Package-Manager: portage-2.2.27
.../files/aegisub-9999-add-missing-pthread-flags.patch | 14 ++++++++++++++
1 file changed, 14 insertions(+)
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
index 920989a..9f41ee5 100644
--- a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
+++ b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
@@ -1,5 +1,6 @@
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
@@ -28,3 +29,16 @@ index b021523..77a18ec 100644
$(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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/
@ 2016-03-08 2:16 Ian Delaney
0 siblings, 0 replies; 7+ messages in thread
From: Ian Delaney @ 2016-03-08 2:16 UTC (permalink / raw
To: gentoo-commits
commit: ebbac21631c77546b1d5e3c0548985e3e49b5467
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Mar 7 15:46:12 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 18:35:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebbac216
media-video/aegisub: better wording in patch comment for 3.0.4
Package-Manager: portage-2.2.27
.../files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 3eda0da..0bd1b5d 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
@@ -1,6 +1,6 @@
-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.
+Upstream always installs all available localization files. We workaround this
+by sed'ing out the unused languages from PO variable in `aegisub/po/Makefile'.
+This can result in an empty PO definition, in which case install target fails.
Thus a simple guard is introduced to prevent this fail.
diff --git a/aegisub/po/Makefile b/aegisub/po/Makefile
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-03-08 2:16 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-10 22:04 [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2016-03-08 2:16 Ian Delaney
2016-02-13 3:56 Ian Delaney
2016-02-10 22:04 Patrice Clement
2015-12-28 9:53 Patrice Clement
2015-12-28 9:53 Patrice Clement
2015-12-28 9:53 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox