xbmc-pvr: update to version pvr-ppa-odk42

packages/mediacenter/xbmc-pvr-theme-Confluence/meta

@@ -19,13 +19,13 @@
 ################################################################################
 
 PKG_NAME="xbmc-pvr-theme-Confluence"
-PKG_VERSION="615e173"
+PKG_VERSION="b485416"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
 #PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="http://gujs.openelec.tv/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://gujs.openelec.tv/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/mediacenter/xbmc-pvr/meta

@@ -19,15 +19,15 @@
 ################################################################################
 
 PKG_NAME="xbmc-pvr"
-PKG_VERSION="615e173"
+PKG_VERSION="b485416"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
 #PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="http://gujs.openelec.tv//$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 wavpack libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba alsa bc xbmc-addon-settings"
-PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 wavpack libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba"
+PKG_URL="http://gujs.openelec.tv//$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba alsa bc xbmc-addon-settings"
+PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXmu libXext libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="xbmc-pvr: XBMC Mediacenter"
@@ -83,4 +83,3 @@ fi
 # some python stuff needed for various addons
   PKG_DEPENDS="$PKG_DEPENDS Imaging"
   PKG_DEPENDS="$PKG_DEPENDS simplejson"
-

packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-b485416-013-reenable_lcd_config_settings-0.1.patch

@@ -0,0 +1,13 @@
+diff -Naur xbmc-eedceeb/xbmc/settings/GUISettings.cpp xbmc-eedceeb.patch/xbmc/settings/GUISettings.cpp
+--- xbmc-eedceeb/xbmc/settings/GUISettings.cpp	2011-06-18 21:30:30.000000000 +0200
++++ xbmc-eedceeb.patch/xbmc/settings/GUISettings.cpp	2011-06-18 22:02:53.535611620 +0200
+@@ -422,7 +422,8 @@
+   AddString(vs, "videoscreen.testpattern",226,"", BUTTON_CONTROL_STANDARD);
+ #endif
+ #if defined(_LINUX) && !defined(__APPLE__)
+-  AddBool(NULL, "videoscreen.haslcd", 4501, false);
++  AddSeparator(vs, "videoscreen.sep2");
++  AddBool(vs, "videoscreen.haslcd", 4501, false);
+ #endif
+ 
+   CSettingsCategory* ao = AddCategory(4, "audiooutput", 772);