Version bump, ebuild from /dev/null but thanks to yngwin for original ebuild at berkano overlay and Ingmar from #genkdesvn for helping with cmake utils.

Package-Manager: portage-2.1.4_rc4

5 files changed, 157 insertions, 15 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 10911fc98c13..f4001256f70d 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.116 2007/11/27 11:57:23 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.117 2007/11/30 20:46:24 drac Exp $
+
+*avidemux-2.4_pre3 (30 Nov 2007)
+
+  30 Nov 2007; Samuli Suominen <drac@gentoo.org>
+  +files/avidemux-2.4_pre3-libdca.patch, +avidemux-2.4_pre3.ebuild:
+  Version bump, ebuild from /dev/null but thanks to yngwin for original ebuild
+  at berkano overlay and Ingmar from #genkdesvn for helping with cmake utils.
 
   27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> avidemux-2.3.0.ebuild:
   Fixed quoting.
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index e84b5974d385..0723d23d86ff 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -21,15 +18,24 @@ AUX avidemux-2.3.0-twolame.patch 4048 RMD160 45e4b1333cdc56934e73758a16ffb54ea2b
 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-libdca.patch 1029 RMD160 5b792477656c2864711d16574e4134c8573daec0 SHA1 10044fdae9506e4ac216d804aef5cfef9649b4db SHA256 81a460a306c469771ab4ae9b3a2c5f97dc61cb738aad19e1a71a93d952b55e1a
+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
-MISC ChangeLog 20903 RMD160 03a2fc61c9e8bb408259fd719bf87d3f48471f0c SHA1 b7b483905389435124e93b40bf935e33535a1871 SHA256 ab5b20e2540e47fc5c04516ea5e16e2bf5943539d68d46506ea3d51fc08b9012
-MD5 abef7201589dbf3314e4938501ca795e ChangeLog 20903
-RMD160 03a2fc61c9e8bb408259fd719bf87d3f48471f0c ChangeLog 20903
-SHA256 ab5b20e2540e47fc5c04516ea5e16e2bf5943539d68d46506ea3d51fc08b9012 ChangeLog 20903
+EBUILD avidemux-2.4_pre3.ebuild 3365 RMD160 3217f09436f3d8089a6c1b1d1be932f55a4c7239 SHA1 e9fc9666773356e3a739409fb9c0f27e1e33ca20 SHA256 ce1997b03b41e6766f3e78aeb7e2d7a8a87db045d3a1efab826b0ab69a8a25b6
+MD5 0eb492d2ba73fb4d6f4a57433f63dcb9 avidemux-2.4_pre3.ebuild 3365
+RMD160 3217f09436f3d8089a6c1b1d1be932f55a4c7239 avidemux-2.4_pre3.ebuild 3365
+SHA256 ce1997b03b41e6766f3e78aeb7e2d7a8a87db045d3a1efab826b0ab69a8a25b6 avidemux-2.4_pre3.ebuild 3365
+MISC ChangeLog 21212 RMD160 9fd8cc2aa81bc43c4e2e66649fbdc3723da70830 SHA1 5fedb75d9af5abcaa04662d6d6925d74e7743834 SHA256 5d3ef63ebf477e836bdf240d50e4a62724875a326d3ccdf4584e3dd990d1b29e
+MD5 042b906a62df78c38f06acf7bd57042f ChangeLog 21212
+RMD160 9fd8cc2aa81bc43c4e2e66649fbdc3723da70830 ChangeLog 21212
+SHA256 5d3ef63ebf477e836bdf240d50e4a62724875a326d3ccdf4584e3dd990d1b29e ChangeLog 21212
 MISC metadata.xml 318 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 SHA1 b9cd3e9f43bdd337eb81270e723569d1b4865e1a SHA256 4379b50013e723e18c04e42b0750112cb17af07b82a7b0e3b7aa32bd502124ba
 MD5 d5c5ccb29604d60b3222d8d620b9a55e metadata.xml 318
 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 metadata.xml 318
