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

merging trunk

Browse Source 
- add initial patch for adding nct667x lirc driver
- add asound.conf config file
This commit is contained in:
Stephan Raue 2010-05-08 20:12:23 +02:00
commit 4caa85818d
92 changed files with 6213 additions and 1051 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
packages/audio/alsa/config/asound.conf Normal file
View File

@ -0,0 +1,69 @@
pcm.!default {
type plug
slave {
pcm "both"
}
}
pcm.both {
type route
slave {
pcm multi
channels 6
}
ttable.0.0 1.0
ttable.1.1 1.0
ttable.0.2 1.0
ttable.1.3 1.0
ttable.0.4 1.0
ttable.1.5 1.0
}
pcm.multi {
type multi
slaves.a {
pcm "tv"
channels 2
}
slaves.b {
pcm "receiver"
channels 2
}
slaves.c {
pcm "analog"
channels 2
}
bindings.0.slave a
bindings.0.channel 0
bindings.1.slave a
bindings.1.channel 1
bindings.2.slave b
bindings.2.channel 0
bindings.3.slave b
bindings.3.channel 1
bindings.4.slave c
bindings.4.channel 0
bindings.5.slave c
bindings.5.channel 1
}
pcm.tv {
type hw
card 0
device 3
channels 2
}
pcm.receiver {
type hw
card 0
device 1
channels 2
}
pcm.analog {
type hw
card 0
device 0
channels 2
}

3
packages/debug/install
View File

@ -5,6 +5,3 @@
$SCRIPTS/install strace
$SCRIPTS/install gdb
$SCRIPTS/install bootchart
$SCRIPTS/install mrxvt
$SCRIPTS/install evilwm

8
packages/graphics/Mesa/build
View File

@ -17,7 +17,6 @@ get_graphicdrivers
cd $PKG_BUILD
HOST_CC=$HOST_CC \
OPT_FLAGS="$CFLAGS -D_GNU_SOURCE" \
HOST_OPT_FLAGS="$HOST_CFLAGS" \
X11_INCLUDES= \
DRI_DRIVER_INSTALL_DIR="$XORG_PATH_DRI" \
@ -48,7 +47,12 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
--without-demos \
--disable-gallium \
make
make -C src/glsl CC=$HOST_CC CFLAGS=""
mv src/glsl/apps/compile ./host_compile
make clean
make GLSL_CL="\$(TOP)/host_compile"
make -C progs/xdemos

12
packages/graphics/Mesa/patches/101_ubuntu_hidden_glname.patch
View File

@ -1,12 +0,0 @@
Index: mesa/src/mesa/x86/glapi_x86.S
===================================================================
--- mesa.orig/src/mesa/x86/glapi_x86.S 2009-06-29 14:43:07.000000000 +0300
+++ mesa/src/mesa/x86/glapi_x86.S 2009-06-29 14:45:38.000000000 +0300
@@ -148,7 +148,6 @@
ALIGNTEXT16
GLOBL GLNAME(gl_dispatch_functions_start)
- HIDDEN(GLNAME(gl_dispatch_functions_start))
GLNAME(gl_dispatch_functions_start):
GL_STUB(NewList, _gloffset_NewList, NewList@8)

14
packages/graphics/Mesa/patches/102_dont-vblank.diff
View File

@ -1,14 +0,0 @@
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 5233e58..5dded4b 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -55,7 +55,7 @@ PUBLIC const char __driConfigOptions[] =
DRI_CONF_BEGIN
DRI_CONF_SECTION_PERFORMANCE
DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
- DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_ALWAYS_SYNC)
+ DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
/* Options correspond to DRI_CONF_BO_REUSE_DISABLED,
* DRI_CONF_BO_REUSE_ALL
*/

18
packages/graphics/Mesa/patches/108_big_endian.patch
View File

@ -1,18 +0,0 @@
diff -Nurp mesa-7.6.0~git20090817.7c422387/src/mesa/drivers/dri/r300/r300_draw.c mesa-7.6.0~git20090817.7c422387-working/src/mesa/drivers/dri/r300/r300_draw.c
--- mesa-7.6.0~git20090817.7c422387/src/mesa/drivers/dri/r300/r300_draw.c 2009-08-17 07:30:14.000000000 -0700
+++ mesa-7.6.0~git20090817.7c422387-working/src/mesa/drivers/dri/r300/r300_draw.c 2009-08-26 13:38:46.000000000 -0700
@@ -108,12 +108,13 @@ static void r300FixupIndexBuffer(GLconte
#if MESA_BIG_ENDIAN
} else { /* if (mesa_ind_buf->type == GL_UNSIGNED_SHORT) */
+ GLuint size;
GLushort *in = (GLushort *)src_ptr;
size = sizeof(GLushort) * ((mesa_ind_buf->count + 1) & ~1);
radeonAllocDmaRegion(&r300->radeon, &r300->ind_buf.bo, &r300->ind_buf.bo_offet, size, 4);
- assert(r300->ind_buf.bo->ptr != NULL)
+ assert(r300->ind_buf.bo->ptr != NULL);
out = (GLuint *)ADD_POINTERS(r300->ind_buf.bo->ptr, r300->ind_buf.bo_offset);
for (i = 0; i + 1 < mesa_ind_buf->count; i += 2) {

26
packages/graphics/Mesa/patches/109_fix_relocation_delta_for_wm_surfaces.patch
View File

@ -1,26 +0,0 @@
From acfea5c705f383692e661d37c5cd7da2f3db559b Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 09 Sep 2009 19:35:30 +0000
Subject: i965: Fix relocation delta for WM surfaces.
This was a regression in 0f328c90dbc893e15005f2ab441d309c1c176245.
Bug #23688
Bug #23254
(cherry picked from commit 5604b27b9326ac542069a49ed9650c4b0d3e939a)
---
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 096f743..3dcc592 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -629,7 +629,7 @@ brw_update_renderbuffer_surface(struct brw_context *brw,
drm_intel_bo_emit_reloc(brw->wm.surf_bo[unit],
offsetof(struct brw_surface_state, ss1),
region_bo,
- surf.ss1.base_addr,
+ surf.ss1.base_addr - region_bo->offset,
I915_GEM_DOMAIN_RENDER,
I915_GEM_DOMAIN_RENDER);
}
--
cgit v0.8.2

4
packages/graphics/Mesa/url
View File

@ -1,2 +1,2 @@
ftp://ftp.freedesktop.org/pub/mesa/7.7.1/MesaLib-7.7.1.tar.bz2
ftp://ftp.freedesktop.org/pub/mesa/7.7.1/MesaDemos-7.7.1.tar.bz2
ftp://freedesktop.org/pub/mesa/7.8.1/MesaLib-7.8.1.tar.bz2
ftp://freedesktop.org/pub/mesa/7.8.1/MesaDemos-7.8.1.tar.bz2

2
packages/image/install
View File

@ -55,8 +55,6 @@ case "$2" in
$SCRIPTS/install linux $2
$SCRIPTS/install busybox
$SCRIPTS/install util-linux-ng
$SCRIPTS/install pm-utils
$SCRIPTS/install ureadahead
echo "OpenELEC" > $INSTALL/etc/distribution

3700
packages/linux/patches/linux-2.6.33-02-add_lirc_driver_nct667x-0.5.diff Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-theme-Confluence-29890.tar.bz2
http://sources.openelec.tv/svn/xbmc-theme-Confluence-29914.tar.bz2

2
packages/mediacenter/xbmc-theme-PM3-HD/url
View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29890.tar.bz2
http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29914.tar.bz2

12
packages/mediacenter/xbmc/init.d/09_cache_xbmc
View File

@ -1,12 +0,0 @@
#
# caching xbmc
#
# runlevels: openelec, textmode
if [ "$XBMC_CACHING" = "yes" ]; then
progress "caching XBMC"
cache_xbmc
fi

24
packages/mediacenter/xbmc/init.d/60_xbmc Normal file
View File

@ -0,0 +1,24 @@
# starting XBMC
#
# runlevels: openelec
. /etc/profile
progress "starting XBMC"
XBMC_ARGS="--standalone -fs --lircdev /dev/lircd"
[ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
while true; do
DISPLAY=:0.0 xbmc $XBMC_ARGS > /dev/null 2>&1
RET=$?
echo "Exited with code $RET"
[ "$RET" == 0 ] && sync && poweroff
[ "$RET" == 64 ] && sync && poweroff
[ "$RET" == 66 ] && sync && reboot
usleep 250000
done

4
packages/mediacenter/xbmc/install
View File

@ -68,11 +68,11 @@ PKG_DIR=`find $PACKAGES -type d -name $1`
PYTHON_LIBDIR="`ls -d $INSTALL/usr/lib/python*`"
mkdir -p $INSTALL/usr/bin
cp -P $PKG_DIR/scripts/xbmc-session $INSTALL/usr/bin
cp -P $PKG_BUILD/xbmc.bin $INSTALL/usr/bin/xbmc
# cp -P $PKG_DIR/scripts/xbmc-session $INSTALL/usr/bin
cp -P $PKG_BUILD/tools/EventClients/Clients/XBMC\ Send/xbmc-send.py $INSTALL/usr/bin/xbmc-send
mkdir -p $INSTALL/usr/share/xbmc
cp -P $PKG_BUILD/xbmc.bin $INSTALL/usr/share/xbmc
cp -P $PKG_BUILD/xbmc-xrandr $INSTALL/usr/share/xbmc
mkdir -p $INSTALL/usr/share/xbmc/language

26
packages/mediacenter/xbmc/scripts/xbmc-session
View File

@ -1,26 +0,0 @@
#!/bin/sh
. /etc/profile
XBMC_ARGS="--standalone -fs --lircdev /dev/lircd"
if test "$XBMC_CACHING" = "yes" ; then
wait_for_xbmc_cache
XBMC_BIN="/var/cache/bin/xbmc.bin"
else
XBMC_BIN="/usr/share/xbmc/xbmc.bin"
fi
[ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate &
while true; do
$IONICE $XBMC_BIN $XBMC_ARGS $@ > /dev/null 2>&1
RET=$?
echo "Exited with code $RET"
[ "$RET" == 0 ] && sync && poweroff
[ "$RET" == 64 ] && sync && poweroff
[ "$RET" == 66 ] && sync && reboot
done

2
packages/mediacenter/xbmc/url
View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-29890.tar.bz2
http://sources.openelec.tv/svn/xbmc-29914.tar.bz2

15
packages/sysutils/bash/build Executable file
View File

@ -0,0 +1,15 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--bindir=/bin \
--without-bash-malloc \
--without-installed-readline \
make

7
packages/sysutils/bash/install Executable file
View File

@ -0,0 +1,7 @@
#!/bin/sh
. config/options
mkdir -p $INSTALL/bin
cp $PKG_BUILD/bash $INSTALL/bin
ln -sf bash $INSTALL/bin/sh

99
packages/sysutils/bash/patches/bash-4.1-fixes-1.diff Normal file
View File

@ -0,0 +1,99 @@
Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org>
Date: 2010-04-14
Initial Package Version: 4.1
Upstream Status: Already in upstream patch repo
Origin: Upstream
Description: This patch contains upstream patch numbers 1 thru 5.
diff -Naur bash-4.1.orig/bashline.c bash-4.1/bashline.c
--- bash-4.1.orig/bashline.c 2009-10-24 19:10:19.000000000 +0100
+++ bash-4.1/bashline.c 2010-04-14 20:15:22.075440836 +0100
@@ -1680,7 +1680,7 @@
a single match (multiple matches that end up reducing the number of
characters in the common prefix are bad) will ever be returned on
regular completion. */
- if (glob_pattern_p (hint))
+ if (globpat)
{
if (state == 0)
{
diff -Naur bash-4.1.orig/builtins/printf.def bash-4.1/builtins/printf.def
--- bash-4.1.orig/builtins/printf.def 2009-11-20 20:31:23.000000000 +0000
+++ bash-4.1/builtins/printf.def 2010-04-14 20:15:22.055434803 +0100
@@ -172,7 +172,7 @@
#endif
#if !HAVE_VSNPRINTF
-extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
+extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));
#endif
static void printf_erange __P((char *));
diff -Naur bash-4.1.orig/builtins/read.def bash-4.1/builtins/read.def
--- bash-4.1.orig/builtins/read.def 2009-10-08 16:35:46.000000000 +0100
+++ bash-4.1/builtins/read.def 2010-04-14 20:15:22.095436083 +0100
@@ -615,14 +615,15 @@
if (unbuffered_read == 0)
zsyncfd (fd);
- interrupt_immediately--;
- terminate_immediately--;
discard_unwind_frame ("read_builtin");
retval = eof ? EXECUTION_FAILURE : EXECUTION_SUCCESS;
assign_vars:
+ interrupt_immediately--;
+ terminate_immediately--;
+
#if defined (ARRAY_VARS)
/* If -a was given, take the string read, break it into a list of words,
an assign them to `arrayname' in turn. */
diff -Naur bash-4.1.orig/lib/readline/complete.c bash-4.1/lib/readline/complete.c
--- bash-4.1.orig/lib/readline/complete.c 2009-11-29 23:39:30.000000000 +0000
+++ bash-4.1/lib/readline/complete.c 2010-04-14 20:15:22.064194346 +0100
@@ -2138,7 +2138,7 @@
All other entries except "." and ".." match. */
if (filename_len == 0)
{
- if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))
+ if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))
continue;
if (convfn[0] != '.' ||
@@ -2219,7 +2219,7 @@
temp[dirlen++] = '/';
}
- strcpy (temp + dirlen, entry->d_name);
+ strcpy (temp + dirlen, convfn);
}
else
temp = savestring (convfn);
diff -Naur bash-4.1.orig/patchlevel.h bash-4.1/patchlevel.h
--- bash-4.1.orig/patchlevel.h 2009-10-01 21:39:22.000000000 +0100
+++ bash-4.1/patchlevel.h 2010-04-14 20:15:22.099440845 +0100
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 0
+#define PATCHLEVEL 5
#endif /* _PATCHLEVEL_H_ */
diff -Naur bash-4.1.orig/variables.c bash-4.1/variables.c
--- bash-4.1.orig/variables.c 2009-11-03 19:13:58.000000000 +0000
+++ bash-4.1/variables.c 2010-04-14 20:15:22.088697241 +0100
@@ -3808,6 +3808,11 @@
if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate)))
{
+ /* Make sure we have a hash table to store the variable in while it is
+ being propagated down to the global variables table. Create one if
+ we have to */
+ if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0)
+ shell_variables->table = hash_create (0);
/* XXX - should we set v->context here? */
v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0);
if (shell_variables == global_variables)

1
packages/sysutils/bash/url Normal file
View File

@ -0,0 +1 @@
http://ftp.gnu.org/gnu/bash/bash-4.1.tar.gz

28
packages/sysutils/busybox/config/busybox.conf
View File

