tb/contrib
1
0
Fork 0
forked from ports/contrib
Code Pull Requests Activity

lirc: cleanup, footprint fix and removed redundant dependency

Browse Source
This commit is contained in:
Tim Biermann 2020-05-25 22:21:27 +00:00
parent 28cb830f1a
commit 0a49df1b2e
9 changed files with 4 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lirc/.signature
View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF37TGd6BiWU2HMeyBjy5goCjvTTTp+mzYcVJ+Pb5mqT51EOA5yVd5It6+838JiJHfbNNtGoxBHiuE1sR3cabVgQM=
SHA256 (Pkgfile) = c40b0a39aeb4ab779f3218104fefc90f7d36e2d20133aa3f846359bc256ec368
RWSagIOpLGJF35Q2w/yvS7gYbAICUg6nr5lkDKXTYlcKSKvs4ULtILL5xHbSmkW4JtloudUG96/CJDErIzXvEEoOrQK5+jU3TwQ=
SHA256 (Pkgfile) = b002d919b98a1a92d809b2e1cf5f10215bf6597c7dcb416142f1102d229e40da
SHA256 (.footprint) = 9b07666ff6103a8dede5b2c3684e85f0adeb278718fb2a7362f8d12897fd3d2c
SHA256 (lirc-0.10.1.tar.bz2) = 8b753c60df2a7f5dcda2db72c38e448ca300c3b4f6000c1501fcb0bd5df414f2
SHA256 (lircd.rc) = 834b125d71f073df370cf1b986e6f76304b77c354325cdc9e51936fbe0569fa5

18
lirc/20141211102847-eb44af1-add-euid-to-template.patch
View File

@ -1,18 +0,0 @@
commit eb44af17ade6f55ca05f825d8a55f65c5305cbf1
Author: Alec Leamas <leamas.alec@gmail.com>
Date: Thu Dec 11 10:28:47 2014 +0100
lirc_options.conf: Add effective-user to template.
diff --git a/lirc_options.conf b/lirc_options.conf
index 9dc672a..9346de8 100644
--- a/lirc_options.conf
+++ b/lirc_options.conf
@@ -12,6 +12,7 @@ plugindir = /usr/lib/lirc/plugins
permission = 666
allow-simulate = No
repeat-max = 600
+#effective-user =
#listen = [address:]port
#connect = host[:port]
#debug = 6

20
lirc/20141229144508-034dcf8-lirc.pc-variable-order.patch
View File

@ -1,20 +0,0 @@
commit 034dcf864796314d46b31268b34d28e9b79a9905
Author: Inando <inand0@users.sf.net>
Date: Mon Dec 29 14:45:08 2014 +0100
lirc.pc: Fix bad variable reference/ordering (#86)
diff --git a/lirc.pc.in b/lirc.pc.in
index 43f2b9b..432f51a 100644
--- a/lirc.pc.in
+++ b/lirc.pc.in
@@ -2,8 +2,8 @@ Name: lirc
Description: LIRC Linux Infrared Control client libs.
Version: @VERSION@
-datarootdir=@datarootdir@
prefix=@prefix@
+datarootdir=@datarootdir@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

65
lirc/20150109124636-35d9b9a-lirc-lsplugins-bugfixes.patch
View File

@ -1,65 +0,0 @@
commit 35d9b9aa0290d393767f9169b7cdf6333be11c6f
Author: Alec Leamas <leamas.alec@gmail.com>
Date: Fri Jan 9 12:46:36 2015 +0100
lirc-lsplugins: Bugfixes, list also default device (#90).
Since we should use the default device, it should also be
possible to check. Added to the -l output.
diff --git a/tools/lirc-lsplugins.c b/tools/lirc-lsplugins.c
index 139fa1e..9ed8f57 100644
--- a/tools/lirc-lsplugins.c
+++ b/tools/lirc-lsplugins.c
@@ -86,6 +86,7 @@ typedef struct {
const char* features;
const char* version;
const char* info;
+ const char* device;
} line_t;
static const line_t* lines[MAX_PLUGINS];
@@ -126,6 +127,7 @@ static line_t* line_new(const char* path)
line->errors = NULL;
line->info = NULL;
line->version = NULL;
+ line->device = NULL;
line->features = opt_long ? " " : "";
return line;
}
@@ -212,7 +214,8 @@ static void line_print_long(const line_t* line)
}
printf("Plugin path:\t%s\n", line->path);
- printf("Driver name:\t%s\n", line->path ? line->name : "-");
+ printf("Driver name:\t%s\n", line->name ? line->name : "-");
+ printf("Default device:\t%s\n", line->device ? line->device : "-");
printf("Load state:\t%s\n", loadstate);
printf("Timing info:\t%s\n", handles_timing);
printf("Can send:\t%s\n", can_send);
@@ -264,17 +267,22 @@ static void format_drivers(struct driver** drivers,
continue;
}
if ((*drivers)->name) {
- strncpy(buf, (*drivers)->name, sizeof(buf));
+ strncpy(buf, (*drivers)->name, sizeof(buf) - 1);
line->name = strdup(buf);
}
if ((*drivers)->driver_version) {
- strncpy(buf, (*drivers)->driver_version, sizeof(buf));
+ strncpy(buf,
+ (*drivers)->driver_version, sizeof(buf) - 1);
line->version = strdup(buf);
}
if ((*drivers)->info) {
- strncpy(buf, (*drivers)->info, sizeof(buf));
+ strncpy(buf, (*drivers)->info, sizeof(buf) - 1);
line->info = strdup(buf);
}
+ if ((*drivers)->device) {
+ strncpy(buf, (*drivers)->device, sizeof(buf) - 1);
+ line->device = strdup(buf);
+ }
snprintf(buf, sizeof(buf), "-%c%c",
get(CAN_ANY, 'a', *drivers),
get(CAN_SEND, 's', *drivers));

