From c0fd705db45bbc9f010f988dfc680d3bf361d54c Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Thu, 8 Jul 2021 10:59:25 +0100 Subject: [PATCH 01/13] [libmodplug] fix pkg-config file for static builds on windows --- ports/libmodplug/004-export-pkgconfig.patch | 32 +++++++++++++++------ ports/libmodplug/portfile.cmake | 2 +- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/ports/libmodplug/004-export-pkgconfig.patch b/ports/libmodplug/004-export-pkgconfig.patch index 28201a96183802..eb59ca111b1246 100644 --- a/ports/libmodplug/004-export-pkgconfig.patch +++ b/ports/libmodplug/004-export-pkgconfig.patch @@ -1,23 +1,37 @@ +From 6a3e539ea26eec1bfc2a6e722e923bd5221f8d26 Mon Sep 17 00:00:00 2001 +From: "Matthias C. M. Troffaes" +Date: Thu, 8 Jul 2021 10:47:30 +0100 +Subject: [PATCH] Fix Libs.private in .pc file. + +--- + CMakeLists.txt | 7 +++++-- + libmodplug.pc.in | 2 +- + 2 files changed, 6 insertions(+), 3 deletions(-) + diff --git a/CMakeLists.txt b/CMakeLists.txt -index 468f1a3..8e94458 100644 +index 468f1a3..3164fc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -142,6 +142,8 @@ if(HAVE_SINF) +@@ -141,7 +141,11 @@ if(HAVE_SINF) + add_definitions(-DHAVE_SINF) endif(HAVE_SINF) - if (NOT WIN32) -+ set(UNIXLIBS "-lstdc++ -lm") -+endif (NOT WIN32) +-if (NOT WIN32) ++if(WIN32) ++ set(LIBS_PRIVATE "-luser32") ++else(WIN32) ++ set(LIBS_PRIVATE "-lstdc++ -lm") ++endif(WIN32) set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "${CMAKE_INSTALL_PREFIX}") set(libdir "${CMAKE_INSTALL_PREFIX}/lib") -@@ -152,4 +154,3 @@ if (NOT WIN32) +@@ -152,4 +156,3 @@ if (NOT WIN32) install(FILES "${PROJECT_BINARY_DIR}/libmodplug.pc" DESTINATION lib/pkgconfig ) -endif (NOT WIN32) diff --git a/libmodplug.pc.in b/libmodplug.pc.in -index bbf05f9..1699d76 100644 +index bbf05f9..e4a43cc 100644 --- a/libmodplug.pc.in +++ b/libmodplug.pc.in @@ -8,5 +8,5 @@ Description: The ModPlug mod file playing library. @@ -25,6 +39,8 @@ index bbf05f9..1699d76 100644 Requires: Libs: -L${libdir} -lmodplug -Libs.private: -lstdc++ -lm -+Libs.private: @UNIXLIBS@ ++Libs.private: @LIBS_PRIVATE@ Cflags: -I${includedir} +-- +2.21.0.windows.1 diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake index 6ead190d83425d..ef606ad8ecb5c1 100644 --- a/ports/libmodplug/portfile.cmake +++ b/ports/libmodplug/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_from_github(ARCHIVE ${STATIC_PATCH} 002-detect_sinf.patch 003-use-static-cast-for-ctype.patch - 004-export-pkgconfig.patch + 004-export-pkgconfig.patch # https://github.com/Konstanty/libmodplug/pull/59 ) vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA) From e6b3e0e6b8a8f692381af43861b5977e280b8d4d Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Thu, 8 Jul 2021 11:03:32 +0100 Subject: [PATCH 02/13] [libmodplug] convert CONTROL to vcpkg.json --- ports/libmodplug/CONTROL | 6 ------ ports/libmodplug/vcpkg.json | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 ports/libmodplug/CONTROL create mode 100644 ports/libmodplug/vcpkg.json diff --git a/ports/libmodplug/CONTROL b/ports/libmodplug/CONTROL deleted file mode 100644 index 2d05f206aaec8c..00000000000000 --- a/ports/libmodplug/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libmodplug -Version: 0.8.9.0 -Port-Version: 7 -Homepage: https://github.com/Konstanty/libmodplug -Description: The ModPlug mod file playing library. -Supports: !uwp diff --git a/ports/libmodplug/vcpkg.json b/ports/libmodplug/vcpkg.json new file mode 100644 index 00000000000000..ff4a2aac93f4fe --- /dev/null +++ b/ports/libmodplug/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libmodplug", + "version-string": "0.8.9.0", + "port-version": 7, + "description": "The ModPlug mod file playing library.", + "homepage": "https://github.com/Konstanty/libmodplug", + "supports": "!uwp" +} From a01c54c50466e180553360fe83756ce57c11a722 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Thu, 8 Jul 2021 11:04:00 +0100 Subject: [PATCH 03/13] [libmodplug] bump port version --- ports/libmodplug/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libmodplug/vcpkg.json b/ports/libmodplug/vcpkg.json index ff4a2aac93f4fe..854e034e1835ea 100644 --- a/ports/libmodplug/vcpkg.json +++ b/ports/libmodplug/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmodplug", "version-string": "0.8.9.0", - "port-version": 7, + "port-version": 8, "description": "The ModPlug mod file playing library.", "homepage": "https://github.com/Konstanty/libmodplug", "supports": "!uwp" From e491947b26e6aa954ecfde485155d27884fe752c Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Thu, 8 Jul 2021 11:00:49 +0100 Subject: [PATCH 04/13] [ffmpeg] enable modplug feature on static windows builds --- ports/ffmpeg/portfile.cmake | 4 ++-- ports/ffmpeg/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 9b70694c2a5688..d56289d8d94b2c 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -56,8 +56,8 @@ if("ilbc" IN_LIST FEATURES) endif() if("modplug" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) - message(FATAL_ERROR "Feature 'modplug' does not support 'uwp | (windows & static)'") + if (VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Feature 'modplug' does not support 'uwp'") endif() endif() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 8ce76f9e343ce4..d2234de2af9cd3 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -132,7 +132,7 @@ "features": [ "modplug" ], - "platform": "!(windows & static) & !uwp" + "platform": "!uwp" }, { "name": "ffmpeg", From b60adb6f6f8188378781a8d38aef76628aef9b6f Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Thu, 8 Jul 2021 11:05:39 +0100 Subject: [PATCH 05/13] [ffmpeg] reformat manifest --- ports/ffmpeg/vcpkg.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index d2234de2af9cd3..df221181bcca60 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -62,6 +62,14 @@ ], "platform": "!osx" }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "modplug" + ], + "platform": "!uwp" + }, { "name": "ffmpeg", "default-features": false, @@ -126,14 +134,6 @@ ], "platform": "!(uwp | arm | x86 | osx)" }, - { - "name": "ffmpeg", - "default-features": false, - "features": [ - "modplug" - ], - "platform": "!uwp" - }, { "name": "ffmpeg", "default-features": false, From 373a6cc8c9ba36fb3a04b5143422539c81d47e5b Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Thu, 8 Jul 2021 11:04:25 +0100 Subject: [PATCH 06/13] [ffmpeg] bump port version --- ports/ffmpeg/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index df221181bcca60..07d42d5336060b 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 7, + "port-version": 8, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." From 0aa22cbff91819a3a7ce68e871574d6c842a96fa Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Thu, 8 Jul 2021 11:06:47 +0100 Subject: [PATCH 07/13] [ffmpeg] [libmodplug] x-add-version --- versions/baseline.json | 4 ++-- versions/f-/ffmpeg.json | 5 +++++ versions/l-/libmodplug.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 46fef4b8236ce3..35136a96483ecd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1986,7 +1986,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 7 + "port-version": 8 }, "ffnvcodec": { "baseline": "10.0.26.0", @@ -3354,7 +3354,7 @@ }, "libmodplug": { "baseline": "0.8.9.0", - "port-version": 7 + "port-version": 8 }, "libmorton": { "baseline": "0.2", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index c510b16ed25c50..65e914e17bb8ec 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2327dfdc0bc900c2735ca2cd81f954a415f1979", + "version": "4.4", + "port-version": 8 + }, { "git-tree": "efdbc20f5003313df2fde681a28ab8718455495f", "version": "4.4", diff --git a/versions/l-/libmodplug.json b/versions/l-/libmodplug.json index f5cfdf03d17a1c..3ecaa114d4af9f 100644 --- a/versions/l-/libmodplug.json +++ b/versions/l-/libmodplug.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a99439ca8874cadd424729ca0a9d769575fd9ff", + "version-string": "0.8.9.0", + "port-version": 8 + }, { "git-tree": "974a84bd910a82a86d2e27d2bb9416d0672390c4", "version-string": "0.8.9.0", From 0adbe56e38a9da9999227cc570ea92a3612ba252 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Fri, 9 Jul 2021 08:14:42 +0100 Subject: [PATCH 08/13] [libmodplug] simplify copyright file install --- ports/libmodplug/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake index ef606ad8ecb5c1..5df935579492b4 100644 --- a/ports/libmodplug/portfile.cmake +++ b/ports/libmodplug/portfile.cmake @@ -37,5 +37,4 @@ endif() vcpkg_fixup_pkgconfig() -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmodplug) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmodplug/COPYING ${CURRENT_PACKAGES_DIR}/share/libmodplug/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 02ce7ea21dfc6496d980825f842dad8c870a20b3 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Fri, 9 Jul 2021 08:15:11 +0100 Subject: [PATCH 09/13] [libmodplug] x-add-version --- versions/l-/libmodplug.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libmodplug.json b/versions/l-/libmodplug.json index 3ecaa114d4af9f..e32694d51a6f22 100644 --- a/versions/l-/libmodplug.json +++ b/versions/l-/libmodplug.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3a99439ca8874cadd424729ca0a9d769575fd9ff", + "git-tree": "b6798791f0c306dcc5a5b9a445b618046dc7e097", "version-string": "0.8.9.0", "port-version": 8 }, From 6261b165f78e8274c6cf105ce3e49bd41d495384 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Fri, 16 Jul 2021 12:22:08 +0100 Subject: [PATCH 10/13] [ffmpeg] bump port version --- ports/ffmpeg/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index e90a9151789193..a060e1b5e3e7a6 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 9, + "port-version": 10, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." From 8b81bbcc419d761bd4558d3fa939f54b2d0f04c3 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Fri, 16 Jul 2021 12:22:15 +0100 Subject: [PATCH 11/13] [ffmpeg] x-add-version --- versions/baseline.json | 10 +++++----- versions/f-/ffmpeg.json | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index e1d13d1f253031..5f4f8de6bd3b58 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1990,7 +1990,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 9 + "port-version": 10 }, "ffnvcodec": { "baseline": "10.0.26.0", @@ -3120,14 +3120,14 @@ "baseline": "0.6.0-1", "port-version": 0 }, - "libebur128": { - "baseline": "1.2.6", - "port-version": 0 - }, "libe57": { "baseline": "1.1.312", "port-version": 0 }, + "libebur128": { + "baseline": "1.2.6", + "port-version": 0 + }, "libepoxy": { "baseline": "1.5.5", "port-version": 0 diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 0c863b404447c4..1dd5fa59699168 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8cb06a30d1bb8ade1859818b59f0b91cb63aa320", + "version": "4.4", + "port-version": 10 + }, { "git-tree": "b118bc2a5cf855546dc3016de53c4d7c75d267b4", "version": "4.4", From 44b9c86af6f0674d2d981ea87148240f93bbf534 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Fri, 16 Jul 2021 12:23:56 +0100 Subject: [PATCH 12/13] [ffmpeg] fix post-merge --- ports/ffmpeg/vcpkg.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index a060e1b5e3e7a6..3dccdeb5dbda2b 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -142,14 +142,6 @@ ], "platform": "!(uwp | arm | x86 | osx)" }, - { - "name": "ffmpeg", - "default-features": false, - "features": [ - "modplug" - ], - "platform": "!(windows & static) & !uwp" - }, { "name": "ffmpeg", "default-features": false, From 42cd5cf1ec3312bd2558b2fd647475bfa9ed43bc Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Fri, 16 Jul 2021 12:24:40 +0100 Subject: [PATCH 13/13] [ffmpeg] x-add-version --- versions/f-/ffmpeg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 1dd5fa59699168..95b846ba556753 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8cb06a30d1bb8ade1859818b59f0b91cb63aa320", + "git-tree": "d8eae79332e72736be5c6accacaf7bf9054df4b9", "version": "4.4", "port-version": 10 },