CVS commit: pkgsrc/graphics/gd

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed May 24 17:14:53 UTC 2023

Modified Files:
        pkgsrc/graphics/gd: Makefile buildlink3.mk options.mk

Log Message:
gd: make libimagequant optional

Bump PKGREVISION.

Based on a patch by osa@, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 pkgsrc/graphics/gd/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/graphics/gd/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/gd/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gd/Makefile
diff -u pkgsrc/graphics/gd/Makefile:1.139 pkgsrc/graphics/gd/Makefile:1.140
--- pkgsrc/graphics/gd/Makefile:1.139   Mon May 22 11:38:58 2023
+++ pkgsrc/graphics/gd/Makefile Wed May 24 17:14:52 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.139 2023/05/22 11:38:58 wiz Exp $
+# $NetBSD: Makefile,v 1.140 2023/05/24 17:14:52 wiz Exp $
 
 DISTNAME=      libgd-2.3.3
 PKGNAME=       ${DISTNAME:S/libgd/gd/}
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libgd/}
 GITHUB_PROJECT=        libgd
@@ -22,7 +22,6 @@ CONFIGURE_ARGS+=      --disable-werror
 CONFIGURE_ARGS+=       --with-fontconfig=${BUILDLINK_PREFIX.fontconfig}
 CONFIGURE_ARGS+=       --with-freetype=${BUILDLINK_PREFIX.freetype2}
 CONFIGURE_ARGS+=       --with-jpeg=${JPEGBASE}
-CONFIGURE_ARGS+=       --with-liq=${BUILDLINK_PREFIX.libimagequant}
 CONFIGURE_ARGS+=       --with-png=${BUILDLINK_PREFIX.png}
 CONFIGURE_ARGS+=       --with-webp=${BUILDLINK_PREFIX.libwebp}
 CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
@@ -35,7 +34,6 @@ PKGCONFIG_OVERRIDE+=  config/gdlib.pc.in
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libimagequant/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/graphics/gd/buildlink3.mk
diff -u pkgsrc/graphics/gd/buildlink3.mk:1.50 pkgsrc/graphics/gd/buildlink3.mk:1.51
--- pkgsrc/graphics/gd/buildlink3.mk:1.50       Mon May 22 11:38:58 2023
+++ pkgsrc/graphics/gd/buildlink3.mk    Wed May 24 17:14:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.50 2023/05/22 11:38:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.51 2023/05/24 17:14:52 wiz Exp $
 
 BUILDLINK_TREE+=       gd
 
@@ -25,7 +25,11 @@ pkgbase := gd
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+
+.if ${PKG_BUILD_OPTIONS.gd:Mlibimagequant}
 .include "../../graphics/libimagequant/buildlink3.mk"
+.endif
+
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/graphics/gd/options.mk
diff -u pkgsrc/graphics/gd/options.mk:1.8 pkgsrc/graphics/gd/options.mk:1.9
--- pkgsrc/graphics/gd/options.mk:1.8   Mon Sep 10 13:34:16 2018
+++ pkgsrc/graphics/gd/options.mk       Wed May 24 17:14:52 2023
@@ -1,11 +1,18 @@
-# $NetBSD: options.mk,v 1.8 2018/09/10 13:34:16 kim Exp $
+# $NetBSD: options.mk,v 1.9 2023/05/24 17:14:52 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gd
-PKG_SUPPORTED_OPTIONS= tiff x11
-PKG_SUGGESTED_OPTIONS= tiff
+PKG_SUPPORTED_OPTIONS= libimagequant tiff x11
+PKG_SUGGESTED_OPTIONS= libimagequant tiff
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mlibimagequant)
+.include "../../graphics/libimagequant/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-liq=${BUILDLINK_PREFIX.libimagequant}
+.else
+CONFIGURE_ARGS+=       --without-liq
+.endif
+
 .if !empty(PKG_OPTIONS:Mtiff)
 .include "../../graphics/tiff/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-tiff=${BUILDLINK_PREFIX.tiff}