@@ -37,10 +43,6 @@ SHA256 4379b50013e723e18c04e42b0750112cb17af07b82a7b0e3b7aa32bd502124ba metadata
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHTAYpt2vP6XvVdOcRAifCAJ9x+g1rrcWg7X2AW0a8iVimAYGcNgCcDPVv
-nPsVp7Jr/d4P60c1Dli6oZY=
-=vDhu
------END PGP SIGNATURE-----
+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.4_pre3.ebuild b/media-video/avidemux/avidemux-2.4_pre3.ebuild
new file mode 100644
index 000000000000..6a72dbcf5767
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.4_pre3.ebuild
@@ -0,0 +1,106 @@
+# 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.4_pre3.ebuild,v 1.1 2007/11/30 20:46:24 drac Exp $
+
+inherit cmake-utils eutils
+
+MY_P=${PN}_${PV/pre/preview}
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks."
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="aac aften alsa amrnb arts dts encode esd fontconfig jack libsamplerate
+x264 xv xvid vorbis truetype gtk qt4"
+
+RDEPEND="dev-libs/libxml2
+	media-libs/libpng
+	media-libs/libsdl
+	>=dev-libs/glib-2
+	alsa? ( media-libs/alsa-lib )
+	fontconfig? ( media-libs/fontconfig )
+	xv? ( x11-libs/libXv )
+	esd? ( media-sound/esound )
+	jack? ( media-sound/jack-audio-connection-kit )
+	aften? ( media-libs/aften )
+	libsamplerate? ( media-libs/libsamplerate )
+	xvid? ( media-libs/xvid )
+	amrnb? ( media-libs/amrnb )
+	dts? ( media-libs/libdca )
+	x264? ( media-libs/x264-svn )
+	aac? ( media-libs/faac media-libs/faad2 )
+	vorbis? ( media-libs/libvorbis )
+	arts? ( kde-base/arts )
+	truetype? ( media-libs/freetype )
+	gtk? ( >=x11-libs/gtk+-2
+		x11-libs/libX11 )
+	qt4? ( >=x11-libs/qt-4
+		x11-libs/libX11 )
+	encode? (
+		aac? ( media-libs/faac )
+		media-sound/lame )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	dev-util/cmake"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-libdca.patch
+}
+
+src_compile() {
+	# Commented options are breaking the build. -drac
+	
+	local mycmakeargs
+
+	# ConfigureChecks.cmake
+	use alsa || mycmakeargs="${mycmakeargs} -DNO_ALSA=1"
+	#use oss || mycmakeargs="${mycmakeargs} -DNO_OSS=1"
+	#use nls || mycmakeargs="${mycmakeargs} -DNO_NLS=1"
+	#use sdl || mycmakeargs="${mycmakeargs} -DNO_SDL=1"
+
+	# ConfigureChecks.cmake -> ADM_CHECK_HL -> cmake/adm_checkHeaderLib.cmake
+	use fontconfig || mycmakeargs="${mycmakeargs} -DNO_FontConfig=1"
+	use xv || mycmakeargs="${mycmakeargs} -DNO_Xvideo=1"
+	use esd || mycmakeargs="${mycmakeargs} -DNO_Esd=1"
+	use jack || mycmakeargs="${mycmakeargs} -DNO_Jack=1"
+	use aften || mycmakeargs="${mycmakeargs} -DNO_Aften=1"
+	use libsamplerate || mycmakeargs="${mycmakeargs} -DNO_libsamplerate=1"
+	use encode || mycmakeargs="${mycmakeargs} -DNO_Lame=1 -DNO_FAAC=1"
+	use xvid || mycmakeargs="${mycmakeargs} -DNO_Xvid=1"
+	use amrnb || mycmakeargs="${mycmakeargs} -DNO_AMRNB=1"
+	use dts || mycmakeargs="${mycmakeargs} -DNO_libdca=1"
+	use x264 || mycmakeargs="${mycmakeargs} -DNO_x264=1"
+	use aac || mycmakeargs="${mycmakeargs} -DNO_FAAD=1 -DNO_NeAAC=1"
+	use vorbis || mycmakeargs="${mycmakeargs} -DNO_Vorbis=1"
+	#use png || mycmakeargs="${mycmakeargs} -DNO_libPNG=1"
+
+	# ConfigureChecks.cmake -> cmake/FindArts.cmake
+	use arts || mycmakeargs="${mycmakeargs} -DNO_ARTS=1"
+
+	# CMakeLists.txt
+	use truetype || mycmakeargs="${mycmakeargs} -DNO_FREETYPE=1"
+	use gtk || mycmakeargs="${mycmakeargs} -DNO_GTK=1"
+	use qt4 || mycmakeargs="${mycmakeargs} -DNO_QT4=1"
+
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS
+
+	doicon avidemux_icon.png
+
+	use gtk && make_desktop_entry avidemux2_gtk "Avidemux GTK" \
+		avidemux_icon "AudioVideo;GTK;"
+	use qt4 && make_desktop_entry avidemux2_qt4 "Avidemux QT" \
+		avidemux_icon "AudioVideo;Qt;"
+}
diff --git a/media-video/avidemux/files/avidemux-2.4_pre3-libdca.patch b/media-video/avidemux/files/avidemux-2.4_pre3-libdca.patch
new file mode 100644
index 000000000000..98767e93c83b
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.4_pre3-libdca.patch
@@ -0,0 +1,24 @@
+diff -ur avidemux_2.4_preview3.orig/ConfigureChecks.cmake avidemux_2.4_preview3/ConfigureChecks.cmake
+--- avidemux_2.4_preview3.orig/ConfigureChecks.cmake	2007-11-10 15:44:58.000000000 +0200
++++ avidemux_2.4_preview3/ConfigureChecks.cmake	2007-11-30 22:28:27.000000000 +0200
+@@ -405,7 +405,7 @@
+ IF (USE_LATE_BINDING)

