From 07a4828c41a95f4200417a4e6c8e95ad4f2ec354 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Tue, 21 Jan 2020 01:32:48 -0500
Subject: linux-libre-tools-5.4.1_gnu-1: updating version

---
 libre/linux-libre-tools/PKGBUILD             | 11 +++++------
 libre/linux-libre-tools/perf-fix-types.patch | 29 ++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 5c2ea3caa..6e9a080df 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -24,7 +24,7 @@ case "$CARCH" in
   armv7h)      pkgname+=('gpio-utils' 'iio-utils') ;;
 esac
 
-pkgver=5.2.1
+pkgver=5.4.1
 pkgver+=_gnu
 pkgrel=1
 license=('GPL2')
@@ -54,7 +54,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver//_/-}/l
         'cpupower.service'
         'usbipd.service'
         'perf-fix-types.patch')
-sha256sums=('a430f25ed746b70fab2dc82e38f494a1b94ee06acf6a634fba857ceba5fe43e2'
+sha256sums=('7d2ce65f26e9c9234091167b7558cc9a3de545236a1cec3a4e77d171d440f35c'
             'SKIP'
 #            '2129f0a264ecb03a2a8ccd6a3e2270dec0b4c11c66d09262eb0f1bbf18fcaefc'
 #            'SKIP'
@@ -62,7 +62,7 @@ sha256sums=('a430f25ed746b70fab2dc82e38f494a1b94ee06acf6a634fba857ceba5fe43e2'
             'd2e8e5e8b22c6089a91f573aa1c59e442a1f3b67a2c9f047abe3b57d3d6558cc'
             'fa2560630576464739ede14c9292249f4007f36a684bc378add174fc88394550'
             '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
-            '7a1d5e5a1adb05f7896b5e81ddd5c998ea67e172110675a706c1536c538ce1ce')
+            'aa08545851784262d1049da4df6f63bdb366b0ac21e2dbecc7fd31382bb4f4dc')
 validpgpkeys=('474402C8C582DAFBE389C427BCB7CF877E7D47A7') # Alexandre Oliva
 
 prepare() {
@@ -98,8 +98,7 @@ build() {
     PYTHON=python \
     PYTHON_CONFIG=python-config \
     PERF_VERSION=$pkgver-$pkgrel \
-    DESTDIR="$pkgdir" \
-    all man
+    DESTDIR="$pkgdir"
   popd
 
   msg2 'cpupower'
@@ -203,7 +202,7 @@ package_perf() {
     PYTHON_CONFIG=python-config \
     PERF_VERSION=$pkgver-$pkgrel \
     DESTDIR="$pkgdir" \
-    install install-man
+    install
   cd "$pkgdir"
   # add linker search path
   mkdir "$pkgdir/etc/ld.so.conf.d"
diff --git a/libre/linux-libre-tools/perf-fix-types.patch b/libre/linux-libre-tools/perf-fix-types.patch
index f00e70a7e..0b81586b0 100644
--- a/libre/linux-libre-tools/perf-fix-types.patch
+++ b/libre/linux-libre-tools/perf-fix-types.patch
@@ -1,6 +1,19 @@
---- 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 @@
+--- linux-5.4.1/tools/perf/builtin-diff.c.orig	2019-11-29 04:10:32.000000000 -0500
++++ linux-5.4.1/tools/perf/builtin-diff.c	2020-01-19 15:54:20.558514973 -0500
+@@ -575,8 +575,8 @@
+ 	if (!pairs_left && !pairs_right)
+ 		return 0;
+ 
+-	l = labs(left->diff.cycles);
+-	r = labs(right->diff.cycles);
++	l = llabs(left->diff.cycles);
++	r = llabs(right->diff.cycles);
+ 	return r - l;
+ }
+ 
+--- linux-5.4.1/tools/perf/util/session.c.orig	2019-11-29 04:10:32.000000000 -0500
++++ linux-5.4.1/tools/perf/util/session.c	2020-01-19 16:13:39.628532016 -0500
+@@ -88,7 +88,7 @@
  		session->decomp_last = decomp;
  	}
  
@@ -9,14 +22,14 @@
  
  	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
+--- linux-5.4.1/tools/perf/util/zstd.c.orig	2019-11-29 04:10:32.000000000 -0500
++++ linux-5.4.1/tools/perf/util/zstd.c	2020-01-19 16:45:37.908560221 -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));
+-			pr_err("failed to decompress (B): %ld -> %ld, dst_size %ld : %s\n",
++			pr_err("failed to decompress (B): %zd -> %zd, dst_size %zd : %s\n",
+ 			       src_size, output.size, dst_size, ZSTD_getErrorName(ret));
  			break;
  		}
-- 
cgit v1.2.3