diff options
| -rw-r--r-- | CMake.patch | 31 | ||||
| -rw-r--r-- | PKGBUILD | 4 |
2 files changed, 4 insertions, 31 deletions
diff --git a/CMake.patch b/CMake.patch index 8e9158e28a7a..f1af784bd9f1 100644 --- a/CMake.patch +++ b/CMake.patch @@ -21,35 +21,8 @@ index c29d9bf..d7d3d60 100644 +FILE(GLOB SOIL_c src/*.c) +FILE(GLOB SOIL_h inc/SOIL/*.h) + -+ADD_LIBRARY( soil SHARED ${SOIL_c} ) ++ADD_LIBRARY( SOIL SHARED ${SOIL_c} ) +SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Installation root directory" FORCE) +install( TARGETS soil ARCHIVE DESTINATION "lib" ) +install( FILES ${SOIL_h} DESTINATION "include/SOIL" ) -diff --git a/src/original/stb_image-1.16.c b/src/original/stb_image-1.16.c -index 029b58e..c4c6fef 100644 ---- a/src/original/stb_image-1.16.c -+++ b/src/original/stb_image-1.16.c -@@ -716,7 +716,8 @@ static void getn(stbi *s, stbi_uc *buffer, int n) - {
- #ifndef STBI_NO_STDIO
- if (s->img_file) {
-- fread(buffer, 1, n, s->img_file);
-+ size_t r = fread(buffer, 1, n, s->img_file);
-+ //assert(r==n);
- return;
- }
- #endif
-diff --git a/src/stb_image_aug.c b/src/stb_image_aug.c -index a167005..b88c81f 100644 ---- a/src/stb_image_aug.c -+++ b/src/stb_image_aug.c -@@ -392,7 +392,8 @@ static void getn(stbi *s, stbi_uc *buffer, int n) - {
- #ifndef STBI_NO_STDIO
- if (s->img_file) {
-- fread(buffer, 1, n, s->img_file);
-+ size_t r = fread(buffer, 1, n, s->img_file);
-+ //assert(r==n);
- return;
- }
- #endif
+ @@ -4,7 +4,7 @@ _author=paralin _pkgname=soil pkgname=${_pkgname}-git -pkgver=1 +pkgver=1.16 pkgrel=1 pkgdesc='SOIL is a tiny C library used primarily for uploading textures into OpenGL. It is based on stb_image version 1.16' arch=( @@ -16,7 +16,7 @@ license=('MIT') depends=() makedepends=('git' 'cmake') source=("git://github.com/$_author/$_pkgname" - "https://aur.archlinux.org/cgit/aur.git/plain/CMake.patch?h=$_pkgname" + "CMake.patch::https://aur.archlinux.org/cgit/aur.git/plain/CMake.patch?h=$pkgname" ) sha256sums=('SKIP' 'SKIP') |