Merge pull request #2948 from mariux64/update-imagemagick

Update imagemagick from 6.9.12 to 7.1.1
mariux64 · Sep 6, 2023 · d5a6aff · d5a6aff
2 parents cc98400 + 28412f5
commit d5a6aff
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/imagemagick.be0 b/imagemagick.be0
@@ -1,10 +1,9 @@
 #!/bin/env beesh
 
-# BEE_VERSION imagemagick-6.9.12p44-0
+# BEE_VERSION imagemagick-7.1.1p15-0
 
-#SRCURL[0]="https://github.com/ImageMagick/ImageMagick6/archive/${PKGVERSION/p/-}.tar.gz imagemagick-${PKGVERSION/p/-}.tar.gz"
-
-SRCURL[0]="https://beehive.molgen.mpg.de/3bb027d07785d4afb6c8c6b6777dfeeb/imagemagick-6.9.12-44.tar.gz"
+#SRCURL[0]="https://github.com/ImageMagick/ImageMagick/archive/${PKGVERSION/p/-}.tar.gz imagemagick-${PKGVERSION/p/-}.tar.gz"
+SRCURL[0]="https://beehive.molgen.mpg.de/03fe250e8ea4dbccd8606b212b4f33e6/imagemagick-7.1.1-15.tar.gz"
 
 # PATCHURL[0]=""
 
@@ -25,7 +24,7 @@ mee_install() {
 
     start_cmd rm -rf ${D}/${DATADIR}/doc
 
-    local tgt=${D}/etc/ImageMagick-6/policy.xml
+    local tgt=${D}/etc/ImageMagick-7/policy.xml
     cp -p -v ${tgt} ${tgt}.raw
     xmllint --format ${tgt}.raw > ${tgt}
     rm ${tgt}.raw

diff --git a/imagemagick6_compat.be0 b/imagemagick6_compat.be0
@@ -0,0 +1,16 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION imagemagick6_compat-6.9.12p44-0
+
+mee_install() {
+    cd ${D}
+    tar xvpf /src/mariux/beeroot/packages/imagemagick-6.9.12p44-0.x86_64.bee.tar.bz2 \
+        /usr/lib/libMagick++-6.Q16.so.9 \
+        /usr/lib/libMagick++-6.Q16.so.9.0.0 \
+        \
+        /usr/lib/libMagickCore-6.Q16.so.7 \
+        /usr/lib/libMagickCore-6.Q16.so.7.0.0 \
+        \
+        /usr/lib/libMagickWand-6.Q16.so.7 \
+        /usr/lib/libMagickWand-6.Q16.so.7.0.0
+}