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

update to openjp2-2.1.2 - a huge number of security fixes since 2.1.0, see

Browse Source 
https://github.com/uclouvain/openjpeg/blob/v2.1.2/CHANGELOG.md
This commit is contained in:
sthen 2016-10-18 09:23:34 +00:00
parent 728f6a40f6
commit 4e04c512be
6 changed files with 34 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
graphics/openjp2/Makefile
View File

@ -1,39 +1,37 @@
# $OpenBSD: Makefile,v 1.6 2014/12/31 08:42:26 landry Exp $
# $OpenBSD: Makefile,v 1.7 2016/10/18 09:23:34 sthen Exp $
COMMENT = open-source JPEG 2000 codec library
BROKEN-hppa = src/bin/jp2/convert.c:192: error: expected identifier or '(' before '__extension__'
COMMENT = open-source JPEG 2000 codec library
V = 2.1.0
DISTNAME = openjpeg-$V
PKGNAME = openjp2-$V
GH_ACCOUNT = uclouvain
GH_PROJECT = openjpeg
GH_TAGNAME = v2.1.2
DISTNAME = openjp2-${GH_TAGNAME:S/v//}
SHARED_LIBS += openjp2 1.0 # 2.0
SHARED_LIBS += openjp2 2.0
CATEGORIES = graphics
CATEGORIES = graphics
HOMEPAGE = http://www.openjpeg.org/
HOMEPAGE = http://www.openjpeg.org/
MAINTAINER = Stuart Henderson <sthen@openbsd.org>
MAINTAINER = Stuart Henderson <sthen@openbsd.org>
# BSD
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c lcms2 m png pthread tiff z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=openjpeg.mirror/}
MODULES = devel/cmake
NO_TEST = Yes
CONFIGURE_ARGS = -DOPENJPEG_INSTALL_MAN_DIR=man \
-DOPENJPEG_INSTALL_SUBDIR:STRING=openjp2 \
-DOPENJPEG_SOVERSION:STRING=${LIBopenjpeg_VERSION}
LIB_DEPENDS = graphics/lcms2 \
graphics/png
MODULES = devel/cmake
NO_TEST = Yes
CONFIGURE_ARGS = -DOPENJPEG_INSTALL_MAN_DIR=man \
-DOPENJPEG_INSTALL_SUBDIR:STRING=openjp2 \
-DOPENJPEG_SOVERSION:STRING=${LIBopenjpeg_VERSION}
LIB_DEPENDS = graphics/lcms2 \
graphics/png
pre-patch:
cd ${WRKSRC}/src/lib && perl -i -pe 's/\r$$//; s/\t*$$//;' openmj2/opj_malloc.h openjp2/opj_malloc.h
cd ${WRKSRC}/src/lib && perl -i -pe 's/\r$$//; s/\t*$$//;' \
openmj2/opj_malloc.h openjp2/opj_malloc.h
post-install:
cd ${WRKSRC}/doc/man; \

4
graphics/openjp2/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (openjpeg-2.1.0.tar.gz) = EjK7gU/YjY7TFMlPC/67A96FWVg6M6u+jGTvP8Co/wM=
SIZE (openjpeg-2.1.0.tar.gz) = 1789675
SHA256 (openjp2-2.1.2.tar.gz) = TOd7bvU47wkNm94dXu/4swaatWxJBvCDR1UXwsAj36c=
SIZE (openjp2-2.1.2.tar.gz) = 1987071

8
graphics/openjp2/patches/patch-CMakeLists_txt
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-CMakeLists_txt,v 1.3 2014/11/29 13:25:05 sthen Exp $
--- CMakeLists.txt.orig Tue Apr 29 08:15:05 2014
+++ CMakeLists.txt Fri Nov 28 23:49:58 2014
@@ -99,7 +99,10 @@ endif()
$OpenBSD: patch-CMakeLists_txt,v 1.4 2016/10/18 09:23:34 sthen Exp $
--- CMakeLists.txt.orig Wed Sep 28 19:18:16 2016
+++ CMakeLists.txt Tue Oct 18 09:42:21 2016
@@ -104,7 +104,10 @@ endif()
option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
string(TOLOWER ${PROJECT_NAME} projectname)

10
graphics/openjp2/patches/patch-src_bin_jp2_convert_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_bin_jp2_convert_c,v 1.1 2014/12/16 12:46:53 sthen Exp $
--- src/bin/jp2/convert.c.orig Tue Dec 16 12:44:56 2014
+++ src/bin/jp2/convert.c Tue Dec 16 12:45:21 2014
@@ -187,7 +187,7 @@ static int tga_readheader(FILE *fp, unsigned int *bits
$OpenBSD: patch-src_bin_jp2_convert_c,v 1.2 2016/10/18 09:23:34 sthen Exp $
--- src/bin/jp2/convert.c.orig Wed Sep 28 19:18:16 2016
+++ src/bin/jp2/convert.c Tue Oct 18 09:42:21 2016
@@ -646,7 +646,7 @@ static int tga_readheader(FILE *fp, unsigned int *bits
return 1;
}
-#ifdef OPJ_BIG_ENDIAN
+#if defined(OPJ_BIG_ENDIAN) && !defined(swap16)
static INLINE int16_t swap16(int16_t x)
static INLINE OPJ_UINT16 swap16(OPJ_UINT16 x)
{

12
graphics/openjp2/patches/patch-src_lib_openjp2_opj_malloc_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_lib_openjp2_opj_malloc_h,v 1.2 2014/06/12 14:07:17 sthen Exp $
--- src/lib/openjp2/opj_malloc.h.orig Thu Jun 12 14:31:00 2014
+++ src/lib/openjp2/opj_malloc.h Thu Jun 12 14:31:00 2014
@@ -101,7 +101,7 @@ Allocate memory aligned to a 16 byte boundry
#elif defined(__FreeBSD__)
#define HAVE_POSIX_MEMALIGN
/* Linux x86_64 and OSX always align allocations to 16 bytes */
- #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)
+ #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__OpenBSD__)
#define HAVE_MEMALIGN
#include <malloc.h>
#endif

8
graphics/openjp2/patches/patch-src_lib_openmj2_opj_malloc_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_lib_openmj2_opj_malloc_h,v 1.1.1.1 2013/10/29 00:01:50 sthen Exp $
--- src/lib/openmj2/opj_malloc.h.orig Tue Apr 2 17:33:28 2013
+++ src/lib/openmj2/opj_malloc.h Tue Apr 2 17:34:53 2013
@@ -86,7 +86,7 @@ Allocate memory aligned to a 16 byte boundry
$OpenBSD: patch-src_lib_openmj2_opj_malloc_h,v 1.2 2016/10/18 09:23:34 sthen Exp $
--- src/lib/openmj2/opj_malloc.h.orig Tue Oct 18 09:42:21 2016
+++ src/lib/openmj2/opj_malloc.h Tue Oct 18 09:42:21 2016
@@ -86,7 +86,7 @@ Allocate memory aligned to a 16 byte boundary
#elif defined(__FreeBSD__)
#define HAVE_POSIX_MEMALIGN
/* Linux x86_64 and OSX always align allocations to 16 bytes */