From 9e51c50eb4ec7b177cdde97f76b6c5dd0f1cf395 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 15 Aug 2010 23:59:28 +0200
Subject: [PATCH] xbmc-dharma: update to xbmc-dharma-32798

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/mediacenter/xbmc-dharma/build        |  2 +-
 packages/mediacenter/xbmc-dharma/meta         |  2 +-
 .../patches/203-xbmc-fix_ffmpeg_simd-0.1.diff | 23 -------------------
 3 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 packages/mediacenter/xbmc-dharma/patches/203-xbmc-fix_ffmpeg_simd-0.1.diff

diff --git a/packages/mediacenter/xbmc-dharma/build b/packages/mediacenter/xbmc-dharma/build
index eb62c960b5..4c2c2ec4b8 100755
--- a/packages/mediacenter/xbmc-dharma/build
+++ b/packages/mediacenter/xbmc-dharma/build
@@ -83,7 +83,7 @@ $AUTORECONF xbmc/lib/libid3tag/libid3tag
             $XBMC_CRYSTALHD \
             --disable-vdadecoder \
             --disable-profiling \
-              --enable-joystick \
+            --enable-joystick \
             --enable-xrandr \
             --disable-goom \
             --disable-xbmcprojectm \
diff --git a/packages/mediacenter/xbmc-dharma/meta b/packages/mediacenter/xbmc-dharma/meta
index 61596d5da2..4f5310cfa9 100644
--- a/packages/mediacenter/xbmc-dharma/meta
+++ b/packages/mediacenter/xbmc-dharma/meta
@@ -1,5 +1,5 @@
 PKG_NAME="xbmc-dharma"
-PKG_VERSION="32733"
+PKG_VERSION="32798"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc-dharma/patches/203-xbmc-fix_ffmpeg_simd-0.1.diff b/packages/mediacenter/xbmc-dharma/patches/203-xbmc-fix_ffmpeg_simd-0.1.diff
deleted file mode 100644
index 239d7f8574..0000000000
--- a/packages/mediacenter/xbmc-dharma/patches/203-xbmc-fix_ffmpeg_simd-0.1.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur xbmc-dharma-32669/configure.in xbmc-dharma-32669.patch/configure.in
---- xbmc-dharma-32669/configure.in	2010-08-10 14:23:07.000000000 +0200
-+++ xbmc-dharma-32669.patch/configure.in	2010-08-11 17:55:44.131212442 +0200
-@@ -1619,6 +1619,7 @@
-       --enable-libfaad \
-       --enable-protocol=http \
-       --enable-pthreads \
-+      --enable-runtime-cpudetect \
-       `case $host_cpu in powerpc*|arm*|amd64*|x86_64*|ia64*) echo --enable-pic ;; esac` \
-       --cc="$CC" &&
-       sed -i -e "s#define HAVE_SYMVER 1#define HAVE_SYMVER 0#" config.h &&
-diff -Naur xbmc-dharma-32669/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp xbmc-dharma-32669.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
---- xbmc-dharma-32669/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp	2010-08-10 14:25:06.000000000 +0200
-+++ xbmc-dharma-32669.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp	2010-08-11 17:57:03.591337432 +0200
-@@ -241,7 +241,7 @@
-   }
- 
-   // set acceleration
--  m_pCodecContext->dsp_mask = FF_MM_FORCE | FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE;
-+  m_pCodecContext->dsp_mask = 0;//FF_MM_FORCE | FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE;
- 
-   // advanced setting override for skip loop filter (see avcodec.h for valid options)
-   // TODO: allow per video setting?