Revision: 5845 Author: pebender Date: Sun Nov 15 14:56:24 2009 Log: - Added configuration varilable MM_X_FETCH_XBINDKEYSRC.
http://code.google.com/p/minimyth/source/detail?r=5845 Added: /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/26xbindkeys /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/28irxevent /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/30irxkeys /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/32unclutter Deleted: /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/26irxevent /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/28irxkeys /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/30unclutter Modified: /trunk/gar-minimyth/html/minimyth/conf/minimyth.conf /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/html/minimyth/document-configure.html /trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html /trunk/gar-minimyth/script/meta/minimyth/Makefile /trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/26xbindkeys Sun Nov 15 14:56:24 2009 @@ -0,0 +1,9 @@ +################################################################################ +# xbindkeys +# +# Binds keys to scripts and/or applications in X. +################################################################################ + +if /usr/bin/test -e /etc/X11/xbindkeysrc ; then + /usr/bin/xbindkeys -f /etc/X11/xbindkeysrc +fi ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/28irxevent Sun Nov 15 14:56:24 2009 @@ -0,0 +1,9 @@ +################################################################################ +# irxevent +# +# Starts the irxevent daemon. +################################################################################ + +if /usr/bin/test "${MM_LIRC_IRXEVENT_ENABLED}" = "yes" ; then + /usr/bin/irxevent /etc/lirc/lircrc & +fi ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/30irxkeys Sun Nov 15 14:56:24 2009 @@ -0,0 +1,9 @@ +################################################################################ +# irxkeys +# +# Starts the irxkeys daemon. +################################################################################ + +if /usr/bin/test "${MM_LIRC_IRXKEYS_ENABLED}" = "yes" ; then + /usr/bin/irxkeys -d 10 -c /etc/lirc/lircrc & +fi ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/32unclutter Sun Nov 15 14:56:24 2009 @@ -0,0 +1,11 @@ +################################################################################ +# unclutter +# +# Starts the unclutter daemon. +################################################################################ + +/usr/bin/unclutter \ + -root \ + -not \ + mythbrowser \ + & ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/26irxevent Mon Jul 13 11:29:10 2009 +++ /dev/null @@ -1,9 +0,0 @@ -################################################################################ -# irxevent -# -# Starts the irxevent daemon. -################################################################################ - -if /usr/bin/test "${MM_LIRC_IRXEVENT_ENABLED}" = "yes" ; then - /usr/bin/irxevent /etc/lirc/lircrc & -fi ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/28irxkeys Mon Jul 13 11:29:10 2009 +++ /dev/null @@ -1,9 +0,0 @@ -################################################################################ -# irxkeys -# -# Starts the irxkeys daemon. -################################################################################ - -if /usr/bin/test "${MM_LIRC_IRXKEYS_ENABLED}" = "yes" ; then - /usr/bin/irxkeys -d 10 -c /etc/lirc/lircrc & -fi ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/30unclutter Sun Oct 11 13:34:00 2009 +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# unclutter -# -# Starts the unclutter daemon. -################################################################################ - -/usr/bin/unclutter \ - -root \ - -not \ - mythbrowser \ - & ======================================= --- /trunk/gar-minimyth/html/minimyth/conf/minimyth.conf Thu Nov 12 06:26:54 2009 +++ /trunk/gar-minimyth/html/minimyth/conf/minimyth.conf Sun Nov 15 14:56:24 2009 @@ -133,6 +133,7 @@ # MM_X_MODE_1 # MM_X_MODE_2 # MM_X_HACK_HIDE_BLUE_LINE_ENABLED +# MM_X_FETCH_XBINDKEYS # MM_X_FETCH_XINITRC # MM_X_FETCH_XMODMAPRC # MM_X_FETCH_XORG_CONF ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Sun Nov 15 14:14:03 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Sun Nov 15 14:56:24 2009 @@ -17,6 +17,9 @@ MythTV 0.22: version 0.22.0, release-0-22-fixes branch svn 22824. MythTV trunk: version trunk.22825 trunk svn 22825. +Modified init + - Added MM_X_FETCH_XBINDKEYSRC. + Modified mediaplayers - Updated FFmpeg and MPlayer multi-threading patches. - Updated FFmpeg and MPlayer VAAPI patches. ======================================= --- /trunk/gar-minimyth/html/minimyth/document-configure.html Thu Nov 12 21:47:43 2009 +++ /trunk/gar-minimyth/html/minimyth/document-configure.html Sun Nov 15 14:56:24 2009 @@ -841,6 +841,19 @@ Therefore, when using network boot, do not allow anything identifying itself using this identity file to do anything that could be harmful. </p> + </dd> + <dt id="xbindkeysrc">xbindkeysrc</dt> + <dd> + <p> + The X Window System (Xorg) bind keys file. + MiniMyth will use this file as the '/etc/X11/xbindkeysrc' file in the MiniMyth file system. + Whether or not 'xbindkeysrc' is retrieved depends on + '<a href="document-minimyth_conf.html#MM_X_FETCH_XBINDKEYSRC">MM_X_FETCH_XBINDKEYSRC</a>'. + </p> + <p> + This file is loaded by MiniMyth's build-in '/etc/X11/xinit/xinitrc' file using the 'xbinkeys' utility. + Therefore, if you override '/etc/X11/xinit/xinitrc', then you will need to load '/etc/X11/xbindkeysrc'. + </p> </dd> <dt id="xinitrc">xinitrc</dt> <dd> @@ -854,7 +867,6 @@ <dt id="xmodmaprc">xmodmaprc</dt> <dd> <p> - The X Window System (Xorg) startup file. The X Window System (Xorg) keyboard map file. MiniMyth will use this file as the '/etc/X11/xmodmaprc' file in the MiniMyth file system. Whether or not 'xmodmaprc' is retrieved depends on @@ -902,7 +914,7 @@ alt="Valid CSS!" height="31" width="88" /></a> </div> <div class="version"> - Last Updated on 2009-11-12 + Last Updated on 2009-11-15 <br /> < mailto : webmaster at minimyth dot org > </div> ======================================= --- /trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Fri Nov 13 08:21:43 2009 +++ /trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Sun Nov 15 14:56:24 2009 @@ -798,6 +798,7 @@ <li><a href="#MM_X_MODELINE_n">MM_X_MODELINE_0, MM_X_MODELINE_1 and MM_X_MODELINE_2</a></li> <li><a href="#MM_X_MODE_n">MM_X_MODE_0, MM_X_MODE_1 and MM_X_MODE_2</a></li> <li><a href="#MM_X_HACK_HIDE_BLUE_LINE_ENABLED">MM_X_HACK_HIDE_BLUE_LINE_ENABLED</a></li> + <li><a href="#MM_X_FETCH_XBINDKEYSRC">MM_X_FETCH_XBINDKEYSRC</a></li> <li><a href="#MM_X_FETCH_XINITRC">MM_X_FETCH_XINITRC</a></li> <li><a href="#MM_X_FETCH_XMODMAPRC">MM_X_FETCH_XMODMAPRC</a></li> <li><a href="#MM_X_FETCH_XORG_CONF">MM_X_FETCH_XORG_CONF</a></li> @@ -1310,6 +1311,17 @@ <p> The X fetch configuration variables are: </p> + <dl> + <dt id="MM_X_FETCH_XBINDKEYSRC"><strong>MM_X_FETCH_XBINDKEYSRC</strong></dt> + <dd> + <p> + Indicate whether or not to fetch the + '<a href="document-configure.html#xbindkeysrc">xbindkeysrc</a>' + file from the MiniMyth system's MiniMyth read-only configuration directory. + Valid values are 'yes' and 'no', with 'no' the default. + </p> + </dd> + </dl> <dl> <dt id="MM_X_FETCH_XINITRC"><strong>MM_X_FETCH_XINITRC</strong></dt> <dd> @@ -3490,7 +3502,7 @@ alt="Valid CSS!" height="31" width="88" /></a> </div> <div class="version"> - Last Updated on 2009-11-13 + Last Updated on 2009-11-15 <br /> < mailto : webmaster at minimyth dot org > </div> ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/Makefile Mon Oct 19 15:31:09 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/Makefile Sun Nov 15 14:56:24 2009 @@ -79,6 +79,7 @@ X11/vdpauinfo \ net/wakelan \ X11/x11vnc \ + X11/xbindkeys \ X11/xmacro \ xorg/xorg \ X11/xosd \ ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list Sun Oct 11 12:03:52 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list Sun Nov 15 14:56:24 2009 @@ -93,6 +93,7 @@ wakelan X x11vnc +xbindkeys xinit xkbcomp xlsclients ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm Fri Nov 13 08:25:18 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_X.pm Sun Nov 15 14:56:24 2009 @@ -82,6 +82,14 @@ #=============================================================================== # #=============================================================================== +$var_list{'MM_X_FETCH_XBINDKEYSRC'} = +{ + value_default => 'no', + value_valid => 'no|yes', + value_file => 'yes', + file => {name_remote => '/xbindkeysrc', + name_local => '/etc/X11/xbindkeysrc'} +}; $var_list{'MM_X_FETCH_XINITRC'} = { value_default => 'no', --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
