[39095] trunk/dports/graphics/openjpeg

[mcalhoun at macports.org]

Revision: 39095
          http://trac.macosforge.org/projects/macports/changeset/39095
Author:   mcalhoun at macports.org
Date:     2008-08-08 00:28:00 -0700 (Fri, 08 Aug 2008)
Log Message:
-----------
openjpeg: assume maintainership and upgrade to version 1.3

Modified Paths:
--------------
    trunk/dports/graphics/openjpeg/Portfile

Added Paths:
-----------
    trunk/dports/graphics/openjpeg/files/
    trunk/dports/graphics/openjpeg/files/patch-opj_malloc.h.diff

Modified: trunk/dports/graphics/openjpeg/Portfile
===================================================================
--- trunk/dports/graphics/openjpeg/Portfile	2008-08-08 07:15:51 UTC (rev 39094)
+++ trunk/dports/graphics/openjpeg/Portfile	2008-08-08 07:28:00 UTC (rev 39095)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem 1.0
@@ -2,8 +3,7 @@
 
-name            openjpeg
-version         1.2
-revision        3
-categories      graphics
-maintainers     nomaintainer
-description     Library for manipulating JPEG-2000 images
+name             openjpeg
+version          1.3
+categories       graphics
+maintainers      mcalhoun
+description      Library for manipulating JPEG-2000 images
 long_description \
@@ -14,20 +14,45 @@
 	the new still-image compression standard from the \
 	Joint Photographic Experts Group (JPEG).
 
-platforms       darwin
+platforms        darwin
 
-homepage        http://www.openjpeg.org/
-master_sites    ${homepage}
+homepage         http://www.openjpeg.org/
+master_sites     ${homepage}
 
-checksums		md5 4973c564c96683a921a7f6759906da4e
-distname        ${name}_v1_2
-depends_lib     port:cmake port:tiff
-worksrcdir      trunk
+checksums \
+    md5     f9a3ccfa91ac34b589e9bf7577ce8ff9          \
+    sha1    8d6870d9500ea09e0b1d30b981bea1c8de534de4  \
+    rmd160  2a22cc123058b1974cd1bf3898044acabceba26c
 
-configure       { system "cd ${worksrcpath} && cmake ${configure.args} ${worksrcpath}" }
-configure.args  -D BUILD_SHARED_LIBS:BOOL=ON \
-                -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-                -D CMAKE_INSTALL_PREFIX:PATH=${prefix} \
-                -D CMAKE_INSTALL_RPATH:PATH=${prefix}/lib \
-                -D CMAKE_INSTALL_NAME_DIR=${prefix}/lib \
-                -D BUILD_EXAMPLES:BOOL=ON
+use_configure    no
+
+patchfiles       patch-opj_malloc.h.diff
+
+post-patch {
+    reinplace \
+        "s| -o root -g wheel | -o ${install.user} -g ${install.group} |g" \
+        ${worksrcpath}/Makefile.osx
+}
+
+post-configure {
+    # Patch is done in post-configure so that ${configure.cc} is available.
+    reinplace -E \
+        "s|^CC = .*$|CC = ${configure.cc}|g" \
+        ${worksrcpath}/Makefile.osx
+    reinplace -E \
+        "s|^LIBTOOLDYN = .*$|LIBTOOLDYN = ${configure.cc}|g" \
+        ${worksrcpath}/Makefile.osx
+}
+
+set verDir       [join [split ${version} {.}] {_}]
+distname         ${name}_v${verDir}
+worksrcdir       OpenJPEG_v${verDir}
+
+build.args \
+    -f Makefile.osx \
+    PREFIX=${prefix}
+
+destroot.args    ${build.args}
+
+livecheck.url    http://www.openjpeg.org/index.php?menu=news
+livecheck.regex  "\[vV\]ersion (\\d+(\\.\\d+)+)"

Added: trunk/dports/graphics/openjpeg/files/patch-opj_malloc.h.diff
===================================================================
--- trunk/dports/graphics/openjpeg/files/patch-opj_malloc.h.diff	                        (rev 0)
+++ trunk/dports/graphics/openjpeg/files/patch-opj_malloc.h.diff	2008-08-08 07:28:00 UTC (rev 39095)
@@ -0,0 +1,27 @@
+--- libopenjpeg/opj_malloc.h.orig	2008-05-21 22:44:36.000000000 -0600
++++ libopenjpeg/opj_malloc.h	2008-05-21 22:44:43.000000000 -0600
+@@ -74,19 +74,14 @@
+ 	#endif
+ #else /* Not WIN32 */
+ 	#if defined(__sun)
+-			#define HAVE_MEMALIGN
+-		#elif defined(__GNUC__)
+-			#define HAVE_MEMALIGN
+-			#include <malloc.h>		
+-		/* Linux x86_64 and OSX always align allocations to 16 bytes */
+-		#elif !defined(__amd64__) && !defined(__APPLE__)	
+-			/* FIXME: Yes, this is a big assumption */
+-			#define HAVE_POSIX_MEMALIGN
++		#define HAVE_MEMALIGN
++	/* Linux x86_64 and OSX always align allocations to 16 bytes */
++	#elif !defined(__amd64__) && !defined(__APPLE__)	
++		#define HAVE_MEMALIGN
++		#include <malloc.h>			
+ 	#endif
+ #endif
+ 
+-
+-
+ #define opj_aligned_malloc(size) malloc(size)
+ #define opj_aligned_free(m) free(m)
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080808/683b6b7e/attachment.html