Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update lirc #1101

Merged
merged 3 commits into from
Jan 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
diff -Naur a/config.h.in b/config.h.in
--- a/config.h.in 2016-05-18 18:19:56.000000000 +0200
+++ b/config.h.in 2016-12-26 22:49:43.514203152 +0100
@@ -21,6 +21,9 @@
/* Define to 1 if you have the `mkfifo' function. */
#undef HAVE_MKFIFO

+/* defined if poll.h is available */
+#undef HAVE_POLL_H
+
/* Define to 1 if you have the `select' function. */
#undef HAVE_SELECT

@@ -48,6 +51,9 @@
/* Define to 1 if you have the <sys/file.h> header file. */
#undef HAVE_SYS_FILE_H

+/* defined if sys/poll.h is available */
+#undef HAVE_SYS_POLL_H
+
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H

diff -Naur a/configure.ac b/configure.ac
--- a/configure.ac 2016-05-18 18:19:41.000000000 +0200
+++ b/configure.ac 2016-12-26 22:48:40.190031280 +0100
@@ -20,7 +20,7 @@

dnl Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h termios.h memory.hi sys/file.h)
+AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h termios.h memory.hi sys/file.h poll.h sys/poll.h)

dnl Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_PID_T
3 changes: 3 additions & 0 deletions packages/sysutils/eventlircd/udev.d/98-eventlircd.rules
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ ATTRS{name}=="eventlircd", GOTO="end"
ATTRS{name}=="lircd", \
ENV{eventlircd_enable}="true"

ATTRS{name}=="lircd-uinput", \
ENV{eventlircd_enable}="true"

#-------------------------------------------------------------------------------
# Ask eventlircd to handle input event devices created by bdremoteng. For this
# to work, bdremoteng must be configured to output Linux input events and must
Expand Down
9 changes: 2 additions & 7 deletions packages/sysutils/lirc/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
################################################################################

PKG_NAME="lirc"
PKG_VERSION="0.9.4"
PKG_VERSION="0.9.4c"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
Expand All @@ -31,19 +31,14 @@ PKG_LONGDESC="LIRC is a package that allows you to decode and send infra-red sig
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"

PKG_CONFIGURE_OPTS_TARGET="ac_cv_path_LIBUSB_CONFIG= /
ac_cv_func_forkpty=no \
PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_forkpty=no \
ac_cv_lib_util_forkpty=no \
ac_cv_prog_HAVE_PYTHON3=no \
--localstatedir=/ \
--with-gnu-ld \
--without-x"

post_makeinstall_target() {
rm -rf $INSTALL/usr/bin/pronto2lirc
rm -rf $INSTALL/usr/bin/lirc-setup
rm -rf $INSTALL/usr/sbin/lircd-setup
rm -rf $INSTALL/usr/lib/python3.4
rm -rf $INSTALL/usr/lib/systemd
rm -rf $INSTALL/lib
rm -rf $INSTALL/usr/share
Expand Down
31 changes: 18 additions & 13 deletions packages/sysutils/lirc/patches/lirc-0002-disable-python3.patch
Original file line number Diff line number Diff line change
@@ -1,38 +1,43 @@
diff -Naur a/configure.ac b/configure.ac
--- a/configure.ac 2016-06-08 13:06:09.757102470 -0700
+++ b/configure.ac 2016-06-08 13:07:04.620705345 -0700
@@ -41,8 +41,8 @@
@@ -40,9 +40,9 @@
AM_CONDITIONAL(HAVE_DOXYGEN, test x$DOXYGEN = xyes)
AC_PROG_LN_S
LT_INIT([disable-static])
AM_PATH_PYTHON([3.1],,)
-AM_PATH_PYTHON([3.1],,)
-AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
-AC_CHECK_PROG([HAVE_PYTHON3],[python3],[yes],[no])
+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" == ""])
+AM_PATH_PYTHON([3.1],,[:])
+AM_CONDITIONAL([HAVE_PYTHON], [false])
+AC_CHECK_PROG([HAVE_PYTHON3],[python3],[no],[no])
LIBUSB_CONFIG="pkg-config libusb"

dnl Checks for header files.
diff -Naur a/tools/Makefile.am b/tools/Makefile.am
--- a/tools/Makefile.am 2016-05-23 10:18:48.000000000 -0700
+++ b/tools/Makefile.am 2016-06-08 13:15:25.711341537 -0700
@@ -114,19 +114,12 @@
@@ -114,22 +114,7 @@

install-exec-hook:
$(SED) -i -e 's/@version@/$(VERSION)/' \
- $(DESTDIR)$(bindir)/lirc-config-tool \
- $(DESTDIR)$(bindir)/irdb-get
+ $(DESTDIR)$(bindir)/lirc-config-tool
rm -f $(DESTDIR)/$(bindir)/lirc-setup
$(srcdir)/make_rel_symlink.py \
$(DESTDIR)/$(pkgpythondir)/lirc-setup \
$(DESTDIR)/$(bindir)/lirc-setup

- rm -f $(DESTDIR)/$(bindir)/lirc-setup
- $(srcdir)/make_rel_symlink.py \
- $(DESTDIR)/$(pkgpythondir)/lirc-setup \
- $(DESTDIR)/$(bindir)/lirc-setup
-
-install-data-hook:
- rm -f $(DESTDIR)/$(pkgpythondir)/configs
- $(srcdir)/make_rel_symlink.py \
- $(DESTDIR)$(pkgdatadir)/configs \
- $(DESTDIR)$(pkgpythondir)/configs
-
uninstall-hook:
rm -f $(DESTDIR)/$(bindir)/lirc-setup \
$(DESTDIR)/$(pkgpythondir)/configs
-uninstall-hook:
- rm -f $(DESTDIR)/$(bindir)/lirc-setup \
- $(DESTDIR)/$(pkgpythondir)/configs
+ $(DESTDIR)$(bindir)/lirc-config-tool

clean-local:
-find . -name __pycache__ -exec rm -r {} \;

This file was deleted.

This file was deleted.

110 changes: 0 additions & 110 deletions packages/sysutils/lirc/patches/lirc-0005-uinput.patch

This file was deleted.

Loading