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

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

2005/05/11 21:43:37+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/11 18:50:47+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/11 18:50:19+02:00 uni-frankfurt.de!mickeyl
unbreak ewl and move to using releases

2005/05/11 18:44:46+02:00 uni-frankfurt.de!mickeyl
move etox to using releases

2005/05/11 18:41:01+02:00 uni-frankfurt.de!mickeyl
unbreak edje and move over to using releases

2005/05/11 18:39:11+02:00 uni-frankfurt.de!mickeyl
enable ecore-dbus and ecore-file libraries

2005/05/11 17:57:28+02:00 uni-frankfurt.de!mickeyl
unbreak imlib2 and switch to using releases

2005/05/11 17:42:25+02:00 uni-frankfurt.de!mickeyl
move embryo to using the release version

2005/05/11 17:39:15+02:00 uni-frankfurt.de!mickeyl
move ecore and evas to releases and unbreak it

2005/05/11 17:09:40+02:00 uni-frankfurt.de!mickeyl
unbreak edb and eet, move to releases, and remove maintainers that don't maintain

BKrev: 42826d99O_aJh416yx1aCKD6PTS1Yw

12 files changed, 153 insertions, 60 deletions

diff --git a/packages/imlib2/imlib2-1.2.0/binconfig.patch b/packages/imlib2/files/binconfig.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/imlib2/imlib2-1.2.0/binconfig.patch
+++ b/packages/imlib2/files/binconfig.patch
diff --git a/packages/imlib2/imlib2-1.2.0/x.patch b/packages/imlib2/files/x.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/imlib2/imlib2-1.2.0/x.patch
+++ b/packages/imlib2/files/x.patch
diff --git a/packages/imlib2/imlib2-1.1.0/autofoo.patch b/packages/imlib2/imlib2-1.1.0/autofoo.patch
index e69de29bb2..1980d7b2c9 100644
--- a/packages/imlib2/imlib2-1.1.0/autofoo.patch
+++ b/packages/imlib2/imlib2-1.1.0/autofoo.patch
@@ -0,0 +1,15 @@
+
+#
+# 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
index e69de29bb2..bb4ed1784d 100644
--- a/packages/imlib2/imlib2-1.1.0/cross.patch
+++ b/packages/imlib2/imlib2-1.1.0/cross.patch
@@ -0,0 +1,74 @@
+
+#
+# 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
index e69de29bb2..e96bcae759 100644
--- a/packages/imlib2/imlib2-1.1.0/gcc34.patch
+++ b/packages/imlib2/imlib2-1.1.0/gcc34.patch
@@ -0,0 +1,24 @@
+
+#
+# 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
index e69de29bb2..e19b75f9d9 100644
--- a/packages/imlib2/imlib2-1.1.0/pkglibdir.patch
+++ b/packages/imlib2/imlib2-1.1.0/pkglibdir.patch
@@ -0,0 +1,40 @@
+
+#
+# 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-fbonly_1.1.0.bb b/packages/imlib2/imlib2-fbonly_1.1.0.bb
deleted file mode 100644
index 3e0d53fa66..0000000000
--- a/packages/imlib2/imlib2-fbonly_1.1.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SECTION = "libs"
-LICENSE = "BSD"
-include imlib2_${PV}.bb
-inherit native
-DEPENDS = "freetype"
-
-EXTRA_OECONF = "--without-x \
-		--disable-mmx"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/imlib2-${PV}"
diff --git a/packages/imlib2/imlib2-fbonly_1.2.0.007.bb b/packages/imlib2/imlib2-fbonly_1.2.0.007.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/imlib2/imlib2-fbonly_1.2.0.007.bb
diff --git a/packages/imlib2/imlib2-native_1.1.0.bb b/packages/imlib2/imlib2-native_1.1.0.bb
deleted file mode 100644
index 4de6b1a389..0000000000
--- a/packages/imlib2/imlib2-native_1.1.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "A graphic library for file loading, saving, rendering, and \
-manipulation."
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
-LICENSE = "BSD"
-SECTION = "e/libs"
-PRIORITY = "optional"
-include imlib2.bb
-inherit native
-DEPENDS = "freetype-native libpng-native jpeg-native"
-
-do_stage () {
-  oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
-  install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
-}
diff --git a/packages/imlib2/imlib2-native_1.2.0.007.bb b/packages/imlib2/imlib2-native_1.2.0.007.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/imlib2/imlib2-native_1.2.0.007.bb
diff --git a/packages/imlib2/imlib2.inc b/packages/imlib2/imlib2.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/imlib2/imlib2.inc
diff --git a/packages/imlib2/imlib2_1.2.0.bb b/packages/imlib2/imlib2_1.2.0.bb
deleted file mode 100644
index eaa7477a19..0000000000
--- a/packages/imlib2/imlib2_1.2.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "A graphic library for file loading, saving, rendering, and \
-manipulation."
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
-LICENSE = BSD
-SECTION = "e/libs"
-PRIORITY = "optional"
-DEPENDS = "freetype libpng jpeg x11 xext"
-PR = "r4"
-
-do_prepsources () {
-	make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/enlightenment/imlib2-1.2.0.tar.gz \
-	   file://binconfig.patch;patch=1 \
-	   file://x.patch;patch=1"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--disable-mmx \
-		--with-x \
-		--x-includes=${STAGING_INCDIR} \
-		--x-libraries=${STAGING_LIBDIR}"
-
-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}"