Remove old. Add patch to fix compilation with gcc-4.4 (bug 269114).

(Portage version: 2.2_rc28/cvs/Linux x86_64)

4 files changed, 143 insertions, 121 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 657a17cfa0a6..6d6f81223aff 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.143 2009/05/08 12:41:49 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.144 2009/05/15 21:13:03 yngwin Exp $
+
+  15 May 2009; Ben de Groot <yngwin@gentoo.org> -avidemux-2.4.4.ebuild,
+  avidemux-2.4.4-r1.ebuild, +files/avidemux-2.4.4-gcc-4.4.patch:
+  Remove old. Add patch to fix compilation with gcc-4.4 (bug 269114).
 
 *avidemux-2.4.4-r1 (08 May 2009)
 
diff --git a/media-video/avidemux/avidemux-2.4.4-r1.ebuild b/media-video/avidemux/avidemux-2.4.4-r1.ebuild
index 0980cf16a992..882ae3e7b60a 100644
--- a/media-video/avidemux/avidemux-2.4.4-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.4-r1.ebuild,v 1.1 2009/05/08 12:41:49 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.4-r1.ebuild,v 1.2 2009/05/15 21:13:03 yngwin Exp $
 
 EAPI="2"
 
@@ -61,8 +61,8 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/lavcodec-mpegvideo_mmx-asm-fix.patch
-	# fix for bug 268618
-	epatch "${FILESDIR}"/${PN}-2.4-cmake264.patch
+	epatch "${FILESDIR}"/${PN}-2.4-cmake264.patch  # bug 268618
+	epatch "${FILESDIR}"/${P}-gcc-4.4.patch  # bug 269114
 }
 
 src_configure() {
diff --git a/media-video/avidemux/avidemux-2.4.4.ebuild b/media-video/avidemux/avidemux-2.4.4.ebuild
deleted file mode 100644
index 725e800413a3..000000000000
--- a/media-video/avidemux/avidemux-2.4.4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.4.ebuild,v 1.1 2009/02/15 23:29:51 yngwin Exp $
-
-EAPI="2"
-
-inherit cmake-utils eutils flag-o-matic
-
-MY_P=${PN}_${PV}
-
-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 esd jack libsamplerate mp3 truetype vorbis
-	x264 xv xvid +gtk"
-	# qt4 currently breaks on generating translations
-
-RDEPEND="dev-libs/libxml2
-	media-libs/libpng
-	media-libs/libsdl
-	>=dev-libs/glib-2
-	aac? ( media-libs/faac
-		media-libs/faad2 )
-	aften? ( media-libs/aften )
-	alsa? ( media-libs/alsa-lib )
-	amrnb? ( media-libs/amrnb )
-	arts? ( kde-base/arts )
-	dts? ( media-libs/libdca )
-	mp3? ( media-sound/lame )
-	esd? ( media-sound/esound )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	truetype? ( media-libs/freetype
-		media-libs/fontconfig )
-	vorbis? ( media-libs/libvorbis )
-	x264? ( media-libs/x264 )
-	xv? ( x11-libs/libXv )
-	xvid? ( media-libs/xvid )
-	gtk? ( x11-libs/gtk+:2
-		x11-libs/libX11 )"
-#	qt4? ( x11-libs/qt-gui:4
-#		x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig
-	>=dev-util/cmake-2.4.4"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if hasq distcc ${FEATURES}; then
-		eerror "Avidemux does not compile with distcc. Please retry with"
-		eerror "FEATURES='-distcc' emerge avidemux"
-		die "distcc not supported for this package"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/lavcodec-mpegvideo_mmx-asm-fix.patch
-}
-
-src_configure() {
-	# Commented out options cause compilation errors, some
-	# might need -Wl,--as-needed in LDFLAGS and all USE
-	# flags disabled for reproducing. -drac
-	# TODO. Needs to be fixed, or reported upstream.
-
-	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 truetype || 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 aac || mycmakeargs="${mycmakeargs} -DNO_FAAC=1"
-	use mp3 || mycmakeargs="${mycmakeargs} -DNO_Lame=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"
-
-	# 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_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS History
-	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.4-gcc-4.4.patch b/media-video/avidemux/files/avidemux-2.4.4-gcc-4.4.patch
new file mode 100644
index 000000000000..9cf5a37ddddd
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.4.4-gcc-4.4.patch
@@ -0,0 +1,135 @@
+--- avidemux/ADM_colorspace/ADM_rgb.h
++++ avidemux/ADM_colorspace/ADM_rgb.h
+@@ -19,6 +19,8 @@
+  #ifndef COLYUVRGB_H

+  #define COLYUVRGB_H

+ 

++#include <inttypes.h>

++

+ #define ADM_COLOR_IS_YUV 0x1000

+  typedef enum 

+  {

+--- avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp
++++ avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp
+@@ -71,7 +71,7 @@
+ */
+ uint8_t fileParser::open( const char *filename,FP_TYPE *multi )
+ {
+-        char *dot = NULL;                   // pointer to the last dot in filename
++        const char *dot = NULL;                   // pointer to the last dot in filename
+         uint8_t decimals = 0;               // number of decimals
+         char *left = NULL, *number = NULL, *right = NULL; // parts of filename (after splitting)
+ 
+--- avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc
++++ avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc
+@@ -104,7 +104,7 @@
+ 
+ int y4m_parse_ratio(y4m_ratio_t *r, const char *s)
+ {
+-  char *t = strchr(s, ':');
++  const char *t = strchr(s, ':');
+   if (t == NULL) return Y4M_ERR_RANGE;
+   r->n = atoi(s);
+   r->d = atoi(t+1);
+--- avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp
++++ avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp
+@@ -53,7 +53,7 @@
+ 
+ bool LPCMStream::Probe(IBitStream &bs )
+ {
+-    char *last_dot = strrchr( bs.StreamName(), '.' );
++    const char *last_dot = strrchr( bs.StreamName(), '.' );
+     return 
+         last_dot != NULL 
+         && strcmp( last_dot+1, "lpcm") == 0;
+--- avidemux/ADM_osSupport/ADM_fileio.cpp
++++ avidemux/ADM_osSupport/ADM_fileio.cpp
+@@ -543,7 +543,7 @@
+ */

+ const char *GetFileName(const char *str)

+ {

+-	char *filename;

++	const char *filename;

+         char *filename2;

+ #ifndef ADM_WIN32		

+ 	filename = strrchr(str, '/');

+--- avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp
++++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp
+@@ -1,6 +1,7 @@
+ #include <QtGui>

+ 

+ #include "../ADM_toolkit/qtToolkit.h"

++#include <stdint.h>

+ 

+ int DIA_colorSel(uint8_t *r, uint8_t *g, uint8_t *b)

+ {

+@@ -17,4 +18,4 @@
+ 	}

+ 

+ 	return 0;

+-}
+\ No newline at end of file
++}

+--- avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_cnr2.cpp
++++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_cnr2.cpp
+@@ -16,6 +16,7 @@
+  ***************************************************************************/

+ 

+ #include <math.h>

++#include <stdint.h>

+ 

+ #include "config.h"

+ #include "ui_cnr2.h"

+--- avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_coloryuv.cpp
++++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_coloryuv.cpp
+@@ -16,6 +16,7 @@
+  ***************************************************************************/

+ #include "config.h"

+ 

++#include <stdint.h>

+ #include <QtGui/QDialog>

+ 

+ #include "ui_coloryuv.h"

+--- avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp
++++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp
+@@ -13,7 +13,7 @@
+ ***************************************************************************/
+ 
+ #include "config.h"
+-
++#include <cstdio>
+ #include <math.h>
+ #include <QPainter>
+ #include <QSlider>
+--- avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h
++++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h
+@@ -1,6 +1,6 @@
+ #ifndef ADM_Q_SLIDER_H
+ #define ADM_Q_SLIDER_H
+-
++#include <inttypes.h>
+ class ADM_QSlider : public QSlider
+ {
+ protected:
+--- avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp
++++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp
+@@ -9,7 +9,7 @@
+ //
+ 
+ #include "config.h"
+-
++#include <inttypes.h>
+ #include <QtGui/QApplication>
+ #include <QtGui/QDesktopWidget>
+ 
+--- avidemux/ADM_video/mmx_macros.h
++++ avidemux/ADM_video/mmx_macros.h
+@@ -353,7 +353,7 @@
+ #define	mmx_m2r(op, mem, reg) \
+ 	__asm__ __volatile__ (#op " %0, %%" #reg \
+ 			      : /* nothing */ \
+-			      : "X" (mem))
++			      : "m" (mem))
+ 
+ #define	mmx_r2m(op, reg, mem) \
+ 	__asm__ __volatile__ (#op " %%" #reg ", %0" \