github-actions/win32: patch in modified portfile to hopefully fix thi…

…s for good
CE-Programming · Oct 10, 2020 · da8899b · da8899b
1 parent 5da09ea
commit da8899b
Show file tree

Hide file tree

Showing 2 changed files with 153 additions and 3 deletions.
diff --git a/.github/workflows/build.msvc.windows.workflow.yml b/.github/workflows/build.msvc.windows.workflow.yml
@@ -123,13 +123,10 @@ jobs:
       run: |
         echo C:\msys64\usr\bin >> $env:GITHUB_PATH
     
-    # Temporarily set VCPKG_KEEP_ENV_VARS: PATH - a bit hacky but it works
-    # This is pending a fix being entered into microsoft/vcpkg#13837
     - name: Set vcpkg's response file path used as part of cache's key.
       uses: lukka/set-shell-env@master
       with:
         VCPKGRESPONSEFILE: ${{ github.workspace }}/.github/workflows/vcpkg/msvc.windows.${{ matrix.arch }}.${{ matrix.linking }}.vcpkg.txt
-        VCPKG_KEEP_ENV_VARS: PATH
         filter: ^VCPKG.*
 
     # Restore from cache the previously built ports. If cache-miss, download, build vcpkg.
@@ -142,7 +139,20 @@ jobs:
         # This commit ID corresponds to 2020.07
         vcpkgGitCommitId: 56fffbe49dfb4dd8fae0940f272c5fd2b86be991
         appendedCacheKey: ${{ hashFiles(env.VCPKGRESPONSEFILE) }}-${{ runner.os }}-${{ matrix.arch_suffix }}-${{ matrix.linking }}
+        setupOnly: true
+
+    # This is pending a fix being entered into microsoft/vcpkg#13837
+    - name: Patch libpng-apng portfile
+      shell: cmd
+      run: |
+        copy /Y ${{ github.workspace }}\.github\workflows\vcpkg\libpng-portfile.cmake .\vcpkg\ports\libpng\portfile.cmake
 
+    - name: Install packages
+      shell: cmd
+      run: |
+        .\vcpkg\vcpkg remove --outdated --recurse
+        .\vcpkg\vcpkg install @${{ env.VCPKGRESPONSEFILE }}
+    
     ## Build time!
 
     # Are we releasing?

