Commit Graph

26 Commits

Author SHA1 Message Date
Kai Pastor
0c143f8183
[skia] Fix linking issues (#36963)
Fixes #32691: unneeded warnings.
Fixes #36928: windows dynamic linkage for icu et al.

These DLLs are possible now (subject to features):
~~~
skia:x64-windows:/bin/dawn_native.dll
skia:x64-windows:/bin/dawn_platform.dll
skia:x64-windows:/bin/dawn_proc.dll
skia:x64-windows:/bin/skia.dll
skia:x64-windows:/bin/skshaper.dll
skia:x64-windows:/bin/skunicode.dll
~~~
2024-04-03 16:14:05 -07:00
Alexandre Bique
de18cd9b33
[skia] update to m123 (#37442) 2024-03-15 18:37:57 -07:00
Kai Pastor
3302690d7e
[skia] Update (#36680)
Based on https://github.com/microsoft/vcpkg/pull/36518, credits @abique.

This update makes skia use vcpkg vulkan. There are still vendored
dependencies (abseil, spirv-*, maybe also dawn, graphite), but I don't
want to touch that now.

---------

Co-authored-by: Alexandre Bique <bique.alexandre@gmail.com>
2024-02-21 22:42:39 -08:00
Cheney Wang
d0b17dbd7e
[skia] Fixes build error on x64-linux (#36236) 2024-01-19 12:40:34 -08:00
Clemens Wasser
d044846ca1
[skia] Fix Debug INTERFACE_COMPILE_COMMANDS (#35800) 2024-01-03 17:17:02 -08:00
Kai Pastor
c415be64bd
[skia] Fix and test vulkan (#35828)
* [vcpkg-ci-skia] Use vulkan

* [skia] Fix vulkan on windows

* Require vcpkg-ci-skia pass

* Fixup
2023-12-28 00:11:17 -08:00
Kai Pastor
848c8178ce
[skia] Fix incomplete update, build modules, fix android (#34951)
* [skia] Restore simple msvc toolchain fix

* libgifcodec is gone

* Update abseil-cpp

* Use vcpkg abseil-cpp

* Update wuffs

* Update dawn

* Update spirv deps

* Remove tint

* Update vulkan-tools

* versions

* Drop obsolete patch

* Use github directly

* Revert "Use vcpkg abseil-cpp"

This reverts commit 9b4157c980.

* Fix dawn

* Build, install, export modules

* Unroll default-features

* Fix comments

* Fix skresources

* Fix manifest

* WIP

* WIP

* Pass-through lib dirs

* Filter link libs

* WIP

* WIP

* Add feature 'modules'

* Fix SkDebugf visibility

* WIP

* WIP

* Rewrite gn install and export

* No pdb for release

* Omit explicit ouput check

* Update modules config

* Disable skparagraph DLL, no dllexport

* Disable icu on shared windows

* Cleanup

* Cleanup

* Enable android CI

* Android

* Don't export standard libraries

* Disable FontConfigInterface on windows
2023-11-29 01:34:00 -08:00
Frank
eb76636c04
[skia] Update version to 0.38.2 (#34787)
* [skia] Update version to 0.38.2

* version

* add dep wuffs

* version

* add support x86 MSVC build

* version
2023-11-01 11:45:44 -07:00
Lily Wang
896155d2d9
[skia] Add dependency dlfcn-win32 for feature freetype on windows (#33793)
* [skia] Add dependency dlfcn-win32 for feature freetype on windows

* update version
2023-09-18 09:49:29 -07:00
Frank
632a33aba2
[skia] disable the dev test (#33494)
* [skia] disable the dev test

* version

* add option

* v db

* revert

* v db

* add patch

* v db
2023-09-01 15:33:40 -07:00
Kai Pastor
f204b54154
[skia] Fix vulkan feature (#32740) 2023-07-26 19:52:57 -07:00
Kai Pastor
873263a7c0
[skia] Fix vulkan (#29448)
* [skia] Fix vulkan

* Use vulkan-memory-allocator
2023-02-06 11:53:39 -08:00
reito
75381ea7fa
[gn-related-ports] Fix gn based projects build error on Windows (#29058)
* fix gn path error on windows

* add quotes

* vcpkg cmake guidelines

* Fix version database.

* Use Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL instead of WARNING

* Quotes 🤦

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2023-01-26 18:53:54 -08:00
Kai Pastor
0a761bd013
[skia] Fix compiler forwarding (#29138) 2023-01-23 16:03:29 -08:00
Kai Pastor
01350d0b49
[skia] Misc fixes (#28971)
* Handle core opengl32 dependency

* Fix regressions for legacy config

* Transform frameworks and SDK during build

* Fix python3 configuration

* Update versions

* Drop unused dep

* Fix python3 again
2023-01-18 13:38:56 -08:00
Kai Pastor
e07c62d059
[skia] Turn into usable and maintainable port (#28007)
* Remove unused SKIA_PUBLIC_DEFINITIONS

* Revise python3 injection

* Major overhaul

* Revise third-party downloads

Declare them early in a single location, but use as needed.
Validate agains skia's DEPS.

* Integrate download & pkgconfig externals handling

Ensure that downloads are complete with --only-downloads mode.

* Move cmake functions to separate file

* Turn source fixups into proper patches

* Update versions

* Generally disable msvc env setup

* Update python patch

* Remove unused patch

* Rename function

* Update versions

* Handle third-party licenses

* Move block

* Rename and unset skia root variable

* Fix usage with alternative build types

* Update versions
2022-12-20 19:29:21 -08:00
xiaozhuai, Weihang Ding
cb76ac9e92
[expat] Fix expat msvc link static crt (#27948)
* Fix expat msvc link static crt

* update port version
2022-11-23 10:12:44 -08:00
Viktor Chlumský
e6a79ac018
[skia] Fix build for release-only triplets (#27196)
* Fix Skia in relase-only config

* Use the modern

release_thing()
if (NOT VCPKG_BUILD_TYPE)
    debug_thing()
endif()

form

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-11-07 15:42:19 -08:00
Lily Wang
af908b85af
[skia] Update to 0.36.0 (#26419)
* [skia] Update to 0.36.0

* x-add-version

* fix Linux build error

* x-add-version
2022-08-31 13:32:04 -07:00
Viktor Chlumský
e1f3eecdeb
[skia] Build configuration fix (#25247)
* [skia] Build configuration fix

* [skia] Changed declared port-version
2022-06-17 13:57:34 -07:00
Benjamin Oldenburg
ce910bb87b
[skia,crashpad,zeroc-ice,vcpkg-tool-gn] New vcpkg-tool-gn and update of several ports (#24066) 2022-04-25 15:39:10 -07:00
Kai Pastor
99346bb692
[libwebp] Update, cleanup (#23864)
* Update to v1.2.2

* Fix libwebpmux Windows name breakage

The pc file relies on the original output name:
No 'lib' prefix for MSVC. No 'liblib' prefix for mingw.

* Minor portfile updates

* Don't self-depend on default features

* Fix the libwebpmux feature

* Fix internal tool dependencies

* Drop Xrandr patch (fixed in freeglut)

* Drop X11 patch (fixed in freeglut)

* Cleanup CMake config patch, no extra case hacks

* Adjust webp lib names in skia, qt5-imageformats

* Adjust downstream WEBP cmake usage

* Debug qtimageformats [skip actions]

* [tiff] Drive-by fix for CMake warning

* Drop non-standard debug postfix

* Update indentation

* Update port versions

* Update versions

* Revert qtimageformat debug change

* Fixup qt5-imageformats change

* Update versions
2022-04-13 11:26:56 -07:00
Benjamin Oldenburg
38d99c1dd7
[skia] Arm64 for skia on osx (#23222)
* build on apple M1

* fixed port version and date

* more changes

* Update version database

* reverted date

* updated versions
2022-02-24 10:35:14 -08:00
Billy O'Neal
c9e786d81a
[many ports] remove remaining vcpkg_fail_port_install calls. (#22770)
* Bulk remove vcpkg_fail_port_install calls.

Interesting ones have been split out into separate reviews, where "interesting" means "anything more than just deleting the call to vcpkg_fail_port_install",

In support of https://github.com/microsoft/vcpkg/pull/21502

* Update version database.

* Revert google benchmark changes already submitted as https://github.com/microsoft/vcpkg/pull/22728

* Repair version database.
2022-01-25 10:31:15 -08:00
autoantwort
a118f6af79
[skia] no absolute paths (#21717) 2021-11-29 16:59:50 -08:00
Billy O'Neal
b295670e4b
Bulk convert control files. (#19986)
```
function Convert-Control {
    Param($full)
    .\vcpkg.exe format-manifest $full
    $root = $full.Substring(0, $full.Length - 7) # CONTROL
    $new = $root + 'vcpkg.json'
    $content = Get-Content -Raw $new
    $asJson = ConvertFrom-Json $content -AsHashtable -Depth 100
    $oldVersion = $asJson['port-version']
    if ($null -eq $oldVersion) {
        $oldVersionFull = $asJson['version-string']
        Write-Host "Got version $oldVersionFull"
        $match = [System.Text.RegularExpressions.Regex]::Match($oldVersionFull, '^(.+)-(\d+)$')
        if ($match.Success -and -not [System.Text.RegularExpressions.Regex]::IsMatch($oldVersionFull, '^\d\d\d\d-\d\d-\d\d$')) {
            $newFullVersion = [string]$match.Groups[1].Value
            $oldVersion = [int]$match.Groups[2].Value
            Write-Host "newFullVersion $newFullVersion oldVersion $oldVersion"
            $newVersion = $oldVersion + 1
            $asJson['version-string'] = $newFullVersion
            Write-Host "Previous version for $full extracted from version field -- setting version-string $newFullVersion and port-version $newVersion"
        } else {
            Write-Host "No previous version for $full -- setting 1"
            $newVersion = 1
        }
    } else {
        $newVersion = [int]$oldVersion + 1
        Write-Host "New version for $full : $newVersion"
    }

    $asJson['port-version'] = $newVersion

    $content = ConvertTo-Json $asJson -Depth 100
    Set-Content -Path $new -Value $content
    .\vcpkg.exe format-manifest $new
}

Get-ChildItem ports\CONTROL -Recurse | Foreach-Object {
    Convert-Control $_.FullName
}

git commit -am "this message"
.\vcpkg.exe x-add-version -all
git commit -a --amend
```
2021-09-09 01:24:04 -07:00