jxrlib: switch to maintained fork, ship pkgconfig. freeimage: unbundle libraries, fix ftbfs

common/shlibs

@@ -4026,8 +4026,6 @@ libkdsoap-qt6.so.2 KDSoap-2.2.0_1
 libkdsoap-server-qt6.so.2 KDSoap-2.2.0_1
 libKDSoapWSDiscoveryClient.so.0 kdsoap-ws-discovery-client-0.4.0_1
 libstoken.so.1 stoken-0.92_1
-libjpegxr.so.0 jxrlib-0.2.2_1
-libjxrglue.so.0 jxrlib-0.2.2_1
 libhidrd_util.so.0 hidrd-0.2.0_1
 libhidrd_usage.so.0 hidrd-0.2.0_1
 libhidrd_item.so.0 hidrd-0.2.0_1

srcpkgs/freeimage/patches/jxrlib-byteswap-ulong-implicit-declaration.patch

@@ -0,0 +1,13 @@
+diff --git a/Source/LibJXR/image/decode/segdec.c b/Source/LibJXR/image/decode/segdec.c
+index f2a0c8b..1e4cd7c 100644
+--- a/Source/LibJXR/image/decode/segdec.c
++++ b/Source/LibJXR/image/decode/segdec.c
+@@ -44,6 +44,8 @@ static Int DecodeSignificantAbsLevel (struct CAdaptiveHuffman *pAHexpt, BitIOInf
+ //================================================================
+ // Memory access functions
+ //================================================================
++extern U32 _byteswap_ulong(U32 bits);
++
+ static U32 _load4(void* pv)
+ {
+ #ifdef _BIG__ENDIAN_

srcpkgs/freeimage/patches/jxrlib-missing-include.patch

@@ -0,0 +1,25 @@
+diff --git a/Source/LibJXR/jxrgluelib/JXRGlueJxr.c b/Source/LibJXR/jxrgluelib/JXRGlueJxr.c
+index 2362806..3dd8d4f 100644
+--- a/Source/LibJXR/jxrgluelib/JXRGlueJxr.c
++++ b/Source/LibJXR/jxrgluelib/JXRGlueJxr.c
+@@ -28,7 +28,7 @@
+ //*@@@---@@@@******************************************************************
+ #include <limits.h>
+ #include <JXRGlue.h>
+-
++#include <wchar.h>
+
+ static const char szHDPhotoFormat[] = "<dc:format>image/vnd.ms-photo</dc:format>";
+ const U32 IFDEntryTypeSizes[] = { 0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8 };
+diff --git a/Source/LibJXR/common/include/guiddef.h b/Source/LibJXR/common/include/guiddef.h
+index 503b643..32b6b10 100644
+--- a/Source/LibJXR/common/include/guiddef.h
++++ b/Source/LibJXR/common/include/guiddef.h
+@@ -173,6 +173,7 @@ typedef FMTID *LPFMTID;
+ // Faster (but makes code fatter) inline version...use sparingly
+ #ifdef __cplusplus
+ __inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2)
++#include <wchar.h>
+ {
+    return (
+       ((unsigned long *) &rguid1)[0] == ((unsigned long *) &rguid2)[0] &&

srcpkgs/freeimage/template

@@ -1,44 +1,35 @@
 # Template file for 'freeimage'
 pkgname=freeimage
-version=3.18.0
-revision=4
-build_style=gnu-makefile
+version=3.19.0+1911
+revision=1
+_commit=${version//*+/}
 hostmakedepends="unzip"
 short_desc="Support library for popular graphics image formats"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, FreeImage"
 homepage="http://freeimage.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/freeimage/Source%20Distribution/FreeImage${version//./}.zip"
-checksum=f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd
+# No longer changes versions or publishes Source Distributions since 2018
+#distfiles="${SOURCEFORGE_SITE}/freeimage/Source%20Distribution/FreeImage${version//./}.zip"
+distfiles="https://sourceforge.net/code-snapshots/svn/f/fr/freeimage/svn/freeimage-svn-r${_commit}-FreeImage-trunk.zip"
+checksum=@c31ab96f8c37c6379cb70c7012534988fb01392c5cc5eac7209b9003d7ff52ea
 
-CFLAGS="-fPIC -DPIC -fexceptions -fvisibility=hidden -DPNG_POWERPC_VSX_OPT=0"
+CFLAGS="-fPIC -DPIC -fexceptions -fvisibility=hidden -DPNG_POWERPC_VSX_OPT=0 -DPNG_ARM_NEON_OPT=0 -D_LARGEFILE64_SOURCE=1 "
 CXXFLAGS="${CFLAGS} -Wno-ctor-dtor-privacy -std=c++14"
 subpackages="freeimage-plus freeimage-devel freeimage-plus-devel"
 
-post_patch() {
-	mkdir /tmp/fi
-	mv ${wrksrc}/* /tmp/fi
-	cp -a /tmp/fi ${wrksrc}/fip
-	mv /tmp/fi ${wrksrc}
-}
-
 do_build() {
-	cd ${wrksrc}/fi
-	make ${makejobs}
-	cd ${wrksrc}/fip
+	make -f Makefile.gnu ${makejobs}
 	make -f Makefile.fip ${makejobs}
 }
 
 do_install() {
-	cd ${wrksrc}/fi
-	make DESTDIR="${DESTDIR}" install
+	make -f Makefile.gnu DESTDIR="${DESTDIR}" install
 	vlicense license-fi.txt LICENSE
 }
 
 freeimage-plus_package() {
 	short_desc+=" (plus)"
 	pkg_install() {
-		cd ${wrksrc}/fip
 		make -f Makefile.fip DESTDIR="${PKGDESTDIR}" install
 		vlicense license-fi.txt LICENSE
 	}

srcpkgs/removed-packages/template

@@ -351,6 +351,8 @@ replaces="
  iproute2-tc-ipt<=6.7.0
  isl16<=0.16_2
  js<=1.8.5_11
+ jxrlib-devel<=0.2.2_1
+ jxrlib<=0.2.2_1
  julia<=1.6.1_2
  jwm-settings-manager<=2.1.5_1
  k3s<=1.0.0_1