Attachment #123405 for bug #166744




#

PORTNAME=	openjpeg
PORTVERSION=	1.5.0
PORTREVISION=	2
CATEGORIES=	graphics
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
		http://openjpeg.googlecode.com/files/
DISTNAME=	${PORTNAME}_v${PORTVERSION:S/./_/g}

MAINTAINER=	lichray@gmail.com
COMMENT=	An open-source JPEG 2000 codec

LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff

LICENSE=	BSD
LICENSE_FILE=	${WRKSRC}/LICENSE

LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
		tiff.4:${PORTSDIR}/graphics/tiff

MAN1=		image_to_j2k.1 j2k_dump.1 j2k_to_image.1
MAN3=		libopenjpeg.3

USE_CMAKE=	yes
USE_LDCONFIG=	yes
CMAKE_ARGS=	-DBUILD_MJ2=ON

.include <bsd.port.pre.mk>

.if exists(${LOCALBASE}/include/lcms.h) && !exists(${LOCALBASE}/include/lcms2.h)
LIB_DEPENDS+=	lcms:${PORTSDIR}/graphics/lcms
.else
LIB_DEPENDS+=	lcms2:${PORTSDIR}/graphics/lcms2
.endif
		${M2J_BINS:S|^|bin/|}

SHLIB_VER=	2

post-patch:	.SILENT
		${FIND} ${WRKSRC} -type f -name Makefile -exec ${REINPLACE_CMD} 's|gcc|$$(CC)|g' {} +

do-install:
		${INSTALL_DATA} ${WRKSRC}/libopenjpeg/openjpeg.h ${PREFIX}/include/
		${INSTALL_DATA} ${WRKSRC}/libopenjpeg.a ${PREFIX}/lib/
		${INSTALL_DATA} ${WRKSRC}/libopenjpeg-2.1.3.0.so \
			${PREFIX}/lib/libopenjpeg.so.${SHLIB_VER}
		cd ${PREFIX}/lib && \
			${LN} -sf libopenjpeg.so.${SHLIB_VER} libopenjpeg.so
.for file in ${M2J_BINS:S|^|mj2/|} ${JPWL_BINS:S|^|jpwl/|}
		${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin/
.endfor

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (openjpeg_v1_3.tar.gz) = 3bca2e1e040f9dcbbcb1e0627f17a76eeb95e153bf663d082070c044a21202bd	1	SHA256 (openjpeg-1.5.0.tar.gz) = c9908fab44432a2ed2550c457cb7e736da6d7c326f1203d23d1082d992364ace
2	SIZE (openjpeg_v1_3.tar.gz) = 1004678	2	SIZE (openjpeg-1.5.0.tar.gz) = 2117572




--- CMakeLists.txt.orig	2012-02-07 04:49:55.000000000 -0600
+++ CMakeLists.txt	2012-04-09 05:18:24.580027970 -0500
@@ -99,7 +99,7 @@ IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
 ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
 
 IF(NOT OPENJPEG_INSTALL_MAN_DIR)
-  SET(OPENJPEG_INSTALL_MAN_DIR "share/man/")
+  SET(OPENJPEG_INSTALL_MAN_DIR "man/")
 ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR)
 
 IF(NOT OPENJPEG_INSTALL_DOC_DIR)
@@ -146,10 +146,7 @@ IF(UNIX)
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake
     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
   INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION
-    ${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig )
-  INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
-  \"libopenjpeg1.pc\"
-  \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")
+    libdata/pkgconfig )
 ENDIF(UNIX)
 
 #-----------------------------------------------------------------------------
@@ -244,6 +241,7 @@ ENDIF(BUILD_TESTING)
 #-----------------------------------------------------------------------------
 # install all targets referenced as OPENJPEGTargets
 INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
+SET(OPENJPEG_LIBRARIES "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}/lib${OPENJPEG_LIBRARY_NAME}.so")
 CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
   ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
   @ONLY
@@ -252,11 +250,4 @@ INSTALL( FILES ${OPENJPEG_BINARY_DIR}/Op
   DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
 )
 
