diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/ImageMagick | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/ImageMagick')
| -rw-r--r-- | package/ImageMagick/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 4979c76af..89034988e 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -9,26 +9,26 @@ PKG_EXTRAVER:= 1 PKG_RELEASE:= 3 PKG_MD5SUM:= 8134257e3fbb43cc06fb32a6d725d3d0 PKG_DESCR:= image processing and converting utility -PKG_SECTION:= multimedia +PKG_SECTION:= mm/image PKG_DEPENDS:= libstdcxx PKG_BUILDDEP:= libpng libjpeg-turbo libtiff fontconfig libiconv-tiny PKG_BUILDDEP+= pango libtool e2fsprogs PKG_URL:= http://www.imagemagick.org/ PKG_SITES:= http://image_magick.veidrodis.com/image_magick/ -PKG_LIBNAME:= libimagemagic +PKG_LIBNAME:= libimagemagick PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !m68k PKG_SUBPKGS:= CONVERT DISPLAY LIBIMAGEMAGICK PKGSD_LIBIMAGEMAGICK:= imagemagick library -PKGSC_LIBIMAGEMAGICK:= libs +PKGSC_LIBIMAGEMAGICK:= libs/image PKGSS_LIBIMAGEMAGICK:= libjpeg-turbo libtiff libpng PKGSD_CONVERT:= image processing and converting utility -PKGSC_CONVERT:= multimedia +PKGSC_CONVERT:= mm/image PKGSS_CONVERT:= libimagemagick PKGSD_DISPLAY:= image display application -PKGSC_DISPLAY:= multimedia +PKGSC_DISPLAY:= mm/image PKGSS_DISPLAY:= libimagemagick libX11 libXau libXdmcp libICE libSM fontconfig libXt zlib libpng libltdl PKGSB_DISPLAY:= libX11 |