From 71231a3125b82d8616101840568928495be29a45 Mon Sep 17 00:00:00 2001 From: maxice8 <30738253+maxice8@users.noreply.github.com> Date: Fri, 21 Sep 2018 08:25:23 -0300 Subject: [PATCH] eudev: update to 3.2.6. --- .../eudev/patches/fix-udev-rules-sub.patch | 40 +++++++++++++++++++ srcpkgs/eudev/patches/identify_switches.patch | 11 ----- srcpkgs/eudev/template | 9 +++-- 3 files changed, 45 insertions(+), 15 deletions(-) create mode 100644 srcpkgs/eudev/patches/fix-udev-rules-sub.patch delete mode 100644 srcpkgs/eudev/patches/identify_switches.patch diff --git a/srcpkgs/eudev/patches/fix-udev-rules-sub.patch b/srcpkgs/eudev/patches/fix-udev-rules-sub.patch new file mode 100644 index 00000000000..4fdb85b583b --- /dev/null +++ b/srcpkgs/eudev/patches/fix-udev-rules-sub.patch @@ -0,0 +1,40 @@ +From b01d1cd8cf7129a555b1781069b2616c7a4c7dd8 Mon Sep 17 00:00:00 2001 +From: maxice8 +Date: Thu, 20 Sep 2018 08:20:12 -0300 +Subject: [PATCH] rules/50-udev-default.rules: fix substituation + +These are now generates upstream by meson + +While we're at it also replace render group with video group +--- + rules/50-udev-default.rules | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules +index 191f56f..c2f4a19 100644 +--- a/rules/50-udev-default.rules ++++ b/rules/50-udev-default.rules +@@ -36,8 +36,8 @@ SUBSYSTEM=="dvb", GROUP="video" + SUBSYSTEM=="media", GROUP="video" + SUBSYSTEM=="cec", GROUP="video" + +-SUBSYSTEM=="drm", KERNEL=="renderD*", GROUP="render", MODE="@GROUP_RENDER_MODE@" +-SUBSYSTEM=="kfd", GROUP="render", MODE="@GROUP_RENDER_MODE@" ++SUBSYSTEM=="drm", KERNEL=="renderD*", GROUP="video", MODE="0666" ++SUBSYSTEM=="kfd", GROUP="video", MODE="0666" + + SUBSYSTEM=="sound", GROUP="audio", \ + OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer" +@@ -79,7 +79,7 @@ KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun" + KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse" + + # The static_node is required on s390x and ppc (they are using MODULE_ALIAS) +-KERNEL=="kvm", GROUP="kvm", MODE="@DEV_KVM_MODE@", OPTIONS+="static_node=kvm" ++KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm" + + SUBSYSTEM=="ptp", ATTR{clock_name}=="KVM virtual PTP", SYMLINK += "ptp_kvm" + +-- +2.19.0 + + diff --git a/srcpkgs/eudev/patches/identify_switches.patch b/srcpkgs/eudev/patches/identify_switches.patch deleted file mode 100644 index 4e2c36b203e..00000000000 --- a/srcpkgs/eudev/patches/identify_switches.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/udev/udev-builtin-input_id.c.orig 2018-03-20 21:28:01.154589960 +0100 -+++ src/udev/udev-builtin-input_id.c 2018-03-20 21:28:03.672847430 +0100 -@@ -292,6 +292,8 @@ static int builtin_input_id(struct udev_ - if (!is_pointer && !is_key && test_bit(EV_REL, bitmask_ev) && - (test_bit(REL_WHEEL, bitmask_rel) || test_bit(REL_HWHEEL, bitmask_rel))) - udev_builtin_add_property(dev, test, "ID_INPUT_KEY", "1"); -+ if (test_bit(EV_SW, bitmask_ev)) -+ udev_builtin_add_property(dev, test, "ID_INPUT_SWITCH", "1"); - } - - devnode = udev_device_get_devnode(dev); diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template index bc9c9b1f9b2..3c3cb12e9b4 100644 --- a/srcpkgs/eudev/template +++ b/srcpkgs/eudev/template @@ -3,19 +3,20 @@ _UDEV_VERSION="220" # compatible udev version provided pkgname=eudev -version=3.2.5 -revision=3 +version=3.2.6 +revision=1 conf_files="/etc/udev/udev.conf" +patch_args="-Np1" build_style=gnu-configure configure_args="--enable-hwdb --enable-manpages --disable-introspection" hostmakedepends="automake libtool pkg-config gperf libxslt docbook-xsl" makedepends="libblkid-devel libkmod-devel" short_desc="Gentoo's fork of systemd-udev (enhanced userland device daemon)" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/gentoo/eudev" distfiles="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz" -checksum=49c2d04105cad2526302627e040fa24b1916a9a3e059539bc8bb919b973890af +checksum=865871d3b3f13a7acf6a8aaacbd5b6c68b206c0b8b4442a5f11ce3b1f5b6b7e1 pre_configure() { autoreconf -fi