Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/22 18:22:54+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/22 18:14:34+02:00 void!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into  dominion.dominion.void:/data/build/oe/openembedded

2005/05/22 17:05:21+01:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded

2005/05/22 01:13:55+02:00 uni-frankfurt.de!mickeyl
python-pickle depends on python-codecs

2005/05/21 22:38:37+02:00 uni-frankfurt.de!mickeyl
fix evas-x11 typo

2005/05/21 20:20:50+02:00 uni-frankfurt.de!mickeyl
clean up the imlib2 situation. remove bogus files, split into .inc, -native, -fb, x11

2005/05/21 18:21:42+01:00 rpsys.net!RP
jlime jornada6xx and jornada7xx updates from Kristoffer Ericson

2005/05/21 19:11:16+02:00 uni-frankfurt.de!mickeyl
remove broken e files

2005/05/21 15:47:58+02:00 void!koen
imlib2-x11_1.2.0.004.bb:  fix src_uri, the fetcher choked on the fetch.php?file=bla.tar.bz2. Could the EFL maintainer fix this?

2005/05/21 14:37:02+02:00 uni-frankfurt.de!mickeyl
add opie-pcmciaapplet

2005/05/21 14:35:44+02:00 uni-frankfurt.de!mickeyl
bump openzaurus-3.5.4 CVSDATE

2005/05/21 14:32:25+02:00 uni-frankfurt.de!mickeyl
split ecore into .inc, -fb, -x11 files. remove broken ecore files

2005/05/21 14:25:30+02:00 uni-frankfurt.de!mickeyl
reorganize evas and split into .inc, -fb, and -x11 files

2005/05/21 13:26:17+02:00 uni-frankfurt.de!mickeyl
add udev 058

2005/05/21 12:50:08+02:00 uni-frankfurt.de!mickeyl
task-python-everything: add pytest and pyweather

2005/05/21 12:43:57+02:00 uni-frankfurt.de!mickeyl
add pytest, a reflective unit testing support module
add pyweather, conversion module for weather scientists
upgrade pysqlite to 2.0.2

BKrev: 4290b5f22-A_n5BGjkjPp0-Fb1tzvg

9 files changed, 27 insertions, 153 deletions

