From c744bdf5082ea64be00f7ed58132f0889e94a107 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 16 Dec 2020 07:38:34 +0800 Subject: [osg] build failure (#15044) --- ports/osg/CONTROL | 2 +- ports/osg/fix-example-application.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index 1a1fb7d6b..854c181a9 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-example-application.patch b/ports/osg/fix-example-application.patch index 3b4da587d..ebef27fd4 100644 --- a/ports/osg/fix-example-application.patch +++ b/ports/osg/fix-example-application.patch @@ -8,7 +8,7 @@ index df859d0..123313a 100644 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() @@ -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() -- cgit v1.2.3