jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stephan Raue 2013-08-08 01:39:27 +02:00
commit fd39b9263e
23 changed files with 45 additions and 2439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/graphics/bcm2835-driver/package.mk
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="bcm2835-driver" PKG_NAME="bcm2835-driver"
PKG_VERSION="89ac8f4" PKG_VERSION="fb15696"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"

2
packages/mediacenter/service.openelec.settings/meta
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="service.openelec.settings" PKG_NAME="service.openelec.settings"
PKG_VERSION="0.1.30" PKG_VERSION="0.2.1"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="prop." PKG_LICENSE="prop."

2431
packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-fixes-0.1.patch
View File

File diff suppressed because it is too large Load Diff

2
packages/mediacenter/service.openelec.settings/unpack
View File

@ -30,7 +30,7 @@ mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
echo "### Applying upstream patches ###" echo "### Applying upstream patches ###"
for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do for patch in `ls $PKG_DIR/patches.upstream/*.patch 2>/dev/null`; do
cat $patch | patch -d \ cat $patch | patch -d \
`echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1 `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1
done done

2
packages/mediacenter/xbmc-theme-Confluence/meta
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc-theme-Confluence" PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="12.2-e40d13d" PKG_VERSION="12.2-a603ef9"
if [ "$XBMC" = "master" ]; then if [ "$XBMC" = "master" ]; then
PKG_VERSION="13.alpha-df91888" PKG_VERSION="13.alpha-df91888"
elif [ "$XBMC" = "xbmc-aml" ]; then elif [ "$XBMC" = "xbmc-aml" ]; then

2
packages/mediacenter/xbmc/package.mk
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc" PKG_NAME="xbmc"
PKG_VERSION="12.2-e40d13d" PKG_VERSION="12.2-a603ef9"
if [ "$XBMC" = "master" ]; then if [ "$XBMC" = "master" ]; then
PKG_VERSION="13.alpha-df91888" PKG_VERSION="13.alpha-df91888"
elif [ "$XBMC" = "xbmc-aml" ]; then elif [ "$XBMC" = "xbmc-aml" ]; then

0
packages/mediacenter/xbmc/patches/12.2-e40d13d/todo/xbmc-990.27-PR2232.patch.bk → packages/mediacenter/xbmc/patches/12.2-a603ef9/todo/xbmc-990.27-PR2232.patch.bk
View File

0
packages/mediacenter/xbmc/patches/12.2-e40d13d/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk → packages/mediacenter/xbmc/patches/12.2-a603ef9/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk
View File

0
packages/mediacenter/xbmc/patches/12.2-e40d13d/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk → packages/mediacenter/xbmc/patches/12.2-a603ef9/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk
View File

0
packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-321-texturepacker-hostflags-and-rework.patch → packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-321-texturepacker-hostflags-and-rework.patch
View File

0
packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch → packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-452-change_lcd_content-0.1.patch → packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-452-change_lcd_content-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-453-add_openelec.tv_RSS_news-0.1.patch → packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-453-add_openelec.tv_RSS_news-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-990.00-remove-windowed-display-mode.patch → packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-990.00-remove-windowed-display-mode.patch
View File

0
packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch → packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch
View File

0
packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-995.11-enable-vpp-deinterlacing.patch → packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-995.11-enable-vpp-deinterlacing.patch
View File

0
packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch → packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch
View File

0
packages/mediacenter/xbmc/patches/12.2-e40d13d/xbmc-995.13-vpp-fix-skipping.patch → packages/mediacenter/xbmc/patches/12.2-a603ef9/xbmc-995.13-vpp-fix-skipping.patch
View File

2
packages/multimedia/libvdpau/meta
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="libvdpau" PKG_NAME="libvdpau"
PKG_VERSION="0.6" PKG_VERSION="0.7"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

1
packages/network/bluez/init.d/55_obexd
View File

@ -41,6 +41,7 @@
if [ "$BLUEZ_ENABLED" == "true" -a "$OBEXD_ENABLED" == "true" ]; then if [ "$BLUEZ_ENABLED" == "true" -a "$OBEXD_ENABLED" == "true" ]; then
progress "Starting obexd" progress "Starting obexd"
wait_for_dbus wait_for_dbus
mkdir -p "$OBEXD_ROOT"
/usr/lib/bluetooth/obexd $OBEXD_DEBUG -r "$OBEXD_ROOT" &>/dev/null /usr/lib/bluetooth/obexd $OBEXD_DEBUG -r "$OBEXD_ROOT" &>/dev/null
fi fi
)& )&

2
packages/tools/bcm2835-bootloader/package.mk
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="bcm2835-bootloader" PKG_NAME="bcm2835-bootloader"
PKG_VERSION="89ac8f4" PKG_VERSION="fb15696"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="arm" PKG_ARCH="arm"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"

2
packages/x11/driver/xf86-video-intel/package.mk
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xf86-video-intel" PKG_NAME="xf86-video-intel"
PKG_VERSION="2.21.13" PKG_VERSION="2.21.14"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="i386 x86_64" PKG_ARCH="i386 x86_64"
PKG_LICENSE="OSS" PKG_LICENSE="OSS"

36
packages/x11/driver/xf86-video-intel/patches/xf86-video-intel-dri_configure.patch Normal file
View File

@ -0,0 +1,36 @@
From 6004870d53221caf05a330fcfc8a72e68b2b8898 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 06 Aug 2013 03:03:18 +0000
Subject: configure.ac: fix dri enabled with kms only picked
Otherwise we'd fail saying DRI1 wasn't possible, when that
is exactly what we asked for.
[ickle: The breakage was introduced with
commit bd6ffd1ad2f903215d2c631252e742a0f6893054 [2.21.14]
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Jul 27 15:33:19 2013 +0100
configure: Print a summary of compilation options
which modified the search to only take place if UMS was enabled, but
missed mollifying the resulting error.]
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
diff --git a/configure.ac b/configure.ac
index 104113e..88f29cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -433,7 +433,7 @@ else
DRI1_CFLAGS=""
DRI1_LIBS=""
- if test "x$enable_dri" = "xyes"; then
+ if test "x$enable_dri" = "xyes" -a "x$KMS_ONLY" != "xyes"; then
AC_MSG_ERROR([DRI1 requested but prerequisites not found])
fi
fi
--
cgit v0.9.0.2-2-gbebe