diff --git a/packages/imlib2/imlib2-1.1.0/autofoo.patch b/packages/imlib2/imlib2-1.1.0/autofoo.patch
deleted file mode 100644
index 1980d7b2c9..0000000000
--- a/packages/imlib2/imlib2-1.1.0/autofoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- imlib2-1.1.0/libltdl/configure.in~autofoo
-+++ imlib2-1.1.0/libltdl/configure.in
-@@ -1,6 +1,7 @@
- dnl Process this file with autoconf to create configure.
- 
- AC_INIT(ltdl.c)
-+AC_CONFIG_AUX_DIR([..])
- 
- dnl We shouldn't be using these internal macros of autoconf,
- dnl but CONFIG_AUX_DIR($with_auxdir) breaks automake.
diff --git a/packages/imlib2/imlib2-1.1.0/cross.patch b/packages/imlib2/imlib2-1.1.0/cross.patch
deleted file mode 100644
index bb4ed1784d..0000000000
--- a/packages/imlib2/imlib2-1.1.0/cross.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- imlib2-1.1.0/demo/Makefile.am~cross
-+++ imlib2-1.1.0/demo/Makefile.am
-@@ -8,8 +8,7 @@
- LDFLAGS              = -L/usr/X11R6/lib
- INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
--                       -I/usr/X11R6/include $(X_CFLAGS) \
--                       -I$(prefix)/include -I$(includedir)
-+                       $(X_CFLAGS)
- 
- bin_PROGRAMS         = imlib2_view imconvert
- imconvert_SOURCES    = imconvert.c
---- imlib2-1.1.0/filters/Makefile.am~cross
-+++ imlib2-1.1.0/filters/Makefile.am
-@@ -8,8 +8,7 @@
- LDFLAGS		     = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib
- INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
--                       -I/usr/X11R6/include $(X_CFLAGS) \
--                       -I$(prefix)/include -I$(includedir)
-+                       $(X_CFLAGS)
- 
- pkgdir		     = $(libdir)/loaders/filter
- pkg_LTLIBRARIES	     = testfilter.la bump_map.la colormod.la
---- imlib2-1.1.0/loaders/Makefile.am~cross
-+++ imlib2-1.1.0/loaders/Makefile.am
-@@ -8,8 +8,7 @@
- LDFLAGS		     = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib 
- INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
--                       -I/usr/X11R6/include $(X_CFLAGS) \
--                       -I$(prefix)/include -I$(includedir)
-+                       $(X_CFLAGS)
- 
- pkgdir		     = $(libdir)/loaders/image
- 
---- imlib2-1.1.0/src/Makefile.am~cross
-+++ imlib2-1.1.0/src/Makefile.am
-@@ -8,8 +8,7 @@
- LDFLAGS		     = -L/usr/X11R6/lib
- INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
--                       $(freetype_cflags) -I/usr/X11R6/include $(X_CFLAGS) \
--                       -I$(prefix)/include -I$(includedir)
-+                       $(freetype_cflags) $(X_CFLAGS)
- MMX_SRCS             = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S \
- 		       asm_blend_cmod.S
- MMX_OBJS             = $(MMX_SRCS:.S=.lo)
-@@ -42,7 +41,7 @@
- libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS)
- endif
- 
--SYS_LOADERS_PATH = @pkglibdir@
-+SYS_LOADERS_PATH = @loadersdir@
- image.lo: loaderpath.h
- loaderpath.h: Makefile
- 	@echo "#define SYS_LOADERS_PATH \"${SYS_LOADERS_PATH}\"" > $@
---- imlib2-1.1.0/test/Makefile.am~cross
-+++ imlib2-1.1.0/test/Makefile.am
-@@ -8,8 +8,7 @@
- LDFLAGS              = -L/usr/X11R6/lib
- INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
- 		       -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
--                       -I/usr/X11R6/include $(X_CFLAGS) \
--		       -I$(prefix)/include -I$(includedir)
-+                       $(X_CFLAGS)
- 
- bin_PROGRAMS         = imlib2 bumpmaptest imlib2_test polytest color_spaces
- imlib2_SOURCES       = main.c
diff --git a/packages/imlib2/imlib2-1.1.0/gcc34.patch b/packages/imlib2/imlib2-1.1.0/gcc34.patch
deleted file mode 100644
index e96bcae759..0000000000
--- a/packages/imlib2/imlib2-1.1.0/gcc34.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- imlib2-1.1.0/src/rgbadraw.c~gcc34
-+++ imlib2-1.1.0/src/rgbadraw.c
-@@ -2357,14 +2357,14 @@
-                        /* last span on line and still not < ss->x */
-                        if (ps)
-                           ps->next = s;
--                     nospans:
-+                     nospans:;
-                     }
-                }
-              if (i == y2)
-                 goto nolines;
-              i += step;
-           }
--      nolines:
-+      nolines:;
-      }
-    for (i = 0; i < h; i++)
-      {
diff --git a/packages/imlib2/imlib2-1.1.0/pkglibdir.patch b/packages/imlib2/imlib2-1.1.0/pkglibdir.patch
deleted file mode 100644
index e19b75f9d9..0000000000
--- a/packages/imlib2/imlib2-1.1.0/pkglibdir.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- imlib2-1.1.0/configure.ac~pkglibdir.patch
-+++ imlib2-1.1.0/configure.ac
-@@ -59,8 +59,8 @@
- fi
- AM_CONDITIONAL(HAVE_MMX, test x$mmx = xyes)
- 
--pkglibdir='${libdir}'/loaders
--AC_SUBST(pkglibdir)
-+loadersdir='${pkglibdir}'/loaders
-+AC_SUBST(loadersdir)
- 
- AC_C_BIGENDIAN	      
- 
---- imlib2-1.1.0/loaders/Makefile.am~pkglibdir.patch
-+++ imlib2-1.1.0/loaders/Makefile.am
-@@ -10,7 +10,7 @@
-                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
-                        $(X_CFLAGS)
- 
--pkgdir		     = $(libdir)/loaders/image
-+pkgdir		     = $(loadersdir)/image
- 
- if JPEG_LOADER
- JPEG_L              = jpeg.la
---- imlib2-1.1.0/filters/Makefile.am~pkglibdir.patch
-+++ imlib2-1.1.0/filters/Makefile.am
-@@ -10,7 +10,7 @@
-                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
-                        $(X_CFLAGS)
- 
--pkgdir		     = $(libdir)/loaders/filter
-+pkgdir		     = $(loadersdir)/filter
- pkg_LTLIBRARIES	     = testfilter.la bump_map.la colormod.la
- 
- testfilter_la_SOURCES  = filter_test.c
diff --git a/packages/imlib2/imlib2-core_1.2.0.004.bb b/packages/imlib2/imlib2-fb_1.2.0.007.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/imlib2/imlib2-core_1.2.0.004.bb
+++ b/packages/imlib2/imlib2-fb_1.2.0.007.bb
diff --git a/packages/imlib2/imlib2-x11_1.2.0.004.bb b/packages/imlib2/imlib2-x11_1.2.0.004.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/imlib2/imlib2-x11_1.2.0.004.bb
+++ /dev/null
diff --git a/packages/imlib2/imlib2-fbonly_1.2.0.007.bb b/packages/imlib2/imlib2-x11_1.2.0.007.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/imlib2/imlib2-fbonly_1.2.0.007.bb
+++ b/packages/imlib2/imlib2-x11_1.2.0.007.bb
diff --git a/packages/imlib2/imlib2.inc b/packages/imlib2/imlib2.inc
index e69de29bb2..fce10c2eb3 100644
--- a/packages/imlib2/imlib2.inc
+++ b/packages/imlib2/imlib2.inc
@@ -0,0 +1,27 @@
+DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation."
+HOMEPAGE = "http://www.enlightenment.org"
+LICENSE = "BSD"
+SECTION = "e/libs"
+PRIORITY = "optional"
+PROVIDES = "virtual/imlib2"
+DEPENDS = "freetype libpng jpeg"
+
+do_prepsources () {
+	make clean distclean || true
+}
+addtask prepsources after do_fetch before do_unpack
+
+SRC_URI = "http://enlightenment.freedesktop.org/files/imlib2-${PV}.tar.gz"
+S = "${WORKDIR}/imlib2-${PV}"
+
+inherit autotools pkgconfig binconfig
+
+do_stage () {
+	oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
+}
+
+PACKAGES += "${PN}-bin"
+FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2"
+FILES_${PN}-dev += "${bindir}/imlib2-config"
+FILES_${PN}-bin = "${bindir}"
diff --git a/packages/imlib2/imlib2_cvs.bb b/packages/imlib2/imlib2_cvs.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/imlib2/imlib2_cvs.bb
+++ /dev/null