summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2007-12-07 17:43:22 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2007-12-07 17:43:22 +0000
commit4a83ccae86e6b3e56cfb3c20ae2d1810f085ea23 (patch)
tree2f8baccbba2f111a34a962d40c03577380ab03c0 /media-video/avidemux
parentremove bin-detex and bin-dialog texmf modules, they dont install anything tha... (diff)
downloadhistorical-4a83ccae86e6b3e56cfb3c20ae2d1810f085ea23.tar.gz
historical-4a83ccae86e6b3e56cfb3c20ae2d1810f085ea23.tar.bz2
historical-4a83ccae86e6b3e56cfb3c20ae2d1810f085ea23.zip
Remove unused version.
Package-Manager: portage-2.1.4_rc7
Diffstat (limited to 'media-video/avidemux')
-rw-r--r--media-video/avidemux/Manifest28
-rw-r--r--media-video/avidemux/avidemux-2.3.0.ebuild120
-rw-r--r--media-video/avidemux/files/avidemux-2.3.0-amprogas.patch10
-rw-r--r--media-video/avidemux/files/avidemux-2.3.0-configure.patch214
-rw-r--r--media-video/avidemux/files/avidemux-2.3.0-dts.patch10
-rw-r--r--media-video/avidemux/files/avidemux-2.3.0-po.makefile.patch12
-rw-r--r--media-video/avidemux/files/avidemux-2.3.0-twolame.patch115
-rw-r--r--media-video/avidemux/files/digest-avidemux-2.3.03
8 files changed, 0 insertions, 512 deletions
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 681998fe57e5..244bff2b1ac4 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,23 +1,3 @@
-AUX avidemux-2.3.0-amprogas.patch 284 RMD160 8c7c44296339f7f4fbae3d629d3e38cf63432756 SHA1 53127b1d07f7d8ceb04d7b92150f499234c4f06d SHA256 b93520061994ba223dede420a597fd3ba999021006893b3100e16649d41957d5
-MD5 5e03fe5ad0e79f4a000cfbafdf28e1a6 files/avidemux-2.3.0-amprogas.patch 284
-RMD160 8c7c44296339f7f4fbae3d629d3e38cf63432756 files/avidemux-2.3.0-amprogas.patch 284
-SHA256 b93520061994ba223dede420a597fd3ba999021006893b3100e16649d41957d5 files/avidemux-2.3.0-amprogas.patch 284
-AUX avidemux-2.3.0-configure.patch 5816 RMD160 8fc9492fa808725e7c10e412a9fc0cc465240113 SHA1 c54df33c712e93b6ec48fb19ab8e17f48baaa5c7 SHA256 f1b880316b4dfbe784f32f7135bc6b5529ce64e283d5a330c02d588bf973f74b
-MD5 267f172131678e6ed36717f634fd1c63 files/avidemux-2.3.0-configure.patch 5816
-RMD160 8fc9492fa808725e7c10e412a9fc0cc465240113 files/avidemux-2.3.0-configure.patch 5816
-SHA256 f1b880316b4dfbe784f32f7135bc6b5529ce64e283d5a330c02d588bf973f74b files/avidemux-2.3.0-configure.patch 5816
-AUX avidemux-2.3.0-dts.patch 275 RMD160 474435e6a459ac626e02c4937f1552a982a37707 SHA1 fe534384d3b4d5455716aa80888e79c88d6bdff6 SHA256 075e602335f8cbe8a1128538a169def1f9f63d780319a15cc595de090aa61448
-MD5 d159311005a9646a9cdcc39d186b3259 files/avidemux-2.3.0-dts.patch 275
-RMD160 474435e6a459ac626e02c4937f1552a982a37707 files/avidemux-2.3.0-dts.patch 275
-SHA256 075e602335f8cbe8a1128538a169def1f9f63d780319a15cc595de090aa61448 files/avidemux-2.3.0-dts.patch 275
-AUX avidemux-2.3.0-po.makefile.patch 750 RMD160 2d8faa77bb8c4c670b6aee925451282b097aa916 SHA1 a839177d55f7567702737bcd35225e0e2ae8ec8b SHA256 589f5c71f6a740a315d9da05f4ee004e74b04867c0206cff6e7c5c7e572a1615
-MD5 bf3b3bc7f5684849698077e2a0188c05 files/avidemux-2.3.0-po.makefile.patch 750
-RMD160 2d8faa77bb8c4c670b6aee925451282b097aa916 files/avidemux-2.3.0-po.makefile.patch 750
-SHA256 589f5c71f6a740a315d9da05f4ee004e74b04867c0206cff6e7c5c7e572a1615 files/avidemux-2.3.0-po.makefile.patch 750
-AUX avidemux-2.3.0-twolame.patch 4048 RMD160 45e4b1333cdc56934e73758a16ffb54ea2b81cad SHA1 ec8d4039a5b85f23484f981e68e71cfb0324825f SHA256 6c8a7b58882417536645611d75584145960a7b2dd499083ab24220f909c30ac8
-MD5 12783df6f9e5d7d6a00aba4f9dadc860 files/avidemux-2.3.0-twolame.patch 4048
-RMD160 45e4b1333cdc56934e73758a16ffb54ea2b81cad files/avidemux-2.3.0-twolame.patch 4048
-SHA256 6c8a7b58882417536645611d75584145960a7b2dd499083ab24220f909c30ac8 files/avidemux-2.3.0-twolame.patch 4048
AUX avidemux-2.4_pre3-i18n.patch 1748 RMD160 e5ef386c325091268d2222be9606284d4d63de0f SHA1 122ccad94d82648c7f01aabe8d2dc5ac2ef27d66 SHA256 4f5ce419edc37f9d7ee0d6d55376eed55e4662775db3fdf9ab0885dfe1a064e3
MD5 7d95abd45babe5a8eca7e9202c4f1261 files/avidemux-2.4_pre3-i18n.patch 1748
RMD160 e5ef386c325091268d2222be9606284d4d63de0f files/avidemux-2.4_pre3-i18n.patch 1748
@@ -26,12 +6,7 @@ AUX avidemux-2.4_pre3-libdca.patch 1029 RMD160 5b792477656c2864711d16574e4134c85
MD5 2abe84b084d8eb2ee4166e86bafae7d8 files/avidemux-2.4_pre3-libdca.patch 1029
RMD160 5b792477656c2864711d16574e4134c8573daec0 files/avidemux-2.4_pre3-libdca.patch 1029
SHA256 81a460a306c469771ab4ae9b3a2c5f97dc61cb738aad19e1a71a93d952b55e1a files/avidemux-2.4_pre3-libdca.patch 1029
-DIST avidemux_2.3.0.tar.gz 4750919 RMD160 1e10183d4b80104a42d40bfd9d9e9b5c54843d9e SHA1 40a51db22593d910224dac91b512489a6af499fb SHA256 ef083ab24e3ec612b10c8a0163845ff680fea845d5eade21d60d47e843b4c623
DIST avidemux_2.4_preview3.tar.gz 5715054 RMD160 034386aabeec3530bc38b3d0e3e31f324d923fb5 SHA1 c780cedfc3e7fe45860780cc57c7f29b5245ba24 SHA256 9f96a266dbb3dc8ca44545f1778616e436f879053904c9f751a271ae7b95d09f
-EBUILD avidemux-2.3.0.ebuild 3374 RMD160 fad4576a9c425971550e95d9b583b5b11ad983d4 SHA1 8b43c548e606171aaae2b3cf189f7453501888bf SHA256 04bb9ebf92137ccb660aaae601fc841183899c51e823826aca0e874c45112aec
-MD5 c17116df34728e1130e2aa2baa02106e avidemux-2.3.0.ebuild 3374
-RMD160 fad4576a9c425971550e95d9b583b5b11ad983d4 avidemux-2.3.0.ebuild 3374
-SHA256 04bb9ebf92137ccb660aaae601fc841183899c51e823826aca0e874c45112aec avidemux-2.3.0.ebuild 3374
EBUILD avidemux-2.4_pre3.ebuild 3394 RMD160 961ffba3a148682a25d8bf09d61e40a67b50eb8e SHA1 a3775ed216a85778f79623e1816f4a3625287430 SHA256 48ac71a984def772e5d21bddf18180ccd10782fe616d3614183dbd558c2449a9
MD5 e695080c605e3b7172e1fed7bc58095c avidemux-2.4_pre3.ebuild 3394
RMD160 961ffba3a148682a25d8bf09d61e40a67b50eb8e avidemux-2.4_pre3.ebuild 3394
@@ -44,9 +19,6 @@ MISC metadata.xml 318 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 SHA1 b9cd3
MD5 d5c5ccb29604d60b3222d8d620b9a55e metadata.xml 318
RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 metadata.xml 318
SHA256 4379b50013e723e18c04e42b0750112cb17af07b82a7b0e3b7aa32bd502124ba metadata.xml 318
-MD5 fda1590238aeae5793a212a88836635b files/digest-avidemux-2.3.0 247
-RMD160 e6bc5a151861e06a0df2a5d143d03d200472c55e files/digest-avidemux-2.3.0 247
-SHA256 9e7c104e7929ebe25b34ce8c772b4c888865242eb143abddc5f4cd77e0357e4d files/digest-avidemux-2.3.0 247
MD5 591e880ea2e489006a61135717fc4e49 files/digest-avidemux-2.4_pre3 268
RMD160 3800c9dcba4847b9833235d8c914492a8a5ebcf1 files/digest-avidemux-2.4_pre3 268
SHA256 3f70e0f6247bef733d54a6a888ea36449e642777efad8b88b9d2c075bb521179 files/digest-avidemux-2.4_pre3 268
diff --git a/media-video/avidemux/avidemux-2.3.0.ebuild b/media-video/avidemux/avidemux-2.3.0.ebuild
deleted file mode 100644
index e7512234ed59..000000000000
--- a/media-video/avidemux/avidemux-2.3.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.3.0.ebuild,v 1.10 2007/11/27 11:57:23 zzam Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils flag-o-matic subversion autotools
-
-MY_P=${PN}_${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Great Video editing/encoding tool"
-HOMEPAGE="http://fixounet.free.fr/avidemux/"
-SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="a52 aac alsa altivec arts encode esd mad nls vorbis sdl truetype x264 xvid xv oss"
-
-RDEPEND="
- >=x11-libs/gtk+-2.6
- >=dev-libs/libxml2-2.6.7
- >=dev-lang/spidermonkey-1.5-r2
- >=media-sound/twolame-0.3.6
- a52? ( >=media-libs/a52dec-0.7.4 )
- encode? ( >=media-sound/lame-3.93 )
- aac? ( >=media-libs/faac-1.23.5
- >=media-libs/faad2-2.0-r7 )
- esd? ( media-sound/esound )
- mad? ( media-libs/libmad )
- xvid? ( >=media-libs/xvid-1.0.0 )
- x264? ( media-libs/x264-svn )
- nls? ( >=sys-devel/gettext-0.12.1 )
- vorbis? ( >=media-libs/libvorbis-1.0.1 )
- arts? ( >=kde-base/arts-1.2.3 )
- truetype? ( >=media-libs/freetype-2.1.5 )
- alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
- sdl? ( media-libs/libsdl )
- xv? ( x11-libs/libXv )
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender"
-
-DEPEND="$RDEPEND
- x11-base/xorg-server
- x11-libs/libXt
- x11-proto/xextproto
- dev-util/pkgconfig"
-
-pkg_setup() {
- filter-flags "-fno-default-inline"
- filter-flags "-funroll-loops"
- filter-flags "-funroll-all-loops"
- filter-flags "-fforce-addr"
-
- if ! built_with_use dev-lang/spidermonkey threadsafe; then
- eerror "dev-lang/spidermonkey is missing threadsafe support, please"
- eerror "enable the threadsafe USE flag and re-emerge"
- eerror "dev-lang/spidermonkey - this avidemux build will not compile"
- eerror "nor work without it!"
- die "dev-lang/spidermonkey needs threadsafe support"
- fi
-
- if ! ( use oss || use arts || use alsa ); then
- eerror "You must select at least one between oss, arts and alsa audio output."
- die "Fix USE flags"
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-dts.patch"
- epatch "${FILESDIR}/${P}-configure.patch"
- epatch "${FILESDIR}/${P}-po.makefile.patch"
- epatch "${FILESDIR}/${P}-amprogas.patch"
- epatch "${FILESDIR}/${P}-twolame.patch"
-
- AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
- econf \
- $(use_enable nls) \
- $(use_enable altivec) \
- $(use_enable xv) \
- $(use_with arts) \
- $(use_with alsa) \
- $(use_with esd) \
- $(use_with oss) \
- $(use_with vorbis) \
- $(use_with sdl libsdl) \
- $(use_with truetype freetype2) \
- $(use_with aac faac) $(use_with aac faad2) \
- $(use_with encode lame) \
- --with-extern-twolame \
- --with-newfaad --with-jsapi-include=/usr/include/js \
- --disable-warnings --disable-dependency-tracking \
- ${myconf} || die "configure failed"
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog History README TODO
- insinto /usr/share/pixmaps
- newins "${S}"/avidemux_icon.png avidemux.png
- make_desktop_entry avidemux2 "Avidemux2" avidemux.png
-}
-
-pkg_postinst() {
- if use ppc && use oss; then
- elog ""
- elog "OSS sound output may not work on ppc"
- elog "If your hear only static noise, try"
- elog "changing the sound device to ALSA or arts"
- fi
-}
diff --git a/media-video/avidemux/files/avidemux-2.3.0-amprogas.patch b/media-video/avidemux/files/avidemux-2.3.0-amprogas.patch
deleted file mode 100644
index 3bb508a0bf21..000000000000
--- a/media-video/avidemux/files/avidemux-2.3.0-amprogas.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in.old 2007-02-02 15:47:59.000000000 +0100
-+++ configure.in 2007-02-02 15:48:40.000000000 +0100
-@@ -54,6 +54,7 @@
- AC_PROG_RANLIB
- AC_PROG_CXX
- AC_PROG_LIBTOOL
-+AM_PROG_AS
- dnl without this order in this file, automake will be confused!
- dnl
- AM_CONFIG_HEADER(config.h)
diff --git a/media-video/avidemux/files/avidemux-2.3.0-configure.patch b/media-video/avidemux/files/avidemux-2.3.0-configure.patch
deleted file mode 100644
index 702aa959bf8c..000000000000
--- a/media-video/avidemux/files/avidemux-2.3.0-configure.patch
+++ /dev/null
@@ -1,214 +0,0 @@
---- avidemux_2.3_preview2/configure.in.old 2006-10-26 21:18:36.453792624 +0200
-+++ avidemux_2.3_preview2/configure.in 2006-10-26 22:41:06.403158349 +0200
-@@ -196,7 +196,7 @@
- have_divx=yes
- have_little_endian=yes
- have_vorbis=yes
--have_ac3=yes
-+have_ac3=no
- have_xx_xvid=yes
- have_xx_xvid_cvs=yes
- have_xvid4=yes
-@@ -270,6 +270,16 @@
-
- dnl __________________divx______________
- dnl __________________x264 ______________
-+AC_ARG_WITH([aften],
-+ AC_HELP_STRING([--without-aften], [Force compilation without aften (default: test)]),
-+ [with_aften=${withval}], [with_aften=test])
-+
-+AC_MSG_CHECKING([if aften support is requested])
-+AC_MSG_RESULT($with_aften)
-+
-+have_aften=no
-+
-+if test "x$with_aften" != "xno"; then
- AC_MSG_CHECKING(for aften codec )
- AC_CHECK_HEADER(aften/aften.h,,have_aften=no)
- if test "x$have_aften" = "xyes"; then
-@@ -277,22 +287,42 @@
- fi
- if test "x$have_aften" = "xyes"; then
- AC_DEFINE(USE_AFTEN,1,[use aften ac3 encoder])
-+ have_ac3=yes
-+fi
- fi
--
-
- dnl __________________x264 ______________
-+AC_ARG_WITH([x264],
-+ AC_HELP_STRING([--without-x264], [Force compilation without x264 (default: test)]),
-+ [with_x264=${withval}], [with_x264=test])
-+
-+AC_MSG_CHECKING([if x264 support is requested])
-+AC_MSG_RESULT($with_x264)
-+
-+have_x264=no
-+
-+if test "x$with_x264" != "xno"; then
- AC_MSG_CHECKING(for x264 codec )
--AC_CHECK_HEADER(x264.h,,have_x264=no)
--if test "x$have_x264" = "xyes"; then
-+AC_CHECK_HEADER(x264.h,have_x264=yes,have_x264=no)
- AC_CHECK_LIB(x264,x264_encoder_open,,have_x264=no,-lm )
--fi
- if test "x$have_x264" = "xyes"; then
- AC_DEFINE(USE_X264,1,[use x264 encoder])
- fi
-+fi
-
- dnl __________________xvid 0.9 ______________
-+AC_ARG_WITH([xx-xvid],
-+ AC_HELP_STRING([--without-xx-xvid], [Force compilation without xvid 0.9 (default: test)]),
-+ [with_xx_xvid=${withval}], [with_xx_xvid=test])
-+
-+AC_MSG_CHECKING([if xvid 0.9 support is requested])
-+AC_MSG_RESULT($with_xx_xvid)
-+
-+have_xx_xvid=no
-+
-+if test "x$with_xx_xvid" != "xno"; then
- AC_MSG_CHECKING(for xvid codec 0.9)
--AC_CHECK_HEADER(xvid.h,,have_xx_xvid=no)
-+AC_CHECK_HEADER(xvid.h,have_xx_xvid=yes,have_xx_xvid=no)
-
- dnl -- check API version 2.1 and not 2.0--
-
-@@ -318,16 +348,38 @@
- if test "x$have_xx_xvid" = "xyes"; then
- AC_DEFINE(USE_XX_XVID,1,[use xvid api])
- fi
-+ fi
- dnl __________________libpng ______________
-+AC_ARG_WITH([png],
-+ AC_HELP_STRING([--without-png], [Force compilation without png support (default: test)]),
-+ [with_png=${withval}], [with_png=test])
-+
-+AC_MSG_CHECKING([if PNG support is requested])
-+AC_MSG_RESULT($with_png)
-+
-+have_png=no
-+
-+if test "x$with_png" != "xno"; then
- AC_MSG_CHECKING(for libpng )
--have_png=yes
--AC_CHECK_HEADER(png.h,,have_png=no)
-+AC_CHECK_HEADER(png.h,have_png=yes,have_png=no)
- AC_CHECK_LIB(png,png_malloc,,have_png=no)
-
- if test "x$have_png" = "xyes"; then
- AC_DEFINE(USE_PNG,1,[Png is available])
- fi
-+fi
- dnl __________________xvid 1.0 ______________
-+AC_ARG_WITH([xvid4],
-+ AC_HELP_STRING([--without-xvid4], [Force compilation without xvid4 support (default: test)]),
-+ [with_xvid4=${withval}], [with_xvid4=test])
-+
-+AC_MSG_CHECKING([if Xvid 4 support is requested])
-+AC_MSG_RESULT($with_xvid4)
-+
-+have_xvid4=no
-+
-+if test "x$with_xvid4" != "xno"; then
-+have_xvid4=yes
- AC_MSG_CHECKING(for xvid codec 1.0)
- AC_CHECK_HEADER(xvid.h,,have_xvid4=no)
-
-@@ -353,6 +405,7 @@
- AC_DEFINE(USE_XVID_4,1,[use xvid api 1.0 beta])
- fi
- fi
-+ fi
-
- dnl __________________FFMPEG______________
-
-@@ -486,6 +539,17 @@
- fi
-
- dnl __________________ALSA______________
-+AC_ARG_WITH([alsa],
-+ AC_HELP_STRING([--without-alsa], [Force compilation without alsa (default: test)]),
-+ [with_alsa=${withval}], [with_alsa=test])
-+
-+AC_MSG_CHECKING([if alsa support is requested])
-+AC_MSG_RESULT($with_alsa)
-+
-+have_alsa=no
-+
-+if test "x$with_alsa" != "xno"; then
-+have_alsa=yes
- AC_MSG_CHECKING(for ALSA audio support)
- AC_CHECK_HEADERS(alsa/asoundlib.h,,have_alsa=no)
- dnl check version 0.9.x
-@@ -526,7 +590,7 @@
- if test "x$have_alsa_1" = "xyes"; then
- AC_DEFINE(ALSA_1_0_SUPPORT,1,"[Alsa is 1.0]")
- fi
--
-+fi
- dnl __________________/ALSA______________
-
-
-@@ -646,6 +710,16 @@
-
-
- dnl ____________ faac ?________________
-+AC_ARG_WITH([faac],
-+ AC_HELP_STRING([--without-faac], [Force compilation without faac (default: test)]),
-+ [with_faac=${withval}], [with_faac=test])
-+
-+AC_MSG_CHECKING([if faac support is requested])
-+AC_MSG_RESULT($with_faac)
-+
-+have_faac=no
-+
-+if test "x$with_faac" != "xno"; then
- have_faac=yes
- AC_CHECK_HEADERS(faac.h,,have_faac=no)
-
-@@ -659,15 +733,35 @@
- fi
- AC_MSG_CHECKING(faac library)
- AC_MSG_RESULT($have_faac)
--
-+ fi
- dnl _______________/faac_______________
- dnl _________________ /freetype 2 _________________
- dnl __________________ac3______________
- dnl
- dnl a52dec decoding library
-+AC_ARG_WITH([a52],
-+ AC_HELP_STRING([--without-a52], [Force compilation without a52 (default: enabled)]),
-+ [with_a52=${withval}], [with_a52=test])
-+
-+AC_MSG_CHECKING([if a52 support is requested])
-+AC_MSG_RESULT($with_a52)
-+
-+if test "x$with_a52" != "xno"; then
- AC_DEFINE(USE_AC3,1,[liba52dec])
-+have_ac3=yes
-+fi
- dnl __________________/ac3______________
- dnl __________________VORBIS______________
-+AC_ARG_WITH([vorbis],
-+ AC_HELP_STRING([--without-vorbis], [Force compilation without vorbis (default: enabled)]),
-+ [with_vorbis=${withval}], [with_vorbis=test])
-+
-+AC_MSG_CHECKING([if vorbis support is requested])
-+AC_MSG_RESULT($with_vorbis)
-+
-+have_vorbis=no
-+if test "x$with_vorbis" != "xno"; then
-+have_vorbis=yes
- AC_CHECK_LIB(vorbis,vorbis_info_init,,have_vorbis=no, -lm)
- if test "x$have_vorbis" = "xyes"; then
- AC_CHECK_LIB(vorbisenc,vorbis_encode_init,,have_vorbis=no, -lm)
-@@ -678,6 +772,7 @@
- fi
- fi
- fi
-+fi
- dnl __________________/VORBIS______________
-
- dnl __________________LAME______________
diff --git a/media-video/avidemux/files/avidemux-2.3.0-dts.patch b/media-video/avidemux/files/avidemux-2.3.0-dts.patch
deleted file mode 100644
index bdc9cc412a77..000000000000
--- a/media-video/avidemux/files/avidemux-2.3.0-dts.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- avidemux/ADM_audiocodec/ADM_dca.cpp.old 2006-05-23 21:25:58.000000000 -0400
-+++ avidemux/ADM_audiocodec/ADM_dca.cpp 2006-05-23 21:26:15.000000000 -0400
-@@ -31,7 +31,6 @@
- extern "C"
- {
- #include "dts.h"
--#include "dts_internal.h"
-
- }
- #include "ADM_audio/ADM_dcainfo.h"
diff --git a/media-video/avidemux/files/avidemux-2.3.0-po.makefile.patch b/media-video/avidemux/files/avidemux-2.3.0-po.makefile.patch
deleted file mode 100644
index 677b30118601..000000000000
--- a/media-video/avidemux/files/avidemux-2.3.0-po.makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -N -u -r avidemux_2.2_preview2-old/po/Makefile.in.in avidemux_2.2_preview2/po/Makefile.in.in
---- avidemux_2.2_preview2-old/po/Makefile.in.in 2006-08-26 19:06:27.631751295 +0200
-+++ avidemux_2.2_preview2/po/Makefile.in.in 2006-08-26 19:07:30.397921873 +0200
-@@ -68,7 +68,7 @@
- @lang=`echo $* | sed -e 's,.*/,,'`; \
- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
-- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
-+ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po
-
- .sin.sed:
- sed -e '/^#/d' $< > t-$@
diff --git a/media-video/avidemux/files/avidemux-2.3.0-twolame.patch b/media-video/avidemux/files/avidemux-2.3.0-twolame.patch
deleted file mode 100644
index 0b16d5aa06ad..000000000000
--- a/media-video/avidemux/files/avidemux-2.3.0-twolame.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -u -r avidemux_2.3.0.old/avidemux/ADM_audiofilter/audioencoder_twolame.cpp avidemux_2.3.0/avidemux/ADM_audiofilter/audioencoder_twolame.cpp
---- avidemux_2.3.0.old/avidemux/ADM_audiofilter/audioencoder_twolame.cpp 2007-02-03 23:41:05.000000000 +0100
-+++ avidemux_2.3.0/avidemux/ADM_audiofilter/audioencoder_twolame.cpp 2007-02-03 23:41:19.000000000 +0100
-@@ -30,7 +30,7 @@
-
- extern "C"
- {
--#include "libtoolame/twolame.h"
-+#include <twolame.h>
- }
- #include "ADM_toolkit/ADM_debugID.h"
- #define MODULE_NAME MODULE_AUDIO_FILTER
-diff -u -r avidemux_2.3.0.old/avidemux/Makefile.am avidemux_2.3.0/avidemux/Makefile.am
---- avidemux_2.3.0.old/avidemux/Makefile.am 2007-02-03 23:41:05.000000000 +0100
-+++ avidemux_2.3.0/avidemux/Makefile.am 2007-02-03 23:41:19.000000000 +0100
-@@ -17,10 +17,11 @@
- ADM_colorspace ADM_editor ADM_encoder ADM_filter ADM_inpics ADM_nuv \
- ADM_toolkit oplug_mpeg xpm ADM_video oplug_avi ADM_audiodevice ADM_vp32 \
- libMpeg2Dec oplug_mpegFF ADM_h263 ADM_gui2 ADM_dialog \
-- ADM_ogm ADM_3gp mpeg2enc ADM_openDML ADM_lvemux libtoolame ADM_requant \
-+ ADM_ogm ADM_3gp mpeg2enc ADM_openDML ADM_lvemux ADM_requant \
- ADM_script oplug_ogm ADM_xvidratectl ADM_mplex ADM_ocr ADM_libswscale \
- ADM_mpegdemuxer ADM_tray ADM_lavutil ADM_lavformat ADM_lavcodec oplug_mp4 \
-- ADM_avsproxy ADM_liba52 ADM_libMad ADM_matroska ADM_asf
-+ ADM_avsproxy ADM_liba52 ADM_libMad ADM_matroska ADM_asf \
-+ $(TWOLAME_DIR)
-
- if HAVE_FREETYPE
- SUBDIRS += libass
-@@ -63,7 +64,6 @@
- ./ADM_video/libADM_video.a ./ADM_encoder/libADM_encoder.a \
- ./ADM_codecs/libADM_codecs.a ./ADM_vp32/libADM_vp32.a \
- ./ADM_audiofilter/libADM_audiofilter.a \
--./libtoolame/liblibtoolame.a \
- ./ADM_gui2/libADM_gui2.a \
- ./ADM_libswscale/libswscale.a \
- ./mpeg2enc/libmpeg2enc.a \
-@@ -91,17 +91,19 @@
- ./ADM_library/libADM_library.a \
- ./ADM_toolkit/libADM_toolkit.a \
- ./libass/libass.a \
--$(libmpeg2enc_Altivec)
-+$(libmpeg2enc_Altivec) \
-+$(TWOLAME_LIBS)
-
-
- INCLUDES = $(all_includes) $(GTK_CFLAGS) $(XML_CFLAGS) \
- $(SMONKEY_CFLAGS) \
- -DADMLOCALE='"'$(ADM_LOCALEDIR)'"' \
-- -IADM_lavutil
-+ -IADM_lavutil \
-+ $(TWOLAME_CFLAGS)
-
- # the library search path.
- avidemux2_LDFLAGS = $(all_libraries) $(SDL_LIBS) $(GTK_LIBS) \
-- $(FREETYPE_LIBS) $(FC_LIBS) $(ARTS_LIBS) $(XML_LIBS)
-+ $(FREETYPE_LIBS) $(FC_LIBS) $(ARTS_LIBS) $(XML_LIBS)
-
- noinst_HEADERS = ADM_pp.h admmangle.h
- AM_CFLAGS = -g
-diff -u -r avidemux_2.3.0.old/configure.in avidemux_2.3.0/configure.in
---- avidemux_2.3.0.old/configure.in 2007-02-03 23:41:05.000000000 +0100
-+++ avidemux_2.3.0/configure.in 2007-02-03 23:42:56.000000000 +0100
-@@ -165,6 +165,7 @@
- AC_SUBST(CCAS)
- AC_SUBST(CCASFLAGS)
-
-+
- dnl ______________________
- dnl AC_DEFINE(USE_DIV5,0,[Divx 5])
- dnl AC_DEFINE(USE_AC3,0,[A52dec])
-@@ -268,6 +269,34 @@
- AC_DEFINE(USE_LIBXML2,1,[LibXML2 is available])
- fi
-
-+dnl ____________TWOLAME____________
-+AC_ARG_WITH([extern-twolame],
-+ AC_HELP_STRING([--without-extern-twolame], [Use builtin TwoLAME library (default: test)]),
-+ [with_extern_twolame=${withval}], [with_extern_twolame=test])
-+
-+
-+if test "x$with_extern_twolame" != "xno"; then
-+ PKG_CHECK_MODULES(TWOLAME, twolame >= 0.3.6, have_twolame=external,
-+ AC_MSG_ERROR([*** need twolame v0.3.6 or greater ! ***]))
-+
-+ TWOLAME_VERSION=`$PKG_CONFIG twolame --modversion`
-+ TWOLAME_DIR=""
-+else
-+ have_twolame=builtin
-+ TWOLAME_VERSION=0.3.6
-+ TWOLAME_LIBS=./libtoolame/liblibtoolame.a
-+ TWOLAME_CFLAGS=
-+ TWOLAME_DIR=libtoolame
-+fi
-+
-+AC_MSG_CHECKING([which twolame support])
-+AC_MSG_RESULT($have_twolame)
-+
-+AC_SUBST(TWOLAME_CFLAGS)
-+AC_SUBST(TWOLAME_LIBS)
-+AC_SUBST(TWOLAME_VERSION)
-+AC_SUBST(TWOLAME_DIR)
-+
-
- dnl __________________divx______________
- dnl __________________x264 ______________
-@@ -1392,6 +1421,8 @@
- AC_OUTPUT
- dnl ** mean ***
- echo " GTK+ version : $GTK_VERSION"
-+echo " TwoLAME support : $have_twolame"
-+echo " TwoLAME version : $TWOLAME_VERSION"
- echo " Divx5.0.5 ? : $have_divx"
- echo " *** DISABLED ***"
- echo " Xvid 0.9 Codec : $have_xx_xvid"
diff --git a/media-video/avidemux/files/digest-avidemux-2.3.0 b/media-video/avidemux/files/digest-avidemux-2.3.0
deleted file mode 100644
index 6730eea28c24..000000000000
--- a/media-video/avidemux/files/digest-avidemux-2.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 14c58c14fc9757d36e4d72498431da42 avidemux_2.3.0.tar.gz 4750919
-RMD160 1e10183d4b80104a42d40bfd9d9e9b5c54843d9e avidemux_2.3.0.tar.gz 4750919
-SHA256 ef083ab24e3ec612b10c8a0163845ff680fea845d5eade21d60d47e843b4c623 avidemux_2.3.0.tar.gz 4750919