From 521554e4908741c39785130ae5c5b1af2d5c3173 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Tue, 13 Aug 2019 21:20:12 -0500
Subject: linux-libre-tools-5.2.1_gnu-1: updating version

---
 libre/linux-libre-tools/PKGBUILD             | 30 ++++++++++++++++++++++------
 libre/linux-libre-tools/perf-fix-types.patch | 22 ++++++++++++++++++++
 2 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 libre/linux-libre-tools/perf-fix-types.patch

diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index c48db2661..5c2ea3caa 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -15,6 +15,7 @@ pkgname=(
   'libtraceevent'
   'linux-libre-tools-meta'
   'perf'
+#  'python-perf'
   'tmon'
   'usbip'
 )
@@ -23,9 +24,9 @@ case "$CARCH" in
   armv7h)      pkgname+=('gpio-utils' 'iio-utils') ;;
 esac
 
-pkgver=4.20
+pkgver=5.2.1
 pkgver+=_gnu
-pkgrel=2
+pkgrel=1
 license=('GPL2')
 arch=('x86_64')
 arch+=('i686' 'armv7h')
@@ -51,13 +52,17 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver//_/-}/l
         'cpupower.default'
         'cpupower.systemd'
         'cpupower.service'
-        'usbipd.service')
-sha256sums=('b80d5c0076dfa11ee8af63ad0b4795569d098b77020d2fffc797b892ba455a1f'
+        'usbipd.service'
+        'perf-fix-types.patch')
+sha256sums=('a430f25ed746b70fab2dc82e38f494a1b94ee06acf6a634fba857ceba5fe43e2'
             'SKIP'
+#            '2129f0a264ecb03a2a8ccd6a3e2270dec0b4c11c66d09262eb0f1bbf18fcaefc'
+#            'SKIP'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'd2e8e5e8b22c6089a91f573aa1c59e442a1f3b67a2c9f047abe3b57d3d6558cc'
             'fa2560630576464739ede14c9292249f4007f36a684bc378add174fc88394550'
-            '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f')
+            '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
+            '7a1d5e5a1adb05f7896b5e81ddd5c998ea67e172110675a706c1536c538ce1ce')
 validpgpkeys=('474402C8C582DAFBE389C427BCB7CF877E7D47A7') # Alexandre Oliva
 
 prepare() {
@@ -111,6 +116,8 @@ fi
 
   msg2 'usbip'
   pushd linux-${pkgver%_*}/tools/usb/usbip
+  # Fix gcc compilation
+  sed -i 's,-Wall -Werror -Wextra,,' configure.ac
   ./autogen.sh
   ./configure --prefix=/usr --sbindir=/usr/bin
   make
@@ -154,6 +161,7 @@ package_linux-libre-tools-meta() {
     'cpupower'
     'libtraceevent'
     'perf'
+#    'python-perf'
     'tmon'
     'usbip'
   )
@@ -207,6 +215,16 @@ package_perf() {
   find usr/share -type f -exec chmod a-x {} \;
 }
 
+ 
+#package_python-perf(){
+#  pkgdesc='GNU/Linux-libre kernel performance auditing tool (python bindings)'
+#  depends=('python')
+#
+#  cd linux-${pkgver%_*}/tools/perf
+#
+#  make install-python_ext PYTHON=python DESTDIR="$pkgdir"
+#}
+
 package_cpupower() {
   pkgdesc='GNU/Linux-libre kernel tool to examine and tune power saving related features of your processor'
   backup=('etc/default/cpupower')
@@ -241,7 +259,7 @@ package_x86_energy_perf_policy() {
 
 package_usbip() {
   pkgdesc='An USB device sharing system over IP network'
-  depends=('glibc' 'glib2' 'sysfsutils' 'libsystemd')
+  depends=('glibc' 'glib2' 'sysfsutils' 'systemd-libs')
 
   pushd linux-${pkgver%_*}/tools/usb/usbip
   make install DESTDIR="$pkgdir"
diff --git a/libre/linux-libre-tools/perf-fix-types.patch b/libre/linux-libre-tools/perf-fix-types.patch
new file mode 100644
index 000000000..f00e70a7e
--- /dev/null
+++ b/libre/linux-libre-tools/perf-fix-types.patch
@@ -0,0 +1,22 @@
+--- linux-5.2.1.orig/tools/perf/util/session.c	2019-07-14 01:01:15.000000000 -0500
++++ linux-5.2.1/tools/perf/util/session.c	2019-08-13 18:15:10.427948151 -0500
+@@ -76,7 +76,7 @@
+ 		session->decomp_last = decomp;
+ 	}
+ 
+-	pr_debug("decomp (B): %ld to %ld\n", src_size, decomp_size);
++	pr_debug("decomp (B): %zd to %zd\n", src_size, decomp_size);
+ 
+ 	return 0;
+ }
+--- linux-5.2.1.orig/tools/perf/util/zstd.c	2019-07-14 01:01:15.000000000 -0500
++++ linux-5.2.1/tools/perf/util/zstd.c	2019-08-13 18:32:14.237937462 -0500
+@@ -99,7 +99,7 @@
+ 	while (input.pos < input.size) {
+ 		ret = ZSTD_decompressStream(data->dstream, &output, &input);
+ 		if (ZSTD_isError(ret)) {
+-			pr_err("failed to decompress (B): %ld -> %ld : %s\n",
++			pr_err("failed to decompress (B): %zd -> %zd : %s\n",
+ 			       src_size, output.size, ZSTD_getErrorName(ret));
+ 			break;
+ 		}
-- 
cgit v1.2.2