From fe629e1b3a0eb225d42f8e088d3aa7745b3519c4 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Sat, 19 Nov 2022 15:49:10 +0100 Subject: [PATCH] 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 --- cross/librsvg/PLIST | 1 + cross/openjpeg/Makefile | 2 ++ spk/imagemagick/Makefile | 1 + 3 files changed, 4 insertions(+) diff --git a/cross/librsvg/PLIST b/cross/librsvg/PLIST index 2e7f5c7f7c6f..903516387588 100644 --- a/cross/librsvg/PLIST +++ b/cross/librsvg/PLIST @@ -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 diff --git a/cross/openjpeg/Makefile b/cross/openjpeg/Makefile index 4db560f539dc..9ef44f27ac7b 100644 --- a/cross/openjpeg/Makefile +++ b/cross/openjpeg/Makefile @@ -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 diff --git a/spk/imagemagick/Makefile b/spk/imagemagick/Makefile index 5df371a033ca..56c0029e3185 100644 --- a/spk/imagemagick/Makefile +++ b/spk/imagemagick/Makefile @@ -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