mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.0
This commit is contained in:
Stephan Raue
commit
be0fd9c615
@ -74,6 +74,11 @@ get_graphicdrivers() {
|
||||
XINERAMA_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "nvidia-legacy" ]; then
|
||||
XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
|
||||
XINERAMA_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "virtualbox" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS,swrast"
|
||||
XORG_DRIVERS="$XORG_DRIVERS virtualbox"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,22 @@
|
||||
--- linux/drivers/media/rc/ir-rc6-decoder.c 2012-11-25 22:08:13.148418669 -0800
|
||||
+++ linux.patch/drivers/media/rc/ir-rc6-decoder.c 2012-11-25 22:07:48.864417975 -0800
|
||||
@@ -39,7 +39,6 @@
|
||||
#define RC6_STARTBIT_MASK 0x08 /* for the header bits */
|
||||
#define RC6_6A_MCE_TOGGLE_MASK 0x8000 /* for the body bits */
|
||||
#define RC6_6A_LCC_MASK 0xffff0000 /* RC6-6A-32 long customer code mask */
|
||||
-#define RC6_6A_MCE_CC 0x800f0000 /* MCE customer code */
|
||||
#ifndef CHAR_BIT
|
||||
#define CHAR_BIT 8 /* Normally in <limits.h> */
|
||||
#endif
|
||||
@@ -242,9 +241,8 @@ again:
|
||||
}
|
||||
|
||||
scancode = data->body;
|
||||
- if (data->count == RC6_6A_32_NBITS &&
|
||||
- (scancode & RC6_6A_LCC_MASK) == RC6_6A_MCE_CC) {
|
||||
- /* MCE RC */
|
||||
+ if (data->count == RC6_6A_32_NBITS) {
|
||||
+ /* MCE compatible RC */
|
||||
toggle = (scancode & RC6_6A_MCE_TOGGLE_MASK) ? 1 : 0;
|
||||
scancode &= ~RC6_6A_MCE_TOGGLE_MASK;
|
||||
} else {
|
||||
@ -0,0 +1,45 @@
|
||||
The array channel_allocations[] is an ordered list, add function to get
|
||||
correct order by ca_index.
|
||||
|
||||
Signed-off-by: Wang Xingchao <xingchao.wang at intel.com>
|
||||
---
|
||||
sound/pci/hda/patch_hdmi.c | 15 ++++++++++++++-
|
||||
1 file changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
|
||||
index d9439c5..6ac21d4 100644
|
||||
--- a/sound/pci/hda/patch_hdmi.c
|
||||
+++ b/sound/pci/hda/patch_hdmi.c
|
||||
@@ -469,6 +469,17 @@ static void init_channel_allocations(void)
|
||||
}
|
||||
}
|
||||
|
||||
+static int get_channel_allocation_order(int ca)
|
||||
+{
|
||||
+ int i;
|
||||
+
|
||||
+ for (i = 0; i < ARRAY_SIZE(channel_allocations); i++) {
|
||||
+ if (channel_allocations[i].ca_index == ca)
|
||||
+ break;
|
||||
+ }
|
||||
+ return i;
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* The transformation takes two steps:
|
||||
*
|
||||
@@ -541,9 +552,11 @@ static void hdmi_setup_channel_mapping(struct hda_codec *codec,
|
||||
{
|
||||
int i;
|
||||
int err;
|
||||
+ int order;
|
||||
|
||||
+ order = get_channel_allocation_order(ca);
|
||||
if (hdmi_channel_mapping[ca][1] == 0) {
|
||||
- for (i = 0; i < channel_allocations[ca].channels; i++)
|
||||
+ for (i = 0; i < channel_allocations[order].channels; i++)
|
||||
hdmi_channel_mapping[ca][i] = i | (i << 4);
|
||||
for (; i < 8; i++)
|
||||
hdmi_channel_mapping[ca][i] = 0xf | (i << 4);
|
||||
--
|
||||
1.7.9.5
|
||||
@ -0,0 +1,130 @@
|
||||
HDMI channel remapping apparently effects HBR packets on Intel's chips.
|
||||
For compressed non-PCM audio, use "straight-through" channel mapping.
|
||||
For uncompressed multi-channel pcm audio, use normal channel mapping.
|
||||
|
||||
Signed-off-by: Wang Xingchao <xingchao.wang at intel.com>
|
||||
---
|
||||
sound/pci/hda/patch_hdmi.c | 36 ++++++++++++++++++++++++++++++++----
|
||||
1 file changed, 32 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
|
||||
index 6ac21d4..a87f8b2 100644
|
||||
--- a/sound/pci/hda/patch_hdmi.c
|
||||
+++ b/sound/pci/hda/patch_hdmi.c
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <linux/module.h>
|
||||
#include <sound/core.h>
|
||||
#include <sound/jack.h>
|
||||
+#include <sound/asoundef.h>
|
||||
#include "hda_codec.h"
|
||||
#include "hda_local.h"
|
||||
#include "hda_jack.h"
|
||||
@@ -60,6 +61,7 @@ struct hdmi_spec_per_cvt {
|
||||
u32 rates;
|
||||
u64 formats;
|
||||
unsigned int maxbps;
|
||||
+ bool non_pcm;
|
||||
};
|
||||
|
||||
struct hdmi_spec_per_pin {
|
||||
@@ -548,13 +550,17 @@ static void hdmi_debug_channel_mapping(struct hda_codec *codec,
|
||||
|
||||
static void hdmi_setup_channel_mapping(struct hda_codec *codec,
|
||||
hda_nid_t pin_nid,
|
||||
+ hda_nid_t cvt_nid,
|
||||
+ bool non_pcm,
|
||||
int ca)
|
||||
{
|
||||
int i;
|
||||
int err;
|
||||
int order;
|
||||
+ int non_pcm_mapping[8];
|
||||
|
||||
order = get_channel_allocation_order(ca);
|
||||
+
|
||||
if (hdmi_channel_mapping[ca][1] == 0) {
|
||||
for (i = 0; i < channel_allocations[order].channels; i++)
|
||||
hdmi_channel_mapping[ca][i] = i | (i << 4);
|
||||
@@ -562,10 +568,17 @@ static void hdmi_setup_channel_mapping(struct hda_codec *codec,
|
||||
hdmi_channel_mapping[ca][i] = 0xf | (i << 4);
|
||||
}
|
||||
|
||||
+ if (non_pcm) {
|
||||
+ for (i = 0; i < channel_allocations[order].channels; i++)
|
||||
+ non_pcm_mapping[i] = i | (i << 4);
|
||||
+ for (; i < 8; i++)
|
||||
+ non_pcm_mapping[i] = 0xf | (i << 4);
|
||||
+ }
|
||||
+
|
||||
for (i = 0; i < 8; i++) {
|
||||
err = snd_hda_codec_write(codec, pin_nid, 0,
|
||||
AC_VERB_SET_HDMI_CHAN_SLOT,
|
||||
- hdmi_channel_mapping[ca][i]);
|
||||
+ non_pcm ? non_pcm_mapping[i] : hdmi_channel_mapping[ca][i]);
|
||||
if (err) {
|
||||
snd_printdd(KERN_NOTICE
|
||||
"HDMI: channel mapping failed\n");
|
||||
@@ -699,15 +712,27 @@ static bool hdmi_infoframe_uptodate(struct hda_codec *codec, hda_nid_t pin_nid,
|
||||
}
|
||||
|
||||
static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx,
|
||||
- struct snd_pcm_substream *substream)
|
||||
+ hda_nid_t cvt_nid, struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct hdmi_spec *spec = codec->spec;
|
||||
struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx];
|
||||
+ struct hdmi_spec_per_cvt *per_cvt;
|
||||
+ struct hda_spdif_out *spdif;
|
||||
hda_nid_t pin_nid = per_pin->pin_nid;
|
||||
int channels = substream->runtime->channels;
|
||||
struct hdmi_eld *eld;
|
||||
int ca;
|
||||
+ int cvt_idx;
|
||||
union audio_infoframe ai;
|
||||
+ bool non_pcm = false;
|
||||
+
|
||||
+ cvt_idx = cvt_nid_to_cvt_index(spec, cvt_nid);
|
||||
+ per_cvt = &spec->cvts[cvt_idx];
|
||||
+
|
||||
+ mutex_lock(&codec->spdif_mutex);
|
||||
+ spdif = snd_hda_spdif_out_of_nid(codec, cvt_nid);
|
||||
+ non_pcm = !!(spdif->status & IEC958_AES0_NONAUDIO);
|
||||
+ mutex_unlock(&codec->spdif_mutex);
|
||||
|
||||
eld = &spec->pins[pin_idx].sink_eld;
|
||||
if (!eld->monitor_present)
|
||||
@@ -750,12 +775,14 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx,
|
||||
"pin=%d channels=%d\n",
|
||||
pin_nid,
|
||||
channels);
|
||||
- hdmi_setup_channel_mapping(codec, pin_nid, ca);
|
||||
+ hdmi_setup_channel_mapping(codec, pin_nid, cvt_nid, non_pcm, ca);
|
||||
hdmi_stop_infoframe_trans(codec, pin_nid);
|
||||
hdmi_fill_audio_infoframe(codec, pin_nid,
|
||||
ai.bytes, sizeof(ai));
|
||||
hdmi_start_infoframe_trans(codec, pin_nid);
|
||||
}
|
||||
+
|
||||
+ per_cvt->non_pcm = non_pcm;
|
||||
}
|
||||
|
||||
|
||||
@@ -1077,6 +1104,7 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)
|
||||
|
||||
per_cvt->cvt_nid = cvt_nid;
|
||||
per_cvt->channels_min = 2;
|
||||
+ per_cvt->non_pcm = false;
|
||||
if (chans <= 16)
|
||||
per_cvt->channels_max = chans;
|
||||
|
||||
@@ -1164,7 +1192,7 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
|
||||
|
||||
hdmi_set_channel_count(codec, cvt_nid, substream->runtime->channels);
|
||||
|
||||
- hdmi_setup_audio_infoframe(codec, pin_idx, substream);
|
||||
+ hdmi_setup_audio_infoframe(codec, pin_idx, cvt_nid, substream);
|
||||
|
||||
pinctl = snd_hda_codec_read(codec, pin_nid, 0,
|
||||
AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
|
||||
--
|
||||
1.7.9.5
|
||||
@ -0,0 +1,27 @@
|
||||
For HBR stream test, use straight channel mapping way.
|
||||
when switched back to "speaker-test -c8", even the audio
|
||||
infoframe is up-to-date, there should be correct channel mapping setup.
|
||||
|
||||
Signed-off-by: Wang Xingchao <xingchao.wang at intel.com>
|
||||
---
|
||||
sound/pci/hda/patch_hdmi.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
|
||||
index a87f8b2..bcb0939 100644
|
||||
--- a/sound/pci/hda/patch_hdmi.c
|
||||
+++ b/sound/pci/hda/patch_hdmi.c
|
||||
@@ -780,6 +780,11 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx,
|
||||
hdmi_fill_audio_infoframe(codec, pin_nid,
|
||||
ai.bytes, sizeof(ai));
|
||||
hdmi_start_infoframe_trans(codec, pin_nid);
|
||||
+ } else {
|
||||
+ /* For non-pcm audio switch, setup new channel mapping
|
||||
+ * accordingly */
|
||||
+ if (per_cvt->non_pcm != non_pcm)
|
||||
+ hdmi_setup_channel_mapping(codec, pin_nid, cvt_nid, non_pcm, ca);
|
||||
}
|
||||
|
||||
per_cvt->non_pcm = non_pcm;
|
||||
--
|
||||
1.7.9.5
|
||||
@ -1,5 +1,7 @@
|
||||
<settings>
|
||||
<setting id="LCD_DRIVER" value="none" />
|
||||
<setting id="HDD_STANDBY" value="false" />
|
||||
<setting id="HDD_STANDBY_TIME" value="15" />
|
||||
<setting id="NET_DNS1" value="" />
|
||||
<setting id="NET_DNS2" value="" />
|
||||
<setting id="NET_DNS3" value="" />
|
||||
|
||||
@ -10,6 +10,9 @@
|
||||
<string id="2021">System Update</string>
|
||||
<string id="2050">LCD/VFD</string>
|
||||
<string id="2051">LCD Driver to use</string>
|
||||
<string id="2060">HDD standby</string>
|
||||
<string id="2061">Enable HDD standby</string>
|
||||
<string id="2062">HDD standby timeout (minutes)</string>
|
||||
|
||||
<!-- Network -->
|
||||
<string id="2100">Network</string>
|
||||
|
||||
@ -13,6 +13,10 @@
|
||||
<setting label="2050" type="lsep"/>
|
||||
<setting type="sep" />
|
||||
<setting id="LCD_DRIVER" type="labelenum" label="2051" values="none|irtrans|imon|imonlcd|mdm166a|MtxOrb|dm140|lis" sort="yes" default="none" />
|
||||
<setting label="2060" type="lsep"/>
|
||||
<setting type="sep" />
|
||||
<setting id="HDD_STANDBY" type="bool" label="2061" default="false" />
|
||||
<setting id="HDD_STANDBY_TIME" type="number" label="2062" default="15" visible="eq(-1,true)" />
|
||||
</category>
|
||||
|
||||
<!-- Network -->
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-theme-Confluence"
|
||||
PKG_VERSION="5417cfb"
|
||||
PKG_VERSION="f14f5a5"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc"
|
||||
PKG_VERSION="5417cfb"
|
||||
PKG_VERSION="f14f5a5"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- samba-3.6.8/source3/param/loadparm.c 2012-09-14 02:12:09.000000000 -0600
|
||||
+++ samba-3.6.8-b/source3/param/loadparm.c 2012-11-25 15:53:07.543125017 -0700
|
||||
@@ -5336,7 +5336,7 @@
|
||||
Globals.bClientPlaintextAuth = False; /* Do NOT use a plaintext password even if is requested by the server */
|
||||
Globals.bLanmanAuth = False; /* Do NOT use the LanMan hash, even if it is supplied */
|
||||
Globals.bNTLMAuth = True; /* Do use NTLMv1 if it is supplied by the client (otherwise NTLMv2) */
|
||||
- Globals.bClientNTLMv2Auth = True; /* Client should always use use NTLMv2, as we can't tell that the server supports it, but most modern servers do */
|
||||
+ Globals.bClientNTLMv2Auth = False; /* Client should always use use NTLMv2, as we can't tell that the server supports it, but most modern servers do */
|
||||
/* Note, that we will also use NTLM2 session security (which is different), if it is available */
|
||||
|
||||
Globals.map_to_guest = 0; /* By Default, "Never" */
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="distribute"
|
||||
PKG_VERSION="0.6.30"
|
||||
PKG_VERSION="0.6.31"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
@ -23,12 +23,17 @@
|
||||
#
|
||||
# runlevels: openelec, installer, textmode
|
||||
|
||||
# Standbytime in 5sec steps (180 = 15min)
|
||||
STANDBY_TIME=180
|
||||
if [ -f /var/config/settings.conf ]; then
|
||||
. /var/config/settings.conf
|
||||
fi
|
||||
|
||||
progress "Setup HDD standby"
|
||||
(
|
||||
(
|
||||
if [ "$HDD_STANDBY" == "true" ] ; then
|
||||
progress "Setup HDD standby"
|
||||
[ -z "$HDD_STANDBY_TIME" ] && HDD_STANDBY_TIME=15
|
||||
STANDBY_TIME=$[$HDD_STANDBY_TIME * 12]
|
||||
for disk in /dev/sd?; do
|
||||
hdparm -S $STANDBY_TIME $disk > /dev/null 2>&1
|
||||
done
|
||||
)&
|
||||
fi
|
||||
)&
|
||||
|
||||
@ -34,7 +34,7 @@ fi
|
||||
|
||||
INSTALL_DIR=".install/usr/lib/fglrx/"
|
||||
|
||||
cd $PKG_BUILD/lib/modules/fglrx/build_mod
|
||||
cd $PKG_BUILD/common/lib/modules/fglrx/build_mod
|
||||
ln -sf $ROOT/$PKG_BUILD/arch/$FGLRX_ARCH/lib/modules/fglrx/build_mod/libfglrx_ip.a .
|
||||
|
||||
cd 2.6.x
|
||||
@ -45,9 +45,9 @@ cd $ROOT/$PKG_BUILD
|
||||
|
||||
# config files
|
||||
mkdir -p $INSTALL_DIR/etc/ati
|
||||
cp etc/ati/amdpcsdb.default $INSTALL_DIR/etc/ati
|
||||
cp etc/ati/control $INSTALL_DIR/etc/ati
|
||||
cp etc/ati/signature $INSTALL_DIR/etc/ati
|
||||
cp common/etc/ati/amdpcsdb.default $INSTALL_DIR/etc/ati
|
||||
cp common/etc/ati/control $INSTALL_DIR/etc/ati
|
||||
cp common/etc/ati/signature $INSTALL_DIR/etc/ati
|
||||
ln -sf /storage/.config/fglrx.conf $INSTALL_DIR/etc/ati/amdpcsdb
|
||||
|
||||
(
|
||||
|
||||
@ -26,7 +26,7 @@ VER=`ls $BUILD/linux*/modules/lib/modules`
|
||||
|
||||
# ATI kernel driver
|
||||
mkdir -p $INSTALL/lib/modules/$VER/ati
|
||||
cp $PKG_BUILD/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $INSTALL/lib/modules/$VER/ati
|
||||
cp $PKG_BUILD/common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $INSTALL/lib/modules/$VER/ati
|
||||
|
||||
mkdir -p $INSTALL/etc/X11
|
||||
cp $PKG_DIR/config/*.conf $INSTALL/etc/X11
|
||||
|
||||
@ -19,14 +19,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-fglrx"
|
||||
PKG_VERSION="12.9-ubuntu"
|
||||
PKG_VERSION="12.10"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.ati.com/"
|
||||
# PKG_URL="http://www2.ati.com/drivers/linux/amd-driver-installer-`echo $PKG_VERSION | sed 's/\./-/'`-x86.x86_64.run"
|
||||
# use ubuntus package from http://archive.ubuntu.com/ubuntu/pool/restricted/f/fglrx-installer/fglrx-installer_9.000.orig.tar.gz
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_URL="http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-$PKG_VERSION-x86.x86_64.zip"
|
||||
PKG_DEPENDS="linux libX11 libXinerama libXcomposite"
|
||||
PKG_BUILD_DEPENDS="toolchain util-macros libX11 libXinerama libXcomposite linux"
|
||||
PKG_PRIORITY="optional"
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-05-26 18:33:25.044695179 +0200
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-05-26 18:28:39.692699095 +0200
|
||||
@@ -188,6 +188,12 @@
|
||||
#include <linux/swap.h>
|
||||
#include "asm/i387.h"
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
|
||||
+#ifdef CONFIG_X86_32
|
||||
+#include "asm/fpu-internal.h"
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
#include "firegl_public.h"
|
||||
#include "kcl_osconfig.h"
|
||||
#include "kcl_io.h"
|
||||
@@ -4154,7 +4160,11 @@ static int kasInitExecutionLevels(unsign
|
||||
{
|
||||
unsigned int p;
|
||||
KCL_DEBUG5(FN_FIREGL_KAS, "%d\n", level_init);
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
|
||||
+ for_each_possible_cpu(p)
|
||||
+#else
|
||||
for_each_cpu_mask(p, cpu_possible_map)
|
||||
+#endif
|
||||
{
|
||||
KCL_DEBUG1(FN_FIREGL_KAS,"Setting initial execution level for CPU # %d\n", p);
|
||||
preempt_disable();
|
||||
--- a/common/lib/modules/fglrx/build_mod/kcl_ioctl.c 2012-05-26 19:11:03.402987821 +0200
|
||||
+++ b/common/lib/modules/fglrx/build_mod/kcl_ioctl.c 2012-05-26 19:13:00.273986422 +0200
|
||||
@@ -217,6 +217,10 @@
|
||||
* \param size [in] Number of bytes to allocate
|
||||
* \return Pointer to allocated memory
|
||||
*/
|
||||
+#ifndef CONFIG_X86_X32
|
||||
+DEFINE_PER_CPU(unsigned long, old_rsp);
|
||||
+#endif
|
||||
+
|
||||
void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
|
||||
{
|
||||
void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
|
||||
@ -1,50 +0,0 @@
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200
|
||||
@@ -2106,6 +2106,12 @@
|
||||
}
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
|
||||
+# define NO_DO_MMAP
|
||||
+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
|
||||
+# define do_munmap(a,b,c) vm_munmap(b, c)
|
||||
+#endif
|
||||
+
|
||||
unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
|
||||
KCL_IO_FILE_Handle file,
|
||||
unsigned long addr,
|
||||
@@ -2117,10 +2123,13 @@
|
||||
|
||||
flags = MAP_SHARED;
|
||||
prot = PROT_READ|PROT_WRITE;
|
||||
-
|
||||
+#ifdef NO_DO_MMAP
|
||||
+ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
|
||||
+#else
|
||||
down_write(¤t->mm->mmap_sem);
|
||||
vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
|
||||
up_write(¤t->mm->mmap_sem);
|
||||
+#endif
|
||||
if (IS_ERR(vaddr))
|
||||
return 0;
|
||||
else
|
||||
@@ -2131,7 +2140,9 @@
|
||||
{
|
||||
int retcode = 0;
|
||||
|
||||
+#ifndef NO_DO_MMAP
|
||||
down_write(¤t->mm->mmap_sem);
|
||||
+#endif
|
||||
#ifdef FGL_LINUX_RHEL_MUNMAP_API
|
||||
retcode = do_munmap(current->mm,
|
||||
addr,
|
||||
@@ -2142,7 +2153,9 @@
|
||||
addr,
|
||||
len);
|
||||
#endif
|
||||
+#ifndef NO_DO_MMAP
|
||||
up_write(¤t->mm->mmap_sem);
|
||||
+#endif
|
||||
return retcode;
|
||||
}
|
||||
|
||||
40
packages/x11/driver/xf86-video-fglrx/unpack
Executable file
40
packages/x11/driver/xf86-video-fglrx/unpack
Executable file
@ -0,0 +1,40 @@
|
||||
#!/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
|
||||
################################################################################
|
||||
|
||||
. config/options $1
|
||||
|
||||
require_eglibc $1
|
||||
|
||||
ZIP_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
|
||||
[ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
|
||||
|
||||
mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
|
||||
unzip $SOURCES/$1/$ZIP_PKG -d $BUILD/${PKG_NAME}-${PKG_VERSION} >/dev/null 2>&1
|
||||
ATI_PKG=`ls -d $BUILD/${PKG_NAME}-${PKG_VERSION}/amd-driver-installer-*.run`
|
||||
sh $ATI_PKG --extract $BUILD/$PKG_NAME-$PKG_VERSION
|
||||
|
||||
echo "### Applying upstream patches ###"
|
||||
|
||||
for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do
|
||||
cat $patch | patch -d \
|
||||
`echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1
|
||||
done
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-intel"
|
||||
PKG_VERSION="2.20.13"
|
||||
PKG_VERSION="2.20.14"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
30
packages/x11/driver/xf86-video-nvidia-legacy/build
Executable file
30
packages/x11/driver/xf86-video-nvidia-legacy/build
Executable file
@ -0,0 +1,30 @@
|
||||
#!/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
|
||||
################################################################################
|
||||
|
||||
. config/options $1
|
||||
|
||||
cd $PKG_BUILD/kernel
|
||||
LDFLAGS="" make module CC=$CC SYSSRC=$(kernel_path) SYSOUT=$(kernel_path)
|
||||
|
||||
cd ..
|
||||
# linking libnvidia-ml.so.$PKG_VERSION to libnvidia-ml.so.1
|
||||
ln -sf libnvidia-ml.so.$PKG_VERSION libnvidia-ml.so.1
|
||||
@ -0,0 +1,34 @@
|
||||
Section "Device"
|
||||
Identifier "nvidia"
|
||||
Driver "nvidia"
|
||||
Option "DynamicTwinView" "False"
|
||||
Option "NoFlip" "false"
|
||||
Option "NoLogo" "true"
|
||||
Option "ConnectToAcpid" "0"
|
||||
Option "FlatPanelProperties" "Scaling = Native"
|
||||
Option "ModeValidation" "NoVesaModes, NoXServerModes"
|
||||
Option "HWCursor" "false"
|
||||
# To put Xorg in debug mode change "false" to "true" in the line below:
|
||||
Option "ModeDebug" "false"
|
||||
# To use a local edid.bin file uncomment the 4 lines below (change DFP-0 to match your card)
|
||||
# Option "ConnectedMonitor" "DFP-0"
|
||||
# Option "CustomEDID" "DFP-0:/storage/.config/edid.bin"
|
||||
# Option "IgnoreEDID" "false"
|
||||
# Option "UseEDID" "true"
|
||||
EndSection
|
||||
|
||||
Section "Screen"
|
||||
Identifier "screen"
|
||||
Device "nvidia"
|
||||
DefaultDepth 24
|
||||
Option "ColorRange" "Full"
|
||||
# Option "ColorRange" "Limited"
|
||||
# Option "ColorSpace" "RGB"
|
||||
SubSection "Display"
|
||||
Depth 24
|
||||
EndSubSection
|
||||
EndSection
|
||||
|
||||
Section "Extensions"
|
||||
Option "Composite" "false"
|
||||
EndSection
|
||||
48
packages/x11/driver/xf86-video-nvidia-legacy/install
Executable file
48
packages/x11/driver/xf86-video-nvidia-legacy/install
Executable file
@ -0,0 +1,48 @@
|
||||
#!/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
|
||||
################################################################################
|
||||
|
||||
. config/options $1
|
||||
|
||||
VER=`ls $BUILD/linux*/modules/lib/modules`
|
||||
|
||||
mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
|
||||
cp -P $PKG_BUILD/nvidia_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
|
||||
|
||||
mkdir -p $INSTALL/$XORG_PATH_MODULES/extensions
|
||||
# rename to not conflicting with Mesa libGL.so
|
||||
cp -P $PKG_BUILD/libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so
|
||||
|
||||
mkdir -p $INSTALL/etc/X11
|
||||
cp $PKG_DIR/config/*.conf $INSTALL/etc/X11
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/libnvidia-glcore.so* $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/libnvidia-ml.so* $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/tls/libnvidia-tls.so* $INSTALL/usr/lib
|
||||
# rename to not conflicting with Mesa libGL.so
|
||||
cp -P $PKG_BUILD/libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1
|
||||
|
||||
mkdir -p $INSTALL/lib/modules/$VER/nvidia
|
||||
cp $PKG_BUILD/kernel/nvidia.ko $INSTALL/lib/modules/$VER/nvidia
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/nvidia-smi $INSTALL/usr/bin
|
||||
37
packages/x11/driver/xf86-video-nvidia-legacy/meta
Normal file
37
packages/x11/driver/xf86-video-nvidia-legacy/meta
Normal file
@ -0,0 +1,37 @@
|
||||
################################################################################
|
||||
# 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
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-nvidia-legacy"
|
||||
PKG_VERSION="304.64"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.nvidia.com/"
|
||||
[ "$TARGET_ARCH" = "i386" ] && PKG_URL="http://download.nvidia.com/XFree86/Linux-x86/$PKG_VERSION/NVIDIA-Linux-x86-$PKG_VERSION.run"
|
||||
[ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run"
|
||||
PKG_DEPENDS="linux libXinerama"
|
||||
PKG_BUILD_DEPENDS="toolchain util-macros linux xorg-server"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="x11/driver"
|
||||
PKG_SHORTDESC="xf86-video-nvidia-legacy: The Xorg driver for NVIDIA video chips supporting Geforce 6 and Geforce 7 devices too"
|
||||
PKG_LONGDESC="These binary drivers provide optimized hardware acceleration of OpenGL applications via a direct-rendering X Server. AGP, PCIe, SLI, TV-out and flat panel displays are also supported. This version only supports GeForce 6xxx and higher of the Geforce GPUs plus complimentary Quadros and nforce."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="no"
|
||||
31
packages/x11/driver/xf86-video-nvidia-legacy/need_unpack
Executable file
31
packages/x11/driver/xf86-video-nvidia-legacy/need_unpack
Executable file
@ -0,0 +1,31 @@
|
||||
#!/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
|
||||
################################################################################
|
||||
|
||||
. config/options $1
|
||||
|
||||
STAMP=$STAMPS/$1/unpack
|
||||
|
||||
test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
|
||||
$PKG_DIR/url -nt $STAMP && rm -f $STAMP
|
||||
|
||||
exit 0
|
||||
@ -24,10 +24,13 @@
|
||||
|
||||
require_eglibc $1
|
||||
|
||||
ATI_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
|
||||
NV_ARCH=x86
|
||||
[ "$TARGET_ARCH" = x86_64 ] && NV_ARCH=x86_64
|
||||
|
||||
NV_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
|
||||
[ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
|
||||
|
||||
sh $SOURCES/$1/$ATI_PKG --extract $BUILD/$PKG_NAME-$PKG_VERSION
|
||||
sh $SOURCES/$1/$NV_PKG --extract-only --target $BUILD/$PKG_NAME-$PKG_VERSION
|
||||
|
||||
echo "### Applying upstream patches ###"
|
||||
|
||||
@ -31,7 +31,7 @@ PKG_BUILD_DEPENDS="toolchain util-macros linux xorg-server"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="x11/driver"
|
||||
PKG_SHORTDESC="xf86-video-nvidia: The Xorg driver for NVIDIA video chips"
|
||||
PKG_LONGDESC="These binary drivers provide optimized hardware acceleration of OpenGL applications via a direct-rendering X Server. AGP, PCIe, SLI, TV-out and flat panel displays are also supported. This version only supports GeForce 6xxx and higher of the Geforce GPUs plus complimentary Quadros and nforce."
|
||||
PKG_LONGDESC="These binary drivers provide optimized hardware acceleration of OpenGL applications via a direct-rendering X Server. AGP, PCIe, SLI, TV-out and flat panel displays are also supported. This version only supports GeForce 8xxx and higher of the Geforce GPUs plus complimentary Quadros and nforce."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="harfbuzz"
|
||||
PKG_VERSION="0.9.5"
|
||||
PKG_VERSION="0.9.7"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pango"
|
||||
PKG_VERSION="1.32.1"
|
||||
PKG_VERSION="1.32.3"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -234,7 +234,7 @@
|
||||
# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
|
||||
# Space separated list is supported,
|
||||
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
|
||||
GRAPHIC_DRIVERS="nvidia"
|
||||
GRAPHIC_DRIVERS="nvidia-legacy"
|
||||
|
||||
# OpenMAX implementation to use (no / bcm2835-driver)
|
||||
OPENMAX="no"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user