From 0d362aa68b55af07cf87f8e3b0dc23cb4c8f7dbf Mon Sep 17 00:00:00 2001
From: RISCi_ATOM <bob@bobcall.me>
Date: Mon, 30 Mar 2020 01:23:46 -0400
Subject: [PATCH] sqlite3: update to version 3.31.1

---
 libs/sqlite3/Makefile                         | 19 +++++++++--------
 .../patches/01-sqlite-arm-endian.patch        | 21 -------------------
 2 files changed, 10 insertions(+), 30 deletions(-)
 delete mode 100644 libs/sqlite3/patches/01-sqlite-arm-endian.patch

diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile
index ffa0a68..eaff41a 100644
--- a/libs/sqlite3/Makefile
+++ b/libs/sqlite3/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sqlite
-PKG_VERSION:=3270200
-PKG_RELEASE:=2
+PKG_VERSION:=3310100
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz
-PKG_HASH:=50c39e85ea28b5ecfdb3f9e860afe9ba606381e21836b2849efca6a0bfe6ef6e
-PKG_SOURCE_URL:=https://www.sqlite.org/2019/
+PKG_HASH:=62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae
+PKG_SOURCE_URL:=https://www.sqlite.org/2020/
 
 PKG_LICENSE:=PUBLICDOMAIN
 PKG_LICENSE_FILES:=
@@ -59,6 +59,7 @@ define Package/libsqlite3
   CATEGORY:=Libraries
   DEPENDS:=+libpthread +zlib
   TITLE+= (library)
+  ABI_VERSION:=0
 endef
 
 define Package/libsqlite3/description
@@ -124,19 +125,19 @@ endif
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3{,ext}.h $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(1)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/sqlite3{,ext}.h $(1)/usr/include
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(1)/usr/lib/pkgconfig
 endef
 
 define Package/libsqlite3/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.$(ABI_VERSION)* $(1)/usr/lib
 endef
 
 define Package/sqlite3-cli/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(1)/usr/bin
 endef
 
 $(eval $(call BuildPackage,libsqlite3))
diff --git a/libs/sqlite3/patches/01-sqlite-arm-endian.patch b/libs/sqlite3/patches/01-sqlite-arm-endian.patch
deleted file mode 100644
index 65fe771..0000000
--- a/libs/sqlite3/patches/01-sqlite-arm-endian.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/sqlite3.c
-+++ b/sqlite3.c
-@@ -13920,12 +13920,13 @@ typedef INT16_TYPE LogEst;
- ** at run-time.
- */
- #ifndef SQLITE_BYTEORDER
--# if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
--     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
--     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
--     defined(__arm__)  || defined(_M_ARM64)
-+# if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
-+     defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
-+     defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
-+     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
- #   define SQLITE_BYTEORDER    1234
--# elif defined(sparc)    || defined(__ppc__)
-+# elif defined(sparc)     || defined(__ppc__) || \
-+       defined(__ARMEB__) || defined(__AARCH64EB__)
- #   define SQLITE_BYTEORDER    4321
- # else
- #   define SQLITE_BYTEORDER 0
-- 
2.25.1