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

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

Browse Source
This commit is contained in:
Stephan Raue 2011-07-15 17:50:02 +02:00
commit 4d8642dbad
5 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/multimedia/rtmpdump/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="rtmpdump"
PKG_VERSION="6155179"
PKG_VERSION="c28f1ba"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

3
packages/x11/driver/xf86-video-nvidia/meta
View File

@ -19,8 +19,7 @@
################################################################################
PKG_NAME="xf86-video-nvidia"
#PKG_VERSION="280.04"
PKG_VERSION="270.41.19"
PKG_VERSION="280.04"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="nonfree"

24
packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-270.41.19-linux-3.0_compat.patch
View File

@ -1,24 +0,0 @@
diff -Naur NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/conftest.sh NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/conftest.sh
--- NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/conftest.sh 2011-05-17 08:32:19.000000000 +0200
+++ NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/conftest.sh 2011-07-09 18:21:30.602664961 +0200
@@ -76,7 +76,7 @@
}
build_cflags() {
- BASE_CFLAGS="-D__KERNEL__ \
+ BASE_CFLAGS="-O2 -D__KERNEL__ \
-DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \
-nostdinc -isystem $ISYSTEM"
diff -Naur NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/nv-linux.h NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/nv-linux.h
--- NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/nv-linux.h 2011-05-17 08:32:19.000000000 +0200
+++ NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/nv-linux.h 2011-07-09 18:22:16.317252983 +0200
@@ -34,6 +34,8 @@
# error This driver does not support 2.5 kernels!
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 7, 0)
# define KERNEL_2_6
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0)
+# define KERNEL_2_6
#else
# error This driver does not support development kernels!
#endif

4
projects/Intel/linux/linux.i386.conf
View File

@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/i386 3.0.0-rc6 Kernel Configuration
# Linux/i386 3.0.0-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -2141,7 +2141,7 @@ CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_CODEC_REALTEK=y
# CONFIG_SND_HDA_CODEC_ANALOG is not set
# CONFIG_SND_HDA_CODEC_SIGMATEL is not set
# CONFIG_SND_HDA_CODEC_VIA is not set
CONFIG_SND_HDA_CODEC_VIA=y
CONFIG_SND_HDA_CODEC_HDMI=y
# CONFIG_SND_HDA_CODEC_CIRRUS is not set
CONFIG_SND_HDA_CODEC_CONEXANT=y

4
projects/Intel/linux/linux.x86_64.conf
View File

@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/x86_64 3.0.0-rc6 Kernel Configuration
# Linux/x86_64 3.0.0-rc7 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@ -2083,7 +2083,7 @@ CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_CODEC_REALTEK=y
# CONFIG_SND_HDA_CODEC_ANALOG is not set
# CONFIG_SND_HDA_CODEC_SIGMATEL is not set
# CONFIG_SND_HDA_CODEC_VIA is not set
CONFIG_SND_HDA_CODEC_VIA=y
CONFIG_SND_HDA_CODEC_HDMI=y
# CONFIG_SND_HDA_CODEC_CIRRUS is not set
CONFIG_SND_HDA_CODEC_CONEXANT=y