xbmc: replace with non pvr version

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -19,13 +19,12 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="2e00d86"
+PKG_VERSION="aeb4dec"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
-#PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_URL="http://gujs.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/mediacenter/xbmc/build

@@ -152,8 +152,6 @@ cd $PKG_BUILD
 # adding fake Makefile for stripped skin
   mkdir -p addons/skin.confluence/media
   touch addons/skin.confluence/media/Makefile.in
-  mkdir -p addons/skin.touched/media
-  touch addons/skin.touched/media/Makefile.in
 
 # autoreconf
   do_autoreconf

packages/mediacenter/xbmc/meta

@@ -19,14 +19,13 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="2e00d86"
+PKG_VERSION="aeb4dec"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
-#PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_URL="http://gujs.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings xbmc-addon-xvdr "
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings"
 PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"

packages/mediacenter/xbmc/patches/xbmc-2e00d86-901-vdpau_fix_deinterlacing_if_flag_toggles.patch

@@ -1,40 +0,0 @@
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-index d4892b5..697431c 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-@@ -943,6 +943,7 @@ bool CVDPAU::ConfigVDPAU(AVCodecContext* avctx, int ref_frames)
- 
-   m_vdpauOutputMethod = OUTPUT_NONE;
- 
-+  m_binterlacedFrame = false;
-   return true;
- }
- 
-@@ -1203,8 +1204,14 @@ int CVDPAU::Decode(AVCodecContext *avctx, AVFrame *pFrame)
-         m_DVDVideoPics.pop();
-     }
- 
-+    if (!m_binterlacedFrame && m_DVDVideoPics.front().iFlags & DVP_FLAG_INTERLACED)
-+    {
-+      m_binterlacedFrame = m_DVDVideoPics.front().iFlags & DVP_FLAG_INTERLACED;
-+      CLog::Log(LOGNOTICE, "CVDPAU::ConfigOutputMethod: detected interlaced frame");
-+    }
-+
-     if (mode == VS_DEINTERLACEMODE_FORCE
--    || (mode == VS_DEINTERLACEMODE_AUTO && m_DVDVideoPics.front().iFlags & DVP_FLAG_INTERLACED))
-+    || (mode == VS_DEINTERLACEMODE_AUTO && m_binterlacedFrame))
-     {
-       if((method == VS_INTERLACEMETHOD_AUTO_ION
-       ||  method == VS_INTERLACEMETHOD_VDPAU_BOB
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-index 2056de1..fc1b9d0 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-@@ -209,6 +209,7 @@ public:
-   uint32_t max_references;
-   Display* m_Display;
-   bool     vdpauConfigured;
-+  bool     m_binterlacedFrame;
- 
- 
-   VdpVideoMixerPictureStructure m_mixerfield;