Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions common/shlibs
Original file line number Diff line number Diff line change
Expand Up @@ -4115,8 +4115,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
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/SLADE/template
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ revision=2
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config 7zip which"
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
makedepends="SFML-devel fluidsynth-devel ftgl-devel glew-devel
gtk+3-devel libcurl-devel wxWidgets-gtk3-devel bzip2-devel zlib-devel
lua53-devel dumb-devel liblzma-devel"
short_desc="Modern editor for Doom-engine based games"
Expand Down
10 changes: 0 additions & 10 deletions srcpkgs/freeimage/patches/disable_arm_neon.patch

This file was deleted.

19 changes: 0 additions & 19 deletions srcpkgs/freeimage/patches/fix-musl.patch

This file was deleted.

56 changes: 0 additions & 56 deletions srcpkgs/freeimage/patches/ftbfs-big-endian.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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_
25 changes: 25 additions & 0 deletions srcpkgs/freeimage/patches/jxrlib-missing-include.patch
Original file line number Diff line number Diff line change
@@ -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] &&
12 changes: 12 additions & 0 deletions srcpkgs/freeimage/patches/tiff-srcs-fix.patch

Large diffs are not rendered by default.

29 changes: 10 additions & 19 deletions srcpkgs/freeimage/template
Original file line number Diff line number Diff line change
@@ -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=e79e90495ca5d6624921d629063eeaecad8aae9de0d497549abb8e52c0f88e47

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
}
Expand Down
143 changes: 0 additions & 143 deletions srcpkgs/jxrlib/patches/usecmake.patch

This file was deleted.

20 changes: 0 additions & 20 deletions srcpkgs/jxrlib/template

This file was deleted.

2 changes: 1 addition & 1 deletion srcpkgs/kew/template
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build_style=gnu-makefile
make_use_env=yes
hostmakedepends="pkg-config"
makedepends="faad2-devel libnotify-devel taglib-devel chafa-devel ffmpeg6-devel fftw-devel
freeimage-devel libglib-devel libogg-devel libvorbis-devel opus-devel opusfile-devel
libglib-devel libogg-devel libvorbis-devel opus-devel opusfile-devel
libcurl-devel"
short_desc="Command-line music player"
maintainer="Mihail Ivanchev <contact@ivanchev.net>"
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/libogre/template
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ make_build_target="all OgreDoc"
hostmakedepends="pkg-config graphviz doxygen dejavu-fonts-ttf"
makedepends="boost-headers freetype-devel libXaw-devel libXrandr-devel
MesaLib-devel zziplib-devel libcppunit-devel glu-devel
freeimage-devel pugixml-devel python3-devel"
pugixml-devel python3-devel"
short_desc="Scene-oriented, flexible 3D engine"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
Expand Down
6 changes: 3 additions & 3 deletions srcpkgs/occt/template
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Template file for 'occt'
pkgname=occt
version=7.9.3
revision=1
revision=2
_gittag="V${version//./_}"
build_style=cmake
configure_args="-DUSE_FREEIMAGE=ON -DUSE_VTK=OFF -DINSTALL_SAMPLES=ON -DUSE_TBB=ON"
makedepends="freetype-devel glu-devel freeimage-devel tcl-devel tk-devel tbb-devel"
configure_args="-DUSE_FREEIMAGE=OFF -DUSE_VTK=OFF -DINSTALL_SAMPLES=ON -DUSE_TBB=ON"
makedepends="freetype-devel glu-devel tcl-devel tk-devel tbb-devel"
short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
maintainer="Piraty <mail@piraty.dev>"
license="custom:LGPL-2.1-only-with-exceptions"
Expand Down
Loading
Loading