diff mbox

[2/3] package/libinput: fix build with libevdev

Message ID 1408899186-28542-2-git-send-email-romain.naour@openwide.fr
State Accepted
Headers show

Commit Message

Romain Naour Aug. 24, 2014, 4:53 p.m. UTC 
libevdev and libinput use the same function name (log_msg).
An easy fix is to rename one of the two functions.

Fixes:
http://autobuild.buildroot.net/results/b1e/b1ea94f09d6f7459e3d7794c4a62bbdbb53d5da6/build-end.log

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 ...put-01-rename-log_msg-to-libinput_log_msg.patch | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch

Comments

Thomas Petazzoni Aug. 25, 2014, 6:12 p.m. UTC | #1 
Dear Romain Naour,

On Sun, 24 Aug 2014 18:53:05 +0200, Romain Naour wrote:
> libevdev and libinput use the same function name (log_msg).
> An easy fix is to rename one of the two functions.
> 
> Fixes:
> http://autobuild.buildroot.net/results/b1e/b1ea94f09d6f7459e3d7794c4a62bbdbb53d5da6/build-end.log
> 
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
>  ...put-01-rename-log_msg-to-libinput_log_msg.patch | 58 ++++++++++++++++++++++
>  1 file changed, 58 insertions(+)
>  create mode 100644 package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch

Committed, but please submit upstream.

Thanks!

Thomas
Romain Naour Aug. 25, 2014, 9:01 p.m. UTC | #2 
Hi Thomas,

Le 25/08/2014 20:12, Thomas Petazzoni a écrit :
> Dear Romain Naour,
> 
> On Sun, 24 Aug 2014 18:53:05 +0200, Romain Naour wrote:
>> libevdev and libinput use the same function name (log_msg).
>> An easy fix is to rename one of the two functions.
>>
>> Fixes:
>> http://autobuild.buildroot.net/results/b1e/b1ea94f09d6f7459e3d7794c4a62bbdbb53d5da6/build-end.log
>>
>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>> ---
>>  ...put-01-rename-log_msg-to-libinput_log_msg.patch | 58 ++++++++++++++++++++++
>>  1 file changed, 58 insertions(+)
>>  create mode 100644 package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
> 
> Committed, but please submit upstream.
> 

I'll do.

Best regards,
Romain
Vicente Olivert Riera Aug. 26, 2014, 9:13 a.m. UTC | #3 
On 08/25/2014 10:01 PM, Romain Naour wrote:
> Hi Thomas,
>
> Le 25/08/2014 20:12, Thomas Petazzoni a écrit :
>> Dear Romain Naour,
>>
>> On Sun, 24 Aug 2014 18:53:05 +0200, Romain Naour wrote:
>>> libevdev and libinput use the same function name (log_msg).
>>> An easy fix is to rename one of the two functions.
>>>
>>> Fixes:
>>> http://autobuild.buildroot.net/results/b1e/b1ea94f09d6f7459e3d7794c4a62bbdbb53d5da6/build-end.log
>>>
>>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>>> ---
>>>   ...put-01-rename-log_msg-to-libinput_log_msg.patch | 58 ++++++++++++++++++++++
>>>   1 file changed, 58 insertions(+)
>>>   create mode 100644 package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
>>
>> Committed, but please submit upstream.
>>
>
> I'll do.
>
> Best regards,
> Romain
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>

Some changes to fix this kind of issues have been applied upstream. 
Please have a look to:

https://bugs.freedesktop.org/show_bug.cgi?id=82292

Maybe it's worth to do a version bump and check if that new patch is no 
longer necessary.
Romain Naour Aug. 28, 2014, 9:31 p.m. UTC | #4 
Hi Vicente,

Le 26/08/2014 11:13, Vicente Olivert Riera a écrit :
> On 08/25/2014 10:01 PM, Romain Naour wrote:
>> Hi Thomas,
>>
>> Le 25/08/2014 20:12, Thomas Petazzoni a écrit :
>>> Dear Romain Naour,
>>>
>>> On Sun, 24 Aug 2014 18:53:05 +0200, Romain Naour wrote:
>>>> libevdev and libinput use the same function name (log_msg).
>>>> An easy fix is to rename one of the two functions.
>>>>
>>>> Fixes:
>>>> http://autobuild.buildroot.net/results/b1e/b1ea94f09d6f7459e3d7794c4a62bbdbb53d5da6/build-end.log
>>>>
>>>>
>>>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>>>> ---
>>>>   ...put-01-rename-log_msg-to-libinput_log_msg.patch | 58
>>>> ++++++++++++++++++++++
>>>>   1 file changed, 58 insertions(+)
>>>>   create mode 100644
>>>> package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
>>>
>>> Committed, but please submit upstream.
>>>
>>
>> I'll do.
>>
>> Best regards,
>> Romain
>> _______________________________________________
>> buildroot mailing list
>> buildroot@busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
>>
> 
> Some changes to fix this kind of issues have been applied upstream. Please have
> a look to:
> 
> https://bugs.freedesktop.org/show_bug.cgi?id=82292

