2
0
mirror of https://github.com/koreader/koreader synced 2024-11-10 01:10:34 +00:00
Commit Graph

423 Commits

Author SHA1 Message Date
Qingping Hou
93d04839fc support for building against custom koreader-base repo 2014-01-01 16:09:29 -05:00
chrox
67f627f2fb update po file from transifex automatically on each build 2013-11-29 22:41:56 +08:00
Giorgio Micotti
7d8f13ae00 Safer installing process for Kobos 2013-09-30 23:03:39 +02:00
Giorgio Micotti
afd4a2d920 Merge branch 'master' of https://github.com/koreader/koreader 2013-09-30 12:30:27 +02:00
chrox
9fd9bb17a9 update mupdf and k2pdfopt to the latest version 2013-09-21 21:31:22 +08:00
Giorgio Micotti
be1a637c3b DO NOT MERGE initial suspend support for Kobo 2013-09-09 09:04:09 +02:00
HW
62a2c6738d consolidated Makefile, adapted to dynlib approach 2013-08-15 15:55:50 +02:00
HW
f2e0eb3dfd interim merge of latest upstream 2013-08-15 15:51:12 +02:00
Giorgio Micotti
d9b210c315 Changed "koboupdate" to be more reliable as an installation mean. 2013-08-08 12:07:40 +02:00
HW
5eeb4380e4 small fixes 2013-08-07 21:58:15 +02:00
HW
e862820638 switch to new dynamic loading library build
separate output directories are created per-architecture
2013-08-07 20:40:00 +02:00
Giorgio Micotti
1201b64d18 Add an option "make koboupdate" 2013-08-06 12:03:10 +02:00
chrox
466605e8f7 add hyphenation dictionaries in customupdate 2013-07-13 21:48:57 +08:00
Giorgio Micotti
c91e3834bb Added detection of single kobo models. Also a script to launch koreader is included and the related Makefile changes. 2013-07-10 09:10:38 +02:00
chrox
43240a7d98 add defaults.lua in emu directory 2013-07-09 15:39:27 +08:00
Qingping Hou
84801e6f51 add defaults.lua in customupdate 2013-07-01 02:58:06 -04:00
Qingping Hou
561c7902ca move defaults.lua to root directory 2013-07-01 02:55:28 -04:00
{Qingping,Dave} Hou
d0e23dd90e Merge pull request #136 from houqp/houqp-master
update koreader-base
2013-06-29 14:11:52 -07:00
Qingping Hou
38bb360f2d link ev_replay to emu dir 2013-06-28 01:53:12 -04:00
chrox
9ab9af20bf rm additional fonts in resources dir in customupdate 2013-06-16 17:17:31 +08:00
chrox
be7794eb06 add 'make fonts' command that merges additional fonts in resources into fonts pool 2013-06-16 15:45:19 +08:00
chrox
1a23787e26 add dict and tessdata directory in dist data directory 2013-05-01 13:51:40 +08:00
chrox
db56b52bed add missing sdcv 2013-04-30 20:06:01 +08:00
chrox
e71aa93a97 add sdcv in customupdate 2013-04-30 18:46:04 +08:00
chrox
936dfc6fd1 add text highlight in both reflow and non-reflow mode 2013-04-24 06:59:52 +08:00
Qingping Hou
3e6005b3af replace i18n with MO_DIR 2013-04-09 20:13:23 -04:00
chrox
b7e0cb2c80 Makefile fix
i. add make mo in rule of make all
ii. make make customupdate depend on make all
iii. copy i18n in current directory
2013-04-09 21:01:02 +08:00
Qingping Hou
d4cec9956d link i18n dir in emu 2013-04-08 11:27:39 -04:00
Qingping Hou
9f267ef5fd add i18n to bootstrapemu target 2013-04-08 11:25:31 -04:00
Qingping Hou
95b2442a49 add target to generate mo files 2013-04-08 03:21:03 +08:00
Qingping Hou
4747cd6a8a add gettext related target to Makefile 2013-04-08 03:05:32 +08:00
Qingping Hou
8968efeb72 copy i18n in customupdate 2013-04-07 16:24:36 +08:00
Qingping Hou
4ccf5a57e3 a little bit code cleanup 2013-04-03 12:43:58 +08:00
Qingping Hou
0285475bac make history directory in bootstrapemu target 2013-04-03 12:29:13 +08:00
chrox
1d775c27a6 rename kpdf.sh to koreader.shin in customupdate 2013-03-25 16:49:41 +08:00
Qingping Hou
b096af45a2 define KOR_BASE at the top of Makefile 2013-03-24 17:27:20 -04:00
Qingping Hou
c3fb3fb7db fix typo 2013-03-24 17:06:49 -04:00
Qingping Hou
c70520dedf add KOR_BASE variable in Makefile 2013-03-24 17:04:32 -04:00
Qingping Hou
221bc10404 add bootstrapemu target and update README 2013-03-24 15:11:21 -04:00
Qingping Hou
23435317ce add emulation bootstrap target in makefile & update README 2013-03-25 00:18:53 +08:00
Qingping Hou
9546c5503b update reader name in customupdate to koreader 2013-03-24 23:52:39 +08:00
Qingping Hou
7d60a4a44f generate git-rev on package build 2013-03-24 23:38:27 +08:00
HW
fb317810fa Some adaptions needed after refactoring 2013-03-24 15:08:42 +01:00
HW
6a92cb99e8 Step #3 factoring out the frontend code
This is a first try, but some work is still needed to bring the
build system back into shape.
2013-03-24 13:25:52 +01:00
Qingping Hou
8d2e5128b6 remove kite in favor of KUAL 2013-02-18 18:45:24 -05:00
chrox
6e858a980b add extensions directory in customupdate 2013-02-18 18:33:48 -05:00
chrox
0706cd719b add libk2pdfopt as a prerequisite lib for kpdfview object 2012-12-22 14:01:05 +08:00
Qingping Hou
3838d8f890 build crengine as shared library
* upstream project removed CMakeLists.txt in crengine dir now, so I
added our own in kpvcrlib/CMakeLists.txt