@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.16.1
# Sun May 2 15:07:06 2010
# Sat May 8 08:10:16 2010
#
CONFIG_HAVE_DOT_CONFIG=y
@ -214,8 +214,8 @@ CONFIG_NICE=y
CONFIG_PRINTENV=y
CONFIG_PRINTF=y
# CONFIG_PWD is not set
# CONFIG_READLINK is not set
# CONFIG_FEATURE_READLINK_FOLLOW is not set
CONFIG_READLINK=y
CONFIG_FEATURE_READLINK_FOLLOW=y
# CONFIG_REALPATH is not set
CONFIG_RM=y
CONFIG_RMDIR=y
@ -252,7 +252,7 @@ CONFIG_FEATURE_TR_EQUIV=y
CONFIG_UNAME=y
# CONFIG_UNEXPAND is not set
# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
# CONFIG_UNIQ is not set
CONFIG_UNIQ=y
CONFIG_USLEEP=y
# CONFIG_UUDECODE is not set
# CONFIG_UUENCODE is not set
@ -281,7 +281,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y
#
# Console Utilities
#
CONFIG_CHVT=y
# CONFIG_CHVT is not set
CONFIG_CLEAR=y
# CONFIG_DEALLOCVT is not set
# CONFIG_DUMPKMAP is not set
@ -814,7 +814,7 @@ CONFIG_FEATURE_PS_WIDE=y
# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
# CONFIG_RENICE is not set
# CONFIG_BB_SYSCTL is not set
CONFIG_BB_SYSCTL=y
CONFIG_TOP=y
CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
@ -859,11 +859,11 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
#
# Shells
#
CONFIG_FEATURE_SH_IS_ASH=y
# CONFIG_FEATURE_SH_IS_ASH is not set
# CONFIG_FEATURE_SH_IS_HUSH is not set
# CONFIG_FEATURE_SH_IS_NONE is not set
CONFIG_ASH=y
CONFIG_ASH_BASH_COMPAT=y
CONFIG_FEATURE_SH_IS_NONE=y
# CONFIG_ASH is not set
# CONFIG_ASH_BASH_COMPAT is not set
# CONFIG_ASH_JOB_CONTROL is not set
# CONFIG_ASH_ALIAS is not set
# CONFIG_ASH_GETOPTS is not set
@ -873,8 +873,8 @@ CONFIG_ASH_BASH_COMPAT=y
# CONFIG_ASH_CMDCMD is not set
# CONFIG_ASH_MAIL is not set
# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
CONFIG_ASH_RANDOM_SUPPORT=y
CONFIG_ASH_EXPAND_PRMT=y
# CONFIG_ASH_RANDOM_SUPPORT is not set
# CONFIG_ASH_EXPAND_PRMT is not set
# CONFIG_HUSH is not set
# CONFIG_HUSH_BASH_COMPAT is not set
# CONFIG_HUSH_HELP is not set
@ -890,9 +890,9 @@ CONFIG_ASH_EXPAND_PRMT=y
# CONFIG_HUSH_RANDOM_SUPPORT is not set
# CONFIG_LASH is not set
# CONFIG_MSH is not set
CONFIG_SH_MATH_SUPPORT=y
# CONFIG_SH_MATH_SUPPORT is not set
# CONFIG_SH_MATH_SUPPORT_64 is not set
CONFIG_FEATURE_SH_EXTRA_QUIET=y
# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
# CONFIG_FEATURE_SH_STANDALONE is not set
# CONFIG_FEATURE_SH_NOFORK is not set
# CONFIG_CTTYHACK is not set

4
packages/sysutils/busybox/install
View File

@ -21,7 +21,6 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
echo "chmod 4755 $INSTALL/bin/busybox" >> $FAKEROOT_SCRIPT
mkdir -p $INSTALL/bin
ln -sf /bin/sh $INSTALL/bin/bash
cp $PKG_DIR/scripts/lsb-release $INSTALL/bin/
mkdir -p $INSTALL/sbin
@ -56,5 +55,6 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
mkdir -p $INSTALL/etc/network
cp $PKG_DIR/config/interfaces $INSTALL/etc/network
# we need an full-featured grep for pm-utils, so we install this :-(
# we need an full-featured grep and bash for pm-utils, so we install this :-(
$SCRIPTS/install grep
$SCRIPTS/install bash

10
packages/sysutils/busybox/profile.d/home.conf Normal file
View File

@ -0,0 +1,10 @@
################################################################################
# Core (PATH) environment variables.
#
# This file contains non-OpenELEC evironment variables as well as OpenELEC
# evironment variables that are not user defined.
################################################################################
HOME="/storage"
export HOME

9
packages/sysutils/dmidecode/build Executable file
View File

@ -0,0 +1,9 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
cd $PKG_BUILD
make CC=$TARGET_CC dmidecode

6
packages/sysutils/dmidecode/install Executable file
View File

@ -0,0 +1,6 @@
#!/bin/sh
. config/options
mkdir -p $INSTALL/usr/sbin
cp -P $PKG_BUILD/dmidecode $INSTALL/usr/sbin

1
packages/sysutils/dmidecode/url Normal file
View File

@ -0,0 +1 @@
http://www.very-clever.com/download/nongnu/dmidecode/dmidecode-2.10.tar.bz2

12
packages/sysutils/hal/init.d/13_hal
View File

@ -1,12 +0,0 @@
#
# starting HAL
#
# runlevels: openelec, textmode
progress "Starting Hardware Abstraction Layer"
$IONICE mkdir -p /var/cache/hald \
/var/run/dbus/hald-local \
/var/run/dbus/hald-runner
hald --verbose=no --daemon=yes --use-syslog &

53
packages/sysutils/hal/install
View File

@ -9,60 +9,7 @@ $SCRIPTS/install dbus
$SCRIPTS/install dbus-glib
$SCRIPTS/install util-linux-ng
add_user haldaemon x 68 68 "HAL daemon" "/" "/bin/sh"
add_group haldaemon 68
mkdir -p $INSTALL/usr/sbin
cp $PKG_BUILD/hald/hald $INSTALL/usr/sbin/
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/lshal $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/hal-device $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/hal-disable-polling $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/hal-find-by-capability $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/hal-find-by-property $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/hal-get-property $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/hal-is-caller-locked-out $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/hal-lock $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/hal-set-property $INSTALL/usr/bin
mkdir -p $INSTALL/usr/libexec
cp $PKG_BUILD/tools/.libs/hal-storage-mount $INSTALL/usr/libexec
cp $PKG_BUILD/tools/.libs/hal-storage-unmount $INSTALL/usr/libexec
cp $PKG_BUILD/tools/.libs/hal-storage-eject $INSTALL/usr/libexec
cp $PKG_BUILD/tools/.libs/hal-storage-closetray $INSTALL/usr/libexec
cp $PKG_BUILD/tools/.libs/hal-storage-cleanup-mountpoint $INSTALL/usr/libexec
cp $PKG_BUILD/tools/.libs/hal-storage-cleanup-all-mountpoints $INSTALL/usr/libexec
cp $PKG_BUILD/hald/linux/addons/.libs/hald-addon-* $INSTALL/usr/libexec
cp $PKG_BUILD/hald/linux/probing/.libs/hald-probe-* $INSTALL/usr/libexec
cp $PKG_BUILD/hald/hald-generate-fdi-cache $INSTALL/usr/libexec
cp $PKG_BUILD/hald-runner/hald-runner $INSTALL/usr/libexec
mkdir -p $INSTALL/usr/lib/hal/scripts
cp $PKG_BUILD/tools/hal-functions $INSTALL/usr/lib/hal/scripts
cp $PKG_BUILD/tools/hal-dockstation-undock $INSTALL/usr/lib/hal/scripts
mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/libhal/.libs/libhal.so* $INSTALL/usr/lib
cp -PR $PKG_BUILD/libhal-storage/.libs/libhal-storage.so* $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libhal-storage.so*T
mkdir -p $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/tools/linux/90-hal.rules $INSTALL/lib/udev/rules.d
mkdir -p $INSTALL/etc/dbus-1/system.d
cp $PKG_BUILD/hal.conf $INSTALL/etc/dbus-1/system.d
mkdir -p $INSTALL/etc/hal/fdi/preprobe
mkdir -p $INSTALL/etc/hal/fdi/information
mkdir -p $INSTALL/etc/hal/fdi/policy
mkdir -p $INSTALL/usr/share/hal/fdi/preprobe
mkdir -p $INSTALL/usr/share/hal/fdi/information/10freedesktop
mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor
cp \
$PKG_BUILD/fdi/policy/10osvendor/10-input-policy.fdi \
$PKG_BUILD/fdi/policy/10osvendor/10-keymap.fdi \
$PKG_BUILD/fdi/policy/10osvendor/20-storage-methods.fdi \
$PKG_BUILD/fdi/policy/10osvendor/20-acl-management.fdi \
$INSTALL/usr/share/hal/fdi/policy/10osvendor

26
packages/sysutils/hal/patches/hal-Linux-should-use-evdev-xkb-rule.diff
View File

@ -1,26 +0,0 @@
From a81c0756c48621fadd18597bb337e08c4c3529d0 Mon Sep 17 00:00:00 2001
From: Yan Li <yan.i.li@intel.com>
Date: Mon, 5 Jan 2009 17:16:03 +0800
Subject: [PATCH] Linux should use evdev xkb rule
Signed-off-by: Yan Li <yan.i.li@intel.com>
---
fdi/policy/10osvendor/10-keymap.fdi | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fdi/policy/10osvendor/10-keymap.fdi b/fdi/policy/10osvendor/10-keymap.fdi
index c9ad87c..1971e8b 100644
--- a/fdi/policy/10osvendor/10-keymap.fdi
+++ b/fdi/policy/10osvendor/10-keymap.fdi
@@ -13,6 +13,7 @@
<merge key="input.xkb.model" type="string">keyboard</merge>
<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
string="Linux">
+ <merge key="input.xkb.rules" type="string">evdev</merge>
<merge key="input.xkb.model" type="string">evdev</merge>
</match>
--
1.5.6.5

15
packages/sysutils/kbd/build Executable file
View File

@ -0,0 +1,15 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
make

8
packages/sysutils/kbd/install Executable file
View File

@ -0,0 +1,8 @@
#!/bin/sh
. config/options
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/src/chvt $INSTALL/usr/bin
cp $PKG_BUILD/src/deallocvt $INSTALL/usr/bin
cp $PKG_BUILD/src/fgconsole $INSTALL/usr/bin

1
packages/sysutils/kbd/url Normal file
View File

@ -0,0 +1 @@
http://www.kernel.org/pub/linux/utils/kbd/kbd-1.15.2.tar.bz2

22
packages/sysutils/pm-utils/install
View File

