3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-26 17:41:09 +08:00
Code Issues Projects Releases Wiki Activity

[libass] Fix build error on x64-windows-static (#12528)

Browse Source 
* [libass] Fix build error on x64-windows-static

* [libass] Update vcpkg.json

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update portfile.cmake

* [libass] Resolve conflict

* [libass] Resolve conflict

* format manifest

Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
This commit is contained in:
Lily 2020-08-08 07:06:43 +08:00 committed by GitHub
parent 728c54951f
commit 1973918384
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libass/CMakeLists.txt
View File

@ -45,7 +45,7 @@ find_path(HARFBUZZ_INCLUDE_DIR
find_path(DIRENT_INCLUDE_DIR
NAMES dirent.h)
find_library(FRIBIDI_LIBRARY NAMES fribidi)
find_library(FRIBIDI_LIBRARY NAMES libfribidi fribidi)
find_library(HARFBUZZ_LIBRARY NAMES harfbuzz)
add_library(ass ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/libass.def)

5
ports/libass/CONTROL
View File

@ -1,5 +0,0 @@
Source: libass
Version: 0.14.0
Port-Version: 2
Build-Depends: freetype, fribidi, harfbuzz, dirent (windows)
Description: libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format.

11
ports/libass/portfile.cmake
View File

@ -1,6 +1,3 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libass/libass
@ -14,9 +11,6 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.in DESTINATION ${SOURCE_PATH})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/libass.def DESTINATION ${SOURCE_PATH})
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libass RENAME copyright)
# Since libass uses automake, make and configure, we use a custom CMake file
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@ -27,4 +21,7 @@ vcpkg_configure_cmake(
PREFER_NINJA)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_copy_pdbs()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

16
ports/libass/vcpkg.json Normal file
View File

@ -0,0 +1,16 @@
{
"name": "libass",
"version-string": "0.14.0",
"port-version": 3,
"description": "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format",
"homepage": "https://github.com/libass/libass",
"dependencies": [
{
"name": "dirent",
"platform": "windows"
},
"freetype",
"fribidi",
"harfbuzz"
]
}

1
scripts/ci.baseline.txt
View File

@ -631,7 +631,6 @@ leveldb:arm-uwp=fail
leveldb:x64-uwp=fail
libaiff:x64-linux=fail
libarchive:arm-uwp=fail
libass:x64-windows-static=fail
libbf:arm64-windows=fail
libbf:arm-uwp=fail
libbf:x64-uwp=fail