new patch

Package-Manager: portage-2.0.51-r15

3 files changed, 21 insertions, 48 deletions

diff --git a/media-video/cxfe/ChangeLog b/media-video/cxfe/ChangeLog
index 491508f33abb..601f0ffb0ca3 100644
--- a/media-video/cxfe/ChangeLog
+++ b/media-video/cxfe/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/cxfe
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.9 2005/02/24 16:42:11 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.10 2005/03/01 23:08:37 arj Exp $
+
+  01 Mar 2005; Anders Rune Jensen <arj@gentoo.org> files/position-osd.patch:
+  Better position patch.
 
   24 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> cxfe-0.9.1-r1.ebuild:
   apllied a patch to fix #82684.
diff --git a/media-video/cxfe/Manifest b/media-video/cxfe/Manifest
index 6ed835919ab5..16dd192ad278 100644
--- a/media-video/cxfe/Manifest
+++ b/media-video/cxfe/Manifest
@@ -1,14 +1,14 @@
-MD5 2cb0434e33ab18e72b127dee21def79b cxfe-0.9.1.ebuild 777
 MD5 230829ed724534f0e29a6e25ad110700 cxfe-0.9.1-r1.ebuild 963
-MD5 1cf8384e8971c25b097845d4dd97ca60 ChangeLog 1456
-MD5 188a07f7158101735aab4f71ac18ee61 cxfe-0.7.5.ebuild 732
 MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247
+MD5 188a07f7158101735aab4f71ac18ee61 cxfe-0.7.5.ebuild 732
+MD5 2cb0434e33ab18e72b127dee21def79b cxfe-0.9.1.ebuild 777
+MD5 694ed280f5b9f223c034d2486371152e ChangeLog 1554
+MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1-r1 61
 MD5 0d403e10e19e0524e5687b7dcdc710c2 files/disable-dpms.patch 3277
-MD5 ff4bdfd3b211f4b6a82e9e01ba4e9151 files/position-osd.patch 2771
-MD5 b3b0eb83642ffd1d2e89799f70169edb files/xv-default.patch 650
-MD5 09a6bfee8d8313dd6ff3acb30b4dad33 files/gcc-2.95-fix.patch 583
+MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1 61
 MD5 8b9e755c332942ee010472cb4db6a68f files/Makefile-fix.patch 1509
+MD5 89258150099c21b29f6ba5c5f27cdb56 files/position-osd.patch 1784
 MD5 d75978f6e55a95ec4a87ba6144aaea71 files/digest-cxfe-0.7.5 61
-MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1 61
-MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1-r1 61
+MD5 09a6bfee8d8313dd6ff3acb30b4dad33 files/gcc-2.95-fix.patch 583
+MD5 b3b0eb83642ffd1d2e89799f70169edb files/xv-default.patch 650
 MD5 b7df88994713f7337645ce491f5d76d9 files/max-osd-fix.patch 728
diff --git a/media-video/cxfe/files/position-osd.patch b/media-video/cxfe/files/position-osd.patch
index 00faa4b18dc0..2d04a38c14cd 100644
--- a/media-video/cxfe/files/position-osd.patch
+++ b/media-video/cxfe/files/position-osd.patch
@@ -1,25 +1,12 @@
-Common subdirectories: cxfe/CVS and cxfe-mod/CVS
-diff -uN cxfe/README cxfe-mod/README
---- cxfe/README	2004-11-27 03:32:10.000000000 +0100
-+++ cxfe-mod/README	2005-01-15 06:26:10.714383896 +0100
-@@ -91,6 +91,7 @@
- Up Arrow - increases Volume
- Down Arrow - decrease Volume
- f - Full Screen/Window Toggle (X only)
-+o - Display position in stream
- d - Toggle Deinterlace/post processing (uses default or post set with
-     -p switch)
- s - Skip to next MRL if multiple MRLS supplied.  If only one
-diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c
 --- cxfe/cxfe.c	2004-11-27 03:07:59.000000000 +0100
-+++ cxfe-mod/cxfe.c	2005-01-15 06:30:27.162397872 +0100
-@@ -476,6 +476,27 @@
++++ cxfe-mod/cxfe.c	2005-03-01 23:37:18.394875952 +0100
+@@ -476,6 +476,28 @@
     percent_done = (ltime/llength)*100;
     printf("Time:%d sec Length:%d sec \n",ltime/1000,llength/1000);
  }
 +static void print_osd_status()
 +{
-+   int               lpos, ltime, llength;
++   int	     lpos, ltime, llength;
 +   int	     percent_done;
 +   
 +   
@@ -35,13 +22,14 @@ diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c
 +   int tot_min = (llength/1000-tot_hour*60*60)/60;
 +   int tot_sec= llength/1000-tot_hour*60*60-tot_min*60;
 +   
-+   osd_display_info("%d:%d:%d / %d:%d:%d (%d%%)", cur_hour, cur_min, cur_sec, 
-+		    tot_hour, tot_min, tot_sec, percent_done);
++   osd_display_info("%02d:%02d:%02d / %02d:%02d:%02d (%2d%%)", cur_hour, 
++		    cur_min, cur_sec, tot_hour, tot_min, tot_sec, 
++		    percent_done);
 +}
  #ifdef HAVE_LIBLIRC_CLIENT
  static void *process_lirc_thread()
  {
-@@ -518,6 +539,8 @@
+@@ -518,6 +540,8 @@
                  if (!strcmp(c,"Quit")){
                      running = 0;
                      next_mrl = FALSE;}
@@ -50,7 +38,7 @@ diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c
  		if (!strcmp(c,"ASPECT_CHANGE"))
  		    aspect_change();
  		if (!strcmp(c,"Menu"))
-@@ -679,6 +702,10 @@
+@@ -679,6 +703,10 @@
  	case 'D':
  	        toggle_deinterlace();
  		break;
@@ -61,7 +49,7 @@ diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c
          case 'l':
          case 13:
             	send_event(XINE_EVENT_INPUT_SELECT);
-@@ -864,6 +891,10 @@
+@@ -864,6 +892,10 @@
             case XK_M:
               send_event(XINE_EVENT_INPUT_DOWN);
               break;
@@ -72,21 +60,3 @@ diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c
             case XK_Return:
               send_event(XINE_EVENT_INPUT_SELECT);
               break;
-diff -uN cxfe/lircrc-example cxfe-mod/lircrc-example
---- cxfe/lircrc-example	2004-11-15 15:44:06.000000000 +0100
-+++ cxfe-mod/lircrc-example	2005-01-15 06:29:39.959573792 +0100
-@@ -99,6 +99,13 @@
- end
- begin
-         remote = REALmagic
-+	button = OSD
-+        prog   = cxfe
-+        repeat = 0
-+        config = STATUS
-+end
-+begin
-+        remote = REALmagic
- 	button = 1
-         prog   = cxfe
-         repeat = 0
-Common subdirectories: cxfe/termio and cxfe-mod/termio