@ -3,6 +3,10 @@
. config/options
$SCRIPTS/install grep
$SCRIPTS/install dmidecode
$SCRIPTS/install kbd
PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/etc/pm/config.d
mkdir -p $INSTALL/etc/pm/power.d
@ -23,19 +27,25 @@ mkdir -p $INSTALL/usr/lib/pm-utils/
cp -P $PKG_BUILD/pm/$file $INSTALL/usr/lib/pm-utils
done
mkdir -p $INSTALL/usr/lib/pm-utils/video-quirks/
cp $PKG_DIR/quirks/*.quirkdb $INSTALL/usr/lib/pm-utils/video-quirks/
mkdir -p $INSTALL/usr/lib/pm-utils/module.d
for file in kernel tuxonice uswsusp; do
# tuxonice
for file in kernel uswsusp; do
cp -P $PKG_BUILD/pm/module.d/$file $INSTALL/usr/lib/pm-utils/module.d
done
mkdir -p $INSTALL/usr/lib/pm-utils/power.d
for file in sched-powersave; do
cp -P $PKG_BUILD/pm/power.d/$file $INSTALL/usr/lib/pm-utils/power.d
chmod +x $INSTALL/usr/lib/pm-utils/power.d/$file
done
# disabled, because not needed
# for file in sched-powersave; do
# cp -P $PKG_BUILD/pm/power.d/$file $INSTALL/usr/lib/pm-utils/power.d
# chmod +x $INSTALL/usr/lib/pm-utils/power.d/$file
# done
mkdir -p $INSTALL/usr/lib/pm-utils/sleep.d
for file in 00logging 00powersave 01grub 49bluetooth 55NetworkManager 75modules 90clock 94cpufreq 95led 98video-quirk-db-handler 99video; do
# 01grub 49bluetooth 55NetworkManager 90clock 95led
for file in 00logging 00powersave 75modules 94cpufreq 98video-quirk-db-handler 99video; do
cp -P $PKG_BUILD/pm/sleep.d/$file $INSTALL/usr/lib/pm-utils/sleep.d
chmod +x $INSTALL/usr/lib/pm-utils/sleep.d/$file
done

158
packages/sysutils/pm-utils/quirks/20-video-quirk-pm-acer.quirkdb Normal file
View File

@ -0,0 +1,158 @@
# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
match system.hardware.vendor regex_ncase ^Acer
match system.hardware.product regex ^TravelMate
match system.hardware.product regex C300
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex 2350|2410|2420|2490|3220|4000|4650|5320
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex 3000|4100
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex 2300|2310|3010|3020|6291
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex 3260
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
addquirk --quirk-pci-save
endmatch
match system.hardware.product regex 7520|8000
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex C100|6460
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex C200|2450|4400|6492
addquirk --quirk-none
endmatch
# <!-- Acer TravalMate 4002 Wlmi with ATI RadeOn Mobility 9700. mashine suspends, wakes up, but "vbetool post" hangs -->
match system.hardware.product regex 4000
match system.hardware.primary_video.product numeric_compare_eq 20048
match system.hardware.primary_video.vendor numeric_compare_eq 4098
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
addquirk --quirk-dpms-on
endmatch
endmatch
endmatch
# <!-- these need the full name to prevent mixes with other machines
# NOTE: HAL removes whitespaces at the end of the sysfs and dmidecode output,
# we need to do exact string matches.
# -->
match system.hardware.product regex ^(TravelMate 240|TravelMate 250|TravelMate 650)$
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex ^TravelMate 380$
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
addquirk --quirk-s3-mode
endmatch
# <!-- TravelMate 630Lci -->
match system.hardware.product regex ^(TravelMate 630|TravelMate 230)$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^TravelMate 660$
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex ^TravelMate 800$
addquirk --quirk-vbe-post
endmatch
endmatch
match system.hardware.product regex ^Aspire
match system.hardware.product regex 5050
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex 1670|3610|3620|3690|5630
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex 5610
# <!-- report from s2ram for a 5610Z, not sure if the 5610 is the same, so do this check -->
match system.hardware.product regex 5610Z
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex_inverse 5610Z
addquirk --quirk-vbe-post
endmatch
endmatch
match system.hardware.product regex 5000|5020|5500
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex 1640
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex 1500|3000
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex 1520|1650|5100|5110|5570|5920
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex 1690|1694
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
addquirk --quirk-no-fb
endmatch
match system.hardware.product regex 1350$
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
addquirk --quirk-no-fb
endmatch
match system.hardware.product regex 2010|2920|3100|4520|5500Z|5580|5920G
addquirk --quirk-none
endmatch
endmatch
match system.hardware.product regex ^Extensa
match system.hardware.product regex 6220
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex 2900|3000|4150|5620
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex 5220
addquirk --quirk-s3-bios
addquirk --quirk-vbe-post
endmatch
endmatch
match system.hardware.product regex ^Ferrari
match system.hardware.product regex 4000
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
addquirk --quirk-no-fb
endmatch
match system.hardware.product regex 1000
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
# <!-- does not work with fglrx -->
match system.hardware.product regex 5000
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.hardware.product regex ^Xspire
match system.hardware.product regex 1650
addquirk --quirk-none
endmatch
endmatch
match system.hardware.product regex ^AcerPower
match system.hardware.product regex 2000
addquirk --quirk-none
endmatch
endmatch
# <!-- Aspire One 110 -->
match system.hardware.product regex ^(AOA110|AOA150)
addquirk --quirk-none
endmatch
endmatch

25
packages/sysutils/pm-utils/quirks/20-video-quirk-pm-apple.quirkdb Normal file
View File

@ -0,0 +1,25 @@
# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
match system.hardware.vendor regex ^Apple
match system.hardware.product regex ^MacBook2,1$
match system.hardware.vendor regex ^Apple Inc\.
match system.hardware.version regex ^1\.0$
# <!-- needs VBE_SAVE from console, but that slows resuming -->
addquirk --quirk-none
endmatch
endmatch
match system.hardware.vendor regex Computer, Inc\.
addquirk --quirk-vbe-post
endmatch
endmatch
match system.hardware.product regex ^(MacBook1,1|MacBook3,1)$
# <!-- s2ram uses vbe_post + vbemode_restore for MacBook1,1 -->
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex ^MacBookPro1,1$
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex ^MacBookPro2,2$
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
endmatch

114
packages/sysutils/pm-utils/quirks/20-video-quirk-pm-asus.quirkdb Normal file
View File

@ -0,0 +1,114 @@
# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
match system.hardware.vendor regex ^ASUS
match system.hardware.product regex ^(U5F |M2000E|F2J )
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex ^(K8N-E-Deluxe|L2000D|M6Ne|M51Sr |U6S|A8N)
addquirk --quirk-s3-mode
endmatch
# <!--NOTE: s2ram list the F3F with power_management.quirk.none=true -->
match system.hardware.product regex ^(M6VA|M6N |M5N|M7A|S6F|S5N |W3A|W5A |M2N |A2D |F3F |V6V|A8He|A6Kt |F3JC |F3Sc)
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^Z35FM
addquirk --quirk-s3-bios
addquirk --quirk-pci-save
endmatch
match system.hardware.product regex ^(A6M|Z84F)
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex ^W7J
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex ^(L3000D|M3N |U3S |X51RL )
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex ^F3Ka
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
addquirk --quirk-no-fb
endmatch
match system.hardware.product regex ^V1J
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
addquirk --quirk-no-fb
endmatch
# <!-- Z91E is identified as A3E -->
match system.hardware.product regex ^(A6J |A6U|A3E|F3JP)
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
# <!-- Asus Eee PC (Note: there is a report from s2ram to use vbe_post, vbemode_restore)-->
match system.hardware.product regex ^(701|900)$
addquirk --quirk-s3-bios
addquirk --quirk-dpms-on
endmatch
match system.hardware.product regex ^901$
addquirk --quirk-vbe-post
endmatch
# <!-- these need no quirks, whitelist them -->
match system.hardware.product regex ^(A2H/L|A6Km|A6JC |A6K |A6T|A6G|A6VA|A8JS |F3Sg|F3T|F9E |G1S|K8V-MX|1000H|F2JE)
addquirk --quirk-none
endmatch
endmatch
# <!-- ASUS Laptop with different vendor string (M2400N) -->
match system.hardware.vendor regex ^ERGOUK
match system.hardware.product regex ^M2N
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
# <!-- ASUS Mainboard with different vendor string -->
match system.hardware.vendor regex ^System manufacturer$
match system.hardware.product regex ^P5Q DELUXE$
match system.firmware.version regex ^System Version
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.version regex ^P5KR
match system.hardware.product regex ^System Version
addquirk --quirk-none
endmatch
endmatch
endmatch
# <!-- Board with broken system.hardware.* fields. Use system.board.* instead -->
match system.board.product regex ^P5LD2
addquirk --quirk-s3-bios
endmatch
# <!-- ASUS a7v600 motherboard, has no usable sys_* entries besides bios_version -->
match system.firmware.version regex ^ASUS A7V600
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
# <!-- another ASUS Mainboard -->
match system.firmware.version regex ^(ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201|ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101|ASUS M2A-VM HDMI ACPI BIOS Revision 1603|ASUS A7V8X-X ACPI BIOS Revision)
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.firmware.version regex ^ASUS M2A-VM ACPI BIOS Revision
match system.firmware.version regex 1101
addquirk --quirk-s3-bios
addquirk --quirk-vbemode-restore
endmatch
match system.firmware.version regex_inverse 1101
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.firmware.version regex ^ASUS P4B266 ACPI BIOS Revision
match system.firmware.version regex 1010
match system.hardware.primary_video.vendor numeric_compare_eq 0x1002
match system.hardware.primary_video.product numeric_compare_eq 0x4966
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
endmatch
endmatch
# <!-- another ASUS Mainboard, this need no quirk -->
match system.firmware.version regex ^(ASUS M2N-E ACPI BIOS Revision|ASUS Striker ACPI BIOS Revision|ASUS A7V ACPI BIOS Revision)
addquirk --quirk-none
endmatch

169
packages/sysutils/pm-utils/quirks/20-video-quirk-pm-dell.quirkdb Normal file
View File

@ -0,0 +1,169 @@
# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
match system.hardware.vendor regex ^Dell
# <!-- Dell Latitude -->
match system.hardware.product regex ^Latitude
match system.hardware.product regex C500
addquirk --quirk-dpms-suspend
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex C600
addquirk --quirk-radeon-off
endmatch
match system.hardware.product regex C800
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex X300|D820
# <!-- the Dell D820 is also reported to work with vbe_post+vbemode_restore and
# need may dpms_on -->
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex CPx J800GT|D400|D410|D420|D430|D520|D530|C610|D620|D830
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex C400|C840|D500|D505|D800|X200
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex D600|D610
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
addquirk --quirk-no-fb
endmatch
match system.hardware.product regex D630
match system.firmware.version compare_lt A12
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
addquirk --quirk-no-fb
endmatch
match system.firmware.version compare_ge A12
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.hardware.product regex X1$
addquirk --quirk-vbe-post
endmatch
# <!-- these need no quirks -->
match system.hardware.product regex CPx J650GT|LS |D810
addquirk --quirk-none
endmatch
endmatch
# <!-- Dell Inspiron -->
match system.hardware.product regex ^Inspiron
match system.hardware.product regex 1501|8600
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex 9300
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex 510m
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex 5100
match system.firmware.version regex ^Revision A0$
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
addquirk --quirk-pci-save
endmatch
match system.firmware.version regex_inverse Revision A0
addquirk --quirk-no-fb
endmatch
endmatch
match system.hardware.product regex 5150|8000|8500
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex 500m|600m|1100|1420|1525|2200|5160
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex 700m
# <!-- ONLY needed with i810 X.org driver 1.x versions,
# DO NOT use with intel X.org driver 2.x version (not needed and causes problems)
# <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
# <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
# <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
# <merge key="power_management.quirk.vga_mode3" type="bool">true</merge> -->
addquirk --quirk-none
endmatch
# <!-- these need no quirks -->
match system.hardware.product regex 1011| 1150| 1520| 1720
addquirk --quirk-none
endmatch
endmatch
# <!-- Dell Precision -->
match system.hardware.product regex ^Precision
match system.hardware.product regex M20
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex M6300
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex M60
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex M65
addquirk --quirk-dpms-on
addquirk --quirk-vbe-post
endmatch
# <!-- these need no quirks -->
match system.hardware.product regex M90 |WorkStation 360| M4300
addquirk --quirk-none
endmatch
endmatch
# <!-- Dell Dimension -->
match system.hardware.product regex ^Dimension
match system.hardware.product regex 2400|3000|9100
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
endmatch
# <!-- Dell Vostro -->
match system.hardware.product regex ^Vostro
match system.hardware.product regex 1000
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex 1500
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex 1710
addquirk --quirk-none
endmatch
endmatch
# <!-- Dell OptiPlex -->
match system.hardware.product regex_ncase ^OptiPlex
match system.hardware.product regex GX520|GX260
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex 755
addquirk --quirk-vbe-post
addquirk --quirk-no-fb
endmatch
match system.hardware.product regex_ncase fx160
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex 170L|GX620
addquirk --quirk-none
endmatch
endmatch
# <!-- Dell Inspiron 640m, XPS M1210 -->
match system.hardware.product regex MXC061|MXC062
addquirk --quirk-vbe-post
endmatch
# <!-- Dell XPS M1330, MM061 = Inspiron E1505 or/and 6400 -->
match system.hardware.product regex XPS M1330|MM061
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
# <!-- these need no quirks : Dimension E520, DXP051, Inspiron: 1300, E1702/E1705, 630m, M1710 (only resumes with vesafb) -->
match system.hardware.product regex DM061 |DXP051|ME051|MP061|MXC051|MXG061|XPS M1530
addquirk --quirk-none
endmatch
endmatch

107
packages/sysutils/pm-utils/quirks/20-video-quirk-pm-fujitsu.quirkdb Normal file
View File

@ -0,0 +1,107 @@
# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
match system.hardware.vendor regex ^FUJITSU
match system.hardware.product regex_ncase amilo
match system.hardware.product regex A1667G Serie|Pa 1510|Li 1718|M1425
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex Pro V3205|Pro Edition V3405|Pro Edition V3505|Xi 1546|Si 1520|A7640|Pi 1505|A1645
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex A1650G
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex ^M Series$
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex Amilo D Series|PRO V2030|PRO V2035|PRO V8010|Pi 1536|Pi 2515| L Series
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex AMILO M|A Series
match system.hardware.version regex -1 |0\.01
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
match system.firmware.version regex ^R01-S0N
addquirk --quirk-pci-save
endmatch
endmatch
endmatch
match system.hardware.product regex A7645
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex Pro V2040|Pro Series V3525
addquirk --quirk-none
endmatch
endmatch
match system.hardware.product regex_ncase lifebook
match system.hardware.product regex P7010D|S2110
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex E8410|T4010|S2210|P8010
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
# <!-- S7020 is also reported with s3_bios/s3_mode/pci_save -->
match system.hardware.product regex S7020
addquirk --quirk-vbe-post
addquirk --quirk-reset-brightness
endmatch
match system.hardware.product regex E4010|P7120
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex E8020|S6410
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex T2010
match system.hardware.product regex ^FUJITSU SIEMENS$
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
addquirk --quirk-pci-save
endmatch
match system.hardware.product regex ^FUJITSU$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.product regex T4210|P7230
addquirk --quirk-pci-save
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex B Series|T Series|S7010|S7110|E8110|T301|T3010
addquirk --quirk-none
endmatch
endmatch
match system.hardware.product regex ^SCENIC
match system.hardware.product regex N300/N600|W300/W600|P / SCENICO P
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex W$
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.hardware.product regex ^(ESPRIMO P|ESPRIMO Mobile M9400|ESPRIMO Mobile D9500)
addquirk --quirk-none
endmatch
match system.hardware.product regex ^Stylistic ST5000$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^P6VAP-AP$
addquirk --quirk-none
endmatch
endmatch
# <!-- different vendor string -->
match system.hardware.vendor regex ^FUJITSO
match system.hardware.product regex ^FMVLT70R$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
addquirk --quirk-pci-save
endmatch
endmatch

309
packages/sysutils/pm-utils/quirks/20-video-quirk-pm-hp.quirkdb Normal file
View File

@ -0,0 +1,309 @@
# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
# <!-- Old Compaq machines. Add them to the HP file -->
match system.hardware.vendor regex ^Compaq
# <!-- Compaq Amada -->
match system.hardware.product regex ^Armada
match system.hardware.product regex E500 | M70 | M700
addquirk --quirk-none
endmatch
# <!-- This Armada m300 seems not to have a useful model description, so to make sure also check the bios_version-->
match system.hardware.product regex
match system.firmware.version regex ^1\.35$
addquirk --quirk-none
endmatch
endmatch
endmatch
match system.hardware.product regex ^Evo
match system.hardware.product regex N600c
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex N800w
addquirk --quirk-vbe-post
# <!-- VBE_MODE does not work, text size changes -->
match system.hardware.version regex ^F\.05$
addquirk --quirk-vbestate-restore
endmatch
# <!-- has a later BIOS and needs different Options -->
match system.hardware.version regex_inverse F\.05
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.hardware.product regex D510 USDT| N400c
addquirk --quirk-none
endmatch
endmatch
match system.hardware.product regex ^Presario
match system.hardware.product regex 2701EA
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
addquirk --quirk-no-fb
endmatch
match system.hardware.product regex V3000 \(EZ674UA#|V3700 Notebook PC
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex X1000
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex V2000
addquirk --quirk-dpms-on
endmatch
match system.hardware.product regex V3000 \(EZ755UA#|V5000 \(ET826UA#|2100 \(DP835E\)|F500 \(GF596UA#|2200 \(PR309UA#|C700 \(GV681LA#
addquirk --quirk-none
endmatch
endmatch
match system.hardware.product regex ^N620c 
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.vendor regex ^Hewlett Packard$
match system.hardware.version regex ^HP OmniBook XE3 GF
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
endmatch
match system.hardware.vendor regex ^Hewlett-Packard
match system.hardware.product regex V2000 \(EP381UA#|X1000 \(DK454AV\)| 6715s|6820s
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex 8510w
match system.hardware.primary_video.vendor numeric_compare_eq 0x1002
addquirk --quirk-s3-bios
endmatch
endmatch
match system.hardware.product regex HP OmniBook XT1000
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex V3000 \(RL377PA#|EW434AVABA|R3000|R4100|nc6000
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex nx6125|nc6230|nx8220
addquirk --quirk-vbestate-restore
addquirk --quirk-no-fb
endmatch
match system.hardware.product regex OmniBook XE3 G|R3200|nx5000|nx7000|nc6120|nx6325|2510p
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
# <!-- yes, system.hardware.version is correct for this machine -->
match system.hardware.version regex ^HP OmniBook 6100 EB$
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
# <!-- Note: PY507ET# is a nc6120 -->
match system.hardware.product regex nc2400|nx6110|nc6120|nc6320|nx7300|6720s|2710p|8510p|PY507ET#|6715b
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex 4410s
# <!-- ATI 0x1002:0x9552-->
match system.hardware.primary_video.vendor numeric_compare_eq 0x1002
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.hardware.product regex M2000 \(EQ547PA
addquirk --quirk-s3-bios
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex tc4400|nc4400|tc4200|nx6120|nc4200|HP 530 Notebook PC
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex HP Compaq nc6400
match system.hardware.version regex ^68YCU
match system.hardware.product regex \(EH522AV\)|\(EY582ES|\(RH560EA
addquirk --quirk-vbemode-restore
addquirk --quirk-vbe-post
endmatch
endmatch
endmatch
match system.hardware.product regex nx 7010
addquirk --quirk-s3-bios
match system.hardware.product regex DU394T#
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.product regex nx7400
addquirk --quirk-vbe-post
match system.firmware.version regex_inverse 68YGU
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.hardware.product regex HP Compaq dc5800 Small Form Factor|HP d330 uT| nw9440|nw8440
addquirk --quirk-none
endmatch
match system.hardware.product regex HP Compaq 2133|HP 2133
match system.firmware.version regex 68VGU
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
# <!-- Handle machines which have the same product string, but differ -->
match system.hardware.product regex 6510b
match system.hardware.product regex KE134EA
addquirk --quirk-none
endmatch
match system.hardware.product regex_inverse KE134EA
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
endmatch
match system.hardware.product regex 6710b
match system.hardware.product regex KE123EA
addquirk --quirk-none
endmatch
match system.hardware.product regex KE124EA
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.hardware.product regex 6710s
match system.firmware.version regex 68DDU
match system.hardware.product regex GC014ET
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex_inverse GC014ET
addquirk --quirk-vbe-post
addquirk --quirk-dpms-on
endmatch
endmatch
endmatch
match system.hardware.product regex 6715b
match system.hardware.product regex GB835EA|RK156AV
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex GB834EA
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex RM174UT
addquirk --quirk-s3-bios
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.hardware.product regex 6910p
match system.firmware.version regex 68MCD
match system.hardware.product regex GB951EA
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex ^HP Compaq 6910p$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
match system.firmware.version regex_inverse 68MCD
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.hardware.product regex nc4400
match system.firmware.version regex ^68YHV
addquirk --quirk-vbe-post
match system.firmware.version regex F\.08
addquirk --quirk-vbestate-restore
endmatch
match system.firmware.version regex_inverse F\.08
addquirk --quirk-vbemode-restore
endmatch
endmatch
endmatch
match system.hardware.product regex nx6310
match system.firmware.version regex ^68YDU
addquirk --quirk-none
endmatch
match system.firmware.version regex_inverse 68YDU
addquirk --quirk-vbe-post
endmatch
endmatch
match system.hardware.product regex_ncase Pavilion
match system.hardware.product regex dv4000 \(ES973EA#
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
addquirk --quirk-no-fb
endmatch
match system.hardware.product regex dv4000 \(EB911EA#| dv2600| dv6500
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex dv4000 \(PX306UA#| dv6700
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex zd8000 \(EL030EA#
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex ze2000
match system.hardware.product regex \(EK791EA#
addquirk --quirk-none
endmatch
match system.hardware.product regex_inverse \(EK791EA#
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.product regex zt3300
match system.firmware.version regex 68BAL
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex PF083UA#
addquirk --quirk-none
endmatch
endmatch
match system.hardware.product regex dv6000
match system.hardware.version regex \(GA378UA#|\(GH907EA#
addquirk --quirk-s3-mode
endmatch
# <!-- note: (RP153UA#: suspend maybe only with binary nvidia module -->
match system.hardware.version regex \(EW434AV#|\(RP153UA#
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.version regex \(EY798AV#|\(GF688EA|\(RM469EA|\(RP980EA#
addquirk --quirk-none
endmatch
endmatch
match system.hardware.product regex ^HP Pavilion Notebook PC$
match system.hardware.version regex ^HP Pavilion Notebook$
match system.firmware.vendor regex ^Insyde Software$
# <!-- HP Pavilion ZT1000-IC -->
match system.firmware.version regex ^ IC\.M1\.04$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
addquirk --quirk-vbemode-restore
endmatch
# <!-- HP Pavilion xz275 -->
match system.firmware.version regex ^ IC\.M1\.02$
addquirk --quirk-none
endmatch
endmatch
endmatch
endmatch
match system.hardware.product regex 8710p|dv2000|dv2500|tx1000|dv5000 \(EZ535UA#|HP d530 SFF|ze4900| dv9700
addquirk --quirk-none
endmatch
endmatch
endmatch
# <!-- HP Media Center PC m7330n w/ ATI RS480 [Radeon Xpress 200G Series] -->
match system.hardware.vendor regex ^HP Pavilion
match system.hardware.product regex M7330N
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex ^(D7223K-ABA A650E|EJ192AA-ABS t3250\.se|EP198AA-UUZ t3335\.ch|ES061AA-ABD t3320|PC098A-ABA M1070N)$
addquirk --quirk-none
endmatch
endmatch
match system.hardware.vendor regex ^HP-Pavilion
match system.hardware.product regex RZ418AA-ABH s3020
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex ^RP829AV-ABA d4790y$
addquirk --quirk-none
endmatch
endmatch

120
packages/sysutils/pm-utils/quirks/20-video-quirk-pm-ibm.quirkdb Normal file
View File

@ -0,0 +1,120 @@
# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
match system.hardware.vendor regex ^IBM$
match system.hardware.version regex ^ThinkPad R50e$
addquirk --quirk-save-pci
addquirk --quirk-dpms-on
endmatch
match system.hardware.version regex ^ThinkPad R51$
addquirk --quirk-none
endmatch
match system.hardware.version regex ^ThinkPad R51e$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
# <!-- 600e -->
match system.hardware.product regex ^2645
match system.firmware.version regex ^INET17WW$
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.firmware.version regex_inverse INET17WW
addquirk --quirk-vbestate-restore
endmatch
endmatch
# <!-- A31-->
match system.hardware.product regex ^2652
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
# <!--
# There are reports that this quirk makes 2652 crash/fail on second suspend (bnc#309742)
# <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
# -->
addquirk --quirk-dpms-suspend
endmatch
# <!-- X31, T30 , A31p-->
match system.hardware.product regex ^(2366|2367|2653)
addquirk --quirk-radeon-off
endmatch
# <!-- X22, X40, X32 -->
match system.hardware.product regex ^(2662|2672|2673)
addquirk --quirk-radeon-off
match system.hardware.version regex_inverse X31
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
# <!-- X31 -->
match system.hardware.product regex ^(2672|2673|2884|2885|2890|2891)
match system.hardware.version regex X31
addquirk --quirk-dpms-suspend
addquirk --quirk-radeon-off
endmatch
match system.hardware.version regex X32
addquirk --quirk-dpms-suspend
endmatch
endmatch
# <!-- T23(2647) -->
match system.hardware.product regex ^2647
addquirk --quirk-vbe-post
endmatch
# <!-- R50p, R52, X41t, X40, T30, T41p, T41p, T42, X40, Z60t, X41, Z60m-->
match system.hardware.product regex ^(1832|1860|1869|2371|2373|2374|2376|2382|2386|2511|2513|2525|2526|2529|2530)
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
# <!-- R52 ATI Mobility Radeon X300, G41 -->
match system.hardware.product regex ^(1846|1847|2886)
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
# <!-- T41 -->
match system.hardware.version regex ^ThinkPad T41$
addquirk --quirk-s3-bios
endmatch
# <!-- T42, T42p -->
match system.hardware.product regex ^(2378|2379)
match system.hardware.version regex ^ThinkPad T42
addquirk --quirk-s3-bios
endmatch
endmatch
# <!-- T43 -->
match system.hardware.version regex ^ThinkPad T43$
# <!-- ATI graphics -->
match system.hardware.primary_video.vendor numeric_compare_eq 0x1002
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
# <!-- Intel graphics -->
match system.hardware.primary_video.vendor numeric_compare_eq 0x8086
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
# <!-- G40 -->
match system.hardware.product regex ^2388
addquirk --quirk-vbestate-restore
endmatch
# <!-- need no quirks: A21m, A21p, R32, R40 (2x)-->
match system.hardware.product regex ^(2628|2629|2658|2681|2722)
addquirk --quirk-none
endmatch
# <!-- need no quirks: a X40, T40 -->
match system.hardware.version regex ^ThinkPad X40$
match system.firmware.version regex ^1UETD2WW
# <!-- one particular X40 was reported to need above quirks -->
addquirk --quirk-none
endmatch
endmatch
endmatch
match system.hardware.version regex ^ThinkPad T40 $
match system.firmware.version regex ^1RETDRWW
addquirk --quirk-none
endmatch
endmatch
endmatch
match system.hardware.vendor regex ^IBM CORPORATION$
match system.hardware.product regex ^(4800723|4800743|4800783|4800C43)$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch

100
packages/sysutils/pm-utils/quirks/20-video-quirk-pm-lenovo.quirkdb Normal file
View File

@ -0,0 +1,100 @@
# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
match system.hardware.vendor regex ^LENOVO$
# <!-- ThinkPads -->
# <!-- X60 / X60s / T61 / T61p / R61 / R61s / X61(s/Tablet) / X300 -->
# <!-- NOTE: there is a report that 6458 needs vbe_post/vbemode_restore -->
match system.hardware.product regex ^(1702|1704|1706|1709|2007|2478|2479|4108|4141|4143|6088|6363|6364|6365|6378|6379|6480|6458|6463|6464|6465|6466|6467|6468|6471|6476|6477|6478|7642|7643|7644|7645|7646|7647|7648|7649|7650|7657|7658|7659|7660|7661|7666|7667|7668|7673|7732|7733|7734|7735|7736|7737|7738|7762|7763|7764|7767|7768|7669|7670|7671|7673|7674|7675|7676|7678|7679|8808|8895|8896|8897|8898|8899|8900|8919|8930|8932|8933|8934|8935|8936|8937|8938|8939|8942|8943|8944|8945|8946|8947|8948|9452)
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^(63664DU|1705CTO)
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex ^6457
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
# <!-- R60 -->
match system.hardware.version regex_ncase ^ThinkPad R60
addquirk --quirk-s3-bios
# <!-- R60e 32bit works with S3_MODE, 64bit needs VBE_MODE -->
match system.hardware.product regex ^0657
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex_inverse 0657
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.version regex ^ThinkPad
# <!-- T60* -->
match system.hardware.version regex T60$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
# <!-- Z61*, R61e ... -->
match system.hardware.version regex T60p|Z61m|Z61t|Z60m|Z61p|R61e
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
# <!-- W500 -->
match system.hardware.version regex W500$
addquirk --quirk-vbe-post
endmatch
endmatch
# <!-- T61 -->
match system.hardware.product regex ^7663
addquirk --quirk-s3-mode
endmatch
# <!-- T61 (8895), intel card 32bit works with S3_MODE, but 64bit needs VBE_MODE
# T61p (6460), does not work with the NVidia driver-->
match system.hardware.product regex ^(6460|6465)
addquirk --quirk-s3-bios
addquirk --quirk-vbemode-restore
endmatch
# <!-- T500 -->
match system.hardware.product regex ^2242CTO$
match system.hardware.version regex ^ThinkPad T500$
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
endmatch
# <!-- These Thinkpads don't need a quirk: 6459 (T61p), 7664 (T60) see s2ram -->
match system.hardware.product regex ^(6459|7664|8918)
addquirk --quirk-none
endmatch
# <!-- Lenovos non-ThinkPads -->
match system.hardware.version regex_ncase ^3000 C100
match system.hardware.product regex ^0761
addquirk --quirk-none
endmatch
endmatch
match system.hardware.version regex_ncase ^3000 N100
match system.hardware.product regex ^(068928U|07686VG|076831G|076835U|0768BYG)
addquirk --quirk-none
endmatch
match system.hardware.product regex ^07687MM
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^076804U$
addquirk --quirk-s3-bios
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.hardware.version regex_ncase ^3000 N200
match system.hardware.product regex ^(0769BBG|0769AC6)$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^(0769B9G|0769BEG|0769AH9)$
addquirk --quirk-none
endmatch
endmatch
match system.hardware.version regex ^LENOVO3000 V100$
match system.hardware.product regex ^0763
addquirk --quirk-none
endmatch
endmatch
match system.hardware.product regex ^Soleil E660P
addquirk --quirk-none
endmatch
endmatch

389
packages/sysutils/pm-utils/quirks/20-video-quirk-pm-misc.quirkdb Normal file
View File

@ -0,0 +1,389 @@
# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
match system.hardware.vendor regex ^AIRIS$
match system.hardware.version regex ^VT6413A$
addquirk --quirk-s3-bios
endmatch
endmatch
match system.hardware.vendor regex ^AnabelleB$
# <!-- ASI Claro TW7M Notebook -->
match system.hardware.version regex ^Claro TW7M$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.vendor regex ^COMPAL
match system.hardware.product regex HEL80C|HEL80I|HEL81I
addquirk --quirk-none
endmatch
endmatch
match system.hardware.vendor regex DIXONSXP
match system.hardware.product regex To be filled by O\.E\.M\.
match system.firmware.version regex ^Ver\.001$
addquirk --quirk-none
endmatch
endmatch
endmatch
match system.hardware.vendor regex ERGOUK
match system.hardware.product regex M2N
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.vendor regex ^JVC$
match system.hardware.product regex ^J2N $
addquirk --quirk-vbestate-restore
endmatch
endmatch
match system.hardware.vendor regex ^LG
match system.hardware.product regex ^(M1-3DGBG|W1-JDGBG|LM50-DGHE|LW75-SGGV1)$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^R500-U\.CPCBG$
addquirk --quirk-none
endmatch
endmatch
match system.hardware.vendor regex MAXDATA
match system.hardware.product regex ^PRO600IW$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex Pro 6100X
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex IMPERIO4045A
addquirk --quirk-none
endmatch
endmatch
match system.hardware.vendor regex ^Matsushita
match system.hardware.product regex ^CF-Y
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex CF-51E|CF-R3E|CF-R2C|CF-R6A|CF-R6M
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex ^CF-W4G
addquirk --quirk-none
endmatch
endmatch
# <!-- VIA EPIA M Mini-ITX Motherboard with onboard gfx -->
match system.hardware.vendor regex ^VIA
match system.hardware.product regex ^VT8623-8235$
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^K8N800$
match system.firmware.version regex ^VT8204B $
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
endmatch
match system.hardware.product regex ^K8T400$
match system.hardware.version regex ^VT8204B $
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.product regex ^(KT400-8235|KT400A-8235)$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.vendor regex ^AVERATEC$
match system.hardware.product regex ^(3700 Series|1000 Series)$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^3200$
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex ^5500 Series$
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.vendor regex ^BenQ
match system.hardware.product regex ^Joybook R42$
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex ^(Joybook R22|Joybook R23|JoyBook 7000)$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^(Joybook S52|Joybook S32)$
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.hardware.vendor regex ^Elonex PLC
match system.hardware.product regex M5A
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.vendor regex ^GERICOM
match system.hardware.product regex HUMMER
match system.firmware.version regex ^1\.03 $
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.hardware.product regex 259IA1
addquirk --quirk-none
endmatch
# <!-- work only from X, models from vendor: Gericom and MTC -->
match system.hardware.product regex ^Montara-GML $
match system.hardware.version regex ^FAB-2$
addquirk --quirk-none
endmatch
endmatch
endmatch
match system.hardware.vendor regex ^MTC
match system.hardware.product regex ^Montara-GML$
addquirk --quirk-s3-bios
endmatch
endmatch
match system.hardware.vendor regex_ncase ^micro-star
match system.hardware.product regex ^(MS-1012|MS-1013)$
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex ^(MS-1057|U-100)$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^PR210$
match system.hardware.version regex ^MS-1222X$
addquirk --quirk-vbe-post
endmatch
endmatch
match system.hardware.product regex ^EX610$
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex ^MS-1412$
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
addquirk --quirk-no-fb
endmatch
match system.hardware.product regex ^MS-1003$
addquirk --quirk-none
endmatch
endmatch
match system.hardware.vendor regex ^MSI
match system.hardware.product regex ^(MS-7350|MS-7207PV|MS-6417|MS-6702)$
addquirk --quirk-none
endmatch
endmatch
match system.hardware.vendor regex ^MiTAC$
# <!-- Mitac 8350
# system.hardware.product = '' (string)
# system.hardware.serial = '' (string)
# system.hardware.uuid = '64DBBBB4-5631-DA11-8000-4E45435F4349' (string)
# system.hardware.vendor = 'MiTAC' (string)
# system.hardware.version = '5a' (string)
# -->
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.vendor regex ^MEDION
match system.hardware.product regex WID2010
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex MS-6714
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^(MS-7012|M295M|WIM 2000 |WIM 2140)$
addquirk --quirk-none
endmatch
endmatch
match system.hardware.vendor regex ^NEC
match system.hardware.product regex B7
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex ^VC2$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^NEC Versa Premium$
addquirk --quirk-none
endmatch
endmatch
match system.hardware.vendor regex_ncase ^packard bell
# <!-- this machines are strange, check also for rest of the vendor string -->
match system.hardware.vendor regex NEC
match system.hardware.product regex ^00000000000000000000000$
match system.hardware.version regex ^P820008416$
addquirk --quirk-none
endmatch
match system.firmware.version regex ^A03 $
addquirk --quirk-none
endmatch
endmatch
endmatch
match system.hardware.product regex ^EasyNote_SJ51$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.vendor regex ^4MBOL
match system.hardware.product regex ^7521
match system.hardware.version regex ^REV\. A0$
addquirk --quirk-none
endmatch
endmatch
endmatch
match system.hardware.vendor regex ^CLEVO$
match system.hardware.product regex ^D500P$
addquirk --quirk-vbe-post
addquirk --quirk-no-fb
endmatch
match system.hardware.product regex ^M5X0JE$
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex ^M720SR$
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex ^TN120R$
addquirk --quirk-none
endmatch
endmatch
# <!-- Clevo D410J laptop reports hardware vendor "VIA", product "K8N800" and version "VT8204B" -->
match system.hardware.vendor regex ^VIA$
match system.hardware.product regex ^K8N800$
match system.hardware.version regex ^VT8204B$
match system.firmware.version regex ^4\.06CJ15$
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
endmatch
endmatch
endmatch
match system.hardware.vendor regex ^ECS$
match system.hardware.product regex ^536$
addquirk --quirk-vbe-post
addquirk --quirk-no-fb
endmatch
endmatch
match system.hardware.vendor regex ^Elitegroup$
match system.hardware.product regex ^ECS G320$
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.hardware.vendor regex ^Gigabyte Technology
match system.hardware.product regex ^(945GCMX-S2|P35-DS4)$
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex ^(945GZM-S2|945GCM-S2L)$
addquirk --quirk-none
endmatch
endmatch
match system.hardware.vendor regex ^Infomash$
match system.hardware.product regex ^RoverBook$
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
endmatch
match system.hardware.vendor regex ^Gateway
match system.hardware.product regex MT6707
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^MT6920
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex MX6922B
addquirk --quirk-none
endmatch
endmatch
match system.hardware.vendor regex ^MaxSelect$
match system.hardware.product regex ^Mission_A330$
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
endmatch
# <!-- medion md 96400 -->
match system.hardware.vendor regex ^NOTEBOOK$
match system.hardware.product regex ^SAM2000$
match system.hardware.version regex ^0131$
addquirk --quirk-none
endmatch
endmatch
# <!-- medion MIM2080 -->
match system.hardware.product regex ^MIM2080$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.vendor regex ^NCA_GROUP_LTD$
match system.hardware.product regex ^iRU_Notebook$
match system.hardware.version regex ^0106$
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
endmatch
endmatch
match system.hardware.vendor regex ^transtec AG
match system.hardware.product regex ^(MS-1057|MS-1034)$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
match system.hardware.vendor regex ^To Be Filled By O\.E\.M\.$
match system.hardware.product regex ^259IA1$
match system.hardware.version regex ^To Be Filled By O\.E\.M\.$
match system.firmware.version regex ^080010 $
addquirk --quirk-s3-mode
endmatch
endmatch
endmatch
match system.hardware.product regex ^MS-7210$
match system.hardware.version regex ^100$
addquirk --quirk-none
endmatch
endmatch
endmatch
match system.hardware.vendor regex ^OEM$
# <!-- rebranded Uniwill P53IN -->
match system.hardware.product regex ^P53IN4$
addquirk --quirk-none
endmatch
endmatch
match system.hardware.vendor regex ^OQO$
match system.hardware.product regex ^ZEPTO$
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
endmatch
match system.hardware.vendor regex ^SHARP$
match system.hardware.product regex ^PC-AR10
addquirk --quirk-none
endmatch
endmatch
match system.hardware.vendor regex ^Shuttle Inc$
match system.hardware.product regex ^SD11V10$
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex ^SD30V10$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^SN41UV10$
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex ^SN85V10$
addquirk --quirk-none
endmatch
endmatch
match system.hardware.vendor regex ^ZEPTO$
match system.hardware.product regex ^ZNOTE
match system.hardware.version regex ^3215W
addquirk --quirk-none
endmatch
endmatch
endmatch

26
packages/sysutils/pm-utils/quirks/20-video-quirk-pm-samsung.quirkdb Normal file
View File

@ -0,0 +1,26 @@
# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
match system.hardware.vendor regex_ncase ^Samsung
match system.hardware.product regex ^(Q35/Q36|SM40S|SQ45S70S)$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^(SQ30|SQ35S|SX50S)$
addquirk --quirk-vbe-post
endmatch
# <!-- Samsung UMPC, P35 (NOTE: there is a s2ram report for CoronaR to need no quirks)-->
match system.hardware.product regex ^(R40/R41|CoronaR|SX22S)$
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex ^(SX20S|SENS V25|NX05S)$
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex ^SQ10$
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
# <!-- these need no quirks to suspend/resume -->
match system.hardware.product regex R50/R51|R55S|SR700
addquirk --quirk-none
endmatch
endmatch

54
packages/sysutils/pm-utils/quirks/20-video-quirk-pm-sony.quirkdb Normal file
View File

@ -0,0 +1,54 @@
# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
match system.hardware.vendor regex ^Sony Corporation$
match system.hardware.product regex ^VGN-FS115Z$
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex VGN-FS730|PCG-FX405|VGN-C2S_G|VGN-B1XP|VGN-FE21B|VGN-B100B||VGN-B1VP
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex ^(VGN-FS115B|VGN-C140G|VGN-TX3XP_L|VGN-T250P|VGN-AR31S|PCV-RX612|VGN-FS485B|VGN-SZ61XN_C|VGN-TZ37|VGN-TZ170N|VGN-FS920|VGN-C240E|PCG-FX601|VGN-SR11M)$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^VGN-NR120E$
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex ^(VGN-TX5MN_W|PCG-TR2A\(UC\)|VGN-UX50)$
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex PCG-FX340
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex PCG-FX802
addquirk --quirk-vbestate-restore
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex PCG-Z1MP
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex PCG-Z1RMP|VGN-TX770P|VGN-FW11|VGN-TX670P|PCG-V505ECP
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex PCG-FX805
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex PCG-FX905
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
addquirk --quirk-dpms-on
endmatch
# <!-- machines which need no quirks -->
# <!-- Note:
# - VGN-FE31M: only from X, S3_MODE hangs the machine, all other leave the screen blank
# - VGN-SZ5XN_C: machine has two gfx cards, works only well with the intel, not with the nvidia -->
match system.hardware.product regex ^(VGN-TX3HP|VGN-B55G\(I\)|VGN-FE31M|VGN-FS215B|VGN-FS660_W|VGN-SZ5XN_C|VGN-TZ21XN_B|PCG-FR215E|VGN-SZ340P|VGN-FE11M|VGN-TZ91HS|PCG-Z505HSK\(UC\)|VGN-FZ39VN|VGN-A115B|VGN-FE890E|VGN-N320E|VGN-C2S_H|VGN-FS215M|VGN-Z90S)$
addquirk --quirk-none
endmatch
match system.hardware.product regex VGN-TZ11|PCG-F430\(UC\)|PCG-GRT916Z|PCG-GRT995MP|PCG-GR7_K\(J\)
addquirk --quirk-none
endmatch
endmatch

130
packages/sysutils/pm-utils/quirks/20-video-quirk-pm-toshiba.quirkdb Normal file
View File

@ -0,0 +1,130 @@
# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
match system.hardware.vendor regex ^TOSHIBA$
# <!-- Satellite Laptops -->
match system.hardware.product regex ^Satellite
match system.hardware.product regex M30X
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex Pro A120|M35X|P100|P200| P205D| A100| A105| A135| A200| A205| A210| L30| M105|M70|P30
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex A215
addquirk --quirk-pci-save
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
# <!-- need exact match for this machine to prevent mixup with M30x -->
match system.hardware.product regex ^Satellite Pro M30$
addquirk --quirk-dpms-on
endmatch
# <!-- need exact match for this machine to prevent mixup with P105 or A100-->
match system.hardware.product regex ^(Satellite P10|Satellite A10)$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex P105
addquirk --quirk-vbe-post
endmatch
match system.hardware.product regex L10|U305|M55
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex A300D
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex A30| 1130
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex Pro 6100
addquirk --quirk-dpms-on
endmatch
# <!-- these need no quirks-->
match system.hardware.product regex A80|Pro4600| U200|Pro U300| U300
addquirk --quirk-none
endmatch
endmatch
# <!-- Tecra Laptops -->
match system.hardware.product regex ^TECRA
match system.hardware.product regex 8100|8200| M9
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex ^T9000$
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex M4
addquirk --quirk-vbe-post
addquirk --quirk-vbemode-restore
endmatch
match system.hardware.product regex S2
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
# <!-- these need no quirks-->
match system.hardware.product regex A8| A9| S3| S1
addquirk --quirk-none
endmatch
endmatch
# <!-- Portege Laptops -->
match system.hardware.product regex ^PORTEGE
match system.hardware.product regex R200|R205|R500
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex M300
addquirk --quirk-s3-mode
endmatch
match system.hardware.product regex A100
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
match system.hardware.product regex R100
addquirk --quirk-vbestate-restore
endmatch
# <!-- these need no quirks-->
match system.hardware.product regex M400|4000
addquirk --quirk-none
endmatch
endmatch
# <!-- EQUIUM -->
match system.hardware.product regex ^EQUIUM
match system.hardware.product regex A100$
addquirk --quirk-s3-bios
addquirk --quirk-s3-mode
endmatch
endmatch
# <!-- Toshiba Portege 3490CT -->
match system.hardware.product regex ^P3490$
addquirk --quirk-vbestate-restore
endmatch
# <!-- Toshiba Satellite S1110 -->
match system.hardware.product regex ^S1110$
addquirk --quirk-s3-bios
endmatch
match system.hardware.product regex ^Portable PC$
match system.hardware.version regex ^Version 1\.0$
# <!-- PORTEGE 100, Toshiba Satellite 4080XCDT -->
match system.firmware.version regex ^(Version 1\.60|Version 7\.80)$
addquirk --quirk-s3-mode
endmatch
# <!-- Tecra A2 PTA20E-4M301VGR -->
match system.firmware.version regex ^Version 1\.20$
addquirk --quirk-none
endmatch
endmatch
endmatch
match system.hardware.product regex ^(P2000|P4000)
addquirk --quirk-vbe-post
addquirk --quirk-vbestate-restore
endmatch
# <!-- these need no quirks-->
match system.hardware.product regex Libretto L5/TNK
addquirk --quirk-none
endmatch
match system.hardware.product regex ^SP4600$
match system.hardware.version regex ^Version 1\.0$
addquirk --quirk-none
endmatch
endmatch
endmatch

1
packages/sysutils/pm-utils/quirks/url Normal file
View File

@ -0,0 +1 @@
http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.gz

4
packages/sysutils/upower/install
View File

@ -7,6 +7,10 @@ $SCRIPTS/install glib
$SCRIPTS/install dbus
$SCRIPTS/install dbus-glib
$SCRIPTS/install polkit
$SCRIPTS/install pm-utils
#mkdir -p $INSTALL/etc
# cp -P $PKG_BUILD/etc/UPower.conf $INSTALL/etc
mkdir -p $INSTALL/etc/dbus-1/system.d
cp -P $PKG_BUILD/src/org.freedesktop.UPower.conf $INSTALL/etc/dbus-1/system.d

18
packages/x11/driver/xf86-input-evdev/config/10-x11-evdev.fdi
View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<deviceinfo version="0.2">
<device>
<match key="info.capabilities" contains="input.mouse">
<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
string="Linux">
<merge key="input.x11_driver" type="string">evdev</merge>
</match>
</match>
<match key="info.capabilities" contains="input.keys">
<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
string="Linux">
<merge key="input.x11_driver" type="string">evdev</merge>
</match>
</match>
</device>
</deviceinfo>

6
packages/x11/driver/xf86-input-evdev/install
View File

@ -2,11 +2,5 @@
. config/options
PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/$XORG_PATH_MODULES/input
cp -P $PKG_BUILD/src/.libs/evdev_drv.so $INSTALL/$XORG_PATH_MODULES/input
mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty
cp -P $PKG_DIR/config/10-x11-evdev.fdi \
$INSTALL/usr/share/hal/fdi/policy/20thirdparty

3
packages/x11/driver/xf86-input-synaptics/install
View File

@ -6,6 +6,3 @@ $SCRIPTS/install libXi
mkdir -p $INSTALL/$XORG_PATH_MODULES/input
cp -P $PKG_BUILD/src/.libs/synaptics_drv.so $INSTALL/$XORG_PATH_MODULES/input
mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty/
cp -P $PKG_BUILD/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/

20
packages/x11/driver/xf86-input-wacom/config/11-wacom.conf Normal file
View File

@ -0,0 +1,20 @@
Section "InputClass"
Identifier "Wacom class"
MatchProduct "Wacom|WALTOP|WACOM"
Driver "wacom"
EndSection
Section "InputClass"
Identifier "Wacom serial class"
MatchProduct "WACf|FUJ02e5|FUJ02e7"
Driver "wacom"
Option "ForceDevice" "ISDV4"
EndSection
# N-Trig Duosense Electromagnetic Digitizer
Section "InputClass"
Identifier "Wacom N-Trig class"
MatchProduct "HID 1b96:0001"
MatchDevicePath "/dev/input/event*"
Driver "wacom"
EndSection

2
packages/x11/driver/xf86-input-wacom/config/69-xorg-wacom.rules Normal file
View File

@ -0,0 +1,2 @@
ACTION=="add|change", SUBSYSTEM=="pnp", ATTR{id}=="WACf*", ENV{NAME}="Serial Wacom Tablet"
ACTION=="add|change", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{x11_driver}="wacom", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"

9
packages/x11/driver/xf86-input-wacom/install
View File

@ -2,11 +2,16 @@
. config/options
PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/$XORG_PATH_MODULES/input
cp -P $PKG_BUILD/src/.libs/wacom_drv.so $INSTALL/$XORG_PATH_MODULES/input
mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty/
cp -P $PKG_BUILD/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/
mkdir -p $INSTALL/usr/share/X11/xorg.conf.d
cp -P $PKG_DIR/config/*.conf $INSTALL/usr/share/X11/xorg.conf.d
mkdir -p $INSTALL/lib/udev/rules.d
cp -P $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d
mkdir -p $INSTALL/usr/bin
cp -P $PKG_BUILD/tools/xsetwacom $INSTALL/usr/bin

1
packages/x11/lib/libXmu/build
View File

@ -17,7 +17,6 @@ cd $PKG_BUILD
--disable-static \
--enable-shared \
--with-gnu-ld \
--enable-malloc0returnsnull \
make

13
packages/x11/other/evilwm/build
View File

@ -1,13 +0,0 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
$SCRIPTS/build libX11
$SCRIPTS/build libXrandr
$SCRIPTS/build libXext
cd $PKG_BUILD
make CC=$TARGET_CC

15
packages/x11/other/evilwm/install
View File

@ -1,15 +0,0 @@
#!/bin/sh
. config/options
$SCRIPTS/install libX11
$SCRIPTS/install libXrandr
$SCRIPTS/install libXext
PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/usr/bin
cp -PR $PKG_BUILD/$1 $INSTALL/usr/bin
# other usefull packages
$SCRIPTS/install xwd

24
packages/x11/other/evilwm/profile.d/evilwm.conf
View File

@ -1,24 +0,0 @@
################################################################################
# Windowmanager environment variables.
#
# This file contains non-OpenELEC evironment variables as well as OpenELEC
# evironment variables that are not user defined.
################################################################################
# [-display display] [-term termprog] [-fn fontname]
# [-fg foreground] [-fc fixed] [-bg background] [-bw borderwidth]
# [-mask1 modifiers] [-mask2 modifiers] [-altmask modifiers]
# [-snap num] [-app name/class] [-g geometry] [-dock]
# [-v vdesk] [-s] [-nosoliddrag] [-V]
if [ "$DEBUG" = "yes" ]; then
EVILWM_ARG="$EVILWM_ARG -fg red -bw 3"
else
EVILWM_ARG="$EVILWM_ARG -fg black -bw 0"
fi
EVILWM_ARG="-fn fixed $EVILWM_ARG"
WINDOWMANAGER="evilwm $EVILWM_ARG"
export WINDOWMANAGER

1
packages/x11/other/evilwm/url
View File

@ -1 +0,0 @@
http://www.6809.org.uk/evilwm/evilwm-1.1.0pre8.tar.gz

52
packages/x11/other/mrxvt/build
View File

@ -1,52 +0,0 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
$SCRIPTS/build libX11
$SCRIPTS/build libXrender
cd $PKG_BUILD
ac_cv_func_setpgrp_void=no \
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \
--disable-static \
--enable-shared \
--x-includes=$SYSROOT_PREFIX/usr/include \
--x-libraries=$SYSROOT_PREFIX/usr/lib \
--enable-minimal \
--disable-frills \
--enable-keepscrolling \
--disable-selectionscrolling \
--enable-mousewheel \
--disable-mouseslipwheel \
--enable-rxvt-scroll \
--disable-half-shadow \
--enable-lastlog \
--enable-sessionmgr \
--enable-linespace \
--enable-24bits \
--enable-256colors \
--enable-cursor-blink \
--enable-pointer-blank \
--disable-text-shadow \
--enable-menubar \
--disable-transparency \
--disable-fading \
--disable-tinting \
--enable-xrender \
--disable-xpm \
--disable-jpeg \
--disable-png \
--disable-xft \
--enable-ttygid \
--enable-backspace-key \
--enable-delete-key \
--disable-resources \
--disable-swapscreen
make
$STRIP src/$1

12
packages/x11/other/mrxvt/install
View File

@ -1,12 +0,0 @@
#!/bin/sh
. config/options
$SCRIPTS/install libX11
PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/usr/bin
cp -P $PKG_DIR/scripts/$1-session $INSTALL/usr/bin
cp -P $PKG_BUILD/src/$1 $INSTALL/usr/bin

9
packages/x11/other/mrxvt/scripts/mrxvt-session
View File

@ -1,9 +0,0 @@
#!/bin/sh
. /etc/profile
# start Windowmanager by default
$WINDOWMANAGER -term mrxvt &
# start terminal
mrxvt

1
packages/x11/other/mrxvt/url
View File

@ -1 +0,0 @@
http://kent.dl.sourceforge.net/sourceforge/materm/mrxvt-0.5.4.tar.gz

12
packages/x11/other/uxlaunch/build
View File

@ -1,12 +0,0 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
$SCRIPTS/build glib
$SCRIPTS/build dbus
$SCRIPTS/build ConsoleKit
cd $PKG_BUILD
make CC=$TARGET_CC

44
packages/x11/other/uxlaunch/init.d/60_uxlaunch
View File

@ -1,44 +0,0 @@
# starting uxlaunch
#
# runlevels: openelec
progress "starting uxlaunch"
UX_USER="root"
UX_TTY="1"
XORG_DEFAULT_CONF="/etc/X11/xorg.conf"
XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
XORG_USER_CONF="/storage/.config/xorg.conf"
if [ "$START_MRXVT" = "yes" -a -f /usr/bin/mrxvt-session ]; then
UX_SESSION="/usr/bin/mrxvt-session"
else
UX_SESSION="/usr/bin/xbmc-session"
fi
UX_ARG="-u $UX_USER -t $UX_TTY -s $UX_SESSION"
[ "$DEBUG" = "yes" ] && UX_ARG="$UX_ARG -v"
progress "creating directories needed for Xorg"
$IONICE mkdir -p /var/cache/xkb
$IONICE mkdir -p /var/lib
$IONICE mkdir -m 1777 -p /tmp/.ICE-unix
$IONICE chown root:root /tmp/.ICE-unix
if lspci -n | grep 0300 | grep -q 10de; then
$IONICE ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
$IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
XORG_CONF="$XORG_NVIDIA_CONF"
else
$IONICE ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
$IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
XORG_CONF="$XORG_DEFAULT_CONF"
fi
[ -f $XORG_USER_CONF ] && XORG_CONF="$XORG_USER_CONF"
UX_ARG="$UX_ARG -c $XORG_CONF"
progress "starting xsession"
uxlaunch $UX_ARG > /dev/null 2>&1

10
packages/x11/other/uxlaunch/install
View File

@ -1,10 +0,0 @@
#!/bin/sh
. config/options
$SCRIPTS/install glib
$SCRIPTS/install dbus
$SCRIPTS/install ConsoleKit
mkdir -p $INSTALL/usr/sbin
cp -P $PKG_BUILD/uxlaunch $INSTALL/usr/sbin

93
packages/x11/other/uxlaunch/patches/uxlaunch-add_xconfig_option-0.1.diff
View File

@ -1,93 +0,0 @@
diff -Naur uxlaunch-0.50/options.c uxlaunch-0.50.patch/options.c
--- uxlaunch-0.50/options.c 2010-04-07 20:32:53.000000000 +0200
+++ uxlaunch-0.50.patch/options.c 2010-04-10 14:20:36.408482887 +0200
@@ -27,6 +27,7 @@
int tty = 2;
char session[256] = "/usr/bin/mutter --sm-disable";
char username[256] = "meego";
+char xconfig[256] = "/etc/X11/xorg.conf";
int verbose = 0;
@@ -34,6 +35,7 @@
{ "user", 1, NULL, 'u' },
{ "tty", 1, NULL, 't' },
{ "session", 1, NULL, 's' },
+ { "xconfig", 1, NULL, 'c' },
{ "help", 0, NULL, 'h' },
{ "verbose", 0, NULL, 'v' },
{ 0, 0, NULL, 0}
@@ -46,6 +48,7 @@
printf(" -u, --user Start session as specific username\n");
printf(" -t, --tty Start session on alternative tty number\n");
printf(" -s, --session Start a non-default session\n");
+ printf(" -c, --xconfig Xorg config file\n");
printf(" -v, --verbose Display lots of output to the console\n");
printf(" -h, --help Display this help message\n");
}
@@ -126,13 +129,15 @@
tty = atoi(val);
if (!strcmp(key, "session"))
strncpy(session, val, 256);
+ if (!strcmp(key, "xconfig"))
+ strncpy(xconfig, val, 256);
}
fclose(f);
}
/* parse cmdline - overrides */
while (1) {
- c = getopt_long(argc, argv, "u:t:s:hv", opts, &i);
+ c = getopt_long(argc, argv, "u:t:s:c:hv", opts, &i);
if (c == -1)
break;
@@ -146,6 +151,9 @@
case 's':
strncpy(session, optarg, 256);
break;
+ case 'c':
+ strncpy(xconfig, optarg, 256);
+ break;
case 'h':
usage(argv[0]);
exit (EXIT_SUCCESS);
@@ -171,7 +179,7 @@
}
lprintf("uxlaunch v%s started.", VERSION);
- lprintf("user \"%s\", tty #%d, session \"%s\"", username, tty, session);
+ lprintf("user \"%s\", tty #%d, session \"%s\", xconfig \"%s\"", username, tty, session, xconfig);
pass = getpwnam(username);
if (!pass)
diff -Naur uxlaunch-0.50/uxlaunch.h uxlaunch-0.50.patch/uxlaunch.h
--- uxlaunch-0.50/uxlaunch.h 2010-04-07 20:32:53.000000000 +0200
+++ uxlaunch-0.50.patch/uxlaunch.h 2010-04-10 14:18:29.327483352 +0200
@@ -19,6 +19,7 @@
extern int tty;
extern char session[];
extern char username[];
+extern char xconfig[];
extern int session_pid;
extern int xpid;
diff -Naur uxlaunch-0.50/xserver.c uxlaunch-0.50.patch/xserver.c
--- uxlaunch-0.50/xserver.c 2010-04-07 20:32:53.000000000 +0200
+++ uxlaunch-0.50.patch/xserver.c 2010-04-10 14:18:29.334358167 +0200
@@ -231,13 +231,13 @@
execl(xserver, xserver, displayname,
"-nolisten", "tcp", "-dpi", "120", "-noreset",
"-auth", xauth_cookie_file,
- vt, NULL);
+ vt, "-config", xconfig, NULL);
} else {
execl(xserver, xserver, displayname,
"-nolisten", "tcp", "-dpi", "120", "-noreset",
"-auth", user_xauth_path,
"-logfile", xorg_log,
- vt, NULL);
+ vt, "-config", xconfig, NULL);
}
exit(0);
}

