mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-22 19:44:21 +01:00
academic/celestia: Patched for libpng16.
Fixes build failure on -current. Signed-off-by: David Spencer <baildon.research@googlemail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
parent
fc050f8db5
commit
948f0ac5b9
3 changed files with 44 additions and 1 deletions
14
academic/celestia/celestia-1.6.1-libpng15.patch
Normal file
14
academic/celestia/celestia-1.6.1-libpng15.patch
Normal file
|
@ -0,0 +1,14 @@
|
|||
imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
|
||||
|
||||
--- src/celestia/imagecapture.cpp
|
||||
+++ src/celestia/imagecapture.cpp
|
||||
@@ -31,6 +31,9 @@
|
||||
#include "png.h"
|
||||
#endif
|
||||
|
||||
+// Z_BEST_COMPRESSION
|
||||
+#include <zlib.h>
|
||||
+
|
||||
// Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
|
||||
#ifndef png_jmpbuf
|
||||
#define png_jmpbuf(png_ptr) png_ptr->jmpbuf
|
25
academic/celestia/celestia-1.6.1-libpng16.patch
Normal file
25
academic/celestia/celestia-1.6.1-libpng16.patch
Normal file
|
@ -0,0 +1,25 @@
|
|||
image.cpp:530:61: error: ‘memcpy’ was not declared in this scope
|
||||
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=464764
|
||||
|
||||
Patch written by Lars Wendler <polynomial-c@gentoo.org>
|
||||
--- a/celestia/src/celengine/image.cpp
|
||||
+++ b/celestia/src/celengine/image.cpp
|
||||
@@ -42,6 +42,7 @@ extern "C" {
|
||||
#include "jpeglib.h"
|
||||
#else
|
||||
#include <cstdio>
|
||||
+#include <string.h>
|
||||
#include <jpeglib.h>
|
||||
#endif
|
||||
}
|
||||
--- a/celestia/src/celengine/texture.cpp
|
||||
+++ b/celestia/src/celengine/texture.cpp
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <cstdlib>
|
||||
#include <cstdio>
|
||||
#include <cassert>
|
||||
+#include <string.h>
|
||||
|
||||
#ifndef _WIN32
|
||||
#ifndef TARGET_OS_MAC
|
|
@ -72,9 +72,13 @@ find -L . \
|
|||
# Note that the kde frontend will only build with kde3
|
||||
FRONTEND=${FRONTEND:-gtk}
|
||||
|
||||
# Fix incomatibility with gcc 4.7
|
||||
# Fix incompatibility with gcc 4.7
|
||||
patch -p1 -i $CWD/celestia-1.6.1-gcc47.patch
|
||||
|
||||
# Fix libpng incompatibilities (thanks to Arch Linux)
|
||||
patch -p0 -i $CWD/celestia-1.6.1-libpng15.patch
|
||||
patch -p2 -i $CWD/celestia-1.6.1-libpng16.patch
|
||||
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
./configure \
|
||||
|
|
Loading…
Reference in a new issue