mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'openelec-eden' of github.com:OpenELEC/OpenELEC.tv
Conflicts: packages/network/afpfs-ng/install
This commit is contained in:
Stephan Raue
commit
6956c9099e
16
CHANGELOG
16
CHANGELOG
@ -0,0 +1,16 @@
|
||||
OpenELEC (Version 2.0)
|
||||
|
||||
Changelog OpenELEC-1.0 to OpenELEC-2.0
|
||||
|
||||
Package updates:
|
||||
- update XBMC to XBMC-11.0 (Eden)
|
||||
- update eglibc to eglibc-2.14
|
||||
|
||||
Added functions:
|
||||
- PXE netboot support
|
||||
- Airplay support
|
||||
- Airtunes support
|
||||
- CEC support
|
||||
|
||||
Removed functions:
|
||||
- remove netmount.conf (XBMC includes native NFS/AFP/CIFS/SSH support)
|
||||
35
packages/3rdparty/multimedia/airplayer/meta
vendored
35
packages/3rdparty/multimedia/airplayer/meta
vendored
@ -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="airplayer"
|
||||
PKG_VERSION="7776e54"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/PascalW/Airplayer"
|
||||
PKG_URL="http://dl.dropbox.com/u/8224157/OpenELEC-Ultra/addons/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="network"
|
||||
PKG_SHORTDESC="Airplayer: script to make media playing software Airplay-compatible."
|
||||
PKG_LONGDESC="Airplayer is a script to make media playing software Airplay-compatible. Airplayer features pluggable backends, making it possible to support different media players."
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
39
packages/3rdparty/multimedia/libao/build
vendored
39
packages/3rdparty/multimedia/libao/build
vendored
@ -1,39 +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
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--datadir=/usr/share \
|
||||
--localstatedir=/var \
|
||||
--disable-esd \
|
||||
--disable-esdtest \
|
||||
--disable-pulse \
|
||||
--enable-alsa \
|
||||
--prefix /storage/.xbmc/addons/service.multimedia.Airplayer-Suite
|
||||
|
||||
make
|
||||
@ -1,36 +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
|
||||
|
||||
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 -O1 --skip-build --prefix /usr --root .install
|
||||
|
||||
find .install -name "*.py" -exec rm -rf "{}" ";"
|
||||
find .install -name "*.pyo" -exec rm -rf "{}" ";"
|
||||
|
||||
rm -rf .install/usr/bin
|
||||
35
packages/3rdparty/multimedia/pybonjour/meta
vendored
35
packages/3rdparty/multimedia/pybonjour/meta
vendored
@ -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="pybonjour"
|
||||
PKG_VERSION="1.1.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://pybonjour.googlecode.com/"
|
||||
PKG_URL="http://pybonjour.googlecode.com/files/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="Python"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="service/multimedia"
|
||||
PKG_SHORTDESC="pybonjour: A Zeroconf mDNS/DNS-SD responder"
|
||||
PKG_LONGDESC="Pybonjour is a framework for Multicast DNS Service Discovery (mDNS/DNS-SD a.k.a. Zeroconf) on Linux. It allows programs to publish and discover services running on a local network with no specific configuration. For example, you can plug into a network and instantly find printers to print to, files to look at, and people to talk to."
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
36
packages/3rdparty/multimedia/shairport/build
vendored
36
packages/3rdparty/multimedia/shairport/build
vendored
@ -1,36 +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
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
# fix me :(
|
||||
LIBAO_DIR=../libao-1.1.0
|
||||
|
||||
# large buffer
|
||||
sed -i 's|#define BUFFER_FRAMES 320|#define BUFFER_FRAMES 1024|g' hairtunes.h
|
||||
sed -i 's|read = ab_read + 10;|read = ab_read + 50;|g' hairtunes.c
|
||||
|
||||
CFLAGS="-O2 -Wall -I$LIBAO_DIR/include" \
|
||||
LDFLAGS="-lm -lpthread -L$LIBAO_DIR/src/.libs -lao -lssl" \
|
||||
make
|
||||
@ -1,66 +0,0 @@
|
||||
diff -uNr shairport_orig/Makefile shairport/Makefile
|
||||
--- shairport_orig/Makefile 2011-08-09 23:07:40.000000000 +0200
|
||||
+++ shairport/Makefile 2011-08-15 20:02:36.000000000 +0200
|
||||
@@ -1,5 +1,5 @@
|
||||
-CFLAGS:=-O2 -Wall $(shell pkg-config --cflags openssl ao)
|
||||
-LDFLAGS:=-lm -lpthread $(shell pkg-config --libs openssl ao)
|
||||
+CFLAGS?=-O2 -Wall $(shell pkg-config --cflags openssl ao)
|
||||
+LDFLAGS?=-lm -lpthread $(shell pkg-config --libs openssl ao)
|
||||
OBJS=socketlib.o shairport.o alac.o hairtunes.o
|
||||
all: hairtunes shairport
|
||||
|
||||
diff -uNr shairport_orig/shairport.c shairport/shairport.c
|
||||
--- shairport_orig/shairport.c 2011-08-09 23:07:40.000000000 +0200
|
||||
+++ shairport/shairport.c 2011-08-09 11:37:52.000000000 +0200
|
||||
@@ -51,6 +51,9 @@
|
||||
#define HEADER_LOG_LEVEL LOG_DEBUG
|
||||
#define AVAHI_LOG_LEVEL LOG_DEBUG
|
||||
|
||||
+char tAoDeviceName[56] = "";
|
||||
+char tAoDriver[56] = "";
|
||||
+
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
char tHWID[HWID_SIZE] = {0,51,52,53,54,55};
|
||||
@@ -129,6 +132,14 @@
|
||||
{
|
||||
kCurrentLogLevel = LOG_DEBUG_VV;
|
||||
}
|
||||
+ else if(!strncmp(arg, "--ao_driver=", 12))
|
||||
+ {
|
||||
+ strncpy(tAoDriver, arg+12, 55);
|
||||
+ }
|
||||
+ else if(!strncmp(arg, "--ao_devicename=", 16))
|
||||
+ {
|
||||
+ strncpy(tAoDeviceName, arg+16, 55);
|
||||
+ }
|
||||
else if(!strcmp(arg, "-h") || !strcmp(arg, "--help"))
|
||||
{
|
||||
slog(LOG_INFO, "ShairPort version 0.05 C port - Airport Express emulator\n");
|
||||
@@ -140,6 +151,8 @@
|
||||
slog(LOG_INFO, " -d Daemon mode\n");
|
||||
slog(LOG_INFO, " -q, --quiet Supresses all output.\n");
|
||||
slog(LOG_INFO, " -v,-v2,-v3,-vv Various debugging levels\n");
|
||||
+ slog(LOG_INFO, " --ao_driver=driver Sets the ao driver (optional)\n");
|
||||
+ slog(LOG_INFO, " --ao_devicename=devicename Sets the ao device name (optional)\n");
|
||||
slog(LOG_INFO, "\n");
|
||||
return 0;
|
||||
}
|
||||
@@ -731,8 +744,6 @@
|
||||
slog(LOG_DEBUG_V, "Got %d for CPort and %d for TPort\n", tControlport, tTimingport);
|
||||
char *tRtp = NULL;
|
||||
char *tPipe = NULL;
|
||||
- char *tAoDriver = NULL;
|
||||
- char *tAoDeviceName = NULL;
|
||||
char *tAoDeviceId = NULL;
|
||||
|
||||
// *************************************************
|
||||
@@ -758,7 +769,7 @@
|
||||
}
|
||||
cleanupBuffers(pConn);
|
||||
hairtunes_init(tKeys->aeskey, tKeys->aesiv, tKeys->fmt, tControlport, tTimingport,
|
||||
- tDataport, tRtp, tPipe, tAoDriver, tAoDeviceName, tAoDeviceId);
|
||||
+ tDataport, tRtp, tPipe, tAoDriver[0]!='\0'?tAoDriver:NULL, tAoDeviceName[0]!='\0'?tAoDeviceName:NULL, tAoDeviceId);
|
||||
|
||||
// Quit when finished.
|
||||
slog(LOG_DEBUG, "Returned from hairtunes init....returning -1, should close out this whole side of the fork\n");
|
||||
36
packages/3rdparty/multimedia/simplejson-ap/build
vendored
36
packages/3rdparty/multimedia/simplejson-ap/build
vendored
@ -1,36 +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
|
||||
|
||||
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 -O1 --skip-build --prefix /usr --root .install
|
||||
|
||||
find .install -name "*.py" -exec rm -rf "{}" ";"
|
||||
find .install -name "*.pyo" -exec rm -rf "{}" ";"
|
||||
|
||||
rm -rf .install/usr/bin
|
||||
35
packages/3rdparty/multimedia/simplejson-ap/meta
vendored
35
packages/3rdparty/multimedia/simplejson-ap/meta
vendored
@ -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="simplejson-ap"
|
||||
PKG_VERSION="2.1.3"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://pypi.python.org/"
|
||||
PKG_URL="http://dl.dropbox.com/u/8224157/OpenELEC-Ultra/addons/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="Python"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="service/multimedia"
|
||||
PKG_SHORTDESC="simplejson: JSON encoder and decoder for Python"
|
||||
PKG_LONGDESC="simplejson is a simple, fast, complete, correct and extensible JSON <http://json.org> encoder and decoder for Python 2.5+. It is pure Python code with no dependencies, but includes an optional C extension for a serious speed boost."
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
36
packages/3rdparty/multimedia/tornado-ap/build
vendored
36
packages/3rdparty/multimedia/tornado-ap/build
vendored
@ -1,36 +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
|
||||
|
||||
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 -O1 --skip-build --prefix /usr --root .install
|
||||
|
||||
find .install -name "*.py" -exec rm -rf "{}" ";"
|
||||
find .install -name "*.pyo" -exec rm -rf "{}" ";"
|
||||
|
||||
rm -rf .install/usr/bin
|
||||
35
packages/3rdparty/multimedia/tornado-ap/meta
vendored
35
packages/3rdparty/multimedia/tornado-ap/meta
vendored
@ -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="tornado-ap"
|
||||
PKG_VERSION="1.2.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.tornadoweb.org/"
|
||||
PKG_URL="http://dl.dropbox.com/u/8224157/OpenELEC-Ultra/addons/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="Python"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="service/multimedia"
|
||||
PKG_SHORTDESC="tornado: a web server for Python"
|
||||
PKG_LONGDESC="Tornado is an open source version of the scalable, non-blocking web server and tools that power FriendFeed."
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
@ -1,42 +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
|
||||
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/ao/plugins-4/
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib/
|
||||
|
||||
cp $PKG_DIR/config/settings.xml $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml
|
||||
|
||||
cp $BUILD/pybonjour-1.1.1/pybonjour.py $ADDON_BUILD/$PKG_ADDON_ID/pylib/
|
||||
cp -R $BUILD/tornado-ap-*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib/
|
||||
cp -R $BUILD/simplejson-ap-*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib/
|
||||
|
||||
cp -a $BUILD/airplayer-*/airplayer/ $ADDON_BUILD/$PKG_ADDON_ID/bin/
|
||||
|
||||
cp $BUILD/libao-*/src/.libs/libao.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib/
|
||||
cp $BUILD/libao-*/src/plugins/alsa/.libs/libalsa.so $ADDON_BUILD/$PKG_ADDON_ID/lib/ao/plugins-4/
|
||||
cp $BUILD/libao-*/src/plugins/oss/.libs/liboss.so $ADDON_BUILD/$PKG_ADDON_ID/lib/ao/plugins-4/
|
||||
|
||||
cp $BUILD/shairport-*/shairport $ADDON_BUILD/$PKG_ADDON_ID/bin/
|
||||
cp $BUILD/shairport-*/hairtunes $ADDON_BUILD/$PKG_ADDON_ID/bin/
|
||||
@ -1,2 +0,0 @@
|
||||
0.99.5
|
||||
- initial version airplayer-7776e54 and shairport-346db95
|
||||
@ -1,7 +0,0 @@
|
||||
<settings>
|
||||
<setting id="LOG_FILES" value="true" />
|
||||
<setting id="SHAIRPORT_DEVICENAME" value="default" />
|
||||
<setting id="SHAIRPORT_DRIVER" value="alsa" />
|
||||
<setting id="SHAIRPORT_NAME" value="ShairPort" />
|
||||
<setting id="AIRPLAYER_NAME" value="Airplayer" />
|
||||
</settings>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
@ -1,36 +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="Airplayer-Suite"
|
||||
PKG_VERSION="Suite"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/PascalW/Airplayer"
|
||||
PKG_URL=""
|
||||
PKG_DEPENDS="Python"
|
||||
PKG_BUILD_DEPENDS="toolchain Python avahi pybonjour tornado-ap simplejson-ap airplayer libao shairport"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="service/multimedia"
|
||||
PKG_SHORTDESC="Airplayer and ShairPort programs"
|
||||
PKG_LONGDESC="Airplayer makes make media playing software Airplay-compatible. Airplayer features pluggable backends, making it possible to support different media players. Send video and pictures from your iDevice to your Airplay enabled media player. Audio streaming is currently not supported. On the iDevice side IOS 4.2 or above is required. ShairPort emulates an AirPort Express for the purpose of streaming music from iTunes and compatible iPods."
|
||||
PKG_IS_ADDON="yes"
|
||||
PKG_ADDON_TYPE="xbmc.service"
|
||||
PKG_AUTORECONF="no"
|
||||
@ -1,84 +0,0 @@
|
||||
#
|
||||
# got from http://stmlabs.com/forum/topic/asoundconf-simultaneous-output#post-896
|
||||
# change line pcm "hw:1,7" to suit your box
|
||||
#
|
||||
#----
|
||||
# /etc/asound.conf file designed to expand 2 channels through device 'clone_output'
|
||||
# to output 2 channels to multiple devices
|
||||
#
|
||||
# Use aplay -l to find device numbers
|
||||
#
|
||||
#----
|
||||
|
||||
pcm.!default {
|
||||
type plug
|
||||
slave.pcm "dmixed_hdmi"
|
||||
}
|
||||
|
||||
#-----
|
||||
# Single channel dmixed. Crossfade works
|
||||
#-----
|
||||
pcm.hdmiout {
|
||||
type plug
|
||||
slave.pcm "dmixed_hdmi"
|
||||
}
|
||||
|
||||
pcm.dmixed_hdmi {
|
||||
type dmix
|
||||
ipc_key 2024
|
||||
slave {
|
||||
pcm "hw:1,7" # hdmi
|
||||
}
|
||||
}
|
||||
#-----
|
||||
# multiple output portion begin (3 devices) dmix not supported.
|
||||
#-----
|
||||
|
||||
pcm.clone_output {
|
||||
type plug
|
||||
slave.pcm "6channel_expander"
|
||||
}
|
||||
|
||||
pcm.multi_pcm_device {
|
||||
type multi;
|
||||
slaves.a.pcm "hw:1,7"; # hdmi
|
||||
slaves.a.channels 2;
|
||||
slaves.b.pcm "hw:0,0"; # analog
|
||||
slaves.b.channels 2;
|
||||
slaves.c.pcm "hw:0,1"; # spdif
|
||||
slaves.c.channels 2;
|
||||
bindings.0.slave a;
|
||||
bindings.0.channel 0;
|
||||
bindings.1.slave a;
|
||||
bindings.1.channel 1;
|
||||
bindings.2.slave b;
|
||||
bindings.2.channel 0;
|
||||
bindings.3.slave b;
|
||||
bindings.3.channel 1;
|
||||
bindings.4.slave c;
|
||||
bindings.4.channel 0;
|
||||
bindings.5.slave c;
|
||||
bindings.5.channel 1;
|
||||
}
|
||||
|
||||
ctl.multi_pcm_device {
|
||||
type hw;
|
||||
card 0;
|
||||
}
|
||||
|
||||
pcm.6channel_expander {
|
||||
type route;
|
||||
slave.pcm "multi_pcm_device";
|
||||
slave.channels 6;
|
||||
ttable.0.0 1;
|
||||
ttable.1.1 1;
|
||||
ttable.0.2 1;
|
||||
ttable.1.3 1;
|
||||
ttable.0.4 1;
|
||||
ttable.1.5 1;
|
||||
}
|
||||
|
||||
ctl.6channel_expander {
|
||||
type hw;
|
||||
card 0;
|
||||
}
|
||||
@ -1,127 +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
|
||||
################################################################################
|
||||
|
||||
# setup functions
|
||||
read_xbmcconfig() {
|
||||
grep "<$1>" $XBMC_SETTINGS | sed -e "s,[[:space:]]*<$1>,," -e "s,</$1>,,"
|
||||
}
|
||||
|
||||
ADDON_ID="Airplayer-Suite"
|
||||
ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.$ADDON_ID"
|
||||
ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.$ADDON_ID"
|
||||
|
||||
AIRPLAYERSUITE_SETTINGS_XML="$ADDON_HOME/settings.xml"
|
||||
AIRPLAYERSUITE_SETTINGS_CONF="/var/config/$ADDON_ID.conf"
|
||||
XBMC_SETTINGS="$HOME/.xbmc/userdata/guisettings.xml"
|
||||
|
||||
# create default config
|
||||
mkdir -p $ADDON_HOME
|
||||
if [ ! -f "$AIRPLAYERSUITE_SETTINGS_XML" ]; then
|
||||
cp $ADDON_DIR/settings-default.xml $AIRPLAYERSUITE_SETTINGS_XML
|
||||
fi
|
||||
|
||||
# convert xml file to bash variables and use them
|
||||
if [ -f "$AIRPLAYERSUITE_SETTINGS_XML" ]; then
|
||||
mkdir -p /var/config/
|
||||
awk -F\" '{print $2"=\""$4"\""}' "$AIRPLAYERSUITE_SETTINGS_XML" | sed '/^=/d' > $AIRPLAYERSUITE_SETTINGS_CONF
|
||||
. $AIRPLAYERSUITE_SETTINGS_CONF
|
||||
# replace spaces with underscore
|
||||
SHAIRPORT_NAME=${SHAIRPORT_NAME// /_}
|
||||
AIRPLAYER_NAME=${AIRPLAYER_NAME// /_}
|
||||
else
|
||||
LOG_FILES="true"
|
||||
SHAIRPORT_DEVICENAME="default"
|
||||
SHAIRPORT_DRIVER="alsa"
|
||||
SHAIRPORT_NAME="ShairPort"
|
||||
AIRPLAYER_NAME="Airplayer"
|
||||
fi
|
||||
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ADDON_DIR/lib"
|
||||
export PYTHONPATH="$ADDON_DIR/pylib"
|
||||
|
||||
if [ "$LOG_FILES" = "true" ]; then
|
||||
LOG_FILE_SHAIRPORT="$ADDON_HOME/shairport.log"
|
||||
LOG_FILE_AIRPLAYER="$ADDON_HOME/airplayer.log"
|
||||
PID_FILE_AIRPLAYER="$ADDON_HOME/airplayer.pid"
|
||||
|
||||
ADDON_ARG_SHAIRPORT="-v --apname=$SHAIRPORT_NAME --ao_driver=$SHAIRPORT_DRIVER --ao_devicename=$SHAIRPORT_DEVICENAME"
|
||||
ADDON_ARG_AIRPLAYER="-d -p $PID_FILE_AIRPLAYER -l $LOG_FILE_AIRPLAYER"
|
||||
else
|
||||
LOG_FILE_SHAIRPORT="/dev/null"
|
||||
LOG_FILE_AIRPLAYER="/dev/null"
|
||||
PID_FILE_AIRPLAYER="$ADDON_HOME/airplayer.pid"
|
||||
|
||||
ADDON_ARG_SHAIRPORT="--apname=$SHAIRPORT_NAME --ao_driver=$SHAIRPORT_DRIVER --ao_devicename=$SHAIRPORT_DEVICENAME"
|
||||
ADDON_ARG_AIRPLAYER="-d -p $PID_FILE_AIRPLAYER -l $LOG_FILE_AIRPLAYER"
|
||||
fi
|
||||
|
||||
AIRPLAYER_SETTINGS_TMP="/tmp/airplayer_settings.py"
|
||||
AIRPLAYER_SETTINGS_ORIG="$ADDON_DIR/bin/airplayer/settings.py"
|
||||
|
||||
# first copy to tmp
|
||||
cp "$AIRPLAYER_SETTINGS_ORIG" "$AIRPLAYER_SETTINGS_TMP"
|
||||
|
||||
# read xbmc settings
|
||||
XBMC_PORT=`read_xbmcconfig webserverport`
|
||||
XBMC_USER=`read_xbmcconfig webserverusername`
|
||||
XBMC_PWD=`read_xbmcconfig webserverpassword`
|
||||
|
||||
# modify with real values
|
||||
sed -i "s|MEDIA_BACKEND_PORT = .*|MEDIA_BACKEND_PORT = $XBMC_PORT|g" $AIRPLAYER_SETTINGS_TMP
|
||||
|
||||
if [ -n "XBMC_USER" ]; then
|
||||
sed -i "s|MEDIA_BACKEND_USERNAME = .*|MEDIA_BACKEND_USERNAME = '$XBMC_USER'|g" $AIRPLAYER_SETTINGS_TMP
|
||||
else
|
||||
sed -i "s|MEDIA_BACKEND_USERNAME = .*|MEDIA_BACKEND_USERNAME = None|g" $AIRPLAYER_SETTINGS_TMP
|
||||
fi
|
||||
if [ -n "XBMC_PWD" ]; then
|
||||
sed -i "s|MEDIA_BACKEND_PASSWORD = .*|MEDIA_BACKEND_PASSWORD = '$XBMC_PWD'|g" $AIRPLAYER_SETTINGS_TMP
|
||||
else
|
||||
sed -i "s|MEDIA_BACKEND_PASSWORD = .*|MEDIA_BACKEND_PASSWORD = None|g" $AIRPLAYER_SETTINGS_TMP
|
||||
fi
|
||||
if [ -n "AIRPLAYER_NAME" ]; then
|
||||
sed -i "s|AIRPLAY_HOSTNAME = .*|AIRPLAY_HOSTNAME = '$AIRPLAYER_NAME'|g" $AIRPLAYER_SETTINGS_TMP
|
||||
else
|
||||
sed -i "s|AIRPLAY_HOSTNAME = .*|AIRPLAY_HOSTNAME = None|g" $AIRPLAYER_SETTINGS_TMP
|
||||
fi
|
||||
|
||||
# if different copy it back
|
||||
if [ "`md5sum "$AIRPLAYER_SETTINGS_TMP" | cut -d ' ' -f 1`" != "`md5sum "$AIRPLAYER_SETTINGS_ORIG" | cut -d ' ' -f 1`" ]; then
|
||||
cp "$AIRPLAYER_SETTINGS_TMP" "$AIRPLAYER_SETTINGS_ORIG"
|
||||
fi
|
||||
|
||||
rm "$AIRPLAYER_SETTINGS_TMP"
|
||||
|
||||
# restart avahi daemon because sometimes doesn't start correctly at boot time
|
||||
avahi-daemon -k
|
||||
/bin/sh /etc/init.d/53_avahi
|
||||
|
||||
# run shairport
|
||||
if [ ! $(pidof shairport) ]; then
|
||||
$ADDON_DIR/bin/shairport $ADDON_ARG_SHAIRPORT >$LOG_FILE_SHAIRPORT 2>&1 &
|
||||
fi
|
||||
|
||||
# run airplayer
|
||||
ps -ef | grep airplayer.py | grep -v grep >/dev/null 2>&1
|
||||
if [ "$?" != "0" ]; then
|
||||
python $ADDON_DIR/bin/airplayer/airplayer.py $ADDON_ARG_AIRPLAYER
|
||||
fi
|
||||
@ -1,23 +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
|
||||
################################################################################
|
||||
|
||||
import xbmc, time, os, subprocess
|
||||
|
||||
os.system("Airplayer-Suite.service")
|
||||
@ -1,14 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<strings>
|
||||
<!-- Airplayer-Suite -->
|
||||
<string id="1000">Airplayer and ShairPort</string>
|
||||
<string id="1010">Identification</string>
|
||||
<string id="1020">Airplayer name</string>
|
||||
<string id="1030">ShairPort name</string>
|
||||
<string id="1040">ShairPort sound output</string>
|
||||
<string id="1050">ao driver</string>
|
||||
<string id="1060">ao device name</string>
|
||||
<string id="1070">Log files</string>
|
||||
<string id="1080">Log file</string>
|
||||
<string id="1090">Enabled</string>
|
||||
</strings>
|
||||
@ -1,19 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<settings>
|
||||
<!-- Airplayer-Suite -->
|
||||
<category label="1000">
|
||||
<setting label="1010" type="lsep"/>
|
||||
<setting type="sep" />
|
||||
<setting id="AIRPLAYER_NAME" type="text" label="1020" default="Airplayer"/>
|
||||
<setting id="SHAIRPORT_NAME" type="text" label="1030" default="ShairPort"/>
|
||||
<setting label="1040" type="lsep"/>
|
||||
<setting type="sep" />
|
||||
<setting id="SHAIRPORT_DRIVER" type="text" label="1050" default="alsa"/>
|
||||
<setting id="SHAIRPORT_DEVICENAME" type="text" label="1060" default="default"/>
|
||||
</category>
|
||||
<category label="1070">
|
||||
<setting label="1080" type="lsep"/>
|
||||
<setting type="sep" />
|
||||
<setting id="LOG_FILES" type="bool" label="1090" default="true" />
|
||||
</category>
|
||||
</settings>
|
||||
@ -1,37 +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
|
||||
|
||||
cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
--exec-prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--datadir=/usr/share \
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
|
||||
make
|
||||
|
||||
$MAKEINSTALL
|
||||
@ -1,36 +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="libmms"
|
||||
PKG_VERSION="0.6"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://sourceforge.net/projects/libmms/"
|
||||
PKG_URL="$SOURCEFORGE_SRC/libmms/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="glib"
|
||||
PKG_BUILD_DEPENDS="toolchain glib"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="audio"
|
||||
PKG_SHORTDESC="libmms: a common library for parsing mms:// and mmsh:// type network streams."
|
||||
PKG_LONGDESC="LibMMS is a common library for parsing mms:// and mmsh:// type network streams. These are commonly used to stream Windows Media Video content over the web. LibMMS itself is only for receiving MMS stream, it doesn't handle sending at all."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="yes"
|
||||
@ -1,48 +0,0 @@
|
||||
diff -Naur libmms-0.5/src/mmsh.h libmms-0.5.patch/src/mmsh.h
|
||||
--- libmms-0.5/src/mmsh.h 2009-10-31 13:35:28.000000000 +0100
|
||||
+++ libmms-0.5.patch/src/mmsh.h 2010-01-25 12:11:31.862959172 +0100
|
||||
@@ -41,20 +41,20 @@
|
||||
|
||||
int mmsh_read (mms_io_t *io, mmsh_t *instance, char *data, int len);
|
||||
int mmsh_time_seek (mms_io_t *io, mmsh_t *instance, double time_sec);
|
||||
-mms_off_t mmsh_seek (mms_io_t *io, mmsh_t *this, mms_off_t offset, int origin);
|
||||
+mms_off_t mmsh_seek (mms_io_t *io, mmsh_t *instance, mms_off_t offset, int origin);
|
||||
uint32_t mmsh_get_length (mmsh_t *instance);
|
||||
-double mmsh_get_time_length (mmsh_t *this);
|
||||
-uint64_t mmsh_get_raw_time_length (mmsh_t *this);
|
||||
+double mmsh_get_time_length (mmsh_t *instance);
|
||||
+uint64_t mmsh_get_raw_time_length (mmsh_t *instance);
|
||||
mms_off_t mmsh_get_current_pos (mmsh_t *instance);
|
||||
void mmsh_close (mmsh_t *instance);
|
||||
|
||||
int mmsh_peek_header (mmsh_t *instance, char *data, int maxsize);
|
||||
|
||||
-uint32_t mmsh_get_asf_header_len (mmsh_t *this);
|
||||
+uint32_t mmsh_get_asf_header_len (mmsh_t *instance);
|
||||
|
||||
-uint32_t mmsh_get_asf_packet_len (mmsh_t *this);
|
||||
+uint32_t mmsh_get_asf_packet_len (mmsh_t *instance);
|
||||
|
||||
-int mmsh_get_seekable (mmsh_t *this);
|
||||
+int mmsh_get_seekable (mmsh_t *instance);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
diff -Naur libmms-0.5/src/mmsx.h libmms-0.5.patch/src/mmsx.h
|
||||
--- libmms-0.5/src/mmsx.h 2009-10-31 13:35:28.000000000 +0100
|
||||
+++ libmms-0.5.patch/src/mmsx.h 2010-01-25 12:11:51.451960516 +0100
|
||||
@@ -55,11 +55,11 @@
|
||||
|
||||
mms_off_t mmsx_get_current_pos (mmsx_t *instance);
|
||||
|
||||
-uint32_t mmsx_get_asf_header_len (mmsx_t *this);
|
||||
+uint32_t mmsx_get_asf_header_len (mmsx_t *instance);
|
||||
|
||||
-uint64_t mmsx_get_asf_packet_len (mmsx_t *this);
|
||||
+uint64_t mmsx_get_asf_packet_len (mmsx_t *instance);
|
||||
|
||||
-int mmsx_get_seekable (mmsx_t *this);
|
||||
+int mmsx_get_seekable (mmsx_t *instance);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
@ -1,36 +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="wavpack"
|
||||
PKG_VERSION="4.60.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.wavpack.com"
|
||||
PKG_URL="http://www.wavpack.com/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="libiconv"
|
||||
PKG_BUILD_DEPENDS="toolchain libiconv"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="audio"
|
||||
PKG_SHORTDESC="wavpack: a completely open audio compression format"
|
||||
PKG_LONGDESC="WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode. Although the technology is loosely based on previous versions of WavPack, the new version 4 format has been designed from the ground up to offer unparalleled performance and functionality."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="yes"
|
||||
@ -1,42 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2010-2011 Roman Weber (roman@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
|
||||
|
||||
cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
--exec-prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--datadir=/usr/share \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--with-gnu-ld \
|
||||
--without-debug \
|
||||
--with-warn \
|
||||
--without-python
|
||||
|
||||
make
|
||||
|
||||
$MAKEINSTALL
|
||||
@ -1,27 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2010-2011 Roman Weber (roman@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
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib
|
||||
@ -1,35 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2010-2011 Roman Weber (roman@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="libcap-ng"
|
||||
PKG_VERSION="0.6.6"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE=""
|
||||
PKG_URL="http://people.redhat.com/sgrubb/libcap-ng/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="attr"
|
||||
PKG_BUILD_DEPENDS="toolchain attr"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="devel"
|
||||
PKG_SHORTDESC="libcap-ng: A library for getting and setting POSIX.1e capabilities"
|
||||
PKG_LONGDESC="As of Linux 2.2.0, the power of the superuser has been partitioned into a set of discrete capabilities (in other places, these capabilities are know as privileges). The contents of the libcap package are a library and a number of simple programs that are intended to show how an application/daemon can be protected (with wrappers) or rewritten to take advantage of this fine grained approach to constraining the danger to your system from programs running as 'root'."
|
||||
PKG_IS_ADDON="no"
|
||||
@ -22,6 +22,9 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
# libcec fails to build with LTO optimization
|
||||
strip_lto
|
||||
|
||||
cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
@ -31,4 +34,5 @@ cd $PKG_BUILD
|
||||
--enable-shared \
|
||||
|
||||
make
|
||||
|
||||
$MAKEINSTALL
|
||||
@ -22,8 +22,10 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp $PKG_DIR/scripts/netmount $INSTALL/usr/bin
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/src/lib/.libs/*.so* $INSTALL/usr/lib
|
||||
|
||||
mkdir -p $INSTALL/usr/config
|
||||
cp $PKG_DIR/config/netmount.conf.sample $INSTALL/usr/config
|
||||
if [ "$DEVTOOLS" = yes ]; then
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp -P $PKG_BUILD/src/testclient/cec-client $INSTALL/usr/bin
|
||||
fi
|
||||
@ -18,19 +18,19 @@
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="ifuse"
|
||||
PKG_VERSION="1.0.0"
|
||||
PKG_NAME="libcec"
|
||||
PKG_VERSION="8f084f0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.libimobiledevice.org"
|
||||
PKG_URL="http://www.libimobiledevice.org/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="fuse glib libimobiledevice"
|
||||
PKG_BUILD_DEPENDS="toolchain fuse glib libimobiledevice"
|
||||
PKG_SITE="http://libcec.pulse-eight.com/"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS="udev"
|
||||
PKG_BUILD_DEPENDS="toolchain udev"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="system"
|
||||
PKG_SHORTDESC="ifuse: a fuse filesystem for mounting iPhone and iPod touch devices"
|
||||
PKG_LONGDESC="ifise is a fuse filesystem for mounting iPhone and iPod touch devices"
|
||||
PKG_SHORTDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor"
|
||||
PKG_LONGDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="yes"
|
||||
@ -1,36 +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="libimobiledevice"
|
||||
PKG_VERSION="1.1.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.libimobiledevice.org/"
|
||||
PKG_URL="http://www.libimobiledevice.org/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="usbmuxd glib gnutls libtasn1 libplist"
|
||||
PKG_BUILD_DEPENDS="toolchain usbmuxd glib gnutls libtasn1 libplist"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="devel"
|
||||
PKG_SHORTDESC="libimobiledevice: a software library that talks the protocols to support iPhone®, iPod Touch®, iPad® and Apple TV® devices."
|
||||
PKG_LONGDESC="libimobiledevice is a software library that talks the protocols to support iPhone®, iPod Touch®, iPad® and Apple TV® devices."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="yes"
|
||||
@ -23,9 +23,12 @@
|
||||
. config/options $1
|
||||
|
||||
cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
--enable-shared \
|
||||
mkdir -p build && cd build
|
||||
|
||||
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
..
|
||||
|
||||
make
|
||||
|
||||
$MAKEINSTALL
|
||||
@ -23,5 +23,5 @@
|
||||
. config/options $1
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/build/yajl-*/lib/libyajl.so* $INSTALL/usr/lib
|
||||
|
||||
17
packages/3rdparty/multimedia/libao/meta → packages/devel/yajl/meta
Executable file → Normal file
17
packages/3rdparty/multimedia/libao/meta → packages/devel/yajl/meta
Executable file → Normal file
@ -18,18 +18,19 @@
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libao"
|
||||
PKG_VERSION="1.1.0"
|
||||
PKG_NAME="yajl"
|
||||
PKG_VERSION="2.0.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/Andywebs/shairport"
|
||||
PKG_URL="http://downloads.xiph.org/releases/ao/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
PKG_LICENSE="ISC"
|
||||
PKG_SITE="http://lloyd.github.com/yajl/"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="network"
|
||||
PKG_SHORTDESC="libao: a cross platform audio library"
|
||||
PKG_LONGDESC="Libao is a cross-platform audio library that allows programs to output audio using a simple API on a wide variety of platforms."
|
||||
PKG_SECTION="devel"
|
||||
PKG_SHORTDESC="yajl: Yet Another JSON Library (YAJL) is a small event-driven (SAX-style) JSON parser"
|
||||
PKG_LONGDESC="Yet Another JSON Library (YAJL) is a small event-driven (SAX-style) JSON parser written in ANSI C, and a small validating JSON generator. YAJL is released under the permissive ISC license."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="no"
|
||||
@ -48,8 +48,8 @@ CONFIG_FEATURE_DEVPTS=y
|
||||
# CONFIG_SELINUX is not set
|
||||
CONFIG_FEATURE_PREFER_APPLETS=y
|
||||
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
|
||||
# CONFIG_FEATURE_SYSLOG is not set
|
||||
# CONFIG_FEATURE_HAVE_RPC is not set
|
||||
CONFIG_FEATURE_SYSLOG=y
|
||||
CONFIG_FEATURE_HAVE_RPC=y
|
||||
|
||||
#
|
||||
# Build Options
|
||||
@ -178,9 +178,9 @@ CONFIG_CAT=y
|
||||
CONFIG_TEST=y
|
||||
CONFIG_FEATURE_TEST_64=y
|
||||
# CONFIG_TOUCH is not set
|
||||
# CONFIG_TR is not set
|
||||
# CONFIG_FEATURE_TR_CLASSES is not set
|
||||
# CONFIG_FEATURE_TR_EQUIV is not set
|
||||
CONFIG_TR=y
|
||||
CONFIG_FEATURE_TR_CLASSES=y
|
||||
CONFIG_FEATURE_TR_EQUIV=y
|
||||
# CONFIG_BASE64 is not set
|
||||
# CONFIG_WHO is not set
|
||||
# CONFIG_USERS is not set
|
||||
@ -571,8 +571,8 @@ CONFIG_FEATURE_MOUNT_FAKE=y
|
||||
# CONFIG_FEATURE_MOUNT_VERBOSE is not set
|
||||
# CONFIG_FEATURE_MOUNT_HELPERS is not set
|
||||
CONFIG_FEATURE_MOUNT_LABEL=y
|
||||
# CONFIG_FEATURE_MOUNT_NFS is not set
|
||||
# CONFIG_FEATURE_MOUNT_CIFS is not set
|
||||
CONFIG_FEATURE_MOUNT_NFS=y
|
||||
CONFIG_FEATURE_MOUNT_CIFS=y
|
||||
CONFIG_FEATURE_MOUNT_FLAGS=y
|
||||
# CONFIG_FEATURE_MOUNT_FSTAB is not set
|
||||
CONFIG_PIVOT_ROOT=y
|
||||
@ -716,7 +716,7 @@ CONFIG_IONICE=y
|
||||
#
|
||||
# CONFIG_NAMEIF is not set
|
||||
# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
|
||||
# CONFIG_NBDCLIENT is not set
|
||||
CONFIG_NBDCLIENT=y
|
||||
# CONFIG_NC is not set
|
||||
# CONFIG_NC_SERVER is not set
|
||||
# CONFIG_NC_EXTRA is not set
|
||||
|
||||
@ -27,9 +27,15 @@ IMAGE_SYSTEM="SYSTEM"
|
||||
IMAGE_KERNEL="KERNEL"
|
||||
REBOOT="0"
|
||||
|
||||
# defaults for booting from an nbd root
|
||||
NBD_ROOT_SERVER="192.168.1.1"
|
||||
NBD_ROOT_PORT="2000"
|
||||
NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
|
||||
|
||||
# mount all needed special filesystems
|
||||
/bin/busybox mount -t devtmpfs none /dev
|
||||
/bin/busybox mount -t proc none /proc
|
||||
/bin/busybox mount -t sysfs none /sys
|
||||
|
||||
# hide kernel log messages on console
|
||||
echo '1 4 1 7' > /proc/sys/kernel/printk
|
||||
@ -49,6 +55,23 @@ REBOOT="0"
|
||||
fastboot)
|
||||
FASTBOOT=yes
|
||||
;;
|
||||
netboot)
|
||||
NETBOOT=yes
|
||||
;;
|
||||
nbdroot=*)
|
||||
nbdroot="${arg#nbdroot=}"
|
||||
NBD_ROOT_SERVER=$( echo "${nbdroot}" | /bin/busybox sed 's/:.*//')
|
||||
NBD_ROOT_PORT=$( echo "${nbdroot}" | /bin/busybox sed 's/.*://')
|
||||
;;
|
||||
nbdserver=*)
|
||||
NBD_ROOT_SERVER="${arg#nbdserver=}"
|
||||
;;
|
||||
nbdport=*)
|
||||
NBD_ROOT_PORT="${arg#nbdport=}"
|
||||
;;
|
||||
nfsoverlay=*)
|
||||
NFS_OVERLAY="${arg#nfsoverlay=}"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
@ -97,14 +120,21 @@ REBOOT="0"
|
||||
# progress "check filesystem $1 ..."
|
||||
# /sbin/fsck -M -T -a $1 > /dev/null 2>&1
|
||||
|
||||
for i in 1 2 3 4 5 6 7 8 9 10; do
|
||||
ERR_ENV=1
|
||||
progress "mount filesystem $1 ..."
|
||||
/bin/busybox mount -o $3 $1 $2 > /dev/null 2>&1
|
||||
[ "$?" -eq "0" ] && ERR_ENV=0 && break
|
||||
/bin/busybox usleep 1000000
|
||||
done
|
||||
[ "$ERR_ENV" -ne "0" ] && error "INIT_4" "Could not mount $1" && debug_shell
|
||||
for i in 1 2 3 4 5 6 7 8 9 10; do
|
||||
ERR_ENV=1
|
||||
MOUNT_OPTIONS="-o $3 $1 $2"
|
||||
|
||||
if [ -n "$4" ]; then
|
||||
MOUNT_OPTIONS="-t $4 $MOUNT_OPTIONS"
|
||||
fi
|
||||
|
||||
progress "mount filesystem $1 ..."
|
||||
$IONICE /bin/busybox mount $MOUNT_OPTIONS > /dev/null 2>&1
|
||||
[ "$?" -eq "0" ] && ERR_ENV=0 && break
|
||||
|
||||
/bin/busybox usleep 1000000
|
||||
done
|
||||
[ "$ERR_ENV" -ne "0" ] && error "INIT_4" "Could not mount $1" && debug_shell
|
||||
}
|
||||
|
||||
update() {
|
||||
@ -135,48 +165,90 @@ REBOOT="0"
|
||||
done
|
||||
}
|
||||
|
||||
# deal with hfs partitions
|
||||
if [ -x /sbin/fsck_hfs ]; then
|
||||
hfsdiskprep
|
||||
fi
|
||||
mount_nbd() {
|
||||
retry_nr=0
|
||||
retry_delay=20
|
||||
OVERLAY_DIR=`cat /sys/class/net/eth0/address | /bin/busybox tr -d :`
|
||||
|
||||
mount_part "$boot" "/flash" "ro,noatime"
|
||||
while [ ${retry_nr} -lt ${retry_delay} ] && [ ! -e /sysroot/sbin/init ]; do
|
||||
[ ${retry_nr} -gt 0 ] && \
|
||||
$IONICE /bin/busybox nbd-client $NBD_ROOT_SERVER $NBD_ROOT_PORT /dev/nbd0 && \
|
||||
mount_part "/dev/nbd0" "/sysroot" "ro" "squashfs"
|
||||
|
||||
show_splash
|
||||
retry_nr=$(( ${retry_nr} + 1 ))
|
||||
|
||||
if [ -f "/flash/MACH_KERNEL" ]; then
|
||||
IMAGE_KERNEL="MACH_KERNEL"
|
||||
fi
|
||||
[ ! -e /sysroot/sbin/init ] && /bin/busybox usleep 1000000
|
||||
|
||||
if [ -n "$disk" ]; then
|
||||
mount_part "$disk" "/storage" "rw,noatime"
|
||||
update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL"
|
||||
update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM"
|
||||
[ ${retry_nr} -gt 0 ]
|
||||
done
|
||||
|
||||
if test "$REBOOT" -eq "1"; then
|
||||
echo "System reboots now..." && \
|
||||
/bin/busybox reboot
|
||||
if [ ! -e /sysroot/sbin/init ]; then
|
||||
error "INIT_2" "Could not mount NBD root from $NBD_ROOT_SERVER port $NBD_ROOT_PORT"
|
||||
debug_shell
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -f "/flash/$IMAGE_SYSTEM" ]; then
|
||||
mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop"
|
||||
[ "$ERR_ENV" -ne "0" ] && debug_shell
|
||||
mount_part "$NFS_OVERLAY" "/sysroot/storage" "rw,nolock,retrans=10" "nfs"
|
||||
|
||||
if [ ! -d /sysroot/storage/$OVERLAY_DIR ]; then
|
||||
mkdir /sysroot/storage/$OVERLAY_DIR
|
||||
fi
|
||||
|
||||
/bin/busybox umount /sysroot/storage
|
||||
mount_part "$NFS_OVERLAY/$OVERLAY_DIR" "/sysroot/storage" "rw,nolock" "nfs"
|
||||
}
|
||||
|
||||
mount_disk() {
|
||||
|
||||
# deal with hfs partitions
|
||||
if [ -x /sbin/fsck_hfs ]; then
|
||||
hfsdiskprep
|
||||
fi
|
||||
|
||||
mount_part "$boot" "/flash" "ro,noatime"
|
||||
show_splash
|
||||
|
||||
if [ -n "$disk" ]; then
|
||||
mount_part "$disk" "/storage" "rw,noatime"
|
||||
|
||||
if [ -f "/flash/MACH_KERNEL" ]; then
|
||||
IMAGE_KERNEL="MACH_KERNEL"
|
||||
fi
|
||||
|
||||
update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL"
|
||||
update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM"
|
||||
|
||||
if test "$REBOOT" -eq "1"; then
|
||||
echo "System reboots now..." && \
|
||||
/bin/busybox reboot
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -f "/flash/$IMAGE_SYSTEM" ]; then
|
||||
mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop"
|
||||
[ "$ERR_ENV" -ne "0" ] && debug_shell
|
||||
else
|
||||
error "INIT_2" "Could not find system."
|
||||
debug_shell
|
||||
fi
|
||||
|
||||
# move /flash and /storage to /sysroot
|
||||
/bin/busybox mount --move /flash /sysroot/flash
|
||||
|
||||
if [ -n "$disk" ]; then
|
||||
/bin/busybox mount --move /storage /sysroot/storage
|
||||
fi
|
||||
}
|
||||
|
||||
if [ -z "$NETBOOT" ]; then
|
||||
mount_disk
|
||||
else
|
||||
error "INIT_2" "Could not find system."
|
||||
debug_shell
|
||||
fi
|
||||
|
||||
# move /flash and /storage to /sysroot
|
||||
/bin/busybox mount --move /flash /sysroot/flash
|
||||
|
||||
if [ -n "$disk" ]; then
|
||||
/bin/busybox mount --move /storage /sysroot/storage
|
||||
mount_nbd
|
||||
fi
|
||||
|
||||
# move some special filesystems
|
||||
/bin/busybox mount --move /dev /sysroot/dev
|
||||
/bin/busybox mount --move /proc /sysroot/proc
|
||||
/bin/busybox mount --move /sys /sysroot/sys
|
||||
|
||||
# switch to new sysroot and start real init
|
||||
exec /bin/busybox switch_root /sysroot /sbin/init
|
||||
|
||||
@ -35,6 +35,6 @@ PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
for i in "$SKINS"; do
|
||||
for i in $SKINS; do
|
||||
PKG_DEPENDS="$PKG_DEPENDS $MEDIACENTER-theme-$i"
|
||||
done
|
||||
@ -19,12 +19,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-theme-Confluence"
|
||||
PKG_VERSION="10.1-Dharma"
|
||||
PKG_VERSION="70537d2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.xbmc.org"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
diff -Naur xbmc-theme-Confluence-10.1-Dharma/720p/VideoOSD.xml xbmc-theme-Confluence-10.1-Dharma.patch/720p/VideoOSD.xml
|
||||
--- xbmc-theme-Confluence-10.1-Dharma/720p/VideoOSD.xml 2011-03-08 02:49:22.000000000 +0100
|
||||
+++ xbmc-theme-Confluence-10.1-Dharma.patch/720p/VideoOSD.xml 2011-03-30 18:18:57.291644805 +0200
|
||||
@@ -23,8 +23,8 @@
|
||||
<height>45</height>
|
||||
<label>298</label>
|
||||
<font>-</font>
|
||||
- <texturefocus>OSDBookMarksFO.png</texturefocus>
|
||||
- <texturenofocus>OSDBookMarksNF.png</texturenofocus>
|
||||
+ <texturefocus>OSDBookmarksFO.png</texturefocus>
|
||||
+ <texturenofocus>OSDBookmarksNF.png</texturenofocus>
|
||||
<onleft>705</onleft>
|
||||
<onright>701</onright>
|
||||
<onup>600</onup>
|
||||
Binary file not shown.
@ -29,9 +29,15 @@ else
|
||||
fi
|
||||
|
||||
if [ "$XBMC_VIS_PROJECTM" = yes ]; then
|
||||
XBMC_PROJECTM="--enable-xbmcprojectm"
|
||||
XBMC_PROJECTM="--enable-projectm"
|
||||
else
|
||||
XBMC_PROJECTM="--disable-xbmcprojectm"
|
||||
XBMC_PROJECTM="--disable-projectm"
|
||||
fi
|
||||
|
||||
if [ "$XBMC_VIS_GOOM" = yes ]; then
|
||||
XBMC_GOOM="--enable-goom"
|
||||
else
|
||||
XBMC_GOOM="--disable-goom"
|
||||
fi
|
||||
|
||||
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
|
||||
@ -40,12 +46,30 @@ else
|
||||
XBMC_PULSEAUDIO="--disable-pulse"
|
||||
fi
|
||||
|
||||
if [ "$CEC_SUPPORT" = yes ]; then
|
||||
XBMC_CEC="--enable-libcec --enable-external-libcec --enable-udev --disable-libusb"
|
||||
else
|
||||
XBMC_CEC="--disable-libcec --disable-udev --disable-libusb"
|
||||
fi
|
||||
|
||||
if [ "$NONFREE_SUPPORT" = yes ]; then
|
||||
XBMC_NONFREE="--enable-non-free"
|
||||
else
|
||||
XBMC_NONFREE="--disable-non-free"
|
||||
fi
|
||||
|
||||
if [ "$AIRPLAY_SUPPORT" = yes ]; then
|
||||
XBMC_AIRPLAY="--enable-airplay"
|
||||
else
|
||||
XBMC_AIRPLAY="--disable-airplay"
|
||||
fi
|
||||
|
||||
if [ "$AIRTUNES_SUPPORT" = yes ]; then
|
||||
XBMC_AIRTUNES="--enable-airtunes"
|
||||
else
|
||||
XBMC_AIRTUNES="--disable-airtunes"
|
||||
fi
|
||||
|
||||
if [ "$DVDCSS_SUPPORT" = yes ]; then
|
||||
XBMC_DVDCSS="--enable-dvdcss"
|
||||
else
|
||||
@ -64,6 +88,18 @@ else
|
||||
XBMC_AVAHI="--disable-avahi"
|
||||
fi
|
||||
|
||||
if [ "$NFS_SUPPORT" = yes ]; then
|
||||
XBMC_NFS="--enable-nfs"
|
||||
else
|
||||
XBMC_NFS="--disable-nfs"
|
||||
fi
|
||||
|
||||
if [ "$AFP_SUPPORT" = yes ]; then
|
||||
XBMC_AFP="--enable-afpclient"
|
||||
else
|
||||
XBMC_AFP="--disable-afpclient"
|
||||
fi
|
||||
|
||||
if [ "$SAMBA_CLIENT" = yes ]; then
|
||||
XBMC_SAMBA="--enable-samba"
|
||||
else
|
||||
@ -103,6 +139,12 @@ fi
|
||||
# this fixes problems with faac implementation of ffmpeg
|
||||
LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
|
||||
|
||||
export PYTHON_VERSION="2.6"
|
||||
export PYTHON_CPPFLAGS="-I$SYSROOT_PREFIX/usr/include/python$PYTHON_VERSION"
|
||||
export PYTHON_LDFLAGS="-L$SYSROOT_PREFIX/usr/lib/python$PYTHON_VERSION -lpython$PYTHON_VERSION"
|
||||
export PYTHON_SITE_PKG="$SYSROOT_PREFIX/usr/lib/python$PYTHON_VERSION/site-packages"
|
||||
export ac_python_version="$PYTHON_VERSION"
|
||||
|
||||
# this fixes the "stretching picture bug"
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-ftree-loop-distribution||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-interchange||"`
|
||||
@ -121,13 +163,26 @@ fi
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
do_autoreconf
|
||||
do_autoreconf lib/cpluff
|
||||
[ -d lib/libass ] && do_autoreconf lib/libass
|
||||
[ -d xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ] && do_autoreconf xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss
|
||||
do_autoreconf xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread
|
||||
do_autoreconf xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav
|
||||
do_autoreconf xbmc/lib/libid3tag/libid3tag
|
||||
# adding fake Makefile for stripped skin
|
||||
mkdir -p addons/skin.confluence/media
|
||||
touch addons/skin.confluence/media/Makefile.in
|
||||
mkdir -p addons/skin.touched/media
|
||||
touch addons/skin.touched/media/Makefile.in
|
||||
|
||||
# autoreconf
|
||||
do_autoreconf
|
||||
do_autoreconf lib/libid3tag/libid3tag
|
||||
do_autoreconf xbmc/screensavers/rsxs-0.9
|
||||
do_autoreconf xbmc/visualizations/Goom/goom2k4-0
|
||||
do_autoreconf lib/libapetag
|
||||
do_autoreconf lib/cpluff
|
||||
# order matters with libdvd and friends
|
||||
[ -d lib/libdvd/libdvdcss ] && do_autoreconf lib/libdvd/libdvdcss
|
||||
do_autoreconf lib/libdvd/libdvdread
|
||||
do_autoreconf lib/libdvd/libdvdnav
|
||||
|
||||
# Clean the generated files
|
||||
find . -depth -type d -name "autom4te.cache" -exec rm -rf {} \;
|
||||
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
@ -141,39 +196,47 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag
|
||||
--disable-debug \
|
||||
--disable-optimizations \
|
||||
--enable-gl \
|
||||
--disable-gles \
|
||||
$XBMC_VDPAU \
|
||||
$XBMC_VAAPI \
|
||||
$XBMC_CRYSTALHD \
|
||||
--disable-vdadecoder \
|
||||
--disable-vtbdecoder \
|
||||
--disable-openmax \
|
||||
--disable-tegra \
|
||||
--disable-profiling \
|
||||
--enable-joystick \
|
||||
--enable-xrandr \
|
||||
--disable-goom \
|
||||
$XBMC_PROJECTM \
|
||||
$XBMC_CEC \
|
||||
$XBMC_GOOM \
|
||||
$XBMC_RSXS \
|
||||
$XBMC_PROJECTM \
|
||||
--enable-x11 \
|
||||
--enable-xrandr \
|
||||
--disable-ccache \
|
||||
$XBMC_PULSEAUDIO \
|
||||
--enable-rtmp \
|
||||
$XBMC_SAMBA \
|
||||
$XBMC_NFS \
|
||||
$XBMC_AFP \
|
||||
--enable-ffmpeg-libvorbis \
|
||||
--disable-faac \
|
||||
--enable-lame \
|
||||
$XBMC_DVDCSS \
|
||||
--disable-mid \
|
||||
$XBMC_AVAHI \
|
||||
$XBMC_SAMBA \
|
||||
--disable-hal \
|
||||
$XBMC_AVAHI \
|
||||
$XBMC_AIRPLAY \
|
||||
$XBMC_AIRTUNES \
|
||||
$XBMC_NONFREE \
|
||||
--disable-asap-codec \
|
||||
$XBMC_WEBSERVER \
|
||||
--disable-libdts \
|
||||
--disable-liba52 \
|
||||
--enable-optical-drive \
|
||||
$XBMC_BLURAY \
|
||||
--enable-texturepacker \
|
||||
--disable-external-libraries \
|
||||
--disable-external-ffmpeg \
|
||||
--disable-external-liba52 \
|
||||
--disable-external-libdts \
|
||||
--enable-external-python \
|
||||
|
||||
# setup default skin inside the sources
|
||||
sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/Settings.h
|
||||
sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/settings/Settings.h
|
||||
|
||||
make externals
|
||||
make xbmc.bin
|
||||
|
||||
10
packages/mediacenter/xbmc/config/advancedsettings.xml
Normal file
10
packages/mediacenter/xbmc/config/advancedsettings.xml
Normal file
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<advancedsettings>
|
||||
<splash>false</splash>
|
||||
<showexitbutton>false</showexitbutton>
|
||||
<cputempcommand>cputemp</cputempcommand>
|
||||
<gputempcommand>gputemp</gputempcommand>
|
||||
<samba>
|
||||
<clienttimeout>30</clienttimeout>
|
||||
</samba>
|
||||
</advancedsettings>
|
||||
@ -34,21 +34,6 @@ progress "setup XBMC"
|
||||
#
|
||||
mkdir -p $HOME/.xbmc/userdata
|
||||
|
||||
# use dds fanarts by default
|
||||
if [ ! -f $HOME/.xbmc/userdata/advancedsettings.xml ] ; then
|
||||
cat > $HOME/.xbmc/userdata/advancedsettings.xml << EOF
|
||||
<advancedsettings>
|
||||
<useddsfanart>true</useddsfanart>
|
||||
<splash>false</splash>
|
||||
<cputempcommand>cputemp</cputempcommand>
|
||||
<gputempcommand>gputemp</gputempcommand>
|
||||
<samba>
|
||||
<clienttimeout>30</clienttimeout>
|
||||
</samba>
|
||||
</advancedsettings>
|
||||
EOF
|
||||
fi
|
||||
|
||||
#
|
||||
# setup directories for XBMC sources
|
||||
#
|
||||
|
||||
@ -73,6 +73,9 @@ mkdir -p $INSTALL/usr/share/xbmc/media
|
||||
$INSTALL/usr/share/xbmc/addons/script.module.pil/lib/PIL
|
||||
rm -rf $INSTALL/usr/share/xbmc/addons/script.module.pysqlite
|
||||
|
||||
mkdir -p $INSTALL/usr/share/xbmc/system/
|
||||
cp $PKG_DIR/config/advancedsettings.xml $INSTALL/usr/share/xbmc/system/
|
||||
|
||||
mkdir -p $INSTALL/usr/share/xbmc/addons
|
||||
cp -R $PKG_DIR/config/os.openelec.tv $INSTALL/usr/share/xbmc/addons
|
||||
$SED "s|@ADDON_OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/xbmc/addons/os.openelec.tv/addon.xml
|
||||
|
||||
@ -19,14 +19,14 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc"
|
||||
PKG_VERSION="10.1-Dharma"
|
||||
PKG_VERSION="70537d2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.xbmc.org"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 SDL SDL_mixer SDL_image sqlite mysql alsa bc xbmc-addon-settings"
|
||||
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 SDL SDL_mixer SDL_image sqlite mysql"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings"
|
||||
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="mediacenter"
|
||||
PKG_SHORTDESC="xbmc: XBMC Mediacenter"
|
||||
@ -35,6 +35,28 @@ PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
# for libX11 support
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext"
|
||||
PKG_DEPENDS="$PKG_DEPENDS libX11 libXext"
|
||||
|
||||
# for libXrandr support
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXrandr"
|
||||
PKG_DEPENDS="$PKG_DEPENDS libXrandr"
|
||||
|
||||
# for dbus support
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS dbus"
|
||||
PKG_DEPENDS="$PKG_DEPENDS dbus"
|
||||
|
||||
if [ "$CEC_SUPPORT" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libcec"
|
||||
PKG_DEPENDS="$PKG_DEPENDS libcec"
|
||||
fi
|
||||
|
||||
if [ "$XBMC_SCR_RSXS" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXt libXmu"
|
||||
PKG_DEPENDS="$PKG_DEPENDS libXt libXmu"
|
||||
fi
|
||||
|
||||
if [ "$FAAC_SUPPORT" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS faac"
|
||||
PKG_DEPENDS="$PKG_DEPENDS faac"
|
||||
@ -50,6 +72,26 @@ if [ "$AVAHI_DAEMON" = yes ]; then
|
||||
PKG_DEPENDS="$PKG_DEPENDS avahi"
|
||||
fi
|
||||
|
||||
if [ "$AIRPLAY_SUPPORT" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libplist"
|
||||
PKG_DEPENDS="$PKG_DEPENDS libplist"
|
||||
fi
|
||||
|
||||
if [ "$AIRTUNES_SUPPORT" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libshairport"
|
||||
PKG_DEPENDS="$PKG_DEPENDS libshairport"
|
||||
fi
|
||||
|
||||
if [ "$NFS_SUPPORT" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libnfs"
|
||||
PKG_DEPENDS="$PKG_DEPENDS libnfs"
|
||||
fi
|
||||
|
||||
if [ "$AFP_SUPPORT" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS afpfs-ng"
|
||||
PKG_DEPENDS="$PKG_DEPENDS afpfs-ng"
|
||||
fi
|
||||
|
||||
if [ "$SAMBA_CLIENT" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS samba"
|
||||
PKG_DEPENDS="$PKG_DEPENDS samba"
|
||||
@ -87,3 +129,4 @@ fi
|
||||
# some python stuff needed for various addons
|
||||
PKG_DEPENDS="$PKG_DEPENDS Imaging"
|
||||
PKG_DEPENDS="$PKG_DEPENDS simplejson"
|
||||
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
<held> bei openelec fehlt mir eigentlich nur noch die bluetooth ps3 remote und mein metadata patch :)
|
||||
<sraue> wo find ich den patch nochmal?
|
||||
<held> http://trac.xbmc.org/ticket/10292 und http://trac.xbmc.org/ticket/10298
|
||||
<held> http://trac.xbmc.org/attachment/ticket/10292/advancedsettings-alwaysextractflags.diff und http://trac.xbmc.org/attachment/ticket/10298/advancedsettings-videolibrary.flattenmoviesets.diff
|
||||
@ -1,56 +0,0 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 13:30:17.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-03-06 21:19:57.004648466 +0100
|
||||
@@ -448,30 +448,6 @@
|
||||
LIBS="$LIBS -framework CoreFoundation"
|
||||
LIBS="$LIBS -framework DiskArbitration"
|
||||
LIBS="$LIBS -framework ApplicationServices"
|
||||
-elif expr "X$host_cpu" : 'Xarm.*' > /dev/null; then
|
||||
- use_arch=arm
|
||||
- CFLAGS="$CFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
|
||||
- CXXFLAGS="$CXXFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
|
||||
- FFMPEG_EXTRACFLAGS="-mfloat-abi=softfp"
|
||||
- if test "$use_tegra" = "yes"; then
|
||||
- # Compile for ARMv7a architecture, need to test gcc for vfpv3-d16 support
|
||||
- SAVE_CFLAGS="$CFLAGS"
|
||||
- CFLAGS="-mfpu=vfpv3-d16"
|
||||
- AC_COMPILE_IFELSE(
|
||||
- [int foo;],
|
||||
- [ CFLAGS="$SAVE_CFLAGS -Wno-psabi -Wa,-march=armv7a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mthumb-interwork"
|
||||
- CXXFLAGS="$CXXFLAGS -Wno-psabi -Wa,-march=armv7a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mthumb-interwork"
|
||||
- FFMPEG_EXTRACFLAGS+=" -mtune=cortex-a9 -mfpu=vfpv3-d16"
|
||||
- use_cpu=cortex-a9],
|
||||
- [ CFLAGS="$SAVE_CFLAGS -Wa,-march=armv6 -mtune=cortex-a8 -mthumb-interwork"
|
||||
- CXXFLAGS="$CXXFLAGS -Wa,-march=armv6 -mtune=cortex-a8 -mthumb-interwork"
|
||||
- use_cpu=cortex-a8])
|
||||
- else
|
||||
- # Compile for ARMv7a architecture, CortexA8 cpu and NEON coprocessor
|
||||
- CFLAGS+=" -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad"
|
||||
- CXXFLAGS+=" -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad"
|
||||
- FFMPEG_EXTRACFLAGS+=" -mfpu=neon"
|
||||
- fi
|
||||
fi
|
||||
|
||||
# Checks for library functions.
|
||||
@@ -1646,6 +1622,7 @@
|
||||
--disable-static \
|
||||
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
|
||||
`if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
|
||||
+ `if test -n "$host_alias"; then echo --cross-prefix="${host_alias}-"; fi`\
|
||||
`if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
|
||||
`if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
|
||||
--target-os=$(tolower $(uname -s)) \
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/Makefile.in xbmc-Dharma-10.1-c8405db.patch/Makefile.in
|
||||
--- xbmc-Dharma-10.1-c8405db/Makefile.in 2011-02-15 13:30:17.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/Makefile.in 2011-03-04 19:52:52.500328225 +0100
|
||||
@@ -467,8 +467,8 @@
|
||||
xbmc/cores/DllLoader/exports/exports.a
|
||||
|
||||
ifeq (arm, $(ARCH))
|
||||
-# Force external python2.5 for now!
|
||||
-LIBS +=-lpython2.5
|
||||
+# Force external python2.6 for now!
|
||||
+LIBS +=-lpython2.6
|
||||
endif
|
||||
|
||||
xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC)
|
||||
@ -1,448 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/Makefile xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/Makefile
|
||||
--- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/Makefile 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/Makefile 2011-09-06 22:59:02.915548511 +0200
|
||||
@@ -1,8 +1,9 @@
|
||||
INCLUDES=-I../../../.. -I. -I../../../ -I../../../linux -I../../../../guilib -I../../../utils -I../../../cores -I../../../../lib/jsoncpp/jsoncpp/include
|
||||
|
||||
-SRCS=action.cpp controlbutton.cpp controlcheckmark.cpp control.cpp controlfadelabel.cpp controlimage.cpp controllabel.cpp controllist.cpp controlprogress.cpp controlslider.cpp controlspin.cpp controltextbox.cpp dialog.cpp GUIPythonWindow.cpp GUIPythonWindowDialog.cpp GUIPythonWindowXML.cpp GUIPythonWindowXMLDialog.cpp infotagmusic.cpp infotagvideo.cpp keyboard.cpp listitem.cpp player.cpp pyplaylist.cpp PythonPlayer.cpp pyutil.cpp window.cpp winxml.cpp winxmldialog.cpp xbmcguimodule.cpp xbmcmodule.cpp controlgroup.cpp xbmcplugin.cpp controlradiobutton.cpp PythonAddon.cpp xbmcaddonmodule.cpp
|
||||
+SRCS=action.cpp controlbutton.cpp controlcheckmark.cpp control.cpp controlfadelabel.cpp controlimage.cpp controllabel.cpp controllist.cpp controlprogress.cpp controlslider.cpp controlspin.cpp controltextbox.cpp dialog.cpp GUIPythonWindow.cpp GUIPythonWindowDialog.cpp GUIPythonWindowXML.cpp GUIPythonWindowXMLDialog.cpp infotagmusic.cpp infotagvideo.cpp keyboard.cpp listitem.cpp player.cpp pyplaylist.cpp PythonPlayer.cpp pyutil.cpp window.cpp winxml.cpp winxmldialog.cpp xbmcguimodule.cpp xbmcmodule.cpp controlgroup.cpp xbmcplugin.cpp controlradiobutton.cpp PythonAddon.cpp xbmcaddonmodule.cpp xbmcvfsmodule.cpp
|
||||
|
||||
LIB=xbmcmodule.a
|
||||
|
||||
include ../../../../Makefile.include
|
||||
-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
|
||||
+
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp 2011-09-06 22:59:02.916548524 +0200
|
||||
@@ -64,6 +64,7 @@
|
||||
#include "SectionLoader.h"
|
||||
#include "Settings.h"
|
||||
#include "LocalizeStrings.h"
|
||||
+#include "utils/FileUtils.h"
|
||||
|
||||
// include for constants
|
||||
#include "pyutil.h"
|
||||
@@ -958,6 +959,35 @@
|
||||
|
||||
return Py_BuildValue((char*)"b", exists);
|
||||
}
|
||||
+
|
||||
+ PyDoc_STRVAR(subHashAndFileSize__doc__,
|
||||
+ "subHashAndFileSize(file)\n"
|
||||
+ "\n"
|
||||
+ "file : file to calculate subtitle hash and size for"
|
||||
+ "\n"
|
||||
+ "example:\n"
|
||||
+ " size,hash = xbmcvfs.subHashAndFileSize(file)\n");
|
||||
+ PyObject* XBMC_subHashAndFileSize(PyObject *self, PyObject *args, PyObject *kwds)
|
||||
+ {
|
||||
+ PyObject *f_line;
|
||||
+ if (!PyArg_ParseTuple(
|
||||
+ args,
|
||||
+ (char*)"O",
|
||||
+ &f_line))
|
||||
+ {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ CStdString strSource;
|
||||
+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL;
|
||||
+
|
||||
+ CStdString strSize;
|
||||
+ CStdString strHash;
|
||||
+ Py_BEGIN_ALLOW_THREADS
|
||||
+ CFileUtils::SubtitleFileSizeAndHash(strSource, strSize, strHash);
|
||||
+ Py_END_ALLOW_THREADS
|
||||
+
|
||||
+ return Py_BuildValue((char*)"ss",strSize.c_str(), strHash.c_str());
|
||||
+ }
|
||||
|
||||
// define c functions to be used in python here
|
||||
PyMethodDef xbmcMethods[] = {
|
||||
@@ -1005,6 +1035,8 @@
|
||||
{(char*)"getCleanMovieTitle", (PyCFunction)XBMC_GetCleanMovieTitle, METH_VARARGS|METH_KEYWORDS, getCleanMovieTitle__doc__},
|
||||
|
||||
{(char*)"skinHasImage", (PyCFunction)XBMC_SkinHasImage, METH_VARARGS|METH_KEYWORDS, skinHasImage__doc__},
|
||||
+ {(char*)"subHashAndFileSize", (PyCFunction)XBMC_subHashAndFileSize, METH_VARARGS, subHashAndFileSize__doc__},
|
||||
+
|
||||
{NULL, NULL, 0, NULL}
|
||||
};
|
||||
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcvfsmodule.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcvfsmodule.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcvfsmodule.cpp 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcvfsmodule.cpp 2011-09-06 23:43:28.717382455 +0200
|
||||
@@ -0,0 +1,299 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2005-2011 Team XBMC
|
||||
+ * http://www.xbmc.org
|
||||
+ *
|
||||
+ * 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 XBMC; 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
|
||||
+ *
|
||||
+ */
|
||||
+
|
||||
+#include "system.h"
|
||||
+#if (defined USE_EXTERNAL_PYTHON)
|
||||
+#if (defined HAVE_LIBPYTHON2_6)
|
||||
+#include <python2.6/Python.h>
|
||||
+#elif (defined HAVE_LIBPYTHON2_5)
|
||||
+#include <python2.5/Python.h>
|
||||
+#elif (defined HAVE_LIBPYTHON2_4)
|
||||
+#include <python2.4/Python.h>
|
||||
+#else
|
||||
+#error "Could not determine version of Python to use."
|
||||
+#endif
|
||||
+#else
|
||||
+#include "python/Include/Python.h"
|
||||
+#endif
|
||||
+#include "../XBPythonDll.h"
|
||||
+
|
||||
+#include "FileSystem/Directory.h"
|
||||
+#include "FileSystem/File.h"
|
||||
+#include "pyutil.h"
|
||||
+
|
||||
+using namespace std;
|
||||
+using namespace XFILE;
|
||||
+using namespace PYXBMC;
|
||||
+
|
||||
+#ifndef __GNUC__
|
||||
+#pragma code_seg("PY_TEXT")
|
||||
+#pragma data_seg("PY_DATA")
|
||||
+#pragma bss_seg("PY_BSS")
|
||||
+#pragma const_seg("PY_RDATA")
|
||||
+#endif
|
||||
+
|
||||
+#if defined(__GNUG__) && (__GNUC__>4) || (__GNUC__==4 && __GNUC_MINOR__>=2)
|
||||
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
|
||||
+#endif
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
+
|
||||
+ namespace xbmcvfs
|
||||
+ {
|
||||
+ /*****************************************************************
|
||||
+ * start of xbmcvfs methods
|
||||
+ *****************************************************************/
|
||||
+ typedef struct {
|
||||
+ PyObject_HEAD
|
||||
+ CFile* pFile;
|
||||
+ } File;
|
||||
+
|
||||
+ // copy() method
|
||||
+ PyDoc_STRVAR(copy__doc__,
|
||||
+ "copy(source, destination) -- copy file to destination, returns true/false.\n"
|
||||
+ "\n"
|
||||
+ "source : file to copy.\n"
|
||||
+ "destination : destination file"
|
||||
+ "\n"
|
||||
+ "example:\n"
|
||||
+ " success = xbmcvfs.copy(source, destination)\n");
|
||||
+
|
||||
+ PyObject* vfs_copy(PyObject *self, PyObject *args)
|
||||
+ {
|
||||
+ PyObject *f_line;
|
||||
+ PyObject *d_line;
|
||||
+ if (!PyArg_ParseTuple(
|
||||
+ args,
|
||||
+ (char*)"OO",
|
||||
+ &f_line,
|
||||
+ &d_line))
|
||||
+ {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ CStdString strSource;
|
||||
+ CStdString strDestnation;
|
||||
+ bool bResult = true;
|
||||
+
|
||||
+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL;
|
||||
+ if (!PyXBMCGetUnicodeString(strDestnation, d_line, 1)) return NULL;
|
||||
+ Py_BEGIN_ALLOW_THREADS
|
||||
+ bResult = CFile::Cache(strSource, strDestnation);
|
||||
+ Py_END_ALLOW_THREADS
|
||||
+
|
||||
+ return Py_BuildValue((char*)"b", bResult);
|
||||
+ }
|
||||
+ PyDoc_STRVAR(delete__doc__,
|
||||
+ "delete(file)\n"
|
||||
+ "\n"
|
||||
+ "file : file to delete"
|
||||
+ "\n"
|
||||
+ "example:\n"
|
||||
+ " xbmcvfs.delete(file)\n");
|
||||
+
|
||||
+ // delete a file
|
||||
+ PyObject* vfs_delete(File *self, PyObject *args, PyObject *kwds)
|
||||
+ {
|
||||
+ PyObject *f_line;
|
||||
+ if (!PyArg_ParseTuple(
|
||||
+ args,
|
||||
+ (char*)"O",
|
||||
+ &f_line))
|
||||
+ {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ CStdString strSource;
|
||||
+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL;
|
||||
+
|
||||
+ Py_BEGIN_ALLOW_THREADS
|
||||
+ self->pFile->Delete(strSource);
|
||||
+ Py_END_ALLOW_THREADS
|
||||
+
|
||||
+ Py_INCREF(Py_None);
|
||||
+ return Py_None;
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ PyDoc_STRVAR(rename__doc__,
|
||||
+ "rename(file, newFileName)\n"
|
||||
+ "\n"
|
||||
+ "file : file to reaname"
|
||||
+ "newFileName : new filename, including the full path"
|
||||
+ "\n"
|
||||
+ "example:\n"
|
||||
+ " success = xbmcvfs.rename(file,newFileName)\n");
|
||||
+
|
||||
+ // rename a file
|
||||
+ PyObject* vfs_rename(File *self, PyObject *args, PyObject *kwds)
|
||||
+ {
|
||||
+ PyObject *f_line;
|
||||
+ PyObject *d_line;
|
||||
+ if (!PyArg_ParseTuple(
|
||||
+ args,
|
||||
+ (char*)"OO",
|
||||
+ &f_line,
|
||||
+ &d_line))
|
||||
+ {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ CStdString strSource;
|
||||
+ CStdString strDestnation;
|
||||
+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL;
|
||||
+ if (!PyXBMCGetUnicodeString(strDestnation, d_line, 1)) return NULL;
|
||||
+
|
||||
+ bool bResult;
|
||||
+ Py_BEGIN_ALLOW_THREADS
|
||||
+ bResult = self->pFile->Rename(strSource,strDestnation);
|
||||
+ Py_END_ALLOW_THREADS
|
||||
+
|
||||
+ return Py_BuildValue((char*)"b", bResult);
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ PyDoc_STRVAR(exists__doc__,
|
||||
+ "exists(path)\n"
|
||||
+ "\n"
|
||||
+ "path : file or folder"
|
||||
+ "\n"
|
||||
+ "example:\n"
|
||||
+ " success = xbmcvfs.exists(path)\n");
|
||||
+
|
||||
+ // check for a file or folder existance, mimics Pythons os.path.exists()
|
||||
+ PyObject* vfs_exists(File *self, PyObject *args, PyObject *kwds)
|
||||
+ {
|
||||
+ PyObject *f_line;
|
||||
+ if (!PyArg_ParseTuple(
|
||||
+ args,
|
||||
+ (char*)"O",
|
||||
+ &f_line))
|
||||
+ {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ CStdString strSource;
|
||||
+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL;
|
||||
+
|
||||
+ bool bResult;
|
||||
+
|
||||
+ Py_BEGIN_ALLOW_THREADS
|
||||
+ bResult = self->pFile->Exists(strSource, false);
|
||||
+ Py_END_ALLOW_THREADS
|
||||
+
|
||||
+ return Py_BuildValue((char*)"b", bResult);
|
||||
+ }
|
||||
+
|
||||
+ PyDoc_STRVAR(mkdir__doc__,
|
||||
+ "mkdir(path) -- Create a folder.\n"
|
||||
+ "\n"
|
||||
+ "path : folder\n"
|
||||
+ "\n"
|
||||
+ "example:\n"
|
||||
+ " - success = xbmcvfs.mkdir(path)\n");
|
||||
+ // make a directory
|
||||
+ PyObject* vfs_mkdir(File *self, PyObject *args, PyObject *kwds)
|
||||
+ {
|
||||
+ PyObject *f_line;
|
||||
+ if (!PyArg_ParseTuple(
|
||||
+ args,
|
||||
+ (char*)"O",
|
||||
+ &f_line))
|
||||
+ {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ CStdString strSource;
|
||||
+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL;
|
||||
+
|
||||
+ bool bResult;
|
||||
+
|
||||
+ Py_BEGIN_ALLOW_THREADS
|
||||
+ bResult = CDirectory::Create(strSource);
|
||||
+ Py_END_ALLOW_THREADS
|
||||
+
|
||||
+ return Py_BuildValue((char*)"b", bResult);
|
||||
+ }
|
||||
+
|
||||
+ PyDoc_STRVAR(rmdir__doc__,
|
||||
+ "rmdir(path) -- Remove a folder.\n"
|
||||
+ "\n"
|
||||
+ "path : folder\n"
|
||||
+ "\n"
|
||||
+ "example:\n"
|
||||
+ " - success = xbmcvfs.rmdir(path)\n");
|
||||
+ // remove a directory
|
||||
+ PyObject* vfs_rmdir(File *self, PyObject *args, PyObject *kwds)
|
||||
+ {
|
||||
+ PyObject *f_line;
|
||||
+ if (!PyArg_ParseTuple(
|
||||
+ args,
|
||||
+ (char*)"O",
|
||||
+ &f_line))
|
||||
+ {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ CStdString strSource;
|
||||
+ if (!PyXBMCGetUnicodeString(strSource, f_line, 1)) return NULL;
|
||||
+
|
||||
+ bool bResult;
|
||||
+
|
||||
+ Py_BEGIN_ALLOW_THREADS
|
||||
+ bResult = CDirectory::Remove(strSource);
|
||||
+ Py_END_ALLOW_THREADS
|
||||
+
|
||||
+ return Py_BuildValue((char*)"b", bResult);
|
||||
+ }
|
||||
+
|
||||
+ // define c functions to be used in python here
|
||||
+ PyMethodDef xbmcvfsMethods[] = {
|
||||
+ {(char*)"copy", (PyCFunction)vfs_copy, METH_VARARGS, copy__doc__},
|
||||
+ {(char*)"delete", (PyCFunction)vfs_delete, METH_VARARGS, delete__doc__},
|
||||
+ {(char*)"rename", (PyCFunction)vfs_rename, METH_VARARGS, rename__doc__},
|
||||
+ {(char*)"mkdir", (PyCFunction)vfs_mkdir, METH_VARARGS, mkdir__doc__},
|
||||
+ {(char*)"rmdir", (PyCFunction)vfs_rmdir, METH_VARARGS, rmdir__doc__},
|
||||
+ {(char*)"exists", (PyCFunction)vfs_exists, METH_VARARGS, exists__doc__},
|
||||
+ {NULL, NULL, 0, NULL}
|
||||
+ };
|
||||
+
|
||||
+ /*****************************************************************
|
||||
+ * end of methods and python objects
|
||||
+ * initxbmc(void);
|
||||
+ *****************************************************************/
|
||||
+
|
||||
+
|
||||
+ PyMODINIT_FUNC
|
||||
+ DeinitVFSModule()
|
||||
+ {
|
||||
+ // no need to Py_DECREF our objects (see InitXBMCMVFSModule()) as they were created only
|
||||
+ // so that they could be added to the module, which steals a reference.
|
||||
+ }
|
||||
+
|
||||
+ PyMODINIT_FUNC
|
||||
+ InitVFSModule()
|
||||
+ {
|
||||
+ // init general xbmc modules
|
||||
+ PyObject* pXbmcvfsModule;
|
||||
+ pXbmcvfsModule = Py_InitModule((char*)"xbmcvfs", xbmcvfsMethods);
|
||||
+ if (pXbmcvfsModule == NULL) return;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/XBPython.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/XBPython.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/lib/libPython/XBPython.cpp 2011-03-08 02:49:15.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/XBPython.cpp 2011-09-06 22:59:02.955549037 +0200
|
||||
@@ -119,6 +119,8 @@
|
||||
void InitAddonModule(void);
|
||||
void InitAddonTypes(void);
|
||||
void DeinitAddonModule(void);
|
||||
+ void InitVFSModule(void);
|
||||
+ void DeinitVFSModule(void);
|
||||
}
|
||||
|
||||
XBPython::XBPython()
|
||||
@@ -297,7 +299,8 @@
|
||||
InitPluginModule(); // init xbmcplugin modules
|
||||
InitGUIModule(); // init xbmcgui modules
|
||||
InitAddonModule(); // init xbmcaddon modules
|
||||
-
|
||||
+ InitVFSModule(); // init xbmcvfs modules
|
||||
+
|
||||
// redirecting default output to debug console
|
||||
if (PyRun_SimpleString(""
|
||||
"import xbmc\n"
|
||||
@@ -325,6 +328,7 @@
|
||||
DeinitPluginModule();
|
||||
DeinitGUIModule();
|
||||
DeinitAddonModule();
|
||||
+ DeinitVFSModule();
|
||||
}
|
||||
|
||||
/**
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/utils/FileUtils.cpp xbmc-10.1-Dharma.patch/xbmc/utils/FileUtils.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/utils/FileUtils.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/utils/FileUtils.cpp 2011-09-06 22:59:02.977549326 +0200
|
||||
@@ -72,3 +72,32 @@
|
||||
}
|
||||
return false;
|
||||
}
|
||||
+
|
||||
+bool CFileUtils::SubtitleFileSizeAndHash(const CStdString &path, CStdString &strSize, CStdString &strHash)
|
||||
+{
|
||||
+ const size_t chksum_block_size = 8192;
|
||||
+
|
||||
+ CFile file;
|
||||
+ size_t i;
|
||||
+ uint64_t hash = 0;
|
||||
+ uint64_t buffer1[chksum_block_size*2];
|
||||
+ uint64_t fileSize ;
|
||||
+ // In natural language it calculates: size + 64k chksum of the first and last 64k
|
||||
+ // (even if they overlap because the file is smaller than 128k).
|
||||
+ file.Open(path, READ_NO_CACHE); //open file
|
||||
+ file.Read(buffer1, chksum_block_size*sizeof(uint64_t)); //read first 64k
|
||||
+ file.Seek(-(int64_t)chksum_block_size*sizeof(uint64_t), SEEK_END); //seek to the end of the file
|
||||
+ file.Read(&buffer1[chksum_block_size], chksum_block_size*sizeof(uint64_t)); //read last 64k
|
||||
+
|
||||
+ for (i=0;i<chksum_block_size*2;i++)
|
||||
+ hash += buffer1[i];
|
||||
+
|
||||
+ fileSize = file.GetLength();
|
||||
+
|
||||
+ hash += fileSize; //add size
|
||||
+
|
||||
+ file.Close(); //close file
|
||||
+ strHash.Format("%"PRIx64"", hash); //format hash
|
||||
+ strSize.Format("%d", fileSize); // format size
|
||||
+ return true;
|
||||
+}
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/utils/FileUtils.h xbmc-10.1-Dharma.patch/xbmc/utils/FileUtils.h
|
||||
--- xbmc-10.1-Dharma/xbmc/utils/FileUtils.h 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/utils/FileUtils.h 2011-09-06 22:59:03.023549930 +0200
|
||||
@@ -6,4 +6,5 @@
|
||||
public:
|
||||
static bool DeleteItem(const CFileItemPtr &item);
|
||||
static bool RenameFile(const CStdString &strFile);
|
||||
+ static bool SubtitleFileSizeAndHash(const CStdString &path, CStdString &strSize, CStdString &strHash);
|
||||
};
|
||||
@ -1,390 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma/language/English/strings.xml xbmc-10.1-Dharma.patch/language/English/strings.xml
|
||||
--- xbmc-10.1-Dharma/language/English/strings.xml 2011-03-08 02:49:12.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/language/English/strings.xml 2011-04-19 00:23:35.019973088 +0200
|
||||
@@ -2193,6 +2193,7 @@
|
||||
<string id="24015">Music video information</string>
|
||||
<string id="24016">Album information</string>
|
||||
<string id="24017">Artist information</string>
|
||||
+ <string id="24018">Services</string>
|
||||
|
||||
<string id="24020">Configure</string>
|
||||
<string id="24021">Disable</string>
|
||||
diff -Naur xbmc-10.1-Dharma/language/English/strings.xml.orig xbmc-10.1-Dharma.patch/language/English/strings.xml.orig
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/AddonDatabase.cpp xbmc-10.1-Dharma.patch/xbmc/AddonDatabase.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/AddonDatabase.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/AddonDatabase.cpp 2011-04-19 00:23:35.020973069 +0200
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "utils/log.h"
|
||||
#include "DateTime.h"
|
||||
#include "StringUtils.h"
|
||||
+#include "addons/Service.h"
|
||||
|
||||
using namespace ADDON;
|
||||
using namespace std;
|
||||
@@ -578,6 +579,16 @@
|
||||
m_pDS->close();
|
||||
sql = PrepareSQL("insert into disabled(id, addonID) values(NULL, '%s')", addonID.c_str());
|
||||
m_pDS->exec(sql);
|
||||
+
|
||||
+ AddonPtr addon;
|
||||
+ // If the addon is a service, stop it
|
||||
+ if (CAddonMgr::Get().GetAddon(addonID, addon, ADDON_SERVICE, false) && addon)
|
||||
+ {
|
||||
+ boost::shared_ptr<CService> service = boost::dynamic_pointer_cast<CService>(addon);
|
||||
+ if (service)
|
||||
+ service->Stop();
|
||||
+ }
|
||||
+
|
||||
return true;
|
||||
}
|
||||
return false; // already disabled or failed query
|
||||
@@ -586,6 +597,16 @@
|
||||
{
|
||||
CStdString sql = PrepareSQL("delete from disabled where addonID='%s'", addonID.c_str());
|
||||
m_pDS->exec(sql);
|
||||
+
|
||||
+ AddonPtr addon;
|
||||
+ // If the addon is a service, start it
|
||||
+ if (CAddonMgr::Get().GetAddon(addonID, addon, ADDON_SERVICE, false) && addon)
|
||||
+ {
|
||||
+ boost::shared_ptr<CService> service = boost::dynamic_pointer_cast<CService>(addon);
|
||||
+ if (service)
|
||||
+ service->Start();
|
||||
+ }
|
||||
+
|
||||
}
|
||||
return true;
|
||||
}
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/addons/Addon.cpp xbmc-10.1-Dharma.patch/xbmc/addons/Addon.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/addons/Addon.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/addons/Addon.cpp 2011-04-19 00:23:35.029972895 +0200
|
||||
@@ -153,7 +153,8 @@
|
||||
{"xbmc.addon.video", ADDON_VIDEO, 1037, "DefaultAddonVideo.png" },
|
||||
{"xbmc.addon.audio", ADDON_AUDIO, 1038, "DefaultAddonMusic.png" },
|
||||
{"xbmc.addon.image", ADDON_IMAGE, 1039, "DefaultAddonPicture.png" },
|
||||
- {"xbmc.addon.executable", ADDON_EXECUTABLE, 1043, "DefaultAddonProgram.png" }};
|
||||
+ {"xbmc.addon.executable", ADDON_EXECUTABLE, 1043, "DefaultAddonProgram.png" },
|
||||
+ {"xbmc.service", ADDON_SERVICE, 24018, "DefaultAddonService.png" }};
|
||||
|
||||
const CStdString TranslateType(const ADDON::TYPE &type, bool pretty/*=false*/)
|
||||
{
|
||||
@@ -367,6 +368,7 @@
|
||||
case ADDON_SCRIPT_WEATHER:
|
||||
case ADDON_SCRIPT_SUBTITLES:
|
||||
case ADDON_PLUGIN:
|
||||
+ case ADDON_SERVICE:
|
||||
ext = ADDON_PYTHON_EXT;
|
||||
break;
|
||||
default:
|
||||
@@ -396,6 +398,7 @@
|
||||
case ADDON_SCRAPER_TVSHOWS:
|
||||
case ADDON_SCRAPER_LIBRARY:
|
||||
case ADDON_PLUGIN:
|
||||
+ case ADDON_SERVICE:
|
||||
{
|
||||
CStdString temp = CAddonMgr::Get().GetExtValue(extension->configuration, "@library");
|
||||
m_strLibName = temp;
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/addons/AddonManager.cpp xbmc-10.1-Dharma.patch/xbmc/addons/AddonManager.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/addons/AddonManager.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/addons/AddonManager.cpp 2011-04-19 00:27:58.785878189 +0200
|
||||
@@ -48,6 +48,7 @@
|
||||
#include "PluginSource.h"
|
||||
#include "Repository.h"
|
||||
#include "Skin.h"
|
||||
+#include "Service.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
@@ -89,6 +90,8 @@
|
||||
case ADDON_SCRIPT_MODULE:
|
||||
case ADDON_WEB_INTERFACE:
|
||||
return AddonPtr(new CAddon(props));
|
||||
+ case ADDON_SERVICE:
|
||||
+ return AddonPtr(new CService(props));
|
||||
case ADDON_SCRAPER_ALBUMS:
|
||||
case ADDON_SCRAPER_ARTISTS:
|
||||
case ADDON_SCRAPER_MOVIES:
|
||||
@@ -481,6 +484,8 @@
|
||||
case ADDON_SCRIPT_MODULE:
|
||||
case ADDON_WEB_INTERFACE:
|
||||
return AddonPtr(new CAddon(addonProps));
|
||||
+ case ADDON_SERVICE:
|
||||
+ return AddonPtr(new CService(addonProps));
|
||||
case ADDON_SCRAPER_ALBUMS:
|
||||
case ADDON_SCRAPER_ARTISTS:
|
||||
case ADDON_SCRAPER_MOVIES:
|
||||
@@ -725,7 +730,42 @@
|
||||
m_cpluff->destroy_context(context);
|
||||
return addon != NULL;
|
||||
}
|
||||
-
|
||||
+
|
||||
+bool CAddonMgr::StartServices()
|
||||
+{
|
||||
+ CLog::Log(LOGDEBUG, "ADDON: Starting service addons.");
|
||||
+
|
||||
+ VECADDONS services;
|
||||
+ if (!GetAddons(ADDON_SERVICE, services))
|
||||
+ return false;
|
||||
+
|
||||
+ bool ret = true;
|
||||
+ for (IVECADDONS it = services.begin(); it != services.end(); ++it)
|
||||
+ {
|
||||
+ boost::shared_ptr<CService> service = boost::dynamic_pointer_cast<CService>(*it);
|
||||
+ if (service)
|
||||
+ ret &= service->Start();
|
||||
+ }
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+void CAddonMgr::StopServices()
|
||||
+{
|
||||
+ CLog::Log(LOGDEBUG, "ADDON: Stopping service addons.");
|
||||
+
|
||||
+ VECADDONS services;
|
||||
+ if (!GetAddons(ADDON_SERVICE, services))
|
||||
+ return;
|
||||
+
|
||||
+ for (IVECADDONS it = services.begin(); it != services.end(); ++it)
|
||||
+ {
|
||||
+ boost::shared_ptr<CService> service = boost::dynamic_pointer_cast<CService>(*it);
|
||||
+ if (service)
|
||||
+ service->Stop();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
int cp_to_clog(cp_log_severity_t lvl)
|
||||
{
|
||||
if (lvl >= CP_LOG_ERROR)
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/addons/AddonManager.h xbmc-10.1-Dharma.patch/xbmc/addons/AddonManager.h
|
||||
--- xbmc-10.1-Dharma/xbmc/addons/AddonManager.h 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/addons/AddonManager.h 2011-04-19 00:23:35.031972857 +0200
|
||||
@@ -154,6 +154,15 @@
|
||||
*/
|
||||
bool AddonsFromRepoXML(const TiXmlElement *root, VECADDONS &addons);
|
||||
ADDONDEPS GetDeps(const CStdString& id);
|
||||
+
|
||||
+ /*! \brief Start all services addons.
|
||||
+ \return True is all addons are started, false otherwise
|
||||
+ */
|
||||
+ bool StartServices();
|
||||
+ /*! \brief Stop all services addons.
|
||||
+ */
|
||||
+ void StopServices();
|
||||
+
|
||||
private:
|
||||
void LoadAddons(const CStdString &path,
|
||||
std::map<CStdString, AddonPtr>& unresolved);
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/addons/IAddon.h xbmc-10.1-Dharma.patch/xbmc/addons/IAddon.h
|
||||
--- xbmc-10.1-Dharma/xbmc/addons/IAddon.h 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/addons/IAddon.h 2011-04-19 00:23:35.032972838 +0200
|
||||
@@ -47,6 +47,7 @@
|
||||
ADDON_PLUGIN,
|
||||
ADDON_REPOSITORY,
|
||||
ADDON_WEB_INTERFACE,
|
||||
+ ADDON_SERVICE,
|
||||
ADDON_VIDEO, // virtual addon types
|
||||
ADDON_AUDIO,
|
||||
ADDON_IMAGE,
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/addons/Makefile xbmc-10.1-Dharma.patch/xbmc/addons/Makefile
|
||||
--- xbmc-10.1-Dharma/xbmc/addons/Makefile 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/addons/Makefile 2011-04-19 00:32:56.915120508 +0200
|
||||
@@ -6,6 +6,7 @@
|
||||
PluginSource.cpp \
|
||||
ScreenSaver.cpp \
|
||||
Scraper.cpp \
|
||||
+ Service.cpp \
|
||||
Skin.cpp \
|
||||
Visualisation.cpp \
|
||||
fft.cpp \
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/addons/Service.cpp xbmc-10.1-Dharma.patch/xbmc/addons/Service.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/addons/Service.cpp 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/addons/Service.cpp 2011-04-19 00:23:35.033972819 +0200
|
||||
@@ -0,0 +1,109 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2005-2009 Team XBMC
|
||||
+ * http://www.xbmc.org
|
||||
+ *
|
||||
+ * 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 XBMC; 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
|
||||
+ *
|
||||
+ */
|
||||
+#include "Service.h"
|
||||
+#include "AddonManager.h"
|
||||
+#include "log.h"
|
||||
+#ifdef HAS_PYTHON
|
||||
+#include "lib/libPython/XBPython.h"
|
||||
+#endif
|
||||
+
|
||||
+using namespace std;
|
||||
+
|
||||
+namespace ADDON
|
||||
+{
|
||||
+
|
||||
+CService::CService(const cp_extension_t *ext)
|
||||
+ : CAddon(ext), m_type(UNKNOWN)
|
||||
+{
|
||||
+ BuildServiceType();
|
||||
+}
|
||||
+
|
||||
+
|
||||
+CService::CService(const AddonProps &props)
|
||||
+ : CAddon(props), m_type(UNKNOWN)
|
||||
+{
|
||||
+ BuildServiceType();
|
||||
+}
|
||||
+
|
||||
+bool CService::Start()
|
||||
+{
|
||||
+ bool ret = true;
|
||||
+ switch (m_type)
|
||||
+ {
|
||||
+#ifdef HAS_PYTHON
|
||||
+ case PYTHON:
|
||||
+ ret = (g_pythonParser.evalFile(LibPath()) != -1);
|
||||
+ break;
|
||||
+#endif
|
||||
+
|
||||
+ case UNKNOWN:
|
||||
+ default:
|
||||
+ ret = false;
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+bool CService::Stop()
|
||||
+{
|
||||
+ bool ret = true;
|
||||
+
|
||||
+ switch (m_type)
|
||||
+ {
|
||||
+#ifdef HAS_PYTHON
|
||||
+ case PYTHON:
|
||||
+ ret = g_pythonParser.StopScript(LibPath());
|
||||
+ break;
|
||||
+#endif
|
||||
+
|
||||
+ case UNKNOWN:
|
||||
+ default:
|
||||
+ ret = false;
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+void CService::BuildServiceType()
|
||||
+{
|
||||
+ CStdString str = LibPath();
|
||||
+ CStdString ext;
|
||||
+
|
||||
+ size_t p = str.find_last_of('.');
|
||||
+ if (p != string::npos)
|
||||
+ ext = str.substr(p + 1);
|
||||
+
|
||||
+#ifdef HAS_PYTHON
|
||||
+ CStdString pythonExt = ADDON_PYTHON_EXT;
|
||||
+ pythonExt.erase(0, 2);
|
||||
+ if ( ext.Equals(pythonExt) )
|
||||
+ m_type = PYTHON;
|
||||
+ else
|
||||
+#endif
|
||||
+ {
|
||||
+ m_type = UNKNOWN;
|
||||
+ CLog::Log(LOGERROR, "ADDON: extension '%s' is not currently supported for service addon", ext.c_str());
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+}
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/addons/Service.h xbmc-10.1-Dharma.patch/xbmc/addons/Service.h
|
||||
--- xbmc-10.1-Dharma/xbmc/addons/Service.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/addons/Service.h 2011-04-19 00:23:35.033972819 +0200
|
||||
@@ -0,0 +1,50 @@
|
||||
+#pragma once
|
||||
+/*
|
||||
+ * Copyright (C) 2005-2009 Team XBMC
|
||||
+ * http://www.xbmc.org
|
||||
+ *
|
||||
+ * 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 XBMC; 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
|
||||
+ *
|
||||
+ */
|
||||
+#include "Addon.h"
|
||||
+
|
||||
+namespace ADDON
|
||||
+{
|
||||
+
|
||||
+ class CService: public CAddon
|
||||
+ {
|
||||
+ public:
|
||||
+
|
||||
+ enum TYPE
|
||||
+ {
|
||||
+ UNKNOWN,
|
||||
+ PYTHON
|
||||
+ };
|
||||
+
|
||||
+ CService(const cp_extension_t *ext);
|
||||
+ CService(const AddonProps &props);
|
||||
+
|
||||
+ bool Start();
|
||||
+ bool Stop();
|
||||
+ TYPE GetServiceType() { return m_type; }
|
||||
+
|
||||
+ protected:
|
||||
+ void BuildServiceType();
|
||||
+
|
||||
+ private:
|
||||
+ TYPE m_type;
|
||||
+ };
|
||||
+}
|
||||
\ Kein Zeilenumbruch am Dateiende.
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/Application.cpp xbmc-10.1-Dharma.patch/xbmc/Application.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/Application.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/Application.cpp 2011-04-19 00:23:35.028972914 +0200
|
||||
@@ -1163,6 +1163,8 @@
|
||||
CCrystalHD::GetInstance();
|
||||
#endif
|
||||
|
||||
+ CAddonMgr::Get().StartServices();
|
||||
+
|
||||
CLog::Log(LOGNOTICE, "initialize done");
|
||||
|
||||
m_bInitializing = false;
|
||||
@@ -3360,6 +3362,9 @@
|
||||
|
||||
g_mediaManager.Stop();
|
||||
|
||||
+ // Stop services before unloading Python
|
||||
+ CAddonMgr::Get().StopServices();
|
||||
+
|
||||
/* Python resource freeing must be done after skin has been unloaded, not before
|
||||
some windows still need it when deinitializing during skin unloading. */
|
||||
#ifdef HAS_PYTHON
|
||||
@ -1,82 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/cores/dvdplayer/DVDOverlayRenderer.h xbmc-10.1-Dharma.patch/xbmc/cores/dvdplayer/DVDOverlayRenderer.h
|
||||
--- xbmc-10.1-Dharma/xbmc/cores/dvdplayer/DVDOverlayRenderer.h 2011-03-08 02:49:16.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/cores/dvdplayer/DVDOverlayRenderer.h 2011-09-15 13:26:00.674107708 +0200
|
||||
@@ -72,6 +72,9 @@
|
||||
|
||||
static void Render(DVDVideoPicture* pPicture, CDVDOverlay* pOverlay, double pts)
|
||||
{
|
||||
+ if(pPicture->format != DVDVideoPicture::FMT_YUV420P)
|
||||
+ return;
|
||||
+
|
||||
DVDPictureRenderer p;
|
||||
|
||||
p.data[0] = pPicture->data[0];
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp xbmc-10.1-Dharma.patch/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2011-03-08 02:49:17.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2011-09-15 13:31:23.725399996 +0200
|
||||
@@ -793,33 +793,22 @@
|
||||
enum EOverlay
|
||||
{ OVERLAY_AUTO // select mode auto
|
||||
, OVERLAY_GPU // render osd using gpu
|
||||
- , OVERLAY_VID // render osd directly on video memory
|
||||
, OVERLAY_BUF // render osd on buffer
|
||||
} render = OVERLAY_AUTO;
|
||||
|
||||
- if(render == OVERLAY_AUTO)
|
||||
+ if(pSource->format == DVDVideoPicture::FMT_YUV420P)
|
||||
{
|
||||
- render = OVERLAY_GPU;
|
||||
-
|
||||
#ifdef _LINUX
|
||||
// for now use cpu for ssa overlays as it currently allocates and
|
||||
// frees textures for each frame this causes a hugh memory leak
|
||||
// on some mesa intel drivers
|
||||
- if(m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SSA) && pSource->format == DVDVideoPicture::FMT_YUV420P)
|
||||
- render = OVERLAY_VID;
|
||||
-#endif
|
||||
|
||||
- if(render == OVERLAY_VID)
|
||||
- {
|
||||
- if( m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SPU)
|
||||
- || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_IMAGE)
|
||||
- || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SSA) )
|
||||
- render = OVERLAY_BUF;
|
||||
- }
|
||||
- }
|
||||
+ if(m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SPU)
|
||||
+ || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_IMAGE)
|
||||
+ || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SSA) )
|
||||
+ render = OVERLAY_BUF;
|
||||
+#endif
|
||||
|
||||
- if(pSource->format == DVDVideoPicture::FMT_YUV420P)
|
||||
- {
|
||||
if(render == OVERLAY_BUF)
|
||||
{
|
||||
// rendering spu overlay types directly on video memory costs a lot of processing power.
|
||||
@@ -848,6 +837,9 @@
|
||||
}
|
||||
}
|
||||
|
||||
+ if(render == OVERLAY_AUTO)
|
||||
+ render = OVERLAY_GPU;
|
||||
+
|
||||
m_pOverlayContainer->Lock();
|
||||
|
||||
VecOverlays* pVecOverlays = m_pOverlayContainer->GetOverlays();
|
||||
@@ -871,13 +863,8 @@
|
||||
if (render == OVERLAY_GPU)
|
||||
g_renderManager.AddOverlay(pOverlay, pts2);
|
||||
|
||||
- if(pSource->format == DVDVideoPicture::FMT_YUV420P)
|
||||
- {
|
||||
- if (render == OVERLAY_BUF)
|
||||
- CDVDOverlayRenderer::Render(m_pTempOverlayPicture, pOverlay, pts2);
|
||||
- else if(render == OVERLAY_VID)
|
||||
- CDVDOverlayRenderer::Render(pDest, pOverlay, pts2);
|
||||
- }
|
||||
+ if (render == OVERLAY_BUF)
|
||||
+ CDVDOverlayRenderer::Render(m_pTempOverlayPicture, pOverlay, pts2);
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,108 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp xbmc-10.1-Dharma.patch/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2011-09-15 13:59:35.016784668 +0200
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2011-09-15 13:58:46.193138096 +0200
|
||||
@@ -20,6 +20,7 @@
|
||||
*/
|
||||
|
||||
#include "system.h"
|
||||
+#include "WindowingFactory.h"
|
||||
#include "AdvancedSettings.h"
|
||||
#include "GUISettings.h"
|
||||
#include "Settings.h"
|
||||
@@ -798,16 +799,17 @@
|
||||
|
||||
if(pSource->format == DVDVideoPicture::FMT_YUV420P)
|
||||
{
|
||||
-#ifdef _LINUX
|
||||
- // for now use cpu for ssa overlays as it currently allocates and
|
||||
- // frees textures for each frame this causes a hugh memory leak
|
||||
- // on some mesa intel drivers
|
||||
-
|
||||
- if(m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SPU)
|
||||
- || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_IMAGE)
|
||||
- || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SSA) )
|
||||
- render = OVERLAY_BUF;
|
||||
-#endif
|
||||
+ if(g_Windowing.GetRenderQuirks() & RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER)
|
||||
+ {
|
||||
+ // for now use cpu for ssa overlays as it currently allocates and
|
||||
+ // frees textures for each frame this causes a hugh memory leak
|
||||
+ // on some mesa intel drivers
|
||||
+
|
||||
+ if(m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SPU)
|
||||
+ || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_IMAGE)
|
||||
+ || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SSA) )
|
||||
+ render = OVERLAY_BUF;
|
||||
+ }
|
||||
|
||||
if(render == OVERLAY_BUF)
|
||||
{
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/RenderSystem.cpp xbmc-10.1-Dharma.patch/xbmc/RenderSystem.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/RenderSystem.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/RenderSystem.cpp 2011-09-15 13:56:10.592078024 +0200
|
||||
@@ -29,6 +29,7 @@
|
||||
m_RenderVersionMajor = 0;
|
||||
m_RenderVersionMinor = 0;
|
||||
m_renderCaps = 0;
|
||||
+ m_renderQuirks = 0;
|
||||
m_minDXTPitch = 0;
|
||||
}
|
||||
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/RenderSystemGL.cpp xbmc-10.1-Dharma.patch/xbmc/RenderSystemGL.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/RenderSystemGL.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/RenderSystemGL.cpp 2011-09-15 13:56:40.948479861 +0200
|
||||
@@ -65,8 +65,22 @@
|
||||
}
|
||||
}
|
||||
#endif
|
||||
- if (m_RenderVendor.Equals("Tungsten Graphics, Inc."))
|
||||
+ if (m_RenderVendor.Equals("Tungsten Graphics, Inc.")
|
||||
+ || m_RenderVendor.Equals("Tungsten Graphics, Inc"))
|
||||
{
|
||||
+ unsigned major, minor, micro;
|
||||
+ if(sscanf(m_RenderVersion.c_str(), "%*s Mesa %u.%u.%u", &major, &minor, µ) == 3)
|
||||
+ {
|
||||
+
|
||||
+ if((major < 7)
|
||||
+ || (major == 7 && minor < 7)
|
||||
+ || (major == 7 && minor == 7 && micro < 1))
|
||||
+ m_renderQuirks |= RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER;
|
||||
+
|
||||
+ }
|
||||
+ else
|
||||
+ CLog::Log(LOGNOTICE, "CRenderSystemGL::CheckOpenGLQuirks - unable to parse mesa version string");
|
||||
+
|
||||
if(m_RenderRenderer.Find("Poulsbo") >= 0)
|
||||
m_renderCaps &= ~RENDER_CAPS_DXT_NPOT;
|
||||
}
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/RenderSystem.h xbmc-10.1-Dharma.patch/xbmc/RenderSystem.h
|
||||
--- xbmc-10.1-Dharma/xbmc/RenderSystem.h 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/RenderSystem.h 2011-09-15 13:56:23.653250913 +0200
|
||||
@@ -52,6 +52,11 @@
|
||||
RENDER_CAPS_DXT_NPOT = (1 << 2)
|
||||
};
|
||||
|
||||
+enum
|
||||
+{
|
||||
+ RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER = 1 << 0,
|
||||
+};
|
||||
+
|
||||
class CRenderSystemBase
|
||||
{
|
||||
public:
|
||||
@@ -94,6 +99,7 @@
|
||||
bool SupportsNPOT(bool dxt) const;
|
||||
unsigned int GetMaxTextureSize() const { return m_maxTextureSize; }
|
||||
unsigned int GetMinDXTPitch() const { return m_minDXTPitch; }
|
||||
+ unsigned int GetRenderQuirks() const { return m_renderQuirks; }
|
||||
|
||||
protected:
|
||||
bool m_bRenderCreated;
|
||||
@@ -108,6 +114,7 @@
|
||||
int m_RenderVersionMinor;
|
||||
int m_RenderVersionMajor;
|
||||
unsigned int m_renderCaps;
|
||||
+ unsigned int m_renderQuirks;
|
||||
};
|
||||
|
||||
#endif // RENDER_SYSTEM_H
|
||||
@ -1,89 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma.patch1/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-10.1-Dharma.patch2/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
|
||||
--- xbmc-10.1-Dharma.patch1/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-08-22 05:07:59.915149830 +0200
|
||||
+++ xbmc-10.1-Dharma.patch2/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-08-22 05:19:43.825427880 +0200
|
||||
@@ -39,6 +39,7 @@
|
||||
#include "utils/fastmemcpy.h"
|
||||
#include "Codecs/DllSwScale.h"
|
||||
#include "utils/TimeUtils.h"
|
||||
+#include "xbmc/WindowingFactory.h"
|
||||
|
||||
namespace BCM
|
||||
{
|
||||
@@ -233,6 +234,7 @@
|
||||
int m_width;
|
||||
int m_height;
|
||||
uint64_t m_timestamp;
|
||||
+ bool m_output_YV12;
|
||||
uint64_t m_PictureNumber;
|
||||
uint8_t m_color_space;
|
||||
unsigned int m_color_range;
|
||||
@@ -335,6 +337,12 @@
|
||||
m_sw_scale_ctx = NULL;
|
||||
m_dllSwScale = new DllSwScale;
|
||||
m_dllSwScale->Load();
|
||||
+
|
||||
+
|
||||
+ if (g_Windowing.GetRenderQuirks() & RENDER_QUIRKS_YV12_PREFERED)
|
||||
+ m_output_YV12 = true;
|
||||
+ else
|
||||
+ m_output_YV12 = false;
|
||||
}
|
||||
|
||||
CMPCOutputThread::~CMPCOutputThread()
|
||||
@@ -773,15 +781,20 @@
|
||||
if (!pBuffer)
|
||||
{
|
||||
// No free pre-allocated buffers so make one
|
||||
-#ifdef _WIN32
|
||||
- // force Windows to use YV12 until DX renderer gets NV12 or YUY2 capability.
|
||||
- pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height);
|
||||
-#else
|
||||
- if (m_color_space == BCM::MODE422_YUY2)
|
||||
- pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUY2, m_width, m_height);
|
||||
+ if (m_output_YV12)
|
||||
+ {
|
||||
+ // output YV12, nouveau driver has slow NV12, YUY2 capability.
|
||||
+ pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height);
|
||||
+ }
|
||||
+
|
||||
else
|
||||
- pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_NV12, m_width, m_height);
|
||||
-#endif
|
||||
+ {
|
||||
+ if (m_color_space == BCM::MODE422_YUY2)
|
||||
+ pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUY2, m_width, m_height);
|
||||
+ else
|
||||
+ pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_NV12, m_width, m_height);
|
||||
+ }
|
||||
+
|
||||
CLog::Log(LOGDEBUG, "%s: Added a new Buffer, ReadyListCount: %d", __MODULE_NAME__, m_ReadyList.Count());
|
||||
while (!m_bStop && m_ReadyList.Count() > 10)
|
||||
Sleep(1);
|
||||
diff -Naur xbmc-10.1-Dharma.patch1/xbmc/RenderSystemGL.cpp xbmc-10.1-Dharma.patch2/xbmc/RenderSystemGL.cpp
|
||||
--- xbmc-10.1-Dharma.patch1/xbmc/RenderSystemGL.cpp 2011-08-22 05:10:58.079496562 +0200
|
||||
+++ xbmc-10.1-Dharma.patch2/xbmc/RenderSystemGL.cpp 2011-08-22 05:20:56.265383606 +0200
|
||||
@@ -65,6 +65,9 @@
|
||||
}
|
||||
}
|
||||
#endif
|
||||
+ if (m_RenderVendor.ToLower() == "nouveau")
|
||||
+ m_renderQuirks |= RENDER_QUIRKS_YV12_PREFERED;
|
||||
+
|
||||
if (m_RenderVendor.Equals("Tungsten Graphics, Inc.")
|
||||
|| m_RenderVendor.Equals("Tungsten Graphics, Inc"))
|
||||
{
|
||||
diff -Naur xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.h xbmc-10.1-Dharma.patch2/xbmc/RenderSystem.h
|
||||
--- xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.h 2011-08-22 05:10:38.495238548 +0200
|
||||
+++ xbmc-10.1-Dharma.patch2/xbmc/RenderSystem.h 2011-08-22 05:19:43.847428169 +0200
|
||||
@@ -57,6 +57,11 @@
|
||||
RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER = 1 << 0,
|
||||
};
|
||||
|
||||
+enum
|
||||
+{
|
||||
+ RENDER_QUIRKS_YV12_PREFERED = 1 << 1,
|
||||
+};
|
||||
+
|
||||
class CRenderSystemBase
|
||||
{
|
||||
public:
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/FileSystem/FileSmb.cpp xbmc-10.1-Dharma.patch/xbmc/FileSystem/FileSmb.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/FileSystem/FileSmb.cpp 2011-09-05 02:24:35.154994777 +0200
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/FileSystem/FileSmb.cpp 2011-09-05 02:22:55.604582159 +0200
|
||||
@@ -122,6 +122,8 @@
|
||||
// use the weaker LANMAN password hash in order to be compatible with older servers
|
||||
fprintf(f, "\tclient lanman auth = yes\n");
|
||||
fprintf(f, "\tlanman auth = yes\n");
|
||||
+ fprintf(f, "\tsocket options = TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=65536 SO_SNDBUF=65536\n");
|
||||
+ fprintf(f, "\tlock directory = %s/.smb/\n", getenv("HOME"));
|
||||
|
||||
// set wins server if there's one. name resolve order defaults to 'lmhosts host wins bcast'.
|
||||
// if no WINS server has been specified the wins method will be ignored.
|
||||
@ -1,97 +0,0 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 13:30:17.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 13:57:02.105903186 +0100
|
||||
@@ -65,6 +65,8 @@
|
||||
xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
|
||||
goom_enabled="== GOOM enabled. =="
|
||||
goom_disabled="== GOOM disabled. =="
|
||||
+xbmcprojectm_enabled="== XBMCProjectM enabled. =="
|
||||
+xbmxprojectm_disabled="== XBMCProjectM disabled. =="
|
||||
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
|
||||
pulse_disabled="== PulseAudio support manually disabled. =="
|
||||
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
|
||||
@@ -204,6 +206,12 @@
|
||||
[use_goom=$enableval],
|
||||
[use_goom=no])
|
||||
|
||||
+AC_ARG_ENABLE([xbmcprojectm],
|
||||
+ [AS_HELP_STRING([--enable-xbmcprojectm],
|
||||
+ [enable XBMCProjectM visualisation (default is yes)])],
|
||||
+ [use_xbmcprojectm=$enableval],
|
||||
+ [use_xbmcprojectm=yes])
|
||||
+
|
||||
AC_ARG_ENABLE([ccache],
|
||||
[AS_HELP_STRING([--enable-ccache],
|
||||
[enable building with ccache feature (default is auto)])],
|
||||
@@ -832,6 +840,15 @@
|
||||
AC_MSG_NOTICE($librtmp_disabled)
|
||||
fi
|
||||
|
||||
+# XBMCPROJECTM
|
||||
+if test "$use_xbmcprojectm" = "yes"; then
|
||||
+ AC_MSG_NOTICE($xbmcprojectm_enabled)
|
||||
+ BUILD_XBMCPROJECTM=0
|
||||
+else
|
||||
+ AC_MSG_NOTICE($xbmcprojectm_disabled)
|
||||
+ BUILD_XBMCPROJECTM=1
|
||||
+fi
|
||||
+
|
||||
### External libraries checks
|
||||
# External FFmpeg
|
||||
if test "$use_external_ffmpeg" = "yes"; then
|
||||
@@ -1210,6 +1227,12 @@
|
||||
final_message="$final_message\n Bluray:\tNo"
|
||||
fi
|
||||
|
||||
+if test "$use_xbmcprojectm" = "yes"; then
|
||||
+ final_message="$final_message\n XBMCProjectM:\tYes"
|
||||
+else
|
||||
+ final_message="$final_message\n XBMCProjectM:\tNo"
|
||||
+fi
|
||||
+
|
||||
if test "$use_mid" = "yes"; then
|
||||
final_message="$final_message\n MID Support:\tYes"
|
||||
SDL_DEFINES="$SDL_DEFINES -DMID"
|
||||
@@ -1474,6 +1497,7 @@
|
||||
AC_SUBST(SDL_DEFINES)
|
||||
AC_SUBST(BUILD_DVDCSS)
|
||||
AC_SUBST(BUILD_GOOM)
|
||||
+AC_SUBST(BUILD_XBMCPROJECTM)
|
||||
AC_SUBST(USE_EXTERNAL_FFMPEG)
|
||||
AC_SUBST(USE_EXTERNAL_LIBA52)
|
||||
AC_SUBST(USE_INTERNAL_LIBA52)
|
||||
@@ -1870,7 +1894,7 @@
|
||||
-DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
|
||||
set +x
|
||||
fi
|
||||
-], [0])
|
||||
+], [$BUILD_XBMCPROJECTM])
|
||||
|
||||
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
|
||||
if test "$host_vendor" != "apple" ; then
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/Makefile.in xbmc-Dharma-10.1-c8405db.patch/Makefile.in
|
||||
--- xbmc-Dharma-10.1-c8405db/Makefile.in 2011-02-15 13:56:41.203329597 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/Makefile.in 2011-02-15 13:57:02.107903144 +0100
|
||||
@@ -109,8 +109,10 @@
|
||||
|
||||
VIS_DIRS=\
|
||||
xbmc/visualizations/OpenGLSpectrum \
|
||||
- xbmc/visualizations/WaveForm \
|
||||
- xbmc/visualizations/XBMCProjectM
|
||||
+ xbmc/visualizations/WaveForm
|
||||
+ifneq (@BUILD_XBMCPROJECTM@,1)
|
||||
+VIS_DIRS+=xbmc/visualizations/XBMCProjectM
|
||||
+endif
|
||||
ifeq ($(findstring osx,$(ARCH)), osx)
|
||||
VIS_DIRS+=xbmc/visualizations/iTunes
|
||||
endif
|
||||
@@ -308,7 +310,9 @@
|
||||
ifneq (arm, $(ARCH))
|
||||
$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
|
||||
$(MAKE) -C xbmc/visualizations/WaveForm
|
||||
+ifneq (@BUILD_XBMCPROJECTM@,1)
|
||||
$(MAKE) -C xbmc/visualizations/XBMCProjectM
|
||||
+endif
|
||||
ifeq ($(findstring osx,$(ARCH)), osx)
|
||||
$(MAKE) -C xbmc/visualizations/iTunes
|
||||
endif
|
||||
@ -1,98 +0,0 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 13:58:10.630505451 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 13:59:48.190515901 +0100
|
||||
@@ -67,6 +67,8 @@
|
||||
goom_disabled="== GOOM disabled. =="
|
||||
xbmcprojectm_enabled="== XBMCProjectM enabled. =="
|
||||
xbmxprojectm_disabled="== XBMCProjectM disabled. =="
|
||||
+rsxs_enabled="== RSXS enabled. =="
|
||||
+rsxs_disabled="== RSXS disabled. =="
|
||||
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
|
||||
pulse_disabled="== PulseAudio support manually disabled. =="
|
||||
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
|
||||
@@ -212,6 +214,12 @@
|
||||
[use_xbmcprojectm=$enableval],
|
||||
[use_xbmcprojectm=yes])
|
||||
|
||||
+AC_ARG_ENABLE([rsxs],
|
||||
+ [AS_HELP_STRING([--enable-rsxs],
|
||||
+ [enable RSXS Screensaver (default is yes)])],
|
||||
+ [use_rsxs=$enableval],
|
||||
+ [use_rsxs=yes])
|
||||
+
|
||||
AC_ARG_ENABLE([ccache],
|
||||
[AS_HELP_STRING([--enable-ccache],
|
||||
[enable building with ccache feature (default is auto)])],
|
||||
@@ -849,6 +857,15 @@
|
||||
BUILD_XBMCPROJECTM=1
|
||||
fi
|
||||
|
||||
+# RSXS
|
||||
+if test "$use_rsxs" = "yes"; then
|
||||
+ AC_MSG_NOTICE($rsxs_enabled)
|
||||
+ BUILD_RSXS=0
|
||||
+else
|
||||
+ AC_MSG_NOTICE($rsxs_disabled)
|
||||
+ BUILD_RSXS=1
|
||||
+fi
|
||||
+
|
||||
### External libraries checks
|
||||
# External FFmpeg
|
||||
if test "$use_external_ffmpeg" = "yes"; then
|
||||
@@ -1233,6 +1250,12 @@
|
||||
final_message="$final_message\n XBMCProjectM:\tNo"
|
||||
fi
|
||||
|
||||
+if test "$use_rsxs" = "yes"; then
|
||||
+ final_message="$final_message\n RSXS:\t\tYes"
|
||||
+else
|
||||
+ final_message="$final_message\n RSXS:\t\tNo"
|
||||
+fi
|
||||
+
|
||||
if test "$use_mid" = "yes"; then
|
||||
final_message="$final_message\n MID Support:\tYes"
|
||||
SDL_DEFINES="$SDL_DEFINES -DMID"
|
||||
@@ -1498,6 +1521,7 @@
|
||||
AC_SUBST(BUILD_DVDCSS)
|
||||
AC_SUBST(BUILD_GOOM)
|
||||
AC_SUBST(BUILD_XBMCPROJECTM)
|
||||
+AC_SUBST(BUILD_RSXS)
|
||||
AC_SUBST(USE_EXTERNAL_FFMPEG)
|
||||
AC_SUBST(USE_EXTERNAL_LIBA52)
|
||||
AC_SUBST(USE_INTERNAL_LIBA52)
|
||||
@@ -1952,7 +1976,7 @@
|
||||
--disable-skyrocket
|
||||
fi
|
||||
fi
|
||||
-], [0])
|
||||
+], [$BUILD_RSXS])
|
||||
|
||||
XB_CONFIG_MODULE([xbmc/lib/libapetag], [
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/Makefile.in xbmc-Dharma-10.1-c8405db.patch/Makefile.in
|
||||
--- xbmc-Dharma-10.1-c8405db/Makefile.in 2011-02-15 13:58:10.631505430 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/Makefile.in 2011-02-15 13:59:48.191515880 +0100
|
||||
@@ -104,8 +104,10 @@
|
||||
LIB_DIRS+=lib/libmicrohttpd
|
||||
endif
|
||||
|
||||
-SS_DIRS=\
|
||||
- xbmc/screensavers/rsxs-0.9/xbmc
|
||||
+SS_DIRS=
|
||||
+ifneq (@BUILD_RSXS@,1)
|
||||
+SS_DIRS=+xbmc/screensavers/rsxs-0.9/xbmc
|
||||
+endif
|
||||
|
||||
VIS_DIRS=\
|
||||
xbmc/visualizations/OpenGLSpectrum \
|
||||
@@ -324,8 +326,10 @@
|
||||
endif
|
||||
screensavers: exports
|
||||
ifneq (arm, $(ARCH))
|
||||
+ifneq (@BUILD_RSXS@,1)
|
||||
$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
|
||||
endif
|
||||
+endif
|
||||
libpython: dllloader
|
||||
$(MAKE) -C xbmc/lib/libPython
|
||||
$(MAKE) -C xbmc/lib/libPython/xbmcmodule
|
||||
@ -1,147 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma/configure.in xbmc-10.1-Dharma.patch/configure.in
|
||||
--- xbmc-10.1-Dharma/configure.in 2011-09-14 15:17:03.499574627 +0200
|
||||
+++ xbmc-10.1-Dharma.patch/configure.in 2011-09-14 15:20:45.627527971 +0200
|
||||
@@ -92,6 +92,8 @@
|
||||
openmax_not_found="== Could not find libnvomx. OpenMax support disabled. =="
|
||||
libass_using_internal="== External Libass not found, using internal. =="
|
||||
ssh_not_found="== Could not find libssh. SSH FTP VFS support disabled. =="
|
||||
+samba_not_found="== Could not find libsmbclient. SAMBA support disabled. =="
|
||||
+samba_disabled="== SAMBA support disabled. =="
|
||||
librtmp_not_found="== Could not find libRTMP. RTMP support disabled. =="
|
||||
librtmp_disabled="== RTMP support disabled. =="
|
||||
|
||||
@@ -274,6 +276,12 @@
|
||||
[use_avahi=$enableval],
|
||||
[use_avahi=yes])
|
||||
|
||||
+AC_ARG_ENABLE([samba],
|
||||
+ [AS_HELP_STRING([--disable-samba],
|
||||
+ [disable SAMBA support (default is enabled if libsmbclient is found)])],
|
||||
+ [use_samba=$enableval],
|
||||
+ [use_samba=yes])
|
||||
+
|
||||
AC_ARG_ENABLE([non-free],
|
||||
[AS_HELP_STRING([--disable-non-free],
|
||||
[disable componentents with non-compliant licenses])],
|
||||
@@ -625,7 +633,6 @@
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
AC_CHECK_LIB([iconv], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
|
||||
- AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))
|
||||
PKG_CHECK_MODULES([VORBISFILE], [vorbisfile],
|
||||
[INCLUDES="$INCLUDES $VORBISFILE_CFLAGS"; LIBS="$LIBS $VORBISFILE_LIBS"],
|
||||
AC_MSG_ERROR($missing_library))
|
||||
@@ -643,7 +650,6 @@
|
||||
AC_CHECK_LIB([mysqlclient],[main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([faad], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library))
|
||||
- AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([SDL_mixer], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([dl], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([resolv], [main],, AC_MSG_ERROR($missing_library))
|
||||
@@ -786,6 +792,18 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
+# samba
|
||||
+if test "$use_samba" = "yes"; then
|
||||
+ AC_CHECK_LIB([smbclient], [main],,
|
||||
+ use_samba=no;AC_MSG_RESULT($samba_not_found))
|
||||
+else
|
||||
+ AC_MSG_RESULT($samba_disabled)
|
||||
+fi
|
||||
+
|
||||
+if test "$use_samba" = "yes"; then
|
||||
+ AC_DEFINE([HAVE_LIBSMBCLIENT], [1], [Define to 1 if you have Samba installed])
|
||||
+fi
|
||||
+
|
||||
# XRandR
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
use_xrandr="no"
|
||||
@@ -1312,6 +1330,12 @@
|
||||
final_message="$final_message\n Avahi:\tNo"
|
||||
fi
|
||||
|
||||
+if test "$use_samba" = "yes"; then
|
||||
+ final_message="$final_message\n Samba:\tYes"
|
||||
+else
|
||||
+ final_message="$final_message\n Samba:\tNo"
|
||||
+fi
|
||||
+
|
||||
if test "$host_vendor" = "apple"; then
|
||||
echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h
|
||||
else
|
||||
diff -Naur xbmc-10.1-Dharma/guilib/system.h xbmc-10.1-Dharma.patch/guilib/system.h
|
||||
--- xbmc-10.1-Dharma/guilib/system.h 2011-03-08 02:49:13.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/guilib/system.h 2011-09-14 15:19:35.257592410 +0200
|
||||
@@ -58,7 +58,6 @@
|
||||
#endif
|
||||
|
||||
#define HAS_FILESYSTEM
|
||||
-#define HAS_FILESYSTEM_SMB
|
||||
#define HAS_FILESYSTEM_CDDA
|
||||
#define HAS_FILESYSTEM_RTV
|
||||
#define HAS_FILESYSTEM_DAAP
|
||||
@@ -67,6 +66,10 @@
|
||||
#define HAS_FILESYSTEM_HTSP
|
||||
#define HAS_FILESYSTEM_MMS
|
||||
|
||||
+#ifdef HAVE_LIBSMBCLIENT
|
||||
+#define HAS_FILESYSTEM_SMB
|
||||
+#endif
|
||||
+
|
||||
/**********************
|
||||
* Non-free Components
|
||||
**********************/
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/GUIDialogMediaSource.cpp xbmc-10.1-Dharma.patch/xbmc/GUIDialogMediaSource.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/GUIDialogMediaSource.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/GUIDialogMediaSource.cpp 2011-09-14 17:13:07.080677066 +0200
|
||||
@@ -240,9 +240,11 @@
|
||||
share1.m_ignore = true;
|
||||
extraShares.push_back(share1);
|
||||
|
||||
+#ifdef HAS_FILESYSTEM_SMB
|
||||
share1.strPath = "smb://";
|
||||
share1.strName = g_localizeStrings.Get(20171);
|
||||
extraShares.push_back(share1);
|
||||
+#endif
|
||||
|
||||
share1.strPath = "upnp://";
|
||||
share1.strName = "UPnP Devices";
|
||||
@@ -282,9 +284,11 @@
|
||||
share1.strName = "ReplayTV Devices";
|
||||
extraShares.push_back(share1);
|
||||
|
||||
+#ifdef HAS_FILESYSTEM_SMB
|
||||
share1.strPath = "smb://";
|
||||
share1.strName = g_localizeStrings.Get(20171);
|
||||
extraShares.push_back(share1);
|
||||
+#endif
|
||||
|
||||
share1.strPath = "hdhomerun://";
|
||||
share1.strName = "HDHomerun Devices";
|
||||
@@ -313,9 +317,11 @@
|
||||
extraShares.push_back(share1);
|
||||
}
|
||||
|
||||
+#ifdef HAS_FILESYSTEM_SMB
|
||||
share1.strPath = "smb://";
|
||||
share1.strName = g_localizeStrings.Get(20171);
|
||||
extraShares.push_back(share1);
|
||||
+#endif
|
||||
|
||||
share1.strPath = "upnp://";
|
||||
share1.strName = "UPnP Devices";
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/GUIDialogNetworkSetup.cpp xbmc-10.1-Dharma.patch/xbmc/GUIDialogNetworkSetup.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/GUIDialogNetworkSetup.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/GUIDialogNetworkSetup.cpp 2011-09-14 16:49:00.902517185 +0200
|
||||
@@ -128,7 +128,9 @@
|
||||
return;
|
||||
|
||||
pSpin->Clear();
|
||||
+#ifdef HAS_FILESYSTEM_SMB
|
||||
pSpin->AddLabel(g_localizeStrings.Get(20171), NET_PROTOCOL_SMB);
|
||||
+#endif
|
||||
pSpin->AddLabel(g_localizeStrings.Get(20256), NET_PROTOCOL_HTSP);
|
||||
pSpin->AddLabel(g_localizeStrings.Get(20257), NET_PROTOCOL_VTP);
|
||||
pSpin->AddLabel(g_localizeStrings.Get(21331), NET_PROTOCOL_TUXBOX);
|
||||
@ -1,19 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma/configure.in xbmc-10.1-Dharma.patch/configure.in
|
||||
--- xbmc-10.1-Dharma/configure.in 2011-03-08 02:49:24.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/configure.in 2011-09-21 22:13:32.305639980 +0200
|
||||
@@ -1613,6 +1613,7 @@
|
||||
--extra-cflags="$CFLAGS -w -D_DARWIN_C_SOURCE -Dattribute_deprecated=" \
|
||||
--disable-amd3dnow \
|
||||
--disable-static \
|
||||
+ --disable-doc \
|
||||
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
|
||||
--disable-muxers \
|
||||
--enable-muxer=spdif \
|
||||
@@ -1644,6 +1645,7 @@
|
||||
./configure \
|
||||
--extra-cflags="$PASSED_CFLAGS $FFMPEG_EXTRACFLAGS" \
|
||||
--disable-static \
|
||||
+ --disable-doc \
|
||||
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
|
||||
`if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
|
||||
`if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
|
||||
@ -1,28 +0,0 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 14:00:23.143803217 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 14:01:15.327739326 +0100
|
||||
@@ -1263,12 +1263,6 @@
|
||||
final_message="$final_message\n MID Support:\tNo"
|
||||
fi
|
||||
|
||||
-if test -d "/usr/include/lzo"; then
|
||||
- INCLUDES="$INCLUDES -I/usr/include/lzo"
|
||||
-else
|
||||
- INCLUDES="$INCLUDES"
|
||||
-fi
|
||||
-
|
||||
if test "x$use_ccache" != "xno"; then
|
||||
AC_PATH_PROG(CCACHE,ccache,none)
|
||||
if test "$ac_cv_path_CCACHE" = "none"; then
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/tools/TexturePacker/XBMCTex.cpp xbmc-Dharma-10.1-c8405db.patch/tools/TexturePacker/XBMCTex.cpp
|
||||
--- xbmc-Dharma-10.1-c8405db/tools/TexturePacker/XBMCTex.cpp 2011-02-15 13:30:04.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/tools/TexturePacker/XBMCTex.cpp 2011-02-15 14:01:15.328739305 +0100
|
||||
@@ -40,7 +40,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef _LINUX
|
||||
-#include <lzo1x.h>
|
||||
+#include <lzo/lzo1x.h>
|
||||
#else
|
||||
#include "../../xbmc/lib/liblzo/LZO1X.H"
|
||||
#endif
|
||||
@ -1,29 +0,0 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/guilib/Makefile.in xbmc-Dharma-10.1-c8405db.patch/guilib/Makefile.in
|
||||
--- xbmc-Dharma-10.1-c8405db/guilib/Makefile.in 2011-02-15 13:30:05.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/guilib/Makefile.in 2011-02-15 14:06:40.345116165 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/linux -I../xbmc/utils -I/usr/include/freetype2 -I/usr/include/SDL -I../xbmc/lib/libsquish
|
||||
+INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish
|
||||
ifneq (@USE_EXTERNAL_FFMPEG@,1)
|
||||
INCLUDES+=-I../xbmc/cores/dvdplayer/Codecs/ffmpeg
|
||||
endif
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/FileSystem/Makefile.in xbmc-Dharma-10.1-c8405db.patch/xbmc/FileSystem/Makefile.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/FileSystem/Makefile.in 2011-02-15 13:30:05.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/FileSystem/Makefile.in 2011-02-15 14:06:40.346116145 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
ARCH=@ARCH@
|
||||
|
||||
-INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I../lib
|
||||
+INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I../lib
|
||||
INCLUDES+=-I../lib/libcdio/libcdio/include
|
||||
ifeq ($(findstring osx,$(ARCH)), osx)
|
||||
INCLUDES+=-I../../lib/libcurl-OSX/include
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/Makefile.in xbmc-Dharma-10.1-c8405db.patch/xbmc/Makefile.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/Makefile.in 2011-02-15 13:30:06.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/Makefile.in 2011-02-15 14:06:40.347116125 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer
|
||||
+INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer
|
||||
|
||||
ifneq (@USE_EXTERNAL_FFMPEG@,1)
|
||||
INCLUDES+=-Icores/dvdplayer/Codecs/ffmpeg
|
||||
@ -1,53 +0,0 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/Makefile
|
||||
--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/Makefile 2011-02-15 13:30:04.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/Makefile 2011-02-15 14:08:13.446219906 +0100
|
||||
@@ -1,3 +1,4 @@
|
||||
+CXX ?= g++
|
||||
CFLAGS = -Wall -pipe -fPIC -funroll-loops
|
||||
OBJ_DIR = release-$(shell $(CC) -v 2>&1|grep ^Target:|cut -d' ' -f2)
|
||||
OBJS = wiiuse_v0.12/src/$(OBJ_DIR)/libwiiuse.so
|
||||
@@ -6,7 +7,7 @@
|
||||
|
||||
all:
|
||||
@$(MAKE) -C wiiuse_$(VERSION)/src $@
|
||||
- g++ $(CFLAGS) WiiUse_WiiRemote.cpp $(OBJS) -o $(BIN)
|
||||
+ $(CXX) $(CFLAGS) -I./wiiuse_$(VERSION)/src WiiUse_WiiRemote.cpp $(OBJS) -o $(BIN)
|
||||
wiiuse:
|
||||
@$(MAKE) -C wiiuse_$(VERSION)/src
|
||||
clean:
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile
|
||||
--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile 2011-02-15 13:30:04.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile 2011-02-15 14:08:13.447219886 +0100
|
||||
@@ -5,7 +5,7 @@
|
||||
#
|
||||
# Change this to your GCC version.
|
||||
#
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
|
||||
####################################################
|
||||
#
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile
|
||||
--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile 2011-02-15 13:30:04.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile 2011-02-15 14:08:13.449219844 +0100
|
||||
@@ -5,7 +5,7 @@
|
||||
#
|
||||
# Change this to your GCC version.
|
||||
#
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
|
||||
####################################################
|
||||
#
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile
|
||||
--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile 2011-02-15 13:30:04.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile 2011-02-15 14:08:13.450219823 +0100
|
||||
@@ -5,7 +5,7 @@
|
||||
#
|
||||
# Change this to your GCC version.
|
||||
#
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
|
||||
####################################################
|
||||
#
|
||||
@ -1,119 +0,0 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in 2011-02-15 14:07:34.152020190 +0100
|
||||
@@ -6,5 +6,5 @@
|
||||
Name: libdvdcss
|
||||
Description: DVD access and decryption library.
|
||||
Version: @VERSION@
|
||||
-Libs: -L${libdir} -ldvdcss
|
||||
-Cflags: -I{includedir} -I${includedir}/@PACKAGE@
|
||||
+Libs: -ldvdcss
|
||||
+Cflags: -I.
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh 2011-02-15 14:07:34.153020170 +0100
|
||||
@@ -56,17 +56,17 @@
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
- echo -I$prefix/include $dvdread_cflags $extracflags $threadcflags
|
||||
+ echo $dvdread_cflags $extracflags $threadcflags
|
||||
fi
|
||||
|
||||
if test "$echo_minicflags" = "yes"; then
|
||||
- echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags
|
||||
+ echo $extracflags $threadcflags
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- echo -L$libdir -ldvdnav $dvdread_libs $threadlib
|
||||
+ echo -ldvdnav $dvdread_libs $threadlib
|
||||
fi
|
||||
|
||||
if test "$echo_minilibs" = "yes"; then
|
||||
- echo -L$libdir -ldvdnavmini $threadlib
|
||||
+ echo -ldvdnavmini $threadlib
|
||||
fi
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in 2011-02-15 14:07:34.154020150 +0100
|
||||
@@ -76,13 +76,13 @@
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
- echo -I@includedir@ -I@includedir@/libdvdread @THREAD_CFLAGS@
|
||||
+ echo @THREAD_CFLAGS@
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- echo -L@libdir@ -ldvdnav -ldvdread @THREAD_LIBS@
|
||||
+ echo -ldvdnav -ldvdread @THREAD_LIBS@
|
||||
fi
|
||||
|
||||
if test "$echo_minilibs" = "yes"; then
|
||||
- echo -L@libdir@ -ldvdnavmini @THREAD_LIBS@
|
||||
+ echo -ldvdnavmini @THREAD_LIBS@
|
||||
fi
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2011-02-15 14:07:34.156020109 +0100
|
||||
@@ -7,5 +7,5 @@
|
||||
Description: DVD Navigation mini library
|
||||
Version: @VERSION@
|
||||
|
||||
-Cflags: -I${includedir} @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
|
||||
-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
|
||||
+Cflags: @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
|
||||
+Libs: -ldvdnav @THREAD_LIBS@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in 2011-02-15 14:07:34.157020088 +0100
|
||||
@@ -8,5 +8,5 @@
|
||||
Version: @VERSION@
|
||||
|
||||
Requires.private: dvdread >= 4.1.2
|
||||
-Cflags: -I${includedir} @THREAD_CFLAGS@
|
||||
-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
|
||||
+Cflags: @THREAD_CFLAGS@
|
||||
+Libs: -ldvdnav @THREAD_LIBS@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in 2011-02-15 14:07:34.158020067 +0100
|
||||
@@ -72,9 +72,9 @@
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
- echo -I@includedir@
|
||||
+ echo ""
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- echo -L@libdir@ -ldvdread
|
||||
+ echo -ldvdread
|
||||
fi
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh 2011-02-15 14:07:34.158020067 +0100
|
||||
@@ -48,9 +48,9 @@
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
- echo -I$prefix/include $extracflags
|
||||
+ echo $extracflags
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- echo -L$libdir $dvdreadlib
|
||||
+ echo $dvdreadlib
|
||||
fi
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in 2011-02-15 13:30:12.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in 2011-02-15 14:07:34.159020047 +0100
|
||||
@@ -7,5 +7,5 @@
|
||||
Description: Low level DVD access library
|
||||
Version: @VERSION@
|
||||
|
||||
-Cflags: -I${includedir}
|
||||
-Libs: -L${libdir} -ldvdread
|
||||
+Cflags: -I.
|
||||
+Libs: -ldvdread
|
||||
@ -1,13 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/Application.cpp xbmc-10.1-Dharma.patch/xbmc/Application.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/Application.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/Application.cpp 2011-05-06 01:41:52.853741840 +0200
|
||||
@@ -2515,8 +2515,8 @@
|
||||
if (!m_pPlayer->IsPaused())
|
||||
{ // unpaused - set the playspeed back to normal
|
||||
SetPlaySpeed(1);
|
||||
+ g_audioManager.Enable(m_pPlayer->IsPaused() && !g_audioContext.IsPassthroughActive());
|
||||
}
|
||||
- g_audioManager.Enable(m_pPlayer->IsPaused() && !g_audioContext.IsPassthroughActive());
|
||||
return true;
|
||||
}
|
||||
if (!m_pPlayer->IsPaused())
|
||||
@ -1,72 +0,0 @@
|
||||
From 76b51cce5dd64d6f33348cd36eddce95d571f783 Mon Sep 17 00:00:00 2001
|
||||
From: Yuriy Romanenko <yromanen@gmail.com>
|
||||
Date: Thu, 24 Feb 2011 12:03:53 +0200
|
||||
Subject: [PATCH] linux: VAAPI fix from bug #10928
|
||||
http://trac.xbmc.org/ticket/10928
|
||||
|
||||
Signed-off-by: Joakim Plate <elupus@xbmc.org>
|
||||
---
|
||||
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 20 ++++++++++++++------
|
||||
1 files changed, 14 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
index 0aac8fe..b03ea5c 100644
|
||||
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
@@ -149,10 +149,10 @@ int CDecoder::GetBuffer(AVCodecContext *avctx, AVFrame *pic)
|
||||
{
|
||||
VASurfaceID surface = GetSurfaceID(pic);
|
||||
CSurface* wrapper = NULL;
|
||||
+ std::list<CSurfacePtr>::iterator it = m_surfaces_free.begin();
|
||||
if(surface)
|
||||
{
|
||||
/* reget call */
|
||||
- std::list<CSurfacePtr>::iterator it = m_surfaces_free.begin();
|
||||
for(; it != m_surfaces_free.end(); it++)
|
||||
{
|
||||
if((*it)->m_id == surface)
|
||||
@@ -171,20 +171,28 @@ int CDecoder::GetBuffer(AVCodecContext *avctx, AVFrame *pic)
|
||||
}
|
||||
else
|
||||
{
|
||||
- if(m_surfaces_free.empty())
|
||||
+ // To avoid stutter, we scan the free surface pool (provided by decoder) for surfaces
|
||||
+ // that are 100% not in use by renderer. The pointers to these surfaces have a use_count of 1.
|
||||
+ for (; it != m_surfaces_free.end() && it->use_count() > 1; it++) {}
|
||||
+
|
||||
+ // If we have zero free surface from decoder OR all free surfaces are in use by renderer, we allocate a new surface
|
||||
+ if (it == m_surfaces_free.end())
|
||||
{
|
||||
+ if (!m_surfaces_free.empty()) CLog::Log(LOGERROR, "VAAPI - renderer still using all freed up surfaces by decoder");
|
||||
CLog::Log(LOGERROR, "VAAPI - unable to find free surface, trying to allocate a new one");
|
||||
if(!EnsureSurfaces(avctx, m_surfaces_count+1) || m_surfaces_free.empty())
|
||||
{
|
||||
CLog::Log(LOGERROR, "VAAPI - unable to find free surface");
|
||||
return -1;
|
||||
}
|
||||
+ // Set itarator position to the newly allocated surface (end-1)
|
||||
+ it = m_surfaces_free.end(); it--;
|
||||
}
|
||||
/* getbuffer call */
|
||||
- wrapper = m_surfaces_free.front().get();
|
||||
+ wrapper = it->get();
|
||||
surface = wrapper->m_id;
|
||||
- m_surfaces_used.push_back(m_surfaces_free.front());
|
||||
- m_surfaces_free.pop_front();
|
||||
+ m_surfaces_used.push_back(*it);
|
||||
+ m_surfaces_free.erase(it);
|
||||
}
|
||||
|
||||
pic->type = FF_BUFFER_TYPE_USER;
|
||||
@@ -349,7 +357,7 @@ bool CDecoder::EnsureContext(AVCodecContext *avctx)
|
||||
else
|
||||
m_refs = 2;
|
||||
}
|
||||
- return EnsureSurfaces(avctx, m_refs + 1 + 1);
|
||||
+ return EnsureSurfaces(avctx, m_refs + 3);
|
||||
}
|
||||
|
||||
bool CDecoder::EnsureSurfaces(AVCodecContext *avctx, unsigned n_surfaces_count)
|
||||
--
|
||||
1.7.5.4
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
From acef66ba6f0bf1db31906c7c7c4f7c83cfee44c1 Mon Sep 17 00:00:00 2001
|
||||
From: Kyle Hill <kyleh@htpc.(none)>
|
||||
Date: Sat, 14 May 2011 17:23:45 -0500
|
||||
Subject: [PATCH] Fix NULL -> 0 conversion warnings in VAAPI.cpp
|
||||
|
||||
---
|
||||
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 10 +++++-----
|
||||
1 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
index b03ea5c..d9d2bd2 100644
|
||||
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
@@ -115,8 +115,8 @@ CDecoder::CDecoder()
|
||||
{
|
||||
m_refs = 0;
|
||||
m_surfaces_count = 0;
|
||||
- m_config = NULL;
|
||||
- m_context = NULL;
|
||||
+ m_config = 0;
|
||||
+ m_context = 0;
|
||||
m_hwaccel = (vaapi_context*)calloc(1, sizeof(vaapi_context));
|
||||
}
|
||||
|
||||
@@ -212,11 +212,11 @@ void CDecoder::Close()
|
||||
{
|
||||
if(m_context)
|
||||
WARN(vaDestroyContext(m_display->get(), m_context))
|
||||
- m_context = NULL;
|
||||
+ m_context = 0;
|
||||
|
||||
if(m_config)
|
||||
WARN(vaDestroyConfig(m_display->get(), m_config))
|
||||
- m_config = NULL;
|
||||
+ m_config = 0;
|
||||
|
||||
m_surfaces_free.clear();
|
||||
m_surfaces_used.clear();
|
||||
@@ -384,7 +384,7 @@ bool CDecoder::EnsureSurfaces(AVCodecContext *avctx, unsigned n_surfaces_count)
|
||||
|
||||
if(m_context)
|
||||
WARN(vaDestroyContext(m_display->get(), m_context))
|
||||
- m_context = NULL;
|
||||
+ m_context = 0;
|
||||
|
||||
CHECK(vaCreateContext(m_display->get()
|
||||
, m_config
|
||||
--
|
||||
1.7.5.4
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
From 00e3095dd47d6474fa6befcbd85157e27f6f68fa Mon Sep 17 00:00:00 2001
|
||||
From: vdrfan <vdrfan-nospam-@xbmc.org>
|
||||
Date: Mon, 1 Aug 2011 16:53:16 +0200
|
||||
Subject: [PATCH] fixed: make sure libexif is using the correct byte order
|
||||
(intel or motorola) when processing gps information (fixes
|
||||
#8427)
|
||||
|
||||
---
|
||||
lib/libexif/ExifParse.cpp | 12 ++++++------
|
||||
1 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/xbmc/lib/libexif/ExifParse.cpp b/xbmc/lib/libexif/ExifParse.cpp
|
||||
index 41690df..74ecbbe 100644
|
||||
--- a/xbmc/lib/libexif/ExifParse.cpp
|
||||
+++ b/xbmc/lib/libexif/ExifParse.cpp
|
||||
@@ -810,15 +810,15 @@ void CExifParse::ProcessGpsInfo(
|
||||
const unsigned char* const OffsetBase,
|
||||
unsigned ExifLength)
|
||||
{
|
||||
- int NumDirEntries = Get16(DirStart);
|
||||
+ int NumDirEntries = Get16(DirStart, m_MotorolaOrder);
|
||||
|
||||
for (int de=0;de<NumDirEntries;de++)
|
||||
{
|
||||
const unsigned char* DirEntry = DIR_ENTRY_ADDR(DirStart, de);
|
||||
|
||||
- unsigned Tag = Get16(DirEntry);
|
||||
- unsigned Format = Get16(DirEntry+2);
|
||||
- unsigned Components = (unsigned)Get32(DirEntry+4);
|
||||
+ unsigned Tag = Get16(DirEntry, m_MotorolaOrder);
|
||||
+ unsigned Format = Get16(DirEntry+2, m_MotorolaOrder);
|
||||
+ unsigned Components = (unsigned)Get32(DirEntry+4, m_MotorolaOrder);
|
||||
if ((Format-1) >= NUM_FORMATS)
|
||||
{
|
||||
// (-1) catches illegal zero case as unsigned underflows to positive large.
|
||||
@@ -834,7 +834,7 @@ void CExifParse::ProcessGpsInfo(
|
||||
|
||||
if (ByteCount > 4)
|
||||
{
|
||||
- unsigned OffsetVal = (unsigned)Get32(DirEntry+8);
|
||||
+ unsigned OffsetVal = (unsigned)Get32(DirEntry+8, m_MotorolaOrder);
|
||||
// If its bigger than 4 bytes, the dir entry contains an offset.
|
||||
if (OffsetVal+ByteCount > ExifLength)
|
||||
{
|
||||
@@ -878,7 +878,7 @@ void CExifParse::ProcessGpsInfo(
|
||||
case TAG_GPS_ALT:
|
||||
{
|
||||
char temp[18];
|
||||
- sprintf(temp,"%dm", Get32(ValuePtr));
|
||||
+ sprintf(temp,"%dm", Get32(ValuePtr, m_MotorolaOrder));
|
||||
strcat(m_ExifInfo->GpsAlt, temp);
|
||||
}
|
||||
break;
|
||||
--
|
||||
1.7.5.4
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp 2011-08-21 17:13:13.382281536 +0200
|
||||
@@ -74,7 +74,7 @@
|
||||
if (!PyArg_ParseTupleAndKeywords(
|
||||
args,
|
||||
kwds,
|
||||
- (char*)"iOO|bl",
|
||||
+ (char*)"iOO|bi",
|
||||
(char**)keywords,
|
||||
&handle,
|
||||
&pURL,
|
||||
@ -1,24 +0,0 @@
|
||||
From d25fbc8248be3cc0b208614faca394c56157cf1a Mon Sep 17 00:00:00 2001
|
||||
From: FernetMenta <fernetmenta@online.de>
|
||||
Date: Fri, 12 Aug 2011 12:39:37 +0200
|
||||
Subject: [PATCH] vaapi: store reordered_opaque to pic
|
||||
|
||||
---
|
||||
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
index d9d2bd2..bcc3fe1 100644
|
||||
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
@@ -205,6 +205,7 @@ int CDecoder::GetBuffer(AVCodecContext *avctx, AVFrame *pic)
|
||||
pic->linesize[1] = 0;
|
||||
pic->linesize[2] = 0;
|
||||
pic->linesize[3] = 0;
|
||||
+ pic->reordered_opaque= avctx->reordered_opaque;
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
1.7.5.4
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 14:06:18.343564347 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 14:16:56.717644949 +0100
|
||||
@@ -685,9 +685,6 @@
|
||||
PKG_CHECK_MODULES([XMU], [xmu],
|
||||
[INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"],
|
||||
AC_MSG_ERROR($missing_library))
|
||||
- PKG_CHECK_MODULES([XINERAMA],[xinerama],
|
||||
- [INCLUDES="$INCLUDES $XINERAMA_CFLAGS"; LIBS="$LIBS $XINERAMA_LIBS"],
|
||||
- AC_MSG_ERROR($missing_library))
|
||||
PKG_CHECK_MODULES([CURL], [libcurl],
|
||||
[INCLUDES="$INCLUDES $CURL_CFLAGS"; LIBS="$LIBS $CURL_LIBS"],
|
||||
AC_MSG_ERROR($missing_library))
|
||||
@ -1,21 +0,0 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 14:23:09.427177685 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 14:23:28.731790834 +0100
|
||||
@@ -562,8 +562,6 @@
|
||||
AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
|
||||
-AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))
|
||||
-AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([wavpack], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([mpeg2], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library))
|
||||
@@ -975,6 +973,8 @@
|
||||
USE_EXTERNAL_PYTHON=1
|
||||
AC_DEFINE([USE_EXTERNAL_PYTHON], [1], [Whether to use external python library.])
|
||||
else
|
||||
+ AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))
|
||||
+ AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library))
|
||||
AC_MSG_NOTICE($external_python_disabled)
|
||||
USE_EXTERNAL_PYTHON=0
|
||||
fi
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/DllVorbis.h xbmc-10.1-Dharma.patch/xbmc/cdrip/DllVorbis.h
|
||||
--- xbmc-10.1-Dharma/xbmc/cdrip/DllVorbis.h 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/cdrip/DllVorbis.h 2011-03-29 16:37:38.432826576 +0200
|
||||
@@ -61,7 +61,7 @@
|
||||
public:
|
||||
virtual ~DllVorbis() {};
|
||||
virtual void vorbis_info_init(vorbis_info *vi)
|
||||
- { vorbis_info_init(vi); }
|
||||
+ { ::vorbis_info_init(vi); }
|
||||
virtual int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd, ogg_packet *op)
|
||||
{ return ::vorbis_bitrate_flushpacket(vd, op); }
|
||||
virtual int vorbis_bitrate_addblock(vorbis_block *vb)
|
||||
@ -1,97 +0,0 @@
|
||||
From c66099c4d8e6b2d748ca3ddc31ee90b731d0f620 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Raue <stephan@openelec.tv>
|
||||
Date: Wed, 30 Mar 2011 14:57:28 +0200
|
||||
Subject: [PATCH] dvdplayer: fix build with gcc-4.6. Flags to the Linker must be passed via -Wl,. This fixes ticket #11383
|
||||
|
||||
Signed-off-by: Stephan Raue <stephan@openelec.tv>
|
||||
---
|
||||
xbmc/cores/dvdplayer/Codecs/Makefile.in | 18 +++++++++---------
|
||||
xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in | 4 ++--
|
||||
2 files changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/xbmc/cores/dvdplayer/Codecs/Makefile.in b/xbmc/cores/dvdplayer/Codecs/Makefile.in
|
||||
index a7ef1a0..308664a 100644
|
||||
--- a/xbmc/cores/dvdplayer/Codecs/Makefile.in
|
||||
+++ b/xbmc/cores/dvdplayer/Codecs/Makefile.in
|
||||
@@ -148,32 +148,32 @@ liba52:
|
||||
else
|
||||
|
||||
$(SYSDIR)/avutil-50-$(ARCH).so: ffmpeg/libavutil/libavutil.so
|
||||
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
|
||||
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
|
||||
ffmpeg/libavutil/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
|
||||
|
||||
$(SYSDIR)/avcodec-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavcodec/libavcodec.so
|
||||
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
|
||||
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
|
||||
ffmpeg/libavcodec/*.o ffmpeg/libavcodec/$(ARCH_DIR)/*.o \
|
||||
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
|
||||
|
||||
$(SYSDIR)/avformat-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavformat/libavformat.so
|
||||
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
|
||||
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
|
||||
ffmpeg/libavformat/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
|
||||
|
||||
ifneq ($(ARCH), arm)
|
||||
$(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so
|
||||
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
|
||||
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
|
||||
ffmpeg/libswscale/*.o ffmpeg/libswscale/$(ARCH_DIR)/*.o \
|
||||
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
|
||||
else # No ARM version of swscale available yet.
|
||||
$(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so
|
||||
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
|
||||
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
|
||||
ffmpeg/libswscale/*.o \
|
||||
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
|
||||
endif
|
||||
|
||||
$(SYSDIR)/postproc-51-$(ARCH).so: $(WRAPPER) ffmpeg/libpostproc/libpostproc.so
|
||||
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
|
||||
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
|
||||
ffmpeg/libpostproc/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
|
||||
|
||||
ffmpeg/libavutil/libavutil.so : ffmpeg;
|
||||
@@ -185,17 +185,17 @@ ffmpeg:
|
||||
$(MAKE) -C $@
|
||||
|
||||
$(SYSDIR)/libdts-$(ARCH).so: $(WRAPPER) libdts/libdts/libdts.a
|
||||
- $(CC) -o $@ $(LDFLAGS) --soname,$@ \
|
||||
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
|
||||
libdts/libdts/bitstream.o \
|
||||
libdts/libdts/downmix.o libdts/libdts/parse.o \
|
||||
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
|
||||
|
||||
$(SYSDIR)/liba52-$(ARCH).so: $(WRAPPER) liba52/liba52/liba52.la
|
||||
- $(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/liba52/.libs/*.o \
|
||||
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/liba52/.libs/*.o \
|
||||
-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
|
||||
|
||||
$(SYSDIR)/libao-$(ARCH).so: $(WRAPPER) liba52/libao/libao.a
|
||||
- $(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/libao/libao.a \
|
||||
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/libao/libao.a \
|
||||
-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
|
||||
|
||||
libdts/libdts/libdts.a : libdts;
|
||||
diff --git a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
|
||||
index 3c487e9..6d4abd4 100644
|
||||
--- a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
|
||||
+++ b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
|
||||
@@ -49,12 +49,12 @@ $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdread/obj/libdvd
|
||||
else
|
||||
|
||||
$(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
|
||||
- $(CC) -o $@ $(LDFLAGS) --soname,$@ \
|
||||
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
|
||||
libdvdcss/src/*.o \
|
||||
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
|
||||
|
||||
$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
|
||||
- $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
|
||||
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
|
||||
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
|
||||
|
||||
endif
|
||||
--
|
||||
1.7.0.2
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/pyutil.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/pyutil.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/pyutil.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/pyutil.cpp 2011-06-10 21:14:07.881047162 +0200
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <wchar.h>
|
||||
#include <vector>
|
||||
#include "addons/Skin.h"
|
||||
+#include "utils/log.h"
|
||||
#include "tinyXML/tinyxml.h"
|
||||
#include "utils/CharsetConverter.h"
|
||||
#include "CriticalSection.h"
|
||||
@@ -202,7 +203,22 @@
|
||||
g_callQueue.erase(iter);
|
||||
lock.Leave();
|
||||
if (p.func)
|
||||
+ {
|
||||
p.func(p.args);
|
||||
+
|
||||
+ // Since the callback is likely to make it into python, and since
|
||||
+ // not all of the callback functions handle errors, the error state
|
||||
+ // may remain set from the previous call. As a result subsequent calls
|
||||
+ // to callback functions exhibit odd behavior difficult to debug.
|
||||
+ if (PyErr_Occurred())
|
||||
+ {
|
||||
+ CLog::Log(LOGERROR,"Exception in python script callback execution");
|
||||
+
|
||||
+ // This clears the python error state and prints it to the log
|
||||
+ PyErr_Print();
|
||||
+ }
|
||||
+
|
||||
+ }
|
||||
//(*((*iter).first))((*iter).second);
|
||||
lock.Enter();
|
||||
iter = g_callQueue.begin();
|
||||
@ -1,16 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/XBPython.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/XBPython.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/lib/libPython/XBPython.cpp 2011-03-08 02:49:15.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/XBPython.cpp 2011-08-16 04:04:59.808482717 +0200
|
||||
@@ -381,10 +381,8 @@
|
||||
CLog::Log(LOGDEBUG, "Python wrapper library linked with internal Python library");
|
||||
#endif /* _LINUX */
|
||||
#else
|
||||
- /* PYTHONOPTIMIZE is set off intentionally when using external Python.
|
||||
- Reason for this is because we cannot be sure what version of Python
|
||||
- was used to compile the various Python object files (i.e. .pyo,
|
||||
- .pyc, etc.). */
|
||||
+ // Required for python to find optimized code (pyo) files
|
||||
+ setenv("PYTHONOPTIMIZE", "1", 1);
|
||||
setenv("PYTHONCASEOK", "1", 1); //This line should really be removed
|
||||
CLog::Log(LOGDEBUG, "Python wrapper library linked with system Python library");
|
||||
#endif /* USE_EXTERNAL_PYTHON */
|
||||
@ -1,61 +0,0 @@
|
||||
--- xbmc-10.1-Dharma/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp 2011-03-08 02:49:17.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp.new 2011-08-29 22:19:01.314816310 +0200
|
||||
@@ -40,9 +40,9 @@
|
||||
{
|
||||
public:
|
||||
virtual ~DllLibblurayInterface() {};
|
||||
- virtual uint32_t bd_get_titles(BLURAY *bd, uint8_t flags)=0;
|
||||
- virtual BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx)=0;
|
||||
- virtual BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist)=0;
|
||||
+ virtual uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length)=0;
|
||||
+ virtual BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx, unsigned angle)=0;
|
||||
+ virtual BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist, unsigned angle)=0;
|
||||
virtual void bd_free_title_info(BLURAY_TITLE_INFO *title_info)=0;
|
||||
virtual BLURAY *bd_open(const char* device_path, const char* keyfile_path)=0;
|
||||
virtual void bd_close(BLURAY *bd)=0;
|
||||
@@ -70,9 +70,9 @@
|
||||
{
|
||||
DECLARE_DLL_WRAPPER(DllLibbluray, DLL_PATH_LIBBLURAY)
|
||||
|
||||
- DEFINE_METHOD2(uint32_t, bd_get_titles, (BLURAY *p1, uint8_t p2))
|
||||
- DEFINE_METHOD2(BLURAY_TITLE_INFO*, bd_get_title_info, (BLURAY *p1, uint32_t p2))
|
||||
- DEFINE_METHOD2(BLURAY_TITLE_INFO*, bd_get_playlist_info, (BLURAY *p1, uint32_t p2))
|
||||
+ DEFINE_METHOD3(uint32_t, bd_get_titles, (BLURAY *p1, uint8_t p2, uint32_t p3))
|
||||
+ DEFINE_METHOD3(BLURAY_TITLE_INFO*, bd_get_title_info, (BLURAY *p1, uint32_t p2, unsigned p3))
|
||||
+ DEFINE_METHOD3(BLURAY_TITLE_INFO*, bd_get_playlist_info, (BLURAY *p1, uint32_t p2, unsigned p3))
|
||||
DEFINE_METHOD1(void, bd_free_title_info, (BLURAY_TITLE_INFO *p1))
|
||||
DEFINE_METHOD2(BLURAY*, bd_open, (const char* p1, const char* p2))
|
||||
DEFINE_METHOD1(void, bd_close, (BLURAY *p1))
|
||||
@@ -303,12 +303,12 @@
|
||||
CStdString filename = CUtil::GetFileName(strFile);
|
||||
if(filename.Equals("index.bdmv"))
|
||||
{
|
||||
- int titles = m_dll->bd_get_titles(m_bd, TITLES_RELEVANT);
|
||||
+ int titles = m_dll->bd_get_titles(m_bd, TITLES_RELEVANT, 0);
|
||||
|
||||
BLURAY_TITLE_INFO *t, *s = NULL;
|
||||
for(int i=0; i < titles; i++)
|
||||
{
|
||||
- t = m_dll->bd_get_title_info(m_bd, i);;
|
||||
+ t = m_dll->bd_get_title_info(m_bd, i, 0);;
|
||||
if(!t)
|
||||
{
|
||||
CLog::Log(LOGDEBUG, "get_main_title - unable to get title %d", i);
|
||||
@@ -324,7 +324,7 @@
|
||||
}
|
||||
else if(CUtil::GetExtension(filename).Equals(".mpls"))
|
||||
{
|
||||
- int titles = m_dll->bd_get_titles(m_bd, TITLES_ALL);
|
||||
+ int titles = m_dll->bd_get_titles(m_bd, TITLES_ALL, 0);
|
||||
do
|
||||
{
|
||||
if(titles < 0)
|
||||
@@ -345,7 +345,7 @@
|
||||
BLURAY_TITLE_INFO *t;
|
||||
for(int i=0; i < titles; i++)
|
||||
{
|
||||
- t = m_dll->bd_get_title_info(m_bd, i);;
|
||||
+ t = m_dll->bd_get_title_info(m_bd, i, 0);;
|
||||
if(!t)
|
||||
{
|
||||
CLog::Log(LOGDEBUG, "get_playlist_title - unable to get title %d", i);
|
||||
@ -1,16 +0,0 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/utils/Splash.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/utils/Splash.cpp
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/utils/Splash.cpp 2011-02-15 13:30:05.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/utils/Splash.cpp 2011-02-15 14:25:02.308915505 +0100
|
||||
@@ -53,9 +53,9 @@
|
||||
g_graphicsContext.Clear();
|
||||
|
||||
g_graphicsContext.SetCameraPosition(CPoint(0, 0));
|
||||
- float w = g_graphicsContext.GetWidth() * 0.5f;
|
||||
- float h = g_graphicsContext.GetHeight() * 0.5f;
|
||||
- CGUIImage* image = new CGUIImage(0, 0, w*0.5f, h*0.5f, w, h, m_ImageName);
|
||||
+ float w = g_graphicsContext.GetWidth();
|
||||
+ float h = g_graphicsContext.GetHeight();
|
||||
+ CGUIImage* image = new CGUIImage(0, 0, 0, 0, w, h, m_ImageName);
|
||||
image->SetAspectRatio(CAspectRatio::AR_KEEP);
|
||||
image->AllocResources();
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma/system/keymaps/keyboard.xml xbmc-10.1-Dharma.patch/system/keymaps/keyboard.xml
|
||||
--- xbmc-10.1-Dharma/system/keymaps/keyboard.xml 2011-03-08 02:49:23.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/system/keymaps/keyboard.xml 2011-07-23 18:04:59.406603684 +0200
|
||||
@@ -75,7 +75,7 @@
|
||||
<seven>Number7</seven>
|
||||
<eight>Number8</eight>
|
||||
<nine>Number9</nine>
|
||||
- <backslash>ToggleFullScreen</backslash>
|
||||
+<!-- <backslash>ToggleFullScreen</backslash> -->
|
||||
<browser_home>XBMC.ActivateWindow(Home)</browser_home>
|
||||
<browser_favorites>ActivateWindow(Favourites)</browser_favorites>
|
||||
<browser_refresh/>
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/FileSystem/File.cpp xbmc-10.1-Dharma.patch/xbmc/FileSystem/File.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/FileSystem/File.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/FileSystem/File.cpp 2011-05-04 17:59:12.093724017 +0200
|
||||
@@ -217,7 +217,7 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
- if ( (flags & READ_NO_CACHE) == 0 && CUtil::IsInternetStream(strFileName) && !CUtil::IsPicture(strFileName) )
|
||||
+ if ( (flags & READ_NO_CACHE) == 0 && ( CUtil::IsInternetStream(strFileName) || CUtil::IsOnLAN(strFileName) ) && !CUtil::IsPicture(strFileName) )
|
||||
m_flags |= READ_CACHED;
|
||||
|
||||
CURL url(strFileName);
|
||||
@ -1,23 +0,0 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp 2011-02-15 13:30:06.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp 2011-02-15 14:31:51.689709299 +0100
|
||||
@@ -617,6 +617,7 @@
|
||||
AddInt(vid, "myvideos.selectaction", 22079, SELECT_ACTION_PLAY_OR_RESUME, SELECT_ACTION_CHOOSE, 1, SELECT_ACTION_INFO, SPIN_CONTROL_TEXT);
|
||||
AddBool(NULL, "myvideos.treatstackasfile", 20051, true);
|
||||
AddBool(vid, "myvideos.extractflags",20433, true);
|
||||
+ AddBool(vid, "myvideos.alwaysextractflags",20433, false);
|
||||
AddBool(vid, "myvideos.cleanstrings", 20418, false);
|
||||
AddBool(NULL, "myvideos.extractthumb",20433, true);
|
||||
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/ThumbLoader.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/ThumbLoader.cpp
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/ThumbLoader.cpp 2011-02-15 13:30:05.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/ThumbLoader.cpp 2011-02-15 14:31:51.690709279 +0100
|
||||
@@ -148,7 +148,7 @@
|
||||
m_item.SetThumbnailImage(m_target);
|
||||
}
|
||||
}
|
||||
- else if (m_item.HasVideoInfoTag() && !m_item.GetVideoInfoTag()->HasStreamDetails())
|
||||
+ else if (m_item.HasVideoInfoTag() && (!m_item.GetVideoInfoTag()->HasStreamDetails() || g_guiSettings.GetBool("myvideos.alwaysextractflags")))
|
||||
{
|
||||
CLog::Log(LOGDEBUG,"%s - trying to extract filestream details from video file %s", __FUNCTION__, m_path.c_str());
|
||||
result = CDVDFileInfo::GetFileStreamDetails(&m_item);
|
||||
@ -1,23 +0,0 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp 2011-02-15 14:32:35.774825404 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp 2011-02-15 14:33:07.788183524 +0100
|
||||
@@ -527,6 +527,7 @@
|
||||
AddBool(NULL, "videolibrary.seasonthumbs", 20382, true);
|
||||
AddBool(vdl, "videolibrary.actorthumbs", 20402, true);
|
||||
AddInt(vdl, "videolibrary.flattentvshows", 20412, 1, 0, 1, 2, SPIN_CONTROL_TEXT);
|
||||
+ AddBool(NULL, "videolibrary.flattenmoviesets", 22002, false);
|
||||
AddBool(vdl, "videolibrary.updateonstartup", 22000, false);
|
||||
AddBool(vdl, "videolibrary.backgroundupdate", 22001, false);
|
||||
AddSeparator(vdl, "videolibrary.sep3");
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/VideoDatabase.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/VideoDatabase.cpp
|
||||
--- xbmc-Dharma-10.1-c8405db/xbmc/VideoDatabase.cpp 2011-02-15 13:30:05.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/VideoDatabase.cpp 2011-02-15 14:33:07.792183444 +0100
|
||||
@@ -4394,7 +4394,7 @@
|
||||
if (NULL == m_pDS.get()) return false;
|
||||
|
||||
CStdString strSQL = "select * from movieview ";
|
||||
- if (fetchSets)
|
||||
+ if (fetchSets && !g_guiSettings.GetBool("videolibrary.flattenmoviesets"))
|
||||
{
|
||||
// not getting a set, so grab all sets that match this where clause first
|
||||
CStdString setsWhere;
|
||||
@ -1,23 +1,22 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 13:30:17.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 19:08:46.445385047 +0100
|
||||
@@ -387,6 +387,15 @@
|
||||
AC_MSG_ERROR(unsupported host ($host))
|
||||
diff -Naur xbmc-9389dc8/configure.in xbmc-9389dc8.patch/configure.in
|
||||
--- xbmc-9389dc8/configure.in 2011-09-01 17:21:47.000000000 +0200
|
||||
+++ xbmc-9389dc8.patch/configure.in 2011-09-01 23:30:40.419399392 +0200
|
||||
@@ -428,6 +428,14 @@
|
||||
esac
|
||||
AC_SUBST([ARCH])
|
||||
+
|
||||
|
||||
+AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
|
||||
+if test "$HAVE_GIT" = "yes" -a "$GIT_REV" = ""; then
|
||||
+ GIT_REV=$(git rev-parse --short HEAD)
|
||||
+ GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}')
|
||||
+elif test "$GIT_REV" = ""; then
|
||||
+ GIT_REV="Unknown"
|
||||
+fi
|
||||
+final_message="$final_message\n git Rev.:\t${GIT_REV}"
|
||||
+
|
||||
# platform debug flags
|
||||
if test "$use_debug" = "yes"; then
|
||||
final_message="$final_message\n Debugging:\tYes"
|
||||
if test "$use_profiling" = "yes"; then
|
||||
@@ -1097,7 +1106,6 @@
|
||||
@@ -1177,7 +1185,6 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -25,12 +24,12 @@ diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/
|
||||
|
||||
# Checks for header files.
|
||||
AC_HEADER_DIRENT
|
||||
@@ -1282,12 +1290,6 @@
|
||||
@@ -1408,12 +1415,6 @@
|
||||
final_message="$final_message\n Avahi:\tNo"
|
||||
fi
|
||||
|
||||
-if test "$HAVE_GIT" = "yes"; then
|
||||
- GIT_REV=$(git rev-parse --short HEAD)
|
||||
- GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}')
|
||||
-fi
|
||||
-if test "$GIT_REV" = ""; then
|
||||
- GIT_REV="Unknown"
|
||||
@ -1,7 +1,7 @@
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/GUISettings.cpp xbmc-10.1-Dharma.patch/xbmc/GUISettings.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/GUISettings.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/GUISettings.cpp 2011-06-18 01:00:25.904995262 +0200
|
||||
@@ -415,7 +415,8 @@
|
||||
diff -Naur xbmc-9389dc8/xbmc/settings/GUISettings.cpp xbmc-9389dc8.patch/xbmc/settings/GUISettings.cpp
|
||||
--- xbmc-9389dc8/xbmc/settings/GUISettings.cpp 2011-09-01 23:34:05.267139356 +0200
|
||||
+++ xbmc-9389dc8.patch/xbmc/settings/GUISettings.cpp 2011-09-01 23:34:52.098765331 +0200
|
||||
@@ -423,7 +423,8 @@
|
||||
AddString(vs, "videoscreen.testpattern",226,"", BUTTON_CONTROL_STANDARD);
|
||||
#endif
|
||||
#if defined(_LINUX) && !defined(__APPLE__)
|
||||
@ -0,0 +1,119 @@
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdcss/src/libdvdcss.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdcss/src/libdvdcss.pc.in
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdcss/src/libdvdcss.pc.in 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdcss/src/libdvdcss.pc.in 2011-04-25 05:01:20.091837122 +0200
|
||||
@@ -6,5 +6,5 @@
|
||||
Name: libdvdcss
|
||||
Description: DVD access and decryption library.
|
||||
Version: @VERSION@
|
||||
-Libs: -L${libdir} -ldvdcss
|
||||
-Cflags: -I{includedir} -I${includedir}/@PACKAGE@
|
||||
+Libs: -ldvdcss
|
||||
+Cflags: -I.
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh 2011-04-25 05:01:20.549828701 +0200
|
||||
@@ -56,17 +56,17 @@
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
- echo -I$prefix/include $dvdread_cflags $extracflags $threadcflags
|
||||
+ echo $dvdread_cflags $extracflags $threadcflags
|
||||
fi
|
||||
|
||||
if test "$echo_minicflags" = "yes"; then
|
||||
- echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags
|
||||
+ echo $extracflags $threadcflags
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- echo -L$libdir -ldvdnav $dvdread_libs $threadlib
|
||||
+ echo -ldvdnav $dvdread_libs $threadlib
|
||||
fi
|
||||
|
||||
if test "$echo_minilibs" = "yes"; then
|
||||
- echo -L$libdir -ldvdnavmini $threadlib
|
||||
+ echo -ldvdnavmini $threadlib
|
||||
fi
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config.in
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav-config.in 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav-config.in 2011-04-25 05:01:20.624827321 +0200
|
||||
@@ -76,13 +76,13 @@
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
- echo -I@includedir@ -I@includedir@/libdvdread @THREAD_CFLAGS@
|
||||
+ echo @THREAD_CFLAGS@
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- echo -L@libdir@ -ldvdnav -ldvdread @THREAD_LIBS@
|
||||
+ echo -ldvdnav -ldvdread @THREAD_LIBS@
|
||||
fi
|
||||
|
||||
if test "$echo_minilibs" = "yes"; then
|
||||
- echo -L@libdir@ -ldvdnavmini @THREAD_LIBS@
|
||||
+ echo -ldvdnavmini @THREAD_LIBS@
|
||||
fi
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in 2011-04-25 05:01:21.042819641 +0200
|
||||
@@ -7,5 +7,5 @@
|
||||
Description: DVD Navigation mini library
|
||||
Version: @VERSION@
|
||||
|
||||
-Cflags: -I${includedir} @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
|
||||
-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
|
||||
+Cflags: @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
|
||||
+Libs: -ldvdnav @THREAD_LIBS@
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav.pc.in
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdnav/misc/dvdnav.pc.in 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdnav/misc/dvdnav.pc.in 2011-04-25 05:01:21.262815601 +0200
|
||||
@@ -8,5 +8,5 @@
|
||||
Version: @VERSION@
|
||||
|
||||
Requires.private: dvdread >= 4.1.2
|
||||
-Cflags: -I${includedir} @THREAD_CFLAGS@
|
||||
-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
|
||||
+Cflags: @THREAD_CFLAGS@
|
||||
+Libs: -ldvdnav @THREAD_LIBS@
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.in
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.in 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.in 2011-04-25 05:01:21.278815307 +0200
|
||||
@@ -72,9 +72,9 @@
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
- echo -I@includedir@
|
||||
+ echo ""
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- echo -L@libdir@ -ldvdread
|
||||
+ echo -ldvdread
|
||||
fi
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.sh xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.sh
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread-config.sh 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread-config.sh 2011-04-25 05:01:21.278815307 +0200
|
||||
@@ -48,9 +48,9 @@
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
- echo -I$prefix/include $extracflags
|
||||
+ echo $extracflags
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- echo -L$libdir $dvdreadlib
|
||||
+ echo $dvdreadlib
|
||||
fi
|
||||
diff -Naur xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread.pc.in xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread.pc.in
|
||||
--- xbmc-pvr-3513480/lib/libdvd/libdvdread/misc/dvdread.pc.in 2011-04-25 02:36:42.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/lib/libdvd/libdvdread/misc/dvdread.pc.in 2011-04-25 05:01:21.279815289 +0200
|
||||
@@ -7,5 +7,5 @@
|
||||
Description: Low level DVD access library
|
||||
Version: @VERSION@
|
||||
|
||||
-Cflags: -I${includedir}
|
||||
-Libs: -L${libdir} -ldvdread
|
||||
+Cflags: -I.
|
||||
+Libs: -ldvdread
|
||||
@ -4,13 +4,13 @@ Date: Sat, 13 Aug 2011 16:07:08 +0200
|
||||
Subject: [PATCH] ati: limit glxSwapBuffers going to far ahead
|
||||
|
||||
---
|
||||
xbmc/WinSystemX11GL.cpp | 23 +++++++++++++++++++++--
|
||||
xbmc/windowing/X11/WinSystemX11GL.cpp | 23 +++++++++++++++++++++--
|
||||
1 files changed, 21 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/xbmc/WinSystemX11GL.cpp b/xbmc/WinSystemX11GL.cpp
|
||||
diff --git a/xbmc/windowing/X11/WinSystemX11GL.cpp b/xbmc/windowing/X11/WinSystemX11GL.cpp
|
||||
index 94f369e..870999e 100644
|
||||
--- a/xbmc/WinSystemX11GL.cpp
|
||||
+++ b/xbmc/WinSystemX11GL.cpp
|
||||
--- a/xbmc/windowing/X11/WinSystemX11GL.cpp
|
||||
+++ b/xbmc/windowing/X11/WinSystemX11GL.cpp
|
||||
@@ -43,7 +43,27 @@ CWinSystemX11GL::~CWinSystemX11GL()
|
||||
|
||||
bool CWinSystemX11GL::PresentRenderImpl(const CDirtyRegionList& dirty)
|
||||
@ -1,18 +1,17 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
|
||||
--- xbmc-Dharma-10.1-c8405db/configure.in 2011-02-15 14:17:38.576806450 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/configure.in 2011-02-15 14:22:07.235423909 +0100
|
||||
@@ -914,6 +914,10 @@
|
||||
AC_LANG_POP([C++])
|
||||
fi
|
||||
CPPFLAGS="$SAVE_CPPFLAGS"
|
||||
diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
|
||||
--- xbmc-pvr-3513480/configure.in 2011-04-25 02:36:33.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/configure.in 2011-04-25 05:14:49.220848143 +0200
|
||||
@@ -885,6 +885,9 @@
|
||||
AC_MSG_NOTICE($external_ffmpeg_disabled)
|
||||
USE_EXTERNAL_FFMPEG=0
|
||||
AC_DEFINE([PIX_FMT_VDPAU_MPEG4_IN_AVUTIL], [1], [Whether AVUtil defines PIX_FMT_VDPAU_MPEG4.])
|
||||
+
|
||||
+ # check for yasm
|
||||
+ AC_CHECK_PROG(HAVE_YASM,yasm,"yes","no",)
|
||||
+
|
||||
else
|
||||
AC_MSG_NOTICE($external_ffmpeg_disabled)
|
||||
USE_EXTERNAL_FFMPEG=0
|
||||
@@ -1688,6 +1692,7 @@
|
||||
fi
|
||||
|
||||
# Python
|
||||
@@ -1547,6 +1550,7 @@
|
||||
`if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
|
||||
`if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
|
||||
--target-os=$(tolower $(uname -s)) \
|
||||
@ -1,18 +1,18 @@
|
||||
diff -Naur xbmc-10.1-Dharma/configure.in xbmc-10.1-Dharma.patch/configure.in
|
||||
--- xbmc-10.1-Dharma/configure.in 2011-03-08 02:49:24.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/configure.in 2011-03-26 05:56:44.077454237 +0100
|
||||
@@ -69,6 +69,8 @@
|
||||
diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
|
||||
--- xbmc-pvr-3513480/configure.in 2011-04-25 05:46:35.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/configure.in 2011-04-25 05:50:02.982401390 +0200
|
||||
@@ -72,6 +72,8 @@
|
||||
rsxs_disabled="== RSXS disabled. =="
|
||||
pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
|
||||
pulse_disabled="== PulseAudio support manually disabled. =="
|
||||
faac_not_found="== Could not find libfaac. FAAC support disabled. =="
|
||||
faac_disabled="== FAAC support manually disabled. =="
|
||||
+lame_not_found="== Could not find libmp3lame. LAME support disabled. =="
|
||||
+lame_disabled="== LAME support manually disabled. =="
|
||||
dvdcss_enabled="== DVDCSS support enabled. =="
|
||||
dvdcss_disabled="== DVDCSS support disabled. =="
|
||||
hal_not_found="== Could not find hal. HAL support disabled. =="
|
||||
@@ -234,6 +236,12 @@
|
||||
[use_faac=$enableval],
|
||||
[use_faac=yes])
|
||||
@@ -244,6 +246,12 @@
|
||||
[use_ffmpeg_libvorbis=$enableval],
|
||||
[use_ffmpeg_libvorbis=no])
|
||||
|
||||
+AC_ARG_ENABLE([lame],
|
||||
+ [AS_HELP_STRING([--enable-lame],
|
||||
@ -23,8 +23,8 @@ diff -Naur xbmc-10.1-Dharma/configure.in xbmc-10.1-Dharma.patch/configure.in
|
||||
AC_ARG_ENABLE([dvdcss],
|
||||
[AS_HELP_STRING([--enable-dvdcss],
|
||||
[enable DVDCSS support (default is yes)])],
|
||||
@@ -747,6 +755,20 @@
|
||||
fi
|
||||
@@ -758,6 +766,20 @@
|
||||
USE_PULSE=0
|
||||
fi
|
||||
|
||||
+# LAME
|
||||
@ -44,8 +44,8 @@ diff -Naur xbmc-10.1-Dharma/configure.in xbmc-10.1-Dharma.patch/configure.in
|
||||
# HAL
|
||||
if test "$host_vendor" = "apple" ; then
|
||||
use_hal="no"
|
||||
@@ -1262,6 +1284,12 @@
|
||||
final_message="$final_message\n FAAC:\t\tNo"
|
||||
@@ -1311,6 +1333,12 @@
|
||||
final_message="$final_message\n HAL Support:\tNo"
|
||||
fi
|
||||
|
||||
+if test "$use_lame" = "yes"; then
|
||||
@ -57,12 +57,14 @@ diff -Naur xbmc-10.1-Dharma/configure.in xbmc-10.1-Dharma.patch/configure.in
|
||||
# DVDCSS
|
||||
if test "$use_dvdcss" = "yes"; then
|
||||
AC_MSG_NOTICE($dvdcss_enabled)
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/CDDARipper.cpp xbmc-10.1-Dharma.patch/xbmc/cdrip/CDDARipper.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/cdrip/CDDARipper.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/cdrip/CDDARipper.cpp 2011-03-26 04:56:03.594891023 +0100
|
||||
diff -Naur xbmc-pvr-3513480/configure.in.orig xbmc-pvr-3513480.patch/configure.in.orig
|
||||
diff -Naur xbmc-pvr-3513480/Makefile.in.orig xbmc-pvr-3513480.patch/Makefile.in.orig
|
||||
diff -Naur xbmc-pvr-3513480/xbmc/cdrip/CDDARipper.cpp xbmc-pvr-3513480.patch/xbmc/cdrip/CDDARipper.cpp
|
||||
--- xbmc-pvr-3513480/xbmc/cdrip/CDDARipper.cpp 2011-04-25 02:36:33.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/xbmc/cdrip/CDDARipper.cpp 2011-04-25 05:48:10.487548571 +0200
|
||||
@@ -27,7 +27,11 @@
|
||||
#include "CDDAReader.h"
|
||||
#include "StringUtils.h"
|
||||
#include "utils/StringUtils.h"
|
||||
#include "Util.h"
|
||||
+
|
||||
+#ifdef HAVE_LIBMP3LAME
|
||||
@ -72,7 +74,7 @@ diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/CDDARipper.cpp xbmc-10.1-Dharma.patch/xbm
|
||||
#include "EncoderWav.h"
|
||||
#include "EncoderVorbis.h"
|
||||
#include "EncoderFFmpeg.h"
|
||||
@@ -77,9 +81,16 @@
|
||||
@@ -78,9 +82,16 @@
|
||||
case CDDARIP_ENCODER_FLAC:
|
||||
m_pEncoder = new CEncoderFlac();
|
||||
break;
|
||||
@ -90,17 +92,16 @@ diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/CDDARipper.cpp xbmc-10.1-Dharma.patch/xbm
|
||||
}
|
||||
|
||||
// we have to set the tags before we init the Encoder
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/Makefile.in xbmc-10.1-Dharma.patch/xbmc/cdrip/Makefile.in
|
||||
--- xbmc-10.1-Dharma/xbmc/cdrip/Makefile.in 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/cdrip/Makefile.in 2011-03-26 04:55:12.286896848 +0100
|
||||
@@ -6,11 +6,14 @@
|
||||
CDDAReader.cpp \
|
||||
diff -Naur xbmc-pvr-3513480/xbmc/cdrip/Makefile.in xbmc-pvr-3513480.patch/xbmc/cdrip/Makefile.in
|
||||
--- xbmc-pvr-3513480/xbmc/cdrip/Makefile.in 2011-04-25 02:36:33.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/xbmc/cdrip/Makefile.in 2011-04-25 05:51:13.013064387 +0200
|
||||
@@ -3,10 +3,13 @@
|
||||
Encoder.cpp \
|
||||
EncoderFFmpeg.cpp \
|
||||
EncoderFlac.cpp \
|
||||
- EncoderLame.cpp \
|
||||
EncoderVorbis.cpp \
|
||||
EncoderWav.cpp \
|
||||
EncoderFlac.cpp \
|
||||
|
||||
+ifeq (@HAVE_LIBMP3LAME@,1)
|
||||
+ SRCS+=EncoderLame.cpp
|
||||
@ -108,11 +109,11 @@ diff -Naur xbmc-10.1-Dharma/xbmc/cdrip/Makefile.in xbmc-10.1-Dharma.patch/xbmc/c
|
||||
+
|
||||
LIB=cdrip.a
|
||||
|
||||
include ../../Makefile.include
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/GUISettings.cpp xbmc-10.1-Dharma.patch/xbmc/GUISettings.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/GUISettings.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/GUISettings.cpp 2011-03-26 04:55:12.288896808 +0100
|
||||
@@ -325,7 +325,9 @@
|
||||
include @abs_top_srcdir@/Makefile.include
|
||||
diff -Naur xbmc-pvr-3513480/xbmc/settings/GUISettings.cpp xbmc-pvr-3513480.patch/xbmc/settings/GUISettings.cpp
|
||||
--- xbmc-pvr-3513480/xbmc/settings/GUISettings.cpp 2011-04-25 05:47:12.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/xbmc/settings/GUISettings.cpp 2011-04-25 05:48:47.956833472 +0200
|
||||
@@ -324,7 +324,9 @@
|
||||
AddPath(acd,"audiocds.recordingpath",20000,"select writable folder",BUTTON_CONTROL_PATH_INPUT,false,657);
|
||||
AddString(acd, "audiocds.trackpathformat", 13307, "%A - %B/[%N. ][%A - ]%T", EDIT_CONTROL_INPUT, false, 16016);
|
||||
map<int,int> encoders;
|
||||
@ -0,0 +1,18 @@
|
||||
diff -Naur xbmc-a3c804b/xbmc/interfaces/python/XBPython.cpp xbmc-a3c804b.patch/xbmc/interfaces/python/XBPython.cpp
|
||||
--- xbmc-a3c804b/xbmc/interfaces/python/XBPython.cpp 2011-08-17 23:40:00.000000000 +0200
|
||||
+++ xbmc-a3c804b.patch/xbmc/interfaces/python/XBPython.cpp 2011-08-18 03:50:49.652475572 +0200
|
||||
@@ -335,11 +335,9 @@
|
||||
// at http://docs.python.org/using/cmdline.html#environment-variables
|
||||
|
||||
#if !defined(_WIN32)
|
||||
- /* PYTHONOPTIMIZE is set off intentionally when using external Python.
|
||||
- Reason for this is because we cannot be sure what version of Python
|
||||
- was used to compile the various Python object files (i.e. .pyo,
|
||||
- .pyc, etc.). */
|
||||
- // check if we are running as real xbmc.app or just binary
|
||||
+ // Required for python to find optimized code (pyo) files
|
||||
+ setenv("PYTHONOPTIMIZE", "1", 1);
|
||||
+ // check if we are running as real xbmc.app or just binary
|
||||
if (!CUtil::GetFrameworksPath(true).IsEmpty())
|
||||
{
|
||||
// using external python, it's build looking for xxx/lib/python2.6
|
||||
@ -1,6 +1,6 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/userdata/LCD.xml xbmc-Dharma-10.1-c8405db.patch/userdata/LCD.xml
|
||||
--- xbmc-Dharma-10.1-c8405db/userdata/LCD.xml 2011-02-15 13:30:17.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/userdata/LCD.xml 2011-02-15 14:25:46.406031718 +0100
|
||||
diff -Naur xbmc-pvr-3513480/userdata/LCD.xml xbmc-pvr-3513480.patch/userdata/LCD.xml
|
||||
--- xbmc-pvr-3513480/userdata/LCD.xml 2011-04-25 02:36:33.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/userdata/LCD.xml 2011-04-25 05:27:34.956125133 +0200
|
||||
@@ -21,7 +21,7 @@
|
||||
<line>Freemem: $INFO[System.FreeMemory]</line>
|
||||
</video>
|
||||
@ -1,6 +1,6 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py
|
||||
--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2011-02-15 13:30:04.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2011-02-15 14:27:22.774100190 +0100
|
||||
diff -Naur xbmc-pvr-3513480/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py xbmc-pvr-3513480.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py
|
||||
--- xbmc-pvr-3513480/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2011-04-25 02:36:33.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2011-04-25 05:30:03.870260596 +0200
|
||||
@@ -59,9 +59,6 @@
|
||||
target_connected = False
|
||||
target_address = None
|
||||
@ -0,0 +1,12 @@
|
||||
diff -Naur xbmc-30a9070/system/keymaps/keyboard.xml xbmc-30a9070.patch/system/keymaps/keyboard.xml
|
||||
--- xbmc-30a9070/system/keymaps/keyboard.xml 2011-07-28 06:20:13.000000000 +0200
|
||||
+++ xbmc-30a9070.patch/system/keymaps/keyboard.xml 2011-07-28 09:39:57.210973380 +0200
|
||||
@@ -90,7 +90,7 @@
|
||||
<numpadseven>Number7</numpadseven>
|
||||
<numpadeight>Number8</numpadeight>
|
||||
<numpadnine>Number9</numpadnine>
|
||||
- <backslash>ToggleFullScreen</backslash>
|
||||
+ <!-- <backslash>ToggleFullScreen</backslash> -->
|
||||
<home>FirstPage</home>
|
||||
<end>LastPage</end>
|
||||
<!-- Multimedia keyboard keys -->
|
||||
@ -1,7 +1,7 @@
|
||||
diff -Naur xbmc-Dharma-10.1-c8405db/system/Lircmap.xml xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml
|
||||
--- xbmc-Dharma-10.1-c8405db/system/Lircmap.xml 2011-02-15 13:30:17.000000000 +0100
|
||||
+++ xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml 2011-02-15 14:28:14.180069773 +0100
|
||||
@@ -408,4 +408,48 @@
|
||||
diff -Naur xbmc-pvr-3513480/system/Lircmap.xml xbmc-pvr-3513480.patch/system/Lircmap.xml
|
||||
--- xbmc-pvr-3513480/system/Lircmap.xml 2011-04-25 02:36:33.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/system/Lircmap.xml 2011-04-25 05:31:39.632429078 +0200
|
||||
@@ -409,4 +409,48 @@
|
||||
<yellow>KEY_YELLOW</yellow>
|
||||
<blue>KEY_BLUE</blue>
|
||||
</remote>
|
||||
@ -30,7 +30,9 @@ ac_cv_func_malloc_0_nonnull=yes \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
--enable-gcrypt \
|
||||
--enable-fuse \
|
||||
--disable-fuse \
|
||||
|
||||
make -C lib
|
||||
make -C fuse
|
||||
|
||||
$MAKEINSTALL -C lib
|
||||
$MAKEINSTALL -C include
|
||||
|
||||
@ -24,9 +24,3 @@
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/fuse/afpfs $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/fuse/.libs/afpfsd $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/fuse/.libs/mount_afp $INSTALL/usr/bin
|
||||
ln -sf mount_afp $INSTALL/usr/bin/afp_client
|
||||
|
||||
@ -25,8 +25,8 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://sourceforge.net/projects/afpfs-ng/"
|
||||
PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="libiconv libgpg-error libgcrypt fuse ncurses"
|
||||
PKG_BUILD_DEPENDS="toolchain libiconv libgpg-error libgcrypt fuse ncurses"
|
||||
PKG_DEPENDS="libiconv libgpg-error libgcrypt ncurses"
|
||||
PKG_BUILD_DEPENDS="toolchain libiconv libgpg-error libgcrypt ncurses"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="network"
|
||||
PKG_SHORTDESC="afpfs-ng: an Apple Filing Protocol client"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user