1
packages/x11/other/uxlaunch/url
View File

@ -1 +0,0 @@
http://sources.openelec.tv/svn/uxlaunch-0.50.tar.gz

16
packages/x11/xserver/xorg-server/build
View File

@ -27,8 +27,8 @@ $SCRIPTS/build Mesa
$SCRIPTS/build openssl
$SCRIPTS/build freetype
$SCRIPTS/build pixman
$SCRIPTS/build dbus
$SCRIPTS/build hal
$SCRIPTS/build fontsproto
$SCRIPTS/build udev
if [ "$XINERAMA_SUPPORT" = "yes" ]; then
$SCRIPTS/build libXinerama
@ -58,7 +58,6 @@ autoconf
--enable-registry \
--disable-composite \
$XORG_XINERAMA \
--enable-null-root-cursor \
--enable-mitshm \
--disable-xres \
--disable-record \
@ -80,8 +79,9 @@ autoconf
--enable-dbe \
--disable-xf86bigfont \
--enable-dpms \
--enable-config-dbus \
--enable-config-hal \
--enable-config-udev \
--disable-config-dbus \
--disable-config-hal \
--enable-xfree86-utils \
--enable-xorg \
--disable-dmx \
@ -92,7 +92,6 @@ autoconf
--disable-xwin \
--disable-kdrive \
--disable-xephyr \
--disable-xsdl \
--disable-xfake \
--enable-xfbdev \
--disable-install-setuid \
@ -100,14 +99,15 @@ autoconf
--with-int10=x86emu \
--disable-ipv6 \
--with-gnu-ld \
--with-sha1=libcrypto \
--with-os-vendor="OpenELEC" \
--with-module-dir=$XORG_PATH_MODULES \
--with-xkb-path=$XORG_PATH_XKB \
--with-xkb-output=/var/cache/xkb \
--with-log-dir=/var/log \
--with-dri-driver-path=$XORG_PATH_DRI \
--with-fontdir=$XORG_PATH_FONTS \
--with-default-font-path="$XORG_PATH_FONTS/liberation,$XORG_PATH_FONTS/misc,built-ins" \
--with-fontrootdir=$XORG_PATH_FONTS \
--with-default-font-path="$XORG_PATH_FONTS/misc,built-ins"
make

