summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Brinkmann <luckyduck@gentoo.org>2005-03-31 19:36:14 +0000
committerJan Brinkmann <luckyduck@gentoo.org>2005-03-31 19:36:14 +0000
commita5cf2e44e720aa9fea1e4c771fe5996dedd40705 (patch)
tree0997ad8bd2e0565dfd672909ec78ed9ec72abc5e /media-video/vls/files
parent(Portage version: 2.0.51.19) (Manifest recommit) (diff)
downloadgentoo-2-a5cf2e44e720aa9fea1e4c771fe5996dedd40705.tar.gz
gentoo-2-a5cf2e44e720aa9fea1e4c771fe5996dedd40705.tar.bz2
gentoo-2-a5cf2e44e720aa9fea1e4c771fe5996dedd40705.zip
added a patch to enable gcc3.4.x compilation. fixes bug #64575
(Portage version: 2.0.51.19)
Diffstat (limited to 'media-video/vls/files')
-rw-r--r--media-video/vls/files/vls-0.5.6-gcc34.patch84
1 files changed, 84 insertions, 0 deletions
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;
+ }