| 1 |
commit: 07146ec002decac6cf35c0762d33cd14a627efec |
| 2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Mar 7 15:11:13 2016 +0000 |
| 4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 7 16:25:12 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07146ec0 |
| 7 |
|
| 8 |
media-video/aegisub: remove unneeded unbundle-luajit patch from 9999 |
| 9 |
|
| 10 |
Mostly merged upstream. Upstream now supports building with system |
| 11 |
luajit. There are still some problems left, see [1]. But it's already |
| 12 |
a major improvement. |
| 13 |
|
| 14 |
[1]: http://devel.aegisub.org/ticket/1904#comment:10 |
| 15 |
|
| 16 |
Package-Manager: portage-2.2.27 |
| 17 |
|
| 18 |
media-video/aegisub/aegisub-9999.ebuild | 4 +- |
| 19 |
.../files/aegisub-9999-unbundle-luajit.patch | 153 --------------------- |
| 20 |
2 files changed, 2 insertions(+), 155 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild |
| 23 |
index 7a83307..2d555ef 100644 |
| 24 |
--- a/media-video/aegisub/aegisub-9999.ebuild |
| 25 |
+++ b/media-video/aegisub/aegisub-9999.ebuild |
| 26 |
@@ -55,11 +55,10 @@ REQUIRED_USE=" |
| 27 |
|| ( alsa openal oss portaudio pulseaudio ) |
| 28 |
" |
| 29 |
|
| 30 |
-# aegisub also bundles luabins (https://github.com/agladysh/luabins). |
| 31 |
+# aegisub bundles luabins (https://github.com/agladysh/luabins). |
| 32 |
# Unfortunately, luabins upstream is dead since 2011. |
| 33 |
# Thus unbundling luabins is not worth the effort. |
| 34 |
PATCHES=( |
| 35 |
- "${FILESDIR}/${P}-unbundle-luajit.patch" |
| 36 |
"${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch" |
| 37 |
) |
| 38 |
|
| 39 |
@@ -87,6 +86,7 @@ src_configure() { |
| 40 |
use openal && export agi_cv_with_openal="yes" |
| 41 |
local myeconfargs=( |
| 42 |
--disable-update-checker |
| 43 |
+ --with-system-luajit |
| 44 |
$(use_enable debug) |
| 45 |
$(use_with alsa) |
| 46 |
$(use_with ffmpeg ffms2) |
| 47 |
|
| 48 |
diff --git a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch |
| 49 |
deleted file mode 100644 |
| 50 |
index c7e3e94..0000000 |
| 51 |
--- a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch |
| 52 |
+++ /dev/null |
| 53 |
@@ -1,153 +0,0 @@ |
| 54 |
-http://devel.aegisub.org/ticket/1904 |
| 55 |
- |
| 56 |
-diff --git a/Makefile.inc.in b/Makefile.inc.in |
| 57 |
-index 5a52d25..6cd16f1 100644 |
| 58 |
---- a/Makefile.inc.in |
| 59 |
-+++ b/Makefile.inc.in |
| 60 |
-@@ -79,7 +79,7 @@ CFLAGS_ICONV = @ICONV_CFLAGS@ |
| 61 |
- CFLAGS_ICU = @ICU_I18N_CFLAGS@ |
| 62 |
- CFLAGS_LIBASS = @LIBASS_CFLAGS@ |
| 63 |
- CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@ |
| 64 |
--CFLAGS_LUA = -I$(TOP)vendor/luajit/include |
| 65 |
-+CFLAGS_LUA = @LUAJIT_CFLAGS@ |
| 66 |
- CFLAGS_OPENAL = @OPENAL_CFLAGS@ |
| 67 |
- CFLAGS_OSS = @OSS_CFLAGS@ |
| 68 |
- CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@ |
| 69 |
-@@ -97,16 +97,12 @@ LIBS_ICONV = @ICONV_LIBS@ |
| 70 |
- LIBS_ICU = @ICU_UC_LIBS@ @ICU_I18N_LIBS@ |
| 71 |
- LIBS_LIBASS = @LIBASS_LIBS@ |
| 72 |
- LIBS_LIBPULSE = @LIBPULSE_LIBS@ |
| 73 |
--LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a |
| 74 |
-+LIBS_LUA = @LUAJIT_LIBS@ |
| 75 |
- LIBS_OPENAL = @OPENAL_LIBS@ |
| 76 |
- LIBS_PORTAUDIO = @PORTAUDIO_LIBS@ |
| 77 |
- LIBS_PTHREAD = @PTHREAD_LIBS@ |
| 78 |
- LIBS_UCHARDET = @UCHARDET_LIBS@ |
| 79 |
- |
| 80 |
--ifeq (yes, $(BUILD_DARWIN)) |
| 81 |
--LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so |
| 82 |
--endif |
| 83 |
-- |
| 84 |
- FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@ |
| 85 |
- |
| 86 |
- ##################### |
| 87 |
-diff --git a/automation/Makefile b/automation/Makefile |
| 88 |
-index d5425b7..121aae7 100644 |
| 89 |
---- a/automation/Makefile |
| 90 |
-+++ b/automation/Makefile |
| 91 |
-@@ -12,9 +12,9 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_ |
| 92 |
- $(DESTDIR)$(P_DATA)/automation/%: $(d)% |
| 93 |
- $(MKDIR_INSTALL) |
| 94 |
- |
| 95 |
--aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA) |
| 96 |
-+aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a |
| 97 |
- aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX) |
| 98 |
--aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) |
| 99 |
-+aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_LUA) |
| 100 |
- |
| 101 |
- PROGRAM += $(d)aegisub-lua |
| 102 |
- |
| 103 |
-diff --git a/configure.ac b/configure.ac |
| 104 |
-index 7492568..2c77fcf 100644 |
| 105 |
---- a/configure.ac |
| 106 |
-+++ b/configure.ac |
| 107 |
-@@ -16,6 +16,8 @@ m4_define([libpulse_required_version], [0.5]) |
| 108 |
- m4_define([pkgconfig_required_version], [0.20]) |
| 109 |
- m4_define([portaudio_required_version], [19]) |
| 110 |
- m4_define([wx_required_version], [3.0.0]) |
| 111 |
-+# Same version as the bundled one |
| 112 |
-+m4_define([luajit_required_version], [2.0.4]) |
| 113 |
- |
| 114 |
- ####### |
| 115 |
- # Setup |
| 116 |
-@@ -209,6 +211,7 @@ AS_IF([test x$build_darwin != xyes], [ |
| 117 |
- ]) |
| 118 |
- |
| 119 |
- PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version) |
| 120 |
-+PKG_CHECK_MODULES(LUAJIT, luajit >= luajit_required_version) |
| 121 |
- |
| 122 |
- AX_BOOST_BASE([boost_required_version]) |
| 123 |
- AX_BOOST_LIB(chrono, BOOST_CHRONO_LIB, [chrono.hpp], [boost::chrono::system_clock::time_point time]) |
| 124 |
-diff --git a/header.mk b/header.mk |
| 125 |
-index 613b38f..873d4ce 100644 |
| 126 |
---- a/header.mk |
| 127 |
-+++ b/header.mk |
| 128 |
-@@ -13,7 +13,6 @@ subdirs := \ |
| 129 |
- tests \ |
| 130 |
- tools \ |
| 131 |
- vendor/luabins \ |
| 132 |
-- vendor/luajit |
| 133 |
- |
| 134 |
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) |
| 135 |
- |
| 136 |
-diff --git a/src/Makefile b/src/Makefile |
| 137 |
-index 1fb983c..1fb0acb 100644 |
| 138 |
---- a/src/Makefile |
| 139 |
-+++ b/src/Makefile |
| 140 |
-@@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui |
| 141 |
- $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CPPFLAGS_BOOST) |
| 142 |
- src_CXXFLAGS := $(CXXFLAGS_WX) |
| 143 |
- src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \ |
| 144 |
-- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) |
| 145 |
-+ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \ |
| 146 |
-+ $(LIBS_ICU) $(LIBS_LUA) |
| 147 |
- src_PCH := $(d)agi_pre.h |
| 148 |
- src_INSTALLNAME := $(AEGISUB_COMMAND) |
| 149 |
- |
| 150 |
-@@ -111,7 +112,6 @@ src_OBJ := \ |
| 151 |
- $(d)video_provider_yuv4mpeg.o \ |
| 152 |
- $(d)video_slider.o \ |
| 153 |
- $(d)visual_feature.o \ |
| 154 |
-- $(LIBS_LUA) \ |
| 155 |
- $(TOP)lib/libaegisub.a \ |
| 156 |
- $(TOP)lib/libluabins.a \ |
| 157 |
- $(TOP)lib/libresrc.a \ |
| 158 |
-@@ -198,10 +198,10 @@ $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS) |
| 159 |
- $(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing |
| 160 |
- $(d)text_file_reader.o_FLAGS := -D_X86_ |
| 161 |
- $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2) |
| 162 |
--$(d)auto4_lua.o_FLAGS := -I$(TOP)vendor/luajit/include |
| 163 |
--$(d)auto4_lua_assfile.o_FLAGS := -I$(TOP)vendor/luajit/include |
| 164 |
--$(d)auto4_lua_dialog.o_FLAGS := -I$(TOP)vendor/luajit/include |
| 165 |
--$(d)auto4_lua_progresssink.o_FLAGS := -I$(TOP)vendor/luajit/include |
| 166 |
-+$(d)auto4_lua.o_FLAGS := $(CFLAGS_LUA) |
| 167 |
-+$(d)auto4_lua_assfile.o_FLAGS := $(CFLAGS_LUA) |
| 168 |
-+$(d)auto4_lua_dialog.o_FLAGS := $(CFLAGS_LUA) |
| 169 |
-+$(d)auto4_lua_progresssink.o_FLAGS := $(CFLAGS_LUA) |
| 170 |
- |
| 171 |
- $(src_OBJ): $(d)libresrc/bitmap.h $(d)libresrc/default_config.h |
| 172 |
- |
| 173 |
-diff --git a/src/libresrc/Makefile b/src/libresrc/Makefile |
| 174 |
-index 6441856..0562eb1 100644 |
| 175 |
---- a/src/libresrc/Makefile |
| 176 |
-+++ b/src/libresrc/Makefile |
| 177 |
-@@ -10,7 +10,7 @@ resrc_OBJ := \ |
| 178 |
- |
| 179 |
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp |
| 180 |
- |
| 181 |
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua |
| 182 |
-+RESPACK := cd $(TOP)src/libresrc; luajit $(TOP)tools/respack.lua |
| 183 |
- |
| 184 |
- $(d)bitmap.cpp: $(d)bitmap.h |
| 185 |
- $(d)default_config.cpp: $(d)default_config.h |
| 186 |
-diff --git a/tools/Makefile b/tools/Makefile |
| 187 |
-index cbf985a..da1d3ef 100644 |
| 188 |
---- a/tools/Makefile |
| 189 |
-+++ b/tools/Makefile |
| 190 |
-@@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) |
| 191 |
- |
| 192 |
- PROGRAM += $(d)repack-thes-dict |
| 193 |
- |
| 194 |
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua |
| 195 |
-- |
| 196 |
- include $(TOP)Makefile.target |
| 197 |
-diff --git a/tools/respack.lua b/tools/respack.lua |
| 198 |
-index 1281ac2..35630a2 100755 |
| 199 |
---- a/tools/respack.lua |
| 200 |
-+++ b/tools/respack.lua |
| 201 |
-@@ -1,4 +1,4 @@ |
| 202 |
--#!../vendor/luajit/src/host/minilua |
| 203 |
-+#!/usr/bin/env luajit |
| 204 |
- -- Copyright (c) 2014, Thomas Goyne <plorkyeran@×××××××.org> |
| 205 |
- -- |
| 206 |
- -- Permission to use, copy, modify, and distribute this software for any |
Archives