Darcsweb-Url:
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.5;a=darcs_commitdiff;h=20070105112213-dd049-2b8008ac97e2278b2b2204cdb942eaa034ff3980.gz;
[mplayer-1.0pre8-6siwenna1-x86_64
voroskoi <[EMAIL PROTECTED]>**20070105112213
secfix relbump, closes #1573
] {
addfile ./source/xapps/mplayer/asmrules_fix_20061231.diff
hunk ./source/xapps/mplayer/FrugalBuild 1
-# Last modified: Tue, 05 Sep 2006 15:44:29 +0200
hunk ./source/xapps/mplayer/FrugalBuild 7
-pkgrel=5
+pkgrel=6siwenna1
hunk ./source/xapps/mplayer/FrugalBuild 23
- http://www.mplayerhq.hu/MPlayer/skins/Blue-1.6.tar.bz2 \
+ http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 \
hunk ./source/xapps/mplayer/FrugalBuild 28
- $pkgname-1.0pre7-lzo2.patch.bz2 fix-newer-x264.patch)
-sha1sums=('8a0929b84dcb37d47c062230ce693b64b3e30921' \
- 'f7492d46afc72678435b70fa4326dbbf32795ba9' \
- '7135e8bf05cee6b123b81fa2a2c6ab18a27af615' \
- '2a082bdef2f5eebc403c234a036949f38683da06' \
- 'ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68' \
- '152c40bf20de34aa8802d7f80d34d673b0b67212' \
- '7b99bbe0e9ba89a57eccbea8f93c453c4f268181' \
- '2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d' \
- '45c4adbe6ab3063b68938c813966948aebf15ce3' \
- 'fd01f3df7a94c31f542747420fd9fe040043229c')
+ $pkgname-1.0pre7-lzo2.patch.bz2 fix-newer-x264.patch \
+ asmrules_fix_20061231.diff)
hunk ./source/xapps/mplayer/FrugalBuild 37
- Fpatch 00-$pkgname.conf.patch
- Fpatch 01-$pkgname.desktop.patch
- Fpatch $pkgname-1.0pre7-lzo2.patch
- Fpatch fix-newer-x264.patch
+ Fpatchall
hunk ./source/xapps/mplayer/FrugalBuild 66
+sha1sums=('8a0929b84dcb37d47c062230ce693b64b3e30921' \
+ 'f7492d46afc72678435b70fa4326dbbf32795ba9' \
+ '7135e8bf05cee6b123b81fa2a2c6ab18a27af615' \
+ '45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9' \
+ 'ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68' \
+ '152c40bf20de34aa8802d7f80d34d673b0b67212' \
+ '7b99bbe0e9ba89a57eccbea8f93c453c4f268181' \
+ '2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d' \
+ '45c4adbe6ab3063b68938c813966948aebf15ce3' \
+ 'fd01f3df7a94c31f542747420fd9fe040043229c' \
+ 'd6509987e509bd39f168bd4afe6227af48cd3a48')
hunk ./source/xapps/mplayer/asmrules_fix_20061231.diff 1
+Index: stream/realrtsp/asmrp.c
+===================================================================
+--- mplayer/libmpdemux/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
+===================================================================
+--- mplayer/libmpdemux/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
+===================================================================
+--- mplayer/libmpdemux/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
}
_______________________________________________
Frugalware-darcs mailing list
Frugalware-darcs@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-darcs
