Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xplanet dependency for kstars

Browse Source
This commit is contained in:
groni
2015-11-18 20:44:19 +01:00
parent 5b0d08cecb
commit f8a1eb6b7a
11 changed files with 398 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
science/astronomy/xplanet/files/giflib6.patch
+130
View File
@@ -0,0 +1,130 @@
diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c
--- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300
+++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c 2013-07-30 18:21:17.412474692 +0400
@@ -20,7 +20,7 @@
#include <stdio.h>
#include <stdlib.h>
-
+#define FALSE 0
#include <gif_lib.h>
/*
@@ -42,11 +42,11 @@
int color_index;
unsigned char *ptr = NULL;
- infile = DGifOpenFileName(filename);
+ infile = DGifOpenFileName(filename, NULL);
if (infile == NULL)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -54,7 +54,7 @@
{
if (DGifGetRecordType(infile, &record_type) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -63,7 +63,7 @@
case IMAGE_DESC_RECORD_TYPE:
if (DGifGetImageDesc(infile) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -107,14 +107,14 @@
GifByteType *ext;
if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
while (ext != NULL)
{
if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
}
@@ -178,7 +178,7 @@
return(0);
}
- colormap = MakeMapObject(colormap_size, NULL);
+ colormap = GifMakeMapObject(colormap_size, NULL);
for (i = 0; i < width * height; i++)
{
@@ -187,10 +187,10 @@
blue[i] = (GifByteType) rgb[3*i+2];
}
- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,
+ if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue,
buffer, colormap->Colors) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -198,24 +198,24 @@
free(green);
free(blue);
- outfile = EGifOpenFileName((char *) filename, FALSE);
+ outfile = EGifOpenFileName((char *) filename, FALSE, NULL);
if (outfile == NULL)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap)
== GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL)
== GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -224,7 +224,7 @@
{
if (EGifPutLine(outfile, ptr, width) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
ptr += width;
@@ -233,7 +233,7 @@
EGifSpew(outfile);
if (EGifCloseFile(outfile) == GIF_ERROR)
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
free(buffer);
science/astronomy/xplanet/files/netpbm-includedir.diff
+36
View File
@@ -0,0 +1,36 @@
diff -Naur xplanet-1.2.1-orig/configure xplanet-1.2.1/configure
--- xplanet-1.2.1-orig/configure 2009-12-04 10:34:21.766146687 +0200
+++ xplanet-1.2.1/configure 2009-12-04 10:34:36.868516259 +0200
@@ -7974,7 +7974,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <pnm.h>
+#include <netpbm/pnm.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
diff -Naur xplanet-1.2.1-orig/src/libimage/pnm.c xplanet-1.2.1/src/libimage/pnm.c
--- xplanet-1.2.1-orig/src/libimage/pnm.c 2009-12-04 10:34:21.768391483 +0200
+++ xplanet-1.2.1/src/libimage/pnm.c 2009-12-04 10:35:13.152141234 +0200
@@ -21,7 +21,7 @@
#include <stdio.h>
#include <string.h>
-#include <pnm.h>
+#include <netpbm/pnm.h>
int
read_pnm(const char *filename, int *width, int *height, char **rgb)
diff -Naur xplanet-1.2.1-orig/src/libimage/WriteImage.cpp xplanet-1.2.1/src/libimage/WriteImage.cpp
--- xplanet-1.2.1-orig/src/libimage/WriteImage.cpp 2009-12-04 10:34:21.768391483 +0200
+++ xplanet-1.2.1/src/libimage/WriteImage.cpp 2009-12-04 10:35:00.145228715 +0200
@@ -31,7 +31,7 @@
#endif
#ifdef HAVE_LIBPNM
-#include <pnm.h>
+#include <netpbm/pnm.h>
int
write_pnm(FILE *outfile, int width, int height, unsigned char *rgb,
int maxv, int format, int forceplain);
science/astronomy/xplanet/files/xplanet-1.2.1-fix-gcc44.patch
+35
View File
@@ -0,0 +1,35 @@
Index: src/PlanetProperties.cpp
===================================================================
--- src/PlanetProperties.cpp
+++ src/PlanetProperties.cpp 2009-05-25 12:31:55.000000000 +0200
@@ -1,6 +1,8 @@
#include <algorithm>
#include <cctype>
#include <cstring>
+#include <cstdio>
+#include <cstdlib>
#include <string>
#include <vector>
using namespace std;
Index: src/Satellite.cpp
===================================================================
--- src/Satellite.cpp
+++ src/Satellite.cpp 2009-05-25 11:44:36.000000000 +0200
@@ -1,5 +1,6 @@
#include <clocale>
#include <cstring>
+#include <cstdio>
#include <iostream>
using namespace std;
Index: src/Separation.cpp
===================================================================
--- src/Separation.cpp
+++ src/Separation.cpp 2009-05-25 11:50:11.000000000 +0200
@@ -1,5 +1,6 @@
#include <cmath>
#include <iostream>
+#include <cstdio>
#include "Separation.h"
#include "View.h"