summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/lirc/Makefile13
-rw-r--r--package/lirc/patches/patch-Makefile_am16
-rw-r--r--package/lirc/patches/patch-configure_ac34
3 files changed, 6 insertions, 57 deletions
diff --git a/package/lirc/Makefile b/package/lirc/Makefile
index 404776670..eaee1bc47 100644
--- a/package/lirc/Makefile
+++ b/package/lirc/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= lirc
-PKG_VERSION:= 0.9.1-pre2
+PKG_VERSION:= 0.9.2
PKG_RELEASE:= 1
-PKG_HASH:= 2ecad376ca491e71d75d0de61e9d0a6b3c1e57962b446f8ff4a43ea4f611fe20
+PKG_HASH:= 4e3f948fcdee6dce009171143f0cb7cd7be48593dd58138db4101a41f651a1dd
PKG_DESCR:= decode and send infra-red signals
PKG_SECTION:= sys/hw
PKG_URL:= http://www.lirc.org/
-PKG_SITES:= http://www.lirc.org/software/snapshots/
+PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=lirc/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -21,12 +21,11 @@ $(eval $(call PKG_template,LIRC,lirc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
AUTOTOOL_STYLE:= autoreconf
CONFIGURE_ARGS+= --with-driver=none
-post-extract:
- find $(WRKSRC)/ -name *.rej -delete
-
lirc-install:
+ $(INSTALL_DIR) $(IDIR_LIRC)/etc/lirc
+ $(CP) $(WRKINST)/etc/lirc/* $(IDIR_LIRC)/etc/lirc
$(INSTALL_DIR) $(IDIR_LIRC)/usr/lib
- $(CP) $(WRKINST)/usr/lib/liblirc_client.so* \
+ $(CP) $(WRKINST)/usr/lib/liblirc*.so* \
$(IDIR_LIRC)/usr/lib
$(INSTALL_DIR) $(IDIR_LIRC)/usr/sbin
$(INSTALL_BIN) $(WRKINST)/usr/sbin/lircd \
diff --git a/package/lirc/patches/patch-Makefile_am b/package/lirc/patches/patch-Makefile_am
deleted file mode 100644
index 0ccf11a47..000000000
--- a/package/lirc/patches/patch-Makefile_am
+++ /dev/null
@@ -1,16 +0,0 @@
---- lirc-0.9.1-pre2.orig/Makefile.am 2014-05-05 22:29:53.000000000 +0200
-+++ lirc-0.9.1-pre2/Makefile.am 2014-06-01 09:22:05.384955110 +0200
-@@ -9,12 +9,7 @@ AUTOMAKE_OPTIONS = 1.5 check-news dist-b
- EXTRA_DIST = setup.sh setup-driver.sh setup-functions.sh setup.data data2setup.sh ANNOUNCE TODO
- EXTRA_DIST += autogen.sh
-
--## daemons/ and tools/ should appear before doc/ for help2man to work.
--if SYSTEMD_INSTALL
-- SYSTEMD_DIR = systemd
--endif
--
--SUBDIRS = drivers daemons tools doc $(SYSTEMD_DIR)
-+SUBDIRS = drivers daemons tools
-
- if SANDBOXED
- else
diff --git a/package/lirc/patches/patch-configure_ac b/package/lirc/patches/patch-configure_ac
deleted file mode 100644
index b7132a1dd..000000000
--- a/package/lirc/patches/patch-configure_ac
+++ /dev/null
@@ -1,34 +0,0 @@
---- lirc-0.9.1-pre2.orig/configure.ac 2014-05-05 22:27:40.000000000 +0200
-+++ lirc-0.9.1-pre2/configure.ac 2014-06-01 09:16:22.335385328 +0200
-@@ -235,9 +235,6 @@ AH_TEMPLATE([HAVE_SCSI],
- AH_TEMPLATE([HAVE_SOUNDCARD],
- [defined if soundcard API is available])
-
--AH_TEMPLATE([HAVE_SYSTEMD],
-- [defined if systemd API is available])
--
- AH_TEMPLATE([HAVE_VSYSLOG],
- [define if you have vsyslog( prio, fmt, va_arg )])
-
-@@ -420,13 +417,6 @@ AC_CHECK_HEADERS(linux/i2c-dev.h,[
- ]
- )
-
--PKG_CHECK_MODULES([SYSTEMD],[libsystemd-daemon],[AC_DEFINE(HAVE_SYSTEMD)],[true])
--CFLAGS="$CFLAGS $SYSTEMD_CFLAGS"
--LIBS="$LIBS $SYSTEMD_LIBS"
--
--AC_CHECK_FILE([/usr/lib/systemd/system], [has_systemd_system=true],[true])
--AM_CONDITIONAL([SYSTEMD_INSTALL],[test x"$has_systemd_system" = xtrue])
--
- dnl here we see what driver the user wants.
-
- AC_ARG_WITH(driver,
-@@ -1811,7 +1801,6 @@ AC_CONFIG_FILES([
- daemons/Makefile
- tools/Makefile
- doc/Makefile
-- systemd/Makefile
- ])
- AC_OUTPUT
-