merge of 'd506336ff98cc7331f3a17226b7b10cef8817694'

     and 'f4ac5cba40afcaee88ee7f46e4ac7ae23cedea9d'

15 files changed, 292 insertions, 15 deletions

diff --git a/packages/diffutils/diffutils_2.8.1.bb b/packages/diffutils/diffutils_2.8.1.bb
index a0a7b7dad9..584188c2a3 100644
--- a/packages/diffutils/diffutils_2.8.1.bb
+++ b/packages/diffutils/diffutils_2.8.1.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DESCRIPTION = "Diffutils contains the GNU diff, diff3, \
 sdiff, and cmp utilities. These programs are usually \
 used for creating patch files."
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz"
 
@@ -18,8 +18,21 @@ EXTRA_OECONF_linux-uclibc = "--without-included-regex"
 
 do_install_append () {
         mv ${D}${bindir}/diff ${D}${bindir}/diff.${PN}
+        mv ${D}${bindir}/cmp ${D}${bindir}/cmp.${PN}
 }
 
 ALTERNATIVE_NAME = "diff"
 ALTERNATIVE_PATH = "diff.${PN}"
 ALTERNATIVE_PRIORITY = "100"
+
+pkg_postinst_${PN} () {
+
+update-alternatives --install /usr/bin/cmp cmp cmp.diffutils 100
+
+}
+
+pkg_postrm_${PN} () {
+
+update-alternatives --remove cmp cmp.diffutils
+
+}
diff --git a/packages/dosfstools/dosfstools-native_2.10.bb b/packages/dosfstools/dosfstools-native_2.10.bb
index 62709916fc..1fbbe37c76 100644
--- a/packages/dosfstools/dosfstools-native_2.10.bb
+++ b/packages/dosfstools/dosfstools-native_2.10.bb
@@ -7,7 +7,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dosfstools-${PV}"
 
 S="${WORKDIR}/dosfstools-${PV}"
 
-PR="r3"
+PR="r4"
 
 SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
 	file://mkdosfs-bootcode.patch;patch=1 \
@@ -16,7 +16,8 @@ SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}
 	file://dosfstools-2.10-kernel-2.6.patch;patch=1 \
 	file://msdos_fat12_undefined.patch;patch=1 \
 	file://dosfstools-msdos_fs-types.patch;patch=1 \
-	file://include-linux-types.patch;patch=1"
+	file://include-linux-types.patch;patch=1 \
+	file://2.6.20-syscall.patch;patch=1"
 
 inherit native
 
