Merge pull request #307 from aldrik/xbmc-update

alarm/xbmc-cubox-git: Update

alarm/xbmc-cubox-git/PKGBUILD

@@ -2,7 +2,7 @@
 buildarch=4
 
 pkgname="xbmc-cubox-git"
-pkgver=20121112
+pkgver=20121121
 pkgrel=1
 pkgdesc="A software media player and entertainment hub for digital media for the Cubox"
 arch=("armv7h")
@@ -27,12 +27,16 @@ provides=("xbmc" "xbmc-git")
 replaces=("marvell-xbmc-git")
 source=("https://dl.dropbox.com/u/38673799/XbmcCuBoxPatches-Rev10.tar.xz" \
 	"http://alunamation.com/archlinux/arm/AdditionalXbmcCuBoxPatches-Rev10.1.tar.xz" \
+	"big-buck-bunny-480p-fix.patch" \
+	"Xbmc-git-Python-2.7-2.patch" \
 	"xbmc.service" \
 	"xbmc.install")
 md5sums=("55813f68e1ab05405451f9791e59e68b" \
 	"966deb0b02155153d72445b461b3e952" \
-	"f5d227faaac16d08035e0dc849649cb5" \
-	"46db2069b75b23809bd7c760650618dd")
+	"f0a903ed4214654e9ca74f5095ee409e" \
+	"39be26ef917050873e0a98d53204f345" \
+	"6a64783fd2a21a593e091c5d328196eb" \
+	"ef0236567e95b462010a5607f76d2b45")
 install="xbmc.install"
 
 _gitroot="git://github.com/xbmc/xbmc.git"
@@ -40,7 +44,7 @@ _gitname="xbmc"
 
 _prefix=/usr
 _patches=(
-	"Xbmc-git-Python-2.7-2.patch" \
+#	"Xbmc-git-Python-2.7-2.patch" \
 	"Lircmap_xml.patch" \
 	"Xbmc-git-force-vdpau.patch" \
 	"Xbmc-git-force-vdpau-2.patch" \
@@ -133,7 +137,8 @@ build() {
 		patch -p1 -i "${srcdir}/XbmcCuBoxPatches-Rev10/${_patch}"
 	done
 
-	for _patch in "${srcdir}"/AdditionalXbmcCuBoxPatches-Rev10.1/*; do
+	for _patch in "${srcdir}"/AdditionalXbmcCuBoxPatches-Rev10.1/* \
+	"${srcdir}"/{big-buck-bunny-480p-fix.patch,Xbmc-git-Python-2.7-2.patch}; do
 		patch -p1 -i "${_patch}"
 	done
 

alarm/xbmc-cubox-git/Xbmc-git-Python-2.7-2.patch

@@ -0,0 +1,10 @@
+--- ./Makefile.include.in.orig	2012-11-21 17:42:18.390305179 +0100
++++ ./Makefile.include.in	2012-11-21 19:30:49.987504858 +0100
+@@ -32,6 +32,7 @@
+ CXXFLAGS+=@CXXFLAGS@
+ CFLAGS+=@CFLAGS@
+ LDFLAGS+=@LDFLAGS@
++INCLUDES+=-I/opt/python2.7/include
+ INCLUDES+=-I@abs_top_srcdir@/lib
+ INCLUDES+=-I@abs_top_srcdir@/xbmc
+ INCLUDES+=$(sort @INCLUDES@)

alarm/xbmc-cubox-git/big-buck-bunny-480p-fix.patch

@@ -0,0 +1,32 @@
+From a7ded663b5a89110a899e130d05364d86940790b Mon Sep 17 00:00:00 2001
+From: Aldrik Dunbar <aldrik@gmail.com>
+Date: Wed, 21 Nov 2012 17:47:46 +0100
+Subject: [PATCH] cubox : fix overlay issue with 480p videos (patch by Rabeeh
+ Khoury)
+
+---
+ xbmc/cores/VideoRenderers/LinuxRendererDoveOverlay.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/xbmc/cores/VideoRenderers/LinuxRendererDoveOverlay.cpp b/xbmc/cores/VideoRenderers/LinuxRendererDoveOverlay.cpp
+index c1fe0cf..ab96003 100644
+--- a/xbmc/cores/VideoRenderers/LinuxRendererDoveOverlay.cpp
++++ b/xbmc/cores/VideoRenderers/LinuxRendererDoveOverlay.cpp
+@@ -104,8 +104,14 @@ void CLinuxRendererDoveOverlay::ManageDisplayDove()
+ 
+   if (m_format == RENDER_FMT_UYVY422)
+   {
++    int delta;
+     m_overlaySurface.videoMode = DOVEFB_VMODE_YUV422PACKED_SWAPYUorV;
+     m_overlaySurface.viewPortInfo.ycPitch = (m_sourceRect.x2 - m_sourceRect.x1) * 2;
++    /* Align ycPitch to 16 pixels (32 bytes) since vmeta outputs in 16byte alignment per stride */
++    /* TODO check of decoded via vmeta or ffmpeg and change accordingly */
++    delta = m_overlaySurface.viewPortInfo.ycPitch % 32;
++    if (delta)
++      m_overlaySurface.viewPortInfo.ycPitch = m_overlaySurface.viewPortInfo.ycPitch - delta + 32;
+     m_overlaySurface.viewPortInfo.uvPitch = 0;
+   }
+   else if (m_format == RENDER_FMT_YUV420P)
+-- 
+1.8.0
+

alarm/xbmc-cubox-git/xbmc.install

@@ -2,7 +2,7 @@ post_install() {
   [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
   [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
   getent group xbmc > /dev/null || groupadd xbmc
-  getent passwd xbmc > /dev/null || useradd -d /var/empty -g xbmc xbmc
+  getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
   usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
 }
 

alarm/xbmc-cubox-git/xbmc.service

@@ -7,7 +7,7 @@ User = xbmc
 Group = xbmc
 Type = simple
 ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0
-Restart = on-failure
+Restart = always
 
 [Install]
 WantedBy = multi-user.target