From cf4ebef2294e164875ce17d7937f44d3e3ea156e Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 15 Mar 2024 18:40:20 -0700 Subject: [PATCH] [sdl2-mixer| sdl2-image| sdl2-ttf] fix pc file in debug pkgconfig (#37411) --- ports/sdl2-image/portfile.cmake | 4 ++++ ports/sdl2-image/vcpkg.json | 1 + ports/sdl2-mixer/portfile.cmake | 4 ++++ ports/sdl2-mixer/vcpkg.json | 2 +- ports/sdl2-ttf/portfile.cmake | 4 ++++ ports/sdl2-ttf/vcpkg.json | 1 + versions/baseline.json | 6 +++--- versions/s-/sdl2-image.json | 5 +++++ versions/s-/sdl2-mixer.json | 5 +++++ versions/s-/sdl2-ttf.json | 5 +++++ 10 files changed, 33 insertions(+), 4 deletions(-) diff --git a/ports/sdl2-image/portfile.cmake b/ports/sdl2-image/portfile.cmake index c541249bd8..6f30422bb5 100644 --- a/ports/sdl2-image/portfile.cmake +++ b/ports/sdl2-image/portfile.cmake @@ -40,6 +40,10 @@ endif() vcpkg_fixup_pkgconfig() +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/SDL2_image.pc" "-lSDL2_image" "-lSDL2_imaged") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/ports/sdl2-image/vcpkg.json b/ports/sdl2-image/vcpkg.json index 9e85351f15..2d775ee1bc 100644 --- a/ports/sdl2-image/vcpkg.json +++ b/ports/sdl2-image/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2-image", "version": "2.8.2", + "port-version": 1, "description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV", "homepage": "https://github.com/libsdl-org/SDL_image", "license": "Zlib", diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index f0ca49a2db..192a17efce 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -56,6 +56,10 @@ vcpkg_cmake_config_fixup( ) vcpkg_fixup_pkgconfig() +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/SDL2_mixer.pc" "-lSDL2_mixer" "-lSDL2_mixerd") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json index 76bb310bf6..b4b15731a2 100644 --- a/ports/sdl2-mixer/vcpkg.json +++ b/ports/sdl2-mixer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2-mixer", "version": "2.8.0", - "port-version": 1, + "port-version": 2, "description": "Multi-channel audio mixer library for SDL.", "homepage": "https://github.com/libsdl-org/SDL_mixer", "license": "Zlib", diff --git a/ports/sdl2-ttf/portfile.cmake b/ports/sdl2-ttf/portfile.cmake index a1d47276f8..1f080e1caa 100644 --- a/ports/sdl2-ttf/portfile.cmake +++ b/ports/sdl2-ttf/portfile.cmake @@ -28,6 +28,10 @@ endif() vcpkg_fixup_pkgconfig() +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/SDL2_ttf.pc" "-lSDL2_ttf" "-lSDL2_ttfd") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/licenses") diff --git a/ports/sdl2-ttf/vcpkg.json b/ports/sdl2-ttf/vcpkg.json index 0d8a49caa1..2c8ec7ffa8 100644 --- a/ports/sdl2-ttf/vcpkg.json +++ b/ports/sdl2-ttf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2-ttf", "version": "2.22.0", + "port-version": 1, "description": "A library for rendering TrueType fonts with SDL", "homepage": "https://www.libsdl.org/projects/SDL_ttf/", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index e10c93276e..53e46d0065 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7902,11 +7902,11 @@ }, "sdl2-image": { "baseline": "2.8.2", - "port-version": 0 + "port-version": 1 }, "sdl2-mixer": { "baseline": "2.8.0", - "port-version": 1 + "port-version": 2 }, "sdl2-mixer-ext": { "baseline": "2.6.0", @@ -7918,7 +7918,7 @@ }, "sdl2-ttf": { "baseline": "2.22.0", - "port-version": 0 + "port-version": 1 }, "sdl2pp": { "baseline": "0.16.1", diff --git a/versions/s-/sdl2-image.json b/versions/s-/sdl2-image.json index f6d94d3422..b3fcf8b704 100644 --- a/versions/s-/sdl2-image.json +++ b/versions/s-/sdl2-image.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3635f81751369912771ffb2bcafe46edec201fa5", + "version": "2.8.2", + "port-version": 1 + }, { "git-tree": "849a6f697c249f583d942ce2ce08ba3e4a9c195c", "version": "2.8.2", diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json index ee49538cc3..3b92aa2d3e 100644 --- a/versions/s-/sdl2-mixer.json +++ b/versions/s-/sdl2-mixer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c3753de43f2caf437f28a171665f37abe890109", + "version": "2.8.0", + "port-version": 2 + }, { "git-tree": "b28cae64adf73bec946de9f037724763eb2ef1b2", "version": "2.8.0", diff --git a/versions/s-/sdl2-ttf.json b/versions/s-/sdl2-ttf.json index 3c75ee4daa..b072d1a7fd 100644 --- a/versions/s-/sdl2-ttf.json +++ b/versions/s-/sdl2-ttf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f37d3fd61ea556591921d6faca01c9e309e4a091", + "version": "2.22.0", + "port-version": 1 + }, { "git-tree": "51a85aefcfb3e578904f1cbd72a9f49ff836b928", "version": "2.22.0",