livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add option to use OpenJPEG 2.1 instead of the real old and outdated 1.4 (Windows/Linux only).

meow-7.2.2
Nicky 2016-01-15 16:34:23 +01:00
parent 248d161342
commit cbc070af09
6 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
autobuild.xml
View File

@ -148,6 +148,49 @@
</map>
</map>
</map>
<key>openjpeg2</key>
<map>
<key>copyright</key>
<string>Copyright (c) 2002-2016, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium, Copyright (c) 2002-2007, Professor Benoit Macq, Copyright (c) 2001-2003, David Janssens, Copyright (c) 2002-2003, Yannick Verschueren, Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe, Copyright (c) 2005, Herve Drolon, FreeImage Team</string>
<key>description</key>
<string>The OpenJPEG library is an open-source JPEG 2000 codec written in C language.</string>
<key>license</key>
<string>BSD</string>
<key>license_file</key>
<string>LICENSES/openjpeg.txt</string>
<key>name</key>
<string>openjpeg2</string>
<key>platforms</key>
<map>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>bc784edaab1b786766b2f381a86b8710</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/openjpeg2-2.1.201601141919-r32-windows-201601141919-r32.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
<key>linux</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>3925c90f0d3f5523acdad063620d01d6</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/openjpeg2-2.1.201601141918-r32-linux-201601141918-r32.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
</map>
</map>
<key>version</key>
<string>2.1</string>
</map>
<key>SDL</key>
<map>

5
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -239,7 +239,7 @@ elseif(LINUX)
libgobject-2.0.so
libhunspell-1.3.so.0.0.0
libopenal.so
libopenjpeg.so
#libopenjpeg.so
libuuid.so.16
libuuid.so.16.0.22
libfontconfig.so.1.8.0
@ -254,6 +254,9 @@ elseif(LINUX)
libfreetype.so.6
)
endif( NOT ND_BUILD64BIT_ARCH )
if( NOT ND_USE_OPENJPEG2 )
set(release_files ${release_files} libopenjpeg.so )
endif( NOT ND_USE_OPENJPEG2 )
if (USE_TCMALLOC)

6
indra/cmake/OpenJPEG.cmake
View File

@ -1,6 +1,12 @@
# -*- cmake -*-
include(Prebuilt)
if( ND_USE_OPENJPEG2 )
message( "Using OpenJPEG2" )
include( OpenJPEG2 )
return()
endif( ND_USE_OPENJPEG2 )
set(OPENJPEG_FIND_QUIETLY ON)
set(OPENJPEG_FIND_REQUIRED ON)

8
indra/llimagej2coj/CMakeLists.txt
View File

@ -13,10 +13,18 @@ include_directories(
${OPENJPEG_INCLUDE_DIR}
)
if( NOT ND_USE_OPENJPEG2 )
set(llimagej2coj_SOURCE_FILES
llimagej2coj.cpp
)
else()
set(llimagej2coj_SOURCE_FILES
llimagej2coj2.cpp
)
endif()
set(llimagej2coj_HEADER_FILES
CMakeLists.txt

2
package_override_gcc.ini
View File

@ -38,7 +38,7 @@ linux = http://downloads.phoenixviewer.com/openal-1.12.854-1.1.0.201505150222-r
linux = http://downloads.phoenixviewer.com/libhunspell-1.3.2.201505150222-r21-linux-x64-201505150222-r21.tar.bz2|7341037efcf156ad7aa6ba67ab0413c5
[openjpeg]
linux = http://downloads.phoenixviewer.com/openjpeg-1.4.201505150222-r26-linux-x64-201505150222-r26.tar.bz2|f8a5ed12a0b45e0c48e04642ee736426
linux = http://downloads.phoenixviewer.com/openjpeg2-2.1.201601141020-r32-linux-x64-201601141020-r32.tar.bz2|8f4188c9a281425e26d89af0676bb6b7
[google_breakpad]
linux = http://downloads.phoenixviewer.com/google_breakpad-1413.201505150223-r95-linux-x64-201505150223-r95.tar.bz2|f8df27382e6afeee5408e85c010a6c86

2
package_override_vc12.ini
View File

@ -35,7 +35,7 @@ windows = http://downloads.phoenixviewer.com/glod-1.0pre4.201508040902-r83-windo
windows = http://downloads.phoenixviewer.com/libhunspell-1.3.2.201412051002-windows-x64-201412051002.tar.bz2|60feb84271fc5a36a5443b2fdd4ae488
[openjpeg]
windows = http://downloads.phoenixviewer.com/openjpeg-1.4.201412051021-windows-x64-201412051021.tar.bz2|47c09d96ae84fa4518b639cd93ba45b3
windows = http://downloads.phoenixviewer.com/openjpeg2-2.1.201601141917-r32-windows-x64-201601141917-r32.tar.bz2|0465f2221c22a7349e4ae49f751ae3d3
[google_breakpad]
windows = http://downloads.phoenixviewer.com/google_breakpad-1413.201505112008-r97-windows-x64-201505112008-r97.tar.bz2|5c838ef1438b1f4264ff393e0d5420bd