43
packages/x11/xserver/xorg-server/init.d/15_xorg Normal file
View File

@ -0,0 +1,43 @@
# starting xorg
#
# runlevels: openelec
. /etc/profile
XORG_DEFAULT_CONF="/etc/X11/xorg.conf"
XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
XORG_USER_CONF="/storage/.config/xorg.conf"
XORG_ARGS="-s 0 -nr -noreset -allowMouseOpenFail -nocursor -nolisten tcp"
[ "$DEBUG" = yes ] && XORG_ARGS="$XORG_ARGS -logverbose 6 -verbose 6"
(
progress "creating directories needed for Xorg"
mkdir -p /var/cache/xkb
mkdir -p /var/lib
mkdir -m 1777 -p /tmp/.ICE-unix
chown root:root /tmp/.ICE-unix
if lspci -n | grep 0300 | grep -q 10de; then
ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
XORG_ARGS="$XORG_ARGS -ignoreABI"
XORG_CONF="$XORG_NVIDIA_CONF"
else
ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
XORG_CONF="$XORG_DEFAULT_CONF"
fi
[ -f $XORG_USER_CONF ] && XORG_CONF="$XORG_USER_CONF"
progress "starting xorg"
XORG_ARGS="$XORG_ARGS -config $XORG_CONF"
Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1
)&

