Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 573990 | Differences between
and this patch

Collapse All | Expand All

(-)a/Makefile.inc.in (-6 / +2 lines)
Lines 78-84 CFLAGS_ICONV = @ICONV_CFLAGS@ Link Here
78
CFLAGS_ICU         = @ICU_I18N_CFLAGS@
78
CFLAGS_ICU         = @ICU_I18N_CFLAGS@
79
CFLAGS_LIBASS      = @LIBASS_CFLAGS@
79
CFLAGS_LIBASS      = @LIBASS_CFLAGS@
80
CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
80
CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
81
CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
81
CFLAGS_LUA         = @LUA_CFLAGS@
82
CFLAGS_OPENAL      = @OPENAL_CFLAGS@
82
CFLAGS_OPENAL      = @OPENAL_CFLAGS@
83
CFLAGS_OSS         = @OSS_CFLAGS@
83
CFLAGS_OSS         = @OSS_CFLAGS@
84
CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
84
CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
Lines 96-110 LIBS_ICONV = @ICONV_LIBS@ Link Here
96
LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
96
LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
97
LIBS_LIBASS        = @LIBASS_LIBS@
97
LIBS_LIBASS        = @LIBASS_LIBS@
98
LIBS_LIBPULSE      = @LIBPULSE_LIBS@
98
LIBS_LIBPULSE      = @LIBPULSE_LIBS@
99
LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
99
LIBS_LUA           = @LUA_LIBS@
100
LIBS_OPENAL        = @OPENAL_LIBS@
100
LIBS_OPENAL        = @OPENAL_LIBS@
101
LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
101
LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
102
LIBS_PTHREAD       = @PTHREAD_LIBS@
102
LIBS_PTHREAD       = @PTHREAD_LIBS@
103
103
104
ifeq (yes, $(BUILD_DARWIN))
105
LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit-aegisub.so
106
endif
107
108
FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
104
FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
109
105
110
#####################
106
#####################
(-)a/automation/Makefile (-2 / +2 lines)
Lines 12-20 DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_ Link Here
12
$(DESTDIR)$(P_DATA)/automation/%: $(d)%
12
$(DESTDIR)$(P_DATA)/automation/%: $(d)%
13
	$(MKDIR_INSTALL)
13
	$(MKDIR_INSTALL)
14
14
15
aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA)
15
aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a
16
aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
16
aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
17
aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU)
17
aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_LUA)
18
18
19
PROGRAM += $(d)aegisub-lua
19
PROGRAM += $(d)aegisub-lua
20
20
(-)a/configure.ac (+3 lines)
Lines 16-21 m4_define([libpulse_required_version], [0.5]) Link Here
16
m4_define([pkgconfig_required_version], [0.20])
16
m4_define([pkgconfig_required_version], [0.20])
17
m4_define([portaudio_required_version], [19])
17
m4_define([portaudio_required_version], [19])
18
m4_define([wx_required_version], [3.0.0])
18
m4_define([wx_required_version], [3.0.0])
19
# Same version as the bundled one
20
m4_define([lua_required_version], [5.1.5])
19
21
20
#######
22
#######
21
# Setup
23
# Setup
Lines 205-210 AC_SUBST(GL_LIBS) Link Here
205
PKG_CHECK_MODULES(FREETYPE, freetype2 >= freetype_required_version)
207
PKG_CHECK_MODULES(FREETYPE, freetype2 >= freetype_required_version)
206
PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version)
208
PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version)
207
PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version)
209
PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version)
210
PKG_CHECK_MODULES(LUA, lua >= lua_required_version)
208
211
209
FONTCONFIG_CONF_DIR=$($PKG_CONFIG --variable=confdir fontconfig)
212
FONTCONFIG_CONF_DIR=$($PKG_CONFIG --variable=confdir fontconfig)
210
AC_SUBST(FONTCONFIG_CONF_DIR)
213
AC_SUBST(FONTCONFIG_CONF_DIR)
(-)a/header.mk (-1 lines)
Lines 13-19 subdirs := \ Link Here
13
	tests \
13
	tests \
14
	tools \
14
	tools \
15
	vendor/luabins \
15
	vendor/luabins \
16
	vendor/luajit \
17
	vendor/universalchardet
16
	vendor/universalchardet
18
17
19
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
18
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
(-)a/src/Makefile (-6 / +6 lines)
Lines 6-12 src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui Link Here
6
	$(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU)