* fix segfault bug in lvimg.cpp by removing JCONFIG_INCLUDED definition
2012-12-19 15:54:41 +08:00
Tigran Aivazian
667d6b654f Don't use DroidSansFallbackFull.ttf fonts
Use DroidSansFallback.ttf rather than DroidSansFallbackFull.ttf because
that is what is used for rendering cjk glyphs by mupdf (see mupdf.patch).

Conflicts:
	font.lua
2012-12-13 01:39:35 +08:00
Tigran Aivazian
42a4c8042b Package defaults.lua and symlink libluajit-5.1.so
1. The file defaults.lua needs to be mentioned in LUA_FILES in order to
be packaged by "make customupdate".
2. The problem with the linker not finding libluajit-5.1.so.2 can be
fixed without specifying the shared library in the list of objects (and
static libraries), simply by making a symbolic link. No need to copy a
duplicate.

Conflicts:

	Makefile
2012-11-26 14:07:37 -05:00
HW
e129307c40 Fixed initialization/update of mupdf's submodules, build "release" version of build helpers 2012-11-26 14:05:29 -05:00
Qingping Hou
a123e5157f remove comments 2012-11-26 14:02:42 -05:00
HW
503fefe7ec moved luajit-2.0 and mupdf to latest version - now really
Conflicts:

	Makefile
2012-11-26 14:02:14 -05:00
HW
77866a4bd4 disabled patching of libjpeg, restructured everything for mupdf subrepos
Conflicts:

	Makefile
2012-11-26 13:59:40 -05:00
HW
e26ae14bed updated mupdf to latest version
Conflicts:

	Makefile
2012-11-26 13:57:37 -05:00
Tigran Aivazian
b3b3d04c98 Create history and clipboard dirs for the emulator 2012-11-26 13:39:53 -05:00
Tigran Aivazian
80fb6c21cc Use the font DroidSansFallbackFull.ttf
Conflicts:

	font.lua
2012-11-26 13:37:49 -05:00
Tigran Aivazian
f2f299cd09 Bugfix: link with the static libjpeg.a
We should explicitly link with the libjpeg.a from mupdf/thirdparty and not with the
shared libjpeg.so that may happen to be installed on the system.

Conflicts:

	Makefile
2012-11-26 13:21:57 -05:00
Qingping Hou
44a0bf33ac Merge branch 'new_ui_code' of github.com:hwhw/kindlepdfviewer into new_ui_code
Conflicts:
	Makefile
2012-11-26 13:16:33 -05:00
HW
f073c23296 Switched LuaJIT to shared library instead of static 2012-11-26 13:00:38 -05:00
chrox
edd18c4219 update k2pdfopt to version 1.62 2012-11-26 22:13:43 +08:00
chrox
4d14cd69b2 use -O3 option in compiling libk2pdfopt
Probably we should use fomit-frame-pointer explicitly even though
fomit-frame-pointer is included by default with -O2 and -O3 just like
the Linux kernel guys doing. I found append -O3 directly to `CFLAGES`
will do the trick. So I removed the KOPT_CFLAGS variable.
2012-11-26 22:08:29 +08:00
chrox
f10feb9b94 add -fno-finite-math-only in KOPT_CFLAGS
In some compilation platform if finite-math-only option is turned
on, math functions like exp and sqrt will be dynamically linked to
finite versions which cannot be located in Kindle's GLIBC. In my
toolchain the symbol __exp_finite cannot be found in GLIBC_2.4 so
gcc just use __exp_finite in GLIBC_2.15, which will cause a run time
error in Kindle saying "version GLIBC_2.15 not found"
2012-11-26 22:07:51 +08:00
chrox
ec03261dc6 -fomit-frame-pointer is enabled at level -O, -O2, -O3 2012-11-26 22:07:27 +08:00
chrox
7850aab2b0 add libk2pdfopt.so.1 in customupdate 2012-11-26 22:06:04 +08:00
chrox
5acf471ecb use -O3 option in k2pdfopt compilation
Koptreader will gain 20% performance boost.
2012-11-26 22:03:37 +08:00
chrox
44361faeee build libk2pdfopt as a shared library 2012-11-26 22:02:09 +08:00
chrox
a5b28ff6f2 include k2pdfopt header in pdf.c and djvu.c and koptcontext.h 2012-11-26 21:58:53 +08:00
chrox
8430850a39 move k2pdfopt source to a submodule libk2pdfopt
Currently libk2pdfopt is staticly linked to kpdfview.
2012-11-26 21:58:32 +08:00
chrox
f70ef06ea6 use koptcontext to keep dozons of parameters for k2pdfopt 2012-11-26 21:57:23 +08:00
Qingping Hou
ba60e641a9 add emu_event to clean target 2012-11-05 13:36:50 -05:00
Qingping Hou
0b08992591 update djvulibre target dependence for LIBDIR 2012-11-02 16:18:16 -04:00
Tigran Aivazian
6580291e3a Link against libraries in libs and libs-emu
Instead of linking against the location inside the original build tree
we should link against the copy in a single place. This makes the build
code cleaner and more compact even now and will do even more so when we
build more libraries as shared (which is what I am going to attempt
next).
2012-11-02 16:15:47 -04:00
Tigran Aivazian
87d0b94d9b Mkdir clipboard at build, not runtime
Conflicts:

	filechooser.lua
