update to 5.1-1

5 files changed, 5 insertions, 162 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 006b414db0f5..01bbb9a9c0a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = drminfo
 	pkgdesc = print drm device information
-	pkgver = 3.1
+	pkgver = 5.1
 	pkgrel = 1
 	url = https://www.kraxel.org/cgit/drminfo/
 	arch = i686
@@ -13,8 +13,8 @@ pkgbase = drminfo
 	depends = cairo
 	depends = pixman
 	depends = gtk3
-	source = https://www.kraxel.org/cgit/drminfo/snapshot/drminfo-3-1.tar.gz
-	sha256sums = 86db7a18c71475d757bb98fa70efbe01993c25e38c7aca487b24a080bd771013
+	source = https://www.kraxel.org/cgit/drminfo/snapshot/drminfo-5-1.tar.gz
+	sha256sums = e3a5db6ccf22e9198e63b5a4f5268b7bc17169ae8e0056673c8760b3d2a7c9a1
 
 pkgname = drminfo
 
diff --git a/0001-include-drm_fourcc.h-from-libdrm-not-the-kernel.patch b/0001-include-drm_fourcc.h-from-libdrm-not-the-kernel.patch
deleted file mode 100644
index aa7ddb63d472..000000000000
--- a/0001-include-drm_fourcc.h-from-libdrm-not-the-kernel.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1ffeb1d4cfb900a241f4a8a09efd4ac18f1311dc Mon Sep 17 00:00:00 2001
-From: Eric Engestrom <eric.engestrom@imgtec.com>
-Date: Tue, 25 Apr 2017 10:49:39 +0100
-Subject: [PATCH drminfo] include drm_fourcc.h from libdrm, not the kernel
-
-Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
----
- drminfo.c  | 2 +-
- drmtest.c  | 2 +-
- drmtools.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drminfo.c b/drminfo.c
-index 43a4fac..195298f 100644
---- a/drminfo.c
-+++ b/drminfo.c
-@@ -9,7 +9,7 @@
- #include <getopt.h>
- 
- #include <sys/ioctl.h>
--#include <drm/drm_fourcc.h>
-+#include <libdrm/drm_fourcc.h>
- 
- #include <xf86drm.h>
- #include <xf86drmMode.h>
-diff --git a/drmtest.c b/drmtest.c
-index 4266149..2e9216a 100644
---- a/drmtest.c
-+++ b/drmtest.c
-@@ -13,7 +13,7 @@
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <sys/time.h>
--#include <drm/drm_fourcc.h>
-+#include <libdrm/drm_fourcc.h>
- 
- #include <xf86drm.h>
- #include <xf86drmMode.h>
-diff --git a/drmtools.c b/drmtools.c
-index 581886a..c71ddae 100644
---- a/drmtools.c
-+++ b/drmtools.c
-@@ -8,7 +8,7 @@
- #include <inttypes.h>
- 
- #include <sys/ioctl.h>
--#include <drm/drm_fourcc.h>
-+#include <libdrm/drm_fourcc.h>
- 
- #include <xf86drm.h>
- #include <xf86drmMode.h>
--- 
-Cheers,
-  Eric
-
diff --git a/0002-meson-install-drminfo-drmtest.patch b/0002-meson-install-drminfo-drmtest.patch
deleted file mode 100644
index 7920fda04053..000000000000
--- a/0002-meson-install-drminfo-drmtest.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5548568fc4419ece6e274344fdaaf3932d8a3522 Mon Sep 17 00:00:00 2001
-From: Eric Engestrom <eric.engestrom@imgtec.com>
-Date: Tue, 25 Apr 2017 11:40:27 +0100
-Subject: [PATCH drminfo 2/3] meson: install drminfo & drmtest
-
-`gtktest` had an explicit `install: false`, but it's the other way
-around: if unspecified, the file doesn't get installed; you have to
-explicitely ask for it with `install: true`.
-
-Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
----
- meson.build | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 4722bf9..8312179 100644
---- a/meson.build
-+++ b/meson.build
-@@ -24,10 +24,12 @@ gtktest_deps  = [ gtk3_dep,
- 
- executable('drminfo',
-            sources      : drminfo_srcs,
--           dependencies : drminfo_deps)
-+           dependencies : drminfo_deps,
-+           install      : true)
- executable('drmtest',
-            sources      : drmtest_srcs,
--           dependencies : drmtest_deps)
-+           dependencies : drmtest_deps,
-+           install      : true)
- executable('gtktest',
-            sources      : gtktest_srcs,
-            dependencies : gtktest_deps,
--- 
-Cheers,
-  Eric
-
diff --git a/0003-meson-install-drminfo-drmtest-man-pages.patch b/0003-meson-install-drminfo-drmtest-man-pages.patch
deleted file mode 100644
index 66716f1ffc8f..000000000000
--- a/0003-meson-install-drminfo-drmtest-man-pages.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From fb23a040798882fb64431d618e4957ec5c5487ea Mon Sep 17 00:00:00 2001
-From: Eric Engestrom <eric.engestrom@imgtec.com>
-Date: Tue, 25 Apr 2017 11:39:58 +0100
-Subject: [PATCH drminfo 3/3] meson: install drminfo & drmtest man-pages
-
-Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
----
- drminfo.man => drminfo.1 | 0
- drminfo.spec             | 4 ++--
- drmtest.man => drmtest.1 | 0
- meson.build              | 3 +++
- 4 files changed, 5 insertions(+), 2 deletions(-)
- rename drminfo.man => drminfo.1 (100%)
- rename drmtest.man => drmtest.1 (100%)
-
-diff --git a/drminfo.man b/drminfo.1
-similarity index 100%
-rename from drminfo.man
-rename to drminfo.1
-diff --git a/drminfo.spec b/drminfo.spec
-index f810a56..fa55ddd 100644
---- a/drminfo.spec
-+++ b/drminfo.spec
-@@ -33,8 +33,8 @@ install -d %{buildroot}%{_bindir}
- install -d %{buildroot}%{_mandir}/man1
- install drminfo %{buildroot}%{_bindir}/drminfo
- install drmtest %{buildroot}%{_bindir}/drmtest
--install -m644 drminfo.man %{buildroot}%{_mandir}/man1/drminfo.1
--install -m644 drmtest.man %{buildroot}%{_mandir}/man1/drmtest.1
-+install -m644 drminfo.1 %{buildroot}%{_mandir}/man1/drminfo.1
-+install -m644 drmtest.1 %{buildroot}%{_mandir}/man1/drmtest.1
- 
- %files
- %{_bindir}/drm*
-diff --git a/drmtest.man b/drmtest.1
-similarity index 100%
-rename from drmtest.man
-rename to drmtest.1
-diff --git a/meson.build b/meson.build
-index 8312179..95a5bd7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -34,3 +34,6 @@ executable('gtktest',
-            sources      : gtktest_srcs,
-            dependencies : gtktest_deps,
-            install      : false)
-+
-+install_man('drminfo.1')
-+install_man('drmtest.1')
--- 
-Cheers,
-  Eric
-
diff --git a/PKGBUILD b/PKGBUILD
index 438035e4b35e..527adf6ae094 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,19 @@
 # Maintainer: Eric Engestrom <aur [at] engestrom [dot] ch>
 
 pkgname=drminfo
-pkgver=3.1
+pkgver=5.1
 pkgrel=1
 pkgdesc="print drm device information"
 arch=('i686' 'x86_64')
 url="https://www.kraxel.org/cgit/drminfo/"
 license=('GPLv2')
 source=("https://www.kraxel.org/cgit/drminfo/snapshot/drminfo-${pkgver/./-}.tar.gz")
-sha256sums=('86db7a18c71475d757bb98fa70efbe01993c25e38c7aca487b24a080bd771013')
+sha256sums=('e3a5db6ccf22e9198e63b5a4f5268b7bc17169ae8e0056673c8760b3d2a7c9a1')
 depends=('libdrm' 'mesa' 'libepoxy' 'cairo' 'pixman' 'gtk3')
 makedepends=('meson')
 
-source+=(0001-include-drm_fourcc.h-from-libdrm-not-the-kernel.patch
-         0002-meson-install-drminfo-drmtest.patch
-         0003-meson-install-drminfo-drmtest-man-pages.patch)
-sha256sums+=(SKIP SKIP SKIP)
-
 prepare() {
   cd drminfo-${pkgver/./-}
-
-	for patch in ../*.patch
-	do
-		msg2 "Applying $patch"
-		patch -sp1 -i "$patch"
-	done
-
   rm -rf build
   meson build --prefix='/usr'
 }