Author: pebender
Date: Tue Dec  9 16:39:35 2008
New Revision: 4077

Modified:
    trunk/gar-minimyth/html/minimyth/document-changelog.txt
     
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/lirc.pm

Log:
- Fixed a bug that would cause the perl init scripts to fail when there
   was more than one LIRC device.
- Fixed bug in LIRC introduced when adding support for devinput.



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     Tue Dec  9  
16:39:35 2008
@@ -85,6 +85,8 @@
  Fixed bugs
      - Fixed a bug that would cause the perl init scripts to hang when no
        remote was present.
+    - Fixed a bug that would cause the perl init scripts to fail when there
+      was more than one LIRC device.

  Modified build system
      - Explicitly enable XvMC and VDPAU in FFmpeg.

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
        
Tue Dec  9 16:39:35 2008
@@ -209,7 +209,7 @@
              my $lircd_conf = q(/etc/lircd.conf);
              if (($device) && ($driver))
              {
-                push(@device_list, "$device,$driver,");
+                push(@device_list, "$device,$driver,$lircd_conf");
              }
              if ($minimyth->var_get('MM_LIRC_AUTO_ENABLED') eq 'yes')
              {

Modified:  
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
==============================================================================
---  
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
        
(original)
+++  
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
        
Tue Dec  9 16:39:35 2008
@@ -129,7 +129,7 @@
      my $self     = shift;
      my $minimyth = shift;

-    my @device_list = split(/  +/,  
$minimyth->var_get('MM_LIRC_DEVICE_LIST'));
+    my @device_list = split(/ +/,  
$minimyth->var_get('MM_LIRC_DEVICE_LIST'));

      # There are no remote control devices, so there is no need to continue.
      if (($#device_list + 1) <= 0)
@@ -170,7 +170,7 @@
      {
          $daemon_master = '/usr/sbin/lircd';
          $daemon_master = $daemon_master . ' --driver=null';
-        $daemon_master = $daemon_master . '--output=/dev/lircd  
--pidfile=/var/run/lircd.pid';
+        $daemon_master = $daemon_master . ' --output=/dev/lircd  
--pidfile=/var/run/lircd.pid';
          for (my $index = 0 ; $index <= $#device_list ; $index++)
          {
              my $port = 8765 + $index;
@@ -312,7 +312,7 @@
          # Start daemon.
          my $daemon = '';
          my $instance = $device;
-        $instance =~ s/\/\/+/~/g;
+        $instance =~ s/\/+/~/g;
          $instance =~ s/^~dev~//;
          if ($daemon_master)
          {

--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to