This updates OpenJPEG to 1.5.0, needed for forthcoming MuPDF update.
Tested all dependent ports on amd64.
I considered removing the -1.5 from the include dir, but came to
the conclusion this would be pointless.
OK?
todd, are you still interested in maintaining this?
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/openjpeg/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 14 Jul 2009 15:35:24 -0000 1.5
+++ Makefile 29 Mar 2012 15:33:57 -0000
@@ -2,10 +2,9 @@
COMMENT= open-source JPEG 2000 codec library
-DISTNAME= openjpeg_v1_3
-PKGNAME= openjpeg-1.3
+DISTNAME= openjpeg-1.5.0
-SHARED_LIBS= openjpeg 4.0
+SHARED_LIBS += openjpeg 5.0 # 6.0
CATEGORIES= graphics
@@ -19,15 +18,20 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${HOMEPAGE}
+WANTLIB += c m z
-MAKE_ENV= LIBopenjpeg_VERSION=${LIBopenjpeg_VERSION}
-MAKE_FLAGS= CC="${CC}" COMPILERFLAGS="${CFLAGS}"
-WRKDIST= ${WRKDIR}/${DISTNAME:S/openjpeg/OpenJPEG/}
+MASTER_SITES= http://openjpeg.googlecode.com/files/
-NO_REGRESS= Yes
+CONFIGURE_STYLE= gnu
+SEPARATE_BUILD= Yes
+USE_LIBTOOL= Yes
-pre-patch:
- cd ${WRKSRC}/libopenjpeg; perl -i -pe 's/\r$$//' `find . -type f`
+# static linked
+BUILD_DEPENDS= graphics/lcms2 \
+ graphics/png \
+ graphics/tiff
+
+post-install:
+ cd ${PREFIX}/share/doc/ && mv openjpeg-* openjpeg
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/openjpeg/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 14 Jul 2009 15:35:24 -0000 1.5
+++ distinfo 29 Mar 2012 15:33:57 -0000
@@ -1,5 +1,5 @@
-MD5 (openjpeg_v1_3.tar.gz) = +aPM+pGsNLWJ6b91d86P+Q==
-RMD160 (openjpeg_v1_3.tar.gz) = KiLMEjBYsZdM0b84mARKyrzromw=
-SHA1 (openjpeg_v1_3.tar.gz) = jWhw2VAOoJ4LHTC5gb6hyN5TTeQ=
-SHA256 (openjpeg_v1_3.tar.gz) = O8ouHgQPncu8seBifxenbuuV4VO/Zj0IIHDARKISAr0=
-SIZE (openjpeg_v1_3.tar.gz) = 1004678
+MD5 (openjpeg-1.5.0.tar.gz) = 5dZhk936Wah9oesI6oYpOw==
+RMD160 (openjpeg-1.5.0.tar.gz) = /6hduwo7oVRbxpdPSVD0ZnicBO8=
+SHA1 (openjpeg-1.5.0.tar.gz) = 3OcFrkXxN+RpiozznR+/IrxDT6g=
+SHA256 (openjpeg-1.5.0.tar.gz) = yZCPq0RDKi7SVQxFfLfnNtptfDJvEgPSPRCC2ZI2Ss4=
+SIZE (openjpeg-1.5.0.tar.gz) = 2117572
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 14 Jul 2009 15:35:24 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,66 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.4 2009/07/14 15:35:24 sthen Exp $
---- Makefile.orig Fri Dec 21 10:39:41 2007
-+++ Makefile Tue Jul 14 13:51:57 2009
-@@ -11,7 +11,7 @@ INCLUDE = -Ilibopenjpeg
- CC = gcc
- AR = ar
-
--PREFIX = /usr
-+PREFIX ?= /usr
- INSTALL_LIBDIR = $(PREFIX)/lib
- INSTALL_INCLUDE = $(PREFIX)/include
-
-@@ -19,14 +19,15 @@ INSTALL_INCLUDE = $(PREFIX)/include
- DOS2UNIX = dos2unix
-
- COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
--LIBRARIES = -lstdc++
-+LIBRARIES =
-
- MODULES = $(SRCS:.c=.o)
-+SOMODULES = $(SRCS:.c=.so)
- CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
-
- TARGET = openjpeg
- STATICLIB = lib$(TARGET).a
--SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
-+SHAREDLIB = lib$(TARGET).so.$(LIBopenjpeg_VERSION)
- LIBNAME = lib$(TARGET).so.$(VER_MAJOR)
-
-
-@@ -47,23 +48,26 @@ dos2unix:
-
- OpenJPEG: $(STATICLIB) $(SHAREDLIB)
-
-+.SUFFIXES: .c .o .so
-+
- .c.o:
- $(CC) $(CFLAGS) -c $< -o $@
-
-+.c.so:
-+ $(CC) $(CFLAGS) -fPIC -c $< -o $@
-+
- $(STATICLIB): $(MODULES)
- $(AR) r $@ $(MODULES)
-
--$(SHAREDLIB): $(MODULES)
-- $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-+$(SHAREDLIB): $(SOMODULES)
-+ $(CC) -shared -fPIC -o $@ $(SOMODULES) $(LIBRARIES)
-
- install: OpenJPEG
-- install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
-- install -m 644 -o root -g root $(STATICLIB)
'$(DESTDIR)$(INSTALL_LIBDIR)'
-- ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)'
-- install -m 755 -o root -g root $(SHAREDLIB)
'$(DESTDIR)$(INSTALL_LIBDIR)'
-- ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)'
-- install -m 644 -o root -g root libopenjpeg/openjpeg.h
'$(DESTDIR)$(INSTALL_INCLUDE)'
-- -ldconfig
-+ ${BSD_INSTALL_DATA_DIR} '$(INSTALL_LIBDIR)' '$(INSTALL_INCLUDE)'
-+ ${BSD_INSTALL_DATA} $(STATICLIB) '$(INSTALL_LIBDIR)'
-+ ranlib '$(INSTALL_LIBDIR)/$(STATICLIB)'
-+ ${BSD_INSTALL_DATA} $(SHAREDLIB) '$(INSTALL_LIBDIR)'
-+ ${BSD_INSTALL_DATA} libopenjpeg/openjpeg.h '$(INSTALL_INCLUDE)'
-
- clean:
- rm -rf core dist/ u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB)
$(LIBNAME)
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 29 Mar 2012 15:33:57 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.orig Thu Mar 29 15:00:02 2012
++++ configure Thu Mar 29 15:00:05 2012
+@@ -15734,7 +15734,7 @@ else
+
+
+ CFLAGS_save="${CFLAGS}"
+-CFLAGS="${CFLAGS} -O3"
++CFLAGS="${CFLAGS}"
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
Index: patches/patch-libopenjpeg_opj_malloc_h
===================================================================
RCS file: patches/patch-libopenjpeg_opj_malloc_h
diff -N patches/patch-libopenjpeg_opj_malloc_h
--- patches/patch-libopenjpeg_opj_malloc_h 14 Jul 2009 15:35:24 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-libopenjpeg_opj_malloc_h,v 1.1 2009/07/14 15:35:24 sthen Exp $
---- libopenjpeg/opj_malloc.h.orig Tue Jul 14 13:59:21 2009
-+++ libopenjpeg/opj_malloc.h Tue Jul 14 16:16:08 2009
-@@ -75,11 +75,11 @@ Allocate memory aligned to a 16 byte boundry
- #else /* Not WIN32 */
- #if defined(__sun)
- #define HAVE_MEMALIGN
-- #elif defined(__GNUC__)
-+ #elif defined(__GNUC__) && !defined(__OpenBSD__)
- #define HAVE_MEMALIGN
- #include <malloc.h>
- /* Linux x86_64 and OSX always align allocations to 16 bytes */
-- #elif !defined(__amd64__) && !defined(__APPLE__)
-+ #elif !defined(__amd64__) && !defined(__APPLE__) &&
!defined(__OpenBSD__)
- /* FIXME: Yes, this is a big assumption */
- #define HAVE_POSIX_MEMALIGN
- #endif
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/openjpeg/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 8 Feb 2007 00:29:22 -0000 1.1.1.1
+++ pkg/PLIST 29 Mar 2012 15:33:57 -0000
@@ -1,4 +1,23 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/02/08 00:29:22 todd Exp $
%%SHARED%%
+@bin bin/image_to_j2k
+@bin bin/j2k_dump
+@bin bin/j2k_to_image
+include/openjpeg-1.5/
+include/openjpeg-1.5/openjpeg.h
include/openjpeg.h
lib/libopenjpeg.a
+lib/libopenjpeg.la
+lib/pkgconfig/
+lib/pkgconfig/libopenjpeg.pc
+lib/pkgconfig/libopenjpeg1.pc
+@man man/man1/image_to_j2k.1
+@man man/man1/j2k_dump.1
+@man man/man1/j2k_to_image.1
+@man man/man1/jpwl_image_to_j2k.1
+@man man/man1/jpwl_j2k_to_image.1
+@man man/man3/jpwl_libopenjpeg.3
+@man man/man3/libopenjpeg.3
+share/doc/openjpeg/
+share/doc/openjpeg/CHANGES
+share/doc/openjpeg/LICENSE
