From b250f1ba16fdc26406f36cc79710357d15ea76e3 Mon Sep 17 00:00:00 2001
From: Alexey Min <alexey.min@gmail.com>
Date: Mon, 7 Dec 2020 01:02:35 +0300
Subject: [PATCH] Revert "temp/libinput: temporarily fork from alpine
 (+depends) (MR 1771)"

This reverts commit 3bd9f62da2d604c3e6fcd6f607f368dd2bdd4fe1.

Both libevdev and libinput are now available for armv7.

- http://dl-cdn.alpinelinux.org/alpine/edge/community/armv7/libevdev-1.10.0-r0.apk
- http://dl-cdn.alpinelinux.org/alpine/edge/community/armv7/libinput-1.16.4-r0.apk
---
 temp/libevdev/APKBUILD | 27 ------------------------
 temp/libinput/APKBUILD | 47 ------------------------------------------
 2 files changed, 74 deletions(-)
 delete mode 100644 temp/libevdev/APKBUILD
 delete mode 100644 temp/libinput/APKBUILD

diff --git a/temp/libevdev/APKBUILD b/temp/libevdev/APKBUILD
deleted file mode 100644
index a5b749260..000000000
--- a/temp/libevdev/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Forked from Alpine, because it's missing for armv7
-
-pkgname=libevdev
-pkgver=1.10.0
-pkgrel=0
-pkgdesc="Kernel Evdev Device Wrapper Library"
-url="https://www.freedesktop.org/wiki/Software/libevdev"
-arch="armv7"
-license="MIT"
-options="!check"  # Requires CONFIG_INPUT_UINPUT in kernel
-makedepends="meson python3 linux-headers doxygen"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://freedesktop.org/software/libevdev/libevdev-$pkgver.tar.xz"
-
-build() {
-	abuild-meson \
-		-Dtests=disabled \
-		-Ddocumentation=enabled \
-		. output
-	meson compile ${JOBS:+-j ${JOBS}} -C output
-}
-
-package() {
-	DESTDIR="$pkgdir" meson install --no-rebuild -C output
-}
-
-sha512sums="94ab4ee7e0854c41a491d8e4713baa95ae66dd337b41823011c0913aa1c72e8bbf8b808d5936c2ef456af794b6d3a5cd7cd0515fbd1d06dd1b7ba19275bd928f  libevdev-1.10.0.tar.xz"
diff --git a/temp/libinput/APKBUILD b/temp/libinput/APKBUILD
deleted file mode 100644
index bc518636a..000000000
--- a/temp/libinput/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Forked from Alpine: missing for armv7, just like xorg-server
-# https://postmarketos.org/edge/2020/12/01/xorg-server-moved/
-
-pkgname=libinput
-pkgver=1.16.4
-pkgrel=0
-pkgdesc="Library for handling input devices"
-url="https://www.freedesktop.org/wiki/Software/libinput"
-arch="armv7"
-license="MIT"
-makedepends="eudev-dev libevdev-dev meson mtdev-dev"
-checkdepends="diffutils bash"
-subpackages="
-	$pkgname-dev
-	$pkgname-doc
-	$pkgname-libs
-	$pkgname-zsh-completion
-	"
-source="https://freedesktop.org/software/libinput/libinput-$pkgver.tar.xz"
-options="!check"
-
-build() {
-	abuild-meson \
-		-Ddocumentation=false \
-		-Dlibwacom=false \
-		-Ddebug-gui=false \
-		-Dtests=false builddir/
-	meson compile ${JOBS:+-j ${JOBS}} -C builddir/
-}
-
-check() {
-	meson test --no-rebuild -v -C builddir
-}
-
-package() {
-	DESTDIR="$pkgdir" meson install --no-rebuild -C builddir
-}
-
-libs() {
-	default_libs
-
-	mv "$pkgdir"/usr/lib/udev "$subpkgdir"/usr/lib
-	mkdir -p "$subpkgdir"/usr/share/
-	mv "$pkgdir"/usr/share/libinput "$subpkgdir"/usr/share
-}
-
-sha512sums="a95a3bcf58a9298946d15f4f2fd93dc5807d3042f8797950a1ffd96d3c979b55a764f035a9f7680d0ea400b033698c322eb61a4387dbc280db6110ffd3e137ee  libinput-1.16.4.tar.xz"