diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index be56c09879..80ec23b43e 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -21,7 +21,7 @@ PKG_NAME="xbmc-theme-Confluence" PKG_VERSION="12.2-71eb528" if [ "$XBMC" = "master" ]; then - PKG_VERSION="13.alpha-2435cf3" + PKG_VERSION="13.alpha-dcd897b" elif [ "$XBMC" = "xbmc-aml" ]; then PKG_VERSION="aml-frodo-d9119f2" fi diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index a217b9e46d..d613dad461 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -21,7 +21,7 @@ PKG_NAME="xbmc" PKG_VERSION="12.2-71eb528" if [ "$XBMC" = "master" ]; then - PKG_VERSION="13.alpha-2435cf3" + PKG_VERSION="13.alpha-dcd897b" elif [ "$XBMC" = "xbmc-aml" ]; then PKG_VERSION="aml-frodo-d9119f2" fi diff --git a/packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-321-PR3190-texturepacker.patch b/packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-321-PR3190-texturepacker.patch deleted file mode 100644 index 566812e05a..0000000000 --- a/packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-321-PR3190-texturepacker.patch +++ /dev/null @@ -1,714 +0,0 @@ -From 70199b49c92d0ca58b09f948794e637ed1bc963c Mon Sep 17 00:00:00 2001 -From: Stephan Raue -Date: Tue, 3 Sep 2013 05:16:54 +0200 -Subject: [PATCH 1/5] configure: add initial support for CC_FOR_BUILD, - CXX_FOR_BUILD, CFLAGS_FOR_BUILD, CXXFLAGS_FOR_BUILD, LDFLAGS_FOR_BUILD - ---- - Makefile.include.in | 5 ++ - configure.in | 15 ++++-- - m4/ax_prog_cc_for_build.m4 | 125 ++++++++++++++++++++++++++++++++++++++++++++ - m4/ax_prog_cxx_for_build.m4 | 110 ++++++++++++++++++++++++++++++++++++++ - 4 files changed, 252 insertions(+), 3 deletions(-) - create mode 100644 m4/ax_prog_cc_for_build.m4 - create mode 100644 m4/ax_prog_cxx_for_build.m4 - -diff --git a/Makefile.include.in b/Makefile.include.in -index 2b7b89a..2afe6ba 100644 ---- a/Makefile.include.in -+++ b/Makefile.include.in -@@ -28,10 +28,15 @@ dvidir=@dvidir@ - pdfdir=@pdfdir@ - psdir=@psdir@ - CXX=@CXX@ -+CXX_FOR_BUILD=@CXX_FOR_BUILD@ - CC=@CC@ -+CC_FOR_BUILD=@CC_FOR_BUILD@ - CXXFLAGS+=@CXXFLAGS@ -+CXXFLAGS_FOR_BUILD+=@CXXFLAGS_FOR_BUILD@ - CFLAGS+=@CFLAGS@ -+CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@ - LDFLAGS+=@LDFLAGS@ -+LDFLAGS_FOR_BUILD+=@LDFLAGS_FOR_BUILD@ - INCLUDES+=-I@abs_top_srcdir@/lib - INCLUDES+=-I@abs_top_srcdir@/xbmc - INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui -diff --git a/configure.in b/configure.in -index a6153ad..ef0e051 100644 ---- a/configure.in -+++ b/configure.in -@@ -5,6 +5,8 @@ AC_PREREQ(2.59) - AC_INIT([xbmc], [12.9.8], [http://trac.xbmc.org]) - AC_CONFIG_HEADERS([xbmc/config.h]) - AH_TOP([#pragma once]) -+m4_include([m4/ax_prog_cc_for_build.m4]) -+m4_include([m4/ax_prog_cxx_for_build.m4]) - m4_include([m4/ax_python_devel.m4]) - m4_include([m4/xbmc_arch.m4]) - -@@ -579,13 +581,15 @@ if test "x$host_vendor" != "xapple"; then - fi - - # Checks for programs. -+PASSED_CFLAGS=$CFLAGS # Hack to override autoconf default values -+AC_PROG_CC -+AX_PROG_CC_FOR_BUILD -+CFLAGS="$PASSED_CFLAGS $DEFAULT_COMPILE_FLAGS" - PASSED_CXXFLAGS=$CXXFLAGS # Hack to override autoconf default values - AC_PROG_CXX -+AX_PROG_CXX_FOR_BUILD - CXXFLAGS="$PASSED_CXXFLAGS $DEFAULT_COMPILE_FLAGS" --PASSED_CFLAGS=$CFLAGS # Hack to override autoconf default values --AC_PROG_CC - AC_PROG_LIBTOOL --CFLAGS="$PASSED_CFLAGS $DEFAULT_COMPILE_FLAGS" - AC_PROG_AWK - AC_PROG_LN_S - AC_PROG_MAKE_SET -@@ -2467,6 +2471,11 @@ AC_SUBST(CFLAGS) - AC_SUBST(CXXFLAGS) - AC_SUBST(INCLUDES) - AC_SUBST(LDFLAGS) -+AC_SUBST(CXX_FOR_BUILD) -+AC_SUBST(CC_FOR_BUILD) -+AC_SUBST(CFLAGS_FOR_BUILD) -+AC_SUBST(CXXFLAGS_FOR_BUILD) -+AC_SUBST(LDFLAGS_FOR_BUILD) - AC_SUBST(SDL_DEFINES) - AC_SUBST(BUILD_DVDCSS) - AC_SUBST(DISABLE_WAVEFORM) -diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4 -new file mode 100644 -index 0000000..77fd346 ---- /dev/null -+++ b/m4/ax_prog_cc_for_build.m4 -@@ -0,0 +1,125 @@ -+# =========================================================================== -+# http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_PROG_CC_FOR_BUILD -+# -+# DESCRIPTION -+# -+# This macro searches for a C compiler that generates native executables, -+# that is a C compiler that surely is not a cross-compiler. This can be -+# useful if you have to generate source code at compile-time like for -+# example GCC does. -+# -+# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything -+# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD). -+# The value of these variables can be overridden by the user by specifying -+# a compiler with an environment variable (like you do for standard CC). -+# -+# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object -+# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if -+# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are -+# substituted in the Makefile. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Paolo Bonzini -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 8 -+ -+AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) -+AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_PROG_CPP])dnl -+AC_REQUIRE([AC_EXEEXT])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+ -+dnl Use the standard macros, but make them use other variable names -+dnl -+pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl -+pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl -+pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl -+pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl -+pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl -+pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl -+pushdef([ac_cv_objext], ac_cv_build_objext)dnl -+pushdef([ac_exeext], ac_build_exeext)dnl -+pushdef([ac_objext], ac_build_objext)dnl -+pushdef([CC], CC_FOR_BUILD)dnl -+pushdef([CPP], CPP_FOR_BUILD)dnl -+pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl -+pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl -+pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl -+pushdef([host], build)dnl -+pushdef([host_alias], build_alias)dnl -+pushdef([host_cpu], build_cpu)dnl -+pushdef([host_vendor], build_vendor)dnl -+pushdef([host_os], build_os)dnl -+pushdef([ac_cv_host], ac_cv_build)dnl -+pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl -+pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl -+pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl -+pushdef([ac_cv_host_os], ac_cv_build_os)dnl -+pushdef([ac_cpp], ac_build_cpp)dnl -+pushdef([ac_compile], ac_build_compile)dnl -+pushdef([ac_link], ac_build_link)dnl -+ -+save_cross_compiling=$cross_compiling -+save_ac_tool_prefix=$ac_tool_prefix -+cross_compiling=no -+ac_tool_prefix= -+ -+AC_PROG_CC -+AC_PROG_CPP -+AC_EXEEXT -+ -+ac_tool_prefix=$save_ac_tool_prefix -+cross_compiling=$save_cross_compiling -+ -+dnl Restore the old definitions -+dnl -+popdef([ac_link])dnl -+popdef([ac_compile])dnl -+popdef([ac_cpp])dnl -+popdef([ac_cv_host_os])dnl -+popdef([ac_cv_host_vendor])dnl -+popdef([ac_cv_host_cpu])dnl -+popdef([ac_cv_host_alias])dnl -+popdef([ac_cv_host])dnl -+popdef([host_os])dnl -+popdef([host_vendor])dnl -+popdef([host_cpu])dnl -+popdef([host_alias])dnl -+popdef([host])dnl -+popdef([LDFLAGS])dnl -+popdef([CPPFLAGS])dnl -+popdef([CFLAGS])dnl -+popdef([CPP])dnl -+popdef([CC])dnl -+popdef([ac_objext])dnl -+popdef([ac_exeext])dnl -+popdef([ac_cv_objext])dnl -+popdef([ac_cv_exeext])dnl -+popdef([ac_cv_prog_cc_g])dnl -+popdef([ac_cv_prog_cc_cross])dnl -+popdef([ac_cv_prog_cc_works])dnl -+popdef([ac_cv_prog_gcc])dnl -+popdef([ac_cv_prog_CPP])dnl -+ -+dnl Finally, set Makefile variables -+dnl -+BUILD_EXEEXT=$ac_build_exeext -+BUILD_OBJEXT=$ac_build_objext -+AC_SUBST(BUILD_EXEEXT)dnl -+AC_SUBST(BUILD_OBJEXT)dnl -+AC_SUBST([CFLAGS_FOR_BUILD])dnl -+AC_SUBST([CPPFLAGS_FOR_BUILD])dnl -+AC_SUBST([LDFLAGS_FOR_BUILD])dnl -+]) -diff --git a/m4/ax_prog_cxx_for_build.m4 b/m4/ax_prog_cxx_for_build.m4 -new file mode 100644 -index 0000000..8cc0f73 ---- /dev/null -+++ b/m4/ax_prog_cxx_for_build.m4 -@@ -0,0 +1,110 @@ -+# =========================================================================== -+# http://www.gnu.org/software/autoconf-archive/ax_prog_cxx_for_build.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_PROG_CXX_FOR_BUILD -+# -+# DESCRIPTION -+# -+# This macro searches for a C++ compiler that generates native -+# executables, that is a C++ compiler that surely is not a cross-compiler. -+# This can be useful if you have to generate source code at compile-time -+# like for example GCC does. -+# -+# The macro sets the CXX_FOR_BUILD and CXXCPP_FOR_BUILD macros to anything -+# needed to compile or link (CXX_FOR_BUILD) and preprocess -+# (CXXCPP_FOR_BUILD). The value of these variables can be overridden by -+# the user by specifying a compiler with an environment variable (like you -+# do for standard CXX). -+# -+# LICENSE -+# -+# Copyright (c) 2008 Paolo Bonzini -+# Copyright (c) 2012 Avionic Design GmbH -+# -+# Based on the AX_PROG_CC_FOR_BUILD macro by Paolo Bonzini. -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 2 -+ -+AU_ALIAS([AC_PROG_CXX_FOR_BUILD], [AX_PROG_CXX_FOR_BUILD]) -+AC_DEFUN([AX_PROG_CXX_FOR_BUILD], [dnl -+AC_REQUIRE([AX_PROG_CC_FOR_BUILD])dnl -+AC_REQUIRE([AC_PROG_CXX])dnl -+AC_REQUIRE([AC_PROG_CXXCPP])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+ -+dnl Use the standard macros, but make them use other variable names -+dnl -+pushdef([ac_cv_prog_CXXCPP], ac_cv_build_prog_CXXCPP)dnl -+pushdef([ac_cv_prog_gxx], ac_cv_build_prog_gxx)dnl -+pushdef([ac_cv_prog_cxx_works], ac_cv_build_prog_cxx_works)dnl -+pushdef([ac_cv_prog_cxx_cross], ac_cv_build_prog_cxx_cross)dnl -+pushdef([ac_cv_prog_cxx_g], ac_cv_build_prog_cxx_g)dnl -+pushdef([CXX], CXX_FOR_BUILD)dnl -+pushdef([CXXCPP], CXXCPP_FOR_BUILD)dnl -+pushdef([CXXFLAGS], CXXFLAGS_FOR_BUILD)dnl -+pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl -+pushdef([CXXCPPFLAGS], CXXCPPFLAGS_FOR_BUILD)dnl -+pushdef([host], build)dnl -+pushdef([host_alias], build_alias)dnl -+pushdef([host_cpu], build_cpu)dnl -+pushdef([host_vendor], build_vendor)dnl -+pushdef([host_os], build_os)dnl -+pushdef([ac_cv_host], ac_cv_build)dnl -+pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl -+pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl -+pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl -+pushdef([ac_cv_host_os], ac_cv_build_os)dnl -+pushdef([ac_cxxcpp], ac_build_cxxcpp)dnl -+pushdef([ac_compile], ac_build_compile)dnl -+pushdef([ac_link], ac_build_link)dnl -+ -+save_cross_compiling=$cross_compiling -+save_ac_tool_prefix=$ac_tool_prefix -+cross_compiling=no -+ac_tool_prefix= -+ -+AC_PROG_CXX -+AC_PROG_CXXCPP -+ -+ac_tool_prefix=$save_ac_tool_prefix -+cross_compiling=$save_cross_compiling -+ -+dnl Restore the old definitions -+dnl -+popdef([ac_link])dnl -+popdef([ac_compile])dnl -+popdef([ac_cxxcpp])dnl -+popdef([ac_cv_host_os])dnl -+popdef([ac_cv_host_vendor])dnl -+popdef([ac_cv_host_cpu])dnl -+popdef([ac_cv_host_alias])dnl -+popdef([ac_cv_host])dnl -+popdef([host_os])dnl -+popdef([host_vendor])dnl -+popdef([host_cpu])dnl -+popdef([host_alias])dnl -+popdef([host])dnl -+popdef([CXXCPPFLAGS])dnl -+popdef([CPPFLAGS])dnl -+popdef([CXXFLAGS])dnl -+popdef([CXXCPP])dnl -+popdef([CXX])dnl -+popdef([ac_cv_prog_cxx_g])dnl -+popdef([ac_cv_prog_cxx_cross])dnl -+popdef([ac_cv_prog_cxx_works])dnl -+popdef([ac_cv_prog_gxx])dnl -+popdef([ac_cv_prog_CXXCPP])dnl -+ -+dnl Finally, set Makefile variables -+dnl -+AC_SUBST([CXXFLAGS_FOR_BUILD])dnl -+AC_SUBST([CXXCPPFLAGS_FOR_BUILD])dnl -+]) --- -1.8.4 - - -From 3a03d3cfc95f8d8b77a583d8556000fafce358c0 Mon Sep 17 00:00:00 2001 -From: Stephan Raue -Date: Tue, 3 Sep 2013 05:31:39 +0200 -Subject: [PATCH 2/5] configure/depends: rename 'USE_TEXTUREPACKER_NATIVE_ROOT' - to 'NATIVE_ROOT' for general usage to use with other hostbuilt tools. Add - $NATIVE_ROOT/lib to LDFLAGS_FOR_BUILD and $NATIVE_ROOT/include to - CFLAGS_FOR_BUILD and CXXFLAGS_FOR_BUILD - ---- - configure.in | 14 ++++++++++---- - tools/TexturePacker/Makefile.in | 2 +- - tools/depends/target/config.site.in | 2 +- - tools/rbp/depends/depends.mk | 4 ++-- - 4 files changed, 14 insertions(+), 8 deletions(-) - -diff --git a/configure.in b/configure.in -index ef0e051..daf5477 100644 ---- a/configure.in -+++ b/configure.in -@@ -695,7 +695,7 @@ case $host in - esac - AC_SUBST([ARCH]) - --check_sdl_arch=[`file $USE_TEXTUREPACKER_NATIVE_ROOT/lib/libSDL_image.dylib | awk '{print $NF}'`] -+check_sdl_arch=[`file $NATIVE_ROOT/lib/libSDL_image.dylib | awk '{print $NF}'`] - if test "x$check_sdl_arch" = "xi386" ; then - DARWIN_NATIVE_ARCH=-m32 - elif test "x$check_sdl_arch" = "xx86_64" ; then -@@ -1960,6 +1960,12 @@ AC_C_BIGENDIAN - - if test "$cross_compiling" = "yes"; then - final_message="$final_message\n Crosscomp.:\tYes" -+ if [[ -d "$NATIVE_ROOT" ]]; then -+ CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD -I$NATIVE_ROOT/include" -+ CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD -I$NATIVE_ROOT/include" -+ LDFLAGS_FOR_BUILD="$LDFLAGS_FOR_BUILD -L$NATIVE_ROOT/lib" -+ final_message="$final_message\n Native Root:\t$NATIVE_ROOT" -+ fi - else - final_message="$final_message\n Crosscomp.:\tNo" - fi -@@ -2103,8 +2109,8 @@ if test "x$use_texturepacker" != "xno"; then - USE_TEXTUREPACKER=1 - if test "x$use_texturepacker_native" = "xyes"; then - USE_TEXTUREPACKER_NATIVE=1 -- if [[ ! -d "$USE_TEXTUREPACKER_NATIVE_ROOT" ]]; then -- USE_TEXTUREPACKER_NATIVE_ROOT= -+ if [[ ! -d "$NATIVE_ROOT" ]]; then -+ NATIVE_ROOT= - fi - fi - else -@@ -2517,7 +2523,7 @@ AC_SUBST(USE_XRANDR) - AC_SUBST(USE_ALSA) - AC_SUBST(USE_TEXTUREPACKER) - AC_SUBST(USE_TEXTUREPACKER_NATIVE) --AC_SUBST(USE_TEXTUREPACKER_NATIVE_ROOT) -+AC_SUBST(NATIVE_ROOT) - AC_SUBST(USE_AIRTUNES) - AC_SUBST(USE_LIBUDEV) - AC_SUBST(USE_LIBUSB) -diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in -index 71e3d4a..343182c 100644 ---- a/tools/TexturePacker/Makefile.in -+++ b/tools/TexturePacker/Makefile.in -@@ -12,7 +12,7 @@ CXXFLAGS+= \ - RPATH=-Wl,-rpath=$(NATIVE_ROOT_PATH)/lib - - ifeq (@USE_TEXTUREPACKER_NATIVE@,1) --NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@ -+NATIVE_ROOT_PATH=@NATIVE_ROOT@ - ifdef NATIVE_ROOT_PATH - ifeq ($(findstring Darwin,$(shell uname -s)),Darwin) - DEFINES += -DTARGET_DARWIN -diff --git a/tools/depends/target/config.site.in b/tools/depends/target/config.site.in -index 7cc470d..207748a 100644 ---- a/tools/depends/target/config.site.in -+++ b/tools/depends/target/config.site.in -@@ -39,7 +39,7 @@ PYTHON_LDFLAGS="-L@prefix@/@deps_dir@/lib -lpython${PYTHON_VERSION} -lc -ldl -lm - PYTHON_CPPFLAGS=-I@prefix@/@deps_dir@/include/python${PYTHON_VERSION} - PYTHON_SITE_PKG=@prefix@/@deps_dir@/lib/python${PYTHON_VERSION}/site-packages - PYTHON_NOVERSIONCHECK=no-check --USE_TEXTUREPACKER_NATIVE_ROOT=@prefix@/@tool_dir@ -+NATIVE_ROOT=@prefix@/@tool_dir@ - - #afps-ng and libomxil-bellagio - ac_cv_func_malloc_0_nonnull=yes -diff --git a/tools/rbp/depends/depends.mk b/tools/rbp/depends/depends.mk -index bafa99c..d805001 100644 ---- a/tools/rbp/depends/depends.mk -+++ b/tools/rbp/depends/depends.mk -@@ -19,7 +19,7 @@ ifeq ($(USE_BUILDROOT),1) - export PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig - export PYTHON_VERSION=2.7 - export PATH:=$(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH) -- export USE_TEXTUREPACKER_NATIVE_ROOT=/usr -+ export NATIVE_ROOT=/usr - export PYTHON_LDFLAGS=-L$(SDKSTAGE)/usr/lib -lpython$(PYTHON_VERSION) -lpthread -ldl -lutil -lm - else - export CFLAGS=-pipe -O3 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=softfp -mfpu=vfp -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated -Wno-deprecated-declarations -@@ -47,7 +47,7 @@ else - export PKG_CONFIG_PATH=$(PREFIX)/bin/pkg-config - export PYTHON_VERSION=2.6 - export PATH:=${PREFIX}/bin:$(PATH):${TOOLCHAIN}/bin -- export USE_TEXTUREPACKER_NATIVE_ROOT=/usr -+ export NATIVE_ROOT=/usr - export PYTHON_LDFLAGS=-L$(SDKSTAGE)/usr/lib -lpython$(PYTHON_VERSION) - endif - export PYTHON_CPPFLAGS=-I$(SDKSTAGE)/usr/include/python$(PYTHON_VERSION) --- -1.8.4 - - -From 59109579ecfe7622fea2283d1391ca4da07aa9a7 Mon Sep 17 00:00:00 2001 -From: Stephan Raue -Date: Tue, 3 Sep 2013 05:37:05 +0200 -Subject: [PATCH 3/5] libsquish: rework to support native builds with - *_FOR_BUILD - ---- - lib/libsquish/Makefile.in | 22 ++++++++++------------ - 1 file changed, 10 insertions(+), 12 deletions(-) - -diff --git a/lib/libsquish/Makefile.in b/lib/libsquish/Makefile.in -index 34f93bd..ef57bb8 100644 ---- a/lib/libsquish/Makefile.in -+++ b/lib/libsquish/Makefile.in -@@ -11,26 +11,24 @@ SRCS= \ - singlecolourfit.cpp \ - squish.cpp - --CXXFLAGS+=-I. -- --LIB=libsquish.a -- --ifeq (@USE_TEXTUREPACKER_NATIVE@,1) --NATIVE_LIB=libsquish-native.so --CLEAN_FILES+=$(NATIVE_LIB) -+CXXFLAGS += -I. -+CXXFLAGS_FOR_BUILD += -I. -+LIB = libsquish.a -+NATIVE_LIB = libsquish-native.so -+CLEAN_FILES += $(NATIVE_LIB) - - ifeq ($(findstring Darwin,$(shell uname -s)),Darwin) --NATIVE_ARCH=@DARWIN_NATIVE_ARCH@ -+ CXXFLAGS_FOR_BUILD += @DARWIN_NATIVE_ARCH@ - endif - --all: $(LIB) $(NATIVE_LIB) -+all: $(LIB) -+ - # TexturePacker links to libsquish and needs to run on build system, so make a native flavor. - $(NATIVE_LIB): $(SRCS) - ifeq ($(findstring Darwin,$(shell uname -s)),Darwin) -- g++ $(NATIVE_ARCH) -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@ -+ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $(SRCS) -dynamiclib -install_name `pwd`/$(NATIVE_LIB) -o $@ - else -- g++ -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@ --endif -+ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/$(NATIVE_LIB) -o $@ - endif - - include ../../Makefile.include --- -1.8.4 - - -From 2108f29aa7f60ed03afea65b262cec5ca1ed5ab9 Mon Sep 17 00:00:00 2001 -From: Stephan Raue -Date: Tue, 3 Sep 2013 05:44:33 +0200 -Subject: [PATCH 4/5] Texturepacker: rework to support native builds with - *_FOR_BUILD, Texturepacker builds always against libsquish-native.so, which - is ok because CXX_FOR_BUILD=CXX, CXXFLAGS_FOR_BUILD=CXXFLAGS and - LDFLAGS_FOR_BUILD=LDFLAGS on non crosscompiled builds, sothere - libsquish-native is the same like libsquish - ---- - Makefile.in | 2 +- - configure.in | 3 ++ - tools/TexturePacker/Makefile.in | 62 +++++++++++++---------------------------- - 3 files changed, 23 insertions(+), 44 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 8162f64..3b21d50 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -520,7 +520,7 @@ else - $(SILENT_LD) $(CC) $(CFLAGS) $(LDFLAGS) -o xbmc-xrandr xbmc-xrandr.c -lXrandr -lX11 -lm - endif - --tools/TexturePacker/TexturePacker: lib/libsquish/libsquish.a xbmc/guilib/XBTF.h -+tools/TexturePacker/TexturePacker: xbmc/guilib/XBTF.h - $(MAKE) -C tools/TexturePacker/ - - -diff --git a/configure.in b/configure.in -index daf5477..dda18ea 100644 ---- a/configure.in -+++ b/configure.in -@@ -1964,6 +1964,9 @@ if test "$cross_compiling" = "yes"; then - CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD -I$NATIVE_ROOT/include" - CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD -I$NATIVE_ROOT/include" - LDFLAGS_FOR_BUILD="$LDFLAGS_FOR_BUILD -L$NATIVE_ROOT/lib" -+ if test "$host_vendor" != "apple" ; then -+ LDFLAGS_FOR_BUILD="$LDFLAGS_FOR_BUILD -Wl,-rpath=$NATIVE_ROOT/lib" -+ fi - final_message="$final_message\n Native Root:\t$NATIVE_ROOT" - fi - else -diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in -index 343182c..4f0b610 100644 ---- a/tools/TexturePacker/Makefile.in -+++ b/tools/TexturePacker/Makefile.in -@@ -1,61 +1,37 @@ --DEFINES += -DTARGET_POSIX -DUSE_LZO_PACKING -+DEFINES += -DTARGET_POSIX -DUSE_LZO_PACKING - ifneq ($(or $(findstring powerpc,@ARCH@),$(findstring ppc, @ARCH@)),) --DEFINES += -DHOST_BIGENDIAN -+DEFINES += -DHOST_BIGENDIAN - endif - --CXXFLAGS+= \ -+SRCS = \ -+ md5.cpp \ -+ SDL_anigif.cpp \ -+ XBTFWriter.cpp \ -+ XBMCTex.cpp \ -+ @abs_top_srcdir@/xbmc/guilib/XBTF.cpp -+ -+TARGET = TexturePacker -+CLEAN_FILES = $(TARGET) -+ -+CXXFLAGS_FOR_BUILD += \ - -I. \ - -I@abs_top_srcdir@/lib \ - -I@abs_top_srcdir@/xbmc \ - -I@abs_top_srcdir@/xbmc/linux - --RPATH=-Wl,-rpath=$(NATIVE_ROOT_PATH)/lib -+LDFLAGS_FOR_BUILD += -lSDL_image -lSDL -llzo2 -+LDFLAGS_FOR_BUILD += -L@abs_top_srcdir@/lib/libsquish -lsquish-native - --ifeq (@USE_TEXTUREPACKER_NATIVE@,1) --NATIVE_ROOT_PATH=@NATIVE_ROOT@ --ifdef NATIVE_ROOT_PATH - ifeq ($(findstring Darwin,$(shell uname -s)),Darwin) - DEFINES += -DTARGET_DARWIN - NATIVE_ARCH=@DARWIN_NATIVE_ARCH@ --RPATH= --endif --NATIVE_CXXFLAGS+= -I. \ -- -I$(NATIVE_ROOT_PATH)/include \ -- -I@abs_top_srcdir@/lib \ -- -I@abs_top_srcdir@/xbmc \ -- -I@abs_top_srcdir@/xbmc/linux --NATIVE_LIBS += -L$(NATIVE_ROOT_PATH)/lib --endif --NATIVE_LIBS += -lSDL_image -lSDL -llzo2 --NATIVE_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native --else --LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish - endif - --LIBS += -lSDL_image -lSDL -llzo2 -- --SRCS = \ -- md5.cpp \ -- SDL_anigif.cpp \ -- XBTFWriter.cpp \ -- XBMCTex.cpp \ -- @abs_top_srcdir@/xbmc/guilib/XBTF.cpp -- -- --TARGET = TexturePacker --CLEAN_FILES=$(TARGET) -- - all: $(TARGET) - --ifeq (@USE_TEXTUREPACKER_NATIVE@,1) --# TexturePacker run native on build system, build it with native tools - $(TARGET): $(SRCS) @abs_top_srcdir@/xbmc/guilib/XBTF.h -- g++ $(DEFINES) $(NATIVE_ARCH) $(NATIVE_CXXFLAGS) $(SRCS) $(NATIVE_LIBS) $(RPATH) -o $(TARGET) --clean: -- rm -f $(TARGET) --else --include @abs_top_srcdir@/Makefile.include -+# TexturePacker run native on build system, build it with native tools -+ make -C @abs_top_srcdir@/lib/libsquish/ libsquish-native.so -+ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $(DEFINES) $(NATIVE_ARCH) $(SRCS) $(LDFLAGS_FOR_BUILD) -o $(TARGET) - --$(TARGET): $(SRCS) @abs_top_srcdir@/xbmc/guilib/XBTF.h -- $(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(SRCS) $(LDFLAGS) $(LIBS) -o $(TARGET) --endif -+include @abs_top_srcdir@/Makefile.include --- -1.8.4 - - -From ed1cd08fd1e93f3af283eb522082c8c8dbaf2ee7 Mon Sep 17 00:00:00 2001 -From: Stephan Raue -Date: Tue, 3 Sep 2013 05:55:37 +0200 -Subject: [PATCH 5/5] configure: cleanup, we dont need - 'use_texturepacker_native' anymore and dont need to force 'use_texturepacker' - (its enabled by default). - ---- - configure.in | 15 --------------- - 1 file changed, 15 deletions(-) - -diff --git a/configure.in b/configure.in -index dda18ea..0337705 100644 ---- a/configure.in -+++ b/configure.in -@@ -637,7 +637,6 @@ case $host in - use_dvdcss=no - use_gles=yes - use_cpu=cortex-a8 -- use_texturepacker_native=yes - ARCH="arm-osx" - use_arch="arm" - PYTHON_VERSION="2.6" -@@ -649,7 +648,6 @@ case $host in - *86*-apple-darwin*) - use_joystick=no - use_vtbdecoder=no -- use_texturepacker_native=yes - ARCH="x86-osx" - ;; - powerpc-apple-darwin*) -@@ -666,7 +664,6 @@ case $host in - ARCH="powerpc64-linux" - ;; - arm*-*-linux-gnu*) -- use_texturepacker=no - ARCH="arm" - use_arch="arm" - ffmpeg_target_os=linux -@@ -705,7 +702,6 @@ AC_SUBST([DARWIN_NATIVE_ARCH]) - - if test "$target_platform" = "target_android" ; then - USE_ANDROID=1 -- use_texturepacker_native=yes - webserver_checkdepends=yes - CFLAGS="$CFLAGS -Wno-psabi" - CXXFLAGS="$CXXFLAGS -Wno-psabi" -@@ -716,8 +712,6 @@ case $use_platform in - raspberry-pi) - target_platform=target_raspberry_pi - use_neon=no -- use_texturepacker=yes -- use_texturepacker_native=yes - use_arch="arm" - use_cpu=arm1176jzf-s - use_hardcoded_tables="yes" -@@ -2106,16 +2100,9 @@ else - final_message="$final_message\n Bluray:\tNo" - fi - --USE_TEXTUREPACKER_NATIVE=0 - if test "x$use_texturepacker" != "xno"; then - final_message="$final_message\n TexturePacker:Yes" - USE_TEXTUREPACKER=1 -- if test "x$use_texturepacker_native" = "xyes"; then -- USE_TEXTUREPACKER_NATIVE=1 -- if [[ ! -d "$NATIVE_ROOT" ]]; then -- NATIVE_ROOT= -- fi -- fi - else - final_message="$final_message\n TexturePacker:No" - USE_TEXTUREPACKER=0 -@@ -2525,8 +2512,6 @@ AC_SUBST(USE_PULSE) - AC_SUBST(USE_XRANDR) - AC_SUBST(USE_ALSA) - AC_SUBST(USE_TEXTUREPACKER) --AC_SUBST(USE_TEXTUREPACKER_NATIVE) --AC_SUBST(NATIVE_ROOT) - AC_SUBST(USE_AIRTUNES) - AC_SUBST(USE_LIBUDEV) - AC_SUBST(USE_LIBUSB) --- -1.8.4 - diff --git a/packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-602-add_as.xml_busy_dialog_delay_control.patch b/packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-602-add_as.xml_busy_dialog_delay_control.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-602-add_as.xml_busy_dialog_delay_control.patch rename to packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-602-add_as.xml_busy_dialog_delay_control.patch diff --git a/packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch b/packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch rename to packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch diff --git a/packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-990.25-BP-xbmc-PR3166.patch b/packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-990.25-BP-xbmc-PR3166.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-990.25-BP-xbmc-PR3166.patch rename to packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-990.25-BP-xbmc-PR3166.patch diff --git a/packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-995.01-xvba_support-4083650.patch b/packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-995.01-xvba_support-3886e9c.patch similarity index 97% rename from packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-995.01-xvba_support-4083650.patch rename to packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-995.01-xvba_support-3886e9c.patch index e37593c5eb..0cffc8b134 100644 --- a/packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-995.01-xvba_support-4083650.patch +++ b/packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-995.01-xvba_support-3886e9c.patch @@ -1,7 +1,7 @@ -From 433613010a5e6bbe4edc983026f07942876347aa Mon Sep 17 00:00:00 2001 +From eca555600c3640fb0847b3fba0e19773bcea3978 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 2 Aug 2013 18:55:56 +0200 -Subject: [PATCH 01/90] linuxrenderer: do not render if upload texture fails +Subject: [PATCH 01/89] linuxrenderer: do not render if upload texture fails --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 39 ++++++++++++++++----------- @@ -248,10 +248,10 @@ index b986d93..b5c4dec 100644 1.8.4 -From 23a0432899735b822ac868608c885dd601e52346 Mon Sep 17 00:00:00 2001 +From 0a3ca102cd3c44d392405be978bc079284bde1d7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 7 Apr 2012 09:19:00 +0200 -Subject: [PATCH 02/90] vdpau: redesign +Subject: [PATCH 02/89] vdpau: redesign --- language/English/strings.po | 21 +- @@ -276,10 +276,10 @@ Subject: [PATCH 02/90] vdpau: redesign 19 files changed, 3679 insertions(+), 1236 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 0042682..4a10f5d 100644 +index 0e7ecd5..cd53a85 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -5784,7 +5784,17 @@ msgctxt "#13436" +@@ -5787,7 +5787,17 @@ msgctxt "#13436" msgid "Allow hardware acceleration (libstagefright)" msgstr "" @@ -298,7 +298,7 @@ index 0042682..4a10f5d 100644 #: system/settings/settings.xml msgctxt "#13500" -@@ -6867,7 +6877,7 @@ msgid "Software Blend" +@@ -6870,7 +6880,7 @@ msgid "Software Blend" msgstr "" msgctxt "#16325" @@ -307,7 +307,7 @@ index 0042682..4a10f5d 100644 msgstr "" #empty strings from id 16326 to 16399 -@@ -14179,7 +14189,12 @@ msgctxt "#36420" +@@ -14182,7 +14192,12 @@ msgctxt "#36420" msgid "No info available yet." msgstr "" @@ -322,7 +322,7 @@ index 0042682..4a10f5d 100644 #: system/settings/settings.xml diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 3da9550..183c91c 100644 +index 56710c7..44a247f 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -375,6 +375,16 @@ @@ -6064,10 +6064,10 @@ index bcfd27c..d35751c 100644 case RENDER_FMT_VAAPI: return "VAAPI"; case RENDER_FMT_OMXEGL: return "OMXEGL"; diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 5feaf8a..f611bb6 100644 +index 374393d..f47a80b 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp -@@ -161,7 +161,7 @@ void CAdvancedSettings::Initialize() +@@ -160,7 +160,7 @@ void CAdvancedSettings::Initialize() m_videoIgnoreSecondsAtStart = 3*60; m_videoIgnorePercentAtEnd = 8.0f; m_videoPlayCountMinimumPercent = 90.0f; @@ -6076,7 +6076,7 @@ index 5feaf8a..f611bb6 100644 m_videoNonLinStretchRatio = 0.5f; m_videoEnableHighQualityHwScalers = false; m_videoAutoScaleMaxFps = 30.0f; -@@ -169,6 +169,8 @@ void CAdvancedSettings::Initialize() +@@ -168,6 +168,8 @@ void CAdvancedSettings::Initialize() m_videoAllowMpeg4VAAPI = false; m_videoDisableBackgroundDeinterlace = false; m_videoCaptureUseOcclusionQuery = -1; //-1 is auto detect @@ -6085,7 +6085,7 @@ index 5feaf8a..f611bb6 100644 m_DXVACheckCompatibility = false; m_DXVACheckCompatibilityPresent = false; m_DXVAForceProcessorRenderer = true; -@@ -594,7 +596,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) +@@ -592,7 +594,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) XMLUtils::GetString(pElement,"cleandatetime", m_videoCleanDateTimeRegExp); XMLUtils::GetString(pElement,"ppffmpegdeinterlacing",m_videoPPFFmpegDeint); XMLUtils::GetString(pElement,"ppffmpegpostprocessing",m_videoPPFFmpegPostProc); @@ -6094,7 +6094,7 @@ index 5feaf8a..f611bb6 100644 XMLUtils::GetFloat(pElement, "nonlinearstretchratio", m_videoNonLinStretchRatio, 0.01f, 1.0f); XMLUtils::GetBoolean(pElement,"enablehighqualityhwscalers", m_videoEnableHighQualityHwScalers); XMLUtils::GetFloat(pElement,"autoscalemaxfps",m_videoAutoScaleMaxFps, 0.0f, 1000.0f); -@@ -603,6 +605,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) +@@ -601,6 +603,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) XMLUtils::GetBoolean(pElement,"allowmpeg4vaapi",m_videoAllowMpeg4VAAPI); XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace); XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1); @@ -6104,10 +6104,10 @@ index 5feaf8a..f611bb6 100644 TiXmlElement* pStagefrightElem = pElement->FirstChildElement("stagefright"); if (pStagefrightElem) diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index 72716ee..df5b028 100644 +index 1de9af7..0d792af 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h -@@ -158,6 +158,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler +@@ -157,6 +157,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler int m_videoPercentSeekBackwardBig; CStdString m_videoPPFFmpegDeint; CStdString m_videoPPFFmpegPostProc; @@ -6116,7 +6116,7 @@ index 72716ee..df5b028 100644 bool m_musicUseTimeSeeking; int m_musicTimeSeekForward; int m_musicTimeSeekBackward; -@@ -173,7 +175,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler +@@ -172,7 +174,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler CStdString m_audioHost; bool m_audioApplyDrc; @@ -6154,10 +6154,10 @@ index a0f7bba..b6b6ec4 100644 1.8.4 -From 6dd9410662f8ac0dfc02dcb49763f61536ffd331 Mon Sep 17 00:00:00 2001 +From 3deffe52767c7d9312e0ec0ade54c5276efd977c Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 09:52:17 +0100 -Subject: [PATCH 03/90] vdpau: make interop gl default and remove setting, +Subject: [PATCH 03/89] vdpau: make interop gl default and remove setting, rename and intvert interop yuv --- @@ -6166,10 +6166,10 @@ Subject: [PATCH 03/90] vdpau: make interop gl default and remove setting, 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 4a10f5d..0e900ad 100644 +index cd53a85..df8d841 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -5786,15 +5786,10 @@ msgstr "" +@@ -5789,15 +5789,10 @@ msgstr "" #: system/settings/settings.xml msgctxt "#13437" @@ -6263,10 +6263,10 @@ index c10c7ea..41defb6 100644 1.8.4 -From 1651196ec68ebb5f596881a1e2dfb8617c877cc0 Mon Sep 17 00:00:00 2001 +From aef4898cd4b5cce247161e945e3d0a73f2437152 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 20:28:49 +0100 -Subject: [PATCH 04/90] vdpau: observe ffmpeg tags for color space +Subject: [PATCH 04/89] vdpau: observe ffmpeg tags for color space --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 38 ++++++++++++++++++-------- @@ -6370,10 +6370,10 @@ index aae4173..8845a16 100644 1.8.4 -From 33bec9436d37732f910caaac7d5a8b4adf43b3b0 Mon Sep 17 00:00:00 2001 +From 8dc0409ab3d4372a6be8e6b334bc8dcec73a58a4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 27 Jan 2013 12:10:19 +0100 -Subject: [PATCH 05/90] vdpau: switch off de-interlacing on ff +Subject: [PATCH 05/89] vdpau: switch off de-interlacing on ff --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 5 +++-- @@ -6399,10 +6399,10 @@ index 8a31cd1..6d982a7 100644 1.8.4 -From 8d9512c7db32ec4a9f19937e656c25eb8e86c054 Mon Sep 17 00:00:00 2001 +From 51711803a6213fbfb04c8ec121ea622e5591a9e5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 25 Sep 2012 12:14:15 +0200 -Subject: [PATCH 06/90] linuxrenderer: drop method RenderMultiPass +Subject: [PATCH 06/89] linuxrenderer: drop method RenderMultiPass --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 9 ++------- @@ -6452,10 +6452,10 @@ index 8daf72c..b086bae 100644 1.8.4 -From dc876ab1b8930bd0d35c5d42af52c06acad6b2c5 Mon Sep 17 00:00:00 2001 +From 4aeb96bcd273ada0d890ece46678c7ed9c9aa6ba Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 25 Sep 2012 13:20:47 +0200 -Subject: [PATCH 07/90] linuxrenderer: implement progressive weave for vdpau +Subject: [PATCH 07/89] linuxrenderer: implement progressive weave for vdpau --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 56 +++++++++++++++++++-------- @@ -6584,10 +6584,10 @@ index b086bae..966733e 100644 1.8.4 -From 1d66197939f9eceede2e264cd56f2c419f1b265e Mon Sep 17 00:00:00 2001 +From 2d46c77953dfda684f243d817c466ad44d57ee35 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 6 Mar 2013 07:35:10 +0100 -Subject: [PATCH 08/90] vdpau: set deinterlacing method to auto, if default +Subject: [PATCH 08/89] vdpau: set deinterlacing method to auto, if default method not supported --- @@ -6619,10 +6619,10 @@ index 6d982a7..9ac8186 100644 1.8.4 -From 6e2c93cf2db0f51bf75e8cbb08167ad2cdeeef61 Mon Sep 17 00:00:00 2001 +From a03d12ee0bec0475a16d5d6b1d081b0d401e4bdc Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 14 Jun 2013 09:23:22 +0200 -Subject: [PATCH 09/90] vdpau: calculate timestamp of second field when doing +Subject: [PATCH 09/89] vdpau: calculate timestamp of second field when doing deinterlacing --- @@ -6654,10 +6654,10 @@ index 9ac8186..369a19e 100644 1.8.4 -From 5f154eebc9a6ab3296b50ecda17b577cc025ddc1 Mon Sep 17 00:00:00 2001 +From e09271e26ca1f841b778bab8877fff7a8890dbc7 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 2 Aug 2013 13:57:47 +0200 -Subject: [PATCH 10/90] vdpau: comment some features that will be added later +Subject: [PATCH 10/89] vdpau: comment some features that will be added later --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 15 ++++++++++----- @@ -6721,10 +6721,10 @@ index 369a19e..ae7cce7 100644 1.8.4 -From 872505796df263932988f2a442a702b94e490d12 Mon Sep 17 00:00:00 2001 +From 35bc34363b7f07b85cc1772c60329fd84c30f243 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 6 Aug 2013 10:37:37 +0200 -Subject: [PATCH 11/90] renderer: protect against div by zero +Subject: [PATCH 11/89] renderer: protect against div by zero --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 7 +++++++ @@ -6752,17 +6752,17 @@ index 1dbb670..fb065ea 100644 1.8.4 -From 496734a6cbd75173bbc84870fe2cf2bb660f985f Mon Sep 17 00:00:00 2001 +From 11272491db2bb8042895e6745c316de2b1ecd852 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 09:52:46 +0200 -Subject: [PATCH 12/90] vdpau: add fence for detecting when a buffer can be +Subject: [PATCH 12/89] vdpau: add fence for detecting when a buffer can be reused --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 11 ++ - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 155 +++++++++++++++++++++++-- + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 162 +++++++++++++++++++++++-- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h | 8 +- - 3 files changed, 161 insertions(+), 13 deletions(-) + 3 files changed, 167 insertions(+), 14 deletions(-) diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp index fb065ea..7bfd892 100644 @@ -6787,7 +6787,7 @@ index fb065ea..7bfd892 100644 void CLinuxRendererGL::RenderSinglePass(int index, int field) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index ae7cce7..43316c1 100644 +index ae7cce7..2a8b6a4 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -1144,6 +1144,23 @@ void CVdpauRenderPicture::ReturnUnused() @@ -6832,7 +6832,7 @@ index ae7cce7..43316c1 100644 m_controlPort.SendInMessage(COutputControlProtocol::STATS); m_state = O_TOP_CONFIGURED_WORK; m_extTimeout = 0; -@@ -2654,6 +2671,10 @@ void COutput::StateMachine(int signal, Protocol *port, Message *msg) +@@ -2654,6 +2671,15 @@ void COutput::StateMachine(int signal, Protocol *port, Message *msg) switch (signal) { case COutputControlProtocol::TIMEOUT: @@ -6840,10 +6840,24 @@ index ae7cce7..43316c1 100644 + m_extTimeout = 10; + else + m_extTimeout = 100; ++ if (HasWork()) ++ { ++ m_state = O_TOP_CONFIGURED_WORK; ++ m_extTimeout = 0; ++ } return; default: break; -@@ -2845,7 +2866,7 @@ void COutput::Flush() +@@ -2682,7 +2708,7 @@ void COutput::StateMachine(int signal, Protocol *port, Message *msg) + else + { + m_state = O_TOP_CONFIGURED_IDLE; +- m_extTimeout = 100; ++ m_extTimeout = 0; + } + return; + default: +@@ -2845,7 +2871,7 @@ void COutput::Flush() { CVdpauRenderPicture *pic; pic = *((CVdpauRenderPicture**)msg->data); @@ -6852,7 +6866,7 @@ index ae7cce7..43316c1 100644 } msg->Release(); } -@@ -2856,7 +2877,7 @@ void COutput::Flush() +@@ -2856,7 +2882,7 @@ void COutput::Flush() { CVdpauRenderPicture *pic; pic = *((CVdpauRenderPicture**)msg->data); @@ -6861,7 +6875,7 @@ index ae7cce7..43316c1 100644 } } -@@ -2984,7 +3005,7 @@ CVdpauRenderPicture* COutput::ProcessMixerPicture() +@@ -2984,7 +3010,7 @@ CVdpauRenderPicture* COutput::ProcessMixerPicture() return retPic; } @@ -6870,7 +6884,7 @@ index ae7cce7..43316c1 100644 { std::deque::iterator it; for (it = m_bufferPool.usedRenderPics.begin(); it != m_bufferPool.usedRenderPics.end(); ++it) -@@ -2997,17 +3018,84 @@ void COutput::ProcessReturnPicture(CVdpauRenderPicture *pic) +@@ -2997,17 +3023,84 @@ void COutput::ProcessReturnPicture(CVdpauRenderPicture *pic) if (it == m_bufferPool.usedRenderPics.end()) { @@ -6961,7 +6975,7 @@ index ae7cce7..43316c1 100644 if (m_config.usePixmaps) { m_bufferPool.pixmaps[pic->sourceIdx].used = false; -@@ -3156,10 +3244,43 @@ void COutput::ReleaseBufferPool() +@@ -3156,10 +3249,43 @@ void COutput::ReleaseBufferPool() } m_bufferPool.outputSurfaces.clear(); @@ -7006,7 +7020,7 @@ index ae7cce7..43316c1 100644 } } -@@ -3169,6 +3290,7 @@ void COutput::PreCleanup() +@@ -3169,6 +3295,7 @@ void COutput::PreCleanup() VdpStatus vdp_st; m_mixer.Dispose(); @@ -7014,7 +7028,7 @@ index ae7cce7..43316c1 100644 CSingleLock lock(m_bufferPool.renderPicSec); for (unsigned int i = 0; i < m_bufferPool.outputSurfaces.size(); ++i) -@@ -3375,6 +3497,15 @@ bool COutput::GLInit() +@@ -3375,6 +3502,15 @@ bool COutput::GLInit() CLog::Log(LOGNOTICE, "VDPAU::COutput: vdpau gl interop initialized"); } #endif @@ -7075,10 +7089,10 @@ index 8845a16..c555d2d 100644 1.8.4 -From a27560a554241c7a80d198291f960409daf6ef26 Mon Sep 17 00:00:00 2001 +From 52a114962e17931735cfc5970ff08d43935ce9b9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 -Subject: [PATCH 13/90] videoplayer: adapt lateness detection and dropping to +Subject: [PATCH 13/89] videoplayer: adapt lateness detection and dropping to buffering --- @@ -7659,10 +7673,10 @@ index f8ad541..186e271 100644 1.8.4 -From 545f80e1587482d93639ef386b4acb0d4b941d82 Mon Sep 17 00:00:00 2001 +From d5e0132f8a147dd756426be74e910d085aacc022 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 -Subject: [PATCH 14/90] video player: present correct pts to user for a/v sync +Subject: [PATCH 14/89] video player: present correct pts to user for a/v sync (after buffering in renderer) --- @@ -7730,10 +7744,10 @@ index 186e271..59c7f09 100644 1.8.4 -From e4ef3a35e8e54e3c0610c50970a4d936a1d9fb1f Mon Sep 17 00:00:00 2001 +From 88420beb8f08c85a4bc7d7725504090755771c46 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 -Subject: [PATCH 15/90] videoplayer: some rework and documentation +Subject: [PATCH 15/89] videoplayer: some rework and documentation --- .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 29 ++++++++++++++++++++-- @@ -7844,10 +7858,10 @@ index 99c8b3c..be3d511 100644 1.8.4 -From 784f41358ea98a2759234c7a600ed4cf99a525be Mon Sep 17 00:00:00 2001 +From 49ac4ae6763c8567c767bc8ffc89efc77fff70b7 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 1 Jun 2013 11:21:19 +0200 -Subject: [PATCH 16/90] renderer: bump buffers to 5 +Subject: [PATCH 16/89] renderer: bump buffers to 5 --- xbmc/cores/VideoRenderers/BaseRenderer.h | 2 +- @@ -7870,10 +7884,10 @@ index a61d3cf..df5fe0e 100644 1.8.4 -From 6aae029ba3acd1130db39200e38beca2902af1a4 Mon Sep 17 00:00:00 2001 +From 228f4c43329fbb128642558aa20dc9e65841f33e Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 -Subject: [PATCH 17/90] videoplayer: update frametime, it might change due to +Subject: [PATCH 17/89] videoplayer: update frametime, it might change due to fps detection --- @@ -7897,10 +7911,10 @@ index be3d511..dbbd11b 100644 1.8.4 -From 39480d2298cb424dd73628f6a6b7e9f76a2ae04d Mon Sep 17 00:00:00 2001 +From 8f4d7c67529431e174126ff3ee430ac57c32604d Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 -Subject: [PATCH 18/90] videoplayer: give streams with invalid fps a chance for +Subject: [PATCH 18/89] videoplayer: give streams with invalid fps a chance for fps detection --- @@ -7924,10 +7938,10 @@ index dbbd11b..eb443af 100644 1.8.4 -From 587ed875534f6500d9277ca9624ec85a0af77cba Mon Sep 17 00:00:00 2001 +From 0f11df591c48463d35ac47ff3485ef8d3c1f4919 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 -Subject: [PATCH 19/90] dvdplayer: allow rewinding at end of stream, do a seek +Subject: [PATCH 19/89] dvdplayer: allow rewinding at end of stream, do a seek after rewind --- @@ -7964,10 +7978,10 @@ index d12121f..06c9439 100644 1.8.4 -From dc4518580ba32618f1099a942c0a440aeb881a8d Mon Sep 17 00:00:00 2001 +From 678aa04eff0644c90eb6f4506d64c0f10e882505 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 -Subject: [PATCH 20/90] X11: ditch SDL for video and window events +Subject: [PATCH 20/89] X11: ditch SDL for video and window events --- xbmc/Application.cpp | 2 +- @@ -9451,10 +9465,10 @@ index b6b6ec4..448a1bb 100644 1.8.4 -From 0709ff85262eb4cd21480b04b067fda62d253ee4 Mon Sep 17 00:00:00 2001 +From bc79312701c39dc9c33c6b10eb89803f9b5e0320 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 -Subject: [PATCH 21/90] X11: Add xbmc icon +Subject: [PATCH 21/89] X11: Add xbmc icon --- xbmc/windowing/X11/WinSystemX11.cpp | 126 +++++++++++++++++++++++++++++++++++- @@ -9643,10 +9657,10 @@ index 448a1bb..e618268 100644 1.8.4 -From 647cea31241e1fed7d54568e01eee7052bbd7ed6 Mon Sep 17 00:00:00 2001 +From b2919310142a92096ceb68ac92980ae3167dce4f Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 -Subject: [PATCH 22/90] X11: add SDL joystick until we have a better solution +Subject: [PATCH 22/89] X11: add SDL joystick until we have a better solution --- xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++ @@ -9700,10 +9714,10 @@ index 5a8bbb8..5bc1de0 100644 1.8.4 -From 9b80f5d960654627e7a46c74593a3e4a86d6e3f6 Mon Sep 17 00:00:00 2001 +From ed8fdfd99df42974bec1ad04dfb7b76ed1d5de40 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 -Subject: [PATCH 23/90] X11: factor out code handling device reset notification +Subject: [PATCH 23/89] X11: factor out code handling device reset notification --- xbmc/windowing/X11/WinSystemX11.cpp | 22 ++++++++++++++-------- @@ -9766,10 +9780,10 @@ index e618268..c4d4b76 100644 1.8.4 -From f05926af6b37b7f81c92d24136aa40e29add9c80 Mon Sep 17 00:00:00 2001 +From 42cf7efae1adc759ad5e6d6cfe4a082bfe09eb9d Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 -Subject: [PATCH 24/90] X11: move xrandr events to WinEventsX11 +Subject: [PATCH 24/89] X11: move xrandr events to WinEventsX11 --- xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++++ @@ -9913,10 +9927,10 @@ index c5938af..9f74dd5 100644 1.8.4 -From 64357da870600d360349cdb21ea561ad2da730dc Mon Sep 17 00:00:00 2001 +From af8adaaef31e8072b351b3e6dc6e54b4bc620ec9 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 -Subject: [PATCH 25/90] xrandr: remove method RestoreState +Subject: [PATCH 25/89] xrandr: remove method RestoreState --- xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- @@ -9995,10 +10009,10 @@ index 0aec487..00b49dc 100644 1.8.4 -From 8e78796297a9899c11ffa46759eaf24ee2016eb9 Mon Sep 17 00:00:00 2001 +From bff486ba4e3dccf2f72d10bb6a0caff92e6e2ee7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 -Subject: [PATCH 26/90] xrandr: observe orientation +Subject: [PATCH 26/89] xrandr: observe orientation --- xbmc/windowing/X11/WinSystemX11.cpp | 89 ++++++++++++++++++++++++++++++------- @@ -10213,10 +10227,10 @@ index 00b49dc..508604d 100644 1.8.4 -From 84941e78c58de9127c9c3b9b474481ba9e090927 Mon Sep 17 00:00:00 2001 +From 28daf46728a533cdfedc8bf00c8b7cb0f2f647de Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 -Subject: [PATCH 27/90] xrandr: allow getting info for multiple screen's +Subject: [PATCH 27/89] xrandr: allow getting info for multiple screen's Refactored by: Joakim Plate --- @@ -10391,10 +10405,10 @@ index 508604d..d37838a 100644 1.8.4 -From 7621f9a351c5c0698e1e389137675c43c71a83e9 Mon Sep 17 00:00:00 2001 +From 0a4db156a9500f324ee2283e346c540ad7faa03c Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 -Subject: [PATCH 28/90] X11: fix multi-head setups +Subject: [PATCH 28/89] X11: fix multi-head setups --- language/English/strings.po | 4 +- @@ -10409,7 +10423,7 @@ Subject: [PATCH 28/90] X11: fix multi-head setups 9 files changed, 229 insertions(+), 116 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 0e900ad..90fb3fd 100644 +index df8d841..c2985ec 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -999,7 +999,9 @@ msgctxt "#245" @@ -10424,7 +10438,7 @@ index 0e900ad..90fb3fd 100644 msgctxt "#247" msgid "Scripts" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 183c91c..9bbcc77 100644 +index 44a247f..f99703f 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -1865,6 +1865,15 @@ @@ -10578,7 +10592,7 @@ index cc4002b..d80f1dc 100644 protected: CDisplaySettings(); diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index 486a26c..dfa3774 100644 +index 0ff415c..3573ef5 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -380,6 +380,7 @@ void CSettings::Uninitialize() @@ -11163,10 +11177,10 @@ index 0727bb9..b1eb278 100644 1.8.4 -From aa2b8b2638d2b69295b2e41ebbc2d7f1aa0f93fb Mon Sep 17 00:00:00 2001 +From 72271a6033634acd241fcceddb6d8a0ad6c3808f Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 -Subject: [PATCH 29/90] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 29/89] X11: remove all DefaultScreen and RootWindow macros --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -11234,10 +11248,10 @@ index 095012f..60a6878 100644 1.8.4 -From 3446cb12a64d0fa3a5bcc90a0b2f19efc862c841 Mon Sep 17 00:00:00 2001 +From b52484f032cfadfcaba370bc853046e04b7f2a18 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 -Subject: [PATCH 30/90] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 30/89] X11: remove all DefaultScreen and RootWindow macros (VideoRefClock) Note this is on a separate display connection. @@ -11309,10 +11323,10 @@ index 5bf3656..0b9e7b3 100644 1.8.4 -From 89db4450489d1aa1ef216f6cbefff729870f4f4b Mon Sep 17 00:00:00 2001 +From fda1da1a299bc890e1ddcd17416a0d0ba4131684 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 -Subject: [PATCH 31/90] X11: recreate gl context after output has changed +Subject: [PATCH 31/89] X11: recreate gl context after output has changed --- xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++---------- @@ -11463,10 +11477,10 @@ index 60a6878..d6ba80a 100644 1.8.4 -From 5943f65feb3d4b961c272e0cdbc54de06e2d5d28 Mon Sep 17 00:00:00 2001 +From 227e85e73999acccfbd5f4e7afeabf3627b57676 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 -Subject: [PATCH 32/90] X11: hook video reference clock in windowing +Subject: [PATCH 32/89] X11: hook video reference clock in windowing --- xbmc/video/VideoReferenceClock.cpp | 71 +++++++++++++++++++++++++++----------- @@ -11671,10 +11685,10 @@ index dd65a1b..afd71fc 100644 1.8.4 -From 428f6a7eccb2a96850050fd38f088c5a6bec649e Mon Sep 17 00:00:00 2001 +From b0e76572dad24bda2830fb9ba94deff6f33f3073 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 -Subject: [PATCH 33/90] X11: fix video calibrations +Subject: [PATCH 33/89] X11: fix video calibrations --- xbmc/windowing/WinSystem.h | 1 + @@ -11766,10 +11780,10 @@ index 05aa60e..95672d1 100644 1.8.4 -From 880e3e53ce9fea9252b45467cdda323837a96157 Mon Sep 17 00:00:00 2001 +From 9a150ea0ce2be482851ffee12694138444819832 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 -Subject: [PATCH 34/90] X11: deactivate screen saver on startup +Subject: [PATCH 34/89] X11: deactivate screen saver on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++ @@ -11839,10 +11853,10 @@ index 95672d1..51ac314 100644 1.8.4 -From 6f22cefb4c18613bb1a0a3ab539112485d5c5da3 Mon Sep 17 00:00:00 2001 +From 20bc26189abf7b5017222ccb78aac580aa74b271 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 -Subject: [PATCH 35/90] X11: change method of going full-screen +Subject: [PATCH 35/89] X11: change method of going full-screen --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -11886,10 +11900,10 @@ index 14a4307..66b91fd 100644 1.8.4 -From 7d494c5ab536c72f17a2ce1f519a85a3e86b52cb Mon Sep 17 00:00:00 2001 +From 758752ce2888e328cbf50ee3539058e3b48f613b Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 -Subject: [PATCH 36/90] X11: reset key repeat and key modifier on focus lost +Subject: [PATCH 36/89] X11: reset key repeat and key modifier on focus lost and gain --- @@ -11921,10 +11935,10 @@ index c58067b..c9f8a20 100644 1.8.4 -From c78a22d009ab004b008cac4657e75cb4d9e6aec9 Mon Sep 17 00:00:00 2001 +From 31014a0daf13ddcb1cc1c83f000119b9cf6022a7 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 -Subject: [PATCH 37/90] X11: replace custom utf8 to unicode with charset +Subject: [PATCH 37/89] X11: replace custom utf8 to unicode with charset convertor (squash to x11 events) --- @@ -12141,10 +12155,10 @@ index 6100933..72955ad 100644 1.8.4 -From dbdcd1398b9596edd368bc11ba33f5f234c6f807 Mon Sep 17 00:00:00 2001 +From cef9360ad1f57ade5837e108634d17607ab025cf Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 -Subject: [PATCH 38/90] X11: fixed invalid usage of sizeof() (squash into x11 +Subject: [PATCH 38/89] X11: fixed invalid usage of sizeof() (squash into x11 changes) --- @@ -12208,10 +12222,10 @@ index 72955ad..102a076 100644 1.8.4 -From 7174edd30e64400b3aeb027b86bf1fa88aed04a5 Mon Sep 17 00:00:00 2001 +From 82fb5ea76e1c480888888e84094c345d98a94653 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 -Subject: [PATCH 39/90] add missing keys to xbmc keytable +Subject: [PATCH 39/89] add missing keys to xbmc keytable --- xbmc/input/XBMC_keytable.cpp | 2 ++ @@ -12234,10 +12248,10 @@ index b430f55..246164b 100644 1.8.4 -From 0f4f3b56b38bbc5893bd7d0ba25563980c8fb0b8 Mon Sep 17 00:00:00 2001 +From 4745bfd4bba075593cd54c9711503aef05d92294 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 -Subject: [PATCH 40/90] videorefclock: temp deactivate of nv settings +Subject: [PATCH 40/89] videorefclock: temp deactivate of nv settings --- xbmc/video/VideoReferenceClock.cpp | 2 +- @@ -12260,10 +12274,10 @@ index 3bd8133..59f924c 100644 1.8.4 -From fefe0d5855abb1eed3f7dea5a995d52ac9a7eaca Mon Sep 17 00:00:00 2001 +From c305d0c9c06b4b34349958c61f6260385db89ec6 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 -Subject: [PATCH 41/90] videorefclock: ask graphics context for refresh rate +Subject: [PATCH 41/89] videorefclock: ask graphics context for refresh rate --- xbmc/video/VideoReferenceClock.cpp | 3 ++- @@ -12294,10 +12308,10 @@ index 59f924c..2f8bc69 100644 1.8.4 -From e6075ceb421bd2c5617a2fc814ebbd5583922820 Mon Sep 17 00:00:00 2001 +From 17464de75451eeb6f5698ecb6636075897de5554 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 -Subject: [PATCH 42/90] X11: fix icon texture after +Subject: [PATCH 42/89] X11: fix icon texture after cc5ed3c2474084ebc0373a3046410e6f766e03f4 --- @@ -12405,10 +12419,10 @@ index 66b91fd..b00eddc 100644 1.8.4 -From ce07b488bf7bd6984eb27f405d917189bd1bf601 Mon Sep 17 00:00:00 2001 +From 2ae04a51c447f32c17a780c6031da3a98363de37 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 -Subject: [PATCH 43/90] X11: check for window manager +Subject: [PATCH 43/89] X11: check for window manager --- xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++++- @@ -12529,10 +12543,10 @@ index 51ac314..ce3c289 100644 1.8.4 -From d9814394d56246c6877cfd01010e9186d8ee686f Mon Sep 17 00:00:00 2001 +From 0506ca4154aaeb734d03cd0dff3be7012b6d5f8d Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 -Subject: [PATCH 44/90] X11: dont set window on xrandr if no mode available +Subject: [PATCH 44/89] X11: dont set window on xrandr if no mode available --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++----- @@ -12569,10 +12583,10 @@ index 05279ad..9697cbb 100644 1.8.4 -From 87d9381f4dd3f79f6ceed1e43d28e3f8c38483be Mon Sep 17 00:00:00 2001 +From b8ee1b78194d1f4bd719d6641de16e31a5b6531e Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 -Subject: [PATCH 45/90] X11: fix crash after a resolution change on startup +Subject: [PATCH 45/89] X11: fix crash after a resolution change on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- @@ -12596,10 +12610,10 @@ index 9697cbb..868071c 100644 1.8.4 -From 8bcd5f0e0e77b9ebcc590e120c6bc8bce387f598 Mon Sep 17 00:00:00 2001 +From a8d17b8138d7f7abe01f5c6621aebe95a99a5c51 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 -Subject: [PATCH 46/90] X11: lock graphics context in NotifyXRREvent +Subject: [PATCH 46/89] X11: lock graphics context in NotifyXRREvent --- xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ @@ -12622,10 +12636,10 @@ index 868071c..9ff947c 100644 1.8.4 -From a5d48e1814d392c6a2bd3ac54d5fc4e8b03464f7 Mon Sep 17 00:00:00 2001 +From de4664a82dca60d0f475f34f94cbb4568134a41a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 8 Oct 2011 16:45:13 +0200 -Subject: [PATCH 47/90] ffmpeg: add xvba hwaccel, co-author @fritsch +Subject: [PATCH 47/89] ffmpeg: add xvba hwaccel, co-author @fritsch --- lib/ffmpeg/configure | 11 ++ @@ -13532,10 +13546,10 @@ index 1c00ac4..6437e29 100644 1.8.4 -From da33e5cad8c7b2988a62a949241ac5b5b1fcef4f Mon Sep 17 00:00:00 2001 +From 249d0af689f94f13e3bcdfb3f54ee45d3732bdbc Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Apr 2012 12:09:31 +0200 -Subject: [PATCH 48/90] xvba: add decoder, co-author @fritsch +Subject: [PATCH 48/89] xvba: add decoder, co-author @fritsch --- configure.in | 47 + @@ -13560,10 +13574,10 @@ Subject: [PATCH 48/90] xvba: add decoder, co-author @fritsch create mode 100644 xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.h diff --git a/configure.in b/configure.in -index 86dc876..25c189b 100644 +index 0337705..1b88d24 100644 --- a/configure.in +++ b/configure.in -@@ -148,6 +148,8 @@ vaapi_not_found="== Could not find libva. VAAPI support disabled. ==" +@@ -150,6 +150,8 @@ vaapi_not_found="== Could not find libva. VAAPI support disabled. ==" vaapi_disabled="== VAAPI support manually disabled. ==" crystalhd_not_found="== Could not find libcrystalhd. CrystalHD support disabled. ==" crystalhd_disabled="== CrystalHD support manually disabled. ==" @@ -13572,7 +13586,7 @@ index 86dc876..25c189b 100644 vtbdecoder_enabled="== VTBDecoder support enabled. ==" vtbdecoder_disabled="== VTBDecoder support manually disabled. ==" openmax_disabled="== OpenMax support manually disabled. ==" -@@ -267,6 +269,12 @@ AC_ARG_ENABLE([crystalhd], +@@ -269,6 +271,12 @@ AC_ARG_ENABLE([crystalhd], [enable CrystalHD decoding (default is auto)])], [use_crystalhd=$enableval], [use_crystalhd=auto]) @@ -13585,7 +13599,7 @@ index 86dc876..25c189b 100644 AC_ARG_ENABLE([vtbdecoder], [AS_HELP_STRING([--enable-vtbdecoder], -@@ -1810,6 +1818,37 @@ else +@@ -1808,6 +1816,37 @@ else USE_CRYSTALHD=0 fi @@ -13623,7 +13637,7 @@ index 86dc876..25c189b 100644 # VTBDecoder if test "x$use_vtbdecoder" != "xno"; then if test "$host_vendor" = "apple" ; then -@@ -2012,6 +2051,12 @@ else +@@ -2019,6 +2058,12 @@ else final_message="$final_message\n CrystalHD:\tNo" fi @@ -13636,7 +13650,7 @@ index 86dc876..25c189b 100644 if test "x$use_vtbdecoder" != "xno"; then final_message="$final_message\n VTBDecoder:\tYes" else -@@ -2498,6 +2543,7 @@ AC_SUBST(USE_OPENGLES) +@@ -2503,6 +2548,7 @@ AC_SUBST(USE_OPENGLES) AC_SUBST(USE_VDPAU) AC_SUBST(USE_VAAPI) AC_SUBST(USE_CRYSTALHD) @@ -13644,7 +13658,7 @@ index 86dc876..25c189b 100644 AC_SUBST(USE_LIBSMBCLIENT) AC_SUBST(USE_LIBNFS) AC_SUBST(USE_LIBAFPCLIENT) -@@ -2682,6 +2728,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [ +@@ -2685,6 +2731,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [ `if test "x$use_vdpau" != "xno"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \ `if test "x$use_vaapi" != "xno"; then echo --enable-vaapi; else echo --disable-vaapi; fi` \ `if test "$use_optimizations" != "no"; then echo --enable-optimizations; else echo --disable-optimizations; fi` \ @@ -13653,10 +13667,10 @@ index 86dc876..25c189b 100644 --enable-pthreads \ --enable-runtime-cpudetect \ diff --git a/language/English/strings.po b/language/English/strings.po -index 90fb3fd..6e87bc7 100644 +index c2985ec..075e0c6 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -5791,7 +5791,12 @@ msgctxt "#13437" +@@ -5794,7 +5794,12 @@ msgctxt "#13437" msgid "Prefer VDPAU Video Mixer" msgstr "" @@ -13670,7 +13684,7 @@ index 90fb3fd..6e87bc7 100644 #: system/settings/settings.xml msgctxt "#13500" -@@ -6877,7 +6882,11 @@ msgctxt "#16325" +@@ -6880,7 +6885,11 @@ msgctxt "#16325" msgid "VDPAU - Bob" msgstr "" @@ -13684,7 +13698,7 @@ index 90fb3fd..6e87bc7 100644 msgctxt "#16400" msgid "Post-processing" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 9bbcc77..00a0b1f 100644 +index f99703f..879c518 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -410,6 +410,11 @@ @@ -17001,7 +17015,7 @@ index eb443af..c2808c3 100644 } return "UNKNOWN"; diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index dfa3774..2557dfe 100644 +index 3573ef5..c774042 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -757,6 +757,9 @@ void CSettings::InitializeConditions() @@ -17043,10 +17057,10 @@ index 8f30248..db58075 100644 1.8.4 -From 9848f8007c61217b884ae1ff4737d60bc75a6ca2 Mon Sep 17 00:00:00 2001 +From 20b11001a85ca36750249974f98ea1b6885ac08e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Jun 2012 12:46:30 +0200 -Subject: [PATCH 49/90] xvba: do not use vaapi if xvba is present +Subject: [PATCH 49/89] xvba: do not use vaapi if xvba is present --- xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 9 +++++++++ @@ -17076,10 +17090,10 @@ index 2d59b09..aa83875 100644 1.8.4 -From 7aad86e6fd4ff45fcda435d32a3cc926e3547261 Mon Sep 17 00:00:00 2001 +From c0b1b3e7cb8775a134b9fbc2d1cf1cfcc5e5dd20 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 -Subject: [PATCH 50/90] ffmpeg: add av_find_default_stream_index to interface +Subject: [PATCH 50/89] ffmpeg: add av_find_default_stream_index to interface --- lib/DllAvFormat.h | 4 ++++ @@ -17125,10 +17139,10 @@ index 0016c0b..3514856 100644 1.8.4 -From 678d601433801d7ec12455353e7aec83e198f156 Mon Sep 17 00:00:00 2001 +From 35ce17f3bf1e2175635427f5a789a2eb388c6e05 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 -Subject: [PATCH 51/90] dvdplayer: observe pts counter overflow +Subject: [PATCH 51/89] dvdplayer: observe pts counter overflow --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 ++++++++++++++++++++- @@ -17415,10 +17429,10 @@ index aef5ab1..35abbdf 100644 1.8.4 -From 018dbad87adb89f8deae6f55fd95b756220d1227 Mon Sep 17 00:00:00 2001 +From 4ff9feb5023035324cad3d12d8135d04d72f6652 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 -Subject: [PATCH 52/90] dvdplayer: avoid short screen flicker caused by +Subject: [PATCH 52/89] dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer --- @@ -17451,10 +17465,10 @@ index c2808c3..5d487f4 100644 1.8.4 -From 76092b0eb617ce0222ffe1b733e9905e56de78ab Mon Sep 17 00:00:00 2001 +From c5f0c48e362eebb0d64ea391673a5e5e0dce616d Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 -Subject: [PATCH 53/90] vdpau: advanced settings for auto deinterlacing +Subject: [PATCH 53/89] vdpau: advanced settings for auto deinterlacing --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- @@ -17463,7 +17477,7 @@ Subject: [PATCH 53/90] vdpau: advanced settings for auto deinterlacing 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 43316c1..cbaf985 100644 +index 2a8b6a4..87c0319 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -1827,10 +1827,10 @@ EINTERLACEMETHOD CMixer::GetDeinterlacingMethod(bool log /* = false */) @@ -17482,10 +17496,10 @@ index 43316c1..cbaf985 100644 if (deint != -1) { diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index f611bb6..bae5466 100644 +index f47a80b..bc3b588 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp -@@ -169,6 +169,8 @@ void CAdvancedSettings::Initialize() +@@ -168,6 +168,8 @@ void CAdvancedSettings::Initialize() m_videoAllowMpeg4VAAPI = false; m_videoDisableBackgroundDeinterlace = false; m_videoCaptureUseOcclusionQuery = -1; //-1 is auto detect @@ -17494,7 +17508,7 @@ index f611bb6..bae5466 100644 m_videoVDPAUtelecine = false; m_videoVDPAUdeintSkipChromaHD = false; m_DXVACheckCompatibility = false; -@@ -605,6 +607,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) +@@ -603,6 +605,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) XMLUtils::GetBoolean(pElement,"allowmpeg4vaapi",m_videoAllowMpeg4VAAPI); XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace); XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1); @@ -17504,10 +17518,10 @@ index f611bb6..bae5466 100644 XMLUtils::GetBoolean(pElement,"vdpauHDdeintSkipChroma",m_videoVDPAUdeintSkipChromaHD); diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index df5b028..82057bf 100644 +index 0d792af..b7b7a80 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h -@@ -158,6 +158,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler +@@ -157,6 +157,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler int m_videoPercentSeekBackwardBig; CStdString m_videoPPFFmpegDeint; CStdString m_videoPPFFmpegPostProc; @@ -17520,10 +17534,10 @@ index df5b028..82057bf 100644 1.8.4 -From 3131970bd9cb75bc3e565ee6120239496bb9d093 Mon Sep 17 00:00:00 2001 +From b03e5dec167d524df52641e3d94d0c5ff7c6d969 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 -Subject: [PATCH 54/90] player: fix rewind +Subject: [PATCH 54/89] player: fix rewind --- xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- @@ -17738,10 +17752,10 @@ index 59c7f09..65dea76 100644 1.8.4 -From 6ef45bf7f53cc1a51206418727d1bd8bb5bc2fa6 Mon Sep 17 00:00:00 2001 +From af1471e4edfd1d7dbe9377c8a5ec93b8093d1857 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 -Subject: [PATCH 55/90] xrandr: fix query for multiple screens +Subject: [PATCH 55/89] xrandr: fix query for multiple screens --- xbmc/windowing/X11/XRandR.cpp | 10 ++++++---- @@ -17782,10 +17796,10 @@ index 9e181f2..ce0a02b 100644 1.8.4 -From 7ab27d6889178da26d24e6ccfb5eb8c6a7bd3863 Mon Sep 17 00:00:00 2001 +From 60bf0adac6c2427fe68dba0cf4cd7afa03257cd4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 -Subject: [PATCH 56/90] X11: add debug log to print out refresh after xrr event +Subject: [PATCH 56/89] X11: add debug log to print out refresh after xrr event --- xbmc/windowing/X11/WinSystemX11.cpp | 6 ++++++ @@ -17812,10 +17826,10 @@ index 9ff947c..a3394e6 100644 1.8.4 -From b42267ed0b252916b62f35294c62b4a951bf5d6e Mon Sep 17 00:00:00 2001 +From a69acc91a5af2e5ded984c0342618f425bfadc50 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 -Subject: [PATCH 57/90] X11: dont call XCloseDisplay on shutdown, it crashes +Subject: [PATCH 57/89] X11: dont call XCloseDisplay on shutdown, it crashes when powered doen by cec on ATI --- @@ -17840,10 +17854,10 @@ index a3394e6..b941c14 100644 1.8.4 -From 11917b49dc814e4a3912951b121edca6fce4ab3a Mon Sep 17 00:00:00 2001 +From 617b4ff7f11e16f7ebd023c82209a1d8ae2d26b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Coutant?= Date: Wed, 12 Dec 2012 19:49:47 +0100 -Subject: [PATCH 58/90] x11: support for multiple x screens +Subject: [PATCH 58/89] x11: support for multiple x screens --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -17866,10 +17880,10 @@ index ce0a02b..aa27d2b 100644 1.8.4 -From 4aa0e9e73a0dfde18bd7e6b245f2e437a3cd353c Mon Sep 17 00:00:00 2001 +From 0168245eee2e763a9b2dabc55a8745b365ff2a80 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 -Subject: [PATCH 59/90] pvr: increase changes counter of stream on stream +Subject: [PATCH 59/89] pvr: increase changes counter of stream on stream change, cosmetics after dd307930d39d92f145a01a16600cd00e01ec39be --- @@ -17903,10 +17917,10 @@ index 62fbb41..a80c789 100644 1.8.4 -From efadfccd9e6ae4601a6560a035663ae524bfbbf3 Mon Sep 17 00:00:00 2001 +From ba36c5babf99746f6ab01e46605a46da9a0bbe63 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 -Subject: [PATCH 60/90] X11: add keymapping for XF86XK_Sleep +Subject: [PATCH 60/89] X11: add keymapping for XF86XK_Sleep --- xbmc/windowing/WinEventsX11.cpp | 1 + @@ -17928,10 +17942,10 @@ index 4a5aab4..da5d412 100644 1.8.4 -From b1c759fe6ef7480e6c12cc266fc9fd7a4df4bf60 Mon Sep 17 00:00:00 2001 +From e7cb292b8a5660c59a4f7b77fb90f19e21b2c271 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 -Subject: [PATCH 61/90] X11: remove toggle full screen after resume +Subject: [PATCH 61/89] X11: remove toggle full screen after resume --- xbmc/powermanagement/PowerManager.cpp | 5 ----- @@ -17957,10 +17971,10 @@ index 2033574..c79bbc1 100644 1.8.4 -From 9da38850f2d3316c648dfd9d2c280486aaed86d1 Mon Sep 17 00:00:00 2001 +From b972b8da4fb8441f07ff21cb1d5e7dfc44bbed84 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 -Subject: [PATCH 62/90] xrandr: set screen on mode change command +Subject: [PATCH 62/89] xrandr: set screen on mode change command --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -17983,10 +17997,10 @@ index aa27d2b..67bf6ca 100644 1.8.4 -From b4fb02f6ea5cea93a5a9fa8ffe318d7eedef051c Mon Sep 17 00:00:00 2001 +From a1dc94956fc9886b60a35a66c9ad81adc9906f66 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 -Subject: [PATCH 63/90] X11: recreate glx context when output changes +Subject: [PATCH 63/89] X11: recreate glx context when output changes --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -18037,10 +18051,10 @@ index ce3c289..311e4cc 100644 1.8.4 -From d1cf19fac6d8dec1e896562564da9682b9331c20 Mon Sep 17 00:00:00 2001 +From 5f6cbd913b55015a8e4d8263e1c014b18f4b5d99 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 -Subject: [PATCH 64/90] pvr: do not show selection dialog for a single menu +Subject: [PATCH 64/89] pvr: do not show selection dialog for a single menu hook --- @@ -18078,10 +18092,10 @@ index aab6345..a880778 100644 1.8.4 -From 5e49f860cf5fde967eeab65d38c7917100d872b2 Mon Sep 17 00:00:00 2001 +From d93a12d971907a313979a77d3c619fc49baa8bdb Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 -Subject: [PATCH 65/90] X11: use default screen parameters if no output +Subject: [PATCH 65/89] X11: use default screen parameters if no output connected --- @@ -18185,10 +18199,10 @@ index c84e793..5215f4d 100644 1.8.4 -From 176e1edd97dda5b927403ebc28f143b8f9d60549 Mon Sep 17 00:00:00 2001 +From 70b83f1cea8eff42473dd5b96fd56d976196f1bd Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 23 Mar 2013 15:13:32 +0100 -Subject: [PATCH 66/90] X11: create parent window +Subject: [PATCH 66/89] X11: create parent window --- xbmc/windowing/X11/WinSystemX11.cpp | 69 +++++++++++++++++++++++-------------- @@ -18454,10 +18468,10 @@ index 311e4cc..49365a8 100644 1.8.4 -From 5c69c27d3ca7b30ce128993a93505fd5e2cc7be6 Mon Sep 17 00:00:00 2001 +From c60e19936076c9b9abe5bde88dcd0eb7bc3f86e1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 12:30:12 +0100 -Subject: [PATCH 67/90] X11: use system key repeat rate instead of hardcoded +Subject: [PATCH 67/89] X11: use system key repeat rate instead of hardcoded one, taken from 58fd64b194e38b73b5f3132744bab35e994e7441 --- @@ -18659,10 +18673,10 @@ index 102a076..5b1f3fa 100644 1.8.4 -From 31dfd5d58bd7e8a092eb59e1a35f265cde604761 Mon Sep 17 00:00:00 2001 +From bd7ce9a61bce915cfeb8554cf0b691b299689507 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 16:04:48 +0100 -Subject: [PATCH 68/90] linux: use CLOCK_MONOTONIC_RAW as this is not subject +Subject: [PATCH 68/89] linux: use CLOCK_MONOTONIC_RAW as this is not subject to NTP --- @@ -18700,20 +18714,20 @@ index c06b8c5..4390d2e 100644 1.8.4 -From 670ece8bdbc1b052e91df86be1ef133ed262baa5 Mon Sep 17 00:00:00 2001 +From 5a1a4ebda29fea6367646836da34ebd0fed483a4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 15:18:53 +0100 -Subject: [PATCH 69/90] OMXPlayer: some caching fixes for pvr +Subject: [PATCH 69/89] OMXPlayer: some caching fixes for pvr --- xbmc/cores/omxplayer/OMXPlayer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp -index 1bfbdaf..11dd1cc 100644 +index 6c13e35..a1d2609 100644 --- a/xbmc/cores/omxplayer/OMXPlayer.cpp +++ b/xbmc/cores/omxplayer/OMXPlayer.cpp -@@ -2460,7 +2460,8 @@ void COMXPlayer::HandleMessages() +@@ -2465,7 +2465,8 @@ void COMXPlayer::HandleMessages() m_messenger.Put(new CDVDMsgPlayerSeek(GetTime(), (speed < 0), true, false, false, true)); m_playSpeed = speed; @@ -18727,10 +18741,10 @@ index 1bfbdaf..11dd1cc 100644 1.8.4 -From 202c5ecb3114faf5403e0f0a1e6f66df7096b3e6 Mon Sep 17 00:00:00 2001 +From f13400a994978d22418aab743a477c5675b675a7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 20:50:59 +0100 -Subject: [PATCH 70/90] fix incorrect display of fps when dr kicks in +Subject: [PATCH 70/89] fix incorrect display of fps when dr kicks in --- xbmc/Application.cpp | 3 ++- @@ -18757,10 +18771,10 @@ index becf35d..dd9d1e1 100644 1.8.4 -From e05b98e99b195b2d157bbd3f31d862f7abe606b4 Mon Sep 17 00:00:00 2001 +From 17132bac1e5d9354f2c57a054bdca7a1545ab847 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 13 Apr 2013 08:32:06 +0200 -Subject: [PATCH 71/90] X11: fix mouse coverage +Subject: [PATCH 71/89] X11: fix mouse coverage --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++++--- @@ -18826,10 +18840,10 @@ index 49365a8..924af1d 100644 1.8.4 -From b71b1b554293c5f7714628ea450a1397efbed3c8 Mon Sep 17 00:00:00 2001 +From 8d410de650dfb1b1782e196f241b3845a4d291aa Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 8 May 2013 13:14:58 +0200 -Subject: [PATCH 72/90] X11: fix incorrectly used screen num in desktop +Subject: [PATCH 72/89] X11: fix incorrectly used screen num in desktop resolution --- @@ -18864,10 +18878,10 @@ index 186a28e..66955b8 100644 1.8.4 -From bc4c72a6709137731b70c2ddb436622ef1ae54df Mon Sep 17 00:00:00 2001 +From 16bdae923c9f30193dcb9f729cc180da989563a1 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 9 May 2013 12:07:09 +0200 -Subject: [PATCH 73/90] X11: do not overwrite user selected monitor with +Subject: [PATCH 73/89] X11: do not overwrite user selected monitor with fallback --- @@ -18992,10 +19006,10 @@ index 924af1d..2fb9e0f 100644 1.8.4 -From 847dae2fcf7bc923afb7bbab21e1255ccb432bf9 Mon Sep 17 00:00:00 2001 +From 2ed6a56e8bb9c87e23f2eff14027eeb078a88c12 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 12 May 2013 10:50:30 +0200 -Subject: [PATCH 74/90] xrandr: add turn on/off to wrapper +Subject: [PATCH 74/89] xrandr: add turn on/off to wrapper --- xbmc/windowing/X11/XRandR.cpp | 78 +++++++++++++++++++++++++++++++++++++++---- @@ -19161,10 +19175,10 @@ index d37838a..059062f 100644 1.8.4 -From 84ca055b225c28e8650046027f26326045893eef Mon Sep 17 00:00:00 2001 +From 0d4f602533f0b8e23efe91ec3e061b13c16b844e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 19 May 2013 12:55:35 +0200 -Subject: [PATCH 75/90] xrandr: add GetPreferredMode to wrapper +Subject: [PATCH 75/89] xrandr: add GetPreferredMode to wrapper --- xbmc/windowing/X11/XRandR.cpp | 23 +++++++++++++++++++++++ @@ -19221,10 +19235,10 @@ index 059062f..ab7cc63 100644 1.8.4 -From 755d86ea8f38056c093b9de3b2ff363f850184c7 Mon Sep 17 00:00:00 2001 +From 0581543c0295cb9f41d32f0e73c4dbbcfc34c97a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 11 May 2013 17:12:12 +0200 -Subject: [PATCH 76/90] X11: multi-head improvement - poll for desired output +Subject: [PATCH 76/89] X11: multi-head improvement - poll for desired output if we do not get an xrr event --- @@ -19239,10 +19253,10 @@ Subject: [PATCH 76/90] X11: multi-head improvement - poll for desired output 8 files changed, 105 insertions(+), 12 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 6e87bc7..b9aefe3 100644 +index 075e0c6..71c6d4a 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6251,7 +6251,7 @@ msgctxt "#14071" +@@ -6254,7 +6254,7 @@ msgctxt "#14071" msgid "Allow file renaming and deletion" msgstr "" @@ -19251,7 +19265,7 @@ index 6e87bc7..b9aefe3 100644 msgctxt "#14074" msgid "Set timezone" -@@ -6383,7 +6383,12 @@ msgctxt "#14100" +@@ -6386,7 +6386,12 @@ msgctxt "#14100" msgid "Stop ripping CD" msgstr "" @@ -19266,7 +19280,7 @@ index 6e87bc7..b9aefe3 100644 #: xbmc/dialogs/GUIDialogFavourites.cpp msgctxt "#15015" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 00a0b1f..ed3c982 100644 +index 879c518..a48ad60 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -1879,6 +1879,11 @@ @@ -19505,10 +19519,10 @@ index 4809821..1ad26b2 100644 1.8.4 -From f9ee70d207b85bd4196af681b7e1863c97f7911a Mon Sep 17 00:00:00 2001 +From d56893ca07e4592231fe269e5ff31483dd6dcaee Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 15 May 2013 09:14:34 +0200 -Subject: [PATCH 77/90] X11: ignore mouse move event form other windows +Subject: [PATCH 77/89] X11: ignore mouse move event form other windows --- xbmc/windowing/WinEventsX11.cpp | 4 +++- @@ -19540,10 +19554,10 @@ index 6ddaead..e4451fe 100644 1.8.4 -From 47da713a623b5327fc365ed96122e664f4ef9088 Mon Sep 17 00:00:00 2001 +From e62b8a4aeba9509fd25e72a3f979367f3984ad8e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:20:29 +0200 -Subject: [PATCH 78/90] renderer: allow some lateness within vblank interval +Subject: [PATCH 78/89] renderer: allow some lateness within vblank interval --- xbmc/cores/VideoRenderers/RenderManager.cpp | 12 ++++++++++-- @@ -19603,10 +19617,10 @@ index befd851..27283ec 100644 1.8.4 -From f3f060802ffa5ca698755f91c9f67e407810986e Mon Sep 17 00:00:00 2001 +From de89d040f0910bedd2498f5bb22fad98d1f96a2e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:22:58 +0200 -Subject: [PATCH 79/90] X11: another fix for mouse coverage +Subject: [PATCH 79/89] X11: another fix for mouse coverage --- xbmc/windowing/WinEventsX11.cpp | 6 ++++-- @@ -19639,10 +19653,10 @@ index e4451fe..582b9f5 100644 1.8.4 -From 344c3ad759793fb684ceee73f65f1864abf93e30 Mon Sep 17 00:00:00 2001 +From a236cf5fcf766094816f92ac8d335f7d89d93694 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 5 Jul 2013 12:14:00 +0200 -Subject: [PATCH 80/90] X11: set windows class name +Subject: [PATCH 80/89] X11: set windows class name --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -19684,47 +19698,20 @@ index 7e4b637..44e40a3 100644 1.8.4 -From c6d410d4aebb063b200823c450c7474290ac83fb Mon Sep 17 00:00:00 2001 -From: fritsch -Date: Sun, 14 Jul 2013 14:21:52 +0200 -Subject: [PATCH 81/90] ActiveAE: Make ActiveAE default Audio Engine to get it - tested via ppa - ---- - xbmc/cores/AudioEngine/AEFactory.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/cores/AudioEngine/AEFactory.cpp b/xbmc/cores/AudioEngine/AEFactory.cpp -index e4a6cd3..2fbcecf 100644 ---- a/xbmc/cores/AudioEngine/AEFactory.cpp -+++ b/xbmc/cores/AudioEngine/AEFactory.cpp -@@ -97,7 +97,7 @@ bool CAEFactory::LoadEngine() - loaded = CAEFactory::LoadEngine(AE_ENGINE_COREAUDIO); - #else - if (!loaded) -- loaded = CAEFactory::LoadEngine(AE_ENGINE_SOFT); -+ loaded = CAEFactory::LoadEngine(AE_ENGINE_ACTIVE); - #endif - - return loaded; --- -1.8.4 - - -From 9b0b7cf83f4102b450bfc49416f7b93202651d4a Mon Sep 17 00:00:00 2001 +From 43c73d114e52ee770df95610f6dde308692f13b9 Mon Sep 17 00:00:00 2001 From: spiff Date: Tue, 16 Jul 2013 14:34:04 +0200 -Subject: [PATCH 82/90] fixed: typo +Subject: [PATCH 81/89] fixed: typo --- language/English/strings.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/English/strings.po b/language/English/strings.po -index b9aefe3..0c5a8dd 100644 +index 71c6d4a..4814e69 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6385,7 +6385,7 @@ msgstr "" +@@ -6388,7 +6388,7 @@ msgstr "" #: xbmc/settings/settings.xml msgctxt "#14101" @@ -19737,17 +19724,17 @@ index b9aefe3..0c5a8dd 100644 1.8.4 -From 57af4044ed57779b68f39ebbf6b0ef3f0bec380e Mon Sep 17 00:00:00 2001 +From 9b618eb033c13bbfbd801f6fb402fc18fbf3c868 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 25 Jul 2013 17:18:13 +0200 -Subject: [PATCH 83/90] ActiveAE: slightly reduce buffer size +Subject: [PATCH 82/89] ActiveAE: slightly reduce buffer size --- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -index d203fb7..88d280b 100644 +index 3f0254d..59847ae 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -30,8 +30,8 @@ @@ -19765,10 +19752,10 @@ index d203fb7..88d280b 100644 1.8.4 -From b5d8863507c637224600fd8d847735e926ae4807 Mon Sep 17 00:00:00 2001 +From fc54b6edfeb762e701d83eb25b73b4fcc75735b7 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 4 Aug 2013 10:11:16 +0200 -Subject: [PATCH 84/90] Revert "vdpau: comment some features that will be added +Subject: [PATCH 83/89] Revert "vdpau: comment some features that will be added later" This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf. @@ -19777,7 +19764,7 @@ This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf. 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index cbaf985..c28f353 100644 +index 87c0319..2f9e631 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -938,8 +938,7 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame) @@ -19834,10 +19821,10 @@ index cbaf985..c28f353 100644 1.8.4 -From 768e191416afbac708c78e88deebba1c9d29ec2b Mon Sep 17 00:00:00 2001 +From 6df94a2652ae6daeee32d6e5fab70efa0880c61f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:01:40 +0200 -Subject: [PATCH 85/90] X11: fix keysyms +Subject: [PATCH 84/89] X11: fix keysyms --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -19860,10 +19847,10 @@ index 582b9f5..ca31278 100644 1.8.4 -From 0a7539073df21555e55387a42b685e63ceb4f25f Mon Sep 17 00:00:00 2001 +From ae393c69253640c346772c4ce5baf13b803e018d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:42:36 +0200 -Subject: [PATCH 86/90] X11: fix keysym for non-IM +Subject: [PATCH 85/89] X11: fix keysym for non-IM --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -19886,10 +19873,10 @@ index ca31278..db50d3c 100644 1.8.4 -From 8d0449fc972132bd371e04a4057fb0f99566185e Mon Sep 17 00:00:00 2001 +From 365538c881144bf5cc4c70993356e4502740c37a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 11:18:16 +0200 -Subject: [PATCH 87/90] add some missing multi media keys +Subject: [PATCH 86/89] add some missing multi media keys --- system/keymaps/keyboard.xml | 3 +++ @@ -19944,10 +19931,10 @@ index ee6bb69..364b45a 100644 1.8.4 -From 63bf84f43a79b7432f6a95b14fef019b975b3b9c Mon Sep 17 00:00:00 2001 +From f6c11c7b6e4bdd6312b46f240a03f1b9c91fed5e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 15:32:06 +0200 -Subject: [PATCH 88/90] CWinSystemBase: keep RES_DESKTOP untouched at pos 0, +Subject: [PATCH 87/89] CWinSystemBase: keep RES_DESKTOP untouched at pos 0, fixes toggle fullscreen --- @@ -19955,7 +19942,7 @@ Subject: [PATCH 88/90] CWinSystemBase: keep RES_DESKTOP untouched at pos 0, 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xbmc/windowing/WinSystem.cpp b/xbmc/windowing/WinSystem.cpp -index b3add75..6294965 100644 +index bad5c95..b789134 100644 --- a/xbmc/windowing/WinSystem.cpp +++ b/xbmc/windowing/WinSystem.cpp @@ -136,7 +136,8 @@ static void AddResolution(vector &resolutions, unsigned int addi @@ -19968,7 +19955,7 @@ index b3add75..6294965 100644 resolutions[idx].ResInfo_Index = addindex; // no need to add the resolution again -@@ -166,7 +167,8 @@ static bool resSortPredicate(RESOLUTION_WHR i, RESOLUTION_WHR j) +@@ -168,7 +169,8 @@ static bool resSortPredicate(RESOLUTION_WHR i, RESOLUTION_WHR j) } // Can't assume a sort order @@ -19982,10 +19969,10 @@ index b3add75..6294965 100644 1.8.4 -From 502da5f74ccc5fd483e9bde6b5d28914d5c86399 Mon Sep 17 00:00:00 2001 +From 86d8693723f05552e6a328bbc38537489905d45f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 15:53:45 +0200 -Subject: [PATCH 89/90] X11: squash multi +Subject: [PATCH 88/89] X11: squash multi --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -20007,3 +19994,29 @@ index 44e40a3..a00481e 100644 -- 1.8.4 + +From 3886e9c703bc50198b8c310ceab36e5fbe6d1a2e Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Tue, 3 Sep 2013 20:46:17 +0200 +Subject: [PATCH 89/89] X11: do not poll default monitor + +--- + xbmc/windowing/X11/WinSystemX11.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp +index a00481e..58ee352 100644 +--- a/xbmc/windowing/X11/WinSystemX11.cpp ++++ b/xbmc/windowing/X11/WinSystemX11.cpp +@@ -720,7 +720,7 @@ void CWinSystemX11::NotifyXRREvent(bool poll) + if (poll) + { + CStdString output = CSettings::Get().GetString("videoscreen.monitor"); +- if (output.Equals(m_currentOutput) || m_userOutput.Equals("Default")) ++ if (output.Equals(m_currentOutput) || output.Equals("Default")) + return; + + int numScreens = XScreenCount(m_dpy); +-- +1.8.4 + diff --git a/packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-995.10-disable-alt-tab.patch b/packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-995.10-disable-alt-tab.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/13.alpha-2435cf3/xbmc-995.10-disable-alt-tab.patch rename to packages/mediacenter/xbmc/patches/13.alpha-dcd897b/xbmc-995.10-disable-alt-tab.patch