From 1550a2ed53ba3e1cf4a7d20dafe2dd46258b9a8af966d3f552ab80d8e3cdadeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 14 Nov 2019 10:02:22 +0000 Subject: [PATCH] Accepting request 748511 from home:mgorse:branches:hardware - Update to 1.1: New devices: Wacom HID 5115 Other change: * Button codes defined for the 3rd gen Intuos S Changes from version 1.0: - udev rules are now installed by default Changes from version 0.99.901: New devices * Lenovo YOGA 720, YOGA 520, IdeaPad FLEX 5, MIIX 520 * Dell XPS 15 9570, Latitude 5175 * HP Spectre x360, Envy x360 Convertible * Wacom Intuos Pro 2 S, Cintiq 22, DTK-1660E * Huion 610 Pro v2 * Samsung 930QAA Other changes: * New API: libwacom_get_model_name() * meson build system support * fixed symbol versioning * EKR button ordering fixed * Stylus grouping added Changes from version 0.33: - New devices: * Wacom Bamboo Fun 4x5, Bamboo Fun 6x8, Bamboo1 5x8, Cintiq 16 * HP EliteBook x360, x2, HP Envy x360 * Acer Switch SA5 * Huion H420 * Lenovo Thinkpad L380 Yoga, L390 Yoga, Ideapad Flex, Yoga 730 * Dell Latitude 7390 - Switch to meson for 15.2/tumbleweed - Remove URI from keyring: file is no longer there. OBS-URL: https://build.opensuse.org/request/show/748511 OBS-URL: https://build.opensuse.org/package/show/hardware/libwacom?expand=0&rev=8 --- libwacom-0.32.tar.bz2 | 3 --- libwacom-0.32.tar.bz2.sig | Bin 95 -> 0 bytes libwacom-1.1.tar.bz2 | 3 +++ libwacom-1.1.tar.bz2.sig | Bin 0 -> 95 bytes libwacom.changes | 37 +++++++++++++++++++++++++++++++++++++ libwacom.spec | 29 +++++++++++++++++++++++------ 6 files changed, 63 insertions(+), 9 deletions(-) delete mode 100644 libwacom-0.32.tar.bz2 delete mode 100644 libwacom-0.32.tar.bz2.sig create mode 100644 libwacom-1.1.tar.bz2 create mode 100644 libwacom-1.1.tar.bz2.sig diff --git a/libwacom-0.32.tar.bz2 b/libwacom-0.32.tar.bz2 deleted file mode 100644 index ff15979..0000000 --- a/libwacom-0.32.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b9dab8bce0471b839c89d34a1b30839de2c24db03796fa8d572817830f85380 -size 501600 diff --git a/libwacom-0.32.tar.bz2.sig b/libwacom-0.32.tar.bz2.sig deleted file mode 100644 index 7e643d2e0031c9240286710a3c82454706a625a026be3d724227ddd2a85684e0..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeB(WnmCxVvrS6WUx`Hj~ANI2{McGl>4bFQ#%NjUIVrBBvhcbOd*!-5TdOE?-Y)$;x|>}dJEa?|b&zpQlu)H*1z diff --git a/libwacom-1.1.tar.bz2 b/libwacom-1.1.tar.bz2 new file mode 100644 index 0000000..3e65870 --- /dev/null +++ b/libwacom-1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cb483593676332e92d3fe1fe816350f136bb906fcee329579d6cb9802d99e02 +size 502696 diff --git a/libwacom-1.1.tar.bz2.sig b/libwacom-1.1.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..efd11de527353d29bf75db797d5d204f3f4f21773c47c68e3f909ded772ab1bd GIT binary patch literal 95 zcmeB(WnmCxVvrS6WUx`Hj~ANI2{#nv4;#lXcW023(_W|&`= v^Z(8+i8rFJrc8g&<2NT=@9CBXh6VdCF3_6i>}~#u{fhrS?Iyu^_emuH105*Y literal 0 HcmV?d00001 diff --git a/libwacom.changes b/libwacom.changes index 557d2df..45cf0f0 100644 --- a/libwacom.changes +++ b/libwacom.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Thu Nov 14 00:46:28 UTC 2019 - Michael Gorse + +- Update to 1.1: + New devices: Wacom HID 5115 + Other change: + * Button codes defined for the 3rd gen Intuos S + Changes from version 1.0: + - udev rules are now installed by default + Changes from version 0.99.901: + New devices + * Lenovo YOGA 720, YOGA 520, IdeaPad FLEX 5, MIIX 520 + * Dell XPS 15 9570, Latitude 5175 + * HP Spectre x360, Envy x360 Convertible + * Wacom Intuos Pro 2 S, Cintiq 22, DTK-1660E + * Huion 610 Pro v2 + * Samsung 930QAA + Other changes: + * New API: libwacom_get_model_name() + * meson build system support + * fixed symbol versioning + * EKR button ordering fixed + * Stylus grouping added + Changes from version 0.33: + - New devices: + * Wacom Bamboo Fun 4x5, Bamboo Fun 6x8, Bamboo1 5x8, Cintiq 16 + * HP EliteBook x360, x2, HP Envy x360 + * Acer Switch SA5 + * Huion H420 + * Lenovo Thinkpad L380 Yoga, L390 Yoga, Ideapad Flex, Yoga 730 + * Dell Latitude 7390 +- Switch to meson for 15.2/tumbleweed +- Remove URI from keyring: file is no longer there. +- Add libxml2 to BuildRequires. +- Don't manually install udev rules: now done by install. +- Switch URL to github. + ------------------------------------------------------------------- Tue Jan 29 08:42:16 UTC 2019 - cornelis@solcon.nl diff --git a/libwacom.spec b/libwacom.spec index 8f32a23..f183983 100644 --- a/libwacom.spec +++ b/libwacom.spec @@ -16,20 +16,29 @@ # +%if 0%{?suse_version} > 1510 +%bcond_without meson +%else +%bcond_with meson +%endif Name: libwacom -Version: 0.32 +Version: 1.1 Release: 0 Summary: Library to identify wacom tablets License: MIT Group: System/Libraries -URL: http://linuxwacom.sourceforge.net/ +URL: https://linuxwacom.github.io/ Source: https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 Source2: https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2.sig -Source3: http://www.who-t.net/contact/hutterer_peter.asc#/%{name}.keyring +Source3: %{name}.keyring Source99: baselibs.conf +%if %{with meson} +BuildRequires: meson >= 0.47.0 +%endif BuildRequires: pkgconfig BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gudev-1.0) +BuildRequires: pkgconfig(libxml-2.0) %description libwacom is a library to identify wacom tablets and their model-specific @@ -78,14 +87,22 @@ built-in on-screen tablet", "what is the size of this model", etc. %setup -q %build +%if %{with meson} +%meson +%meson_build +%else %configure \ + --with-udev-dir=%{_libexecdir}/udev \ --disable-static make %{?_smp_mflags} +%endif %install +%if %{with meson} +%meson_install +%else %make_install -mkdir -p %{buildroot}%{_udevrulesdir} -tools/generate-udev-rules > %{buildroot}%{_udevrulesdir}/65-libwacom.rules +%endif find %{buildroot} -type f -name "*.la" -delete -print @@ -94,7 +111,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %files -n libwacom2 %license COPYING -%doc NEWS README +%doc NEWS README.md %{_libdir}/libwacom.so.2* %files data