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 | ab66ba5429d7042f136566dfa5439af56128292e (patch) | |
| tree | 59b135b47cc8fef92cccafe8a64315e446d61bbf /media-video | |
| parent | Fix deps and removed all the unnecessary confutils stuff. Removed mod-cache,m... (diff) | |
| download | historical-ab66ba5429d7042f136566dfa5439af56128292e.tar.gz historical-ab66ba5429d7042f136566dfa5439af56128292e.tar.bz2 historical-ab66ba5429d7042f136566dfa5439af56128292e.zip | |
fixed patches
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/cxfe/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/cxfe/Manifest | 6 | ||||
| -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 |
4 files changed, 65 insertions, 61 deletions
diff --git a/media-video/cxfe/ChangeLog b/media-video/cxfe/ChangeLog index 6ff35adeada3..8b5884874a41 100644 --- a/media-video/cxfe/ChangeLog +++ b/media-video/cxfe/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for media-video/cxfe # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.7 2005/01/15 04:48:31 arj Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.8 2005/02/16 17:23:23 arj Exp $ + 16 Feb 2005; Anders Rune Jensen <arj@gentoo.org> + files/gcc-2.95-fix.patch, files/max-osd-fix.patch: + Convert these two patches from dos format to unix. Hopefully fixing #81523. + 15 Jan 2005; Anders Rune Jensen <arj@gentoo.org> +cxfe-0.9.1-r1.ebuild: Two more patches, one to disable dpms in x11 fullscreen and another to add a status button. diff --git a/media-video/cxfe/Manifest b/media-video/cxfe/Manifest index 9a7d0911c5a9..16ee1d2febbd 100644 --- a/media-video/cxfe/Manifest +++ b/media-video/cxfe/Manifest @@ -2,13 +2,13 @@ MD5 548bc0365bacecc9bfae8ae63cde8aa7 cxfe-0.9.1-r1.ebuild 860 MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247 MD5 61fb77a7bb61267e9b13868822cb977b cxfe-0.7.5.ebuild 726 MD5 2cb0434e33ab18e72b127dee21def79b cxfe-0.9.1.ebuild 777 -MD5 b150b3f07e31f4717ae8cbb62ddbf41a ChangeLog 1158 +MD5 af933f2c29d5c6c5091d12afe082376d ChangeLog 1342 MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1-r1 61 MD5 0d403e10e19e0524e5687b7dcdc710c2 files/disable-dpms.patch 3277 MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1 61 MD5 8b9e755c332942ee010472cb4db6a68f files/Makefile-fix.patch 1509 MD5 ff4bdfd3b211f4b6a82e9e01ba4e9151 files/position-osd.patch 2771 MD5 d75978f6e55a95ec4a87ba6144aaea71 files/digest-cxfe-0.7.5 61 -MD5 aa89d08a6f878178dee16433cc4a194c files/gcc-2.95-fix.patch 606 +MD5 09a6bfee8d8313dd6ff3acb30b4dad33 files/gcc-2.95-fix.patch 583 MD5 b3b0eb83642ffd1d2e89799f70169edb files/xv-default.patch 650 -MD5 dab7b66c0f22d379e2e525f9b94903b5 files/max-osd-fix.patch 762 +MD5 b7df88994713f7337645ce491f5d76d9 files/max-osd-fix.patch 728 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); + |