fix gcc 3.3.x compile issues

5 files changed, 62 insertions, 13 deletions

diff --git a/media-libs/gst-plugins/ChangeLog b/media-libs/gst-plugins/ChangeLog
index cc9ca4f4ddfc..5604e6c14385 100644
--- a/media-libs/gst-plugins/ChangeLog
+++ b/media-libs/gst-plugins/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for media-libs/gst-plugins
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/ChangeLog,v 1.39 2003/09/07 19:33:01 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/ChangeLog,v 1.40 2003/09/11 21:40:41 liquidx Exp $
+
+  11 Sep 2003; Alastair Tse <liquidx@gentoo.org> gst-plugins-0.6.2-r1.ebuild,
+  gst-plugins-0.6.3.ebuild, files/gst-plugins-0.6.3-gcc33.patch:
+  adding gcc3.3 compile fixes
 
 *gst-plugins-0.6.3 (07 Sep 2003)
 
diff --git a/media-libs/gst-plugins/Manifest b/media-libs/gst-plugins/Manifest
index 2c51e9b07fd5..844b942dff28 100644
--- a/media-libs/gst-plugins/Manifest
+++ b/media-libs/gst-plugins/Manifest
@@ -1,17 +1,18 @@
-MD5 9b1b32467f2b148dadb24faa67b30ba8 ChangeLog 6944
-MD5 0a2eb3e8bfd351c97f6ee6109536f19d gst-plugins-0.6.3.ebuild 2263
+MD5 1b05be9b7f313d9da4d6a222278d267b ChangeLog 7120
 MD5 ca97543ee9f2a20325ce51626a1f3c43 gst-plugins-0.6.1.ebuild 4861
-MD5 ef98fe1233696e1ccf36a56f61581af4 gst-plugins-0.6.2.ebuild 4943
+MD5 5a9fccd929db1fc2a4487b10dfc7cd0c gst-plugins-0.6.2-r1.ebuild 5098
 MD5 77a7756503fe6ee887918f5352661e5f gst-plugins-0.6.2-r5.ebuild 2255
+MD5 ef98fe1233696e1ccf36a56f61581af4 gst-plugins-0.6.2.ebuild 4943
+MD5 9af79c551b82660c7c35998eb031c492 gst-plugins-0.6.3.ebuild 2338
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 35d840a158639a5513b5f35524d56fd8 gst-plugins-0.6.2-r1.ebuild 5016
-MD5 ad7d13e5c42638d153311159e0c64028 files/digest-gst-plugins-0.6.3 71
 MD5 497c4febffa64787dea6e4771fb6b72b files/digest-gst-plugins-0.6.1 71
-MD5 f4d299412b70de18060a4226c6fa981f files/gst-plugins-0.6-disable_ffmpeg_mpeg_typefind.patch 923
-MD5 548125c96ab562221dc0509e485d0f5a files/gst-plugins-0.6-ffmpeg_ldflags.patch 1858
-MD5 04bb0cdc1431b53db92b658a3c9fa6dd files/noppcasm.patch 1431
 MD5 c416f328737707f685267ea1dcf14272 files/digest-gst-plugins-0.6.2 71
-MD5 c416f328737707f685267ea1dcf14272 files/digest-gst-plugins-0.6.2-r5 71
-MD5 f7aac3ba492d4e54ae14ebeabc3299d4 files/libmpeg2.patch 878
 MD5 c416f328737707f685267ea1dcf14272 files/digest-gst-plugins-0.6.2-r1 71
+MD5 c416f328737707f685267ea1dcf14272 files/digest-gst-plugins-0.6.2-r5 71
+MD5 ad7d13e5c42638d153311159e0c64028 files/digest-gst-plugins-0.6.3 71
+MD5 f4d299412b70de18060a4226c6fa981f files/gst-plugins-0.6-disable_ffmpeg_mpeg_typefind.patch 923
+MD5 548125c96ab562221dc0509e485d0f5a files/gst-plugins-0.6-ffmpeg_ldflags.patch 1858
 MD5 1934516009a2cf836520961cd1fd0085 files/gst-plugins-0.6.2-rm_cflags.patch 2542
