t-head/meta-openembedded
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-openembedded synced 2026-09-06 06:04:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

lirc: upgrade 0.9.4d -> 0.10.1

Browse Source 
Upgrade Linux Infrared Remote Control (LIRC) to the latest version
0.10.1. Remove redundant old patches. Apply a new patch from Arch
Linux FS#57792 that fixes build errors. Create tar.gz archive
(PYTHON_TARBALL) which LIRC needs for install-nodist_pkgdataDATA.
Add python3-setuptools-native as a dependency. Replace path to
python3 in scripts based on a similar approach as in the recipe
for blueman.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Leon Anavi
2020-05-12 17:21:33 +03:00
committed by Khem Raj
parent 45ca9fc0de
commit cdeebf0aa9
3 changed files with 58 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/fix_build_errors.patch Normal file
View File

@@ -0,0 +1,30 @@
diff --git a/configure.ac b/configure.ac
index 58347d8..8c7fca2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,15 +77,10 @@ AC_TYPE_UINT64_T
dnl AC_TYPE_GETGROUPS seems broken on recent MacOS, so:
AC_MSG_CHECKING([Figure out if getgrouplist() needs gid_t or int])
-oldcflags="$CFLAGS"
-export CFLAGS=-Werror
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <unistd.h>
-#include <grp.h>
- ]], [[
-gid_t groups[32]; int ngroups; const char* user = "root";
-getgrouplist(user, 1, groups, &ngroups);
- ]])],[
+int getgroups(int gidsetsize, gid_t grouplist[]);
+ ]], [[ ]])],[
AC_MSG_RESULT(gid_t)
AC_DEFINE(GETGROUPS_T,[gid_t])
],[
@@ -93,7 +88,6 @@ getgrouplist(user, 1, groups, &ngroups);
AC_DEFINE(GETGROUPS_T,[int])
]
)
-export CFLAGS="$oldcflags"
dnl Checks for library functions.
AC_CHECK_FUNCS(gethostname gettimeofday mkfifo select socket strdup \

101
meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/pollfd.patch
View File

@@ -1,101 +0,0 @@
Index: lirc-0.9.4d/daemons/lircrcd.cpp
===================================================================
--- lirc-0.9.4d.orig/daemons/lircrcd.cpp
+++ lirc-0.9.4d/daemons/lircrcd.cpp
@@ -29,10 +29,12 @@
#include <sys/un.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <poll.h>
#include <syslog.h>
#include "lirc_client.h"
#include "lirc/lirc_log.h"
+#include "lirc/curl_poll.h"
#define MAX_CLIENTS 100
#define WHITE_SPACE " \t"
Index: lirc-0.9.4d/lib/curl_poll.c
===================================================================
--- lirc-0.9.4d.orig/lib/curl_poll.c
+++ lirc-0.9.4d/lib/curl_poll.c
@@ -36,6 +36,7 @@
#include <stdlib.h>
#include <sys/time.h>
#include <sys/types.h>
+#include <sys/poll.h>
#include "lirc_log.h"
#include "curl_poll.h"
@@ -67,7 +68,7 @@ static const logchannel_t logchannel = L
#ifdef HAVE_POLL_FINE
-int curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms)
+int curl_poll(struct pollfd *ufds, unsigned int nfds, int timeout_ms)
{
return poll(ufds, nfds, timeout_ms);
}
@@ -112,7 +113,7 @@ static int verify_sock(int s)
}
-int curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms)
+int curl_poll(struct pollfd *ufds, unsigned int nfds, int timeout_ms)
{
struct timeval pending_tv;
struct timeval* ptimeout;
Index: lirc-0.9.4d/lib/curl_poll.h
===================================================================
--- lirc-0.9.4d.orig/lib/curl_poll.h
+++ lirc-0.9.4d/lib/curl_poll.h
@@ -1,5 +1,5 @@
-#ifndef _POLL_H
-#define _POLL_H
+#ifndef _LIB_CURL_POLL_H
+#define _LIB_CURL_POLL_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
@@ -29,13 +29,9 @@
extern "C" {
#endif
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
-#else
#include <poll.h>
-#endif
-int curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms);
+int curl_poll(struct pollfd *ufds, unsigned int nfds, int timeout_ms);
#ifdef __cplusplus
}
Index: lirc-0.9.4d/lib/lirc/curl_poll.h
===================================================================
--- lirc-0.9.4d.orig/lib/lirc/curl_poll.h
+++ lirc-0.9.4d/lib/lirc/curl_poll.h
@@ -1,5 +1,5 @@
-#ifndef _POLL_H
-#define _POLL_H
+#ifndef _LIRC_CURL_POLL_H
+#define _LIRC_CURL_POLL_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
@@ -29,13 +29,9 @@
extern "C" {
#endif
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
-#else
#include <poll.h>
-#endif
-int curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms);
+int curl_poll(struct pollfd *ufds, unsigned int nfds, int timeout_ms);
#ifdef __cplusplus
}