diff --git a/packages/x11/other/uxlaunch/build b/packages/x11/other/uxlaunch/build deleted file mode 100755 index c6c5b886d3..0000000000 --- a/packages/x11/other/uxlaunch/build +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/build toolchain -$SCRIPTS/build glib -$SCRIPTS/build dbus -$SCRIPTS/build ConsoleKit - -cd $PKG_BUILD - -make CC=$TARGET_CC diff --git a/packages/x11/other/uxlaunch/init.d/60_uxlaunch b/packages/x11/other/uxlaunch/init.d/60_uxlaunch deleted file mode 100644 index 316fb8e125..0000000000 --- a/packages/x11/other/uxlaunch/init.d/60_uxlaunch +++ /dev/null @@ -1,44 +0,0 @@ -# starting uxlaunch -# -# runlevels: openelec - -progress "starting uxlaunch" - - UX_USER="root" - UX_TTY="1" - XORG_DEFAULT_CONF="/etc/X11/xorg.conf" - XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf" - XORG_USER_CONF="/storage/.config/xorg.conf" - - if [ "$START_MRXVT" = "yes" -a -f /usr/bin/mrxvt-session ]; 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" - -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 - XORG_CONF="$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 - XORG_CONF="$XORG_DEFAULT_CONF" - fi - - [ -f $XORG_USER_CONF ] && XORG_CONF="$XORG_USER_CONF" - UX_ARG="$UX_ARG -c $XORG_CONF" - -progress "starting xsession" - - uxlaunch $UX_ARG > /dev/null 2>&1 \ No newline at end of file diff --git a/packages/x11/other/uxlaunch/install b/packages/x11/other/uxlaunch/install deleted file mode 100755 index bf7a00fdf5..0000000000 --- a/packages/x11/other/uxlaunch/install +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/install glib -$SCRIPTS/install dbus -$SCRIPTS/install ConsoleKit - -mkdir -p $INSTALL/usr/sbin - cp -P $PKG_BUILD/uxlaunch $INSTALL/usr/sbin 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 deleted file mode 100644 index 95cabd1f74..0000000000 --- a/packages/x11/other/uxlaunch/patches/uxlaunch-add_xconfig_option-0.1.diff +++ /dev/null @@ -1,93 +0,0 @@ -diff -Naur uxlaunch-0.50/options.c uxlaunch-0.50.patch/options.c ---- uxlaunch-0.50/options.c 2010-04-07 20:32:53.000000000 +0200 -+++ uxlaunch-0.50.patch/options.c 2010-04-10 14:20:36.408482887 +0200 -@@ -27,6 +27,7 @@ - int tty = 2; - char session[256] = "/usr/bin/mutter --sm-disable"; - char username[256] = "meego"; -+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.50/uxlaunch.h uxlaunch-0.50.patch/uxlaunch.h ---- uxlaunch-0.50/uxlaunch.h 2010-04-07 20:32:53.000000000 +0200 -+++ uxlaunch-0.50.patch/uxlaunch.h 2010-04-10 14:18:29.327483352 +0200 -@@ -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.50/xserver.c uxlaunch-0.50.patch/xserver.c ---- uxlaunch-0.50/xserver.c 2010-04-07 20:32:53.000000000 +0200 -+++ uxlaunch-0.50.patch/xserver.c 2010-04-10 14:18:29.334358167 +0200 -@@ -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/url b/packages/x11/other/uxlaunch/url deleted file mode 100644 index b4d84fd19d..0000000000 --- a/packages/x11/other/uxlaunch/url +++ /dev/null @@ -1 +0,0 @@ -http://sources.openelec.tv/svn/uxlaunch-0.50.tar.gz \ No newline at end of file