From 217763665e3c6794fbb9b8d0e81895dce9380943 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 20 Mar 2010 02:11:21 +0100 Subject: [PATCH 01/12] xbmc: update to xbmc-28690 --- packages/mediacenter/xbmc/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 4657fc4bd99c5bc17b7a51a7c736abc90cc83980 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 20 Mar 2010 02:11:42 +0100 Subject: [PATCH 02/12] xbmc-theme-Confluence: - update to xbmc-theme-Confluence-28690 --- packages/mediacenter/xbmc-theme-Confluence/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From be560907dd6d9831491a797d9cc83aaad1c9c4b6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 20 Mar 2010 03:34:26 +0100 Subject: [PATCH 03/12] xf86-video-ati: - dont build and install libXv --- packages/x11/driver/xf86-video-ati/build | 1 - packages/x11/driver/xf86-video-ati/install | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/x11/driver/xf86-video-ati/build b/packages/x11/driver/xf86-video-ati/build index 1103f17d27..e1d39221bf 100755 --- a/packages/x11/driver/xf86-video-ati/build +++ b/packages/x11/driver/xf86-video-ati/build @@ -5,7 +5,6 @@ $SCRIPTS/build toolchain $SCRIPTS/build libXrandr $SCRIPTS/build libXrender -$SCRIPTS/build libXv $SCRIPTS/build libXext $SCRIPTS/build libpciaccess $SCRIPTS/build libdrm diff --git a/packages/x11/driver/xf86-video-ati/install b/packages/x11/driver/xf86-video-ati/install index 1f4b9c1dda..b8559a77ba 100755 --- a/packages/x11/driver/xf86-video-ati/install +++ b/packages/x11/driver/xf86-video-ati/install @@ -4,7 +4,6 @@ $SCRIPTS/install libXrandr $SCRIPTS/install libXrender -$SCRIPTS/install libXv $SCRIPTS/install libXext $SCRIPTS/install libpciaccess $SCRIPTS/install libdrm From c2ed3538e429d1ef431c253c5f75429b24bee367 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 20 Mar 2010 13:20:20 +0100 Subject: [PATCH 04/12] cmake: - install cmake configfile for host and target build - cosmetics --- config/path | 8 ++++ packages/toolchain/devel/cmake/install | 54 +++++++++++++++++++++++--- 2 files changed, 57 insertions(+), 5 deletions(-) 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/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 < Date: Sat, 20 Mar 2010 13:21:06 +0100 Subject: [PATCH 05/12] new package: - add package libssh for newer xbmc builds --- packages/network/libssh/build | 19 +++++++++++++++++++ packages/network/libssh/install | 9 +++++++++ packages/network/libssh/url | 1 + 3 files changed, 29 insertions(+) create mode 100644 packages/network/libssh/build create mode 100644 packages/network/libssh/install create mode 100644 packages/network/libssh/url diff --git a/packages/network/libssh/build b/packages/network/libssh/build new file mode 100644 index 0000000000..82d9ebef64 --- /dev/null +++ b/packages/network/libssh/build @@ -0,0 +1,19 @@ +#!/bin/sh + +. config/options + +$SCRIPTS/build toolchain +$SCRIPTS/build zlib +$SCRIPTS/build openssl + +cd $PKG_BUILD +mkdir -p build +cd build + +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 100644 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 From bcb66965a41023a34bd9f5f5a54296be7a9d4acd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 20 Mar 2010 13:22:17 +0100 Subject: [PATCH 06/12] xbmc: - build with libssh support --- packages/mediacenter/xbmc/build | 1 + packages/mediacenter/xbmc/install | 1 + 2 files changed, 2 insertions(+) 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 From e751006db50428bf61c8d9218dff41951de56438 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 20 Mar 2010 13:35:06 +0100 Subject: [PATCH 07/12] libssh: - adding cmake configuration errormessage if cmake configuration not found (will be removed later) --- packages/network/libssh/build | 9 +++++++++ packages/network/libssh/install | 0 2 files changed, 9 insertions(+) mode change 100644 => 100755 packages/network/libssh/build mode change 100644 => 100755 packages/network/libssh/install diff --git a/packages/network/libssh/build b/packages/network/libssh/build old mode 100644 new mode 100755 index 82d9ebef64..1ac6b19930 --- a/packages/network/libssh/build +++ b/packages/network/libssh/build @@ -10,6 +10,15 @@ 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 \ .. diff --git a/packages/network/libssh/install b/packages/network/libssh/install old mode 100644 new mode 100755 From c9cfc2ddc42186000fa20e1cb1e4967b2c80e078 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 20 Mar 2010 16:32:02 +0100 Subject: [PATCH 08/12] xf86-video-nvidia: - update to NVIDIA-Linux-*-195.36.15 --- packages/x11/driver/xf86-video-nvidia/url | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/x11/driver/xf86-video-nvidia/url b/packages/x11/driver/xf86-video-nvidia/url index bc10c9cf26..9daaa44db8 100644 --- a/packages/x11/driver/xf86-video-nvidia/url +++ b/packages/x11/driver/xf86-video-nvidia/url @@ -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 \ No newline at end of file +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 From 262405c8cd591729fee386e8a91263e1454364ce Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 21 Mar 2010 15:41:41 +0100 Subject: [PATCH 09/12] uxlaunch: - add patch to specify xorg configfile to uxlaunch --- .../uxlaunch-add_xconfig_option-0.1.diff | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 packages/x11/other/uxlaunch/patches/uxlaunch-add_xconfig_option-0.1.diff diff --git a/packages/x11/other/uxlaunch/patches/uxlaunch-add_xconfig_option-0.1.diff b/packages/x11/other/uxlaunch/patches/uxlaunch-add_xconfig_option-0.1.diff new file mode 100644 index 0000000000..66a8425e46 --- /dev/null +++ b/packages/x11/other/uxlaunch/patches/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-21 14:07:15.273504664 +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-21 14:09:01.116504932 +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-21 14:07:43.871631141 +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); + } From 8e11adefe6c3f870ad9093c7ff06762856356f49 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 21 Mar 2010 15:42:17 +0100 Subject: [PATCH 10/12] xorg-server: - remove init script (moved to uxlaunch) --- .../xorg-server/init.d/09_configure_xorg | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100755 packages/x11/xserver/xorg-server/init.d/09_configure_xorg 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 From ee2c4cba3681fd7e8ea33ac12c32999cd878c597 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 21 Mar 2010 15:44:25 +0100 Subject: [PATCH 11/12] uxlaunch: - create directorys for starting xorg here - specify xorg configfile based on detecte graphic adapter --- .../x11/other/uxlaunch/init.d/60_uxlaunch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/packages/x11/other/uxlaunch/init.d/60_uxlaunch b/packages/x11/other/uxlaunch/init.d/60_uxlaunch index a31dfe9b0e..9a6c152514 100644 --- a/packages/x11/other/uxlaunch/init.d/60_uxlaunch +++ b/packages/x11/other/uxlaunch/init.d/60_uxlaunch @@ -6,6 +6,8 @@ progress "starting uxlaunch" UX_USER="root" 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 \ No newline at end of file From f7462efa2e655f5451d828128d051eea3936e989 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 21 Mar 2010 23:22:58 +0100 Subject: [PATCH 12/12] eggdbus-host: - disable build of man pages (thanks to estyx) --- packages/devel/eggdbus-host/build | 1 + 1 file changed, 1 insertion(+) 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