2012-11-02 16:07:08 -04:00
Tigran Aivazian
2bd8dd3389 build: mkdir libs if does not exist
Since we are doing this for emulator we might as well do this for normal
build too.
2012-11-01 09:28:59 -04:00
Qingping Hou
6f6cb3c1a9 build: create libs-emu dir if not found 2012-10-31 22:54:19 -04:00
Tigran Aivazian
d4642a5df1 Build djvulibre as a shared library 2012-10-31 22:39:58 -04:00
Tigran Aivazian
5c0201d3e3 Makefile: extr depends on MUPDFLIBS/THIRDPARTYLIBS 2012-10-31 22:29:31 -04:00
Tigran Aivazian
fc20c0af26 Support for extracting attachments from PDF file
This commit adds Alt-S command which invokes the external utility "extr"
passing it the full pathname of the open PDF file and the current page
number. The utility extracts all attachments on this page (if there are
any) and saves them in the same directory as the PDF file. The file
names given to attachments are decoded from within the PDF file itself,
i.e. they are the same as the original file names of the files embedded
in the PDF.

Conflicts:

	pdfreader.lua
2012-10-31 22:19:39 -04:00
Tigran Aivazian
7f4be723a0 LuaJIT: make distclean -> make clean
Two reasons for this change:

1. The latest LuaJIT has no "distclean" target
2. The "distclean" is MUCH slower
2012-10-31 21:43:52 -04:00
chrox
9e8a92862c add koptreader.lua file in customupdate
Conflicts:

	Makefile
2012-10-31 21:34:30 -04:00
chrox
441d061664 add DJVU reflow
Conflicts:

	djvu.c
	koptreader.lua
	reader.lua
2012-10-31 21:30:06 -04:00
chrox
f3f97b6223 add pdf page reflow
Conflicts:

	pdfreader.lua
2012-10-31 21:17:08 -04:00
Dobrica Pavlinusic
95f6ed5bd6 fix getCurrentPageLinks segfault on links without target 2012-10-31 21:11:16 -04:00
Tigran Aivazian
6c9a3c3dc5 Factor out JPEG support into a module
This is to make adding support for new formats easier.
See the file pic_jpeg.h for the description of the interface that each
image format must support.

Conflicts:

	Makefile
2012-10-31 20:54:24 -04:00
Tigran Aivazian
879c937762 Force the use of bash.
On some distributions (e.g. Ubuntu) the shell used for scripts is dash,
not bash and we explicitly rely on bash's features in the Makefile, so
we must guarantee that we are running with bash (not dash or anything
else).
2012-10-31 20:33:49 -04:00
Tigran Aivazian
cbfa0d5344 Generate git-rev file at compile time.
The file git-rev containing the program's version should be generated at
kpdfview compile time rather than package generation time.

Conflicts:

	Makefile
