CVS commit: pkgsrc/graphics/libcaca

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Apr 21 20:21:44 UTC 2025

Modified Files:
        pkgsrc/graphics/libcaca: Makefile distinfo
Added Files:
        pkgsrc/graphics/libcaca/patches: patch-examples_Makefile.am
            patch-examples_Makefile.in

Log Message:
libcaca: Fix examples build with imlib2 -x11.

While here, add missing devel/zlib/buildlink3.mk. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/libcaca/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/libcaca/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/libcaca/patches/patch-examples_Makefile.am \
    pkgsrc/graphics/libcaca/patches/patch-examples_Makefile.in

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

Modified files:

Index: pkgsrc/graphics/libcaca/Makefile
diff -u pkgsrc/graphics/libcaca/Makefile:1.43 pkgsrc/graphics/libcaca/Makefile:1.44
--- pkgsrc/graphics/libcaca/Makefile:1.43       Mon Feb 17 22:00:48 2025
+++ pkgsrc/graphics/libcaca/Makefile    Mon Apr 21 20:21:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2025/02/17 22:00:48 nia Exp $
+# $NetBSD: Makefile,v 1.44 2025/04/21 20:21:43 schmonz Exp $
 
 DISTNAME=      libcaca-0.99.beta20
 PKGNAME=       ${DISTNAME:S/beta//}
@@ -30,5 +30,6 @@ CONFIGURE_ARGS+=      --disable-doc
 LDFLAGS.Linux+=        -ldl
 LDFLAGS.SunOS+=        -lsocket -lnsl
 
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/libcaca/distinfo
diff -u pkgsrc/graphics/libcaca/distinfo:1.13 pkgsrc/graphics/libcaca/distinfo:1.14
--- pkgsrc/graphics/libcaca/distinfo:1.13       Mon Feb 17 22:00:48 2025
+++ pkgsrc/graphics/libcaca/distinfo    Mon Apr 21 20:21:43 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2025/02/17 22:00:48 nia Exp $
+$NetBSD: distinfo,v 1.14 2025/04/21 20:21:43 schmonz Exp $
 
 BLAKE2s (libcaca-0.99.beta20.tar.gz) = a876fb9691d30c2aea3ecff525205feb8ff612e05ecd71532f9884a3d0ce24cc
 SHA512 (libcaca-0.99.beta20.tar.gz) = ab03e6c7d17fd152b2d5e9161799531f5e87322e174cb9d25874700f5bc1acfaf8bc2736e733998dad906f793c5a0304740dd39eec04a5e4c3d181bb109b4f23
@@ -6,4 +6,6 @@ Size (libcaca-0.99.beta20.tar.gz) = 1099
 SHA1 (patch-CVE-2022-0856) = 466b2e6abf21cd28d0195a72f382be57aaee1d4d
 SHA1 (patch-caca_dither.c) = d2285e75eaec09840c38c2c54ce5e942d0a2e820
 SHA1 (patch-configure) = 12b3f5c5835876e9e26df7ce677182548bf36572
+SHA1 (patch-examples_Makefile.am) = f9d5df8893a84489a358fa5c0bbff6ae51ad53f7
+SHA1 (patch-examples_Makefile.in) = f6ca05f1f8b324ec9514a09ccbd9e96fc6eb1d9b
 SHA1 (patch-examples_font.c) = cc3e32a41c941e2c11a380e4e811ac4ba8b14f1d

Added files:

Index: pkgsrc/graphics/libcaca/patches/patch-examples_Makefile.am
diff -u /dev/null pkgsrc/graphics/libcaca/patches/patch-examples_Makefile.am:1.1
--- /dev/null   Mon Apr 21 20:21:44 2025
+++ pkgsrc/graphics/libcaca/patches/patch-examples_Makefile.am  Mon Apr 21 20:21:43 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-examples_Makefile.am,v 1.1 2025/04/21 20:21:43 schmonz Exp $
+
+Fix examples build with imlib2 -x11.
+
+--- examples/Makefile.am.orig  2025-04-21 20:12:47.920704417 +0000
++++ examples/Makefile.am
+@@ -1,6 +1,8 @@
+ 
+ include $(top_srcdir)/build/autotools/common.am
+ 
++AM_CPPFLAGS += -DX_DISPLAY_MISSING=1
++
+ noinst_PROGRAMS = trifiller blit canvas colors conio $(conio_snake) demo demo0 dithering driver event export figfont font font2tga frames fullwidth gamma hsv input spritedit swallow text transform 
truecolor unicode import mouse
+ 
+ if USE_CXX
Index: pkgsrc/graphics/libcaca/patches/patch-examples_Makefile.in
diff -u /dev/null pkgsrc/graphics/libcaca/patches/patch-examples_Makefile.in:1.1
--- /dev/null   Mon Apr 21 20:21:44 2025
+++ pkgsrc/graphics/libcaca/patches/patch-examples_Makefile.in  Mon Apr 21 20:21:43 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-examples_Makefile.in,v 1.1 2025/04/21 20:21:43 schmonz Exp $
+
+Fix examples build with imlib2 -x11.
+
+--- examples/Makefile.in.orig  2025-04-21 20:12:47.925151734 +0000
++++ examples/Makefile.in
+@@ -508,7 +508,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I$(top_builddir)/caca
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I$(top_builddir)/caca -DX_DISPLAY_MISSING=1
+ @USE_CXX_TRUE@conio_snake = conio-snake
+ trifiller_SOURCES = trifiller.c
+ trifiller_CFLAGS = $(IMLIB2_CFLAGS)