jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

lirc: fix disable-python patch

Browse Source 
The patch accidentally dropped installation of pkgconfig files which
lead to libirman not detecting lirc

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2019-07-03 11:55:04 +02:00
parent 812f140d90
commit 304fa8c2eb
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/sysutils/lirc/patches/lirc-0100-disable-python.patch
View File

@ -1,5 +1,5 @@
diff --git a/Makefile.am b/Makefile.am diff --git a/Makefile.am b/Makefile.am
index aafb4e8c..f33a0c19 100644 index 9f3dd143..9619a6eb 100644
--- a/Makefile.am --- a/Makefile.am
+++ b/Makefile.am +++ b/Makefile.am
@@ -5,7 +5,9 @@ ACLOCAL_AMFLAGS = -I m4 @@ -5,7 +5,9 @@ ACLOCAL_AMFLAGS = -I m4
@ -31,15 +31,25 @@ index aafb4e8c..f33a0c19 100644
if INSTALL_ETC if INSTALL_ETC
@@ -61,6 +67,7 @@ endif @@ -61,7 +67,9 @@ endif
dist_doc_DATA = VERSION dist_doc_DATA = VERSION
+if HAVE_PYTHON +if HAVE_PYTHON
nodist_pkgdata_DATA = $(PYTHON_TARBALL) nodist_pkgdata_DATA = $(PYTHON_TARBALL)
+endif
pkgconfigdir = $(libdir)/pkgconfig 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 $(if $(VERBOSE),,-q) build
endif endif
@ -48,7 +58,7 @@ index aafb4e8c..f33a0c19 100644
install-data-hook: install-data-hook:
$(SED) -i -e '/^plugindir/s|/usr/lib|$(libdir)|' \ $(SED) -i -e '/^plugindir/s|/usr/lib|$(libdir)|' \
$(DESTDIR)$(lirc_confdir)/lirc_options.conf $(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 '/DATE/s/=.*/="$(GIT_DATE)"/' $(distdir)/VERSION
$(SED) -i '/REFS/s|=.*|="$(GIT_REFS)"|' $(distdir)/VERSION $(SED) -i '/REFS/s|=.*|="$(GIT_REFS)"|' $(distdir)/VERSION
@ -56,7 +66,7 @@ index aafb4e8c..f33a0c19 100644
$(abs_builddir)/python-pkg/setup.py: $(abs_builddir)/python-pkg/setup.py:
cp -ar $(top_srcdir)/python-pkg $(abs_builddir) cp -ar $(top_srcdir)/python-pkg $(abs_builddir)
chmod -R u+w python-pkg 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 'DOCDIR = "$(docdir)"' >>$@
@echo 'MODINFO = "$(MODINFO)"' >>$@ @echo 'MODINFO = "$(MODINFO)"' >>$@
@echo 'VERSION = "$(VERSION)"' >>$@ @echo 'VERSION = "$(VERSION)"' >>$@
@ -65,7 +75,7 @@ index aafb4e8c..f33a0c19 100644
paths.h: Makefile paths.h: Makefile
@echo "#ifndef PATHS_H" >paths.h @echo "#ifndef PATHS_H" >paths.h
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 321a61f7..016813c1 100644 index 58347d88..48ce5629 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -43,7 +43,8 @@ AC_CHECK_PROG([DOXYGEN],[doxygen],[yes],[no]) @@ -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]) PKG_CHECK_MODULES([PYTHON],[python-${PYTHON_VERSION}m],,[true])
test -z "$PYTHON_LIBS" && \ test -z "$PYTHON_LIBS" && \
PKG_CHECK_MODULES([PYTHON], [python-$PYTHON_VERSION],,[true]) 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([LINUX_KERNEL])
AX_REPORT_CONDITIONAL([HAVE_DEVINPUT]) AX_REPORT_CONDITIONAL([HAVE_DEVINPUT])
AX_REPORT_CONDITIONAL([WITH_SYSTEMDSYSTEMUNITDIR]) AX_REPORT_CONDITIONAL([WITH_SYSTEMDSYSTEMUNITDIR])