63
lirc/20150110013032-39d7085-log-priority-labels.patch
View File

@ -1,63 +0,0 @@
commit 39d70855945ad1cb14fd865ebe581081ca8f2a27
Author: Alec Leamas <leamas.alec@gmail.com>
Date: Sat Jan 10 01:30:32 2015 +0100
lib/lirc_log: Add priority labels (info, error...) to syslog msg (#89).
diff --git a/lib/lirc_log.c b/lib/lirc_log.c
index 307fb77..cf37e6d 100644
--- a/lib/lirc_log.c
+++ b/lib/lirc_log.c
@@ -2,22 +2,8 @@
** lircd.c *****************************************************************
****************************************************************************
*
- * lircd - LIRC Decoder Daemon
+ * lirc_log - simple logging module.
*
- * Copyright (C) 1996,97 Ralph Metzler <rjkm@thp.uni-koeln.de>
- * Copyright (C) 1998,99 Christoph Bartelmus <lirc@bartelmus.de>
- *
- * =======
- * HISTORY
- * =======
- *
- * 0.1: 03/27/96 decode SONY infra-red signals
- * create mousesystems mouse signals on pipe /dev/lircm
- * 04/07/96 send ir-codes to clients via socket (see irpty)
- * 05/16/96 now using ir_remotes for decoding
- * much easier now to describe new remotes
- *
- * 0.5: 09/02/98 finished (nearly) complete rewrite (Christoph)
*
*/
@@ -59,6 +45,8 @@ const char *logfile = "syslog";
char progname[128] = {'?','\0'};
static int nodaemon = 0;
+static const int PRIO_LEN = 16; /**< Longest priority label, some margin. */
+
static const char* prio2text(int prio)
{
@@ -246,6 +234,7 @@ void logprintf(loglevel_t prio, const char *format_str, ...)
{
int save_errno = errno;
va_list ap;
+ char buff[PRIO_LEN + strlen(format_str)];
#ifdef SYSTEMD_LOGPERROR_FIX
if (nodaemon && prio <= loglevel) {
@@ -258,8 +247,10 @@ void logprintf(loglevel_t prio, const char *format_str, ...)
}
#endif
if (use_syslog) {
+ snprintf(buff, sizeof(buff),
+ "%s: %s", prio2text(prio), format_str);
va_start(ap, format_str);
- vsyslog(prio, format_str, ap);
+ vsyslog(prio, buff, ap);
va_end(ap);
} else if (lf && prio <= loglevel) {
time_t current;

22
lirc/20150115020157-b7758ca-user-config.patch
View File

@ -1,22 +0,0 @@
commit b7758ca235bb5d8bbeca7ea45d304545d757b957
Author: Alec Leamas <leamas.alec@gmail.com>
Date: Thu Jan 15 02:01:57 2015 +0100
lib: Bad bugfix for finding ~/.lircrc
Basically, the common library code did not find ~/.lircrc, just
~/.config/lircrc. Fixed.
diff --git a/lib/lirc_client.c b/lib/lirc_client.c
index b161f0e..0f31fa8 100644
--- a/lib/lirc_client.c
+++ b/lib/lirc_client.c
@@ -805,7 +805,7 @@ static char *lirc_getfilename(const char *file, const char *current_file)
if (filename == NULL) {
return NULL;
}
- strcat(filename, LIRCRC_USER_FILE);
+ strcat(filename, "/" LIRCRC_USER_FILE);
}
filename = realloc(filename, strlen(filename) + 1);
} else if (strncmp(file, "~/", 2) == 0) {

19
lirc/20150123231142-97282f2-help-message.patch
View File

@ -1,19 +0,0 @@
commit 97282f2dce4404a6ada9fdb1fa7cc9bfba16e93a
Author: Alec Leamas <leamas.alec@gmail.com>
Date: Fri Jan 23 23:11:42 2015 +0100
lircd: Help message bugfix.
diff --git a/daemons/lircd.c b/daemons/lircd.c
index 1251b92..2ce3850 100644
--- a/daemons/lircd.c
+++ b/daemons/lircd.c
@@ -114,7 +114,7 @@ static const char* const help =
"\t -r --release[=suffix]\t\tAuto-generate release events\n"
"\t -a --allow-simulate\t\tAccept SIMULATE command\n"
"\t -Y --dynamic-codes\t\tEnable dynamic code generation\n"
-"\t -A --driver-options=key:value[;key:value...]\n"
+"\t -A --driver-options=key:value[|key:value...]\n"
"\t\t\t\t\tSet driver options\n"
# if defined(__linux__)
"\t -u --uinput\t\t\tgenerate Linux input events\n"

4
lirc/Pkgfile
View File

@ -1,7 +1,7 @@
# Description: Linux Infrared Remote Control
# URL: http://www.lirc.org/
# Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve
# Depends on: alsa-lib libdtdi libxslt libusb-compat python3-setuptools xorg-libx11
# Depends on: alsa-lib libxslt libusb-compat python3-setuptools xorg-libx11
name=lirc
version=0.10.1
@ -31,5 +31,5 @@ build() {
install -D -m 755 $SRC/lircd.rc $PKG/etc/rc.d/lircd
# remove cruft
rm -rf $PKG/configs $PKG/usr/share/doc $PKG/var $PKG/etc/lirc/lircd.conf.d/README.conf.d $PKG/usr/lib/lirc/plugins/*.la
rm -fr $PKG/configs $PKG/usr/share/doc $PKG/var $PKG/etc/lirc/lircd.conf.d/README.conf.d $PKG/usr/lib/lirc/plugins/*.la $PKG/lib/systemd
}

73
lirc/lirc-0.9.2-noextras.diff
View File

@ -1,73 +0,0 @@
diff -u -r lirc-0.9.2.orig/Makefile.am lirc-0.9.2/Makefile.am
--- lirc-0.9.2.orig/Makefile.am 2015-02-06 11:54:40.611513940 +0900
+++ lirc-0.9.2/Makefile.am 2015-02-06 12:33:37.500372671 +0900
@@ -36,7 +36,7 @@
pkgconfigdir = $(libdir)/pkgconfig
dist_pkgconfig_DATA = lirc.pc lirc-driver.pc
-nobase_dist_pkgdata_DATA = $(srcdir)/configs/* $(srcdir)/contrib/*
+nobase_dist_pkgdata_DATA =
headerdir = $(includedir)/lirc
nobase_header_HEADERS = include/media/lirc.h
@@ -45,9 +45,6 @@
install-data-hook:
$(SED) -i -e '/^plugindir/s|/usr/lib|$(libdir)|' \
$(DESTDIR)$(lirc_confdir)/lirc_options.conf
- cd $(srcdir); $(TAR_DEREFERENCE) -cf - lirc.org | \
- tar -C $(DESTDIR)$(docdir) -xf -
- rm $(DESTDIR)$(datadir)/lirc/configs/check_configs.py
dist-hook: ChangeLog
chmod u+w $(distdir)
diff -u -r lirc-0.9.2.orig/Makefile.in lirc-0.9.2/Makefile.in
--- lirc-0.9.2.orig/Makefile.in 2015-02-06 11:54:40.610513977 +0900
+++ lirc-0.9.2/Makefile.in 2015-02-06 12:38:25.928740763 +0900
@@ -957,7 +957,7 @@
dvi-am:
-html: html-recursive
+html:
html-am:
@@ -977,7 +977,7 @@
install-exec-am:
-install-html: install-html-recursive
+install-html:
install-html-am:
diff -u -r lirc-0.9.2.orig/doc/Makefile.am lirc-0.9.2/doc/Makefile.am
--- lirc-0.9.2.orig/doc/Makefile.am 2015-02-06 11:54:40.593514604 +0900
+++ lirc-0.9.2/doc/Makefile.am 2015-02-06 12:24:24.051773626 +0900
@@ -25,15 +25,9 @@
docdir = @datadir@/doc/@PACKAGE@
dist_doc_DATA = lirc.css irxevent.keys
-if HAVE_DOXYGEN
-dist_doc_DATA += api-docs.tar.gz
-endif
htmldir = $(docdir)/html
nodist_html_DATA += $(generated_html)
-if HAVE_MAN2HTML
-nodist_html_DATA += $(manpage_html)
-endif
dist_html_DATA = $(html_includes) html-source/lirc.css
@@ -41,10 +35,6 @@
dist_html_DATA += table.html
endif
-if HAVE_PYMOD_YAML
-dist_pkgdata_DATA = lirc.hwdb
-endif
-
dist_noinst_DATA = $(man_sources) $(html_sources)
imagedir = $(docdir)/images