Your message dated Sat, 05 Nov 2016 13:49:35 +0000
with message-id <e1c31lj-0001dj...@fasolo.debian.org>
and subject line Bug#842330: fixed in squeezelite 1.8-3.1
has caused the Debian Bug report #842330,
regarding [PATCH] [RC] Fix syslog.h conflict with upcoming lirc-0.9.4
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
842330: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=842330
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: squeezelite
Version: 1.8-3
Severity: Important
The upcoming lirc-0.9.4 has a compile-time conflict with syslog.h which
is included by the updated lirc.h header. The enclosed patch fixes this
by re-defining the conflicting symbols as needed.
Without the patch squeezelite won't build against the new lirc.
Please note that we would like to upload lirc 0.9.4 in unstable in the
next few weeks, in that timing this bug will become RC and an NMU might
be required.
Description: Handle LOG_ macros conflict with syslog.h
Upcoming lirc-0.9.4 includes syslog.h when including lirc_client.h. Since
ffmpeg uses macros like LOG_DEBUG which conflicts with the symbols in
syslog.h this leads to FTBS erros. Enclosed patch basically undefines
the syslog symbols before re-using them.
Author: Alec Leamas <lea...@nowhere.net>
--- squeezelite-1.8.orig/ir.c
+++ squeezelite-1.8/ir.c
@@ -20,12 +20,14 @@
// ir thread - linux only
+#if IR
+#include <lirc/lirc_client.h>
+#endif
+
#include "squeezelite.h"
#if IR
-#include <lirc/lirc_client.h>
-
#define LIRC_CLIENT_ID "squeezelite"
static log_level loglevel;
@@ -52,8 +54,10 @@ struct lirc {
};
static struct lirc *i;
+
#endif
+
#if LINKALL
#define LIRC(h, fn, ...) (lirc_ ## fn)(__VA_ARGS__)
#else
--- squeezelite-1.8.orig/squeezelite.h
+++ squeezelite-1.8/squeezelite.h
@@ -363,6 +363,26 @@ typedef enum { lERROR = 0, lWARN, lINFO,
const char *logtime(void);
void logprint(const char *fmt, ...);
+#ifdef LOG_ERROR
+#undef LOG_ERROR
+#endif
+
+#ifdef LOG_WARN
+#undef LOG_WARN
+#endif
+
+#ifdef LOG_INFO
+#undef LOG_INFO
+#endif
+
+#ifdef LOG_DEBUG
+#undef LOG_DEBUG
+#endif
+
+#ifdef LOG_SDEBUG
+#undef LOG_SDEBUG
+#endif
+
#define LOG_ERROR(fmt, ...) logprint("%s %s:%d " fmt "\n", logtime(), __FUNCTION__, __LINE__, ##__VA_ARGS__)
#define LOG_WARN(fmt, ...) if (loglevel >= lWARN) logprint("%s %s:%d " fmt "\n", logtime(), __FUNCTION__, __LINE__, ##__VA_ARGS__)
#define LOG_INFO(fmt, ...) if (loglevel >= lINFO) logprint("%s %s:%d " fmt "\n", logtime(), __FUNCTION__, __LINE__, ##__VA_ARGS__)
--- End Message ---
--- Begin Message ---
Source: squeezelite
Source-Version: 1.8-3.1
We believe that the bug you reported is fixed in the latest version of
squeezelite, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 842...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Gianfranco Costamagna <locutusofb...@debian.org> (supplier of updated
squeezelite package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Mon, 31 Oct 2016 13:50:26 +0100
Source: squeezelite
Binary: squeezelite squeezelite-pa
Architecture: source
Version: 1.8-3.1
Distribution: unstable
Urgency: medium
Maintainer: Chris Boot <bo...@debian.org>
Changed-By: Gianfranco Costamagna <locutusofb...@debian.org>
Description:
squeezelite - lightweight headless Squeezebox emulator - ALSA version
squeezelite-pa - lightweight headless Squeezebox emulator - PortAudio version
Closes: 842330
Changes:
squeezelite (1.8-3.1) unstable; urgency=medium
.
* Non-maintainer upload.
* debian/patches/rename-logs.patch:
- rename LOG_* functions to avoid clashes with the one in syslog.h
(Closes: #842330)
Checksums-Sha1:
f9638ce7d2169655abaa54fe2a531cb5bdbb3e92 2089 squeezelite_1.8-3.1.dsc
d4d1fc7b12c66fcc4a0377c2d92ee3b57b289e54 32712
squeezelite_1.8-3.1.debian.tar.xz
Checksums-Sha256:
a48dd763dd6d65a15691ca0454c74d02e2025e98c900e588f2654fe75066e5f8 2089
squeezelite_1.8-3.1.dsc
64bd3656d80a134af136f82e57cd5c629ed7022f092d057a3a3a6894935a2a09 32712
squeezelite_1.8-3.1.debian.tar.xz
Files:
39b9e037a0a7bc56742fc8735ecabfdf 2089 sound extra squeezelite_1.8-3.1.dsc
34292555f63a0505719a183e905e9a2e 32712 sound extra
squeezelite_1.8-3.1.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBCAAGBQJYF0LaAAoJEPNPCXROn13Z+88P/0qdKoIW4rRNhXaMI7F/ZFzH
zPgXIq2YM4RPl9azahXsOjzrTC+tPq5b7Co+AcAEjmxaGNzCGhpspqG6pJmEJw7Q
RNJbueQqvySkkM2fgIzWavahDhNXlLZW+pTOgAahHjfb/+ivAbW9zJpzLFgrfe4P
Dl+4QJvYgt4AzAmjIb7uOswbH/+TocqEBBOX3AyNaIUi4NyT4f9R0FWf7WlJkdrH
Qv06EGjP88dR2ExCmcwdGdmM0AiqRJrH778SF+3BYAxn7KnujfjSyXLVFo+1a+IL
FMSXSvMVTohfclr49Y7J+rfY3SPDCnMOl3p/d/Tykqx0hi6m9ETO3iy7I+H3H1/V
PgedBGQjyfIoDIKPe95w02RsqMXx4IsJCuj1hcgCl3O0cdxXbaP8Lyqdn689KgKU
M5wrKOgIS06cqkF3JtHT37z7GDhGTccMB7KCgSEL1X8YrcX1Q4fbq3OyrCkCoZUC
Uu30hVgpjicbywWjPp16DvWiOye7POx+itlyD4s4/fqcqFXWTinMs+6bAjx/McZj
PgCCHXRndC9s3PsKP4wFevulV7fT1Ee0RT3Ao0XWAca/CcWhbasNCfNf4G8/rOhO
5D5e4ivO++Au0LCbQ/j5Cgi3sUUcSRS73v7c2jgEGxmFEK1veDvmlXCxkNAZkQsY
E/WJxqapjI9rB4ilE/2O
=CE/+
-----END PGP SIGNATURE-----
--- End Message ---
