Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded

into giantshoulder.com:/home/tom/dev/openslug/openembedded

2005/03/17 00:06:10+10:30 (none)!rwhitby
Removed the ehci module from openslug-init.

2005/03/17 00:03:09+10:30 (none)!rwhitby
Removed the ehci module from openslug-image.

2005/03/16 08:34:55+10:30 (none)!rwhitby
OpenSlug 1.7 - removed KALLSYMS, and EHCI is now compiled back into the kernel.

2005/03/15 08:41:13-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/15 15:48:57+00:00 (none)!dp
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cimmeria.(none):/home/dp/zaurus/openembedded

2005/03/15 15:44:34+00:00 (none)!dp
Change TARGET_ARCH to TARGET_SYS and enable RTC for timing

2005/03/15 07:41:18-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/15 16:02:40+01:00 mn-solutions.de!schurig
mnci-ramses: kernel image fixes

2005/03/14 03:41:08-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/14 12:29:29+01:00 local!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into marcinj.local:/home/hrw/zaurus/bb/openembedded

2005/03/14 12:26:37+01:00 local!hrw
allow packages to not have shlibs info generated - useful with packages like sharp-compat-libs

2005/03/14 03:06:57-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/14 21:33:42+10:30 (none)!rwhitby
Updated fakeroot from 1.2.1 to 1.2.2 (upstream change).

2005/03/14 12:02:04+01:00 uni-frankfurt.de!mickeyl
upgrade fakeroot to 1.2.2

2005/03/13 19:41:10-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/14 03:38:40+00:00 (none)!cwiiis
Add missing dependencies to gconf-dbus (libxml2, popt)

2005/03/14 03:13:30+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded

2005/03/14 03:12:25+00:00 (none)!cwiiis
Fix automake 1.9 breakage in libmatchbox.

2005/03/13 17:41:10-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/14 00:54:51+00:00 rpsys.net!RP
openzaurus-2.6: Add pxa udc suspend/resume patch by David Brownell

2005/03/13 10:41:06-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/13 13:31:09-05:00 handhelds.org!kergoth
Add fakeroot 1.2.1.

2005/03/13 13:25:28-05:00 handhelds.org!kergoth
Add hdparm 5.8.

2005/03/13 13:21:24-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/03/13 13:21:04-05:00 handhelds.org!kergoth
Add rxvt-unicode 5.3.

2005/03/13 09:41:04-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/13 18:13:24+01:00 handhelds.org!zecke
libsdl-qpe:
	Try placing __attribute__ at a different location

2005/03/13 08:41:59-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/13 11:49:00-05:00 handhelds.org!kergoth
Fix the efl package builds that were broken by the recent binconfig changes (they were directly specifying the -config script paths in staging_bindir).

2005/03/13 11:43:47-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/03/13 11:43:30-05:00 handhelds.org!kergoth
Apply bugfix from Finn Thain to the bytes_per_inode patch in genext2fs.

2005/03/13 07:41:23-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/13 16:15:10+01:00 uni-frankfurt.de!mickeyl
add collections.so and itertools.so to python-lang

2005/03/13 06:41:12-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/13 15:17:47+01:00 uni-frankfurt.de!mickeyl
bump CVSDATE for oz-3.5.3

2005/03/13 15:15:43+01: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/03/13 15:13:39+01:00 uni-frankfurt.de!mickeyl
repair fortune-mod and bring it back from nonworking

2005/03/13 13:34:54+01:00 uni-frankfurt.de!mickeyl
add GNU recode, a charset conversion utility

2005/03/13 03:41:06-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/13 12:16:41+01:00 (none)!koen
Add vlc-gpe_0.8.1, courtesy Marc Poulhies. Fix configure flags, disable ogg/tremor for now.

2005/03/12 21:41:06-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/13 00:47:35-05:00 handhelds.org!kergoth
Upgrade beep-media-player from 0.9.7rc2 to 0.9.7, and fix the build by defining _GNU_SOURCE.

2005/03/13 00:35:23-05:00 handhelds.org!kergoth
Make the libogg builds inherit pkgconfig.

2005/03/13 00:21:46-05:00 handhelds.org!kergoth
Unbork the ccdv build.

2005/03/12 20:41:07-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/12 23:46:08-05:00 handhelds.org!kergoth
Add OpenSSH 4.0p1.

2005/03/12 19:41:14-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/12 17:28:56-10:00 (none)!dyoung
Set NLS for glib-2.0 to be on so packages that depend on it will build

2005/03/12 22:16:52-05:00 handhelds.org!kergoth
Add openssh test results to the i686 linux* site files.

2005/03/12 22:02:28-05:00 handhelds.org!kergoth
Disable mmx in the inkscape builds.

2005/03/12 21:57:04-05:00 handhelds.org!kergoth
Split libsigc++ 1.2 and 2.0 into seperate entities, as they should be, and adjust the inkscape deps accordingly.  Inkscape builds again.

