From 6c0493222168409026278545f8ebca933f17f9fe Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 12 Mar 2015 09:41:06 +0100 Subject: [PATCH 1/6] libinput: update to 0.12.0. --- common/shlibs | 2 +- srcpkgs/libinput/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 1dff294cf18..ef303528ecc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1486,7 +1486,7 @@ libmspack.so.0 libmspack-0.4alpha_1 libslim.so.1.3.6 slim-1.3.6_1 libmozjs-24.so mozjs24-24.2.0_1 libmediaart-1.0.so.0 libmediaart-0.3.0_1 -libinput.so.7 libinput-0.10.0_1 +libinput.so.10 libinput-0.12.0_1 libvaladoc.so.0 valadoc-git-20140327_1 libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1 libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1 diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template index 812a2ddaa1a..9ecc43467fe 100644 --- a/srcpkgs/libinput/template +++ b/srcpkgs/libinput/template @@ -1,6 +1,6 @@ # Template file for 'libinput' pkgname=libinput -version=0.10.0 +version=0.12.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="MIT" homepage="http://www.freedesktop.org/wiki/Software/libinput/" distfiles="http://freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" -checksum=4ce001f80ff1a6bf547784d02125648bf8abe60db7d3d5e0020294d5215c1441 +checksum=6e0ce9dd9ff04e9ac382dffb7fa332b94f093227a197a9c8189e87de6d88b55a libinput-devel_package() { short_desc+=" - development files" From 838b9c97f3a45b3145a0d4c526f29b6a859d153b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 12 Mar 2015 09:43:45 +0100 Subject: [PATCH 2/6] clutter: rebuild with libinput-0.12.0. --- srcpkgs/clutter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template index 0b74b6070cd..7e2e95961ee 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -1,7 +1,7 @@ # Template file for 'clutter' pkgname=clutter version=1.20.0 -revision=3 +revision=4 patch_args="-Np1" build_style=gnu-configure build_options="gir" @@ -11,7 +11,7 @@ hostmakedepends="automake libtool pkg-config intltool glib-devel gettext-devel $(vopt_if gir gobject-introspection)" makedepends=" atk-devel pango-devel libXi-devel libXcomposite-devel json-glib-devel - libxkbcommon-devel cogl-devel>=1.18 libinput-devel eudev-libgudev-devel + libxkbcommon-devel cogl-devel>=1.18 libinput-devel>=0.12 eudev-libgudev-devel eudev-libudev-devel" short_desc="OpenGL based interactive canvas library" maintainer="Juan RP " From f4f57101a14f5f66e9bd817a96d2bce432aca130 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 12 Mar 2015 09:46:11 +0100 Subject: [PATCH 3/6] weston: rebuild with libinput-0.12.0. --- srcpkgs/weston/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template index e931479d04a..c7647cef686 100644 --- a/srcpkgs/weston/template +++ b/srcpkgs/weston/template @@ -1,7 +1,7 @@ # Template file for 'weston'. pkgname=weston version=1.7.0 -revision=2 +revision=3 build_style=gnu-configure # XXX enable rdp compositor if freerdp is updated to >=1.1. configure_args="--enable-libinput-backend --disable-setuid-install @@ -21,7 +21,7 @@ hostmakedepends="pkg-config wayland-devel>=${version} autoconf automake libtool" makedepends="libpng-devel>=1.6 wayland-devel>=${version} libxkbcommon-devel pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel>=0.4.0 poppler-glib-devel pam-devel lcms2-devel libudev-devel libdrm-devel - libinput-devel>=0.10.0 libxcb-devel libXcursor-devel colord-devel + libinput-devel>=0.12 libxcb-devel libXcursor-devel colord-devel $(vopt_if backtrace libunwind-devel) $(vopt_if dbus dbus-devel) $(vopt_if systemd systemd-devel) $(vopt_if vaapi libva-devel)" From 787b25c06f90bd41af770ccd2738d1744b8a4ff7 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 12 Mar 2015 09:52:26 +0100 Subject: [PATCH 4/6] wld-git: rebuild with libinput-0.12.0. --- srcpkgs/wld-git/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wld-git/template b/srcpkgs/wld-git/template index 30670287210..8f2781fb336 100644 --- a/srcpkgs/wld-git/template +++ b/srcpkgs/wld-git/template @@ -5,7 +5,7 @@ _gitshort="${_githash:0:7}" pkgname=wld-git version=20150215 -revision=1 +revision=2 homepage="https://github.com/michaelforney/wld" distfiles="https://github.com/michaelforney/wld/archive/${_githash}.tar.gz" short_desc="Primitive drawing library targeted at Wayland" From a7206a9382a87a1112ed4f256b66a31d4e58d4cb Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 12 Mar 2015 09:44:27 +0100 Subject: [PATCH 5/6] xf86-input-libinput: update to 0.8.0. --- srcpkgs/xf86-input-libinput/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xf86-input-libinput/template b/srcpkgs/xf86-input-libinput/template index 5fe512c22a8..fbc65ffd653 100644 --- a/srcpkgs/xf86-input-libinput/template +++ b/srcpkgs/xf86-input-libinput/template @@ -1,18 +1,18 @@ # Template build file for 'xf86-input-libinput'. pkgname=xf86-input-libinput -version=0.7.0 +version=0.8.0 revision=1 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="xorg-server-devel>=1.17<1.18 libinput-devel>=0.10" +makedepends="xorg-server-devel>=1.17<1.18 libinput-devel>=0.12" depends="virtual?xserver-abi-input-21_1" short_desc="Generic input driver for the X.Org server based on libinput" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" license="MIT" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" -checksum=9392129d9598ddc108faa74e8eb311dc59b81c083da0c4804210ed2a7b4abb84 +checksum=2152b0984feffe8151934ad9af29bde7fc621e0a54b0cdedbaf1abc367dea43a post_install() { vinstall ${FILESDIR}/90-libinput.conf 644 usr/share/X11/xorg.conf.d From 6d0df6a2a76f67c54d54d2be6a4381c4e93b5a27 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 12 Mar 2015 10:00:04 +0100 Subject: [PATCH 6/6] libinput: shorten short_desc, use FREEDESKTOP_SITE. --- srcpkgs/libinput/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template index 9ecc43467fe..16c4818a6d0 100644 --- a/srcpkgs/libinput/template +++ b/srcpkgs/libinput/template @@ -5,11 +5,11 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="mtdev-devel libudev-devel libevdev-devel" -short_desc="Library to handle input devices in Wayland compositors and to provide a generic X.Org input driver" +short_desc="Provides handling input devices in Wayland compositors and X.Org" maintainer="Juan RP " license="MIT" homepage="http://www.freedesktop.org/wiki/Software/libinput/" -distfiles="http://freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" +distfiles="$FREEDESKTOP_SITE/$pkgname/$pkgname-$version.tar.xz" checksum=6e0ce9dd9ff04e9ac382dffb7fa332b94f093227a197a9c8189e87de6d88b55a libinput-devel_package() {