16
packages/x11/xserver/xorg-server/install
View File

@ -12,8 +12,7 @@ $SCRIPTS/install libXfont
$SCRIPTS/install libdrm
$SCRIPTS/install Mesa
$SCRIPTS/install pixman
$SCRIPTS/install dbus
$SCRIPTS/install hal
$SCRIPTS/install udev
[ "$XINERAMA_SUPPORT" = "yes" ] && $SCRIPTS/install libXinerama
@ -53,18 +52,14 @@ mkdir -p $XORG_DST/multimedia
mkdir -p $INSTALL/usr/lib/xorg
cp -P $PKG_BUILD/dix/protocol.txt $INSTALL/usr/lib/xorg
mkdir -p $INSTALL/etc/dbus-1/system.d
cp -P $PKG_BUILD/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d
mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/
cp -P $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
mkdir -p $INSTALL/usr/share/X11/xorg.conf.d
cp -P $PKG_BUILD/config/10-evdev.conf $INSTALL/usr/share/X11/xorg.conf.d
#Fonts
$SCRIPTS/install encodings
$SCRIPTS/install font-xfree86-type1
$SCRIPTS/install font-bitstream-type1
$SCRIPTS/install font-misc-misc
$SCRIPTS/install liberation-fonts
#Server
$SCRIPTS/install xkeyboard-config
@ -73,12 +68,11 @@ mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/
#Drivers
$SCRIPTS/install xf86-input-evdev
$SCRIPTS/install xf86-input-synaptics
# $SCRIPTS/install xf86-input-wacom
$SCRIPTS/install xf86-input-wacom
for drv in $XORG_DRIVERS; do
$SCRIPTS/install xf86-video-$drv
done
#Tools
# Tools
$SCRIPTS/install pciutils
$SCRIPTS/install uxlaunch

233
packages/x11/xserver/xorg-server/patches/03_fedora_glx_versioning.diff
View File

