summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Heidelberg <david@ixit.cz>2019-10-27 16:44:27 +0100
committerMatt Turner <mattst88@gentoo.org>2020-02-01 18:40:51 -0800
commita4941a41f29c6e912417905a113e72418f2a8621 (patch)
treee65097ca193314137106d434f435ad4477c75faa /dev-libs/libwacom/files
parentdev-libs/libwacom: 1.0, avoid using GOLD linker (diff)
downloadgentoo-a4941a41f29c6e912417905a113e72418f2a8621.tar.gz
gentoo-a4941a41f29c6e912417905a113e72418f2a8621.tar.bz2
gentoo-a4941a41f29c6e912417905a113e72418f2a8621.zip
dev-libs/libwacom: Version bump to 1.1
- port to meson - include two meson fixes patches from master - add patch for optional doc/doxygen compilation option (merged upstream) Closes: https://bugs.gentoo.org/698660 Signed-off-by: David Heidelberg <david@ixit.cz> Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'dev-libs/libwacom/files')
-rw-r--r--dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch39
-rw-r--r--dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch24
-rw-r--r--dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch21
3 files changed, 84 insertions, 0 deletions
diff --git a/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch b/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch
new file mode 100644
index 00000000000..47eb27d54bf
--- /dev/null
+++ b/dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch
@@ -0,0 +1,39 @@
+From 18722d30b9eb38d0cd22609e076ad45c810f137d Mon Sep 17 00:00:00 2001
+From: David Heidelberg <david@ixit.cz>
+Date: Sun, 27 Oct 2019 20:34:55 +0100
+Subject: [PATCH] meson: make documentation a feature
+
+Nice to have for distributions, which needs to have predicable build.
+
+Signed-off-by: David Heidelberg <david@ixit.cz>
+---
+ meson.build | 3 ++-
+ meson_options.txt | 4 ++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 8283613..be2fcb3 100644
+--- a/meson.build
++++ b/meson.build
+@@ -460,7 +460,8 @@ install_man(configure_file(input: 'tools/libwacom-list-local-devices.man',
+ copy: true))
+
+ ############### docs ###########################
+-doxygen = find_program('doxygen', required: false)
++docs_feature = get_option('documentation')
++doxygen = find_program('doxygen', required: docs_feature)
+ if doxygen.found()
+ src_doxygen = [
+ join_paths(dir_src, 'libwacom.h'),
+diff --git a/meson_options.txt b/meson_options.txt
+index 1d75434..84c92bf 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,7 @@
++option('documentation',
++ type: 'feature',
++ value: 'auto',
++ description: 'Build doxygen documentation [default=auto]')
+ option('udev-dir',
+ type: 'string',
+ value: '',
diff --git a/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch b/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch
new file mode 100644
index 00000000000..06858cd36ad
--- /dev/null
+++ b/dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch
@@ -0,0 +1,24 @@
+From 07753990d7476d52cfd34fb7558c077bd8b44eeb Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon, 23 Sep 2019 09:29:45 +1000
+Subject: [PATCH] meson.build: match the libwacom.pc file Name with the
+ autotools one (#164)
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 13459f7..3e0cc07 100644
+--- a/meson.build
++++ b/meson.build
+@@ -81,7 +81,7 @@ dep_libwacom = declare_dependency(link_with: lib_libwacom)
+ install_headers('libwacom/libwacom.h', subdir: 'libwacom-1.0/libwacom')
+
+ pkgconfig.generate(filebase: 'libwacom',
+- name: 'Libwacom',
++ name: 'libwacom',
+ description: 'Wacom model feature query library',
+ version: meson.project_version(),
+ subdirs: 'libwacom-1.0',
diff --git a/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch b/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch
new file mode 100644
index 00000000000..e31df3a683d
--- /dev/null
+++ b/dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch
@@ -0,0 +1,21 @@
+From 6953c5a9fc51e286134cb977b3fdfe0999f3503a Mon Sep 17 00:00:00 2001
+From: worldofpeace <worldofpeace@protonmail.ch>
+Date: Sun, 22 Sep 2019 19:04:58 -0400
+Subject: [PATCH] meson: add private requires to .pc (#163)
+
+---
+ meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/meson.build b/meson.build
+index 0ae03e1..13459f7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -85,6 +85,7 @@ pkgconfig.generate(filebase: 'libwacom',
+ description: 'Wacom model feature query library',
+ version: meson.project_version(),
+ subdirs: 'libwacom-1.0',
++ requires_private: deps_libwacom,
+ libraries: lib_libwacom)
+
+ #################### data files ########################