2005/03/12 18:41:10-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/12 20:57:13-05:00 handhelds.org!kergoth
Fix the libart-lgpl build for i686.

2005/03/12 17:41:03-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/12 20:44:07-05:00 handhelds.org!kergoth
Fix FILESPATH in freetype-native.

2005/03/12 20:34:07-05:00 handhelds.org!kergoth
Add feh version 1.2.7.

2005/03/12 20:32:27-05:00 handhelds.org!kergoth
imlib2:
  * Enable X support, and patch up the buildsystem to do so more intelligently.
  * Depend on x11 and xext.
  * Fixup the -config script.
  * Split out the binaries into a -bin package.

2005/03/12 20:03:00-05:00 handhelds.org!kergoth
Apply patch to fixup giblib-config.

2005/03/12 16:41:04-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/12 19:28:47-05:00 handhelds.org!kergoth
Add giblib 1.2.4 and consolodate some metadata into a .inc.

2005/03/12 19:09:47-05:00 handhelds.org!kergoth
Unbork the imlib2 build.. its packaging needed tweaks, and its manual set oF EET_CONFIG and FREETYPE_CONFIG was broken by the recent binconfig changes.

2005/03/12 18:53:25-05:00 handhelds.org!kergoth
Clean up the freetype builds.. use autotools_stage_includes.

2005/03/12 15:41:11-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/12 18:28:04-05:00 handhelds.org!kergoth
Add grep 2.5.1.

2005/03/12 18:19:59-05:00 handhelds.org!kergoth
Upgrade mysql to 4.1.10a.

2005/03/12 14:41:18-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/12 17:38:33-05:00 handhelds.org!kergoth
Add php 4.3.10, and move common bits into a .inc.

2005/03/12 17:35:21-05:00 handhelds.org!kergoth
Add php test results to the i686 linux* site files.

2005/03/12 17:08:27-05:00 handhelds.org!kergoth
Pass the password in the cvs:// uri in the slugimage .bb

2005/03/12 17:03:03-05:00 handhelds.org!kergoth
Per the recommendation of Erik Andersen, kill off the setting of -rpath in our
TARGET_LDFLAGS.  We now rely on ldconfig more than ever.  This was necessary,
because the linker looks in both rpath _and_ rpath-link to find things
during the build.

2005/03/12 17:01:41-05:00 handhelds.org!kergoth
Fix the naming of the .ext2 image inside the .ext2.gz for that image type.

2005/03/12 16:57:29-05:00 handhelds.org!kergoth
Fix the autom4te_perllibdir bits in gnu-configize, to make it usable natively on the target.

2005/03/12 12:41:25-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/12 15:32:05-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/03/12 15:31:46-05:00 handhelds.org!kergoth
genext2fs 1.3+cvs:
  * Apply bytes per inode patch, to fix the default inode count based on # of
    blocks, so it no longer uses the auto bits unnecessarily, and add a
    cmdline opt to control it.

BKrev: 4238364bBtYSx5s1QTTJbjtEROGB3w

3 files changed, 15 insertions, 14 deletions

diff --git a/packages/imlib2/imlib2-1.2.0/binconfig.patch b/packages/imlib2/imlib2-1.2.0/binconfig.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/imlib2/imlib2-1.2.0/binconfig.patch
diff --git a/packages/imlib2/imlib2-1.2.0/x.patch b/packages/imlib2/imlib2-1.2.0/x.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/imlib2/imlib2-1.2.0/x.patch
diff --git a/packages/imlib2/imlib2_1.2.0.bb b/packages/imlib2/imlib2_1.2.0.bb
index e4b82ba619..eaa7477a19 100644
--- a/packages/imlib2/imlib2_1.2.0.bb
+++ b/packages/imlib2/imlib2_1.2.0.bb
@@ -5,30 +5,31 @@ MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
 LICENSE = BSD
 SECTION = "e/libs"
 PRIORITY = "optional"
-DEPENDS = "freetype libpng jpeg"
-PR = "2"
+DEPENDS = "freetype libpng jpeg x11 xext"
+PR = "r4"
 
 do_prepsources () {
-  make clean distclean || true
+	make clean distclean || true
 }
 addtask prepsources after do_fetch before do_unpack
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/enlightenment/imlib2-1.2.0.tar.gz"
+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
 
-export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config"
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
-
 EXTRA_OECONF = "--disable-mmx \
-                --disable-x11"
+		--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}/
+	oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
 }
 
-FILES_${PN} = "${libdir}/libImlib2*.so*"
-FILES_${PN} = "${libdir}/imlib2"
-FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig"
- 
+PACKAGES += "${PN}-bin"
+FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2"
+FILES_${PN}-dev += "${bindir}/imlib2-config"
+FILES_${PN}-bin = "${bindir}"