jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	projects/ATV/options
This commit is contained in:
Stephan Raue 2011-04-24 17:50:42 +02:00
commit d247335552
35 changed files with 443 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mediacenter/xbmc-pvr-theme-Confluence/meta
View File

@ -19,13 +19,13 @@
################################################################################
PKG_NAME="xbmc-pvr-theme-Confluence"
PKG_VERSION="10.0-Dharma"
PKG_VERSION="master-e686e63"
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="$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"

21
packages/mediacenter/xbmc-pvr/build
View File

@ -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
@ -112,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 \
@ -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,8 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag
--disable-ccache \
$XBMC_PULSEAUDIO \
--enable-ffmpeg-libvorbis \
$XBMC_FAAC \
--disable-faac \
--enable-lame \
$XBMC_DVDCSS \
--disable-mid \
$XBMC_AVAHI \
@ -159,7 +154,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

9
packages/mediacenter/xbmc-pvr/install
View File

@ -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

8
packages/mediacenter/xbmc-pvr/meta
View File

@ -19,15 +19,15 @@
################################################################################
PKG_NAME="xbmc-pvr"
PKG_VERSION="10.0-Dharma"
PKG_VERSION="master-e686e63"
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="$OPENELEC_SRC/$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_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 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"

0
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-451-full_splash-0.1.patch → packages/mediacenter/xbmc-pvr/patches/451-full_splash-0.1.patch
View File

15
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-002-arm_remove_forced_python2.5-0.1.patch
View File

@ -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

28
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-301-correct_lzo_include-0.1.patch
View File

@ -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 <lzo1x.h>
+#include <lzo/lzo1x.h>
#else
#include "../../xbmc/lib/liblzo/LZO1X.H"
#endif

29
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-302-dont_hardcode_usr_include-0.1.patch
View File

@ -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

53
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-303-WiiRemote_crosscompiling-0.1.patch
View File

@ -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
####################################################
#

119
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-303-fix_libdvd_xFLAGS-0.1.patch
View File

@ -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

13
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-401-we_dont_need_libXinerama-0.1.patch
View File

@ -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))

21
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-403-openssl_only_needed_for_internal_python-0.1.patch
View File

@ -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

12
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch
View File

@ -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;

24
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-902-advancedsettings_videolibrary.flattenmoviesets.patch
View File

@ -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

12
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-101-don_not_check_for_Confluence_at_configure-0.1.patch Normal file
View File

@ -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 \

14
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-201-let_select_XBMCProjectM-0.1.patch → packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-201-let_select_XBMCProjectM-0.1.patch
View File

@ -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

10
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-202-let_select_RSXS-0.1.patch → packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-202-let_select_RSXS-0.1.patch
View File

@ -85,15 +85,15 @@ 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
@@ -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
+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

119
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-303-fix_libdvd_xFLAGS-0.1.patch Normal file
View File

@ -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

0
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-321-CrystalHD_use_yuy2_to_yv12-0.1.patch → packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-321-CrystalHD_use_yuy2_to_yv12-0.1.patch
View File

2
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-402-enable_yasm_in_ffmpeg-0.1.patch → packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-402-enable_yasm_in_ffmpeg-0.1.patch
View File

@ -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`\

12
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-403-openssl_only_needed_for_internal_python-0.1.patch Normal file
View File

@ -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

0
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-452-change_lcd_content-0.1.patch → packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-452-change_lcd_content-0.1.patch
View File

0
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-452-ps3_remote_be_more_quiet-0.1.patch → packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-452-ps3_remote_be_more_quiet-0.1.patch
View File

0
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-462-add_remote_irtrans_mediacenter-0.1.patch → packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-462-add_remote_irtrans_mediacenter-0.1.patch
View File

0
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-463-add_remote_devinput-0.1.patch → packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-463-add_remote_devinput-0.1.patch
View File

4
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-901-advancedsettings_alwaysextractflags.patch → packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-e686e63-901-advancedsettings_alwaysextractflags.patch
View File

@ -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);

41
packages/mediacenter/xbmc-pvr/sleep.d/01_update_videodb Executable file
View File

@ -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

41
packages/mediacenter/xbmc-pvr/sleep.d/02_update_musicdb Executable file
View File

@ -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

34
packages/mediacenter/xbmc-pvr/sleep.d/61xbmc_lirc Executable file
View File

@ -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

34
packages/mediacenter/xbmc-pvr/sleep.d/62xbmc-lcd Executable file
View File

@ -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

0
packages/mediacenter/xbmc-pvr/rules.d/98-ps3remote.rules → packages/mediacenter/xbmc-pvr/udev.d/98-ps3remote.rules
View File

0
packages/mediacenter/xbmc-pvr/rules.d/98-wiiremote.rules → packages/mediacenter/xbmc-pvr/udev.d/98-wiiremote.rules
View File

1
projects/ATV/options
View File

@ -93,7 +93,6 @@
# Mediacenter to use (xbmc / xbmc-pvr / no)
MEDIACENTER="xbmc-pvr"
>>>>>>> master
# Skins to install (Confluence)
SKINS="Confluence"

60
tools/mkpkg/mkpkg_xbmc-dharma-pvr
View File

@ -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

80
tools/mkpkg/mkpkg_xbmc-master-pvr Executable file
View File

@ -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