Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
28666 commits 8 branches 0 tags 65 MiB
Commit graph

9 commits

Author SHA1 Message Date
Tony Butler
ac09d1c2f1 imagemagick: refresh GCC options in Makefile 
this Makefile still used `CONFIG_GCC_USE_VERSION_*` to select various
compilation options, for GCC versions that are antiquated

convert to parsing the major from the `CONFIG_GCC_VERSION` which will
always exist and can also be used with range logic

intent seemed to be:
* `-flto` for "not =10" (or newer, probably)
* no additional options for "=10" (and newer, probably)

GCC 11 or 12 would likely revert to the default (not =10) option,
because 10 was the newest at the time, and 11 and 12 are "not 10"

unsure of what actually works, perhaps `-flto` works in all versions by
now (possibly early gcc 10 bug workaround?)

GCC 11 will have been using `-flto` anyway by the current logic and I
guess it must be working or there would have been changes

Signed-off-by: Tony Butler <spudz76@gmail.com>
 2022-12-22 18:11:51 -08:00
Alexander Egorenkov
6ecf4869bd imagemagick: fix linking of host libfreetype 
Host's libfreetype is being linked during build.

libtool: warning: relinking 'MagickWand/libMagickWand-7.Q8.la'
libtool: install: (cd /home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5; /bin/sh "/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5/libtool"  --tag CC --mode=relink arm-openwrt-linux-muslgnueabi-gcc -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include/libpng16 -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include/freetype2 -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include/libpng16 -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include -Os -pipe -fno-caller-saves -fno-plt -fhonour-copts -Wno-error=unused-but-set-variable -Wno-error=unused-result -mfloat-abi=hard -fmacro-prefix-map=/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5=ImageMagick-7.0.9-5 -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro -flto -Wall -fexceptions -pthread -DMAGICKCORE_HDRI_ENABLE=0 -DMAGICKCORE_QUANTUM_DEPTH=8 -no-undefined -Wl,--version-script=./MagickWand/libMagickWand.map -version-info 7:0:0 -L/home/egorenar/Repositories/openwrt-rel/staging_dir/toolchain-arm_cortex-a15+neon-vfpv4_gcc-8.4.0_musl_eabi/usr/lib -L/home/egorenar/Repositories/openwrt-rel/staging_dir/toolchain-arm_cortex-a15+neon-vfpv4_gcc-8.4.0_musl_eabi/lib -znow -zrelro -o MagickWand/libMagickWand-7.Q8.la -rpath /usr/lib MagickWand/libMagickWand_7_Q8_la-animate.lo MagickWand/libMagickWand_7_Q8_la-compare.lo MagickWand/libMagickWand_7_Q8_la-composite.lo MagickWand/libMagickWand_7_Q8_la-conjure.lo MagickWand/libMagickWand_7_Q8_la-convert.lo MagickWand/libMagickWand_7_Q8_la-deprecate.lo MagickWand/libMagickWand_7_Q8_la-display.lo MagickWand/libMagickWand_7_Q8_la-drawing-wand.lo MagickWand/libMagickWand_7_Q8_la-identify.lo MagickWand/libMagickWand_7_Q8_la-import.lo MagickWand/libMagickWand_7_Q8_la-magick-cli.lo MagickWand/libMagickWand_7_Q8_la-magick-image.lo MagickWand/libMagickWand_7_Q8_la-magick-property.lo MagickWand/libMagickWand_7_Q8_la-magick-wand.lo MagickWand/libMagickWand_7_Q8_la-mogrify.lo MagickWand/libMagickWand_7_Q8_la-montage.lo MagickWand/libMagickWand_7_Q8_la-operation.lo MagickWand/libMagickWand_7_Q8_la-pixel-iterator.lo MagickWand/libMagickWand_7_Q8_la-pixel-wand.lo MagickWand/libMagickWand_7_Q8_la-script-token.lo MagickWand/libMagickWand_7_Q8_la-stream.lo MagickWand/libMagickWand_7_Q8_la-wand.lo MagickWand/libMagickWand_7_Q8_la-wandcli.lo MagickWand/libMagickWand_7_Q8_la-wand-view.lo MagickCore/libMagickCore-7.Q8.la -lm -inst-prefix-dir /home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5/ipkg-install)
libtool: relink: arm-openwrt-linux-muslgnueabi-gcc -shared  -fPIC -DPIC  MagickWand/.libs/libMagickWand_7_Q8_la-animate.o MagickWand/.libs/libMagickWand_7_Q8_la-compare.o MagickWand/.libs/libMagickWand_7_Q8_la-composite.o MagickWand/.libs/libMagickWand_7_Q8_la-conjure.o MagickWand/.libs/libMagickWand_7_Q8_la-convert.o MagickWand/.libs/libMagickWand_7_Q8_la-deprecate.o MagickWand/.libs/libMagickWand_7_Q8_la-display.o MagickWand/.libs/libMagickWand_7_Q8_la-drawing-wand.o MagickWand/.libs/libMagickWand_7_Q8_la-identify.o MagickWand/.libs/libMagickWand_7_Q8_la-import.o MagickWand/.libs/libMagickWand_7_Q8_la-magick-cli.o MagickWand/.libs/libMagickWand_7_Q8_la-magick-image.o MagickWand/.libs/libMagickWand_7_Q8_la-magick-property.o MagickWand/.libs/libMagickWand_7_Q8_la-magick-wand.o MagickWand/.libs/libMagickWand_7_Q8_la-mogrify.o MagickWand/.libs/libMagickWand_7_Q8_la-montage.o MagickWand/.libs/libMagickWand_7_Q8_la-operation.o MagickWand/.libs/libMagickWand_7_Q8_la-pixel-iterator.o MagickWand/.libs/libMagickWand_7_Q8_la-pixel-wand.o MagickWand/.libs/libMagickWand_7_Q8_la-script-token.o MagickWand/.libs/libMagickWand_7_Q8_la-stream.o MagickWand/.libs/libMagickWand_7_Q8_la-wand.o MagickWand/.libs/libMagickWand_7_Q8_la-wandcli.o MagickWand/.libs/libMagickWand_7_Q8_la-wand-view.o   -L/home/egorenar/Repositories/openwrt-rel/staging_dir/toolchain-arm_cortex-a15+neon-vfpv4_gcc-8.4.0_musl_eabi/usr/lib -L/home/egorenar/Repositories/openwrt-rel/staging_dir/toolchain-arm_cortex-a15+neon-vfpv4_gcc-8.4.0_musl_eabi/lib -L/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5/ipkg-install/usr/lib -L/usr/lib -lMagickCore-7.Q8 -L/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/lib -lfreetype -lz -lltdl -lm  -Os -mfloat-abi=hard -fstack-protector -Wl,-z -Wl,now -Wl,-z -Wl,relro -flto -pthread -Wl,--version-script=./MagickWand/libMagickWand.map   -pthread -Wl,-soname -Wl,libMagickWand-7.Q8.so.7 -o MagickWand/.libs/libMagickWand-7.Q8.so.7.0.0
/usr/lib/libfreetype.so: file not recognized: file format not recognized
collect2: error: ld returned 1 exit status
libtool:   error: error: relink 'MagickWand/libMagickWand-7.Q8.la' with the above command before installing it
make[5]: *** [Makefile:6264: install-libLTLIBRARIES] Error 1
make[5]: Leaving directory '/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5'
make[4]: *** [Makefile:12263: install-am] Error 2
make[4]: Leaving directory '/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5'
make[3]: *** [Makefile:12257: install] Error 2
make[3]: Leaving directory '/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5'
make[2]: *** [Makefile:153: /home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5/.built] Error 2
make[2]: Leaving directory '/home/egorenar/Repositories/openwrt-rel/feeds/packages/multimedia/imagemagick'
time: package/feeds/packages/imagemagick/compile#105.77#18.23#212.14
    ERROR: package/feeds/packages/imagemagick failed to build.
