Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply patches for new version of skia4delphi #379

Open
victorfedorenkov opened this issue Jan 31, 2025 · 1 comment
Open

Apply patches for new version of skia4delphi #379

victorfedorenkov opened this issue Jan 31, 2025 · 1 comment

Comments

@victorfedorenkov
Copy link

victorfedorenkov commented Jan 31, 2025

hi, for new version skia4delphi 6.3.0 your patches for Athens do not work. You can use this command file for merging patched files with new skia4delphi.

Create empty directory Embarcadero\Athens\skia4delphi630\FMX\ and run this code from alcinoe\Embarcadero\Athens\

SET SkiaSourceDir=D:\components\Skia4Delphi\Source

if "%ALBaseDir%"=="" (
  cls  
  Set Standalone=1
  set ALDelphiVersion=23.0
  call "%~dp0\..\..\InitEnvironment.bat"
  IF ERRORLEVEL 1 goto ERROR  
)

FOR /F "tokens=2* skip=2" %%a in ('reg query "HKLM\SOFTWARE\WOW6432Node\Embarcadero\BDS\23.0" /v "RootDir"') do set EmbSourceDir=%%b
set EmbSourceDir=%EmbSourceDir:~0,-1%\source

set skiafile=FMX\FMX.Skia.Canvas.GL.pas
set modified=%SkiaSourceDir%\%skiafile%
set base=%EmbSourceDir%\%skiafile%
set patch=%skiafile%
git merge-file -p "%modified%" "%base%" "%patch%" >> skia4delphi630\%skiafile%

set skiafile=FMX\FMX.Skia.Canvas.Metal.pas
set modified=%SkiaSourceDir%\%skiafile%
set base=%EmbSourceDir%\%skiafile%
set patch=%skiafile%
git merge-file -p "%modified%" "%base%" "%patch%" >> skia4delphi630\%skiafile%

set skiafile=FMX\FMX.Skia.Canvas.pas
set modified=%SkiaSourceDir%\%skiafile%
set base=%EmbSourceDir%\%skiafile%
set patch=%skiafile%
git merge-file -p "%modified%" "%base%" "%patch%" >> skia4delphi630\%skiafile%

set skiafile=FMX\FMX.Skia.Canvas.Vulkan.pas
set modified=%SkiaSourceDir%\%skiafile%
set base=%EmbSourceDir%\%skiafile%
set patch=%skiafile%
git merge-file -p "%modified%" "%base%" "%patch%" >> skia4delphi630\%skiafile%
@Zeus64
Copy link
Collaborator

Zeus64 commented Jan 31, 2025

They corrected the bug (https://embt.atlassian.net/servicedesk/customer/portal/1/RSS-1997) in skia4delphi 6.3.0, so you probably do not need the file Alcinoe\Embarcadero\Athens\rtl\common\System.Skia.API.pas anymore (you can delete it)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants