diff --git a/packages/mediacenter/xbmc-pvr-theme-Confluence/install b/packages/mediacenter/xbmc-pvr-theme-Confluence/install new file mode 100755 index 0000000000..3aff360e25 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr-theme-Confluence/install @@ -0,0 +1,26 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +mkdir -p $INSTALL/usr/share/xbmc/addons/skin.confluence + cp -R $PKG_BUILD/* $INSTALL/usr/share/xbmc/addons/skin.confluence diff --git a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta new file mode 100644 index 0000000000..4e3040a75b --- /dev/null +++ b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta @@ -0,0 +1,37 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="xbmc-theme-Confluence" +PKG_VERSION="2e00d86" +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="" +PKG_BUILD_DEPENDS="toolchain" +PKG_PRIORITY="optional" +PKG_SECTION="mediacenter" +PKG_SHORTDESC="xbmc-theme-Confluence: XBMC Mediacenter default theme" +PKG_LONGDESC="XBMC Media Center (which was formerly named Xbox Media Center) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/mediacenter/xbmc-pvr/build b/packages/mediacenter/xbmc-pvr/build new file mode 100755 index 0000000000..319ee97904 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/build @@ -0,0 +1,229 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +if [ "$XBMC_SCR_RSXS" = yes ]; then + XBMC_RSXS="--enable-rsxs" +else + XBMC_RSXS="--disable-rsxs" +fi + +if [ "$XBMC_VIS_PROJECTM" = yes ]; then + XBMC_PROJECTM="--enable-projectm" +else + XBMC_PROJECTM="--disable-projectm" +fi + +if [ "$XBMC_VIS_GOOM" = yes ]; then + XBMC_GOOM="--enable-goom" +else + XBMC_GOOM="--disable-goom" +fi + +if [ "$PULSEAUDIO_SUPPORT" = yes ]; then + XBMC_PULSEAUDIO="--enable-pulse" +else + XBMC_PULSEAUDIO="--disable-pulse" +fi + +if [ "$CEC_SUPPORT" = yes ]; then + XBMC_CEC="--enable-libcec --enable-external-libcec --enable-udev --disable-libusb" +else + XBMC_CEC="--disable-libcec --disable-udev --disable-libusb" +fi + +if [ "$NONFREE_SUPPORT" = yes ]; then + XBMC_NONFREE="--enable-non-free" +else + XBMC_NONFREE="--disable-non-free" +fi + +if [ "$AIRPLAY_SUPPORT" = yes ]; then + XBMC_AIRPLAY="--enable-airplay" +else + XBMC_AIRPLAY="--disable-airplay" +fi + +if [ "$AIRTUNES_SUPPORT" = yes ]; then + XBMC_AIRTUNES="--enable-airtunes" +else + XBMC_AIRTUNES="--disable-airtunes" +fi + +if [ "$DVDCSS_SUPPORT" = yes ]; then + XBMC_DVDCSS="--enable-dvdcss" +else + XBMC_DVDCSS="--disable-dvdcss" +fi + +if [ "$BLURAY_SUPPORT" = yes ]; then + XBMC_BLURAY="--enable-libbluray" +else + XBMC_BLURAY="--disable-libbluray" +fi + +if [ "$AVAHI_DAEMON" = yes ]; then + XBMC_AVAHI="--enable-avahi" +else + XBMC_AVAHI="--disable-avahi" +fi + +if [ "$NFS_SUPPORT" = yes ]; then + XBMC_NFS="--enable-nfs" +else + XBMC_NFS="--disable-nfs" +fi + +if [ "$AFP_SUPPORT" = yes ]; then + XBMC_AFP="--enable-afpclient" +else + XBMC_AFP="--disable-afpclient" +fi + +if [ "$SAMBA_CLIENT" = yes ]; then + XBMC_SAMBA="--enable-samba" +else + XBMC_SAMBA="--disable-samba" +fi + +if [ "$WEBSERVER" = yes ]; then + XBMC_WEBSERVER="--enable-webserver" +else + XBMC_WEBSERVER="--disable-webserver" +fi + +if [ "$VDPAU" = yes ]; then + XBMC_VDPAU="--enable-vdpau" +else + XBMC_VDPAU="--disable-vdpau" +fi + +if [ "$VAAPI" = yes ]; then + XBMC_VAAPI="--enable-vaapi" +else + XBMC_VAAPI="--disable-vaapi" +fi + +if [ "$CRYSTALHD" = yes ]; then + XBMC_CRYSTALHD="--enable-crystalhd" +else + XBMC_CRYSTALHD="--disable-crystalhd" +fi + +# xbmc (ffmpeg) fails to build with LTO optimization + strip_lto + strip_gold + +# dont use some optimizations because of problems +# this fixes problems with faac implementation of ffmpeg + LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` + + export PYTHON_VERSION="2.7" + export PYTHON_CPPFLAGS="-I$SYSROOT_PREFIX/usr/include/python$PYTHON_VERSION" + export PYTHON_LDFLAGS="-L$SYSROOT_PREFIX/usr/lib/python$PYTHON_VERSION -lpython$PYTHON_VERSION" + export PYTHON_SITE_PKG="$SYSROOT_PREFIX/usr/lib/python$PYTHON_VERSION/site-packages" + export ac_python_version="$PYTHON_VERSION" + +# setup skin dir from default skin + SKIN_DIR="skin.`tolower $SKIN_DEFAULT`" + +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 + do_autoreconf lib/libid3tag/libid3tag + do_autoreconf xbmc/screensavers/rsxs-0.9 + do_autoreconf xbmc/visualizations/Goom/goom2k4-0 + do_autoreconf lib/libapetag + do_autoreconf lib/cpluff + # order matters with libdvd and friends + [ -d lib/libdvd/libdvdcss ] && do_autoreconf lib/libdvd/libdvdcss + do_autoreconf lib/libdvd/libdvdread + do_autoreconf lib/libdvd/libdvdnav + +# Clean the generated files + find . -depth -type d -name "autom4te.cache" -exec rm -rf {} \; + +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --with-arch=$TARGET_ARCH \ + --with-cpu=$TARGET_CPU \ + --prefix=/usr \ + --exec-prefix=/usr \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + GIT_REV=`cat git.version` \ + --disable-debug \ + --disable-optimizations \ + --enable-gl \ + --disable-gles \ + $XBMC_VDPAU \ + $XBMC_VAAPI \ + $XBMC_CRYSTALHD \ + --disable-vdadecoder \ + --disable-vtbdecoder \ + --disable-openmax \ + --disable-tegra \ + --disable-profiling \ + --enable-joystick \ + $XBMC_CEC \ + $XBMC_GOOM \ + $XBMC_RSXS \ + $XBMC_PROJECTM \ + --enable-x11 \ + --enable-xrandr \ + --disable-ccache \ + $XBMC_PULSEAUDIO \ + --enable-rtmp \ + $XBMC_SAMBA \ + $XBMC_NFS \ + $XBMC_AFP \ + --enable-ffmpeg-libvorbis \ + --enable-lame \ + $XBMC_DVDCSS \ + --disable-mid \ + --disable-hal \ + $XBMC_AVAHI \ + $XBMC_AIRPLAY \ + $XBMC_AIRTUNES \ + $XBMC_NONFREE \ + --disable-asap-codec \ + $XBMC_WEBSERVER \ + --enable-optical-drive \ + $XBMC_BLURAY \ + --enable-texturepacker \ + --disable-external-libraries \ + --disable-external-ffmpeg \ + +# setup default skin inside the sources + sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/settings/Settings.h + +make externals +make xbmc.bin +make xbmc-xrandr diff --git a/packages/mediacenter/xbmc-pvr/config/advancedsettings.xml b/packages/mediacenter/xbmc-pvr/config/advancedsettings.xml new file mode 100644 index 0000000000..c6f22f0a3a --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/config/advancedsettings.xml @@ -0,0 +1,10 @@ + + + false + false + cputemp + gputemp + + 30 + + diff --git a/packages/mediacenter/xbmc-pvr/config/os.openelec.tv/addon.xml b/packages/mediacenter/xbmc-pvr/config/os.openelec.tv/addon.xml new file mode 100644 index 0000000000..f786fbfc1d --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/config/os.openelec.tv/addon.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/packages/mediacenter/xbmc-pvr/config/repository.openelec.tv/addon.xml b/packages/mediacenter/xbmc-pvr/config/repository.openelec.tv/addon.xml new file mode 100644 index 0000000000..7ebb2ad74b --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/config/repository.openelec.tv/addon.xml @@ -0,0 +1,17 @@ + + + + @ADDON_URL@/addons.xml + @ADDON_URL@/addons.xml.md5 + @ADDON_URL@ + + + Install Add-ons, Plugins, Games and Programs from OpenELEC.tv + Download and install Add-ons, Plugins, Games and Programs from the Official OpenELEC.tv addon repository.[CR] By using the official Repository you will be able to take advantage of our extensive file mirror service to help get you faster downloads from a region close to you.[CR] All addons on this repository have under gone basic testing, if you find a broken or not working addon please report it to OpenELEC.tv so we can take any action needed. + all + + diff --git a/packages/mediacenter/xbmc-pvr/fonts/DejaVuSans.ttf b/packages/mediacenter/xbmc-pvr/fonts/DejaVuSans.ttf new file mode 100644 index 0000000000..84ca1d7503 Binary files /dev/null and b/packages/mediacenter/xbmc-pvr/fonts/DejaVuSans.ttf differ diff --git a/packages/mediacenter/xbmc-pvr/fonts/Trebuchet MS Bold.ttf b/packages/mediacenter/xbmc-pvr/fonts/Trebuchet MS Bold.ttf new file mode 100644 index 0000000000..867f56d776 Binary files /dev/null and b/packages/mediacenter/xbmc-pvr/fonts/Trebuchet MS Bold.ttf differ diff --git a/packages/mediacenter/xbmc-pvr/fonts/YanoneKaffeesatz-Bold.ttf b/packages/mediacenter/xbmc-pvr/fonts/YanoneKaffeesatz-Bold.ttf new file mode 100644 index 0000000000..e9964b0809 Binary files /dev/null and b/packages/mediacenter/xbmc-pvr/fonts/YanoneKaffeesatz-Bold.ttf differ diff --git a/packages/mediacenter/xbmc-pvr/init.d/92_setup-xbmc b/packages/mediacenter/xbmc-pvr/init.d/92_setup-xbmc new file mode 100644 index 0000000000..dc1ce42edb --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/init.d/92_setup-xbmc @@ -0,0 +1,118 @@ +################################################################################ +# Copyright (C) 2009-2010 OpenELEC.tv +# http://www.openelec.tv +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +# setup XBMC +# +# runlevels: openelec + +progress "setup XBMC" + +# +# clean temp dir +# + rm -rf $HOME/.xbmc/temp/* + +# +# add some default settings +# + mkdir -p $HOME/.xbmc/userdata + +# +# setup directories for XBMC sources +# + + [ ! -d "$HOME/music" ] && mkdir -p $HOME/music + [ ! -d "$HOME/pictures" ] && mkdir -p $HOME/pictures + [ ! -d "$HOME/tvshows" ] && mkdir -p $HOME/tvshows + [ ! -d "$HOME/videos" ] && mkdir -p $HOME/videos + + mkdir -p $HOME/.xbmc/userdata + + if [ ! -f $HOME/.xbmc/userdata/sources.xml ] ; then + cat > $HOME/.xbmc/userdata/sources.xml << EOF + + + + + + Music + $HOME/music/ + + + + + + Pictures + $HOME/pictures/ + + + +EOF + fi + +# +# common setup guisettings +# + + mkdir -p $HOME/.xbmc/userdata + + [ ! -d "$HOME/screenshots" ] && mkdir -p $HOME/screenshots + + if [ ! -f $HOME/.xbmc/userdata/guisettings.xml ] ; then + echo "" > $HOME/.xbmc/userdata/guisettings.xml + + cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF + + $HOME/screenshots/ + +EOF + +# +# include project specific options +# + + if [ -f /usr/share/xbmc/config/guisettings.xml ]; then + cat /usr/share/xbmc/config/guisettings.xml >> $HOME/.xbmc/userdata/guisettings.xml + fi + +# +# common setup for amd and nvidia graphic +# + + # Always sync to vblank + if [ "$GPUTYPE" = "NVIDIA" -o "$GPUTYPE" = "AMD" ] ; then + cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF + + 2 + +EOF + fi + echo "" >> $HOME/.xbmc/userdata/guisettings.xml + fi diff --git a/packages/mediacenter/xbmc-pvr/init.d/93_xbmc b/packages/mediacenter/xbmc-pvr/init.d/93_xbmc new file mode 100644 index 0000000000..c50c56068e --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/init.d/93_xbmc @@ -0,0 +1,97 @@ +################################################################################ +# Copyright (C) 2009-2010 OpenELEC.tv +# http://www.openelec.tv +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +# starting XBMC +# +# runlevels: openelec + +LIRCDEV="/var/run/lirc/lircd" +[ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans" +XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV" + +progress "starting XBMC" + +# hack for Boxee Remote +if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then + export SDL_MOUSE_RELATIVE=0 +fi + +# hack: make addon-bins executable + chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1 + +# hack to support user installed fonts + SUBFONTS="/storage/.xbmc/userdata/fonts" + if [ -d "$SUBFONTS" ]; then + files=$(ls $SUBFONTS/*.[tT][tT][fF] 2>/dev/null | wc -l) + if [ "$files" = "0" ]; then + cp /usr/share/xbmc/media/Fonts/*.[tT][tT][fF] $SUBFONTS/ + fi + mount --bind $SUBFONTS /usr/share/xbmc/media/Fonts/ + fi + +# starting autostart script (will be removed later again, dont use it!!!) + AUTOSTART="/storage/.config/autostart.sh" + if [ -f $AUTOSTART ]; then + echo "!!! AUTOSTART script detected !!!" >> /var/log/messages + cat "$AUTOSTART" >> /var/log/messages + echo "!!! -End of autostart script- !!!" >> /var/log/messages + + sh $AUTOSTART + fi + +# starting autoupdate + [ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate & + +# waiting for Xorg to start + wait_for_xorg + +# set cpu's to 'on demand' + ( usleep 15000000 + progress "set cpu's to 'on demand'" + cpupower frequency-set -g ondemand > /dev/null 2>&1 + )& + +# starting XBMC + while true; do + + DISPLAY=:0.0 /usr/lib/xbmc/xbmc.bin $XBMC_ARGS > /dev/null 2>&1 + RET=$? + + case "$RET" in + 0) + poweroff -f + ;; + 64) + poweroff -f + ;; + 66) + reboot + ;; + 255) + echo "Abnormal Exit. Exited with code $RET" + echo "is Xorg running? check /var/log/Xorg.log" + ;; + *) + echo "Abnormal Exit. Exited with code $RET" + ;; + esac + + usleep 250000 + done diff --git a/packages/mediacenter/xbmc-pvr/install b/packages/mediacenter/xbmc-pvr/install new file mode 100755 index 0000000000..dd85f76fee --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/install @@ -0,0 +1,101 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +PYTHON_LIBDIR="`ls -d $INSTALL/usr/lib/python*`" + +mkdir -p $INSTALL/usr/bin + cp $PKG_DIR/scripts/cputemp $INSTALL/usr/bin + cp $PKG_DIR/scripts/gputemp $INSTALL/usr/bin + cp $PKG_BUILD/tools/EventClients/Clients/XBMC\ Send/xbmc-send.py $INSTALL/usr/bin/xbmc-send + +mkdir -p $INSTALL/usr/lib/xbmc + cp $PKG_BUILD/xbmc.bin $INSTALL/usr/lib/xbmc + cp $PKG_BUILD/xbmc-xrandr $INSTALL/usr/lib/xbmc + +cd $PKG_BUILD + find system addons \ + -regextype posix-extended -type f \ + -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" \ + -iregex ".*-linux.*|.*\.vis|.*\.xbs" \ + -exec install -D "{}" $ROOT/$INSTALL/usr/lib/xbmc/"{}" ";" + + find addons language media sounds userdata system \ + -regextype posix-extended -type f \ + -not -iregex ".*-linux.*|.*\.vis|.*\.xbs|.*svn.*|.*\.orig|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" \ + -exec install -D -m 0644 "{}" $ROOT/$INSTALL/usr/share/xbmc/"{}" ";" +cd - + +if [ ! "$XBMC_SCR_RSXS" = yes ]; then + rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/screensaver.rsxs.* +fi + +if [ ! "$XBMC_VIS_PROJECTM" = yes ]; then + rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.projectm +fi + +rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.dxspectrum +rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.itunes +rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.milkdrop + +# overriding Splash image +mkdir -p $INSTALL/usr/share/xbmc/media + rm -rf $INSTALL/usr/share/xbmc/media/Splash.png +# if [ -f $PROJECT_DIR/$PROJECT/splash/splash.png ]; then +# cp $PROJECT_DIR/$PROJECT/splash/splash.png $INSTALL/usr/share/xbmc/media/Splash.png +# else +# cp $PKG_DIR/splash/splash.png $INSTALL/usr/share/xbmc/media/Splash.png +# fi + +# cleanup and python addon fixes + mkdir -p $INSTALL/usr/share/xbmc/addons/script.module.pil/lib + ln -s `ls -d $INSTALL/usr/lib/python*/site-packages | sed -e "s,$INSTALL,,"`/PIL \ + $INSTALL/usr/share/xbmc/addons/script.module.pil/lib/PIL + rm -rf $INSTALL/usr/share/xbmc/addons/script.module.pysqlite + +mkdir -p $INSTALL/usr/share/xbmc/system/ + cp $PKG_DIR/config/advancedsettings.xml $INSTALL/usr/share/xbmc/system/ + +mkdir -p $INSTALL/usr/share/xbmc/addons + cp -R $PKG_DIR/config/os.openelec.tv $INSTALL/usr/share/xbmc/addons + $SED "s|@ADDON_OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/xbmc/addons/os.openelec.tv/addon.xml + cp -R $PKG_DIR/config/repository.openelec.tv $INSTALL/usr/share/xbmc/addons + $SED "s|@ADDON_URL@|$ADDON_URL|g" -i $INSTALL/usr/share/xbmc/addons/repository.openelec.tv/addon.xml + +mkdir -p $PYTHON_LIBDIR/site-packages/xbmc + cp -R $PKG_BUILD/tools/EventClients/lib/python/* $PYTHON_LIBDIR/site-packages/xbmc + +# install powermanagement hooks + mkdir -p $INSTALL/etc/pm/sleep.d + cp $PKG_DIR/sleep.d/* $INSTALL/etc/pm/sleep.d + +# install project specific configs + if [ -f $PROJECT_DIR/$PROJECT/xbmc/*.xml ]; then + mkdir -p $INSTALL/usr/share/xbmc/config + cp -R $PROJECT_DIR/$PROJECT/xbmc/* $INSTALL/usr/share/xbmc/config + fi + +if [ "$XBMC_EXTRA_FONTS" = yes ]; then + mkdir -p $INSTALL/usr/share/xbmc/media/Fonts + cp $PKG_DIR/fonts/*.ttf $INSTALL/usr/share/xbmc/media/Fonts +fi diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta new file mode 100644 index 0000000000..0b5b0989d4 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/meta @@ -0,0 +1,129 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="xbmc" +PKG_VERSION="2e00d86" +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_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" +PKG_SHORTDESC="xbmc: XBMC Mediacenter" +PKG_LONGDESC="XBMC Media Center (which was formerly named Xbox Media Center) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" + +# for libX11 support + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext" + PKG_DEPENDS="$PKG_DEPENDS libX11 libXext" + +# for libXrandr support + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXrandr" + PKG_DEPENDS="$PKG_DEPENDS libXrandr" + +# for dbus support + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS dbus" + PKG_DEPENDS="$PKG_DEPENDS dbus" + +if [ "$PULSEAUDIO_SUPPORT" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS pulseaudio" + PKG_DEPENDS="$PKG_DEPENDS pulseaudio" +fi + +if [ "$CEC_SUPPORT" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libcec" + PKG_DEPENDS="$PKG_DEPENDS libcec" +fi + +if [ "$XBMC_SCR_RSXS" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXt libXmu" + PKG_DEPENDS="$PKG_DEPENDS libXt libXmu" +fi + +if [ "$FAAC_SUPPORT" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS faac" + PKG_DEPENDS="$PKG_DEPENDS faac" +fi + +if [ "$BLURAY_SUPPORT" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libbluray" + PKG_DEPENDS="$PKG_DEPENDS libbluray" +fi + +if [ "$AVAHI_DAEMON" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS avahi" + PKG_DEPENDS="$PKG_DEPENDS avahi" +fi + +if [ "$AIRPLAY_SUPPORT" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libplist" + PKG_DEPENDS="$PKG_DEPENDS libplist" +fi + +if [ "$AIRTUNES_SUPPORT" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libshairport" + PKG_DEPENDS="$PKG_DEPENDS libshairport" +fi + +if [ "$NFS_SUPPORT" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libnfs" + PKG_DEPENDS="$PKG_DEPENDS libnfs" +fi + +if [ "$AFP_SUPPORT" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS afpfs-ng" + PKG_DEPENDS="$PKG_DEPENDS afpfs-ng" +fi + +if [ "$SAMBA_CLIENT" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS samba" + PKG_DEPENDS="$PKG_DEPENDS samba" +fi + +if [ "$WEBSERVER" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libmicrohttpd" + PKG_DEPENDS="$PKG_DEPENDS libmicrohttpd" +fi + +if [ "$VDPAU" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau" + PKG_DEPENDS="$PKG_DEPENDS libvdpau" +fi + +if [ "$VAAPI" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libva" + PKG_DEPENDS="$PKG_DEPENDS libva" +fi + +if [ "$CRYSTALHD" = yes ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS crystalhd" + PKG_DEPENDS="$PKG_DEPENDS crystalhd" +fi + +# some python stuff needed for various addons + PKG_DEPENDS="$PKG_DEPENDS Imaging" + PKG_DEPENDS="$PKG_DEPENDS simplejson" + diff --git a/packages/mediacenter/xbmc-pvr/patches/rename.sh b/packages/mediacenter/xbmc-pvr/patches/rename.sh new file mode 100755 index 0000000000..64715435df --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/rename.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + + +for i in `ls xbmc-*.patch`; do + mv $i `echo $i | sed "s,$1,$2,g"` +done diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-001-add_support_to_specify_GIT_REV-0.1.patch new file mode 100644 index 0000000000..c013e0ae3a --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-001-add_support_to_specify_GIT_REV-0.1.patch @@ -0,0 +1,39 @@ +diff -Naur xbmc-9389dc8/configure.in xbmc-9389dc8.patch/configure.in +--- xbmc-9389dc8/configure.in 2011-09-01 17:21:47.000000000 +0200 ++++ xbmc-9389dc8.patch/configure.in 2011-09-01 23:30:40.419399392 +0200 +@@ -428,6 +428,14 @@ + esac + AC_SUBST([ARCH]) + ++AC_CHECK_PROG(HAVE_GIT,git,"yes","no",) ++if test "$HAVE_GIT" = "yes" -a "$GIT_REV" = ""; then ++ GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}') ++elif test "$GIT_REV" = ""; then ++ GIT_REV="Unknown" ++fi ++final_message="$final_message\n git Rev.:\t${GIT_REV}" ++ + # platform debug flags + if test "$use_debug" = "yes"; then + final_message="$final_message\n Debugging:\tYes" +@@ -1177,7 +1185,6 @@ + fi + fi + +-AC_CHECK_PROG(HAVE_GIT,git,"yes","no",) + + # Checks for header files. + AC_HEADER_DIRENT +@@ -1408,12 +1415,6 @@ + final_message="$final_message\n Avahi:\tNo" + fi + +-if test "$HAVE_GIT" = "yes"; then +- GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}') +-fi +-if test "$GIT_REV" = ""; then +- GIT_REV="Unknown" +-fi + if test "$host_vendor" = "apple"; then + echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h + else diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-013-reenable_lcd_config_settings-0.1.patch new file mode 100644 index 0000000000..656dcac934 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-013-reenable_lcd_config_settings-0.1.patch @@ -0,0 +1,13 @@ +diff -Naur xbmc-9389dc8/xbmc/settings/GUISettings.cpp xbmc-9389dc8.patch/xbmc/settings/GUISettings.cpp +--- xbmc-9389dc8/xbmc/settings/GUISettings.cpp 2011-09-01 23:34:05.267139356 +0200 ++++ xbmc-9389dc8.patch/xbmc/settings/GUISettings.cpp 2011-09-01 23:34:52.098765331 +0200 +@@ -423,7 +423,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); diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-303-fix_libdvd_xFLAGS-0.1.patch new file mode 100644 index 0000000000..5e76acefe4 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-303-fix_libdvd_xFLAGS-0.1.patch @@ -0,0 +1,119 @@ +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdcss/src/libdvdcss.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdcss/src/libdvdcss.pc.in +--- xbmc-pvr-3513480/lib/libdvd/libdvdcss/src/libdvdcss.pc.in 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdcss/src/libdvdcss.pc.in 2011-04-25 05:01:20.091837122 +0200 +@@ -6,5 +6,5 @@ + Name: libdvdcss + Description: DVD access and decryption library. + Version: @VERSION@ +-Libs: -L${libdir} -ldvdcss +-Cflags: -I{includedir} -I${includedir}/@PACKAGE@ ++Libs: -ldvdcss ++Cflags: -I. +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh +--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh 2011-04-25 05:01:20.549828701 +0200 +@@ -56,17 +56,17 @@ + fi + + if test "$echo_cflags" = "yes"; then +- echo -I$prefix/include $dvdread_cflags $extracflags $threadcflags ++ echo $dvdread_cflags $extracflags $threadcflags + fi + + if test "$echo_minicflags" = "yes"; then +- echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags ++ echo $extracflags $threadcflags + fi + + if test "$echo_libs" = "yes"; then +- echo -L$libdir -ldvdnav $dvdread_libs $threadlib ++ echo -ldvdnav $dvdread_libs $threadlib + fi + + if test "$echo_minilibs" = "yes"; then +- echo -L$libdir -ldvdnavmini $threadlib ++ echo -ldvdnavmini $threadlib + fi +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config.in +--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config.in 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config.in 2011-04-25 05:01:20.624827321 +0200 +@@ -76,13 +76,13 @@ + fi + + if test "$echo_cflags" = "yes"; then +- echo -I@includedir@ -I@includedir@/libdvdread @THREAD_CFLAGS@ ++ echo @THREAD_CFLAGS@ + fi + + if test "$echo_libs" = "yes"; then +- echo -L@libdir@ -ldvdnav -ldvdread @THREAD_LIBS@ ++ echo -ldvdnav -ldvdread @THREAD_LIBS@ + fi + + if test "$echo_minilibs" = "yes"; then +- echo -L@libdir@ -ldvdnavmini @THREAD_LIBS@ ++ echo -ldvdnavmini @THREAD_LIBS@ + fi +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in +--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2011-04-25 05:01:21.042819641 +0200 +@@ -7,5 +7,5 @@ + Description: DVD Navigation mini library + Version: @VERSION@ + +-Cflags: -I${includedir} @DVDREAD_CFLAGS@ @THREAD_CFLAGS@ +-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@ ++Cflags: @DVDREAD_CFLAGS@ @THREAD_CFLAGS@ ++Libs: -ldvdnav @THREAD_LIBS@ +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav.pc.in +--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav.pc.in 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav.pc.in 2011-04-25 05:01:21.262815601 +0200 +@@ -8,5 +8,5 @@ + Version: @VERSION@ + + Requires.private: dvdread >= 4.1.2 +-Cflags: -I${includedir} @THREAD_CFLAGS@ +-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@ ++Cflags: @THREAD_CFLAGS@ ++Libs: -ldvdnav @THREAD_LIBS@ +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.in +--- xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.in 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.in 2011-04-25 05:01:21.278815307 +0200 +@@ -72,9 +72,9 @@ + fi + + if test "$echo_cflags" = "yes"; then +- echo -I@includedir@ ++ echo "" + fi + + if test "$echo_libs" = "yes"; then +- echo -L@libdir@ -ldvdread ++ echo -ldvdread + fi +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.sh xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.sh +--- xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.sh 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.sh 2011-04-25 05:01:21.278815307 +0200 +@@ -48,9 +48,9 @@ + fi + + if test "$echo_cflags" = "yes"; then +- echo -I$prefix/include $extracflags ++ echo $extracflags + fi + + if test "$echo_libs" = "yes"; then +- echo -L$libdir $dvdreadlib ++ echo $dvdreadlib + fi +diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread.pc.in +--- xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread.pc.in 2011-04-25 02:36:42.000000000 +0200 ++++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread.pc.in 2011-04-25 05:01:21.279815289 +0200 +@@ -7,5 +7,5 @@ + Description: Low level DVD access library + Version: @VERSION@ + +-Cflags: -I${includedir} +-Libs: -L${libdir} -ldvdread ++Cflags: -I. ++Libs: -ldvdread diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-311-fix_rsxs_build-0.1.patch new file mode 100644 index 0000000000..fe0ee49cab --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-311-fix_rsxs_build-0.1.patch @@ -0,0 +1,12 @@ +diff -Naur xbmc-dab646e/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h xbmc-dab646e.patch/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h +--- xbmc-dab646e/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h 2011-09-27 15:56:19.000000000 +0200 ++++ xbmc-dab646e.patch/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h 2011-10-16 02:13:13.805433847 +0200 +@@ -17,7 +17,7 @@ + with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +-#if !_LIBC ++#if 0 + /* This code is written for inclusion in gnu-libc, and uses names in the + namespace reserved for libc. If we're not compiling in libc, define those + names to be the normal ones instead. */ diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-351-increase_YV12_buffers-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-351-increase_YV12_buffers-0.1.patch new file mode 100644 index 0000000000..bc842ab6d0 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-351-increase_YV12_buffers-0.1.patch @@ -0,0 +1,34 @@ +From 0c2185d62f858f7b41461b4141e731dc7ec01ca6 Mon Sep 17 00:00:00 2001 +From: FernetMenta +Date: Thu, 11 Aug 2011 18:35:18 +0200 +Subject: [PATCH] LinuxRendererGL: increase buffers to 3 + +--- + xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp +index 18c6da4..79a9d90 100644 +--- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp ++++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp +@@ -223,7 +223,7 @@ bool CLinuxRendererGL::ValidateRenderer() + + void CLinuxRendererGL::ManageTextures() + { +- m_NumYV12Buffers = 2; ++ m_NumYV12Buffers = 3; + //m_iYV12RenderBuffer = 0; + return; + } +@@ -720,7 +720,7 @@ unsigned int CLinuxRendererGL::PreInit() + m_resolution = RES_PAL_4x3; + + m_iYV12RenderBuffer = 0; +- m_NumYV12Buffers = 2; ++ m_NumYV12Buffers = 3; + + // setup the background colour + m_clearColour = (float)(g_advancedSettings.m_videoBlackBarColour & 0xff) / 0xff; +-- +1.7.5.4 + diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch new file mode 100644 index 0000000000..b7c38d53f1 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch @@ -0,0 +1,40 @@ +diff -Naur xbmc-4c32cde/xbmc/windowing/X11/WinSystemX11GL.cpp xbmc-4c32cde.patch/xbmc/windowing/X11/WinSystemX11GL.cpp +--- xbmc-4c32cde/xbmc/windowing/X11/WinSystemX11GL.cpp 2011-10-29 14:43:48.634117918 +0200 ++++ xbmc-4c32cde.patch/xbmc/windowing/X11/WinSystemX11GL.cpp 2011-10-29 14:45:56.207774711 +0200 +@@ -45,7 +45,27 @@ + { + CheckDisplayEvents(); + +- if(m_iVSyncMode == 3) ++ if(m_iVSyncMode == 2) ++ { ++ static unsigned int last = 0; ++ unsigned int now; ++ if(m_glXGetVideoSyncSGI(&now) != 0) ++ CLog::Log(LOGERROR, "%s - glXGetVideoSyncSGI - Failed to get current retrace count", __FUNCTION__); ++ ++ if (now == last) ++ { ++ if (m_glXWaitVideoSyncSGI(2, (last + 1) % 2, &now) != 0) ++ CLog::Log(LOGERROR, "%s - glXWaitVideoSyncSGI - Returned error", __FUNCTION__); ++ if(m_glXGetVideoSyncSGI(&now) != 0) ++ CLog::Log(LOGERROR, "%s - glXGetVideoSyncSGI - Failed to get current retrace count", __FUNCTION__); ++ last = now + 1; ++ } ++ else ++ last = now; ++ ++ glXSwapBuffers(m_dpy, m_glWindow); ++ } ++ else if(m_iVSyncMode == 3) + { + glFinish(); + unsigned int before = 0, after = 0; +@@ -238,7 +258,6 @@ + else + m_glXSwapIntervalMESA = NULL; + +- + return true; + } + diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch new file mode 100644 index 0000000000..a03fb50292 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch @@ -0,0 +1,27 @@ +From dff7d824c82f957e19ad56247134912d70862188 Mon Sep 17 00:00:00 2001 +From: FernetMenta +Date: Sun, 14 Aug 2011 11:21:32 +0200 +Subject: [PATCH] vaapi: increase number of video surface allocated + +--- + xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp +index bcc3fe1..326c390 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp +@@ -358,7 +358,9 @@ bool CDecoder::EnsureContext(AVCodecContext *avctx) + else + m_refs = 2; + } +- return EnsureSurfaces(avctx, m_refs + 3); ++ // number of reference + 3 renderbuffers + Holder ++ // an extra one should not harm ++ return EnsureSurfaces(avctx, m_refs + 5); + } + + bool CDecoder::EnsureSurfaces(AVCodecContext *avctx, unsigned n_surfaces_count) +-- +1.7.5.4 + diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-402-enable_yasm_in_ffmpeg-0.1.patch new file mode 100644 index 0000000000..b8f5b8afcf --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-402-enable_yasm_in_ffmpeg-0.1.patch @@ -0,0 +1,21 @@ +diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in +--- xbmc-pvr-3513480/configure.in 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/configure.in 2011-04-25 05:14:49.220848143 +0200 +@@ -885,6 +885,9 @@ + AC_MSG_NOTICE($external_ffmpeg_disabled) + USE_EXTERNAL_FFMPEG=0 + AC_DEFINE([PIX_FMT_VDPAU_MPEG4_IN_AVUTIL], [1], [Whether AVUtil defines PIX_FMT_VDPAU_MPEG4.]) ++ ++ # check for yasm ++ AC_CHECK_PROG(HAVE_YASM,yasm,"yes","no",) + fi + + # Python +@@ -1547,6 +1550,7 @@ + `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\ + `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\ + --target-os=$(tolower $(uname -s)) \ ++ `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \ + --disable-muxers \ + --enable-muxer=spdif \ + --enable-muxer=adts \ diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-404-add_lame_check-0.6.patch new file mode 100644 index 0000000000..a459219108 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-404-add_lame_check-0.6.patch @@ -0,0 +1,125 @@ +diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in +--- xbmc-pvr-3513480/configure.in 2011-04-25 05:46:35.000000000 +0200 ++++ xbmc-pvr-3513480.patch/configure.in 2011-04-25 05:50:02.982401390 +0200 +@@ -72,6 +72,8 @@ + rsxs_disabled="== RSXS disabled. ==" + pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" + pulse_disabled="== PulseAudio support manually disabled. ==" ++lame_not_found="== Could not find libmp3lame. LAME support disabled. ==" ++lame_disabled="== LAME support manually disabled. ==" + dvdcss_enabled="== DVDCSS support enabled. ==" + dvdcss_disabled="== DVDCSS support disabled. ==" + hal_not_found="== Could not find hal. HAL support disabled. ==" +@@ -244,6 +246,12 @@ + [use_ffmpeg_libvorbis=$enableval], + [use_ffmpeg_libvorbis=no]) + ++AC_ARG_ENABLE([lame], ++ [AS_HELP_STRING([--enable-lame], ++ [enable lame support (default is yes)])], ++ [use_lame=$enableval], ++ [use_lame=yes]) ++ + AC_ARG_ENABLE([dvdcss], + [AS_HELP_STRING([--enable-dvdcss], + [enable DVDCSS support (default is yes)])], +@@ -758,6 +766,20 @@ + USE_PULSE=0 + fi + ++# LAME ++if test "$use_lame" = "yes"; then ++ AC_CHECK_LIB([mp3lame], [main], ++ AC_DEFINE([HAVE_LIBMP3LAME], [1], [Define to 1 if you have the 'libmp3lame' library (-lmp3lame).]), ++ use_lame=no;AC_MSG_RESULT($lame_not_found)) ++else ++ AC_MSG_RESULT($lame_disabled) ++fi ++if test "$use_lame" = "yes"; then ++ AC_SUBST([HAVE_LIBMP3LAME], 1) ++else ++ AC_SUBST([HAVE_LIBMP3LAME], 0) ++fi ++ + # HAL + if test "$host_vendor" = "apple" ; then + use_hal="no" +@@ -1311,6 +1333,12 @@ + final_message="$final_message\n HAL Support:\tNo" + fi + ++if test "$use_lame" = "yes"; then ++ final_message="$final_message\n LAME:\t\tYes" ++else ++ final_message="$final_message\n LAME:\t\tNo" ++fi ++ + # DVDCSS + if test "$use_dvdcss" = "yes"; then + AC_MSG_NOTICE($dvdcss_enabled) +diff -Naur xbmc-pvr-3513480/configure.in.orig xbmc-pvr-3513480.patch/configure.in.orig +diff -Naur xbmc-pvr-3513480/Makefile.in.orig xbmc-pvr-3513480.patch/Makefile.in.orig +diff -Naur xbmc-pvr-3513480/xbmc/cdrip/CDDARipper.cpp xbmc-pvr-3513480.patch/xbmc/cdrip/CDDARipper.cpp +--- xbmc-pvr-3513480/xbmc/cdrip/CDDARipper.cpp 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/xbmc/cdrip/CDDARipper.cpp 2011-04-25 05:48:10.487548571 +0200 +@@ -27,7 +27,11 @@ + #include "CDDAReader.h" + #include "utils/StringUtils.h" + #include "Util.h" ++ ++#ifdef HAVE_LIBMP3LAME + #include "EncoderLame.h" ++#endif ++ + #include "EncoderWav.h" + #include "EncoderVorbis.h" + #include "EncoderFFmpeg.h" +@@ -78,9 +82,16 @@ + case CDDARIP_ENCODER_FLAC: + m_pEncoder = new CEncoderFlac(); + break; +- default: ++#ifdef HAVE_LIBMP3LAME ++ case CDDARIP_ENCODER_LAME: + m_pEncoder = new CEncoderLame(); + break; ++#else ++ default: ++ CLog::Log(LOGERROR,"invalid encoder selected"); ++ return false; ++ break; ++#endif + } + + // we have to set the tags before we init the Encoder +diff -Naur xbmc-pvr-3513480/xbmc/cdrip/Makefile.in xbmc-pvr-3513480.patch/xbmc/cdrip/Makefile.in +--- xbmc-pvr-3513480/xbmc/cdrip/Makefile.in 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/xbmc/cdrip/Makefile.in 2011-04-25 05:51:13.013064387 +0200 +@@ -3,10 +3,13 @@ + Encoder.cpp \ + EncoderFFmpeg.cpp \ + EncoderFlac.cpp \ +- EncoderLame.cpp \ + EncoderVorbis.cpp \ + EncoderWav.cpp \ + ++ifeq (@HAVE_LIBMP3LAME@,1) ++ SRCS+=EncoderLame.cpp ++endif ++ + LIB=cdrip.a + + include @abs_top_srcdir@/Makefile.include +diff -Naur xbmc-pvr-3513480/xbmc/settings/GUISettings.cpp xbmc-pvr-3513480.patch/xbmc/settings/GUISettings.cpp +--- xbmc-pvr-3513480/xbmc/settings/GUISettings.cpp 2011-04-25 05:47:12.000000000 +0200 ++++ xbmc-pvr-3513480.patch/xbmc/settings/GUISettings.cpp 2011-04-25 05:48:47.956833472 +0200 +@@ -324,7 +324,9 @@ + AddPath(acd,"audiocds.recordingpath",20000,"select writable folder",BUTTON_CONTROL_PATH_INPUT,false,657); + AddString(acd, "audiocds.trackpathformat", 13307, "%A - %B/[%N. ][%A - ]%T", EDIT_CONTROL_INPUT, false, 16016); + map encoders; ++#ifdef HAVE_LIBMP3LAME + encoders.insert(make_pair(34000,CDDARIP_ENCODER_LAME)); ++#endif + encoders.insert(make_pair(34001,CDDARIP_ENCODER_VORBIS)); + encoders.insert(make_pair(34002,CDDARIP_ENCODER_WAV)); + encoders.insert(make_pair(34005,CDDARIP_ENCODER_FLAC)); diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch new file mode 100644 index 0000000000..821c1cc7bd --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch @@ -0,0 +1,18 @@ +diff -Naur xbmc-a3c804b/xbmc/interfaces/python/XBPython.cpp xbmc-a3c804b.patch/xbmc/interfaces/python/XBPython.cpp +--- xbmc-a3c804b/xbmc/interfaces/python/XBPython.cpp 2011-08-17 23:40:00.000000000 +0200 ++++ xbmc-a3c804b.patch/xbmc/interfaces/python/XBPython.cpp 2011-08-18 03:50:49.652475572 +0200 +@@ -335,11 +335,9 @@ + // at http://docs.python.org/using/cmdline.html#environment-variables + + #if !defined(_WIN32) +- /* PYTHONOPTIMIZE is set off intentionally when using external Python. +- Reason for this is because we cannot be sure what version of Python +- was used to compile the various Python object files (i.e. .pyo, +- .pyc, etc.). */ +- // check if we are running as real xbmc.app or just binary ++ // Required for python to find optimized code (pyo) files ++ setenv("PYTHONOPTIMIZE", "1", 1); ++ // check if we are running as real xbmc.app or just binary + if (!CUtil::GetFrameworksPath(true).IsEmpty()) + { + // using external python, it's build looking for xxx/lib/python2.6 diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-452-change_lcd_content-0.1.patch new file mode 100644 index 0000000000..0427b534f9 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-452-change_lcd_content-0.1.patch @@ -0,0 +1,12 @@ +diff -Naur xbmc-pvr-3513480/userdata/LCD.xml xbmc-pvr-3513480.patch/userdata/LCD.xml +--- xbmc-pvr-3513480/userdata/LCD.xml 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/userdata/LCD.xml 2011-04-25 05:27:34.956125133 +0200 +@@ -21,7 +21,7 @@ + Freemem: $INFO[System.FreeMemory] + + +- XBMC running... ++ *** OpenELEC *** + $INFO[System.Time] $INFO[System.Date] + Freemem: $INFO[System.FreeMemory] + $INFO[System.ScreenWidth]x$INFO[System.ScreenHeight] $INFO[System.ScreenMode] diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-453-add_openelec.tv_RSS_news-0.1.patch new file mode 100644 index 0000000000..5b32c0cce7 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-453-add_openelec.tv_RSS_news-0.1.patch @@ -0,0 +1,11 @@ +diff -Naur xbmc-10.1-Dharma/userdata/RssFeeds.xml xbmc-10.1-Dharma.patch/userdata/RssFeeds.xml +--- xbmc-10.1-Dharma/userdata/RssFeeds.xml 2011-03-08 02:49:24.000000000 +0100 ++++ xbmc-10.1-Dharma.patch/userdata/RssFeeds.xml 2011-06-14 17:07:08.450880123 +0200 +@@ -3,6 +3,7 @@ + + + ++ http://openelec.tv/news?format=feed&type=rss + http://feeds.feedburner.com/xbmc + + diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-454-disable_backslash-0.1.patch new file mode 100644 index 0000000000..0888920258 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-454-disable_backslash-0.1.patch @@ -0,0 +1,12 @@ +diff -Naur xbmc-30a9070/system/keymaps/keyboard.xml xbmc-30a9070.patch/system/keymaps/keyboard.xml +--- xbmc-30a9070/system/keymaps/keyboard.xml 2011-07-28 06:20:13.000000000 +0200 ++++ xbmc-30a9070.patch/system/keymaps/keyboard.xml 2011-07-28 09:39:57.210973380 +0200 +@@ -90,7 +90,7 @@ + Number7 + Number8 + Number9 +- ToggleFullScreen ++ + FirstPage + LastPage + diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-457-fix_connection_check-0.1.patch new file mode 100644 index 0000000000..f4982ec635 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-457-fix_connection_check-0.1.patch @@ -0,0 +1,15 @@ +diff -Naur xbmc-10.1-Dharma/xbmc/FileSystem/FileCurl.cpp xbmc-10.1-Dharma.patch/xbmc/FileSystem/FileCurl.cpp +--- xbmc-10.1-Dharma/xbmc/filesystem/FileCurl.cpp 2011-03-08 02:49:14.000000000 +0100 ++++ xbmc-10.1-Dharma.patch/xbmc/filesystem/FileCurl.cpp 2011-10-17 19:21:04.180783870 +0200 +@@ -803,9 +803,9 @@ + // Detect whether we are "online" or not! Very simple and dirty! + bool CFileCurl::IsInternet(bool checkDNS /* = true */) + { +- CStdString strURL = "http://www.google.com"; ++ CStdString strURL = "http://www.openelec.tv"; + if (!checkDNS) +- strURL = "http://74.125.19.103"; // www.google.com ip ++ strURL = "http://212.101.13.10"; // www.openelec.tv ip + + bool found = Exists(strURL); + Close(); diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-462-add_remote_irtrans_mediacenter-0.1.patch new file mode 100644 index 0000000000..0edef5a7a5 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-462-add_remote_irtrans_mediacenter-0.1.patch @@ -0,0 +1,52 @@ +diff -Naur xbmc-pvr-3513480/system/Lircmap.xml xbmc-pvr-3513480.patch/system/Lircmap.xml +--- xbmc-pvr-3513480/system/Lircmap.xml 2011-04-25 02:36:33.000000000 +0200 ++++ xbmc-pvr-3513480.patch/system/Lircmap.xml 2011-04-25 05:31:39.632429078 +0200 +@@ -409,4 +409,48 @@ + KEY_YELLOW + KEY_BLUE + ++ ++ pause ++ stop ++ fwd ++ rew ++ left ++ right ++ up ++ down ++ ++ ch+ ++ ch- ++ back ++ clear ++ play ++ info ++ next ++ prev ++ teletext ++ ehome ++ rec ++ vol+ ++ vol- ++ mute ++ power ++ video ++ music ++ pictures ++ tv ++ 1 ++ 2 ++ 3 ++ 4 ++ 5 ++ 6 ++ 7 ++ 8 ++ 9 ++ 0 ++ red ++ green ++ yellow ++ blue ++ + diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-463-add_remote_devinput-0.1.patch new file mode 100644 index 0000000000..85d635b61b --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-463-add_remote_devinput-0.1.patch @@ -0,0 +1,71 @@ +diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lircmap.xml +--- xbmc-10.1-Dharma/system/Lircmap.xml 2011-06-18 01:43:43.132101246 +0200 ++++ xbmc-10.1-Dharma.patch/system/Lircmap.xml 2011-06-18 01:44:53.777025290 +0200 +@@ -365,7 +365,6 @@ + + + cx23885_remote +- devinput + KEY_LEFT + KEY_RIGHT + KEY_UP +@@ -452,4 +451,59 @@ + yellow + blue + ++ ++ ++ KEY_LEFT ++ KEY_RIGHT ++ KEY_UP ++ KEY_DOWN ++ ++ KEY_ENTER ++ KEY_DELETE ++ KEY_PROG1 ++ KEY_EXIT ++ KEY_RECORD ++ KEY_PLAY ++ KEY_PAUSE ++ KEY_STOP ++ KEY_FASTFORWARD ++ KEY_REWIND ++ KEY_VOLUMEUP ++ KEY_VOLUMEDOWN ++ KEY_CHANNELUP ++ KEY_CHANNELDOWN ++ KEY_NEXT ++ KEY_PREVIOUS ++ KEY_EPG ++ KEY_SUBTITLE ++ KEY_LANGUAGE ++ KEY_INFO ++ KEY_ZOOM ++ KEY_MUTE ++ KEY_POWER ++ KEY_EJECT ++ KEY_DVD ++ KEY_MENU ++ KEY_VIDEO ++ KEY_AUDIO ++ KEY_CAMERA ++ KEY_TUNER ++ KEY_TEXT ++ KEY_NUMERIC_1 ++ KEY_NUMERIC_2 ++ KEY_NUMERIC_3 ++ KEY_NUMERIC_4 ++ KEY_NUMERIC_5 ++ KEY_NUMERIC_6 ++ KEY_NUMERIC_7 ++ KEY_NUMERIC_8 ++ KEY_NUMERIC_9 ++ KEY_NUMERIC_0 ++ KEY_NUMERIC_STAR ++ KEY_NUMERIC_POUND ++ KEY_RED ++ KEY_GREEN ++ KEY_YELLOW ++ KEY_BLUE ++ + diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-464-add_eject_keymapping_for_lirc-0.1.patch new file mode 100644 index 0000000000..56c56016b5 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-464-add_eject_keymapping_for_lirc-0.1.patch @@ -0,0 +1,11 @@ +diff -Naur xbmc-10.1-Dharma/system/keymaps/remote.xml xbmc-10.1-Dharma.patch/system/keymaps/remote.xml +--- xbmc-10.1-Dharma/system/keymaps/remote.xml 2011-03-08 02:49:23.000000000 +0100 ++++ xbmc-10.1-Dharma.patch/system/keymaps/remote.xml 2011-06-18 01:48:26.887811969 +0200 +@@ -63,6 +63,7 @@ + VolumeDown + Mute + XBMC.ShutDown() ++ XBMC.EjectTray() + XBMC.ActivateWindow(MyVideos) + XBMC.ActivateWindow(MyMusic) + XBMC.ActivateWindow(MyPictures) diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-901-vdpau_fix_deinterlacing_if_flag_toggles.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-901-vdpau_fix_deinterlacing_if_flag_toggles.patch new file mode 100644 index 0000000000..83b3ba6054 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-2e00d86-901-vdpau_fix_deinterlacing_if_flag_toggles.patch @@ -0,0 +1,40 @@ +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; diff --git a/packages/mediacenter/xbmc-pvr/profile.d/xbmc.conf b/packages/mediacenter/xbmc-pvr/profile.d/xbmc.conf new file mode 100644 index 0000000000..0495a2733e --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/profile.d/xbmc.conf @@ -0,0 +1,37 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +#      Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ +# Mediacenter environment variables. +# +# This file contains non-OpenELEC evironment variables as well as OpenELEC +# evironment variables that are not user defined. +################################################################################ + +XBMC_HOME="/usr/share/xbmc" + +export XBMC_HOME + +GPUDEVICE=$(lspci -n | grep 0300) +GPUTYPE="OTHER" +[ "$(echo $GPUDEVICE | grep 8086)" ] && GPUTYPE="INTEL" # 8086 == INTEL +[ "$(echo $GPUDEVICE | grep 10de)" ] && GPUTYPE="NVIDIA" # 10de == NVIDIA +[ "$(echo $GPUDEVICE | grep 1002)" ] && GPUTYPE="AMD" # 1002 == AMD + +export GPUTYPE \ No newline at end of file diff --git a/packages/mediacenter/xbmc-pvr/scripts/cputemp b/packages/mediacenter/xbmc-pvr/scripts/cputemp new file mode 100755 index 0000000000..3c35564ed1 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/scripts/cputemp @@ -0,0 +1,51 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +# inspired by +# https://github.com/xtranophilist/gnome-shell-extension-cpu-temperature/blob/master/extension.js + +TEMP=0 + +if [ -f /sys/devices/platform/coretemp.0/temp1_input ]; then + # used with coretemp + TEMP=`cat /sys/devices/platform/coretemp.0/temp1_input` +elif [ -f /sys/devices/platform/coretemp.0/temp2_input ]; then + # used with coretemp + TEMP=`cat /sys/devices/platform/coretemp.0/temp2_input` +elif [ -f /sys/bus/acpi/devices/LNXTHERM\:00/thermal_zone/temp ]; then + # used on some intel systems + TEMP=`cat /sys/bus/acpi/devices/LNXTHERM\:00/thermal_zone/temp` +elif [ -f /sys/devices/virtual/thermal/thermal_zone0/temp ]; then + # used on some intel systems + TEMP=`cat /sys/devices/virtual/thermal/thermal_zone0/temp` +elif [ -f /sys/class/hwmon/hwmon0/temp1_input ]; then + # hwmon for new 2.6.39, 3.0 linux kernels + TEMP=`cat /sys/class/hwmon/hwmon0/temp1_input` +elif [ -f /sys/class/hwmon/hwmon0/device/temp1_input ]; then + # used on AMD systems + TEMP=`cat /sys/class/hwmon/hwmon0/device/temp1_input` +elif [ -f /sys/class/hwmon/hwmon0/device/temp2_input ]; then + # used on ION systems + TEMP=`cat /sys/class/hwmon/hwmon0/device/temp2_input` +fi + +echo "$(( $TEMP / 1000 )) C" diff --git a/packages/mediacenter/xbmc-pvr/scripts/gputemp b/packages/mediacenter/xbmc-pvr/scripts/gputemp new file mode 100755 index 0000000000..7767e885a9 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/scripts/gputemp @@ -0,0 +1,38 @@ +#!/bin/sh + +################################################################################ +# Copyright (C) 2009-2010 OpenELEC.tv +# http://www.openelec.tv +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +TEMP="0" + +if lspci -n | grep 0300 | grep -q 10de; then + [ -f /usr/bin/nvidia-smi ] && TEMP=`/usr/bin/nvidia-smi -q -x | grep 'gpu_temp' | awk '{ print $1 }' | sed 's,,,g'` +fi + +if lspci -n | grep 0300 | grep -q 1002; then + if [ -f /storage/.config/xorg.conf ]; then + XORG="/storage/.config/xorg.conf" + else + XORG="/etc/X11/xorg-fglrx.conf" + fi + [ -f /usr/bin/aticonfig ] && TEMP=`/usr/bin/aticonfig -i $XORG --od-gettemperature | grep Temperature | cut -f 2 -d "-" | cut -f 1 -d "." | sed -e "s, ,,"` +fi + +echo "${TEMP} C" diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/00_addon-sleep b/packages/mediacenter/xbmc-pvr/sleep.d/00_addon-sleep new file mode 100755 index 0000000000..0a9d84e0c4 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/sleep.d/00_addon-sleep @@ -0,0 +1,28 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. /etc/profile + +for script in $HOME/.xbmc/addons/*/sleep.d/*.power; do + progress "running addon sleep script $script ($1)..." + sh $script $1 +done diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/61_xbmc_lirc b/packages/mediacenter/xbmc-pvr/sleep.d/61_xbmc_lirc new file mode 100755 index 0000000000..6df3ad6b31 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/sleep.d/61_xbmc_lirc @@ -0,0 +1,34 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. /etc/profile + +case "$1" in + hibernate|suspend) + xbmc-send --host=127.0.0.1 -a "LIRC.Stop" + ;; + thaw|resume) + xbmc-send --host=127.0.0.1 -a "LIRC.Start" + ;; + *) exit $NA + ;; +esac diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/62_xbmc_lcd b/packages/mediacenter/xbmc-pvr/sleep.d/62_xbmc_lcd new file mode 100755 index 0000000000..7b93b3c3a3 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/sleep.d/62_xbmc_lcd @@ -0,0 +1,34 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. /etc/profile + +case "$1" in + hibernate|suspend) + xbmc-send --host=127.0.0.1 -a "LCD.Suspend" + ;; + thaw|resume) + xbmc-send --host=127.0.0.1 -a "LCD.Resume" + ;; + *) exit $NA + ;; +esac diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/99_reload_skin b/packages/mediacenter/xbmc-pvr/sleep.d/99_reload_skin new file mode 100755 index 0000000000..fd0a13ed3c --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/sleep.d/99_reload_skin @@ -0,0 +1,31 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. /etc/profile + +case "$1" in + thaw|resume) + xbmc-send --host=127.0.0.1 -a "ReloadSkin()" & + ;; + *) exit $NA + ;; +esac diff --git a/packages/mediacenter/xbmc-pvr/splash/splash.png b/packages/mediacenter/xbmc-pvr/splash/splash.png new file mode 100644 index 0000000000..6b2897b0a1 Binary files /dev/null and b/packages/mediacenter/xbmc-pvr/splash/splash.png differ diff --git a/packages/mediacenter/xbmc-pvr/splash/splash1.png b/packages/mediacenter/xbmc-pvr/splash/splash1.png new file mode 100644 index 0000000000..ac0aa0052f Binary files /dev/null and b/packages/mediacenter/xbmc-pvr/splash/splash1.png differ diff --git a/packages/mediacenter/xbmc-pvr/unpack b/packages/mediacenter/xbmc-pvr/unpack new file mode 100755 index 0000000000..04e7dbae71 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/unpack @@ -0,0 +1,30 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +echo "### Applying project based patches ###" + +for patch in `ls $PROJECT_DIR/$PROJECT/patches/$1`; do + cat $PROJECT_DIR/$PROJECT/patches/$1/$patch | patch -d \ + `echo $PKG_BUILD | cut -f1 -d\ ` -p1 +done