diff options
| -rw-r--r-- | patches/imagemagick-7.0.9-10.local.patch | 17 | ||||
| -rw-r--r-- | vars/build.vars | 9 |
2 files changed, 25 insertions, 1 deletions
diff --git a/patches/imagemagick-7.0.9-10.local.patch b/patches/imagemagick-7.0.9-10.local.patch new file mode 100644 index 00000000..811a602f --- /dev/null +++ b/patches/imagemagick-7.0.9-10.local.patch @@ -0,0 +1,17 @@ +diff -ru ImageMagick-7.0.9-10.orig/configure ImageMagick-7.0.9-10/configure +--- ImageMagick-7.0.9-10.orig/configure 2019-12-22 16:01:03.000000000 +0100 ++++ ImageMagick-7.0.9-10/configure 2019-12-24 14:17:48.641714511 +0100 +@@ -22639,13 +22639,7 @@ + + # Only allow building loadable modules if we are building shared libraries + if test "$with_modules" != 'no' ; then +- if test "$libtool_build_shared_libs" = 'no'; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Modules may only be built if building shared libraries is enabled." >&5 +-$as_echo "$as_me: WARNING: Modules may only be built if building shared libraries is enabled." >&2;} +- build_modules='no' +- else + build_modules='yes' +- fi + fi + if test "$build_modules" != 'no' ; then + diff --git a/vars/build.vars b/vars/build.vars index 8bbbc8fc..0d1ca902 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1531,7 +1531,7 @@ bison chicken cparser diffutils flex lunix m4 make mandoc nasm patch patchutils # Packages list native_packages_etc NATIVE_PACKAGES_ETC_PACKAGES=" bochs ca_certificates cron dante debianutils emacs fetchmail ffmpeg gdb gnuchess ghostscript hastyhex hexcurse htop icecast isync infounzip -infozip john less libredwg mlogin mc mintty nano ncdu p7zip procps_ng qemu qpdf rdesktop rw rxvt_unicode st +infozip imagemagick john less libredwg mlogin mc mintty nano ncdu p7zip procps_ng qemu qpdf rdesktop rw rxvt_unicode st tmux tzdb vim yabasic xcowsay xeyes xorriso xterm xwd"; : ${PKG_BOCHS_SHA256SUM:=ee5b677fd9b1b9f484b5aeb4614f43df21993088c0c0571187f93acb0866e98c}; : ${PKG_BOCHS_VERSION:=2.6.9}; @@ -1622,6 +1622,13 @@ tmux tzdb vim yabasic xcowsay xeyes xorriso xterm xwd"; : ${PKG_INFOZIP_URLS_GIT:=infozip=https://github.com/Redfoxmoon3/infozip.git@master}; : ${PKG_INFOZIP_IN_TREE:=1}; : ${PKG_INFOZIP_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_CFLAGS_CONFIGURE}}; +: ${PKG_IMAGEMAGICK_SHA256SUM:=0ac3a0b695180d715908352d79db1ce24c42771def15d4ee3d6540dd622b4389}; +: ${PKG_IMAGEMAGICK_VERSION:=7.0.9-10}; +: ${PKG_IMAGEMAGICK_URL:=https://imagemagick.org/download/ImageMagick-${PKG_IMAGEMAGICK_VERSION}.tar.xz}; +: ${PKG_IMAGEMAGICK_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2}; +: ${PKG_IMAGEMAGICK_CONFIGURE_ARGS_EXTRA:="--enable-shared=yes --with-modules=yes --without-x --without-pango"}; +: ${PKG_IMAGEMAGICK_DISABLED:=1}; +: ${PKG_IMAGEMAGICK_IN_TREE:=1}; : ${PKG_JAMVM_SHA256SUM:=76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da}; : ${PKG_JAMVM_VERSION:=2.0.0}; : ${PKG_JAMVM_URL:=http://sourceforge.mirrorservice.org/j/ja/jamvm/jamvm/JamVM%20${PKG_JAMVM_VERSION}/jamvm-${PKG_JAMVM_VERSION}.tar.gz}; |