diff --git a/config/path b/config/path index 594d46a366..11f70592ee 100644 --- a/config/path +++ b/config/path @@ -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 diff --git a/packages/devel/eggdbus-host/build b/packages/devel/eggdbus-host/build index f6c8bb3f60..9f2dcf52fe 100755 --- a/packages/devel/eggdbus-host/build +++ b/packages/devel/eggdbus-host/build @@ -20,6 +20,7 @@ cd .build-host --sysconfdir=$ROOT/$TOOLCHAIN/etc \ --disable-static \ --enable-shared \ + --disable-man-pages \ make make install diff --git a/packages/graphics/Mesa/url b/packages/graphics/Mesa/url index 4d940a8ccc..c17be051c9 100644 --- a/packages/graphics/Mesa/url +++ b/packages/graphics/Mesa/url @@ -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 \ No newline at end of file diff --git a/packages/mediacenter/xbmc-theme-Confluence/url b/packages/mediacenter/xbmc-theme-Confluence/url index e39a20a03a..0066bc213d 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/url +++ b/packages/mediacenter/xbmc-theme-Confluence/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-theme-Confluence-28622.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-Confluence-28690.tar.bz2 diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index 337ae9b0ff..b1cde99c34 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -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 diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install index c57d1064cd..6a1e4c105a 100755 --- a/packages/mediacenter/xbmc/install +++ b/packages/mediacenter/xbmc/install @@ -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 diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index 364b65c3f6..aa8d60462b 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-28622.tar.bz2 +http://sources.openelec.tv/svn/xbmc-28690.tar.bz2 diff --git a/packages/network/libssh/build b/packages/network/libssh/build new file mode 100755 index 0000000000..1ac6b19930 --- /dev/null +++ b/packages/network/libssh/build @@ -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 diff --git a/packages/network/libssh/install b/packages/network/libssh/install new file mode 100755 index 0000000000..86ed31d8f8 --- /dev/null +++ b/packages/network/libssh/install @@ -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 diff --git a/packages/network/libssh/url b/packages/network/libssh/url new file mode 100644 index 0000000000..cf97e70192 --- /dev/null +++ b/packages/network/libssh/url @@ -0,0 +1 @@ +http://www.libssh.org/files/libssh-0.4.2.tar.gz \ No newline at end of file diff --git a/packages/toolchain/devel/cmake/install b/packages/toolchain/devel/cmake/install index 25e8e0187a..7c91165e18 100755 --- a/packages/toolchain/devel/cmake/install +++ b/packages/toolchain/devel/cmake/install @@ -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 <$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf < /dev/null 2>&1 \ No newline at end of file diff --git a/packages/x11/other/uxlaunch/patches/010-uxlaunch-add_xconfig_option-0.1.diff b/packages/x11/other/uxlaunch/patches/010-uxlaunch-add_xconfig_option-0.1.diff new file mode 100644 index 0000000000..d031e8027b --- /dev/null +++ b/packages/x11/other/uxlaunch/patches/010-uxlaunch-add_xconfig_option-0.1.diff @@ -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); + } diff --git a/packages/x11/other/uxlaunch/patches/011-uxlaunch-add_nohwaccess_and_nocursor_option-0.1.diff b/packages/x11/other/uxlaunch/patches/011-uxlaunch-add_nohwaccess_and_nocursor_option-0.1.diff new file mode 100644 index 0000000000..78e64004be --- /dev/null +++ b/packages/x11/other/uxlaunch/patches/011-uxlaunch-add_nohwaccess_and_nocursor_option-0.1.diff @@ -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); + } diff --git a/packages/x11/xserver/xorg-server/init.d/09_configure_xorg b/packages/x11/xserver/xorg-server/init.d/09_configure_xorg deleted file mode 100755 index fc0f8efea6..0000000000 --- a/packages/x11/xserver/xorg-server/init.d/09_configure_xorg +++ /dev/null @@ -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 diff --git a/packages/x11/xserver/xorg-server/url b/packages/x11/xserver/xorg-server/url index d611943c45..383e297ed8 100644 --- a/packages/x11/xserver/xorg-server/url +++ b/packages/x11/xserver/xorg-server/url @@ -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 \ No newline at end of file