From b6ac40a33195c9deb7a67a76706fd4a1f15b3348 Mon Sep 17 00:00:00 2001 From: Gujs Date: Wed, 26 Jan 2011 21:29:26 +0100 Subject: [PATCH 1/8] xbmc-pvr* source package destination changed --- packages/mediacenter/xbmc-pvr-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc-pvr/meta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta index 61098e5b7c..6f093427e1 100644 --- a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" #PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://gujs.openelec.tv/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta index 4e533b2167..6008bf6138 100644 --- a/packages/mediacenter/xbmc-pvr/meta +++ b/packages/mediacenter/xbmc-pvr/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" #PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://gujs.openelec.tv/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc" PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba" PKG_PRIORITY="optional" From c040e4e20ac8c524d791bbb87d5a487a4d6ac388 Mon Sep 17 00:00:00 2001 From: Gujs Date: Wed, 26 Jan 2011 21:31:21 +0100 Subject: [PATCH 2/8] Add xbmc-addon-settings to xbmc-pvr dependencies --- packages/mediacenter/xbmc-pvr/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta index 6008bf6138..642241f8ed 100644 --- a/packages/mediacenter/xbmc-pvr/meta +++ b/packages/mediacenter/xbmc-pvr/meta @@ -26,7 +26,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" #PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_URL="http://gujs.openelec.tv/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc" +PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc xbmc-addon-settings" PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" From bfe6cfe414de60c5b55196a098add70044452f07 Mon Sep 17 00:00:00 2001 From: Gujs Date: Wed, 2 Mar 2011 17:37:10 +0100 Subject: [PATCH 3/8] xbmc-pvr: sync with xbmc package --- packages/mediacenter/xbmc-pvr/build | 10 +---- packages/mediacenter/xbmc-pvr/install | 9 ++-- .../xbmc-pvr/sleep.d/01_update_videodb | 41 +++++++++++++++++++ .../xbmc-pvr/sleep.d/02_update_musicdb | 41 +++++++++++++++++++ .../mediacenter/xbmc-pvr/sleep.d/61xbmc_lirc | 34 +++++++++++++++ .../mediacenter/xbmc-pvr/sleep.d/62xbmc-lcd | 34 +++++++++++++++ .../{rules.d => udev.d}/98-ps3remote.rules | 0 .../{rules.d => udev.d}/98-wiiremote.rules | 0 8 files changed, 156 insertions(+), 13 deletions(-) create mode 100755 packages/mediacenter/xbmc-pvr/sleep.d/01_update_videodb create mode 100755 packages/mediacenter/xbmc-pvr/sleep.d/02_update_musicdb create mode 100755 packages/mediacenter/xbmc-pvr/sleep.d/61xbmc_lirc create mode 100755 packages/mediacenter/xbmc-pvr/sleep.d/62xbmc-lcd rename packages/mediacenter/xbmc-pvr/{rules.d => udev.d}/98-ps3remote.rules (100%) rename packages/mediacenter/xbmc-pvr/{rules.d => udev.d}/98-wiiremote.rules (100%) diff --git a/packages/mediacenter/xbmc-pvr/build b/packages/mediacenter/xbmc-pvr/build index cf182af5f3..a204715ec7 100755 --- a/packages/mediacenter/xbmc-pvr/build +++ b/packages/mediacenter/xbmc-pvr/build @@ -46,12 +46,6 @@ else XBMC_DVDCSS="--disable-dvdcss" fi -if [ "$FAAC_SUPPORT" = yes ]; then - XBMC_FAAC="--enable-faac" -else - XBMC_FAAC="--disable-faac" -fi - if [ "$AVAHI_DAEMON" = yes ]; then XBMC_AVAHI="--enable-avahi" else @@ -125,7 +119,7 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag --exec-prefix=/usr \ --sysconfdir=/etc \ --datadir=/usr/share \ - SVN_REV=`cat svn.version` \ + GIT_REV=`cat git.version` \ --disable-debug \ --disable-optimizations \ --enable-gl \ @@ -142,7 +136,7 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag --disable-ccache \ $XBMC_PULSEAUDIO \ --enable-ffmpeg-libvorbis \ - $XBMC_FAAC \ + --disable-faac \ $XBMC_DVDCSS \ --disable-mid \ $XBMC_AVAHI \ diff --git a/packages/mediacenter/xbmc-pvr/install b/packages/mediacenter/xbmc-pvr/install index fb79bf15df..58d9f182bf 100755 --- a/packages/mediacenter/xbmc-pvr/install +++ b/packages/mediacenter/xbmc-pvr/install @@ -3,7 +3,6 @@ ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@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 @@ -65,13 +64,15 @@ mkdir -p $INSTALL/usr/share/xbmc/addons 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 + if [ "$WIIMOTE_SUPPORT" = yes ]; then mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote $INSTALL/usr/bin/xbmc-wiiremote mkdir -p $INSTALL/lib/udev cp $PKG_DIR/scripts/wiiremote_helper $INSTALL/lib/udev - mkdir -p $INSTALL/lib/udev/rules.d - cp $PKG_DIR/rules.d/98-wiiremote.rules $INSTALL/lib/udev/rules.d fi if [ "$PS3REMOTE_SUPPORT" = yes ]; then @@ -83,6 +84,4 @@ if [ "$PS3REMOTE_SUPPORT" = yes ]; then echo 'ICON_PATH="/usr/share/pixmaps/xbmc/"' > $PYTHON_LIBDIR/site-packages/xbmc/defs.py mkdir -p $INSTALL/lib/udev cp $PKG_DIR/scripts/ps3remote_helper $INSTALL/lib/udev - mkdir -p $INSTALL/lib/udev/rules.d - cp $PKG_DIR/rules.d/98-ps3remote.rules $INSTALL/lib/udev/rules.d fi diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/01_update_videodb b/packages/mediacenter/xbmc-pvr/sleep.d/01_update_videodb new file mode 100755 index 0000000000..ee72bfee67 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/sleep.d/01_update_videodb @@ -0,0 +1,41 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. /etc/profile + +OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" + +case "$1" in + thaw|resume) + ( + if [ -f "$OPENELEC_SETTINGS" ]; then + VIDEODBUPDATE=`grep WAKEUP_VIDEODBUPDATE $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + if [ "$VIDEODBUPDATE" = "true" ]; then + usleep 5000000 + xbmc-send --host=127.0.0.1 -a "UpdateLibrary(video)" + fi + fi + )& + ;; + *) exit $NA + ;; +esac diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/02_update_musicdb b/packages/mediacenter/xbmc-pvr/sleep.d/02_update_musicdb new file mode 100755 index 0000000000..7abc8c90da --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/sleep.d/02_update_musicdb @@ -0,0 +1,41 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. /etc/profile + +OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" + +case "$1" in + thaw|resume) + ( + if [ -f "$OPENELEC_SETTINGS" ]; then + MUSICDBUPDATE=`grep WAKEUP_MUSICDBUPDATE $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + if [ "$MUSICDBUPDATE" = "true" ]; then + usleep 5000000 + xbmc-send --host=127.0.0.1 -a "UpdateLibrary(music)" + fi + fi + )& + ;; + *) exit $NA + ;; +esac diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/61xbmc_lirc b/packages/mediacenter/xbmc-pvr/sleep.d/61xbmc_lirc new file mode 100755 index 0000000000..6df3ad6b31 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/sleep.d/61xbmc_lirc @@ -0,0 +1,34 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. /etc/profile + +case "$1" in + hibernate|suspend) + xbmc-send --host=127.0.0.1 -a "LIRC.Stop" + ;; + thaw|resume) + xbmc-send --host=127.0.0.1 -a "LIRC.Start" + ;; + *) exit $NA + ;; +esac diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/62xbmc-lcd b/packages/mediacenter/xbmc-pvr/sleep.d/62xbmc-lcd new file mode 100755 index 0000000000..7b93b3c3a3 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/sleep.d/62xbmc-lcd @@ -0,0 +1,34 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. /etc/profile + +case "$1" in + hibernate|suspend) + xbmc-send --host=127.0.0.1 -a "LCD.Suspend" + ;; + thaw|resume) + xbmc-send --host=127.0.0.1 -a "LCD.Resume" + ;; + *) exit $NA + ;; +esac diff --git a/packages/mediacenter/xbmc-pvr/rules.d/98-ps3remote.rules b/packages/mediacenter/xbmc-pvr/udev.d/98-ps3remote.rules similarity index 100% rename from packages/mediacenter/xbmc-pvr/rules.d/98-ps3remote.rules rename to packages/mediacenter/xbmc-pvr/udev.d/98-ps3remote.rules diff --git a/packages/mediacenter/xbmc-pvr/rules.d/98-wiiremote.rules b/packages/mediacenter/xbmc-pvr/udev.d/98-wiiremote.rules similarity index 100% rename from packages/mediacenter/xbmc-pvr/rules.d/98-wiiremote.rules rename to packages/mediacenter/xbmc-pvr/udev.d/98-wiiremote.rules From 5c9469655a3401981b1fee7522c08384c97b8ab0 Mon Sep 17 00:00:00 2001 From: Gujs Date: Wed, 2 Mar 2011 19:05:49 +0100 Subject: [PATCH 4/8] mkpkg: sync mkpkg_xbmc-dharma-pvr with mkpkg_xbmc-dharma-10.1 --- tools/mkpkg/mkpkg_xbmc-dharma-pvr | 60 ++++++++++++++++++------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/tools/mkpkg/mkpkg_xbmc-dharma-pvr b/tools/mkpkg/mkpkg_xbmc-dharma-pvr index 49c6333bf0..61f74aa5da 100755 --- a/tools/mkpkg/mkpkg_xbmc-dharma-pvr +++ b/tools/mkpkg/mkpkg_xbmc-dharma-pvr @@ -2,7 +2,6 @@ ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@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 @@ -20,49 +19,62 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -REV="10.0-Dharma" +PKG_NAME="xbmc-pvr" +PKG_VERSION="10.0-Dharma-pvr" +GIT_REPO="-b $PKG_VERSION git://github.com/opdenkamp/xbmc.git" +DEST_DIR="$PKG_NAME-$PKG_VERSION" echo "getting sources..." - git clone -b Dharma https://github.com/opdenkamp/xbmc.git xbmc-pvr - cd xbmc-pvr - git checkout 10.0-Dharma-pvr + if [ ! -d $DEST_DIR-latest ]; then + git clone $GIT_REPO $DEST_DIR-latest + fi + + cd $DEST_DIR-latest + git checkout $PKG_VERSION + git pull echo "getting version..." GIT_REV=`git log -n1 --format=%h` echo $GIT_REV - -echo "exporting sources..." - git checkout-index -a -f --prefix=../xbmc-pvr-$REV/ cd .. - echo "$GIT_REV" > xbmc-pvr-$REV/git.version -echo "seperating theme..." - rm -rf xbmc-pvr-theme-Confluence-$REV - mv xbmc-pvr-$REV/addons/skin.confluence xbmc-pvr-theme-Confluence-$REV +echo "copying sources..." + rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV + cp -R $DEST_DIR-latest $PKG_NAME-$PKG_VERSION-$GIT_REV + echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION-$GIT_REV/git.version echo "cleaning sources..." - rm -rf xbmc-pvr-$REV/visualisations - rm -rf xbmc-pvr-$REV/lib/libSDL-* - rm -rf xbmc-pvr-$REV/lib/libcurl-* - rm -rf xbmc-pvr-$REV/project + rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/.git + +echo "seperating theme..." + rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV + mv $PKG_NAME-$PKG_VERSION-$GIT_REV/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV + +echo "cleaning sources..." + rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/visualisations + rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/lib/libSDL-* + rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/lib/libcurl-* + rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/project for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \ "PackageMaker" "Translator" "XBMCLive" "XprPack" \ "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do - rm -rf xbmc-pvr-$REV/tools/$i + rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/tools/$i done for i in dll a lib so bat; do - find xbmc-pvr-$REV -name *.$i -exec rm -rf {} ";" + find $PKG_NAME-$PKG_VERSION-$GIT_REV -name *.$i -exec rm -rf {} ";" done # bundled win32 binaries - rm -r xbmc-pvr-$REV/xbmc/visualizations/XBMCProjectM/win32 + rm -r $PKG_NAME-$PKG_VERSION-$GIT_REV/xbmc/visualizations/XBMCProjectM/win32 echo "packing sources..." - tar cvjf xbmc-pvr-$REV.tar.bz2 xbmc-pvr-$REV - tar cvjf xbmc-pvr-theme-Confluence-$REV.tar.bz2 xbmc-pvr-theme-Confluence-$REV + tar cvjf $PKG_NAME-$PKG_VERSION-$GIT_REV.tar.bz2 $PKG_NAME-$PKG_VERSION-$GIT_REV + tar cvjf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV.tar.bz2 $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV + +echo "remove temporary sourcedir..." + rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV + rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV + -# echo "remove temporary sourcedir..." -# rm -rf xbmc-pvr-$REV -# rm -rf xbmc-pvr-theme-Confluence-$REV From b35825d33d351bcd2aaa5a6ae53c6461b52d64bf Mon Sep 17 00:00:00 2001 From: Gujs Date: Wed, 2 Mar 2011 19:07:50 +0100 Subject: [PATCH 5/8] xbmc-pvr: une new source package --- packages/mediacenter/xbmc-pvr-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc-pvr/meta | 3 ++- ...arma-pvr-7647593-002-arm_remove_forced_python2.5-0.1.patch} | 0 ...0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch} | 0 ...-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch} | 0 ...-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch} | 0 ...Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch} | 0 ...-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch} | 0 ...vr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...harma-pvr-7647593-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} | 0 ...-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch} | 0 ...0.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...7593-403-openssl_only_needed_for_internal_python-0.1.patch} | 0 ...xbmc-pvr-10.0-Dharma-pvr-7647593-451-full_splash-0.1.patch} | 0 ...r-10.0-Dharma-pvr-7647593-452-change_lcd_content-0.1.patch} | 0 ...-Dharma-pvr-7647593-452-ps3_remote_be_more_quiet-0.1.patch} | 0 ...a-pvr-7647593-462-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...-10.0-Dharma-pvr-7647593-463-add_remote_devinput-0.1.patch} | 0 ...501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch} | 0 ...-pvr-7647593-901-advancedsettings_alwaysextractflags.patch} | 0 ...3-902-advancedsettings_videolibrary.flattenmoviesets.patch} | 0 21 files changed, 3 insertions(+), 2 deletions(-) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-002-arm_remove_forced_python2.5-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-002-arm_remove_forced_python2.5-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-201-let_select_XBMCProjectM-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-202-let_select_RSXS-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-301-correct_lzo_include-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-302-dont_hardcode_usr_include-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-303-WiiRemote_crosscompiling-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-321-CrystalHD_use_yuy2_to_yv12-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-401-we_dont_need_libXinerama-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-403-openssl_only_needed_for_internal_python-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-403-openssl_only_needed_for_internal_python-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-451-full_splash-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-451-full_splash-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-452-change_lcd_content-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-452-ps3_remote_be_more_quiet-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-452-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-463-add_remote_devinput-0.1.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-901-advancedsettings_alwaysextractflags.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-901-advancedsettings_alwaysextractflags.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-902-advancedsettings_videolibrary.flattenmoviesets.patch => xbmc-pvr-10.0-Dharma-pvr-7647593-902-advancedsettings_videolibrary.flattenmoviesets.patch} (100%) diff --git a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta index 6f093427e1..b9779d7f8b 100644 --- a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-pvr-theme-Confluence" -PKG_VERSION="10.0-Dharma" +PKG_VERSION="10.0-Dharma-pvr-7647593" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta index 642241f8ed..660cf36fc1 100644 --- a/packages/mediacenter/xbmc-pvr/meta +++ b/packages/mediacenter/xbmc-pvr/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-pvr" -PKG_VERSION="10.0-Dharma" +PKG_VERSION="10.0-Dharma-pvr-7647593" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -74,3 +74,4 @@ fi if [ "$PS3REMOTE_SUPPORT" = yes ]; then PKG_DEPENDS="$PKG_DEPENDS PyBluez" fi + diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-002-arm_remove_forced_python2.5-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-002-arm_remove_forced_python2.5-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-002-arm_remove_forced_python2.5-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-002-arm_remove_forced_python2.5-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-301-correct_lzo_include-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-301-correct_lzo_include-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-302-dont_hardcode_usr_include-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-302-dont_hardcode_usr_include-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-303-WiiRemote_crosscompiling-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-303-WiiRemote_crosscompiling-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-321-CrystalHD_use_yuy2_to_yv12-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-321-CrystalHD_use_yuy2_to_yv12-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-321-CrystalHD_use_yuy2_to_yv12-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-401-we_dont_need_libXinerama-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-401-we_dont_need_libXinerama-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-403-openssl_only_needed_for_internal_python-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-403-openssl_only_needed_for_internal_python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-403-openssl_only_needed_for_internal_python-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-403-openssl_only_needed_for_internal_python-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-451-full_splash-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-451-full_splash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-451-full_splash-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-451-full_splash-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-452-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-452-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-901-advancedsettings_alwaysextractflags.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-902-advancedsettings_videolibrary.flattenmoviesets.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-902-advancedsettings_videolibrary.flattenmoviesets.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-902-advancedsettings_videolibrary.flattenmoviesets.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-902-advancedsettings_videolibrary.flattenmoviesets.patch From b89aaaad224b2cd2d6b0e28235faa7bfa0eee0b5 Mon Sep 17 00:00:00 2001 From: Gujs Date: Wed, 2 Mar 2011 21:03:10 +0100 Subject: [PATCH 6/8] xbmc-pvr: change package to build opdenkamp xbmc master pvr branch --- .../xbmc-pvr-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc-pvr/build | 10 +- packages/mediacenter/xbmc-pvr/meta | 2 +- ...sh-0.1.patch => 451-full_splash-0.1.patch} | 0 ...-002-arm_remove_forced_python2.5-0.1.patch | 15 --- ...-7647593-301-correct_lzo_include-0.1.patch | 28 ----- ...93-302-dont_hardcode_usr_include-0.1.patch | 29 ----- ...593-303-WiiRemote_crosscompiling-0.1.patch | 53 -------- ...vr-7647593-303-fix_libdvd_xFLAGS-0.1.patch | 119 ------------------ ...593-401-we_dont_need_libXinerama-0.1.patch | 13 -- ...eam_mode_improperly_set-Ticket-10981.patch | 12 -- ...ttings_videolibrary.flattenmoviesets.patch | 24 ---- ...heck_for_Confluence_at_configure-0.1.patch | 12 ++ ...563-201-let_select_XBMCProjectM-0.1.patch} | 14 ++- ...ter-2a1a563-202-let_select_RSXS-0.1.patch} | 8 +- ...er-2a1a563-303-fix_libdvd_xFLAGS-0.1.patch | 119 ++++++++++++++++++ ...-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} | 0 ...1a563-402-enable_yasm_in_ffmpeg-0.1.patch} | 2 +- ...only_needed_for_internal_python-0.1.patch} | 0 ...-2a1a563-452-change_lcd_content-0.1.patch} | 0 ...63-452-ps3_remote_be_more_quiet-0.1.patch} | 0 ...-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...2a1a563-463-add_remote_devinput-0.1.patch} | 0 ...advancedsettings_alwaysextractflags.patch} | 4 +- tools/mkpkg/mkpkg_xbmc-master-pvr | 80 ++++++++++++ 25 files changed, 233 insertions(+), 313 deletions(-) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-451-full_splash-0.1.patch => 451-full_splash-0.1.patch} (100%) delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-002-arm_remove_forced_python2.5-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-902-advancedsettings_videolibrary.flattenmoviesets.patch create mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-101-don_not_check_for_Confluence_at_configure-0.1.patch rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch => xbmc-pvr-master-2a1a563-201-let_select_XBMCProjectM-0.1.patch} (95%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch => xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch} (95%) create mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-303-fix_libdvd_xFLAGS-0.1.patch rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-321-CrystalHD_use_yuy2_to_yv12-0.1.patch => xbmc-pvr-master-2a1a563-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-pvr-master-2a1a563-402-enable_yasm_in_ffmpeg-0.1.patch} (92%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-403-openssl_only_needed_for_internal_python-0.1.patch => xbmc-pvr-master-2a1a563-403-openssl_only_needed_for_internal_python-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-452-change_lcd_content-0.1.patch => xbmc-pvr-master-2a1a563-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-452-ps3_remote_be_more_quiet-0.1.patch => xbmc-pvr-master-2a1a563-452-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-pvr-master-2a1a563-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-463-add_remote_devinput-0.1.patch => xbmc-pvr-master-2a1a563-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-10.0-Dharma-pvr-7647593-901-advancedsettings_alwaysextractflags.patch => xbmc-pvr-master-2a1a563-901-advancedsettings_alwaysextractflags.patch} (87%) create mode 100755 tools/mkpkg/mkpkg_xbmc-master-pvr diff --git a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta index b9779d7f8b..03bbb17de6 100644 --- a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-pvr-theme-Confluence" -PKG_VERSION="10.0-Dharma-pvr-7647593" +PKG_VERSION="master-2a1a563" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-pvr/build b/packages/mediacenter/xbmc-pvr/build index a204715ec7..237dc994f9 100755 --- a/packages/mediacenter/xbmc-pvr/build +++ b/packages/mediacenter/xbmc-pvr/build @@ -106,10 +106,10 @@ cd $PKG_BUILD do_autoreconf do_autoreconf lib/cpluff [ -d lib/libass ] && do_autoreconf lib/libass -[ -d xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ] && do_autoreconf xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss -do_autoreconf xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread -do_autoreconf xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav -do_autoreconf xbmc/lib/libid3tag/libid3tag +[ -d lib/libdvd/libdvdcss ] && do_autoreconf lib/libdvd/libdvdcss +do_autoreconf lib/libdvd/libdvdread +do_autoreconf lib/libdvd/libdvdnav +do_autoreconf lib/libid3tag/libid3tag ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ @@ -153,7 +153,7 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag --enable-external-python \ # setup default skin inside the sources - sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/Settings.h + sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/settings/Settings.h make externals make xbmc.bin diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta index 660cf36fc1..417d40ad55 100644 --- a/packages/mediacenter/xbmc-pvr/meta +++ b/packages/mediacenter/xbmc-pvr/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-pvr" -PKG_VERSION="10.0-Dharma-pvr-7647593" +PKG_VERSION="master-2a1a563" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-451-full_splash-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/451-full_splash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-451-full_splash-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/451-full_splash-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-002-arm_remove_forced_python2.5-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-002-arm_remove_forced_python2.5-0.1.patch deleted file mode 100644 index f90ee1faa0..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-002-arm_remove_forced_python2.5-0.1.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur xbmc-dharma-35100/Makefile.in xbmc-dharma-35100.patch/Makefile.in ---- xbmc-dharma-35100/Makefile.in 2010-10-30 05:36:41.000000000 +0200 -+++ xbmc-dharma-35100.patch/Makefile.in 2010-11-01 04:53:48.542705631 +0100 -@@ -471,11 +471,6 @@ - xbmc/cores/DllLoader/exports/util/exports_utils.a \ - xbmc/cores/DllLoader/exports/exports.a - --ifeq (arm, $(ARCH)) --# Force external python2.5 for now! --LIBS +=-lpython2.5 --endif -- - xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC) - ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch deleted file mode 100644 index d9b5732f81..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in ---- xbmc-31903/configure.in 2010-07-17 16:50:02.838501479 +0200 -+++ xbmc-31903.patch/configure.in 2010-07-17 16:50:20.633376618 +0200 -@@ -1205,12 +1205,6 @@ - final_message="$final_message\n MID Support:\tNo" - fi - --if test -d "/usr/include/lzo"; then -- INCLUDES="$INCLUDES -I/usr/include/lzo" --else -- INCLUDES="$INCLUDES" --fi -- - if test "x$use_ccache" != "xno"; then - AC_PATH_PROG(CCACHE,ccache,none) - if test "$ac_cv_path_CCACHE" = "none"; then -diff -Naur xbmc-31903/tools/TexturePacker/XBMCTex.cpp xbmc-31903.patch/tools/TexturePacker/XBMCTex.cpp ---- xbmc-31903/tools/TexturePacker/XBMCTex.cpp 2010-07-17 16:28:40.000000000 +0200 -+++ xbmc-31903.patch/tools/TexturePacker/XBMCTex.cpp 2010-07-17 16:50:20.634375824 +0200 -@@ -37,7 +37,7 @@ - #endif - - #ifdef _LINUX --#include -+#include - #else - #include "../../xbmc/lib/liblzo/LZO1X.H" - #endif diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch deleted file mode 100644 index 33af095f6e..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur xbmc-28910/guilib/Makefile.in xbmc-28910.patch/guilib/Makefile.in ---- xbmc-28910/guilib/Makefile.in 2010-03-28 17:12:32.000000000 +0200 -+++ xbmc-28910.patch/guilib/Makefile.in 2010-03-28 19:13:23.816629379 +0200 -@@ -1,4 +1,4 @@ --INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/linux -I../xbmc/utils -I/usr/include/freetype2 -I/usr/include/SDL -I../xbmc/lib/libsquish -+INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish - ifneq (@USE_EXTERNAL_FFMPEG@,1) - INCLUDES+=-I../xbmc/cores/dvdplayer/Codecs/ffmpeg - endif -diff -Naur xbmc-28910/xbmc/FileSystem/Makefile.in xbmc-28910.patch/xbmc/FileSystem/Makefile.in ---- xbmc-28910/xbmc/FileSystem/Makefile.in 2010-03-28 17:14:55.000000000 +0200 -+++ xbmc-28910.patch/xbmc/FileSystem/Makefile.in 2010-03-28 19:13:23.834753245 +0200 -@@ -1,6 +1,6 @@ - ARCH=@ARCH@ - --INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I../lib -+INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I../lib - INCLUDES+=-I../lib/libcdio/libcdio/include - ifeq ($(findstring osx,$(ARCH)), osx) - INCLUDES+=-I../../lib/libcurl-OSX/include -diff -Naur xbmc-28910/xbmc/Makefile.in xbmc-28910.patch/xbmc/Makefile.in ---- xbmc-28910/xbmc/Makefile.in 2010-03-28 17:13:35.000000000 +0200 -+++ xbmc-28910.patch/xbmc/Makefile.in 2010-03-28 19:13:23.837752973 +0200 -@@ -1,4 +1,4 @@ --INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer -+INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer - - ifneq (@USE_EXTERNAL_FFMPEG@,1) - INCLUDES+=-Icores/dvdplayer/Codecs/ffmpeg diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch deleted file mode 100644 index e63840a6da..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/Makefile ---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/Makefile 2010-09-19 14:54:08.000000000 +0200 -+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/Makefile 2010-09-21 20:31:58.649299449 +0200 -@@ -1,3 +1,4 @@ -+CXX ?= g++ - CFLAGS = -Wall -pipe -fPIC -funroll-loops - OBJ_DIR = release-$(shell $(CC) -v 2>&1|grep ^Target:|cut -d' ' -f2) - OBJS = wiiuse_v0.12/src/$(OBJ_DIR)/libwiiuse.so -@@ -6,7 +7,7 @@ - - all: - @$(MAKE) -C wiiuse_$(VERSION)/src $@ -- g++ $(CFLAGS) WiiUse_WiiRemote.cpp $(OBJS) -o $(BIN) -+ $(CXX) $(CFLAGS) -I./wiiuse_$(VERSION)/src WiiUse_WiiRemote.cpp $(OBJS) -o $(BIN) - wiiuse: - @$(MAKE) -C wiiuse_$(VERSION)/src - clean: -diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile ---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile 2010-09-19 14:54:08.000000000 +0200 -+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile 2010-09-21 20:28:15.388265664 +0200 -@@ -5,7 +5,7 @@ - # - # Change this to your GCC version. - # --CC = gcc -+CC ?= gcc - - #################################################### - # -diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile ---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile 2010-09-19 14:54:08.000000000 +0200 -+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile 2010-09-21 20:28:22.476390252 +0200 -@@ -5,7 +5,7 @@ - # - # Change this to your GCC version. - # --CC = gcc -+CC ?= gcc - - #################################################### - # -diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile ---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile 2010-09-19 14:54:08.000000000 +0200 -+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile 2010-09-21 20:28:32.447265813 +0200 -@@ -5,7 +5,7 @@ - # - # Change this to your GCC version. - # --CC = gcc -+CC ?= gcc - - #################################################### - # diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch deleted file mode 100644 index d3155b02bc..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in 2010-09-04 04:22:52.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in 2010-09-06 00:34:45.247116875 +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-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh 2010-09-04 04:22:50.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh 2010-09-06 00:30:38.943396556 +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-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in 2010-09-04 04:22:50.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in 2010-09-06 00:31:04.643116783 +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-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2010-09-04 04:22:50.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2010-09-06 00:31:31.665116765 +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-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in 2010-09-04 04:22:50.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in 2010-09-06 00:31:18.193116906 +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-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in 2010-09-04 04:22:51.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in 2010-09-06 00:32:18.255991830 +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-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh 2010-09-04 04:22:51.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh 2010-09-06 00:32:35.283991243 +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-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in ---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in 2010-09-04 04:22:51.000000000 +0200 -+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in 2010-09-06 00:32:57.831991741 +0200 -@@ -7,5 +7,5 @@ - Description: Low level DVD access library - Version: @VERSION@ - --Cflags: -I${includedir} --Libs: -L${libdir} -ldvdread -+Cflags: -I. -+Libs: -ldvdread diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch deleted file mode 100644 index c3e6dea659..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in ---- xbmc-31903/configure.in 2010-07-17 16:50:57.045376680 +0200 -+++ xbmc-31903.patch/configure.in 2010-07-17 16:52:57.912501212 +0200 -@@ -585,9 +585,6 @@ - PKG_CHECK_MODULES([XMU], [xmu], - [INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"], - AC_MSG_ERROR($missing_library)) -- PKG_CHECK_MODULES([XINERAMA],[xinerama], -- [INCLUDES="$INCLUDES $XINERAMA_CFLAGS"; LIBS="$LIBS $XINERAMA_LIBS"], -- AC_MSG_ERROR($missing_library)) - PKG_CHECK_MODULES([CURL], [libcurl], - [INCLUDES="$INCLUDES $CURL_CFLAGS"; LIBS="$LIBS $CURL_LIBS"], - AC_MSG_ERROR($missing_library)) diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch deleted file mode 100644 index a77ad31d11..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xbmc-10.0-Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c xbmc-10.0-Dharma.patch/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c ---- xbmc-10.0-Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c 2010-12-17 20:13:36.000000000 +0100 -+++ xbmc-10.0-Dharma.patch/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c 2011-01-07 01:19:48.721555949 +0100 -@@ -108,7 +108,7 @@ - static int spdif_header_ac3(AVFormatContext *s, AVPacket *pkt) - { - IEC958Context *ctx = s->priv_data; -- int bitstream_mode = pkt->data[6] & 0x7; -+ int bitstream_mode = pkt->data[5] & 0x7; - - ctx->data_type = IEC958_AC3 | (bitstream_mode << 8); - ctx->pkt_offset = AC3_FRAME_SIZE << 2; diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-902-advancedsettings_videolibrary.flattenmoviesets.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-902-advancedsettings_videolibrary.flattenmoviesets.patch deleted file mode 100644 index a22d3acb65..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-902-advancedsettings_videolibrary.flattenmoviesets.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/GUISettings.cpp ---- xbmc-dharma-35003/xbmc/GUISettings.cpp 2010-10-25 23:37:10.165043528 +0200 -+++ xbmc-dharma-35003.patch/xbmc/GUISettings.cpp 2010-10-25 23:37:27.888251923 +0200 -@@ -528,6 +528,7 @@ - AddBool(NULL, "videolibrary.seasonthumbs", 20382, true); - AddBool(vdl, "videolibrary.actorthumbs", 20402, true); - AddInt(vdl, "videolibrary.flattentvshows", 20412, 1, 0, 1, 2, SPIN_CONTROL_TEXT); -+ AddBool(NULL, "videolibrary.flattenmoviesets", 22002, false); - AddBool(vdl, "videolibrary.updateonstartup", 22000, false); - AddBool(vdl, "videolibrary.backgroundupdate", 22001, false); - AddSeparator(vdl, "videolibrary.sep3"); -diff -Naur xbmc-dharma-35003/xbmc/VideoDatabase.cpp xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp ---- xbmc-dharma-35003/xbmc/VideoDatabase.cpp 2010-10-25 15:36:19.000000000 +0200 -+++ xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp 2010-10-25 23:37:27.887251911 +0200 -@@ -4394,7 +4394,7 @@ - if (NULL == m_pDS.get()) return false; - - CStdString strSQL = "select * from movieview "; -- if (fetchSets) -+ if (fetchSets && !g_guiSettings.GetBool("videolibrary.flattenmoviesets")) - { - // not getting a set, so grab all sets that match this where clause first - CStdString setsWhere; -diff -Naur xbmc-dharma-35003/xbmc/VideoDatabase.cpp.orig xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp.orig diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-101-don_not_check_for_Confluence_at_configure-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-101-don_not_check_for_Confluence_at_configure-0.1.patch new file mode 100644 index 0000000000..9d6c19c81d --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-101-don_not_check_for_Confluence_at_configure-0.1.patch @@ -0,0 +1,12 @@ +diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in +--- xbmc-31903/configure.in 2011-03-02 20:11:20.857533002 +0100 ++++ xbmc-31903.patch/configure.in 2011-03-02 20:21:14.527533001 +0100 +@@ -25154,7 +25154,6 @@ + + OUTPUT_FILES="Makefile \ + Makefile.include \ +- addons/skin.confluence/media/Makefile \ + xbmc/Makefile \ + xbmc/cdrip/Makefile \ + xbmc/cores/Makefile \ + diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-201-let_select_XBMCProjectM-0.1.patch similarity index 95% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-201-let_select_XBMCProjectM-0.1.patch index 8da9696e60..db6e1e80ba 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-201-let_select_XBMCProjectM-0.1.patch @@ -73,18 +73,20 @@ diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in --- xbmc-31903/Makefile.in 2010-07-17 16:25:37.000000000 +0200 +++ xbmc-31903.patch/Makefile.in 2010-07-17 16:46:16.391376663 +0200 @@ -108,8 +108,10 @@ - - VIS_DIRS=\ + ifeq (@USE_OPENGL@,1) + VIS_DIRS+=\ xbmc/visualizations/OpenGLSpectrum \ - xbmc/visualizations/WaveForm \ -- xbmc/visualizations/XBMCProjectM +- xbmc/visualizations/XBMCProjectM \ + xbmc/visualizations/WaveForm + + endif +ifneq (@BUILD_XBMCPROJECTM@,1) +VIS_DIRS+=xbmc/visualizations/XBMCProjectM +endif - ifeq ($(findstring osx,$(ARCH)), osx) - VIS_DIRS+=xbmc/visualizations/iTunes - endif + ifeq ($(findstring osx,@ARCH@), osx) + VIS_DIRS+=xbmc/visualizations/iTunes \ + @@ -307,7 +309,9 @@ ifneq (arm, $(ARCH)) $(MAKE) -C xbmc/visualizations/OpenGLSpectrum diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch similarity index 95% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch index 378eb81c50..b9be5bba6c 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch @@ -86,14 +86,14 @@ diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in VIS_DIRS=\ xbmc/visualizations/OpenGLSpectrum \ @@ -323,8 +325,10 @@ - $(MAKE) -C xbmc/pvrclients/tvheadend + $(MAKE) -C xbmc/pvrclients/tvheadend screensavers: exports - ifneq (arm, $(ARCH)) + ifneq (arm, @ARCH@) +ifneq (@BUILD_RSXS@,1) $(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc endif +endif libaddon: exports - $(MAKE) -C lib/addons/library.xbmc.addon - $(MAKE) -C lib/addons/library.xbmc.gui + $(MAKE) -C lib/addons/library.xbmc.addon + $(MAKE) -C lib/addons/library.xbmc.gui diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-303-fix_libdvd_xFLAGS-0.1.patch new file mode 100644 index 0000000000..2e1713f760 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-303-fix_libdvd_xFLAGS-0.1.patch @@ -0,0 +1,119 @@ +diff -Naur xbmc-dharma-33517/lib/libdvd/libdvdcss/src/libdvdcss.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in +--- xbmc-dharma-33517/lib/libdvd/libdvdcss/src/libdvdcss.pc.in 2010-09-04 04:22:52.000000000 +0200 ++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdcss/src/libdvdcss.pc.in 2010-09-06 00:34:45.247116875 +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-dharma-33517/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh +--- xbmc-dharma-33517/xbmc/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh 2010-09-04 04:22:50.000000000 +0200 ++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh 2010-09-06 00:30:38.943396556 +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-dharma-33517/lib/libdvd/libdvdnav/misc/dvdnav-config.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in +--- xbmc-dharma-33517/lib/libdvd/libdvdnav/misc/dvdnav-config.in 2010-09-04 04:22:50.000000000 +0200 ++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdnav/misc/dvdnav-config.in 2010-09-06 00:31:04.643116783 +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-dharma-33517/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in +--- xbmc-dharma-33517/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2010-09-04 04:22:50.000000000 +0200 ++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2010-09-06 00:31:31.665116765 +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-dharma-33517/lib/libdvd/libdvdnav/misc/dvdnav.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in +--- xbmc-dharma-33517/lib/libdvd/libdvdnav/misc/dvdnav.pc.in 2010-09-04 04:22:50.000000000 +0200 ++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdnav/misc/dvdnav.pc.in 2010-09-06 00:31:18.193116906 +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-dharma-33517/lib/libdvd/libdvdread/misc/dvdread-config.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in +--- xbmc-dharma-33517/lib/libdvd/libdvdread/misc/dvdread-config.in 2010-09-04 04:22:51.000000000 +0200 ++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdread/misc/dvdread-config.in 2010-09-06 00:32:18.255991830 +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-dharma-33517/lib/libdvd/libdvdread/misc/dvdread-config.sh xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh +--- xbmc-dharma-33517/lib/libdvd/libdvdread/misc/dvdread-config.sh 2010-09-04 04:22:51.000000000 +0200 ++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdread/misc/dvdread-config.sh 2010-09-06 00:32:35.283991243 +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-dharma-33517/lib/libdvd/libdvdread/misc/dvdread.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in +--- xbmc-dharma-33517/lib/libdvd/libdvdread/misc/dvdread.pc.in 2010-09-04 04:22:51.000000000 +0200 ++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdread/misc/dvdread.pc.in 2010-09-06 00:32:57.831991741 +0200 +@@ -7,5 +7,5 @@ + Description: Low level DVD access library + Version: @VERSION@ + +-Cflags: -I${includedir} +-Libs: -L${libdir} -ldvdread ++Cflags: -I. ++Libs: -ldvdread diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-321-CrystalHD_use_yuy2_to_yv12-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-321-CrystalHD_use_yuy2_to_yv12-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-321-CrystalHD_use_yuy2_to_yv12-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 92% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-402-enable_yasm_in_ffmpeg-0.1.patch index f2db6fd5a2..296379243d 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-402-enable_yasm_in_ffmpeg-0.1.patch @@ -6,9 +6,9 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in fi +AC_CHECK_PROG(HAVE_YASM,yasm,"yes","no",) - AC_CHECK_PROG(HAVE_SVNVERSION,svnversion,"yes","no",) AC_CHECK_PROG(HAVE_GIT,git,"yes","no",) + # Checks for header files. @@ -1639,6 +1640,7 @@ `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\ `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\ diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-403-openssl_only_needed_for_internal_python-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-403-openssl_only_needed_for_internal_python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-403-openssl_only_needed_for_internal_python-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-403-openssl_only_needed_for_internal_python-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-901-advancedsettings_alwaysextractflags.patch similarity index 87% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-901-advancedsettings_alwaysextractflags.patch index de16d8ec29..2861db307a 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-901-advancedsettings_alwaysextractflags.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-901-advancedsettings_alwaysextractflags.patch @@ -1,6 +1,6 @@ diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/GUISettings.cpp ---- xbmc-dharma-35003/xbmc/GUISettings.cpp 2010-10-25 15:36:18.000000000 +0200 -+++ xbmc-dharma-35003.patch/xbmc/GUISettings.cpp 2010-10-25 23:34:14.131974258 +0200 +--- xbmc-dharma-35003/xbmc/settings/GUISettings.cpp 2010-10-25 15:36:18.000000000 +0200 ++++ xbmc-dharma-35003.patch/xbmc/settings/GUISettings.cpp 2010-10-25 23:34:14.131974258 +0200 @@ -618,6 +618,7 @@ AddInt(vid, "myvideos.selectaction", 22079, SELECT_ACTION_PLAY_OR_RESUME, SELECT_ACTION_CHOOSE, 1, SELECT_ACTION_INFO, SPIN_CONTROL_TEXT); AddBool(NULL, "myvideos.treatstackasfile", 20051, true); diff --git a/tools/mkpkg/mkpkg_xbmc-master-pvr b/tools/mkpkg/mkpkg_xbmc-master-pvr new file mode 100755 index 0000000000..3883e58b51 --- /dev/null +++ b/tools/mkpkg/mkpkg_xbmc-master-pvr @@ -0,0 +1,80 @@ +#!/bin/sh +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="xbmc-pvr" +PKG_VERSION="master" +GIT_REPO="-b $PKG_VERSION git://github.com/opdenkamp/xbmc.git" +DEST_DIR="$PKG_NAME-$PKG_VERSION" + +echo "getting sources..." + if [ ! -d $DEST_DIR-latest ]; then + git clone $GIT_REPO $DEST_DIR-latest + fi + + cd $DEST_DIR-latest + git checkout $PKG_VERSION + git pull + +echo "getting version..." + GIT_REV=`git log -n1 --format=%h` + echo $GIT_REV + cd .. + +echo "copying sources..." + rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV + cp -R $DEST_DIR-latest $PKG_NAME-$PKG_VERSION-$GIT_REV + echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION-$GIT_REV/git.version + +echo "cleaning sources..." + rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/.git + +echo "seperating theme..." + rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV + mv $PKG_NAME-$PKG_VERSION-$GIT_REV/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV + +echo "cleaning sources..." + rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/visualisations + rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/lib/libSDL-* + rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/lib/libcurl-* + rm -rf $PKG_NAME-$PKG_VERSION-$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-$PKG_VERSION-$GIT_REV/tools/$i + done + + for i in dll a lib so bat; do + find $PKG_NAME-$PKG_VERSION-$GIT_REV -name *.$i -exec rm -rf {} ";" + done + + # bundled win32 binaries + rm -r $PKG_NAME-$PKG_VERSION-$GIT_REV/xbmc/visualizations/XBMCProjectM/win32 + +echo "packing sources..." + tar cvjf $PKG_NAME-$PKG_VERSION-$GIT_REV.tar.bz2 $PKG_NAME-$PKG_VERSION-$GIT_REV + tar cvjf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV.tar.bz2 $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV + +echo "remove temporary sourcedir..." + rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV + rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV + + From cf7a171ae4c9dd540f3a083a1031a5dafc4ecd6a Mon Sep 17 00:00:00 2001 From: Gujs Date: Sun, 3 Apr 2011 23:34:10 +0200 Subject: [PATCH 7/8] xbmc-pvr: update to latest git version --- .../xbmc-pvr-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc-pvr/build | 1 + packages/mediacenter/xbmc-pvr/meta | 7 +++---- ...eck_for_Confluence_at_configure-0.1.patch} | 0 ...3ef-201-let_select_XBMCProjectM-0.1.patch} | 0 ...ter-05bd3ef-202-let_select_RSXS-0.1.patch} | 4 ++-- ...r-05bd3ef-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} | 0 ...bd3ef-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ..._only_needed_for_internal_python-0.1.patch | 12 +++++++++++ ...-05bd3ef-452-change_lcd_content-0.1.patch} | 0 ...ef-452-ps3_remote_be_more_quiet-0.1.patch} | 0 ...-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...05bd3ef-463-add_remote_devinput-0.1.patch} | 0 ...advancedsettings_alwaysextractflags.patch} | 0 ..._only_needed_for_internal_python-0.1.patch | 21 ------------------- 16 files changed, 19 insertions(+), 28 deletions(-) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-101-don_not_check_for_Confluence_at_configure-0.1.patch => xbmc-pvr-master-05bd3ef-101-don_not_check_for_Confluence_at_configure-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-201-let_select_XBMCProjectM-0.1.patch => xbmc-pvr-master-05bd3ef-201-let_select_XBMCProjectM-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch => xbmc-pvr-master-05bd3ef-202-let_select_RSXS-0.1.patch} (97%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-pvr-master-05bd3ef-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-321-CrystalHD_use_yuy2_to_yv12-0.1.patch => xbmc-pvr-master-05bd3ef-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-pvr-master-05bd3ef-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) create mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-403-openssl_only_needed_for_internal_python-0.1.patch rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-452-change_lcd_content-0.1.patch => xbmc-pvr-master-05bd3ef-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-452-ps3_remote_be_more_quiet-0.1.patch => xbmc-pvr-master-05bd3ef-452-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-pvr-master-05bd3ef-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-463-add_remote_devinput-0.1.patch => xbmc-pvr-master-05bd3ef-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-2a1a563-901-advancedsettings_alwaysextractflags.patch => xbmc-pvr-master-05bd3ef-901-advancedsettings_alwaysextractflags.patch} (100%) delete mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-403-openssl_only_needed_for_internal_python-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta index 03bbb17de6..4218e3bfee 100644 --- a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-pvr-theme-Confluence" -PKG_VERSION="master-2a1a563" +PKG_VERSION="master-05bd3ef" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-pvr/build b/packages/mediacenter/xbmc-pvr/build index 237dc994f9..ff67104751 100755 --- a/packages/mediacenter/xbmc-pvr/build +++ b/packages/mediacenter/xbmc-pvr/build @@ -137,6 +137,7 @@ do_autoreconf lib/libid3tag/libid3tag $XBMC_PULSEAUDIO \ --enable-ffmpeg-libvorbis \ --disable-faac \ + --enable-lame \ $XBMC_DVDCSS \ --disable-mid \ $XBMC_AVAHI \ diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta index 417d40ad55..a6a2318c2e 100644 --- a/packages/mediacenter/xbmc-pvr/meta +++ b/packages/mediacenter/xbmc-pvr/meta @@ -19,15 +19,15 @@ ################################################################################ PKG_NAME="xbmc-pvr" -PKG_VERSION="master-2a1a563" +PKG_VERSION="master-05bd3ef" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" #PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_URL="http://gujs.openelec.tv/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc xbmc-addon-settings" -PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba" +PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc xbmc-addon-settings" +PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" PKG_SHORTDESC="xbmc-pvr: XBMC Mediacenter" @@ -74,4 +74,3 @@ fi if [ "$PS3REMOTE_SUPPORT" = yes ]; then PKG_DEPENDS="$PKG_DEPENDS PyBluez" fi - diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-101-don_not_check_for_Confluence_at_configure-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-101-don_not_check_for_Confluence_at_configure-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-101-don_not_check_for_Confluence_at_configure-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-101-don_not_check_for_Confluence_at_configure-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-201-let_select_XBMCProjectM-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-201-let_select_XBMCProjectM-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-202-let_select_RSXS-0.1.patch similarity index 97% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-202-let_select_RSXS-0.1.patch index b9be5bba6c..5c1de763ae 100644 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-202-let_select_RSXS-0.1.patch @@ -85,10 +85,10 @@ diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in VIS_DIRS=\ xbmc/visualizations/OpenGLSpectrum \ -@@ -323,8 +325,10 @@ +@@ -483,8 +485,10 @@ $(MAKE) -C xbmc/pvrclients/tvheadend screensavers: exports - ifneq (arm, @ARCH@) + ifneq ($(findstring arm,@ARCH@), arm) +ifneq (@BUILD_RSXS@,1) $(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc endif diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-321-CrystalHD_use_yuy2_to_yv12-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-321-CrystalHD_use_yuy2_to_yv12-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-321-CrystalHD_use_yuy2_to_yv12-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-403-openssl_only_needed_for_internal_python-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-403-openssl_only_needed_for_internal_python-0.1.patch new file mode 100644 index 0000000000..2daf7ad2fe --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-403-openssl_only_needed_for_internal_python-0.1.patch @@ -0,0 +1,12 @@ +diff -Naur xbmc-10.0-Dharma/configure.in xbmc-10.0-Dharma.patch/configure.in +--- xbmc-10.0-Dharma/configure.in 2010-12-17 20:30:53.000000000 +0100 ++++ xbmc-10.0-Dharma.patch/configure.in 2011-01-06 03:41:05.387941174 +0100 +@@ -940,6 +938,8 @@ + USE_EXTERNAL_PYTHON=1 + AC_DEFINE([USE_EXTERNAL_PYTHON], [1], [Whether to use external python library.]) + else ++ AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library)) ++ AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library)) + AC_MSG_NOTICE($external_python_disabled) + USE_EXTERNAL_PYTHON=0 + fi diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-452-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-452-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-901-advancedsettings_alwaysextractflags.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-403-openssl_only_needed_for_internal_python-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-403-openssl_only_needed_for_internal_python-0.1.patch deleted file mode 100644 index f914bcde7b..0000000000 --- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-403-openssl_only_needed_for_internal_python-0.1.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur xbmc-10.0-Dharma/configure.in xbmc-10.0-Dharma.patch/configure.in ---- xbmc-10.0-Dharma/configure.in 2010-12-17 20:30:53.000000000 +0100 -+++ xbmc-10.0-Dharma.patch/configure.in 2011-01-06 03:41:05.387941174 +0100 -@@ -546,8 +546,6 @@ - AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library)) --AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library)) --AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([wavpack], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([mpeg2], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library)) -@@ -940,6 +938,8 @@ - USE_EXTERNAL_PYTHON=1 - AC_DEFINE([USE_EXTERNAL_PYTHON], [1], [Whether to use external python library.]) - else -+ AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library)) -+ AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library)) - AC_MSG_NOTICE($external_python_disabled) - USE_EXTERNAL_PYTHON=0 - fi From c87bd4ec61cb968ad14f4f965999ef4c271788f9 Mon Sep 17 00:00:00 2001 From: Gujs Date: Sat, 9 Apr 2011 22:43:25 +0200 Subject: [PATCH 8/8] xbmc-pvr: update to the latest pvr-ppa from opdenkamp github repository --- packages/mediacenter/xbmc-pvr-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc-pvr/meta | 2 +- ...e63-101-don_not_check_for_Confluence_at_configure-0.1.patch} | 0 ...mc-pvr-master-e686e63-201-let_select_XBMCProjectM-0.1.patch} | 0 ...ch => xbmc-pvr-master-e686e63-202-let_select_RSXS-0.1.patch} | 0 ... => xbmc-pvr-master-e686e63-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...pvr-master-e686e63-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} | 0 ...xbmc-pvr-master-e686e63-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...86e63-403-openssl_only_needed_for_internal_python-0.1.patch} | 0 ...=> xbmc-pvr-master-e686e63-452-change_lcd_content-0.1.patch} | 0 ...c-pvr-master-e686e63-452-ps3_remote_be_more_quiet-0.1.patch} | 0 ...master-e686e63-462-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...> xbmc-pvr-master-e686e63-463-add_remote_devinput-0.1.patch} | 0 ...aster-e686e63-901-advancedsettings_alwaysextractflags.patch} | 0 14 files changed, 2 insertions(+), 2 deletions(-) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-05bd3ef-101-don_not_check_for_Confluence_at_configure-0.1.patch => xbmc-pvr-master-e686e63-101-don_not_check_for_Confluence_at_configure-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-05bd3ef-201-let_select_XBMCProjectM-0.1.patch => xbmc-pvr-master-e686e63-201-let_select_XBMCProjectM-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-05bd3ef-202-let_select_RSXS-0.1.patch => xbmc-pvr-master-e686e63-202-let_select_RSXS-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-05bd3ef-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-pvr-master-e686e63-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-05bd3ef-321-CrystalHD_use_yuy2_to_yv12-0.1.patch => xbmc-pvr-master-e686e63-321-CrystalHD_use_yuy2_to_yv12-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-05bd3ef-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-pvr-master-e686e63-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-05bd3ef-403-openssl_only_needed_for_internal_python-0.1.patch => xbmc-pvr-master-e686e63-403-openssl_only_needed_for_internal_python-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-05bd3ef-452-change_lcd_content-0.1.patch => xbmc-pvr-master-e686e63-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-05bd3ef-452-ps3_remote_be_more_quiet-0.1.patch => xbmc-pvr-master-e686e63-452-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-05bd3ef-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-pvr-master-e686e63-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-05bd3ef-463-add_remote_devinput-0.1.patch => xbmc-pvr-master-e686e63-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc-pvr/patches/{xbmc-pvr-master-05bd3ef-901-advancedsettings_alwaysextractflags.patch => xbmc-pvr-master-e686e63-901-advancedsettings_alwaysextractflags.patch} (100%) diff --git a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta index 4218e3bfee..ca465d3920 100644 --- a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-pvr-theme-Confluence" -PKG_VERSION="master-05bd3ef" +PKG_VERSION="master-e686e63" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta index a6a2318c2e..3c237b3124 100644 --- a/packages/mediacenter/xbmc-pvr/meta +++ b/packages/mediacenter/xbmc-pvr/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-pvr" -PKG_VERSION="master-05bd3ef" +PKG_VERSION="master-e686e63" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-101-don_not_check_for_Confluence_at_configure-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-101-don_not_check_for_Confluence_at_configure-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-101-don_not_check_for_Confluence_at_configure-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-101-don_not_check_for_Confluence_at_configure-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-201-let_select_XBMCProjectM-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-201-let_select_XBMCProjectM-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-201-let_select_XBMCProjectM-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-202-let_select_RSXS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-202-let_select_RSXS-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-202-let_select_RSXS-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-321-CrystalHD_use_yuy2_to_yv12-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-321-CrystalHD_use_yuy2_to_yv12-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-321-CrystalHD_use_yuy2_to_yv12-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-403-openssl_only_needed_for_internal_python-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-403-openssl_only_needed_for_internal_python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-403-openssl_only_needed_for_internal_python-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-403-openssl_only_needed_for_internal_python-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-452-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-452-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-452-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-452-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-901-advancedsettings_alwaysextractflags.patch similarity index 100% rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-05bd3ef-901-advancedsettings_alwaysextractflags.patch rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-901-advancedsettings_alwaysextractflags.patch