Changeset 14022


Ignorieren:
Zeitstempel:
09.01.2017 22:26:31 (vor 8 Tagen)
Autor:
er13
Nachricht:

ImageMagick:

Ort:
trunk
Dateien:
6 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/CHANGELOG

    r14021 r14022  
    109109    * htop 1.0.3 
    110110    * httpry 0.1.8 
    111     * ImageMagick 6.9.3-0 
     111    * ImageMagick 7.0.4-3 
    112112    * inadyn-mt 02.28.10 
    113113    * iodine 0.7.0 
  • trunk/make/imagemagick/Config.in

    r13571 r14022  
    11config FREETZ_PACKAGE_IMAGEMAGICK 
    2     bool "ImageMagick 6.9.3-0 (binary only)" 
     2    bool "ImageMagick 7.0.4-3 (binary only)" 
    33    select FREETZ_LIB_libpthread 
    44    select FREETZ_LIB_libm 
     
    1414        the command line as well as through C, C++, and PERL-based programming 
    1515        interfaces. 
    16  
    17 menu "Utilities" 
    18     depends on FREETZ_PACKAGE_IMAGEMAGICK 
    19  
    20     config FREETZ_PACKAGE_IMAGEMAGICK_animate 
    21     bool "animate" 
    22     default y 
    23  
    24     config FREETZ_PACKAGE_IMAGEMAGICK_conjure 
    25     bool "conjure" 
    26     default y 
    27  
    28     config FREETZ_PACKAGE_IMAGEMAGICK_convert 
    29     bool "convert" 
    30     default y 
    31  
    32     config FREETZ_PACKAGE_IMAGEMAGICK_compare 
    33     bool "compare" 
    34     default y 
    35  
    36     config FREETZ_PACKAGE_IMAGEMAGICK_composite 
    37     bool "composite" 
    38     default y 
    39  
    40     config FREETZ_PACKAGE_IMAGEMAGICK_display 
    41     bool "display" 
    42     default y 
    43  
    44     config FREETZ_PACKAGE_IMAGEMAGICK_identify 
    45     bool "identify" 
    46     default y 
    47  
    48     config FREETZ_PACKAGE_IMAGEMAGICK_import 
    49     bool "import" 
    50     default y 
    51  
    52     config FREETZ_PACKAGE_IMAGEMAGICK_mogrify 
    53     bool "mogrify" 
    54     default y 
    55  
    56     config FREETZ_PACKAGE_IMAGEMAGICK_montage 
    57     bool "montage" 
    58     default y 
    59  
    60     config FREETZ_PACKAGE_IMAGEMAGICK_stream 
    61     bool "stream" 
    62     default y 
    63  
    64 endmenu 
    6516 
    6617menu "Configuration" 
  • trunk/make/imagemagick/external.files

    r13615 r14022  
    11if [ "$EXTERNAL_FREETZ_PACKAGE_IMAGEMAGICK" ]; then 
    2     [ "$FREETZ_PACKAGE_IMAGEMAGICK_animate"   == "y" ] && EXTERNAL_FILES+=" /usr/bin/animate" 
    3     [ "$FREETZ_PACKAGE_IMAGEMAGICK_conjure"   == "y" ] && EXTERNAL_FILES+=" /usr/bin/conjure" 
    4     [ "$FREETZ_PACKAGE_IMAGEMAGICK_convert"   == "y" ] && EXTERNAL_FILES+=" /usr/bin/convert" 
    5     [ "$FREETZ_PACKAGE_IMAGEMAGICK_compare"   == "y" ] && EXTERNAL_FILES+=" /usr/bin/compare" 
    6     [ "$FREETZ_PACKAGE_IMAGEMAGICK_composite" == "y" ] && EXTERNAL_FILES+=" /usr/bin/composite" 
    7     [ "$FREETZ_PACKAGE_IMAGEMAGICK_display"   == "y" ] && EXTERNAL_FILES+=" /usr/bin/display" 
    8     [ "$FREETZ_PACKAGE_IMAGEMAGICK_identify"  == "y" ] && EXTERNAL_FILES+=" /usr/bin/identify" 
    9     [ "$FREETZ_PACKAGE_IMAGEMAGICK_import"    == "y" ] && EXTERNAL_FILES+=" /usr/bin/import" 
    10     [ "$FREETZ_PACKAGE_IMAGEMAGICK_mogrify"   == "y" ] && EXTERNAL_FILES+=" /usr/bin/mogrify" 
    11     [ "$FREETZ_PACKAGE_IMAGEMAGICK_montage"   == "y" ] && EXTERNAL_FILES+=" /usr/bin/montage" 
    12     [ "$FREETZ_PACKAGE_IMAGEMAGICK_stream"    == "y" ] && EXTERNAL_FILES+=" /usr/bin/stream" 
    13     [ "$FREETZ_PACKAGE_IMAGEMAGICK_STATIC"    != "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libMagickCore-6-Q16.so.2.0.0" 
    14     [ "$FREETZ_PACKAGE_IMAGEMAGICK_STATIC"    != "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libMagickWand-6-Q16.so.2.0.0" 
    15     [ "$FREETZ_PACKAGE_IMAGEMAGICK_xml"       == "y" ] && EXTERNAL_FILES+=" /etc/ImageMagick-6" 
     2    [ "$FREETZ_PACKAGE_IMAGEMAGICK"        == "y" ] && EXTERNAL_FILES+=" /usr/bin/magick" 
     3    [ "$FREETZ_PACKAGE_IMAGEMAGICK_STATIC" != "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libMagickCore-7-Q16.so.1.0.0" 
     4    [ "$FREETZ_PACKAGE_IMAGEMAGICK_STATIC" != "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libMagickWand-7-Q16.so.0.0.0" 
     5    [ "$FREETZ_PACKAGE_IMAGEMAGICK_xml"    == "y" ] && EXTERNAL_FILES+=" /etc/ImageMagick-7" 
    166fi 
  • trunk/make/imagemagick/external.in

    r13615 r14022  
    55    help 
    66        externals the following file(s): 
    7          ${FREETZ_LIBRARY_DIR}/libMagickWand-6-Q16.so.2.0.0 
    8          ${FREETZ_LIBRARY_DIR}/libMagickCore-6-Q16.so.2.0.0 
    9          /usr/bin/animate 
    10          /usr/bin/conjure 
    11          /usr/bin/convert 
    12          /usr/bin/compare 
    13          /usr/bin/composite 
    14          /usr/bin/display 
    15          /usr/bin/identify 
    16          /usr/bin/import 
    17          /usr/bin/mogrify 
    18          /usr/bin/montage 
    19          /usr/bin/stream 
    20          /etc/ImageMagick-6 
     7         /usr/bin/magick 
     8         ${FREETZ_LIBRARY_DIR}/libMagickWand-7-Q16.so.1.0.0 
     9         ${FREETZ_LIBRARY_DIR}/libMagickCore-7-Q16.so.0.0.0 
     10         /etc/ImageMagick-7 
  • trunk/make/imagemagick/imagemagick.mk

    r13571 r14022  
    1 $(call PKG_INIT_BIN, 6.9.3-0) 
     1$(call PKG_INIT_BIN, 7.0.4-3) 
    22$(PKG)_MAJOR_VERSION:=$(call GET_MAJOR_VERSION,$($(PKG)_VERSION),1) 
    33$(PKG)_ABI_SUFFIX:=Q16 
    4 $(PKG)_LIB_VERSION:=2.0.0 
    54$(PKG)_SOURCE:=ImageMagick-$($(PKG)_VERSION).tar.xz 
    6 $(PKG)_SOURCE_SHA256:=2ba0656eb03d72d8a44e741ead524e8c34097418c0bb5487a5c4f4fe5eca9656 
     5$(PKG)_SOURCE_SHA256:=bc09ea103a82d1c2c093889eda7e36dd0aa7aa98a06c55de4b73932838459fc4 
    76$(PKG)_SITE:=@SF/$(pkg),http://www.imagemagick.org/download 
    87 
    98$(PKG)_DIR:=$(SOURCE_DIR)/ImageMagick-$($(PKG)_VERSION) 
    109 
    11 $(PKG)_BINARIES_ALL := convert mogrify stream montage import identify display conjure compare animate composite 
    12 $(PKG)_BINARIES := $(call PKG_SELECTED_SUBOPTIONS,$($(PKG)_BINARIES_ALL)) 
    13 $(PKG)_BINARIES_BUILD_DIR := $($(PKG)_BINARIES:%=$($(PKG)_DIR)/utilities/$(if $(FREETZ_PACKAGE_IMAGEMAGICK_STATIC),,.libs/)%) 
    14 $(PKG)_BINARIES_TARGET_DIR := $($(PKG)_BINARIES:%=$($(PKG)_DEST_DIR)/usr/bin/%) 
     10$(PKG)_BINARY := magick 
     11$(PKG)_BINARY_BUILD_DIR := $($(PKG)_BINARY:%=$($(PKG)_DIR)/utilities/$(if $(FREETZ_PACKAGE_IMAGEMAGICK_STATIC),,.libs/)%) 
     12$(PKG)_BINARY_TARGET_DIR := $($(PKG)_BINARY:%=$($(PKG)_DEST_DIR)/usr/bin/%) 
    1513 
    16 $(PKG)_LIB_CORE := libMagickCore-$($(PKG)_MAJOR_VERSION)-$($(PKG)_ABI_SUFFIX).so.$($(PKG)_LIB_VERSION) 
    17 $(PKG)_LIB_CORE_BUILD_DIR := $($(PKG)_LIB_CORE:%=$($(PKG)_DIR)/magick/.libs/%) 
     14$(PKG)_SYMLINKS := animate compare composite conjure convert display identify import magick-script mogrify montage stream 
     15$(PKG)_SYMLINKS_TARGET_DIR := $($(PKG)_SYMLINKS:%=$($(PKG)_DEST_DIR)/usr/bin/%) 
     16 
     17$(PKG)_LIB_CORE := libMagickCore-$($(PKG)_MAJOR_VERSION)-$($(PKG)_ABI_SUFFIX).so.1.0.0 
     18$(PKG)_LIB_CORE_BUILD_DIR := $($(PKG)_LIB_CORE:%=$($(PKG)_DIR)/MagickCore/.libs/%) 
    1819$(PKG)_LIB_CORE_TARGET_DIR := $($(PKG)_LIB_CORE:%=$($(PKG)_DEST_LIBDIR)/%) 
    1920 
    20 $(PKG)_LIB_WAND := libMagickWand-$($(PKG)_MAJOR_VERSION)-$($(PKG)_ABI_SUFFIX).so.$($(PKG)_LIB_VERSION) 
    21 $(PKG)_LIB_WAND_BUILD_DIR := $($(PKG)_LIB_WAND:%=$($(PKG)_DIR)/wand/.libs/%) 
     21$(PKG)_LIB_WAND := libMagickWand-$($(PKG)_MAJOR_VERSION)-$($(PKG)_ABI_SUFFIX).so.0.0.0 
     22$(PKG)_LIB_WAND_BUILD_DIR := $($(PKG)_LIB_WAND:%=$($(PKG)_DIR)/MagickWand/.libs/%) 
    2223$(PKG)_LIB_WAND_TARGET_DIR := $($(PKG)_LIB_WAND:%=$($(PKG)_DEST_LIBDIR)/%) 
    2324 
    2425$(PKG)_XML_CONFIGS := \ 
    25     coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml policy.xml \ 
    26     thresholds.xml type.xml type-dejavu.xml type-ghostscript.xml type-windows.xml 
     26    coder.xml colors.xml delegates.xml english.xml locale.xml log.xml magic.xml mime.xml policy.xml \ 
     27    quantization-table.xml thresholds.xml type.xml type-apple.xml type-dejavu.xml type-ghostscript.xml type-windows.xml 
     28 
    2729$(PKG)_XML_CONFIGS_BUILD_DIR := $($(PKG)_XML_CONFIGS:%=$($(PKG)_DIR)/config/%) 
    2830$(PKG)_XML_CONFIGS_TARGET_DIR := $($(PKG)_XML_CONFIGS:%=$($(PKG)_DEST_DIR)/etc/ImageMagick-$($(PKG)_MAJOR_VERSION)/%) 
    2931 
    30 $(PKG)_EXCLUDED += $(patsubst %,$($(PKG)_DEST_DIR)/usr/bin/%,$(filter-out $($(PKG)_BINARIES),$($(PKG)_BINARIES_ALL))) 
    3132$(PKG)_EXCLUDED += $(if $(FREETZ_PACKAGE_IMAGEMAGICK_xml),,$($(PKG)_XML_CONFIGS_TARGET_DIR)) 
    3233 
     
    9798$(PKG_CONFIGURED_CONFIGURE) 
    9899 
    99 $($(PKG)_BINARIES_BUILD_DIR) $(if $(FREETZ_PACKAGE_IMAGEMAGICK_STATIC),,$($(PKG)_LIB_CORE_BUILD_DIR) $($(PKG)_LIB_WAND_BUILD_DIR)): $($(PKG)_DIR)/.configured 
     100$($(PKG)_BINARY_BUILD_DIR) $(if $(FREETZ_PACKAGE_IMAGEMAGICK_STATIC),,$($(PKG)_LIB_CORE_BUILD_DIR) $($(PKG)_LIB_WAND_BUILD_DIR)): $($(PKG)_DIR)/.configured 
    100101    $(SUBMAKE) -C $(IMAGEMAGICK_DIR) \ 
    101102        EXTRA_CFLAGS="$(IMAGEMAGICK_EXTRA_CFLAGS)" \ 
     
    106107    @touch $@ 
    107108 
    108 $($(PKG)_BINARIES_TARGET_DIR): $($(PKG)_DEST_DIR)/usr/bin/%: $($(PKG)_DIR)/utilities/$(if $(FREETZ_PACKAGE_IMAGEMAGICK_STATIC),,.libs/)% 
     109$($(PKG)_BINARY_TARGET_DIR): $($(PKG)_BINARY_BUILD_DIR) 
    109110    $(INSTALL_BINARY_STRIP) 
    110 $($(PKG)_LIB_CORE_TARGET_DIR): $($(PKG)_DEST_LIBDIR)/%: $($(PKG)_DIR)/magick/.libs/% 
     111$($(PKG)_LIB_CORE_TARGET_DIR): $($(PKG)_DEST_LIBDIR)/%: $($(PKG)_DIR)/MagickCore/.libs/% 
    111112    $(INSTALL_LIBRARY_STRIP) 
    112 $($(PKG)_LIB_WAND_TARGET_DIR): $($(PKG)_DEST_LIBDIR)/%: $($(PKG)_DIR)/wand/.libs/% 
     113$($(PKG)_LIB_WAND_TARGET_DIR): $($(PKG)_DEST_LIBDIR)/%: $($(PKG)_DIR)/MagickWand/.libs/% 
    113114    $(INSTALL_LIBRARY_STRIP) 
    114115$($(PKG)_XML_CONFIGS_TARGET_DIR): $($(PKG)_DEST_DIR)/etc/ImageMagick-$($(PKG)_MAJOR_VERSION)/%: $($(PKG)_DIR)/config/% 
    115116    $(INSTALL_FILE) 
    116117 
     118$($(PKG)_SYMLINKS_TARGET_DIR): $($(PKG)_BINARY_TARGET_DIR) 
     119    ln -sf $(notdir $<) $@ 
     120 
    117121$(pkg): 
    118122 
    119123$(pkg)-precompiled: \ 
    120     $($(PKG)_BINARIES_TARGET_DIR) \ 
     124    $($(PKG)_BINARY_TARGET_DIR) \ 
     125    $($(PKG)_SYMLINKS_TARGET_DIR) \ 
    121126    $(if $(FREETZ_PACKAGE_IMAGEMAGICK_STATIC),,$($(PKG)_LIB_CORE_TARGET_DIR) $($(PKG)_LIB_WAND_TARGET_DIR)) \ 
    122127    $(if $(FREETZ_PACKAGE_IMAGEMAGICK_xml),$($(PKG)_XML_CONFIGS_TARGET_DIR)) 
     
    128133$(pkg)-uninstall: 
    129134    $(RM) \ 
    130         $(IMAGEMAGICK_BINARIES_ALL:%=$(IMAGEMAGICK_DEST_DIR)/usr/bin/%) \ 
     135        $(IMAGEMAGICK_BINARY_TARGET_DIR) \ 
     136        $(IMAGEMAGICK_SYMLINKS_ALL:%=$(IMAGEMAGICK_DEST_DIR)/usr/bin/%) \ 
    131137        $(IMAGEMAGICK_LIB_CORE_TARGET_DIR) \ 
    132138        $(IMAGEMAGICK_LIB_WAND_TARGET_DIR) \ 
  • trunk/make/imagemagick/patches/010-extra_flags.patch

    r13428 r14022  
    11--- Makefile.in 
    22+++ Makefile.in 
    3 @@ -2559,7 +2559,7 @@ 
     3@@ -2503,7 +2503,7 @@ 
    44 CC = @CC@ 
    55 CCDEPMODE = @CCDEPMODE@ 
     
    1010 CL_LIBS = @CL_LIBS@ 
    1111 CODER_DIRNAME = @CODER_DIRNAME@ 
    12 @@ -2658,7 +2658,7 @@ 
     12@@ -2600,7 +2600,7 @@ 
    1313 LCMS_CFLAGS = @LCMS_CFLAGS@ 
    1414 LCMS_LIBS = @LCMS_LIBS@ 
     
    1616-LDFLAGS = @LDFLAGS@ 
    1717+LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) 
     18 LEPDelegate = @LEPDelegate@ 
    1819 LFS_CPPFLAGS = @LFS_CPPFLAGS@ 
    1920 LIBEXEC_DIR = @LIBEXEC_DIR@ 
    20  LIBOBJS = @LIBOBJS@ 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.