Add DevIL port

This commit is contained in:
Lyrex 2017-10-30 04:50:29 +01:00
parent 7c3f469568
commit 31bbb8be37
4 changed files with 332 additions and 0 deletions

View File

@ -0,0 +1,173 @@
diff --git a/src-ILU/include/ilu_error/ilu_err-french.h b/src-ILU/include/ilu_error/ilu_err-french.h
index d3b280d..445440e 100644
--- a/src-ILU/include/ilu_error/ilu_err-french.h
+++ b/src-ILU/include/ilu_error/ilu_err-french.h
@@ -17,19 +17,19 @@
#include "ilu_internal.h"
ILconst_string iluErrorStringsFrench[IL_FILE_READ_ERROR - IL_INVALID_ENUM + 1] = {
- IL_TEXT("énumération invalide"),
- IL_TEXT("dépassement de mémoire"),
- IL_TEXT("format non supporté"),
+ IL_TEXT("énumération invalide"),
+ IL_TEXT("dépassement de mémoire"),
+ IL_TEXT("format non supporté"),
IL_TEXT("erreur interne"),
- IL_TEXT("valeur illégale"),
- IL_TEXT("opération illégale"),
- IL_TEXT("valeur de fichier illégale"),
- IL_TEXT("en-tête de fichier invalide"),
- IL_TEXT("paramètre invalide"),
+ IL_TEXT("valeur illégale"),
+ IL_TEXT("opération illégale"),
+ IL_TEXT("valeur de fichier illégale"),
+ IL_TEXT("en-tête de fichier invalide"),
+ IL_TEXT("paramètre invalide"),
IL_TEXT("ne peut pas ouvrir le fichier"),
IL_TEXT("extension invalide"),
- IL_TEXT("fichier déjà existant"),
- IL_TEXT("équivalent hors-format"),
+ IL_TEXT("fichier déjà existant"),
+ IL_TEXT("équivalent hors-format"),
IL_TEXT("stack overflow"), //often used like this in French, so no need to translate
IL_TEXT("stack underflow"),
IL_TEXT("conversion invalide"),
@@ -38,7 +38,7 @@ ILconst_string iluErrorStringsFrench[IL_FILE_READ_ERROR - IL_INVALID_ENUM + 1] =
};
ILconst_string iluLibErrorStringsFrench[IL_LIB_EXR_ERROR - IL_LIB_GIF_ERROR + 1] = {
- IL_TEXT("gif : erreur dans la librairie"), //or: gif : erreur dans la bibliothèque (but less used)
+ IL_TEXT("gif : erreur dans la librairie"), //or: gif : erreur dans la bibliothèque (but less used)
IL_TEXT("jpeg : erreur dans la librairie"),
IL_TEXT("png : erreur dans la librairie"),
IL_TEXT("tiff : erreur dans la librairie"),
diff --git a/src-ILU/include/ilu_error/ilu_err-german.h b/src-ILU/include/ilu_error/ilu_err-german.h
index bf3f05c..acdbe8a 100644
--- a/src-ILU/include/ilu_error/ilu_err-german.h
+++ b/src-ILU/include/ilu_error/ilu_err-german.h
@@ -6,7 +6,7 @@
//
// Filename: src-ILU/include/ilu_error/ilu_err_German.h
//
-// Description: Error functions in German, translated by Andreas Stöckel.
+// Description: Error functions in German, translated by Andreas Stöckel.
//
//-----------------------------------------------------------------------------
@@ -17,23 +17,23 @@
#include "ilu_internal.h"
ILconst_string iluErrorStringsGerman[IL_FILE_READ_ERROR - IL_INVALID_ENUM + 1] = {
- IL_TEXT("Ungültiger Enumerator"),
- IL_TEXT("Kein Speicher verfügbar"),
- IL_TEXT("Das Format wird noch nicht unterstützt"),
+ IL_TEXT("Ungültiger Enumerator"),
+ IL_TEXT("Kein Speicher verfügbar"),
+ IL_TEXT("Das Format wird noch nicht unterstützt"),
IL_TEXT("Interner Fehler"),
- IL_TEXT("Ungültiger Wert"),
- IL_TEXT("Unzulässige Operation"),
- IL_TEXT("Unzulässiger Datei-Wert"),
- IL_TEXT("Unzulässiger Datei-Header"),
- IL_TEXT("Unzulässiger Parameter"),
- IL_TEXT("Datei konnte nicht geöffnet werden"),
- IL_TEXT("Ungültiger Erweiterung"),
+ IL_TEXT("Ungültiger Wert"),
+ IL_TEXT("Unzulässige Operation"),
+ IL_TEXT("Unzulässiger Datei-Wert"),
+ IL_TEXT("Unzulässiger Datei-Header"),
+ IL_TEXT("Unzulässiger Parameter"),
+ IL_TEXT("Datei konnte nicht geöffnet werden"),
+ IL_TEXT("Ungültiger Erweiterung"),
IL_TEXT("Die Datei existiert bereits"),
IL_TEXT("out format equivalent"),
- IL_TEXT("Stack Überlauf"),
+ IL_TEXT("Stack Ãœberlauf"),
IL_TEXT("Stack Unterlauf"),
- IL_TEXT("Ungültige Konvertierung"),
- IL_TEXT("Unzulässige Abmessungen"),
+ IL_TEXT("Ungültige Konvertierung"),
+ IL_TEXT("Unzulässige Abmessungen"),
IL_TEXT("Fehler beim Lesen der Datei")
};
diff --git a/src-ILU/include/ilu_error/ilu_err-italian.h b/src-ILU/include/ilu_error/ilu_err-italian.h
index 09d7bd1..d34b23f 100644
--- a/src-ILU/include/ilu_error/ilu_err-italian.h
+++ b/src-ILU/include/ilu_error/ilu_err-italian.h
@@ -22,13 +22,13 @@ ILconst_string iluErrorStringsItalian[IL_FILE_READ_ERROR - IL_INVALID_ENUM + 1]
IL_TEXT("configuri non sostenne"),
IL_TEXT("erreur interne"),
IL_TEXT("errore interno"),
- IL_TEXT("opération illégale"),
+ IL_TEXT("opération illégale"),
IL_TEXT("operazione illegale"),
IL_TEXT("inebri archivio nullo"),
IL_TEXT("parametro nullo"),
- IL_TEXT("non può aprire l'archivio"),
+ IL_TEXT("non può aprire l'archivio"),
IL_TEXT("dilazione nulla"),
- IL_TEXT("archivi già esistendo"),
+ IL_TEXT("archivi già esistendo"),
IL_TEXT("equivalente fuori-configuri"),
IL_TEXT("inondi di batteria"),
IL_TEXT("insufficienza di batteria"),
diff --git a/src-ILU/include/ilu_error/ilu_err-spanish.h b/src-ILU/include/ilu_error/ilu_err-spanish.h
index 77b5a24..0945fdf 100644
--- a/src-ILU/include/ilu_error/ilu_err-spanish.h
+++ b/src-ILU/include/ilu_error/ilu_err-spanish.h
@@ -6,7 +6,7 @@
//
// Filename: src-ILU/include/ilu_error/ilu_err-spanish.h
//
-// Description: Error functions in Spanish, translated by Carlos Aragonés
+// Description: Error functions in Spanish, translated by Carlos Aragonés
//
//-----------------------------------------------------------------------------
@@ -19,32 +19,32 @@
ILconst_string iluErrorStringsSpanish[IL_FILE_READ_ERROR - IL_INVALID_ENUM + 1] = {
IL_TEXT("enumerador incorrecto"),
IL_TEXT("no queda memoria disponible"),
- IL_TEXT("formato no soportado todavía"),
+ IL_TEXT("formato no soportado todavía"),
IL_TEXT("error interno"),
IL_TEXT("valor incorrecto"),
- IL_TEXT("operación ilegaIL_TEXT("),
+ IL_TEXT("operación ilegaIL_TEXT("),
IL_TEXT("valor de fichero ilegaIL_TEXT("),
IL_TEXT("cabecera incorrecta"),
- IL_TEXT("parámetro incorrecto"),
+ IL_TEXT("parámetro incorrecto"),
IL_TEXT("no se puede abrir el fichero"),
- IL_TEXT("extensión desconocida"),
+ IL_TEXT("extensión desconocida"),
IL_TEXT("el fichero ya existe"),
IL_TEXT("formato de salida equivalente"),
IL_TEXT("desbordamiento superior de pila"),
IL_TEXT("desbordamiento inferior de pila"),
- IL_TEXT("conversión incorrecta"),
- IL_TEXT("número de dimensiones incorrecto"),
+ IL_TEXT("conversión incorrecta"),
+ IL_TEXT("número de dimensiones incorrecto"),
IL_TEXT("error de lectura en el fichero")
};
ILconst_string iluLibErrorStringsSpanish[IL_LIB_EXR_ERROR - IL_LIB_GIF_ERROR + 1] = {
- IL_TEXT("error en la librería gif"), // the correct translation will be 'error en la biblioteca gif', but nobody in spain uses the word 'biblioteca' for the translation the word 'library'. Almost all Spanish programmers translate 'library' incorrectly to 'librería'.
- IL_TEXT("error en la librería jpeg"),
- IL_TEXT("error en la librería png"),
- IL_TEXT("error en la librería tiff"),
- IL_TEXT("error en la librería mng"),
- IL_TEXT("error en la librería jp2"),
- IL_TEXT("error en la librería exr"),
+ IL_TEXT("error en la librería gif"), // the correct translation will be 'error en la biblioteca gif', but nobody in spain uses the word 'biblioteca' for the translation the word 'library'. Almost all Spanish programmers translate 'library' incorrectly to 'librería'.
+ IL_TEXT("error en la librería jpeg"),
+ IL_TEXT("error en la librería png"),
+ IL_TEXT("error en la librería tiff"),
+ IL_TEXT("error en la librería mng"),
+ IL_TEXT("error en la librería jp2"),
+ IL_TEXT("error en la librería exr"),
};
ILconst_string iluMiscErrorStringsSpanish[2] = {

View File

@ -0,0 +1,102 @@
diff --git a/src-IL/msvc/IL Unicode.rc b/src-IL/msvc/IL Unicode.rc
index 346758f..298a207 100644
--- a/src-IL/msvc/IL Unicode.rc
+++ b/src-IL/msvc/IL Unicode.rc
@@ -7,7 +7,11 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include "resource.h"
+
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
diff --git a/src-IL/msvc/IL.rc b/src-IL/msvc/IL.rc
index 8bfadf9..0b8289f 100644
--- a/src-IL/msvc/IL.rc
+++ b/src-IL/msvc/IL.rc
@@ -7,10 +7,13 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include "resource.h"
-/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (United States) resources
diff --git a/src-IL/msvc8/IL Unicode.rc b/src-IL/msvc8/IL Unicode.rc
index 026ee49..66ca4bf 100644
--- a/src-IL/msvc8/IL Unicode.rc
+++ b/src-IL/msvc8/IL Unicode.rc
@@ -7,7 +7,10 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include "resource.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
diff --git a/src-IL/msvc8/IL.rc b/src-IL/msvc8/IL.rc
index 9301d41..3ad52c0 100644
--- a/src-IL/msvc8/IL.rc
+++ b/src-IL/msvc8/IL.rc
@@ -7,7 +7,10 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include "resource.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
diff --git a/src-IL/msvc9/IL Unicode.rc b/src-IL/msvc9/IL Unicode.rc
index d0dff4f..c9cf51f 100644
--- a/src-IL/msvc9/IL Unicode.rc
+++ b/src-IL/msvc9/IL Unicode.rc
@@ -7,7 +7,10 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include "resource.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
diff --git a/src-IL/msvc9/IL.rc b/src-IL/msvc9/IL.rc
index 9f5c795..6b8c891 100644
--- a/src-IL/msvc9/IL.rc
+++ b/src-IL/msvc9/IL.rc
@@ -7,7 +7,10 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include "resource.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

4
ports/devil/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: devil
Version: 1.8.0
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp, libraw, jxrlib, openexr, jasper, liblzma
Description: A full featured cross-platform image library

View File

@ -0,0 +1,53 @@
# Common Ambient Variables:
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# PORT = current port name (zlib, etc)
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
#
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(DEVIL_VERSION 1.8.0)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO DentonW/DevIL
REF v${DEVIL_VERSION}
SHA512 4aed5e50a730ece8b1eb6b2f6204374c6fb6f5334cf7c880d84c0f79645ea7c6b5118f57a7868a487510fc59c452f51472b272215d4c852f265f58b5857e17c7
HEAD_REF master
)
set(DEVIL_SHARED OFF)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(DEVIL_SHARED ON)
else()
set(DEVIL_SHARED OFF)
endif()
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}/DevIL
PATCHES
${CMAKE_CURRENT_LIST_DIR}/0001_fix-encoding.patch
${CMAKE_CURRENT_LIST_DIR}/0002_fix-missing-mfc-includes.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/DevIL
PREFER_NINJA
OPTIONS
-DBUILD_SHARED_LIBS=${DEVIL_SHARED}
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/devil RENAME copyright)