diff options
| author |   Christian Heim <phreak@gentoo.org> | 2007-02-02 14:50:46 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2007-02-02 14:50:46 +0000 |
| commit | 7b8da05fdb71284deecdeb9f624590a113d04784 (patch) | |
| tree | 390f7f473f80127a8a00864b1b568917f6a539ec /hardened/media-video | |
| parent | media-video/mplayer: Fixed ebuild for usage on hardened (PaX-enabled) boxen. (diff) | |
| download | phreak-7b8da05fdb71284deecdeb9f624590a113d04784.tar.gz phreak-7b8da05fdb71284deecdeb9f624590a113d04784.tar.bz2 phreak-7b8da05fdb71284deecdeb9f624590a113d04784.zip | |
media-video/mplayer: Adding missing patch.
svn path=/; revision=224
Diffstat (limited to 'hardened/media-video')
| -rw-r--r-- | hardened/media-video/mplayer/Manifest | 4 | ||||
| -rw-r--r-- | hardened/media-video/mplayer/files/mplayer-1.0_rc1-asmrules.patch | 51 |
2 files changed, 55 insertions, 0 deletions
diff --git a/hardened/media-video/mplayer/Manifest b/hardened/media-video/mplayer/Manifest index 7654881..7c7ec9a 100644 --- a/hardened/media-video/mplayer/Manifest +++ b/hardened/media-video/mplayer/Manifest @@ -2,6 +2,10 @@ AUX mplayer-1.0_pre8-amr-64bit.patch 1438 RMD160 c0848ae29590b5cc011d252798115cc MD5 7c7e0313f90c399e78c4496b07bb5f82 files/mplayer-1.0_pre8-amr-64bit.patch 1438 RMD160 c0848ae29590b5cc011d252798115cc66af37335 files/mplayer-1.0_pre8-amr-64bit.patch 1438 SHA256 7bcc9351707571a80c6a8c52381ad8f3f980e2e570091196df61880d019c9d51 files/mplayer-1.0_pre8-amr-64bit.patch 1438 +AUX mplayer-1.0_rc1-asmrules.patch 1450 RMD160 370877b45b314c9deb2d89739f8067a4a77c0844 SHA1 84412f4bd85d64a92586ca4db7e8585d16cd1acd SHA256 3f71e6f4e07940d4d55084d0df12404371bc4e534a3a6b0756ca73e44ddbc3c4 +MD5 f0b71c38b1207c1d604be091876ac051 files/mplayer-1.0_rc1-asmrules.patch 1450 +RMD160 370877b45b314c9deb2d89739f8067a4a77c0844 files/mplayer-1.0_rc1-asmrules.patch 1450 +SHA256 3f71e6f4e07940d4d55084d0df12404371bc4e534a3a6b0756ca73e44ddbc3c4 files/mplayer-1.0_rc1-asmrules.patch 1450 AUX mplayer-undefined-reference-fix.patch 316 RMD160 cbbcc1df4e0011f12baffdbae3ec6037123e628e SHA1 63a8b250a9e3e929549f10786000daf5fab9bc3a SHA256 1b7004af914727c1710602dfef3dd2828896f5d4f309c1742ee0dcbd1989b346 MD5 04bb7e15784fc0b9898526d873bc1ba9 files/mplayer-undefined-reference-fix.patch 316 RMD160 cbbcc1df4e0011f12baffdbae3ec6037123e628e files/mplayer-undefined-reference-fix.patch 316 diff --git a/hardened/media-video/mplayer/files/mplayer-1.0_rc1-asmrules.patch b/hardened/media-video/mplayer/files/mplayer-1.0_rc1-asmrules.patch new file mode 100644 index 0000000..87bab25 --- /dev/null +++ b/hardened/media-video/mplayer/files/mplayer-1.0_rc1-asmrules.patch @@ -0,0 +1,51 @@ +Index: stream/realrtsp/asmrp.c +=================================================================== +--- stream/realrtsp/asmrp.c (revision 20381) ++++ stream/realrtsp/asmrp.c (working copy) +@@ -40,6 +40,7 @@ + #include <stdlib.h> + #include <stdio.h> + #include <string.h> ++#include "asmrp.h" + + /* + #define LOG +@@ -645,8 +646,10 @@ + #ifdef LOG + printf ("rule #%d is true\n", rule_num); + #endif +- matches[num_matches] = rule_num; +- num_matches++; ++ if(num_matches < MAX_RULEMATCHES - 1) ++ matches[num_matches++] = rule_num; ++ else ++ printf("Ignoring matched asm rule %d, too many matched rules.\n", rule_num); + } + + rule_num++; +Index: stream/realrtsp/real.c +=================================================================== +--- stream/realrtsp/real.c (revision 20381) ++++ stream/realrtsp/real.c (working copy) +@@ -271,7 +271,7 @@ + int j=0; + int n; + char b[64]; +- int rulematches[16]; ++ int rulematches[MAX_RULEMATCHES]; + + #ifdef LOG + printf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth); +Index: stream/realrtsp/asmrp.h +=================================================================== +--- stream/realrtsp/asmrp.h (revision 20381) ++++ stream/realrtsp/asmrp.h (working copy) +@@ -40,6 +40,8 @@ + #ifndef HAVE_ASMRP_H + #define HAVE_ASMRP_H + ++#define MAX_RULEMATCHES 16 ++ + int asmrp_match (const char *rules, int bandwidth, int *matches) ; + + #endif |