From a360b138da436029e722f777a6989f4160bb9da0 Mon Sep 17 00:00:00 2001 From: Derek Cyrus-Chow Date: Wed, 17 Jul 2024 16:54:18 +0100 Subject: [PATCH 1/7] [mp3lame] add default-feature 'frontend' --- ports/mp3lame/portfile.cmake | 6 ++++++ ports/mp3lame/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/m-/mp3lame.json | 5 +++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ports/mp3lame/portfile.cmake b/ports/mp3lame/portfile.cmake index 4d9366566330a8..57fdb547d2ec82 100644 --- a/ports/mp3lame/portfile.cmake +++ b/ports/mp3lame/portfile.cmake @@ -96,6 +96,12 @@ else() endif() endif() + if("frontend" IN_LIST FEATURES) + list(APPEND OPTIONS --enable-frontend) + else() + list(APPEND OPTIONS --disable-frontend) + endif() + if(NOT VCPKG_TARGET_IS_MINGW) list(APPEND OPTIONS --with-pic=yes) endif() diff --git a/ports/mp3lame/vcpkg.json b/ports/mp3lame/vcpkg.json index d48daa7da54de0..eec615240b4c6f 100644 --- a/ports/mp3lame/vcpkg.json +++ b/ports/mp3lame/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mp3lame", "version": "3.100", - "port-version": 14, + "port-version": 15, "description": "LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL.", "homepage": "https://sourceforge.net/projects/lame", "license": "LGPL-2.0-only", @@ -11,5 +11,13 @@ "host": true, "platform": "windows & !mingw" } - ] + ], + "default-features": [ + "frontend" + ], + "features": { + "frontend": { + "description": "Build the lame frontend" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 7815fb992ef258..584fbff56c54de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5922,7 +5922,7 @@ }, "mp3lame": { "baseline": "3.100", - "port-version": 14 + "port-version": 15 }, "mpark-patterns": { "baseline": "2019-10-03", diff --git a/versions/m-/mp3lame.json b/versions/m-/mp3lame.json index 2cf27694e83150..34fa93e605bbb3 100644 --- a/versions/m-/mp3lame.json +++ b/versions/m-/mp3lame.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa6a3436a9217fea4d54c1e708d58d75c139bd5b", + "version": "3.100", + "port-version": 15 + }, { "git-tree": "70565b18777c4bd7ebb7724be82f9957a5a17475", "version": "3.100", From d68190edbe11dd2e7fa391a42818b2cbefa05f49 Mon Sep 17 00:00:00 2001 From: Derek Cyrus-Chow Date: Wed, 17 Jul 2024 17:15:23 +0100 Subject: [PATCH 2/7] [ffmpeg] mp3lame dependency doesn't need default-feature of 'frontend' --- ports/ffmpeg/vcpkg.json | 7 +++++-- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 0746fafd1d5872..81a7824a0cf40f 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "6.1.1", - "port-version": 11, + "port-version": 12, "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." @@ -457,7 +457,10 @@ "mp3lame": { "description": "MP3 encoding via libmp3lame", "dependencies": [ - "mp3lame" + { + "name": "mp3lame", + "default-features": false + } ] }, "nonfree": { diff --git a/versions/baseline.json b/versions/baseline.json index 584fbff56c54de..043a04cf5d0da7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2694,7 +2694,7 @@ }, "ffmpeg": { "baseline": "6.1.1", - "port-version": 11 + "port-version": 12 }, "ffnvcodec": { "baseline": "12.1.14.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index dbec2ed1c725b9..137c09f33672b8 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "383f650dc261478b47b057e8fe06725398608d55", + "version": "6.1.1", + "port-version": 12 + }, { "git-tree": "15b90b33b76e69c2d9b876b32c4c9b47c97846ed", "version": "6.1.1", From 142d86cb432bd986d099d669d39072c1cdba0449 Mon Sep 17 00:00:00 2001 From: Derek Cyrus-Chow Date: Thu, 18 Jul 2024 13:56:30 +0100 Subject: [PATCH 3/7] Revert "[ffmpeg] mp3lame dependency doesn't need default-feature of 'frontend'" This reverts commit d68190edbe11dd2e7fa391a42818b2cbefa05f49. --- ports/ffmpeg/vcpkg.json | 7 ++----- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 ----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 81a7824a0cf40f..0746fafd1d5872 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "6.1.1", - "port-version": 12, + "port-version": 11, "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." @@ -457,10 +457,7 @@ "mp3lame": { "description": "MP3 encoding via libmp3lame", "dependencies": [ - { - "name": "mp3lame", - "default-features": false - } + "mp3lame" ] }, "nonfree": { diff --git a/versions/baseline.json b/versions/baseline.json index 043a04cf5d0da7..584fbff56c54de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2694,7 +2694,7 @@ }, "ffmpeg": { "baseline": "6.1.1", - "port-version": 12 + "port-version": 11 }, "ffnvcodec": { "baseline": "12.1.14.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 137c09f33672b8..dbec2ed1c725b9 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "383f650dc261478b47b057e8fe06725398608d55", - "version": "6.1.1", - "port-version": 12 - }, { "git-tree": "15b90b33b76e69c2d9b876b32c4c9b47c97846ed", "version": "6.1.1", From 68a487b32fb1635b9beb24b657ffe6317caf6ef4 Mon Sep 17 00:00:00 2001 From: Derek Cyrus-Chow Date: Thu, 18 Jul 2024 14:01:15 +0100 Subject: [PATCH 4/7] [lame] make 'frontend' a non-default feature --- ports/mp3lame/vcpkg.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/ports/mp3lame/vcpkg.json b/ports/mp3lame/vcpkg.json index eec615240b4c6f..94c353e959e5a2 100644 --- a/ports/mp3lame/vcpkg.json +++ b/ports/mp3lame/vcpkg.json @@ -12,9 +12,6 @@ "platform": "windows & !mingw" } ], - "default-features": [ - "frontend" - ], "features": { "frontend": { "description": "Build the lame frontend" From 80413349afa09a5d12ca4ff4e299472bea919163 Mon Sep 17 00:00:00 2001 From: derekchow Date: Thu, 18 Jul 2024 14:47:38 +0100 Subject: [PATCH 5/7] [lame] fix 'frontend' feature for Windows/MinGW builds --- ports/mp3lame/portfile.cmake | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/ports/mp3lame/portfile.cmake b/ports/mp3lame/portfile.cmake index 57fdb547d2ec82..12fd4ccf51ef5d 100644 --- a/ports/mp3lame/portfile.cmake +++ b/ports/mp3lame/portfile.cmake @@ -53,12 +53,29 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) file(WRITE "${SOURCE_PATH}/vc_solution/${machine}_${vcxproj}" "${vcxproj_con}") endforeach() - vcpkg_msbuild_install( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH "vc_solution/${machine}_vc11_lame.sln" - TARGET "lame" - PLATFORM "${platform}" - ) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "vc_solution/${machine}_vc11_lame.sln" + TARGET "libmp3lame-static" + PLATFORM "${platform}" + ) + else() + vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "vc_solution/${machine}_vc11_lame.sln" + TARGET "libmp3lame" + PLATFORM "${platform}" + ) + endif() + if("frontend" IN_LIST FEATURES) + vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "vc_solution/${machine}_vc11_lame.sln" + TARGET "lame" + PLATFORM "${platform}" + ) + endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") From ce34cba6d9dfb9962cb6a2a564f3bd1d5da4e2fc Mon Sep 17 00:00:00 2001 From: Derek Cyrus-Chow Date: Thu, 18 Jul 2024 15:07:22 +0100 Subject: [PATCH 6/7] [lame] explicitly add ncurses dependency for 'frontend' feature --- ports/mp3lame/vcpkg.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/mp3lame/vcpkg.json b/ports/mp3lame/vcpkg.json index 94c353e959e5a2..182893cf7772e4 100644 --- a/ports/mp3lame/vcpkg.json +++ b/ports/mp3lame/vcpkg.json @@ -14,7 +14,13 @@ ], "features": { "frontend": { - "description": "Build the lame frontend" + "description": "Build the lame frontend", + "dependencies": [ + { + "name": "ncurses", + "platform": "!windows | mingw" + } + ] } } } From f9417f1457b21144f1a473478e01d99047f00262 Mon Sep 17 00:00:00 2001 From: Derek Cyrus-Chow Date: Thu, 18 Jul 2024 15:09:47 +0100 Subject: [PATCH 7/7] [lame] update versions --- versions/m-/mp3lame.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/mp3lame.json b/versions/m-/mp3lame.json index 34fa93e605bbb3..b9266a29534af1 100644 --- a/versions/m-/mp3lame.json +++ b/versions/m-/mp3lame.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fa6a3436a9217fea4d54c1e708d58d75c139bd5b", + "git-tree": "d69dbcc93a03d6792d239a4f1f11e43618c45a16", "version": "3.100", "port-version": 15 },