archr/Arch-R
0
0
Fork 0
mirror of https://github.com/archr-linux/Arch-R.git synced 2026-03-31 14:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

merging branch next

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:17:44 +02:00
parent cbde3ef169 0eacf2a667
commit b60ee2d65c
92 changed files with 6213 additions and 1051 deletions
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

2
packages/graphics/Mesa/install
View File

@@ -25,4 +25,4 @@ if [ "$DEVTOOLS" = yes ]; then
cp -P $PKG_BUILD/progs/xdemos/glxdemo $INSTALL/usr/bin
cp -P $PKG_BUILD/progs/xdemos/glxgears $INSTALL/usr/bin
cp -P $PKG_BUILD/progs/xdemos/glxinfo $INSTALL/usr/bin
fi
fi

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

2
packages/network/transmission/init.d/43_transmission
View File

@@ -40,4 +40,4 @@
transmission-daemon $TRANSMISSION_ARG
fi
)&
)&

2
packages/network/transmission/install
View File

@@ -17,4 +17,4 @@ mkdir -p $INSTALL/usr/share/transmission/web
rm -rf $INSTALL/usr/share/transmission/web/LICENSE
mkdir -p $INSTALL/usr/config
cp $PKG_DIR/config/transmission.conf $INSTALL/usr/config
cp $PKG_DIR/config/transmission.conf $INSTALL/usr/config

Some files were not shown because too many files have changed in this diff Show More