[libxmp] Update to v4.6.0 (#32110)

This commit is contained in:
Denis Barkar 2023-06-22 04:55:07 +04:00 committed by GitHub
parent aa5e934ffd
commit d5e4b2f928
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 33 deletions

View File

@ -1,26 +0,0 @@
diff --git a/src/depackers/ptpopen.c b/src/depackers/ptpopen.c
index 421faf08c6bf83e38fbb795595f1a8cf79691b16..a11ade9d81267346a0a3970723de2dc12f62c189 100644
--- a/src/depackers/ptpopen.c
+++ b/src/depackers/ptpopen.c
@@ -12,7 +12,7 @@
* useful. -- Kurt Keller, Aug 2013
*/
-#ifdef _WIN32
+#if defined(_WIN32 ) && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP))
#include "ptpopen.h"
diff --git a/src/depackers/depacker.c b/src/depackers/depacker.c
index 7ff76513781d7daf79135ddf578db94f826f6e19..429a421e29fe1c17ed1d79a5e0d376dbfe04e7b9 100644
--- a/src/depackers/depacker.c
+++ b/src/depackers/depacker.c
@@ -28,7 +28,7 @@
#include "../tempfile.h"
#include "xfnmatch.h"
-#ifdef _WIN32
+#if defined(_WIN32 ) && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP))
/* Note: The _popen function returns an invalid file opaque, if
* used in a Windows program, that will cause the program to hang
* indefinitely. _popen works properly in a Console application.

View File

@ -1,11 +1,10 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libxmp/libxmp
REF 2c339d0f7517e464d3f2f743212ca76c8c6fe1f1
SHA512 6c8eca7e37ad9b51b4d9aea08f253c6c4c34f01bfc44b2be4066450b8e34c4bc96a1d1129edc761de4d2e281f718f8d969ce86273af23e37ee172072af8b0a2c
REF libxmp-${VERSION}
SHA512 5f7690e274f3857bd6889cd2ba637473f4a85359a6ef87c76313f87d0c725e3880ba6e428b542dbbf0c8a7725a87b5019289b3f19d2c5bb49527b380f1b4f7e4
PATCHES
fix-cmake-config-dir.patch
fix-uwp-build.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)

View File

@ -1,7 +1,6 @@
{
"name": "libxmp",
"version-date": "2023-04-13",
"port-version": 1,
"version": "4.6.0",
"description": "Libxmp is a library that renders module files to PCM data.",
"homepage": "https://sourceforge.net/projects/xmp/",
"license": "LGPL-2.1-or-later",

View File

@ -4833,8 +4833,8 @@
"port-version": 3
},
"libxmp": {
"baseline": "2023-04-13",
"port-version": 1
"baseline": "4.6.0",
"port-version": 0
},
"libxmu": {
"baseline": "1.1.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9822e97892e95d5804274ce1076e1abbbed706ce",
"version": "4.6.0",
"port-version": 0
},
{
"git-tree": "a5c05ac5a1e4a0ff9580fc5bba923b39a48b033e",
"version-date": "2023-04-13",