Merge branch 'openelec-pvr' of git://github.com/Gujs/OpenELEC.tv into openelec-pvr

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

@@ -19,13 +19,13 @@
 ################################################################################
 
 PKG_NAME="xbmc-pvr-theme-Confluence"
-PKG_VERSION="60222aa"
+PKG_VERSION="5c6848a"
 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.xz"
+PKG_URL="http://gujs.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/mediacenter/xbmc-pvr/meta

@@ -19,13 +19,13 @@
 ################################################################################
 
 PKG_NAME="xbmc-pvr"
-PKG_VERSION="60222aa"
+PKG_VERSION="5c6848a"
 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.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 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"

packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-5c6848a-901-advancedsettings_alwaysextractflags.patch

@@ -6,7 +6,7 @@ diff -Naur xbmc-pvr-3513480/xbmc/settings/GUISettings.cpp xbmc-pvr-3513480.patch
    AddBool(NULL, "myvideos.treatstackasfile", 20051, true);
    AddBool(vid, "myvideos.extractflags",20433, true);
 +  AddBool(vid, "myvideos.alwaysextractflags",20433, false);
-   AddBool(vid, "myvideos.cleanstrings", 20418, false);
+   AddBool(vid, "myvideos.filemetadata", 20419, true);
    AddBool(NULL, "myvideos.extractthumb",20433, true);
  
 diff -Naur xbmc-pvr-3513480/xbmc/ThumbLoader.cpp xbmc-pvr-3513480.patch/xbmc/ThumbLoader.cpp