commit: b662bea84ad0a98537120e7c026d7bacda471200 Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> AuthorDate: Mon Nov 2 17:53:05 2015 +0000 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> CommitDate: Mon Nov 2 17:53:05 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b662bea8
media-video/aegisub: update live ebuild Sync live ebuild with the latest versioned one aka 3.2.2. media-video/aegisub/aegisub-9999.ebuild | 91 ++++++++------ .../aegisub-9999-respect-user-compiler-flags.patch | 50 ++++++++ .../files/aegisub-9999-unbundle-luajit.patch | 134 +++++++++++++++++++++ 3 files changed, 238 insertions(+), 37 deletions(-) diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild index fb5c7ea..c678b5f 100644 --- a/media-video/aegisub/aegisub-9999.ebuild +++ b/media-video/aegisub/aegisub-9999.ebuild @@ -1,84 +1,101 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI=5 -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" +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" -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 vi zh_CN zh_TW" -inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils git-2 + +inherit autotools-utils fdo-mime gnome2-utils l10n toolchain-funcs wxwidgets git-2 DESCRIPTION="Advanced subtitle editor" HOMEPAGE="http://www.aegisub.org/"; -EGIT_REPO_URI="https://github.com/Aegisub/Aegisub.git"; +EGIT_REPO_URI="git://github.com/Aegisub/Aegisub.git" LICENSE="BSD" SLOT="0" KEYWORDS="" IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell" -REQUIRED_USE=" - || ( alsa openal oss portaudio pulseaudio ) -" - +# 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.4:2= + >=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?] - virtual/opengl - virtual/glu - >=media-libs/libass-0.10.0[fontconfig] + media-libs/fontconfig + media-libs/freetype + media-libs/libass[fontconfig] virtual/libiconv - >=dev-libs/boost-1.53.0:=[icu,nls,threads] - >=dev-libs/icu-4.8.1.1:= - >=media-libs/fontconfig-2.4.2 - >=media-libs/freetype-2.3.5:2 + virtual/opengl - alsa? ( >=media-libs/alsa-lib-1.0.16 ) - portaudio? ( =media-libs/portaudio-19* ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.5 ) + 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-1.2.2 ) - ffmpeg? ( >=media-libs/ffmpegsource-2.17:= ) - fftw? ( >=sci-libs/fftw-3.3 ) + spell? ( app-text/hunspell ) " DEPEND="${RDEPEND} oss? ( virtual/os-headers ) - >=sys-devel/gettext-0.18 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}/${PN}-3.2.2-fix-lua-regexp.patch" + "${FILESDIR}/${P}-unbundle-luajit.patch" + "${FILESDIR}/${P}-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() { - my_rm_loc() { - sed -i -e "s:${1}\.po::" po/Makefile || die + cp /usr/share/gettext/config.rpath . || die + + remove_locale() { rm "po/${1}.po" || die } l10n_find_plocales_changes 'po' '' '.po' - if [ -z "$(l10n_get_locales)" ]; then - sed -e 's/^\s*po\s*$//' -i Makefile || die - else - l10n_for_each_disabled_locale_do my_rm_loc - fi + l10n_for_each_disabled_locale_do remove_locale autotools-utils_src_prepare } src_configure() { - # testing openal does not work in sandbox, bug #508184 + # 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 openal) - $(use_with ffmpeg ffms2) - $(use_with fftw fftw3) $(use_with spell hunspell) - $(use_enable debug) ) autotools-utils_src_configure } diff --git a/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch new file mode 100644 index 0000000..ae1f5c1 --- /dev/null +++ b/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch @@ -0,0 +1,50 @@ +diff --git a/configure.ac b/configure.ac +index d0b5152..2609161 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -136,20 +136,17 @@ AS_IF([test x$build_darwin != xyes], [ + 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" ++ 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 08f9216..e2e5602 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-9999-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch new file mode 100644 index 0000000..4eea654 --- /dev/null +++ b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch @@ -0,0 +1,134 @@ +diff --git a/Makefile.inc.in b/Makefile.inc.in +index d1e1da4..aa26b81 100644 +--- a/Makefile.inc.in ++++ b/Makefile.inc.in +@@ -78,7 +78,7 @@ CFLAGS_ICONV = @ICONV_CFLAGS@ + CFLAGS_ICU = @ICU_I18N_CFLAGS@ + CFLAGS_LIBASS = @LIBASS_CFLAGS@ + CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@ +-CFLAGS_LUA = -I$(TOP)vendor/luajit/include ++CFLAGS_LUA = @LUAJIT_CFLAGS@ + CFLAGS_OPENAL = @OPENAL_CFLAGS@ + CFLAGS_OSS = @OSS_CFLAGS@ + CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@ +@@ -96,15 +96,11 @@ LIBS_ICONV = @ICONV_LIBS@ + LIBS_ICU = @ICU_UC_LIBS@ @ICU_I18N_LIBS@ + LIBS_LIBASS = @LIBASS_LIBS@ + LIBS_LIBPULSE = @LIBPULSE_LIBS@ +-LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a ++LIBS_LUA = @LUAJIT_LIBS@ + 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/configure.ac b/configure.ac +index d0b5152..ecec4de 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,6 +16,8 @@ m4_define([libpulse_required_version], [0.5]) + m4_define([pkgconfig_required_version], [0.20]) + m4_define([portaudio_required_version], [19]) + 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) + 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 +index 61c8ba1..050472d 100644 +--- a/header.mk ++++ b/header.mk +@@ -13,7 +13,6 @@ subdirs := \ + tests \ + tools \ + vendor/luabins \ +- vendor/luajit \ + vendor/universalchardet + + subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) +diff --git a/src/Makefile b/src/Makefile +index 08f9216..bb9233b 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 + $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CPPFLAGS_BOOST) + 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) + 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 \ + $(d)visual_feature.o \ +- $(LIBS_LUA) \ + $(TOP)lib/libaegisub.a \ + $(TOP)lib/libluabins.a \ + $(TOP)lib/libresrc.a \ +@@ -192,10 +192,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) +-$(d)auto4_lua.o_FLAGS := -I$(TOP)vendor/luajit/include +-$(d)auto4_lua_assfile.o_FLAGS := -I$(TOP)vendor/luajit/include +-$(d)auto4_lua_dialog.o_FLAGS := -I$(TOP)vendor/luajit/include +-$(d)auto4_lua_progresssink.o_FLAGS := -I$(TOP)vendor/luajit/include ++$(d)auto4_lua.o_FLAGS := $(CFLAGS_LUA) ++$(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 +--- 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 +--- a/tools/respack.lua ++++ b/tools/respack.lua +@@ -1,4 +1,4 @@ +-#!../vendor/luajit/src/host/minilua ++#!/usr/bin/env luajit + -- Copyright (c) 2014, Thomas Goyne <plorkye...@aegisub.org> + -- + -- Permission to use, copy, modify, and distribute this software for any
