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

merging trunk

Browse Source
This commit is contained in:
Stephan Raue 2010-03-24 12:47:19 +01:00
commit 65ed0ea470
18 changed files with 242 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/path
View File

@ -162,6 +162,10 @@ setup_toolchain() {
export CXXFLAGS="$TARGET_CXXFLAGS"
export LDFLAGS="$TARGET_LDFLAGS"
export PKG_CONFIG_PATH="$TARGET_PKG_CONFIG_PATH"
# set CMAKE configfile for target
export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
elif [ "$1" = host ]; then
export AWK=$HOST_AWK
export CC=$HOST_CC
@ -178,6 +182,10 @@ setup_toolchain() {
export CXXFLAGS="$HOST_CXXFLAGS"
export LDFLAGS="$HOST_LDFLAGS"
export PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH"
# set CMAKE configfile for host
export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf
fi
}
setup_toolchain target

1
packages/devel/eggdbus-host/build
View File

@ -20,6 +20,7 @@ cd .build-host
--sysconfdir=$ROOT/$TOOLCHAIN/etc \
--disable-static \
--enable-shared \
--disable-man-pages \
make
make install

3
packages/graphics/Mesa/url
View File

@ -1 +1,2 @@
http://sources.openelec.tv/svn/Mesa-7.8-20100318.tar.bz2
ftp://freedesktop.org/pub/mesa/7.8/RC/MesaLib-7.8-rc2.tar.bz2
ftp://freedesktop.org/pub/mesa/7.8/RC/MesaDemos-7.8-rc2.tar.bz2

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

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

1
packages/mediacenter/xbmc/build
View File

@ -14,6 +14,7 @@ $SCRIPTS/build alsa-lib
$SCRIPTS/build enca
$SCRIPTS/build curl
$SCRIPTS/build libmicrohttpd
$SCRIPTS/build libssh
$SCRIPTS/build dbus
$SCRIPTS/build hal

1
packages/mediacenter/xbmc/install
View File

@ -12,6 +12,7 @@ $SCRIPTS/install alsa-lib
$SCRIPTS/install enca
$SCRIPTS/install curl
$SCRIPTS/install libmicrohttpd
$SCRIPTS/install libssh
$SCRIPTS/install dbus
$SCRIPTS/install hal

2
packages/mediacenter/xbmc/url
View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-28622.tar.bz2
http://sources.openelec.tv/svn/xbmc-28690.tar.bz2

28
packages/network/libssh/build Executable file
View File

@ -0,0 +1,28 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
$SCRIPTS/build zlib
$SCRIPTS/build openssl
cd $PKG_BUILD
mkdir -p build
cd build
if [ ! -f $CMAKE_CONF ]; then
echo " ######### ERROR: ##########"
echo " $CMAKE_CONF not found"
echo " please reinstall cmake with: PROJECT=... ./scripts/install cmake"
echo " or do an full rebuild !!!"
echo " "
exit 1
fi
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=/usr \
..
make
$MAKEINSTALL

9
packages/network/libssh/install Executable file
View File

@ -0,0 +1,9 @@
#!/bin/sh
. config/options
$SCRIPTS/install zlib
$SCRIPTS/install openssl
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/build/libssh/*.so* $INSTALL/usr/lib

1
packages/network/libssh/url Normal file
View File

@ -0,0 +1 @@
http://www.libssh.org/files/libssh-0.4.2.tar.gz

54
packages/toolchain/devel/cmake/install
View File

@ -2,9 +2,53 @@
. config/options
cp $PKG_BUILD/bin/cmake \
$PKG_BUILD/bin/cpack \
$PKG_BUILD/bin/ctest \
$ROOT/$TOOLCHAIN/bin
mkdir -p $ROOT/$TOOLCHAIN/bin
cp -P $PKG_BUILD/bin/cmake $ROOT/$TOOLCHAIN/bin
cp -P $PKG_BUILD/bin/cpack $ROOT/$TOOLCHAIN/bin
cp -P $PKG_BUILD/bin/ctest $ROOT/$TOOLCHAIN/bin
# $PKG_BUILD/bin/ccmake \
mkdir -p $ROOT/$TOOLCHAIN/etc
cat >$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf <<EOF
# this one is important
SET(CMAKE_SYSTEM_NAME Linux)
#this one not so much
SET(CMAKE_SYSTEM_VERSION 1)
# specify the cross compiler
SET(CMAKE_C_COMPILER $TARGET_CC)
SET(CMAKE_CXX_COMPILER $TARGET_CXX)
# where is the target environment
SET(CMAKE_FIND_ROOT_PATH $SYSROOT_PREFIX)
# search for programs in the build host directories
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
# for libraries and headers in the target directories
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
EOF
cat >$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf <<EOF
# this one is important
SET(CMAKE_SYSTEM_NAME Linux)
#this one not so much
SET(CMAKE_SYSTEM_VERSION 1)
# specify the host compiler
SET(CMAKE_C_COMPILER $HOST_CC)
SET(CMAKE_CXX_COMPILER $HOST_CXX)
# where is the target environment
SET(CMAKE_FIND_ROOT_PATH $ROOT/$TOOLCHAIN)
# search for programs in the build host directories
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
# for libraries and headers in the target directories
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
EOF

2
packages/x11/driver/xf86-video-intel/url
View File

@ -1 +1 @@
http://sources.openelec.tv/svn/xf86-video-intel-20100318.tar.bz2
http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.10.903.tar.bz2

4
packages/x11/driver/xf86-video-nvidia/url
View File

@ -1,2 +1,2 @@
http://sources.openelec.tv/svn/NVIDIA-Linux-x86-195.36.08-pkg0.run
http://sources.openelec.tv/svn/NVIDIA-Linux-x86_64-195.36.08-pkg0.run
ftp://download.nvidia.com/XFree86/Linux-x86/195.36.15/NVIDIA-Linux-x86-195.36.15-pkg0.run
ftp://download.nvidia.com/XFree86/Linux-x86_64/195.36.15/NVIDIA-Linux-x86_64-195.36.15-pkg0.run

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

@ -4,8 +4,10 @@
progress "starting uxlaunch"
UX_USER="root"
UX_USER="openelec"
UX_TTY="1"
XORG_CONF="/etc/X11/xorg.conf"
XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
if [ "$START_MRXVT" = "yes" ]; then
UX_SESSION="/usr/bin/mrxvt-session"
@ -16,4 +18,23 @@ progress "starting uxlaunch"
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
UX_ARG="$UX_ARG -c $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
UX_ARG="$UX_ARG -c $XORG_CONF"
fi
progress "starting xsession"
uxlaunch $UX_ARG > /dev/null 2>&1

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

@ -0,0 +1,93 @@
diff -Naur uxlaunch-0.46/options.c uxlaunch-0.46.patch/options.c
--- uxlaunch-0.46/options.c 2010-03-04 19:51:44.000000000 +0100
+++ uxlaunch-0.46.patch/options.c 2010-03-23 09:47:14.394856281 +0100
@@ -27,6 +27,7 @@
int tty = 2;
char session[256] = "/usr/bin/mutter --sm-disable";
char username[256] = "moblin";
+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.46/uxlaunch.h uxlaunch-0.46.patch/uxlaunch.h
--- uxlaunch-0.46/uxlaunch.h 2010-03-04 19:51:44.000000000 +0100
+++ uxlaunch-0.46.patch/uxlaunch.h 2010-03-23 09:47:14.395856611 +0100
@@ -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.46/xserver.c uxlaunch-0.46.patch/xserver.c
--- uxlaunch-0.46/xserver.c 2010-03-04 19:51:44.000000000 +0100
+++ uxlaunch-0.46.patch/xserver.c 2010-03-23 09:47:14.401856143 +0100
@@ -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);
}

21
packages/x11/other/uxlaunch/patches/011-uxlaunch-add_nohwaccess_and_nocursor_option-0.1.diff Normal file
View File

@ -0,0 +1,21 @@
diff -Naur uxlaunch-0.46/xserver.c uxlaunch-0.46.patch/xserver.c
--- uxlaunch-0.46/xserver.c 2010-03-23 09:47:54.621981367 +0100
+++ uxlaunch-0.46.patch/xserver.c 2010-03-23 09:53:39.703855113 +0100
@@ -231,13 +231,15 @@
execl(xserver, xserver, displayname,
"-nolisten", "tcp", "-dpi", "120", "-noreset",
"-auth", xauth_cookie_file,
- vt, "-config", xconfig, NULL);
+ vt, "-config", xconfig, "-nocursor", "-nohwaccess",
+ NULL);
} else {
execl(xserver, xserver, displayname,
"-nolisten", "tcp", "-dpi", "120", "-noreset",
"-auth", user_xauth_path,
"-logfile", xorg_log,
- vt, "-config", xconfig, NULL);
+ vt, "-config", xconfig, "-nocursor", "-nohwaccess",
+ NULL);
}
exit(0);
}

19
packages/x11/xserver/xorg-server/init.d/09_configure_xorg
View File

@ -1,19 +0,0 @@
#
# 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

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

@ -1 +1 @@
http://sources.openelec.tv/svn/xorg-server-20100318.tar.bz2
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.99.902.tar.bz2