Skip to content
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

Jump to bottom

[libpng] Remove -DPNG_PREFIX=a option when apng feature enabled #40280

Merged
merged 2 commits into from
Aug 8, 2024
Merged

[libpng] Remove -DPNG_PREFIX=a option when apng feature enabled #40280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
671ffde
[libpng] Remove -DPNG_PREFIX=a option when apng feature enabled
ADKaster Aug 5, 2024
43db531
[libpng] Update version baseline
ADKaster Aug 5, 2024
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
3 changes: 0 additions & 3 deletions ports/libpng/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Download the apng patch
set(LIBPNG_APNG_PATCH_PATH "")
set(LIBPNG_APNG_OPTION "")
if ("apng" IN_LIST FEATURES)
if(VCPKG_HOST_IS_WINDOWS)
# Get (g)awk and gzip installed
Expand All @@ -25,7 +24,6 @@ if ("apng" IN_LIST FEATURES)
LOGNAME extract-patch.log
)
endif()
set(LIBPNG_APNG_OPTION "-DPNG_PREFIX=a")
endif()

vcpkg_from_github(
Expand Down Expand Up @@ -73,7 +71,6 @@ endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${LIBPNG_APNG_OPTION}
${LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION}
${LD_VERSION_SCRIPT_OPTION}
-DPNG_STATIC=${PNG_STATIC}
Expand Down
2 changes: 1 addition & 1 deletion ports/libpng/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libpng",
"version": "1.6.43",
"port-version": 2,
"port-version": 3,
"description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files",
"homepage": "https://github.com/glennrp/libpng",
"license": "libpng-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4882,7 +4882,7 @@
},
"libpng": {
"baseline": "1.6.43",
"port-version": 2
"port-version": 3
},
"libpopt": {
"baseline": "1.16",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libpng.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9c7fd06f1cdd1dfc08b35ca9d6b0ba470cdd2470",
"version": "1.6.43",
"port-version": 3
},
{
"git-tree": "915cc8e8e0adbfb2708a310635217811a849d709",
"version": "1.6.43",
Expand Down
Loading