Hardcode our build options in pngconf.h so everything sees really the same

interface.  ok steven@
This commit is contained in:
naddy 2007-04-08 15:02:36 +00:00
parent 79d76f6137
commit ce25e73ce9
3 changed files with 23 additions and 5 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.61 2007/03/15 19:19:23 naddy Exp $
# $OpenBSD: Makefile,v 1.62 2007/04/08 15:02:36 naddy Exp $
COMMENT= "library for manipulating PNG images"
VERSION= 1.2.16
DISTNAME= libpng-${VERSION}
PKGNAME= png-${VERSION}
PKGNAME= png-${VERSION}p0
SHARED_LIBS= png 5.2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/}

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-pngconf_h,v 1.6 2007/04/08 15:02:36 naddy Exp $
--- pngconf.h.orig Wed Jan 31 14:22:33 2007
+++ pngconf.h Sat Mar 31 20:51:57 2007
@@ -37,6 +37,14 @@
#endif
#endif
+/* libpng compile time options */
+#ifndef PNG_NO_MMX_CODE
+# define PNG_NO_MMX_CODE
+#endif
+#ifndef PNG_USE_PNGGCCRD
+# define PNG_USE_PNGGCCRD
+#endif
+
/*
* Added at libpng-1.2.8
*

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_makefile_openbsd,v 1.19 2007/03/15 19:19:23 naddy Exp $
$OpenBSD: patch-scripts_makefile_openbsd,v 1.20 2007/04/08 15:02:36 naddy Exp $
--- scripts/makefile.openbsd.orig Wed Jan 31 14:22:38 2007
+++ scripts/makefile.openbsd Sat Feb 10 20:26:09 2007
+++ scripts/makefile.openbsd Sat Mar 31 20:47:38 2007
@@ -4,11 +4,12 @@
# For conditions of distribution and use, see copyright notice in png.h
@ -16,7 +16,7 @@ $OpenBSD: patch-scripts_makefile_openbsd,v 1.19 2007/03/15 19:19:23 naddy Exp $
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
@@ -22,24 +23,42 @@ CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_COD
@@ -22,24 +23,42 @@ CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_CODE -DPNG_USE_PN
NOPROFILE= Yes