-#-----------------------------------------------------------------------------
-# install CHANGES and LICENSE
-INSTALL(
-  FILES       CHANGES 
-              LICENSE
-  DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
-
 INCLUDE (CMake/OpenJPEGCPack.cmake)

Line 0 Link Here

(-)./files/patch-CMake_OpenJPEGConfig.cmake.in (+11 lines)
	1	--- CMake/OpenJPEGConfig.cmake.in~ 2012-02-07 04:49:55.000000000 -0600
	2	+++ CMake/OpenJPEGConfig.cmake.in 2012-04-09 05:05:46.024519656 -0500
	3	@@ -17,7 +17,7 @@ SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRAR
	4	SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_CMAKE_DIR_CONFIG@")
	5
	6	# The configuration options.
	7	-SET(OPENJPEG_BUILD_SHARED_LIBS "@OPENJPEG_BUILD_SHARED_LIBS@")
	8	+SET(OPENJPEG_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
	9
	10	# The "use" file.
	11	SET(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@")




--- Makefile.orig	2007-12-21 11:39:41.000000000 +0100
+++ Makefile	2009-03-21 11:51:26.000000000 +0100
@@ -8,17 +8,16 @@
 INCLUDE = -Ilibopenjpeg
 
 # General configuration variables:
-CC = gcc
-AR = ar
 
-PREFIX = /usr
 INSTALL_LIBDIR = $(PREFIX)/lib
 INSTALL_INCLUDE = $(PREFIX)/include
 
+SUBDIRS=	jpwl mj2
+
 # Converts cr/lf to just lf
 DOS2UNIX = dos2unix
 
-COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
+COMPILERFLAGS := $(CFLAGS) -Wall -std=c99 -fPIC
 LIBRARIES = -lstdc++
 
 MODULES = $(SRCS:.c=.o)
@@ -33,7 +32,13 @@
 
 default: all
 
-all: OpenJPEG
+all: OpenJPEG subdirs
+
+subdirs:
+	set -e; \
+	for dir in $(SUBDIRS); do \
+		$(MAKE) -C $$dir; \
+	done
 
 dist: OpenJPEG
 	install -d dist




--- jpwl/Makefile.orig	2007-11-05 14:05:07.000000000 +0100
+++ jpwl/Makefile	2009-03-21 11:54:55.000000000 +0100
@@ -9,10 +9,7 @@
 INCLUDE = -Ilibopenjpeg_JPWL
 
 # General configuration variables:
-CC = gcc
-AR = ar
 
-PREFIX = /usr
 INSTALL_LIBDIR = $(PREFIX)/lib
 INSTALL_INCLUDE = $(PREFIX)/include
 
@@ -23,7 +20,7 @@
 LIBRARIES = -lstdc++
 
 MODULES = $(SRCS:.c=.o)
-CFLAGS = $(COMPILERFLAGS) $(INCLUDE) -DUSE_JPWL
+CFLAGS += $(COMPILERFLAGS) $(INCLUDE) -DUSE_JPWL
 
 TARGET  = openjpeg_JPWL
 STATICLIB = lib$(TARGET).a
@@ -60,10 +57,10 @@
 	$(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
 
 JPWL_j2k_to_image: ../codec/j2k_to_image.c
-	gcc $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -ltiff
+	gcc $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c ../codec/index.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -L . -L$(LOCALBASE)/lib -lopenjpeg_JPWL -lm -ltiff
 
 JPWL_image_to_j2k: ../codec/image_to_j2k.c
-	gcc $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -ltiff
+	gcc $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c ../codec/index.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -L . -L$(LOCALBASE)/lib -lopenjpeg_JPWL -lm -ltiff
 
 install: OpenJPEG
 	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'




--- jpwl/jpwl.c.orig	2007-11-29 15:38:26.000000000 +0100
+++ jpwl/jpwl.c	2009-03-21 12:36:53.000000000 +0100
@@ -122,19 +122,19 @@
 		switch (jwmarker[mm].id) {
 
 		case J2K_MS_EPB:
-			free(jwmarker[mm].epbmark);
+			opj_aligned_free(jwmarker[mm].u.epbmark);
 			break;
 
 		case J2K_MS_EPC:
-			free(jwmarker[mm].epcmark);
+			opj_aligned_free(jwmarker[mm].u.epcmark);
 			break;
 
 		case J2K_MS_ESD:
-			free(jwmarker[mm].esdmark);
+			opj_aligned_free(jwmarker[mm].u.esdmark);
 			break;
 
 		case J2K_MS_RED:
-			free(jwmarker[mm].redmark);
+			opj_aligned_free(jwmarker[mm].u.redmark);
 			break;
 
 		default:
@@ -213,7 +213,7 @@
 		/* Add this marker to the 'insertanda' list */
 		if (epc_mark) {
 			jwmarker[jwmarker_num].id = J2K_MS_EPC; /* its type */
-			jwmarker[jwmarker_num].epcmark = epc_mark; /* the EPC */
+			jwmarker[jwmarker_num].u.epcmark = epc_mark; /* the EPC */
 			jwmarker[jwmarker_num].pos = soc_pos + socsiz_len; /* after SIZ */
 			jwmarker[jwmarker_num].dpos = (double) jwmarker[jwmarker_num].pos + 0.1; /* not so first */
 			jwmarker[jwmarker_num].len = epc_mark->Lepc; /* its length */
@@ -258,7 +258,7 @@
 			/* Add this marker to the 'insertanda' list */
 			if (jwmarker_num < JPWL_MAX_NO_MARKERS) {
 				jwmarker[jwmarker_num].id = J2K_MS_ESD; /* its type */
-				jwmarker[jwmarker_num].esdmark = esd_mark; /* the EPB */
+				jwmarker[jwmarker_num].u.esdmark = esd_mark; /* the EPB */
 				jwmarker[jwmarker_num].pos = soc_pos + socsiz_len; /* we choose to place it after SIZ */
 				jwmarker[jwmarker_num].dpos = (double) jwmarker[jwmarker_num].pos + 0.2; /* not first at all! */
 				jwmarker[jwmarker_num].len = esd_mark->Lesd; /* its length */
@@ -352,7 +352,7 @@
 					/* Add this marker to the 'insertanda' list */
 					if (jwmarker_num < JPWL_MAX_NO_MARKERS) {
 						jwmarker[jwmarker_num].id = J2K_MS_ESD; /* its type */
-						jwmarker[jwmarker_num].esdmark = esd_mark; /* the EPB */
+						jwmarker[jwmarker_num].u.esdmark = esd_mark; /* the EPB */
 						/****** jwmarker[jwmarker_num].pos = j2k->cstr_info->tile[tileno].start_pos + sot_len + 2; */ /* after SOT */
 						jwmarker[jwmarker_num].pos = j2k->cstr_info->tile[tileno].tp[tpno].tp_start_pos + sot_len + 2; /* after SOT */
 						jwmarker[jwmarker_num].dpos = (double) jwmarker[jwmarker_num].pos + 0.2; /* not first at all! */
@@ -430,7 +430,7 @@
 			/* Add this marker to the 'insertanda' list */
 			if (jwmarker_num < JPWL_MAX_NO_MARKERS) {
 				jwmarker[jwmarker_num].id = J2K_MS_EPB; /* its type */
-				jwmarker[jwmarker_num].epbmark = epb_mark; /* the EPB */
+				jwmarker[jwmarker_num].u.epbmark = epb_mark; /* the EPB */
 				jwmarker[jwmarker_num].pos = soc_pos + socsiz_len; /* after SIZ */
 				jwmarker[jwmarker_num].dpos = (double) jwmarker[jwmarker_num].pos; /* first first first! */
 				jwmarker[jwmarker_num].len = epb_mark->Lepb; /* its length */
@@ -528,7 +528,7 @@
 					/* Add this marker to the 'insertanda' list */
 					if (jwmarker_num < JPWL_MAX_NO_MARKERS) {
 						jwmarker[jwmarker_num].id = J2K_MS_EPB; /* its type */
-						jwmarker[jwmarker_num].epbmark = epb_mark; /* the EPB */
+						jwmarker[jwmarker_num].u.epbmark = epb_mark; /* the EPB */
 						/****** jwmarker[jwmarker_num].pos = j2k->cstr_info->tile[tileno].start_pos + sot_len + 2; */ /* after SOT */
 						jwmarker[jwmarker_num].pos = j2k->cstr_info->tile[tileno].tp[tpno].tp_start_pos + sot_len + 2; /* after SOT */
 						jwmarker[jwmarker_num].dpos = (double) jwmarker[jwmarker_num].pos; /* first first first! */
@@ -758,15 +758,15 @@
 		switch (jwmarker[mm].id) {
 
 		case J2K_MS_EPB:
-			jpwl_epb_write(j2k, jwmarker[mm].epbmark, jpwl_buf);
+			jpwl_epb_write(j2k, jwmarker[mm].u.epbmark, jpwl_buf);
 			break;
 
 		case J2K_MS_EPC:
-			jpwl_epc_write(j2k, jwmarker[mm].epcmark, jpwl_buf);
+			jpwl_epc_write(j2k, jwmarker[mm].u.epcmark, jpwl_buf);
 			break;
 
 		case J2K_MS_ESD:
-			jpwl_esd_write(j2k, jwmarker[mm].esdmark, jpwl_buf);
+			jpwl_esd_write(j2k, jwmarker[mm].u.esdmark, jpwl_buf);
 			break;
 
 		case J2K_MS_RED:
@@ -812,11 +812,11 @@
 			unsigned short int mycrc = 0x0000;
 
 			/* fix and fill the DL field */
-			jwmarker[mm].epcmark->DL = new_size;
-			orig_buf[epc_pos + 6] = (unsigned char) (jwmarker[mm].epcmark->DL >> 24);
-			orig_buf[epc_pos + 7] = (unsigned char) (jwmarker[mm].epcmark->DL >> 16);
-			orig_buf[epc_pos + 8] = (unsigned char) (jwmarker[mm].epcmark->DL >> 8);
-			orig_buf[epc_pos + 9] = (unsigned char) (jwmarker[mm].epcmark->DL >> 0);
+			jwmarker[mm].u.epcmark->DL = new_size;
+			orig_buf[epc_pos + 6] = (unsigned char) (jwmarker[mm].u.epcmark->DL >> 24);
+			orig_buf[epc_pos + 7] = (unsigned char) (jwmarker[mm].u.epcmark->DL >> 16);
+			orig_buf[epc_pos + 8] = (unsigned char) (jwmarker[mm].u.epcmark->DL >> 8);
+			orig_buf[epc_pos + 9] = (unsigned char) (jwmarker[mm].u.epcmark->DL >> 0);
 
 			/* compute the CRC field (excluding itself) */
 			for (pp = 0; pp < 4; pp++)
@@ -825,9 +825,9 @@
 				jpwl_updateCRC16(&mycrc, orig_buf[epc_pos + pp]);
 
 			/* fix and fill the CRC */
-			jwmarker[mm].epcmark->Pcrc = mycrc;
-			orig_buf[epc_pos + 4] = (unsigned char) (jwmarker[mm].epcmark->Pcrc >> 8);
-			orig_buf[epc_pos + 5] = (unsigned char) (jwmarker[mm].epcmark->Pcrc >> 0);
+			jwmarker[mm].u.epcmark->Pcrc = mycrc;
+			orig_buf[epc_pos + 4] = (unsigned char) (jwmarker[mm].u.epcmark->Pcrc >> 8);
+			orig_buf[epc_pos + 5] = (unsigned char) (jwmarker[mm].u.epcmark->Pcrc >> 0);
 
 		}
 	}
@@ -842,7 +842,7 @@
 			/* remember that they are now in a new position (dpos) */
 			int esd_pos = (int) jwmarker[mm].dpos;
 
-			jpwl_esd_fill(j2k, jwmarker[mm].esdmark, &orig_buf[esd_pos]);
+			jpwl_esd_fill(j2k, jwmarker[mm].u.esdmark, &orig_buf[esd_pos]);
 		
 		}
 
@@ -867,16 +867,16 @@
 			accum_len = 0;
 			for (nn = mm; (nn < jwmarker_num) && (jwmarker[nn].id == J2K_MS_EPB) &&
 				(jwmarker[nn].pos == jwmarker[mm].pos); nn++)
-				accum_len += jwmarker[nn].epbmark->Lepb + 2;
+				accum_len += jwmarker[nn].u.epbmark->Lepb + 2;
 
 			/* fill the current (first) EPB with post-data starting from the computed position */
-			jpwl_epb_fill(j2k, jwmarker[mm].epbmark, &orig_buf[(int) jwmarker[mm].dpos],
+			jpwl_epb_fill(j2k, jwmarker[mm].u.epbmark, &orig_buf[(int) jwmarker[mm].dpos],
 				&orig_buf[(int) jwmarker[mm].dpos + accum_len]);
 		
 			/* fill the remaining EPBs in the header with post-data starting from the last position */
 			for (nn = mm + 1; (nn < jwmarker_num) && (jwmarker[nn].id == J2K_MS_EPB) &&
 				(jwmarker[nn].pos == jwmarker[mm].pos); nn++)
-				jpwl_epb_fill(j2k, jwmarker[nn].epbmark, &orig_buf[(int) jwmarker[nn].dpos], NULL);
+				jpwl_epb_fill(j2k, jwmarker[nn].u.epbmark, &orig_buf[(int) jwmarker[nn].dpos], NULL);
 
 			/* skip all the processed EPBs */
 			mm = nn - 1;

Lines 1-11 Link Here

(-)./files/patch-jpwl.h (-11 lines)
1	--- jpwl/jpwl.h.orig 2007-11-05 14:05:07.000000000 +0100
2	+++ jpwl/jpwl.h 2009-03-21 12:21:21.000000000 +0100
3	@@ -188,7 +188,7 @@
4	jpwl_esd_ms_t *esdmark;
5	/** pointer to RED marker */
6	jpwl_red_ms_t *redmark;
7	- };
8	+ } u;
9	/** position where the marker should go, in the pre-JPWL codestream */
10	unsigned long int pos;
11	/** same as before, only written as a double, so we can sort it better */




--- jpwl/jpwl_lib.c.orig	2007-11-29 15:38:26.000000000 +0100
+++ jpwl/jpwl_lib.c	2009-03-21 12:39:09.000000000 +0100
@@ -166,7 +166,7 @@
 			/* Add this marker to the 'insertanda' list */
 			if (*jwmarker_num < JPWL_MAX_NO_MARKERS) {
 				jwmarker[*jwmarker_num].id = J2K_MS_EPB; /* its type */
-				jwmarker[*jwmarker_num].epbmark = epb_mark; /* the EPB */
+				jwmarker[*jwmarker_num].u.epbmark = epb_mark; /* the EPB */
 				jwmarker[*jwmarker_num].pos = (int) place_pos; /* after SOT */
 				jwmarker[*jwmarker_num].dpos = place_pos + 0.0000001 * (double)(*idx); /* not very first! */
 				jwmarker[*jwmarker_num].len = epb_mark->Lepb; /* its length */
@@ -335,7 +335,7 @@
 	jpwl_epc_ms_t *epc = NULL;
 
 	/* Alloc space */
-	if (!(epc = (jpwl_epc_ms_t *) malloc((size_t) 1 * sizeof (jpwl_epc_ms_t)))) {
+	if (!(epc = (jpwl_epc_ms_t *) opj_aligned_malloc((size_t) 1 * sizeof (jpwl_epc_ms_t)))) {
 		opj_event_msg(j2k->cinfo, EVT_ERROR, "Could not allocate room for EPC MS\n");
 		return NULL;
 	};
@@ -1196,7 +1196,7 @@
 	jpwl_esd_ms_t *esd = NULL;
 
 	/* Alloc space */
-	if (!(esd = (jpwl_esd_ms_t *) malloc((size_t) 1 * sizeof (jpwl_esd_ms_t)))) {
+	if (!(esd = (jpwl_esd_ms_t *) opj_aligned_malloc((size_t) 1 * sizeof (jpwl_esd_ms_t)))) {
 		opj_event_msg(j2k->cinfo, EVT_ERROR, "Could not allocate room for ESD MS\n");
 		return NULL;
 	};




--- libopenjpeg1.pc.cmake~	2012-02-07 04:49:55.000000000 -0600
+++ libopenjpeg1.pc.cmake	2012-04-07 17:13:24.589503254 -0500
@@ -1,8 +1,8 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-bindir=@OPENJPEG_INSTALL_BIN_DIR@
-datadir=@OPENJPEG_INSTALL_DATA_DIR@
-libdir=@OPENJPEG_INSTALL_LIB_DIR@
-includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@
+bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+datadir=${prefix}/@OPENJPEG_INSTALL_DATA_DIR@
+libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
 
 Name: openjpeg
 Description: JPEG2000 files library

Line 0 Link Here

(-)./files/patch-libopenjpeg_CMakeLists.txt (+11 lines)
	1	--- libopenjpeg/CMakeLists.txt~ 2012-02-07 04:49:55.000000000 -0600
	2	+++ libopenjpeg/CMakeLists.txt 2012-04-07 16:28:11.038275932 -0500
	3	@@ -55,7 +55,7 @@ INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
	4
	5	# Install includes files
	6	INSTALL(FILES openjpeg.h
	7	- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
	8	+ DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
	9	)
	10
	11	# install man page of the library




--- mj2/Makefile.orig	2007-07-18 07:14:14.000000000 -0400
+++ mj2/Makefile	2007-07-18 07:14:43.000000000 -0400
@@ -1,20 +1,20 @@
 # Makefile for the MJ2 codecs of the OpenJPEG library: frames_to_mj2, mj2_to_frames, extract_j2k_from_mj2 and wrap_j2k_in_mj2
 
-CFLAGS = -O3 -lstdc++ # -g -p -pg
+CFLAGS += -lstdc++ # -g -p -pg
 
 all: frames_to_mj2 mj2_to_frames extract_j2k_from_mj2 wrap_j2k_in_mj2
 
 frames_to_mj2: frames_to_mj2.c ../libopenjpeg.a
-	gcc $(CFLAGS) compat/getopt.c mj2_convert.c mj2.c frames_to_mj2.c -o frames_to_mj2 -L.. -lopenjpeg -I ../libopenjpeg/ -lm
+	$(CC) $(CFLAGS) compat/getopt.c mj2_convert.c mj2.c frames_to_mj2.c -o frames_to_mj2 -L.. -lopenjpeg -I ../libopenjpeg/ -lm
 
 mj2_to_frames: mj2_to_frames.c ../libopenjpeg.a
-	gcc $(CFLAGS) compat/getopt.c mj2_convert.c mj2.c mj2_to_frames.c -o mj2_to_frames -L.. -lopenjpeg -I ../libopenjpeg/ -lm
+	$(CC) $(CFLAGS) compat/getopt.c mj2_convert.c mj2.c mj2_to_frames.c -o mj2_to_frames -L.. -lopenjpeg -I ../libopenjpeg/ -lm
 
 extract_j2k_from_mj2: extract_j2k_from_mj2.c ../libopenjpeg.a
-	gcc $(CFLAGS) mj2.c extract_j2k_from_mj2.c -o extract_j2k_from_mj2 -L.. -lopenjpeg -I ../libopenjpeg/ -lm
+	$(CC) $(CFLAGS) mj2.c extract_j2k_from_mj2.c -o extract_j2k_from_mj2 -L.. -lopenjpeg -I ../libopenjpeg/ -lm
 
 wrap_j2k_in_mj2: wrap_j2k_in_mj2.c ../libopenjpeg.a
-	gcc $(CFLAGS) mj2.c wrap_j2k_in_mj2.c -o wrap_j2k_in_mj2 -L.. -lopenjpeg -I ../libopenjpeg/ -lm
+	$(CC) $(CFLAGS) mj2.c wrap_j2k_in_mj2.c -o wrap_j2k_in_mj2 -L.. -lopenjpeg -I ../libopenjpeg/ -lm
 
 clean:
 	rm -f frames_to_mj2 mj2_to_frames extract_j2k_from_mj2 wrap_j2k_in_mj2




--- libopenjpeg/opj_malloc.h.orig	2007-12-21 11:19:01.000000000 +0100
+++ libopenjpeg/opj_malloc.h	2009-03-21 12:02:37.000000000 +0100
@@ -76,8 +76,15 @@
 	#if defined(__sun)
 			#define HAVE_MEMALIGN
 		#elif defined(__GNUC__)
+			#if defined(__FreeBSD__)
+			#include <stdlib.h>
+			#include <osreldate.h>
+			#if __FreeBSD_versioni >= 700000 
+			#endif
+			#else
 			#define HAVE_MEMALIGN
 			#include <malloc.h>		
+			#endif
 		/* Linux x86_64 and OSX always align allocations to 16 bytes */
 		#elif !defined(__amd64__) && !defined(__APPLE__)	
 			/* FIXME: Yes, this is a big assumption */




bin/extract_j2k_from_mj2
bin/frames_to_mj2
bin/image_to_j2k
bin/j2k_dump
bin/j2k_to_image
bin/mj2_to_frames
bin/wrap_j2k_in_mj2
include/openjpeg.h
lib/libopenjpeg.so
lib/libopenjpeg.so.1
lib/libopenjpeg.so.1.5.0
%%DATADIR%%-1.5/OpenJPEGConfig.cmake
%%DATADIR%%-1.5/OpenJPEGTargets-release.cmake
%%DATADIR%%-1.5/OpenJPEGTargets.cmake
libdata/pkgconfig/libopenjpeg1.pc
@dirrm %%DATADIR%%-1.5

Return to bug 166744

Lines 6-54 Link Here

(-)./Makefile (-38 / +21 lines)
6	#	6	#
7		7
8	PORTNAME= openjpeg	8	PORTNAME= openjpeg
9	PORTVERSION= 1.3	9	PORTVERSION= 1.5.0
10	PORTREVISION= 2
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= http://www.openjpeg.org/ \	11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
13	http://openjpeg.googlecode.com/files/
14	DISTNAME= ${PORTNAME}_v${PORTVERSION:S/./_/g}
15		12
16	MAINTAINER= dinoex@FreeBSD.org	13	MAINTAINER= lichray@gmail.com
17	COMMENT= An open-source JPEG 2000 codec	14	COMMENT= An open-source JPEG 2000 codec
18		15
19	LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
20
21	LICENSE= BSD	16	LICENSE= BSD
22	LICENSE_FILE= ${WRKSRC}/jp3d/LICENSE.txt	17	LICENSE_FILE= ${WRKSRC}/LICENSE
23	MAKE_JOBS_UNSAFE= yes	18
		19	LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
		20	tiff.4:${PORTSDIR}/graphics/tiff
		21
		22	MAN1= image_to_j2k.1 j2k_dump.1 j2k_to_image.1
		23	MAN3= libopenjpeg.3
24		24
25	USE_GMAKE= yes	25	USE_CMAKE= yes
26	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
27	WRKSRC= ${WRKDIR}/OpenJPEG_v1_3	27	CMAKE_ARGS= -DBUILD_MJ2=ON
28	JPWL_BINS= JPWL_image_to_j2k JPWL_j2k_to_image	28
29	M2J_BINS= extract_j2k_from_mj2 frames_to_mj2 mj2_to_frames wrap_j2k_in_mj2	29	.include <bsd.port.pre.mk>
30		30
31	PLIST_FILES= include/openjpeg.h \	31	.if exists(${LOCALBASE}/include/lcms.h) && !exists(${LOCALBASE}/include/lcms2.h)
32	lib/libopenjpeg.a \	32	LIB_DEPENDS+= lcms:${PORTSDIR}/graphics/lcms
33	lib/libopenjpeg.so.${SHLIB_VER} \	33	.else
34	lib/libopenjpeg.so \	34	LIB_DEPENDS+= lcms2:${PORTSDIR}/graphics/lcms2
35	${JPWL_BINS:S\|^\|bin/\|} \	35	.endif
36	${M2J_BINS:S\|^\|bin/\|}
37
38	SHLIB_VER= 2
39
40	post-patch: .SILENT
41	${FIND} ${WRKSRC} -type f -name Makefile -exec ${REINPLACE_CMD} 's\|gcc\|$$(CC)\|g' {} +
42
43	do-install:
44	${INSTALL_DATA} ${WRKSRC}/libopenjpeg/openjpeg.h ${PREFIX}/include/
45	${INSTALL_DATA} ${WRKSRC}/libopenjpeg.a ${PREFIX}/lib/
46	${INSTALL_DATA} ${WRKSRC}/libopenjpeg-2.1.3.0.so \
47	${PREFIX}/lib/libopenjpeg.so.${SHLIB_VER}
48	cd ${PREFIX}/lib && \
49	${LN} -sf libopenjpeg.so.${SHLIB_VER} libopenjpeg.so
50	.for file in ${M2J_BINS:S\|^\|mj2/\|} ${JPWL_BINS:S\|^\|jpwl/\|}
51	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin/
52	.endfor
53		36
54	.include <bsd.port.mk>	37	.include <bsd.port.post.mk>

Line 0 Link Here

(-)./files/patch-CMakeLists.txt (+43 lines)
	1	--- CMakeLists.txt.orig 2012-02-07 04:49:55.000000000 -0600
	2	+++ CMakeLists.txt 2012-04-09 05:18:24.580027970 -0500
	3	@@ -99,7 +99,7 @@ IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
	4	ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
	5
	6	IF(NOT OPENJPEG_INSTALL_MAN_DIR)
	7	- SET(OPENJPEG_INSTALL_MAN_DIR "share/man/")
	8	+ SET(OPENJPEG_INSTALL_MAN_DIR "man/")
	9	ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR)
	10
	11	IF(NOT OPENJPEG_INSTALL_DOC_DIR)
	12	@@ -146,10 +146,7 @@ IF(UNIX)
	13	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake
	14	${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
	15	INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION
	16	- ${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig )
	17	- INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
	18	- \"libopenjpeg1.pc\"
	19	- \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")
	20	+ libdata/pkgconfig )
	21	ENDIF(UNIX)
	22
	23	#-----------------------------------------------------------------------------
	24	@@ -244,6 +241,7 @@ ENDIF(BUILD_TESTING)
	25	#-----------------------------------------------------------------------------
	26	# install all targets referenced as OPENJPEGTargets
	27	INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
	28	+SET(OPENJPEG_LIBRARIES "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}/lib${OPENJPEG_LIBRARY_NAME}.so")
	29	CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
	30	${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
	31	@ONLY
	32	@@ -252,11 +250,4 @@ INSTALL( FILES ${OPENJPEG_BINARY_DIR}/Op
	33	DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
	34	)
	35
	36	-#-----------------------------------------------------------------------------
	37	-# install CHANGES and LICENSE
	38	-INSTALL(
	39	- FILES CHANGES
	40	- LICENSE
	41	- DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
	42	-
	43	INCLUDE (CMake/OpenJPEGCPack.cmake)

Lines 1-38 Link Here

(-)./files/patch-Makefile (-38 lines)
1	--- Makefile.orig 2007-12-21 11:39:41.000000000 +0100
2	+++ Makefile 2009-03-21 11:51:26.000000000 +0100
3	@@ -8,17 +8,16 @@
4	INCLUDE = -Ilibopenjpeg
5
6	# General configuration variables:
7	-CC = gcc
8	-AR = ar
9
10	-PREFIX = /usr
11	INSTALL_LIBDIR = $(PREFIX)/lib
12	INSTALL_INCLUDE = $(PREFIX)/include
13
14	+SUBDIRS= jpwl mj2
15	+
16	# Converts cr/lf to just lf
17	DOS2UNIX = dos2unix
18
19	-COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
20	+COMPILERFLAGS := $(CFLAGS) -Wall -std=c99 -fPIC
21	LIBRARIES = -lstdc++
22
23	MODULES = $(SRCS:.c=.o)
24	@@ -33,7 +32,13 @@
25
26	default: all
27
28	-all: OpenJPEG
29	+all: OpenJPEG subdirs
30	+
31	+subdirs:
32	+ set -e; \
33	+ for dir in $(SUBDIRS); do \
34	+ $(MAKE) -C $$dir; \
35	+ done
36
37	dist: OpenJPEG
38	install -d dist

Lines 1-35 Link Here

(-)./files/patch-jpwl-Makefile (-35 lines)
1	--- jpwl/Makefile.orig 2007-11-05 14:05:07.000000000 +0100
2	+++ jpwl/Makefile 2009-03-21 11:54:55.000000000 +0100
3	@@ -9,10 +9,7 @@
4	INCLUDE = -Ilibopenjpeg_JPWL
5
6	# General configuration variables:
7	-CC = gcc
8	-AR = ar
9
10	-PREFIX = /usr
11	INSTALL_LIBDIR = $(PREFIX)/lib
12	INSTALL_INCLUDE = $(PREFIX)/include
13
14	@@ -23,7 +20,7 @@
15	LIBRARIES = -lstdc++
16
17	MODULES = $(SRCS:.c=.o)
18	-CFLAGS = $(COMPILERFLAGS) $(INCLUDE) -DUSE_JPWL
19	+CFLAGS += $(COMPILERFLAGS) $(INCLUDE) -DUSE_JPWL
20
21	TARGET = openjpeg_JPWL
22	STATICLIB = lib$(TARGET).a
23	@@ -60,10 +57,10 @@
24	$(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
25
26	JPWL_j2k_to_image: ../codec/j2k_to_image.c
27	- gcc $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -ltiff
28	+ gcc $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c ../codec/index.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -L . -L$(LOCALBASE)/lib -lopenjpeg_JPWL -lm -ltiff
29
30	JPWL_image_to_j2k: ../codec/image_to_j2k.c
31	- gcc $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -ltiff
32	+ gcc $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c ../codec/index.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -L . -L$(LOCALBASE)/lib -lopenjpeg_JPWL -lm -ltiff
33
34	install: OpenJPEG
35	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'

Lines 1-149 Link Here

(-)./files/patch-jpwl.c (-149 lines)
1	--- jpwl/jpwl.c.orig 2007-11-29 15:38:26.000000000 +0100
2	+++ jpwl/jpwl.c 2009-03-21 12:36:53.000000000 +0100
3	@@ -122,19 +122,19 @@
4	switch (jwmarker[mm].id) {
5
6	case J2K_MS_EPB:
7	- free(jwmarker[mm].epbmark);
8	+ opj_aligned_free(jwmarker[mm].u.epbmark);
9	break;
10
11	case J2K_MS_EPC:
12	- free(jwmarker[mm].epcmark);
13	+ opj_aligned_free(jwmarker[mm].u.epcmark);
14	break;
15
16	case J2K_MS_ESD:
17	- free(jwmarker[mm].esdmark);
18	+ opj_aligned_free(jwmarker[mm].u.esdmark);
19	break;
20
21	case J2K_MS_RED:
22	- free(jwmarker[mm].redmark);
23	+ opj_aligned_free(jwmarker[mm].u.redmark);
24	break;
25
26	default:
27	@@ -213,7 +213,7 @@
28	/* Add this marker to the 'insertanda' list */
29	if (epc_mark) {
30	jwmarker[jwmarker_num].id = J2K_MS_EPC; /* its type */
31	- jwmarker[jwmarker_num].epcmark = epc_mark; /* the EPC */
32	+ jwmarker[jwmarker_num].u.epcmark = epc_mark; /* the EPC */
33	jwmarker[jwmarker_num].pos = soc_pos + socsiz_len; /* after SIZ */
34	jwmarker[jwmarker_num].dpos = (double) jwmarker[jwmarker_num].pos + 0.1; /* not so first */
35	jwmarker[jwmarker_num].len = epc_mark->Lepc; /* its length */
36	@@ -258,7 +258,7 @@
37	/* Add this marker to the 'insertanda' list */
38	if (jwmarker_num < JPWL_MAX_NO_MARKERS) {
39	jwmarker[jwmarker_num].id = J2K_MS_ESD; /* its type */
40	- jwmarker[jwmarker_num].esdmark = esd_mark; /* the EPB */
41	+ jwmarker[jwmarker_num].u.esdmark = esd_mark; /* the EPB */
42	jwmarker[jwmarker_num].pos = soc_pos + socsiz_len; /* we choose to place it after SIZ */
43	jwmarker[jwmarker_num].dpos = (double) jwmarker[jwmarker_num].pos + 0.2; /* not first at all! */
44	jwmarker[jwmarker_num].len = esd_mark->Lesd; /* its length */
45	@@ -352,7 +352,7 @@
46	/* Add this marker to the 'insertanda' list */
47	if (jwmarker_num < JPWL_MAX_NO_MARKERS) {
48	jwmarker[jwmarker_num].id = J2K_MS_ESD; /* its type */
49	- jwmarker[jwmarker_num].esdmark = esd_mark; /* the EPB */
50	+ jwmarker[jwmarker_num].u.esdmark = esd_mark; /* the EPB */
51	/****** jwmarker[jwmarker_num].pos = j2k->cstr_info->tile[tileno].start_pos + sot_len + 2; / / after SOT */
52	jwmarker[jwmarker_num].pos = j2k->cstr_info->tile[tileno].tp[tpno].tp_start_pos + sot_len + 2; /* after SOT */
53	jwmarker[jwmarker_num].dpos = (double) jwmarker[jwmarker_num].pos + 0.2; /* not first at all! */
54	@@ -430,7 +430,7 @@
55	/* Add this marker to the 'insertanda' list */
56	if (jwmarker_num < JPWL_MAX_NO_MARKERS) {
57	jwmarker[jwmarker_num].id = J2K_MS_EPB; /* its type */
58	- jwmarker[jwmarker_num].epbmark = epb_mark; /* the EPB */
59	+ jwmarker[jwmarker_num].u.epbmark = epb_mark; /* the EPB */
60	jwmarker[jwmarker_num].pos = soc_pos + socsiz_len; /* after SIZ */
61	jwmarker[jwmarker_num].dpos = (double) jwmarker[jwmarker_num].pos; /* first first first! */
62	jwmarker[jwmarker_num].len = epb_mark->Lepb; /* its length */
63	@@ -528,7 +528,7 @@
64	/* Add this marker to the 'insertanda' list */
65	if (jwmarker_num < JPWL_MAX_NO_MARKERS) {
66	jwmarker[jwmarker_num].id = J2K_MS_EPB; /* its type */
67	- jwmarker[jwmarker_num].epbmark = epb_mark; /* the EPB */
68	+ jwmarker[jwmarker_num].u.epbmark = epb_mark; /* the EPB */
69	/****** jwmarker[jwmarker_num].pos = j2k->cstr_info->tile[tileno].start_pos + sot_len + 2; / / after SOT */
70	jwmarker[jwmarker_num].pos = j2k->cstr_info->tile[tileno].tp[tpno].tp_start_pos + sot_len + 2; /* after SOT */
71	jwmarker[jwmarker_num].dpos = (double) jwmarker[jwmarker_num].pos; /* first first first! */
72	@@ -758,15 +758,15 @@
73	switch (jwmarker[mm].id) {
74
75	case J2K_MS_EPB:
76	- jpwl_epb_write(j2k, jwmarker[mm].epbmark, jpwl_buf);
77	+ jpwl_epb_write(j2k, jwmarker[mm].u.epbmark, jpwl_buf);
78	break;
79
80	case J2K_MS_EPC:
81	- jpwl_epc_write(j2k, jwmarker[mm].epcmark, jpwl_buf);
82	+ jpwl_epc_write(j2k, jwmarker[mm].u.epcmark, jpwl_buf);
83	break;
84
85	case J2K_MS_ESD:
86	- jpwl_esd_write(j2k, jwmarker[mm].esdmark, jpwl_buf);
87	+ jpwl_esd_write(j2k, jwmarker[mm].u.esdmark, jpwl_buf);
88	break;
89
90	case J2K_MS_RED:
91	@@ -812,11 +812,11 @@
92	unsigned short int mycrc = 0x0000;
93
94	/* fix and fill the DL field */
95	- jwmarker[mm].epcmark->DL = new_size;
96	- orig_buf[epc_pos + 6] = (unsigned char) (jwmarker[mm].epcmark->DL >> 24);
97	- orig_buf[epc_pos + 7] = (unsigned char) (jwmarker[mm].epcmark->DL >> 16);
98	- orig_buf[epc_pos + 8] = (unsigned char) (jwmarker[mm].epcmark->DL >> 8);
99	- orig_buf[epc_pos + 9] = (unsigned char) (jwmarker[mm].epcmark->DL >> 0);
100	+ jwmarker[mm].u.epcmark->DL = new_size;
101	+ orig_buf[epc_pos + 6] = (unsigned char) (jwmarker[mm].u.epcmark->DL >> 24);
102	+ orig_buf[epc_pos + 7] = (unsigned char) (jwmarker[mm].u.epcmark->DL >> 16);
103	+ orig_buf[epc_pos + 8] = (unsigned char) (jwmarker[mm].u.epcmark->DL >> 8);
104	+ orig_buf[epc_pos + 9] = (unsigned char) (jwmarker[mm].u.epcmark->DL >> 0);
105
106	/* compute the CRC field (excluding itself) */
107	for (pp = 0; pp < 4; pp++)
108	@@ -825,9 +825,9 @@
109	jpwl_updateCRC16(&mycrc, orig_buf[epc_pos + pp]);
110
111	/* fix and fill the CRC */
112	- jwmarker[mm].epcmark->Pcrc = mycrc;
113	- orig_buf[epc_pos + 4] = (unsigned char) (jwmarker[mm].epcmark->Pcrc >> 8);
114	- orig_buf[epc_pos + 5] = (unsigned char) (jwmarker[mm].epcmark->Pcrc >> 0);
115	+ jwmarker[mm].u.epcmark->Pcrc = mycrc;
116	+ orig_buf[epc_pos + 4] = (unsigned char) (jwmarker[mm].u.epcmark->Pcrc >> 8);
117	+ orig_buf[epc_pos + 5] = (unsigned char) (jwmarker[mm].u.epcmark->Pcrc >> 0);
118
119	}
120	}
121	@@ -842,7 +842,7 @@
122	/* remember that they are now in a new position (dpos) */
123	int esd_pos = (int) jwmarker[mm].dpos;
124
125	- jpwl_esd_fill(j2k, jwmarker[mm].esdmark, &orig_buf[esd_pos]);
126	+ jpwl_esd_fill(j2k, jwmarker[mm].u.esdmark, &orig_buf[esd_pos]);
127
128	}
129
130	@@ -867,16 +867,16 @@
131	accum_len = 0;
132	for (nn = mm; (nn < jwmarker_num) && (jwmarker[nn].id == J2K_MS_EPB) &&
133	(jwmarker[nn].pos == jwmarker[mm].pos); nn++)
134	- accum_len += jwmarker[nn].epbmark->Lepb + 2;
135	+ accum_len += jwmarker[nn].u.epbmark->Lepb + 2;
136
137	/* fill the current (first) EPB with post-data starting from the computed position */
138	- jpwl_epb_fill(j2k, jwmarker[mm].epbmark, &orig_buf[(int) jwmarker[mm].dpos],
139	+ jpwl_epb_fill(j2k, jwmarker[mm].u.epbmark, &orig_buf[(int) jwmarker[mm].dpos],
140	&orig_buf[(int) jwmarker[mm].dpos + accum_len]);
141
142	/* fill the remaining EPBs in the header with post-data starting from the last position */
143	for (nn = mm + 1; (nn < jwmarker_num) && (jwmarker[nn].id == J2K_MS_EPB) &&
144	(jwmarker[nn].pos == jwmarker[mm].pos); nn++)
145	- jpwl_epb_fill(j2k, jwmarker[nn].epbmark, &orig_buf[(int) jwmarker[nn].dpos], NULL);
146	+ jpwl_epb_fill(j2k, jwmarker[nn].u.epbmark, &orig_buf[(int) jwmarker[nn].dpos], NULL);
147
148	/* skip all the processed EPBs */
149	mm = nn - 1;

Lines 1-29 Link Here

(-)./files/patch-jpwl_lib.c (-29 lines)
1	--- jpwl/jpwl_lib.c.orig 2007-11-29 15:38:26.000000000 +0100
2	+++ jpwl/jpwl_lib.c 2009-03-21 12:39:09.000000000 +0100
3	@@ -166,7 +166,7 @@
4	/* Add this marker to the 'insertanda' list */
5	if (*jwmarker_num < JPWL_MAX_NO_MARKERS) {
6	jwmarker[jwmarker_num].id = J2K_MS_EPB; / its type */
7	- jwmarker[jwmarker_num].epbmark = epb_mark; / the EPB */
8	+ jwmarker[jwmarker_num].u.epbmark = epb_mark; / the EPB */
9	jwmarker[jwmarker_num].pos = (int) place_pos; / after SOT */
10	jwmarker[jwmarker_num].dpos = place_pos + 0.0000001 (double)(idx); / not very first! */
11	jwmarker[jwmarker_num].len = epb_mark->Lepb; / its length */
12	@@ -335,7 +335,7 @@
13	jpwl_epc_ms_t *epc = NULL;
14
15	/* Alloc space */
16	- if (!(epc = (jpwl_epc_ms_t ) malloc((size_t) 1 sizeof (jpwl_epc_ms_t)))) {
17	+ if (!(epc = (jpwl_epc_ms_t ) opj_aligned_malloc((size_t) 1 sizeof (jpwl_epc_ms_t)))) {
18	opj_event_msg(j2k->cinfo, EVT_ERROR, "Could not allocate room for EPC MS\n");
19	return NULL;
20	};
21	@@ -1196,7 +1196,7 @@
22	jpwl_esd_ms_t *esd = NULL;
23
24	/* Alloc space */
25	- if (!(esd = (jpwl_esd_ms_t ) malloc((size_t) 1 sizeof (jpwl_esd_ms_t)))) {
26	+ if (!(esd = (jpwl_esd_ms_t ) opj_aligned_malloc((size_t) 1 sizeof (jpwl_esd_ms_t)))) {
27	opj_event_msg(j2k->cinfo, EVT_ERROR, "Could not allocate room for ESD MS\n");
28	return NULL;
29	};

Line 0 Link Here

(-)./files/patch-libopenjpeg1.pc.cmake (+15 lines)
	1	--- libopenjpeg1.pc.cmake~ 2012-02-07 04:49:55.000000000 -0600
	2	+++ libopenjpeg1.pc.cmake 2012-04-07 17:13:24.589503254 -0500
	3	@@ -1,8 +1,8 @@
	4	prefix=@CMAKE_INSTALL_PREFIX@
	5	-bindir=@OPENJPEG_INSTALL_BIN_DIR@
	6	-datadir=@OPENJPEG_INSTALL_DATA_DIR@
	7	-libdir=@OPENJPEG_INSTALL_LIB_DIR@
	8	-includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@
	9	+bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
	10	+datadir=${prefix}/@OPENJPEG_INSTALL_DATA_DIR@
	11	+libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
	12	+includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
	13
	14	Name: openjpeg
	15	Description: JPEG2000 files library

Lines 1-28 Link Here

(-)./files/patch-mj2_Makefile (-28 lines)
1	--- mj2/Makefile.orig 2007-07-18 07:14:14.000000000 -0400
2	+++ mj2/Makefile 2007-07-18 07:14:43.000000000 -0400
3	@@ -1,20 +1,20 @@
4	# Makefile for the MJ2 codecs of the OpenJPEG library: frames_to_mj2, mj2_to_frames, extract_j2k_from_mj2 and wrap_j2k_in_mj2
5
6	-CFLAGS = -O3 -lstdc++ # -g -p -pg
7	+CFLAGS += -lstdc++ # -g -p -pg
8
9	all: frames_to_mj2 mj2_to_frames extract_j2k_from_mj2 wrap_j2k_in_mj2
10
11	frames_to_mj2: frames_to_mj2.c ../libopenjpeg.a
12	- gcc $(CFLAGS) compat/getopt.c mj2_convert.c mj2.c frames_to_mj2.c -o frames_to_mj2 -L.. -lopenjpeg -I ../libopenjpeg/ -lm
13	+ $(CC) $(CFLAGS) compat/getopt.c mj2_convert.c mj2.c frames_to_mj2.c -o frames_to_mj2 -L.. -lopenjpeg -I ../libopenjpeg/ -lm
14
15	mj2_to_frames: mj2_to_frames.c ../libopenjpeg.a
16	- gcc $(CFLAGS) compat/getopt.c mj2_convert.c mj2.c mj2_to_frames.c -o mj2_to_frames -L.. -lopenjpeg -I ../libopenjpeg/ -lm
17	+ $(CC) $(CFLAGS) compat/getopt.c mj2_convert.c mj2.c mj2_to_frames.c -o mj2_to_frames -L.. -lopenjpeg -I ../libopenjpeg/ -lm
18
19	extract_j2k_from_mj2: extract_j2k_from_mj2.c ../libopenjpeg.a
20	- gcc $(CFLAGS) mj2.c extract_j2k_from_mj2.c -o extract_j2k_from_mj2 -L.. -lopenjpeg -I ../libopenjpeg/ -lm
21	+ $(CC) $(CFLAGS) mj2.c extract_j2k_from_mj2.c -o extract_j2k_from_mj2 -L.. -lopenjpeg -I ../libopenjpeg/ -lm
22
23	wrap_j2k_in_mj2: wrap_j2k_in_mj2.c ../libopenjpeg.a
24	- gcc $(CFLAGS) mj2.c wrap_j2k_in_mj2.c -o wrap_j2k_in_mj2 -L.. -lopenjpeg -I ../libopenjpeg/ -lm
25	+ $(CC) $(CFLAGS) mj2.c wrap_j2k_in_mj2.c -o wrap_j2k_in_mj2 -L.. -lopenjpeg -I ../libopenjpeg/ -lm
26
27	clean:
28	rm -f frames_to_mj2 mj2_to_frames extract_j2k_from_mj2 wrap_j2k_in_mj2

Lines 1-18 Link Here

(-)./files/patch-opj_malloc.h (-18 lines)
1	--- libopenjpeg/opj_malloc.h.orig 2007-12-21 11:19:01.000000000 +0100
2	+++ libopenjpeg/opj_malloc.h 2009-03-21 12:02:37.000000000 +0100
3	@@ -76,8 +76,15 @@
4	#if defined(__sun)
5	#define HAVE_MEMALIGN
6	#elif defined(__GNUC__)
7	+ #if defined(__FreeBSD__)
8	+ #include <stdlib.h>
9	+ #include <osreldate.h>
10	+ #if __FreeBSD_versioni >= 700000
11	+ #endif
12	+ #else
13	#define HAVE_MEMALIGN
14	#include <malloc.h>
15	+ #endif
16	/* Linux x86_64 and OSX always align allocations to 16 bytes */
17	#elif !defined(__amd64__) && !defined(__APPLE__)
18	/* FIXME: Yes, this is a big assumption */

Line 0 Link Here

(-)./pkg-plist (+16 lines)
	1	bin/extract_j2k_from_mj2
	2	bin/frames_to_mj2
	3	bin/image_to_j2k
	4	bin/j2k_dump
	5	bin/j2k_to_image
	6	bin/mj2_to_frames
	7	bin/wrap_j2k_in_mj2
	8	include/openjpeg.h
	9	lib/libopenjpeg.so
	10	lib/libopenjpeg.so.1
	11	lib/libopenjpeg.so.1.5.0
	12	%%DATADIR%%-1.5/OpenJPEGConfig.cmake
	13	%%DATADIR%%-1.5/OpenJPEGTargets-release.cmake
	14	%%DATADIR%%-1.5/OpenJPEGTargets.cmake
	15	libdata/pkgconfig/libopenjpeg1.pc
	16	@dirrm %%DATADIR%%-1.5