Thanks for the link !

I should have looked at the latest commits...

> 
> Maybe it's worth to do a version bump and check if that new patch is no longer
> necessary.
> 

Yes, I reverted my commit and I built libinput-0.3.0 using a backported version
of this patch:
http://lists.freedesktop.org/archives/wayland-devel/2014-August/016599.html

Also, libevdev has renamed the functions log_msg to _libevdev_log_msg.
So, the issue will be fixed without my patch in the next version bump of
libevdev or libinput.

Best regards,
Romain
diff mbox

Patch

diff --git a/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch b/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
new file mode 100644
index 0000000..55604b5
--- /dev/null
+++ b/package/libinput/libinput-01-rename-log_msg-to-libinput_log_msg.patch
@@ -0,0 +1,58 @@ 
+From 89a3ae2de21e528b8feb80dbea3928d43982d3be Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@openwide.fr>
+Date: Thu, 21 Aug 2014 18:18:16 +0200
+Subject: [PATCH 1/1] rename log_msg to libinput_log_msg
+
+This fix conflicts between libevdev and libinput
+
+http://autobuild.buildroot.net/results/c13/c133b7c706ee31302125df8ca94f4d0f0152c6c6/build-end.log
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ src/libinput-private.h | 14 +++++++-------
+ src/libinput.c         |  2 +-
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/libinput-private.h b/src/libinput-private.h
+index f9d2f87..ac1e1c4 100644
+--- a/src/libinput-private.h
++++ b/src/libinput-private.h
+@@ -81,15 +81,15 @@ typedef void (*libinput_source_dispatch_t)(void *data);
+ 
+ struct libinput_source;
+ 
+-#define log_debug(...) log_msg(LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__)
+-#define log_info(...) log_msg(LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__)
+-#define log_error(...) log_msg(LIBINPUT_LOG_PRIORITY_ERROR, __VA_ARGS__)
+-#define log_bug_kernel(...) log_msg(LIBINPUT_LOG_PRIORITY_ERROR, "kernel bug: " __VA_ARGS__)
+-#define log_bug_libinput(...) log_msg(LIBINPUT_LOG_PRIORITY_ERROR, "libinput bug: " __VA_ARGS__);
+-#define log_bug_client(...) log_msg(LIBINPUT_LOG_PRIORITY_ERROR, "client bug: " __VA_ARGS__);
++#define log_debug(...) libinput_log_msg(LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__)
++#define log_info(...) libinput_log_msg(LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__)
++#define log_error(...) libinput_log_msg(LIBINPUT_LOG_PRIORITY_ERROR, __VA_ARGS__)
++#define log_bug_kernel(...) libinput_log_msg(LIBINPUT_LOG_PRIORITY_ERROR, "kernel bug: " __VA_ARGS__)
++#define log_bug_libinput(...) libinput_log_msg(LIBINPUT_LOG_PRIORITY_ERROR, "libinput bug: " __VA_ARGS__);
++#define log_bug_client(...) libinput_log_msg(LIBINPUT_LOG_PRIORITY_ERROR, "client bug: " __VA_ARGS__);
+ 
+ void
+-log_msg(enum libinput_log_priority priority, const char *format, ...);
++libinput_log_msg(enum libinput_log_priority priority, const char *format, ...);
+ 
+ int
+ libinput_init(struct libinput *libinput,
+diff --git a/src/libinput.c b/src/libinput.c
+index eec9efb..4e3f6fa 100644
+--- a/src/libinput.c
++++ b/src/libinput.c
+@@ -110,7 +110,7 @@ static struct log_data log_data = {
+ };
+ 
+ void
+-log_msg(enum libinput_log_priority priority, const char *format, ...)
++libinput_log_msg(enum libinput_log_priority priority, const char *format, ...)
+ {
+ 	va_list args;
+ 
+-- 
+1.9.3
+