Skip to content

deps: New PugiXML min 1.11, rely on cmake config now, bump vendored version #5246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lgritz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

deps: New PugiXML min 1.11, rely on cmake config now, bump vendored version #5246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ jobs:
LIBTIFF_VERSION=v4.7.1
OPENJPEG_VERSION=v2.5.4
PTEX_VERSION=v2.5.0
PUGIXML_VERSION=v1.15
PUGIXML_VERSION=v1.16
WEBP_VERSION=v1.6.0
FREETYPE_VERSION=VER-2-14-1
USE_OPENVDB=0
Expand Down Expand Up @@ -413,7 +413,7 @@ jobs:
LIBTIFF_VERSION=v4.7.1
OPENJPEG_VERSION=v2.5.4
PTEX_VERSION=v2.4.3
PUGIXML_VERSION=v1.15
PUGIXML_VERSION=v1.16
WEBP_VERSION=v1.6.0
FREETYPE_VERSION=VER-2-14-1
USE_OPENVDB=0
Expand All @@ -435,7 +435,7 @@ jobs:
LIBTIFF_VERSION=v4.7.1
OPENJPEG_VERSION=v2.5.4
PTEX_VERSION=v2.4.3
PUGIXML_VERSION=v1.15
PUGIXML_VERSION=v1.16
WEBP_VERSION=v1.6.0
FREETYPE_VERSION=VER-2-14-1
USE_OPENVDB=0
Expand All @@ -458,7 +458,7 @@ jobs:
setenvs: export CMAKE_VERSION=3.18.2
PTEX_VERSION=v2.3.2
WEBP_VERSION=v1.1.0
PUGIXML_VERSION=v1.8
PUGIXML_VERSION=v1.11
BUILD_PNG_VERSION=1.6.0
PIP_SUFFIX=.9
PIP_INSTALLS=numpy
Expand Down Expand Up @@ -486,7 +486,7 @@ jobs:
setenvs: export CMAKE_VERSION=3.18.2
PTEX_VERSION=v2.3.2
WEBP_VERSION=v1.1.0
PUGIXML_VERSION=v1.8
PUGIXML_VERSION=v1.11
BUILD_PNG_VERSION=1.6.0
PIP_SUFFIX=.9
PIP_INSTALLS=numpy
Expand Down Expand Up @@ -527,7 +527,7 @@ jobs:
USE_OPENCV=0
USE_LIBUHDR=0
FREETYPE_VERSION=VER-2-10-0
PUGIXML_VERSION=v1.8
PUGIXML_VERSION=v1.11
BUILD_PNG_VERSION=1.6.0
PIP_SUFFIX=.9
PIP_INSTALLS=numpy
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
tree, but if you want to use an external, system-installed version (as
may be required by some software distributions with policies against
embedding other projects), then just build with `-DUSE_EXTERNAL_PUGIXML=1`.
Any PugiXML >= 1.8 should be fine (we have tested through 1.15).
Any PugiXML >= 1.11 should be fine (we have tested through 1.16).



Expand Down
2 changes: 1 addition & 1 deletion src/build-scripts/build_pugixml.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set -ex

# Repo and branch/tag/commit of pugixml to download if we don't have it yet
PUGIXML_REPO=${PUGIXML_REPO:=https://github.com/zeux/pugixml.git}
PUGIXML_VERSION=${PUGIXML_VERSION:=v1.15}
PUGIXML_VERSION=${PUGIXML_VERSION:=v1.16}

# Where to put pugixml repo source (default to the ext area)
PUGIXML_SRC_DIR=${PUGIXML_SRC_DIR:=${PWD}/ext/pugixml}
Expand Down
4 changes: 2 additions & 2 deletions src/cmake/externalpackages.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ checked_find_package (JXL
# allow this to be overridden to use the distro-provided package if desired.
option (USE_EXTERNAL_PUGIXML "Use an externally built shared library version of the pugixml library" OFF)
if (USE_EXTERNAL_PUGIXML)
checked_find_package (pugixml REQUIRED
VERSION_MIN 1.8
checked_find_package (pugixml CONFIG REQUIRED
VERSION_MIN 1.11
DEFINITIONS USE_EXTERNAL_PUGIXML=1)
else ()
message (STATUS "Using internal PugiXML")
Expand Down
77 changes: 0 additions & 77 deletions src/cmake/modules/Findpugixml.cmake
View file
Open in desktop

This file was deleted.

22 changes: 13 additions & 9 deletions src/include/OpenImageIO/detail/pugixml/pugiconfig.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
/**
* pugixml parser - version 1.12
* pugixml parser - version 1.16
* --------------------------------------------------------
* Copyright (C) 2006-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
* Report bugs and download new versions at https://pugixml.org/
*
* This library is distributed under the MIT License. See notice at the end
* of this file.
* SPDX-FileCopyrightText: Copyright (C) 2006-2026, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
* SPDX-License-Identifier: MIT
*
* This work is based on the pugxml parser, which is:
* Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
* See LICENSE.md or notice at the end of this file.
*/
// clang-format off

Expand All @@ -18,6 +16,9 @@
// Uncomment this to enable wchar_t mode
// #define PUGIXML_WCHAR_MODE

// Uncomment this to enable from_chars/to_chars for number conversion
// #define PUGIXML_CHARCONV_FLOAT

// Uncomment this to enable compact mode
// #define PUGIXML_COMPACT

Expand Down Expand Up @@ -49,15 +50,18 @@
// #define PUGIXML_XPATH_DEPTH_LIMIT 1024

// Uncomment this to switch to header-only version
#define PUGIXML_HEADER_ONLY
// #define PUGIXML_HEADER_ONLY

// Uncomment this to enable long long support
// Uncomment this to enable long long support (usually enabled automatically)
// #define PUGIXML_HAS_LONG_LONG

// Uncomment this to enable support for std::string_view (usually enabled automatically)
// #define PUGIXML_HAS_STRING_VIEW

#endif

/**
* Copyright (c) 2006-2022 Arseny Kapoulkine
* Copyright (c) 2006-2026 Arseny Kapoulkine
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
Expand Down
Loading
Loading