| 1 |
aballier 08/03/27 11:30:45 |
| 2 |
|
| 3 |
Modified: series |
| 4 |
Added: 360_all_cplusplus_min.patch |
| 5 |
Log: |
| 6 |
add a patch for bug #214809 |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 src/patchsets/vlc/0.8.6e/series |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6e/series?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6e/series?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6e/series?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: series |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/0.8.6e/series,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- series 22 Mar 2008 17:16:32 -0000 1.1 |
| 22 |
+++ series 27 Mar 2008 11:30:44 -0000 1.2 |
| 23 |
@@ -13,3 +13,4 @@ |
| 24 |
330_all_libdca.patch |
| 25 |
340_all_CVE-2008-0073.patch |
| 26 |
350_all_CVE-2007-6681.patch |
| 27 |
+360_all_cplusplus_min.patch |
| 28 |
|
| 29 |
|
| 30 |
|
| 31 |
1.1 src/patchsets/vlc/0.8.6e/360_all_cplusplus_min.patch |
| 32 |
|
| 33 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6e/360_all_cplusplus_min.patch?rev=1.1&view=markup |
| 34 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6e/360_all_cplusplus_min.patch?rev=1.1&content-type=text/plain |
| 35 |
|
| 36 |
Index: 360_all_cplusplus_min.patch |
| 37 |
=================================================================== |
| 38 |
https://bugs.gentoo.org/show_bug.cgi?id=214809 |
| 39 |
|
| 40 |
commit 8c55b82642441491f14486744abf6a145cd7d7db |
| 41 |
Author: Jean-Baptiste Kempf <jb@××××××××.org> |
| 42 |
Date: Mon Feb 18 08:59:43 2008 +0000 |
| 43 |
|
| 44 |
MKV: use __MIN instead of min( |
| 45 |
|
| 46 |
Index: vlc-0.8.6e/modules/demux/mkv.cpp |
| 47 |
=================================================================== |
| 48 |
--- vlc-0.8.6e.orig/modules/demux/mkv.cpp |
| 49 |
+++ vlc-0.8.6e/modules/demux/mkv.cpp |
| 50 |
@@ -5845,7 +5845,7 @@ bool dvd_chapter_codec_c::Enter() |
| 51 |
binary *p_data = (*index)->GetBuffer(); |
| 52 |
size_t i_size = *p_data++; |
| 53 |
// avoid reading too much from the buffer |
| 54 |
- i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 ); |
| 55 |
+ i_size = __MIN( i_size, ((*index)->GetSize() - 1) >> 3 ); |
| 56 |
for ( ; i_size > 0; i_size--, p_data += 8 ) |
| 57 |
{ |
| 58 |
msg_Dbg( &sys.demuxer, "Matroska DVD enter command" ); |
| 59 |
@@ -5868,7 +5868,7 @@ bool dvd_chapter_codec_c::Leave() |
| 60 |
binary *p_data = (*index)->GetBuffer(); |
| 61 |
size_t i_size = *p_data++; |
| 62 |
// avoid reading too much from the buffer |
| 63 |
- i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 ); |
| 64 |
+ i_size = __MIN( i_size, ((*index)->GetSize() - 1) >> 3 ); |
| 65 |
for ( ; i_size > 0; i_size--, p_data += 8 ) |
| 66 |
{ |
| 67 |
msg_Dbg( &sys.demuxer, "Matroska DVD leave command" ); |
| 68 |
|
| 69 |
|
| 70 |
|
| 71 |
-- |
| 72 |
gentoo-commits@l.g.o mailing list |
Archives