diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 7787e61..907cc7e 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -182,10 +182,10 @@ zstd")"; : ${PKG_GNUCHESS_VERSION:=6.2.9}; : ${PKG_GNUCHESS_URL:=https://ftp.gnu.org/gnu/chess/gnuchess-${PKG_GNUCHESS_VERSION}.tar.gz}; : ${PKG_GRAPHICSMAGICK_DEPENDS:="libz libpng freetype lcms2 libxml2 tiff libjpeg_turbo bzip2 zstd"}; -: ${PKG_GRAPHICSMAGICK_SHA256SUM:=188a8d6108fea87a0208723e8d206ec1d4d7299022be8ce5d0a9720509250250}; -: ${PKG_GRAPHICSMAGICK_VERSION:=1.3.35}; -: ${PKG_GRAPHICSMAGICK_URL:=ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/${PKG_GRAPHICSMAGICK_VERSION%.*}/GraphicsMagick-${PKG_GRAPHICSMAGICK_VERSION}.tar.xz}; -: ${PKG_GRAPHICSMAGICK_CONFIGURE_ARGS_EXTRA:="--enable-shared --with-modules --without-x"}; +: ${PKG_GRAPHICSMAGICK_SHA256SUM:=d60cd9db59351d2b9cb19beb443170acaa28f073d13d258f67b3627635e32675}; +: ${PKG_GRAPHICSMAGICK_VERSION:=1.3.38}; +: ${PKG_GRAPHICSMAGICK_URL:=http://sources.buildroot.net/graphicsmagick/GraphicsMagick-${PKG_GRAPHICSMAGICK_VERSION}.tar.xz}; +: ${PKG_GRAPHICSMAGICK_CONFIGURE_ARGS_EXTRA:="--enable-shared --with-modules --without-x --without-gs --without-trio --without-wmf --without-gdi32 --without-dps --without-fpx --without-jbig --without-jp2 --without-jxl"}; : ${PKG_GRAPHICSMAGICK_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2}; : ${PKG_GRAPHICSMAGICK_LIBTOOL=rdlibtool}; : ${PKG_GZIP_SHA256SUM:=ce5e03e519f637e1f814011ace35c4f87b33c0bbabeec35baf5fbd3479e91956}; diff --git a/patches/graphicsmagick-1.3.35_pre.local.patch b/patches/graphicsmagick-1.3.35_pre.local.patch deleted file mode 100644 index 8ccf465..0000000 --- a/patches/graphicsmagick-1.3.35_pre.local.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ru GraphicsMagick-1.3.35.orig/configure GraphicsMagick-1.3.35/configure ---- GraphicsMagick-1.3.35.orig/configure 2020-02-23 16:53:04.000000000 +0100 -+++ GraphicsMagick-1.3.35/configure 2020-11-24 13:12:28.674236547 +0100 -@@ -14614,6 +14614,16 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+midipix*) -+ version_type=linux # correct to gnu/linux during the next big refactor -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no diff --git a/patches/graphicsmagick-1.3.38_pre.local.patch b/patches/graphicsmagick-1.3.38_pre.local.patch new file mode 100644 index 0000000..8ccf465 --- /dev/null +++ b/patches/graphicsmagick-1.3.38_pre.local.patch @@ -0,0 +1,20 @@ +diff -ru GraphicsMagick-1.3.35.orig/configure GraphicsMagick-1.3.35/configure +--- GraphicsMagick-1.3.35.orig/configure 2020-02-23 16:53:04.000000000 +0100 ++++ GraphicsMagick-1.3.35/configure 2020-11-24 13:12:28.674236547 +0100 +@@ -14614,6 +14614,16 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++midipix*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no