Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.0

This commit is contained in:
Stephan Raue 2012-12-08 05:18:05 +01:00
commit 68391a604e
27 changed files with 96 additions and 62 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libcec"
PKG_VERSION="2.0.4"
PKG_VERSION="2.0.5"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="e979ca9"
PKG_VERSION="ae60d24"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="e979ca9"
PKG_VERSION="ae60d24"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,11 +0,0 @@
diff -Naur xbmc-1677554/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h xbmc-1677554.patch/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h
--- xbmc-1677554/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h 2012-10-27 20:43:47.000000000 +0200
+++ xbmc-1677554.patch/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h 2012-10-28 16:39:35.842914672 +0100
@@ -21,6 +21,7 @@
#include <sys/socket.h>
#include <sys/time.h>
//#include <math.h>
+#include <unistd.h>
#ifdef DEB_PACK
#include <xbmc/xbmcclient.h>
#else

View File

@ -23,6 +23,7 @@
. config/options $1
cd $PKG_BUILD/driver/linux
autoreconf -vif
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="crystalhd"
PKG_VERSION="171"
PKG_VERSION="3cb6786"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://code.google.com/p/crystalhd-for-osx/"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_SITE="http://git.linuxtv.org/jarod/crystalhd.git"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="linux"
PKG_BUILD_DEPENDS="toolchain linux"
PKG_PRIORITY="optional"

View File

@ -1,28 +0,0 @@
diff -Naur crystalhd-171/driver/linux/crystalhd_lnx.h crystalhd-171.patch/driver/linux/crystalhd_lnx.h
--- crystalhd-171/driver/linux/crystalhd_lnx.h 2010-10-18 01:56:15.000000000 +0200
+++ crystalhd-171.patch/driver/linux/crystalhd_lnx.h 2012-07-24 00:17:05.257202412 +0200
@@ -45,7 +45,10 @@
#include <linux/io.h>
#include <asm/irq.h>
#include <asm/pgtable.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
#include <asm/system.h>
+#endif
#include <linux/uaccess.h>
#include "crystalhd_cmds.h"
diff -Naur crystalhd-171/driver/linux/crystalhd_misc.h crystalhd-171.patch/driver/linux/crystalhd_misc.h
--- crystalhd-171/driver/linux/crystalhd_misc.h 2010-10-18 01:56:15.000000000 +0200
+++ crystalhd-171.patch/driver/linux/crystalhd_misc.h 2012-07-24 00:16:57.091091576 +0200
@@ -35,7 +35,10 @@
#include <linux/ioctl.h>
#include <linux/dma-mapping.h>
#include <linux/sched.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
#include <asm/system.h>
+#endif
#include "bc_dts_glob_lnx.h"
#include "crystalhd_hw.h"

View File

@ -1,14 +0,0 @@
diff -Naur crystalhd-171/include/bc_dts_glob_lnx.h crystalhd-171.patch/include/bc_dts_glob_lnx.h
--- crystalhd-171/include/bc_dts_glob_lnx.h 2010-10-18 01:56:14.000000000 +0200
+++ crystalhd-171.patch/include/bc_dts_glob_lnx.h 2010-10-24 02:53:16.739741578 +0200
@@ -76,8 +76,8 @@
BC_LINK_MAX_OPENS = 3, /* Maximum simultaneous opens*/
BC_LINK_MAX_SGLS = 1024, /* Maximum SG elements 4M/4K */
BC_TX_LIST_CNT = 2, /* Max Tx DMA Rings */
- //BC_RX_LIST_CNT = 8, /* Max Rx DMA Rings*/
- BC_RX_LIST_CNT = 16, /* Max Rx DMA Rings*/
+ BC_RX_LIST_CNT = 8, /* Max Rx DMA Rings*/
+ //BC_RX_LIST_CNT = 16, /* Max Rx DMA Rings*/
BC_PROC_OUTPUT_TIMEOUT = 2000, /* Milliseconds */
BC_INFIFO_THRESHOLD = 0x10000,
};

View File

@ -0,0 +1,12 @@
diff -Naur crystalhd-3cb6786/linux_lib/libcrystalhd/libcrystalhd_fwdiag_if.cpp crystalhd-3cb6786.patch/linux_lib/libcrystalhd/libcrystalhd_fwdiag_if.cpp
--- crystalhd-3cb6786/linux_lib/libcrystalhd/libcrystalhd_fwdiag_if.cpp 2012-12-08 03:31:38.000000000 +0100
+++ crystalhd-3cb6786.patch/linux_lib/libcrystalhd/libcrystalhd_fwdiag_if.cpp 2012-12-08 04:48:46.572661023 +0100
@@ -233,7 +233,7 @@
}
else
- DebugLog_Trace(LDIL_DBG,"Uart Set Sucessfully\n");
+ DebugLog_Trace(LDIL_DBG,"Uart Set Successfully\n");
//START_PROCESSOR bit in DCI_CMD.
RegVal = 0;

