From 61cc320d89e73e041cb5097ca4e3c084c385eee9 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <13720414433@163.com> Date: Thu, 10 Dec 2020 16:31:05 +0800 Subject: [PATCH 1/5] [osg] build failure --- ports/osg/CONTROL | 2 +- ports/osg/fix-iconv-notfound.patch | 13 +++++++++++++ ports/osg/portfile.cmake | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/osg/fix-iconv-notfound.patch diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index 1a1fb7d6b8a1ad..854c181a942a35 100644 --- a/ports/osg/CONTROL +++ b/ports/osg/CONTROL @@ -1,6 +1,6 @@ Source: osg Version: 3.6.5 -Port-Version: 4 +Port-Version: 5 Homepage: https://github.com/openscenegraph/OpenSceneGraph Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit. Build-Depends: zlib, fontconfig, freeglut (windows), expat (windows), openimageio (osx) diff --git a/ports/osg/fix-iconv-notfound.patch b/ports/osg/fix-iconv-notfound.patch new file mode 100644 index 00000000000000..e15359ed198863 --- /dev/null +++ b/ports/osg/fix-iconv-notfound.patch @@ -0,0 +1,13 @@ +diff --git a/applications/present3D/CMakeLists.txt b/applications/present3D/CMakeLists.txt +index 8bf91e3..6195485 100644 +--- a/applications/present3D/CMakeLists.txt ++++ b/applications/present3D/CMakeLists.txt +@@ -105,7 +105,7 @@ IF (WIN32) + SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32) + + find_package(EXPAT REQUIRED) +- find_package(Iconv CONFIG REQUIRED) ++ find_package(Iconv REQUIRED) + + list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) + ELSE() diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 14fe4216822ee9..163f298b2af813 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( fix-nvtt.patch use-boost-asio.patch fix-dependency-coin.patch + fix-iconv-notfound.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") From 37739dabc6b077b31281cabd16df783bc3c855d4 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <13720414433@163.com> Date: Fri, 11 Dec 2020 14:38:03 +0800 Subject: [PATCH 2/5] Merge patchfile --- ports/osg/fix-example-application.patch | 67 ++++++++++++------------- ports/osg/fix-iconv-notfound.patch | 13 ----- ports/osg/portfile.cmake | 1 - 3 files changed, 33 insertions(+), 48 deletions(-) delete mode 100644 ports/osg/fix-iconv-notfound.patch diff --git a/ports/osg/fix-example-application.patch b/ports/osg/fix-example-application.patch index 3b4da587dd7656..a932ecdaf79b2e 100644 --- a/ports/osg/fix-example-application.patch +++ b/ports/osg/fix-example-application.patch @@ -1,34 +1,33 @@ -diff --git a/applications/present3D/CMakeLists.txt b/applications/present3D/CMakeLists.txt -index df859d0..123313a 100644 ---- a/applications/present3D/CMakeLists.txt -+++ b/applications/present3D/CMakeLists.txt -@@ -103,6 +103,11 @@ ENDIF() - IF (WIN32) - # to support cluster code - SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32) -+ -+ find_package(EXPAT REQUIRED) -+ find_package(Iconv CONFIG REQUIRED) -+ -+ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) - ELSE() - CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" LIB_NSL_HAS_GETHOSTBYNAME) - IF(LIB_NSL_HAS_GETHOSTBYNAME) -diff --git a/examples/osgstaticviewer/CMakeLists.txt b/examples/osgstaticviewer/CMakeLists.txt -index 071ab26..bf8d85f 100644 ---- a/examples/osgstaticviewer/CMakeLists.txt -+++ b/examples/osgstaticviewer/CMakeLists.txt -@@ -19,6 +19,13 @@ IF(FREETYPE_FOUND) - SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_freetype) - ENDIF(FREETYPE_FOUND) - -+IF (WIN32) -+ find_package(EXPAT REQUIRED) -+ find_package(Iconv CONFIG REQUIRED) -+ -+ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) -+ENDIF() -+ - SET(TARGET_SRC osgstaticviewer.cpp ) - #### end var setup ### - SETUP_EXAMPLE(osgstaticviewer) +diff --git a/applications/present3D/CMakeLists.txt b/applications/present3D/CMakeLists.txt +index df859d0..df13c86 100644 +--- a/applications/present3D/CMakeLists.txt ++++ b/applications/present3D/CMakeLists.txt +@@ -103,6 +103,10 @@ ENDIF() + IF (WIN32) + # to support cluster code + SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32) ++ ++ find_package(EXPAT REQUIRED) ++ find_package(Iconv REQUIRED) ++ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) + ELSE() + CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" LIB_NSL_HAS_GETHOSTBYNAME) + IF(LIB_NSL_HAS_GETHOSTBYNAME) +diff --git a/examples/osgstaticviewer/CMakeLists.txt b/examples/osgstaticviewer/CMakeLists.txt +index 071ab26..3a2939b 100644 +--- a/examples/osgstaticviewer/CMakeLists.txt ++++ b/examples/osgstaticviewer/CMakeLists.txt +@@ -19,6 +19,13 @@ IF(FREETYPE_FOUND) + SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_freetype) + ENDIF(FREETYPE_FOUND) + ++IF (WIN32) ++ find_package(EXPAT REQUIRED) ++ find_package(Iconv REQUIRED) ++ ++ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) ++ENDIF() ++ + SET(TARGET_SRC osgstaticviewer.cpp ) + #### end var setup ### + SETUP_EXAMPLE(osgstaticviewer) diff --git a/ports/osg/fix-iconv-notfound.patch b/ports/osg/fix-iconv-notfound.patch deleted file mode 100644 index e15359ed198863..00000000000000 --- a/ports/osg/fix-iconv-notfound.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/applications/present3D/CMakeLists.txt b/applications/present3D/CMakeLists.txt -index 8bf91e3..6195485 100644 ---- a/applications/present3D/CMakeLists.txt -+++ b/applications/present3D/CMakeLists.txt -@@ -105,7 +105,7 @@ IF (WIN32) - SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32) - - find_package(EXPAT REQUIRED) -- find_package(Iconv CONFIG REQUIRED) -+ find_package(Iconv REQUIRED) - - list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) - ELSE() diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 163f298b2af813..14fe4216822ee9 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -18,7 +18,6 @@ vcpkg_from_github( fix-nvtt.patch use-boost-asio.patch fix-dependency-coin.patch - fix-iconv-notfound.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") From 1d8e0ce40cdb1c1c37f6beab2d20422b3477c8c5 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <13720414433@163.com> Date: Fri, 11 Dec 2020 14:40:14 +0800 Subject: [PATCH 3/5] Modify the patch file format --- ports/osg/fix-example-application.patch | 66 ++++++++++++------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/ports/osg/fix-example-application.patch b/ports/osg/fix-example-application.patch index a932ecdaf79b2e..e6719de38c3bf0 100644 --- a/ports/osg/fix-example-application.patch +++ b/ports/osg/fix-example-application.patch @@ -1,33 +1,33 @@ -diff --git a/applications/present3D/CMakeLists.txt b/applications/present3D/CMakeLists.txt -index df859d0..df13c86 100644 ---- a/applications/present3D/CMakeLists.txt -+++ b/applications/present3D/CMakeLists.txt -@@ -103,6 +103,10 @@ ENDIF() - IF (WIN32) - # to support cluster code - SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32) -+ -+ find_package(EXPAT REQUIRED) -+ find_package(Iconv REQUIRED) -+ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) - ELSE() - CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" LIB_NSL_HAS_GETHOSTBYNAME) - IF(LIB_NSL_HAS_GETHOSTBYNAME) -diff --git a/examples/osgstaticviewer/CMakeLists.txt b/examples/osgstaticviewer/CMakeLists.txt -index 071ab26..3a2939b 100644 ---- a/examples/osgstaticviewer/CMakeLists.txt -+++ b/examples/osgstaticviewer/CMakeLists.txt -@@ -19,6 +19,13 @@ IF(FREETYPE_FOUND) - SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_freetype) - ENDIF(FREETYPE_FOUND) - -+IF (WIN32) -+ find_package(EXPAT REQUIRED) -+ find_package(Iconv REQUIRED) -+ -+ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) -+ENDIF() -+ - SET(TARGET_SRC osgstaticviewer.cpp ) - #### end var setup ### - SETUP_EXAMPLE(osgstaticviewer) +diff --git a/applications/present3D/CMakeLists.txt b/applications/present3D/CMakeLists.txt +index df859d0..df13c86 100644 +--- a/applications/present3D/CMakeLists.txt ++++ b/applications/present3D/CMakeLists.txt +@@ -103,6 +103,10 @@ ENDIF() + IF (WIN32) + # to support cluster code + SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32) ++ ++ find_package(EXPAT REQUIRED) ++ find_package(Iconv REQUIRED) ++ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) + ELSE() + CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" LIB_NSL_HAS_GETHOSTBYNAME) + IF(LIB_NSL_HAS_GETHOSTBYNAME) +diff --git a/examples/osgstaticviewer/CMakeLists.txt b/examples/osgstaticviewer/CMakeLists.txt +index 071ab26..3a2939b 100644 +--- a/examples/osgstaticviewer/CMakeLists.txt ++++ b/examples/osgstaticviewer/CMakeLists.txt +@@ -19,6 +19,13 @@ IF(FREETYPE_FOUND) + SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_freetype) + ENDIF(FREETYPE_FOUND) + ++IF (WIN32) ++ find_package(EXPAT REQUIRED) ++ find_package(Iconv REQUIRED) ++ ++ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) ++ENDIF() ++ + SET(TARGET_SRC osgstaticviewer.cpp ) + #### end var setup ### + SETUP_EXAMPLE(osgstaticviewer) From 2723fd765efc98e58022ef2fe2f77590305ee47b Mon Sep 17 00:00:00 2001 From: JonLiu1993 <13720414433@163.com> Date: Mon, 14 Dec 2020 14:46:24 +0800 Subject: [PATCH 4/5] Modify the patch --- ports/osg/fix-example-application.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ports/osg/fix-example-application.patch b/ports/osg/fix-example-application.patch index e6719de38c3bf0..316a08f6ea81ea 100644 --- a/ports/osg/fix-example-application.patch +++ b/ports/osg/fix-example-application.patch @@ -1,20 +1,21 @@ diff --git a/applications/present3D/CMakeLists.txt b/applications/present3D/CMakeLists.txt -index df859d0..df13c86 100644 +index df859d0..123313a 100644 --- a/applications/present3D/CMakeLists.txt +++ b/applications/present3D/CMakeLists.txt -@@ -103,6 +103,10 @@ ENDIF() +@@ -103,6 +103,11 @@ ENDIF() IF (WIN32) # to support cluster code SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32) -+ ++ + find_package(EXPAT REQUIRED) -+ find_package(Iconv REQUIRED) ++ find_package(Iconv REQUIRED) ++ + list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) ELSE() CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" LIB_NSL_HAS_GETHOSTBYNAME) IF(LIB_NSL_HAS_GETHOSTBYNAME) diff --git a/examples/osgstaticviewer/CMakeLists.txt b/examples/osgstaticviewer/CMakeLists.txt -index 071ab26..3a2939b 100644 +index 071ab26..bf8d85f 100644 --- a/examples/osgstaticviewer/CMakeLists.txt +++ b/examples/osgstaticviewer/CMakeLists.txt @@ -19,6 +19,13 @@ IF(FREETYPE_FOUND) @@ -23,7 +24,7 @@ index 071ab26..3a2939b 100644 +IF (WIN32) + find_package(EXPAT REQUIRED) -+ find_package(Iconv REQUIRED) ++ find_package(Iconv CONFIG REQUIRED) + + list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) +ENDIF() From bd2f733b935c5510071397aa7760a2199be7b169 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Mon, 14 Dec 2020 15:14:31 +0800 Subject: [PATCH 5/5] Update fix-example-application.patch --- ports/osg/fix-example-application.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/osg/fix-example-application.patch b/ports/osg/fix-example-application.patch index 316a08f6ea81ea..ebef27fd4764f6 100644 --- a/ports/osg/fix-example-application.patch +++ b/ports/osg/fix-example-application.patch @@ -24,7 +24,7 @@ index 071ab26..bf8d85f 100644 +IF (WIN32) + find_package(EXPAT REQUIRED) -+ find_package(Iconv CONFIG REQUIRED) ++ find_package(Iconv REQUIRED) + + list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) +ENDIF()