Author: pebender
Date: Fri Jun 19 20:02:54 2009
New Revision: 4979
Added:
trunk/gar-minimyth/script/mediaplayers/xine-ui/files/xine-ui-0.99.5-fork_wait.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/mediaplayers/xine-ui/Makefile
trunk/gar-minimyth/script/mediaplayers/xine-ui/checksums
trunk/gar-minimyth/script/mediaplayers/xine-ui/files/xine-ui-0.99.5-xscreensaver.patch
Log:
- Modified Xine so that it does not leave defunct xscreensaver-command
processes while it is running.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Fri Jun 19
20:02:54 2009
@@ -31,6 +31,8 @@
- Modified configuration so that Xine does not periodically attempt to
deactivate a screensaver unless MiniMyth is configured to enable
a screensaver.
+ - Modified Xine so that it does not leave defunct xscreensaver-command
+ processes while it is running.
Modified LIRC
- Updated to pick up the improved iMON driver
Modified: trunk/gar-minimyth/script/mediaplayers/xine-ui/Makefile
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/xine-ui/Makefile (original)
+++ trunk/gar-minimyth/script/mediaplayers/xine-ui/Makefile Fri Jun 19
20:02:54 2009
@@ -3,7 +3,7 @@
CATEGORIES = mediaplayers
MASTER_SITES = http://easynews.dl.sourceforge.net/sourceforge/xine/
DISTFILES = $(DISTNAME).tar.gz
-PATCHFILES = $(DISTNAME)-lirc_shared.patch $(DISTNAME).patch.gar
$(DISTNAME)-pmaxsize.patch $(DISTNAME)-xscreensaver.patch
$(DISTNAME)-xtest_disable.patch
+PATCHFILES = $(DISTNAME)-fork_wait.patch $(DISTNAME)-lirc_shared.patch
$(DISTNAME).patch.gar $(DISTNAME)-pmaxsize.patch
$(DISTNAME)-xscreensaver.patch $(DISTNAME)-xtest_disable.patch
LICENSE = GPL2
DESCRIPTION =
Modified: trunk/gar-minimyth/script/mediaplayers/xine-ui/checksums
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/xine-ui/checksums (original)
+++ trunk/gar-minimyth/script/mediaplayers/xine-ui/checksums Fri Jun 19
20:02:54 2009
@@ -1,6 +1,7 @@
e643cd1fcad4d98a5ae4eb877ce5087b download/xine-ui-0.99.5.tar.gz
+6b0a64cbe042061ad5e2670aecc708e4 download/xine-ui-0.99.5-fork_wait.patch
bdb8aba332e88a43a631fbde0e13abd8 download/xine-ui-0.99.5-lirc_shared.patch
2f16f1b7715bd2bdfaa162256b2c97cb download/xine-ui-0.99.5.patch.gar
d4fdefd18aaa283770b5a5a01787793b download/xine-ui-0.99.5-pmaxsize.patch
-81b110a7c70d9e7c184067b7f459ebb3
download/xine-ui-0.99.5-xscreensaver.patch
+c232ee9b288a99f7376247b2e816fdd2
download/xine-ui-0.99.5-xscreensaver.patch
748ddc62a015cdf945ad916621e3e65f
download/xine-ui-0.99.5-xtest_disable.patch
Added:
trunk/gar-minimyth/script/mediaplayers/xine-ui/files/xine-ui-0.99.5-fork_wait.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/mediaplayers/xine-ui/files/xine-ui-0.99.5-fork_wait.patch
Fri Jun 19 20:02:54 2009
@@ -0,0 +1,35 @@
+diff -Naur xine-ui-0.99.5-old/src/xitk/videowin.c
xine-ui-0.99.5-new/src/xitk/videowin.c
+--- xine-ui-0.99.5-old/src/xitk/videowin.c 2007-03-25 16:26:55.000000000
-0700
++++ xine-ui-0.99.5-new/src/xitk/videowin.c 2009-06-19 09:24:29.000000000
-0700
+@@ -29,6 +29,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <string.h>
++#include <sys/wait.h>
+ #include <sys/time.h>
+ #include <X11/Xlib.h>
+ #include <X11/cursorfont.h>
+@@ -2320,9 +2321,20 @@
+ gssaver_path = (access(pbuf, X_OK)) ? "" : strdup(pbuf);
+ } while(!gssaver_path[0] && *path++);
+ }
+- if(gssaver_path[0] && (fork() == 0)) {
+- execv(gssaver_path, gssaver_args);
+- exit(0);
++ if(gssaver_path[0])
++ {
++ switch(fork())
++ {
++ case -1:
++ break;
++ case 0:
++ execv(gssaver_path, gssaver_args);
++ exit(0);
++ break;
++ default:
++ wait(NULL);
++ break;
++ }
+ }
+ }
+
Modified:
trunk/gar-minimyth/script/mediaplayers/xine-ui/files/xine-ui-0.99.5-xscreensaver.patch
==============================================================================
---
trunk/gar-minimyth/script/mediaplayers/xine-ui/files/xine-ui-0.99.5-xscreensaver.patch
(original)
+++
trunk/gar-minimyth/script/mediaplayers/xine-ui/files/xine-ui-0.99.5-xscreensaver.patch
Fri Jun 19 20:02:54 2009
@@ -1,7 +1,7 @@
diff -Naur xine-ui-0.99.5-old/src/xitk/videowin.c
xine-ui-0.99.5-new/src/xitk/videowin.c
---- xine-ui-0.99.5-old/src/xitk/videowin.c 2007-03-25 16:26:55.000000000
-0700
-+++ xine-ui-0.99.5-new/src/xitk/videowin.c 2007-10-13 12:47:16.000000000
-0700
-@@ -2292,6 +2292,40 @@
+--- xine-ui-0.99.5-old/src/xitk/videowin.c 2009-06-19 09:24:29.000000000
-0700
++++ xine-ui-0.99.5-new/src/xitk/videowin.c 2009-06-19 09:25:04.000000000
-0700
+@@ -2293,6 +2293,51 @@
else
#endif
{
@@ -33,9 +33,20 @@
+ xssaver_path = (access(pbuf, X_OK)) ? "" : strdup(pbuf);
+ } while(!xssaver_path[0] && *path++);
+ }
-+ if(xssaver_path[0] && (fork() == 0)) {
-+ execv(xssaver_path, xssaver_args);
-+ exit(0);
++ if(xssaver_path[0])
++ {
++ switch(fork())
++ {
++ case -1:
++ break;
++ case 0:
++ execv(xssaver_path, xssaver_args);
++ exit(0);
++ break;
++ default:
++ wait(NULL);
++ break;
++ }
+ }
+ }
+
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
