added a patch to enable gcc3.4.x compilation. fixes bug #64575

Package-Manager: portage-2.0.51.19

4 files changed, 113 insertions, 5 deletions

diff --git a/media-video/vls/ChangeLog b/media-video/vls/ChangeLog
index bfd5e2a45744..6634ecdd60e8 100644
--- a/media-video/vls/ChangeLog
+++ b/media-video/vls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vls
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vls/ChangeLog,v 1.16 2005/01/29 00:27:08 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vls/ChangeLog,v 1.17 2005/03/31 19:36:14 luckyduck Exp $
+
+  31 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/vls-0.5.6-gcc34.patch, vls-0.5.6-r2.ebuild:
+  added a patch to enable gcc3.4.x compilation. fixes bug #64575.
 
   29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> vls-0.5.6-r1.ebuild:
   restructered DEPEND to fix #48087.
diff --git a/media-video/vls/Manifest b/media-video/vls/Manifest
index 7fc0a9b519e5..10cdcf122394 100644
--- a/media-video/vls/Manifest
+++ b/media-video/vls/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 9e41d350e375888f5423c519a455b289 vls-0.5.6-r1.ebuild 916
 MD5 f36343caec9f9bd914d92cd129893774 vls-0.5.5-r1.ebuild 889
 MD5 69af3c87aaba6c0cb6805b82a71c159a vls-0.5.5.ebuild 768
-MD5 f55eeb1b14f82f0ea91bcaa2c998c2c4 vls-0.5.6-r2.ebuild 915
-MD5 be85018d5567acab522196bb15f5e912 ChangeLog 1585
+MD5 65bad42c4d1141ed4ee528f12d61900b vls-0.5.6-r2.ebuild 1010
+MD5 259c89c629b0e7fa55be3af2155e7b07 ChangeLog 1757
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 8f73d513b104c15745ca3a2b60cdd64d files/vls-0.5.6-gcc34.patch 2553
 MD5 c02a9033fcb3db177a39b972ffb0cc6d files/digest-vls-0.5.5 61
 MD5 c02a9033fcb3db177a39b972ffb0cc6d files/digest-vls-0.5.5-r1 61
 MD5 17bf9416e2bf4aca59217e79371eb8ac files/digest-vls-0.5.6-r1 61
 MD5 17bf9416e2bf4aca59217e79371eb8ac files/digest-vls-0.5.6-r2 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCTFFF06ebR+OMO78RAo2EAKCDzuVXj5La2C2/X4q2CnMapdigHwCfYJqf
+uRLy7L7AYfy+S9mZsrkv0aE=
+=kueZ
+-----END PGP SIGNATURE-----
diff --git a/media-video/vls/files/vls-0.5.6-gcc34.patch b/media-video/vls/files/vls-0.5.6-gcc34.patch
new file mode 100644
index 000000000000..bfaddba2e2a0
--- /dev/null
+++ b/media-video/vls/files/vls-0.5.6-gcc34.patch
@@ -0,0 +1,84 @@
+diff -uprN src.orig/core/common.h src/core/common.h
+--- src.orig/core/common.h	2005-03-31 00:01:14.000000000 +0200
++++ src/core/common.h	2005-03-31 00:25:08.000000000 +0200
+@@ -110,8 +110,6 @@ typedef unsigned long       count;
+     typedef uint32_t            u32;
+     typedef int32_t             s32;
+ 
+-    typedef uint64_t            u64;
+-    typedef int64_t             s64;
+ #else
+     typedef unsigned char       u8;
+     typedef signed char         s8;
+diff -uprN src.orig/core/hashtable.h src/core/hashtable.h
+--- src.orig/core/hashtable.h	2005-03-31 00:01:14.000000000 +0200
++++ src/core/hashtable.h	2005-03-31 00:19:30.000000000 +0200
+@@ -62,7 +62,7 @@ template <class T> class C_HashMethod
+   u32 m_uiMaxHash;
+ };
+ 
+-
++template <>
+ class C_HashMethod<u32>
+ {
+  public:
+@@ -75,7 +75,7 @@ class C_HashMethod<u32>
+   u32 m_uiMaxHash;
+ };
+ 
+-
++template <>
+ class C_HashMethod<u16>
+ {
+  public:
+@@ -88,7 +88,7 @@ class C_HashMethod<u16>
+   u32 m_uiMaxHash;
+ };
+ 
+-
++template <>
+ class C_HashMethod<handle>
+ {
+  public:
+diff -uprN src.orig/core/library.cpp src/core/library.cpp
+--- src.orig/core/library.cpp	2005-03-31 00:01:14.000000000 +0200
++++ src/core/library.cpp	2005-03-31 21:31:10.340269432 +0200
+@@ -33,7 +33,8 @@
+ // There is no preamble since this file is to be included in the files which
+ // use the template: look at vector.h for further explanation
+ 
+-
++#define DL_LAZY 1
++#include <dlfcn.h>
+ 
+ //******************************************************************************
+ // class C_Library
+Files src.orig/core/.library.cpp.swp and src/core/.library.cpp.swp differ
+diff -uprN src.orig/core/stream.cpp src/core/stream.cpp
+--- src.orig/core/stream.cpp	2005-03-31 00:01:14.000000000 +0200
++++ src/core/stream.cpp	2005-03-31 00:40:27.000000000 +0200
+@@ -317,6 +317,9 @@ template <class IOStream>
+ template <class IOStream>
+  C_Stream<IOStream>& C_Stream<IOStream>::operator >> (C_Serializable& cObject)
+ {
++  C_ClassDescription cObjectDescription = cObject.Reflect();
++  C_Serializer cSerializer(&cObject, cObjectDescription);
++  
+   try
+   {
+     u32 iByteCount = cSerializer.NextBytesCount();
+@@ -324,11 +327,12 @@ template <class IOStream>
+     {
+       const byte aBytes[iByteCount];
+       u32 iOffset = 0;
+-
++	
++      int iRc;
+       // Read the data to deserialize on the stream
+       do
+       {
+-        int iRc = m_pIOStream->Read(aBytes+iOffset, iByteCount-iOffset);
++        iRc = m_pIOStream->Read(aBytes+iOffset, iByteCount-iOffset);
+         ASSERT(iRc >= 0 || iRc == FILE_EOF);
+         iOffset += iRc;
+       }
diff --git a/media-video/vls/vls-0.5.6-r2.ebuild b/media-video/vls/vls-0.5.6-r2.ebuild
index 6a3d8d08d912..849a99757877 100644
--- a/media-video/vls/vls-0.5.6-r2.ebuild
+++ b/media-video/vls/vls-0.5.6-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vls/vls-0.5.6-r2.ebuild,v 1.3 2005/01/29 00:27:08 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vls/vls-0.5.6-r2.ebuild,v 1.4 2005/03/31 19:36:14 luckyduck Exp $
+
+inherit eutils
 
 IUSE="debug dvd dvb"
 
@@ -17,13 +19,20 @@ DEPEND="dvd? ( >=media-libs/libdvdread-0.9.4
 	dvb? ( >=media-libs/libdvb-0.5.0 )
 	>=media-libs/libdvbpsi-0.1.3"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
 src_compile() {
 	local myconf
 	use debug || myconf="--disable-debug"
 
 	use dvb && myconf="${myconf} --enable-dvb --with-libdvb=/usr/lib/"
 
-	econf `use_enable dvd` \
+	econf $(use_enable dvd) \
 		${myconf} || die "econf failed"
 
 	emake || die "emake failed"