libgd: Switch to CMake

Size reduced from 92878 to 91675 bytes.

CMake added CXX files. Removed those.

Removed ceill patch. ceill is not used anymore.

Removed pkgconfig patch. CMake uses a different file, which does not have
this problem.

Further size reduction to 87938 with LTO.

Removed InstallDev. CMAKE_INSTALL takes care of that.

Added WebP support.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2019-09-10 13:49:21 -07:00
parent 70448f6e1f
commit 3e44ecbafa
5 changed files with 49 additions and 97 deletions
+26
View File
@@ -0,0 +1,26 @@
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,8 +23,6 @@ SET (LIBGD_SRC_FILES
gd_io_dp.c
gd_io_file.c
gd_io_ss.c
- gd_io_stream.cxx
- gd_io_stream.h
gd_jpeg.c
gd_matrix.c
gd_nnquant.c
@@ -60,8 +58,6 @@ SET (LIBGD_SRC_FILES
gdhelpers.c
gdhelpers.h
gdkanji.c
- gdpp.cxx
- gdpp.h
gdtables.c
gdxpm.c
jisx0208.h
@@ -175,5 +171,4 @@ install(FILES
gdfonts.h
gdfontt.h
gdfx.h
- gdpp.h
DESTINATION include)
-20
View File
@@ -1,20 +0,0 @@
--- a/config/gdlib-config.in
+++ b/config/gdlib-config.in
@@ -74,7 +74,7 @@ while test $# -gt 0; do
echo @LDFLAGS@
;;
--libs)
- echo -lgd @LIBS@ @LIBICONV@
+ echo -lgd @LIBS@
;;
--cflags|--includes)
echo -I@includedir@
@@ -87,7 +87,7 @@ while test $# -gt 0; do
echo "includedir: $includedir"
echo "cflags: -I@includedir@"
echo "ldflags: @LDFLAGS@"
- echo "libs: @LIBS@ @LIBICONV@"
+ echo "libs: @LIBS@"
echo "libdir: $libdir"
echo "features: @FEATURES@"
;;
-9
View File
@@ -1,9 +0,0 @@
--- a/config/gdlib.pc.in
+++ b/config/gdlib.pc.in
@@ -7,5 +7,5 @@ Name: gd
Description: GD graphics library
Version: @VERSION@
Cflags: -I${includedir}
-Libs.private: @LIBS@ @LIBICONV@
+Libs.private: @LIBS@
Libs: -L${libdir} -lgd
-24
View File
@@ -1,24 +0,0 @@
--- a/src/gd_bmp.c
+++ b/src/gd_bmp.c
@@ -28,6 +28,7 @@
#include <math.h>
#include <string.h>
#include <stdlib.h>
+#include <features.h>
#include "gd.h"
#include "gdhelpers.h"
#include "bmp.h"
@@ -49,6 +50,13 @@ static int bmp_read_rle(gdImagePtr im, g
#define BMP_DEBUG(s)
+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LONG_DOUBLE_MATH__)
+long double ceill(long double x)
+{
+ return (long double)ceil((double)x);
+}
+#endif
+
static int gdBMPPutWord(gdIOCtx *out, int w)
{
/* Byte order is little-endian */