Attachment #79884 for bug #114694

View | Details | Raw Unified | Return to bug 114694
Collapse All | Expand All

Lines 7-12 Link Here

(-)openjpeg/Makefile (-2 / +12 lines)
7		7
8	PORTNAME= openjpeg	8	PORTNAME= openjpeg
9	PORTVERSION= 1.2	9	PORTVERSION= 1.2
		10	PORTREVISION= 1
10	CATEGORIES= graphics	11	CATEGORIES= graphics
11	MASTER_SITES= http://www.openjpeg.org/ \	12	MASTER_SITES= http://www.openjpeg.org/ \
12	${MASTER_SITE_LOCAL}	13	${MASTER_SITE_LOCAL}
Lines 16-38 Link Here
16	MAINTAINER= trasz@FreeBSD.org	17	MAINTAINER= trasz@FreeBSD.org
17	COMMENT= An open-source JPEG 2000 codec	18	COMMENT= An open-source JPEG 2000 codec
18		19
		20	LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
		21
19	USE_GMAKE= yes	22	USE_GMAKE= yes
20	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
21	WRKSRC= ${WRKDIR}/trunk	24	WRKSRC= ${WRKDIR}/trunk
		25	JPWL_BINS= JPWL_image_to_j2k JPWL_j2k_to_image
		26	M2J_BINS= extract_j2k_from_mj2 frames_to_mj2 mj2_to_frames wrap_j2k_in_mj2
22		27
23	PLIST_FILES= include/openjpeg.h \	28	PLIST_FILES= include/openjpeg.h \
24	lib/libopenjpeg.a \	29	lib/libopenjpeg.a \
25	lib/libopenjpeg.so.${SHLIB_VER} \	30	lib/libopenjpeg.so.${SHLIB_VER} \
26	lib/libopenjpeg.so	31	lib/libopenjpeg.so \
		32	${JPWL_BINS:S\|^\|bin/\|} \
		33	${M2J_BINS:S\|^\|bin/\|}
27		34
28	SHLIB_VER= 2	35	SHLIB_VER= 2
29		36
30	do-install:	37	do-install:
31	${INSTALL_DATA} ${WRKSRC}/libopenjpeg/openjpeg.h ${PREFIX}/include	38	${INSTALL_DATA} ${WRKSRC}/libopenjpeg/openjpeg.h ${PREFIX}/include
32	${INSTALL_DATA} ${WRKSRC}/libopenjpeg.a ${PREFIX}/lib	39	${INSTALL_DATA} ${WRKSRC}/libopenjpeg.a ${PREFIX}/lib
33	${INSTALL_PROGRAM} ${WRKSRC}/libopenjpeg-2.1.2.0.so \	40	${INSTALL_DATA} ${WRKSRC}/libopenjpeg-2.1.2.0.so \
34	${PREFIX}/lib/libopenjpeg.so.${SHLIB_VER}	41	${PREFIX}/lib/libopenjpeg.so.${SHLIB_VER}
35	cd ${PREFIX}/lib && \	42	cd ${PREFIX}/lib && \
36	${LN} -sf libopenjpeg.so.${SHLIB_VER} libopenjpeg.so	43	${LN} -sf libopenjpeg.so.${SHLIB_VER} libopenjpeg.so
		44	.for file in ${M2J_BINS:S\|^\|mj2/\|} ${JPWL_BINS:S\|^\|jpwl/\|}
		45	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
		46	.endfor
37		47
38	.include <bsd.port.mk>	48	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)openjpeg/files/patch-Makefile (-3 / +19 lines)
1	--- Makefile.orig Mon Jun 4 15:27:25 2007	1	--- Makefile.orig 2007-06-04 09:27:25.000000000 -0400
2	+++ Makefile Wed Jul 4 09:43:14 2007	2	+++ Makefile 2007-07-18 06:51:33.000000000 -0400
3	@@ -8,17 +8,14 @@	3	@@ -8,17 +8,16 @@
4	INCLUDE = -Ilibopenjpeg	4	INCLUDE = -Ilibopenjpeg
5		5
6	# General configuration variables:	6	# General configuration variables:
Lines 11-16 Link Here
11	INSTALL_LIBDIR = $(PREFIX)/lib	11	INSTALL_LIBDIR = $(PREFIX)/lib
12	INSTALL_INCLUDE = $(PREFIX)/include	12	INSTALL_INCLUDE = $(PREFIX)/include
13		13
		14	+SUBDIRS= jpwl mj2
		15	+
14	# Converts cr/lf to just lf	16	# Converts cr/lf to just lf
15	DOS2UNIX = dos2unix	17	DOS2UNIX = dos2unix
16		18
Lines 19-21 Link Here
19	LIBRARIES = -lstdc++	21	LIBRARIES = -lstdc++
20		22
21	MODULES = $(SRCS:.c=.o)	23	MODULES = $(SRCS:.c=.o)
		24	@@ -33,7 +32,12 @@
		25
		26	default: all
		27
		28	-all: OpenJPEG
		29	+all: OpenJPEG subdirs
		30	+
		31	+subdirs:
		32	+ for dir in $(SUBDIRS); do \
		33	+ $(MAKE) -C $$dir; \
		34	+ done
		35
		36	dist: OpenJPEG
		37	install -d dist




