diff --git a/packages/linux/meta b/packages/linux/meta index f20af6dd52..59708b2899 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux" -PKG_VERSION="3.0-rc5" +PKG_VERSION="3.0-rc6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux/patches/linux-3.0-rc5-000_crosscompile.patch b/packages/linux/patches/linux-3.0-rc6-000_crosscompile.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-000_crosscompile.patch rename to packages/linux/patches/linux-3.0-rc6-000_crosscompile.patch diff --git a/packages/linux/patches/linux-3.0-rc5-003-no_dev_console.patch b/packages/linux/patches/linux-3.0-rc6-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-003-no_dev_console.patch rename to packages/linux/patches/linux-3.0-rc6-003-no_dev_console.patch diff --git a/packages/linux/patches/linux-3.0-rc5-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-3.0-rc6-004_lower_undefined_mode_timeout.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-004_lower_undefined_mode_timeout.patch rename to packages/linux/patches/linux-3.0-rc6-004_lower_undefined_mode_timeout.patch diff --git a/packages/linux/patches/linux-3.0-rc5-006_enable_utf8.patch b/packages/linux/patches/linux-3.0-rc6-006_enable_utf8.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-006_enable_utf8.patch rename to packages/linux/patches/linux-3.0-rc6-006_enable_utf8.patch diff --git a/packages/linux/patches/linux-3.0-rc5-007_die_floppy_die.patch b/packages/linux/patches/linux-3.0-rc6-007_die_floppy_die.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-007_die_floppy_die.patch rename to packages/linux/patches/linux-3.0-rc6-007_die_floppy_die.patch diff --git a/packages/linux/patches/linux-3.0-rc5-008-hda_intel_prealloc_4mb_dmabuffer.patch b/packages/linux/patches/linux-3.0-rc6-008-hda_intel_prealloc_4mb_dmabuffer.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-008-hda_intel_prealloc_4mb_dmabuffer.patch rename to packages/linux/patches/linux-3.0-rc6-008-hda_intel_prealloc_4mb_dmabuffer.patch diff --git a/packages/linux/patches/linux-3.0-rc5-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-3.0-rc6-009_disable_i8042_check_on_apple_mac.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-009_disable_i8042_check_on_apple_mac.patch rename to packages/linux/patches/linux-3.0-rc6-009_disable_i8042_check_on_apple_mac.patch diff --git a/packages/linux/patches/linux-3.0-rc5-050_add_appleir_usb_driver.patch b/packages/linux/patches/linux-3.0-rc6-050_add_appleir_usb_driver.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-050_add_appleir_usb_driver.patch rename to packages/linux/patches/linux-3.0-rc6-050_add_appleir_usb_driver.patch diff --git a/packages/linux/patches/linux-3.0-rc5-051-call_input_sync_after_scancode_reports.patch b/packages/linux/patches/linux-3.0-rc6-051-call_input_sync_after_scancode_reports.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-051-call_input_sync_after_scancode_reports.patch rename to packages/linux/patches/linux-3.0-rc6-051-call_input_sync_after_scancode_reports.patch diff --git a/packages/linux/patches/linux-3.0-rc5-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-3.0-rc6-052-aureal_remote_quirk-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-052-aureal_remote_quirk-0.1.patch rename to packages/linux/patches/linux-3.0-rc6-052-aureal_remote_quirk-0.1.patch diff --git a/packages/linux/patches/linux-3.0-rc5-053_ati-remote_all_keys_and_keychange-0.1.patch b/packages/linux/patches/linux-3.0-rc6-053_ati-remote_all_keys_and_keychange-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-053_ati-remote_all_keys_and_keychange-0.1.patch rename to packages/linux/patches/linux-3.0-rc6-053_ati-remote_all_keys_and_keychange-0.1.patch diff --git a/packages/linux/patches/linux-3.0-rc5-058-add_rtl2832u_dvb-usb_driver-0.1.patch b/packages/linux/patches/linux-3.0-rc6-058-add_rtl2832u_dvb-usb_driver-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-058-add_rtl2832u_dvb-usb_driver-0.1.patch rename to packages/linux/patches/linux-3.0-rc6-058-add_rtl2832u_dvb-usb_driver-0.1.patch diff --git a/packages/linux/patches/linux-3.0-rc5-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch b/packages/linux/patches/linux-3.0-rc6-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch rename to packages/linux/patches/linux-3.0-rc6-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch diff --git a/packages/linux/patches/linux-3.0-rc5-071-silence_i915_agp-module-0.1.patch b/packages/linux/patches/linux-3.0-rc6-071-silence_i915_agp-module-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-071-silence_i915_agp-module-0.1.patch rename to packages/linux/patches/linux-3.0-rc6-071-silence_i915_agp-module-0.1.patch diff --git a/packages/linux/patches/linux-3.0-rc5-110-drm_nouveau_upstream-20110626.1.patch b/packages/linux/patches/linux-3.0-rc6-110-drm_nouveau_upstream-20110626.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-110-drm_nouveau_upstream-20110626.1.patch rename to packages/linux/patches/linux-3.0-rc6-110-drm_nouveau_upstream-20110626.1.patch diff --git a/packages/linux/patches/linux-3.0-rc5-322-omap4_pandaboard_fix_dvi_support-0.1.patch b/packages/linux/patches/linux-3.0-rc6-322-omap4_pandaboard_fix_dvi_support-0.1.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-322-omap4_pandaboard_fix_dvi_support-0.1.patch rename to packages/linux/patches/linux-3.0-rc6-322-omap4_pandaboard_fix_dvi_support-0.1.patch diff --git a/packages/linux/patches/linux-3.0-rc5-716_mm-zero_swappiness.patch b/packages/linux/patches/linux-3.0-rc6-716_mm-zero_swappiness.patch similarity index 100% rename from packages/linux/patches/linux-3.0-rc5-716_mm-zero_swappiness.patch rename to packages/linux/patches/linux-3.0-rc6-716_mm-zero_swappiness.patch diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml index bd765f88fc..9d7e62f467 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml @@ -12,7 +12,7 @@ - + diff --git a/packages/sysutils/fuse/config/fuse.conf b/packages/sysutils/fuse/config/fuse.conf new file mode 100644 index 0000000000..cd4c6bdaf3 --- /dev/null +++ b/packages/sysutils/fuse/config/fuse.conf @@ -0,0 +1,2 @@ +# mount_max = 1000 +# user_allow_other diff --git a/packages/sysutils/fuse/install b/packages/sysutils/fuse/install index 1c793dc5ee..3c6a105391 100755 --- a/packages/sysutils/fuse/install +++ b/packages/sysutils/fuse/install @@ -22,6 +22,9 @@ . config/options $1 +mkdir -p $INSTALL/etc + cp $PKG_DIR/config/fuse.conf $INSTALL/etc + mkdir -p $INSTALL/lib/udev/rules.d cp $PKG_BUILD/util/udev.rules $INSTALL/lib/udev/rules.d/99-fuse.rules diff --git a/packages/sysutils/fuse/patches/fuse-2.8.5-001-Fix-udev-rules-Fedora-specific.patch b/packages/sysutils/fuse/patches/fuse-2.8.5-001-Fix-udev-rules-Fedora-specific.patch new file mode 100644 index 0000000000..d4bb54481c --- /dev/null +++ b/packages/sysutils/fuse/patches/fuse-2.8.5-001-Fix-udev-rules-Fedora-specific.patch @@ -0,0 +1,20 @@ +From ba47031f3557b81e732d41593c95e7b984b54b78 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 9 Aug 2010 12:09:00 +0400 +Subject: [PATCH 1/3] Fix udev rules (Fedora-specific) + +Signed-off-by: Peter Lemenkov +--- + util/udev.rules | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/util/udev.rules b/util/udev.rules +index 9585111..bb8033f 100644 +--- a/util/udev.rules ++++ b/util/udev.rules +@@ -1 +1 @@ +-KERNEL=="fuse", MODE="0666" ++KERNEL=="fuse", MODE="0666",OWNER="root",GROUP="root" +-- +1.7.3.1 + diff --git a/packages/sysutils/fuse/patches/fuse-2.8.5-002-More-parentheses.patch b/packages/sysutils/fuse/patches/fuse-2.8.5-002-More-parentheses.patch new file mode 100644 index 0000000000..bf0eef0a2f --- /dev/null +++ b/packages/sysutils/fuse/patches/fuse-2.8.5-002-More-parentheses.patch @@ -0,0 +1,52 @@ +From 459c84a3e5fda1ef7f7060d44903b31215857e70 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 9 Aug 2010 12:10:40 +0400 +Subject: [PATCH 2/3] More parentheses + +Signed-off-by: Peter Lemenkov +--- + lib/fuse.c | 8 +++----- + lib/fuse_lowlevel.c | 2 +- + 2 files changed, 4 insertions(+), 6 deletions(-) + +diff --git a/lib/fuse.c b/lib/fuse.c +index 95cf50b..76c2681 100644 +--- a/lib/fuse.c ++++ b/lib/fuse.c +@@ -961,17 +961,15 @@ static int fuse_compat_open(struct fuse_fs *fs, const char *path, + { + int err; + if (!fs->compat || fs->compat >= 25) +- err = fs->op.open(path, fi); ++ err = (fs->op.open)(path, fi); + else if (fs->compat == 22) { + struct fuse_file_info_compat tmp; + memcpy(&tmp, fi, sizeof(tmp)); +- err = ((struct fuse_operations_compat22 *) &fs->op)->open(path, +- &tmp); ++ err = (((struct fuse_operations_compat22 *) &fs->op)->open)(path, &tmp); + memcpy(fi, &tmp, sizeof(tmp)); + fi->fh = tmp.fh; + } else +- err = ((struct fuse_operations_compat2 *) &fs->op) +- ->open(path, fi->flags); ++ err = (((struct fuse_operations_compat2 *) &fs->op)->open)(path, fi->flags); + return err; + } + +diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c +index c519bfb..d6275b5 100644 +--- a/lib/fuse_lowlevel.c ++++ b/lib/fuse_lowlevel.c +@@ -716,7 +716,7 @@ static void do_open(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) + fi.flags = arg->flags; + + if (req->f->op.open) +- req->f->op.open(req, nodeid, &fi); ++ (req->f->op.open)(req, nodeid, &fi); + else + fuse_reply_open(req, &fi); + } +-- +1.7.3.1 + diff --git a/packages/sysutils/fuse/patches/fuse-2.8.5-003-Fix-mounting-FUSE-fs-into-current-working-directory.patch b/packages/sysutils/fuse/patches/fuse-2.8.5-003-Fix-mounting-FUSE-fs-into-current-working-directory.patch new file mode 100644 index 0000000000..bd69cd0785 --- /dev/null +++ b/packages/sysutils/fuse/patches/fuse-2.8.5-003-Fix-mounting-FUSE-fs-into-current-working-directory.patch @@ -0,0 +1,125 @@ +From d8bdebc639a84fa280153a466d4bb420fc9572bc Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Wed, 27 Oct 2010 16:29:45 +0400 +Subject: [PATCH 3/3] Fix mounting FUSE fs into current working directory + +See rhbz #622255 for bug description: + +https://bugzilla.redhat.com/622255 + +Signed-off-by: Peter Lemenkov +--- + lib/mount_util.c | 75 +++++++++++++----------------------------------------- + 1 files changed, 18 insertions(+), 57 deletions(-) + +diff --git a/lib/mount_util.c b/lib/mount_util.c +index 33e6697..b9a0895 100644 +--- a/lib/mount_util.c ++++ b/lib/mount_util.c +@@ -54,8 +54,8 @@ static int mtab_needs_update(const char *mnt) + return 1; + } + +-static int add_mount_legacy(const char *progname, const char *fsname, +- const char *mnt, const char *type, const char *opts) ++static int add_mount(const char *progname, const char *fsname, ++ const char *mnt, const char *type, const char *opts, int is_legacy) + { + int res; + int status; +@@ -76,6 +76,14 @@ static int add_mount_legacy(const char *progname, const char *fsname, + goto out_restore; + } + if (res == 0) { ++ /* ++ * Hide output, because old versions don't support ++ * --no-canonicalize ++ */ ++ int fd = open("/dev/null", O_RDONLY); ++ dup2(fd, 1); ++ dup2(fd, 2); ++ + char templ[] = "/tmp/fusermountXXXXXX"; + char *tmp; + +@@ -99,59 +107,12 @@ static int add_mount_legacy(const char *progname, const char *fsname, + exit(1); + } + rmdir(tmp); +- execl("/bin/mount", "/bin/mount", "-i", "-f", "-t", type, +- "-o", opts, fsname, mnt, NULL); +- fprintf(stderr, "%s: failed to execute /bin/mount: %s\n", +- progname, strerror(errno)); +- exit(1); +- } +- res = waitpid(res, &status, 0); +- if (res == -1) +- fprintf(stderr, "%s: waitpid: %s\n", progname, strerror(errno)); +- +- if (status != 0) +- res = -1; +- +- out_restore: +- sigprocmask(SIG_SETMASK, &oldmask, NULL); +- +- return res; +-} +- +-static int add_mount(const char *progname, const char *fsname, +- const char *mnt, const char *type, const char *opts) +-{ +- int res; +- int status; +- sigset_t blockmask; +- sigset_t oldmask; +- +- sigemptyset(&blockmask); +- sigaddset(&blockmask, SIGCHLD); +- res = sigprocmask(SIG_BLOCK, &blockmask, &oldmask); +- if (res == -1) { +- fprintf(stderr, "%s: sigprocmask: %s\n", progname, strerror(errno)); +- return -1; +- } +- +- res = fork(); +- if (res == -1) { +- fprintf(stderr, "%s: fork: %s\n", progname, strerror(errno)); +- goto out_restore; +- } +- if (res == 0) { +- /* +- * Hide output, because old versions don't support +- * --no-canonicalize +- */ +- int fd = open("/dev/null", O_RDONLY); +- dup2(fd, 1); +- dup2(fd, 2); +- +- sigprocmask(SIG_SETMASK, &oldmask, NULL); +- setuid(geteuid()); +- execl("/bin/mount", "/bin/mount", "--no-canonicalize", "-i", +- "-f", "-t", type, "-o", opts, fsname, mnt, NULL); ++ if(is_legacy) ++ execl("/bin/mount", "/bin/mount", "-i", ++ "-f", "-t", type, "-o", opts, fsname, mnt, NULL); ++ else ++ execl("/bin/mount", "/bin/mount", "--no-canonicalize", "-i", ++ "-f", "-t", type, "-o", opts, fsname, mnt, NULL); + fprintf(stderr, "%s: failed to execute /bin/mount: %s\n", + progname, strerror(errno)); + exit(1); +@@ -177,9 +138,9 @@ int fuse_mnt_add_mount(const char *progname, const char *fsname, + if (!mtab_needs_update(mnt)) + return 0; + +- res = add_mount(progname, fsname, mnt, type, opts); ++ res = add_mount(progname, fsname, mnt, type, opts, 0); + if (res == -1) +- res = add_mount_legacy(progname, fsname, mnt, type, opts); ++ res = add_mount(progname, fsname, mnt, type, opts, 1); + + return res; + } +-- +1.7.3.1 + diff --git a/packages/sysutils/lcdproc/meta b/packages/sysutils/lcdproc/meta index 54aac07c50..da4dde79f1 100644 --- a/packages/sysutils/lcdproc/meta +++ b/packages/sysutils/lcdproc/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://lcdproc.org/" PKG_URL="$SOURCEFORGE_SRC/lcdproc/lcdproc/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="libusb irserver" -PKG_BUILD_DEPENDS="toolchain libusb" +PKG_DEPENDS="libusb libhid irserver" +PKG_BUILD_DEPENDS="toolchain libusb libhid" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="lcdproc: Software to display system information from your Linux/*BSD box on a LCD" diff --git a/packages/sysutils/libhid/build b/packages/sysutils/libhid/build new file mode 100755 index 0000000000..dc1b293101 --- /dev/null +++ b/packages/sysutils/libhid/build @@ -0,0 +1,35 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +cd $PKG_BUILD +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --enable-shared \ + --disable-static \ + --enable-swig \ + +make + +$MAKEINSTALL diff --git a/packages/sysutils/libhid/install b/packages/sysutils/libhid/install new file mode 100755 index 0000000000..ab769d8dae --- /dev/null +++ b/packages/sysutils/libhid/install @@ -0,0 +1,26 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +mkdir -p $INSTALL/usr/lib + cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib \ No newline at end of file diff --git a/packages/sysutils/libhid/meta b/packages/sysutils/libhid/meta new file mode 100644 index 0000000000..78106f1aab --- /dev/null +++ b/packages/sysutils/libhid/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="libhid" +PKG_VERSION="0.2.16" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://libhid.alioth.debian.org/" +PKG_URL="http://alioth.debian.org/frs/download.php/1958/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_DEPENDS="libusb" +PKG_BUILD_DEPENDS="toolchain libusb" +PKG_PRIORITY="optional" +PKG_SECTION="system" +PKG_SHORTDESC="libhid: userspace USB HID access library" +PKG_LONGDESC="libhid provides a generic and flexible way to access and interact with USB HID devices, much like libusb does for plain USB devices" +PKG_IS_ADDON="no" + +PKG_AUTORECONF="yes" diff --git a/packages/sysutils/ntfs-3g_ntfsprogs/build b/packages/sysutils/ntfs-3g_ntfsprogs/build index 739edd32fb..18d13a123f 100755 --- a/packages/sysutils/ntfs-3g_ntfsprogs/build +++ b/packages/sysutils/ntfs-3g_ntfsprogs/build @@ -34,7 +34,7 @@ cd $PKG_BUILD --enable-mtab \ --enable-ntfsprogs \ --enable-crypto \ - --with-fuse=external \ + --with-fuse=internal \ --with-uuid \ make diff --git a/packages/sysutils/ntfs-3g_ntfsprogs/meta b/packages/sysutils/ntfs-3g_ntfsprogs/meta index 009ad5bff1..6d0390e58e 100644 --- a/packages/sysutils/ntfs-3g_ntfsprogs/meta +++ b/packages/sysutils/ntfs-3g_ntfsprogs/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.ntfs-3g.org/" PKG_URL="http://tuxera.com/opensource/$PKG_NAME-$PKG_VERSION.tgz" -PKG_DEPENDS="fuse gnutls" -PKG_BUILD_DEPENDS="toolchain fuse gnutls" +PKG_DEPENDS="gnutls" +PKG_BUILD_DEPENDS="toolchain gnutls" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="ntfs-3g_ntfsprogs: NTFS-3G Read/Write userspace driver" diff --git a/packages/x11/driver/xf86-video-intel/build b/packages/x11/driver/xf86-video-intel/build index 3b9acde3d8..d78fb582b6 100755 --- a/packages/x11/driver/xf86-video-intel/build +++ b/packages/x11/driver/xf86-video-intel/build @@ -24,8 +24,8 @@ xorg_drv_configure_prepend -PKG_CONFIG="$PKG_CONFIG --define-variable=sdkdir=$SYSROOT_PREFIX/usr/include/xorg" -CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/xorg/" +#PKG_CONFIG="$PKG_CONFIG --define-variable=sdkdir=$SYSROOT_PREFIX/usr/include/xorg" +#CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/xorg/" cd $PKG_BUILD ./configure --host=$TARGET_NAME \ @@ -37,6 +37,8 @@ cd $PKG_BUILD --enable-dri \ --enable-kms-only \ --disable-xvmc \ + --enable-sna \ + --enable-vmap \ --with-xorg-module-dir=$XORG_PATH_MODULES make diff --git a/packages/x11/driver/xf86-video-intel/meta b/packages/x11/driver/xf86-video-intel/meta index 55283a3048..a8361054bc 100644 --- a/packages/x11/driver/xf86-video-intel/meta +++ b/packages/x11/driver/xf86-video-intel/meta @@ -19,12 +19,13 @@ ################################################################################ PKG_NAME="xf86-video-intel" -PKG_VERSION="2.15.0" +PKG_VERSION="98f2e38" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" PKG_SITE="http://intellinuxgraphics.org/" -PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" +#PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="udev" PKG_BUILD_DEPENDS="toolchain util-macros util-macros fontsproto udev xorg-server" PKG_PRIORITY="optional" diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 97af618a89..f2bd86e3c5 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.0-rc4 Kernel Configuration +# Linux/i386 3.0.0-rc6 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1799,6 +1799,7 @@ CONFIG_SND=y CONFIG_SND_TIMER=y CONFIG_SND_PCM=y CONFIG_SND_HWDEP=y +CONFIG_SND_JACK=y # CONFIG_SND_SEQUENCER is not set # CONFIG_SND_MIXER_OSS is not set # CONFIG_SND_PCM_OSS is not set @@ -1861,10 +1862,11 @@ CONFIG_SND_PCI=y # CONFIG_SND_FM801 is not set CONFIG_SND_HDA_INTEL=y CONFIG_SND_HDA_HWDEP=y -# CONFIG_SND_HDA_RECONFIG is not set -# CONFIG_SND_HDA_INPUT_BEEP is not set -# CONFIG_SND_HDA_INPUT_JACK is not set -# CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=2 +CONFIG_SND_HDA_INPUT_JACK=y +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 @@ -2441,7 +2443,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -# CONFIG_CIFS_NFSD_EXPORT is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/ATV/options b/projects/ATV/options index 6074fa672f..0c9bb59934 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -200,12 +200,13 @@ ATVCLIENT_SUPPORT="yes" # LCD driver to Use - Possible drivers are ( Comma seperated: -# bayrad,CFontz,CFontz633,CFontzPacket,CwLnx,ea65, -# EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,icp_a106,imon,imonlcd, -# IOWarrior,irman,irtrans,joy,lb216,lcdm001,lcterm,lirc,lis, -# MD8800,ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,picolcd, -# pyramid,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli, -# stv5730,SureElec,t6963,text,tyan,ula200,xosd +# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, +# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd, +# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans, +# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a, +# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD, +# picolcd,pyramid,sed1330,sed1520,serialPOS, +# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga, # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 9c1de32dab..b111eb1487 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.0-rc4 Kernel Configuration +# Linux/i386 3.0.0-rc6 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -736,7 +736,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 # CONFIG_ATA_OVER_ETH is not set # CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_RBD is not set -# CONFIG_SENSORS_LIS3LV02D is not set +CONFIG_SENSORS_LIS3LV02D=m CONFIG_MISC_DEVICES=y # CONFIG_AD525X_DPOT is not set # CONFIG_IBM_ASM is not set @@ -1099,7 +1099,7 @@ CONFIG_USB_NET_DM9601=m # CONFIG_INPUT=y CONFIG_INPUT_FF_MEMLESS=y -# CONFIG_INPUT_POLLDEV is not set +CONFIG_INPUT_POLLDEV=m CONFIG_INPUT_SPARSEKMAP=m # @@ -1970,6 +1970,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y # CONFIG_SND_SEQUENCER is not set # CONFIG_SND_MIXER_OSS is not set # CONFIG_SND_PCM_OSS is not set @@ -2032,13 +2033,14 @@ CONFIG_SND_PCI=y # CONFIG_SND_FM801 is not set CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_HWDEP=y -# CONFIG_SND_HDA_RECONFIG is not set -# CONFIG_SND_HDA_INPUT_BEEP is not set -# CONFIG_SND_HDA_INPUT_JACK is not set -# CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=2 +CONFIG_SND_HDA_INPUT_JACK=y +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_SIGMATEL=y # CONFIG_SND_HDA_CODEC_VIA is not set CONFIG_SND_HDA_CODEC_HDMI=y # CONFIG_SND_HDA_CODEC_CIRRUS is not set @@ -2223,7 +2225,7 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set +CONFIG_USB_UAS=m # CONFIG_USB_LIBUSUAL is not set # @@ -2495,8 +2497,8 @@ CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_DELL_WMI is not set # CONFIG_DELL_WMI_AIO is not set # CONFIG_TC1100_WMI is not set -# CONFIG_HP_ACCEL is not set -# CONFIG_HP_WMI is not set +CONFIG_HP_ACCEL=m +CONFIG_HP_WMI=m # CONFIG_SONY_LAPTOP is not set # CONFIG_IDEAPAD_LAPTOP is not set # CONFIG_THINKPAD_ACPI is not set @@ -2643,7 +2645,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -# CONFIG_CIFS_NFSD_EXPORT is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Fusion/options b/projects/Fusion/options index 7c93dbdb45..e0a1b640a6 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -200,16 +200,17 @@ ATVCLIENT_SUPPORT="no" # LCD driver to Use - Possible drivers are ( Comma seperated: -# bayrad,CFontz,CFontz633,CFontzPacket,CwLnx,ea65, -# EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,icp_a106,imon,imonlcd, -# IOWarrior,irman,irtrans,joy,lb216,lcdm001,lcterm,lirc,lis, -# MD8800,ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,picolcd, -# pyramid,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli, -# stv5730,SureElec,t6963,text,tyan,ula200,xosd +# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, +# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd, +# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans, +# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a, +# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD, +# picolcd,pyramid,sed1330,sed1520,serialPOS, +# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga, # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a" # additional Firmware to use (dvb-firmware, wlan-firmware) # Space separated list is supported, diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 9898cdffd6..3884544ba8 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.0-rc5 Kernel Configuration +# Linux/i386 3.0.0-rc6 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -749,7 +749,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 # CONFIG_ATA_OVER_ETH is not set # CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_RBD is not set -# CONFIG_SENSORS_LIS3LV02D is not set +CONFIG_SENSORS_LIS3LV02D=m CONFIG_MISC_DEVICES=y # CONFIG_AD525X_DPOT is not set # CONFIG_IBM_ASM is not set @@ -1233,7 +1233,7 @@ CONFIG_USB_NET_DM9601=m # CONFIG_INPUT=y CONFIG_INPUT_FF_MEMLESS=y -# CONFIG_INPUT_POLLDEV is not set +CONFIG_INPUT_POLLDEV=m CONFIG_INPUT_SPARSEKMAP=m # @@ -2165,6 +2165,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y # CONFIG_SND_SEQUENCER is not set # CONFIG_SND_MIXER_OSS is not set # CONFIG_SND_PCM_OSS is not set @@ -2228,10 +2229,11 @@ CONFIG_SND_CTXFI=m # CONFIG_SND_FM801 is not set CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_HWDEP=y -# CONFIG_SND_HDA_RECONFIG is not set -# CONFIG_SND_HDA_INPUT_BEEP is not set -# CONFIG_SND_HDA_INPUT_JACK is not set -# CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=2 +CONFIG_SND_HDA_INPUT_JACK=y +CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_CODEC_REALTEK=y CONFIG_SND_HDA_CODEC_ANALOG=y CONFIG_SND_HDA_CODEC_SIGMATEL=y @@ -2422,7 +2424,7 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set +CONFIG_USB_UAS=m # CONFIG_USB_LIBUSUAL is not set # @@ -2745,8 +2747,8 @@ CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_DELL_WMI_AIO is not set # CONFIG_FUJITSU_LAPTOP is not set # CONFIG_TC1100_WMI is not set -# CONFIG_HP_ACCEL is not set -# CONFIG_HP_WMI is not set +CONFIG_HP_ACCEL=m +CONFIG_HP_WMI=m # CONFIG_MSI_LAPTOP is not set # CONFIG_PANASONIC_LAPTOP is not set # CONFIG_COMPAL_LAPTOP is not set diff --git a/projects/Generic/options b/projects/Generic/options index a9cc2a8635..92577d0019 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -200,16 +200,17 @@ ATVCLIENT_SUPPORT="yes" # LCD driver to Use - Possible drivers are ( Comma seperated: -# bayrad,CFontz,CFontz633,CFontzPacket,CwLnx,ea65, -# EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,icp_a106,imon,imonlcd, -# IOWarrior,irman,irtrans,joy,lb216,lcdm001,lcterm,lirc,lis, -# MD8800,ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,picolcd, -# pyramid,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli, -# stv5730,SureElec,t6963,text,tyan,ula200,xosd +# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, +# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd, +# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans, +# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a, +# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD, +# picolcd,pyramid,sed1330,sed1520,serialPOS, +# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga, # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a" # additional Firmware to use (dvb-firmware, wlan-firmware) # Space separated list is supported, diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index bed13f44f0..9c7e20b376 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.0-rc4 Kernel Configuration +# Linux/i386 3.0.0-rc6 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2020,6 +2020,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y # CONFIG_SND_SEQUENCER is not set # CONFIG_SND_MIXER_OSS is not set # CONFIG_SND_PCM_OSS is not set @@ -2082,10 +2083,11 @@ CONFIG_SND_PCI=y # CONFIG_SND_FM801 is not set CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_HWDEP=y -# CONFIG_SND_HDA_RECONFIG is not set -# CONFIG_SND_HDA_INPUT_BEEP is not set -# CONFIG_SND_HDA_INPUT_JACK is not set -# CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=2 +CONFIG_SND_HDA_INPUT_JACK=y +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 @@ -2705,7 +2707,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -# CONFIG_CIFS_NFSD_EXPORT is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 79c1ec874d..ed6f2bf68d 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.0-rc4 Kernel Configuration +# Linux/x86_64 3.0.0-rc6 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1957,6 +1957,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y # CONFIG_SND_SEQUENCER is not set # CONFIG_SND_MIXER_OSS is not set # CONFIG_SND_PCM_OSS is not set @@ -2019,10 +2020,11 @@ CONFIG_SND_PCI=y # CONFIG_SND_FM801 is not set CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_HWDEP=y -# CONFIG_SND_HDA_RECONFIG is not set -# CONFIG_SND_HDA_INPUT_BEEP is not set -# CONFIG_SND_HDA_INPUT_JACK is not set -# CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=2 +CONFIG_SND_HDA_INPUT_JACK=y +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 @@ -2648,7 +2650,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -# CONFIG_CIFS_NFSD_EXPORT is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/ION/options b/projects/ION/options index 73675445da..ae25a99359 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -200,16 +200,17 @@ ATVCLIENT_SUPPORT="no" # LCD driver to Use - Possible drivers are ( Comma seperated: -# bayrad,CFontz,CFontz633,CFontzPacket,CwLnx,ea65, -# EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,icp_a106,imon,imonlcd, -# IOWarrior,irman,irtrans,joy,lb216,lcdm001,lcterm,lirc,lis, -# MD8800,ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,picolcd, -# pyramid,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli, -# stv5730,SureElec,t6963,text,tyan,ula200,xosd +# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, +# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd, +# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans, +# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a, +# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD, +# picolcd,pyramid,sed1330,sed1520,serialPOS, +# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga, # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a" # additional Firmware to use (dvb-firmware, wlan-firmware) # Space separated list is supported, diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index bf55c1ca6b..652d8d78dc 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.0-rc4 Kernel Configuration +# Linux/i386 3.0.0-rc6 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2070,6 +2070,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y # CONFIG_SND_SEQUENCER is not set # CONFIG_SND_MIXER_OSS is not set # CONFIG_SND_PCM_OSS is not set @@ -2132,10 +2133,11 @@ CONFIG_SND_PCI=y # CONFIG_SND_FM801 is not set CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_HWDEP=y -# CONFIG_SND_HDA_RECONFIG is not set -# CONFIG_SND_HDA_INPUT_BEEP is not set -# CONFIG_SND_HDA_INPUT_JACK is not set -# CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=2 +CONFIG_SND_HDA_INPUT_JACK=y +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 @@ -2762,7 +2764,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -# CONFIG_CIFS_NFSD_EXPORT is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 03addf6ed1..df32bc70b4 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.0-rc4 Kernel Configuration +# Linux/x86_64 3.0.0-rc6 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2012,6 +2012,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y # CONFIG_SND_SEQUENCER is not set # CONFIG_SND_MIXER_OSS is not set # CONFIG_SND_PCM_OSS is not set @@ -2074,10 +2075,11 @@ CONFIG_SND_PCI=y # CONFIG_SND_FM801 is not set CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_HWDEP=y -# CONFIG_SND_HDA_RECONFIG is not set -# CONFIG_SND_HDA_INPUT_BEEP is not set -# CONFIG_SND_HDA_INPUT_JACK is not set -# CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=2 +CONFIG_SND_HDA_INPUT_JACK=y +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 @@ -2701,7 +2703,6 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -# CONFIG_CIFS_NFSD_EXPORT is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Intel/options b/projects/Intel/options index a5465b1f51..568129dd65 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -200,16 +200,17 @@ ATVCLIENT_SUPPORT="no" # LCD driver to Use - Possible drivers are ( Comma seperated: -# bayrad,CFontz,CFontz633,CFontzPacket,CwLnx,ea65, -# EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,icp_a106,imon,imonlcd, -# IOWarrior,irman,irtrans,joy,lb216,lcdm001,lcterm,lirc,lis, -# MD8800,ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,picolcd, -# pyramid,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli, -# stv5730,SureElec,t6963,text,tyan,ula200,xosd +# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, +# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd, +# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans, +# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a, +# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD, +# picolcd,pyramid,sed1330,sed1520,serialPOS, +# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga, # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a" # additional Firmware to use (dvb-firmware, wlan-firmware) # Space separated list is supported, diff --git a/projects/Ultra/options b/projects/Ultra/options index deb015fee8..d877cb7fc9 100644 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -197,16 +197,17 @@ ATVCLIENT_SUPPORT="no" # LCD driver to Use - Possible drivers are ( Comma seperated: -# bayrad,CFontz,CFontz633,CFontzPacket,CwLnx,ea65, -# EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,icp_a106,imon,imonlcd, -# IOWarrior,irman,irtrans,joy,lb216,lcdm001,lcterm,lirc,lis, -# MD8800,ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,picolcd, -# pyramid,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli, -# stv5730,SureElec,t6963,text,tyan,ula200,xosd +# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx, +# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd, +# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans, +# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a, +# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD, +# picolcd,pyramid,sed1330,sed1520,serialPOS, +# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga, # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd" + LCD_DRIVER="imon,imonlcd" # additional Firmware to use (dvb-firmware, wlan-firmware) # Space separated list is supported, diff --git a/tools/mkpkg/mkpkg_xf86-video-intel b/tools/mkpkg/mkpkg_xf86-video-intel new file mode 100755 index 0000000000..814bc6ed60 --- /dev/null +++ b/tools/mkpkg/mkpkg_xf86-video-intel @@ -0,0 +1,43 @@ +#!/bin/sh +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +echo "getting sources..." + if [ ! -d xf86-video-intel.git ]; then + git clone git://anongit.freedesktop.org/xorg/driver/xf86-video-intel -b master xf86-video-intel.git + fi + + cd xf86-video-intel.git + git pull + GIT_REV=`git log -n1 --format=%h` + cd .. + +echo "copying sources..." + rm -rf xf86-video-intel-$GIT_REV + cp -R xf86-video-intel.git xf86-video-intel-$GIT_REV + +echo "cleaning sources..." + rm -rf xf86-video-intel-$GIT_REV/.git + +echo "packing sources..." + tar cvJf xf86-video-intel-$GIT_REV.tar.xz xf86-video-intel-$GIT_REV + +echo "remove temporary sourcedir..." + rm -rf xf86-video-intel-$GIT_REV