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

Bump FreeType to 2.10.3 #1214

Merged
merged 2 commits into from
Oct 11, 2020
Merged

Bump FreeType to 2.10.3 #1214

merged 2 commits into from
Oct 11, 2020

Conversation

NiLuJe
Copy link
Member

@NiLuJe NiLuJe commented Oct 11, 2020

@NiLuJe
Copy link
Member Author

NiLuJe commented Oct 11, 2020

(Shouldn't cause any trouble, I'm pretty much always running FT master on my desktop).

@NiLuJe NiLuJe merged commit 9e0877f into koreader:master Oct 11, 2020
NiLuJe added a commit to NiLuJe/koreader that referenced this pull request Oct 11, 2020
NiLuJe added a commit to koreader/koreader that referenced this pull request Oct 12, 2020
@yparitcher
Copy link
Member

After this when rebuilding Koreader I have to manually delete libs/libfreetype.so.6 & rebuild (kodev/make don't take care of this themselves) or it crashes with:

ffi.load: libs/libmupdf.so
ffi.load (warning): /mnt/us/koreader/libs/libfreetype.so.6: undefined symbol: ft_smooth_lcd_renderer_class
./luajit: ./setupkoenv.lua:27: Not able to load dynamic library: libs/libmupdf.so
stack traceback:
	[C]: in function 'error'
	./setupkoenv.lua:27: in function 'load'
	./ffi/mupdf.lua:25: in main chunk
	[C]: in function 'require'
	frontend/document/canvascontext.lua:14: in main chunk
	[C]: in function 'require'
	./reader.lua:139: in main chunk
	[C]: at 0x0001414d

@NiLuJe
Copy link
Member Author

NiLuJe commented Oct 14, 2020

That... doesn't surprise me all that much, I rarely do incremental builds for a reason: I don't trust 'em not to mess up the depchain after any significant change ;).

@yparitcher
Copy link
Member

They almost always work on my end, and ./kodev clean deletes deps downloads so not an option with slow internet.

@NiLuJe
Copy link
Member Author

NiLuJe commented Oct 14, 2020

I don't rightly recall where the git checkout ends up, so this may be a moot point, but I tend to do those manually, too ;p (e.g., rm -rf base/thirdparty/*/build or something, plus the actual target dir in build/something IIRC).

Granted, unmetered cable/FTTLA/FTTH means I've never really thought all that much about the download aspect of things.

@NiLuJe
Copy link
Member Author

NiLuJe commented Oct 14, 2020

I'm not even sure the buildsystem groks that a version update requires a clean rebuild of at least that subproject?

(And I do know that there are... weird interactions where FT & HB are involved when touching 'em on an incremental build).

@yparitcher
Copy link
Member

I'm not even sure the buildsystem groks that a version update requires a clean rebuild of at least that subproject?

(And I do know that there are... weird interactions where FT & HB are involved when touching 'em on an incremental build).

usually it does, this time it did download and rebuild FT but i guess it didn't replace the library or something.

@Frenzie
Copy link
Member

Frenzie commented Oct 14, 2020

If it doesn't, and that's a pretty big if except for some minor trouble with libk2pdfopt/leptonica/tesseract I never bothered to fix, it's a simple dependency issue in our Makefile. I probably haven't done a full clean build in years on my main Git checkout.

I don't rightly recall where the git checkout ends up, so this may be a moot point, but I tend to do those manually, too ;p (e.g., rm -rf base/thirdparty/*/build

Checkout is separate from build, CMake copies it into build so if you delete build it only needs to recompile, not redownload. But it also does that if the CMakeLists.txt changes or one of the patch files, or one of the dependencies. If it didn't it means FT is a dependency for something that isn't specified properly in Makefile.third.

@@ -29,7 +29,7 @@ endif()
ko_write_gitclone_script(
GIT_CLONE_SCRIPT_FILENAME
https://gitlab.com/koreader/freetype2.git
VER-2-10-2
VER-2-10-3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, changed cmakelists = this will be recompiled as will everything that depends on FT.

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

Successfully merging this pull request may close these issues.

None yet

3 participants