ports/70144: [PATCH] graphics/ale: update to 0.7.0
Michael Johnson
ahze at ahze.net
Sat Aug 7 21:10:21 UTC 2004
>Number: 70144
>Category: ports
>Synopsis: [PATCH] graphics/ale: update to 0.7.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 07 21:10:20 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Michael Johnson
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD gentoo.ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #60: Wed Aug 4 21:10:57 EDT
>Description:
- Update to 0.7.0
Added file(s):
- files/patch-Makefile
Removed file(s):
- files/patch-channel.h
- files/patch-ppm.h
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- ale-0.7.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/ale.orig/Makefile /usr/ports/graphics/ale/Makefile
--- /usr/ports/graphics/ale.orig/Makefile Thu Feb 5 15:37:19 2004
+++ /usr/ports/graphics/ale/Makefile Sat Aug 7 17:01:24 2004
@@ -7,33 +7,50 @@
#
PORTNAME= ale
-PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTVERSION= 0.7.0
CATEGORIES= graphics
MASTER_SITES= http://auricle.dyndns.org/ALE/download/
-PATCH_SITES= http://auricle.dyndns.org/ALE/bugs/
-PATCHFILES= 0.5.1.patch1 0.5.1.patch2
-PATCH_DIST_ARGS= -p1 -d ${PATCH_WRKSRC}
MAINTAINER= ports at FreeBSD.org
COMMENT= Anti-Lamenessing Engine
PLIST_FILES= bin/ale
USE_GMAKE= yes
+USE_REINPLACE= yes
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+USE_GCC= 3.3
+.endif
.if !defined(WITHOUT_IMAGEMAGICK)
-LIB_DEPENDS= Magick.6:${PORTSDIR}/graphics/ImageMagick
-MAKE_ARGS= IMAGEMAGICK=1
+LIB_DEPENDS+= Magick.6:${PORTSDIR}/graphics/ImageMagick
+MAKE_ARGS+= IMAGEMAGICK=1
.endif
-.include <bsd.port.pre.mk>
+.if !defined(WITHOUT_FFTW3)
+LIB_DEPENDS+= fftw3.3:${PORTSDIR}/math/fftw3
+MAKE_ARGS+= FFTW=1
+.endif
-.if ${OSVERSION} < 500035
-USE_REINPLACE= yes
-USE_GCC= 3.1
+pre-everything::
+.if !defined(WITHOUT_IMAGEMAGICK)
+ @${ECHO_MSG} "===> Disable ImageMagick Support by defining WITHOUT_IMAGEMAGICK"
+.endif
+.if !defined(WITHOUT_FFTW3)
+ @${ECHO_MSG} "===> Disable FFTW3 Support by defining WITHOUT_FFTW3"
+.endif
post-patch:
- @${REINPLACE_CMD} -e "s|^ g++| ${CXX}|" ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|; \
+ s|g++|${CXX}|' ${WRKSRC}/${MAKEFILE}
+ @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \
+ ${WRKSRC}/*.h ${WRKSRC}/*/*.h
+.if ${OSVERSION} < 502114
+ @${REINPLACE_CMD} -e 's|round|rint|' \
+ ${WRKSRC}/d2/image_rw.h \
+ ${WRKSRC}/d2/ppm.h
.endif
do-install:
diff -ruN --exclude=CVS /usr/ports/graphics/ale.orig/distinfo /usr/ports/graphics/ale/distinfo
--- /usr/ports/graphics/ale.orig/distinfo Thu Jan 29 02:24:14 2004
+++ /usr/ports/graphics/ale/distinfo Sat Aug 7 13:02:39 2004
@@ -1,6 +1,2 @@
-MD5 (ale-0.5.1.tar.gz) = 5c08c6f8b1d7cec89771d64ef09e2bef
-SIZE (ale-0.5.1.tar.gz) = 50082
-MD5 (0.5.1.patch1) = 4de11856fdc611c0446c1ea81e6fee67
-SIZE (0.5.1.patch1) = 1805
-MD5 (0.5.1.patch2) = b87e6023f4f6d4aa3f604582a691b3b8
-SIZE (0.5.1.patch2) = 6141
+MD5 (ale-0.7.0.tar.gz) = 0e812b29d10c2cc6a48baf5326e597bd
+SIZE (ale-0.7.0.tar.gz) = 96247
diff -ruN --exclude=CVS /usr/ports/graphics/ale.orig/files/patch-Makefile /usr/ports/graphics/ale/files/patch-Makefile
--- /usr/ports/graphics/ale.orig/files/patch-Makefile Wed Dec 31 19:00:00 1969
+++ /usr/ports/graphics/ale/files/patch-Makefile Sat Aug 7 13:12:18 2004
@@ -0,0 +1,19 @@
+--- Makefile.orig Wed Aug 4 16:46:34 2004
++++ Makefile Sat Aug 7 13:11:43 2004
+@@ -41,14 +41,14 @@
+ DEBUG_CFLAGS:=$(if $(subst 0,,$(DEBUG)),-DDEBUG,-DNDEBUG)
+ IMAGEMAGICK_CFLAGS:=$(if $(use_imagemagick),-DUSE_MAGICK $(shell Magick-config --cflags --cppflags),)
+ IMAGEMAGICK_LDFLAGS:=$(if $(use_imagemagick),$(shell Magick-config --ldflags --libs),)
+-FFTW_CFLAGS:=$(if $(subst 0,,$(FFTW)),-DUSE_FFTW,)
++FFTW_CFLAGS:=-I%%LOCALBASE%%/include -DUSE_FFTW
+ POSIX_CFLAGS:=$(if $(subst 0,,$(POSIX)),-DUSE_UNIX,)
+ PRECISION_CFLAGS:=$(if $(subst SINGLE,,$(COLORS)),,-DALE_COLORS=SINGLE)\
+ $(if $(subst DOUBLE,,$(COLORS)),,-DALE_COLORS=DOUBLE)\
+ $(if $(subst HALF,,$(COLORS)),,-DALE_COLORS=HALF)\
+ $(if $(subst SINGLE,,$(COORDINATES)),,-DALE_COORDINATES=SINGLE)\
+ $(if $(subst DOUBLE,,$(COORDINATES)),,-DALE_COORDINATES=DOUBLE)
+-FFTW_LDFLAGS:=$(if $(subst 0,,$(FFTW)),-lfftw3,)
++FFTW_LDFLAGS:=-L%%LOCALBASE%%/lib -lfftw3
+
+ CFLAGS:= $(POSIX_CFLAGS) $(DEBUG_CFLAGS) $(FFTW_CFLAGS) $(PRECISION_CFLAGS) \
+ $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS),-Wall -O2)
diff -ruN --exclude=CVS /usr/ports/graphics/ale.orig/files/patch-channel.h /usr/ports/graphics/ale/files/patch-channel.h
--- /usr/ports/graphics/ale.orig/files/patch-channel.h Mon Jan 26 22:25:51 2004
+++ /usr/ports/graphics/ale/files/patch-channel.h Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
---- channel.h.orig Tue Jan 27 10:59:02 2004
-+++ channel.h Tue Jan 27 10:59:10 2004
-@@ -20,7 +20,7 @@
- #ifndef __channel_h__
- #define __channel_h__
-
--#include <stdint.h>
-+#include <inttypes.h>
-
- /*
- * Channel type used by ALE.
diff -ruN --exclude=CVS /usr/ports/graphics/ale.orig/files/patch-ppm.h /usr/ports/graphics/ale/files/patch-ppm.h
--- /usr/ports/graphics/ale.orig/files/patch-ppm.h Tue Dec 16 23:15:52 2003
+++ /usr/ports/graphics/ale/files/patch-ppm.h Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
---- ppm.h.orig Wed Dec 17 11:56:17 2003
-+++ ppm.h Wed Dec 17 11:57:01 2003
-@@ -189,7 +189,7 @@
- }
-
- if (mcv != CHANNEL_MAX)
-- ival = (int) round(((double) ival / (double) (mcv)) * (CHANNEL_MAX));
-+ ival = (int) ceil(((double) ival / (double) (mcv)) * (CHANNEL_MAX) + 0.5);
-
- im->set_pixel_component(i, j, k, ival);
- }
--- ale-0.7.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list