| Message ID | 1461273652-8935-1-git-send-email-gustavo@zacarias.com.ar |
|---|---|
| State | Accepted |
| Commit | 1c02dee9552c06c90d887746e70181347a2e2fde |
| Headers | show |
Hello, On Thu, 21 Apr 2016 18:20:51 -0300, Gustavo Zacarias wrote: > diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk > index 6d8b7b6..2954760 100644 > --- a/package/libinput/libinput.mk > +++ b/package/libinput/libinput.mk > @@ -7,13 +7,18 @@ > LIBINPUT_VERSION = 1.1.5 > LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz > LIBINPUT_SITE = http://www.freedesktop.org/software/libinput > -LIBINPUT_LICENSE = MIT > -LIBINPUT_LICENSE_FILES = COPYING > - > LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev > LIBINPUT_INSTALL_STAGING = YES > - > +LIBINPUT_LICENSE = MIT > +LIBINPUT_LICENSE_FILES = COPYING You say in the commit log you're doing whitespace changes, but it seems like the licence lines were moved down in the file. For what reason? Thomas
On 21/04/16 18:39, Thomas Petazzoni wrote: > You say in the commit log you're doing whitespace changes, but it seems > like the licence lines were moved down in the file. For what reason? > > Thomas Hi. I tend to like licensing info below, so yes i've moved it down, just pure habit. Regards.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: > Otherwise since it's automatic it was left to random depending on the > libgtk3/libinput build order. > Also collapse all that whitespace. > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks.
diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 6d8b7b6..2954760 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -7,13 +7,18 @@ LIBINPUT_VERSION = 1.1.5 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput -LIBINPUT_LICENSE = MIT -LIBINPUT_LICENSE_FILES = COPYING - LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev LIBINPUT_INSTALL_STAGING = YES - +LIBINPUT_LICENSE = MIT +LIBINPUT_LICENSE_FILES = COPYING # Tests need fork, so just disable them everywhere. LIBINPUT_CONF_OPTS = --disable-tests +ifeq ($(BR2_PACKAGE_LIBGTK3),y) +LIBINPUT_CONF_OPTS += --enable-event-gui +LIBINPUT_DEPENDENCIES += libgtk3 +else +LIBINOUT_CONF_OPTS += --disable-event-gui +endif + $(eval $(autotools-package))
Otherwise since it's automatic it was left to random depending on the libgtk3/libinput build order. Also collapse all that whitespace. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/libinput/libinput.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)