2012-10-09 14:41:00 -04:00
NiLuJe
d60504ef83 More comments on the whole unaligned access mess on FW 2.x. Don't even
think about setting the alignment trap to a mode that includes warn,
that simply kills the performance because of the storm of faults the
syslog gets...
2012-10-03 13:03:27 -04:00
NiLuJe
42e66cc605 Yep, -mno-unaligned-access is definitely needed with a GCC 4.7
ToolChain, the kernel used on FW 2.x is too old to handle unaligned
accesses properly.
2012-10-03 13:02:04 -04:00
NiLuJe
24b9678dc6 It's a spaaaaace! 2012-10-03 13:01:25 -04:00
NiLuJe
3e47fe8e01 Quote that to avoid potential issues... 2012-10-03 12:57:20 -04:00
NiLuJe
0790190af5 Slightly nicer fix for building mupdf's .host stuff with CFLAGS in the env. 2012-10-03 12:55:26 -04:00
NiLuJe
c68ac9c8c8 Add a note about -mno-unaligned-access (check my x-compile.sh script for
more details, I'll revisit this once Linaro 2012.10 comes out).
2012-10-03 12:54:58 -04:00
NiLuJe
d55138113f Split the backward compat stuff between CFLAGS/CXXFLAGS 2012-10-03 12:54:34 -04:00
NiLuJe
c35b5d2d56 Don't use the backward compat flags on the host. Move to a dedicated
variable, with a few comments to explain ;).
2012-10-03 12:53:19 -04:00
NiLuJe
9520c9b662 Add -fno-finite-math-only (after -ffast-math) to the ARM flags to avoid
MG 2012.03 pulling GLIBC_2.15 symbols from libm (because -ffast-math asks
for it).
I didn't see this on my own TC because it's using a much older glibc version (2.9).
2012-10-03 12:53:09 -04:00
NiLuJe
b0f7ea5d81 revert the whole 'let's use ld' thing. It's useless, and might wreak
havoc on EMU builds picking up system libs instead of the bundled ones.
2012-10-03 12:52:39 -04:00
NiLuJe
9169ac7541 Make sure we're always building luajit statically, so ld doesn't pick a
shared version. Of course that explained the size difference :D.
2012-10-03 12:52:18 -04:00
NiLuJe
5a2e4dec99 Fix the luajit clean fix (forgot to quote *_*).
Let ld do its job when linking, don't pass the static libs as object
files (we end up with a smaller native binary).
2012-10-03 12:51:27 -04:00
NiLuJe
679fce3df4 Make sure we're building for the softfp float ABI, and not in Thumb.
Might fix #359
2012-10-03 12:50:17 -04:00
NiLuJe
b5134ee4f2 Honor toplevel settings re: CC/FLAGS when building libdjvu. Define
_GNU_SOURCE to fix build with CS/MG TC. Fixes #341
2012-10-03 12:49:50 -04:00
NiLuJe
51345c6f08 Let's do a distclean, actually. Less noise in git status that way. 2012-10-03 12:49:27 -04:00
NiLuJe
9173f0a549 Don't require a cross-tc for cleanthirdparty (still confuzzled about why
luajit needs CFLAGS for a clean target, but, hey!). Fixes #357
2012-10-03 12:48:38 -04:00
Qingping Hou
7352ff8a65 revert commit 9127d1c9a1
As NiLuJe points out, that line is not needed, clean
stage of the popen Makefile will take care of it.
2012-10-03 05:36:59 -04:00
NiLuJe
bccccba794 Reimplement kpdf.sh changes from PR#348 after the PR#352 merge, and fix
customupdate to actually bundle kpdf.sh in the new location

Conflicts:

	launchpad/kpdf.sh
2012-10-02 21:40:05 -04:00
Qingping Hou
e82121b72e add HOSTAR for emu mode complie 2012-10-02 21:15:37 -04:00
Qingping Hou
9a1e581f7a add popennslib to cleanthirdparty 2012-10-02 21:14:21 -04:00
NiLuJe
30c3497654 Slight syntax tweak 2012-10-02 21:05:05 -04:00
NiLuJe
4c5341fb30 Hello, tiny stupid typo! 2012-10-02 21:04:45 -04:00
NiLuJe
4310b68b3b Don't checkout popen_noshell twice (it reverts parts of our patch) 2012-10-02 20:57:06 -04:00
NiLuJe
84e107313c Don't patch popen-noshell twice 2012-10-02 20:56:58 -04:00
NiLuJe
8250d77390 Properly fix the luajit *FLAGS mess 2012-10-02 20:56:46 -04:00
NiLuJe
3672d79fef Restore Makefiles tweaks 2012-10-02 20:56:37 -04:00
NiLuJe
10c9b3a58c Fetch popen_noshell during fetchthirdparty, don't bundle it in our repo 2012-10-02 20:53:42 -04:00
NiLuJe
18ed67ba2c Fix a stupid typo 2012-10-02 20:52:59 -04:00
NiLuJe
ead342926c Use popen_noshell as a static lib instead of an object file. Use CHOST
instead of HOST (and allow it to be set from the env), use $(MAKE)
instead of make to allow using the jobserver properly, and remove the
dash from commands where we do care about the return code (or inhibit
errors the usual way: rm -f instead of -rm)

Conflicts:

	Makefile