6
	$(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU)
7
src_CXXFLAGS := $(CXXFLAGS_WX)
7
src_CXXFLAGS := $(CXXFLAGS_WX)
8
src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
8
src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
9
	$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3)  $(LIBS_BOOST) $(LIBS_ICU)
9
	$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \
10
	$(LIBS_ICU) $(LIBS_LUA)
10
src_PCH := $(d)agi_pre.h
11
src_PCH := $(d)agi_pre.h
11
src_INSTALLNAME := $(AEGISUB_COMMAND)
12
src_INSTALLNAME := $(AEGISUB_COMMAND)
12
13
Lines 112-118 src_OBJ := \ Link Here
112
	$(d)video_provider_yuv4mpeg.o \
113
	$(d)video_provider_yuv4mpeg.o \
113
	$(d)video_slider.o \
114
	$(d)video_slider.o \
114
	$(d)visual_feature.o \
115
	$(d)visual_feature.o \
115
	$(LIBS_LUA) \
116
	$(TOP)lib/libaegisub.a \
116
	$(TOP)lib/libaegisub.a \
117
	$(TOP)lib/libluabins.a \
117
	$(TOP)lib/libluabins.a \
118
	$(TOP)lib/libresrc.a \
118
	$(TOP)lib/libresrc.a \
Lines 192-201 $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS) Link Here
192
$(d)subtitles_provider_libass.o_FLAGS   := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
192
$(d)subtitles_provider_libass.o_FLAGS   := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
193
$(d)text_file_reader.o_FLAGS            := -D_X86_
193
$(d)text_file_reader.o_FLAGS            := -D_X86_
194
$(d)video_provider_manager.o_FLAGS      := $(CFLAGS_FFMS2)
194
$(d)video_provider_manager.o_FLAGS      := $(CFLAGS_FFMS2)
195
$(d)auto4_lua.o_FLAGS                   := -I$(TOP)vendor/luajit/include
195
$(d)auto4_lua.o_FLAGS                   := $(CFLAGS_LUA)
196
$(d)auto4_lua_assfile.o_FLAGS           := -I$(TOP)vendor/luajit/include
196
$(d)auto4_lua_assfile.o_FLAGS           := $(CFLAGS_LUA)
197
$(d)auto4_lua_dialog.o_FLAGS            := -I$(TOP)vendor/luajit/include
197
$(d)auto4_lua_dialog.o_FLAGS            := $(CFLAGS_LUA)
198
$(d)auto4_lua_progresssink.o_FLAGS      := -I$(TOP)vendor/luajit/include
198
$(d)auto4_lua_progresssink.o_FLAGS      := $(CFLAGS_LUA)
199
199
200
$(src_OBJ): $(d)libresrc/bitmap.h $(d)libresrc/default_config.h
200
$(src_OBJ): $(d)libresrc/bitmap.h $(d)libresrc/default_config.h
201
201
(-)a/src/libresrc/Makefile (-1 / +1 lines)
Lines 10-16 resrc_OBJ := \ Link Here
10
10
11
$(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
11
$(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
12
12
13
RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
13
RESPACK := cd $(TOP)src/libresrc; lua $(TOP)tools/respack.lua
14
14
15
$(d)bitmap.cpp: $(d)bitmap.h
15
$(d)bitmap.cpp: $(d)bitmap.h
16
$(d)default_config.cpp: $(d)default_config.h
16
$(d)default_config.cpp: $(d)default_config.h
(-)a/tools/Makefile (-2 lines)
Lines 12-17 repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) Link Here
12
12
13
PROGRAM += $(d)repack-thes-dict
13
PROGRAM += $(d)repack-thes-dict
14
14
15
$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
16
17
include $(TOP)Makefile.target
15
include $(TOP)Makefile.target
(-)a/tools/respack.lua (-1 / +1 lines)
Lines 1-4 Link Here
1
#!../vendor/luajit/src/host/minilua
1
#!/usr/bin/env lua
2
-- Copyright (c) 2014, Thomas Goyne <plorkyeran@aegisub.org>
2
-- Copyright (c) 2014, Thomas Goyne <plorkyeran@aegisub.org>
3
--
3
--
4
-- Permission to use, copy, modify, and distribute this software for any
4
-- Permission to use, copy, modify, and distribute this software for any

Return to bug 573990