gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

media-video/aegisub: remove old.

Browse Source 
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3420
This commit is contained in:
Ilya Tumaykin
2017-01-10 19:20:23 +03:00
committed by Patrice Clement
parent 980810e3f0
commit 9a5986cbb3
6 changed files with 0 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media-video/aegisub/Manifest
View File

@@ -1,2 +1 @@
DIST aegisub-3.2.2.tar.xz 5252052 SHA256 c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885 SHA512 54f825e52f238fef8d5cc31c37436e21355aee27883347f905271e5d2a8ff2a77e1b67d5aef38b0f8468bd0bad851fe944e02de27ec96310b902fbe5b1086722 WHIRLPOOL fe948edbb01f11385e14d1912b73942605df18325fcd95f4284a3c2edb73778d90d73038ac4a062e211fd56879590040e3c558fe1e361ec9fe2eee6a5c016448
DIST aegisub-3.2.2_p20160518.tar.gz 7438734 SHA256 744318ce8be1afb21fbd6b0ce6d407a6f42c442db0df10c7cf89692a5bc8ca31 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6 WHIRLPOOL 0d46799009c72cac1d6df89f4ffe5110d904e671175380e20605683b6a2f3ccdd46855cf98ebac8f0088c7a928b82547557afc8214b2fce85aed759aa5e9e4ab

119
media-video/aegisub/aegisub-3.2.2.ebuild
View File

@@ -1,119 +0,0 @@
# 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 gnome2-utils l10n toolchain-funcs 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
>=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}/${PV}/${P}-fix-lua-regexp.patch"
"${FILESDIR}/${PV}/${P}-unbundle-luajit.patch"
"${FILESDIR}/${PV}/${P}-add-missing-pthread-flags.patch"
"${FILESDIR}/${PV}/${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() {
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
}

43
media-video/aegisub/files/3.2.2/aegisub-3.2.2-add-missing-pthread-flags.patch
View File

@@ -1,43 +0,0 @@
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
+++ b/Makefile.inc.in
@@ -99,7 +99,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
ifeq (yes, $(BUILD_DARWIN))
LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
diff --git a/libaegisub/Makefile b/libaegisub/Makefile
index 64204ef..178044d 100644
--- a/libaegisub/Makefile
+++ 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
index 81bcef3..d9f64b8 100644
--- a/tools/Makefile
+++ 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

15
media-video/aegisub/files/3.2.2/aegisub-3.2.2-fix-lua-regexp.patch
View File

@@ -1,15 +0,0 @@
http://devel.aegisub.org/ticket/1898
diff --git a/tools/respack.lua b/tools/respack.lua
index 85955d1..1281ac2 100755
--- a/tools/respack.lua
+++ b/tools/respack.lua
@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
for line in manifest:lines() do
if line:find('.') then
local file = try_open(path..line, 'rb')
- local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
+ local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
out_cpp:write("const unsigned char " .. id .. "[] = {")
local len = 0

53
media-video/aegisub/files/3.2.2/aegisub-3.2.2-respect-user-compiler-flags.patch
View File

@@ -1,53 +0,0 @@
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
+++ 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"
+ 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

152
media-video/aegisub/files/3.2.2/aegisub-3.2.2-unbundle-luajit.patch
View File

@@ -1,152 +0,0 @@
http://devel.aegisub.org/ticket/1904
diff --git a/Makefile.inc.in b/Makefile.inc.in
index c93b9dc..ae018c3 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/automation/Makefile b/automation/Makefile
index 45a5ce2..db51a61 100644
--- a/automation/Makefile
+++ b/automation/Makefile
@@ -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
+++ 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.3])
#######
# Setup
@@ -205,6 +207,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 60d7101..1d4779c 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)
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 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
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 <plorkyeran@aegisub.org>
--
-- Permission to use, copy, modify, and distribute this software for any