Author: pebender
Date: Sun Jul 5 18:58:37 2009
New Revision: 5121
Added:
trunk/gar-minimyth/script/system/lirc/files/lirc-20090706-input_map.patch.gar
trunk/gar-minimyth/script/system/lirc/files/lirc-20090706-no_python.patch
trunk/gar-minimyth/script/system/lirc/files/lirc-20090706-remove_smp_unsafe_drivers.patch
Removed:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf/mceusb2
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf/mceusb2.mceusb2
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircrc/mplayer/remote.mceusb2
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircrc/mythtv/remote.mceusb2
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircrc/xine/remote.mceusb2
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.6pre1-mceusb2_mod_mce_0.2.0.patch
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.6pre1-no_python.patch
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.6pre1-remove_smp_unsafe_drivers.patch
trunk/gar-minimyth/script/system/lirc/files/lirc-0.8.6pre1-update_input_map.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
trunk/gar-minimyth/html/minimyth/index.html
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
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/lib/udev/rules.d/05-minimyth-detect-event.rules.disabled
trunk/gar-minimyth/script/system/lirc/Makefile
trunk/gar-minimyth/script/system/lirc/checksums
Log:
- Updated package system/lirc.
- Merged MiniMyths's mceusb and mceusb2 support becuase the lirc_mceusb2
driver has been merged into the lirc_mceusb driver.
- Removed support for MCE keyboard because the patch is not compatible
with the merged lirc_mceusb/lirc_mceusb2 driver.
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 Sun Jul 5
18:58:37 2009
@@ -64,6 +64,10 @@
lircrc configuration files so that they are treated the same.
- Included KEY_\d and KEY_KP\d along side KEY_NUMERIC_\d in the
lircrc configuration files so that they are treated the same.
+ - Merged MiniMyths's mceusb and mceusb2 support becuase the
lirc_mceusb2
+ driver has been merged into the lirc_mceusb driver.
+ - Removed support for MCE keyboard because the patch is not compatible
+ with the merged lirc_mceusb/lirc_mceusb2 driver.
Modified Xorg
- Added nv driver to replace unsupported nvidia 71.x.x driver.
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 Sun Jul
5
18:58:37 2009
@@ -2665,7 +2665,6 @@
<li>an 'irman' receiver with a 'hauppauge_A415' remote</li>
<li>an 'irman' receiver with a 'hauppauge_R808' remote</li>
<li>an 'mceusb' receiver with an 'mceusb' remote</li>
- <li>an 'mceusb2' receiver with an 'mceusb2' remote</li>
<li>an 'serial' receiver with a 'hauppauge_R808'
remote</li>
<li>a 'streamzap' receiver with a 'streamzap' remote</li>
</ul>
@@ -3302,7 +3301,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2009-06-25
+ Last Updated on 2009-07-05
<br />
< mailto : webmaster at minimyth dot org >
</div>
Modified: trunk/gar-minimyth/html/minimyth/index.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/index.html (original)
+++ trunk/gar-minimyth/html/minimyth/index.html Sun Jul 5 18:58:37 2009
@@ -104,7 +104,7 @@
<li><a href="http://xorg.freedesktop.org/wiki/";>Xorg</a>
<strong>7.4+</strong></li>
<li><a href="http://www.openchrome.org/";>openChrome Xorg
graphics driver</a> <strong>0.2.903</strong></li>
<li><a href="http://www.nvidia.com/";>NVIDIA Xorg graphics
driver</a> <strong>185.18.14</strong></li>
- <li><a href="http://www.lirc.org/";>LIRC</a>
<strong>0.8.6pre1</strong></li>
+ <li><a href="http://www.lirc.org/";>LIRC</a>
<strong>20090706</strong></li>
<li><a href="http://www.lcdproc.org/";>LCDproc</a>
<strong>0.5.3</strong></li>
<li>
<a href="http://www.kernel.org/";>Linux</a>
<strong>2.6.30.1</strong> with patches to add
@@ -196,7 +196,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2009-07-02
+ Last Updated on 2009-07-05
<br />
< mailto : webmaster at minimyth dot org >
</div>
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/lists/minimyth-lib-list
Sun Jul 5 18:58:37 2009
@@ -135,7 +135,6 @@
modules/*/misc/lirc/lirc_it87.ko
modules/*/misc/lirc/lirc_ite8709.ko
modules/*/misc/lirc/lirc_mceusb.ko
-modules/*/misc/lirc/lirc_mceusb2.ko
modules/*/misc/lirc/lirc_sasem.ko
modules/*/misc/lirc/lirc_serial.ko
modules/*/misc/lirc/lirc_sir.ko
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
Sun Jul 5 18:58:37 2009
@@ -42,7 +42,7 @@
{
value_default => 'none',
value_valid => 'none|.+',
- value_obsolete => 'auto|mceusbnew',
+ value_obsolete => 'auto|mceusb2|mceusbnew',
value_none => '',
};
$var_list{'MM_LIRC_DEVICE'} =
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-event.rules.disabled
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-event.rules.disabled
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/05-minimyth-detect-event.rules.disabled
Sun Jul 5 18:58:37 2009
@@ -23,7 +23,7 @@
# USB HID device.
SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03",
ENV{mm_detect_state_event}="usb-hid"
# Microsoft
-DRIVERS=="lirc_mceusb2",
ENV{mm_detect_state_event}="mce-keyboard-mouse"
+DRIVERS=="lirc_mceusb",
ENV{mm_detect_state_event}="mce-keyboard-mouse"
# Wiimote
ATTRS{name}=="Nintendo Wiimote",
ENV{mm_detect_state_event}="wiimote"
Modified: trunk/gar-minimyth/script/system/lirc/Makefile
==============================================================================
--- trunk/gar-minimyth/script/system/lirc/Makefile (original)
+++ trunk/gar-minimyth/script/system/lirc/Makefile Sun Jul 5 18:58:37 2009
@@ -1,11 +1,11 @@
GARNAME = lirc
-GARVERSION = 0.8.6pre1
+GARVERSION = 20090706
CATEGORIES = system
#MASTER_SITES = http://easynews.dl.sourceforge.net/sourceforge/$(GARNAME)/
-MASTER_SITES = http://www.lirc.org/software/snapshots/
-#MASTER_SITES =
cvs://anonym...@$(GARNAME).cvs.sourceforge.net:/cvsroot/$(GARNAME)/
+#MASTER_SITES = http://www.lirc.org/software/snapshots/
+MASTER_SITES =
cvs://anonym...@$(GARNAME).cvs.sourceforge.net:/cvsroot/$(GARNAME)/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME)-mceusb2_mod_mce_0.2.0.patch
$(DISTNAME)-no_python.patch $(DISTNAME)-remove_smp_unsafe_drivers.patch
$(DISTNAME)-update_input_map.patch
+PATCHFILES = $(DISTNAME)-no_python.patch
$(DISTNAME)-remove_smp_unsafe_drivers.patch $(DISTNAME)-input_map.patch.gar
LICENSE = GPL2
DESCRIPTION =
@@ -46,7 +46,7 @@
@$(call FETCH_CVS, $*, $(GARNAME), $(GARVERSION), $(DISTNAME))
@$(MAKECOOKIE)
-x-checksum-$(DISTNAME).tar.bz2:
+checksum-$(DISTNAME).tar.bz2:
@$(MAKECOOKIE)
pre-configure:
Modified: trunk/gar-minimyth/script/system/lirc/checksums
==============================================================================
--- trunk/gar-minimyth/script/system/lirc/checksums (original)
+++ trunk/gar-minimyth/script/system/lirc/checksums Sun Jul 5 18:58:37 2009
@@ -1,5 +1,3 @@
-0d42127b1e58c42e276349a0da545584 download/lirc-0.8.6pre1.tar.bz2
-e014309c2cbece89a137cf27140f8733
download/lirc-0.8.6pre1-mceusb2_mod_mce_0.2.0.patch
-475d48d83e2112b11b7f2629ab343533 download/lirc-0.8.6pre1-no_python.patch
-ad6b9e8d971ed77e934ed349b96c47bc
download/lirc-0.8.6pre1-remove_smp_unsafe_drivers.patch
-c4a97833d9dcf697680a494c84e97168
download/lirc-0.8.6pre1-update_input_map.patch
+684aa7da51986c05d8b1db6849b8312c download/lirc-20090706-no_python.patch
+c152bdadffbe129d077e149257db2a9f
download/lirc-20090706-remove_smp_unsafe_drivers.patch
+e34e8ea703c2a7034b2ed1aea4413a97
download/lirc-20090706-input_map.patch.gar
Added:
trunk/gar-minimyth/script/system/lirc/files/lirc-20090706-input_map.patch.gar
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/system/lirc/files/lirc-20090706-input_map.patch.gar
Sun Jul 5 18:58:37 2009
@@ -0,0 +1,14 @@
+diff -Naur lirc-20090706-old/daemons/Makefile.am
lirc-20090706-new/daemons/Makefile.am
+--- lirc-20090706-old/daemons/Makefile.am 2008-12-30 13:25:09.000000000
-0800
++++ lirc-20090706-new/daemons/Makefile.am 2009-07-05 17:58:05.000000000
-0700
+@@ -133,8 +133,8 @@
+ -$(RM) $(DESTDIR)$(devdir)/lircd
+ -$(RM) $(DESTDIR)$(devdir)/lircm
+
+-input_map.inc:
+- $(srcdir)/input_map.sh >$@
++input_map.inc: $(srcdir)/input_map.sh
@GAR_DESTDIR@@GAR_includedir@/linux/input.h
++ $(srcdir)/input_map.sh @GAR_DESTDIR@@GAR_includedir@/linux/input.h >$@
+
+ DISTCLEANFILES = input_map.inc
+ EXTRA_DIST = input_map.inc input_map.sh
Added:
trunk/gar-minimyth/script/system/lirc/files/lirc-20090706-no_python.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/system/lirc/files/lirc-20090706-no_python.patch
Sun Jul 5 18:58:37 2009
@@ -0,0 +1,14 @@
+diff -Naur lirc-20090706-old/configure.ac lirc-20090706-new/configure.ac
+--- lirc-20090706-old/configure.ac 2009-07-05 14:26:25.000000000 -0700
++++ lirc-20090706-new/configure.ac 2009-07-05 17:44:08.000000000 -0700
+@@ -22,8 +22,8 @@
+ AC_PATH_PROG(LIBUSB_CONFIG, libusb-config)
+ AC_PROG_LN_S
+ AC_PROG_LIBTOOL
+-AM_PATH_PYTHON
+-AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
++AM_PATH_PYTHON(,,[:])
++AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
Added:
trunk/gar-minimyth/script/system/lirc/files/lirc-20090706-remove_smp_unsafe_drivers.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/system/lirc/files/lirc-20090706-remove_smp_unsafe_drivers.patch
Sun Jul 5 18:58:37 2009
@@ -0,0 +1,106 @@
+diff -Naur lirc-20090706-old/configure.ac lirc-20090706-new/configure.ac
+--- lirc-20090706-old/configure.ac 2009-07-05 17:44:08.000000000 -0700
++++ lirc-20090706-new/configure.ac 2009-07-05 17:45:51.000000000 -0700
+@@ -168,7 +168,6 @@
+ (lirc_dev lirc_it87) \
+ (lirc_dev lirc_ite8709) \
+ (lirc_dev lirc_mceusb) \
+- (lirc_dev lirc_parallel) \
+ (lirc_dev lirc_sasem) \
+ (lirc_dev lirc_serial) \
+ (lirc_dev lirc_sir) \
+@@ -302,9 +301,6 @@
+ AH_TEMPLATE([LIRC_IMON_LCD],
+ [Define if your iMON is an LCD and not a VFD.])
+
+-AH_TEMPLATE([LIRC_TIMER],
+- [Set the timer for the parallel port driver])
+-
+ AH_TEMPLATE([LOCALSTATEDIR],
+ [modifiable single-machine data])
+
+@@ -448,7 +444,7 @@
+ livedrive_midi, livedrive_seq, logitech,
+ lptX, macmini, mceusb, mediafocusI,
+ mouseremote, mouseremote_ps2, mp3anywhere,
+- mplay, nslu2,packard_bell, parallel, pcmak,
++ mplay, nslu2,packard_bell, pcmak,
+ pcmak_usb, pctv, pixelview_bt878,
+ pixelview_pak, pixelview_pro, provideo,
+ realmagic, remotemaster, sa1100, samsung,
+@@ -605,8 +601,6 @@
+ ;;
+ lirc_dev-lirc_mceusb)
+ ;;
+- lirc_dev-lirc_parallel)
+- ;;
+ lirc_dev-lirc_sasem)
+ ;;
+ lirc_dev-lirc_serial)
+@@ -1130,18 +1124,6 @@
+ lircmd_conf="logitech/lircmd.conf.logitech"
+ fi
+
+-if test "$driver" = "lpt1"; then
+- lirc_driver="lirc_dev lirc_parallel"
+- port=0x378
+- irq=7
+-fi
+-
+-if test "$driver" = "lpt2"; then
+- lirc_driver="lirc_dev lirc_parallel"
+- port=0x278
+- irq=5
+-fi
+-
+ if test "$driver" = "macmini"; then
+ lirc_driver="$driver"
+ hw_module="hw_hiddev.o"
+@@ -1200,10 +1182,6 @@
+ lircd_conf="packard_bell/lircd.conf.packard_bell"
+ fi
+
+-if test "$driver" = "parallel"; then
+- lirc_driver="lirc_dev lirc_parallel"
+-fi
+-
+ if test "$driver" = "pcmak" -o "$driver" = "pcmak_usb"; then
+ lirc_driver="none"
+ hw_module="hw_pcmak.o serial.o"
+@@ -1491,7 +1469,6 @@
+ lirc_it87 \
+ lirc_ite8709 \
+ lirc_mceusb \
+- lirc_parallel \
+ lirc_sasem \
+ lirc_serial \
+ lirc_sir \
+@@ -1562,10 +1539,6 @@
+ irq=${withval}
+ )
+
+-AC_ARG_WITH(timer,
+-[ --with-timer=value specify the timer value for the parallel
driver],
+-timer=${withval})
+-
+ dnl I dont think libirman will accept this at the moment
+ AC_ARG_WITH(tty,
+ [ --with-tty=file specify the tty to use (Irman, RemoteMaster,
etc.)],
+@@ -1696,9 +1669,6 @@
+ if test "$irq" != ""; then
+ AC_DEFINE_UNQUOTED(LIRC_IRQ, $irq)
+ fi
+-if test "$timer" != ""; then
+- AC_DEFINE_UNQUOTED(LIRC_TIMER, $timer)
+-fi
+ AC_DEFINE_UNQUOTED(LIRC_IRTTY, "$irtty")
+ AC_DEFINE_UNQUOTED(LIRC_SYSLOG, $facility)
+
+@@ -1770,7 +1740,6 @@
+ drivers/lirc_it87/Makefile
+ drivers/lirc_ite8709/Makefile
+ drivers/lirc_mceusb/Makefile
+- drivers/lirc_parallel/Makefile
+ drivers/lirc_sasem/Makefile
+ drivers/lirc_serial/Makefile
+ drivers/lirc_sir/Makefile
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
