diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/imagemagick | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/imagemagick')
| -rw-r--r-- | packages/imagemagick/files/PerlMagic_MakePatch | 13 | ||||
| -rw-r--r-- | packages/imagemagick/files/binconfig-fixes.patch | 81 | ||||
| -rw-r--r-- | packages/imagemagick/files/makefile-am.patch | 13 | ||||
| -rw-r--r-- | packages/imagemagick/imagemagick-6.4.4-1/PerlMagic_MakePatch | 11 | ||||
| -rw-r--r-- | packages/imagemagick/imagemagick-native_6.3.5-10.bb | 3 | ||||
| -rw-r--r-- | packages/imagemagick/imagemagick_6.3.5-10.bb | 36 | ||||
| -rw-r--r-- | packages/imagemagick/imagemagick_6.4.4-1.bb | 39 |
7 files changed, 0 insertions, 196 deletions
diff --git a/packages/imagemagick/files/PerlMagic_MakePatch b/packages/imagemagick/files/PerlMagic_MakePatch deleted file mode 100644 index c87414529a..0000000000 --- a/packages/imagemagick/files/PerlMagic_MakePatch +++ /dev/null @@ -1,13 +0,0 @@ -Index: ImageMagick-6.2.5/PerlMagick/Makefile.PL.in -=================================================================== ---- ImageMagick-6.2.5.orig/PerlMagick/Makefile.PL.in 2005-04-21 00:27:36.000000000 +0800 -+++ ImageMagick-6.2.5/PerlMagick/Makefile.PL.in 2005-10-04 04:43:35.239036400 +0800 -@@ -72,6 +72,8 @@ - - # Use same compiler as ImageMagick - 'PERLMAINCC' => '@PERLMAINCC@', -+ 'AR' => '@AR@', -+ 'LD' => '@PERLMAINCC@', - - # Set Perl installation prefix to ImageMagick installation prefix - # 'PREFIX' => '@prefix@', diff --git a/packages/imagemagick/files/binconfig-fixes.patch b/packages/imagemagick/files/binconfig-fixes.patch deleted file mode 100644 index 51797c5326..0000000000 --- a/packages/imagemagick/files/binconfig-fixes.patch +++ /dev/null @@ -1,81 +0,0 @@ -Index: ImageMagick-6.3.5/Magick++/bin/Magick++-config.in -=================================================================== ---- ImageMagick-6.3.5.orig/Magick++/bin/Magick++-config.in 2007-10-24 08:04:49.000000000 +0100 -+++ ImageMagick-6.3.5/Magick++/bin/Magick++-config.in 2007-10-24 08:07:51.000000000 +0100 -@@ -4,6 +4,9 @@ - # required to use the Magick++ library. - # - # -+prefix=@PREFIX_DIR@ -+exec_prefix=@EXEC_PREFIX_DIR@ -+ - usage='Usage: Magick++-config [--cppflags] [--cxxflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version] - - For example, "magick.cpp" may be compiled to produce "magick" as follows: -@@ -18,10 +21,10 @@ - while test $# -gt 0; do - case $1 in - --prefix) -- echo @PREFIX_DIR@ -+ echo $prefix - ;; - --exec-prefix) -- echo @EXEC_PREFIX_DIR@ -+ echo $exec_prefix - ;; - --version) - echo @PACKAGE_VERSION@ -Index: ImageMagick-6.3.5/magick/Magick-config.in -=================================================================== ---- ImageMagick-6.3.5.orig/magick/Magick-config.in 2007-10-24 08:04:49.000000000 +0100 -+++ ImageMagick-6.3.5/magick/Magick-config.in 2007-10-24 08:07:19.000000000 +0100 -@@ -3,6 +3,9 @@ - # Configure options script for re-calling MagickCore compilation options - # required to use the MagickCore library. - # -+prefix=@PREFIX_DIR@ -+exec_prefix=@EXEC_PREFIX_DIR@ -+ - usage="\ - Usage: Magick-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" - -@@ -15,10 +18,10 @@ - while test $# -gt 0; do - case $1 in - --prefix) -- echo @PREFIX_DIR@ -+ echo $prefix - ;; - --exec-prefix) -- echo @EXEC_PREFIX_DIR@ -+ echo $exec_prefix - ;; - --version) - echo '@PACKAGE_VERSION@ Q@QuantumDepth@ @MAGICK_HDRI@' -Index: ImageMagick-6.3.5/wand/Wand-config.in -=================================================================== ---- ImageMagick-6.3.5.orig/wand/Wand-config.in 2007-10-24 08:04:49.000000000 +0100 -+++ ImageMagick-6.3.5/wand/Wand-config.in 2007-10-24 08:06:38.000000000 +0100 -@@ -3,6 +3,9 @@ - # Configure options script for re-calling MagickWand compilation options - # required to use the MagickWand library. - # -+prefix=@PREFIX_DIR@ -+exec_prefix=@EXEC_PREFIX_DIR@ -+ - usage="\ - Usage: Wand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" - -@@ -15,10 +18,10 @@ - while test $# -gt 0; do - case $1 in - --prefix) -- echo @PREFIX_DIR@ -+ echo $prefix - ;; - --exec-prefix) -- echo @EXEC_PREFIX_DIR@ -+ echo $exec_prefix - ;; - --version) - echo '@PACKAGE_VERSION@ Q@QuantumDepth@ @MAGICK_HDRI@' diff --git a/packages/imagemagick/files/makefile-am.patch b/packages/imagemagick/files/makefile-am.patch deleted file mode 100644 index 7ee6ccb4c9..0000000000 --- a/packages/imagemagick/files/makefile-am.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: ImageMagick-6.3.5/Makefile.am -=================================================================== ---- ImageMagick-6.3.5.orig/Makefile.am 2007-10-24 08:03:09.000000000 +0100 -+++ ImageMagick-6.3.5/Makefile.am 2007-10-24 08:03:21.000000000 +0100 -@@ -18,7 +18,7 @@ - - AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) - --ACLOCAL_AMFLAGS = -Iltdl/m4 -I m4 -+ACLOCAL_AMFLAGS = -I m4 - - MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -module -avoid-version - diff --git a/packages/imagemagick/imagemagick-6.4.4-1/PerlMagic_MakePatch b/packages/imagemagick/imagemagick-6.4.4-1/PerlMagic_MakePatch deleted file mode 100644 index f8ad0afc5f..0000000000 --- a/packages/imagemagick/imagemagick-6.4.4-1/PerlMagic_MakePatch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/Makefile.PL.in 2008-10-01 10:39:38.000000000 +0200 -+++ ImageMagick-6.4.4/PerlMagick/Makefile.PL.in 2008-10-01 10:40:25.000000000 +0200 -@@ -87,6 +87,8 @@ - - # Use same compiler as ImageMagick - 'PERLMAINCC' => '@PERLMAINCC@ @OPENMP_CFLAGS@', -+ 'AR' => '@AR@', -+ 'LD' => '@PERLMAINCC@', - - # Set Perl installation prefix to ImageMagick installation prefix - # 'PREFIX' => '@prefix@', diff --git a/packages/imagemagick/imagemagick-native_6.3.5-10.bb b/packages/imagemagick/imagemagick-native_6.3.5-10.bb deleted file mode 100644 index b03e18e9c1..0000000000 --- a/packages/imagemagick/imagemagick-native_6.3.5-10.bb +++ /dev/null @@ -1,3 +0,0 @@ -require imagemagick_${PV}.bb -DEPENDS ="libtool-native" -inherit native diff --git a/packages/imagemagick/imagemagick_6.3.5-10.bb b/packages/imagemagick/imagemagick_6.3.5-10.bb deleted file mode 100644 index 7b92a8252e..0000000000 --- a/packages/imagemagick/imagemagick_6.3.5-10.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "ImageMagick is an image convertion tools" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "tiff" -PR = "r3" - -SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \ - file://PerlMagic_MakePatch;patch=1 \ - file://makefile-am.patch;patch=1 \ - file://binconfig-fixes.patch;patch=1 " - -IMVER = "6.3.5" - -S = "${WORKDIR}/ImageMagick-${IMVER}" - -inherit autotools binconfig pkgconfig - -EXTRA_AUTORECONF += "--exclude=libtoolize" -EXTRA_OECONF = "--without-x --without-freetype --without-perl" -EXTRA_OECONF_openprotium = "--without-x --without-freetype --without-xml --without-perl" - -do_stage() { - autotools_stage_all -} - -FILES_${PN} += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.so \ - ${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.la \ - ${libdir}/ImageMagick-${IMVER}/config/ \ - ${datadir}/ImageMagick-${IMVER}" - -FILES_${PN}-dev += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.a" - -FILES_${PN}-dbg += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/.debug/*" - -LEAD_SONAME = "libMagick.so.*" - diff --git a/packages/imagemagick/imagemagick_6.4.4-1.bb b/packages/imagemagick/imagemagick_6.4.4-1.bb deleted file mode 100644 index 42bf1b8bb6..0000000000 --- a/packages/imagemagick/imagemagick_6.4.4-1.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "ImageMagick is an image convertion tools" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "tiff" - -SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \ - file://PerlMagic_MakePatch;patch=1 \ - " - -IMVER = "6.4.4" - -S = "${WORKDIR}/ImageMagick-${IMVER}" - -inherit autotools binconfig pkgconfig - -EXTRA_AUTORECONF += "--exclude=libtoolize" -EXTRA_OECONF = "--without-x --without-freetype --without-perl --disable-openmp" - -do_configure() { - gnu-configize - cp config.{sub,guess} config/ - oe_runconf -} - -do_stage() { - autotools_stage_all -} - -FILES_${PN} += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.so \ - ${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.la \ - ${libdir}/ImageMagick-${IMVER}/config/ \ - ${datadir}/ImageMagick-${IMVER}" - -FILES_${PN}-dev += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.a" - -FILES_${PN}-dbg += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/.debug/*" - -LEAD_SONAME = "libMagickCore.so.*" - |
