Accepting request 329624 from home:posophe:branches:vdr
It was just commented out. OBS-URL: https://build.opensuse.org/request/show/329624 OBS-URL: https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=58
This commit is contained in:
parent
9e09498ee0
commit
56929dfeb0
@ -7,19 +7,19 @@ Subject: [PATCH 2/3] lircd: Fix bad default for lircdfile.
|
||||
daemons/lircd.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/daemons/lircd.c b/daemons/lircd.c
|
||||
diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
|
||||
index db8ea13..fa8cf17 100644
|
||||
--- a/daemons/lircd.c
|
||||
+++ b/daemons/lircd.c
|
||||
@@ -2230,7 +2230,7 @@
|
||||
"lircd:device", LIRC_DRIVER_DEVICE,
|
||||
"lircd:listen", NULL ,
|
||||
"lircd:connect", NULL,
|
||||
- "lircd:output", LIRCD,
|
||||
+ "lircd:lircdfile", LIRCD,
|
||||
"lircd:pidfile", PIDFILE,
|
||||
"lircd:logfile", "syslog",
|
||||
"lircd:debug", level,
|
||||
--- a/daemons/lircd.cpp
|
||||
+++ b/daemons/lircd.cpp
|
||||
@@ -2179,7 +2179,7 @@
|
||||
"lircd:device", NULL,
|
||||
"lircd:listen", NULL,
|
||||
"lircd:connect", NULL,
|
||||
- "lircd:output", LIRCD,
|
||||
+ "lircd:lircdfile", LIRCD,
|
||||
"lircd:pidfile", PIDFILE,
|
||||
"lircd:logfile", "syslog",
|
||||
"lircd:debug", level,
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
|
@ -1,25 +0,0 @@
|
||||
From d80c94ead949e16053449ddf215a88a5e5e159e3 Mon Sep 17 00:00:00 2001
|
||||
From: Alec Leamas <leamas.alec@gmail.com>
|
||||
Date: Tue, 19 Aug 2014 19:21:25 +0200
|
||||
Subject: [PATCH 4/4] lircd: fix compiler error=format-security error.
|
||||
|
||||
---
|
||||
daemons/lircd.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/daemons/lircd.c b/daemons/lircd.c
|
||||
index 7af4265..50fd9c6 100644
|
||||
--- a/daemons/lircd.c
|
||||
+++ b/daemons/lircd.c
|
||||
@@ -2303,7 +2303,7 @@ int main(int argc, char **argv)
|
||||
opt = options_getstring("lircd:listen_hostport");
|
||||
if (opt){
|
||||
if (opt2host_port(opt, &address, &port, errmsg) != 0){
|
||||
- fprintf(stderr, errmsg);
|
||||
+ printf(stderr, errmsg);
|
||||
return(EXIT_FAILURE);
|
||||
}
|
||||
} else
|
||||
--
|
||||
1.8.4.2
|
||||
|
126
imon2_conf.patch
126
imon2_conf.patch
@ -1,126 +0,0 @@
|
||||
diff -Nur lirc-0.8.1.orig/remotes/imon/lircd.conf.imon2 lirc-0.8.1/remotes/imon/lircd.conf.imon2
|
||||
--- lirc-0.8.1.orig/remotes/imon/lircd.conf.imon2 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ lirc-0.8.1/remotes/imon/lircd.conf.imon2 2007-04-23 14:17:52.000000000 +0200
|
||||
@@ -0,0 +1,122 @@
|
||||
+#
|
||||
+# this config file was automatically generated
|
||||
+# using lirc-0.8.1(imon2) on Mon Jan 23 20:22:11 2006
|
||||
+#
|
||||
+# contributed by M.Brakemeier
|
||||
+#
|
||||
+# brand: SoundGraph
|
||||
+# model no. of remote control: iMON-PAD
|
||||
+# devices being controlled by this remote:
|
||||
+#
|
||||
+
|
||||
+begin remote
|
||||
+
|
||||
+ name iMON-PAD
|
||||
+ bits 32
|
||||
+ eps 30
|
||||
+ aeps 100
|
||||
+
|
||||
+ one 0 0
|
||||
+ zero 0 0
|
||||
+ gap 235965
|
||||
+ min_repeat 1
|
||||
+ toggle_bit 0
|
||||
+
|
||||
+
|
||||
+ begin codes
|
||||
+ AppExit 0x288195B7
|
||||
+ Power 0x289115B7
|
||||
+ Record 0x298115B7
|
||||
+ Play 0x2A8115B7
|
||||
+ Open 0x29B1D5B7
|
||||
+ Rewind 0x2A8195B7
|
||||
+ Pause 0x2A9115B7
|
||||
+ FastForward 0x2B8115B7
|
||||
+ PrevChapter 0x2B9115B7
|
||||
+ Stop 0x2B9715B7
|
||||
+ NextChapter 0x298195B7
|
||||
+ Esc 0x2BB715B7
|
||||
+ Eject 0x299395B7
|
||||
+ AppLauncher 0x29B715B7
|
||||
+ MultiMon 0x2AB195B7
|
||||
+ TaskSwitcher 0x2A9395B7
|
||||
+ Mute 0x2B9595B7
|
||||
+ Vol+ 0x28A395B7
|
||||
+ Vol- 0x28A595B7
|
||||
+ Ch+ 0x289395B7
|
||||
+ Ch- 0x288795B7
|
||||
+ Timer 0x2B8395B7
|
||||
+ 1 0x28B595B7
|
||||
+ 2 0x2BB195B7
|
||||
+ 3 0x28B195B7
|
||||
+ 4 0x2A8595B7
|
||||
+ 5 0x299595B7
|
||||
+ 6 0x2AA595B7
|
||||
+ 7 0x2B9395B7
|
||||
+ 8 0x2A8515B7
|
||||
+ 9 0x2AA115B7
|
||||
+ 0 0x2BA595B7
|
||||
+ ShiftTab 0x28B515B7
|
||||
+ Tab 0x29A115B7
|
||||
+ MyMovie 0x2B8515B7
|
||||
+ MyMusic 0x299195B7
|
||||
+ MyPhoto 0x2BA115B7
|
||||
+ MyTV 0x28A515B7
|
||||
+ MyDVD 0x29A295B7
|
||||
+ Bookmark 0x288515B7
|
||||
+ Thumbnail 0x2AB715B7
|
||||
+ AspectRatio 0x29A595B7
|
||||
+ FullScreen 0x2AA395B7
|
||||
+ Menu 0x2BA385B7
|
||||
+ Caption 0x298595B7
|
||||
+ Language 0x2B8595B7
|
||||
+ MouseKeyboard 0x299115B7
|
||||
+ SelectSpace 0x2A9315B7
|
||||
+ MouseMenu 0x28B715B7
|
||||
+ MouseRightClick 0x688481B7
|
||||
+ Enter 0x28A195B7
|
||||
+ MouseLeftClick 0x688301B7
|
||||
+ WindowsKey 0x2B8195B7
|
||||
+ Backspace 0x28A115B7
|
||||
+ Mouse_N 0x690281B7
|
||||
+ Mouse_S 0x688291B7
|
||||
+ Mouse_W 0x6A8281B7
|
||||
+ Mouse_E 0x688A81B7
|
||||
+ end codes
|
||||
+
|
||||
+end remote
|
||||
+
|
||||
+#
|
||||
+# this config file was automatically generated
|
||||
+# using lirc-0.8.0(userspace) on Tue Oct 17 22:45:11 2006
|
||||
+#
|
||||
+# contributed by
|
||||
+#
|
||||
+# brand: Antec Fusion Wheel
|
||||
+# model no. of remote control:
|
||||
+# devices being controlled by this remote:
|
||||
+#
|
||||
+
|
||||
+begin remote
|
||||
+
|
||||
+ name Antec_Fusion_Wheel
|
||||
+ bits 16
|
||||
+ eps 30
|
||||
+ aeps 100
|
||||
+
|
||||
+ one 0 0
|
||||
+ zero 0 0
|
||||
+ post_data_bits 16
|
||||
+ post_data 0xFF
|
||||
+ gap 131971
|
||||
+ min_repeat 1
|
||||
+ toggle_bit 0
|
||||
+
|
||||
+
|
||||
+ begin codes
|
||||
+ CCW 0x0100
|
||||
+ CW 0x0001
|
||||
+ end codes
|
||||
+
|
||||
+end remote
|
||||
+
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:357ed1270c664f8293797fb0fa2c9260bd9b9cbce3497a95ce22b452fbe53604
|
||||
size 1642734
|
3
lirc-0.9.3.tar.bz2
Normal file
3
lirc-0.9.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:26f26914083aa3a56f874b45344f10b20725cb00cb0e6c4cab61daa665a386a5
|
||||
size 2284045
|
71
lirc.changes
71
lirc.changes
@ -1,3 +1,74 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 7 09:00:31 UTC 2015 - p.drouand@gmail.com
|
||||
|
||||
- Update to version 0.9.3
|
||||
* New build dependency: xsltproc (sometimes coming with libxml).
|
||||
* The irexec semantics have been changed so that the invoked programs
|
||||
run disconnected from the main irexec process. See irexec(1) (#92).
|
||||
* irrecord has got some love:
|
||||
* irrecord handles multiple definitions of same symbol OK (#78)
|
||||
* irrecord : Warns about single-key config files (#77)
|
||||
* irrecord : Checks for ambient light disturbances (#76)
|
||||
* irrecord : New option allows updating of existing template file.
|
||||
* irrecord : Template handling bug fixed
|
||||
* irrecord : -l --list-namespace option parsing bug fixed (#101).
|
||||
* irrecord : Minor fixes to irrecord-ui including -k option parsing fixed.
|
||||
* mode2 has been updated
|
||||
* mode2 : Handle also LIRCCODE devices (#94),
|
||||
* mode2 : Drop root privileges (#91)
|
||||
* mode2 : Add new scope-like display
|
||||
* mode2 : Handle the--driver-options switch
|
||||
* xmode2 has been updated to handle udp driver, the new --driver-options
|
||||
switch + some general overhaul.
|
||||
* irrecord has been split into a library and a cli interface (#36).
|
||||
The library interface is unstable.
|
||||
* irtoy: New support for debug LEDs. New documentation file, support
|
||||
in lirc-setup and driver table doc added.
|
||||
* The udp driver is patched to allow adjustable clockrates, see new
|
||||
udp_driver.html driver doc.
|
||||
* The mplay driver has been updated with patches which has been
|
||||
available "out there".
|
||||
* The select() calls in lircd, lircrcd and library routines have
|
||||
been replaced with poll() to avoid crashes when file descriptors
|
||||
becomes > 1024 (#109).
|
||||
* Set supplementary groups using effective-user (RH bz 1253907).
|
||||
* Work around kernel bug in /dev/lirc0 output (#119).
|
||||
* lircmd: Several option parsing bugs fixed, one of which blocked the
|
||||
systemd service (#104, RH bz 1234155).
|
||||
* lirc-lsremotes now displays logs after parsing files, making more
|
||||
parsing warnings visible.
|
||||
* lirc-config-tool is fixed to comply with guidelines (#105).
|
||||
* Bug in irexec when using modes fixed (#102).
|
||||
* Create log directory if required (#124).
|
||||
* lirc-setup: Fixed name clash on recent python versions.
|
||||
* The library routines for parsing lircd.conf now warns for duplicate
|
||||
keys and values (#107).
|
||||
* Enhanced pkg-config support for drivers compiled out-of-tree
|
||||
(see driver-api in the manual).
|
||||
* Unlinked and hard to find driver docs and manpages have been linked.
|
||||
* The documentation is heavily revised. Old obsolete text is removed,
|
||||
the manual is reorganized, some info is moved to manpages and a lot
|
||||
of minor updates and bugfixes.
|
||||
* The compiler has been switched to c++, and filenames are updated
|
||||
to *.cpp (#79)
|
||||
* The lircd.simsend and lircd.simreceive tools have been removed, superseeded
|
||||
by irsimsend and irsimreceive.
|
||||
* A new kernel driver irpipe has been added. This allows feeding data from
|
||||
userspace to lircd, which can use the /dev/irpipeX device as a clean
|
||||
substitute for /dev/lircX. A companion CLI tool irpipe(1) is also added.
|
||||
* Options parsing (notably -U) and just listing first remote bugs in
|
||||
irsimsend have been fixed.
|
||||
* Overall code formatting is improved with more consistent layout and
|
||||
updated git hook. See CONTRIBUTE.md'
|
||||
* Build: now uses parallel make by default.
|
||||
* Hardcoded CFLAGS in Makefiles fixed (#124).
|
||||
- Update patches
|
||||
* 0002-lircd-Fix-bad-default-for-lircdfile.patch
|
||||
* 0004-lircd-fix-compiler-error-format-security-error.patch
|
||||
- Remove imon2_conf.patch; fixed on upstream release
|
||||
- Add a dependency to libxslt-tools and gcc-c++
|
||||
- Add libirrecord0 subpackage
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 31 17:59:10 UTC 2015 - jengelh@inai.de
|
||||
|
||||
|
34
lirc.spec
34
lirc.spec
@ -22,7 +22,7 @@
|
||||
%endif
|
||||
Name: lirc
|
||||
#
|
||||
Version: 0.9.2a
|
||||
Version: 0.9.3
|
||||
Release: 0
|
||||
Summary: Tools for Infrared Receivers
|
||||
License: GPL-2.0+
|
||||
@ -37,12 +37,10 @@ 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
|
||||
# PATCH-FEATURE-UPSTREAM 0004-lircd-fix-compiler-error-format-security-error.patch --fix compiler error=format-security error
|
||||
Patch3: 0004-lircd-fix-compiler-error-format-security-error.patch
|
||||
# PATCH-FEATURE-UPSTREAM -- lirc config for iMON-PAD remote
|
||||
Patch90: imon2_conf.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libxslt-tools
|
||||
# for hw_atilibusb driver
|
||||
BuildRequires: libusb-devel
|
||||
BuildRequires: pkgconfig
|
||||
@ -107,6 +105,7 @@ Group: Development/Libraries/C and C++
|
||||
Requires: liblirc0 = %{version}
|
||||
Requires: liblirc_client0 = %{version}
|
||||
Requires: liblirc_driver0 = %{version}
|
||||
Requires: libirrecord0 = %{version}
|
||||
# files were in lirc package previously
|
||||
Conflicts: lirc <= 0.8.4
|
||||
|
||||
@ -136,6 +135,14 @@ Group: Hardware/Other
|
||||
%description -n liblirc_driver0
|
||||
The LIRC driver library. To actually use the lirc plugins.
|
||||
|
||||
%package -n libirrecord0
|
||||
Summary: LIRC record library
|
||||
License: GPL-2.0+
|
||||
Group: Hardware/Other
|
||||
|
||||
%description -n libirrecord0
|
||||
The LIRC record library. To actually use the lirc plugins.
|
||||
|
||||
%package -n liblirc0
|
||||
Summary: LIRC driver library
|
||||
License: GPL-2.0+
|
||||
@ -196,8 +203,6 @@ Some seldom used X11-based tools for debugging lirc configurations.
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
%patch90 -p1
|
||||
cp %{SOURCE8} .
|
||||
%if %{defined _rundir}
|
||||
# Fix rundir for openSUSE > 13.1
|
||||
@ -208,7 +213,7 @@ sed -i 's|run|%{_localstatedir}/run|g' systemd/lircd.socket
|
||||
%endif
|
||||
|
||||
%build
|
||||
CFLAGS="%{optflags} -fno-strict-aliasing" %configure \
|
||||
%configure \
|
||||
--with-igor \
|
||||
--with-transmitter \
|
||||
--with-port=0x3f8 \
|
||||
@ -249,6 +254,7 @@ rm -rf %{buildroot}%{_localstatedir}
|
||||
# Remove contrib folder; we will copy it into doc directory
|
||||
rm -rf %{buildroot}%{_datadir}/lirc/contrib
|
||||
#
|
||||
rm -rf %{buildroot}%{_datadir}/lirc/plugindocs
|
||||
#
|
||||
%fdupes -s %{buildroot}
|
||||
%fdupes -s .
|
||||
@ -256,10 +262,12 @@ rm -rf %{buildroot}%{_datadir}/lirc/contrib
|
||||
%post -n liblirc_client0 -p /sbin/ldconfig
|
||||
%post -n liblirc_driver0 -p /sbin/ldconfig
|
||||
%post -n liblirc0 -p /sbin/ldconfig
|
||||
%post -n libirrecord0 -p /sbin/ldconfig
|
||||
|
||||
%postun -n liblirc_client0 -p /sbin/ldconfig
|
||||
%postun -n liblirc_driver0 -p /sbin/ldconfig
|
||||
%postun -n liblirc0 -p /sbin/ldconfig
|
||||
%postun -n libirrecord0 -p /sbin/ldconfig
|
||||
|
||||
%pre core
|
||||
%service_add_pre lircd.service lircmd.service lircd.socket
|
||||
@ -287,9 +295,9 @@ done
|
||||
|
||||
%files core
|
||||
%defattr (-,root,root)
|
||||
%doc AUTHORS COPYING ChangeLog NEWS README TODO
|
||||
%doc AUTHORS COPYING ChangeLog NEWS README
|
||||
%doc README.SUSE
|
||||
%doc doc/html doc/images doc/lirc.hwdb doc/lirc.css doc/irxevent.keys
|
||||
%doc doc/html doc/lirc.hwdb doc/irxevent.keys
|
||||
%doc contrib
|
||||
%dir %{_datadir}/%{name}
|
||||
%dir %{_libdir}/%{name}
|
||||
@ -310,6 +318,7 @@ done
|
||||
%exclude %{_mandir}/man1/irxevent.*
|
||||
%exclude %{_mandir}/man1/xmode2.*
|
||||
%{_mandir}/man1/*
|
||||
%{_mandir}/man4/*
|
||||
%{_mandir}/man5/*
|
||||
%{_mandir}/man8/*
|
||||
%{python3_sitelib}/*
|
||||
@ -329,6 +338,7 @@ done
|
||||
%{_includedir}/lirc_driver.h
|
||||
%{_includedir}/lirc_private.h
|
||||
%{_libdir}/liblirc.so
|
||||
%{_libdir}/libirrecord.so
|
||||
%{_libdir}/liblirc_client.so
|
||||
%{_libdir}/liblirc_driver.so
|
||||
%{_libdir}/pkgconfig/lirc-driver.pc
|
||||
@ -366,6 +376,10 @@ done
|
||||
%defattr (-,root,root)
|
||||
%{_libdir}/liblirc_driver.so.*
|
||||
|
||||
%files -n libirrecord0
|
||||
%defattr (-,root,root)
|
||||
%{_libdir}/libirrecord.so.*
|
||||
|
||||
%files disable-kernel-rc
|
||||
%defattr (-,root,root)
|
||||
%{_udevrulesdir}/99-remote-control-lirc.rules
|
||||
|
Loading…
Reference in New Issue
Block a user