+MD5 4ce1d39bcd5cf1db9464cad55467b790 files/gst-plugins-0.6.3-gcc33.patch 1307
+MD5 f7aac3ba492d4e54ae14ebeabc3299d4 files/libmpeg2.patch 878
+MD5 04bb0cdc1431b53db92b658a3c9fa6dd files/noppcasm.patch 1431
diff --git a/media-libs/gst-plugins/files/gst-plugins-0.6.3-gcc33.patch b/media-libs/gst-plugins/files/gst-plugins-0.6.3-gcc33.patch
new file mode 100644
index 000000000000..813da699c78a
--- /dev/null
+++ b/media-libs/gst-plugins/files/gst-plugins-0.6.3-gcc33.patch
@@ -0,0 +1,38 @@
+diff -ur gst-plugins-0.6.3/gst-libs/ext/ffmpeg/ffmpeg/ffserver.c gst-plugins-0.6.3.new/gst-libs/ext/ffmpeg/ffmpeg/ffserver.c
+--- gst-plugins-0.6.3/gst-libs/ext/ffmpeg/ffmpeg/ffserver.c	2002-12-11 03:16:51.000000000 +0000
++++ gst-plugins-0.6.3.new/gst-libs/ext/ffmpeg/ffmpeg/ffserver.c	2003-09-11 13:10:43.517428848 +0100
+@@ -20,6 +20,8 @@
+ #include "avformat.h"
+ 
+ #include <stdarg.h>
++#include <ctype.h>
++
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+@@ -33,12 +35,12 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
+-#include <ctype.h>
+ #include <signal.h>
+ #ifdef CONFIG_HAVE_DLFCN
+ #include <dlfcn.h>
+ #endif
+ 
++
+ #include "ffserver.h"
+ 
+ /* maximum number of simultaneous HTTP connections */
+diff -ur gst-plugins-0.6.3/gst-libs/ext/ffmpeg/ffmpeg/vhook/imlib2.c gst-plugins-0.6.3.new/gst-libs/ext/ffmpeg/ffmpeg/vhook/imlib2.c
+--- gst-plugins-0.6.3/gst-libs/ext/ffmpeg/ffmpeg/vhook/imlib2.c	2002-11-30 17:17:58.000000000 +0000
++++ gst-plugins-0.6.3.new/gst-libs/ext/ffmpeg/ffmpeg/vhook/imlib2.c	2003-09-11 13:12:33.854655040 +0100
+@@ -48,7 +48,7 @@
+ #include <stdarg.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <sys/time.h>
++#include <time.h>
+ #include <X11/Xlib.h>
+ #include <Imlib2.h>                                                             
+ 
diff --git a/media-libs/gst-plugins/gst-plugins-0.6.2-r1.ebuild b/media-libs/gst-plugins/gst-plugins-0.6.2-r1.ebuild
index f0e2bc6a7eee..a4210b388715 100644
--- a/media-libs/gst-plugins/gst-plugins-0.6.2-r1.ebuild
+++ b/media-libs/gst-plugins/gst-plugins-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.2-r1.ebuild,v 1.3 2003/09/11 01:17:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.2-r1.ebuild,v 1.4 2003/09/11 21:40:41 liquidx Exp $
 
 inherit eutils libtool gnome2 flag-o-matic
 
@@ -63,6 +63,9 @@ src_unpack() {
 	# using a slower but working version for now
 	epatch ${FILESDIR}/noppcasm.patch
 
+	# patch for gcc-3.3.x
+	cd ${S};  patch -p1 < ${FILESDIR}/${PN}-0.6.3-gcc33.patch
+
 	# ffmpeg libs fix
 	use oggvorbis && epatch ${FILESDIR}/${PN}-${PV_MAJ_MIN}-ffmpeg_ldflags.patch
 
diff --git a/media-libs/gst-plugins/gst-plugins-0.6.3.ebuild b/media-libs/gst-plugins/gst-plugins-0.6.3.ebuild
index 7e03f45721f2..4a35df437135 100644
--- a/media-libs/gst-plugins/gst-plugins-0.6.3.ebuild
+++ b/media-libs/gst-plugins/gst-plugins-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.3.ebuild,v 1.2 2003/09/11 01:17:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.3.ebuild,v 1.3 2003/09/11 21:40:41 liquidx Exp $
 
 # IMPORTANT
 #
@@ -39,6 +39,9 @@ src_unpack() {
 	# ppc asm included in the resample plugin seems to be broken,
 	# using a slower but working version for now
 	epatch ${FILESDIR}/noppcasm.patch
+	
+	# fix compile issues with gcc-3.3.x
+	epatch ${FILESDIR}/${P}-gcc33.patch
 
 	# patch for changing types in >libmpeg-0.3.1
 	if grep -q mpeg2_picture ${ROOT}/usr/include/mpeg2dec/mpeg2.h; then