make[1]: *** [package/Makefile:114: package/feeds/packages/imagemagick/compile] Error 1
make[1]: Leaving directory '/home/egorenar/Repositories/openwrt-rel'
make: *** [/home/egorenar/Repositories/openwrt-rel/include/toplevel.mk:230: package/imagemagick/compile] Error 2

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>
 2021-03-27 13:43:05 +01:00
Eneas U de Queiroz
26fd0cbac9
imagemagick: copy *-config files to staging dir 
We need to copy MagickWand-config, which handles pkg-config data, to the
staging dir, so that dependent packages can use it.  php7-pecl-imagick,
for example, may otherwise use an eventual host-installed file, causing
compilation to fail.  There's also a MagickCore-config file that does
the same thing for the MagickCore library, so a *-config wilcard is used
to handle all cases.

Since configure is called with --prefix=/usr, use $(SED) to change
definition of prefix and exec_prefix lines in *-config from /usr to
$(STAGING_DIR)/usr.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
 2021-02-28 22:30:08 -03:00
Rosen Penev
605ea8a21e
imagemagick: remove lto for GCC10 
It does not work with GCC10.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
 2020-10-11 19:12:53 -07:00
Val Kulkov
d48715b138 imagemagick: update to the latest release 
Update to ImageMagick 7.0.9-5.

Signed-off-by: Val Kulkov <val.kulkov@gmail.com>
 2019-11-20 10:11:16 -05:00
Val Kulkov
ca91486de3 imagemagick: update to 7.0.8-62 
This version upgrade should fix issue #9830.

Signed-off-by: Val Kulkov <val.kulkov@gmail.com>
 2019-08-26 15:58:40 -04:00
Jan Pavlinec
e81aa8ff8a
imagemagick: update to version 7.0.8-61 
Changes:
-add PKG_CPE_ID

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
 2019-08-23 15:48:48 +02:00
Val Kulkov
43cfda226c imagemagick: update to v.7.0.8-59 
Update to the latest official release.

Signed-off-by: Val Kulkov <val.kulkov@gmail.com>
 2019-08-05 14:27:21 -04:00
Val Kulkov
069dd2e9fc imagemagick: reintroduce package, cleanup and upgrade 
ImageMagick is a free and open-source software suite for displaying,
converting, and editing raster image and vector image files. This
package provides the prominent 'convert' utility.

ImageMagick's installation footprint is:
  x86_64: 6.7 MB,
  ipq806x (ARM): 6.0 MB,
  bcm53xx: 6.2 MB.

The shared libraries occupy 2.4 MB on bcm53xx, 2.3 MB on ipq806x, and
2.5 MB on x86_64. The 114 ImageMagick's modules occupy from 3.4 MB to
4.0 MB depending on the target. It may be possible to reduce the
installation footprint by introducing build parameters to control the
selection of modules. In view of the large number of modules and the
possibility of breakage due to module interdependencies or other
reasons, such attempt is not made at this time.

ImageMagick is therefore best suited for extroot-enabled or x86_64
OpenWrt systems.

In many cases, GraphicsMagick may be used as a substitute for
ImageMagick. GraphicsMagick provides similar functionality, it is
faster and it has a smaller installation footprint. It is therefore
better suited for non-extroot OpenWrt systems. However, in tests to
reduce resolution (and size) of a high-resolution JPEG image
GraphicsMagick required about 25% more RAM than ImageMagick (no HDRI,
quantum depth of 8) during its execution.

Signed-off-by: Val Kulkov <val.kulkov@gmail.com>
 2019-06-13 15:53:17 -04:00