From 9f32fe815b85b9b6ff8b914e31647e336be989d0 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 18 Feb 2025 00:29:57 -0800 Subject: [PATCH 1/8] [x264] copy bin directory after build --- ports/x264/portfile.cmake | 9 +++++---- ports/x264/vcpkg.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index c6383f06363eb1..d6e56d228b37fe 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -96,10 +96,6 @@ vcpkg_make_configure( vcpkg_make_install() -if("tool" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN) -endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -123,6 +119,11 @@ elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") ) endif() +file(COPY "${CURRENT_PACKAGES_DIR}/tools/x264/bin/libx264-164.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${CURRENT_PACKAGES_DIR}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") + vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index c8a41629324c80..1a9b14f80a3044 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,7 +1,7 @@ { "name": "x264", "version": "0.164.3108", - "port-version": 1, + "port-version": 2, "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", "homepage": "https://www.videolan.org/developers/x264.html", "license": "GPL-2.0-or-later", From 795c8766c97a9245ce88cc193f9f8b6841e6f52c Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 18 Feb 2025 00:30:22 -0800 Subject: [PATCH 2/8] update version --- versions/baseline.json | 2 +- versions/x-/x264.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 8dca19009aae96..860ab25720ac20 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9918,7 +9918,7 @@ }, "x264": { "baseline": "0.164.3108", - "port-version": 1 + "port-version": 2 }, "x265": { "baseline": "4.1", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index 6b430320b036c1..b4dcdcebdff45c 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be3b2200c9c0ac793d099b26db7ad3fa1a97c10e", + "version": "0.164.3108", + "port-version": 2 + }, { "git-tree": "0b3254a0abf3a2a2748b7353594b401893f74da9", "version": "0.164.3108", From 0cfac7e16a640864e791f4e753994c1d8469edbb Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 18 Feb 2025 01:56:19 -0800 Subject: [PATCH 3/8] fix pipline error --- ports/x264/portfile.cmake | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index d6e56d228b37fe..5c2be47631e515 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -98,6 +98,14 @@ vcpkg_make_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_TARGET_IS_WINDOWS) + if (NOT VCPKG_BUILD_TYPE) + file(COPY "${CURRENT_PACKAGES_DIR}/tools/x264/bin/libx264-164.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_PACKAGES_DIR}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") + endif() +endif() + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x264.pc" "-lx264" "-llibx264") if(NOT VCPKG_BUILD_TYPE) @@ -119,11 +127,6 @@ elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") ) endif() -file(COPY "${CURRENT_PACKAGES_DIR}/tools/x264/bin/libx264-164.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") -file(COPY "${CURRENT_PACKAGES_DIR}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") - vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() From f8d39d0bb400029a1b58a973761b113d1054717f Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 18 Feb 2025 01:56:48 -0800 Subject: [PATCH 4/8] update version --- versions/x-/x264.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/x-/x264.json b/versions/x-/x264.json index b4dcdcebdff45c..7b11083a03ea48 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "be3b2200c9c0ac793d099b26db7ad3fa1a97c10e", + "git-tree": "bdc3bb2b4430b1bb1f8cf7d8ddb0a8c6346ae201", "version": "0.164.3108", "port-version": 2 }, From a30307263c8fb6274d6c1fa81e09eb5d2ce2b4b7 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 18 Feb 2025 02:38:46 -0800 Subject: [PATCH 5/8] fix pipeline --- ports/x264/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 5c2be47631e515..e17697fad048e6 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -98,7 +98,7 @@ vcpkg_make_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if (NOT VCPKG_BUILD_TYPE) file(COPY "${CURRENT_PACKAGES_DIR}/tools/x264/bin/libx264-164.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") From 1ec10e2cd081794801804812a1ad0d02b9aa1e70 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 18 Feb 2025 02:39:04 -0800 Subject: [PATCH 6/8] update version --- versions/x-/x264.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/x-/x264.json b/versions/x-/x264.json index 7b11083a03ea48..fae9620502bfac 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bdc3bb2b4430b1bb1f8cf7d8ddb0a8c6346ae201", + "git-tree": "913953f17a4eab13b73b2d4ddb617af5c887208b", "version": "0.164.3108", "port-version": 2 }, From 671d064d8b34c8037510cf962d5498c9e2ddbb67 Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 19 Feb 2025 00:18:18 -0800 Subject: [PATCH 7/8] Apply suggesstion --- ports/x264/portfile.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index e17697fad048e6..13aba6dc5aee04 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -86,6 +86,7 @@ vcpkg_make_configure( --disable-gpac --disable-lsmash --disable-bashcompletion + --bindir=[debug/]bin OPTIONS_RELEASE ${OPTIONS_RELEASE} --enable-strip @@ -98,14 +99,6 @@ vcpkg_make_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - if (NOT VCPKG_BUILD_TYPE) - file(COPY "${CURRENT_PACKAGES_DIR}/tools/x264/bin/libx264-164.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(COPY "${CURRENT_PACKAGES_DIR}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") - endif() -endif() - if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x264.pc" "-lx264" "-llibx264") if(NOT VCPKG_BUILD_TYPE) @@ -127,6 +120,13 @@ elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") ) endif() +if(VCPKG_TARGET_IS_WINDOWS) + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(COPY "${CURRENT_PACKAGES_DIR}/tools/x264/bin/libx264-164.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_PACKAGES_DIR}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") + endif() +endif() + vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() From b50193983fc2dde5d6092ff5f731f3e6eeafd850 Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 19 Feb 2025 00:18:36 -0800 Subject: [PATCH 8/8] update version --- versions/x-/x264.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/x-/x264.json b/versions/x-/x264.json index fae9620502bfac..f2e6d8aa6114ef 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "913953f17a4eab13b73b2d4ddb617af5c887208b", + "git-tree": "9bee6ff2ae0128061fb62fc4be756c80b86643c0", "version": "0.164.3108", "port-version": 2 },