diff --git a/packages/dosfstools/files/2.6.20-syscall.patch b/packages/dosfstools/files/2.6.20-syscall.patch
new file mode 100644
index 0000000000..7cf2662d27
--- /dev/null
+++ b/packages/dosfstools/files/2.6.20-syscall.patch
@@ -0,0 +1,65 @@
+Index: dosfstools-2.10/dosfsck/io.c
+===================================================================
+--- dosfstools-2.10.orig/dosfsck/io.c	2007-06-07 16:15:52.000000000 +0200
++++ dosfstools-2.10/dosfsck/io.c	2007-06-07 16:16:06.000000000 +0200
+@@ -42,28 +42,11 @@
+ /* Use the _llseek system call directly, because there (once?) was a bug in
+  * the glibc implementation of it. */
+ #include <linux/unistd.h>
+-#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__
+ /* On alpha, the syscall is simply lseek, because it's a 64 bit system. */
+ static loff_t llseek( int fd, loff_t offset, int whence )
+ {
+     return lseek(fd, offset, whence);
+ }
+-#else
+-# ifndef __NR__llseek
+-# error _llseek system call not present
+-# endif
+-static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo,
+-		  loff_t *, res, uint, wh );
+-
+-static loff_t llseek( int fd, loff_t offset, int whence )
+-{
+-    loff_t actual;
+-
+-    if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0)
+-	return (loff_t)-1;
+-    return actual;
+-}
+-#endif
+ 
+ 
+ void fs_open(char *path,int rw)
+Index: dosfstools-2.10/mkdosfs/mkdosfs.c
+===================================================================
+--- dosfstools-2.10.orig/mkdosfs/mkdosfs.c	2007-06-07 16:15:11.000000000 +0200
++++ dosfstools-2.10/mkdosfs/mkdosfs.c	2007-06-07 16:15:30.000000000 +0200
+@@ -116,27 +116,11 @@
+ /* Use the _llseek system call directly, because there (once?) was a bug in
+  * the glibc implementation of it. */
+ #include <linux/unistd.h>
+-#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__
+ /* On alpha, the syscall is simply lseek, because it's a 64 bit system. */
+ static loff_t llseek( int fd, loff_t offset, int whence )
+ {
+     return lseek(fd, offset, whence);
+ }
+-#else
+-# ifndef __NR__llseek
+-# error _llseek system call not present
+-# endif
+-static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo,
+-		  loff_t *, res, uint, wh );
+-static loff_t llseek( int fd, loff_t offset, int whence )
+-{
+-    loff_t actual;
+-
+-    if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0)
+-	return (loff_t)-1;
+-    return actual;
+-}
+-#endif
+ 
+ #define ROUND_UP(value, divisor) (value + (divisor - (value % divisor))) / divisor
+ 
diff --git a/packages/glib-2.0/glib-2.0-2.16.1/hurd-arg-max.patch b/packages/glib-2.0/glib-2.0-2.16.1/hurd-arg-max.patch
new file mode 100644
index 0000000000..36c9d15908
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.16.1/hurd-arg-max.patch
@@ -0,0 +1,76 @@
+Source: http://bugzilla.gnome.org/show_bug.cgi?id=522335
+
+This patch fixes the following error.
+
+| make[4]: Entering directory `/home/khem/oe/build/eglibc/tmp-qemuarm/work/armv5te-angstrom-linux-gnueabi/glib-2.0-2.16.1-r3/glib-2.16.1/glib'
+| if ccache arm-angstrom-linux-gnueabi-gcc -march=armv5te -mtune=arm926ej-s -DHAVE_CONFIG_H -I. -I. -I..  -I..  -DG_LOG_DOMAIN=\"GLib\" -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION -DPCRE_STATIC -isystem/home/khem/oe/build/eglibc/tmp-qemuarm/staging/arm-angstrom-linux-gnueabi/usr/include -pthread  -isystem/home/khem/oe/build/eglibc/tmp-qemuarm/staging/arm-angstrom-linux-gnueabi/usr/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -Wall -MT gtester.o -MD -MP -MF ".deps/gtester.Tpo" -c -o gtester.o gtester.c; \
+| 	then mv -f ".deps/gtester.Tpo" ".deps/gtester.Po"; else rm -f ".deps/gtester.Tpo"; exit 1; fi
+| gtester.c: In function 'launch_test_binary':
+| gtester.c:276: error: 'ARG_MAX' undeclared (first use in this function)
+| gtester.c:276: error: (Each undeclared identifier is reported only once
+| gtester.c:276: error: for each function it appears in.)
+| gtester.c:276: warning: unused variable 'argv'
+| make[4]: *** [gtester.o] Error 1
+
+
+Index: glib-2.16.1/glib/gtester.c
+===================================================================
+--- glib-2.16.1.orig/glib/gtester.c	(Revision 6750)
++++ glib-2.16.1/glib/gtester.c	(Arbeitskopie)
+@@ -273,7 +273,8 @@
+   GTestLogBuffer *tlb;
+   GSList *slist, *free_list = NULL;
+   GError *error = NULL;
+-  const gchar *argv[ARG_MAX];
++  int argc = 0;
++  const gchar **argv;
+   GPid pid = 0;
+   gint report_pipe[2] = { -1, -1 };
+   guint child_report_cb_id = 0;
+@@ -289,7 +290,34 @@
+       return FALSE;
+     }
+ 
++  /* setup argc */
++  for (slist = subtest_args; slist; slist = slist->next)
++    argc++;
++  /* argc++; */
++  if (subtest_quiet)
++    argc++;
++  if (subtest_verbose)
++    argc++;
++  if (!subtest_mode_fatal)
++    argc++;
++  if (subtest_mode_quick)
++    argc++;
++  else
++    argc++;
++  if (subtest_mode_perf)
++    argc++;
++  if (gtester_list_tests)
++    argc++;
++  if (subtest_seedstr)
++    argc++;
++  argc++;
++  if (skip_tests)
++    argc++;
++  for (slist = subtest_paths; slist; slist = slist->next)
++    argc++;
++
+   /* setup argv */
++  argv = g_malloc ((argc + 1) * sizeof(gchar *));
+   argv[i++] = binary;
+   for (slist = subtest_args; slist; slist = slist->next)
+     argv[i++] = (gchar*) slist->data;
+@@ -343,8 +371,10 @@
+       else
+         g_warning ("Failed to execute test binary: %s: %s", argv[0], error->message);
+       g_clear_error (&error);
++      g_free (argv);
+       return FALSE;
+     }
++  g_free (argv);
+ 
+   subtest_running = TRUE;
+   subtest_io_pending = TRUE;
+
diff --git a/packages/glib-2.0/glib-2.0_2.16.1.bb b/packages/glib-2.0/glib-2.0_2.16.1.bb
index ccbbb9be70..ef7a1e84fc 100644
--- a/packages/glib-2.0/glib-2.0_2.16.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.16.1.bb
@@ -1,9 +1,10 @@
 require glib.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1 \
            file://gcc-4.2-inline-fix.patch;patch=1 \
+           file://hurd-arg-max.patch;patch=1 \
           "
diff --git a/packages/jamvm/jamvm_1.5.1.bb b/packages/jamvm/jamvm_1.5.1.bb
new file mode 100644
index 0000000000..bf9271c938
--- /dev/null
+++ b/packages/jamvm/jamvm_1.5.1.bb
@@ -0,0 +1,12 @@
+require jamvm.inc
+
+SRC_URI += "file://debian-jni.patch;patch=1;pnum=0"
+
+PR = "r0"
+
+do_configure_prepend() {
+  # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
+  # configured in OE.
+  sed -i -e "s|OE_LIBDIR_JNI|${libdir_jni}|" src/dll.c
+}
+
diff --git a/packages/less/less_418.bb b/packages/less/less_418.bb
index c19a41e63d..d63e2c3290 100644
--- a/packages/less/less_418.bb
+++ b/packages/less/less_418.bb
@@ -6,7 +6,7 @@ SECTION = "console/utils"
 LICENSE = "BSD"
 DEPENDS = "ncurses"
 
-SRC_URI = "${GNU_MIRROR}/less/less-${PV}.tar.gz "
+SRC_URI = "${GNU_MIRROR}/less/less-${PV}.tar.gz"
 
 inherit autotools update-alternatives
 
diff --git a/packages/libid3tag/files/.mtn2git_empty b/packages/libid3tag/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libid3tag/files/.mtn2git_empty
diff --git a/packages/libid3tag/files/id3tag.pc b/packages/libid3tag/files/id3tag.pc
new file mode 100644
index 0000000000..e686000689
--- /dev/null
+++ b/packages/libid3tag/files/id3tag.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: id3tag
+Description: ID3 tag reading library
+Requires:
+Version: 0.15.0b
+Libs: -L${libdir} -lid3tag -lz
+Cflags: -I${includedir}
diff --git a/packages/libid3tag/libid3tag_0.15.1b.bb b/packages/libid3tag/libid3tag_0.15.1b.bb
index c093ea5310..c9f4a0c0ba 100644
--- a/packages/libid3tag/libid3tag_0.15.1b.bb
+++ b/packages/libid3tag/libid3tag_0.15.1b.bb
@@ -1,17 +1,23 @@
-DESCRIPTION = "Library for interacting with ID3 tags."
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "zlib"
+DESCRIPTION = "Library for interacting with ID3 tags."
 LICENSE = "GPL"
 PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libid3tag-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz \
+           file://id3tag.pc"
+
 S = "${WORKDIR}/libid3tag-${PV}"
 
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "-enable-speed"
 
+do_configure_prepend() {
+    install -m 0644 ${WORKDIR}/id3tag.pc ${S}
+}
 do_stage() {
-    autotools_stage_all
+	oe_libinstall -so libid3tag ${STAGING_LIBDIR}
+        install -m 0644 id3tag.h ${STAGING_INCDIR}
 }
diff --git a/packages/libmad/files/add-pkgconfig.patch b/packages/libmad/files/add-pkgconfig.patch
new file mode 100644
index 0000000000..636b27a928
--- /dev/null
+++ b/packages/libmad/files/add-pkgconfig.patch
@@ -0,0 +1,68 @@
+Here is a patch for adding pkg-config support to libmad.
+It would make life a bit easier for distro maintainers if this was applied.
+In case you didn't know, pkg-config is a tool for providing LDFLAGS and
+CFLAGS for packages using shared libraries. It's on freedesktop.org.
+Debian has already been distributing the pkg-config file mad.pc with
+libmad for some time, and people developing on debian (notably xmms2 
+developers) have started relying on this support being present, causing
+some confusion for people installing from source and on some BSDs which
+do not provide mad.pc (google: pkgconfig libmad).
+
+EMH
+
+--h31gzZEtNLTqOjlF
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: attachment; filename=&quot;libmad-0.15.1b-pkgconfig.patch&quot;
+
+diff -Naur libmad-0.15.1b.old/configure.ac libmad-0.15.1b/configure.ac
+--- libmad-0.15.1b.old/configure.ac	2004-01-23 10:41:32.000000000 +0100
++++ libmad-0.15.1b/configure.ac	2004-08-07 02:25:24.633462168 +0200
+@@ -429,5 +429,5 @@
+ dnl AC_SUBST(LTLIBOBJS)
+ 
+ AC_CONFIG_FILES([Makefile msvc++/Makefile  \
+-	libmad.list])
++	libmad.list mad.pc])
+ AC_OUTPUT
+diff -Naur libmad-0.15.1b.old/mad.pc.in libmad-0.15.1b/mad.pc.in
+--- libmad-0.15.1b.old/mad.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ libmad-0.15.1b/mad.pc.in	2004-08-07 02:04:59.617692872 +0200
+@@ -0,0 +1,14 @@
++# libmad pkg-config source file
++
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: mad
++Description: MPEG Audio Decoder
++Version: @VERSION@
++Requires:
++Conflicts:
++Libs: -L${libdir} -lmad -lm
++Cflags: -I${includedir}
+diff -Naur libmad-0.15.1b.old/Makefile.am libmad-0.15.1b/Makefile.am
+--- libmad-0.15.1b.old/Makefile.am	2004-02-17 03:02:03.000000000 +0100
++++ libmad-0.15.1b/Makefile.am	2004-08-07 02:03:19.859858368 +0200
+@@ -24,6 +24,9 @@
+ SUBDIRS =		
+ DIST_SUBDIRS =		msvc++
+ 
++pkgconfigdir =		$(libdir)/pkgconfig
++pkgconfig_DATA =	mad.pc
++
+ lib_LTLIBRARIES =	libmad.la
+ include_HEADERS =	mad.h
+ 
+@@ -34,7 +37,8 @@
+ minimad_LDADD =		libmad.la
+ 
+ EXTRA_DIST =		mad.h.sed  \
+-			CHANGES COPYRIGHT CREDITS README TODO VERSION
++			CHANGES COPYRIGHT CREDITS README TODO VERSION \
++			mad.pc.in
+ 
+ exported_headers =	version.h fixed.h bit.h timer.h stream.h frame.h  \
+ 			synth.h decoder.h
+
diff --git a/packages/libmad/libmad_0.15.1b.bb b/packages/libmad/libmad_0.15.1b.bb
index 1f341b9957..d828ca85a4 100644
--- a/packages/libmad/libmad_0.15.1b.bb
+++ b/packages/libmad/libmad_0.15.1b.bb
@@ -3,15 +3,16 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "libid3tag"
 LICENSE = "GPL"
+PR = "r3"
 
-PR = "r2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \
+           file://add-pkgconfig.patch;patch=1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz"
 S = "${WORKDIR}/libmad-${PV}"
 
 SRC_URI_append_avr32 = " file://libmad-0.15.1b-avr32-optimization.patch;patch=1"
 
-inherit autotools
+inherit autotools pkgconfig
 
 EXTRA_OECONF = "-enable-speed --enable-shared"
 # The ASO's don't take any account of thumb...
@@ -27,3 +28,5 @@ do_stage() {
 	oe_libinstall -so libmad ${STAGING_LIBDIR}
 	install -m 0644 mad.h ${STAGING_INCDIR}
 }
+
+ARM_INSTRUCTION_SET = "arm"
diff --git a/packages/mtools/files/no-x11.patch b/packages/mtools/files/no-x11.patch
new file mode 100644
index 0000000000..300f43f000
--- /dev/null
+++ b/packages/mtools/files/no-x11.patch
@@ -0,0 +1,19 @@
+---
+ Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- mtools-3.9.9.orig/Makefile.in
++++ mtools-3.9.9/Makefile.in
+@@ -128,11 +128,11 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ CFLAGS = $(CPPFLAGS) $(DEFS) $(MYCFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS) 
+ CXXFLAGS  = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS) 
+ LINK      = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@
+ ALLLIBS   = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS)
+-X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lXau -lX11 $(LIBS) 
++X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(LIBS)
+ X_CCFLAGS = $(X_CFLAGS) $(CFLAGS)
+ 
+ all:    mtools $(LINKS) mkmanifest @FLOPPYD@
+ 
+ %.o: %.c
diff --git a/packages/mtools/mtools-native_3.9.9.bb b/packages/mtools/mtools-native_3.9.9.bb
index 16a0c37f7c..c82f7404eb 100644
--- a/packages/mtools/mtools-native_3.9.9.bb
+++ b/packages/mtools/mtools-native_3.9.9.bb
@@ -3,6 +3,5 @@
 # Released under the MIT license (see packages/COPYING)
 
 require mtools_${PV}.bb
-S="${WORKDIR}/mtools-${PV}"
 
 inherit autotools native
diff --git a/packages/mtools/mtools_3.9.9.bb b/packages/mtools/mtools_3.9.9.bb
index 7c872a144f..eca9909e8f 100644
--- a/packages/mtools/mtools_3.9.9.bb
+++ b/packages/mtools/mtools_3.9.9.bb
@@ -5,12 +5,15 @@
 DESCRIPTION="Mtools is a collection of utilities for accessing MS-DOS disks from Unix without mounting them."
 HOMEPAGE="http://mtools.linux.lu"
 LICENSE="GPL"
-PR = "r2"
+PR = "r4"
 
 SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \
 	file://mtools-makeinfo.patch;patch=1 \
-	file://mtools.patch;patch=1"
+	file://mtools.patch;patch=1 \
+	file://no-x11.patch;patch=1"
 
-#DEPENDS = "tetex-native"
+S = "${WORKDIR}/mtools-${PV}"
 
 inherit autotools
+
+EXTRA_OECONF = "--without-x"