diff options
| author |   Anders Rune Jensen <arj@gentoo.org> | 2005-02-16 17:23:23 +0000 |
|---|---|---|
| committer | Anders Rune Jensen <arj@gentoo.org> | 2005-02-16 17:23:23 +0000 |
| commit | a3e4f59a274d25cf7d6d02924ef09ef2be5bb8c6 (patch) | |
| tree | c370a24096fbb030c2cc9d494b31e68ab105dea7 /media-video/cxfe/files | |
| parent | Fix deps and removed all the unnecessary confutils stuff. Removed mod-cache,m... (diff) | |
| download | gentoo-2-a3e4f59a274d25cf7d6d02924ef09ef2be5bb8c6.tar.gz gentoo-2-a3e4f59a274d25cf7d6d02924ef09ef2be5bb8c6.tar.bz2 gentoo-2-a3e4f59a274d25cf7d6d02924ef09ef2be5bb8c6.zip | |
fixed patches
(Portage version: 2.0.51-r15)
Diffstat (limited to 'media-video/cxfe/files')
| -rw-r--r-- | media-video/cxfe/files/gcc-2.95-fix.patch | 46 | ||||
| -rw-r--r-- | media-video/cxfe/files/max-osd-fix.patch | 68 |
2 files changed, 57 insertions, 57 deletions
diff --git a/media-video/cxfe/files/gcc-2.95-fix.patch b/media-video/cxfe/files/gcc-2.95-fix.patch index 9f1b1e4b4eb2..4f8b7f934490 100644 --- a/media-video/cxfe/files/gcc-2.95-fix.patch +++ b/media-video/cxfe/files/gcc-2.95-fix.patch @@ -1,23 +1,23 @@ ---- cxfe/cxfe.c 2004-11-27 03:07:59.000000000 +0100
-+++ cxfe-0.91/cxfe.c 2004-11-30 11:32:48.230792288 +0100
-@@ -955,6 +955,9 @@
- static pthread_t lirc_thread;
- static pthread_t osd_thread;
- int err;
-+ int dvd_mrl = 0;
-+ int vcd_mrl = 0;
-+ int cd_mrl = 0;
- /* default values */
- fullscreen = 0;
-
-@@ -1075,10 +1078,6 @@
- xine_init(cxfe.xine);
-
- // check which mrl types was specified:
-- int dvd_mrl = 0;
-- int vcd_mrl = 0;
-- int cd_mrl = 0;
--
- for(i = 0; i < m; i++){
- if (strstr(mrl[i], "dvd:"))
- dvd_mrl = 1;
+--- cxfe/cxfe.c 2004-11-27 03:07:59.000000000 +0100 ++++ cxfe-0.91/cxfe.c 2004-11-30 11:32:48.230792288 +0100 +@@ -955,6 +955,9 @@ + static pthread_t lirc_thread; + static pthread_t osd_thread; + int err; ++ int dvd_mrl = 0; ++ int vcd_mrl = 0; ++ int cd_mrl = 0; + /* default values */ + fullscreen = 0; + +@@ -1075,10 +1078,6 @@ + xine_init(cxfe.xine); + + // check which mrl types was specified: +- int dvd_mrl = 0; +- int vcd_mrl = 0; +- int cd_mrl = 0; +- + for(i = 0; i < m; i++){ + if (strstr(mrl[i], "dvd:")) + dvd_mrl = 1; diff --git a/media-video/cxfe/files/max-osd-fix.patch b/media-video/cxfe/files/max-osd-fix.patch index e6fc4660f110..92847a9a4d09 100644 --- a/media-video/cxfe/files/max-osd-fix.patch +++ b/media-video/cxfe/files/max-osd-fix.patch @@ -1,34 +1,34 @@ ---- cxfe.c 2004-11-27 03:07:59.000000000 +0100
-+++ cxfe-max-osd.c 2004-12-11 18:22:29.171711112 +0100
-@@ -125,11 +125,22 @@
- // if(fbxine.osd.enabled) {
- va_list args;
- char *buf;
-- int n, size = 100;
-+ int n, size = 47;
-
- if((buf = xine_xmalloc(size)) == NULL)
- return;
-
-+ va_start(args, info);
-+ n = vsnprintf(buf, size, info, args);
-+ va_end(args);
-+
-+ buf = realloc(buf, size+3);
-+ buf[size-1] = '.';
-+ buf[size] = '.';
-+ buf[size+1] = '.';
-+ buf[size+2] = '\0';
-+
-+#if 0
- while(1) {
-
- va_start(args, info);
-@@ -147,6 +158,7 @@
- if((buf = realloc(buf, size)) == NULL)
- return;
- }
-+#endif
-
- xine_osd_clear(osd);
-
+--- cxfe.c 2004-11-27 03:07:59.000000000 +0100 ++++ cxfe-max-osd.c 2004-12-11 18:22:29.171711112 +0100 +@@ -125,11 +125,22 @@ + // if(fbxine.osd.enabled) { + va_list args; + char *buf; +- int n, size = 100; ++ int n, size = 47; + + if((buf = xine_xmalloc(size)) == NULL) + return; + ++ va_start(args, info); ++ n = vsnprintf(buf, size, info, args); ++ va_end(args); ++ ++ buf = realloc(buf, size+3); ++ buf[size-1] = '.'; ++ buf[size] = '.'; ++ buf[size+1] = '.'; ++ buf[size+2] = '\0'; ++ ++#if 0 + while(1) { + + va_start(args, info); +@@ -147,6 +158,7 @@ + if((buf = realloc(buf, size)) == NULL) + return; + } ++#endif + + xine_osd_clear(osd); + |