--- jpwl/Makefile.orig	2007-02-23 13:24:49.000000000 -0500
+++ jpwl/Makefile	2007-07-18 07:13:51.000000000 -0400
@@ -1,10 +1,7 @@
 # Makefile for the main JPWL OpenJPEG codecs: JPWL_ j2k_to_image and JPWL_image_to_j2k
 
 # General configuration variables:
-CC = gcc
-AR = ar
-
-CFLAGS = -O3 -DUSE_JPWL # -g -p -pg -DUSE_JPWL
+CFLAGS += -DUSE_JPWL # -g -p -pg -DUSE_JPWL
 
 OPJ_SRCS = ../libopenjpeg/bio.c ../libopenjpeg/cio.c ../libopenjpeg/dwt.c ../libopenjpeg/event.c ../libopenjpeg/image.c ../libopenjpeg/j2k.c ../libopenjpeg/j2k_lib.c ../libopenjpeg/jp2.c ../libopenjpeg/jpt.c ../libopenjpeg/mct.c ../libopenjpeg/mqc.c ../libopenjpeg/openjpeg.c ../libopenjpeg/pi.c ../libopenjpeg/raw.c ../libopenjpeg/t1.c ../libopenjpeg/t2.c ../libopenjpeg/tcd.c ../libopenjpeg/tgt.c
 JPWL_SRCS = crc.c jpwl.c jpwl_lib.c rs.c
@@ -23,10 +20,10 @@
 	$(AR) r $@ $(MODULES)
 
 JPWL_j2k_to_image: ../codec/j2k_to_image.c $(STATICLIB)
-	gcc $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -lstdc++ 
+	$(CC) $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -ltiff -L$(LOCALBASE)/lib -L . -lopenjpeg_JPWL -lm -lstdc++ 
 
 JPWL_image_to_j2k: ../codec/image_to_j2k.c $(STATICLIB)
-	gcc $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -lstdc++ 
+	$(CC) $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -ltiff -L$(LOCALBASE)/lib -L . -lopenjpeg_JPWL -lm -lstdc++ 
 
 clean:
 	rm -f JPWL_j2k_to_image JPWL_image_to_j2k *.o *.a




--- 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

Return to bug 114694

Line 0 Link Here

(-)openjpeg/files/patch-jpwl_Makefile (+27 lines)
	1	--- jpwl/Makefile.orig 2007-02-23 13:24:49.000000000 -0500
	2	+++ jpwl/Makefile 2007-07-18 07:13:51.000000000 -0400
	3	@@ -1,10 +1,7 @@
	4	# Makefile for the main JPWL OpenJPEG codecs: JPWL_ j2k_to_image and JPWL_image_to_j2k
	5
	6	# General configuration variables:
	7	-CC = gcc
	8	-AR = ar
	9	-
	10	-CFLAGS = -O3 -DUSE_JPWL # -g -p -pg -DUSE_JPWL
	11	+CFLAGS += -DUSE_JPWL # -g -p -pg -DUSE_JPWL
	12
	13	OPJ_SRCS = ../libopenjpeg/bio.c ../libopenjpeg/cio.c ../libopenjpeg/dwt.c ../libopenjpeg/event.c ../libopenjpeg/image.c ../libopenjpeg/j2k.c ../libopenjpeg/j2k_lib.c ../libopenjpeg/jp2.c ../libopenjpeg/jpt.c ../libopenjpeg/mct.c ../libopenjpeg/mqc.c ../libopenjpeg/openjpeg.c ../libopenjpeg/pi.c ../libopenjpeg/raw.c ../libopenjpeg/t1.c ../libopenjpeg/t2.c ../libopenjpeg/tcd.c ../libopenjpeg/tgt.c
	14	JPWL_SRCS = crc.c jpwl.c jpwl_lib.c rs.c
	15	@@ -23,10 +20,10 @@
	16	$(AR) r $@ $(MODULES)
	17
	18	JPWL_j2k_to_image: ../codec/j2k_to_image.c $(STATICLIB)
	19	- gcc $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -lstdc++
	20	+ $(CC) $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -ltiff -L$(LOCALBASE)/lib -L . -lopenjpeg_JPWL -lm -lstdc++
	21
	22	JPWL_image_to_j2k: ../codec/image_to_j2k.c $(STATICLIB)
	23	- gcc $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -lstdc++
	24	+ $(CC) $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -ltiff -L$(LOCALBASE)/lib -L . -lopenjpeg_JPWL -lm -lstdc++
	25
	26	clean:
	27	rm -f JPWL_j2k_to_image JPWL_image_to_j2k .o .a

Line 0 Link Here

(-)openjpeg/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