View File

@ -0,0 +1,18 @@
diff -Naur crystalhd-3cb6786/linux_lib/libcrystalhd/libcrystalhd_priv.h crystalhd-3cb6786.patch/linux_lib/libcrystalhd/libcrystalhd_priv.h
--- crystalhd-3cb6786/linux_lib/libcrystalhd/libcrystalhd_priv.h 2012-12-08 03:31:38.000000000 +0100
+++ crystalhd-3cb6786.patch/linux_lib/libcrystalhd/libcrystalhd_priv.h 2012-12-08 04:53:46.515531561 +0100
@@ -62,10 +62,10 @@
BC_INPUT_MDATA_POOL_SZ_COLLECT = 256, /* Input Meta Data Pool size for collector */
BC_MAX_SW_VOUT_BUFFS = BC_RX_LIST_CNT, /* MAX - pre allocated buffers..*/
RX_START_DELIVERY_THRESHOLD = 0,
- PAUSE_DECODER_THRESHOLD = 12,
- RESUME_DECODER_THRESHOLD = 5,
- FLEA_RT_PD_THRESHOLD = 14,
- FLEA_RT_PU_THRESHOLD = 3,
+ PAUSE_DECODER_THRESHOLD = 6,
+ RESUME_DECODER_THRESHOLD = 3,
+ FLEA_RT_PD_THRESHOLD = 7,
+ FLEA_RT_PU_THRESHOLD = 2,
HARDWARE_INIT_RETRY_CNT = 10,
HARDWARE_INIT_RETRY_LINK_CNT = 1,
};

View File

@ -0,0 +1,12 @@
diff -Naur crystalhd-3cb6786/include/bc_dts_glob_lnx.h crystalhd-3cb6786.patch/include/bc_dts_glob_lnx.h
--- crystalhd-3cb6786/include/bc_dts_glob_lnx.h 2012-12-08 03:31:38.000000000 +0100
+++ crystalhd-3cb6786.patch/include/bc_dts_glob_lnx.h 2012-12-08 04:50:12.004056345 +0100
@@ -76,7 +76,7 @@
BC_LINK_MAX_OPENS = 3, /* Maximum simultaneous opens*/
BC_LINK_MAX_SGLS = 1024, /* Maximum SG elements 4M/4K */
BC_TX_LIST_CNT = 2, /* Max Tx DMA Rings */
- BC_RX_LIST_CNT = 16, /* Max Rx DMA Rings*/
+ BC_RX_LIST_CNT = 8, /* Max Rx DMA Rings*/
BC_PROC_OUTPUT_TIMEOUT = 2000, /* Milliseconds */
BC_INFIFO_THRESHOLD = 0x10000,
};

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libnfs"
PKG_VERSION="1.3.0"
PKG_VERSION="1.5.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -35,8 +35,8 @@ export INSTALL=$BUILD/image/system
BUILD_DATE=`date +%Y%m%d%H%M%S`
if [ "$OPENELEC_VERSION" = devel -o "$OPENELEC_VERSION" = debug ]; then
GIT_BUILD=`git log --pretty=format:'' | wc -l`
GIT_HASH=`git log -n1 --format=%H`
GIT_BUILD=`git rev-list HEAD | wc -l`
GIT_HASH=`git rev-parse HEAD`
OPENELEC_VERSION=$OPENELEC_VERSION-$BUILD_DATE-r$GIT_BUILD
fi

View File

@ -0,0 +1,44 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
echo "getting sources..."
if [ ! -d crystalhd.git ]; then
git clone git://linuxtv.org/jarod/crystalhd.git -b master crystalhd.git
fi
cd crystalhd.git
git pull
GIT_REV=`git log -n1 --format=%h`
cd ..
echo "copying sources..."
rm -rf crystalhd-$GIT_REV
cp -R crystalhd.git crystalhd-$GIT_REV
echo "cleaning sources..."
rm -rf crystalhd-$GIT_REV/.git
echo "packing sources..."
tar cvJf crystalhd-$GIT_REV.tar.xz crystalhd-$GIT_REV
echo "remove temporary sourcedir..."
rm -rf crystalhd-$GIT_REV