Skip to content

Commit fe629e1

Browse files
committed
imagemagick fixes
- fix rsvg integration (magick depends on bin/rsvg-convert) - exclude tools in cross/openjpeg (fail to build with zlib.pc fix) - zlib.pc fix fixes OpenEXR integration
1 parent 2a15371 commit fe629e1

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

cross/librsvg/PLIST

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
bin:bin/rsvg-convert
12
lnk:lib/librsvg-2.so
23
lnk:lib/librsvg-2.so.2
34
lib:lib/librsvg-2.so.2.40.21

cross/openjpeg/Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,7 @@ LICENSE = BSD 2-clause simplified
1515
CMAKE_USE_NINJA = 1
1616
CMAKE_ARGS += -DBUILD_STATIC_LIBS=OFF
1717
CMAKE_ARGS += -DOPENJP2_COMPILE_OPTIONS="-O"
18+
# deactivate build of tools (we use the library only)
19+
CMAKE_ARGS += -DBUILD_CODEC=OFF
1820

1921
include ../../mk/spksrc.cross-cmake.mk

spk/imagemagick/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ imagemagick_extra_install:
6262
@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libxml2.so.2.9.12
6363
ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
6464
@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/pango-view
65+
@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/rsvg-convert
6566
@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libIlmImf-2_5.so.26.0.0
6667
@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libIlmImfUtil-2_5.so.26.0.0
6768
@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libcairo-gobject.so.2.11600.0

0 commit comments

Comments
 (0)