@ -1,233 +0,0 @@
From 3ef4be8129f78afd5566a9e5d0fb901449dcb771 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 29 Sep 2009 16:43:43 -0700
Subject: [PATCH] GLX: Enable GLX 1.4 on DRI2
this squashes 4 commits
(cherry picked from commit ad5c0d9efa47476ed5cf75c82265c73919e468b4)
(cherry picked from commit cb54cf1b3e8c4109541cfb698542c00f2473e731)
(cherry picked from commit 4c6bfa2c09ae2b0cffdf9211a6dfbcaefe0366b5)
(cherry picked from commit 9bf2ff4faf730913de3073f346646a8727be41d4)
---
glx/glxcmds.c | 12 ++++++++----
glx/glxdri2.c | 12 ++++++++++++
glx/glxext.c | 8 +++++++-
glx/glxscreens.c | 15 ++++++++++++---
glx/glxscreens.h | 11 +++++++++++
glx/glxserver.h | 3 +++
glx/indirect_texture_compression.c | 4 ++--
include/protocol-versions.h | 2 +-
8 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index b1061a8..ba4c123 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -50,7 +50,6 @@
#include "indirect_dispatch.h"
#include "indirect_table.h"
#include "indirect_util.h"
-#include "protocol-versions.h"
static int
validGlxScreen(ClientPtr client, int screen, __GLXscreen **pGlxScreen, int *err)
@@ -739,8 +738,8 @@ int __glXDisp_QueryVersion(__GLXclientState *cl, GLbyte *pc)
** client if it wants to work with older clients; however, in this
** implementation the server just returns its version number.
*/
- reply.majorVersion = SERVER_GLX_MAJOR_VERSION;
- reply.minorVersion = SERVER_GLX_MINOR_VERSION;
+ reply.majorVersion = glxMajorVersion;
+ reply.minorVersion = glxMinorVersion;
reply.length = 0;
reply.type = X_Reply;
reply.sequenceNumber = client->sequence;
@@ -2360,6 +2359,7 @@ int __glXDisp_QueryServerString(__GLXclientState *cl, GLbyte *pc)
char *buf;
__GLXscreen *pGlxScreen;
int err;
+ char ver_str[16];
if (!validGlxScreen(client, req->screen, &pGlxScreen, &err))
return err;
@@ -2369,7 +2369,11 @@ int __glXDisp_QueryServerString(__GLXclientState *cl, GLbyte *pc)
ptr = pGlxScreen->GLXvendor;
break;
case GLX_VERSION:
- ptr = pGlxScreen->GLXversion;
+ /* Return to the server version rather than the screen version
+ * to prevent confusion when they do not match.
+ */
+ snprintf(ver_str, 16, "%d.%d", glxMajorVersion, glxMinorVersion);
+ ptr = ver_str;
break;
case GLX_EXTENSIONS:
ptr = pGlxScreen->GLXextensions;
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index ed7fb4c..ed7dc80 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -685,6 +685,18 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->base.GLXextensions);
}
+ /* We're going to assume (perhaps incorrectly?) that all DRI2-enabled
+ * drivers support the required extensions for GLX 1.4. The extensions
+ * we're assuming are:
+ *
+ * - GLX_SGI_make_current_read (1.3)
+ * - GLX_SGIX_fbconfig (1.3)
+ * - GLX_SGIX_pbuffer (1.3)
+ * - GLX_ARB_multisample (1.4)
+ */
+ screen->base.GLXmajor = 1;
+ screen->base.GLXminor = 4;
+
screen->enterVT = pScrn->EnterVT;
pScrn->EnterVT = glxDRIEnterVT;
screen->leaveVT = pScrn->LeaveVT;
diff --git a/glx/glxext.c b/glx/glxext.c
index 19d70d4..9f9c0ed 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -360,12 +360,18 @@ void GlxExtensionInit(void)
pScreen = screenInfo.screens[i];
for (p = __glXProviderStack; p != NULL; p = p->next) {
- if (p->screenProbe(pScreen) != NULL) {
+ __GLXscreen *glxScreen;
+
+ glxScreen = p->screenProbe(pScreen);
+ if (glxScreen != NULL) {
+ if (glxScreen->GLXminor < glxMinorVersion)
+ glxMinorVersion = glxScreen->GLXminor;
LogMessage(X_INFO,
"GLX: Initialized %s GL provider for screen %d\n",
p->name, i);
break;
}
+
}
if (!p)
diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index 7d29d31..674e2c6 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -42,6 +42,7 @@
#include "glxserver.h"
#include "glxutil.h"
#include "glxext.h"
+#include "protocol-versions.h"
static int glxScreenPrivateKeyIndex;
static DevPrivateKey glxScreenPrivateKey = &glxScreenPrivateKeyIndex;
@@ -162,7 +163,8 @@ static const char GLServerExtensions[] =
** supported across all screens in a multi-screen system.
*/
static char GLXServerVendorName[] = "SGI";
-static char GLXServerVersion[] = "1.2";
+unsigned glxMajorVersion = SERVER_GLX_MAJOR_VERSION;
+unsigned glxMinorVersion = SERVER_GLX_MINOR_VERSION;
static char GLXServerExtensions[] =
"GLX_ARB_multisample "
"GLX_EXT_visual_info "
@@ -378,9 +380,17 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
pGlxScreen->pScreen = pScreen;
pGlxScreen->GLextensions = xstrdup(GLServerExtensions);
pGlxScreen->GLXvendor = xstrdup(GLXServerVendorName);
- pGlxScreen->GLXversion = xstrdup(GLXServerVersion);
pGlxScreen->GLXextensions = xstrdup(GLXServerExtensions);
+ /* All GLX providers must support all of the functionality required for at
+ * least GLX 1.2. If the provider supports a higher version, the GLXminor
+ * version can be changed in the provider's screen-probe routine. For
+ * most providers, the screen-probe routine is the caller of this
+ * function.
+ */
+ pGlxScreen->GLXmajor = 1;
+ pGlxScreen->GLXminor = 2;
+
pGlxScreen->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = glxCloseScreen;
pGlxScreen->DestroyWindow = pScreen->DestroyWindow;
@@ -454,7 +464,6 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
void __glXScreenDestroy(__GLXscreen *screen)
{
xfree(screen->GLXvendor);
- xfree(screen->GLXversion);
xfree(screen->GLXextensions);
xfree(screen->GLextensions);
}
diff --git a/glx/glxscreens.h b/glx/glxscreens.h
index 3c1bdd4..bff4363 100644
--- a/glx/glxscreens.h
+++ b/glx/glxscreens.h
@@ -161,6 +161,17 @@ struct __GLXscreen {
char *GLXversion;
char *GLXextensions;
+ /**
+ * \name GLX version supported by this screen.
+ *
+ * Since the GLX version advertised by the server is for the whole server,
+ * the GLX protocol code uses the minimum version supported on all screens.
+ */
+ /*@{*/
+ unsigned GLXmajor;
+ unsigned GLXminor;
+ /*@}*/
+
Bool (*CloseScreen)(int index, ScreenPtr pScreen);
Bool (*DestroyWindow)(WindowPtr pWindow);
};
diff --git a/glx/glxserver.h b/glx/glxserver.h
index 4aa8c2e..80f1b28 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -248,4 +248,7 @@ extern int __glXImageSize(GLenum format, GLenum type,
GLint imageHeight, GLint rowLength, GLint skipImages, GLint skipRows,
GLint alignment);
+extern unsigned glxMajorVersion;
+extern unsigned glxMinorVersion;
+
#endif /* !__GLX_server_h__ */
diff --git a/glx/indirect_texture_compression.c b/glx/indirect_texture_compression.c
index 25c6eb3..5f44d7b 100644
--- a/glx/indirect_texture_compression.c
+++ b/glx/indirect_texture_compression.c
@@ -52,7 +52,7 @@ int __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte *p
const GLenum target = *(GLenum *)(pc + 0);
const GLint level = *(GLint *)(pc + 4);
GLint compsize = 0;
- char *answer, answerBuffer[200];
+ char *answer = NULL, answerBuffer[200];
CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize));
@@ -92,7 +92,7 @@ int __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyt
const GLenum target = (GLenum) bswap_32( *(int *)(pc + 0) );
const GLint level = (GLint ) bswap_32( *(int *)(pc + 4) );
GLint compsize = 0;
- char *answer, answerBuffer[200];
+ char *answer = NULL, answerBuffer[200];
CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize));
diff --git a/include/protocol-versions.h b/include/protocol-versions.h
index da9770c..d688c66 100644
--- a/include/protocol-versions.h
+++ b/include/protocol-versions.h
@@ -61,7 +61,7 @@
/* GLX */
#define SERVER_GLX_MAJOR_VERSION 1
-#define SERVER_GLX_MINOR_VERSION 2
+#define SERVER_GLX_MINOR_VERSION 4
/* Xinerama */
#define SERVER_PANORAMIX_MAJOR_VERSION 1
--
1.6.5.rc2

26
packages/x11/xserver/xorg-server/patches/04_fedora_glx14-swrast.diff
View File

@ -1,26 +0,0 @@
From 25a0107768c9f25e8edc5e423ca8b1d0813f2d04 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 24 Nov 2009 13:38:46 -0500
Subject: [PATCH] Enable GLX 1.4 for swrast
---
glx/glxdriswrast.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index 44f658f..20f9f90 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -510,6 +510,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
__glXScreenInit(&screen->base, pScreen);
+ screen->base.GLXmajor = 1;
+ screen->base.GLXminor = 4;
+
LogMessage(X_INFO,
"AIGLX: Loaded and initialized %s\n", filename);
--
1.6.5.2

25
packages/x11/xserver/xorg-server/patches/05_only_call_gamma_set_if_nonnull.diff
View File

@ -1,25 +0,0 @@
Bug#564203
From 8ca4233017e9f441303088e7054b6a7c4f171d80 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Wed, 6 Jan 2010 14:40:34 +0100
Subject: [PATCH] * hw/xfree86/modes/xf86Crtc.c:
- only call gamma_set if its non NULL
---
hw/xfree86/modes/xf86Crtc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index d015c6a..573fe96 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -354,7 +354,7 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
}
/* Only upload when needed, to avoid unneeded delays. */
- if (!crtc->active)
+ if (!crtc->active && crtc->funcs->gamma_set)
crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
crtc->gamma_blue, crtc->gamma_size);

22
packages/x11/xserver/xorg-server/patches/06_dont_trap_access_to_timer_and_keyboard.diff
View File

@ -1,22 +0,0 @@
[PATCH] Do not trap access to timer and keyboard
Some VESA BIOSes need to access to them.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
hw/xfree86/os-support/hurd/hurd_video.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
index 4a99db3..e049ceb 100644
--- a/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/hw/xfree86/os-support/hurd/hurd_video.c
@@ -124,8 +124,6 @@ xf86EnableIO()
FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno));
return FALSE;
}
- ioperm(0x40,4,0); /* trap access to the timer chip */
- ioperm(0x60,4,0); /* trap access to the keyboard controller */
return TRUE;
}

34
packages/x11/xserver/xorg-server/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
View File

@ -1,34 +0,0 @@
From 4ae407a5a308febf63de27a62f8c301c73b37d3e Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Tue, 6 Oct 2009 17:44:33 +0200
Subject: [PATCH 1/5] Move config_init() after CreateWellKnownSockets() and InitCoreDevices()
config_init() can now add devices directly instead of scheduling a
timer.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
---
dix/main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Index: xorg-server/dix/main.c
===================================================================
--- xorg-server.orig/dix/main.c
+++ xorg-server/dix/main.c
@@ -168,7 +168,6 @@
InitBlockAndWakeupHandlers();
/* Perform any operating system dependent initializations you'd like */
OsInit();
- config_init();
if(serverGeneration == 1)
{
CreateWellKnownSockets();
@@ -256,6 +255,7 @@
InitCoreDevices();
InitInput(argc, argv);
InitAndStartDevices();
+ config_init();
dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);

53
packages/x11/xserver/xorg-server/patches/16-xfree86-fix-build-with-xv-disabled.diff
View File

@ -1,53 +0,0 @@
From fe7575e929d65e8c798104ec2f72b879051694d3 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Mon, 8 Feb 2010 02:04:33 +0100
Subject: [PATCH] xfree86: fix build with xv disabled
---
hw/xfree86/modes/xf86Crtc.c | 2 ++
hw/xfree86/modes/xf86Crtc.h | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 30b49af..62f8737 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -3009,6 +3009,7 @@ xf86_crtc_box_area(BoxPtr box)
return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
}
+#ifdef XV
/*
* Return the crtc covering 'box'. If two crtcs cover a portion of
* 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
@@ -3097,6 +3098,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
return ret;
}
+#endif
xf86_crtc_notify_proc_ptr
xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
index 9baa956..2fb32c1 100644
--- a/hw/xfree86/modes/xf86Crtc.h
+++ b/hw/xfree86/modes/xf86Crtc.h
@@ -908,6 +908,7 @@ xf86_hide_cursors (ScrnInfoPtr scrn);
extern _X_EXPORT void
xf86_cursors_fini (ScreenPtr screen);
+#ifdef XV
/*
* For overlay video, compute the relevant CRTC and
* clip video to that.
@@ -926,6 +927,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
RegionPtr reg,
INT32 width,
INT32 height);
+#endif
extern _X_EXPORT xf86_crtc_notify_proc_ptr
xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);
--
1.6.6.1

0
packages/x11/xserver/xorg-server/patches/001_fedora_extramodes.diff → packages/x11/xserver/xorg-server/patches/20_extra_modelines_fromxorg.diff
View File

358
packages/x11/xserver/xorg-server/patches/cache-xkbcomp-output-for-fast-start-up.diff Normal file
View File

@ -0,0 +1,358 @@
From d2d3bcc9e23b9a4bea9f67a06cd23aa3ce7f4b59 Mon Sep 17 00:00:00 2001
Message-Id: <d2d3bcc9e23b9a4bea9f67a06cd23aa3ce7f4b59.1268201183.git.yan.i.li@intel.com>
From: Yan Li <yan.i.li@intel.com>
Date: Wed, 10 Mar 2010 14:06:17 +0800
Subject: [PATCH] XKB: cache xkbcomp output for fast start-up v6 for 1.7.99.901
xkbcomp outputs will be cached in files with hashed keymap as
names. This saves boot time for around 1s on commodity netbooks.
v6: rebased to v1.7.99.901
v5: now using a much bigger xkbKeyMapBuf (100k) since the XKB to be
complied may be very large (as seen with
gnome-keyboard-properties), rebased to v1.6.1
Signed-off-by: Yan Li <yan.i.li@intel.com>
---
configure.ac | 6 +-
xkb/README.compiled | 8 +-
xkb/ddxLoad.c | 187 +++++++++++++++++++++++++++++++++++++++++----------
3 files changed, 159 insertions(+), 42 deletions(-)
diff --git a/configure.ac b/configure.ac
index de252f3..54a0327 100644
--- a/configure.ac
+++ b/configure.ac
@@ -527,9 +527,9 @@ AC_MSG_RESULT([$FONTPATH])
AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
[ XKBPATH="$withval" ],
[ XKBPATH="${datadir}/X11/xkb" ])
-AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),
+AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${localstatedir}/cache/xkb)]),
[ XKBOUTPUT="$withval" ],
- [ XKBOUTPUT="compiled" ])
+ [ XKBOUTPUT="${localstatedir}/cache/xkb" ])
AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],
[Keyboard ruleset (default: base/evdev)]),
[ XKB_DFLT_RULES="$withval" ],
@@ -1148,7 +1148,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir])
dnl Make sure XKM_OUTPUT_DIR is an absolute path
XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
- XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
+ AC_MSG_ERROR([xkb-output must be an absolute path.])
fi
dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
diff --git a/xkb/README.compiled b/xkb/README.compiled
index 71caa2f..a4a2ae0 100644
--- a/xkb/README.compiled
+++ b/xkb/README.compiled
@@ -4,10 +4,10 @@ current keymap and/or any scratch keymaps used by clients. The X server
or some other tool might destroy or replace the files in this directory,
so it is not a safe place to store compiled keymaps for long periods of
time. The default keymap for any server is usually stored in:
- X<num>-default.xkm
-where <num> is the display number of the server in question, which makes
-it possible for several servers *on the same host* to share the same
-directory.
+ server-<SHA1>.xkm
+
+where <SHA1> is the SHA1 hash of keymap source, so that compiled
+keymap of different keymap sources are stored in different files.
Unless the X server is modified, sharing this directory between servers on
different hosts could cause problems.
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 4ccddda..63b9f97 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -30,6 +30,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <xkb-config.h>
+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
+# include <sha1.h>
+#else /* Use OpenSSL's libcrypto */
+# include <stddef.h> /* buggy openssl/sha.h wants size_t */
+# include <openssl/sha.h>
+#endif
#include <stdio.h>
#include <ctype.h>
#include <X11/X.h>
@@ -43,24 +49,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XKBSRV_NEED_FILE_FUNCS
#include <xkbsrv.h>
#include <X11/extensions/XI.h>
+#include <errno.h>
#include "xkb.h"
#if defined(CSRG_BASED) || defined(linux) || defined(__GNU__)
#include <paths.h>
#endif
- /*
- * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is
- * relative to the top-level XKB configuration directory.
- * Making the server write to a subdirectory of that directory
- * requires some work in the general case (install procedure
- * has to create links to /var or somesuch on many machines),
- * so we just compile into /usr/tmp for now.
- */
-#ifndef XKM_OUTPUT_DIR
-#define XKM_OUTPUT_DIR "compiled/"
-#endif
-
#define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
#define ERROR_PREFIX "\"> \""
#define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""
@@ -175,6 +170,45 @@ OutputDirectory(
}
static Bool
+Sha1Asc(char sha1Asc[SHA_DIGEST_LENGTH*2+1], const char * input)
+{
+ int i;
+ unsigned char sha1[SHA_DIGEST_LENGTH];
+
+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
+ SHA1_CTX ctx;
+
+ SHA1Init (&ctx);
+ SHA1Update (&ctx, input, strlen(input));
+ SHA1Final (sha1, &ctx);
+#else /* Use OpenSSL's libcrypto */
+ SHA_CTX ctx;
+ int success;
+
+ success = SHA1_Init (&ctx);
+ if (! success)
+ return BadAlloc;
+
+ success = SHA1_Update (&ctx, input, strlen(input));
+ if (! success)
+ return BadAlloc;
+
+ success = SHA1_Final (sha1, &ctx);
+ if (! success)
+ return BadAlloc;
+#endif
+
+ /* convert sha1 to sha1_asc */
+ for(i=0; i<SHA_DIGEST_LENGTH; ++i) {
+ sprintf(sha1Asc+i*2, "%02X", sha1[i]);
+ }
+
+ return Success;
+}
+
+/* call xkbcomp and compile XKB keymap, return xkm file name in
+ nameRtrn */
+static Bool
XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
XkbComponentNamesPtr names,
unsigned want,
@@ -183,7 +217,11 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
int nameRtrnLen)
{
FILE * out;
- char *buf = NULL, keymap[PATH_MAX], xkm_output_dir[PATH_MAX];
+ char * buf = NULL, xkmfile[PATH_MAX], xkm_output_dir[PATH_MAX];
+ char * tmpXkmFile = NULL;
+ char * canonicalXkmFileName = NULL;
+ char sha1Asc[SHA_DIGEST_LENGTH*2+1], xkbKeyMapBuf[100*1024];
+ int ret, result;
const char *emptystring = "";
const char *xkbbasedirflag = emptystring;
@@ -194,15 +232,67 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
/* WIN32 has no popen. The input must be stored in a file which is
used as input for xkbcomp. xkbcomp does not read from stdin. */
char tmpname[PATH_MAX];
- const char *xkmfile = tmpname;
+ const char *xkbfile = tmpname;
#else
- const char *xkmfile = "-";
+ const char *xkbfile = "-";
+#endif
+
+ /* Write keymap source (xkbfile) to memory buffer `xkbKeyMapBuf',
+ of which SHA1 is generated and used as result xkm file name */
+ memset(xkbKeyMapBuf, 0, sizeof(xkbKeyMapBuf));
+ out = fmemopen(xkbKeyMapBuf, sizeof(xkbKeyMapBuf), "w");
+ if (NULL == out) {
+ ErrorF("[xkb] Open xkbKeyMapBuf for writing failed\n");
+ return FALSE;
+ }
+ ret = XkbWriteXKBKeymapForNames(out, names, xkb, want, need);
+ if (fclose(out) !=0) {
+ ErrorF("[xkb] XkbWriteXKBKeymapForNames error, perhaps xkbKeyMapBuf is too small\n");
+ return FALSE;
+ }
+#ifdef DEBUG
+ if (xkbDebugFlags) {
+ ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
+ fputs(xkbKeyMapBuf, stderr);
+ }
#endif
+ if (!ret) {
+ ErrorF("[xkb] Generating XKB Keymap failed, giving up compiling keymap\n");
+ return FALSE;
+ }
- snprintf(keymap, sizeof(keymap), "server-%s", display);
+ DebugF("[xkb] computing SHA1 of keymap\n");
+ if (Success == Sha1Asc(sha1Asc, xkbKeyMapBuf)) {
+ snprintf(xkmfile, sizeof(xkmfile), "server-%s", sha1Asc);
+ } else {
+ ErrorF("[xkb] Computing SHA1 of keymap failed, "
+ "using display name instead as xkm file name\n");
+ snprintf(xkmfile, sizeof(xkmfile), "server-%s", display);
+ }
OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
+ /* set nameRtrn, fail if it's too small */
+ if ((strlen(xkmfile)+1 > nameRtrnLen) && nameRtrn) {
+ ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n");
+ return FALSE;
+ }
+ strncpy(nameRtrn, xkmfile, nameRtrnLen);
+
+ /* if the xkm file already exists, reuse it */
+ canonicalXkmFileName = Xprintf("%s%s.xkm", xkm_output_dir, xkmfile);
+ if (access(canonicalXkmFileName, R_OK) == 0) {
+ /* yes, we can reuse the old xkm file */
+ LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName);
+ result = TRUE;
+ goto _ret;
+ }
+ LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName);
+
+ /* continue to call xkbcomp to compile the keymap. to avoid race
+ condition, we compile it to a tmpfile then rename it to
+ xkmfile */
+
#ifdef WIN32
strcpy(tmpname, Win32TempDir());
strcat(tmpname, "\\xkb_XXXXXX");
@@ -225,19 +315,30 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
}
}
+ if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) {
+ ErrorF("[xkb] Can't generate temp xkm file name");
+ result = FALSE;
+ goto _ret;
+ }
+
buf = Xprintf("\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" "
- "-em1 %s -emp %s -eml %s \"%s%s.xkm\"",
+ "-em1 %s -emp %s -eml %s \"%s\"",
xkbbindir, xkbbindirsep,
( (xkbDebugFlags < 2) ? 1 :
((xkbDebugFlags > 10) ? 10 : (int)xkbDebugFlags) ),
- xkbbasedirflag, xkmfile,
+ xkbbasedirflag, xkbfile,
PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1,
- xkm_output_dir, keymap);
+ tmpXkmFile);
if (xkbbasedirflag != emptystring) {
xfree(xkbbasedirflag);
}
+ /* there's a potential race condition between calling tempnam()
+ and invoking xkbcomp to write the result file (potential temp
+ file name conflicts), but since xkbcomp is a standalone
+ program, we have to live with this */
+
#ifndef WIN32
out= Popen(buf,"w");
#else
@@ -245,31 +346,41 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
#endif
if (out!=NULL) {
-#ifdef DEBUG
- if (xkbDebugFlags) {
- ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
- XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need);
- }
-#endif
- XkbWriteXKBKeymapForNames(out,names,xkb,want,need);
+ /* write XKBKeyMapBuf to xkbcomp */
+ if (EOF==fputs(xkbKeyMapBuf, out))
+ {
+ ErrorF("[xkb] Sending keymap to xkbcomp failed\n");
+ result = FALSE;
+ goto _ret;
+ }
#ifndef WIN32
if (Pclose(out)==0)
#else
if (fclose(out)==0 && System(buf) >= 0)
#endif
{
+ /* xkbcomp success */
if (xkbDebugFlags)
DebugF("[xkb] xkb executes: %s\n",buf);
- if (nameRtrn) {
- strncpy(nameRtrn,keymap,nameRtrnLen);
- nameRtrn[nameRtrnLen-1]= '\0';
+ /* if canonicalXkmFileName already exists now, we simply
+ overwrite it, this is OK */
+ ret = rename(tmpXkmFile, canonicalXkmFileName);
+ if (0 != ret) {
+ ErrorF("[xkb] Can't rename %s to %s, error: %s\n",
+ tmpXkmFile, canonicalXkmFileName,
+ strerror(errno));
+
+ /* in case of error, don't unlink tmpXkmFile, leave it
+ for debugging */
+
+ result = FALSE;
+ goto _ret;
}
- if (buf != NULL)
- xfree (buf);
- return TRUE;
+ result = TRUE;
+ goto _ret;
}
else
- LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap);
+ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile);
#ifdef WIN32
/* remove the temporary file */
unlink(tmpname);
@@ -284,9 +395,16 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
}
if (nameRtrn)
nameRtrn[0]= '\0';
+ result = FALSE;
+
+_ret:
+ if (tmpXkmFile)
+ free(tmpXkmFile);
+ if (canonicalXkmFileName)
+ xfree(canonicalXkmFileName);
if (buf != NULL)
xfree (buf);
- return FALSE;
+ return result;
}
static FILE *
@@ -370,7 +488,6 @@ unsigned missing;
DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined);
}
fclose(file);
- (void) unlink (fileName);
return (need|want)&(~missing);
}
--
1.5.6.5

