add package djvulibre #1286

darealshinji · 2016-04-08T17:28:05Z

~~I wasn't able to build v3.5.27 yet. I was able to build shared libraries but they were broken.~~
Right now only shared libraries can be build and used. Static libraries, if build, are broken.

starius · 2016-04-08T23:18:52Z

src/djvulibre.mk

+
+PKG             := djvulibre
+$(PKG)_IGNORE   := 3.5.27
+$(PKG)_VERSION_ := 3.5.25


I think, $(PKG)_VERSION_ should be renamed to $(PKG)_SHORTVERSION.

starius · 2016-04-08T23:26:13Z

Can you combine all patches to single file in git like format, please?
To create such patch, ./tools/patch-tool-mxe can be used:

$ ./tools/patch-tool-mxe init djvulibre
$ cd gits/djvulibre-3.5.25
$ git apply path/to/first.patch
$ git commit -m 'description (reason, error fixed, etc)'
$ git apply path/to/second.patch
$ git commit -m 'description (reason, error fixed, etc)'
and so on
$ cd -
$ ./tools/patch-tool-mxe export djvulibre

Single file with all patches in unified format makes browsing history easier.

darealshinji · 2016-04-09T00:11:31Z

Like this? https://gist.github.com/darealshinji/e0da804a3eff975954408232a3e4cf1b

starius · 2016-04-09T11:09:20Z

Like this? https://gist.github.com/darealshinji/e0da804a3eff975954408232a3e4cf1b

No, it lacks commit messages, author and date.

I contributed all the changes in the pull request to your branch: https://github.com/darealshinji/mxe/pull/1

improvements of djvulibre

darealshinji · 2016-04-09T13:19:11Z

Ah, thanks. Merged.

starius · 2016-04-09T13:54:47Z

Why are shared targets disabled?

darealshinji · 2016-04-09T16:34:29Z

I was able to build them but they didn't seem to work. Maybe you can give it a try?

starius · 2016-04-09T16:55:37Z

I have built static targets. They produce the following files:
https://gist.github.com/74156e2a0a1662f9a2b9f7723a4b0948

