head	1.4;
access;
symbols
	pkgsrc-2026Q3:1.4.0.14
	pkgsrc-2026Q3-base:1.4
	pkgsrc-2026Q2:1.4.0.12
	pkgsrc-2026Q2-base:1.4
	pkgsrc-2026Q1:1.4.0.10
	pkgsrc-2026Q1-base:1.4
	pkgsrc-2025Q4:1.4.0.8
	pkgsrc-2025Q4-base:1.4
	pkgsrc-2025Q3:1.4.0.6
	pkgsrc-2025Q3-base:1.4
	pkgsrc-2025Q2:1.4.0.4
	pkgsrc-2025Q2-base:1.4
	pkgsrc-2025Q1:1.4.0.2
	pkgsrc-2025Q1-base:1.4
	pkgsrc-2024Q4:1.3.0.68
	pkgsrc-2024Q4-base:1.3
	pkgsrc-2024Q3:1.3.0.66
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.64
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.62
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.60
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.58
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.3.0.56
	pkgsrc-2023Q2-base:1.3
	pkgsrc-2023Q1:1.3.0.54
	pkgsrc-2023Q1-base:1.3
	pkgsrc-2022Q4:1.3.0.52
	pkgsrc-2022Q4-base:1.3
	pkgsrc-2022Q3:1.3.0.50
	pkgsrc-2022Q3-base:1.3
	pkgsrc-2022Q2:1.3.0.48
	pkgsrc-2022Q2-base:1.3
	pkgsrc-2022Q1:1.3.0.46
	pkgsrc-2022Q1-base:1.3
	pkgsrc-2021Q4:1.3.0.44
	pkgsrc-2021Q4-base:1.3
	pkgsrc-2021Q3:1.3.0.42
	pkgsrc-2021Q3-base:1.3
	pkgsrc-2021Q2:1.3.0.40
	pkgsrc-2021Q2-base:1.3
	pkgsrc-2021Q1:1.3.0.38
	pkgsrc-2021Q1-base:1.3
	pkgsrc-2020Q4:1.3.0.36
	pkgsrc-2020Q4-base:1.3
	pkgsrc-2020Q3:1.3.0.34
	pkgsrc-2020Q3-base:1.3
	pkgsrc-2020Q2:1.3.0.30
	pkgsrc-2020Q2-base:1.3
	pkgsrc-2020Q1:1.3.0.10
	pkgsrc-2020Q1-base:1.3
	pkgsrc-2019Q4:1.3.0.32
	pkgsrc-2019Q4-base:1.3
	pkgsrc-2019Q3:1.3.0.28
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.26
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.24
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.22
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.20
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.18
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.16
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.14
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.12
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.8
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.3.0.6
	pkgsrc-2017Q1-base:1.3
	pkgsrc-2016Q4:1.3.0.4
	pkgsrc-2016Q4-base:1.3
	pkgsrc-2016Q3:1.3.0.2
	pkgsrc-2016Q3-base:1.3
	pkgsrc-2016Q2:1.2.0.30
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.28
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.26
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.24
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.22
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.20
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.18
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.16
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.14
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.12
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.10
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.8
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.6
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.4
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.2
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.1.0.10
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.8
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.6
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.4
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.2
	pkgsrc-2011Q3-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2025.01.31.07.09.56;	author wiz;	state Exp;
branches;
next	1.3;
commitid	dXIc4wANvBebGBHF;

1.3
date	2016.09.18.05.48.59;	author dholland;	state Exp;
branches;
next	1.2;
commitid	rF7IflYZDwURuJmz;

1.2
date	2012.12.26.10.24.17;	author jaapb;	state Exp;
branches;
next	1.1;

1.1
date	2011.08.07.20.36.20;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.4
log
@camlimages: do not build tests and examples

Fix the png detection.

Fixes the build for me on NetBSD-current, but I don't know if this
works or not.
@
text
@$NetBSD: patch-OMakefile,v 1.3 2016/09/18 05:48:59 dholland Exp $

Use pkgsrc build variables, correct detection of libpng

--- OMakefile.orig	2011-06-22 18:04:32.000000000 +0000
+++ OMakefile	2011-08-06 17:23:47.000000000 +0000
@@@@ -25,8 +25,10 @@@@
   /usr/include/X11
   /usr/local/include
 
+INCLUDES[]+= @@PREFIX@@/include
+
 # Specify non standard library directories
-LDFLAGS[]+= 
+LDFLAGS[]+= @@LDFLAGS@@
 # for example, 
 # LDFLAGS[]+= -L/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/
 
@@@@ -35,6 +37,8 @@@@
   /etc/X11
   /usr/share/X11
 
+PATH_RGB_TXT[]+= @@X11BASE@@/lib/X11
+
 BYTE_ENABLED=1
 NATIVE_ENABLED=1
 
@@@@ -122,11 +126,11 @@@@
     export
 
   HAVE_Z = $(Check_header_library z, zlib.h, zlibVersion)
-  HAVE_PNG = $(Check_header_library png, png.h, png_create_read_struct)
+  HAVE_PNG = $(Check_header_library png16, png.h, png_create_read_struct)
   SUPPORT_PNG = $(and $(HAVE_Z) $(HAVE_PNG))
   LDFLAGS_png=
   if $(SUPPORT_PNG)
-    LDFLAGS_png=-lpng -lz
+    LDFLAGS_png=-lpng16 -lz
     SUPPORTED_FORMATS+=png
     export
 
@@@@ -207,4 +211,4 @@@@ section:
   VERSION=$(PACKAGE_VERSION)
   ConfReplaceConfigH(config.h)
 
-.SUBDIRS: src test examples
+.SUBDIRS: src
@


1.3
log
@pkglint
@
text
@d1 1
a1 1
$NetBSD: patch-OMakefile,v 1.2 2012/12/26 10:24:17 jaapb Exp $
d33 1
a33 1
+  HAVE_PNG = $(Check_header_library png15, png.h, png_create_read_struct)
d38 1
a38 1
+    LDFLAGS_png=-lpng15 -lz
d42 6
@


1.2
log
@Corrected build failure with clang, and added comments to patches.
@
text
@d1 1
a1 1
$NetBSD: patch-OMakefile,v 1.1 2011/08/07 20:36:20 wiz Exp $
d4 1
@


1.1
log
@Update to 4.0.1, from Nicolas Thauvin.

4.0.1
	* Minor bug fixes, patch submitted by Damien Doligez

4.0.0
	* Stop supporting the autoconf build. (It might works though.)
	* Instead of autoconf, using omake and ocamlfind
	* Subpackages: no need to link codes for uninterested format.
	* Stop supporting lablgtk1
	  - Ximage2 module is now Ximage, and the older Ximage is removed
	  - OXimage2 module is now OXimage, and the older OXimage is removed

3.2.0
	* Misnamed version. It should have been 3.0.3 or something.
        * Small bug fix for image load memory allocation vulnerability

3.0.2
        * O'Caml 3.11 port.
	* Integer overflow vulnerability fix for pngread.c

3.0.1
        * Alpha channel support for png images.

3.0.0
        * new version numbering scheme
        * autoconf and makefiles cleanup
        * fix examples compilation

2.2.1
        * Now compiling with -warn-error -A
@
text
@d1 1
a1 1
$NetBSD$
d3 1
@

