Author: pebender
Date: Thu Jun 25 08:07:22 2009
New Revision: 5057
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/28irxkeys
trunk/gar-minimyth/script/system/irxkeys/ (props changed)
trunk/gar-minimyth/script/system/irxkeys/Makefile
trunk/gar-minimyth/script/system/irxkeys/checksums
trunk/gar-minimyth/script/system/irxkeys/files/
trunk/gar-minimyth/script/system/irxkeys/files/irxkeys-1.0-fixes.patch
Modified:
trunk/gar-minimyth/html/minimyth/conf/minimyth.conf
trunk/gar-minimyth/html/minimyth/document-changelog.txt
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_LIRC.pm
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
Log:
- Added irxkeys support.
- Added package system/irxkeys.
Modified: trunk/gar-minimyth/html/minimyth/conf/minimyth.conf
==============================================================================
--- trunk/gar-minimyth/html/minimyth/conf/minimyth.conf (original)
+++ trunk/gar-minimyth/html/minimyth/conf/minimyth.conf Thu Jun 25 08:07:22
2009
@@ -258,6 +258,7 @@
# MM_LIRC_KERNEL_MODULE_OPTIONS
# MM_LIRC_IREXEC_ENABLED
# MM_LIRC_IRXEVENT_ENABLED
+# MM_LIRC_IRXKEYS_ENABLED
# MM_LIRC_SLEEP_ENABLED
# MM_LIRC_WAKEUP_ENABLED
# MM_LIRC_FETCH_LIRCD_CONF
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 Thu Jun 25
08:07:22 2009
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 67 (2009-06-23):
+Changes since 67 (2009-06-25):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082 and
@@ -48,6 +48,7 @@
Modified LIRC
- Updated to pick up the improved iMON driver
<http://www.gossamer-threads.com/lists/mythtv/users/386004>
+ - Added irxkeys support.
Modified ALSA
- Patched audio drivers to enable 7.1 sound on NVidia HDMI.
@@ -119,6 +120,7 @@
Removed xorg-7.3.
Added packages
+ Added system/irxkeys.
Added X11/libva.
Added X11/vdpau-video.
Modified: trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
(original)
+++ trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Thu Jun
25
08:07:22 2009
@@ -2386,6 +2386,7 @@
<li><a
href="#MM_LIRC_KERNEL_MODULE_OPTIONS">MM_LIRC_KERNEL_MODULE_OPTIONS</a></li>
<li><a
href="#MM_LIRC_IREXEC_ENABLED">MM_LIRC_IREXEC_ENABLED</a></li>
<li><a
href="#MM_LIRC_IRXEVENT_ENABLED">MM_LIRC_IRXEVENT_ENABLED</a></li>
+ <li><a
href="#MM_LIRC_IRXKEYS_ENABLED">MM_LIRC_IRXKEYS_ENABLED</a></li>
<li><a
href="#MM_LIRC_SLEEP_ENABLED">MM_LIRC_SLEEP_ENABLED</a></li>
<li><a
href="#MM_LIRC_WAKEUP_ENABLED">MM_LIRC_WAKEUP_ENABLED</a></li>
<li><a
href="#MM_LIRC_FETCH_LIRCD_CONF">MM_LIRC_FETCH_LIRCD_CONF</a></li>
@@ -2567,6 +2568,19 @@
then MiniMyth will enable or disable the irxevent daemon
depending on
whether or not the irxevent binary is present and
whether or not irxevent is used the lircrc file.
+ </p>
+ </dd>
+ <dt
id="MM_LIRC_IRXKEYS_ENABLED"><strong>MM_LIRC_IRXKEYS_ENABLED</strong></dt>
+ <dd>
+ <p>
+ Indicate whether or not the irxkeys daemon runs.
+ Valid values are 'yes', 'no' and 'auto', with 'auto' the
default.
+ </p>
+ <p>
+ If the value is 'auto',
+ then MiniMyth will enable or disable the irxkeys daemon
depending on
+ whether or not the irxkeys binary is present and
+ whether or not irxkeys is used the lircrc file.
</p>
</dd>
<dt
id="MM_LIRC_SLEEP_ENABLED"><strong>MM_LIRC_SLEEP_ENABLED</strong></dt>
Modified: trunk/gar-minimyth/script/meta/minimyth/Makefile
==============================================================================
--- trunk/gar-minimyth/script/meta/minimyth/Makefile (original)
+++ trunk/gar-minimyth/script/meta/minimyth/Makefile Thu Jun 25 08:07:22
2009
@@ -30,6 +30,7 @@
net/iputils \
system/irclient \
system/irserver \
+ system/irxkeys \
system/lcdproc \
net/lighttpd \
system/kbdd \
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-bin-list
Thu Jun 25 08:07:22 2009
@@ -28,11 +28,12 @@
insmod
irclient
irexec
-irxevent
irrecord
irsend
irserver
irw
+irxevent
+irxkeys
kbdd
LCDd
ldconfig
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/28irxkeys
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/X11/xinit/xinitrc.d/28irxkeys
Thu Jun 25 08:07:22 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/lircrc &
+fi
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
Thu Jun 25 08:07:22 2009
@@ -241,6 +241,52 @@
return $value;
}
};
+$var_list{'MM_LIRC_IRXKEYS_ENABLED'} =
+{
+ prerequisite => [ 'MM_LIRC_FETCH_LIRCRC' ],
+ value_default => 'auto',
+ value_valid => 'auto|no|yes',
+ value_auto => sub
+ {
+ my $value = 'no';
+
+ if ((-e '/usr/bin/irxkeys') && (-e '/etc/lircrc'))
+ {
+ # Only one level of includes is supported.
+ my @lircrc_list = ();
+ push(@lircrc_list, '/etc/lircrc');
+ if (open(FILE, '<', '/etc/lircrc'))
+ {
+ foreach (grep(s/^include +(.*)$/$1/, (<FILE>)))
+ {
+ chomp;
+ push(@lircrc_list, $_);
+ }
+ close(FILE);
+ }
+ foreach my $lircrc_file (@lircrc_list)
+ {
+ if (open(FILE, '<', $lircrc_file))
+ {
+ foreach (grep(/^ *prog *= *irxkeys *$/, (<FILE>)))
+ {
+ $value = 'yes';
+ if ($value eq 'yes')
+ {
+ last;
+ }
+ }
+ close(FILE);
+ }
+ if ($value eq 'yes')
+ {
+ last;
+ }
+ }
+ }
+ return $value;
+ }
+};
$var_list{'MM_LIRC_SLEEP_ENABLED'} =
{
value_default => 'yes',
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums (original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums Thu Jun 25
08:07:22 2009
@@ -1 +1 @@
-a9216a52a4e02ed455852f5546ceaa84 download/MiniMyth.pm
+a3936bc796d27144d4c96e6032fb9f93 download/MiniMyth.pm
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
(original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm Thu Jun
25 08:07:22 2009
@@ -2406,6 +2406,7 @@
my @applications = ();
push(@applications, $myth_program);
push(@applications, 'irxevent');
+ push(@applications, 'irxkeys');
push(@applications, 'mythfrontend');
push(@applications, 'mythwelcome');
push(@applications, 'ratpoison');
Added: trunk/gar-minimyth/script/system/irxkeys/Makefile
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/system/irxkeys/Makefile Thu Jun 25 08:07:22
2009
@@ -0,0 +1,28 @@
+GARNAME = irxkeys
+GARVERSION = 1.0
+CATEGORIES = system
+MASTER_SITES = http://frodo.dyn.gno.org/~brettk/download/
+DISTFILES = $(DISTNAME).tar.gz
+PATCHFILES = $(DISTNAME)-fixes.patch
+LICENSE =
+
+DESCRIPTION =
+define BLURB
+endef
+
+DEPENDS = lang/c system/lirc xorg/xorg
+
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
+INSTALL_SCRIPTS = custom
+
+BUILD_ARGS = \
+ LDFLAGS="$(LDFLAGS)"
+
+include ../../gar.mk
+
+LDFLAGS := -lXtst -llirc_client $(LDFLAGS)
+
+install-custom:
+ @mkdir -p $(DESTDIR)$(bindir)
+ @cp -f $(WORKSRC)/irxkeys $(DESTDIR)$(bindir)/irxkeys
+ @$(MAKECOOKIE)
Added: trunk/gar-minimyth/script/system/irxkeys/checksums
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/system/irxkeys/checksums Thu Jun 25 08:07:22
2009
@@ -0,0 +1,2 @@
+b17dbe5c65b66c34dff1d549e1f2cf9b download/irxkeys-1.0.tar.gz
+88942a41f36989a9402a4ddc5198b7eb download/irxkeys-1.0-fixes.patch
Added:
trunk/gar-minimyth/script/system/irxkeys/files/irxkeys-1.0-fixes.patch
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/system/irxkeys/files/irxkeys-1.0-fixes.patch
Thu Jun 25 08:07:22 2009
@@ -0,0 +1,95 @@
+diff -Naur irxkeys-1.0-old/irxkeys.c irxkeys-1.0-new/irxkeys.c
+--- irxkeys-1.0-old/irxkeys.c 2006-11-11 15:27:01.000000000 -0800
++++ irxkeys-1.0-new/irxkeys.c 2009-06-25 06:46:25.000000000 -0700
+@@ -2,6 +2,7 @@
+ #include <X11/keysym.h>
+ #include <X11/extensions/XTest.h>
+
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <getopt.h>
+
+@@ -14,14 +15,15 @@
+ struct lirc_config *config;
+ char *config_file = NULL;
+
+-int delay = 10; // Delay for key sends (10 millis)
++int delay = 10; // Delay for key sends (10 milliseconds)
+
+ int printUsage()
+ {
+- printf("Usage: %s [options] %s\n", PROG_NAME);
++ printf("Usage: %s [-hv] [-d delay] [-c file]\n", PROG_NAME);
+ printf("\t -h --help\t\tdisplay usage summary\n");
+ printf("\t -v --version\t\tdisplay version\n");
+- printf("\t -c --config=<file>\tset config file\n");
++ printf("\t -d --delay=<delay>\tset key send delay in milliseconds\n");
++ printf("\t -c --config=<file>\tset LIRC config file\n");
+ }
+
+ int sendkey(char *keyname)
+@@ -72,17 +74,23 @@
+ XSync(display, True);
+
+ XTestDiscard(display);
++
++ return 0;
+ }
+
+ int initLirc(int argc, char **argv)
+ {
+ if (lirc_init(PROG_NAME, 1) == -1) {
++ fprintf(stderr, "Error, failed to initialize LIRC.\n");
+ return -1;
+ }
+
+ if (lirc_readconfig(config_file, &config, NULL) != 0) {
++ fprintf(stderr, "Error, failed to read LIRC configuration
file %s.\n", config_file);
+ return -1;
+ }
++
++ return 0;
+ }
+
+ int processCommandLine(int argc, char **argv)
+@@ -90,10 +98,10 @@
+ while (1) {
+ int c;
+ static struct option long_options[] = {
+- {"config", required_argument, NULL, 0},
+- {"delay", required_argument, NULL, 0},
+- {"help", no_argument, NULL, 0},
+- {"version", no_argument, NULL, 0},
++ {"config", required_argument, 0, 'c'},
++ {"delay", required_argument, 0, 'd'},
++ {"help", no_argument, 0, 'd'},
++ {"version", no_argument, 0, 'v'},
+ {0, 0, 0, 0}
+ };
+
+@@ -131,6 +139,8 @@
+
+ return -1;
+ }
++
++ return 0;
+ }
+
+ void mainloop()
+@@ -158,12 +168,16 @@
+ XFlush(display);
+
+ XCloseDisplay(display);
++
++ return 0;
+ }
+
+ int deinitLirc()
+ {
+ lirc_freeconfig(config);
+ lirc_deinit();
++
++ return 0;
+ }
+
+ int main(int argc, char **argv)
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
