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>

7 files changed, 196 insertions, 0 deletions

diff --git a/recipes/imagemagick/files/PerlMagic_MakePatch b/recipes/imagemagick/files/PerlMagic_MakePatch
new file mode 100644
index 0000000000..c87414529a
--- /dev/null
+++ b/recipes/imagemagick/files/PerlMagic_MakePatch
@@ -0,0 +1,13 @@
+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/recipes/imagemagick/files/binconfig-fixes.patch b/recipes/imagemagick/files/binconfig-fixes.patch
new file mode 100644
index 0000000000..51797c5326
--- /dev/null
+++ b/recipes/imagemagick/files/binconfig-fixes.patch
@@ -0,0 +1,81 @@
+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/recipes/imagemagick/files/makefile-am.patch b/recipes/imagemagick/files/makefile-am.patch
new file mode 100644
index 0000000000..7ee6ccb4c9
--- /dev/null
+++ b/recipes/imagemagick/files/makefile-am.patch
@@ -0,0 +1,13 @@
+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/recipes/imagemagick/imagemagick-6.4.4-1/PerlMagic_MakePatch b/recipes/imagemagick/imagemagick-6.4.4-1/PerlMagic_MakePatch
new file mode 100644
index 0000000000..f8ad0afc5f
--- /dev/null
+++ b/recipes/imagemagick/imagemagick-6.4.4-1/PerlMagic_MakePatch
@@ -0,0 +1,11 @@
+--- /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/recipes/imagemagick/imagemagick-native_6.3.5-10.bb b/recipes/imagemagick/imagemagick-native_6.3.5-10.bb
new file mode 100644
index 0000000000..b03e18e9c1
--- /dev/null
+++ b/recipes/imagemagick/imagemagick-native_6.3.5-10.bb
@@ -0,0 +1,3 @@
+require imagemagick_${PV}.bb
+DEPENDS ="libtool-native"
+inherit native
diff --git a/recipes/imagemagick/imagemagick_6.3.5-10.bb b/recipes/imagemagick/imagemagick_6.3.5-10.bb
new file mode 100644
index 0000000000..7b92a8252e
--- /dev/null
+++ b/recipes/imagemagick/imagemagick_6.3.5-10.bb
@@ -0,0 +1,36 @@
+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/recipes/imagemagick/imagemagick_6.4.4-1.bb b/recipes/imagemagick/imagemagick_6.4.4-1.bb
new file mode 100644
index 0000000000..42bf1b8bb6
--- /dev/null
+++ b/recipes/imagemagick/imagemagick_6.4.4-1.bb
@@ -0,0 +1,39 @@
+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.*"
+