From 9b3ff52664e5ddda63f2a0ddfb243fb69bb02d25 Mon Sep 17 00:00:00 2001 From: Ilya Tumaykin Date: Wed, 10 Feb 2016 20:00:15 +0300 Subject: 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 --- media-video/aegisub/aegisub-3.2.2-r1.ebuild | 119 +++++++++++++++++++++ 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, 192 insertions(+), 23 deletions(-) create mode 100644 media-video/aegisub/aegisub-3.2.2-r1.ebuild create mode 100644 media-video/aegisub/files/aegisub-3.2.2-r1-respect-user-compiler-flags.patch diff --git a/media-video/aegisub/aegisub-3.2.2-r1.ebuild b/media-video/aegisub/aegisub-3.2.2-r1.ebuild new file mode 100644 index 000000000000..79bc20d66c93 --- /dev/null +++ b/media-video/aegisub/aegisub-3.2.2-r1.ebuild @@ -0,0 +1,119 @@ +# 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" + +inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets + +DESCRIPTION="Advanced subtitle editor" +HOMEPAGE="http://www.aegisub.org/" +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="~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.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?] + media-libs/fontconfig + media-libs/freetype + media-libs/libass[fontconfig] + 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:= ) + + 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 ) +" + +# aegisub also 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}-fix-lua-regexp.patch" + "${FILESDIR}/${P}-unbundle-luajit.patch" + "${FILESDIR}/${P}-add-missing-pthread-flags.patch" + "${FILESDIR}/${PF}-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() { + cp /usr/share/gettext/config.rpath . || die + + remove_locale() { + rm "po/${1}.po" || 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-update-checker + $(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) + ) + 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/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild index e554a3d47cd1..2d5050e6845a 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 ed45de7a9bd3..a5a6fc016891 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 a05ed2d65125..e3b620b4b714 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 000000000000..7c018321e7ff --- /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 ff033cb969e7..ec561b23ce46 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 -- cgit v1.2.3-65-gdbad From 3c8ea82d5159978f7b5de17d43fff3cfb5ddc512 Mon Sep 17 00:00:00 2001 From: Ilya Tumaykin Date: Wed, 10 Feb 2016 20:04:30 +0300 Subject: 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 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 @@ -- cgit v1.2.3-65-gdbad From bb7d025fe33277e5b32e795201dbfb2b0469d133 Mon Sep 17 00:00:00 2001 From: Ilya Tumaykin Date: Wed, 10 Feb 2016 20:10:34 +0300 Subject: 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 a5a6fc016891..d119409b4af4 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 e3b620b4b714..4d2050c66263 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 7c018321e7ff..517898303e53 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 3cb268615b3b..eeeeab3cb9e8 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 ec561b23ce46..c301b37b2749 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 720211afb507..920989a01843 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 3fa914377fd4..c7e3e949325c 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 -- cgit v1.2.3-65-gdbad From fb6f9253c8ca8e564ed0bbc9f4d740e6bab57874 Mon Sep 17 00:00:00 2001 From: Ilya Tumaykin Date: Wed, 10 Feb 2016 20:13:56 +0300 Subject: media-video/aegisub: add uchardet USE to 9999 Package-Manager: portage-2.2.27 --- media-video/aegisub/aegisub-9999.ebuild | 4 +++- media-video/aegisub/metadata.xml | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild index 2d5050e6845a..8c24de933892 100644 --- a/media-video/aegisub/aegisub-9999.ebuild +++ b/media-video/aegisub/aegisub-9999.ebuild @@ -18,7 +18,7 @@ EGIT_REPO_URI="git://github.com/Aegisub/Aegisub.git" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell" +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-2010 yy. @@ -43,6 +43,7 @@ RDEPEND=" fftw? ( >=sci-libs/fftw-3.3:= ) spell? ( app-text/hunspell ) + uchardet? ( dev-libs/uchardet ) " DEPEND="${RDEPEND} oss? ( virtual/os-headers ) @@ -96,6 +97,7 @@ src_configure() { $(use_with portaudio) $(use_with pulseaudio libpulse) $(use_with spell hunspell) + $(use_with uchardet) ) autotools-utils_src_configure } diff --git a/media-video/aegisub/metadata.xml b/media-video/aegisub/metadata.xml index 839775721edf..6c63e45b7444 100644 --- a/media-video/aegisub/metadata.xml +++ b/media-video/aegisub/metadata.xml @@ -13,6 +13,9 @@ proxy-maint@gentoo.org Proxy Maintainers + + Enable charset discovery via dev-libs/uchardet + Aegisub/Aegisub -- cgit v1.2.3-65-gdbad