From 5be81966458dff6e2926f470a8a820a76b39abb1 Mon Sep 17 00:00:00 2001 From: cvh Date: Fri, 20 May 2016 21:10:21 +0200 Subject: [PATCH] eventlircd: update to eventlircd fork - the OE fork of eventlircd seems to be the upstream project --- packages/sysutils/eventlircd/package.mk | 7 ++-- .../patches/eventlircd-42-001-path.patch | 12 ------- .../patches/eventlircd-kernel-4.4.patch | 36 ------------------- 3 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 packages/sysutils/eventlircd/patches/eventlircd-42-001-path.patch delete mode 100644 packages/sysutils/eventlircd/patches/eventlircd-kernel-4.4.patch diff --git a/packages/sysutils/eventlircd/package.mk b/packages/sysutils/eventlircd/package.mk index f9b90c70e2..76ee498a74 100644 --- a/packages/sysutils/eventlircd/package.mk +++ b/packages/sysutils/eventlircd/package.mk @@ -17,12 +17,13 @@ ################################################################################ PKG_NAME="eventlircd" -PKG_VERSION="42" +PKG_VERSION="7faaf9d" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" -PKG_SITE="http://code.google.com/p/eventlircd" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_SITE="https://github.com/OpenELEC/eventlircd" +PKG_URL="https://github.com/OpenELEC/eventlircd/archive/$PKG_VERSION.tar.gz" +PKG_SOURCE_DIR="${PKG_NAME}-${PKG_VERSION}*" PKG_DEPENDS_TARGET="toolchain systemd lirc" PKG_PRIORITY="optional" PKG_SECTION="system/remote" diff --git a/packages/sysutils/eventlircd/patches/eventlircd-42-001-path.patch b/packages/sysutils/eventlircd/patches/eventlircd-42-001-path.patch deleted file mode 100644 index e85edbf3bc..0000000000 --- a/packages/sysutils/eventlircd/patches/eventlircd-42-001-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur eventlircd-42/udev/wakeup_enable.in eventlircd-42.patch/udev/wakeup_enable.in ---- eventlircd-42/udev/wakeup_enable.in 2011-04-01 16:42:27.000000000 +0200 -+++ eventlircd-42.patch/udev/wakeup_enable.in 2011-11-28 02:05:59.743690557 +0100 -@@ -4,7 +4,7 @@ - ################################################################################ - - devpath=`readlink -f "/sys/${DEVPATH}"` --while echo "${devpath}" | /bin/grep -q '^/sys/devices/' > /dev/null 2>&1 ; do -+while echo "${devpath}" | grep -q '^/sys/devices/' > /dev/null 2>&1 ; do - if test -e "${devpath}/power/wakeup" ; then - state=`cat "${devpath}/power/wakeup"` - if test "x${state}" = "xdisabled" ; then diff --git a/packages/sysutils/eventlircd/patches/eventlircd-kernel-4.4.patch b/packages/sysutils/eventlircd/patches/eventlircd-kernel-4.4.patch deleted file mode 100644 index d5b9bdd242..0000000000 --- a/packages/sysutils/eventlircd/patches/eventlircd-kernel-4.4.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 424810e45bb065151bed0cd8f5e03a3283c06f21 Mon Sep 17 00:00:00 2001 -From: Stephan Raue -Date: Fri, 18 Dec 2015 19:09:25 +0100 -Subject: [PATCH] [configure.ac] add support for kernel 4.4 - -Signed-off-by: Stephan Raue ---- - configure.ac | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b5de94d..f04ffc0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -92,10 +92,15 @@ dnl event_name_to_code.h.sh, evkey_code_to_name.h.sh and evkey_type.h.sh - dnl in order for them to generate the header files event_name_to_code.h, - dnl evkey_code_to_name.h and evkey_type.h respectively - AX_ABSOLUTE_HEADER(linux/input.h) --if test "x$gl_cv_absolute_linux_input_h" = "x" ; then -- AC_MSG_ERROR([failed to find the absolute path to header file linux/input.h]) -+AX_ABSOLUTE_HEADER(linux/input-event-codes.h) -+if test "x$gl_cv_absolute_linux_input_event_codes_h" = "x" ; then -+ if test "x$gl_cv_absolute_linux_input_h" = "x" ; then -+ AC_MSG_ERROR([failed to find the absolute path to header file linux/input.h or linux/input-event-codes.h]) -+ fi -+ AC_SUBST(ABSOLUTE_LINUX_INPUT_H, $gl_cv_absolute_linux_input_h) -+else -+ AC_SUBST(ABSOLUTE_LINUX_INPUT_H, $gl_cv_absolute_linux_input_event_codes_h) - fi --AC_SUBST(ABSOLUTE_LINUX_INPUT_H, $gl_cv_absolute_linux_input_h) - - PKG_CHECK_MODULES(LIBUDEV, [libudev >= 136]) - --- -1.9.3 -