From 77904fb1eadd4802ff0f800b6791da1374619e9af0496ce3cc8bc20fdddcefd7 Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Mon, 13 Jun 2016 12:46:21 +0000 Subject: [PATCH] Accepting request 401637 from home:posophe:branches:vdr update OBS-URL: https://build.opensuse.org/request/show/401637 OBS-URL: https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=68 --- ...gfault-when-starting-lircd-AUR-41581.patch | 6 +- lirc-0.9.3a.tar.bz2 | 3 - lirc-0.9.4.tar.bz2 | 3 + lirc.changes | 106 +++++++++++++++++- lirc.spec | 29 +++-- 5 files changed, 122 insertions(+), 25 deletions(-) delete mode 100644 lirc-0.9.3a.tar.bz2 create mode 100644 lirc-0.9.4.tar.bz2 diff --git a/0001-Fix-segfault-when-starting-lircd-AUR-41581.patch b/0001-Fix-segfault-when-starting-lircd-AUR-41581.patch index 74d750e..21ebf64 100644 --- a/0001-Fix-segfault-when-starting-lircd-AUR-41581.patch +++ b/0001-Fix-segfault-when-starting-lircd-AUR-41581.patch @@ -12,10 +12,10 @@ diff --git a/lirc_options.conf b/lirc_options.conf index d8ddedd..11293e2 100644 --- a/lirc_options.conf +++ b/lirc_options.conf -@@ -6,7 +6,7 @@ +@@ -10,7 +10,7 @@ nodaemon = False - driver = default - device = /dev/lirc0 + driver = devinput + device = auto -output = /var/run/lirc/lircd +lircdfile = /var/run/lirc/lircd pidfile = /var/run/lirc/lircd.pid diff --git a/lirc-0.9.3a.tar.bz2 b/lirc-0.9.3a.tar.bz2 deleted file mode 100644 index 8bccb46..0000000 --- a/lirc-0.9.3a.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9aff0cf6cbdbb46f55317777e651d796c10bf9287f3acb3bc0113440a276ef22 -size 2283361 diff --git a/lirc-0.9.4.tar.bz2 b/lirc-0.9.4.tar.bz2 new file mode 100644 index 0000000..4e42565 --- /dev/null +++ b/lirc-0.9.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd18a6751674fd61e4a96eebc3b9e5c883389d6230811943513443522dfc5dd0 +size 2291164 diff --git a/lirc.changes b/lirc.changes index 0957167..e77137b 100644 --- a/lirc.changes +++ b/lirc.changes @@ -1,3 +1,103 @@ +------------------------------------------------------------------- +Mon Jun 13 11:20:36 UTC 2016 - p.drouand@gmail.com + +- Update to version 0.9.4 + * The caraca driver has been retired (still available in attic/). + * The iguanair driver has been moved out of tree and is now + maintained by Iguanaworks, Inc. See drivers/iguanair/README. + * The irman driver has been moved out of tree. From 0.5.1 the + libirman package contains the driver. See drivers/irman/README + * The yard2 driver has been moved out of tree and is now maintained + by the yard2 project. See driver/yard2/README. + * The lirc.4 manpage (/dev/lirc* interface) is upstreamed to the + linux kernel manpages project (#164). Old page lirc.4l still + lingers in attic/ but is not installed. + * Upstream selinux updated to match current lircd requirements. + See: https://github.com/fedora-selinux/selinux-policy/pull/41 + * New upstream debian packaging with which Debian users can create + .deb packages. Ubuntu packages are also available in PPAs. See + README.md in the debian branch (#137). + * New driver girs for the GIRS protocol, gives LIRC Arduino support. + See new info in driver documentation. + * New transmit-only FTDI driver with enhanced accuracy and hardware + support. See ftdix driver documentation. + * Support for non-modulated signals added (#132). + * As shipped, lircd now uses the devinput driver and the new 'auto' + device, should work for all remotes supported by kernel (#106). + * Enhanced lirc-setup tool (#123, partly): + - Add drvctl device enumeration support. + - Integrated mode2 and irw tests of current configuration. + - Documentation links. + - More consistent data based on new database. + - Multiple bugfixes. + * Several patches to make mode2 work with all drivers(#123, partly) + * Configuration database overhaul (#123, partly) + - Database lives as yaml files in configs/. + - Data is collected from drivers, remotes and static files. + - Better ways for drivers to enumerate devices. + - There is an unstable python database module used by + all tools. + * Several drivers including default and devinput has enhanced + enumeration support, usable with mode2 -l and lirc-setup. + * devinput.lircd.conf is generated at build time to match host kernel, + new script lirc-make-devinput shipped to re-generate it (#153) + * A new script lircd-setup runs as a one-shot service before lircd, + performing setup commands as root (#121). + * Several new examples in contrib/, notably lircrc templates for + many popular LIRC applications and improved udev rules. + * The default driver does not require root perms if the protocol + is correct (#133). + * Add an "auto" device to devinput driver for single-device + usecase (#134). + * irrecord has been taught to handle remotes without gap (#98). + * The --uinput lircd option is deprecated, obsoleted by the + lircd.uinput.service systemd service. See lircd-uinput(8). + * CLI options for mode2, xmode2 and irrecord has been streamlined. + All tools falls back to lircd defaults where it makes sense. + * The driver API has been expanded with functions to enumerate + devices. See configs/README and lib/driver.h. + * New logging API with hooks for enhanced messages and filtering + (also #129). + * The out-of-tree build interface is enhanced with hooks for external + drivers to rebuild documentation and add a config file. + * lircd: Fix too-short gap when sending/blasting (#158). + * lircd: Fix typo causing lost deinit_func() calls (#179). + * irrecord fixes: + - Fix broken namespace checks on recent kernels (#187). + - Buggy handling of not decoded buttons in irrecord (#146). + - Repeated buttons problems (#149) + - Endless loop when key is not recognized (#146) + - Endless loop on idendifying toggle mark (#139) + * lirs-lsremotes: Don't use non-standard GLOB_BRACE (#174). + * lib: Fix misleading logprintf comments (#179) + * lib: Clean up loglevel handling (#178). + * Fix --plugindir not being respected (#144). + * Fix gid and supplementary groups in CLI apps dropping root. + * Fix a crash in irrecord when invoked without options. + * Fix bad parsing of --options-file unless given first (#165). + * plugins/default: Don't require write access if not needed (#133). + * plugins/atilibusb: Fix crash for non-existing device (#145). + * plugins/audio_alsa : Fix blocking regression bug (#169). + * plugins/file: Fix bad test for LIRCCODE cases (#171). + * plugins/ftdi: Bugfixes: 4157fe1, 92e2d1d, #182. + * plugins/girs: Bugfixes. + * plugins/default: Remotes become too sensitive in 0.9.3 (#148) + * plugins/default: Walk around kernel bug generating multiple + spaces (#172). + * doc: lircd.conf: Document suppress_repeat parameter. + * Clean up docs, remove circular links (#136). Documentation is + now only in lirc.org/html. + * build: Add explicit default -L${libdir} linker flag. + * build: Fix Debian FTBS compilation error. +- Add some missing dependencies + * doxygen + * kmod-compat + * pkgconfig(sm) +- Replace pkgconfig(libusb-1.0) with pkgconfig(libusb); fow some + reasons, lirc now relies on compat libusb +- Remove obsolete configure switches +- Update 0001-Fix-segfault-when-starting-lircd-AUR-41581.patch + ------------------------------------------------------------------- Thu Mar 17 08:36:41 UTC 2016 - pgajdos@suse.com @@ -13,9 +113,9 @@ Sun Dec 6 13:57:19 UTC 2015 - p.drouand@gmail.com Sun Oct 25 08:39:22 UTC 2015 - mpluskal@suse.com - Update to 0.9.3a - * Broken fix for kernel bug reverted (#148, #119). This makes - lirc incompatible with at least the 4.04 kernels. kernels - < 4.0 and > 4.1.6 seemingly works. + * Broken fix for kernel bug reverted (#148, #119). This makes + lirc incompatible with at least the 4.04 kernels. kernels + < 4.0 and > 4.1.6 seemingly works. * Several irrecord fixes (#146, #139, d8826b, #141). * Some fixes for poll() usage, one of which blocked irrecord (02c2480, d9339b6). diff --git a/lirc.spec b/lirc.spec index 2aa71d1..c02b955 100644 --- a/lirc.spec +++ b/lirc.spec @@ -22,7 +22,7 @@ %endif Name: lirc # -Version: 0.9.3a +Version: 0.9.4 Release: 0 Summary: Tools for Infrared Receivers License: GPL-2.0+ @@ -37,10 +37,12 @@ Source9: 51-lirc.rules Patch0: 0001-Fix-segfault-when-starting-lircd-AUR-41581.patch # PATCH-FEATURE-UPSTREAM 0002-lircd-Fix-bad-default-for-lircdfile.patch -- Fix bad default for lircdfile Patch1: 0002-lircd-Fix-bad-default-for-lircdfile.patch +BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: libxslt-tools +BuildRequires: kmod-compat # for hw_atilibusb driver BuildRequires: pkgconfig BuildRequires: pkgconfig(alsa) @@ -50,8 +52,9 @@ BuildRequires: pkgconfig(libirman) %endif BuildRequires: python3 BuildRequires: python3-PyYAML -BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(libusb) BuildRequires: pkgconfig(portaudio-2.0) +BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(x11) @@ -215,14 +218,10 @@ sed -i 's|run|%{_localstatedir}/run|g' systemd/lircd.socket %build %configure \ - --with-igor \ - --with-transmitter \ - --with-port=0x3f8 \ - --with-irq=4 \ --enable-ipv6 # make %%{?_smp_mflags} # parallel makes are currently busted, do single-threaded for now -make +make perl %{SOURCE6} configs %install @@ -243,8 +242,6 @@ install -Dpm 644 contrib/99-remote-control-lirc.rules \ # get rid of libtool file find %{buildroot}%{_libdir} -type f -name "*.la" -print -delete # -# get rid of useless contrib stuff -rm contrib/lirc.* # # Don't install documentation in a non standard directory rm -rf %{buildroot}%{_datadir}/doc @@ -258,9 +255,6 @@ rm -rf %{buildroot}%{_datadir}/lirc/contrib # rm -rf %{buildroot}%{_datadir}/lirc/plugindocs # -# remove lirc.4, as it is part of man-pages from 4.05 on -rm %{buildroot}%{_mandir}/man4/lirc.4 -# %fdupes -s %{buildroot} %fdupes -s . @@ -275,10 +269,10 @@ rm %{buildroot}%{_mandir}/man4/lirc.4 %postun -n libirrecord0 -p /sbin/ldconfig %pre core -%service_add_pre lircd.service lircmd.service lircd.socket +%service_add_pre lircd.service lircmd.service lircd.socket irexec.service %post core -%service_add_post lircd.service lircmd.service lircd.socket +%service_add_post lircd.service lircmd.service lircd.socket irexec.service %if 0%{?suse_version} <= 1320 systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf >/dev/null 2>&1 || : %else @@ -297,10 +291,10 @@ for file in lircd.conf lircmd.conf lircrc; do done %preun core -%service_del_preun lircd.service lircmd.service lircd.socket +%service_del_preun lircd.service lircmd.service lircd.socket irexec.service %postun core -%service_del_postun lircd.service lircmd.service lircd.socket +%service_del_postun lircd.service lircmd.service lircd.socket irexec.service %files core %defattr (-,root,root) @@ -335,7 +329,10 @@ done %config(noreplace,missingok) %{_sysconfdir}/lirc/lircmd.conf %config(noreplace,missingok) %{_sysconfdir}/lirc/lirc_options.conf %config(noreplace,missingok) %{_sysconfdir}/lirc/lircd.conf.d/README.conf.d +%config(noreplace,missingok) %{_sysconfdir}/lirc/lircd.conf.d/devinput.lircd.conf +%config(noreplace,missingok) %{_sysconfdir}/lirc/irexec.lircrc %{_unitdir}/lirc* +%{_unitdir}/irexec.service %{_tmpfilesdir}/lirc.conf %files devel