diff options
author | Nick White <git@njw.me.uk> | 2010-01-10 19:47:57 +0000 |
---|---|---|
committer | Nick White <git@njw.me.uk> | 2010-01-10 19:47:57 +0000 |
commit | d9acabe6f696a0e88be42cceae14d563b85edf33 (patch) | |
tree | fa2f9b940afff367ff6027a00f1e323c5f1149a0 /media-video/ffmpeg2theora/files | |
parent | 673640b358be5b0da0ac00a959a2e591125d85e7 (diff) | |
download | njw-gentoo-local-d9acabe6f696a0e88be42cceae14d563b85edf33.tar.bz2 njw-gentoo-local-d9acabe6f696a0e88be42cceae14d563b85edf33.zip |
Removed ffmpeg2theora ebuild (patch now in gentoo repo)
Diffstat (limited to 'media-video/ffmpeg2theora/files')
-rw-r--r-- | media-video/ffmpeg2theora/files/libkate.ebuild.patch | 39 | ||||
-rw-r--r-- | media-video/ffmpeg2theora/files/libkate.patch | 44 |
2 files changed, 0 insertions, 83 deletions
diff --git a/media-video/ffmpeg2theora/files/libkate.ebuild.patch b/media-video/ffmpeg2theora/files/libkate.ebuild.patch deleted file mode 100644 index 1c92aa2..0000000 --- a/media-video/ffmpeg2theora/files/libkate.ebuild.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- ffmpeg2theora-0.24.ebuild 2009-04-05 09:08:24.000000000 +0100 -+++ ffmpeg2theora-0.24.ebuild 2009-05-27 11:24:13.000000000 +0100 -@@ -13,7 +13,7 @@ SRC_URI="http://www.v2v.cc/~j/ffmpeg2the - LICENSE="GPL-2" - SLOT="0" - KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" --IUSE="" -+IUSE="kate" - - RDEPEND=" - || ( <media-video/ffmpeg-9999[vhook] -@@ -21,16 +21,24 @@ RDEPEND=" - >=media-libs/libvorbis-1.1 - >=media-libs/libogg-1.1 - >=media-libs/libtheora-1.0_beta1[encode] -- media-libs/libkate" -+ kate? ( media-libs/libkate )" - DEPEND="${RDEPEND} - dev-util/pkgconfig - >=dev-util/scons-1.0.0" - -+src_unpack() { -+ unpack ${A} -+ cd "${S}" -+ epatch "${FILESDIR}/libkate.patch" -+} -+ - src_compile() { -- scons APPEND_CFLAGS="${CFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}" || die "scons failed" -+ myconf="" -+ use kate || myconf="${myconf} libkate=no" -+ scons APPEND_CFLAGS="${CFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}" ${myconf} || die "scons failed" - } - - src_install() { -- scons destdir="${D}" prefix=/usr mandir=PREFIX/share/man install || die "install failed" -+ scons destdir="${D}" prefix=/usr mandir=PREFIX/share/man ${myconf} install || die "install failed" - dodoc AUTHORS ChangeLog README TODO || die - } diff --git a/media-video/ffmpeg2theora/files/libkate.patch b/media-video/ffmpeg2theora/files/libkate.patch deleted file mode 100644 index 0dcb0e1..0000000 --- a/media-video/ffmpeg2theora/files/libkate.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- SConstruct 2009-05-27 10:38:45.594552002 +0100 -+++ SConstruct 2009-05-27 10:41:13.091260241 +0100 -@@ -29,6 +29,7 @@ opts.AddOptions( - ('destdir', 'extra install time prefix', ''), - ('APPEND_CCFLAGS', 'Additional C/C++ compiler flags'), - ('APPEND_LINKFLAGS', 'Additional linker flags'), -+ BoolOption('libkate', 'enable libkate support', 1), - BoolOption('crossmingw', 'Set to 1 for crosscompile with mingw', 0) - ) - env = Environment(options = opts) -@@ -134,19 +135,20 @@ if conf.CheckCHeader('libavformat/frameh - ]) - - KATE_LIBS="oggkate" --if os.path.exists("./libkate/misc/pkgconfig"): -- os.environ['PKG_CONFIG_PATH'] = "./libkate/misc/pkgconfig:" + os.environ.get('PKG_CONFIG_PATH', '') --if os.path.exists("./libkate/pkg/pkgconfig"): -- os.environ['PKG_CONFIG_PATH'] = "./libkate/pkg/pkgconfig:" + os.environ.get('PKG_CONFIG_PATH', '') --if conf.CheckPKG(KATE_LIBS): -- ParsePKGConfig(env, KATE_LIBS) -- env.Append(CCFLAGS=['-DHAVE_KATE', '-DHAVE_OGGKATE']) --else: -- print """ -- Could not find libkate. Subtitles support will be disabled. -- You can also run ./get_libkate.sh (for more information see INSTALL) -- or update PKG_CONFIG_PATH to point to libkate's source folder -- """ -+if env['libkate']: -+ if os.path.exists("./libkate/misc/pkgconfig"): -+ os.environ['PKG_CONFIG_PATH'] = "./libkate/misc/pkgconfig:" + os.environ.get('PKG_CONFIG_PATH', '') -+ if os.path.exists("./libkate/pkg/pkgconfig"): -+ os.environ['PKG_CONFIG_PATH'] = "./libkate/pkg/pkgconfig:" + os.environ.get('PKG_CONFIG_PATH', '') -+ if conf.CheckPKG(KATE_LIBS): -+ ParsePKGConfig(env, KATE_LIBS) -+ env.Append(CCFLAGS=['-DHAVE_KATE', '-DHAVE_OGGKATE']) -+ else: -+ print """ -+ Could not find libkate. Subtitles support will be disabled. -+ You can also run ./get_libkate.sh (for more information see INSTALL) -+ or update PKG_CONFIG_PATH to point to libkate's source folder -+ """ - env = conf.Finish() - - # ffmpeg2theora |