Add patch to fix building with GCC 4.1.1 on 64-bit platforms, add patch to fix building with gmake 3.81 (bug #132952), and fix patch to build with newer dvdread versions.

Package-Manager: portage-2.1_rc1-r3

9 files changed, 134 insertions, 31 deletions

diff --git a/media-video/vls/ChangeLog b/media-video/vls/ChangeLog
index 3737c7f4c523..448f7cc5f868 100644
--- a/media-video/vls/ChangeLog
+++ b/media-video/vls/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/vls
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vls/ChangeLog,v 1.24 2006/04/17 15:59:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vls/ChangeLog,v 1.25 2006/05/20 11:12:42 flameeyes Exp $
+
+  20 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/vls-0.5.6-64bit.patch, files/vls-0.5.6-dvdread.patch,
+  +files/vls-0.5.6-gmake-3.81.patch, vls-0.5.6-r2.ebuild:
+  Add patch to fix building with GCC 4.1.1 on 64-bit platforms, add patch to
+  fix building with gmake 3.81 (bug #132952), and fix patch to build with
+  newer dvdread versions.
 
   17 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/vls-0.5.6-dvdread.patch, vls-0.5.6-r2.ebuild:
diff --git a/media-video/vls/Manifest b/media-video/vls/Manifest
index 496e1152d40c..c1e9e9c68d50 100644
--- a/media-video/vls/Manifest
+++ b/media-video/vls/Manifest
@@ -1,46 +1,64 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 36701f03b851557186a19789708ed6b3 ChangeLog 2676
-RMD160 69d20d832d809cd365bb254c1b31a53afa6b4c68 ChangeLog 2676
-SHA256 c42d14129713d15aa7c0186c58ef461bded9f29635ee83db5459e358c2746cf9 ChangeLog 2676
-MD5 c02a9033fcb3db177a39b972ffb0cc6d files/digest-vls-0.5.5 61
-RMD160 575d034dda77eb56f6bdfda846bcf0f66c050d15 files/digest-vls-0.5.5 61
-SHA256 e1d0d7ce214237cd217eec2ed58d0424fe17ef77444096269b2a0e759f7b2c16 files/digest-vls-0.5.5 61
-MD5 01f568090383ac992cc0fd1c50cbc1c6 files/digest-vls-0.5.5-r1 229
-RMD160 39c204daa45b6a4f7f126efe150aa704bf3d1794 files/digest-vls-0.5.5-r1 229
-SHA256 0da4034e641805ec1267fbf55029db25c0348b8a32ffdc323b1cbc3194208393 files/digest-vls-0.5.5-r1 229
-MD5 17bf9416e2bf4aca59217e79371eb8ac files/digest-vls-0.5.6-r1 61
-RMD160 3571104f075378e82ab8cc6f01475dcc2f479588 files/digest-vls-0.5.6-r1 61
-SHA256 3b6585ede638930175ddfcfd2fbcc7ba4f760b7f67a74ff4bf7838d7ed71bf9b files/digest-vls-0.5.6-r1 61
-MD5 17bf9416e2bf4aca59217e79371eb8ac files/digest-vls-0.5.6-r2 61
-RMD160 3571104f075378e82ab8cc6f01475dcc2f479588 files/digest-vls-0.5.6-r2 61
-SHA256 3b6585ede638930175ddfcfd2fbcc7ba4f760b7f67a74ff4bf7838d7ed71bf9b files/digest-vls-0.5.6-r2 61
-MD5 df331905a72e22f412e90ee2b90894bb files/vls-0.5.6-dvdread.patch 928
-RMD160 90de497cbc0dd419eac0b23f89a15848621b18a6 files/vls-0.5.6-dvdread.patch 928
-SHA256 1a953fb956994f93287659623ea05e079e3cf825c8ba445293da2d021335f658 files/vls-0.5.6-dvdread.patch 928
+AUX vls-0.5.6-64bit.patch 860 RMD160 7e0dc52b8515ce9378181247806ca83aad5b1f90 SHA1 5739c53ae154f0134f04a572ddbb2fb8aefb7f6e SHA256 4bc558814f0ae04c506f560679e58f85df33597af584a28901e418c701fff297 size 860
+MD5 36a2d57833ff4a27a44f0af7a3296674 files/vls-0.5.6-64bit.patch 860
+RMD160 7e0dc52b8515ce9378181247806ca83aad5b1f90 files/vls-0.5.6-64bit.patch 860
+SHA256 4bc558814f0ae04c506f560679e58f85df33597af584a28901e418c701fff297 files/vls-0.5.6-64bit.patch 860
+AUX vls-0.5.6-dvdread.patch 1266 RMD160 f9979cadbdfb0dc399f273ac86d146d840baa0c8 SHA1 e534b8613ec6fa0182905830ee894c5269a6f694 SHA256 019d1afd9fd6759df6c0a82db5a2b92106c2ae625cd6807cc38eb2ce93928cee size 1266
+MD5 b060177b2123d91e55f8367133c21469 files/vls-0.5.6-dvdread.patch 1266
+RMD160 f9979cadbdfb0dc399f273ac86d146d840baa0c8 files/vls-0.5.6-dvdread.patch 1266
+SHA256 019d1afd9fd6759df6c0a82db5a2b92106c2ae625cd6807cc38eb2ce93928cee files/vls-0.5.6-dvdread.patch 1266
+AUX vls-0.5.6-gcc34.patch 2553 RMD160 378c717c37a54f58d4730f1ecde158101c6e8f4b SHA1 170272b428bca0ff02e08e87a065f7dc6a7413af SHA256 3446c02b63d8e5155f5326be1ee8671921c697ae7b1d37abf78d8fc7108ec197 size 2553
 MD5 8f73d513b104c15745ca3a2b60cdd64d files/vls-0.5.6-gcc34.patch 2553
 RMD160 378c717c37a54f58d4730f1ecde158101c6e8f4b files/vls-0.5.6-gcc34.patch 2553
 SHA256 3446c02b63d8e5155f5326be1ee8671921c697ae7b1d37abf78d8fc7108ec197 files/vls-0.5.6-gcc34.patch 2553
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
-SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata.xml 225
+AUX vls-0.5.6-gmake-3.81.patch 1860 RMD160 436b8d82ce4d9f2c03d82f4fce421088e48962f5 SHA1 02b7623a4cefd5995159ed9fd4f711e764293670 SHA256 e0900003d412e729a5f70ff61d008e194262aaf893cb8375ee60055ade677137 size 1860
+MD5 7c6159a4ec02663e8f1b9e7e676b2646 files/vls-0.5.6-gmake-3.81.patch 1860
+RMD160 436b8d82ce4d9f2c03d82f4fce421088e48962f5 files/vls-0.5.6-gmake-3.81.patch 1860
+SHA256 e0900003d412e729a5f70ff61d008e194262aaf893cb8375ee60055ade677137 files/vls-0.5.6-gmake-3.81.patch 1860
+DIST vls-0.5.5.tar.gz 659096 RMD160 9cca36377221879f64797729cffd75535e6e8aab SHA256 5a1db24322ab5026f898d11514d57dbdd3ca37867e3032184975411783307c40 size 659096
+DIST vls-0.5.6.tar.gz 802915 RMD160 4f88c59b4fd96df1ea4d46b66467fa3287776c2c SHA256 cb2c8f95fef7eea031478759f2001722cf992cbc27abb87328524ef71dff4931 size 802915
+EBUILD vls-0.5.5-r1.ebuild 1025 RMD160 0db4e802dc53e2539d078335a77e225b544a5ca9 SHA1 37dc20a18b7373c5172ee257d528d844c3405622 SHA256 2a9ba5ae8be6240cff21a985dad0cece00c9b8e708d0578c0cbc0dc361cb3f87 size 1025
 MD5 24c0887b522d3a7dad704d0da1e473b3 vls-0.5.5-r1.ebuild 1025
 RMD160 0db4e802dc53e2539d078335a77e225b544a5ca9 vls-0.5.5-r1.ebuild 1025
 SHA256 2a9ba5ae8be6240cff21a985dad0cece00c9b8e708d0578c0cbc0dc361cb3f87 vls-0.5.5-r1.ebuild 1025
+EBUILD vls-0.5.5.ebuild 760 RMD160 964ec0fee46d8ea7f58633a308921e32bec575ce SHA1 e021a2c456f8c2ad1105cfe2e66f2f7b3360e591 SHA256 35aa91177767ebe8ba5a8da8497fe834e296877ac62d0197f410d53d6209ac5e size 760
 MD5 48e1a9390b117c0525b135c88ccfd0f4 vls-0.5.5.ebuild 760
 RMD160 964ec0fee46d8ea7f58633a308921e32bec575ce vls-0.5.5.ebuild 760
 SHA256 35aa91177767ebe8ba5a8da8497fe834e296877ac62d0197f410d53d6209ac5e vls-0.5.5.ebuild 760
+EBUILD vls-0.5.6-r1.ebuild 1034 RMD160 31c2b66ed3a5a117d3d7409786cb0440de94dadd SHA1 9d1ee6b70d8a6ebf7e8e805759e6912de599d259 SHA256 7f499915ca30b89332d4eb16ea7c29fe8085d70e6e4c4a738bc50b4bfe938e2d size 1034
 MD5 d7ba05ae9b07217ad1d3b9ab126041a0 vls-0.5.6-r1.ebuild 1034
 RMD160 31c2b66ed3a5a117d3d7409786cb0440de94dadd vls-0.5.6-r1.ebuild 1034
 SHA256 7f499915ca30b89332d4eb16ea7c29fe8085d70e6e4c4a738bc50b4bfe938e2d vls-0.5.6-r1.ebuild 1034
-MD5 fe1b610151bb5e031d7c1061743cb151 vls-0.5.6-r2.ebuild 1193
-RMD160 7433980c4197d2a7c993c7db126da416b2a4ee28 vls-0.5.6-r2.ebuild 1193
-SHA256 d4f8ac6ea81dd18ac0a3bc812caff3509a29568b3de32dbee0ee368ae8fd1e0f vls-0.5.6-r2.ebuild 1193
+EBUILD vls-0.5.6-r2.ebuild 1276 RMD160 e55912938308f46e7d698005a9ad33cbeddcc1b9 SHA1 bccfc8fd9b43cc4dd282d6d2f1c2e5b7a5b61388 SHA256 7f0e75dcb1cb11b97ffb212c70c4453dbf9bbe3c409e924826ce8242757c52dd size 1276
+MD5 ffe866d57b29d1d8b5f91504b1752371 vls-0.5.6-r2.ebuild 1276
+RMD160 e55912938308f46e7d698005a9ad33cbeddcc1b9 vls-0.5.6-r2.ebuild 1276
+SHA256 7f0e75dcb1cb11b97ffb212c70c4453dbf9bbe3c409e924826ce8242757c52dd vls-0.5.6-r2.ebuild 1276
+MISC ChangeLog 3028 RMD160 e435ad44612a2c6fbac4a60953c17f70364768e1 SHA1 a80789a031b5284cea4f1032f1e0a14a73fbe9d0 SHA256 572f9d94d3b441583bedc1c83a8e1020a96876e158adda8596234395fb34182b size 3028
+MD5 c00460ceda5c750b21fac4208b8f25fe ChangeLog 3028
+RMD160 e435ad44612a2c6fbac4a60953c17f70364768e1 ChangeLog 3028
+SHA256 572f9d94d3b441583bedc1c83a8e1020a96876e158adda8596234395fb34182b ChangeLog 3028
+MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 size 225
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
+SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata.xml 225
+MD5 01f568090383ac992cc0fd1c50cbc1c6 files/digest-vls-0.5.5 229
+RMD160 39c204daa45b6a4f7f126efe150aa704bf3d1794 files/digest-vls-0.5.5 229
+SHA256 0da4034e641805ec1267fbf55029db25c0348b8a32ffdc323b1cbc3194208393 files/digest-vls-0.5.5 229
+MD5 01f568090383ac992cc0fd1c50cbc1c6 files/digest-vls-0.5.5-r1 229
+RMD160 39c204daa45b6a4f7f126efe150aa704bf3d1794 files/digest-vls-0.5.5-r1 229
+SHA256 0da4034e641805ec1267fbf55029db25c0348b8a32ffdc323b1cbc3194208393 files/digest-vls-0.5.5-r1 229
+MD5 cb002bc2d70d5fccb3e9e1b0dc27ee46 files/digest-vls-0.5.6-r1 229
+RMD160 197524390fee8fa8b257bd4018c6883046475857 files/digest-vls-0.5.6-r1 229
+SHA256 e6de06a069a53ded0c2cf3fededa1df5d1082f4ad26cf84f1da4138d2cf03b50 files/digest-vls-0.5.6-r1 229
+MD5 cb002bc2d70d5fccb3e9e1b0dc27ee46 files/digest-vls-0.5.6-r2 229
+RMD160 197524390fee8fa8b257bd4018c6883046475857 files/digest-vls-0.5.6-r2 229
+SHA256 e6de06a069a53ded0c2cf3fededa1df5d1082f4ad26cf84f1da4138d2cf03b50 files/digest-vls-0.5.6-r2 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEQ7q+AiZjviIA2XgRAjL8AJwJ0RLoUDiscGqpfUdrdxc7A0zlzgCg8YVZ
-UvPrLtrEnOKT0LOvd5fO6cY=
-=JSC/
+iD8DBQFEbvmxAiZjviIA2XgRArm7AKDG2DkOnlpPwLbgeVYVIDcGvjM3cgCfflnh
+qKBEherInADXXXMB2SW19pY=
+=iP9G
 -----END PGP SIGNATURE-----
diff --git a/media-video/vls/files/digest-vls-0.5.5 b/media-video/vls/files/digest-vls-0.5.5
index 63c5addfa138..63d2937a617b 100644
--- a/media-video/vls/files/digest-vls-0.5.5
+++ b/media-video/vls/files/digest-vls-0.5.5
@@ -1 +1,3 @@
 MD5 c4ea13e1fa22572b383e7c666215d68b vls-0.5.5.tar.gz 659096
+RMD160 9cca36377221879f64797729cffd75535e6e8aab vls-0.5.5.tar.gz 659096
+SHA256 5a1db24322ab5026f898d11514d57dbdd3ca37867e3032184975411783307c40 vls-0.5.5.tar.gz 659096
diff --git a/media-video/vls/files/digest-vls-0.5.6-r1 b/media-video/vls/files/digest-vls-0.5.6-r1
index fa7a84d68388..a5cff958ee9e 100644
--- a/media-video/vls/files/digest-vls-0.5.6-r1
+++ b/media-video/vls/files/digest-vls-0.5.6-r1
@@ -1 +1,3 @@
 MD5 2844d8780efd69cafc0be3b398b9553d vls-0.5.6.tar.gz 802915
+RMD160 4f88c59b4fd96df1ea4d46b66467fa3287776c2c vls-0.5.6.tar.gz 802915
+SHA256 cb2c8f95fef7eea031478759f2001722cf992cbc27abb87328524ef71dff4931 vls-0.5.6.tar.gz 802915
diff --git a/media-video/vls/files/digest-vls-0.5.6-r2 b/media-video/vls/files/digest-vls-0.5.6-r2
index fa7a84d68388..a5cff958ee9e 100644
--- a/media-video/vls/files/digest-vls-0.5.6-r2
+++ b/media-video/vls/files/digest-vls-0.5.6-r2
@@ -1 +1,3 @@
 MD5 2844d8780efd69cafc0be3b398b9553d vls-0.5.6.tar.gz 802915
+RMD160 4f88c59b4fd96df1ea4d46b66467fa3287776c2c vls-0.5.6.tar.gz 802915
+SHA256 cb2c8f95fef7eea031478759f2001722cf992cbc27abb87328524ef71dff4931 vls-0.5.6.tar.gz 802915
diff --git a/media-video/vls/files/vls-0.5.6-64bit.patch b/media-video/vls/files/vls-0.5.6-64bit.patch
new file mode 100644
index 000000000000..6fa98d886d6d
--- /dev/null
+++ b/media-video/vls/files/vls-0.5.6-64bit.patch
@@ -0,0 +1,26 @@
+Index: vls-0.5.6/src/core/hashtable.cpp
+===================================================================
+--- vls-0.5.6.orig/src/core/hashtable.cpp
++++ vls-0.5.6/src/core/hashtable.cpp
+@@ -97,7 +97,7 @@ u32 C_HashMethod<u16>::Hash(u16 iKey) co
+ 
+ u32 C_HashMethod<handle>::Hash(handle hKey) const
+ {
+-  return (u32)hKey % m_uiMaxHash;
++  return static_cast<u32>((long)hKey % m_uiMaxHash);
+ }
+ 
+ 
+Index: vls-0.5.6/src/core/stream.cpp
+===================================================================
+--- vls-0.5.6.orig/src/core/stream.cpp
++++ vls-0.5.6/src/core/stream.cpp
+@@ -339,7 +339,7 @@ template <class IOStream>
+       while(iByteCount > 0 && iRc != FILE_EOF);
+ 
+       // Deserialize them
+-      cSerializer.SetNextBytes(&aBytes);
++      cSerializer.SetNextBytes(aBytes);
+ 
+       // Next iteration
+       iByteCount = cSerializer.NextBytesCount();
diff --git a/media-video/vls/files/vls-0.5.6-dvdread.patch b/media-video/vls/files/vls-0.5.6-dvdread.patch
index bd6ca5b7816c..7240831529d7 100644
--- a/media-video/vls/files/vls-0.5.6-dvdread.patch
+++ b/media-video/vls/files/vls-0.5.6-dvdread.patch
@@ -15,7 +15,14 @@ Index: vls-0.5.6/src/modules/dvdreader/dvdreader.cpp
 ===================================================================
 --- vls-0.5.6.orig/src/modules/dvdreader/dvdreader.cpp
 +++ vls-0.5.6/src/modules/dvdreader/dvdreader.cpp
-@@ -34,6 +34,7 @@
+@@ -28,12 +28,14 @@
+ //------------------------------------------------------------------------------
+ // Preamble
+ //------------------------------------------------------------------------------
++#define __STDC_LIMIT_MACROS // We're in C++ so we need to define this before stdint.h inclusion
+ #include "../../core/defs.h"
+ 
+ #include "../../core/core.h"
  
  #include "../../core/iso_lang.h"
  
diff --git a/media-video/vls/files/vls-0.5.6-gmake-3.81.patch b/media-video/vls/files/vls-0.5.6-gmake-3.81.patch
new file mode 100644
index 000000000000..ae3301a52b9a
--- /dev/null
+++ b/media-video/vls/files/vls-0.5.6-gmake-3.81.patch
@@ -0,0 +1,37 @@
+Index: vls-0.5.6/Makefile.dep
+===================================================================
+--- vls-0.5.6.orig/Makefile.dep
++++ vls-0.5.6/Makefile.dep
+@@ -49,16 +49,12 @@ default:
+ $(DEP): dep/%.dpp: src/%.cpp
+ 	@test -d dep/$(dir $*) || mkdir -p dep/$(dir $*)
+ 	@echo "Generating dependancies for $<..."
+-	@$(SHELL) -ec '$(CXX) $(DCFLAGS) $(INCLUDE) $< \
+-	| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/src\/$(subst /,\/,$*).o \
+-	dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
++	@$(SHELL) -ec '$(CXX) $(DCFLAGS) $(INCLUDE) $< | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/src\/$(subst /,\/,$*).o dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
+ 	[ -s $@ ] || rm -f $@'
+ 
+ $(C_DEP): dep/%.d: src/%.c
+ 	@test -d dep/$(dir $*) || mkdir -p dep/$(dir $*)
+ 	@echo "Generating dependancies for $<..."
+-	@$(SHELL) -ec '$(CC) $(DCFLAGS) $(INCLUDE) $< \
+-	| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/src\/$(subst /,\/,$*).o \
+-	dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
++	@$(SHELL) -ec '$(CC) $(DCFLAGS) $(INCLUDE) $< | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/src\/$(subst /,\/,$*).o dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
+ 	[ -s $@ ] || rm -f $@'
+ 
+Index: vls-0.5.6/Makefile.module.dep
+===================================================================
+--- vls-0.5.6.orig/Makefile.module.dep
++++ vls-0.5.6/Makefile.module.dep
+@@ -49,8 +49,6 @@ default:
+ $(MODULE_DEP): dep/%.d: %.cpp
+ 	@test -d dep/$(dir $*) || mkdir -p dep/$(dir $*)
+ 	@echo "Generating dependancies for $<..."
+-	@$(SHELL) -ec '$(CXX) $(DCFLAGS) $(MODULE_DCFLAGS) $(INCLUDE) $< \
+-	| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \
+-	dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
++	@$(SHELL) -ec '$(CXX) $(DCFLAGS) $(MODULE_DCFLAGS) $(INCLUDE) $< | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
+ 	[ -s $@ ] || rm -f $@'
+ 
diff --git a/media-video/vls/vls-0.5.6-r2.ebuild b/media-video/vls/vls-0.5.6-r2.ebuild
index cf6fe9b52217..2c3dbd55bb86 100644
--- a/media-video/vls/vls-0.5.6-r2.ebuild
+++ b/media-video/vls/vls-0.5.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.11 2006/04/17 15:59:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vls/vls-0.5.6-r2.ebuild,v 1.12 2006/05/20 11:12:42 flameeyes Exp $
 
 inherit eutils
 
@@ -28,6 +28,8 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-gcc34.patch"
 	epatch "${FILESDIR}/${P}-dvdread.patch"
+	epatch "${FILESDIR}/${P}-gmake-3.81.patch"
+	epatch "${FILESDIR}/${P}-64bit.patch"
 }
 
 src_compile() {