Please prevent installation of $(PREFIX)/$(TARGET)/bin/*.exe and $(PREFIX)/$(TARGET)/bin/any2djvu. The latter is a shell script.

Please prevent installation of $(PREFIX)/$(TARGET)/share/man.

Are other files in $(PREFIX)/$(TARGET)/share needed to use this library? They seem to be a documentation. If they are not needed, please prevent their installation as well.

Please provide a simple test: file src/test-djvulibre.c and a command in the build rules, which produces executable $(PREFIX)/$(TARGET)/bin/test-djvulibre.exe from it. It should use pkg-config to generate compiler and linker flags. The executable should exit with 0 exit status, of course.

Having this work done, it will be easier to deal with shared targets, I think.

darealshinji · 2016-04-10T01:01:09Z

Should the executables still be built or should I only build the library?

starius · 2016-04-10T01:39:45Z

Executables should be built to catch build errors.

darealshinji · 2016-04-10T01:58:08Z

Alright. To only install the build stuff you can use make -C libdjvu install-lib install-include install-pkgconfig.
This installs the following files for me:

include/libdjvu/ddjvuapi.h
include/libdjvu/miniexp.h
lib/libdjvulibre.a
lib/pkgconfig/ddjvuapi.pc
lib/libdjvulibre.la

Will this serve as a test program?

#include <windows.h>
#include <libdjvu/ddjvuapi.h>

int main(int argc, char *argv[])
{
    ddjvu_context_t *djvu_test;
    djvu_test = ddjvu_context_create(argv[0]);
    ddjvu_context_release(djvu_test);
    return 0;
}

starius · 2016-04-10T02:20:10Z

Will this serve as a test program?

Can it work without include of windows.h to keep it cross-platform?
Otherwise looks good to me.

darealshinji · 2016-04-10T05:05:18Z

windows.h wasn't necessary. And the created test program works as expected on Windows and returns 0.

starius · 2016-04-10T13:08:54Z

I'm investigating shared build issues. i686-w64-mingw32.shared works with the patch.

x86_64-w64-mingw32.shared is still broken because of linking problems with jpeg.

I am going to make another pull request against your branch.

starius · 2016-04-10T15:05:40Z

I have fixed shared targets in a pull request https://github.com/darealshinji/mxe/pull/2

Patch "fix linking errors in shared builds" fixes i686-w64-mingw32.shared. Change of djvulibre.mk fixes x86_64-w64-mingw32.shared by changing deplibs check method to "objdump". See the explanations below. On Wheezy (at least) "file" returns "data" for x86-64 object files from libmsvcp60.a. Therefore the check fails with the following message: *** Warning: linker path does not have real file for library -lmsvcp60. *** I have the capability to make that library automatically link in when *** you link to this library. But I can only do this if you have a *** shared version of the library, which you do not appear to have *** because I did check the linker path looking for a file starting *** with libmsvcp60 and none of the candidates passed a file format test *** using a file magic. Last file checked: /home/mxe/mxe-djvulibre/usr/lib/gcc/x86_64-w64-mingw32.shared/4.9.3/../../../../x86_64-w64-mingw32.shared/lib//libmsvcp60.a *** The inter-library dependencies that have been dropped here will be *** automatically added whenever a program is linked with this library *** or is declared to -dlopen it. *** Since this library must not contain undefined symbols, *** because either the platform does not support them or *** it was explicitly requested with -no-undefined, *** libtool will only create a static version of it. Then it compiled static library and failed when compiling djvulibre-test.c because of missing -ljpeg.

djvulibre: enable shared targets

TimothyGu · 2016-04-10T19:44:53Z

src/djvulibre.mk

+        --disable-desktopfiles \
+        $(if $(BUILD_SHARED),\
+            lt_cv_deplibs_check_method='file_magic file format (pe-i386|pe-x86-64)' \
+            lt_cv_file_magic_cmd='$$OBJDUMP -f')


This is an indication that the libtool included in the tarball is ancient. Try using autoreconf -fi instead of manually specifying the variables.

Fixed in https://github.com/darealshinji/mxe/pull/3

Changes of ./configure were moved to ./configure.ac to preserve them after `autoreconf -fi`. See #1286 (comment)

djvulibre: call autoreconf -fi, not change options

darealshinji · 2016-04-11T18:11:39Z

Maybe for the static targets we should add #define MINILISPAPI __declspec(dllexport) and #define DDJVUAPI __declspec(dllexport) to the headers, otherwise the users will always have to manually add -DDLL_EXPORT to their build flags to link against the static libraries.

TimothyGu · 2016-04-11T19:58:45Z

Maybe for the static targets we should add #define MINILISPAPI __declspec(dllexport) and #define DDJVUAPI __declspec(dllexport) to the headers

That sounds wrong. Actually, we DON'T want to do this for static builds during the compilation process, which is harmless, OR when users are compiling their own code, which is harmful.

darealshinji · 2016-06-12T12:29:59Z

When I built a pdf/djvu viewer and wanted to link it against the static library I got errors about unresolved import library symbols. But apparently the library can't be build at all without the DLL_EXPORT macro, so right now only a dll can be build.

# This file is part of MXE.
# See index.html for further information.

PKG             := djvulibre
$(PKG)_IGNORE   := 3.5.27
$(PKG)_SHORTVER := 3.5.25
$(PKG)_VERSION  := $($(PKG)_SHORTVER).3
$(PKG)_CHECKSUM := 898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0
$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_SHORTVER)
$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/djvu/DjVuLibre/$($(PKG)_SHORTVER)/$($(PKG)_FILE)
$(PKG)_DEPS     := gcc jpeg tiff zlib

define $(PKG)_UPDATE
    $(WGET) -q -O- 'http://sourceforge.net/projects/djvu/files/DjVuLibre/' | \
    $(SED) -n 's,.*/\([0-9][^A-Za-z"]*\)/".*,\1,p' | \
    head -1
endef

define $(PKG)_BUILD_SHARED
    cd '$(1)' && autoreconf -fi
    cd '$(1)' && ./configure $(MXE_CONFIGURE_OPTS) --disable-desktopfiles
    $(MAKE) -C '$(1)' -j '$(JOBS)'
    $(MAKE) -C '$(1)/libdjvu' -j 1 install-lib install-include install-pkgconfig

    '$(TARGET)-g++' \
        -W -Wall -Werror -pedantic \
        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
        `'$(TARGET)-pkg-config' --cflags --libs ddjvuapi`
endef

I still need to check if I can properly build/link the djvu viewer (qpdfview, if anyone wants to know) under the .shared mxe targets.

darealshinji · 2016-06-13T11:15:11Z

The shared library builds and runs without problems on the i686-w64-mingw32.shared target.

darealshinji · 2016-07-23T12:11:53Z

Yesterday I gave it another try and I really wasn't able to build a proper static library.
I've updated the Makefile with those new macros.

starius · 2016-07-23T23:58:24Z

It fails here in automake with the following error:

configure.ac:44: error: version mismatch.  This is Automake 1.15,
configure.ac:44: but the definition used by this AM_INIT_AUTOMAKE
configure.ac:44: comes from Automake 1.14.1.  You should recreate
configure.ac:44: aclocal.m4 with aclocal and run automake again.

Why did you replaced autoreconf -fi with automake?

darealshinji · 2016-07-24T07:14:13Z

Why did you replaced autoreconf -fi with automake?

I didn't realize that. It's now fixed.

starius · 2016-07-24T16:27:53Z

Next problem: s/$(TEST_FILE).c/$(TEST_FILE)/

starius · 2016-07-24T16:43:55Z

After applying s/$(TEST_FILE).c/$(TEST_FILE)/ the build succeeded.
The list of files installed: https://gist.github.com/d866baba1a23870df9308615ea218e14

I applied the following patch:

diff --git a/src/djvulibre.mk b/src/djvulibre.mk
index 3e4f394..4caf6e1 100644
--- a/src/djvulibre.mk
+++ b/src/djvulibre.mk
@@ -22,10 +22,11 @@ define $(PKG)_BUILD_SHARED
     cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS) \
         --disable-desktopfiles
-    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' install-strip
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install-strip $(MXE_DISABLE_CRUFT)

     '$(TARGET)-g++' \
         -W -Wall -Werror -pedantic \
-        '$(TEST_FILE).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `'$(TARGET)-pkg-config' ddjvuapi --cflags --libs`
 endef

to prevent it from installing docs and tools.

(And to prevent installation with -j > 1.)

Now the list of files is as following:
https://gist.github.com/f728df76fdd000b40d10cba04ce392e0

Looks better, but it still installs shell scripts: any2djvu, djvudigital.

Could you apply my patches and prevent installation of these shell scripts?

darealshinji · 2016-07-24T17:28:20Z

Could you apply my patches and prevent installation of these shell scripts?

Done.

starius · 2016-07-24T19:30:39Z

Exclusion of shell scripts can be achieved without patching source:

diff --git a/src/djvulibre.mk b/src/djvulibre.mk
index 4caf6e1..5e3fc5b 100644
--- a/src/djvulibre.mk
+++ b/src/djvulibre.mk
@@ -23,7 +23,8 @@ define $(PKG)_BUILD_SHARED
         $(MXE_CONFIGURE_OPTS) \
         --disable-desktopfiles
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
-    $(MAKE) -C '$(BUILD_DIR)' -j 1 install-strip $(MXE_DISABLE_CRUFT)
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install-strip \
+        $(MXE_DISABLE_CRUFT) dist_bin_SCRIPTS=

     '$(TARGET)-g++' \
         -W -Wall -Werror -pedantic \

darealshinji · 2016-07-25T12:14:42Z

Very convenient, I didn't know that.

starius · 2016-07-26T08:56:29Z

List of files installed: https://gist.github.com/ea0a95023b6bfa8403f0e6611bf242ff

Looks good to me. Very well done!

add package djvulibre

9ba1b57

starius reviewed Apr 8, 2016
View reviewed changes

starius added 3 commits April 9, 2016 14:06

djvulibre: rename VERSION_ to SHORTVER

ba11af0

djvulibre: use macro SOURCEFORGE_MIRROR

4a7b59e

djvulibre: consolidate patches

f3908f8

Merge pull request #1 from LuaAndC/djvulibre5

330cef1

improvements of djvulibre

djvulibre test program

cbbb43b

starius and others added 2 commits April 10, 2016 19:21

Merge pull request #2 from LuaAndC/djvulibre6

ebcd93b

djvulibre: enable shared targets

TimothyGu reviewed Apr 10, 2016
View reviewed changes

starius and others added 2 commits April 10, 2016 23:28

djvulibre: call autoreconf -fi, not change options

c520ddd

Changes of ./configure were moved to ./configure.ac to preserve them after `autoreconf -fi`. See #1286 (comment)

Merge pull request #3 from LuaAndC/djvulibre9

6d1fe07

djvulibre: call autoreconf -fi, not change options

darealshinji added 2 commits June 13, 2016 15:01

djvulibre 3.5.27 (shared-only)

4e4f031

Merge remote-tracking branch 'upstream/master' into djvulibre

29050ec

djvulibre: fixes

d4b2eeb

starius merged commit 22db053 into mxe:master Jul 26, 2016

darealshinji deleted the djvulibre branch July 26, 2016 12:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add package djvulibre #1286

add package djvulibre #1286

darealshinji commented Apr 8, 2016 •

edited

starius Apr 8, 2016

starius commented Apr 8, 2016

darealshinji commented Apr 9, 2016

starius commented Apr 9, 2016

darealshinji commented Apr 9, 2016

starius commented Apr 9, 2016

darealshinji commented Apr 9, 2016

starius commented Apr 9, 2016

darealshinji commented Apr 10, 2016

starius commented Apr 10, 2016

darealshinji commented Apr 10, 2016

starius commented Apr 10, 2016

darealshinji commented Apr 10, 2016

starius commented Apr 10, 2016

starius commented Apr 10, 2016

TimothyGu Apr 10, 2016

starius Apr 10, 2016

darealshinji commented Apr 11, 2016

TimothyGu commented Apr 11, 2016

darealshinji commented Jun 12, 2016

darealshinji commented Jun 13, 2016

darealshinji commented Jul 23, 2016

starius commented Jul 23, 2016

darealshinji commented Jul 24, 2016

starius commented Jul 24, 2016

starius commented Jul 24, 2016

darealshinji commented Jul 24, 2016

starius commented Jul 24, 2016

darealshinji commented Jul 25, 2016

starius commented Jul 26, 2016

add package djvulibre #1286

add package djvulibre #1286

Conversation

darealshinji commented Apr 8, 2016 • edited

starius Apr 8, 2016

Choose a reason for hiding this comment

starius commented Apr 8, 2016

darealshinji commented Apr 9, 2016

starius commented Apr 9, 2016

darealshinji commented Apr 9, 2016

starius commented Apr 9, 2016

darealshinji commented Apr 9, 2016

starius commented Apr 9, 2016

darealshinji commented Apr 10, 2016

starius commented Apr 10, 2016

darealshinji commented Apr 10, 2016

starius commented Apr 10, 2016

darealshinji commented Apr 10, 2016

starius commented Apr 10, 2016

starius commented Apr 10, 2016

TimothyGu Apr 10, 2016

Choose a reason for hiding this comment

starius Apr 10, 2016

Choose a reason for hiding this comment

darealshinji commented Apr 11, 2016

TimothyGu commented Apr 11, 2016

darealshinji commented Jun 12, 2016

darealshinji commented Jun 13, 2016

darealshinji commented Jul 23, 2016

starius commented Jul 23, 2016

darealshinji commented Jul 24, 2016

starius commented Jul 24, 2016

starius commented Jul 24, 2016

darealshinji commented Jul 24, 2016

starius commented Jul 24, 2016

darealshinji commented Jul 25, 2016

starius commented Jul 26, 2016

darealshinji commented Apr 8, 2016 •

edited