From 5ca06f5755abaa05032ab9c50638a20d95d1cac2 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 14 Jul 2013 21:54:16 +0300 Subject: [PATCH 01/12] remove package: 'libXcursor', moving to unofficial --- packages/3rdparty/x11/lib/libXcursor/build | 35 -------------------- packages/3rdparty/x11/lib/libXcursor/install | 26 --------------- packages/3rdparty/x11/lib/libXcursor/meta | 35 -------------------- 3 files changed, 96 deletions(-) delete mode 100755 packages/3rdparty/x11/lib/libXcursor/build delete mode 100755 packages/3rdparty/x11/lib/libXcursor/install delete mode 100644 packages/3rdparty/x11/lib/libXcursor/meta diff --git a/packages/3rdparty/x11/lib/libXcursor/build b/packages/3rdparty/x11/lib/libXcursor/build deleted file mode 100755 index a47c4d38fa..0000000000 --- a/packages/3rdparty/x11/lib/libXcursor/build +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-shared - -make -$MAKEINSTALL diff --git a/packages/3rdparty/x11/lib/libXcursor/install b/packages/3rdparty/x11/lib/libXcursor/install deleted file mode 100755 index b37dd417f9..0000000000 --- a/packages/3rdparty/x11/lib/libXcursor/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -#mkdir -p $INSTALL/usr/lib -# cp -P $PKG_BUILD/src/.libs/libXcursor.so* $INSTALL/usr/lib diff --git a/packages/3rdparty/x11/lib/libXcursor/meta b/packages/3rdparty/x11/lib/libXcursor/meta deleted file mode 100644 index 121d2ce199..0000000000 --- a/packages/3rdparty/x11/lib/libXcursor/meta +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="libXcursor" -PKG_VERSION="1.1.13" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libXfixes libXrender libX11" -PKG_BUILD_DEPENDS="toolchain libX11 libXfixes libXrender" -PKG_PRIORITY="optional" -PKG_SECTION="x11/lib" -PKG_SHORTDESC="libXcursor: X Cursor Library" -PKG_LONGDESC="X11 Cursor management library" -PKG_IS_ADDON="no" -PKG_AUTORECONF="yes" From 1d01f59c6918e2aaf1bc38863b668742e93340c3 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 14 Jul 2013 22:01:33 +0300 Subject: [PATCH 02/12] remove package: 'xdotool', moving to unofficial --- packages/3rdparty/x11/app/xdotool/build | 28 -------------------- packages/3rdparty/x11/app/xdotool/meta | 35 ------------------------- 2 files changed, 63 deletions(-) delete mode 100755 packages/3rdparty/x11/app/xdotool/build delete mode 100644 packages/3rdparty/x11/app/xdotool/meta diff --git a/packages/3rdparty/x11/app/xdotool/build b/packages/3rdparty/x11/app/xdotool/build deleted file mode 100755 index 1f5e21e076..0000000000 --- a/packages/3rdparty/x11/app/xdotool/build +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD - -make xdotool.static -mv xdotool.static xdotool diff --git a/packages/3rdparty/x11/app/xdotool/meta b/packages/3rdparty/x11/app/xdotool/meta deleted file mode 100644 index 40d8b1301c..0000000000 --- a/packages/3rdparty/x11/app/xdotool/meta +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="xdotool" -PKG_VERSION="2.20110530.1" -PKG_REV="1" -PKG_ARCH="" -PKG_LICENSE="GPL" -PKG_SITE="http://www.semicomplete.com/projects/xdotool/" -PKG_URL="http://semicomplete.googlecode.com/files/${PKG_NAME}-${PKG_VERSION}.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain libXtst libXinerama" -PKG_PRIORITY="optional" -PKG_SECTION="x11/app" -PKG_SHORTDESC="This tool lets you simulate keyboard input and mouse activity, move and resize windows, etc.." -PKG_LONGDESC="This tool lets you simulate keyboard input and mouse activity, move and resize windows, etc.." -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" From 7c8b1f59eb860ef44d33c546dfc72ba8b08ab571 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 14 Jul 2013 22:06:32 +0300 Subject: [PATCH 03/12] remove package: 'nss', moving to unofficial --- packages/3rdparty/security/nss/build | 64 ---------------------------- packages/3rdparty/security/nss/meta | 35 --------------- 2 files changed, 99 deletions(-) delete mode 100755 packages/3rdparty/security/nss/build delete mode 100644 packages/3rdparty/security/nss/meta diff --git a/packages/3rdparty/security/nss/build b/packages/3rdparty/security/nss/build deleted file mode 100755 index 7df73ad843..0000000000 --- a/packages/3rdparty/security/nss/build +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -# dont build parallel - MAKEFLAGS=-j1 - -cd $PKG_BUILD/mozilla/security/nss - -setup_toolchain host - -[ "`uname -m`" = "x86_64" ] && HOST_USE_64="USE_64=1" - -# make host part for nsinstall binary and created library signatures -make nss_build_all CC=$CC LDFLAGS="$LDFLAGS" $HOST_USE_64 - -# save host binary -cp ../coreconf/nsinstall/Linux*_DBG.OBJ/nsinstall nsinstall-host -NSINSTALL_HOST=`pwd`/nsinstall-host - -# save library signatures to be used on target -# the .chk file format is cross platform (so I read) -find ./ -name "lib*.chk" -exec cp {} ../../dist/ \; - -# can't run in crosscompile (remove it from target) -sed -i "/shlibsign/d" cmd/manifest.mn - -# clean up host part -rm -rf `find ../../../ -type d -name Linux*_DBG.OBJ` - -[ "$TARGET_ARCH" = "x86_64" ] && TARGET_USE_64="USE_64=1" - -setup_toolchain target - -NSPR_CONFIGURE_OPTS="--host=$TARGET_NAME --build=$HOST_NAME --target=$TARGET_NAME" -NSPR_CONFIGURE_OPTS="$NSPR_CONFIGURE_OPTS --prefix=/usr --enable-strip --with-pthreads" \ -make nss_build_all \ - NSINSTALL=$NSINSTALL_HOST \ - BUILD_OPT=1 $TARGET_USE_64 \ - OS_TEST=$TARGET_ARCH \ - CPU_ARCH_TAG=$TARGET_ARCH \ - USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz \ - CC=$CC CCC=$CXX RANLIB=$RANLIB \ - V=1 diff --git a/packages/3rdparty/security/nss/meta b/packages/3rdparty/security/nss/meta deleted file mode 100644 index 7ccfff1e5a..0000000000 --- a/packages/3rdparty/security/nss/meta +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="nss" -PKG_VERSION="3.13.3" -PKG_REV="1" -PKG_ARCH="i386 x86_64" -PKG_LICENSE="Mozilla Public License" -PKG_SITE="http://ftp.mozilla.org/" -PKG_URL="http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/$PKG_NAME-$PKG_VERSION-with-nspr-4.9.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="security" -PKG_SHORTDESC="nss: Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications." -PKG_LONGDESC="Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications." -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" From 9b266577b08ef76e7d2ba1f17c43612ae45ebd09 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 14 Jul 2013 22:06:57 +0300 Subject: [PATCH 04/12] remove package: 'bbe', moving to unofficial --- packages/3rdparty/textproc/bbe/build | 32 ------------------------- packages/3rdparty/textproc/bbe/meta | 35 ---------------------------- 2 files changed, 67 deletions(-) delete mode 100755 packages/3rdparty/textproc/bbe/build delete mode 100644 packages/3rdparty/textproc/bbe/meta diff --git a/packages/3rdparty/textproc/bbe/build b/packages/3rdparty/textproc/bbe/build deleted file mode 100755 index 6572aec299..0000000000 --- a/packages/3rdparty/textproc/bbe/build +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD - -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc - -make diff --git a/packages/3rdparty/textproc/bbe/meta b/packages/3rdparty/textproc/bbe/meta deleted file mode 100644 index 31b7fa48ad..0000000000 --- a/packages/3rdparty/textproc/bbe/meta +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="bbe" -PKG_VERSION="0.2.2" -PKG_REV="1" -PKG_ARCH="" -PKG_LICENSE="GPL" -PKG_SITE="http://bbe-.sourceforge.net/" -PKG_URL="$SOURCEFORGE_SRC/bbe-/${PKG_NAME}-${PKG_VERSION}.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="textproc" -PKG_SHORTDESC="sed-like editor for binary files" -PKG_LONGDESC="bbe: sed-like editor for binary files" -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" From 42a57074d39bc1e838e456611062a074915a33e6 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 14 Jul 2013 22:10:03 +0300 Subject: [PATCH 05/12] sync unofficial --- packages/unofficial | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/unofficial b/packages/unofficial index 464a7aa0fc..b425b905f3 160000 --- a/packages/unofficial +++ b/packages/unofficial @@ -1 +1 @@ -Subproject commit 464a7aa0fc2b6c12042c2f302029d0bba1807f8f +Subproject commit b425b905f3eb417bace156a4526fbc29d8439e39 From 17672f9bac98a36d31bbbbb260f673d63294dcf8 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 14 Jul 2013 22:13:20 +0300 Subject: [PATCH 06/12] remove package: 'imlib2', moving to unofficial --- packages/3rdparty/graphics/imlib2/build | 50 ------------------------- packages/3rdparty/graphics/imlib2/meta | 35 ----------------- 2 files changed, 85 deletions(-) delete mode 100755 packages/3rdparty/graphics/imlib2/build delete mode 100755 packages/3rdparty/graphics/imlib2/meta diff --git a/packages/3rdparty/graphics/imlib2/build b/packages/3rdparty/graphics/imlib2/build deleted file mode 100755 index b02be3e17b..0000000000 --- a/packages/3rdparty/graphics/imlib2/build +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -VDR_ADDON_DIR="/storage/.xbmc/addons/service.multimedia.vdr-addon" - -cd $PKG_BUILD - -case "$TARGET_ARCH" in - i386) - MMX_ARG="--enable-mmx --disable-amd64" - ;; - x86_64) - MMX_ARG="--enable-mmx --enable-amd64" - ;; - *) - MMX_ARG="--disable-mmx --disable-amd64" - ;; -esac - -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - $MMX_ARG - -sed -i "s|#define SYS_LOADERS_PATH .*|#define SYS_LOADERS_PATH \"$VDR_ADDON_DIR/lib/imlib2\"|" src/lib/loaderpath.h - -make -$MAKEINSTALL diff --git a/packages/3rdparty/graphics/imlib2/meta b/packages/3rdparty/graphics/imlib2/meta deleted file mode 100755 index b354c7ebbf..0000000000 --- a/packages/3rdparty/graphics/imlib2/meta +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="imlib2" -PKG_VERSION="1.4.5" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://web.enlightenment.org/" -PKG_URL="$SOURCEFORGE_SRC/enlightenment/${PKG_NAME}-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain libjpeg-turbo libpng tiff zlib bzip2 libX11 libXext" -PKG_PRIORITY="optional" -PKG_SECTION="multimedia" -PKG_SHORTDESC="Imlib2 is a graphics library." -PKG_LONGDESC="Imlib2 is a graphics library for file loading, saving, rendering, manipulation." -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" From 766a72389efc2c51733d3ba7faae1d7cecb63baf Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 14 Jul 2013 22:27:03 +0300 Subject: [PATCH 07/12] remove package: 'CherryPy', moving to unofficial --- packages/python/web/CherryPy/build | 33 ------------------------- packages/python/web/CherryPy/install | 25 ------------------- packages/python/web/CherryPy/meta | 36 ---------------------------- 3 files changed, 94 deletions(-) delete mode 100755 packages/python/web/CherryPy/build delete mode 100755 packages/python/web/CherryPy/install delete mode 100644 packages/python/web/CherryPy/meta diff --git a/packages/python/web/CherryPy/build b/packages/python/web/CherryPy/build deleted file mode 100755 index 285d2998d2..0000000000 --- a/packages/python/web/CherryPy/build +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" -export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" - -cd $PKG_BUILD - -python setup.py build --cross-compile -python setup.py install --root=./.install --prefix=/usr - -rm -rf .install/usr/bin diff --git a/packages/python/web/CherryPy/install b/packages/python/web/CherryPy/install deleted file mode 100755 index 85a37ef61d..0000000000 --- a/packages/python/web/CherryPy/install +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cp -PR $PKG_BUILD/.install/* $INSTALL diff --git a/packages/python/web/CherryPy/meta b/packages/python/web/CherryPy/meta deleted file mode 100644 index 7d02834923..0000000000 --- a/packages/python/web/CherryPy/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="CherryPy" -PKG_VERSION="3.2.2" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="BSD" -PKG_SITE="http://cherrypy.org/" -PKG_URL="http://download.cherrypy.org/cherrypy/3.2.2/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="Python" -PKG_BUILD_DEPENDS="toolchain Python distutilscross" -PKG_PRIORITY="optional" -PKG_SECTION="python/web" -PKG_SHORTDESC="CherrPy: A Pythonic, object-orientated web framework" -PKG_LONGDESC="CherryPy allows developers to build web applications in much the same way they would build any other object-oriented Python program. This results in smaller source code developed in less time." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" From c3ca91dd10d75dca43b5bc94bbd419f6b8f9e7a8 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 14 Jul 2013 22:29:56 +0300 Subject: [PATCH 08/12] remove package: 'configobj', moving to unofficial --- packages/python/system/configobj/build | 33 ----------------- packages/python/system/configobj/install | 25 ------------- packages/python/system/configobj/meta | 36 ------------------- .../configobj-4.7.2-setuptools-0.1.patch | 12 ------- 4 files changed, 106 deletions(-) delete mode 100755 packages/python/system/configobj/build delete mode 100755 packages/python/system/configobj/install delete mode 100644 packages/python/system/configobj/meta delete mode 100644 packages/python/system/configobj/patches/configobj-4.7.2-setuptools-0.1.patch diff --git a/packages/python/system/configobj/build b/packages/python/system/configobj/build deleted file mode 100755 index 0efff6bff7..0000000000 --- a/packages/python/system/configobj/build +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" -export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" - -cd $PKG_BUILD - -python setup.py build --cross-compile -python setup.py install --root=./.install --prefix=/usr - -rm -rf .install/usr/lib/python*/site-packages/*.py diff --git a/packages/python/system/configobj/install b/packages/python/system/configobj/install deleted file mode 100755 index 85a37ef61d..0000000000 --- a/packages/python/system/configobj/install +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cp -PR $PKG_BUILD/.install/* $INSTALL diff --git a/packages/python/system/configobj/meta b/packages/python/system/configobj/meta deleted file mode 100644 index cb58813111..0000000000 --- a/packages/python/system/configobj/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="configobj" -PKG_VERSION="4.7.2" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.voidspace.org.uk/python/configobj.html" -PKG_URL="http://pypi.python.org/packages/source/c/configobj/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="Python" -PKG_BUILD_DEPENDS="toolchain Python distutilscross" -PKG_PRIORITY="optional" -PKG_SECTION="python/system" -PKG_SHORTDESC="configobj: a simple but powerful config file reader and writer" -PKG_LONGDESC="ConfigObj is a simple but powerful config file reader and writer: an ini file round tripper. Its main feature is that it is very easy to use, with a straightforward programmer's interface and a simple syntax for config files." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/python/system/configobj/patches/configobj-4.7.2-setuptools-0.1.patch b/packages/python/system/configobj/patches/configobj-4.7.2-setuptools-0.1.patch deleted file mode 100644 index 9141114ffa..0000000000 --- a/packages/python/system/configobj/patches/configobj-4.7.2-setuptools-0.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur configobj-4.7.2/setup.py configobj-4.7.2.patch/setup.py ---- configobj-4.7.2/setup.py 2010-03-02 00:18:36.000000000 +0100 -+++ configobj-4.7.2.patch/setup.py 2011-02-19 13:56:40.861322489 +0100 -@@ -9,7 +9,7 @@ - # http://www.voidspace.org.uk/python/license.shtml - - import sys --from distutils.core import setup -+from setuptools import setup - from configobj import __version__ as VERSION - - NAME = 'configobj' From 71cb04bbb5faaf8b17cb89971b55435fc0d90107 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 14 Jul 2013 22:32:19 +0300 Subject: [PATCH 09/12] remove package: 'pyOpenSSL', moving to unofficial --- packages/python/security/pyOpenSSL/build | 33 ----------------- packages/python/security/pyOpenSSL/install | 25 ------------- packages/python/security/pyOpenSSL/meta | 36 ------------------- .../patches/pyOpenSSL-0.11-setuptools.patch | 12 ------- 4 files changed, 106 deletions(-) delete mode 100755 packages/python/security/pyOpenSSL/build delete mode 100755 packages/python/security/pyOpenSSL/install delete mode 100644 packages/python/security/pyOpenSSL/meta delete mode 100644 packages/python/security/pyOpenSSL/patches/pyOpenSSL-0.11-setuptools.patch diff --git a/packages/python/security/pyOpenSSL/build b/packages/python/security/pyOpenSSL/build deleted file mode 100755 index 285d2998d2..0000000000 --- a/packages/python/security/pyOpenSSL/build +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" -export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" - -cd $PKG_BUILD - -python setup.py build --cross-compile -python setup.py install --root=./.install --prefix=/usr - -rm -rf .install/usr/bin diff --git a/packages/python/security/pyOpenSSL/install b/packages/python/security/pyOpenSSL/install deleted file mode 100755 index 85a37ef61d..0000000000 --- a/packages/python/security/pyOpenSSL/install +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cp -PR $PKG_BUILD/.install/* $INSTALL diff --git a/packages/python/security/pyOpenSSL/meta b/packages/python/security/pyOpenSSL/meta deleted file mode 100644 index ed4c6d3e38..0000000000 --- a/packages/python/security/pyOpenSSL/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="pyOpenSSL" -PKG_VERSION="0.11" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="LGPL" -PKG_SITE="https://launchpad.net/pyopenssl" -PKG_URL="http://launchpad.net/pyopenssl/main/$PKG_VERSION/+download/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="Python distutilscross openssl" -PKG_BUILD_DEPENDS="toolchain Python distutilscross openssl" -PKG_PRIORITY="optional" -PKG_SECTION="python/security" -PKG_SHORTDESC="pyOpenSSL: Python interface to the OpenSSL library" -PKG_LONGDESC="Python interface to the OpenSSL library. Includes: SSL Context objects, SSL Connection objects, using Python sockets as transport layer. The Connection object wraps all the socket methods and can therefore be used interchangeably." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/python/security/pyOpenSSL/patches/pyOpenSSL-0.11-setuptools.patch b/packages/python/security/pyOpenSSL/patches/pyOpenSSL-0.11-setuptools.patch deleted file mode 100644 index b93a8d3126..0000000000 --- a/packages/python/security/pyOpenSSL/patches/pyOpenSSL-0.11-setuptools.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur pyOpenSSL-0.10/setup.py pyOpenSSL-0.10.patch/setup.py ---- pyOpenSSL-0.10/setup.py 2009-11-13 16:36:16.000000000 +0100 -+++ pyOpenSSL-0.10.patch/setup.py 2010-10-19 00:24:51.858811333 +0200 -@@ -15,7 +15,7 @@ - distutils.log.set_verbosity(3) - - import sys, os --from distutils.core import Extension, setup -+from setuptools import Extension, setup - from distutils.errors import DistutilsFileError - from distutils.command.build_ext import build_ext - From 761950fef59f041c04a2011a53922b93d9c1376f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Jul 2013 21:32:49 +0200 Subject: [PATCH 10/12] xbmc: update to xbmc-c218d5c Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/meta | 2 +- .../xbmc-321-texturepacker-hostflags-and-rework.patch | 0 ...bmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch | 0 .../xbmc-453-add_openelec.tv_RSS_news-0.1.patch | 0 .../xbmc-602-add_as.xml_busy_dialog_delay_control.patch | 0 ...xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch | 0 .../{e565394 => c218d5c}/xbmc-995.01-xvba_support-a3dbeb0.patch | 0 .../{e565394 => c218d5c}/xbmc-995.10-disable-alt-tab.patch | 0 .../{e565394 => c218d5c}/xbmc-999.01-automake-1.13.patch | 0 10 files changed, 2 insertions(+), 2 deletions(-) rename packages/mediacenter/xbmc/patches/{e565394 => c218d5c}/xbmc-321-texturepacker-hostflags-and-rework.patch (100%) rename packages/mediacenter/xbmc/patches/{e565394 => c218d5c}/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{e565394 => c218d5c}/xbmc-453-add_openelec.tv_RSS_news-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{e565394 => c218d5c}/xbmc-602-add_as.xml_busy_dialog_delay_control.patch (100%) rename packages/mediacenter/xbmc/patches/{e565394 => c218d5c}/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch (100%) rename packages/mediacenter/xbmc/patches/{e565394 => c218d5c}/xbmc-995.01-xvba_support-a3dbeb0.patch (100%) rename packages/mediacenter/xbmc/patches/{e565394 => c218d5c}/xbmc-995.10-disable-alt-tab.patch (100%) rename packages/mediacenter/xbmc/patches/{e565394 => c218d5c}/xbmc-999.01-automake-1.13.patch (100%) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 0f60c7c2e8..8a7de79748 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.0" if [ "$XBMC" = "master" ]; then - PKG_VERSION="e565394" + PKG_VERSION="c218d5c" elif [ "$XBMC" = "xbmc-aml" ]; then PKG_VERSION="aml-frodo-d9119f2" fi diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index cb256f7d84..cf7539c6a8 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -21,7 +21,7 @@ PKG_NAME="xbmc" PKG_VERSION="12.2.0" if [ "$XBMC" = "master" ]; then - PKG_VERSION="e565394" + PKG_VERSION="c218d5c" elif [ "$XBMC" = "xbmc-aml" ]; then PKG_VERSION="aml-frodo-d9119f2" fi diff --git a/packages/mediacenter/xbmc/patches/e565394/xbmc-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc/patches/c218d5c/xbmc-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/e565394/xbmc-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc/patches/c218d5c/xbmc-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc/patches/e565394/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/c218d5c/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/e565394/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/c218d5c/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/e565394/xbmc-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/c218d5c/xbmc-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/e565394/xbmc-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/c218d5c/xbmc-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/e565394/xbmc-602-add_as.xml_busy_dialog_delay_control.patch b/packages/mediacenter/xbmc/patches/c218d5c/xbmc-602-add_as.xml_busy_dialog_delay_control.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/e565394/xbmc-602-add_as.xml_busy_dialog_delay_control.patch rename to packages/mediacenter/xbmc/patches/c218d5c/xbmc-602-add_as.xml_busy_dialog_delay_control.patch diff --git a/packages/mediacenter/xbmc/patches/e565394/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch b/packages/mediacenter/xbmc/patches/c218d5c/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/e565394/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch rename to packages/mediacenter/xbmc/patches/c218d5c/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch diff --git a/packages/mediacenter/xbmc/patches/e565394/xbmc-995.01-xvba_support-a3dbeb0.patch b/packages/mediacenter/xbmc/patches/c218d5c/xbmc-995.01-xvba_support-a3dbeb0.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/e565394/xbmc-995.01-xvba_support-a3dbeb0.patch rename to packages/mediacenter/xbmc/patches/c218d5c/xbmc-995.01-xvba_support-a3dbeb0.patch diff --git a/packages/mediacenter/xbmc/patches/e565394/xbmc-995.10-disable-alt-tab.patch b/packages/mediacenter/xbmc/patches/c218d5c/xbmc-995.10-disable-alt-tab.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/e565394/xbmc-995.10-disable-alt-tab.patch rename to packages/mediacenter/xbmc/patches/c218d5c/xbmc-995.10-disable-alt-tab.patch diff --git a/packages/mediacenter/xbmc/patches/e565394/xbmc-999.01-automake-1.13.patch b/packages/mediacenter/xbmc/patches/c218d5c/xbmc-999.01-automake-1.13.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/e565394/xbmc-999.01-automake-1.13.patch rename to packages/mediacenter/xbmc/patches/c218d5c/xbmc-999.01-automake-1.13.patch From b62af51153acb13e1bf6ef1a154e414396462fd1 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 14 Jul 2013 22:41:20 +0300 Subject: [PATCH 11/12] remove package: 'lua', moving to unofficial --- packages/lang/lua/build | 65 ----------------------------------------- packages/lang/lua/meta | 36 ----------------------- 2 files changed, 101 deletions(-) delete mode 100755 packages/lang/lua/build delete mode 100644 packages/lang/lua/meta diff --git a/packages/lang/lua/build b/packages/lang/lua/build deleted file mode 100755 index a75045dcbc..0000000000 --- a/packages/lang/lua/build +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD - -# build and install host packages - setup_toolchain host - - cp -R src src.host - make -C src.host \ - INSTALL_TOP=/usr \ - PLAT=linux \ - CC="$HOST_CC" \ - AR="$HOST_AR rcu" \ - RANLIB="$HOST_RANLIB" \ - CFLAGS="$HOST_CFLAGS" \ - LDFLAGS="$HOST_LDFLAGS" \ - linux - - mkdir -p $ROOT/$TOOLCHAIN/bin - cp -P src.host/lua $ROOT/$TOOLCHAIN/bin - cp -P src.host/luac $ROOT/$TOOLCHAIN/bin - -# build and install target packages - setup_toolchain target - - make -C src \ - INSTALL_TOP=/usr \ - PLAT=linux \ - CC="$TARGET_CC" \ - CFLAGS="$TARGET_CFLAGS" \ - AR="$TARGET_AR rcu" \ - RANLIB="$TARGET_RANLIB" \ - liblua.a - - mkdir -p $SYSROOT_PREFIX/usr/lib - cp src/liblua.a $SYSROOT_PREFIX/usr/lib - - mkdir -p $SYSROOT_PREFIX/usr/include - cp src/lua.h $SYSROOT_PREFIX/usr/include - cp src/luaconf.h $SYSROOT_PREFIX/usr/include - cp src/lualib.h $SYSROOT_PREFIX/usr/include - cp src/lauxlib.h $SYSROOT_PREFIX/usr/include - cp src/lua.hpp $SYSROOT_PREFIX/usr/include diff --git a/packages/lang/lua/meta b/packages/lang/lua/meta deleted file mode 100644 index 8be2e3ff88..0000000000 --- a/packages/lang/lua/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="lua" -PKG_VERSION="5.2.1" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="MIT" -PKG_SITE="http://www.lua.org/" -PKG_URL="http://www.lua.org/ftp/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain readline-host" -PKG_PRIORITY="optional" -PKG_SECTION="lang" -PKG_SHORTDESC="lua: A lightweight, extensible programming language" -PKG_LONGDESC="Lua is a powerful light-weight programming language designed for extending applications. Lua is also frequently used as a general-purpose, stand-alone language." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" From 0a44d576add7829e01532da1521e3e6ab45e73e0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 14 Jul 2013 22:12:45 +0200 Subject: [PATCH 12/12] xbmc: update XVBA/VDPAU patch Signed-off-by: Stephan Raue --- ...=> xbmc-995.01-xvba_support-da1ff12.patch} | 758 +++++++++++------- 1 file changed, 483 insertions(+), 275 deletions(-) rename packages/mediacenter/xbmc/patches/c218d5c/{xbmc-995.01-xvba_support-a3dbeb0.patch => xbmc-995.01-xvba_support-da1ff12.patch} (97%) diff --git a/packages/mediacenter/xbmc/patches/c218d5c/xbmc-995.01-xvba_support-a3dbeb0.patch b/packages/mediacenter/xbmc/patches/c218d5c/xbmc-995.01-xvba_support-da1ff12.patch similarity index 97% rename from packages/mediacenter/xbmc/patches/c218d5c/xbmc-995.01-xvba_support-a3dbeb0.patch rename to packages/mediacenter/xbmc/patches/c218d5c/xbmc-995.01-xvba_support-da1ff12.patch index a5f62476bb..c6bd3082c1 100644 --- a/packages/mediacenter/xbmc/patches/c218d5c/xbmc-995.01-xvba_support-a3dbeb0.patch +++ b/packages/mediacenter/xbmc/patches/c218d5c/xbmc-995.01-xvba_support-da1ff12.patch @@ -1,7 +1,7 @@ From 16898b6bd8f19f416c9f4765ee20858fb42ead11 Mon Sep 17 00:00:00 2001 From: fritsch Date: Mon, 15 Apr 2013 20:27:39 +0200 -Subject: [PATCH 001/120] AE: Start of planar format internally +Subject: [PATCH 001/123] AE: Start of planar format internally --- xbmc/cores/AudioEngine/AEAudioFormat.h | 7 +++++++ @@ -125,7 +125,7 @@ index 6de84dc..3322226 100644 From 7be39700ca76a23e1f51315a77e4fba5dfdfbc39 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 31 May 2013 16:28:30 +0200 -Subject: [PATCH 002/120] AE: register callback for all audio settings +Subject: [PATCH 002/123] AE: register callback for all audio settings --- xbmc/settings/Settings.cpp | 10 ++++++++++ @@ -158,47 +158,10 @@ index 65e685a..ee97753 100644 1.8.1.6 -From df0408008af793f9e726707e396b4c8d48f8038a Mon Sep 17 00:00:00 2001 -From: fritsch -Date: Sat, 8 Jun 2013 09:45:48 +0200 -Subject: [PATCH 003/120] AE: Make sure to reinit and to avoid races cause of - sleeping - ---- - xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index 9d3cefa..ef7637f 100644 ---- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -@@ -1150,16 +1150,13 @@ bool CAESinkALSA::SoftSuspend() - bool CAESinkALSA::SoftResume() - { - // reinit all the clibber -- bool ret = true; // all fine - if(!m_pcm) - { - if (!snd_config) - snd_config_update(); -- -- ret = Initialize(m_initFormat, m_initDevice); - } -- //we want that AE loves us again - reinit when initialize failed -- return ret; // force reinit if false -+ // make sure that OpenInternalSink is done again -+ return false; - } - - void CAESinkALSA::sndLibErrorHandler(const char *file, int line, const char *function, int err, const char *fmt, ...) --- -1.8.1.6 - - -From 4f5f3db325d1eb38d5b9e37ffeed0c30456141a4 Mon Sep 17 00:00:00 2001 +From a2070bcc6555822f98e8bb5d846dee36c3b98028 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 23 May 2013 10:05:11 +0200 -Subject: [PATCH 004/120] AESinkALSA: drop unneeded member +Subject: [PATCH 003/123] AESinkALSA: drop unneeded member --- xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 11 ++++++----- @@ -206,7 +169,7 @@ Subject: [PATCH 004/120] AESinkALSA: drop unneeded member 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index ef7637f..474c7cc 100644 +index 9d3cefa..32fb450 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp @@ -131,19 +131,20 @@ void CAESinkALSA::GetAESParams(AEAudioFormat format, std::string& params) @@ -273,10 +236,10 @@ index e2b4e4f..73615a5 100644 1.8.1.6 -From a53de587ce8a071c252c394f5131a422daa76496 Mon Sep 17 00:00:00 2001 +From 1871f8bc6bb5828299b57db0fbf131392e2ea5a1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 27 Apr 2013 10:47:01 +0200 -Subject: [PATCH 005/120] ffmpeg: add methods to the interface needed for +Subject: [PATCH 004/123] ffmpeg: add methods to the interface needed for resampling --- @@ -387,10 +350,10 @@ index e9613d3..320b3a7 100644 1.8.1.6 -From be01097993a127b5fcb1cdcd60ff34768dcc9136 Mon Sep 17 00:00:00 2001 +From efe72091a8b488b8bb11063149252b6de292f66b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 26 Jun 2013 15:12:28 +0200 -Subject: [PATCH 006/120] AE: allow encoder to be fed with planar format +Subject: [PATCH 005/123] AE: allow encoder to be fed with planar format --- .../cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp | 66 +++++++++++++++++++++- @@ -568,10 +531,10 @@ index e304908..0e6f1f8 100644 1.8.1.6 -From 6c7828f08a31febb7dff6d301b16d99b523197de Mon Sep 17 00:00:00 2001 +From 796f1dbc328099fd3527756675795b8708436468 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 26 Jun 2013 15:13:22 +0200 -Subject: [PATCH 007/120] AE: alsa - close device in blocking mode, fixes +Subject: [PATCH 006/123] AE: alsa - close device in blocking mode, fixes device busy --- @@ -579,7 +542,7 @@ Subject: [PATCH 007/120] AE: alsa - close device in blocking mode, fixes 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index 474c7cc..dbff176 100644 +index 32fb450..91cfc08 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp @@ -196,8 +196,8 @@ bool CAESinkALSA::Initialize(AEAudioFormat &format, std::string &device) @@ -609,17 +572,17 @@ index 474c7cc..dbff176 100644 1.8.1.6 -From cacc59128514fe159ca6aed6049beaba45dadca3 Mon Sep 17 00:00:00 2001 +From 5cdc044bbfdf1740992d930501d48f78ea104d5d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 26 Jun 2013 18:48:30 +0200 -Subject: [PATCH 008/120] AE: alsa - set to prepared after drain +Subject: [PATCH 007/123] AE: alsa - set to prepared after drain --- xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index dbff176..3497aef 100644 +index 91cfc08..ee7b549 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp @@ -196,8 +196,8 @@ bool CAESinkALSA::Initialize(AEAudioFormat &format, std::string &device) @@ -644,10 +607,10 @@ index dbff176..3497aef 100644 1.8.1.6 -From 6a745e90665ff9a654c64792406d23a46eacad8a Mon Sep 17 00:00:00 2001 +From a28f4c46f39407d1e155a6b300a38eadca67a2c6 Mon Sep 17 00:00:00 2001 From: fritsch Date: Fri, 5 Jul 2013 21:02:00 +0200 -Subject: [PATCH 009/120] AE: Add blocking option to AddPackets, makes Sink +Subject: [PATCH 008/123] AE: Add blocking option to AddPackets, makes Sink behaviour choosable after c2493d5bf6bc2be2fb45f563affdd214bf9862fb --- @@ -682,7 +645,7 @@ index cb9c04b..65395bf 100644 /* Drain the sink diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index 3497aef..bfa1351 100644 +index ee7b549..8d2e6a1 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp @@ -497,7 +497,7 @@ double CAESinkALSA::GetCacheTotal() @@ -890,10 +853,10 @@ index 312866c..c88dd91 100644 1.8.1.6 -From 6dc0c4756cedb4cb7d83a207c41fa4df0a6f3a85 Mon Sep 17 00:00:00 2001 +From d6064a357c0423d7601c50568f78496fc7fd89ea Mon Sep 17 00:00:00 2001 From: fritsch Date: Sat, 6 Jul 2013 08:07:30 +0200 -Subject: [PATCH 010/120] AE: Give Sinks the possibility to be used in a +Subject: [PATCH 009/123] AE: Give Sinks the possibility to be used in a blocking way --- @@ -1008,10 +971,10 @@ index 6d6e477..5aebb47 100644 1.8.1.6 -From 0953ebde86870b738288d60596016a069728109c Mon Sep 17 00:00:00 2001 +From feafa929a610c5de9ebdaf7f1fd1657348d48945 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 7 Jul 2013 18:22:04 +0200 -Subject: [PATCH 011/120] AE: allow to register audio callback directly into +Subject: [PATCH 010/123] AE: allow to register audio callback directly into engine --- @@ -1125,10 +1088,10 @@ index cfde8fb..c9d56ac 100644 1.8.1.6 -From 54451cd2c0d74d41415655779f0a6ab7999ff793 Mon Sep 17 00:00:00 2001 +From 6df9543d4e87cc038938efb44bc44c4e8eba9c45 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Mon, 1 Jul 2013 13:52:29 +0200 -Subject: [PATCH 012/120] AE: add parameter wait to drain, dvdplayer wants to +Subject: [PATCH 011/123] AE: add parameter wait to drain, dvdplayer wants to wait for the stream to be drained, papayer does not --- @@ -1264,10 +1227,10 @@ index c9d56ac..f2e288c 100644 1.8.1.6 -From 1b0dc8cf08199a1c1238f4639fafad666a1c148b Mon Sep 17 00:00:00 2001 +From 2381ed88238ff8445cc23ac227e59e37b809e513 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 25 Mar 2013 13:58:11 +0100 -Subject: [PATCH 013/120] ActiveAE: add new audio engine, co-author: fritsch +Subject: [PATCH 012/123] ActiveAE: add new audio engine, co-author: fritsch --- xbmc/cores/AudioEngine/AEFactory.cpp | 3 + @@ -6763,10 +6726,10 @@ index 694a9bd..ca49be2 100644 1.8.1.6 -From aaa70a24dc188032d626a82092d82183e95303f6 Mon Sep 17 00:00:00 2001 +From 5e22d771079269b28d443a869cf9024bf7cfb9c0 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sat, 8 Jun 2013 09:39:38 +0200 -Subject: [PATCH 014/120] ActiveAE: Make Factory aware of environment, change +Subject: [PATCH 013/123] ActiveAE: Make Factory aware of environment, change global namespace --- @@ -6807,10 +6770,10 @@ index 4f9f566..5adda5f 100644 1.8.1.6 -From b3b2ffbc59448441f9afdeb45c0fd126656a74bd Mon Sep 17 00:00:00 2001 +From 89bb54f049db842565fe68698fd8aacc896be229 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 11 Jul 2013 18:33:34 +0200 -Subject: [PATCH 016/120] AE: allow Windows to use ActiveAE via env +Subject: [PATCH 015/123] AE: allow Windows to use ActiveAE via env --- xbmc/cores/AudioEngine/AEFactory.cpp | 14 ++++++++++++++ @@ -6845,10 +6808,255 @@ index 5adda5f..d5517f3 100644 1.8.1.6 -From c1c001b40a648e8812678c5b994e9566c5a30ca2 Mon Sep 17 00:00:00 2001 +From 795bc8558b82484598f4e304a0b0681eaa0b7ec5 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Sun, 14 Jul 2013 17:28:13 +0200 +Subject: [PATCH 016/123] ActiveAE: convert BE/LE to NE if possible + +--- + xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp +index 252f431..0e003bd 100644 +--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp ++++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp +@@ -648,6 +648,18 @@ void CActiveAESink::OpenSink() + return; + } + ++#ifdef WORDS_BIGENDIAN ++ if (m_sinkFormat.m_dataFormat == AE_FMT_S16BE) ++ m_sinkFormat.m_dataFormat = AE_FMT_S16NE; ++ else if (m_sinkFormat.m_dataFormat == AE_FMT_S32BE) ++ m_sinkFormat.m_dataFormat = AE_FMT_S32NE; ++#else ++ if (m_sinkFormat.m_dataFormat == AE_FMT_S16LE) ++ m_sinkFormat.m_dataFormat = AE_FMT_S16NE; ++ else if (m_sinkFormat.m_dataFormat == AE_FMT_S32LE) ++ m_sinkFormat.m_dataFormat = AE_FMT_S32NE; ++#endif ++ + CLog::Log(LOGDEBUG, "CActiveAE::OpenSink - %s Initialized:", m_sink->GetName()); + CLog::Log(LOGDEBUG, " Output Device : %s", m_deviceFriendlyName.c_str()); + CLog::Log(LOGDEBUG, " Sample Rate : %d", m_sinkFormat.m_sampleRate); +-- +1.8.1.6 + + +From d3462ff7d97c254cc3f5378421e1507d4a19a29f Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Sun, 14 Jul 2013 17:48:23 +0200 +Subject: [PATCH 017/123] ActiveAE: always request float on sink if not raw + +--- + xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +index dc79da7..c1ec6e5 100644 +--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp ++++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +@@ -1087,6 +1087,7 @@ void CActiveAE::ApplySettingsToFormat(AEAudioFormat &format, AudioSettings &sett + } + else + { ++ format.m_dataFormat = AE_FMT_FLOAT; + if ((format.m_channelLayout.Count() > 2) || settings.stereoupmix) + { + switch (settings.channels) +-- +1.8.1.6 + + +From 91ab13397e29e13fef220b3b8334f6062b73f63d Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Sun, 14 Jul 2013 18:34:47 +0200 +Subject: [PATCH 018/123] ActiveAE: set volume on sink if supported + +--- + xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 8 +++++++- + xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h | 1 + + xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp | 14 ++++++++++++++ + xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h | 3 +++ + 4 files changed, 25 insertions(+), 1 deletion(-) + +diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +index c1ec6e5..a692d2b 100644 +--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp ++++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +@@ -146,6 +146,7 @@ bool CEngineStats::IsSuspended() + m_encoder = NULL; + m_audioCallback = NULL; + m_vizInitialized = false; ++ m_sinkHasVolume = false; + } + + CActiveAE::~CActiveAE() +@@ -217,6 +218,8 @@ void CActiveAE::StateMachine(int signal, Protocol *port, Message *msg) + return; + case CActiveAEControlProtocol::VOLUME: + m_volume = *(float*)msg->data; ++ if (m_sinkHasVolume) ++ m_sink.m_controlPort.SendOutMessage(CSinkControlProtocol::VOLUME, &m_volume, sizeof(float)); + return; + case CActiveAEControlProtocol::MUTE: + m_muted = *(bool*)msg->data; +@@ -752,6 +755,7 @@ void CActiveAE::Configure() + m_settings.driver = driver; + initSink = true; + m_stats.Reset(m_sinkFormat.m_sampleRate); ++ m_sink.m_controlPort.SendOutMessage(CSinkControlProtocol::VOLUME, &m_volume, sizeof(float)); + } + + if (m_silenceBuffers) +@@ -1181,6 +1185,7 @@ void CActiveAE::InitSink() + { + m_sinkFormat = *data; + } ++ m_sinkHasVolume = m_sink.HasVolume(); + reply->Release(); + } + else +@@ -1461,7 +1466,8 @@ bool CActiveAE::RunStages() + { + // mix gui sounds + MixSounds(*(out->pkt)); +- Deamplify(*(out->pkt)); ++ if (!m_sinkHasVolume) ++ Deamplify(*(out->pkt)); + + // viz + { +diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h +index 30da1ac..40a2870 100644 +--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h ++++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h +@@ -314,6 +314,7 @@ class CActiveAE : public IAE, private CThread + + float m_volume; + bool m_muted; ++ bool m_sinkHasVolume; + + // viz + IAudioCallback *m_audioCallback; +diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp +index 0e003bd..2088cb6 100644 +--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp ++++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp +@@ -39,6 +39,7 @@ + m_sink = NULL; + m_stats = NULL; + m_convertBuffer = NULL; ++ m_volume = 0.0; + } + + void CActiveAESink::Start() +@@ -88,6 +89,13 @@ bool CActiveAESink::IsCompatible(const AEAudioFormat format, const std::string & + return m_sink->IsCompatible(format, device); + } + ++bool CActiveAESink::HasVolume() ++{ ++ if (!m_sink) ++ return false; ++ return m_sink->HasVolume(); ++} ++ + enum SINK_STATES + { + S_TOP = 0, // 0 +@@ -232,6 +240,10 @@ void CActiveAESink::StateMachine(int signal, Protocol *port, Message *msg) + m_extTimeout = 0; + } + return; ++ case CSinkControlProtocol::VOLUME: ++ m_volume = *(float*)msg->data; ++ m_sink->SetVolume(m_volume); ++ return; + default: + break; + } +@@ -648,6 +660,8 @@ void CActiveAESink::OpenSink() + return; + } + ++ m_sink->SetVolume(m_volume); ++ + #ifdef WORDS_BIGENDIAN + if (m_sinkFormat.m_dataFormat == AE_FMT_S16BE) + m_sinkFormat.m_dataFormat = AE_FMT_S16NE; +diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h +index ae19f38..d36555d 100644 +--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h ++++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h +@@ -49,6 +49,7 @@ class CSinkControlProtocol : public Protocol + CONFIGURE, + UNCONFIGURE, + SILENCEMODE, ++ VOLUME, + TIMEOUT, + }; + enum InSignal +@@ -85,6 +86,7 @@ class CActiveAESink : private CThread + void Start(); + void Dispose(); + bool IsCompatible(const AEAudioFormat format, const std::string &device); ++ bool HasVolume(); + CSinkControlProtocol m_controlPort; + CSinkDataProtocol m_dataPort; + +@@ -128,6 +130,7 @@ class CActiveAESink : private CThread + IAESink *m_sink; + AEAudioFormat m_sinkFormat, m_requestedFormat; + CEngineStats *m_stats; ++ float m_volume; + }; + + } +-- +1.8.1.6 + + +From 7b58c9ca0373097b89339304035a4a5edb05c1fe Mon Sep 17 00:00:00 2001 +From: fritsch +Date: Sun, 14 Jul 2013 15:42:25 +0200 +Subject: [PATCH 019/123] ActiveAE: Remove special case - not needed anymore + after: 37b8fb75af29c071a47d1557fe7dfff0b0812dc4 + +--- + xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp +index 2088cb6..7812c02 100644 +--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp ++++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp +@@ -826,14 +826,7 @@ void CActiveAESink::GenerateNoise() + noise[i] = (float) sqrt( -2.0f * log( R1 )) * cos( 2.0f * PI * R2 ) * 0.00001; + } + +- if (m_sinkFormat.m_dataFormat != AE_FMT_FLOAT) +- { +- CAEConvert::AEConvertFrFn convertFn = CAEConvert::FrFloat(m_sinkFormat.m_dataFormat); +- convertFn(noise, nb_floats, m_sampleOfNoise.pkt->data[0]); +- } +- else +- { +- memcpy(m_sampleOfNoise.pkt->data[0], noise, nb_floats*sizeof(float)); +- } ++ CAEConvert::AEConvertFrFn convertFn = CAEConvert::FrFloat(m_sinkFormat.m_dataFormat); ++ convertFn(noise, nb_floats, m_sampleOfNoise.pkt->data[0]); + delete [] noise; + } +-- +1.8.1.6 + + +From e7a30953e4fab54b252fb66f9d48720bf31abe1e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 30 May 2013 10:56:06 +0200 -Subject: [PATCH 017/120] renderer: use fence for determination when a buffer +Subject: [PATCH 020/123] renderer: use fence for determination when a buffer is ready for reuse --- @@ -6980,10 +7188,10 @@ index 28201a2..595ed8b 100644 1.8.1.6 -From 2a6ca858bf5301d36102270c447912c1455ba1cf Mon Sep 17 00:00:00 2001 +From be9fc8089a3ab1a44e6d2ec3cc2cd222f20987c6 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 -Subject: [PATCH 018/120] videoplayer: adapt lateness detection and dropping to +Subject: [PATCH 021/123] videoplayer: adapt lateness detection and dropping to buffering --- @@ -7557,10 +7765,10 @@ index 5f763c0..9be23fb 100644 1.8.1.6 -From 14bd8098eea15a14ba62562d9575f2ee9767965b Mon Sep 17 00:00:00 2001 +From 4b56e80e90f4d673cbca7fa91e740216444d6586 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 -Subject: [PATCH 019/120] video player: present correct pts to user for a/v +Subject: [PATCH 022/123] video player: present correct pts to user for a/v sync (after buffering in renderer) --- @@ -7628,10 +7836,10 @@ index 9be23fb..3c3e007 100644 1.8.1.6 -From d9d48dd1bb4db8f2a60a01ff4d1a0346467fc41c Mon Sep 17 00:00:00 2001 +From 3be868f44191d3437f2ccf053e2c964ed5b3ffd4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 -Subject: [PATCH 020/120] videoplayer: some rework and documentation +Subject: [PATCH 023/123] videoplayer: some rework and documentation --- .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 29 ++++++++++++++++++++-- @@ -7742,10 +7950,10 @@ index ba99804..56b32b9 100644 1.8.1.6 -From e28c8ab5d80c5865a9ac4df391020ab9a963cc5c Mon Sep 17 00:00:00 2001 +From 4dd137d05f8e2fe7f36736395a9650139b7f21cb Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 7 Apr 2012 09:19:00 +0200 -Subject: [PATCH 021/120] vdpau: redesign +Subject: [PATCH 024/123] vdpau: redesign --- language/English/strings.po | 12 +- @@ -13558,10 +13766,10 @@ index e425327..3dae22c 100644 1.8.1.6 -From 1beab603bbf8e8dfc830686c3791cee2fdd69034 Mon Sep 17 00:00:00 2001 +From 2c65b5bb8caabbe3ed88861ebda5a0392d06cd2e Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 09:52:17 +0100 -Subject: [PATCH 022/120] vdpau: make interop gl default and remove setting, +Subject: [PATCH 025/123] vdpau: make interop gl default and remove setting, rename and intvert interop yuv --- @@ -13666,10 +13874,10 @@ index 89ac10e..c4d1a53 100644 1.8.1.6 -From 04b477cfe396088d7938c165fbc482f16c06d9df Mon Sep 17 00:00:00 2001 +From 5625fb3f23df0575518af5db59bc0ac6d0b204dc Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 18:34:47 +0100 -Subject: [PATCH 023/120] vdpau: drop studio level conversion +Subject: [PATCH 026/123] vdpau: drop studio level conversion --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 4 +- @@ -13821,10 +14029,10 @@ index c4d1a53..399da83 100644 1.8.1.6 -From 906fb1ac0ee3abae868cb27174d21e312bd9be02 Mon Sep 17 00:00:00 2001 +From 335ae083e1dcc89cfaa8351b4ff3136b78c432be Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 20:28:49 +0100 -Subject: [PATCH 024/120] vdpau: observe ffmpeg tags for color space +Subject: [PATCH 027/123] vdpau: observe ffmpeg tags for color space --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 38 ++++++++++++++++++-------- @@ -13928,10 +14136,10 @@ index 5bee48b..ef99383 100644 1.8.1.6 -From bde56ed93a92ee72b5694e4399b79fad2932b9cc Mon Sep 17 00:00:00 2001 +From 28f7a60727380f8bef98393e8ed5162ecf4b20a0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 27 Jan 2013 12:10:19 +0100 -Subject: [PATCH 025/120] vdpau: switch off de-interlacing on ff +Subject: [PATCH 028/123] vdpau: switch off de-interlacing on ff --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 5 +++-- @@ -13957,10 +14165,10 @@ index 4b2b4e8..c56dc9c 100644 1.8.1.6 -From 3c356c52a68f17fd54c6f0c916a0804a55c461eb Mon Sep 17 00:00:00 2001 +From a04827ef0ca9a5a659ed2063d7076fb5db016134 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 2 Feb 2013 13:17:09 +0100 -Subject: [PATCH 026/120] vdpau: fix mp4 part2 decoding, activate by default +Subject: [PATCH 029/123] vdpau: fix mp4 part2 decoding, activate by default --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 3 +-- @@ -14000,10 +14208,10 @@ index c156b90..bd08884 100644 1.8.1.6 -From 391c8d2c65b8bbd7593087db0d2fd5843dc592a8 Mon Sep 17 00:00:00 2001 +From 29f7a999fbf40b3228553a655b9b5713cd572e66 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 2 Mar 2013 15:19:19 +0100 -Subject: [PATCH 027/120] vdpau: re-add limited range conversion +Subject: [PATCH 030/123] vdpau: re-add limited range conversion --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 4 +- @@ -14147,10 +14355,10 @@ index 4ffeeb5..f913a97 100644 1.8.1.6 -From 1a1208d017ee657e98bc13bfb2284bc3fd827c67 Mon Sep 17 00:00:00 2001 +From 1ec0508b83dde208260e6574139ea0d1e8ecfe01 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 25 Sep 2012 12:14:15 +0200 -Subject: [PATCH 028/120] linuxrenderer: drop method RenderMultiPass +Subject: [PATCH 031/123] linuxrenderer: drop method RenderMultiPass --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 9 ++------- @@ -14200,10 +14408,10 @@ index d72eb64..6b9046d 100644 1.8.1.6 -From e3d314166a93ef1951e936b5b6bc34d95376088b Mon Sep 17 00:00:00 2001 +From 84d3b7a85900519c4ebc246db4e83cfaba4197b9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 25 Sep 2012 13:20:47 +0200 -Subject: [PATCH 029/120] linuxrenderer: implement progressive weave for vdpau +Subject: [PATCH 032/123] linuxrenderer: implement progressive weave for vdpau --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 55 +++++++++++++++++++-------- @@ -14331,10 +14539,10 @@ index 6b9046d..4494eca 100644 1.8.1.6 -From 678d78876f5398504858585f2c20df379a5f439f Mon Sep 17 00:00:00 2001 +From ec7254bd6dabe50dfaa382840b585004c1c8c883 Mon Sep 17 00:00:00 2001 From: fritsch Date: Thu, 28 Mar 2013 10:38:37 +0100 -Subject: [PATCH 030/120] VDPAU: silence compiler warnings +Subject: [PATCH 033/123] VDPAU: silence compiler warnings --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 19 ++++++++----------- @@ -14430,10 +14638,10 @@ index f913a97..e9ec3d2 100644 1.8.1.6 -From ae0b5c14850e790d9e85492e860740e77b00a5f3 Mon Sep 17 00:00:00 2001 +From 3bc3adc2abf37a0edeb829c89559b71d314c40ca Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 25 Feb 2013 08:47:10 +0100 -Subject: [PATCH 031/120] vdpau: release more resources on pre-cleanup +Subject: [PATCH 034/123] vdpau: release more resources on pre-cleanup --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 72 +++++++++++++++++++++++--- @@ -14571,10 +14779,10 @@ index ef99383..39047b5 100644 1.8.1.6 -From 4bb5dc9797eba87f40fc171a1fa3676914e52186 Mon Sep 17 00:00:00 2001 +From d35ccb80581844bbca3333347f00e6fcb93a71d0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 6 Mar 2013 07:35:10 +0100 -Subject: [PATCH 032/120] vdpau: set deinterlacing method to auto, if default +Subject: [PATCH 035/123] vdpau: set deinterlacing method to auto, if default method not supported --- @@ -14606,10 +14814,10 @@ index 9850cf0..0a6a1dc 100644 1.8.1.6 -From 27dc27eeeb0bf859a3afbd68dca6921b0e696da5 Mon Sep 17 00:00:00 2001 +From c3e2ffae7ea03c7f97534d5232c7d85fa15e89fc Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 21 Apr 2013 09:19:34 +0200 -Subject: [PATCH 033/120] vdpau: fix deadlock if decoder is closed while +Subject: [PATCH 036/123] vdpau: fix deadlock if decoder is closed while refresh rate changes --- @@ -14647,10 +14855,10 @@ index 0a6a1dc..4b4b3c3 100644 1.8.1.6 -From ec3a78f5a324200d906c3c837c4f7b7d5a1fbe99 Mon Sep 17 00:00:00 2001 +From a8be3fdeb938bbaafb2ed203f3603df659fbeab2 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 1 Jun 2013 11:21:19 +0200 -Subject: [PATCH 034/120] renderer: bump buffers to 5 +Subject: [PATCH 037/123] renderer: bump buffers to 5 --- xbmc/cores/VideoRenderers/BaseRenderer.h | 2 +- @@ -14673,10 +14881,10 @@ index fe1f577..527ecf1 100644 1.8.1.6 -From a52b5fccc31fbb30033ada0d68710f4f9e026e40 Mon Sep 17 00:00:00 2001 +From b0470afab151c7b6f40ef522a34971915eaf6a01 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 -Subject: [PATCH 035/120] videoplayer: update frametime, it might change due to +Subject: [PATCH 038/123] videoplayer: update frametime, it might change due to fps detection --- @@ -14700,10 +14908,10 @@ index 3c30d0b..347e888 100644 1.8.1.6 -From 893c978e92d984fc5f221a8c76e06d5226f92fdd Mon Sep 17 00:00:00 2001 +From 3b2c4035e621d28160dc432159b61df047c6b879 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 -Subject: [PATCH 036/120] videoplayer: give streams with invalid fps a chance +Subject: [PATCH 039/123] videoplayer: give streams with invalid fps a chance for fps detection --- @@ -14727,10 +14935,10 @@ index 347e888..1a17145 100644 1.8.1.6 -From 43038bb0e9387714f45a06c5893d714e2f645653 Mon Sep 17 00:00:00 2001 +From 122cde177d428fc91114be2fb57318a6aa69ba5b Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 -Subject: [PATCH 037/120] dvdplayer: allow rewinding at end of stream, do a +Subject: [PATCH 040/123] dvdplayer: allow rewinding at end of stream, do a seek after rewind --- @@ -14767,10 +14975,10 @@ index 974ebd1..b56423b 100644 1.8.1.6 -From 11d775de444786677adf7ee9bbf8010729a7198c Mon Sep 17 00:00:00 2001 +From a308b831bd2e6e7a74589987a4ea805e3f10b2ae Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 -Subject: [PATCH 038/120] X11: ditch SDL for video and window events +Subject: [PATCH 041/123] X11: ditch SDL for video and window events --- xbmc/Application.cpp | 2 +- @@ -16254,10 +16462,10 @@ index 3dae22c..25faaef 100644 1.8.1.6 -From 072d548f43ebb178ca9d2bd2669346f863547a72 Mon Sep 17 00:00:00 2001 +From 9f772616412e5bc3a72e2d56ed5ae6ccc7264693 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 -Subject: [PATCH 039/120] X11: Add xbmc icon +Subject: [PATCH 042/123] X11: Add xbmc icon --- xbmc/windowing/X11/WinSystemX11.cpp | 126 +++++++++++++++++++++++++++++++++++- @@ -16446,10 +16654,10 @@ index 25faaef..c1e6cf1 100644 1.8.1.6 -From 19a7649f89e18a26bd19f210d4ab6609b8188618 Mon Sep 17 00:00:00 2001 +From c3a5e18e21191c785d31fecd9013f25bdada062d Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 -Subject: [PATCH 040/120] X11: add SDL joystick until we have a better solution +Subject: [PATCH 043/123] X11: add SDL joystick until we have a better solution --- xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++ @@ -16503,10 +16711,10 @@ index 5a8bbb8..5bc1de0 100644 1.8.1.6 -From 567720c46694331a46099657276eeea0444036dd Mon Sep 17 00:00:00 2001 +From cedafa3581d7893778c46473b32c90cde9306e9f Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 -Subject: [PATCH 041/120] X11: factor out code handling device reset +Subject: [PATCH 044/123] X11: factor out code handling device reset notification --- @@ -16570,10 +16778,10 @@ index c1e6cf1..041ea55 100644 1.8.1.6 -From 399b4e5eb4c7b5cc60f926c87a9fca5db8bcabcb Mon Sep 17 00:00:00 2001 +From a6d829d266bc04a52e8340aa2e2ea79e2e258070 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 -Subject: [PATCH 042/120] X11: move xrandr events to WinEventsX11 +Subject: [PATCH 045/123] X11: move xrandr events to WinEventsX11 --- xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++++ @@ -16717,10 +16925,10 @@ index fd51dc0..d495443 100644 1.8.1.6 -From e6ac06bcef620b0ba1a801de70a7100026c58205 Mon Sep 17 00:00:00 2001 +From b8c92d9d5a2c7cbf6315d9a04be99d6501de7fe9 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 -Subject: [PATCH 043/120] xrandr: remove method RestoreState +Subject: [PATCH 046/123] xrandr: remove method RestoreState --- xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- @@ -16799,10 +17007,10 @@ index e3450fe..cf22fbf 100644 1.8.1.6 -From 7851a002d04867ff712ee70754434c8bdd00d205 Mon Sep 17 00:00:00 2001 +From 3715129c3cbfcf14b49f28e1721b4d869a370de3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 -Subject: [PATCH 044/120] xrandr: observe orientation +Subject: [PATCH 047/123] xrandr: observe orientation --- xbmc/windowing/X11/WinSystemX11.cpp | 89 ++++++++++++++++++++++++++++++------- @@ -17017,10 +17225,10 @@ index cf22fbf..71ffab4 100644 1.8.1.6 -From f35862ec292d7b2a8a006fe652ad7478f24dd132 Mon Sep 17 00:00:00 2001 +From 74087bc15aafee00399f86ce4387e07bcdc852b6 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 -Subject: [PATCH 045/120] xrandr: allow getting info for multiple screen's +Subject: [PATCH 048/123] xrandr: allow getting info for multiple screen's Refactored by: Joakim Plate --- @@ -17195,10 +17403,10 @@ index 71ffab4..26c2653 100644 1.8.1.6 -From 590e8b59af389a15474571338b65ff0f8a4b8a89 Mon Sep 17 00:00:00 2001 +From 962e8baf6d19fb165988939a07e350b55e7b379e Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 -Subject: [PATCH 046/120] X11: fix multi-head setups +Subject: [PATCH 049/123] X11: fix multi-head setups --- language/English/strings.po | 4 +- @@ -17967,10 +18175,10 @@ index 0d4436b..0336b3b 100644 1.8.1.6 -From 4cad89d71536a4e1ea5c709caf93d09c131dfe3e Mon Sep 17 00:00:00 2001 +From 1b9d4812607e358873e2a8868edf53b41c67cd15 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 -Subject: [PATCH 047/120] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 050/123] X11: remove all DefaultScreen and RootWindow macros --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -18038,10 +18246,10 @@ index 1bea366..cc39720 100644 1.8.1.6 -From e9295108e4c2d6ae7c035fee0f2c4320409dc94c Mon Sep 17 00:00:00 2001 +From 25cb8d56c21407abe41750eb4ac03a6a72cc005d Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 -Subject: [PATCH 048/120] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 051/123] X11: remove all DefaultScreen and RootWindow macros (VideoRefClock) Note this is on a separate display connection. @@ -18113,10 +18321,10 @@ index ca239cf..687e3ff 100644 1.8.1.6 -From e1a6a35c6e12b9f1e759371da90c539141569d27 Mon Sep 17 00:00:00 2001 +From dde7b8a4d232d927c23b3d101687df45dba94886 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 -Subject: [PATCH 049/120] X11: recreate gl context after output has changed +Subject: [PATCH 052/123] X11: recreate gl context after output has changed --- xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++---------- @@ -18267,10 +18475,10 @@ index cc39720..dda7b14 100644 1.8.1.6 -From 4e3d5836dff1ed8c1be980303958f95a9487c1db Mon Sep 17 00:00:00 2001 +From 04b267d0ada69b62e07d05dd840fde3ff2e8d72c Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 -Subject: [PATCH 050/120] X11: hook video reference clock in windowing +Subject: [PATCH 053/123] X11: hook video reference clock in windowing --- xbmc/video/VideoReferenceClock.cpp | 71 +++++++++++++++++++++++++++----------- @@ -18475,10 +18683,10 @@ index 1791570..bcabc9f 100644 1.8.1.6 -From 67d6b86b9baa87e24d1a4f5594799c532201ad1d Mon Sep 17 00:00:00 2001 +From ec444ec34ecb704349dc4e82417a8014e4252e3c Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 -Subject: [PATCH 051/120] X11: fix video calibrations +Subject: [PATCH 054/123] X11: fix video calibrations --- xbmc/windowing/WinSystem.h | 1 + @@ -18570,10 +18778,10 @@ index 2227320..630c0e2 100644 1.8.1.6 -From e18f7e7f7378fb38443ae630bd392cb85ed74f83 Mon Sep 17 00:00:00 2001 +From d29b764e4396e21d57260832012ec8d05ca0f3f8 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 -Subject: [PATCH 052/120] X11: deactivate screen saver on startup +Subject: [PATCH 055/123] X11: deactivate screen saver on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++ @@ -18643,10 +18851,10 @@ index 630c0e2..f78f613 100644 1.8.1.6 -From 04dc438ad60bbd8f4361d0294b09db10a0b2b927 Mon Sep 17 00:00:00 2001 +From 8fc2d01d984fa1dcba0b6a135d085f70e02516f8 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 -Subject: [PATCH 053/120] X11: change method of going full-screen +Subject: [PATCH 056/123] X11: change method of going full-screen --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -18690,10 +18898,10 @@ index c643177..e1e1096 100644 1.8.1.6 -From a23457c2f28caa9e289e78fb6a40940aac02a452 Mon Sep 17 00:00:00 2001 +From c0ef76639af991ea31bd9188c431692f3a3c526d Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 -Subject: [PATCH 054/120] X11: reset key repeat and key modifier on focus lost +Subject: [PATCH 057/123] X11: reset key repeat and key modifier on focus lost and gain --- @@ -18725,10 +18933,10 @@ index c58067b..c9f8a20 100644 1.8.1.6 -From 6baa4227008e47184697e353afe5862c872fc856 Mon Sep 17 00:00:00 2001 +From c7a3b7a4ce52000bbdb260e9f2142297bb531617 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 -Subject: [PATCH 055/120] X11: replace custom utf8 to unicode with charset +Subject: [PATCH 058/123] X11: replace custom utf8 to unicode with charset convertor (squash to x11 events) --- @@ -18945,10 +19153,10 @@ index 6100933..72955ad 100644 1.8.1.6 -From 980445d07a18ceae59d31cbd13999daf2191b210 Mon Sep 17 00:00:00 2001 +From b99781ba1c13380f8c98414fd2b0e7735da27046 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 -Subject: [PATCH 056/120] X11: fixed invalid usage of sizeof() (squash into x11 +Subject: [PATCH 059/123] X11: fixed invalid usage of sizeof() (squash into x11 changes) --- @@ -19012,10 +19220,10 @@ index 72955ad..102a076 100644 1.8.1.6 -From e07faa45207e51ad87a938eb90e1a7ffa3cb6b2a Mon Sep 17 00:00:00 2001 +From b279aabe373a8a7e2bfc65e2a7f5c9f539b2d86e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 -Subject: [PATCH 057/120] add missing keys to xbmc keytable +Subject: [PATCH 060/123] add missing keys to xbmc keytable --- xbmc/input/XBMC_keytable.cpp | 2 ++ @@ -19038,10 +19246,10 @@ index f18e9b1..066cd77 100644 1.8.1.6 -From 2305c7525204667368a4bc178d2ba533572ce5ac Mon Sep 17 00:00:00 2001 +From 156e9d1e3b67b4444366009b19b47410fd4ee60a Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 -Subject: [PATCH 058/120] videorefclock: temp deactivate of nv settings +Subject: [PATCH 061/123] videorefclock: temp deactivate of nv settings --- xbmc/video/VideoReferenceClock.cpp | 2 +- @@ -19064,10 +19272,10 @@ index 4287e8f..21f59b8 100644 1.8.1.6 -From 41964e6b27093a48da7a0c689cf2967bd7a0cf29 Mon Sep 17 00:00:00 2001 +From 0a143d6a5ea9581125f476c892ab9deb93730d4b Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 -Subject: [PATCH 059/120] videorefclock: ask graphics context for refresh rate +Subject: [PATCH 062/123] videorefclock: ask graphics context for refresh rate --- xbmc/video/VideoReferenceClock.cpp | 3 ++- @@ -19098,10 +19306,10 @@ index 21f59b8..0156b2c 100644 1.8.1.6 -From 0a0f3fe5802d36371473e21a69fb4352f0992a57 Mon Sep 17 00:00:00 2001 +From 224633df916fd15c03b9042ce8ac4d23912ce4cc Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 -Subject: [PATCH 060/120] X11: fix icon texture after +Subject: [PATCH 063/123] X11: fix icon texture after cc5ed3c2474084ebc0373a3046410e6f766e03f4 --- @@ -19209,10 +19417,10 @@ index e1e1096..ace57ff 100644 1.8.1.6 -From 3bb6a3c15daa1a2dffc5fc19627c2f0e902c539e Mon Sep 17 00:00:00 2001 +From e5eac0a49cf2bf417683ea22d185424473b846b8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 -Subject: [PATCH 061/120] X11: check for window manager +Subject: [PATCH 064/123] X11: check for window manager --- xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++++- @@ -19333,10 +19541,10 @@ index f78f613..f479c27 100644 1.8.1.6 -From 0bd65115c8ec32b5f5f83fd1bc285f5ea84ecb15 Mon Sep 17 00:00:00 2001 +From 1e0e335c33da59271313f587d14bec4fcda1db15 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 -Subject: [PATCH 062/120] X11: dont set window on xrandr if no mode available +Subject: [PATCH 065/123] X11: dont set window on xrandr if no mode available --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++----- @@ -19373,10 +19581,10 @@ index 188864b..076ed82 100644 1.8.1.6 -From d7d76427fd99a6e6e4e255f853ca674b6406e399 Mon Sep 17 00:00:00 2001 +From 8a637a5c920ad2491e1f45c36ada25fd675fe8e3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 -Subject: [PATCH 063/120] X11: fix crash after a resolution change on startup +Subject: [PATCH 066/123] X11: fix crash after a resolution change on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- @@ -19400,10 +19608,10 @@ index 076ed82..ee339d9 100644 1.8.1.6 -From 7a52fca0ad9ae6580257fec98978804917d84faa Mon Sep 17 00:00:00 2001 +From 6fdb9269d58e784b1ffe846707732faadf505974 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 -Subject: [PATCH 064/120] X11: lock graphics context in NotifyXRREvent +Subject: [PATCH 067/123] X11: lock graphics context in NotifyXRREvent --- xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ @@ -19426,10 +19634,10 @@ index ee339d9..d2dcccd 100644 1.8.1.6 -From 39582233d652d30690985dba0c3c6afaf2d6556c Mon Sep 17 00:00:00 2001 +From cf823969dd79b155ccf6e797312ec447da8c80a9 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 8 Oct 2011 16:45:13 +0200 -Subject: [PATCH 065/120] ffmpeg: add xvba hwaccel +Subject: [PATCH 068/123] ffmpeg: add xvba hwaccel --- lib/ffmpeg/configure | 11 ++ @@ -20278,10 +20486,10 @@ index 1c00ac4..6437e29 100644 1.8.1.6 -From 87bbfa53e72ecb16e4dbdc5c21539401e1bfe09e Mon Sep 17 00:00:00 2001 +From 93c92af6eceb08981a57ddd5b082118cffeb81ba Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Apr 2012 12:09:31 +0200 -Subject: [PATCH 066/120] xvba: add decoder +Subject: [PATCH 069/123] xvba: add decoder --- configure.in | 47 + @@ -23733,10 +23941,10 @@ index 27ed5ee..007ad74 100644 1.8.1.6 -From 3927b4a02ffc72037a30166a149b0127ba6d8fe8 Mon Sep 17 00:00:00 2001 +From a1d6b330e8316cb52b0b9f97c3be92269760a878 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sun, 4 Nov 2012 16:24:10 +0100 -Subject: [PATCH 067/120] xvba: add string for available decoders - we are +Subject: [PATCH 070/123] xvba: add string for available decoders - we are important so make sure we are there --- @@ -23763,10 +23971,10 @@ index 1477264..37a5994 100644 1.8.1.6 -From 168f5f992253b08beba775bad241e0722d7e2423 Mon Sep 17 00:00:00 2001 +From 033dbfbc37f33a1670357c39e6f82dd36e457ab0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Jun 2012 12:46:30 +0200 -Subject: [PATCH 068/120] xvba: do not use vaapi if xvba is present +Subject: [PATCH 071/123] xvba: do not use vaapi if xvba is present --- xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 9 +++++++++ @@ -23796,10 +24004,10 @@ index 2343b11..f102cba 100644 1.8.1.6 -From e882055a9101ee9aca6e44683f8dcf20e0e8c75a Mon Sep 17 00:00:00 2001 +From 4115edbecd5b2dd346f1ea727191737a5d7cfe74 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 -Subject: [PATCH 069/120] ffmpeg: add av_find_default_stream_index to interface +Subject: [PATCH 072/123] ffmpeg: add av_find_default_stream_index to interface --- lib/DllAvFormat.h | 4 ++++ @@ -23845,10 +24053,10 @@ index ee41fa8..56605cb 100644 1.8.1.6 -From b0d63fcec25215eb75e299f04bdec333e5280569 Mon Sep 17 00:00:00 2001 +From 8ffb30c17bd7e2547d8f9822ea3c7ba79ddd5d85 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sat, 13 Apr 2013 11:30:39 +0200 -Subject: [PATCH 070/120] XVBA: revisit draw functions +Subject: [PATCH 073/123] XVBA: revisit draw functions --- lib/ffmpeg/libavcodec/xvba_h264.c | 2 +- @@ -23885,10 +24093,10 @@ index bf3d9c2..ff35a28 100644 1.8.1.6 -From 6d13ff6b61a094a6096e80fc41b7ab110bee18c6 Mon Sep 17 00:00:00 2001 +From 79d420cd213211980405eaec3985973c5747ec20 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sat, 13 Apr 2013 12:06:02 +0200 -Subject: [PATCH 071/120] (ffmpeg): Make XVBA codec available +Subject: [PATCH 074/123] (ffmpeg): Make XVBA codec available --- lib/ffmpeg/libavcodec/vc1dec.c | 3 +++ @@ -23912,10 +24120,10 @@ index 2130c74..4d611f9 100644 1.8.1.6 -From 882cc9482c118c64bb4fb2bbe26bf8bc6162cde9 Mon Sep 17 00:00:00 2001 +From ac4379b9aae918e85751a5dfcf9be58387696da8 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sat, 13 Apr 2013 16:38:50 +0200 -Subject: [PATCH 072/120] ffmpeg: XVBA-VC1 use v->second_field instead of +Subject: [PATCH 075/123] ffmpeg: XVBA-VC1 use v->second_field instead of !s->first_field to make VC1 interlaced working --- @@ -23939,10 +24147,10 @@ index ff35a28..04e7983 100644 1.8.1.6 -From 2dc265d9cbf9a862046e39fbc7501b6c5643b90c Mon Sep 17 00:00:00 2001 +From 7f1f427783474710997c79fc53a087c1bf23537d Mon Sep 17 00:00:00 2001 From: fritsch Date: Sat, 27 Apr 2013 17:36:15 +0200 -Subject: [PATCH 073/120] XVBA: Only set second_field when we are interlaced +Subject: [PATCH 076/123] XVBA: Only set second_field when we are interlaced and an interlaced field --- @@ -23966,10 +24174,10 @@ index 04e7983..eb90c12 100644 1.8.1.6 -From 2a0242ad0ffb76b54742a4afab1bd8800f73dd53 Mon Sep 17 00:00:00 2001 +From b58048413f9b77a3cb6495607743ee5cb6e8b452 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sat, 27 Apr 2013 22:08:50 +0200 -Subject: [PATCH 074/120] xvba: translate picture_structure to a value xvba +Subject: [PATCH 077/123] xvba: translate picture_structure to a value xvba understands --- @@ -24052,10 +24260,10 @@ index eb90c12..c98dba5 100644 1.8.1.6 -From 65248d527c31071a62cc90c7c08561fbafebbbdb Mon Sep 17 00:00:00 2001 +From 50a161f1bc214ad3383ec0c089bc4c92d8e2df4b Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 30 Apr 2013 21:18:55 +0200 -Subject: [PATCH 075/120] ffmpeg xvba: fix vc1 field interlace +Subject: [PATCH 078/123] ffmpeg xvba: fix vc1 field interlace --- lib/ffmpeg/libavcodec/xvba.c | 4 ++-- @@ -24107,10 +24315,10 @@ index c98dba5..e7a85a7 100644 1.8.1.6 -From bc779b113f81ca5556ab6224f39df01a1776858b Mon Sep 17 00:00:00 2001 +From 53256575a97d81b9fcedd1438c34323dc0b27824 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 30 Apr 2013 21:19:07 +0200 -Subject: [PATCH 076/120] xvba: fix vc1 field interlace +Subject: [PATCH 079/123] xvba: fix vc1 field interlace --- xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp | 3 +++ @@ -24134,10 +24342,10 @@ index 43a331f..568632f 100644 1.8.1.6 -From fc7c680416899a757feae367465e6c4bd450a211 Mon Sep 17 00:00:00 2001 +From 66f7bfd6bdf9f765fc2a6eecfb58d69883e7a059 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 30 Apr 2013 21:40:55 +0200 -Subject: [PATCH 077/120] xvba: vc1 - honor psf +Subject: [PATCH 080/123] xvba: vc1 - honor psf --- xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp | 3 +++ @@ -24168,10 +24376,10 @@ index 568632f..1db9363 100644 1.8.1.6 -From 0c5d9141dd96cd672cf34a81ed85ace3fd81dc4f Mon Sep 17 00:00:00 2001 +From 5b328a69f54b582ba3987cb218233bbe587e91f9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 4 May 2013 10:31:32 +0200 -Subject: [PATCH 078/120] xvba: squash me, settings +Subject: [PATCH 081/123] xvba: squash me, settings --- xbmc/settings/Settings.cpp | 3 +++ @@ -24195,10 +24403,10 @@ index 63cdf0e..02eef76 100644 1.8.1.6 -From 4c8d51caa9dafea84316f7ef2be30f6da3437023 Mon Sep 17 00:00:00 2001 +From 0aaeb0a6313953818000e7203d527dfee8906f83 Mon Sep 17 00:00:00 2001 From: fritsch Date: Fri, 24 May 2013 12:02:02 +0200 -Subject: [PATCH 079/120] XVBA: Limit video to 2048x1152 as this is the max all +Subject: [PATCH 082/123] XVBA: Limit video to 2048x1152 as this is the max all blocks can handle --- @@ -24228,10 +24436,10 @@ index 1db9363..54d7aea 100644 1.8.1.6 -From f253a19754ae4681b1ef1b8a20bc54d433c69e64 Mon Sep 17 00:00:00 2001 +From f4f97fb0313df385610d2d3d2164cbb2f4390773 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 -Subject: [PATCH 080/120] dvdplayer: observe pts counter overflow +Subject: [PATCH 083/123] dvdplayer: observe pts counter overflow --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 ++++++++++++++++++++- @@ -24518,10 +24726,10 @@ index b78094e..17d2f7a 100644 1.8.1.6 -From b6966559bfcb6d8247f9dcbe545a9c2249f304a4 Mon Sep 17 00:00:00 2001 +From 1936aa6817db5c98cd21a2ab7a9656f183ac9509 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 -Subject: [PATCH 081/120] dvdplayer: avoid short screen flicker caused by +Subject: [PATCH 084/123] dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer --- @@ -24554,10 +24762,10 @@ index 41e64a5..74b4391 100644 1.8.1.6 -From 7e0a288445d9a411a65f50e3f58f419df637d9ad Mon Sep 17 00:00:00 2001 +From 869811cf0359978019c5edc2277610d9a58a47e1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 -Subject: [PATCH 082/120] vdpau: advanced settings for auto deinterlacing +Subject: [PATCH 085/123] vdpau: advanced settings for auto deinterlacing --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- @@ -24623,10 +24831,10 @@ index 3a52878..3e6901b 100644 1.8.1.6 -From 75905003ddf0c49e0c8efb54ee562e1a1d6be316 Mon Sep 17 00:00:00 2001 +From ad793502d0586581120666555f6b6d231c1b249d Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 -Subject: [PATCH 083/120] player: fix rewind +Subject: [PATCH 086/123] player: fix rewind --- xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- @@ -24841,10 +25049,10 @@ index 3c3e007..6ae3860 100644 1.8.1.6 -From 01cab2fa720c32c295755f0d21efb6af2e9d5d5e Mon Sep 17 00:00:00 2001 +From 13a147ecc9caadc5933691d90af691b4878303f1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 -Subject: [PATCH 084/120] xrandr: fix query for multiple screens +Subject: [PATCH 087/123] xrandr: fix query for multiple screens --- xbmc/windowing/X11/XRandR.cpp | 10 ++++++---- @@ -24885,10 +25093,10 @@ index 97b1e32..a3d3543 100644 1.8.1.6 -From c729728cddd9d5d673dd8290e61f05194091dc96 Mon Sep 17 00:00:00 2001 +From 0925b7658bf2ed75cea29963c2a535e7829e5b1a Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 -Subject: [PATCH 085/120] X11: add debug log to print out refresh after xrr +Subject: [PATCH 088/123] X11: add debug log to print out refresh after xrr event --- @@ -24916,10 +25124,10 @@ index d2dcccd..7403785 100644 1.8.1.6 -From 51949d1edc0d73a0e694d95aa5b13f96096c19cb Mon Sep 17 00:00:00 2001 +From 9f1759a1b344dbc1b038ce14336381de5dc9dbc1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 -Subject: [PATCH 086/120] X11: dont call XCloseDisplay on shutdown, it crashes +Subject: [PATCH 089/123] X11: dont call XCloseDisplay on shutdown, it crashes when powered doen by cec on ATI --- @@ -24944,10 +25152,10 @@ index 7403785..0e39867 100644 1.8.1.6 -From bb5b4b390c8b5ef322a826b6ae21aaa7d21365e4 Mon Sep 17 00:00:00 2001 +From 6e7a31afeb0107b9636ffb0790ce348ef50cad5e 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 087/120] x11: support for multiple x screens +Subject: [PATCH 090/123] x11: support for multiple x screens --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -24970,10 +25178,10 @@ index a3d3543..8846bc6 100644 1.8.1.6 -From 9910e14b12a73069a08dfcedd845a5fcbf1793d2 Mon Sep 17 00:00:00 2001 +From 7876a7ae280e920cf6978e4afa48f4ebdedc3910 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 -Subject: [PATCH 088/120] pvr: increase changes counter of stream on stream +Subject: [PATCH 091/123] pvr: increase changes counter of stream on stream change, cosmetics after dd307930d39d92f145a01a16600cd00e01ec39be --- @@ -25007,10 +25215,10 @@ index 305ba07..3ad9792 100644 1.8.1.6 -From 5259e6c6da5d419ccd00eedcdfbb520c2563fbd5 Mon Sep 17 00:00:00 2001 +From 7bef6de9b9afa5d67b467fa06612e2eafef9b81e Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 -Subject: [PATCH 089/120] X11: add keymapping for XF86XK_Sleep +Subject: [PATCH 092/123] X11: add keymapping for XF86XK_Sleep --- xbmc/windowing/WinEventsX11.cpp | 1 + @@ -25032,10 +25240,10 @@ index 4a5aab4..da5d412 100644 1.8.1.6 -From aa780253926d75fc655f1c68b6a9d4070f9f0a76 Mon Sep 17 00:00:00 2001 +From 8511f31601ff6970648ed51204cc55102dafbf1c Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 -Subject: [PATCH 090/120] X11: remove toggle full screen after resume +Subject: [PATCH 093/123] X11: remove toggle full screen after resume --- xbmc/powermanagement/PowerManager.cpp | 5 ----- @@ -25061,10 +25269,10 @@ index f2a063f..f1e3c4f 100644 1.8.1.6 -From 48c4123199a0d72fa1e5376835ba1e37ba098c8c Mon Sep 17 00:00:00 2001 +From a0368631b8ed581ae1fa54bd7b51a3cc4323e8c5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 -Subject: [PATCH 091/120] xrandr: set screen on mode change command +Subject: [PATCH 094/123] xrandr: set screen on mode change command --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -25087,10 +25295,10 @@ index 8846bc6..e6d6240 100644 1.8.1.6 -From 6c45e086d7b8b64f3c242e27142ebb722fd7bc6e Mon Sep 17 00:00:00 2001 +From 9071be89472ecbcc05ffa4bb967883a0b53e3a07 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 -Subject: [PATCH 092/120] X11: recreate glx context when output changes +Subject: [PATCH 095/123] X11: recreate glx context when output changes --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -25141,10 +25349,10 @@ index f479c27..7345c06 100644 1.8.1.6 -From 6773b28acbcc4832190677a22c90e7b58cf641ef Mon Sep 17 00:00:00 2001 +From 76daa1b4fa31511125dc2d3532fc510fcd6a1697 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 -Subject: [PATCH 093/120] pvr: do not show selection dialog for a single menu +Subject: [PATCH 096/123] pvr: do not show selection dialog for a single menu hook --- @@ -25187,10 +25395,10 @@ index 2b43bcb..d07f23d 100644 1.8.1.6 -From 6279f69b3c2c829ae721837a871dfbf979a44bf4 Mon Sep 17 00:00:00 2001 +From 79107721f0b07baa19fcc25931de6fc5d6c0fecf Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 -Subject: [PATCH 094/120] X11: use default screen parameters if no output +Subject: [PATCH 097/123] X11: use default screen parameters if no output connected --- @@ -25294,10 +25502,10 @@ index d865cd7..97975dd 100644 1.8.1.6 -From 1f51b9667e9b425598a330a7d971438b7aec0a7e Mon Sep 17 00:00:00 2001 +From a8e44a830153163fd330b0ceb4dcb5b9554c5a73 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 23 Mar 2013 15:13:32 +0100 -Subject: [PATCH 095/120] X11: create parent window +Subject: [PATCH 098/123] X11: create parent window --- xbmc/windowing/X11/WinSystemX11.cpp | 69 +++++++++++++++++++++++-------------- @@ -25563,10 +25771,10 @@ index 7345c06..770ae84 100644 1.8.1.6 -From 04288c55b3eb01b5ba39bd7da7c8d7ea3e67e29f Mon Sep 17 00:00:00 2001 +From 106ab1d2c77591f37d915727cf0f3ab8c876b523 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 12:30:12 +0100 -Subject: [PATCH 096/120] X11: use system key repeat rate instead of hardcoded +Subject: [PATCH 099/123] X11: use system key repeat rate instead of hardcoded one, taken from 58fd64b194e38b73b5f3132744bab35e994e7441 --- @@ -25768,10 +25976,10 @@ index 102a076..5b1f3fa 100644 1.8.1.6 -From 18b0fa15efb0564d5e64a520ef0dc51354a768d0 Mon Sep 17 00:00:00 2001 +From a647eace0d91644e7216187dcb4608df7d2bfa69 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 16:04:48 +0100 -Subject: [PATCH 097/120] linux: use CLOCK_MONOTONIC_RAW as this is not subject +Subject: [PATCH 100/123] linux: use CLOCK_MONOTONIC_RAW as this is not subject to NTP --- @@ -25809,10 +26017,10 @@ index 8304ef6..ba27257 100644 1.8.1.6 -From ff344a3f82d0dae8e39251d87520d509cfb123e0 Mon Sep 17 00:00:00 2001 +From 2cef9ccf704ba1e9144a318044e4cd622a2a4fde Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 15:18:53 +0100 -Subject: [PATCH 098/120] OMXPlayer: some caching fixes for pvr +Subject: [PATCH 101/123] OMXPlayer: some caching fixes for pvr --- xbmc/cores/omxplayer/OMXPlayer.cpp | 3 ++- @@ -25836,10 +26044,10 @@ index f20c399..c096f32 100644 1.8.1.6 -From 38974c764854c7191b6336d89827c5ee5d6e3174 Mon Sep 17 00:00:00 2001 +From 4ed5d6875bd066d4d1ab8518facd02ecb166829c Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 20:50:59 +0100 -Subject: [PATCH 099/120] fix incorrect display of fps when dr kicks in +Subject: [PATCH 102/123] fix incorrect display of fps when dr kicks in --- xbmc/Application.cpp | 3 ++- @@ -25866,10 +26074,10 @@ index a5603a2..ce0a147 100644 1.8.1.6 -From 9320c643038190eed1b3c68f403fb1381eac4f71 Mon Sep 17 00:00:00 2001 +From 9d33e9711b3ff21d18832c2db087e6d5cd04f3c4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 8 Apr 2013 11:18:31 +0200 -Subject: [PATCH 100/120] squash to dropping control +Subject: [PATCH 103/123] squash to dropping control --- xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 1 + @@ -25891,10 +26099,10 @@ index 11e0b26..3f915ce 100644 1.8.1.6 -From e642fd14bc1e9aa84969fef2b8fb7cc2fa4cbc86 Mon Sep 17 00:00:00 2001 +From 9fa7033fc9da50c54ad133e7ea016eaab89967c9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Apr 2013 12:33:46 +0200 -Subject: [PATCH 101/120] pvr: try SwtichChannel when selecting a channel via +Subject: [PATCH 104/123] pvr: try SwtichChannel when selecting a channel via EPG --- @@ -25929,10 +26137,10 @@ index 6b999e4..256a295 100644 1.8.1.6 -From 81af9728bd20d6799225749f53a293ded3c78f22 Mon Sep 17 00:00:00 2001 +From b807258fddaca8f65a6552633ada3e75412271d4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 13 Apr 2013 08:32:06 +0200 -Subject: [PATCH 102/120] X11: fix mouse coverage +Subject: [PATCH 105/123] X11: fix mouse coverage --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++++--- @@ -25998,10 +26206,10 @@ index 770ae84..084f546 100644 1.8.1.6 -From b16758959d4ea789e547202c0de581fbdc9f56db Mon Sep 17 00:00:00 2001 +From 59d09d7e25cc8654a1d89d4e1f55596c8ad3cd16 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 8 May 2013 13:14:58 +0200 -Subject: [PATCH 103/120] X11: fix incorrectly used screen num in desktop +Subject: [PATCH 106/123] X11: fix incorrectly used screen num in desktop resolution --- @@ -26036,10 +26244,10 @@ index bf95bc7..0221036 100644 1.8.1.6 -From 4d0abbd8f86044c16fc27b57aa8a136cc5456c4f Mon Sep 17 00:00:00 2001 +From f2fecf3c39f9939bd4504f1148a8d93b9e67eabe Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 9 May 2013 12:07:09 +0200 -Subject: [PATCH 104/120] X11: do not overwrite user selected monitor with +Subject: [PATCH 107/123] X11: do not overwrite user selected monitor with fallback --- @@ -26164,10 +26372,10 @@ index 084f546..30f5fa0 100644 1.8.1.6 -From 34bcf3ae44ae6a4b83fe20ce3c17984e37959d75 Mon Sep 17 00:00:00 2001 +From 80fa9e33ccd53aa00bae4c6750cb91483eab4a70 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 12 May 2013 10:50:30 +0200 -Subject: [PATCH 105/120] xrandr: add turn on/off to wrapper +Subject: [PATCH 108/123] xrandr: add turn on/off to wrapper --- xbmc/windowing/X11/XRandR.cpp | 78 +++++++++++++++++++++++++++++++++++++++---- @@ -26333,10 +26541,10 @@ index 26c2653..2741879 100644 1.8.1.6 -From 745f293c7ccbac0f19d578b6e111cb40daf8906e Mon Sep 17 00:00:00 2001 +From 658f7678d3c10cebffeafd04979a6f66929f0a43 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 19 May 2013 12:55:35 +0200 -Subject: [PATCH 106/120] xrandr: add GetPreferredMode to wrapper +Subject: [PATCH 109/123] xrandr: add GetPreferredMode to wrapper --- xbmc/windowing/X11/XRandR.cpp | 23 +++++++++++++++++++++++ @@ -26393,10 +26601,10 @@ index 2741879..24ad1d0 100644 1.8.1.6 -From ed467ea7523cb6f6fbf85b9d31107c6300fba8a4 Mon Sep 17 00:00:00 2001 +From c2d9632a75a8f659f58bd0ad1367242639840b07 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 11 May 2013 17:12:12 +0200 -Subject: [PATCH 107/120] X11: multi-head improvement - poll for desired output +Subject: [PATCH 110/123] X11: multi-head improvement - poll for desired output if we do not get an xrr event --- @@ -26677,10 +26885,10 @@ index 380a194..650a6ef 100644 1.8.1.6 -From a69d038705bb1bf5400ee636a50ab7b7d8bee9af Mon Sep 17 00:00:00 2001 +From e3f99b95970e08f6e36867152534378b3e064e1d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 15 May 2013 09:14:34 +0200 -Subject: [PATCH 108/120] X11: ignore mouse move event form other windows +Subject: [PATCH 111/123] X11: ignore mouse move event form other windows --- xbmc/windowing/WinEventsX11.cpp | 4 +++- @@ -26712,10 +26920,10 @@ index 879d8f2..2ec9b6f 100644 1.8.1.6 -From 22c0d6b6086515ac76d7b4e5623c59c7b1d1523f Mon Sep 17 00:00:00 2001 +From b3ec49babe443c5c1e0156e86992dcc39ac29dec Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 2 Jun 2013 14:53:45 +0200 -Subject: [PATCH 109/120] vdpau: fix segfault caused by uninitialized member +Subject: [PATCH 112/123] vdpau: fix segfault caused by uninitialized member --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 1 + @@ -26737,10 +26945,10 @@ index fc4c030..9bafdd7 100644 1.8.1.6 -From d63b245cec19b5375337b917da1612fb5f5a376d Mon Sep 17 00:00:00 2001 +From 4ffa47f4352b8ddc59242615c86115781e5412ea Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:13:45 +0200 -Subject: [PATCH 110/120] vdpau: sync video mixer +Subject: [PATCH 113/123] vdpau: sync video mixer --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 15 +++++++++++++++ @@ -26776,10 +26984,10 @@ index 9bafdd7..55ef4dc 100644 1.8.1.6 -From 29ece2fd859f50915578fc78e721e7b702c71107 Mon Sep 17 00:00:00 2001 +From 890c33ae9afbca2659b1244aa7c039279f454ea1 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:20:29 +0200 -Subject: [PATCH 111/120] renderer: allow some lateness within vblank interval +Subject: [PATCH 114/123] renderer: allow some lateness within vblank interval --- xbmc/cores/VideoRenderers/RenderManager.cpp | 12 ++++++++++-- @@ -26839,10 +27047,10 @@ index 7a3a530..480e4dc 100644 1.8.1.6 -From fc99eaf2c71798ecb3841f6043626286c750b9cc Mon Sep 17 00:00:00 2001 +From 28912445572715df8588111eba8848d283f12233 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 14 Jun 2013 09:23:22 +0200 -Subject: [PATCH 112/120] vdpau: calculate timestamp of second field when doing +Subject: [PATCH 115/123] vdpau: calculate timestamp of second field when doing deinterlacing --- @@ -26868,10 +27076,10 @@ index 55ef4dc..27d63f5 100644 1.8.1.6 -From de1036f61e6974d6d5c9b28a4d852862eae56bd2 Mon Sep 17 00:00:00 2001 +From 2eb311f322f2b671218447472a89ca1125707801 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 14 Jun 2013 10:46:58 +0200 -Subject: [PATCH 113/120] vdpau: comment debug log: long decoding time +Subject: [PATCH 116/123] vdpau: comment debug log: long decoding time --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- @@ -26907,10 +27115,10 @@ index 27d63f5..593f96c 100644 1.8.1.6 -From 0b3531fdba493d2f2fb50e0024fa03fc2c3c85c2 Mon Sep 17 00:00:00 2001 +From 686e6da18cec2138c1543fa402296eb92c7daadc Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:22:58 +0200 -Subject: [PATCH 114/120] X11: another fix for mouse coverage +Subject: [PATCH 117/123] X11: another fix for mouse coverage --- xbmc/windowing/WinEventsX11.cpp | 6 ++++-- @@ -26943,10 +27151,10 @@ index 2ec9b6f..4ed978c 100644 1.8.1.6 -From 2ec93711fbca9c546a29ed2c7f3dc6ee38173e13 Mon Sep 17 00:00:00 2001 +From 1814ed1f05d82067956c1eaec459f7eeace006c9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:23:19 +0200 -Subject: [PATCH 115/120] renderer: delete fence on uninit +Subject: [PATCH 118/123] renderer: delete fence on uninit --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 5 +++++ @@ -26973,10 +27181,10 @@ index c663423..858d39d 100644 1.8.1.6 -From edffe3bc5afa89da9d1db58cc752f01e786eeaea Mon Sep 17 00:00:00 2001 +From 90727fe2c507dccd7dfc308a094a492a301ef763 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 16 Jun 2013 14:28:01 +0200 -Subject: [PATCH 116/120] renderer: limit fence to vdpau +Subject: [PATCH 119/123] renderer: limit fence to vdpau --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 15 +++++++++------ @@ -27014,10 +27222,10 @@ index 858d39d..bb198f3 100644 1.8.1.6 -From 1a10092809cbc1d465f90ac2ed62c23a1d2b0475 Mon Sep 17 00:00:00 2001 +From 6d8df3121b0e0b4f8e70ef454b04dd36783fbbf7 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 4 Jul 2013 16:38:26 +0200 -Subject: [PATCH 117/120] XVBA: replace CODEC_IS with AV_CODEC_ID +Subject: [PATCH 120/123] XVBA: replace CODEC_IS with AV_CODEC_ID --- xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp | 14 +++++++------- @@ -27092,10 +27300,10 @@ index 54d7aea..5845dbf 100644 1.8.1.6 -From f283aa4f4bc54ca786ef49d20546fabb47121cd9 Mon Sep 17 00:00:00 2001 +From aca51d06f3589e934dbb49d44b45a81a08e29d52 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 5 Jul 2013 12:14:00 +0200 -Subject: [PATCH 118/120] X11: set windows class name +Subject: [PATCH 121/123] X11: set windows class name --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -27137,10 +27345,10 @@ index 6b1ed87..30eff67 100644 1.8.1.6 -From 16699f98372b9468c17a11d8cae851704c42bf7c Mon Sep 17 00:00:00 2001 +From 18f918782577c79e8cb1cef6ad0650c2668baa92 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 13 Jul 2013 20:00:45 +0200 -Subject: [PATCH 119/120] VDPAU: revert sync mixer, does a busy wait +Subject: [PATCH 122/123] VDPAU: revert sync mixer, does a busy wait --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 31 +++++++++++++------------- @@ -27206,10 +27414,10 @@ index 593f96c..f630bcb 100644 1.8.1.6 -From 4c3839fa3d2984a6a20e98ce0f9f5c503138b4cf Mon Sep 17 00:00:00 2001 +From da1ff12885a9aec8e6cc1eb7a060e9a3f6dcc2e4 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sun, 14 Jul 2013 14:21:52 +0200 -Subject: [PATCH 120/120] ActiveAE: Make ActiveAE default Audio Engine to get +Subject: [PATCH 123/123] ActiveAE: Make ActiveAE default Audio Engine to get it tested via ppa ---