2012-10-02 20:52:49 -04:00
NiLuJe
ee7122d6c4 Revert Makefile changes potentially unsuitable for upstream 2012-10-02 20:49:12 -04:00
NiLuJe
7ce8ff58f8 Update the standalone testcase, too. 2012-10-02 20:49:04 -04:00
NiLuJe
26e10c6069 Fix input device closing, and fix lipc-wait-event handling (using
popen-noshell from http://code.google.com/p/popen-noshell/)

Conflicts:

	input.c
2012-10-02 20:48:43 -04:00
NiLuJe
acae9e618b Makefile tweaks for my TC 2012-10-02 20:43:48 -04:00
Dobrica Pavlinusic
c6ead8690e use git describe to generate version
Last release had git annotate tag (added with git -a) so this is
now much better alternative to just git sha1
2012-10-02 20:18:21 -04:00
Tigran Aivazian
47e5065d6a Be minimalistic wrt LDFLAGS
Passing CFLAGS and LDFLAGS to kpdfview link stage has no effect in our
particular case, so I ripped it out, leaving it only for the crengine.
2012-10-02 20:18:21 -04:00
Tigran Aivazian
d5fb6c846f Enable LTO for kpdfview and crengine
Enaling link time optimizations for kpdfview binary and crengine library
causes another slight performance increase --- almost negligible (1-2ms
per page) but still noticeable by precise measurements.
2012-10-02 20:18:21 -04:00
Tigran Aivazian
15baa52889 ARM-specific optimizations
Thanks to NiLuJe who pointed out that our generic -march=armv6 can be
replaced (for K2/K3/DX/DXG) with a more specific optimization:
-march=armv6j -mtune=arm1136jf-s -mfpu=vfp. This I have now done and
also passed ARM_CFLAGS value to CXXFLAGS which is then passed to
crengine build. Tested, works fine. The performance improvement is
negligible (a few ms per page, but seems to be consistently better, i.e.
not just plus/minus fluctuations).
2012-10-02 20:18:21 -04:00
Tigran Aivazian
5dc488e8c8 Build mupdf in release mode, not debug.
Thanks to NiLuJe who pointed out that we are building mupdf in debug
mode. Switching to "release" build reduced the size of the kpdfview
binary and did not cause any performance degradation (but no noticeable
improvement either --- the page handling times seem to be exactly the
same, i.e. fluctuating a couple of ms in both directions).
2012-10-02 20:18:21 -04:00
Tigran Aivazian
2ac7c7d4cf Optimize compilation of cre.cpp
1. Remove unused "-lsdtc++" from the compilation stage as no linking is
done then.
2. Add our standard CFLAGS to the compilation of cre.cpp which brings in
-O3 -march=armv6 which enables optimizations.
It seemed strange that we compile a cpp file with gcc (as opposed to
g++), but I left it as is for now.
2012-09-30 03:30:48 +08:00
Tigran Aivazian
c5565146f9 Typo: --disable-largefiles -> --disable-largefile
As a result of a simple typo we were continuing to include LFS
support unnecessarily...
2012-09-30 03:30:00 +08:00
Tigran Aivazian
35701e6ec0 Create static directories at build, not runtime.
Instead of calling lfs.mkdir() to create "./history" and "./screenshots"
at runtime it is easier to create them at package build time.
I hesitated whether to add "./clipboard" to this list but decided
against it as we can perhaps change current directory and then
all the code manipulating clipboard would break, so I left it as is.

Conflicts:

	filechooser.lua
	screen.lua
	settings.lua
2012-09-25 10:48:50 -04:00
Tigran Aivazian
50a76c09a0 Optimize building djvulibre.
1. Don't build xmltools in the emulator
2. Remove duplicate --disable-desktopfiles
3. Don't build LFS support. The largest DjVu file I have ever published
was a highres facsimile edition of the London Walton Polyglot (1657)
which was a "mere" 1GB in size and I don't think anyone produced
anything bigger. Besides, storing DjVu files >2GB in size (even if
they existed, which I doubt) on a Kindle with only 3GB total storage
space is _exceedingly_ unlikely.
2012-09-25 10:33:45 -04:00
Dobrica Pavlinusic
cf5dca718b include git rev in distribution zip 2012-09-25 00:00:45 +08:00
Dobrica Pavlinusic
83d910b7d3 use README.md in distribution zip
Conflicts:

	Makefile
2012-09-17 20:29:55 -04:00
Qingping Hou
e6a8f5558c move -l argument to the end of GCC call 2012-09-17 20:22:40 -04:00
Dobrica Pavlinusic
cc52ee0a09 Revert "Set up to compile with arm-kindle-linux-x-tools-glibc2.5-gcc4.2.4.tar.gz toolchain."
This reverts commit 2650faa000
as described in #229
2012-09-17 11:26:44 -04:00
Tigran Aivazian
bcb85d7c07 Fix the Makefile to use freetype-2.4.10 and kpvcrlib/CMakeLists.txt to do the same and also zlib 1.2.5->1.2.7 and libjpeg 8d->9. 2012-09-17 11:21:07 -04:00
Tigran Aivazian
a52aee2f9a Set up to compile with arm-kindle-linux-x-tools-glibc2.5-gcc4.2.4.tar.gz toolchain. 2012-09-17 11:20:31 -04:00
Qingping Hou
98c752f50d Merge branch 'new_ui_code' of github.com:houqp/kindlepdfviewer into new_ui_code
for push
2012-08-25 22:52:56 +08:00
Qingping Hou
c1ccff70ad minor adjustment for Makefile and document.lua 2012-08-25 22:52:12 +08:00
Dobrica Pavlinusic
77fece8ad9 fix lua include path 2012-07-15 02:35:22 +08:00
Kefu Chai
e39bbd7077 fixes for mac
* per http://luajit.org/install.html, otherwise LuaJIT always fails
  to get desired memory chunk from mmap(2)
* kill a warning of clang
2012-07-15 02:35:12 +08:00
Qingping Hou
ae780a543b check mupdf's thirdparty libs' version 2012-07-15 02:19:10 +08:00
Qingping Hou
10e723896b fix wrong warnning message in Makefile 2012-07-13 22:35:51 +08:00
Qingping Hou
59e81a0345 fix typo in makefile 2012-07-13 22:33:32 +08:00
Qingping Hou
fba5ce51bd Merge branch 'new_ui_code' of github.com:hwhw/kindlepdfviewer into new_ui_code 2012-06-10 21:50:43 +08:00
Qingping Hou
a26f6ed9a5 update customupdate target for new ui framework 2012-06-10 21:20:48 +08:00
Qingping Hou
2108b6daeb fix CC for luajit compilation
Conflicts:
	Makefile
2012-06-10 12:37:26 +02:00
Qingping Hou
8f410bdbbe fix cleanthirdparty target 2012-06-10 12:31:04 +02:00
HW
31df51cc80 update to freetype-2.4.9 2012-06-10 12:27:32 +02:00
HW
a381e11a9e switch to LuaJIT-2.0
LuaJIT is a JIT compiler for Lua code. It's phenomenal work, and
you can read about it here: http://luajit.org/
2012-06-10 12:26:12 +02:00
HW
1c05fa2a24 added shortcuts for Kite
as per suggestion from NuPogodi:
http://www.mobileread.com/forums/showpost.php?p=2090800&postcount=465
2012-06-10 12:13:18 +02:00
Qingping Hou
0e9e1f8482 Merge branch 'master' of github.com:hwhw/kindlepdfviewer 2012-04-24 20:38:53 +08:00
Qingping Hou
dbb49505f1 add doc format support
Though I don't like doc at all.
2012-04-24 20:37:16 +08:00
Dobrica Pavlinusic
ebc5f94f61 crengine patching shouldn't fail if already applied
When patch is already applied, -N will skip applying it again,
but it will also return error exit code which will break
make fetchthirdparty
2012-04-24 14:27:42 +02:00
Qingping Hou
c961fbd515 add dirty hack for child node font settings. 2012-04-24 11:04:31 +08:00
Dobrica Pavlinusic
77f2c3b386 don't patch already patched crengine 2012-04-16 10:53:44 +02:00
traycold
429f572827 modification to take into account new version of mupdf 2012-04-16 00:10:41 +02:00
traycold
02dd9b023f Merge remote branch 'hwhw/master'
* hwhw/master: (183 commits)
  show infomessage on document open
  use InfoMessage for empty TOC, jump history and highlights
  copy resources dir on customupdate
  add resource: info icon
  display document open error message
  added infomessage dialog implementation
  bugfix, removed old test constant
  Added widget abstraction framework
  added interface to get blitbuffers from JPEG/PNG files
  fix typo
  added reading of pan_margin settings
  fix full screen refresh command, close #99
  add: sleep and usleep in util module
  fix: add back KEY_FW{LEFT,RIGHT} commands to NumInputBox
  reverted removal of last-doc shortcut, introduced framework restart
  kill our own child process. not quite finished.
  added line spacing setting for crereader
  remove page:getPageText debug dump to improve performance on device
  remove page:getPageText debug dump to improve performance on device
  display crash.log on error
  ...

Conflicts:
	ft.c
	helppage.lua
	inputbox.lua
	rendertext.lua
	rendertext_example.lua
	unireader.lua
2012-04-16 00:08:19 +02:00
Qingping Hou
552246ba13 copy resources dir on customupdate 2012-04-15 11:01:14 +08:00
HW
38afb59b3f added interface to get blitbuffers from JPEG/PNG files
this is supposed to help us in the UI code.
2012-04-14 22:32:05 +02:00
Qingping Hou
0007a8677f fix: rm antiword in make clean 2012-04-11 17:32:36 +08:00
Qingping Hou
e3f6bab9f1 mod: adapt Makefile to new kpvcrlib's CMake environment 2012-04-11 17:13:37 +08:00
HW
a0c0c98093 added configurable static libstdc++ linking
you can now point to a static libstdc++:

make STATICLIBSTDCPP=/home/hw/kindle-sysroot/usr/lib/libstdc++.a
2012-04-09 19:46:10 +02:00
HW
538940baf7 reworked toolchain management a bit
you can now set the toolchain by using e.g.

make HOST=arm-unknown-linux-gnueabi
or
make HOST=arm-linux-gnueabi

also, a SYSROOT flag is introduced. I use this to point
the compiler to a certain sysroot (which contains headers
and might contain libraries to link against). I use this to
use a current and modern compiler against the older
software versions on the Kindle (especially glibc).

I use it like this:

make HOST=arm-none-linux-gnueabi SYSROOT="--sysroot=/home/hw/my-kindle-sysroot"
2012-04-09 19:37:47 +02:00
HW
2f11b761b0 fixed font copying upon customupdate 2012-04-09 19:32:08 +02:00
HW
b32c3bef1f added bind-mounting of host fonts 2012-04-09 19:18:07 +02:00
HW
ec2eda0c05 switched font handling to only work with external fonts
now you can use a environment variable, FONTDIR, to point
to a font dir. Otherwise, "./fonts" is used by default.
Subdirectories are indexed.
2012-04-09 19:04:26 +02:00
Dobrica Pavlinušić
f9c97bcf59 Merge pull request #94 from dpavlin/dbbd6e4c1247e4caeff79245c62f5dd352b17d5b
cleanup customupdate make target
2012-04-09 04:30:20 -07:00
HW
c24d0bd26e corrected CFLAGS for some base .c files 2012-04-09 13:00:02 +02:00
Dobrica Pavlinusic
dbbd6e4c12 call all target for customupdates and cleanup install dir 2012-04-09 12:59:30 +02:00
HW
cce3b41d63 don't build slider_watcher for now 2012-04-09 12:40:38 +02:00
Qingping Hou
f926a12b73 fix: only copy css files from data directory when building customupdate
refer to #77
2012-04-08 09:58:51 +08:00
Dobrica Pavlinusic
9add90a169 Merge branch 'master' of github.com:hwhw/kindlepdfviewer 2012-04-08 00:11:06 +02:00
Qingping Hou
1f9efe0d9c Merge branch 'master' into epub
Conflicts:
	Makefile
	unireader.lua
2012-04-07 23:09:57 +08:00
Dobrica Pavlinusic
f1ba76bfdc create fonts symlink to TTF_FONTS_DIR #77
It took me few tries to figure out that fonts should point to directory
with *.ttf files as opposed to directory with subdirectories so I
decided to add comment about it
2012-04-07 13:48:33 +02:00
Dobrica Pavlinusic
3160ae15f4 make fetchthirdparty fails on existing data dir #77 2012-04-07 13:37:37 +02:00
Qingping Hou
99f3d405b0 add: slider_watcher to customupdate target 2012-04-06 21:21:21 +08:00
Qingping Hou
c41e3e75a3 add: demo for fixing #85, #86 2012-04-06 13:51:37 +08:00
Qingping Hou
17823a0b58 mod: add cflags in crereader compiling 2012-04-04 20:24:17 +08:00
Qingping Hou
8b6398b58e mod: small changes for kindle build 2012-04-04 15:27:01 +08:00
Qingping Hou
74ffdf019e add: dirty hack for libjpeg as workaround
no segfault now, but no images displayed.
2012-04-04 02:57:02 +08:00
Qingping Hou
2814102d28 mod: use customed cmake rules to build CREngine libraries 2012-04-02 11:52:34 +08:00
Dobrica Pavlinusic
989318661d disable djvu tools when cross-compiling 2012-03-31 19:47:39 +02:00
Qingping Hou
9b500189f2 Merge branch 'master' into epub 2012-03-29 19:36:32 +08:00
Dobrica Pavlinusic
e97cfb91e7 hack crsetup.h using grep #77 2012-03-29 00:59:15 +02:00
Dobrica Pavlinusic
ee5b32aced build crengine after depenencies #77 2012-03-28 20:02:41 +02:00
Dobrica Pavlinusic
8bd1cb09ea lua.h dependecy #77 2012-03-28 19:47:39 +02:00
Qingping Hou
c56516d5d1 add: data from crengine 2012-03-29 00:16:00 +08:00
Qingping Hou
4821f10dda half done demo for crengine 2012-03-29 00:09:26 +08:00
traycold
96894ec1a5 update mupdf submodule to commit bdb6b688a238df56b2cf47fa17a08a4dd4b7a122 and small modification to source code to adapt to mupdf modifications 2012-03-24 17:47:52 +01:00
traycold
e2e5af1c61 added some debug code to better understand memory usage by muPdf 2012-03-22 02:08:31 +01:00
HW
a49c8fa2e5 forgot Makefile change when factoring out drawcontext 2012-03-19 22:04:49 +01:00
HW
7b120b0ee0 allow easier customization of toolchain for libdjvu 2012-03-18 11:48:26 +01:00
Dobrica Pavlinusic
65f95ca204 fix fetchthirdparty, closes #43
- added forgot git submodule init to make empty repository checkout work
- fetchthirdparty won't re-download exiting archives on disk
- moved mupdf-thirdparty.zip to root of repostory, since mupdf already
  has .gitignore and we shouldn't modify upstream submodule
2012-03-08 14:06:16 +01:00
Dobrica Pavlinusic
9bd93fe9c1 move third-party git checkouts into submodules #43 2012-03-07 17:19:52 +01:00
Qingping Hou
9c41d0468e fix: remove misplaced backslash in Makefile 2012-03-06 11:58:44 +08:00
traycold
eba1c2d5ef Merge remote-tracking branch 'hwhw/master' into djvu 2012-03-05 23:36:58 +01:00
Qingping Hou
2505128128 fix: add -lpthread for kpdfview target 2012-03-05 14:43:09 +08:00
Qingping Hou
bd02f93d50 mod: remove sqlite in kpdfview dependence 2012-03-05 08:58:11 +08:00
Qingping Hou
1b1fc2b3ae integrate djvu support 2012-03-04 23:30:08 +01:00
traycold
9fb0fcadd8 fixed small type; set compiler variables when using scratchbox 2012-03-04 23:01:41 +01:00
HW
8816285ec7 removed SQLite and lsqlite for the moment 2012-03-04 17:50:25 +01:00
HW
357da594d4 disable ARM specific CFLAGS when in emu mode 2012-03-04 16:56:19 +01:00
HW
b7d0e657a8 disabled debug symbol output, enabled optimization 2012-03-04 15:36:17 +01:00
Dobrica Pavlinusic
c9064411f7 build only static djvulibre and fix cross-compile #26 2012-03-04 15:31:15 +01:00
Dobrica Pavlinusic
2b0a17e034 switch to git djvulibre since 3.5.24 fails #26
I'm using gcc version 4.6.3 (Debian 4.6.3-1) and git does compile while
version 3.5.24 fails with:

In file included from ../../libdjvu/GContainer.h:67:0,
                 from ../../libdjvu/GContainer.cpp:63:
../../libdjvu/GSmartPointer.h:492:30: error: ‘size_t’ does not name a type
../../libdjvu/GSmartPointer.h:492:37: error: ISO C++ forbids declaration of ‘n’ with no type [-fpermissive]
2012-03-04 14:29:11 +01:00
Qingping Hou
41c46313ef mod: adapt makefile to build djvu library 2012-03-03 22:56:07 +08:00
Qingping Hou
4a1a5233c0 Merge branch 'master' into djvu
Conflicts:
	reader.lua
2012-03-03 17:08:06 +08:00
Qingping Hou
c4d0cd26ae half done djvu support 2012-03-01 21:04:46 +08:00
Dobrica Pavlinusic
ccc2f7e134 cleanup old files before fetching new versions 2012-02-29 16:17:43 +01:00
Qingping Hou
e9f6ecfb86 fix: freetype version in Makefile 2012-02-26 11:08:58 +08:00
HW
225fa725db Adapted to latest muPDF changes (xref -> document, memory context) 2012-02-13 20:13:04 +01:00
HW
fbbdc8dfc0 Adapted to latest muPDF code. Makes code a bit slicker. 2012-01-21 19:20:16 +01:00
Dobrica Pavlinusic
f74def7a69 create customupdate package for launchpad installation
This change also modifies installation directory for install
and customupdate make targets to /mnt/us/kindlepdfviewer
2012-01-19 19:52:22 +01:00
HW
f48526d84c reworked install target a bit 2011-12-09 00:11:55 +01:00
HW
f06b0f1dd3 added building/linking of luafilesystem
for info about luafilesystem, see
http://keplerproject.github.com/luafilesystem/
2011-12-02 23:10:59 +01:00
HW
f307264fb6 added freetype text rendering (still buggy)
this allows to render glyphs and also brings a simple
engine for rendering UTF-8 strings onto the framebuffer.
blitting to uneven offset is implemented here, too, but
needs more work and is still buggy.

In the end, this will allow for a simple GUI.
2011-12-01 01:35:53 +01:00
HW
12edfa7627 integrated sqlite3 + luasqlite3 in build
This will pull in support for SQLite3.
For the API, see here:
http://lua.sqlite.org/index.cgi/index
2011-11-29 00:07:46 +01:00
Dobrica Pavlinusic
2d023d79c2 scp all *.lua files to Kindle 2011-11-21 19:30:00 +01:00
HW
11cc9e38f4 added mupdf patching to Makefile 2011-11-20 23:02:39 +01:00
HW
c6e491ad11 accidently enabled PDF tracing output, revert that. 2011-11-17 00:52:07 +01:00
HW
4e037e44f5 more makefile love: compile everything in one go
now - after fetching third party sources - you can
compile everything via

make

or

EMULATE_READER=1 make

in one go.
2011-11-17 00:50:10 +01:00
HW
f78776a4d5 changes on building (clean-up) and emulation code
cleaned up Makefile a bit and made emulation related
parts really conditional on a single flag (EMULATE_READER).
2011-11-16 23:52:26 +01:00
HW
ade5c4892d better argument parsing and option for gamma correction
included MIT-licensed alt_getopt implementation:
http://files.luaforge.net/releases/alt-getopt/alt-getopt/alt-getopt-0.7.0

created example use of gamma correction.

reader.lua now has usage notes for its invocation syntax.
2011-11-16 17:13:08 +01:00
HW
10a8d59882 oops, Makefile wasn't in initial import. 2011-11-14 19:17:14 +01:00