From b5b0a3fbf6b58c7f1a7e4377bfeb6adb3337e4bf Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 31 Jan 2023 18:48:16 +0200
Subject: SL-19110 Fix xxhash build link and properly register contribution
---
autobuild.xml | 4 ++--
doc/contributions.txt | 2 ++
indra/llcommon/hbxxh.cpp | 4 ++--
indra/llcommon/hbxxh.h | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 67c9b84af2..916a2d06e8 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2947,9 +2947,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>f54f21dda4ce25b112f0cc7b4ce38bba</string>
+ <string>e4f77ba0a9b8ec3cc3fabc51c4da81d2</string>
<key>url</key>
- <string>http://sldev.free.fr/libraries/xxhash-0.8.1-20230124.tar.bz2</string>
+ <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110070/956941/xxhash-0.8.1.578006-windows-578006.tar.bz2</string>
</map>
<key>name</key>
<string>common</string>
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 4cabb84b10..4975039241 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -582,6 +582,8 @@ Henri Beauchamp
VWR-1320
VWR-1406
VWR-4157
+ SL-15175
+ SL-19110
herina Bode
Hikkoshi Sakai
VWR-429
diff --git a/indra/llcommon/hbxxh.cpp b/indra/llcommon/hbxxh.cpp
index e94581d415..388269d6c8 100644
--- a/indra/llcommon/hbxxh.cpp
+++ b/indra/llcommon/hbxxh.cpp
@@ -2,7 +2,7 @@
* @file hbxxh.cpp
* @brief High performances vectorized hashing based on xxHash.
*
- * $LicenseInfo:firstyear=2023&license=viewergpl$
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (c) 2023, Henri Beauchamp.
*
@@ -34,7 +34,7 @@
// in your build, in which case the latter would be used instead. For ARM64
// builds, this would also automatically enable NEON vectorization.
#define XXH_INLINE_ALL
-#include "xxhash.h"
+#include "xxhash/xxhash.h"
#include "hbxxh.h"
diff --git a/indra/llcommon/hbxxh.h b/indra/llcommon/hbxxh.h
index 8a5f977648..236716722a 100644
--- a/indra/llcommon/hbxxh.h
+++ b/indra/llcommon/hbxxh.h
@@ -2,7 +2,7 @@
* @file hbxxh.h
* @brief High performances vectorized hashing based on xxHash.
*
- * $LicenseInfo:firstyear=2023&license=viewergpl$
+ * $LicenseInfo:firstyear=2023&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (c) 2023, Henri Beauchamp.
*
--
cgit v1.2.3