diff options
| author |   Davide Cendron <scen@gentoo.org> | 2007-12-04 22:33:53 +0000 |
|---|---|---|
| committer | Davide Cendron <scen@gentoo.org> | 2007-12-04 22:33:53 +0000 |
| commit | e44d81da4ab3bf740d6cb493fa05c834a1cb30c1 (patch) | |
| tree | c32ca9ae1723c00047658630006bebd99f2b6348 | |
| parent | net-p2p/freenet/Manifest: Another upstream release (diff) | |
| download | sunrise-e44d81da4ab3bf740d6cb493fa05c834a1cb30c1.tar.gz sunrise-e44d81da4ab3bf740d6cb493fa05c834a1cb30c1.tar.bz2 sunrise-e44d81da4ab3bf740d6cb493fa05c834a1cb30c1.zip | |
games-fps/vavoom: Added patch to fix compile failure with media-libs/flac-1.2*
svn path=/sunrise/; revision=5216
| -rw-r--r-- | games-fps/vavoom/ChangeLog | 4 | ||||
| -rw-r--r-- | games-fps/vavoom/Manifest | 5 | ||||
| -rw-r--r-- | games-fps/vavoom/files/vavoom-1.25_flac-1.2_fix.patch | 38 | ||||
| -rw-r--r-- | games-fps/vavoom/vavoom-1.25.ebuild | 2 |
4 files changed, 47 insertions, 2 deletions
diff --git a/games-fps/vavoom/ChangeLog b/games-fps/vavoom/ChangeLog index 25944aa76..3644d16bb 100644 --- a/games-fps/vavoom/ChangeLog +++ b/games-fps/vavoom/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Dec 2007; Davide Cendron (scen) <scen@gentoo.org> + +files/vavoom-1.25_flac-1.2_fix.patch, vavoom-1.25.ebuild: + Added patch to fix compile failure with media-libs/flac-1.2* + 13 Oct 2007; Jakub Moc <jakub@gentoo.org> vavoom-1.25.ebuild, vavoom-9999.ebuild: Sanitize built_with_use checks so that we do not die too many times. Remove diff --git a/games-fps/vavoom/Manifest b/games-fps/vavoom/Manifest index 7367699bf..696809f83 100644 --- a/games-fps/vavoom/Manifest +++ b/games-fps/vavoom/Manifest @@ -1,6 +1,7 @@ +AUX vavoom-1.25_flac-1.2_fix.patch 1466 RMD160 8b54e99dad99773cdcba8356df36f28280f71e53 SHA1 2e9fd55909f483fde115e94bbd59586b64ef3815 SHA256 dea733f6c69d4b1e0b9ea797fc4d68b8877455accbdfd64d66745d4c6b273273 AUX vavoom-makefile_nowrapper.patch 3235 RMD160 b04e87de8068e2d290387998d34701e2a3a58b30 SHA1 5e5f3b0da0c9ca975cb9606e5684bb5e21e3d7de SHA256 23266e9e536cafb766155d6b6899f358d7dd0489ce61e2b9bec9ec567d0ac7d9 DIST vavoom-1.25.tar.bz2 1731228 RMD160 fd974a5fabec6501b4683784367f2f616373c55d SHA1 d0ef203ef614318ed6ac0040f8da5d76cf8770d4 SHA256 bba1ac08ff82ca77da684af049ac68fa16dbb099755e41372b82ec6817b140ba -EBUILD vavoom-1.25.ebuild 6386 RMD160 b1e2ac093a462730248a579058eb84982a34075c SHA1 064bf104a55dd144bd48df3879dda6682fa18231 SHA256 0be8da672f77d8cd2efda29541131e0c26f21609e66e7bcd55887f1dd6f02b04 +EBUILD vavoom-1.25.ebuild 6479 RMD160 e65e7d1046d3c68f60eab4371b40fc8483bbcabe SHA1 b736c92389efae072910cca5b2071c622f858223 SHA256 a9274b035aa93729043b8d6e0f7f92c952d1fa00f9f0440729415a620d5c5ee0 EBUILD vavoom-9999.ebuild 6449 RMD160 89e329bca2caea0f0802fc0f1b0a1e2fb67d96db SHA1 0e2a1b5e997f4cd311c387d0c5a4dad4a3db5a3c SHA256 bf0ad0fdd9bf02a8c5b13a76476551a804d66e7c86fd0655f5056bab1d6236e0 -MISC ChangeLog 2747 RMD160 119d15d39cb8b7f13a4f0b09e3ec225023885d20 SHA1 149fed5da0d67b3d8bbe3d5503bbbb0b48d982df SHA256 cccb2105decfd8dc76cb22b9deb2f70c75b09d4edd53e29b0120eddeab48dd43 +MISC ChangeLog 2927 RMD160 68b48f5ccdfad2eee4fa41861a7314176532d757 SHA1 8183f8a7644ca0cff932c44b9965f6d46c4f00c8 SHA256 09a8e1d796094a578b24fbd77ad1e181cdf277f7ec76e1a0cb70a0d4f3dafdaf MISC metadata.xml 303 RMD160 626272995441b20fd23b1d0a94603e98b97b0f1e SHA1 f3cae1ec3568e7717d7265a58d0b2e6d8efe88b5 SHA256 334d9b64af3b010a9fcdcbd8736eba2f81ff9d87dee3eb76b5adacb7d48afa37 diff --git a/games-fps/vavoom/files/vavoom-1.25_flac-1.2_fix.patch b/games-fps/vavoom/files/vavoom-1.25_flac-1.2_fix.patch new file mode 100644 index 000000000..95b7d53c8 --- /dev/null +++ b/games-fps/vavoom/files/vavoom-1.25_flac-1.2_fix.patch @@ -0,0 +1,38 @@ +--- source/s_flac.cpp 2007/04/28 14:56:23 2210 ++++ source/s_flac.cpp 2007/11/17 10:08:50 2809 +@@ -54,7 +54,7 @@ + protected: + // FLAC decoder callbacks. + ::FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[], +- unsigned *bytes); ++ size_t *bytes); + ::FLAC__StreamDecoderWriteStatus write_callback( + const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[]); + void metadata_callback(const ::FLAC__StreamMetadata *metadata); +@@ -92,7 +92,7 @@ + protected: + // FLAC decoder callbacks. + ::FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[], +- unsigned *bytes); ++ size_t* bytes); + ::FLAC__StreamDecoderWriteStatus write_callback( + const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[]); + void metadata_callback(const ::FLAC__StreamMetadata *metadata); +@@ -199,7 +199,7 @@ + //========================================================================== + + ::FLAC__StreamDecoderReadStatus VFlacSampleLoader::FStream::read_callback( +- FLAC__byte buffer[], unsigned* bytes) ++ FLAC__byte buffer[], size_t* bytes) + { + guard(VFlacSampleLoader::FStream::read_callback); + if (*bytes > 0) +@@ -477,7 +477,7 @@ + //========================================================================== + + ::FLAC__StreamDecoderReadStatus VFlacAudioCodec::FStream::read_callback( +- FLAC__byte buffer[], unsigned* bytes) ++ FLAC__byte buffer[], size_t* bytes) + { + guard(VFlacAudioCodec::FStream::read_callback); + if (*bytes > 0) diff --git a/games-fps/vavoom/vavoom-1.25.ebuild b/games-fps/vavoom/vavoom-1.25.ebuild index df85a6a33..1d3303d75 100644 --- a/games-fps/vavoom/vavoom-1.25.ebuild +++ b/games-fps/vavoom/vavoom-1.25.ebuild @@ -108,6 +108,8 @@ src_unpack() { # Patch Makefiles to get rid of executable wrappers epatch "${FILESDIR}/${PN}-makefile_nowrapper.patch" + # Patch for compiling issue against flac-1.2* + epatch "${FILESDIR}/${P}_flac-1.2_fix.patch" # Set shared directory sed -i \ |