cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- don't strip the library. ok todd@

Browse Source 
- update to 1.3, fixing LP64 arch in the process. "even better indeed" todd@
This commit is contained in:
sthen 2009-07-14 15:35:24 +00:00
parent f9093e7686
commit 2874dc1ddc
4 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/openjpeg/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2007/12/03 00:36:44 todd Exp $
# $OpenBSD: Makefile,v 1.5 2009/07/14 15:35:24 sthen Exp $
COMMENT= open-source JPEG 2000 codec library
DISTNAME= openjpeg_v1_2
PKGNAME= openjpeg-1.2
DISTNAME= openjpeg_v1_3
PKGNAME= openjpeg-1.3
SHARED_LIBS= openjpeg 3.0
SHARED_LIBS= openjpeg 4.0
CATEGORIES= graphics
@ -23,8 +23,11 @@ MASTER_SITES= ${HOMEPAGE}
MAKE_ENV= LIBopenjpeg_VERSION=${LIBopenjpeg_VERSION}
MAKE_FLAGS= CC="${CC}" COMPILERFLAGS="${CFLAGS}"
WRKDIST= ${WRKDIR}/trunk
WRKDIST= ${WRKDIR}/${DISTNAME:S/openjpeg/OpenJPEG/}
NO_REGRESS= Yes
pre-patch:
cd ${WRKSRC}/libopenjpeg; perl -i -pe 's/\r$$//' `find . -type f`
.include <bsd.port.mk>

10
graphics/openjpeg/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openjpeg_v1_2.tar.gz) = SXPFZMlmg6khp/Z1mQbaTg==
RMD160 (openjpeg_v1_2.tar.gz) = OsRuD0zRa7tS4FrSPgtNOVwzPCc=
SHA1 (openjpeg_v1_2.tar.gz) = OACKvXeXK4BiaTJUyy6gh+uHfr0=
SHA256 (openjpeg_v1_2.tar.gz) = IClMiu/BW0Vav8irc3R6xTRaHL9vcDXdNu9pDSGI4sQ=
SIZE (openjpeg_v1_2.tar.gz) = 929866
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

22
graphics/openjpeg/patches/patch-Makefile
View File

@ -1,16 +1,6 @@
$OpenBSD: patch-Makefile,v 1.3 2007/12/03 00:36:44 todd Exp $
--- Makefile.orig Mon Jun 4 08:27:25 2007
+++ Makefile Sun Dec 2 18:03:43 2007
@@ -1,7 +1,7 @@
# Linux makefile for OpenJPEG
-VER_MAJOR = 2
-VER_MINOR = 1.2.0
+VER_MAJOR ?= 2
+VER_MINOR ?= 1.2.0
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
INCLS = ./libopenjpeg/bio.h ./libopenjpeg/cio.h ./libopenjpeg/dwt.h ./libopenjpeg/event.h ./libopenjpeg/fix.h ./libopenjpeg/image.h ./libopenjpeg/int.h ./libopenjpeg/j2k.h ./libopenjpeg/j2k_lib.h ./libopenjpeg/jp2.h ./libopenjpeg/jpt.h ./libopenjpeg/mct.h ./libopenjpeg/mqc.h ./libopenjpeg/openjpeg.h ./libopenjpeg/pi.h ./libopenjpeg/raw.h ./libopenjpeg/t1.h ./libopenjpeg/t2.h ./libopenjpeg/tcd.h ./libopenjpeg/tgt.h ./libopenjpeg/opj_includes.h
$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
@ -23,9 +13,9 @@ $OpenBSD: patch-Makefile,v 1.3 2007/12/03 00:36:44 todd Exp $
@@ -19,14 +19,15 @@ INSTALL_INCLUDE = $(PREFIX)/include
DOS2UNIX = dos2unix
COMPILERFLAGS = -O3 -fPIC
COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
-LIBRARIES = -lstdc++
+LIBRARIES =
+LIBRARIES =
MODULES = $(SRCS:.c=.o)
+SOMODULES = $(SRCS:.c=.so)
@ -56,7 +46,7 @@ $OpenBSD: patch-Makefile,v 1.3 2007/12/03 00:36:44 todd Exp $
-$(SHAREDLIB): $(MODULES)
- $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
+$(SHAREDLIB): $(SOMODULES)
+ $(CC) -s -shared -fPIC -o $@ $(SOMODULES) $(LIBRARIES)
+ $(CC) -shared -fPIC -o $@ $(SOMODULES) $(LIBRARIES)
install: OpenJPEG
- install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'

17
graphics/openjpeg/patches/patch-libopenjpeg_opj_malloc_h Normal file
View File

@ -0,0 +1,17 @@
$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