merge of 'f8ad7a4bfb118867c5a5867eb5c4c2c2c74f8330'

     and 'f9d110b5aa39df7718381524083e62d3f8f7a5f0'

6 files changed, 106 insertions, 8 deletions

diff --git a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
index 4b5b3a408b..d6c43a3839 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
@@ -3,7 +3,7 @@
 QTE_VERSION ?= "2.3.10"
 PALMTOP_USE_MULTITHREADED_QT ?= "yes"
 
-OPIE_SRCDATE ?= "20080906"
+OPIE_SRCDATE ?= "20080914"
 OPIE_VERSION ?= "1.2.3+cvs${OPIE_SRCDATE}"
 OPIE_CVS_PV ?= "1.2.3+cvs${OPIE_SRCDATE}"
 
diff --git a/packages/id3lib/id3lib_3.8.3.bb b/packages/id3lib/id3lib_3.8.3.bb
index 76134bc6fd..fa6fc3c5bc 100644
--- a/packages/id3lib/id3lib_3.8.3.bb
+++ b/packages/id3lib/id3lib_3.8.3.bb
@@ -3,16 +3,14 @@ SECTION = "libs/multimedia"
 PRIORITY = "optional"
 DEPENDS = "zlib"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 inherit autotools
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz"
-S = "${WORKDIR}/id3lib-${PV}"
+SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz \
+           http://ftp.de.debian.org/debian/pool/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-7.2.diff.gz;patch=1 \
+          "
 
 do_stage() {
-	oe_libinstall -a -so -C src libid3 ${STAGING_LIBDIR}
-	install -m 0644 include/id3.h ${STAGING_INCDIR}
-	install -d ${STAGING_INCDIR}/id3/
-	install -m 0644 include/id3/*.h ${STAGING_INCDIR}/id3/
+	autotools_stage_all
 }
diff --git a/packages/mediatomb/files/.mtn2git_empty b/packages/mediatomb/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mediatomb/files/.mtn2git_empty
diff --git a/packages/mediatomb/files/curl.diff b/packages/mediatomb/files/curl.diff
new file mode 100644
index 0000000000..f34c9fc26e
--- /dev/null
+++ b/packages/mediatomb/files/curl.diff
@@ -0,0 +1,20 @@
+--- /tmp/url.cc	2008-09-14 20:40:33.000000000 +0200
++++ mediatomb-0.11.0/src/url.cc	2008-09-14 20:40:49.523198000 +0200
+@@ -24,7 +24,7 @@
+     version 2 along with MediaTomb; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+     
+-    $Id: url.cc 1714 2008-03-01 17:33:21Z lww $
++    $Id$
+ */
+ 
+ /// \file url.cc
+@@ -75,7 +75,7 @@
+ 
+     if (only_header)
+     {
+-        curl_easy_setopt(curl_handle, CURLOPT_NOBODY);
++        curl_easy_setopt(curl_handle, CURLOPT_NOBODY, 1);
+         curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl);
+         curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, 
+                          (void *)buffer.getPtr());
diff --git a/packages/mediatomb/files/inotify.diff b/packages/mediatomb/files/inotify.diff
new file mode 100644
index 0000000000..8c14fc99cc
--- /dev/null
+++ b/packages/mediatomb/files/inotify.diff
@@ -0,0 +1,45 @@
+--- /tmp/configure.ac	2008-09-14 20:31:20.000000000 +0200
++++ mediatomb-0.11.0/configure.ac	2008-09-14 20:32:23.043198000 +0200
+@@ -2888,41 +2888,7 @@
+     fi
+ fi
+ 
+-if test "x$INOTIFY_EN" != xno; then
+-dnl The check below was inspired by configure.ac from the inotify tools
+-dnl package, see the "Acknowledgements" section in our README file for more 
+-dnl information.
+-    CXXFLAGS="$CXXFLAGS $INOTIFY_CXXFLAGS"
+-    AC_MSG_CHECKING([whether sys/inotify.h works])
+-    AC_RUN_IFELSE(
+-        AC_LANG_PROGRAM([[#include <sys/inotify.h>]],
+-                         [[return (-1 == inotify_init());]]
+-                       ),
+-                [
+-                    AC_MSG_RESULT([yes]); 
+-                    AC_DEFINE([SYS_INOTIFY_H_OK],[1],[sys/inotify.h exists and works on this system])],
+-                [
+-                    AC_MSG_RESULT([no, using own inotify headers])
+-                    AC_MSG_CHECKING([whether inotify-nosys.h works on this system])
+-                    AC_RUN_IFELSE(
+-                        AC_LANG_PROGRAM([[#include "src/inotify-nosys.h"]],
+-                         [[return (-1 == inotify_init());]]
+-                        ),
+-                        [
+-                            AC_MSG_RESULT([yes]);
+-                            INOTIFY_OK=yes
+-                        ],
+-                        [
+-                            if test "x$INOTIFY_EN" != xyes; then
+-                                AC_MSG_RESULT([no, disabling inotify support])
+-                            else
+-                                AC_MSG_RESULT([no])
+-                            fi
+-                            INOTIFY_OK=missing
+-                        ])
+-
+-                ])
+-fi
++INOTIFY_OK=yes
+ 
+ if test "x$INOTIFY_OK" = xyes; then
+     AC_DEFINE([HAVE_INOTIFY], [1], [inotify presence])
diff --git a/packages/mediatomb/mediatomb_0.11.0.bb b/packages/mediatomb/mediatomb_0.11.0.bb
new file mode 100644
index 0000000000..f529a55065
--- /dev/null
+++ b/packages/mediatomb/mediatomb_0.11.0.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "MediaTomb - UPnP AV MediaServer for Linux"
+HOMEPAGE = "http://mediatomb.cc/"
+LICENSE = "GPLv2"
+DEPENDS = "expat ffmpeg sqlite3 libexif js zlib file id3lib"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/mediatomb/mediatomb-${PV}.tar.gz \
+           file://curl.diff;patch=1 \
+	   file://inotify.diff;patch=1 \
+	  "
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-mysql \
+                --disable-rpl-malloc \
+		--enable-sqlite3 \
+                --enable-libjs \
+		--enable-libmagic \
+		--enable-id3lib \
+		--enable-libexif \
+                --enable-db-autocreate \
+		--disable-largefile \
+                --with-sqlite3-h=${STAGING_INCDIR} \
+                --with-sqlite3-libs=${STAGING_LIBDIR} \
+                --with-magic-h=${STAGING_INCDIR} \
+                --with-magic-libs=${STAGING_LIBDIR} \
+                --with-exif-h=${STAGING_INCDIR} \
+                --with-exif-libs=${STAGING_LIBDIR} \
+                --with-zlib-h=${STAGING_INCDIR} \
+                --with-zlib-libs=${STAGING_LIBDIR} \
+                --with-js-h=${STAGING_INCDIR}/js \
+                --with-js-libs=${STAGING_LIBDIR} \
+                --with-id3lib-h=${STAGING_INCDIR} \
+                --with-id3lib-libs=${STAGING_LIBDIR} \
+		ac_cv_header_sys_inotify_h=yes"