Merge oe-devel@oe-devel.bkbits.net:openembedded

into hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.

BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA

7 files changed, 0 insertions, 182 deletions

diff --git a/imlib2/imlib2-1.1.0/autofoo.patch b/imlib2/imlib2-1.1.0/autofoo.patch
deleted file mode 100644
index 1980d7b2c9..0000000000
--- a/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/imlib2/imlib2-1.1.0/cross.patch b/imlib2/imlib2-1.1.0/cross.patch
deleted file mode 100644
index bb4ed1784d..0000000000
--- a/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/imlib2/imlib2-1.1.0/gcc34.patch b/imlib2/imlib2-1.1.0/gcc34.patch
deleted file mode 100644
index e96bcae759..0000000000
--- a/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/imlib2/imlib2-1.1.0/pkglibdir.patch b/imlib2/imlib2-1.1.0/pkglibdir.patch
deleted file mode 100644
index e19b75f9d9..0000000000
--- a/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/imlib2/imlib2-fbonly_1.1.0.bb b/imlib2/imlib2-fbonly_1.1.0.bb
deleted file mode 100644
index 5192a88888..0000000000
--- a/imlib2/imlib2-fbonly_1.1.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SECTION = "libs"
-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/imlib2/imlib2-native_1.1.0.bb b/imlib2/imlib2-native_1.1.0.bb
deleted file mode 100644
index 7b6cafe66b..0000000000
--- a/imlib2/imlib2-native_1.1.0.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SECTION = "libs"
-include imlib2_${PV}.bb
-inherit native
-DEPENDS = "freetype-native"
-EXTRA_OECONF = "--without-x"
-PR = "r1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/imlib2-${PV}"
-
-do_configure () {
-        rm -f ${S}/libltdl/acinclude.m4
-        autotools_do_configure
-}
-
-do_stage () {
-        oe_libinstall -a -so -C src libImlib2 ${STAGING_LIBDIR}/
-        install -m 0644 ${S}/src/Imlib2.h ${STAGING_INCDIR}/
-	install -d ${STAGING_LIBDIR}/imlib2/loaders/image/
-	install -m 0755 loaders/.libs/*.so ${STAGING_LIBDIR}/imlib2/loaders/image/
-}
diff --git a/imlib2/imlib2_1.1.0.bb b/imlib2/imlib2_1.1.0.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/imlib2/imlib2_1.1.0.bb
+++ /dev/null