media-video/aegisub: update 9999 patchset

Package-Manager: portage-2.2.27

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 363136134e84..720211afb507 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 cfae62ae7feb..3fa914377fd4 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 @@