diff --git a/.github/workflows/vcpkg/libpng-portfile.cmake b/.github/workflows/vcpkg/libpng-portfile.cmake
@@ -0,0 +1,140 @@
+set(LIBPNG_VER 1.6.37)
+
+# Download the apng patch
+set(LIBPNG_APNG_OPTION )
+if ("apng" IN_LIST FEATURES)
+    # Get (g)awk installed
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk)
+    set(AWK_EXE_PATH "${MSYS_ROOT}/usr/bin")
+    vcpkg_add_to_path("${AWK_EXE_PATH}")
+
+    set(LIBPNG_APG_PATCH_NAME libpng-${LIBPNG_VER}-apng.patch)
+    set(LIBPNG_APG_PATCH_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIBPNG_APG_PATCH_NAME})
+    if (NOT EXISTS ${LIBPNG_APG_PATCH_PATH})
+        if (NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src)
+            file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src)
+        endif()
+        vcpkg_download_distfile(LIBPNG_APNG_PATCH_ARCHIVE
+            URLS "https://downloads.sourceforge.net/project/libpng-apng/libpng16/${LIBPNG_VER}/${LIBPNG_APG_PATCH_NAME}.gz"
+            FILENAME "${LIBPNG_APG_PATCH_NAME}.gz"
+            SHA512 226adcb3a8c60f2267fe2976ab531329ae43c2603dab4d0cf8f16217d64069936b879f3d6516b75d259c47d6f5c5b1f24f887602206c8e46abde0fb7f5c7946b
+        )
+        vcpkg_find_acquire_program(7Z)
+        vcpkg_execute_required_process(
+            COMMAND ${7Z} x ${LIBPNG_APNG_PATCH_ARCHIVE} -aoa
+            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src
+            LOGNAME extract-patch.log
+        )
+    endif()
+    set(APNG_EXTRA_PATCH ${LIBPNG_APG_PATCH_PATH})
+    set(LIBPNG_APNG_OPTION "-DPNG_PREFIX=a")
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO glennrp/libpng
+    REF v${LIBPNG_VER}
+    SHA512 ccb3705c23b2724e86d072e2ac8cfc380f41fadfd6977a248d588a8ad57b6abe0e4155e525243011f245e98d9b7afbe2e8cc7fd4ff7d82fcefb40c0f48f88918
+    HEAD_REF master
+    PATCHES
+        use_abort.patch
+        cmake.patch
+        pkgconfig.patch
+        pkgconfig.2.patch
+        ${APNG_EXTRA_PATCH}
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    set(PNG_STATIC_LIBS OFF)
+    set(PNG_SHARED_LIBS ON)
+else()
+    set(PNG_STATIC_LIBS ON)
+    set(PNG_SHARED_LIBS OFF)
+endif()
+
+set(LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION )
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL iOS)
+    set(LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_HARDWARE_OPTIMIZATIONS=OFF")
+endif()
+
+set(LD_VERSION_SCRIPT_OPTION )
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Android)
+    set(LD_VERSION_SCRIPT_OPTION "-Dld-version-script=OFF")
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DPNG_MAN_DIR=share/${PORT}/man
+        ${LIBPNG_APNG_OPTION}
+        ${LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION}
+        ${LD_VERSION_SCRIPT_OPTION}
+        -DPNG_ARM_NEON=on
+        -DPNG_STATIC=${PNG_STATIC_LIBS}
+        -DPNG_SHARED=${PNG_SHARED_LIBS}
+        -DPNG_TESTS=OFF
+        -DSKIP_INSTALL_PROGRAMS=ON
+        -DSKIP_INSTALL_EXECUTABLES=ON
+        -DSKIP_INSTALL_FILES=OFF
+    OPTIONS_DEBUG
+        -DSKIP_INSTALL_HEADERS=ON
+)
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/libpng)
+set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc")
+if(EXISTS ${_file})
+    file(READ "${_file}" _contents)
+    if(VCPKG_TARGET_IS_WINDOWS)
+        string(REGEX REPLACE "-lpng16(d)?" "-llibpng16d" _contents "${_contents}")
+    else()
+        string(REGEX REPLACE "-lpng16(d)?" "-lpng16d" _contents "${_contents}")
+    endif()
+    if(VCPKG_TARGET_IS_MINGW)
+        string(REPLACE "-lz" "-lzlibd" _contents "${_contents}")
+    else()
+        string(REPLACE "-lzlib" "-lzlibd" _contents "${_contents}")
+    endif()
+    file(WRITE "${_file}" "${_contents}")
+endif()
+set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng.pc")
+if(EXISTS ${_file})
+    file(READ "${_file}" _contents)
+    if(VCPKG_TARGET_IS_WINDOWS)
+        string(REGEX REPLACE "-lpng16(d)?" "-llibpng16d" _contents "${_contents}")
+    else()
+        string(REGEX REPLACE "-lpng16(d)?" "-lpng16d" _contents "${_contents}")
+    endif()
+    if(VCPKG_TARGET_IS_MINGW)
+        string(REPLACE "-lz" "-lzlibd" _contents "${_contents}")
+    else()
+        string(REPLACE "-lzlib" "-lzlibd" _contents "${_contents}")
+    endif()
+    file(WRITE "${_file}" "${_contents}")
+endif()
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc")
+    if(EXISTS ${_file})
+        file(READ "${_file}" _contents)
+        string(REPLACE "-lpng16" "-llibpng16" _contents "${_contents}")
+        if(VCPKG_TARGET_IS_MINGW)
+            string(REPLACE "-lz" "-lzlib" _contents "${_contents}")
+        endif()
+        file(WRITE "${_file}" "${_contents}")
+    endif()
+    set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng.pc")
+    if(EXISTS ${_file})
+        file(READ "${_file}" _contents)
+        string(REPLACE "-lpng16" "-llibpng16" _contents "${_contents}")
+        if(VCPKG_TARGET_IS_MINGW)
+            string(REPLACE "-lz" "-lzlib" _contents "${_contents}")
+        endif()
+        file(WRITE "${_file}" "${_contents}")
+    endif()
+endif()
+vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m)
+
+vcpkg_copy_pdbs()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)