Improved and more comfortable; newer Version; more tools integrated

----


Index: packages/utils/lirc/Config.in
===================================================================
--- Config.in   (Revision 0)
+++ Config.in   (Revision 0)
@@ -0,0 +1,52 @@
+# lirc configuration
+menu "Configuration"
+depends on PACKAGE_lirc
+       config LIRC_DRIVER
+        string "Driver to be complined with LIRC Daemon"
+        default none
+
+       config LIRCMD
+       bool "LIRC mouse daemon translates infrared signals into mouse events"
+       default n
+
+       config LIRCRCD
+       bool "lircrcd - daemon to handle consistent .lircrc state among
client applications"
+       select LIBLIRC
+       select IREXEC
+       default n
+
+       config IREXEC
+       bool "irexec - run programs with one button press"
+       select LIBLIRC
+       default y
+
+       config IRCAT
+       bool "ircat - print strings when pressing buttons"
+       select LIBLIRC
+       default n
+
+       config IRPTY
+       bool "irpty - pseudo tty driver"
+       select LIBLIRC
+       default y
+
+       config IRRECORD
+       bool "irrecord - application for recording IR-codes"
+       default n
+
+       config IRW
+       bool "irw - sends data from Unix domain socket to stdout"
+       default n
+
+       config MODE2
+       bool "mode2 - shows the pulse/space length of infrared signals"
+       default n
+
+       config IRSEND
+       bool "irsend - basic LIRC program to send infra-red commands"
+       default n
+
+       config LIBLIRC
+       bool "liblirc client library"
+       default y
+endmenu
Index: packages/utils/lirc/Makefile
===================================================================
--- Makefile    (Revision 27038)
+++ Makefile    (Arbeitskopie)
@@ -10,13 +10,14 @@
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=lirc
-PKG_VERSION:=0.8.7
+PKG_VERSION:=0.9.0
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/${PKG_NAME}
-PKG_MD5SUM:=fb1dcddbc8ca3d03c7f3a2d40cf28b71
+PKG_MD5SUM:=b232aef26f23fe33ea8305d276637086

+
 PKG_BUILD_PARALLEL:=1

 include $(INCLUDE_DIR)/package.mk
@@ -34,6 +35,10 @@
    MENU:=1
 endef

+define Package/lirc/config
+       source "$(SOURCE)/Config.in"
+endef
+
 define Package/lirc/description
  LIRC is a package that allows you to decode and send
  infra-red signals of many (but not all) commonly used
@@ -67,41 +72,11 @@

 endef

-
-define  Package/lircdaemonadd
-    $(call Package/lirc/Default)
-    DEPENDS:=lirc
-    TITLE:=Daemon Additional Files
-endef
-
-define Package/lircdaemonadd/description
-  Contains those additional daemon-tools:
-   -irrecord
-   -lircmd
-endef
-
-define  Package/lirctools
-    $(call Package/lirc/Default)
-    DEPENDS:=lirc
-    TITLE:=LIRC tools
-endef
-
-define Package/lirctools/description
-  This package contains those lirc-tools:
-   -ircat:   prints config strings to standard output, can be used to
provide remote control input to scripts
-   -irexec:  execute programs according to the pressed remote control buttons
-   -irpty:   pseudo tty driver. Connects to lircd via socket to
receive infra-red codes and converts them to key strokes
-   -irsend:  application for sending IR-codes via lirc
-   -irw:     watch the codes as lircd recognize them
-   -lircrcd: daemon that manages current mode for all applications
-   -mode2:   shows the pulse/space length of a remote button
-endef
-
 CONFIGURE_ARGS += \
       --disable-nls \
       --disable-static \
       --with-kerneldir="$(LINUX_DIR)" \
-       --with-driver="mceusb" \
+       --with-driver=$(CONFIG_LIRC_DRIVER) \
       --without-x \
       --with-pic \
       --with-gnu-ld \
@@ -113,31 +88,46 @@

 MAKE_FLAGS += \
       DESTDIR="$(PKG_INSTALL_DIR)" \
-       ARCH="$(LINUX_KARCH)"
+       ARCH="$(LINUX_KARCH)" \
+       all install

 define  Package/lirc/install
       $(INSTALL_DIR) $(1)/usr/sbin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/daemons/lircd $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/lircd $(1)/usr/sbin/
+       @if [ "$(CONFIG_LIRCMD)" == "y" ]; then \
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/lircmd $(1)/usr/sbin/; \
+       fi
+       @if [ "$(CONFIG_LIRCRCD)" == "y" ]; then \
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lircrcd $(1)/usr/sbin/; \
+       fi
+       @if [ "$(CONFIG_IREXEC)" == "y" ]; then \
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/irexec $(1)/usr/sbin/; \
+       fi
+       @if [ "$(CONFIG_IRCAT)" == "y" ]; then \
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ircat $(1)/usr/sbin/; \
+       fi
+       @if [ "$(CONFIG_IRPTY)" == "y" ]; then \
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/irpty $(1)/usr/sbin/; \
+       fi
+       @if [ "$(CONFIG_IRRECORD)" == "y" ]; then \
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/irrecord $(1)/usr/sbin/; \
+       fi
+       @if [ "$(CONFIG_IRW)" == "y" ]; then \
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/irw $(1)/usr/sbin/; \
+       fi
+       @if [ "$(CONFIG_MODE2)" == "y" ]; then \
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mode2 $(1)/usr/sbin/; \
+       fi
+       @if [ "$(CONFIG_IRSEND)" == "y" ]; then \
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/irsend $(1)/usr/sbin/; \
+       fi
+       @if [ "$(CONFIG_LIBLIRC)" == "y" ]; then \
+       $(INSTALL_DIR) $(1)/usr/lib; \
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/liblirc_client.so*
$(1)/usr/lib/; \
+       fi
       $(INSTALL_DIR) $(1)/etc
-       $(INSTALL_CONF) $(PKG_BUILD_DIR)/contrib/lircd.conf $(1)/etc/
+       $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/lirc/lircd.conf $(1)/etc/
 endef
-#todo:
-#      $(CP) $(PKG_BUILD_DIR)/drivers/lirc_dev/lirc_dev.ko
-#      $(CP) $(PKG_BUILD_DIR)/drivers/lirc_mceusb2/lirc_mceusb2.ko
-#depends on the selected module

-define  Package/lircdaemonadd/install
-       $(INSTALL_DIR) $(1)/usr/sbin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/daemons/{irrecord,lircmd} $(1)/usr/sbin/
-endef

-define  Package/lirctools/install
-       $(INSTALL_DIR) $(1)/usr/sbin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/irsend $(1)/usr/sbin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/irw $(1)/usr/sbin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mode2 $(1)/usr/sbin/
-endef
-
 $(eval $(call BuildPackage,lirc))
-$(eval $(call BuildPackage,lircdaemonadd))
-$(eval $(call BuildPackage,lirctools))
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to