remove openjpeg, with the openimageio/blender updates it has no more
consumers. merge into openjp2.
This commit is contained in:
sthen
parent
30133a442d
commit
52bc8156e8
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.1101 2020/11/29 00:32:11 daniel Exp $
|
||||
# $OpenBSD: Makefile,v 1.1102 2020/11/29 20:08:49 sthen Exp $
|
||||
|
||||
COMMENT = exceptions to pkg_add rules
|
||||
CATEGORIES = devel databases
|
||||
DISTFILES =
|
||||
|
||||
# API.rev
|
||||
PKGNAME = quirks-3.493
|
||||
PKGNAME = quirks-3.494
|
||||
PKG_ARCH = *
|
||||
MAINTAINER = Marc Espie <espie@openbsd.org>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#! /usr/bin/perl
|
||||
|
||||
# ex:ts=8 sw=4:
|
||||
# $OpenBSD: Quirks.pm,v 1.1119 2020/11/29 00:32:11 daniel Exp $
|
||||
# $OpenBSD: Quirks.pm,v 1.1120 2020/11/29 20:08:49 sthen Exp $
|
||||
#
|
||||
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
|
||||
#
|
||||
@ -515,6 +515,7 @@ my $stem_extensions = {
|
||||
'py-txaio' => 'py3-txaio',
|
||||
'py-qrcode' => 'py3-qrcode',
|
||||
'py-acoustid' => 'py3-acoustid',
|
||||
'openjpeg' => 'openjp2',
|
||||
};
|
||||
|
||||
my $obsolete_reason = {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.532 2020/11/24 16:43:38 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.533 2020/11/29 20:08:49 sthen Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += DevIL
|
||||
@ -181,7 +181,6 @@
|
||||
SUBDIR += openexr
|
||||
SUBDIR += openimageio
|
||||
SUBDIR += openjp2
|
||||
SUBDIR += openjpeg
|
||||
SUBDIR += openscenegraph
|
||||
SUBDIR += optipng
|
||||
SUBDIR += orthanc
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2020/02/03 20:40:38 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2020/11/29 20:08:49 sthen Exp $
|
||||
|
||||
COMMENT= open-source JPEG 2000 codec library
|
||||
|
||||
@ -6,7 +6,7 @@ GH_ACCOUNT= uclouvain
|
||||
GH_PROJECT= openjpeg
|
||||
GH_TAGNAME= v2.3.1
|
||||
DISTNAME= openjp2-${GH_TAGNAME:S/v//}
|
||||
REVISION= 0
|
||||
REVISION= 1
|
||||
|
||||
SHARED_LIBS += openjp2 3.1
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
@comment $OpenBSD: PLIST,v 1.6 2019/01/16 22:29:54 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.7 2020/11/29 20:08:49 sthen Exp $
|
||||
@pkgpath graphics/openjpeg
|
||||
@bin bin/opj_compress
|
||||
@bin bin/opj_decompress
|
||||
@bin bin/opj_dump
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
# $OpenBSD: Makefile,v 1.31 2020/02/03 20:40:38 sthen Exp $
|
||||
|
||||
COMMENT= open-source JPEG 2000 codec library
|
||||
|
||||
V= 1.5.2
|
||||
PORTROACH = limit:^1
|
||||
DISTNAME= openjpeg-version.$V
|
||||
PKGNAME= openjpeg-$V
|
||||
DISTFILES= ${DISTNAME}{version.$V}.tar.gz
|
||||
REVISION= 0
|
||||
|
||||
SHARED_LIBS += openjpeg 5.0 # 6.2
|
||||
|
||||
CATEGORIES= graphics
|
||||
|
||||
HOMEPAGE= http://www.openjpeg.org/
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE= Yes
|
||||
|
||||
WANTLIB += c jpeg lcms2 m png pthread tiff z
|
||||
|
||||
# not using GH_* because it strips 'v' from version
|
||||
MASTER_SITES= https://github.com/uclouvain/openjpeg/archive/
|
||||
|
||||
CONFIGURE_STYLE= autoreconf
|
||||
SEPARATE_BUILD= Yes
|
||||
|
||||
AUTOCONF_VERSION= 2.69
|
||||
AUTOMAKE_VERSION= 1.14
|
||||
AUTORECONF= ./bootstrap.sh
|
||||
|
||||
LIB_DEPENDS= graphics/lcms2 \
|
||||
graphics/png \
|
||||
graphics/tiff
|
||||
|
||||
# XXX Yes, really, libtiff by itself won't be detected
|
||||
LIB_DEPENDS += graphics/jpeg
|
||||
CONFIGURE_ENV += TIFF_LIBS='-L${LOCALBASE}/lib -ltiff -ljpeg' \
|
||||
TIFF_CFLAGS='-I${LOCALBASE}/include'
|
||||
|
||||
pre-patch:
|
||||
perl -i -pe 's/\r$$//; s/\t*$$//;' ${WRKSRC}/libopenjpeg/opj_malloc.h
|
||||
|
||||
post-install:
|
||||
cd ${PREFIX}/share/doc/ && mv openjpeg-* openjpeg
|
||||
|
||||
.include <bsd.port.mk>
|
||||
@ -1,2 +0,0 @@
|
||||
SHA256 (openjpeg-version.1.5.2.tar.gz) = NzTpXt0L724FaBVZF1Xv2CIijcPNhmiU4AoskpAmsW0=
|
||||
SIZE (openjpeg-version.1.5.2.tar.gz) = 1372533
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-applications_codec_convert_c,v 1.2 2016/10/26 18:16:49 jca Exp $
|
||||
--- applications/codec/convert.c.orig Fri Mar 28 09:20:25 2014
|
||||
+++ applications/codec/convert.c Tue Oct 18 02:55:44 2016
|
||||
@@ -184,7 +184,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)
|
||||
{
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.1 2016/10/26 18:16:49 jca Exp $
|
||||
--- configure.ac.orig Fri Mar 28 09:20:25 2014
|
||||
+++ configure.ac Tue Oct 18 02:53:55 2016
|
||||
@@ -483,7 +483,7 @@ if test "x${want_debug}" = "xyes" ; then
|
||||
OPJ_COMPILER_FLAG([-g])
|
||||
OPJ_COMPILER_FLAG([-O0])
|
||||
else
|
||||
- OPJ_COMPILER_FLAG([-O3])
|
||||
+ :
|
||||
fi
|
||||
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-libopenjpeg_opj_malloc_h,v 1.4 2013/12/10 12:26:47 sthen Exp $
|
||||
|
||||
Required for !amd64. We could use posix_memalign() instead, but no point
|
||||
as our malloc() already aligns to 16 bytes.
|
||||
|
||||
--- libopenjpeg/opj_malloc.h.orig Fri Dec 6 14:56:48 2013
|
||||
+++ libopenjpeg/opj_malloc.h Fri Dec 6 14:57:45 2013
|
||||
@@ -86,7 +86,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
|
||||
@ -1,4 +0,0 @@
|
||||
The OpenJPEG library is an open-source JPEG 2000 codec written
|
||||
in C language. It has been developed in order to promote the
|
||||
use of JPEG 2000, the new still-image compression standard
|
||||
from the Joint Photographic Experts Group (JPEG).
|
||||
@ -1,17 +0,0 @@
|
||||
@comment $OpenBSD: PLIST,v 1.5 2016/10/26 18:16:49 jca Exp $
|
||||
@bin bin/image_to_j2k
|
||||
@bin bin/j2k_dump
|
||||
@bin bin/j2k_to_image
|
||||
include/openjpeg-1.5/
|
||||
include/openjpeg-1.5/openjpeg.h
|
||||
lib/libopenjpeg.a
|
||||
lib/libopenjpeg.la
|
||||
@lib lib/libopenjpeg.so.${LIBopenjpeg_VERSION}
|
||||
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/man3/libopenjpeg.3
|
||||
share/doc/openjpeg/
|
||||
share/doc/openjpeg/LICENSE
|
||||
Loading…
Reference in New Issue
Block a user