Skip to content

Commit f0832a8

Browse files
committed
building with libopenjp2
1 parent 8a71c33 commit f0832a8

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ list-formats:
2020
bash:
2121
$(DOCKER) $(MOUNTS) --entrypoint /bin/bash -t $(DOCKER_IMAGE)
2222

23-
all:
24-
$(DOCKER) $(MOUNTS) --entrypoint /usr/bin/make -t $(DOCKER_IMAGE) TARGET_DIR=$(TARGET) -f ../src/Makefile all
23+
all libs:
24+
$(DOCKER) $(MOUNTS) --entrypoint /usr/bin/make -t $(DOCKER_IMAGE) TARGET_DIR=$(TARGET) -f ../src/Makefile $@

src/Makefile

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
PNG_SOURCE=libpng-1.6.37.tar.xz
33
JPG_SOURCE=jpegsrc.v9c.tar.gz
4+
OPENJP2_VERSION=2.3.1
5+
OPENJP2_SOURCE=openjp2-$(OPENJP2_VERSION)
46
IMAGE_MAGICK_SOURCE=ImageMagick.tar.gz
57
TARGET_DIR ?= /opt/imagemagick
68

@@ -15,12 +17,16 @@ $(JPG_SOURCE):
1517
$(PNG_SOURCE):
1618
curl -LO http://prdownloads.sourceforge.net/libpng/$(PNG_SOURCE)
1719

20+
$(OPENJP2_SOURCE):
21+
curl -L https://github.com/uclouvain/openjpeg/archive/v$(OPENJP2_VERSION).tar.gz -o $(OPENJP2_SOURCE)
22+
1823
$(TARGET_DIR)/lib/libpng.a: $(PNG_SOURCE)
1924
tar xf $(PNG_SOURCE) &&
2025
cd libpng*
2126
./configure \
2227
--disable-dependency-tracking \
2328
--disable-shared \
29+
--enable-static \
2430
--prefix=$(TARGET_DIR)
2531
make
2632
make install
@@ -31,12 +37,26 @@ $(TARGET_DIR)/lib/libjpeg.a: $(JPG_SOURCE)
3137
./configure \
3238
--disable-dependency-tracking \
3339
--disable-shared \
34-
--disable-docs \
40+
--enable-static \
3541
--prefix=$(TARGET_DIR)
3642
make
3743
make install
3844

39-
$(TARGET_DIR)/bin/identify: $(TARGET_DIR)/lib/libjpeg.a $(TARGET_DIR)/lib/libpng.a $(IMAGE_MAGICK_SOURCE)
45+
$(TARGET_DIR)/lib/libopenjp2.a: $(OPENJP2_SOURCE) $(TARGET_DIR)/lib/libpng.a
46+
tar xf $(OPENJP2_SOURCE) &&
47+
cd openjpeg-*
48+
mkdir -p build
49+
cd build
50+
cmake .. \
51+
-DCMAKE_BUILD_TYPE=Release \
52+
-DCMAKE_INSTALL_PREFIX=$(TARGET_DIR) \
53+
-DBUILD_SHARED_LIBS:bool=off
54+
make
55+
make install
56+
57+
LIBS:=$(TARGET_DIR)/lib/libjpeg.a $(TARGET_DIR)/lib/libpng.a $(TARGET_DIR)/lib/libopenjp2.a
58+
59+
$(TARGET_DIR)/bin/identify: $(LIBS) $(IMAGE_MAGICK_SOURCE)
4060
tar xf $(IMAGE_MAGICK_SOURCE)
4161
cd ImageMa*
4262
PKG_CONFIG_PATH=$(TARGET_DIR)/lib/pkgconfig ./configure \
@@ -46,7 +66,7 @@ $(TARGET_DIR)/bin/identify: $(TARGET_DIR)/lib/libjpeg.a $(TARGET_DIR)/lib/libpng
4666
--disable-dependency-tracking \
4767
--enable-delegate-build \
4868
--disable-shared \
49-
--with-static \
69+
--enable-static \
5070
--without-modules \
5171
--disable-docs \
5272
--without-magick-plus-plus \
@@ -55,4 +75,6 @@ $(TARGET_DIR)/bin/identify: $(TARGET_DIR)/lib/libjpeg.a $(TARGET_DIR)/lib/libpng
5575
make
5676
make install
5777

78+
libs: $(LIBS)
79+
5880
all: $(TARGET_DIR)/bin/identify

0 commit comments

Comments
 (0)