diff options
| -rw-r--r-- | groups.d/231.native_packages_etc.group | 4 | ||||
| -rw-r--r-- | patches/imagemagick-7.1.1-15.local.patch (renamed from patches/imagemagick-7.1.1-6.local.patch) | 82 | ||||
| -rw-r--r-- | patches/imagemagick-7.1.1-15_pre.local.patch | 37 |
3 files changed, 63 insertions, 60 deletions
diff --git a/groups.d/231.native_packages_etc.group b/groups.d/231.native_packages_etc.group index 68110f8e..118b1f4f 100644 --- a/groups.d/231.native_packages_etc.group +++ b/groups.d/231.native_packages_etc.group @@ -212,8 +212,8 @@ zstd"; am_cv_func_working_getline=yes gl_cv_func_getopt_gnu=yes"}; : ${PKG_IMAGEMAGICK_DEPENDS:="bzip2 curl freetype fontconfig libpng libz libzip libxml2 tiff xz zstd"}; -: ${PKG_IMAGEMAGICK_SHA256SUM:=73bbf585f69423c204b271a37158e611318b174eb7e4d294efd83f8b52325761}; -: ${PKG_IMAGEMAGICK_VERSION:=7.1.1-6}; +: ${PKG_IMAGEMAGICK_SHA256SUM:=c8589ea233f678b0474daaba19a55ce783b52b25495fb5ba93ac1d377f65bb2f}; +: ${PKG_IMAGEMAGICK_VERSION:=7.1.1-15}; : ${PKG_IMAGEMAGICK_URL:=https://imagemagick.org/download/releases/ImageMagick-${PKG_IMAGEMAGICK_VERSION}.tar.xz}; : ${PKG_IMAGEMAGICK_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2"}; : ${PKG_IMAGEMAGICK_CONFIGURE_ARGS_EXTRA:="--with-modules --without-x --without-pango --without-jemalloc --without-tcmalloc --without-umem"}; diff --git a/patches/imagemagick-7.1.1-6.local.patch b/patches/imagemagick-7.1.1-15.local.patch index 79b4012f..b865c8c3 100644 --- a/patches/imagemagick-7.1.1-6.local.patch +++ b/patches/imagemagick-7.1.1-15.local.patch @@ -1,45 +1,7 @@ -diff -ru ImageMagick-7.1.0-51.orig/configure ImageMagick-7.1.0-51/configure ---- ImageMagick-7.1.0-51.orig/configure 2022-10-16 17:54:02.000000000 +0200 -+++ ImageMagick-7.1.0-51/configure 2022-11-05 22:37:15.089499439 +0100 -@@ -18236,6 +18236,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 -@@ -22765,6 +22775,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 -Only in ImageMagick-7.1.0-51: configure.orig -diff -ru ImageMagick-7.1.0-51.orig/MagickCore/module.c ImageMagick-7.1.0-51/MagickCore/module.c ---- ImageMagick-7.1.0-51.orig/MagickCore/module.c 2022-10-16 17:53:13.000000000 +0200 -+++ ImageMagick-7.1.0-51/MagickCore/module.c 2022-11-05 22:34:35.101498468 +0100 -@@ -66,18 +66,14 @@ +diff -ru ImageMagick-7.1.1-15.orig/MagickCore/module.c ImageMagick-7.1.1-15/MagickCore/module.c +--- ImageMagick-7.1.1-15.orig/MagickCore/module.c 2023-07-30 13:49:52.000000000 +0200 ++++ ImageMagick-7.1.1-15/MagickCore/module.c 2023-08-24 18:06:47.065366224 +0200 +@@ -66,10 +66,6 @@ #include "MagickCore/utility.h" #include "MagickCore/utility-private.h" #if defined(MAGICKCORE_MODULES_SUPPORT) @@ -51,7 +13,7 @@ diff -ru ImageMagick-7.1.0-51.orig/MagickCore/module.c ImageMagick-7.1.0-51/Magi typedef void *ModuleHandle; -#endif - /* +@@ -77,7 +74,7 @@ Define declarations. */ #if defined(MAGICKCORE_LTDL_DELEGATE) @@ -60,17 +22,19 @@ diff -ru ImageMagick-7.1.0-51.orig/MagickCore/module.c ImageMagick-7.1.0-51/Magi #else # if defined(_DEBUG) # define ModuleGlobExpression "IM_MOD_DB_*.dll" -@@ -893,9 +889,6 @@ +@@ -893,11 +890,6 @@ if (status == MagickFalse) ThrowFatalException(ResourceLimitFatalError, "MemoryAllocationFailed"); +-#if defined(MAGICKCORE_LTDL_DELEGATE) - if (lt_dlinit() != 0) - ThrowFatalException(ModuleFatalError, - "UnableToInitializeModuleLoader"); +-#endif module_list=splay_tree; } UnlockSemaphoreInfo(module_semaphore); -@@ -992,11 +985,11 @@ +@@ -994,11 +986,11 @@ /* Open the module. */ @@ -84,7 +48,7 @@ diff -ru ImageMagick-7.1.0-51.orig/MagickCore/module.c ImageMagick-7.1.0-51/Magi return(MagickFalse); } /* -@@ -1012,10 +1005,10 @@ +@@ -1014,10 +1006,10 @@ Execute the module. */ ClearMagickException(exception); @@ -97,7 +61,7 @@ diff -ru ImageMagick-7.1.0-51.orig/MagickCore/module.c ImageMagick-7.1.0-51/Magi else { size_t -@@ -1036,9 +1029,9 @@ +@@ -1038,9 +1030,9 @@ /* Close the module. */ @@ -109,7 +73,7 @@ diff -ru ImageMagick-7.1.0-51.orig/MagickCore/module.c ImageMagick-7.1.0-51/Magi return(exception->severity < ErrorException ? MagickTrue : MagickFalse); } -@@ -1283,11 +1276,11 @@ +@@ -1285,11 +1277,11 @@ */ (void) LogMagickEvent(ModuleEvent,GetMagickModule(), "Opening module at path \"%s\"",path); @@ -123,7 +87,7 @@ diff -ru ImageMagick-7.1.0-51.orig/MagickCore/module.c ImageMagick-7.1.0-51/Magi return(MagickFalse); } /* -@@ -1301,11 +1294,11 @@ +@@ -1303,11 +1295,11 @@ Define RegisterFORMATImage method. */ TagToModuleName(module_name,"Register%sImage",name); @@ -137,7 +101,7 @@ diff -ru ImageMagick-7.1.0-51.orig/MagickCore/module.c ImageMagick-7.1.0-51/Magi return(MagickFalse); } (void) LogMagickEvent(ModuleEvent,GetMagickModule(), -@@ -1315,11 +1308,11 @@ +@@ -1317,11 +1309,11 @@ Define UnregisterFORMATImage method. */ TagToModuleName(module_name,"Unregister%sImage",name); @@ -151,7 +115,7 @@ diff -ru ImageMagick-7.1.0-51.orig/MagickCore/module.c ImageMagick-7.1.0-51/Magi return(MagickFalse); } (void) LogMagickEvent(ModuleEvent,GetMagickModule(), -@@ -1471,7 +1464,7 @@ +@@ -1464,7 +1464,7 @@ if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag); #if defined(MAGICKCORE_LTDL_DELEGATE) @@ -160,7 +124,7 @@ diff -ru ImageMagick-7.1.0-51.orig/MagickCore/module.c ImageMagick-7.1.0-51/Magi (void) LocaleLower(name); #else #if defined(MAGICKCORE_WINDOWS_SUPPORT) -@@ -1525,7 +1518,7 @@ +@@ -1518,7 +1518,7 @@ #elif !defined(MAGICKCORE_LTDL_DELEGATE) (void) FormatLocaleString(name,MagickPathExtent,"%s.dll",tag); #else @@ -168,8 +132,9 @@ diff -ru ImageMagick-7.1.0-51.orig/MagickCore/module.c ImageMagick-7.1.0-51/Magi + (void) FormatLocaleString(name,MagickPathExtent,"%s.so",tag); #endif } - -@@ -1622,10 +1615,10 @@ + + +@@ -1624,10 +1616,10 @@ if (module_info->unregister_module == NULL) return(MagickTrue); module_info->unregister_module(); @@ -182,10 +147,10 @@ diff -ru ImageMagick-7.1.0-51.orig/MagickCore/module.c ImageMagick-7.1.0-51/Magi return(MagickFalse); } return(MagickTrue); -diff -ru ImageMagick-7.1.0-51.orig/MagickCore/opencl.c ImageMagick-7.1.0-51/MagickCore/opencl.c ---- ImageMagick-7.1.0-51.orig/MagickCore/opencl.c 2022-10-16 17:53:13.000000000 +0200 -+++ ImageMagick-7.1.0-51/MagickCore/opencl.c 2022-11-05 22:36:35.473499198 +0100 -@@ -2607,7 +2607,7 @@ +diff -ru ImageMagick-7.1.1-15.orig/MagickCore/opencl.c ImageMagick-7.1.1-15/MagickCore/opencl.c +--- ImageMagick-7.1.1-15.orig/MagickCore/opencl.c 2023-07-30 13:49:52.000000000 +0200 ++++ ImageMagick-7.1.1-15/MagickCore/opencl.c 2023-08-24 18:03:15.806759171 +0200 +@@ -2610,7 +2610,7 @@ if (openCL_library != (MagickLibrary *) NULL) { if (openCL_library->library != (void *) NULL) @@ -194,3 +159,4 @@ diff -ru ImageMagick-7.1.0-51.orig/MagickCore/opencl.c ImageMagick-7.1.0-51/Magi openCL_library=(MagickLibrary *) RelinquishMagickMemory(openCL_library); } } +Only in ImageMagick-7.1.1-15/MagickCore: opencl.c.orig diff --git a/patches/imagemagick-7.1.1-15_pre.local.patch b/patches/imagemagick-7.1.1-15_pre.local.patch new file mode 100644 index 00000000..c8356941 --- /dev/null +++ b/patches/imagemagick-7.1.1-15_pre.local.patch @@ -0,0 +1,37 @@ +diff -ru ImageMagick-7.1.0-51.orig/configure ImageMagick-7.1.0-51/configure +--- ImageMagick-7.1.0-51.orig/configure 2022-10-16 17:54:02.000000000 +0200 ++++ ImageMagick-7.1.0-51/configure 2022-11-05 22:37:15.089499439 +0100 +@@ -18236,6 +18236,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 +@@ -22765,6 +22775,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 |