+ 	CHECK_INCLUDE_FILES(dts.h USE_LIBDCA)

+ ELSE (USE_LATE_BINDING)

+-	ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA)

++	ADM_CHECK_HL(libdca dts.h dca dca_init USE_LIBDCA)

+ ENDIF (USE_LATE_BINDING)

+ 

+ SET(CMAKE_REQUIRED_LIBRARIES)

+diff -ur avidemux_2.4_preview3.orig/avidemux/CMakeLists.txt avidemux_2.4_preview3/avidemux/CMakeLists.txt
+--- avidemux_2.4_preview3.orig/avidemux/CMakeLists.txt	2007-11-09 18:34:00.000000000 +0200
++++ avidemux_2.4_preview3/avidemux/CMakeLists.txt	2007-11-30 22:17:20.000000000 +0200
+@@ -326,7 +326,7 @@
+ 

+ #libdts

+ if(USE_LIBDCA AND NOT USE_LATE_BINDING)

+-	add_libs_all_targets(dts)

++	add_libs_all_targets(dca)

+ endif(USE_LIBDCA AND NOT USE_LATE_BINDING)

+ 

+ # Lame

diff --git a/media-video/avidemux/files/digest-avidemux-2.4_pre3 b/media-video/avidemux/files/digest-avidemux-2.4_pre3
new file mode 100644
index 000000000000..47241747a3a6
--- /dev/null
+++ b/media-video/avidemux/files/digest-avidemux-2.4_pre3
@@ -0,0 +1,3 @@
+MD5 f7a073abfe1c93a3d1d5a324c0a21b93 avidemux_2.4_preview3.tar.gz 5715054
+RMD160 034386aabeec3530bc38b3d0e3e31f324d923fb5 avidemux_2.4_preview3.tar.gz 5715054
+SHA256 9f96a266dbb3dc8ca44545f1778616e436f879053904c9f751a271ae7b95d09f avidemux_2.4_preview3.tar.gz 5715054