From 91623605d89f5fc262c03d24c20ada23f841cb6d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Sat, 24 Apr 2010 23:17:18 +0200
Subject: [PATCH] xbmc: - update to xbmc-29490

---
 .../001-xbmc-fix_libcurl.so_detection.diff    | 12 +++
 ...ariable_GCC_instead_hardcoded_gcc-0.1.diff | 84 +++++++++++++++++++
 packages/mediacenter/xbmc/url                 |  2 +-
 3 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 packages/mediacenter/xbmc/patches/001-xbmc-fix_libcurl.so_detection.diff
 create mode 100644 packages/mediacenter/xbmc/patches/303-xbmc-use_variable_GCC_instead_hardcoded_gcc-0.1.diff

diff --git a/packages/mediacenter/xbmc/patches/001-xbmc-fix_libcurl.so_detection.diff b/packages/mediacenter/xbmc/patches/001-xbmc-fix_libcurl.so_detection.diff
new file mode 100644
index 0000000000..57772d9445
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/001-xbmc-fix_libcurl.so_detection.diff
@@ -0,0 +1,12 @@
+diff -Naur xbmc-29428/configure.in xbmc-29428.patch/configure.in
+--- xbmc-29428/configure.in	2010-04-22 00:56:44.000000000 +0200
++++ xbmc-29428.patch/configure.in	2010-04-22 19:06:31.906738563 +0200
+@@ -478,7 +478,7 @@
+                      while read output; do objdump -p $output | \
+                      grep SONAME | \
+                      awk 'BEGIN { FS = " " } ; { print $2 }'; done)
+-  if [ -z "$LIBCURL_BASENAME" ]; then
++  if [[ -z "$LIBCURL_BASENAME" ]]; then
+     echo "Unable to determine basename of libcurl library"
+   fi
+ 
diff --git a/packages/mediacenter/xbmc/patches/303-xbmc-use_variable_GCC_instead_hardcoded_gcc-0.1.diff b/packages/mediacenter/xbmc/patches/303-xbmc-use_variable_GCC_instead_hardcoded_gcc-0.1.diff
new file mode 100644
index 0000000000..182c72f5ed
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/303-xbmc-use_variable_GCC_instead_hardcoded_gcc-0.1.diff
@@ -0,0 +1,84 @@
+diff -Naur xbmc-29428/configure.in xbmc-29428.patch/configure.in
+--- xbmc-29428/configure.in	2010-04-22 00:56:44.000000000 +0200
++++ xbmc-29428.patch/configure.in	2010-04-22 02:22:21.771774020 +0200
+@@ -474,7 +474,7 @@
+ # check for library basenames
+ if test "$host_vendor" != "apple"; then
+   # libcurl
+-  LIBCURL_BASENAME=$(gcc $CFLAGS -print-file-name=libcurl.so | \
++  LIBCURL_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libcurl.so | \
+                      while read output; do objdump -p $output | \
+                      grep SONAME | \
+                      awk 'BEGIN { FS = " " } ; { print $2 }'; done)
+@@ -483,7 +483,7 @@
+   fi
+ 
+   # libFLAC
+-  LIBFLAC_BASENAME=$(gcc $CFLAGS -print-file-name=libFLAC.so | \
++  LIBFLAC_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libFLAC.so | \
+                      while read output; do objdump -p $output | \
+                      grep SONAME | \
+                      awk 'BEGIN { FS = " " } ; { print $2 }'; done)
+@@ -492,7 +492,7 @@
+   fi
+ 
+   # libvorbisfile
+-  LIBVORBISFILE_BASENAME=$(gcc $CFLAGS -print-file-name=libvorbisfile.so | \
++  LIBVORBISFILE_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libvorbisfile.so | \
+                      while read output; do objdump -p $output | \
+                      grep SONAME | \
+                      awk 'BEGIN { FS = " " } ; { print $2 }'; done)
+@@ -501,7 +501,7 @@
+   fi
+ 
+   # libmodplug
+-  LIBMODPLUG_BASENAME=$(gcc $CFLAGS -print-file-name=libmodplug.so | \
++  LIBMODPLUG_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libmodplug.so | \
+                      while read output; do objdump -p $output | \
+                      grep SONAME | \
+                      awk 'BEGIN { FS = " " } ; { print $2 }'; done)
+@@ -510,7 +510,7 @@
+   fi
+ 
+   # libfaad
+-  LIBFAAD_BASENAME=$(gcc $CFLAGS -print-file-name=libfaad.so | \
++  LIBFAAD_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libfaad.so | \
+                      while read output; do objdump -p $output | \
+                      grep SONAME | \
+                      awk 'BEGIN { FS = " " } ; { print $2 }'; done)
+@@ -519,7 +519,7 @@
+   fi
+ 
+   # libmad
+-  LIBMAD_BASENAME=$(gcc $CFLAGS -print-file-name=libmad.so | \
++  LIBMAD_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libmad.so | \
+                      while read output; do objdump -p $output | \
+                      grep SONAME | \
+                      awk 'BEGIN { FS = " " } ; { print $2 }'; done)
+@@ -528,7 +528,7 @@
+   fi
+ 
+   # libogg
+-  LIBOGG_BASENAME=$(gcc $CFLAGS -print-file-name=libogg.so | \
++  LIBOGG_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libogg.so | \
+                      while read output; do objdump -p $output | \
+                      grep SONAME | \
+                      awk 'BEGIN { FS = " " } ; { print $2 }'; done)
+@@ -537,7 +537,7 @@
+   fi
+ 
+   # libvorbisenc
+-  LIBVORBISENC_BASENAME=$(gcc $CFLAGS -print-file-name=libvorbisenc.so | \
++  LIBVORBISENC_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libvorbisenc.so | \
+                      while read output; do objdump -p $output | \
+                      grep SONAME | \
+                      awk 'BEGIN { FS = " " } ; { print $2 }'; done)
+@@ -546,7 +546,7 @@
+   fi
+ 
+   # libvorbis
+-  LIBVORBIS_BASENAME=$(gcc $CFLAGS -print-file-name=libvorbis.so | \
++  LIBVORBIS_BASENAME=$($ac_cv_prog_CC $CFLAGS -print-file-name=libvorbis.so | \
+                      while read output; do objdump -p $output | \
+                      grep SONAME | \
+                      awk 'BEGIN { FS = " " } ; { print $2 }'; done)
diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url
index 1b2ad8d941..f995ab9a88 100644
--- a/packages/mediacenter/xbmc/url
+++ b/packages/mediacenter/xbmc/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/xbmc-29203.tar.bz2
+http://sources.openelec.tv/svn/xbmc-29490.tar.bz2