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

[fix] Add util.ffiLoadCandidates to try multiple SDL2 library names #873

Merged
merged 1 commit into from Mar 21, 2019

Conversation

Frenzie
Copy link
Member

@Frenzie Frenzie commented Mar 20, 2019

Fixes koreader/koreader#4826 (comment).

A bit like the idea penned down here.

@Frenzie Frenzie requested a review from NiLuJe March 20, 2019 22:49
Copy link
Member

@NiLuJe NiLuJe left a comment

Choose a reason for hiding this comment

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

Binary distro be stupid.

LGTM! ;).

@Frenzie Frenzie merged commit 148eb32 into koreader:master Mar 21, 2019
@Frenzie Frenzie deleted the sdl2-try-harder branch March 21, 2019 07:10
Frenzie added a commit to Frenzie/koreader-base that referenced this pull request Mar 21, 2019
Fixes minor typo with embarrassing consequences from koreader#873

The file I committed accidentally wasn't 100 % the same as the one I tested. That would've blown up in a pretty embarrassing way.
@Frenzie Frenzie added the bug label Mar 21, 2019
Frenzie added a commit that referenced this pull request Mar 21, 2019
Fixes minor typo with embarrassing consequences from #873

The file I committed accidentally wasn't 100 % the same as the one I tested. That would've blown up in a pretty embarrassing way.
Frenzie added a commit to Frenzie/koreader that referenced this pull request Mar 21, 2019
See koreader#4826 (comment)

Also some Makefile/CMake sanity/cleanup/style/refactoring.

Includes:

* [build] Move Android ZLIB_LDFLAGS to thirdparty/zlib koreader/koreader-base#870
* [chore] Update CMake to modern style with lowercase commands koreader/koreader-base#872
* [fix] Add util.ffiLoadCandidates to try multiple SDL2 library names koreader/koreader-base#873
* [fix] Return fail status for SDL koreader/koreader-base#874
* [chore] Makefile: declare all phonies koreader/koreader-base#875
* [chore] Remove luajit-clean target koreader/koreader-base#876
* [chore] CMake kpvcrlib convert remaining tabs to four spaces koreader/koreader-base#877
Frenzie added a commit to koreader/koreader that referenced this pull request Mar 21, 2019
See #4826 (comment)

Also some Makefile/CMake sanity/cleanup/style/refactoring.

Includes:

* [build] Move Android ZLIB_LDFLAGS to thirdparty/zlib koreader/koreader-base#870
* [chore] Update CMake to modern style with lowercase commands koreader/koreader-base#872
* [fix] Add util.ffiLoadCandidates to try multiple SDL2 library names koreader/koreader-base#873
* [fix] Return fail status for SDL koreader/koreader-base#874
* [chore] Makefile: declare all phonies koreader/koreader-base#875
* [chore] Remove luajit-clean target koreader/koreader-base#876
* [chore] CMake kpvcrlib convert remaining tabs to four spaces koreader/koreader-base#877
@xelxebar
Copy link
Contributor

Unfortunately, even with this fix, I ran into the missing libSDL.so issue. I'm running a Void Linux chroot, and the problem is that it ships libraries with version strings in the filename: e.g. libSDL2-2.0.so.0.9.0. Maintaining a list of all possible filename permutations seems like the Cthulhu solution, though.

@Frenzie
Copy link
Member Author

Frenzie commented Apr 16, 2019

No symlinks of any sort? On my Debian libSDL2-2.0.so is a symlink to libSDL2-2.0.so.0, which is a symlink to libSDL2-2.0.so.0.9.0 (the real deal).

On older versions it's the same, except on Ubuntu 16.04, for example, the actual library is libSDL2-2.0.so.0.4.0.

libSDL2.so is also a symlink to libSDL2-2.0.so.0.9.0, but apparently that only happens if you have the libsdl2-dev package installed.

@xelxebar
Copy link
Contributor

Looks like I've just got /usr/lib/libSDL2-2.0.so.0 -> libSDL2-2.0.so.0.9.0*, without the libSDL2-2.0.so one.

@Frenzie
Copy link
Member Author

Frenzie commented Apr 24, 2019

Alright, so then we can add libSDL2-2.0.so.0 to the list without having to check for 9+ libSDL2-2.0.so.0.?.0 possibilities. :-)

Frenzie added a commit to Frenzie/koreader-base that referenced this pull request Aug 3, 2019
Frenzie added a commit that referenced this pull request Aug 3, 2019
mwoz123 pushed a commit to mwoz123/koreader that referenced this pull request Mar 29, 2020
See koreader#4826 (comment)

Also some Makefile/CMake sanity/cleanup/style/refactoring.

Includes:

* [build] Move Android ZLIB_LDFLAGS to thirdparty/zlib koreader/koreader-base#870
* [chore] Update CMake to modern style with lowercase commands koreader/koreader-base#872
* [fix] Add util.ffiLoadCandidates to try multiple SDL2 library names koreader/koreader-base#873
* [fix] Return fail status for SDL koreader/koreader-base#874
* [chore] Makefile: declare all phonies koreader/koreader-base#875
* [chore] Remove luajit-clean target koreader/koreader-base#876
* [chore] CMake kpvcrlib convert remaining tabs to four spaces koreader/koreader-base#877
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Linux version does not save font sizes and margins
3 participants