Skip to content

Commit

Permalink
imagemagick fixes
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
hgy59 committed Nov 19, 2022
1 parent 2a15371 commit fe629e1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions cross/librsvg/PLIST
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
bin:bin/rsvg-convert
lnk:lib/librsvg-2.so
lnk:lib/librsvg-2.so.2
lib:lib/librsvg-2.so.2.40.21
2 changes: 2 additions & 0 deletions cross/openjpeg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,7 @@ LICENSE = BSD 2-clause simplified
CMAKE_USE_NINJA = 1
CMAKE_ARGS += -DBUILD_STATIC_LIBS=OFF
CMAKE_ARGS += -DOPENJP2_COMPILE_OPTIONS="-O"
# deactivate build of tools (we use the library only)
CMAKE_ARGS += -DBUILD_CODEC=OFF

include ../../mk/spksrc.cross-cmake.mk
1 change: 1 addition & 0 deletions spk/imagemagick/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ imagemagick_extra_install:
@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libxml2.so.2.9.12
ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/pango-view
@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/rsvg-convert
@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libIlmImf-2_5.so.26.0.0
@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libIlmImfUtil-2_5.so.26.0.0
@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libcairo-gobject.so.2.11600.0
Expand Down

0 comments on commit fe629e1

Please sign in to comment.