Use external libsquish if found #2451
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This patch checks for libsquish already on the system, and if found, uses it. If not found on the system, it falls back on the embedded version in src/dds.imageio/squish. CMake option USE_EMBEDDED_LIBSQUISH can be used to force use of the embedded version even if found on the system. Background: Our DDS support (by Leszek Godlewski in 2010, as a GSoC student) relies on an embedded copy of libsquish (MIT license) for DXT compression. Embedding was a reasonable choice at the time, but in 2020 it's easily installed an Ubuntu, Homebrew, Vcpkg. Furthermore, it's also a Debian package and runs up against their rule that we should never embed code that is available from other Debian packages that can be used as dependencies. This is all I want to do in this patch -- comply with Debian rules, and also reduce OIIO build time by relying on a prebuilt libsquish if found on the system. This won't break anybody's builds at this time if they don't have libsquish already installed, and should be safe to backport to 2.1 for Debian compliance. But in the future, we might make it a purely external dependency -- expect it on the system, and if not found, simply disable DDS support (like we do with many other optional dependency such as libwebp or libheif).
lgritz
added a commit
to lgritz/OpenImageIO
that referenced
this pull request
Jan 7, 2020
This patch checks for libsquish already on the system, and if found, uses it. If not found on the system, it falls back on the embedded version in src/dds.imageio/squish. CMake option USE_EMBEDDED_LIBSQUISH can be used to force use of the embedded version even if found on the system. Background: Our DDS support (by Leszek Godlewski in 2010, as a GSoC student) relies on an embedded copy of libsquish (MIT license) for DXT compression. Embedding was a reasonable choice at the time, but in 2020 it's easily installed an Ubuntu, Homebrew, Vcpkg. Furthermore, it's also a Debian package and runs up against their rule that we should never embed code that is available from other Debian packages that can be used as dependencies. This is all I want to do in this patch -- comply with Debian rules, and also reduce OIIO build time by relying on a prebuilt libsquish if found on the system. This won't break anybody's builds at this time if they don't have libsquish already installed, and should be safe to backport to 2.1 for Debian compliance. But in the future, we might make it a purely external dependency -- expect it on the system, and if not found, simply disable DDS support (like we do with many other optional dependency such as libwebp or libheif).
lgritz
added a commit
to lgritz/OpenImageIO
that referenced
this pull request
Jan 9, 2020
This patch checks for libsquish already on the system, and if found, uses it. If not found on the system, it falls back on the embedded version in src/dds.imageio/squish. CMake option USE_EMBEDDED_LIBSQUISH can be used to force use of the embedded version even if found on the system. Background: Our DDS support (by Leszek Godlewski in 2010, as a GSoC student) relies on an embedded copy of libsquish (MIT license) for DXT compression. Embedding was a reasonable choice at the time, but in 2020 it's easily installed an Ubuntu, Homebrew, Vcpkg. Furthermore, it's also a Debian package and runs up against their rule that we should never embed code that is available from other Debian packages that can be used as dependencies. This is all I want to do in this patch -- comply with Debian rules, and also reduce OIIO build time by relying on a prebuilt libsquish if found on the system. This won't break anybody's builds at this time if they don't have libsquish already installed, and should be safe to backport to 2.1 for Debian compliance. But in the future, we might make it a purely external dependency -- expect it on the system, and if not found, simply disable DDS support (like we do with many other optional dependency such as libwebp or libheif).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch checks for libsquish already on the system, and if found,
uses it. If not found on the system, it falls back on the embedded
version in src/dds.imageio/squish. CMake option USE_EMBEDDED_LIBSQUISH
can be used to force use of the embedded version even if found on the
system.
Background: Our DDS support (by Leszek Godlewski in 2010, as a GSoC
student) relies on an embedded copy of libsquish (MIT license) for DXT
compression. Embedding was a reasonable choice at the time, but in
2020 it's easily installed an Ubuntu, Homebrew, Vcpkg. Furthermore,
it's also a Debian package and runs up against their rule that we
should never embed code that is available from other Debian packages
that can be used as dependencies.
This is all I want to do in this patch -- comply with Debian rules,
and also reduce OIIO build time by relying on a prebuilt libsquish if
found on the system. This won't break anybody's builds at this time if
they don't have libsquish already installed, and should be safe to
backport to 2.1 for Debian compliance.
But in the future, we might make it a purely external dependency --
expect it on the system, and if not found, simply disable DDS support
(like we do with many other optional dependency such as libwebp or
libheif).