12
packages/x11/xserver/xorg-server/patches/xorg-x11-nonroot-vesa.diff Normal file
View File

@ -0,0 +1,12 @@
--- xorg-server-1.6.1.901/hw/xfree86/common/xf86AutoConfig.c~ 2009-07-03 11:59:30.000000000 -0700
+++ xorg-server-1.6.1.901/hw/xfree86/common/xf86AutoConfig.c 2009-07-03 11:59:30.000000000 -0700
@@ -516,7 +516,8 @@
/* Fallback to platform default hardware */
if (i < (nmatches - 1)) {
#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
- matches[i++] = xnfstrdup("vesa");
+ if (geteuid() == 0)
+ matches[i++] = xnfstrdup("vesa");
#elif defined(__sparc__) && !defined(sun)
matches[i++] = xnfstrdup("sunffb");
#endif

49
packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.diff
View File

@ -1,17 +1,3 @@
From b4e4b980663692a3af5787eeaf2d48eb6c0188ed Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <airlied@redhat.com>
Date: Tue, 4 Aug 2009 14:45:58 +1000
Subject: [PATCH] Add nr for background=none root
---
dix/globals.c | 1 +
dix/window.c | 12 +++++++-----
hw/xfree86/common/xf86Init.c | 11 +++++++++++
hw/xfree86/common/xf86str.h | 5 ++++-
include/opaque.h | 1 +
os/utils.c | 3 +++
6 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/dix/globals.c b/dix/globals.c
index c24a94f..907a5e8 100644
--- a/dix/globals.c
@ -25,10 +11,10 @@ index c24a94f..907a5e8 100644
int cursorScreenDevPriv[MAXSCREENS];
diff --git a/dix/window.c b/dix/window.c
index 32e26d9..0bf1d52 100644
index caff1cb..f343d25 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -466,22 +466,24 @@ InitRootWindow(WindowPtr pWin)
@@ -466,23 +466,24 @@ InitRootWindow(WindowPtr pWin)
pWin->optional->cursor = rootCursor;
rootCursor->refcnt++;
@ -38,7 +24,7 @@ index 32e26d9..0bf1d52 100644
if (party_like_its_1989) {
MakeRootTile(pWin);
backFlag |= CWBackPixmap;
+ pScreen->ChangeWindowAttributes(pWin, backFlag);
+ (*pScreen->ChangeWindowAttributes)(pWin, backFlag);
+ } else if (bgNoneRoot) {
+ /* nothing, handled in xf86CreateRootWindow */
} else {
@ -47,19 +33,19 @@ index 32e26d9..0bf1d52 100644
else
pWin->background.pixel = pScreen->blackPixel;
backFlag |= CWBackPixel;
- }
+ (*pScreen->ChangeWindowAttributes)(pWin, backFlag);
}
- pWin->backingStore = defaultBackingStore;
- pWin->forcedBS = (defaultBackingStore != NotUseful);
- /* We SHOULD check for an error value here XXX */
- (*pScreen->ChangeWindowAttributes)(pWin, backFlag);
+ pScreen->ChangeWindowAttributes(pWin, backFlag);
+ }
-
MapWindow(pWin, serverClient);
}
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index e84da4e..2a0f47a 100644
index c9baff3..81c62f2 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -77,6 +77,7 @@
@ -70,7 +56,7 @@ index e84da4e..2a0f47a 100644
#include "xf86VGAarbiter.h"
#include "globals.h"
@@ -234,6 +235,7 @@ xf86CreateRootWindow(WindowPtr pWin)
@@ -249,6 +250,7 @@ xf86CreateRootWindow(WindowPtr pWin)
int ret = TRUE;
int err = Success;
ScreenPtr pScreen = pWin->drawable.pScreen;
@ -78,11 +64,11 @@ index e84da4e..2a0f47a 100644
RootWinPropPtr pProp;
CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
@@ -285,6 +287,15 @@ xf86CreateRootWindow(WindowPtr pWin)
@@ -300,6 +302,15 @@ xf86CreateRootWindow(WindowPtr pWin)
}
}
+ if (bgNoneRoot && pScrn->canDoBGNoneRoot) {
+ if (bgNoneRoot && pScrn->canDoBGNoneRoot || 1) {
+ pWin->backgroundState = XaceBackgroundNoneState(pWin);
+ pWin->background.pixel = pScreen->whitePixel;
+ pScreen->ChangeWindowAttributes(pWin, CWBackPixmap | CWBorderPixel | CWCursor | CWBackingStore);
@ -95,7 +81,7 @@ index e84da4e..2a0f47a 100644
return (ret);
}
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 5c3ee44..e3c7841 100644
index b9a2e06..fd28664 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -516,7 +516,7 @@ typedef struct _confdrirec {
@ -107,7 +93,7 @@ index 5c3ee44..e3c7841 100644
#define NUM_RESERVED_POINTERS 14
#define NUM_RESERVED_FUNCS 11
@@ -800,6 +800,9 @@ typedef struct _ScrnInfoRec {
@@ -788,6 +788,9 @@ typedef struct _ScrnInfoRec {
ClockRangesPtr clockRanges;
int adjustFlags;
@ -130,10 +116,10 @@ index b3c7c70..fcc8c95 100644
extern _X_EXPORT Bool CoreDump;
diff --git a/os/utils.c b/os/utils.c
index 00abd63..7bfdf8b 100644
index 3718b17..52e30d3 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -514,6 +514,7 @@ void UseMsg(void)
@@ -513,6 +513,7 @@ void UseMsg(void)
#endif
ErrorF("-nolisten string don't listen on protocol\n");
ErrorF("-noreset don't reset after last client exists\n");
@ -141,7 +127,7 @@ index 00abd63..7bfdf8b 100644
ErrorF("-reset reset after last client exists\n");
ErrorF("-p # screen-saver pattern duration (minutes)\n");
ErrorF("-pn accept failure to listen on all ports\n");
@@ -861,6 +862,8 @@ ProcessCommandLine(int argc, char *argv[])
@@ -856,6 +857,8 @@ ProcessCommandLine(int argc, char *argv[])
defaultBackingStore = WhenMapped;
else if ( strcmp( argv[i], "-wr") == 0)
whiteRoot = TRUE;
@ -150,6 +136,3 @@ index 00abd63..7bfdf8b 100644
else if ( strcmp( argv[i], "-maxbigreqsize") == 0) {
if(++i < argc) {
long reqSizeArg = atol(argv[i]);
--
1.6.0.6

38
packages/x11/xserver/xorg-server/patches/xserver-boottime.diff
View File

@ -1,38 +0,0 @@
diff --git a/os/log.c b/os/log.c
index 0860847..2c46f1a 100644
--- a/os/log.c
+++ b/os/log.c
@@ -255,6 +255,33 @@ LogVWrite(int verb, const char *f, va_list args)
static char tmpBuffer[1024];
int len = 0;
+ struct timeval time;
+ time_t tv_sec;
+ suseconds_t tv_usec;
+ static Bool first = TRUE;
+ static time_t start_tv_sec;
+ static suseconds_t start_usec;
+ int diff_sec, diff_usec;
+
+ gettimeofday(&time, NULL);
+ tv_sec = time.tv_sec;
+ tv_usec = time.tv_usec;
+ if (first == TRUE) {
+ start_tv_sec = tv_sec;
+ start_usec = tv_usec;
+ first = FALSE;
+ }
+ diff_sec = (int)difftime(tv_sec, start_tv_sec);
+ diff_usec = (tv_usec - start_usec);
+ if (diff_usec < 0) {
+ diff_sec--;
+ diff_usec += 1000000;
+ }
+ sprintf(tmpBuffer, "[%d sec: %06d usec]", diff_sec , diff_usec);
+ len = strlen(tmpBuffer);
+ if (logFile)
+ fwrite(tmpBuffer, len, 1, logFile);
+
/*
* Since a va_list can only be processed once, write the string to a
* buffer, and then write the buffer out to the appropriate output

10
packages/x11/xserver/xorg-server/profile.d/display.conf Normal file
View File

@ -0,0 +1,10 @@
################################################################################
# Xorg environment variables.
#
# This file contains non-OpenELEC evironment variables as well as OpenELEC
# evironment variables that are not user defined.
################################################################################
DISPLAY=":0.0"
export DISPLAY

2
packages/x11/xserver/xorg-server/url
View File

@ -1 +1 @@
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.7.tar.bz2
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.8.0.902.tar.bz2

2
projects/ION/linux/linux.i386.conf
View File

@ -1831,7 +1831,7 @@ CONFIG_RTC_DRV_CMOS=y
CONFIG_FIRMWARE_MEMMAP=y
# CONFIG_DELL_RBU is not set
# CONFIG_DCDBAS is not set
# CONFIG_DMIID is not set
CONFIG_DMIID=y
# CONFIG_ISCSI_IBFT_FIND is not set
#

2
projects/ION/linux/linux.x86_64.conf
View File

@ -1786,7 +1786,7 @@ CONFIG_RTC_DRV_CMOS=y
CONFIG_FIRMWARE_MEMMAP=y
# CONFIG_DELL_RBU is not set
# CONFIG_DCDBAS is not set
# CONFIG_DMIID is not set
CONFIG_DMIID=y
# CONFIG_ISCSI_IBFT_FIND is not set
#

2
projects/generic/linux/linux.i386.conf
View File

@ -2070,7 +2070,7 @@ CONFIG_CRYSTALHD=m
CONFIG_FIRMWARE_MEMMAP=y
# CONFIG_DELL_RBU is not set
# CONFIG_DCDBAS is not set
# CONFIG_DMIID is not set
CONFIG_DMIID=y
# CONFIG_ISCSI_IBFT_FIND is not set
#

2
projects/intel/linux/linux.i386.conf
View File

@ -2013,7 +2013,7 @@ CONFIG_CRYSTALHD=m
CONFIG_FIRMWARE_MEMMAP=y
# CONFIG_DELL_RBU is not set
# CONFIG_DCDBAS is not set
# CONFIG_DMIID is not set
CONFIG_DMIID=y
# CONFIG_ISCSI_IBFT_FIND is not set
#

2
projects/intel/linux/linux.x86_64.conf
View File

@ -1971,7 +1971,7 @@ CONFIG_CRYSTALHD=m
CONFIG_FIRMWARE_MEMMAP=y
# CONFIG_DELL_RBU is not set
# CONFIG_DCDBAS is not set
# CONFIG_DMIID is not set
CONFIG_DMIID=y
# CONFIG_ISCSI_IBFT_FIND is not set
#