diff --git a/packages/mediacenter/xbmc-frodo/build b/packages/mediacenter/xbmc-frodo/build index 755c8f31d7..e36b24db7e 100755 --- a/packages/mediacenter/xbmc-frodo/build +++ b/packages/mediacenter/xbmc-frodo/build @@ -85,6 +85,9 @@ fi if [ "$CEC_SUPPORT" = yes ]; then XBMC_CEC="--enable-libcec" + if [ "$OPENMAX" = "bcm2835-driver" ]; then + XBMC_CEC="$XBMC_CEC --enable-rpi-cec-api" + fi else XBMC_CEC="--disable-libcec" fi @@ -172,6 +175,7 @@ if [ "$OPENMAX_SUPPORT" = yes ]; then XBMC_OPENMAX="--enable-openmax" if [ "$OPENMAX" = "bcm2835-driver" ]; then XBMC_PLATFORM_SUPPORT="--with-platform=raspberry-pi" + XBMC_PLAYER="--enable-player=omxplayer" CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/" CXXFLAGS="$CXXFLAGS -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/" fi @@ -298,6 +302,7 @@ cd $PKG_BUILD --disable-external-libraries \ --enable-external-ffmpeg \ $XBMC_PLATFORM_SUPPORT \ + $XBMC_PLAYER \ # setup default skin inside the sources sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/settings/Settings.h diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-601-dont_show_unneeded_sysinfo.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-c49247d-601-dont_show_unneeded_sysinfo.patch similarity index 100% rename from packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-601-dont_show_unneeded_sysinfo.patch rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-c49247d-601-dont_show_unneeded_sysinfo.patch diff --git a/packages/mediacenter/xbmc-rpi-theme-Confluence/build b/packages/mediacenter/xbmc-rpi-theme-Confluence/build deleted file mode 100755 index b35b583807..0000000000 --- a/packages/mediacenter/xbmc-rpi-theme-Confluence/build +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD -TexturePacker -input media/ \ - -output Textures.xbt \ - -dupecheck \ - -use_none diff --git a/packages/mediacenter/xbmc-rpi-theme-Confluence/install b/packages/mediacenter/xbmc-rpi-theme-Confluence/install deleted file mode 100755 index 9e1aeaacb8..0000000000 --- a/packages/mediacenter/xbmc-rpi-theme-Confluence/install +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, 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 - cp $PKG_BUILD/*.txt $INSTALL/usr/share/xbmc/addons/skin.confluence - cp $PKG_BUILD/*.xml $INSTALL/usr/share/xbmc/addons/skin.confluence - cp $PKG_BUILD/*.png $INSTALL/usr/share/xbmc/addons/skin.confluence - rm -rf $INSTALL/usr/share/xbmc/addons/skin.confluence/media - -mkdir -p $INSTALL/usr/share/xbmc/addons/skin.confluence/media - cp $PKG_BUILD/Textures.xbt $INSTALL/usr/share/xbmc/addons/skin.confluence/media diff --git a/packages/mediacenter/xbmc-rpi-theme-Confluence/meta b/packages/mediacenter/xbmc-rpi-theme-Confluence/meta deleted file mode 100644 index 97453fd805..0000000000 --- a/packages/mediacenter/xbmc-rpi-theme-Confluence/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="xbmc-rpi-theme-Confluence" -PKG_VERSION="efef226" -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_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-rpi/build b/packages/mediacenter/xbmc-rpi/build deleted file mode 100755 index a75bf405ef..0000000000 --- a/packages/mediacenter/xbmc-rpi/build +++ /dev/null @@ -1,313 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -if [ "$DISPLAYSERVER" = "xorg-server" ]; then - XBMC_XORG="--enable-x11 --enable-xrandr" -else - XBMC_XORG="--disable-x11 --disable-xrandr" -fi - -if [ "$OPENGL_SUPPORT" = yes ]; then - XBMC_OPENGL="--enable-gl" -else - XBMC_OPENGL="--disable-gl" -fi - -if [ "$OPENGLES_SUPPORT" = yes ]; then - XBMC_OPENGLES="--enable-gles" -else - XBMC_OPENGLES="--disable-gles" -fi - -if [ "$SDL_SUPPORT" = yes ]; then - XBMC_SDL="--enable-sdl" -else - XBMC_SDL="--disable-sdl" -fi - -if [ "$XBMC_SCR_RSXS" = yes ]; then - XBMC_RSXS="--enable-rsxs" - # fix build of RSXS Screensaver support if not using libiconv - if [ ! "$ICONV" = "libiconv" ]; then - export jm_cv_func_gettimeofday_clobber=no - fi -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 [ "$ALSA_SUPPORT" = yes ]; then - XBMC_ALSA="--enable-alsa" -else - XBMC_ALSA="--disable-alsa" -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" - if [ "$OPENMAX" = "bcm2835-driver" ]; then - XBMC_CEC="$XBMC_CEC --enable-rpi-cec-api" - fi -else - XBMC_CEC="--disable-libcec" -fi - -if [ "$JOYSTICK_SUPPORT" = yes ]; then - XBMC_JOYSTICK="--enable-joystick" -else - XBMC_JOYSTICK="--disable-joystick" -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 [ "$ENCODER_LAME" = yes ]; then - XBMC_LAMEENC="--enable-libmp3lame" -else - XBMC_LAMEENC="--disable-libmp3lame" -fi - -if [ "$ENCODER_VORBIS" = yes ]; then - XBMC_VORBISENC="--enable-libvorbisenc" -else - XBMC_VORBISENC="--disable-libvorbisenc" -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" - export LIBS="$LIBS -ltalloc -ltdb -lwbclient" -else - XBMC_SAMBA="--disable-samba" -fi - -if [ "$WEBSERVER" = yes ]; then - XBMC_WEBSERVER="--enable-webserver" -else - XBMC_WEBSERVER="--disable-webserver" -fi - -if [ "$OPENMAX_SUPPORT" = yes ]; then - XBMC_OPENMAX="--enable-openmax" - if [ "$OPENMAX" = "bcm2835-driver" ]; then - XBMC_PLATFORM_SUPPORT="--with-platform=raspberry-pi" - CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/" - CXXFLAGS="$CXXFLAGS -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/" - fi -else - XBMC_OPENMAX="--disable-openmax" -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 [ "$XVBA" = yes ]; then - XBMC_XVBA="--enable-xvba" -else - XBMC_XVBA="--disable-xvba" -fi - -if [ "$CRYSTALHD" = yes ]; then - XBMC_CRYSTALHD="--enable-crystalhd" -else - XBMC_CRYSTALHD="--disable-crystalhd" -fi - -# xbmc fails to build with LTO optimization - strip_lto - -# dont use some optimizations because of build problems - LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` - -# dont build parallel - MAKEFLAGS=-j1 - - 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 - -# 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 \ - $XBMC_OPENGL \ - $XBMC_OPENGLES \ - $XBMC_SDL \ - $XBMC_OPENMAX \ - $XBMC_VDPAU \ - $XBMC_VAAPI \ - $XBMC_CRYSTALHD \ - $XBMC_XVBA \ - --disable-vdadecoder \ - --disable-vtbdecoder \ - --disable-tegra \ - --disable-profiling \ - $XBMC_JOYSTICK \ - $XBMC_CEC \ - --enable-udev \ - --disable-libusb \ - $XBMC_GOOM \ - $XBMC_RSXS \ - $XBMC_PROJECTM \ - $XBMC_XORG \ - --disable-ccache \ - $XBMC_ALSA \ - $XBMC_PULSEAUDIO \ - --enable-rtmp \ - $XBMC_SAMBA \ - $XBMC_NFS \ - $XBMC_AFP \ - $XBMC_VORBISENC \ - --enable-ffmpeg-libvorbis \ - $XBMC_LAMEENC \ - $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 --with-texturepacker-root="$ROOT/$TOOLCHAIN" \ - --disable-external-libraries \ - --enable-external-ffmpeg \ - $XBMC_PLATFORM_SUPPORT \ - -# setup default skin inside the sources - sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/settings/Settings.h - -make externals -make xbmc.bin - -if [ "$DISPLAYSERVER" = "xorg-server" ]; then - make xbmc-xrandr -fi - -make -C tools/TexturePacker -cp -PR tools/TexturePacker/TexturePacker $ROOT/$TOOLCHAIN/bin diff --git a/packages/mediacenter/xbmc-rpi/config/advancedsettings.xml b/packages/mediacenter/xbmc-rpi/config/advancedsettings.xml deleted file mode 100644 index c6f22f0a3a..0000000000 --- a/packages/mediacenter/xbmc-rpi/config/advancedsettings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - false - false - cputemp - gputemp - - 30 - - diff --git a/packages/mediacenter/xbmc-rpi/config/os.openelec.tv/addon.xml b/packages/mediacenter/xbmc-rpi/config/os.openelec.tv/addon.xml deleted file mode 100644 index b1ed65be99..0000000000 --- a/packages/mediacenter/xbmc-rpi/config/os.openelec.tv/addon.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/packages/mediacenter/xbmc-rpi/config/repository.openelec.tv/addon.xml b/packages/mediacenter/xbmc-rpi/config/repository.openelec.tv/addon.xml deleted file mode 100644 index d715467e85..0000000000 --- a/packages/mediacenter/xbmc-rpi/config/repository.openelec.tv/addon.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - @ADDON_URL@/addons.xml - @ADDON_URL@/addons.xml.md5 - @ADDON_URL@ - - - Install Add-ons, Plugins, Games and Programs from [COLOR FF757677]Open[/COLOR][COLOR FF8ABEE2]ELEC[/COLOR] - Download and install Add-ons, Plugins, Games and Programs from the Official [COLOR FF757677]Open[/COLOR][COLOR FF8ABEE2]ELEC[/COLOR] 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 [COLOR FF757677]Open[/COLOR][COLOR FF8ABEE2]ELEC[/COLOR] so we can take any action needed. - all - - diff --git a/packages/mediacenter/xbmc-rpi/config/repository.openelec.tv/icon.png b/packages/mediacenter/xbmc-rpi/config/repository.openelec.tv/icon.png deleted file mode 100644 index 1147ae1d37..0000000000 Binary files a/packages/mediacenter/xbmc-rpi/config/repository.openelec.tv/icon.png and /dev/null differ diff --git a/packages/mediacenter/xbmc-rpi/fonts/DejaVuSans.ttf b/packages/mediacenter/xbmc-rpi/fonts/DejaVuSans.ttf deleted file mode 100644 index 84ca1d7503..0000000000 Binary files a/packages/mediacenter/xbmc-rpi/fonts/DejaVuSans.ttf and /dev/null differ diff --git a/packages/mediacenter/xbmc-rpi/fonts/Trebuchet MS Bold.ttf b/packages/mediacenter/xbmc-rpi/fonts/Trebuchet MS Bold.ttf deleted file mode 100644 index 867f56d776..0000000000 Binary files a/packages/mediacenter/xbmc-rpi/fonts/Trebuchet MS Bold.ttf and /dev/null differ diff --git a/packages/mediacenter/xbmc-rpi/fonts/YanoneKaffeesatz-Bold.ttf b/packages/mediacenter/xbmc-rpi/fonts/YanoneKaffeesatz-Bold.ttf deleted file mode 100644 index e9964b0809..0000000000 Binary files a/packages/mediacenter/xbmc-rpi/fonts/YanoneKaffeesatz-Bold.ttf and /dev/null differ diff --git a/packages/mediacenter/xbmc-rpi/init.d/91_cleanup-logfiles b/packages/mediacenter/xbmc-rpi/init.d/91_cleanup-logfiles deleted file mode 100644 index 7f479fe516..0000000000 --- a/packages/mediacenter/xbmc-rpi/init.d/91_cleanup-logfiles +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -# starting XBMC -# -# runlevels: openelec - -progress "clean up log files" - rm -f /storage/.xbmc/userdata/addon_data/*/*.log 2>/dev/null - rm -rf /storage/.xbmc/userdata/addon_data/*/log/* 2>/dev/null diff --git a/packages/mediacenter/xbmc-rpi/init.d/92_setup-xbmc b/packages/mediacenter/xbmc-rpi/init.d/92_setup-xbmc deleted file mode 100644 index 7075f3d3fe..0000000000 --- a/packages/mediacenter/xbmc-rpi/init.d/92_setup-xbmc +++ /dev/null @@ -1,123 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, 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 - if [ -f /usr/share/xbmc/config/sources.xml ]; then - # include project specific sources - cp /usr/share/xbmc/config/sources.xml $HOME/.xbmc/userdata - else - cat > $HOME/.xbmc/userdata/sources.xml << EOF - - - - - - Music - $HOME/music/ - - - - - - Pictures - $HOME/pictures/ - - - -EOF - fi - 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-rpi/init.d/93_xbmc b/packages/mediacenter/xbmc-rpi/init.d/93_xbmc deleted file mode 100644 index 6fb03041e9..0000000000 --- a/packages/mediacenter/xbmc-rpi/init.d/93_xbmc +++ /dev/null @@ -1,116 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, 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 grep -q "Vendor=0471 Product=20d9" /proc/bus/input/devices; 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 'conservative' - ( usleep 15000000 - progress "set cpu's to 'conservative'" - cpupower frequency-set -g conservative > /dev/null 2>&1 - )& - -# prevent restrating XBMC at reboot or shutdown - LOCKDIR="/var/lock/" - LOCKFILE="xbmc.disabled" - [ -f "$LOCKDIR/$LOCKFILE" ] && rm -f "$LOCKDIR/$LOCKFILE" & - -# starting XBMC - usleep $XBMC_STARTDELAY - while true; do - - while [ -f "$LOCKDIR/$LOCKFILE" ]; do - usleep 250000 - done - - DISPLAY=:0.0 /usr/lib/xbmc/xbmc.bin $XBMC_ARGS > /dev/null 2>&1 - RET=$? - - case "$RET" in - 0) - if [ ! $(pidof console-kit-daemon) ]; then - touch "$LOCKDIR/$LOCKFILE" - poweroff -f - fi - ;; - 64) - if [ ! $(pidof console-kit-daemon) ]; then - touch "$LOCKDIR/$LOCKFILE" - poweroff -f - fi - ;; - 66) - if [ ! $(pidof console-kit-daemon) ]; then - touch "$LOCKDIR/$LOCKFILE" - reboot - fi - ;; - 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-rpi/install b/packages/mediacenter/xbmc-rpi/install deleted file mode 100755 index d17d97fccb..0000000000 --- a/packages/mediacenter/xbmc-rpi/install +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, 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_DIR/scripts/wait_on_xbmc_exit $INSTALL/usr/bin - cp $PKG_BUILD/tools/EventClients/Clients/XBMC\ Send/xbmc-send.py $INSTALL/usr/bin/xbmc-send - cp $PKG_DIR/scripts/setwakeup.sh $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/lib/xbmc - cp $PKG_BUILD/xbmc.bin $INSTALL/usr/lib/xbmc - if [ "$DISPLAYSERVER" = "xorg-server" ]; then - cp $PKG_BUILD/xbmc-xrandr $INSTALL/usr/lib/xbmc - fi - -cd $PKG_BUILD - find system addons \ - -regextype posix-extended -type f \ - -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" \ - -iregex ".*-linux.*|.*-arm.*|.*\.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.*|.*-arm.*|.*\.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 - rm -rf $INSTALL/usr/share/xbmc/addons/script.module.pysqlite - rm -rf $INSTALL/usr/share/xbmc/addons/script.module.simplejson - -mkdir -p $INSTALL/usr/share/xbmc/addons - cp -R $PKG_DIR/config/os.openelec.tv $INSTALL/usr/share/xbmc/addons - $SED "s|@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 - mkdir -p $INSTALL/usr/share/xbmc/config - if [ -f $PROJECT_DIR/$PROJECT/xbmc/guisettings.xml ]; then - cp -R $PROJECT_DIR/$PROJECT/xbmc/guisettings.xml $INSTALL/usr/share/xbmc/config - fi - - if [ -f $PROJECT_DIR/$PROJECT/xbmc/sources.xml ]; then - cp -R $PROJECT_DIR/$PROJECT/xbmc/sources.xml $INSTALL/usr/share/xbmc/config - fi - - mkdir -p $INSTALL/usr/share/xbmc/system/ - if [ -f $PROJECT_DIR/$PROJECT/xbmc/advancedsettings.xml ]; then - cp $PROJECT_DIR/$PROJECT/xbmc/advancedsettings.xml $INSTALL/usr/share/xbmc/system/ - else - cp $PKG_DIR/config/advancedsettings.xml $INSTALL/usr/share/xbmc/system/ - 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-rpi/meta b/packages/mediacenter/xbmc-rpi/meta deleted file mode 100644 index 5eded968e3..0000000000 --- a/packages/mediacenter/xbmc-rpi/meta +++ /dev/null @@ -1,175 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="xbmc-rpi" -PKG_VERSION="efef226" -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_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 yajl sqlite bc xbmc-addon-settings" -PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 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" - -# needed for hosttools (Texturepacker) - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS lzo-host SDL-host SDL_image-host" - -# some python stuff needed for various addons - PKG_DEPENDS="$PKG_DEPENDS Imaging" - PKG_DEPENDS="$PKG_DEPENDS simplejson" - -# various PVR clients - PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-xvdr xbmc-addon-njoy" - PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-xvdr xbmc-addon-vuplus" - -if [ "$DISPLAYSERVER" = "xorg-server" ]; then - # 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 SDL support - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS SDL SDL_image" - PKG_DEPENDS="$PKG_DEPENDS SDL SDL_image" -fi - -if [ "$OPENGL_SUPPORT" = yes ]; then - # for OpenGL (GLX) support - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS $OPENGL glew" - PKG_DEPENDS="$PKG_DEPENDS $OPENGL glew" -fi - -if [ "$OPENGLES_SUPPORT" = yes ]; then - # for OpenGL-ES support - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS $OPENGLES" - PKG_DEPENDS="$PKG_DEPENDS $OPENGLES" -fi - -# for dbus support - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS dbus" - PKG_DEPENDS="$PKG_DEPENDS dbus" - -if [ "$ALSA_SUPPORT" = yes ]; then - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS alsa-lib" - PKG_DEPENDS="$PKG_DEPENDS alsa alsa-lib" -fi - -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 [ "$ENCODER_LAME" = yes ]; then - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS lame" - PKG_DEPENDS="$PKG_DEPENDS lame" -fi - -if [ "$ENCODER_VORBIS" = yes ]; then - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvorbis" - PKG_DEPENDS="$PKG_DEPENDS libvorbis" -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" -fi - -if [ "$OPENMAX_SUPPORT" = yes ]; then - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS $OPENMAX" - PKG_DEPENDS="$PKG_DEPENDS $OPENMAX" -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 - -if [ "$XVBA" = yes ]; then - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS xf86-video-fglrx" -fi diff --git a/packages/mediacenter/xbmc-rpi/patches/rename.sh b/packages/mediacenter/xbmc-rpi/patches/rename.sh deleted file mode 100755 index 21b155f7be..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/rename.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, 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-rpi/patches/xbmc-rpi-efef226-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-001-add_support_to_specify_GIT_REV-0.1.patch deleted file mode 100644 index c013e0ae3a..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-001-add_support_to_specify_GIT_REV-0.1.patch +++ /dev/null @@ -1,39 +0,0 @@ -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-rpi/patches/xbmc-rpi-efef226-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-303-fix_libdvd_xFLAGS-0.1.patch deleted file mode 100644 index 5e76acefe4..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-303-fix_libdvd_xFLAGS-0.1.patch +++ /dev/null @@ -1,119 +0,0 @@ -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-rpi/patches/xbmc-rpi-efef226-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-311-fix_rsxs_build-0.1.patch deleted file mode 100644 index fe0ee49cab..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-311-fix_rsxs_build-0.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-rpi/patches/xbmc-rpi-efef226-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-321-texturepacker-hostflags-and-rework.patch deleted file mode 100644 index cbe5891222..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-321-texturepacker-hostflags-and-rework.patch +++ /dev/null @@ -1,190 +0,0 @@ -diff -Naur xbmc-frodo-433f681/configure.in xbmc-frodo-433f681.patch/configure.in ---- xbmc-frodo-433f681/configure.in 2012-06-15 02:52:26.000000000 +0200 -+++ xbmc-frodo-433f681.patch/configure.in 2012-06-19 05:26:41.472596903 +0200 -@@ -405,6 +405,12 @@ - [use_texturepacker=$enableval], - [use_texturepacker=auto]) - -+AC_ARG_WITH([texturepacker-root], -+ [AS_HELP_STRING([--with-texturepacker-root], -+ [root dir to search for librarys and includes if building native TexturePacker (default is \$prefix)])], -+ [use_texturepacker_root=$withval], -+ [use_texturepacker_root=$prefix]) -+ - AC_ARG_WITH([lirc-device], - [AS_HELP_STRING([--with-lirc-device=file], - [specify the default LIRC device (default is /dev/lircd)])], -@@ -516,8 +522,7 @@ - use_cpu=cortex-a8 - check_sdl_arch=[`file /opt/local/lib/libSDL_image.dylib | awk '{V=7; print $V}'`] - if test "x$check_sdl_arch" = "xi386"; then -- use_texturepacker_native=yes -- USE_TEXTUREPACKER_NATIVE_ROOT="/opt/local" -+ use_texturepacker_root="/opt/local" - else - use_texturepacker=no - fi -@@ -533,8 +538,6 @@ - *86*-apple-darwin*) - use_joystick=no - use_vtbdecoder=no -- use_texturepacker_native=yes -- USE_TEXTUREPACKER_NATIVE_ROOT="$prefix" - ARCH="x86-osx" - AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX") - ;; -@@ -1756,13 +1759,13 @@ - - USE_TEXTUREPACKER_NATIVE=0 - if test "x$use_texturepacker" != "xno"; then -- final_message="$final_message\n TexturePacker:Yes" - USE_TEXTUREPACKER=1 -- if test "x$use_texturepacker_native" = "xyes"; then -+ if test "x$cross_compiling" = "xyes"; then - USE_TEXTUREPACKER_NATIVE=1 -- if [[ ! -d "$USE_TEXTUREPACKER_NATIVE_ROOT" ]]; then -- USE_TEXTUREPACKER_NATIVE_ROOT= -- fi -+ USE_TEXTUREPACKER_NATIVE_ROOT="$use_texturepacker_root" -+ final_message="$final_message\n TexturePacker:Native ($USE_TEXTUREPACKER_NATIVE_ROOT)" -+ else -+ final_message="$final_message\n TexturePacker:Yes" - fi - else - final_message="$final_message\n TexturePacker:No" -diff -Naur xbmc-frodo-433f681/lib/libsquish/Makefile.in xbmc-frodo-433f681.patch/lib/libsquish/Makefile.in ---- xbmc-frodo-433f681/lib/libsquish/Makefile.in 2012-06-15 02:51:53.000000000 +0200 -+++ xbmc-frodo-433f681.patch/lib/libsquish/Makefile.in 2012-06-19 05:42:20.313119617 +0200 -@@ -11,31 +11,34 @@ - singlecolourfit.cpp \ - squish.cpp - --CXXFLAGS+=-I. -+LIB = libsquish.a -+NATIVE_LIB = libsquish-native.so -+CLEAN_FILES += $(NATIVE_LIB) -+ -+HOST_CXX ?= g++ -+CXXFLAGS += -I. -+HOST_CXXFLAGS += -I. -+ - ifeq ($(findstring powerpc,$(ARCH)),powerpc) -- CXXFLAGS+=-DSQUISH_USE_ALTIVEC=1 -maltivec -+ CXXFLAGS += -DSQUISH_USE_ALTIVEC=1 -maltivec -+ HOST_CXXFLAGS += -DSQUISH_USE_ALTIVEC=1 -maltivec - else ifeq ($(findstring x86,$(ARCH)), x86) -- CXXFLAGS+=-DSQUISH_USE_SSE=2 -msse2 -+ CXXFLAGS += -DSQUISH_USE_SSE=2 -msse2 -+ HOST_CXXFLAGS += -DSQUISH_USE_SSE=2 -msse2 - endif - --LIB=libsquish.a -- --ifeq (@USE_TEXTUREPACKER_NATIVE@,1) --NATIVE_LIB=libsquish-native.so --CLEAN_FILES+=$(NATIVE_LIB) -- - ifeq ($(findstring osx,$(ARCH)),osx) --NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32) -+ HOST_CXXFLAGS += $(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32) - endif - --all: $(LIB) $(NATIVE_LIB) -+$(LIB): $(SRCS) -+ - # TexturePacker links to libsquish and needs to run on build system, so make a native flavor. - $(NATIVE_LIB): $(SRCS) - ifeq ($(findstring osx,$(ARCH)),osx) -- g++ $(NATIVE_ARCH) -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@ -+ $(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@ - else -- g++ -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@ --endif -+ $(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@ - endif - - include ../../Makefile.include -diff -Naur xbmc-frodo-433f681/tools/TexturePacker/Makefile.in xbmc-frodo-433f681.patch/tools/TexturePacker/Makefile.in ---- xbmc-frodo-433f681/tools/TexturePacker/Makefile.in 2012-06-15 02:52:20.000000000 +0200 -+++ xbmc-frodo-433f681.patch/tools/TexturePacker/Makefile.in 2012-06-19 05:35:15.349564918 +0200 -@@ -1,48 +1,51 @@ --DEFINES += -D_LINUX -DUSE_LZO_PACKING -+DEFINES += -D_LINUX -DUSE_LZO_PACKING - ifneq ($(or $(findstring powerpc,@ARCH@),$(findstring ppc, @ARCH@)),) --DEFINES += -DHOST_BIGENDIAN -+DEFINES += -DHOST_BIGENDIAN - endif - --CXXFLAGS+= \ -+SRCS = \ -+ md5.cpp \ -+ SDL_anigif.cpp \ -+ XBTFWriter.cpp \ -+ XBMCTex.cpp \ -+ @abs_top_srcdir@/xbmc/guilib/XBTF.cpp -+ -+TARGET = TexturePacker -+CLEAN_FILES = $(TARGET) -+ -+all: $(TARGET) -+ -+HOST_CXX ?= g++ -+HOST_ROOT_PATH = @USE_TEXTUREPACKER_NATIVE_ROOT@ -+ -+LIBS += -lSDL_image -lSDL -llzo2 -+LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish -+HOST_LIBS += -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2 -+HOST_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native -+ -+CXXFLAGS += \ - -I. \ - -I@abs_top_srcdir@/lib \ - -I@abs_top_srcdir@/xbmc \ - -I@abs_top_srcdir@/xbmc/linux - --ifeq (@USE_TEXTUREPACKER_NATIVE@,1) --NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@ --ifdef NATIVE_ROOT_PATH -+HOST_CXXFLAGS += \ -+ -I. \ -+ -I@abs_top_srcdir@/lib \ -+ -I@abs_top_srcdir@/xbmc \ -+ -I@abs_top_srcdir@/xbmc/linux \ -+ -I$(HOST_ROOT_PATH)/include -+ - ifeq ($(findstring osx,@ARCH@),osx) - DEFINES += -DTARGET_DARWIN - NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32) - endif --CXXFLAGS+= -I$(NATIVE_ROOT_PATH)/include --LIBS += -L$(NATIVE_ROOT_PATH)/lib --endif --LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native --else --LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish --endif -- --LIBS += -lSDL_image -lSDL -llzo2 -- --SRCS = \ -- md5.cpp \ -- SDL_anigif.cpp \ -- XBTFWriter.cpp \ -- XBMCTex.cpp \ -- @abs_top_srcdir@/xbmc/guilib/XBTF.cpp -- -- --TARGET = TexturePacker --CLEAN_FILES=$(TARGET) -- --all: $(TARGET) - - ifeq (@USE_TEXTUREPACKER_NATIVE@,1) - # TexturePacker run native on build system, build it with native tools - $(TARGET): $(SRCS) -- g++ $(DEFINES) $(NATIVE_ARCH) $(CXXFLAGS) $(SRCS) $(LIBS) -o $(TARGET) -+ make -C @abs_top_srcdir@/lib/libsquish libsquish-native.so -+ $(HOST_CXX) $(DEFINES) $(NATIVE_ARCH) $(HOST_CXXFLAGS) $(SRCS) $(HOST_LIBS) -o $(TARGET) - clean: - rm -f $(TARGET) - else diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-402-enable_yasm_in_ffmpeg-0.1.patch deleted file mode 100644 index b8f5b8afcf..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-402-enable_yasm_in_ffmpeg-0.1.patch +++ /dev/null @@ -1,21 +0,0 @@ -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-rpi/patches/xbmc-rpi-efef226-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch deleted file mode 100644 index 821c1cc7bd..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch +++ /dev/null @@ -1,18 +0,0 @@ -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-rpi/patches/xbmc-rpi-efef226-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-452-change_lcd_content-0.1.patch deleted file mode 100644 index 0427b534f9..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-452-change_lcd_content-0.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-rpi/patches/xbmc-rpi-efef226-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-453-add_openelec.tv_RSS_news-0.1.patch deleted file mode 100644 index 5b32c0cce7..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-453-add_openelec.tv_RSS_news-0.1.patch +++ /dev/null @@ -1,11 +0,0 @@ -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-rpi/patches/xbmc-rpi-efef226-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-454-disable_backslash-0.1.patch deleted file mode 100644 index 0888920258..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-454-disable_backslash-0.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-rpi/patches/xbmc-rpi-efef226-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-457-fix_connection_check-0.1.patch deleted file mode 100644 index 9488def289..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-457-fix_connection_check-0.1.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp ---- a/xbmc/filesystem/CurlFile.cpp 2011-03-08 02:49:14.000000000 +0100 -+++ b/xbmc/filesystem/CurlFile.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-rpi/patches/xbmc-rpi-efef226-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-462-add_remote_irtrans_mediacenter-0.1.patch deleted file mode 100644 index 0edef5a7a5..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-462-add_remote_irtrans_mediacenter-0.1.patch +++ /dev/null @@ -1,52 +0,0 @@ -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-rpi/patches/xbmc-rpi-efef226-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-463-add_remote_devinput-0.1.patch deleted file mode 100644 index 85d635b61b..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-463-add_remote_devinput-0.1.patch +++ /dev/null @@ -1,71 +0,0 @@ -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-rpi/patches/xbmc-rpi-efef226-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-464-add_eject_keymapping_for_lirc-0.1.patch deleted file mode 100644 index 56c56016b5..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-464-add_eject_keymapping_for_lirc-0.1.patch +++ /dev/null @@ -1,11 +0,0 @@ -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-rpi/patches/xbmc-rpi-efef226-607-enable_ae_for_movie_gui.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-607-enable_ae_for_movie_gui.patch deleted file mode 100644 index 521b40d724..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-607-enable_ae_for_movie_gui.patch +++ /dev/null @@ -1,154 +0,0 @@ -diff -Naur xbmc-rpi-2acdae7/configure.in xbmc-rpi-2acdae7.patch/configure.in ---- xbmc-rpi-2acdae7/configure.in 2012-07-20 00:27:10.000000000 +0200 -+++ xbmc-rpi-2acdae7.patch/configure.in 2012-07-20 03:55:07.680124127 +0200 -@@ -591,7 +591,7 @@ - use_armv6="yes" - use_armvfp="yes" - use_hardcoded_tables="yes" -- use_alsa="no" -+ use_alsa="yes" - USE_TEXTUREPACKER_NATIVE_ROOT="$TEXTUREPACKER_NATIVE_ROOT" - ARCH="arm" - AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_ARMEL -DTARGET_RASPBERRY_PI") -diff -Naur xbmc-rpi-2acdae7/xbmc/cores/AudioEngine/AEFactory.cpp xbmc-rpi-2acdae7.patch/xbmc/cores/AudioEngine/AEFactory.cpp ---- xbmc-rpi-2acdae7/xbmc/cores/AudioEngine/AEFactory.cpp 2012-07-20 00:27:35.000000000 +0200 -+++ xbmc-rpi-2acdae7.patch/xbmc/cores/AudioEngine/AEFactory.cpp 2012-07-20 03:55:07.680124127 +0200 -@@ -119,10 +119,6 @@ - - bool CAEFactory::StartEngine() - { --#if defined(TARGET_RASPBERRY_PI) -- return true; --#endif -- - if (!AE) - return false; - -diff -Naur xbmc-rpi-2acdae7/xbmc/cores/AudioEngine/AESinkFactory.cpp xbmc-rpi-2acdae7.patch/xbmc/cores/AudioEngine/AESinkFactory.cpp ---- xbmc-rpi-2acdae7/xbmc/cores/AudioEngine/AESinkFactory.cpp 2012-07-20 00:27:35.000000000 +0200 -+++ xbmc-rpi-2acdae7.patch/xbmc/cores/AudioEngine/AESinkFactory.cpp 2012-07-20 03:55:07.723124715 +0200 -@@ -28,7 +28,7 @@ - #if defined(TARGET_WINDOWS) - #include "Sinks/AESinkWASAPI.h" - #include "Sinks/AESinkDirectSound.h" --#elif (defined(TARGET_LINUX) || defined(TARGET_FREEBSD)) && !defined(TARGET_RASPBERRY_PI) -+#elif (defined(TARGET_LINUX) || defined(TARGET_FREEBSD)) - #if defined(HAS_ALSA) - #include "Sinks/AESinkALSA.h" - #endif -@@ -106,7 +106,7 @@ - else - TRY_SINK(DirectSound) /* Always fall back to DirectSound */ - --#elif (defined(TARGET_LINUX) || defined(TARGET_FREEBSD)) && !defined(TARGET_RASPBERRY_PI) -+#elif (defined(TARGET_LINUX) || defined(TARGET_FREEBSD)) - - #if defined(HAS_ALSA) - if (driver.empty() || driver == "ALSA") -@@ -154,7 +154,7 @@ - ENUMERATE_SINK(ALSA); - #endif - --#if (defined(TARGET_LINUX) || defined(TARGET_FREEBSD)) && !defined(TARGET_RASPBERRY_PI) -+#if (defined(TARGET_LINUX) || defined(TARGET_FREEBSD)) - ENUMERATE_SINK(OSS); - #endif - -diff -Naur xbmc-rpi-2acdae7/xbmc/cores/omxplayer/OMXPlayer.cpp xbmc-rpi-2acdae7.patch/xbmc/cores/omxplayer/OMXPlayer.cpp ---- xbmc-rpi-2acdae7/xbmc/cores/omxplayer/OMXPlayer.cpp 2012-07-20 00:27:35.000000000 +0200 -+++ xbmc-rpi-2acdae7.patch/xbmc/cores/omxplayer/OMXPlayer.cpp 2012-07-20 03:55:07.743124988 +0200 -@@ -73,6 +73,9 @@ - - #include "LangInfo.h" - -+#include "cores/AudioEngine/AEFactory.h" -+#include "cores/AudioEngine/Utils/AEUtil.h" -+ - using namespace XFILE; - - // **************************************************************** -@@ -920,6 +923,9 @@ - return; - } - -+ /* shutdown AE */ -+ CAEFactory::Shutdown(); -+ - m_player_video.EnableFullscreen(true); - - OpenDefaultStreams(); -@@ -1862,6 +1868,13 @@ - - // set event to inform openfile something went wrong in case openfile is still waiting for this event - m_ready.Set(); -+ -+ /* start AE again */ -+ CAEFactory::LoadEngine(); -+ CAEFactory::StartEngine(); -+ -+ CAEFactory::SetMute (g_settings.m_bMute); -+ CAEFactory::SetSoundMode(g_guiSettings.GetInt("audiooutput.guisoundmode")); - } - - void COMXPlayer::HandleMessages() -diff -Naur xbmc-rpi-2acdae7/xbmc/settings/GUISettings.cpp xbmc-rpi-2acdae7.patch/xbmc/settings/GUISettings.cpp ---- xbmc-rpi-2acdae7/xbmc/settings/GUISettings.cpp 2012-07-20 00:27:26.000000000 +0200 -+++ xbmc-rpi-2acdae7.patch/xbmc/settings/GUISettings.cpp 2012-07-20 03:55:07.745125016 +0200 -@@ -476,7 +476,7 @@ - #if !defined(TARGET_DARWIN_IOS) && !defined(TARGET_RASPBERRY_PI) - AddBool(aocat, "audiooutput.multichannellpcm" , 348, true ); - #endif --#if !defined(TARGET_DARWIN) && !defined(TARGET_RASPBERRY_PI) -+#if !defined(TARGET_DARWIN) - AddBool(aocat, "audiooutput.truehdpassthrough", 349, true ); - AddBool(aocat, "audiooutput.dtshdpassthrough" , 347, true ); - #endif -@@ -490,11 +490,6 @@ - #endif - AddString(ao, "audiooutput.audiodevice", 545, defaultDeviceName.c_str(), SPIN_CONTROL_TEXT); - AddString(NULL, "audiooutput.passthroughdevice", 546, defaultDeviceName.c_str(), SPIN_CONTROL_TEXT); --#elif defined(TARGET_RASPBERRY_PI) -- CStdString defaultDeviceName = "Default"; -- AddString(NULL, "audiooutput.audiodevice", 545, defaultDeviceName.c_str(), SPIN_CONTROL_TEXT); -- AddString(NULL, "audiooutput.passthroughdevice", 546, defaultDeviceName.c_str(), SPIN_CONTROL_TEXT); --#else - AddSeparator(ao, "audiooutput.sep1"); - AddString (ao, "audiooutput.audiodevice" , 545, CStdString(CAEFactory::GetDefaultDevice(false)), SPIN_CONTROL_TEXT); - AddString (ao, "audiooutput.passthroughdevice", 546, CStdString(CAEFactory::GetDefaultDevice(true )), SPIN_CONTROL_TEXT); -diff -Naur xbmc-rpi-2acdae7/xbmc/settings/GUIWindowSettingsCategory.cpp xbmc-rpi-2acdae7.patch/xbmc/settings/GUIWindowSettingsCategory.cpp ---- xbmc-rpi-2acdae7/xbmc/settings/GUIWindowSettingsCategory.cpp 2012-07-20 00:27:26.000000000 +0200 -+++ xbmc-rpi-2acdae7.patch/xbmc/settings/GUIWindowSettingsCategory.cpp 2012-07-20 03:55:07.746125030 +0200 -@@ -1849,13 +1849,13 @@ - if (strSetting.Equals("audiooutput.audiodevice")) - { - CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(pSettingControl->GetID()); --#if defined(TARGET_DARWIN) || defined(TARGET_RASPBERRY_PI) -+#if defined(TARGET_DARWIN) - g_guiSettings.SetString("audiooutput.audiodevice", pControl->GetCurrentLabel()); - #else - g_guiSettings.SetString("audiooutput.audiodevice", m_AnalogAudioSinkMap[pControl->GetCurrentLabel()]); - #endif - } --#if !defined(TARGET_DARWIN) && !defined(TARGET_RASPBERRY_PI) -+#if !defined(TARGET_DARWIN) - else if (strSetting.Equals("audiooutput.passthroughdevice")) - { - CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(pSettingControl->GetID()); -@@ -2719,7 +2719,7 @@ - int selectedValue = -1; - AEDeviceList sinkList; - CAEFactory::EnumerateOutputDevices(sinkList, Passthrough); --#if !defined(TARGET_DARWIN) && !defined(TARGET_RASPBERRY_PI) -+#if !defined(TARGET_DARWIN) - if (sinkList.size()==0) - { - pControl->AddLabel("Error - no devices found", 0); -@@ -2748,7 +2748,7 @@ - } - - numberSinks = sinkList.size(); --#if !defined(TARGET_DARWIN) && !defined(TARGET_RASPBERRY_PI) -+#if !defined(TARGET_DARWIN) - } - #endif - diff --git a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-981-toggleButtonState.patch b/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-981-toggleButtonState.patch deleted file mode 100644 index 17a606f1b1..0000000000 --- a/packages/mediacenter/xbmc-rpi/patches/xbmc-rpi-efef226-981-toggleButtonState.patch +++ /dev/null @@ -1,304 +0,0 @@ -diff -Naur xbmc-f3b0020/xbmc/guilib/GUIToggleButtonControl.h xbmc-f3b0020.patch/xbmc/guilib/GUIToggleButtonControl.h ---- xbmc-f3b0020/xbmc/guilib/GUIToggleButtonControl.h 2011-12-10 22:16:22.000000000 +0100 -+++ xbmc-f3b0020.patch/xbmc/guilib/GUIToggleButtonControl.h 2011-12-17 18:43:42.183704449 +0100 -@@ -57,6 +57,7 @@ - virtual CStdString GetDescription() const; - void SetToggleSelect(const CStdString &toggleSelect); - void SetAltClickActions(const CGUIAction &clickActions); -+ bool IsSelected() const { return m_bSelected; }; - - protected: - virtual bool UpdateColors(); -diff -Naur xbmc-f3b0020/xbmc/interfaces/python/xbmcmodule/control.h xbmc-f3b0020.patch/xbmc/interfaces/python/xbmcmodule/control.h ---- xbmc-f3b0020/xbmc/interfaces/python/xbmcmodule/control.h 2011-12-10 22:16:21.000000000 +0100 -+++ xbmc-f3b0020.patch/xbmc/interfaces/python/xbmcmodule/control.h 2011-12-17 18:43:42.216705084 +0100 -@@ -135,6 +135,11 @@ - - typedef struct { - PyObject_HEAD_XBMC_CONTROL -+ bool bIsSelected; -+ } ControlToggle; -+ -+ typedef struct { -+ PyObject_HEAD_XBMC_CONTROL - std::string strFont; - color_t textColor; - std::vector vecLabels; -@@ -263,7 +268,8 @@ - extern PyTypeObject ControlRadioButton_Type; - extern PyTypeObject ControlSlider_Type; - extern PyTypeObject ControlEdit_Type; -- -+ extern PyTypeObject ControlToggle_Type; -+ - CGUIControl* ControlLabel_Create(ControlLabel* pControl); - CGUIControl* ControlFadeLabel_Create(ControlFadeLabel* pControl); - CGUIControl* ControlTextBox_Create(ControlTextBox* pControl); -@@ -276,6 +282,7 @@ - CGUIControl* ControlRadioButton_Create(ControlRadioButton* pControl); - CGUIControl* ControlSlider_Create(ControlSlider* pControl); - CGUIControl* ControlEdit_Create(ControlEdit* pControl); -+ CGUIControl* ControlToggle_Create(ControlToggle* pControl); - - void initControl_Type(); - void initControlSpin_Type(); -@@ -291,6 +298,7 @@ - void initControlRadioButton_Type(); - void initControlSlider_Type(); - void initControlEdit_Type(); -+ void initControlToggle_Type(); - } - - #ifdef __cplusplus -diff -Naur xbmc-f3b0020/xbmc/interfaces/python/xbmcmodule/controltogglebutton.cpp xbmc-f3b0020.patch/xbmc/interfaces/python/xbmcmodule/controltogglebutton.cpp ---- xbmc-f3b0020/xbmc/interfaces/python/xbmcmodule/controltogglebutton.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-f3b0020.patch/xbmc/interfaces/python/xbmcmodule/controltogglebutton.cpp 2011-12-17 18:43:42.217705104 +0100 -@@ -0,0 +1,181 @@ -+/* -+ * Copyright (C) 2005-2011 Team XBMC -+ * http://www.xbmc.org -+ * -+ * 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 XBMC; 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 -+ * -+ */ -+ -+#include -+ -+#include "guilib/GUIToggleButtonControl.h" -+#include "guilib/GUIFontManager.h" -+#include "control.h" -+#include "pyutil.h" -+ -+using namespace std; -+ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+namespace PYXBMC -+{ -+ PyObject* ControlToggle_New( -+ PyTypeObject *type, -+ PyObject *args, -+ PyObject *kwds ) -+ { -+ static const char *keywords[] = { -+ "x", "y", "width", "height", "label", -+ "focusTexture", "noFocusTexture", -+ "textOffsetX", "textOffsetY", "alignment", -+ "font", "textColor", "disabledColor", "angle", "shadowColor", "focusedColor", NULL }; -+ ControlToggle *self; -+ char* cFont = NULL; -+ char* cTextureFocus = NULL; -+ char* cTextureNoFocus = NULL; -+ char* cTextColor = NULL; -+ char* cDisabledColor = NULL; -+ char* cShadowColor = NULL; -+ char* cFocusedColor = NULL; -+ -+ PyObject* pObjectText; -+ -+ self = (ControlToggle*)type->tp_alloc(type, 0); -+ if (!self) return NULL; -+ new(&self->bIsSelected) bool(); -+ -+ if (!PyArg_ParseTupleAndKeywords( -+ args, -+ kwds, -+ (char*)"llllO|sslllssslss", -+ (char**)keywords, -+ &self->dwPosX, -+ &self->dwPosY, -+ &self->dwWidth, -+ &self->dwHeight, -+ &pObjectText, -+ &cTextureFocus, -+ &cTextureNoFocus, -+ &cFont, -+ &cTextColor, -+ &cDisabledColor, -+ &cShadowColor, -+ &cFocusedColor)) -+ { -+ Py_DECREF( self ); -+ return NULL; -+ } -+ -+ -+ cTextureFocus : -+ PyXBMCGetDefaultImage((char*)"button", (char*)"texturefocus", (char*)"button-focus.png"); -+ cTextureNoFocus : -+ PyXBMCGetDefaultImage((char*)"button", (char*)"texturenofocus", (char*)"button-nofocus.jpg"); -+ -+ return (PyObject*)self; -+ } -+ -+ void ControlToggle_Dealloc(ControlToggle* self) -+ { -+ self->ob_type->tp_free((PyObject*)self); -+ } -+ -+ -+ // isSelected() Method -+ PyDoc_STRVAR(isSelected__doc__, -+ "isSelected() -- Returns the toggle buttons's selected status.\n" -+ "\n" -+ "example:\n" -+ " - is = self.togglebutton.isSelected()\n"); -+ -+ PyObject* ControlToggle_IsSelected(ControlToggle *self, PyObject *args) -+ { -+ bool isSelected = false; -+ -+ PyXBMCGUILock(); -+ if (self->pGUIControl) -+ isSelected = ((CGUIToggleButtonControl*)self->pGUIControl)->IsSelected(); -+ PyXBMCGUIUnlock(); -+ -+ return Py_BuildValue((char*)"b", isSelected); -+ } -+ -+ -+ PyMethodDef ControlToggle_methods[] = { -+ {(char*)"isSelected", (PyCFunction)ControlToggle_IsSelected, METH_VARARGS, isSelected__doc__}, -+ {NULL, NULL, 0, NULL} -+ }; -+ -+ // ControlRadioButton class -+ PyDoc_STRVAR(ControlToggle__doc__, -+ "ControlRadioButton class.\n" -+ "\n" -+ "ControlRadioButton(x, y, width, height, label[, focusTexture, noFocusTexture, textOffsetX, textOffsetY,\n" -+ " alignment, font, textColor, disabledColor, angle, shadowColor, focusedColor,\n" -+ " radioFocusTexture, noRadioFocusTexture])\n" -+ "\n" -+ "x : integer - x coordinate of control.\n" -+ "y : integer - y coordinate of control.\n" -+ "width : integer - width of control.\n" -+ "height : integer - height of control.\n" -+ "label : string or unicode - text string.\n" -+ "focusTexture : [opt] string - filename for focus texture.\n" -+ "noFocusTexture : [opt] string - filename for no focus texture.\n" -+ "textOffsetX : [opt] integer - x offset of label.\n" -+ "textOffsetY : [opt] integer - y offset of label.\n" -+ "alignment : [opt] integer - alignment of label - *Note, see xbfont.h\n" -+ "font : [opt] string - font used for label text. (e.g. 'font13')\n" -+ "textColor : [opt] hexstring - color of enabled radio button's label. (e.g. '0xFFFFFFFF')\n" -+ "disabledColor : [opt] hexstring - color of disabled radio button's label. (e.g. '0xFFFF3300')\n" -+ "angle : [opt] integer - angle of control. (+ rotates CCW, - rotates CW)\n" -+ "shadowColor : [opt] hexstring - color of radio button's label's shadow. (e.g. '0xFF000000')\n" -+ "focusedColor : [opt] hexstring - color of focused radio button's label. (e.g. '0xFF00FFFF')\n" -+ "radioFocusTexture : [opt] string - filename for radio focus texture.\n" -+ "noRadioFocusTexture : [opt] string - filename for radio no focus texture.\n" -+ "\n" -+ "*Note, You can use the above as keywords for arguments and skip certain optional arguments.\n" -+ " Once you use a keyword, all following arguments require the keyword.\n" -+ " After you create the control, you need to add it to the window with addControl().\n" -+ "\n" -+ "example:\n" -+ " - self.radiobutton = xbmcgui.ControlToggleButton(100, 250, 200, 50, 'Status', font='font14')\n"); -+ -+ // Restore code and data sections to normal. -+ -+ PyTypeObject ControlToggle_Type; -+ -+ void initControlToggle_Type() -+ { -+ PyXBMCInitializeTypeObject(&ControlToggle_Type); -+ -+ ControlToggle_Type.tp_name = (char*)"xbmcgui.ControlToggleButton"; -+ ControlToggle_Type.tp_basicsize = sizeof(ControlToggle); -+ ControlToggle_Type.tp_dealloc = (destructor)ControlToggle_Dealloc; -+ ControlToggle_Type.tp_compare = 0; -+ ControlToggle_Type.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; -+ ControlToggle_Type.tp_doc = ControlToggle__doc__; -+ ControlToggle_Type.tp_methods = ControlToggle_methods; -+ ControlToggle_Type.tp_base = &Control_Type; -+ ControlToggle_Type.tp_new = ControlToggle_New; -+ } -+} -+ -+#ifdef __cplusplus -+} -+#endif -diff -Naur xbmc-f3b0020/xbmc/interfaces/python/xbmcmodule/Makefile.in xbmc-f3b0020.patch/xbmc/interfaces/python/xbmcmodule/Makefile.in ---- xbmc-f3b0020/xbmc/interfaces/python/xbmcmodule/Makefile.in 2011-12-10 22:16:21.000000000 +0100 -+++ xbmc-f3b0020.patch/xbmc/interfaces/python/xbmcmodule/Makefile.in 2011-12-17 18:44:47.447960296 +0100 -@@ -13,6 +13,7 @@ - controlslider.cpp \ - controlspin.cpp \ - controltextbox.cpp \ -+ controltogglebutton.cpp \ - dialog.cpp \ - GUIPythonWindow.cpp \ - GUIPythonWindowDialog.cpp \ -diff -Naur xbmc-f3b0020/xbmc/interfaces/python/xbmcmodule/window.cpp xbmc-f3b0020.patch/xbmc/interfaces/python/xbmcmodule/window.cpp ---- xbmc-f3b0020/xbmc/interfaces/python/xbmcmodule/window.cpp 2011-12-10 22:16:21.000000000 +0100 -+++ xbmc-f3b0020.patch/xbmc/interfaces/python/xbmcmodule/window.cpp 2011-12-17 18:43:42.218705123 +0100 -@@ -277,6 +277,12 @@ - if (li.font) ((ControlEdit*)pControl)->strFont = li.font->GetFontName(); - ((ControlButton*)pControl)->align = li.align; - break; -+ case CGUIControl::GUICONTROL_TOGGLEBUTTON: -+ pControl = (Control*)ControlToggle_Type.tp_alloc(&ControlToggle_Type, 0); -+ new(&((ControlToggle*)pControl)->bIsSelected) bool(); -+ -+ break; -+ - default: - break; - } -diff -Naur xbmc-f3b0020/xbmc/interfaces/python/xbmcmodule/xbmcguimodule.cpp xbmc-f3b0020.patch/xbmc/interfaces/python/xbmcmodule/xbmcguimodule.cpp ---- xbmc-f3b0020/xbmc/interfaces/python/xbmcmodule/xbmcguimodule.cpp 2011-12-10 22:16:21.000000000 +0100 -+++ xbmc-f3b0020.patch/xbmc/interfaces/python/xbmcmodule/xbmcguimodule.cpp 2011-12-17 18:43:42.219705142 +0100 -@@ -138,6 +138,7 @@ - initAction_Type(); - initControlRadioButton_Type(); - initControlEdit_Type(); -+ initControlToggle_Type(); - - if (PyType_Ready(&Window_Type) < 0 || - PyType_Ready(&WindowDialog_Type) < 0 || -@@ -160,7 +161,8 @@ - PyType_Ready(&ControlSlider_Type) < 0 || - PyType_Ready(&ControlRadioButton_Type) < 0 || - PyType_Ready(&ControlEdit_Type) < 0 || -- PyType_Ready(&Action_Type) < 0) -+ PyType_Ready(&Action_Type) < 0 || -+ PyType_Ready(&ControlToggle_Type) < 0) - return; - - } -@@ -200,6 +202,7 @@ - Py_INCREF(&Action_Type); - Py_INCREF(&ControlRadioButton_Type); - Py_INCREF(&ControlEdit_Type); -+ Py_INCREF(&ControlToggle_Type); - - pXbmcGuiModule = Py_InitModule3((char*)"xbmcgui", xbmcGuiMethods, xbmcgui_module_documentation); - -@@ -227,7 +230,8 @@ - PyModule_AddObject(pXbmcGuiModule, (char*)"Action", (PyObject *)&Action_Type); - PyModule_AddObject(pXbmcGuiModule, (char*)"ControlRadioButton", (PyObject*)&ControlRadioButton_Type); - PyModule_AddObject(pXbmcGuiModule, (char*)"ControlEdit", (PyObject*)&ControlEdit_Type); -- -+ PyModule_AddObject(pXbmcGuiModule, (char*)"ControlToggle", (PyObject*)&ControlToggle_Type); -+ - PyModule_AddStringConstant(pXbmcGuiModule, (char*)"__author__", (char*)PY_XBMC_AUTHOR); - PyModule_AddStringConstant(pXbmcGuiModule, (char*)"__date__", (char*)"14 July 2006"); - PyModule_AddStringConstant(pXbmcGuiModule, (char*)"__version__", (char*)"1.2"); -diff -Naur xbmc-f3b0020/XBMC.xcodeproj/project.pbxproj xbmc-f3b0020.patch/XBMC.xcodeproj/project.pbxproj diff --git a/packages/mediacenter/xbmc-rpi/profile.d/xbmc.conf b/packages/mediacenter/xbmc-rpi/profile.d/xbmc.conf deleted file mode 100644 index 7029bf1bd3..0000000000 --- a/packages/mediacenter/xbmc-rpi/profile.d/xbmc.conf +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, 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. -################################################################################ - -if [ -z "$XBMC_STARTDELAY" ]; then - XBMC_STARTDELAY="1000000" -fi - -XBMC_HOME="/usr/share/xbmc" - -export XBMC_HOME - -GPUTYPE="OTHER" - -if [ -x /usr/bin/lspci ]; then - GPUDEVICE=$(lspci -n | grep 0300) - - [ "$(echo $GPUDEVICE | grep 8086)" ] && GPUTYPE="INTEL" # 8086 == INTEL - [ "$(echo $GPUDEVICE | grep 10de)" ] && GPUTYPE="NVIDIA" # 10de == NVIDIA - [ "$(echo $GPUDEVICE | grep 1002)" ] && GPUTYPE="AMD" # 1002 == AMD -fi - -export GPUTYPE diff --git a/packages/mediacenter/xbmc-rpi/scripts/cputemp b/packages/mediacenter/xbmc-rpi/scripts/cputemp deleted file mode 100755 index 10a3683262..0000000000 --- a/packages/mediacenter/xbmc-rpi/scripts/cputemp +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, 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-rpi/scripts/gputemp b/packages/mediacenter/xbmc-rpi/scripts/gputemp deleted file mode 100755 index d5152aa4f6..0000000000 --- a/packages/mediacenter/xbmc-rpi/scripts/gputemp +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, 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-rpi/scripts/setwakeup.sh b/packages/mediacenter/xbmc-rpi/scripts/setwakeup.sh deleted file mode 100755 index 557abff270..0000000000 --- a/packages/mediacenter/xbmc-rpi/scripts/setwakeup.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -if [ -f /sys/class/rtc/rtc0/wakealarm ]; then - logger -t setwakeup.sh "### Setting system wakeup time ###" - echo 0 > /sys/class/rtc/rtc0/wakealarm - echo $1 > /sys/class/rtc/rtc0/wakealarm - logger -t setwakeup.sh "### $(cat /proc/driver/rtc) ###" -fi diff --git a/packages/mediacenter/xbmc-rpi/scripts/wait_on_xbmc_exit b/packages/mediacenter/xbmc-rpi/scripts/wait_on_xbmc_exit deleted file mode 100755 index 60efb36402..0000000000 --- a/packages/mediacenter/xbmc-rpi/scripts/wait_on_xbmc_exit +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -count=0 - -while [ $(pidof xbmc.bin) -a $count -le 20 ]; do - usleep 250000 - logger -t wait_on_xbmc_exit "### Waiting for XBMC to Exit - $count ###" - count=$((count+1)) -done diff --git a/packages/mediacenter/xbmc-rpi/sleep.d/00_addon-sleep b/packages/mediacenter/xbmc-rpi/sleep.d/00_addon-sleep deleted file mode 100755 index 01c9653b45..0000000000 --- a/packages/mediacenter/xbmc-rpi/sleep.d/00_addon-sleep +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, 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-rpi/sleep.d/61_xbmc_lirc b/packages/mediacenter/xbmc-rpi/sleep.d/61_xbmc_lirc deleted file mode 100755 index 0cb99c757e..0000000000 --- a/packages/mediacenter/xbmc-rpi/sleep.d/61_xbmc_lirc +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, 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-rpi/sleep.d/62_xbmc_lcd b/packages/mediacenter/xbmc-rpi/sleep.d/62_xbmc_lcd deleted file mode 100755 index a3f8e358a4..0000000000 --- a/packages/mediacenter/xbmc-rpi/sleep.d/62_xbmc_lcd +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, 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-rpi/sleep.d/99_reload_skin b/packages/mediacenter/xbmc-rpi/sleep.d/99_reload_skin deleted file mode 100755 index eb3a3dce07..0000000000 --- a/packages/mediacenter/xbmc-rpi/sleep.d/99_reload_skin +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, 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-rpi/splash/splash.png b/packages/mediacenter/xbmc-rpi/splash/splash.png deleted file mode 100644 index 6b2897b0a1..0000000000 Binary files a/packages/mediacenter/xbmc-rpi/splash/splash.png and /dev/null differ diff --git a/packages/mediacenter/xbmc-rpi/splash/splash1.png b/packages/mediacenter/xbmc-rpi/splash/splash1.png deleted file mode 100644 index ac0aa0052f..0000000000 Binary files a/packages/mediacenter/xbmc-rpi/splash/splash1.png and /dev/null differ diff --git a/packages/mediacenter/xbmc-rpi/unpack b/packages/mediacenter/xbmc-rpi/unpack deleted file mode 100755 index 58c11116fd..0000000000 --- a/packages/mediacenter/xbmc-rpi/unpack +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, 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 diff --git a/projects/RPi/options b/projects/RPi/options index bd43c53dd9..16855f3c50 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -107,10 +107,8 @@ SQUASHFS_COMPRESSION="lzo" # Mediacenter to use (xbmc / no) - if [ "$XBMC" = frodo ]; then + if [ "$XBMC" = frodo -o "$PROJECT" = RPi ]; then MEDIACENTER="xbmc-frodo" - elif [ "$PROJECT" = RPi ]; then - MEDIACENTER="xbmc-rpi" else MEDIACENTER="xbmc" fi diff --git a/tools/mkpkg/mkpkg_xbmc-rpi b/tools/mkpkg/mkpkg_xbmc-rpi deleted file mode 100755 index 1a5d90f5bc..0000000000 --- a/tools/mkpkg/mkpkg_xbmc-rpi +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="xbmc-rpi" -GIT_REPO="-b master git@github.com:xbmc/xbmc-rbp.git" -DEST_DIR="$PKG_NAME" - -echo "getting sources..." - if [ ! -d $DEST_DIR-latest ]; then - git clone $GIT_REPO $DEST_DIR-latest - fi - - cd $DEST_DIR-latest - git pull - -echo "getting version..." - GIT_REV=`git log -n1 --format=%h` - echo $GIT_REV - cd .. - -echo "copying sources..." - rm -rf $PKG_NAME-$GIT_REV - cp -R $DEST_DIR-latest $PKG_NAME-$GIT_REV - echo "$GIT_REV" > $PKG_NAME-$GIT_REV/git.version - -echo "cleaning sources..." - rm -rf $PKG_NAME-$GIT_REV/.git - -echo "seperating theme..." - rm -rf $PKG_NAME-theme-Confluence-$GIT_REV - mv $PKG_NAME-$GIT_REV/addons/skin.confluence $PKG_NAME-theme-Confluence-$GIT_REV -# rm -rf $PKG_NAME-theme-Touched-$GIT_REV -# mv $PKG_NAME-$GIT_REV/addons/skin.touched $PKG_NAME-theme-Touched-$GIT_REV - -echo "cleaning sources..." - rm -rf $PKG_NAME-$GIT_REV/visualisations - rm -rf $PKG_NAME-$GIT_REV/lib/libSDL-* - rm -rf $PKG_NAME-$GIT_REV/lib/libcurl-* - rm -rf $PKG_NAME-$GIT_REV/project - - for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \ - "PackageMaker" "Translator" "XBMCLive" "XprPack" \ - "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do - rm -rf $PKG_NAME-$GIT_REV/tools/$i - done - - for i in dll a lib so bat; do - find $PKG_NAME-$GIT_REV -name *.$i -exec rm -rf {} ";" - done - - # bundled win32 binaries - rm -r $PKG_NAME-$GIT_REV/xbmc/visualizations/XBMCProjectM/win32 - -echo "packing sources..." - tar cvJf $PKG_NAME-$GIT_REV.tar.xz $PKG_NAME-$GIT_REV - tar cvJf $PKG_NAME-theme-Confluence-$GIT_REV.tar.xz $PKG_NAME-theme-Confluence-$GIT_REV -# tar cvJf $PKG_NAME-theme-Touched-$GIT_REV.tar.xz $PKG_NAME-theme-Touched-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf $PKG_NAME-$GIT_REV - rm -rf $PKG_NAME-theme-Confluence-$GIT_REV -# rm -rf $PKG_NAME-theme-Touched-$GIT_REV