diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
commit | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch) | |
tree | ab466b4dfa7abecb401b2f8039d08af4689306bb /dev-libs/libwacom | |
parent | d42200bec37eef2a7478d88988ff00addd0a9202 (diff) |
gentoo resync : 05.02.2020
Diffstat (limited to 'dev-libs/libwacom')
-rw-r--r-- | dev-libs/libwacom/Manifest | 9 | ||||
-rw-r--r-- | dev-libs/libwacom/files/libwacom-1.1-configurable_docs.patch | 39 | ||||
-rw-r--r-- | dev-libs/libwacom/files/libwacom-1.1-match-with-autotools.patch | 24 | ||||
-rw-r--r-- | dev-libs/libwacom/files/libwacom-1.1-meson-add-private.patch | 21 | ||||
-rw-r--r-- | dev-libs/libwacom/libwacom-0.33.ebuild | 2 | ||||
-rw-r--r-- | dev-libs/libwacom/libwacom-1.0.ebuild | 6 | ||||
-rw-r--r-- | dev-libs/libwacom/libwacom-1.1.ebuild | 46 |
7 files changed, 143 insertions, 4 deletions
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest index 4834eeb955ab..29515e7f161a 100644 --- a/dev-libs/libwacom/Manifest +++ b/dev-libs/libwacom/Manifest @@ -1,5 +1,10 @@ +AUX libwacom-1.1-configurable_docs.patch 1281 BLAKE2B 33a4ed7776580f3146351e552fd8fbd26ad4207d612596291272fee2d6f85aac36fc0fd2d47b31c1dffdcc58a325bb3aae28122a1e7cc4dab96d10efdc2fbfcf SHA512 d1d4aa074f8b3d14f7b59f66db86b132c1ab152324b8191a2d99f61b4283ced02f2d931a725c71a92427f31f89a14e323e57c163efbb1a3d71bafe43f5b2f0cc +AUX libwacom-1.1-match-with-autotools.patch 854 BLAKE2B a89d65616346b943b4566c1619b6f1af45f6c9543e35f2722a114623480de7391a2cc3f99ee62ff214662ce61c3d0dfc48ff163173bd138cc433b94a43c73078 SHA512 abab5526cc4c9190bc8546d2c4c590d8af41d86a180ef87aaea8509c061837dfb81ba6fb9d34348c9ec63ebcb8736191549feb921b2f6702ffb2184a783b887c +AUX libwacom-1.1-meson-add-private.patch 694 BLAKE2B 98330d479d1e24de0ad3f4c055be5c07a3581592cfcd3e8d122ff1157691e7847f18a11ec43ab8433ebaa8d2442688772e32fab2c063f74aa5d44d55ba2cded4 SHA512 32bb46c24145f06f3bcfa6e55322ba1ca2df859bd47f8d35725e9a361f9a74f0c0c1d6a221792dc9b20928cf82f393c74301dad159cb490ce14064f0c0e8c86b DIST libwacom-0.33.tar.bz2 503217 BLAKE2B 034b06495209cc88e9a3131a8a23b35fdadf8bc038ff9db62d4dc05b31657d1cfbe4856cf7b1a6112c97d47bb532b664e4e59c3b00a2aebf14dfacbcac141063 SHA512 de4d9cf3b5f4d87a159ba8ee617bafce9d13b67dc23d9dc67efd57317b0df2079dd0de328bc800de47f14ee49ea82bb842e34297cef23ba336c1ddca3afa826d DIST libwacom-1.0.tar.bz2 502457 BLAKE2B c7de15e8e403a4778662c711a4318ffd46c65fcb895e50181b14f6f9c4169493fcd14a78bae62cfad8af0e4d762b5babb06df21ff257994b1890d5ec9078e6ef SHA512 43a8098ed06c86edc647d6a6b0ee0b465bcb6089df77fd361909271aaf5f18ae2fecfa34062fd4a9fdee6983ff1303b99636485ebde6a75a669307bd19c2b313 -EBUILD libwacom-0.33.ebuild 1175 BLAKE2B cf9dcbb372671ba9e4f76508bca2eacac88a4c26b9ad4880e14fc5139bbb04af18cbe8c514fb644f1d91ccbb0f4164ab1399e07a8194d9be99fcb37b38d7c9c4 SHA512 fb7252999e9007c551f6acfdac650157832913b9d4942cdbed4d13134eeed0854cc43bfb8f1bb08adc02863cb89a9e2fa53a2258a27066c53116f28a3453512b -EBUILD libwacom-1.0.ebuild 1039 BLAKE2B dbf80df3a60d3e3a670ec62e95bf65f75eaeaae944c449bccf61f6fa585374615e48e2d8ba3f2f29281351eb04c6426b6c1bc6da797b4bf6f2d5b48a5eb8d9fa SHA512 25b2de42c9a6aefc428d7350f5fa7da4dcef578104d3549d322582e875cf5c23b4dd46413fbe07d3e3776d226d1b0db743860461d7c3272d7ade0fc930d038d6 +DIST libwacom-1.1.tar.bz2 502696 BLAKE2B 1c2e03b00eb3b17dea2d5cd3e61afa4b7f36dcb727f07bb1cc42631febc9d1939bdd2652d6fd1f0d020815cac1f937c1daddae3019ac9aa01659442cdc8b9054 SHA512 8b63d9bad18c27f8078711408a7b79c70086cd0c64fe692ee693d53d834dff8ab45631eabd206f0dfac80d8cc86c14b5833831b1b99b06e34aacd235176d266b +EBUILD libwacom-0.33.ebuild 1176 BLAKE2B acdb336190e555a0078a813f44660653428c49b4aa52f98942b5d556b802e50412249a682c5ab23bcb96657f5df23e8a36a0bfc200461ae25f27fdf3a8bbaf13 SHA512 409187fb02424346ea1d925b96d0b3699a4337bc532c99bf3f7c5faa0cbb73de85f8cc693661063bcf3f15857f46e2f862d349730f1fc4bc40164cc88a8245c2 +EBUILD libwacom-1.0.ebuild 1148 BLAKE2B 3999f45892c620cc1e1263b0d1cfefab431122b14a1ec308a80d6d72426885b74cfd4aa785984ec46ef6117ae4b1b5d56e0331abf60782a7327e20970135b3df SHA512 c99a4f68900a5efca6d743138e583a15317da2401384ac17f8ef281cb698d337c3cc83971d9fbd18b38af54255b8b17172d06f9b0b368beb3c37678aa2e67b82 +EBUILD libwacom-1.1.ebuild 1020 BLAKE2B 115cecd08add58be7186676e5595b9f4d60b685049ebd9d122853ccf17e8e2b5142782fcb3458b72283dd5cd1157616e0cb310dda5a83eb2b1338433869f07c0 SHA512 af1cc00cf112066c954e92fb11924baf382e2fd4e62b531478fe7658492f5533993dcccc2d0300879e2b18e03ca0f9b6a819035796407464947b49df520b2773 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5 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 000000000000..47eb27d54bf8 --- /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 000000000000..06858cd36ad1 --- /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 000000000000..e31df3a683d0 --- /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 ######################## diff --git a/dev-libs/libwacom/libwacom-0.33.ebuild b/dev-libs/libwacom/libwacom-0.33.ebuild index cfdfa6692595..c281d67ae4f9 100644 --- a/dev-libs/libwacom/libwacom-0.33.ebuild +++ b/dev-libs/libwacom/libwacom-0.33.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2 LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86" IUSE="doc static-libs" BDEPEND=" diff --git a/dev-libs/libwacom/libwacom-1.0.ebuild b/dev-libs/libwacom/libwacom-1.0.ebuild index 358cf66a884b..eea01082ec86 100644 --- a/dev-libs/libwacom/libwacom-1.0.ebuild +++ b/dev-libs/libwacom/libwacom-1.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools udev +inherit autotools udev toolchain-funcs DESCRIPTION="Library for identifying Wacom tablets and their model-specific features" HOMEPAGE="https://github.com/linuxwacom/libwacom" @@ -24,6 +24,10 @@ RDEPEND=" " DEPEND="${RDEPEND}" +pkg_setup() { + tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170 +} + src_prepare() { default rm -r data/foo || die # duplicate dir in tarball, bug #693434 diff --git a/dev-libs/libwacom/libwacom-1.1.ebuild b/dev-libs/libwacom/libwacom-1.1.ebuild new file mode 100644 index 000000000000..0496e24b9b6c --- /dev/null +++ b/dev-libs/libwacom/libwacom-1.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson udev toolchain-funcs + +DESCRIPTION="Library for identifying Wacom tablets and their model-specific features" +HOMEPAGE="https://github.com/linuxwacom/libwacom" +SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" +RDEPEND=" + dev-libs/glib:2 + dev-libs/libgudev:= +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-meson-add-private.patch" + "${FILESDIR}/${P}-match-with-autotools.patch" + "${FILESDIR}/${P}-configurable_docs.patch" +) + +pkg_setup() { + tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170 +} + +src_configure() { + local emesonargs=( + $(meson_feature doc documentation) + $(meson_use test tests) + -Dudev-dir=$(get_udevdir) + + ) + meson_src_configure +} |