Merge pull request sagemath#2 from mkoeppe/libgd_reduce_deps

Libgd reduce deps

build/pkgs/libgd/SPKG.rst

@@ -23,9 +23,4 @@ Upstream Contact
 
 -  https://libgd.github.io
 -  Pierre Joye (http://blog.thepimp.net)
--  http://libgd.bitbucket.org/
-
-Special Update/Build Instructions
----------------------------------
-
-See spkg-src script.
+-  https://github.com/libgd/libgd

build/pkgs/libgd/checksums.ini

@@ -1,5 +1,5 @@
 tarball=libgd-VERSION.tar.xz
-sha1=dddf5e9d25cb0b20b8642d5cbcfad67f8903532f
-md5=0ee844caca06bb02bf4b4dabdfab4fb1
-cksum=902217083
+sha1=7ce6ecb5aed26c08246a37b6351c886ab4b51ca2
+md5=7a58b54d375eda236414201252a0ee3c
+cksum=1360697583
 upstream_url=https://github.com/libgd/libgd/releases/download/gd-VERSION/libgd-VERSION.tar.xz

build/pkgs/libgd/dependencies

@@ -1,4 +1,4 @@
-libpng freetype xz
+xz
 
 # xz needed to unpack tarball when sage-bootstrap-python is Python < 3.3
 ----------

build/pkgs/libgd/package-version.txt

@@ -1 +1 @@
-2.3.2
+2.3.3

build/pkgs/libgd/spkg-install.in

@@ -2,25 +2,13 @@ cd src
 
 export CFLAGS="-g $CFLAGS"
 
-if [ "$UNAME" = "CYGWIN" ]; then
-    # Compiling with vpx support creates a broken library in some cases
-    # because the vpx package itself is broken on some older Cygwin versions;
-    # we don't need this feature so safer to just disable
-    # https://github.com/sagemath/sage/issues/27970
-    LIBGD_CONFIGURE="--without-vpx $LIBGD_CONFIGURE"
-fi
-if [ -n "$SAGE_FREETYPE_PREFIX" ]; then
-    LIBGD_CONFIGURE="--with-freetype=$SAGE_FREETYPE_PREFIX $LIBGD_CONFIGURE"
-else
-    LIBGD_CONFIGURE="--with-freetype=yes $LIBGD_CONFIGURE"
-fi
-
-# We explicitly disable X and fontconfig support, since (1) X is not a SAGE dependency,
-# and (2) the gd build fails on a lot of OS X PPC machines when X is enabled.
-# Also, libgd will try to link against system libavif/libvmaf and fail
-# on Fedora 34
+# We explicitly disable X, fontconfig, and support of various formats/libraries.
+# We only need png.
+# see https://github.com/libgd/libgd/blob/master/configure.ac
 sdh_configure --without-jpeg --without-xpm --without-x --without-fontconfig \
-              --without-avif \
+              --without-avif --without-freetype --without-raqm --without-liq \
+              --without-tiff --without-webp --without-heif \
+              --disable-gd-formats \
               --with-zlib="$SAGE_LOCAL" $LIBGD_CONFIGURE
 sdh_make
 sdh_make_install