CVS commit: pkgsrc/graphics/openjpeg

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul 14 15:41:44 UTC 2016

Modified Files:
        pkgsrc/graphics/openjpeg: Makefile distinfo
        pkgsrc/graphics/openjpeg/patches: patch-src_bin_jp2_CMakeLists.txt
            patch-src_lib_openjp2_opj__config__private.h.cmake.in
Removed Files:
        pkgsrc/graphics/openjpeg/patches: patch-aa

Log Message:
Updated openjpeg to 2.1.1.

## v2.1.1

**Implemented enhancements:**

- opj_malloc replacement
- backport "-p" and "-force-rgb" options in 1.5
- Use travis-ci matrix build
- Add Coverity Scan analysis
- Unnecessary rate distortion calculations
- Add images from various security issues to test suite
- Coding speed for 9/7 on 32bits platforms (x86/ARM) can be improved with a quick fix

**Fixed bugs:**

- Out-of-Bounds Access in function opj_tgt_reset of tgt.c
- Heap Buffer Overflow in function color_cmyk_to_rgb of color.c
- division-by-zero (SIGFPE) error in opj_tcd_init_tile function (line 730 of tcd.c)
- Out-Of-Bounds Read in sycc422_to_rgb function
- Heap Corruption in opj_free function
- Out-Of-Bounds Read in opj_tcd_free_tile function
- Cannot handle box of undefined size
- Compilation fails without platform-supplied aligned malloc
- HP compiler warns about redeclaration of static function
- Implementation-defined behavior of malloc causes different behavior on Linux and AIX
- Build on AIX fails because "opj_includes.h" is included after system headers
- Compiling with SSE2 on Linux 32-bit causes crashes in OpenJPEG
- Build on AIX fails because of "restrict" pointers
- bug in new tif conversion code
- bin/jp2/convert.c line 1085 Resource leak
- bin/jp2/convert.c  memory leak
- Resource leak in opj_j2k_create_cstr_index in case of failure
- Resource leak in opj_j2k_encode in case of failure
- Resource leak in opj_j2k_decode_one_tile in case of failure
- Resource Leak
- opj_compress fails to compress lossless on gcc/x86 (-m32)
- Use-after-free in opj_j2k_write_mco
- openjpeg-master-2015-07-30 failed to compile on LINUX
- PNG images are always read as RGB(A) images
- g4_colr.j2c not handled properly
- Bigendian: opj_compress + opj_decompress fails
- Suspicious code in j2k.c
- Decode times almost double(!!) on Visual Studio 2013, 2015
- opj_data/input/nonregression/issue226.j2k
- opj_setup_encoder always returns true
- Double free in j2k_read_ppm_v3 parsing ((presumably invalid) image.
- Invalid write in opj_j2k_update_image_data
- Undefined printf format specifier %ud used in code
- Potential double free on malloc failure in opj_j2k_copy_default_tcp_and_create_tcp()
- Do not link with -ffast-math
- Heap-buffer-overflow in opj_dwt_decode
- opj_dump fails on Windows 7, 64 bits
- SIGSEGV in opj_j2k_update_image_data via pdfium_test
- Heap-buffer-overflow in opj_j2k_tcp_destroy
- Invalid image causes write past end of heap buffer
- Assertion `l_res->x0 >= 0' fails when parsing invalid images
- Bug on opj_write_bytes_BE function
- Refactor j2k_read_ppm_v3 function
- compression: strange precinct dimensions
- (:- Console message in opj_decompress -:)
- opj_decompress fails to decompress any files
- bio->ct is unnecessarily set to zero in opj_bio_flush method
- Maximal unsigned short is 65535, not 65536
- OpenJpeg fails to encode components with different precision properly
- component precision upscaling isn't correct in opj_decompress
- Multiple precision components won't get encoded to jp2 if 1 component is unsigned 1 bit
- Incorrect code in ../bin/jp2/convert.c,  function rawtoimage_common(...)
- [OpenJPEG-trunk] opj_stream_get_number_byte_left throws assert
- NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5 fails randomly when running tests in parallel
- compare_raw_files doesn't report an error on invalid arguments / missing input files
- Forward discrete wavelet transform: implement periodic symmetric extension at boundaries
- Bug in tiff reading method in convert.c
- Image in pdf don't display
- Multiple issues causing opj_decompress to segfault
- opj_compress: 40% of encode time is spent freeing data
- Multiple warnings when configuring OpenJPEG on MacOS with CMake 3.x (trunk)
- valgrind memleak found
- global-buffer-overflow src/lib/openjp2/t1.c:1146 opj_t1_getwmsedec
- Warning introduced on trunk r2923 & r2924
- heap-buffer-overflow in opj_t1_decode_cblks
- Heap-buffer-overflow in opj_tcd_init_decode_tile
- Heap-buffer-overflow in opj_j2k_tcp_destroy
- Heap-buffer-overflow in opj_jp2_apply_pclr
- issue412 revisited
- Image distorted (sides look cankered)
- openjpeg-2.x-trunk-r2918 is broken in color.c
- Heap-buffer-overflow in opj_tcd_init_decode_tile
- Heap-use-after-free in opj_t1_decode_cblks
- UNKNOWN in opj_read_bytes_LE
- Transparency problem
- Image with per channel alpha (cdef) does not decode properly
- OpenJPEG crashes with attached image
- Palette image with cdef fails to decompress
- Invalid member values from opj_read_header or opj_decode ?
- MD5 Checksum hangs under valgrind on MacOS X
- Heap-buffer-overflow in opj_tcd_get_decoded_tile_size
- C++ style comments in trunk/src/lib/openjp2/j2k.c
- Backport bugfixes from trunk to 2.1 branch
- Heap-buffer-overflow in parse_cmdline_encoder
- Heap-buffer-overflow in opj_v4dwt_interleave_h
- Heap-buffer-overflow in opj_dwt_decode
- Heap-use-after-free in opj_t1_decode_cblks
- Heap-buffer-overflow in opj_jp2_apply_cdef
- Heap-buffer-overflow in opj_t2_read_packet_header
- Heap-buffer-overflow in opj_t2_read_packet_header
- Heap-buffer-overflow in opj_dwt_decode_1
- Heap-double-free in j2k_read_ppm_v3
- Security hole in j2k.c
- Security: double-free in opj_tcd_code_block_dec_deallocate
- check for negative-size params in code
- Heap-buffer-overflow in opj_t2_read_packet_header
- Heap overflow in OpenJpeg 1.5.2
- openjpip.so.6 file too short
- Corrupted JP3D file
- variable assigned to itself
- Null pointer dereferencing
- bad use of case statement
- Release 2.1 as a Ubuntu package
- Bug in libopenjpwl.pc
- inconsistent tile numbering in decode output message
- error in code block calculations
- r2872 fails to compile due to "attempt to use poisoned malloc" error in j2k.c
- OSX build gives libopenjp2.6.dylib with not-absolute install name id
- opj_decompress gives error but successfully decompress in OPJ 2.1
- pngtoimage() and imagetopng() have wrong byte order for 16-Bit image
- PDF crash in chrome - part2 (due to attachment limit)
- PDF crash in chrome - part1
- PDF crash in chrome - part0
- Compilation fails on Windows with mingw32 gcc4.8
- security issue
- improve memory management
- how to compress a yuv420 raw data using opj_compress
- Some memory allocation are not checked
- Static library symbols shall be marked as hidden
- opj_compress rejects valid bmp files
- opj_compress crashes when number of resolutions is set to zero
- Compilation error under Visual Studio 2003
- opj_compress description example error [Low priority]
- opj_write_bytes_BE is wrong in trunk
- PART1ONLY option in release.sh doesn't work properly
- openjpeg crash error
- openjpeg decompress error
- openjpeg decompress issue
- limited tif support
- asoc value of  65536 is allowed
- opj_skip_from_file error
- Heavy quota usage in openjpeg
- Verify -help actually match letter
- g3_colr.j2c not handled
- reopen/fix issue 165
- kakadu conformance tests
- missing break after case statement in opj_dwt_decode_real
- Run Coverity on trunk
- NR-ENC-random-issue-0005.tif-12-encode
- Use new add_test signature to handle cross compilation
- Loss decoding quality in 2.0.0
- Decompress that worked in 1.5.1 fails in 2.0
- Expected endianness with raw input is not documented leading to SEGFAULT
- OpenJPEG writes to stderr
- Inconsistent logging of tile index
- patch for openjpeg-trunk-r2347 and BIG_ENDIAN
- CMAP: MTYP == 0 (direct use) not handled properly
- Black Pixel
-  opj_compress runtime error after fresh Linux install due to apparent failure to execute ldconfig
- openjp2 debug works, release build does not
- openjpeg-branch15-r2299 and openjpeg-trunk-r2299 fail to decode a JP2 file
- openjpeg-trunk issue with Win7
- undefined reference to `opj_version'
- In tgt.c we used fprintf not the openjpeg message reporter
- Windows binaries not working under WinXP
- add ability to use intel ipp (performance primitive) within OpenJPEG
- Migration guide v2
- Cannot decompress JPEG2000Aware3.18.7.3Win32_kdutranscode6.3.1.j2k
- Cannot decompress JPEG2000Aware3.18.7.3Win32.j2k
- openjpeg%googlegroups.com@localhost has disappeard
- OpenJPEG 1.5.0 crashes on a ridiculously big file...
- opj_image vs free
- Windows .dll file invalid
- Problem with second layer of a 2 layer coded LRCP (with precincts)
- version 1.4 crashes when opening PDF file with JPEG2000 images
- Setup a win64 dashboard
- J2KP4files/codestreams_profile0/p0_13.j2k question jpeg2000
- Out of memory: Kill process 11204 (opj_server) score 917 or sacrifice child
- FILE* in opj API is unsafe
- third-party lib order
- openjpeg-1.5.0-Darwin-powerpc.dmg is huge !
- misleading info in JP2 box lead to wrong number of components
- Image_to_j2k says that j2k files is generated but no file is on the HDD
- Error in openjpegV1.4 on compiling image_to_j2k: crash on reading bmp file
- Update to abi-compliance-checker 1.96
- Decode error on the attached JPEG...works in KDU and with JASPER...please help!
- Mac binaries v1.4 is broken
- jp2_read_boxhdr() has size bug in version 1
- Support for Java JAI Imageio
- encoding test failing
- source archive on demand
- CMakeLists.txt and Makefile.am for JPIP are buggy
- pclr-cmap-cdef
- Error when compiling openjpeg_v1_4_sources_r697
- J2K codec issue on Windows Mobile
- image_to_j2k.exe crashes on large .bmp file
- fatal error C1900 building the project on windows
- same option but different size
- Missing openjpegConfigure.h
- Not an issue in openjpeg, but ...
- OpenJPEG-1.3.0 pclr, cmap and cdef
- realloc maybe too big (t2.c)
- libopenjpeg/opj_malloc.h breaks on FreeBSD/Darwin systems
- image_to_j2k not outputting to win32 console properly
- [OpenJPEG] OpenJPEG_v13: tiled image part 2
- JP2 Color Space modification by Matteo Italia
-  Patch submission ( exotic video formats, and a few things )
- 16 bits lossy compression
- pnm file formats not accepting bitdepth greater than 8 bpp
- Heap corruption in j2k encoder
- JPWL crash in marker reallocation(+patch), segfault while decoding image with main header protection
- a couple of small errors in libopenjpeg detected by coverity

**Closed issues:**

- Shared library build broken on ubuntu
- opj_includes.h shouldn't define `__attribute__`
- Possible website problems due to Jekyll upgrade
- Stable Release?
- Meta Issue : try to fix some of these critical bugs before thinking about optimizing the library
- Tiled encoding broken for images with non power of 2 dimensions
- install_name (still) not set on OS X
- Add section in wiki describing where one can get test images
- Make EvenManager into singleton
- Remove old branches from repo
- MQ Coder encode: Conditional jump or move depends on uninitialised value(s)
- Can we add these files to our test suite ?
- -t and -d command line flags for decode are not documented on OpenJPEG website
- Decoding at the precinct level
- Support unscaled 10 bit data for 2K cinema @ 48 FPS, as per DCI standard
- Use parallel jobs in ctest
- [Security]Multiple Memory error
- lossy encoding a 16 bit TIF file : severe artifiacts in decompressed image
- opj_compress and opj_decompress : get_next_file method uses hard-coded unix path separator
- Uninitialized variable
- Use of enum variable for bit flags prevents compilation as C++ source
- Serious problem with quantization during lossy encoding
- Decompression does not work with sequential data source
- potential overflow in opj_tcd_tile_t
- Logical condition
- file9.jp2 does not dump correctly on 1.5
- opj_compress man page is missing documentation of -jpip option
- opj_compress fails to compress lossless on gcc/x86 (-m32) in 1.5 branch
- Example: opj_compress -i image.j2k -o image.pgm
- Mismatching delete
- Compilation fails on Win7
- NR-JP2-file5.jp2-compare2base fails with third party libcms
- CTest spits out an error at the end of the test run
- opj_uint_adds()  is questionable
- Might consider renaming this method:
- opj_compress run twice gives different fiile sizes for same file
- Android Support
- Add SSE2/SSE41 implementations for mct.c
- Reduce encoder code block memory usage for non 64x64 code block sizes
- valgrind "Uninitialized Memory Read" & "Uninitialized Memory Conditional" found
- No way to debug opj_tcd_init_encode_tile or opj_tcd_init_decode_tile
- Add option to call dsymutil on built binaries
- Allow opj_compress and opj_decompress to read/write images over stdin/stdout
- reduce memory significantly for single tile RGB encoding
- Switch code repo to github and start using pull request workflow
- This is a BigTIFF file.  This format not supported
- Add a test suite to check the convert functions
- Add build config to the dashboard to verify the autotools build

**Merged pull requests:**

- Correct abi-check.sh for PR
- Update tcd.c
- Update lcms2
- Use lowercase for cmake commands consistenly
- Ignore clang's summary warning
- Fix UBSan gcc warning for first arg to memset non null
- Update to libtiff-4.0.6
- Fix warnings
- Check SSIZ is valid in opj_j2k_read_siz
- Fix unsigned int overflow reported by UBSan
- Fix unsigned int overflow reported by UBSan
- Fix negative shift left reported by UBSan
- Fix negative shift left reported by UBSan
- Add clang 3.9 build to Travis matrix
- Fix implicit floating bool conversion
- Do not define __attribute__ in opj_includes.h
- Allow to read/write 3/5/7/9/11/13/15 bpp TIF files
- Fix heap-buffer-overflow in color_esycc_to_rgb
- update libpng to from 1.6.17 to 1.6.21
- Update cmake & jpylyzer for travis builds
- Fix Out-Of-Bounds Read in sycc42x_to_rgb function
- cppcheck fix for openjp2
- Fix uninitialized variable reported by cppcheck
- Remove dead code in opj_dump
- issue #695 MQ Encode: ensure that bp pointer never points to uninitialized memory
- Fix issue 135
- Fix implementation of opj_calloc
- [git/2.1 regression] Fix opj_write_tile() failure when numresolutions=1
- Fix fatal crash on 64 bit Linux
- [libtiff] Add missing include statement for ssize_t
- Fix duplicate article in comments
- Fix grammar in comment
- Remove whitespace and CR at line endings
- Fix typos
- Add missing source for the JPIP library and executables (issue #658)
- Fix undefined size jp2 box handling
- opj_decompress: Update error message
- Fix support of posix_memalloc for Linux
- Fix typo in comments
- Avoid pointer arithmetic with (void *) pointers
- Fix HP compiler warning about redeclaration of function (#640)
- Fix format strings and unneeded assignment
- Fix repository for JPEG2000 test data
- Update allocation functions
- Fix OpenJPEG GitHub issue #633.
- travis-ci: Include add ons in matrix
- Add Appveyor
- Use Travis-ci to run ABI check
- Fix warnings for C++
- Fixed problem that C++ compilation failed because of enum variable.
- Added missing casts for return values of opj_malloc()/opj_calloc().
- Add check for seek support before trying TPsot==TNsot workaround
- Fix some typos found by codespell
- Correct leak in color_cielab_to_rgb
- Add Travis-ci build matrix
- Correct lossless issue on linux x86
- Travis-ci update
- Correct CMake version requirements
- Add tests for CMYK/esYCC/CIELab
- Add support for CIELab, EYCC and CMYK
- Remove printf/fprintf to stdout/stderr throughout openjp2 lib
- better -ffast-math handling
- Add jpylyzer tests for JP2 compression
- Add COC/QCC in main header when needed
- Use __emul under msvc x86 for fast 64 = 32 * 32
- Update convert for PNG output
- Remove some warnings when building
- Switch to libpng-1.6.17
- Add some missing static keywords
- Switch to libcms2  mm2/Little-CMS@0e8234e090d6aab33f90e2eb0296f30aa0705e57
- Prevent overflow when coding 16 bits images
- Switch to libcms2-2.6
- Update PNG support
- Various Minor fixes
- Update TIFF conversion to support more bit depth.
- Add checks for odd looking cmap & for cmap outside jp2h box
- Refactor opj_j2k_read_ppm & opj_j2k_read_ppt
- Add option to force component splitting in imagetopnm
- fix Suspicious code in j2k.c #517
- Update zlib to version 1.2.8
- Fix opj_write_bytes_BE (#518)
- Correctly decode files with incorrect tile-part header fields (TPsot==TNsot)
- Fixed typos
- Formatted the readme file


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/openjpeg/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/openjpeg/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/graphics/openjpeg/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt \
    pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_opj__config__private.h.cmake.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/openjpeg/Makefile
diff -u pkgsrc/graphics/openjpeg/Makefile:1.11 pkgsrc/graphics/openjpeg/Makefile:1.12
--- pkgsrc/graphics/openjpeg/Makefile:1.11      Fri Jan 23 17:15:09 2015
+++ pkgsrc/graphics/openjpeg/Makefile   Thu Jul 14 15:41:43 2016
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2015/01/23 17:15:09 pho Exp $
+# $NetBSD: Makefile,v 1.12 2016/07/14 15:41:43 wiz Exp $
 
-DISTNAME=      openjpeg-2.1.0
+DISTNAME=      openjpeg-2.1.1
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=openjpeg.mirror/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=uclouvain/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.openjpeg.org/

Index: pkgsrc/graphics/openjpeg/distinfo
diff -u pkgsrc/graphics/openjpeg/distinfo:1.9 pkgsrc/graphics/openjpeg/distinfo:1.10
--- pkgsrc/graphics/openjpeg/distinfo:1.9       Tue Nov  3 21:34:11 2015
+++ pkgsrc/graphics/openjpeg/distinfo   Thu Jul 14 15:41:43 2016
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 21:34:11 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/07/14 15:41:43 wiz Exp $
 
-SHA1 (openjpeg-2.1.0.tar.gz) = c2a255f6b51ca96dc85cd6e85c89d300018cb1cb
-RMD160 (openjpeg-2.1.0.tar.gz) = dc6e77a2539ab4071cf1a1b62f653fea13707b54
-SHA512 (openjpeg-2.1.0.tar.gz) = 3da84d7828a82c738f6ea5fe776c989283ba257cc6884aebfc090cee7e33c88471dee1a93f4a87a300b11f43b98f6624b838171f06227add24afcb1d57208df1
-Size (openjpeg-2.1.0.tar.gz) = 1789675 bytes
+SHA1 (openjpeg-2.1.1.tar.gz) = b995742c41abe58828d72ffec52404ec91111194
+RMD160 (openjpeg-2.1.1.tar.gz) = 14c2b72b41cfef2c088a9b3d042c40793fc41dfe
+SHA512 (openjpeg-2.1.1.tar.gz) = c7c5cd95a3b8bc643207fecdfbffd45c3d91e48196455ae42061862aebcd558c3e508c39513285b8ebb4f57b7316116d15cc74c0b9cc3e31c2a7b70d3e5e2cdd
+Size (openjpeg-2.1.1.tar.gz) = 1984111 bytes
 SHA1 (patch-CMakeLists.txt) = 3738946db63df4d623c6ce486bd22fa4d57336e2
-SHA1 (patch-aa) = 6201b76c91edd88ba23e18218f2951b5fb65eb24
-SHA1 (patch-src_bin_jp2_CMakeLists.txt) = cbb8e9f33fe781af54a1b7e44694413220d114a2
+SHA1 (patch-src_bin_jp2_CMakeLists.txt) = c9f709c23d6bab7a3c705640d66a00ec90ddabc7
 SHA1 (patch-src_lib_openjp2_CMakeLists.txt) = 85d7729bdebbc5ce520c69df7541575547b49708
-SHA1 (patch-src_lib_openjp2_opj__config__private.h.cmake.in) = 6b0b3ca45bfb80c586edeef81920a03e9d5eef2a
+SHA1 (patch-src_lib_openjp2_opj__config__private.h.cmake.in) = fc0c170789dbe0a2ebc9dce0ef0d21aa6b2edd49

Index: pkgsrc/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt
diff -u pkgsrc/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt:1.1 pkgsrc/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt:1.2
--- pkgsrc/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt:1.1       Thu May 15 14:14:54 2014
+++ pkgsrc/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt   Thu Jul 14 15:41:44 2016
@@ -1,18 +1,18 @@
-$NetBSD: patch-src_bin_jp2_CMakeLists.txt,v 1.1 2014/05/15 14:14:54 adam Exp $
+$NetBSD: patch-src_bin_jp2_CMakeLists.txt,v 1.2 2016/07/14 15:41:44 wiz Exp $
 
 Install man pages without building other docs.
 
---- src/bin/jp2/CMakeLists.txt.orig    2014-05-15 11:05:39.000000000 +0000
+--- src/bin/jp2/CMakeLists.txt.orig    2016-07-05 14:54:17.000000000 +0000
 +++ src/bin/jp2/CMakeLists.txt
-@@ -52,7 +52,6 @@ foreach(exe opj_decompress opj_compress 
-   )
+@@ -71,7 +71,6 @@ foreach(exe opj_decompress opj_compress 
+   endif()
  endforeach()
  
 -if(BUILD_DOC)
  # Install man pages
  install(
    FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
-@@ -60,4 +59,3 @@ install(
+@@ -79,4 +78,3 @@ install(
                ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
    DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
  #
Index: pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_opj__config__private.h.cmake.in
diff -u pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_opj__config__private.h.cmake.in:1.1 pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_opj__config__private.h.cmake.in:1.2
--- pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_opj__config__private.h.cmake.in:1.1  Fri Jan 23 17:15:09 2015
+++ pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_opj__config__private.h.cmake.in      Thu Jul 14 15:41:44 2016
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_lib_openjp2_opj__config__private.h.cmake.in,v 1.1 2015/01/23 17:15:09 pho Exp $
+$NetBSD: patch-src_lib_openjp2_opj__config__private.h.cmake.in,v 1.2 2016/07/14 15:41:44 wiz Exp $
 
 Add #cmakedefine for aligned malloc functions.
 See also patch-CMakeLists.txt
 
---- src/lib/openjp2/opj_config_private.h.cmake.in.orig 2014-04-29 07:15:02.000000000 +0000
+--- src/lib/openjp2/opj_config_private.h.cmake.in.orig 2016-07-05 14:54:17.000000000 +0000
 +++ src/lib/openjp2/opj_config_private.h.cmake.in
 @@ -12,6 +12,10 @@
  /*#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ */
@@ -16,10 +16,3 @@ See also patch-CMakeLists.txt
  #cmakedefine _LARGEFILE_SOURCE
  #cmakedefine _LARGE_FILES
  #cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
-@@ -28,4 +32,4 @@ On other platforms we use the result of 
- #cmakedefine OPJ_BIG_ENDIAN
- #elif defined(__BIG_ENDIAN__)
- # define OPJ_BIG_ENDIAN
--#endif
-\ No newline at end of file
-+#endif