From 60541fc7a4c73bc3b7a907ddbc63695e71df33c6 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 3 Jul 2019 11:55:04 +0200 Subject: [PATCH] lirc: fix disable-python patch The patch accidentally dropped installation of pkgconfig files which lead to libirman not detecting lirc Signed-off-by: Matthias Reichl --- .../patches/lirc-0100-disable-python.patch | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/packages/sysutils/lirc/patches/lirc-0100-disable-python.patch b/packages/sysutils/lirc/patches/lirc-0100-disable-python.patch index a71e042c24..d91175f116 100644 --- a/packages/sysutils/lirc/patches/lirc-0100-disable-python.patch +++ b/packages/sysutils/lirc/patches/lirc-0100-disable-python.patch @@ -1,5 +1,5 @@ diff --git a/Makefile.am b/Makefile.am -index aafb4e8c..f33a0c19 100644 +index 9f3dd143..9619a6eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,9 @@ ACLOCAL_AMFLAGS = -I m4 @@ -31,15 +31,25 @@ index aafb4e8c..f33a0c19 100644 if INSTALL_ETC -@@ -61,6 +67,7 @@ endif +@@ -61,7 +67,9 @@ endif dist_doc_DATA = VERSION +if HAVE_PYTHON nodist_pkgdata_DATA = $(PYTHON_TARBALL) ++endif pkgconfigdir = $(libdir)/pkgconfig -@@ -134,6 +141,8 @@ all-local: + dist_pkgconfig_DATA = lirc.pc lirc-driver.pc +@@ -71,6 +79,7 @@ nobase_header_HEADERS = include/media/lirc.h \ + include/linux/input-event-codes.h + header_HEADERS = drivers/irpipe/irpipe.h + ++if HAVE_PYTHON + py_pkgdir = $(pkgdatadir)/python-pkg + dist_py_pkg_DATA = python-pkg/setup.py \ + python-pkg/README.rst +@@ -134,6 +143,8 @@ all-local: $(if $(VERBOSE),,-q) build endif @@ -48,7 +58,7 @@ index aafb4e8c..f33a0c19 100644 install-data-hook: $(SED) -i -e '/^plugindir/s|/usr/lib|$(libdir)|' \ $(DESTDIR)$(lirc_confdir)/lirc_options.conf -@@ -167,6 +176,7 @@ fix-version: .phony +@@ -170,6 +181,7 @@ fix-version: .phony $(SED) -i '/DATE/s/=.*/="$(GIT_DATE)"/' $(distdir)/VERSION $(SED) -i '/REFS/s|=.*|="$(GIT_REFS)"|' $(distdir)/VERSION @@ -56,7 +66,7 @@ index aafb4e8c..f33a0c19 100644 $(abs_builddir)/python-pkg/setup.py: cp -ar $(top_srcdir)/python-pkg $(abs_builddir) chmod -R u+w python-pkg -@@ -190,6 +200,7 @@ python-pkg/lirc/config.py: Makefile $(abs_builddir)/python-pkg/setup.py +@@ -193,6 +205,7 @@ python-pkg/lirc/config.py: Makefile $(abs_builddir)/python-pkg/setup.py @echo 'DOCDIR = "$(docdir)"' >>$@ @echo 'MODINFO = "$(MODINFO)"' >>$@ @echo 'VERSION = "$(VERSION)"' >>$@ @@ -65,7 +75,7 @@ index aafb4e8c..f33a0c19 100644 paths.h: Makefile @echo "#ifndef PATHS_H" >paths.h diff --git a/configure.ac b/configure.ac -index 321a61f7..016813c1 100644 +index 58347d88..48ce5629 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,8 @@ AC_CHECK_PROG([DOXYGEN],[doxygen],[yes],[no]) @@ -78,7 +88,7 @@ index 321a61f7..016813c1 100644 PKG_CHECK_MODULES([PYTHON],[python-${PYTHON_VERSION}m],,[true]) test -z "$PYTHON_LIBS" && \ PKG_CHECK_MODULES([PYTHON], [python-$PYTHON_VERSION],,[true]) -@@ -577,6 +578,7 @@ AX_REPORT_CONDITIONAL([DEVEL]) +@@ -580,6 +581,7 @@ AX_REPORT_CONDITIONAL([DEVEL]) AX_REPORT_CONDITIONAL([LINUX_KERNEL]) AX_REPORT_CONDITIONAL([HAVE_DEVINPUT]) AX_REPORT_CONDITIONAL([WITH_SYSTEMDSYSTEMUNITDIR])