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

This commit is contained in:
Stephan Raue 2013-01-03 01:19:27 +01:00
commit cd452f8288
26 changed files with 64 additions and 44 deletions

View File

@ -20,12 +20,12 @@
################################################################################
PKG_NAME="pcsc-lite"
PKG_VERSION="1.8.6"
PKG_VERSION="1.8.7"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://pcsclite.alioth.debian.org/pcsclite.html"
PKG_URL="https://alioth.debian.org/frs/download.php/3757/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_URL="https://alioth.debian.org/frs/download.php/3842/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain libusb"
PKG_PRIORITY="optional"

View File

@ -28,6 +28,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $PKG_BUILD/build/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $PKG_BUILD/build/utils/list_smargo $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -PR $PKG_DIR/config/oscam.conf $ADDON_BUILD/$PKG_ADDON_ID/oscam-default.conf
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib

View File

@ -1,3 +1,7 @@
3.0.4
- update to oscam-8030
- update to pcsc-lite-1.8.7
3.0.3
- update to oscam-7968

View File

@ -20,8 +20,8 @@
################################################################################
PKG_NAME="oscam"
PKG_VERSION="7968"
PKG_REV="3"
PKG_VERSION="8030"
PKG_REV="4"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.streamboard.tv/oscam/wiki"

View File

@ -1,3 +1,6 @@
3.0.3
- update to pcsc-lite-1.8.7
3.0.2
- update to pcsc-lite-1.8.6
- update to ccid-1.4.8

View File

@ -21,7 +21,7 @@
PKG_NAME="pcscd-addon"
PKG_VERSION="3.0"
PKG_REV="2"
PKG_REV="3"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv"

View File

@ -32,6 +32,13 @@ else
LIBCEC_RPI="--disable-rpi"
fi
if [ "$OPENGLES" = "marvell-libgfx" ]; then
LIBCEC_TDA995X="--enable-cubox --with-tda995x-toolkit-path=$(kernel_path)/drivers/video/dovefb/nxp_hdmi"
else
LIBCEC_TDA995X="--disable-cubox"
fi
# dont use some optimizations because of build problems
LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
@ -42,7 +49,8 @@ cd $PKG_BUILD
--sysconfdir=/etc \
--disable-static \
--enable-shared \
$LIBCEC_RPI
$LIBCEC_RPI \
$LIBCEC_TDA995X
make

View File

@ -41,6 +41,11 @@ NBD_DEVS="0"
/bin/busybox mount -t proc none /proc
/bin/busybox mount -t sysfs none /sys
# load any configuration
if [ -f "/etc/initramfs.conf" ]; then
. /etc/initramfs.conf
fi
# hide kernel log messages on console
echo '1 4 1 7' > /proc/sys/kernel/printk
@ -351,7 +356,9 @@ NBD_DEVS="0"
if [ -e /dev/fb0 -a ! "$SPLASH" = "no" ]; then
# set framebuffer to a default resolution (1024x768-32)
if [ ! "$SWITCH_FRAMEBUFFER" = "no" ]; then
fbset -g 1024 768 1024 768 32
fi
# load splash
if [ -f /flash/oemsplash.png ]; then
@ -464,10 +471,6 @@ NBD_DEVS="0"
INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'`
SYSTEM_TORAM_LIMIT=1024000
if [ -f "/etc/initramfs.conf" ]; then
. /etc/initramfs.conf
fi
if [ "$SYSTEM_TORAM" = "no" -o "$INSTALLED_MEMORY" -lt "$SYSTEM_TORAM_LIMIT" ]; then
mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop"
else

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="5ea5421"
PKG_VERSION="0a58027"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="5ea5421"
PKG_VERSION="0a58027"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -31,7 +31,7 @@ fi
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/$VMETA_LIBDIR/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/lib/libmiscgen.so $SYSROOT_PREFIX/usr/lib
cp -P $PKG_BUILD/lib/libmiscgen.so $INSTALL/usr/lib
mkdir -p $INSTALL/lib/udev/rules.d
cp -PR $PKG_BUILD/etc/*.rules $INSTALL/lib/udev/rules.d

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="upower"
PKG_VERSION="0.9.18"
PKG_VERSION="0.9.19"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,19 +1,11 @@
Section "Monitor"
Identifier "DVI"
Option "Position" "0 0"
Option "Enable" "true"
Option "PreferredMode" "1920x1080"
# Option "PreferredMode" "1280x720"
# Option "Rotate" "left"
# Option "NoDDCValue" "true"
# Option "PreferredMode" "800x600"
EndSection
Section "Monitor"
Identifier "VGA"
Identifier "HDMI"
Option "Position" "0 0"
Option "Enable" "true"
Option "PreferredMode" "1920x1080"
# Option "PreferredMode" "1280x720"
# Option "PreferredMode" "1024x768"
# Option "PreferredMode" "640x480"
# Option "PreferredMode" "800x600"
EndSection
@ -21,9 +13,7 @@ Section "Device"
Identifier "Driver0"
Screen 0
Driver "dovefb"
Option "debug" "false"
# Option "ShadowFB" "TRUE"
# Option "UseGPU" "FALSE"
Option "debug" "TRUE"
Option "ExaAccel" "FALSE"
Option "Solid" "TRUE"
Option "Copy" "TRUE"
@ -32,22 +22,20 @@ Section "Device"
Option "SWCopy" "FALSE"
Option "Commit" "FALSE"
Option "XvAccel" "TRUE"
Option "HWCursor" "false"
Option "HWCursor" "FALSE"
Option "EncFunc" "7"
Option "UseDriverBuiltInMode" "TRUE"
Option "EnableDualDisplay" "true"
Option "Monitor-VGA" "VGA"
Option "Monitor-lvds" "DVI"
Option "EnableDualDisplay" "FALSE"
EndSection
Section "Screen"
Device "Driver0"
Identifier "Primary Screen"
DefaultDepth 32
DefaultFbBpp 32
Monitor "HDMI"
Identifier "Screen"
# DefaultDepth 24
# DefaultFbBpp 24
SubSection "Display"
Viewport 0 0
Virtual 2048 2048
EndSubSection
EndSection

View File

@ -0,0 +1,12 @@
diff -Naur xf86-video-dove-0.3.4/src/Makefile.am xf86-video-dove-0.3.4.patch/src/Makefile.am
--- xf86-video-dove-0.3.4/src/Makefile.am 2011-03-07 18:52:09.000000000 +0100
+++ xf86-video-dove-0.3.4.patch/src/Makefile.am 2013-01-01 03:58:19.411541528 +0100
@@ -24,7 +24,7 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-INCLUDES = -I/usr/include/HAL -I$(top_srcdir)/src/video
+INCLUDES = -I$(top_srcdir)/src/video
AM_CFLAGS = @XORG_CFLAGS@
dovefb_drv_la_LTLIBRARIES = dovefb_drv.la

View File

@ -34,8 +34,9 @@ echo "copying sources..."
rm -rf oscam-$SVN_REV
cp -R oscam-latest oscam-$SVN_REV
echo "cleaning sources..."
find oscam-$SVN_REV -name .svn -exec rm -rf {} ";"
# webif needs versioning info
#echo "cleaning sources..."
# find oscam-$SVN_REV -name .svn -exec rm -rf {} ";"
echo "packing sources..."
tar cvjf oscam-$SVN_REV.tar.bz2 oscam-$SVN_REV