The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[devil] Fix static builds

Browse Source
This commit is contained in:
Robert Schumacher 2018-10-17 11:41:58 -07:00
parent f520aacf0e
commit 17766ecd8c
4 changed files with 39 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ports/devil/0001_fix-encoding.patch
View File

@ -1,7 +1,7 @@
diff --git a/src-ILU/include/ilu_error/ilu_err-french.h b/src-ILU/include/ilu_error/ilu_err-french.h
diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-french.h b/DevIL/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
--- a/DevIL/src-ILU/include/ilu_error/ilu_err-french.h
+++ b/DevIL/src-ILU/include/ilu_error/ilu_err-french.h
@@ -17,19 +17,19 @@
#include "ilu_internal.h"
@ -41,10 +41,10 @@ index d3b280d..445440e 100644
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
diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-german.h b/DevIL/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
--- a/DevIL/src-ILU/include/ilu_error/ilu_err-german.h
+++ b/DevIL/src-ILU/include/ilu_error/ilu_err-german.h
@@ -6,7 +6,7 @@
//
// Filename: src-ILU/include/ilu_error/ilu_err_German.h
@ -91,10 +91,10 @@ index bf3f05c..acdbe8a 100644
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
diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-italian.h b/DevIL/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
--- a/DevIL/src-ILU/include/ilu_error/ilu_err-italian.h
+++ b/DevIL/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"),
@ -112,10 +112,10 @@ index 09d7bd1..d34b23f 100644
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
diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h b/DevIL/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
--- a/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h
+++ b/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h
@@ -6,7 +6,7 @@
//
// Filename: src-ILU/include/ilu_error/ilu_err-spanish.h

36
ports/devil/0002_fix-missing-mfc-includes.patch
View File

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

12
ports/devil/enable-static.patch
View File

@ -1,7 +1,7 @@
diff --git a/devil/src-ILU/CMakeLists.txt b/devil/src-ILU/CMakeLists.txt
diff --git a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt
index 17a3afe..a46ab41 100644
--- a/devil/src-ILU/CMakeLists.txt
+++ b/devil/src-ILU/CMakeLists.txt
--- a/DevIL/src-ILU/CMakeLists.txt
+++ b/DevIL/src-ILU/CMakeLists.txt
@@ -43,7 +43,7 @@ source_group("Header Files" FILES ${ILU_INC} )
source_group("Resource Files" FILES ${ILU_RSRC} )
@ -11,10 +11,10 @@ index 17a3afe..a46ab41 100644
## ILU requires IL
diff --git a/devil/src-ILUT/CMakeLists.txt b/devil/src-ILUT/CMakeLists.txt
diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt
index 21470cb..398d3c1 100644
--- a/devil/src-ILUT/CMakeLists.txt
+++ b/devil/src-ILUT/CMakeLists.txt
--- a/DevIL/src-ILUT/CMakeLists.txt
+++ b/DevIL/src-ILUT/CMakeLists.txt
@@ -43,7 +43,7 @@ source_group("Header Files" FILES ${ILUT_INC} )
source_group("Resource Files" FILES ${ILUT_RSRC} )

10
ports/devil/portfile.cmake
View File

@ -8,14 +8,10 @@ vcpkg_from_github(
REF v${DEVIL_VERSION}
SHA512 4aed5e50a730ece8b1eb6b2f6204374c6fb6f5334cf7c880d84c0f79645ea7c6b5118f57a7868a487510fc59c452f51472b272215d4c852f265f58b5857e17c7
HEAD_REF master
)
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
${CMAKE_CURRENT_LIST_DIR}/enable-static.patch
0001_fix-encoding.patch
0002_fix-missing-mfc-includes.patch
enable-static.patch
)
set(IL_NO_PNG 1)