diff options
| author | ankurverma85 <31362771+ankurverma85@users.noreply.github.com> | 2021-01-20 16:22:09 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-20 16:22:09 -0800 |
| commit | 9d98893b09d3e3574970172e2da45220b9ec59fe (patch) | |
| tree | f54209cdd53fb38a259f6b7372e79f6ab50d8dd5 | |
| parent | 93db9aced19c819cf0040a2d628f73b246653439 (diff) | |
| download | vcpkg-9d98893b09d3e3574970172e2da45220b9ec59fe.tar.gz vcpkg-9d98893b09d3e3574970172e2da45220b9ec59fe.zip | |
[osg] fix x64-windows-static-md builds (#15374)
* Trim out dependencies
* Fix static compilation
* Update ports/osg/CONTROL
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update baseline
Co-authored-by: ankurv <ankurv@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
| -rw-r--r-- | port_versions/baseline.json | 2 | ||||
| -rw-r--r-- | port_versions/o-/osg.json | 5 | ||||
| -rw-r--r-- | ports/osg/CONTROL | 4 | ||||
| -rw-r--r-- | ports/osg/osgdb_zip_nozip.patch | 52 | ||||
| -rw-r--r-- | ports/osg/portfile.cmake | 1 |
5 files changed, 61 insertions, 3 deletions
diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 30c6d3c70..c2685e0d3 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4346,7 +4346,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 5 + "port-version": 6 }, "osg-qt": { "baseline": "Qt4", diff --git a/port_versions/o-/osg.json b/port_versions/o-/osg.json index 5901d4ba9..973c0de20 100644 --- a/port_versions/o-/osg.json +++ b/port_versions/o-/osg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "9b787269fae66af2447354c4e76ce0883c8d93b9", + "version-string": "3.6.5", + "port-version": 6 + }, + { "git-tree": "de60b215a6e17bc6651d212874ffdaf513bdbf16", "version-string": "3.6.5", "port-version": 5 diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index 854c181a9..8d453c36c 100644 --- a/ports/osg/CONTROL +++ b/ports/osg/CONTROL @@ -1,9 +1,9 @@ Source: osg Version: 3.6.5 -Port-Version: 5 +Port-Version: 6 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) +Build-Depends: zlib, fontconfig (!windows), expat (windows), openimageio (osx) Feature: collada Description: Support for Collada (.dae) files diff --git a/ports/osg/osgdb_zip_nozip.patch b/ports/osg/osgdb_zip_nozip.patch new file mode 100644 index 000000000..a16deca97 --- /dev/null +++ b/ports/osg/osgdb_zip_nozip.patch @@ -0,0 +1,52 @@ +From bee432e701c541f9a86bd051b795c3e056e36646 Mon Sep 17 00:00:00 2001
+From: Ankur Verma <ankurv@localhost.localdomain>
+Date: Sun, 16 Aug 2020 14:36:31 -0700
+Subject: [PATCH] osg
+
+---
+ src/osgPlugins/zip/unzip.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/osgPlugins/zip/unzip.cpp b/src/osgPlugins/zip/unzip.cpp
+index 0bec28f0c..74e7b2413 100644
+--- a/src/osgPlugins/zip/unzip.cpp
++++ b/src/osgPlugins/zip/unzip.cpp
+@@ -1742,8 +1742,8 @@ int inflate_blocks_free(inflate_blocks_statef *s, z_streamp z)
+
+
+
+-extern const char inflate_copyright[] =
+- " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
++//extern const char inflate_copyright[] =
++// " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
+ // If you use the zlib library in a product, an acknowledgment is welcome
+ // in the documentation of your product. If for some reason you cannot
+ // include such an acknowledgment, I would appreciate that you keep this
+--
+2.26.2
+
+From 24d4036036884b350bd6c519b64626faa2c7e660 Mon Sep 17 00:00:00 2001
+From: Ankur Verma <ankurv@localhost.localdomain>
+Date: Thu, 20 Aug 2020 23:16:12 -0700
+Subject: [PATCH] Symbol clashes
+
+---
+ src/osgPlugins/zip/unzip.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/osgPlugins/zip/unzip.cpp b/src/osgPlugins/zip/unzip.cpp
+index 74e7b2413..f5169c6f4 100644
+--- a/src/osgPlugins/zip/unzip.cpp
++++ b/src/osgPlugins/zip/unzip.cpp
+@@ -213,7 +213,7 @@ DWORD GetFilePosU(HANDLE hfout)
+ return ftell(hfout);
+ }
+
+-bool FileExists(const TCHAR *fn)
++static bool FileExists(const TCHAR *fn)
+ { struct stat st;
+ int res=stat(fn,&st);
+ return (res==0);
+--
+2.26.2
+
diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 14fe42168..eaa94c2dd 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 + osgdb_zip_nozip.patch # This is fix symbol clashes with other libs when built in static-lib mode ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") |