merging trunk

This commit is contained in:
Stephan Raue 2010-03-15 18:48:14 +01:00
commit f488426c9d
33 changed files with 221 additions and 190 deletions

View File

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

View File

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

View File

@ -1,7 +1,7 @@
diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--- xbmc-28425/configure.in 2010-03-06 13:48:42.000000000 +0100
+++ xbmc-28425.patch/configure.in 2010-03-06 15:45:45.758328458 +0100
@@ -1153,7 +1153,9 @@
diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
--- xbmc-28584/configure.in 2010-03-14 21:06:24.000000000 +0100
+++ xbmc-28584.patch/configure.in 2010-03-15 00:50:53.680149619 +0100
@@ -1154,7 +1154,9 @@
cp pyconfig.h Include
else
./configure \
@ -12,7 +12,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--enable-unicode=ucs4 \
--without-cxx \
--enable-shared \
@@ -1218,6 +1220,7 @@
@@ -1219,6 +1221,7 @@
--disable-static \
--disable-ipv6 \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
@ -20,7 +20,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--disable-muxers \
--enable-muxer=spdif \
--enable-muxer=adts \
@@ -1234,6 +1237,7 @@
@@ -1235,6 +1238,7 @@
--enable-postproc \
--enable-gpl \
`if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \
@ -28,7 +28,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--enable-libfaad \
--enable-protocol=http \
--enable-pthreads \
@@ -1253,6 +1257,8 @@
@@ -1254,6 +1258,8 @@
--disable-win
else
./configure \
@ -37,7 +37,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--disable-oss \
--disable-solaris-audio \
--disable-al-audio \
@@ -1270,6 +1276,8 @@
@@ -1271,6 +1277,8 @@
--with-pic
else
./configure \
@ -46,7 +46,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--disable-doc \
--enable-static \
--with-pic
@@ -1288,6 +1296,8 @@
@@ -1289,6 +1297,8 @@
cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
else
./configure2 \
@ -55,7 +55,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--enable-static \
@@ -1313,6 +1323,8 @@
@@ -1314,6 +1324,8 @@
--cc="$CC"
else
./configure2 \
@ -64,7 +64,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
@@ -1345,6 +1357,8 @@
@@ -1346,6 +1358,8 @@
--disable-al-audio
else
./configure \
@ -73,7 +73,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--with-pic \
--disable-static \
--enable-shared \
@@ -1380,7 +1394,9 @@
@@ -1381,7 +1395,9 @@
./configure MACOSX_DEPLOYMENT_TARGET=10.4
else
CFLAGS="$CFLAGS -fPIC" \
@ -84,7 +84,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
fi
], [$USE_EXTERNAL_LIBASS])
@@ -1394,6 +1410,8 @@
@@ -1395,6 +1411,8 @@
--with-pic
else
./configure \
@ -93,7 +93,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1420,6 +1438,8 @@
@@ -1421,6 +1439,8 @@
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
./configure \
@ -102,7 +102,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1450,6 +1470,8 @@
@@ -1451,6 +1471,8 @@
--disable-skyrocket
else
./configure \
@ -111,7 +111,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS -fPIC" \
CXXFLAGS="$CXXFLAGS -fPIC" \
@@ -1469,9 +1491,11 @@
@@ -1470,9 +1492,11 @@
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
@ -125,7 +125,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
fi
], [0])
@@ -1480,7 +1504,9 @@
@@ -1481,7 +1505,9 @@
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared
else

View File

@ -1,6 +1,6 @@
diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--- xbmc-28425/configure.in 2010-03-06 15:46:30.970324985 +0100
+++ xbmc-28425.patch/configure.in 2010-03-06 15:46:44.355431403 +0100
diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
--- xbmc-28584/configure.in 2010-03-15 00:51:45.481151345 +0100
+++ xbmc-28584.patch/configure.in 2010-03-15 00:52:15.206151488 +0100
@@ -33,6 +33,8 @@
xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
goom_enabled="== GOOM enabled. =="
@ -60,7 +60,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
AC_SUBST(USE_EXTERNAL_LIBRARIES)
AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(USE_EXTERNAL_LIBA52)
@@ -1433,7 +1457,7 @@
@@ -1434,7 +1458,7 @@
-DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
set +x
fi
@ -69,9 +69,9 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
if test "$host_vendor" != "apple" ; then
diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
--- xbmc-28425/Makefile.in 2010-03-06 13:48:42.000000000 +0100
+++ xbmc-28425.patch/Makefile.in 2010-03-06 15:46:44.356451434 +0100
diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
--- xbmc-28584/Makefile.in 2010-03-14 21:06:24.000000000 +0100
+++ xbmc-28584.patch/Makefile.in 2010-03-15 00:55:14.471274664 +0100
@@ -104,8 +104,10 @@
VIS_DIRS=\
@ -82,16 +82,16 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
+ifneq (@BUILD_XBMCPROJECTM@,1)
+VIS_DIRS+=xbmc/visualizations/XBMCProjectM
+endif
ifneq (@BUILD_GOOM@,1)
VIS_DIRS+=xbmc/visualizations/Goom
ifeq ($(findstring osx,$(ARCH)), osx)
VIS_DIRS+=xbmc/visualizations/iTunes
endif
@@ -291,7 +293,9 @@
@@ -294,7 +296,9 @@
visualizations: exports
$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
$(MAKE) -C xbmc/visualizations/WaveForm
+ifneq (@BUILD_XBMCPROJECTM@,1)
$(MAKE) -C xbmc/visualizations/XBMCProjectM
+endif
ifneq (@BUILD_GOOM@,1)
ifeq ($(or $(findstring powerpc-linux,$(ARCH)),$(findstring powerpc64-linux,$(ARCH))),)
$(MAKE) -C xbmc/visualizations/Goom
ifeq ($(findstring osx,$(ARCH)), osx)
$(MAKE) -C xbmc/visualizations/iTunes
endif

View File

@ -1,6 +1,6 @@
diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
--- xbmc-28425/configure.in 2010-03-06 15:47:49.217295596 +0100
+++ xbmc-28425.patch/configure.in 2010-03-06 15:48:00.615295765 +0100
diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
--- xbmc-28584/configure.in 2010-03-15 00:58:21.345276911 +0100
+++ xbmc-28584.patch/configure.in 2010-03-15 00:58:38.170152082 +0100
@@ -35,6 +35,8 @@
goom_disabled="== GOOM disabled. =="
xbmcprojectm_enabled="== XBMCProjectM enabled. =="
@ -60,7 +60,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
AC_SUBST(USE_EXTERNAL_LIBRARIES)
AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(USE_EXTERNAL_LIBA52)
@@ -1511,7 +1535,7 @@
@@ -1512,7 +1536,7 @@
--disable-lattice \
--disable-skyrocket
fi
@ -69,9 +69,9 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
if test "$host_vendor" = "apple" ; then
diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
--- xbmc-28425/Makefile.in 2010-03-06 15:47:49.218295582 +0100
+++ xbmc-28425.patch/Makefile.in 2010-03-06 15:48:45.399294520 +0100
diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
--- xbmc-28584/Makefile.in 2010-03-15 00:58:21.346276544 +0100
+++ xbmc-28584.patch/Makefile.in 2010-03-15 00:58:38.176152470 +0100
@@ -99,8 +99,10 @@
lib/xbmc-dll-symbols \
lib/jsoncpp/jsoncpp/src/lib_json
@ -85,7 +85,7 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
VIS_DIRS=\
xbmc/visualizations/OpenGLSpectrum \
@@ -302,7 +304,9 @@
@@ -308,7 +310,9 @@
endif
endif
screensavers: exports

View File

@ -1,7 +1,7 @@
diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
--- xbmc-28425/Makefile.in 2010-03-06 15:49:58.203323655 +0100
+++ xbmc-28425.patch/Makefile.in 2010-03-06 15:53:21.236294350 +0100
@@ -480,7 +480,7 @@
diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
--- xbmc-28584/Makefile.in 2010-03-15 01:06:53.490151727 +0100
+++ xbmc-28584.patch/Makefile.in 2010-03-15 01:06:07.685150760 +0100
@@ -486,7 +486,7 @@
$(MAKE) -C tools/TexturePacker/
install-bin: xbmc.bin # developement convenience target
@ -10,7 +10,7 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
ifeq ($(findstring osx,$(ARCH)), osx)
# TODO: add osx install
@@ -488,55 +488,55 @@
@@ -494,55 +494,55 @@
install: install-binaries install-arch install-datas install-web
install-binaries: install-scripts
@ -47,8 +47,8 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
- @echo "Copying system files to $(prefix)/share/xbmc"
+ @echo "Copying system files to $(DESTDIR)/$(prefix)/share/xbmc"
@# Arch independent files
- @find addons language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find addons language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(DESTDIR)/$(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
- @find addons language media scripts sounds userdata system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find addons language media scripts sounds userdata system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" -exec install -D -m 0644 "{}" $(DESTDIR)/$(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
@# Skins
- @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r"
+ @find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(DESTDIR)/$(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r"

View File

@ -13,13 +13,13 @@ fi
while true; do
[ $START_WM="yes" ] && $WINDOWMANAGER &
[ "$START_WM" = "yes" ] && $WINDOWMANAGER &
$XBMC_BIN $XBMC_ARGS $@ > /dev/null 2>&1
$IONICE $XBMC_BIN $XBMC_ARGS $@ > /dev/null 2>&1
RET=$?
echo "Exited with code $RET"
[ "$RET" == 0 ] && break
[ "$RET" == 0 ] && sync && poweroff
[ "$RET" == 64 ] && sync && poweroff
[ "$RET" == 66 ] && sync && reboot

View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-28425.tar.bz2
http://sources.openelec.tv/svn/xbmc-28584.tar.bz2

View File

@ -1,6 +1,6 @@
# start Avahi Daemon
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
(
progress "Starting Avahi Daemon"

View File

@ -1,8 +1,9 @@
# start connman network manager
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
progress "Starting Connection Manager"
$IONICE mkdir -p /var/run
$IONICE touch /var/run/resolv.conf
connmand

View File

@ -1,6 +1,6 @@
# start telnet daemon
# start ssh server
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
(
# Check for the Dropbear RSA key
@ -8,7 +8,7 @@
progress "SSH: generating rsa key"
$IONICE mkdir -p /etc/dropbear
/usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1
dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1
fi
# Check for the Dropbear DSS key
@ -16,7 +16,7 @@
progress "SSH: generating dsa key"
$IONICE mkdir -p /etc/dropbear
/usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1
dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1
fi
progress "Starting SSH Server"

View File

@ -1,6 +1,6 @@
# start Samba Server
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
(
progress "Starting Samba server"

View File

@ -1,6 +1,6 @@
# start D-BUS daemon
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
(
progress "Setup ConsoleKit"

View File

@ -0,0 +1,8 @@
#
# mounting needed filesystems
#
# runlevels: openelec, text
progress "mounting needed filesystems"
$IONICE mount -n -t ramfs none /var

View File

@ -0,0 +1,15 @@
#
# make variable directory structure
#
# runlevels: openelec, text
progress "make variable directory structure"
$IONICE mkdir -p /var/log \
/var/lock \
/var/media \
/var/run \
/var/tmp \
/var/run/sepermit
$IONICE chmod 1777 /var/run /var/tmp

View File

@ -0,0 +1,13 @@
#
# copying config into storage
#
# runlevels: openelec, text
progress "copying config into storage"
$IONICE mkdir -p $HOME/.config
for i in `ls /usr/config`; do
[ ! -f "$HOME/.config/$i" ] && cp -PR /usr/config/$i $HOME/.config
done

View File

@ -1,7 +1,7 @@
#
# start syslog daemon
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
HOSTNAME=`cat /etc/hostname`

View File

@ -1,15 +0,0 @@
# start the ACPI daemon subsystem
#
# runlevels: openelec, text, debug
TTY="3"
(
echo "#############################################"
echo "### it seems we are running in Debug mode ###"
echo "### starting debugging shell on console $TTY ###"
echo "### ...... switch with ctrl-alt-f$TTY ...... ###"
echo "#############################################"
exec /bin/sh </dev/tty$TTY >/dev/tty$TTY 2>&1
)&

View File

@ -1,11 +1,10 @@
#
# start syslog daemon
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
(
progress "Starting Syslog daemon"
mkdir -p /var/log
syslogd
)&

View File

@ -0,0 +1,18 @@
# start debug shell
#
# runlevels: openelec, text
TTY="3"
if [ "$DEBUG" = "yes" ]; then
echo "###########################################"
echo "## it seems we are running in Debug mode ##"
echo "## starting debugging shell on console $TTY ##"
echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
echo "###########################################"
# exec /bin/sh </dev/tty$TTY >/dev/tty$TTY 2>&1 &
exec /sbin/getty -n -l /bin/sh 38400 tty$TTY &
fi

View File

@ -1,6 +1,6 @@
# start the ACPI daemon subsystem
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
(
progress "Starting ACPI daemon"

View File

@ -0,0 +1,16 @@
# start text mode shell
#
# runlevels: text
TTY="1"
echo "###########################################"
echo "## it seems we are running in Text mode. ##"
echo "## .... starting shell on console $TTY .... ##"
echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
echo "###########################################"
while true; do
# exec /bin/sh </dev/tty$TTY >/dev/tty$TTY 2>&1
exec /sbin/getty -n -l /bin/sh 38400 tty$TTY
done

View File

@ -3,70 +3,10 @@
# read config
. /etc/sysconfig
# Starting Splash
[ "$DEBUG" != "yes" \
-a "$TEXTMODE" != "yes" \
-a -f /usr/bin/ply-image \
-a -f /usr/share/splash/Splash.png \
] && ply-image /usr/share/splash/Splash.png &
# mounting needed filesystems
progress "mounting needed filesystems"
$IONICE mount -n -t ramfs none /var
# make variable directory structure
progress "make variable directory structure"
$IONICE mkdir -p /var/log \
/var/lock \
/var/media \
/var/run \
/var/tmp \
/var/run/sepermit
$IONICE chmod 1777 /var/run /var/tmp
# copying config into storage
progress "copying config into storage"
mkdir -p $HOME/.config
for i in `ls /usr/config`; do
[ ! -f "$HOME/.config/$i" ] && \
cp -PR /usr/config/$i $HOME/.config
done
# caching xbmc
[ "$XBMC_CACHING" = "yes" ] && cache_xbmc
# starting Udev
progress "starting Udev"
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
$NICE_20 udevd --daemon
$NICE_20 udevadm monitor 2>&1 >/var/log/udev.log &
$NICE_20 udevadm control --env STARTUP=1
(
$NICE_20 udevadm trigger
$NICE_20 udevadm settle --timeout=5
$NICE_20 udevadm control --env STARTUP=
)&
# starting dbus
progress "Starting D-BUS"
$IONICE mkdir -p /var/lib/dbus /var/run/dbus
dbus-daemon --system
dbus-uuidgen --ensure
# starting HAL
progress "Starting Hardware Abstraction Layer"
$IONICE mkdir -p /var/cache/hald
$IONICE mkdir -p /var/run/dbus/hald-local
$IONICE mkdir -p /var/run/dbus/hald-runner
hald --verbose=no --daemon=yes --use-syslog
# getting runlevel
RUNLEVEL="openelec"
if test "$TEXTMODE" = yes; then
RUNLEVEL="text"
elif test "$CONFIGURE" = yes; then
RUNLEVEL="configure"
fi
# starting init scripts for wanted runlevel
@ -80,10 +20,3 @@
test $S_RET -ge $RET && RET=$S_RET
fi
done
# if we have an problem we must look where is this problem
echo "###################################"
echo "### it seems we have an problem ###"
echo "### starting emergency shell... ###"
echo "###################################"
exec /bin/sh </dev/tty1 >/dev/tty1 2>&1

View File

@ -0,0 +1,11 @@
#
# starting dbus
#
# runlevels: openelec, text
progress "Starting D-BUS"
$IONICE mkdir -p /var/lib/dbus /var/run/dbus
dbus-daemon --system
dbus-uuidgen --ensure

View File

@ -0,0 +1,12 @@
#
# starting HAL
#
# runlevels: openelec, text
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

View File

@ -1,6 +1,6 @@
# start the LIRC daemon
#
# runlevels: openelec, text, debug
# runlevels: openelec, text
(
progress "Starting LIRC daemon"

View File

@ -0,0 +1,11 @@
#
# starting splash
#
# runlevels: openelec, text
(
[ "$DEBUG" != "yes" -a "$TEXTMODE" != "yes" \
-a -f /usr/bin/ply-image -a -f /usr/share/splash/Splash.png \
] && ply-image /usr/share/splash/Splash.png
)&

View File

@ -0,0 +1,18 @@
#
# starting Udev
#
# runlevels: openelec, text
progress "starting Udev"
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
$NICE_20 udevd --daemon
$NICE_20 udevadm monitor 2>&1 >/var/log/udev.log &
$NICE_20 udevadm control --env STARTUP=1
(
$NICE_20 udevadm trigger
$NICE_20 udevadm settle --timeout=5
$NICE_20 udevadm control --env STARTUP=
)&

View File

@ -7,13 +7,13 @@ progress "starting uxlaunch"
UX_USER="root"
UX_TTY="1"
if [ "$START_MRXVT" = yes ]; then
if [ "$START_MRXVT" = "yes" ]; 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"
[ "$DEBUG" = "yes" ] && UX_ARG="$UX_ARG -v"
uxlaunch $UX_ARG > /dev/null 2>&1

View File

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

View File

@ -0,0 +1,19 @@
#
# configure xorg directories
#
# runlevels: openelec, text
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
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
fi

View File

@ -1,27 +0,0 @@
# configure X.Org video settings
#
# runlevels: openelec, text, debug
if lspci -n | grep 0300 | grep -q 10de; then
progress "Found nVidia card, loading NVidia driver"
$IONICE modprobe nvidia &
progress "Found nVidia card, enabling NVIDIA GLX as requested"
$IONICE mkdir -p /var/lib
$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
else
progress "Not found nVidia card, enabling Mesa GLX as requested"
$IONICE mkdir -p /var/lib
$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
fi
# Make some needed directorys
$IONICE mkdir -p /var/cache/xkb
$IONICE mkdir -m 1777 -p /tmp/.ICE-unix
$IONICE chown root:root /tmp/.ICE-unix

View File

@ -74,7 +74,7 @@ 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