mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-27 12:46:53 +00:00
Merge branch 'openelec-next' of github.com:OpenELEC/OpenELEC.tv into openelec-eden
This commit is contained in:
commit
94758e880d
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="linux"
|
PKG_NAME="linux"
|
||||||
PKG_VERSION="3.1-rc6"
|
PKG_VERSION="3.1-rc7"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
@ -0,0 +1,19 @@
|
|||||||
|
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`\
|
@ -1577,7 +1577,7 @@ CONFIG_DVB_USB_DIB0700=m
|
|||||||
# CONFIG_DVB_USB_GP8PSK is not set
|
# CONFIG_DVB_USB_GP8PSK is not set
|
||||||
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
||||||
# CONFIG_DVB_USB_TTUSB2 is not set
|
# CONFIG_DVB_USB_TTUSB2 is not set
|
||||||
# CONFIG_DVB_USB_DTT200U is not set
|
CONFIG_DVB_USB_DTT200U=m
|
||||||
# CONFIG_DVB_USB_OPERA1 is not set
|
# CONFIG_DVB_USB_OPERA1 is not set
|
||||||
CONFIG_DVB_USB_AF9005=m
|
CONFIG_DVB_USB_AF9005=m
|
||||||
CONFIG_DVB_USB_AF9005_REMOTE=m
|
CONFIG_DVB_USB_AF9005_REMOTE=m
|
||||||
|
@ -1806,7 +1806,7 @@ CONFIG_DVB_USB_DIB0700=m
|
|||||||
# CONFIG_DVB_USB_GP8PSK is not set
|
# CONFIG_DVB_USB_GP8PSK is not set
|
||||||
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
||||||
# CONFIG_DVB_USB_TTUSB2 is not set
|
# CONFIG_DVB_USB_TTUSB2 is not set
|
||||||
# CONFIG_DVB_USB_DTT200U is not set
|
CONFIG_DVB_USB_DTT200U=m
|
||||||
# CONFIG_DVB_USB_OPERA1 is not set
|
# CONFIG_DVB_USB_OPERA1 is not set
|
||||||
CONFIG_DVB_USB_AF9005=m
|
CONFIG_DVB_USB_AF9005=m
|
||||||
CONFIG_DVB_USB_AF9005_REMOTE=m
|
CONFIG_DVB_USB_AF9005_REMOTE=m
|
||||||
|
@ -1764,7 +1764,7 @@ CONFIG_DVB_USB_DIB0700=m
|
|||||||
# CONFIG_DVB_USB_GP8PSK is not set
|
# CONFIG_DVB_USB_GP8PSK is not set
|
||||||
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
||||||
# CONFIG_DVB_USB_TTUSB2 is not set
|
# CONFIG_DVB_USB_TTUSB2 is not set
|
||||||
# CONFIG_DVB_USB_DTT200U is not set
|
CONFIG_DVB_USB_DTT200U=m
|
||||||
# CONFIG_DVB_USB_OPERA1 is not set
|
# CONFIG_DVB_USB_OPERA1 is not set
|
||||||
CONFIG_DVB_USB_AF9005=m
|
CONFIG_DVB_USB_AF9005=m
|
||||||
CONFIG_DVB_USB_AF9005_REMOTE=m
|
CONFIG_DVB_USB_AF9005_REMOTE=m
|
||||||
|
@ -1952,7 +1952,7 @@ CONFIG_DVB_USB_DIB0700=m
|
|||||||
# CONFIG_DVB_USB_GP8PSK is not set
|
# CONFIG_DVB_USB_GP8PSK is not set
|
||||||
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
||||||
# CONFIG_DVB_USB_TTUSB2 is not set
|
# CONFIG_DVB_USB_TTUSB2 is not set
|
||||||
# CONFIG_DVB_USB_DTT200U is not set
|
CONFIG_DVB_USB_DTT200U=m
|
||||||
# CONFIG_DVB_USB_OPERA1 is not set
|
# CONFIG_DVB_USB_OPERA1 is not set
|
||||||
CONFIG_DVB_USB_AF9005=m
|
CONFIG_DVB_USB_AF9005=m
|
||||||
CONFIG_DVB_USB_AF9005_REMOTE=m
|
CONFIG_DVB_USB_AF9005_REMOTE=m
|
||||||
|
@ -1949,7 +1949,7 @@ CONFIG_DVB_USB_DIB0700=m
|
|||||||
# CONFIG_DVB_USB_GP8PSK is not set
|
# CONFIG_DVB_USB_GP8PSK is not set
|
||||||
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
||||||
# CONFIG_DVB_USB_TTUSB2 is not set
|
# CONFIG_DVB_USB_TTUSB2 is not set
|
||||||
# CONFIG_DVB_USB_DTT200U is not set
|
CONFIG_DVB_USB_DTT200U=m
|
||||||
# CONFIG_DVB_USB_OPERA1 is not set
|
# CONFIG_DVB_USB_OPERA1 is not set
|
||||||
CONFIG_DVB_USB_AF9005=m
|
CONFIG_DVB_USB_AF9005=m
|
||||||
CONFIG_DVB_USB_AF9005_REMOTE=m
|
CONFIG_DVB_USB_AF9005_REMOTE=m
|
||||||
|
@ -1828,7 +1828,7 @@ CONFIG_DVB_USB_DIB0700=m
|
|||||||
# CONFIG_DVB_USB_GP8PSK is not set
|
# CONFIG_DVB_USB_GP8PSK is not set
|
||||||
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
||||||
# CONFIG_DVB_USB_TTUSB2 is not set
|
# CONFIG_DVB_USB_TTUSB2 is not set
|
||||||
# CONFIG_DVB_USB_DTT200U is not set
|
CONFIG_DVB_USB_DTT200U=m
|
||||||
# CONFIG_DVB_USB_OPERA1 is not set
|
# CONFIG_DVB_USB_OPERA1 is not set
|
||||||
CONFIG_DVB_USB_AF9005=m
|
CONFIG_DVB_USB_AF9005=m
|
||||||
CONFIG_DVB_USB_AF9005_REMOTE=m
|
CONFIG_DVB_USB_AF9005_REMOTE=m
|
||||||
|
@ -1778,7 +1778,7 @@ CONFIG_DVB_USB_DIB0700=m
|
|||||||
# CONFIG_DVB_USB_GP8PSK is not set
|
# CONFIG_DVB_USB_GP8PSK is not set
|
||||||
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
||||||
# CONFIG_DVB_USB_TTUSB2 is not set
|
# CONFIG_DVB_USB_TTUSB2 is not set
|
||||||
# CONFIG_DVB_USB_DTT200U is not set
|
CONFIG_DVB_USB_DTT200U=m
|
||||||
# CONFIG_DVB_USB_OPERA1 is not set
|
# CONFIG_DVB_USB_OPERA1 is not set
|
||||||
CONFIG_DVB_USB_AF9005=m
|
CONFIG_DVB_USB_AF9005=m
|
||||||
CONFIG_DVB_USB_AF9005_REMOTE=m
|
CONFIG_DVB_USB_AF9005_REMOTE=m
|
||||||
|
@ -1869,7 +1869,7 @@ CONFIG_DVB_USB_DIB0700=m
|
|||||||
# CONFIG_DVB_USB_GP8PSK is not set
|
# CONFIG_DVB_USB_GP8PSK is not set
|
||||||
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
||||||
# CONFIG_DVB_USB_TTUSB2 is not set
|
# CONFIG_DVB_USB_TTUSB2 is not set
|
||||||
# CONFIG_DVB_USB_DTT200U is not set
|
CONFIG_DVB_USB_DTT200U=m
|
||||||
# CONFIG_DVB_USB_OPERA1 is not set
|
# CONFIG_DVB_USB_OPERA1 is not set
|
||||||
CONFIG_DVB_USB_AF9005=m
|
CONFIG_DVB_USB_AF9005=m
|
||||||
CONFIG_DVB_USB_AF9005_REMOTE=m
|
CONFIG_DVB_USB_AF9005_REMOTE=m
|
||||||
|
@ -1823,7 +1823,7 @@ CONFIG_DVB_USB_DIB0700=m
|
|||||||
# CONFIG_DVB_USB_GP8PSK is not set
|
# CONFIG_DVB_USB_GP8PSK is not set
|
||||||
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
||||||
# CONFIG_DVB_USB_TTUSB2 is not set
|
# CONFIG_DVB_USB_TTUSB2 is not set
|
||||||
# CONFIG_DVB_USB_DTT200U is not set
|
CONFIG_DVB_USB_DTT200U=m
|
||||||
# CONFIG_DVB_USB_OPERA1 is not set
|
# CONFIG_DVB_USB_OPERA1 is not set
|
||||||
CONFIG_DVB_USB_AF9005=m
|
CONFIG_DVB_USB_AF9005=m
|
||||||
CONFIG_DVB_USB_AF9005_REMOTE=m
|
CONFIG_DVB_USB_AF9005_REMOTE=m
|
||||||
|
@ -1663,7 +1663,7 @@ CONFIG_DVB_USB_DIB0700=m
|
|||||||
# CONFIG_DVB_USB_GP8PSK is not set
|
# CONFIG_DVB_USB_GP8PSK is not set
|
||||||
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
# CONFIG_DVB_USB_NOVA_T_USB2 is not set
|
||||||
# CONFIG_DVB_USB_TTUSB2 is not set
|
# CONFIG_DVB_USB_TTUSB2 is not set
|
||||||
# CONFIG_DVB_USB_DTT200U is not set
|
CONFIG_DVB_USB_DTT200U=m
|
||||||
# CONFIG_DVB_USB_OPERA1 is not set
|
# CONFIG_DVB_USB_OPERA1 is not set
|
||||||
CONFIG_DVB_USB_AF9005=m
|
CONFIG_DVB_USB_AF9005=m
|
||||||
CONFIG_DVB_USB_AF9005_REMOTE=m
|
CONFIG_DVB_USB_AF9005_REMOTE=m
|
||||||
|
Loading…
x
Reference in New Issue
Block a user