diff options
| author | Lily <47812810+LilyWangL@users.noreply.github.com> | 2020-08-08 07:06:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 16:06:43 -0700 |
| commit | 19739183848c679e8058b5f907c06cb0be0bbc4d (patch) | |
| tree | 56594fb0dbc497ca79e74c36547554873f5a367a | |
| parent | 728c54951fa4489387650f70f0aebf41ae0a834b (diff) | |
| download | vcpkg-19739183848c679e8058b5f907c06cb0be0bbc4d.tar.gz vcpkg-19739183848c679e8058b5f907c06cb0be0bbc4d.zip | |
[libass] Fix build error on x64-windows-static (#12528)
* [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>
| -rw-r--r-- | ports/libass/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/libass/CONTROL | 5 | ||||
| -rw-r--r-- | ports/libass/portfile.cmake | 11 | ||||
| -rw-r--r-- | ports/libass/vcpkg.json | 16 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 |
5 files changed, 21 insertions, 14 deletions
diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt index 2db910d27..aacf89d86 100644 --- a/ports/libass/CMakeLists.txt +++ b/ports/libass/CMakeLists.txt @@ -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)
diff --git a/ports/libass/CONTROL b/ports/libass/CONTROL deleted file mode 100644 index 3e886403a..000000000 --- a/ports/libass/CONTROL +++ /dev/null @@ -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. diff --git a/ports/libass/portfile.cmake b/ports/libass/portfile.cmake index 040cadc66..f5ab6606c 100644 --- a/ports/libass/portfile.cmake +++ b/ports/libass/portfile.cmake @@ -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()
\ No newline at end of file +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libass/vcpkg.json b/ports/libass/vcpkg.json new file mode 100644 index 000000000..151d87cdd --- /dev/null +++ b/ports/libass/vcpkg.json @@ -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" + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 74a2605c1..9c3347625 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -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 |