mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 21:56:42 +00:00
xbmc: update to xbmc-Dharma-10.1-c8405db
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
51efca1023
commit
f0c109331a
@ -119,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 \
|
||||
|
@ -40,7 +40,7 @@ cd $PKG_BUILD
|
||||
-iregex ".*-linux.*|.*\.vis|.*\.xbs" \
|
||||
-exec install -D "{}" $ROOT/$INSTALL/usr/lib/xbmc/"{}" ";"
|
||||
|
||||
find addons language media scripts sounds userdata system \
|
||||
find addons language media sounds userdata system \
|
||||
-regextype posix-extended -type f \
|
||||
-not -iregex ".*-linux.*|.*\.vis|.*\.xbs|.*svn.*|.*\.orig|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" \
|
||||
-exec install -D -m 0644 "{}" $ROOT/$INSTALL/usr/share/xbmc/"{}" ";"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc"
|
||||
PKG_VERSION="10.0-Dharma"
|
||||
PKG_VERSION="Dharma-10.1-c8405db"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -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
|
@ -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
|
||||
|
||||
####################################################
|
||||
#
|
@ -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
|
@ -1,12 +0,0 @@
|
||||
diff -Naur xbmc-10.0-Dharma/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-10.0-Dharma.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
|
||||
--- xbmc-10.0-Dharma/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2010-12-17 20:14:04.000000000 +0100
|
||||
+++ xbmc-10.0-Dharma.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-01-21 13:52:11.238550146 +0100
|
||||
@@ -773,7 +773,7 @@
|
||||
if (!pBuffer)
|
||||
{
|
||||
// No free pre-allocated buffers so make one
|
||||
-#ifdef _WIN32
|
||||
+#if 1
|
||||
// force Windows to use YV12 until DX renderer gets NV12 or YUY2 capability.
|
||||
pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height);
|
||||
#else
|
@ -1,19 +0,0 @@
|
||||
diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
--- xbmc-31903/configure.in 2010-07-17 16:53:28.281376543 +0200
|
||||
+++ xbmc-31903.patch/configure.in 2010-07-17 16:55:45.481375135 +0200
|
||||
@@ -1045,6 +1045,7 @@
|
||||
fi
|
||||
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",)
|
||||
|
||||
@@ -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`\
|
||||
--target-os=$(tolower $(uname -s)) \
|
||||
+ `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \
|
||||
--disable-muxers \
|
||||
--enable-muxer=spdif \
|
||||
--enable-muxer=adts \
|
@ -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;
|
@ -0,0 +1,40 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 13:30:17.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 19:08:46.445385047 +0100
|
||||
@@ -387,6 +387,15 @@
|
||||
AC_MSG_ERROR(unsupported host ($host))
|
||||
esac
|
||||
AC_SUBST([ARCH])
|
||||
+
|
||||
+AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
|
||||
+if test "$HAVE_GIT" = "yes" -a "$GIT_REV" = ""; then
|
||||
+ GIT_REV=$(git rev-parse --short HEAD)
|
||||
+elif test "$GIT_REV" = ""; then
|
||||
+ GIT_REV="Unknown"
|
||||
+fi
|
||||
+final_message="$final_message\n git Rev.:\t${GIT_REV}"
|
||||
+
|
||||
if test "$use_debug" = "yes"; then
|
||||
final_message="$final_message\n Debugging:\tYes"
|
||||
if test "$use_profiling" = "yes"; then
|
||||
@@ -1097,7 +1106,6 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
-AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
|
||||
|
||||
# Checks for header files.
|
||||
AC_HEADER_DIRENT
|
||||
@@ -1282,12 +1290,6 @@
|
||||
final_message="$final_message\n Avahi:\tNo"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GIT" = "yes"; then
|
||||
- GIT_REV=$(git rev-parse --short HEAD)
|
||||
-fi
|
||||
-if test "$GIT_REV" = ""; then
|
||||
- GIT_REV="Unknown"
|
||||
-fi
|
||||
if test "$host_vendor" = "apple"; then
|
||||
echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h
|
||||
else
|
@ -1,7 +1,7 @@
|
||||
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 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/Makefile.in xbmc-Dharma-10.1-c8405db.patch/Makefile.in
|
||||
--- xbmc-Dharma-10.1-c8405db/Makefile.in 2011-02-15 13:30:17.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/Makefile.in 2011-02-15 13:55:18.511016755 +0100
|
||||
@@ -466,11 +466,6 @@
|
||||
xbmc/cores/DllLoader/exports/util/exports_utils.a \
|
||||
xbmc/cores/DllLoader/exports/exports.a
|
||||
|
@ -1,7 +1,7 @@
|
||||
diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
--- xbmc-31903/configure.in 2010-07-17 16:25:37.000000000 +0200
|
||||
+++ xbmc-31903.patch/configure.in 2010-07-17 16:46:16.387376489 +0200
|
||||
@@ -23,6 +23,8 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 13:30:17.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 13:57:02.105903186 +0100
|
||||
@@ -65,6 +65,8 @@
|
||||
xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
|
||||
goom_enabled="== GOOM enabled. =="
|
||||
goom_disabled="== GOOM disabled. =="
|
||||
@ -10,7 +10,7 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
|
||||
pulse_disabled="== PulseAudio support manually disabled. =="
|
||||
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
|
||||
@@ -161,6 +163,12 @@
|
||||
@@ -204,6 +206,12 @@
|
||||
[use_goom=$enableval],
|
||||
[use_goom=no])
|
||||
|
||||
@ -23,9 +23,9 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
AC_ARG_ENABLE([ccache],
|
||||
[AS_HELP_STRING([--enable-ccache],
|
||||
[enable building with ccache feature (default is auto)])],
|
||||
@@ -725,6 +733,15 @@
|
||||
AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],use_librtmp=yes,
|
||||
use_librtmp=no;AC_MSG_RESULT($librtmp_not_found))
|
||||
@@ -832,6 +840,15 @@
|
||||
AC_MSG_NOTICE($librtmp_disabled)
|
||||
fi
|
||||
|
||||
+# XBMCPROJECTM
|
||||
+if test "$use_xbmcprojectm" = "yes"; then
|
||||
@ -39,8 +39,8 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
### External libraries checks
|
||||
# External FFmpeg
|
||||
if test "$use_external_ffmpeg" = "yes"; then
|
||||
@@ -1132,6 +1149,12 @@
|
||||
final_message="$final_message\n GOOM:\t\tNo"
|
||||
@@ -1210,6 +1227,12 @@
|
||||
final_message="$final_message\n Bluray:\tNo"
|
||||
fi
|
||||
|
||||
+if test "$use_xbmcprojectm" = "yes"; then
|
||||
@ -52,7 +52,7 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
if test "$use_mid" = "yes"; then
|
||||
final_message="$final_message\n MID Support:\tYes"
|
||||
SDL_DEFINES="$SDL_DEFINES -DMID"
|
||||
@@ -1401,6 +1424,7 @@
|
||||
@@ -1474,6 +1497,7 @@
|
||||
AC_SUBST(SDL_DEFINES)
|
||||
AC_SUBST(BUILD_DVDCSS)
|
||||
AC_SUBST(BUILD_GOOM)
|
||||
@ -60,7 +60,7 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
AC_SUBST(USE_EXTERNAL_FFMPEG)
|
||||
AC_SUBST(USE_EXTERNAL_LIBA52)
|
||||
AC_SUBST(USE_INTERNAL_LIBA52)
|
||||
@@ -1788,7 +1812,7 @@
|
||||
@@ -1870,7 +1894,7 @@
|
||||
-DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
|
||||
set +x
|
||||
fi
|
||||
@ -69,10 +69,10 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
|
||||
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
|
||||
if test "$host_vendor" != "apple" ; then
|
||||
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 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/Makefile.in xbmc-Dharma-10.1-c8405db.patch/Makefile.in
|
||||
--- xbmc-Dharma-10.1-c8405db/Makefile.in 2011-02-15 13:56:41.203329597 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/Makefile.in 2011-02-15 13:57:02.107903144 +0100
|
||||
@@ -109,8 +109,10 @@
|
||||
|
||||
VIS_DIRS=\
|
||||
xbmc/visualizations/OpenGLSpectrum \
|
||||
@ -85,7 +85,7 @@ diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in
|
||||
ifeq ($(findstring osx,$(ARCH)), osx)
|
||||
VIS_DIRS+=xbmc/visualizations/iTunes
|
||||
endif
|
||||
@@ -307,7 +309,9 @@
|
||||
@@ -308,7 +310,9 @@
|
||||
ifneq (arm, $(ARCH))
|
||||
$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
|
||||
$(MAKE) -C xbmc/visualizations/WaveForm
|
@ -1,7 +1,7 @@
|
||||
diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
--- xbmc-31903/configure.in 2010-07-17 16:47:46.246501133 +0200
|
||||
+++ xbmc-31903.patch/configure.in 2010-07-17 16:47:17.801376519 +0200
|
||||
@@ -25,6 +25,8 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 13:58:10.630505451 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 13:59:48.190515901 +0100
|
||||
@@ -67,6 +67,8 @@
|
||||
goom_disabled="== GOOM disabled. =="
|
||||
xbmcprojectm_enabled="== XBMCProjectM enabled. =="
|
||||
xbmxprojectm_disabled="== XBMCProjectM disabled. =="
|
||||
@ -10,7 +10,7 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
|
||||
pulse_disabled="== PulseAudio support manually disabled. =="
|
||||
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
|
||||
@@ -169,6 +171,12 @@
|
||||
@@ -212,6 +214,12 @@
|
||||
[use_xbmcprojectm=$enableval],
|
||||
[use_xbmcprojectm=yes])
|
||||
|
||||
@ -23,7 +23,7 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
AC_ARG_ENABLE([ccache],
|
||||
[AS_HELP_STRING([--enable-ccache],
|
||||
[enable building with ccache feature (default is auto)])],
|
||||
@@ -742,6 +750,15 @@
|
||||
@@ -849,6 +857,15 @@
|
||||
BUILD_XBMCPROJECTM=1
|
||||
fi
|
||||
|
||||
@ -39,7 +39,7 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
### External libraries checks
|
||||
# External FFmpeg
|
||||
if test "$use_external_ffmpeg" = "yes"; then
|
||||
@@ -1155,6 +1172,12 @@
|
||||
@@ -1233,6 +1250,12 @@
|
||||
final_message="$final_message\n XBMCProjectM:\tNo"
|
||||
fi
|
||||
|
||||
@ -52,7 +52,7 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
if test "$use_mid" = "yes"; then
|
||||
final_message="$final_message\n MID Support:\tYes"
|
||||
SDL_DEFINES="$SDL_DEFINES -DMID"
|
||||
@@ -1425,6 +1448,7 @@
|
||||
@@ -1498,6 +1521,7 @@
|
||||
AC_SUBST(BUILD_DVDCSS)
|
||||
AC_SUBST(BUILD_GOOM)
|
||||
AC_SUBST(BUILD_XBMCPROJECTM)
|
||||
@ -60,21 +60,21 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
|
||||
AC_SUBST(USE_EXTERNAL_FFMPEG)
|
||||
AC_SUBST(USE_EXTERNAL_LIBA52)
|
||||
AC_SUBST(USE_INTERNAL_LIBA52)
|
||||
@@ -1866,7 +1890,7 @@
|
||||
@@ -1952,7 +1976,7 @@
|
||||
--disable-skyrocket
|
||||
fi
|
||||
fi
|
||||
-], [0])
|
||||
+], [$BUILD_RSXS])
|
||||
|
||||
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
|
||||
XB_CONFIG_MODULE([xbmc/lib/libapetag], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in
|
||||
--- xbmc-31903/Makefile.in 2010-07-17 16:47:46.258501239 +0200
|
||||
+++ xbmc-31903.patch/Makefile.in 2010-07-17 16:47:17.803376676 +0200
|
||||
@@ -103,8 +103,10 @@
|
||||
lib/xbmc-dll-symbols \
|
||||
lib/jsoncpp/jsoncpp/src/lib_json
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/Makefile.in xbmc-Dharma-10.1-c8405db.patch/Makefile.in
|
||||
--- xbmc-Dharma-10.1-c8405db/Makefile.in 2011-02-15 13:58:10.631505430 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/Makefile.in 2011-02-15 13:59:48.191515880 +0100
|
||||
@@ -104,8 +104,10 @@
|
||||
LIB_DIRS+=lib/libmicrohttpd
|
||||
endif
|
||||
|
||||
-SS_DIRS=\
|
||||
- xbmc/screensavers/rsxs-0.9/xbmc
|
||||
@ -85,7 +85,7 @@ diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in
|
||||
|
||||
VIS_DIRS=\
|
||||
xbmc/visualizations/OpenGLSpectrum \
|
||||
@@ -323,8 +325,10 @@
|
||||
@@ -324,8 +326,10 @@
|
||||
endif
|
||||
screensavers: exports
|
||||
ifneq (arm, $(ARCH))
|
@ -0,0 +1,28 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 14:00:23.143803217 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 14:01:15.327739326 +0100
|
||||
@@ -1263,12 +1263,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-Dharma-10.1-c8405db/tools/TexturePacker/XBMCTex.cpp xbmc-Dharma-10.1-c8405db.patch/tools/TexturePacker/XBMCTex.cpp
|
||||
--- xbmc-Dharma-10.1-c8405db/tools/TexturePacker/XBMCTex.cpp 2011-02-15 13:30:04.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/tools/TexturePacker/XBMCTex.cpp 2011-02-15 14:01:15.328739305 +0100
|
||||
@@ -40,7 +40,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef _LINUX
|
||||
-#include <lzo1x.h>
|
||||
+#include <lzo/lzo1x.h>
|
||||
#else
|
||||
#include "../../xbmc/lib/liblzo/LZO1X.H"
|
||||
#endif
|
@ -1,15 +1,15 @@
|
||||
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
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/guilib/Makefile.in xbmc-Dharma-10.1-c8405db.patch/guilib/Makefile.in
|
||||
--- xbmc-Dharma-10.1-c8405db/guilib/Makefile.in 2011-02-15 13:30:05.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/guilib/Makefile.in 2011-02-15 14:06:40.345116165 +0100
|
||||
@@ -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
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/FileSystem/Makefile.in xbmc-Dharma-10.1-c8405db.patch/xbmc/FileSystem/Makefile.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/FileSystem/Makefile.in 2011-02-15 13:30:05.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/FileSystem/Makefile.in 2011-02-15 14:06:40.346116145 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
ARCH=@ARCH@
|
||||
|
||||
@ -18,9 +18,9 @@ diff -Naur xbmc-28910/xbmc/FileSystem/Makefile.in xbmc-28910.patch/xbmc/FileSyst
|
||||
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
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/Makefile.in xbmc-Dharma-10.1-c8405db.patch/xbmc/Makefile.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/Makefile.in 2011-02-15 13:30:06.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/Makefile.in 2011-02-15 14:06:40.347116125 +0100
|
||||
@@ -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
|
@ -0,0 +1,53 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/Makefile
|
||||
--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/Makefile 2011-02-15 13:30:04.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/Makefile 2011-02-15 14:08:13.446219906 +0100
|
||||
@@ -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-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile
|
||||
--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile 2011-02-15 13:30:04.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile 2011-02-15 14:08:13.447219886 +0100
|
||||
@@ -5,7 +5,7 @@
|
||||
#
|
||||
# Change this to your GCC version.
|
||||
#
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
|
||||
####################################################
|
||||
#
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile
|
||||
--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile 2011-02-15 13:30:04.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile 2011-02-15 14:08:13.449219844 +0100
|
||||
@@ -5,7 +5,7 @@
|
||||
#
|
||||
# Change this to your GCC version.
|
||||
#
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
|
||||
####################################################
|
||||
#
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile
|
||||
--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile 2011-02-15 13:30:04.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile 2011-02-15 14:08:13.450219823 +0100
|
||||
@@ -5,7 +5,7 @@
|
||||
#
|
||||
# Change this to your GCC version.
|
||||
#
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
|
||||
####################################################
|
||||
#
|
@ -0,0 +1,119 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in 2011-02-15 14:07:34.152020190 +0100
|
||||
@@ -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-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh 2011-02-15 14:07:34.153020170 +0100
|
||||
@@ -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-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in 2011-02-15 14:07:34.154020150 +0100
|
||||
@@ -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-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2011-02-15 14:07:34.156020109 +0100
|
||||
@@ -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-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in 2011-02-15 14:07:34.157020088 +0100
|
||||
@@ -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-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in 2011-02-15 14:07:34.158020067 +0100
|
||||
@@ -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-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh 2011-02-15 14:07:34.158020067 +0100
|
||||
@@ -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-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in 2011-02-15 14:07:34.159020047 +0100
|
||||
@@ -7,5 +7,5 @@
|
||||
Description: Low level DVD access library
|
||||
Version: @VERSION@
|
||||
|
||||
-Cflags: -I${includedir}
|
||||
-Libs: -L${libdir} -ldvdread
|
||||
+Cflags: -I.
|
||||
+Libs: -ldvdread
|
@ -0,0 +1,12 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-02-15 14:08:59.000292217 +0100
|
||||
@@ -773,7 +773,7 @@
|
||||
if (!pBuffer)
|
||||
{
|
||||
// No free pre-allocated buffers so make one
|
||||
-#ifdef _WIN32
|
||||
+#if 1
|
||||
// force Windows to use YV12 until DX renderer gets NV12 or YUY2 capability.
|
||||
pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height);
|
||||
#else
|
@ -1,7 +1,7 @@
|
||||
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 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 14:06:18.343564347 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 14:16:56.717644949 +0100
|
||||
@@ -685,9 +685,6 @@
|
||||
PKG_CHECK_MODULES([XMU], [xmu],
|
||||
[INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"],
|
||||
AC_MSG_ERROR($missing_library))
|
@ -0,0 +1,22 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 14:17:38.576806450 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 14:22:07.235423909 +0100
|
||||
@@ -914,6 +914,10 @@
|
||||
AC_LANG_POP([C++])
|
||||
fi
|
||||
CPPFLAGS="$SAVE_CPPFLAGS"
|
||||
+
|
||||
+ # check for yasm
|
||||
+ AC_CHECK_PROG(HAVE_YASM,yasm,"yes","no",)
|
||||
+
|
||||
else
|
||||
AC_MSG_NOTICE($external_ffmpeg_disabled)
|
||||
USE_EXTERNAL_FFMPEG=0
|
||||
@@ -1688,6 +1692,7 @@
|
||||
`if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
|
||||
`if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
|
||||
--target-os=$(tolower $(uname -s)) \
|
||||
+ `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \
|
||||
--disable-muxers \
|
||||
--enable-muxer=spdif \
|
||||
--enable-muxer=adts \
|
@ -1,7 +1,7 @@
|
||||
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 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 14:23:09.427177685 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 14:23:28.731790834 +0100
|
||||
@@ -562,8 +562,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))
|
||||
@ -10,7 +10,7 @@ diff -Naur xbmc-10.0-Dharma/configure.in xbmc-10.0-Dharma.patch/configure.in
|
||||
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 @@
|
||||
@@ -975,6 +973,8 @@
|
||||
USE_EXTERNAL_PYTHON=1
|
||||
AC_DEFINE([USE_EXTERNAL_PYTHON], [1], [Whether to use external python library.])
|
||||
else
|
@ -1,6 +1,6 @@
|
||||
diff -Naur xbmc-28910/xbmc/utils/Splash.cpp xbmc-28910.patch/xbmc/utils/Splash.cpp
|
||||
--- xbmc-28910/xbmc/utils/Splash.cpp 2010-03-28 17:14:58.000000000 +0200
|
||||
+++ xbmc-28910.patch/xbmc/utils/Splash.cpp 2010-03-28 19:29:51.138661142 +0200
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/utils/Splash.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/utils/Splash.cpp
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/utils/Splash.cpp 2011-02-15 13:30:05.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/utils/Splash.cpp 2011-02-15 14:25:02.308915505 +0100
|
||||
@@ -53,9 +53,9 @@
|
||||
g_graphicsContext.Clear();
|
||||
|
@ -1,12 +1,12 @@
|
||||
diff -Naur xbmc-29490/userdata/LCD.xml xbmc-29490.patch/userdata/LCD.xml
|
||||
--- xbmc-29490/userdata/LCD.xml 2010-04-24 22:42:45.000000000 +0200
|
||||
+++ xbmc-29490.patch/userdata/LCD.xml 2010-04-27 17:26:02.946045110 +0200
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/userdata/LCD.xml xbmc-Dharma-10.1-c8405db.patch/userdata/LCD.xml
|
||||
--- xbmc-Dharma-10.1-c8405db/userdata/LCD.xml 2011-02-15 13:30:17.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/userdata/LCD.xml 2011-02-15 14:25:46.406031718 +0100
|
||||
@@ -21,7 +21,7 @@
|
||||
<line>Freemem: $INFO[System.FreeMemory]</line>
|
||||
</video>
|
||||
<general>
|
||||
- <line>XBMC running...</line>
|
||||
+ <line>*** OpenELEC.tv ***</line>
|
||||
+ <line>*** OpenELEC ***</line>
|
||||
<line>$INFO[System.Time] $INFO[System.Date]</line>
|
||||
<line>Freemem: $INFO[System.FreeMemory]</line>
|
||||
<line>$INFO[System.ScreenWidth]x$INFO[System.ScreenHeight] $INFO[System.ScreenMode]</line>
|
@ -1,6 +1,6 @@
|
||||
diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py xbmc-dharma-33971.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py
|
||||
--- xbmc-dharma-33971/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2010-09-19 14:54:08.000000000 +0200
|
||||
+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2010-09-25 22:30:55.174281890 +0200
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py
|
||||
--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2011-02-15 13:30:04.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2011-02-15 14:27:22.774100190 +0100
|
||||
@@ -59,9 +59,6 @@
|
||||
target_connected = False
|
||||
target_address = None
|
@ -1,9 +1,9 @@
|
||||
diff -Naur xbmc-29490/system/Lircmap.xml xbmc-29490.patch/system/Lircmap.xml
|
||||
--- xbmc-29490/system/Lircmap.xml 2010-04-24 22:45:26.000000000 +0200
|
||||
+++ xbmc-29490.patch/system/Lircmap.xml 2010-04-28 22:00:13.734656322 +0200
|
||||
@@ -362,4 +362,48 @@
|
||||
<recordedtv>recordlist</recordedtv>
|
||||
<title>teletext</title>
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/system/Lircmap.xml xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml
|
||||
--- xbmc-Dharma-10.1-c8405db/system/Lircmap.xml 2011-02-15 13:30:17.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml 2011-02-15 14:28:14.180069773 +0100
|
||||
@@ -408,4 +408,48 @@
|
||||
<yellow>KEY_YELLOW</yellow>
|
||||
<blue>KEY_BLUE</blue>
|
||||
</remote>
|
||||
+ <remote device="mediacenter">
|
||||
+ <pause>pause</pause>
|
@ -1,6 +1,6 @@
|
||||
diff -Naur xbmc-dharma-35248/system/Lircmap.xml xbmc-dharma-35248.patch/system/Lircmap.xml
|
||||
--- xbmc-dharma-35248/system/Lircmap.xml 2010-11-12 13:25:11.464538074 +0100
|
||||
+++ xbmc-dharma-35248.patch/system/Lircmap.xml 2010-11-12 13:26:26.486568902 +0100
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/system/Lircmap.xml xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml
|
||||
--- xbmc-Dharma-10.1-c8405db/system/Lircmap.xml 2011-02-15 14:28:59.646158376 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml 2011-02-15 14:29:58.387980799 +0100
|
||||
@@ -365,7 +365,6 @@
|
||||
|
||||
<remote device="linux-input-layer">
|
@ -1,7 +1,7 @@
|
||||
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
|
||||
@@ -618,6 +618,7 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp 2011-02-15 13:30:06.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp 2011-02-15 14:31:51.689709299 +0100
|
||||
@@ -617,6 +617,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);
|
||||
AddBool(vid, "myvideos.extractflags",20433, true);
|
||||
@ -9,9 +9,9 @@ diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/G
|
||||
AddBool(vid, "myvideos.cleanstrings", 20418, false);
|
||||
AddBool(NULL, "myvideos.extractthumb",20433, true);
|
||||
|
||||
diff -Naur xbmc-dharma-35003/xbmc/ThumbLoader.cpp xbmc-dharma-35003.patch/xbmc/ThumbLoader.cpp
|
||||
--- xbmc-dharma-35003/xbmc/ThumbLoader.cpp 2010-10-25 15:37:06.000000000 +0200
|
||||
+++ xbmc-dharma-35003.patch/xbmc/ThumbLoader.cpp 2010-10-25 23:34:04.223857821 +0200
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/ThumbLoader.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/ThumbLoader.cpp
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/ThumbLoader.cpp 2011-02-15 13:30:05.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/ThumbLoader.cpp 2011-02-15 14:31:51.690709279 +0100
|
||||
@@ -148,7 +148,7 @@
|
||||
m_item.SetThumbnailImage(m_target);
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
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 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp 2011-02-15 14:32:35.774825404 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp 2011-02-15 14:33:07.788183524 +0100
|
||||
@@ -527,6 +527,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);
|
||||
@ -9,9 +9,9 @@ diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/G
|
||||
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
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/VideoDatabase.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/VideoDatabase.cpp
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/VideoDatabase.cpp 2011-02-15 13:30:05.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/VideoDatabase.cpp 2011-02-15 14:33:07.792183444 +0100
|
||||
@@ -4394,7 +4394,7 @@
|
||||
if (NULL == m_pDS.get()) return false;
|
||||
|
||||
@ -21,4 +21,3 @@ diff -Naur xbmc-dharma-35003/xbmc/VideoDatabase.cpp xbmc-dharma-35003.patch/xbmc
|
||||
{
|
||||
// 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
|
Loading…
x
Reference in New Issue
Block a user