SliTaz Repositories

     1.1 --- a/xorg-server-Xephyr/receipt	Mon Oct 18 22:32:22 2010 +0200
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,21 +0,0 @@
     1.4 -# SliTaz package receipt.
     1.5 -
     1.6 -PACKAGE="xorg-server-Xephyr"
     1.7 -VERSION="1.5.3"
     1.8 -CATEGORY="x-window"
     1.9 -SHORT_DESC="Xephyr server used to creat chrooted X env."
    1.10 -MAINTAINER="pankso@slitaz.org"
    1.11 -DEPENDS="freetype xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont \
    1.12 -xorg-libXext xorg-libX11 zlib pixman hal libcrypto xorg-libXv"
    1.13 -WANTED="xorg-server-tinyX"
    1.14 -SOURCE="xorg-server"
    1.15 -WEB_SITE="http://www.x.org/"
    1.16 -
    1.17 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.18 -genpkg_rules()
    1.19 -{
    1.20 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    1.21 -	mkdir -p $fs/usr/bin
    1.22 -	cp -a $_pkg/usr/bin/Xephyr $fs/usr/bin
    1.23 -	chmod 4711 $fs/usr/bin/Xephyr
    1.24 -}

     2.1 --- a/xorg-server-Xvesa/receipt	Mon Oct 18 22:32:22 2010 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,35 +0,0 @@
     2.4 -# SliTaz package receipt.
     2.5 -
     2.6 -PACKAGE="xorg-server-Xvesa"
     2.7 -VERSION="1.5.3"
     2.8 -CATEGORY="x-window"
     2.9 -SHORT_DESC="Xorg kdrive server Xvesa (tinyX)."
    2.10 -MAINTAINER="pankso@slitaz.org"
    2.11 -DEPENDS="xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont \
    2.12 -xorg-base-fonts freetype zlib hal dbus pixman libcrypto"
    2.13 -SUGGESTED="xorg-xrandr"
    2.14 -WANTED="xorg-server-tinyX"
    2.15 -SOURCE="xorg-server"
    2.16 -WEB_SITE="http://www.x.org/"
    2.17 -
    2.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
    2.19 -genpkg_rules()
    2.20 -{
    2.21 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    2.22 -	mkdir -p $fs/usr/bin $fs/etc/X11
    2.23 -	cp -a $_pkg/usr/bin/Xvesa $fs/usr/bin
    2.24 -	chmod 4711 $fs/usr/bin/Xvesa
    2.25 -}
    2.26 -
    2.27 -post_install()
    2.28 -{
    2.29 -	# Upgrade from 1.2.0 to 1.5.3
    2.30 -	if ! grep -q "\-keybd keyboard" $1/etc/slim.conf; then
    2.31 -		echo -n "Updating Slim configuration..."
    2.32 -		res=$(grep ^xserver_arguments $1/etc/slim.conf | \
    2.33 -			sed 's/xserver_arguments.*-screen *//' | awk '{ print $1 }')
    2.34 -		sed -i s/"-screen $res"/"-screen $res -keybd keyboard -mouse mouse,5,\/dev\/input\/mice -nolisten tcp"/ \
    2.35 -			$1/etc/slim.conf
    2.36 -		status
    2.37 -	fi
    2.38 -}

     3.1 --- a/xorg-server-tinyX/receipt	Mon Oct 18 22:32:22 2010 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,74 +0,0 @@
     3.4 -# SliTaz package receipt.
     3.5 -
     3.6 -PACKAGE="xorg-server-tinyX"
     3.7 -VERSION="1.5.3"
     3.8 -CATEGORY="meta"
     3.9 -SHORT_DESC="Xorg tinyX servers meta package."
    3.10 -MAINTAINER="pankso@slitaz.org"
    3.11 -DEPENDS="xorg-libX11 xorg-server-Xvesa"
    3.12 -BUILD_DEPENDS="xorg-dev-proto xorg-libXfont-dev xorg-xtrans xorg-libxkbfile-dev \
    3.13 -xorg-libfontenc-dev xorg-libxkbfile xorg-evieext"
    3.14 -SOURCE="xorg-server"
    3.15 -TARBALL="$SOURCE-$VERSION.tar.bz2"
    3.16 -WEB_SITE="http://www.x.org/"
    3.17 -WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
    3.18 -KDRIVE="
    3.19 -Xchips
    3.20 -Xvesa
    3.21 -Xephyr
    3.22 -Xi810
    3.23 -Xnvidia
    3.24 -Xepson
    3.25 -Xsmi
    3.26 -Xr128
    3.27 -Xvia
    3.28 -Xpm2
    3.29 -Xati
    3.30 -Xfake
    3.31 -Xneomagic
    3.32 -Xmach64
    3.33 -Xfbdev
    3.34 -Xmga
    3.35 -Xvfb
    3.36 -Xnest"
    3.37 -
    3.38 -# Rules to configure and make the package.
    3.39 -compile_rules()
    3.40 -{
    3.41 -	cd $src
    3.42 -	while read file; do
    3.43 -    	[ -f done.$file ] && continue
    3.44 -    	echo "Apply $file..."
    3.45 -    	busybox patch -p1 < ../stuff/$PACKAGE-$VERSION-$file || return 1
    3.46 -	touch done.$file
    3.47 -    done <<EOT
    3.48 -hal_parallel.u
    3.49 -boottimestamp.u
    3.50 -EOT
    3.51 -	./configure \
    3.52 -		--prefix=/usr \
    3.53 -		--sysconfdir=/etc \
    3.54 -		--mandir=/usr/share/man \
    3.55 -		--localstatedir=/var \
    3.56 -		--with-module-dir=/usr/lib/X11/modules \
    3.57 -		--with-xkb-output=/var/lib/xkb \
    3.58 -		--with-serverconfig-path=/etc/X11 \
    3.59 -		--with-fontdir=/usr/share/fonts/X11 \
    3.60 -		--enable-install-setuid \
    3.61 -		--disable-xorg \
    3.62 -		--enable-kdrive \
    3.63 -		--enable-kdrive-vesa \
    3.64 -		--with-os-name="SliTaz GNU/Linux" \
    3.65 -		--with-builder-addr=$MAINTAINER \
    3.66 -		--disable-dri \
    3.67 -		--disable-xorgcfg \
    3.68 -		$CONFIGURE_ARGS &&
    3.69 -	make &&
    3.70 -	make DESTDIR=$PWD/_pkg install
    3.71 -}
    3.72 -
    3.73 -# Rules to gen a SliTaz package suitable for Tazpkg.
    3.74 -genpkg_rules()
    3.75 -{
    3.76 -	mkdir -p $fs/usr
    3.77 -}

     4.1 --- a/xorg-server-tinyX/stuff/xorg-server-tinyX-1.5.3-boottimestamp.u	Mon Oct 18 22:32:22 2010 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,38 +0,0 @@
     4.4 -diff --git xorg-server-1.5.3/os/log.c xorg-server-1.5.3/os/log.c
     4.5 -index 0860847..2c46f1a 100644
     4.6 ---- xorg-server-1.5.3/os/log.c
     4.7 -+++ xorg-server-1.5.3/os/log.c
     4.8 -@@ -255,6 +255,33 @@ LogVWrite(int verb, const char *f, va_list args)
     4.9 -     static char tmpBuffer[1024];
    4.10 -     int len = 0;
    4.11 - 
    4.12 -+    struct timeval time;
    4.13 -+    time_t tv_sec;
    4.14 -+    suseconds_t tv_usec;
    4.15 -+    static Bool first = TRUE;
    4.16 -+    static time_t start_tv_sec;
    4.17 -+    static suseconds_t start_usec;
    4.18 -+    int diff_sec, diff_usec;
    4.19 -+
    4.20 -+    gettimeofday(&time, NULL);
    4.21 -+    tv_sec = time.tv_sec;
    4.22 -+    tv_usec = time.tv_usec;
    4.23 -+    if (first == TRUE) {
    4.24 -+        start_tv_sec = tv_sec;
    4.25 -+        start_usec = tv_usec;
    4.26 -+        first = FALSE;
    4.27 -+    }
    4.28 -+    diff_sec = (int)difftime(tv_sec, start_tv_sec);
    4.29 -+    diff_usec = (tv_usec - start_usec);
    4.30 -+    if (diff_usec < 0) {
    4.31 -+        diff_sec--;
    4.32 -+        diff_usec += 1000000;
    4.33 -+    }
    4.34 -+    sprintf(tmpBuffer, "[%d sec: %06d usec]", diff_sec , diff_usec);
    4.35 -+    len = strlen(tmpBuffer);
    4.36 -+    if (logFile)
    4.37 -+          fwrite(tmpBuffer, len, 1, logFile);
    4.38 -+
    4.39 -     /*
    4.40 -      * Since a va_list can only be processed once, write the string to a
    4.41 -      * buffer, and then write the buffer out to the appropriate output

     5.1 --- a/xorg-server-tinyX/stuff/xorg-server-tinyX-1.5.3-hal_parallel.u	Mon Oct 18 22:32:22 2010 +0200
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,136 +0,0 @@
     5.4 -diff --git xorg-server-1.5.3/config/hal.c xorg-server-1.5.3/config/hal.c
     5.5 -index 8dfbb07..36fa839 100644
     5.6 ---- xorg-server-1.5.3/config/hal.c
     5.7 -+++ xorg-server-1.5.3/config/hal.c
     5.8 -@@ -467,11 +467,10 @@ disconnect_hook(void *data)
     5.9 -info->system_bus = NULL;
    5.10 -}
    5.11 --static void
    5.12 --connect_hook(DBusConnection *connection, void *data)
    5.13 -+static BOOL
    5.14 -+connect_and_register(DBusConnection *connection, struct config_hal_info *info)
    5.15 -{
    5.16 -DBusError error;
    5.17 -- struct config_hal_info *info = data;
    5.18 -char **devices;
    5.19 -int num_devices, i;
    5.20 -@@ -479,8 +478,10 @@ connect_hook(DBusConnection *connection, void *data)
    5.21 -dbus_error_init(&error);
    5.22 -- if (!info->hal_ctx)
    5.23 -- info->hal_ctx = libhal_ctx_new();
    5.24 -+ if (info->hal_ctx)
    5.25 -+ return TRUE; /* already registered, pretend we did something */
    5.26 -+
    5.27 -+ info->hal_ctx = libhal_ctx_new();
    5.28 -if (!info->hal_ctx) {
    5.29 -LogMessage(X_ERROR, "config/hal: couldn't create HAL context\n");
    5.30 -goto out_err;
    5.31 -@@ -512,7 +513,7 @@ connect_hook(DBusConnection *connection, void *data)
    5.32 -dbus_error_free(&error);
    5.33 -- return;
    5.34 -+ return TRUE;
    5.35 -out_ctx2:
    5.36 -if (!libhal_ctx_shutdown(info->hal_ctx, &error))
    5.37 -@@ -525,6 +526,104 @@ out_err:
    5.38 -info->hal_ctx = NULL;
    5.39 -info->system_bus = NULL;
    5.40 -+ return FALSE;
    5.41 -+}
    5.42 -+
    5.43 -+
    5.44 -+/**
    5.45 -+ * Handle NewOwnerChanged signals to deal with HAL startup at X server runtime.
    5.46 -+ *
    5.47 -+ * NewOwnerChanged is send once when HAL shuts down, and once again when it
    5.48 -+ * comes back up. Message has three arguments, first is the name
    5.49 -+ * (org.freedesktop.Hal), the second one is the old owner, third one is new
    5.50 -+ * owner.
    5.51 -+ */
    5.52 -+static DBusHandlerResult
    5.53 -+ownerchanged_handler(DBusConnection *connection, DBusMessage *message, void *data)
    5.54 -+{
    5.55 -+ int ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
    5.56 -+
    5.57 -+ if (dbus_message_is_signal(message,
    5.58 -+ "org.freedesktop.DBus",
    5.59 -+ "NameOwnerChanged")) {
    5.60 -+ DBusError error;
    5.61 -+ char *name, *old_owner, *new_owner;
    5.62 -+
    5.63 -+ dbus_error_init(&error);
    5.64 -+ dbus_message_get_args(message, &error,
    5.65 -+ DBUS_TYPE_STRING, &name,
    5.66 -+ DBUS_TYPE_STRING, &old_owner,
    5.67 -+ DBUS_TYPE_STRING, &new_owner,
    5.68 -+ DBUS_TYPE_INVALID);
    5.69 -+
    5.70 -+ if (dbus_error_is_set(&error)) {
    5.71 -+ ErrorF("[config/hal] failed to get NameOwnerChanged args: %s (%s)\n",
    5.72 -+ error.name, error.message);
    5.73 -+ } else if (name && strcmp(name, "org.freedesktop.Hal") == 0) {
    5.74 -+
    5.75 -+ if (!old_owner || !strlen(old_owner)) {
    5.76 -+ DebugF("[config/hal] HAL startup detected.\n");
    5.77 -+ if (connect_and_register(connection, (struct config_hal_info*)data))
    5.78 -+ dbus_connection_unregister_object_path(connection,
    5.79 -+ "/org/freedesktop/DBus");
    5.80 -+ else
    5.81 -+ ErrorF("[config/hal] Failed to connect to HAL bus.\n");
    5.82 -+ }
    5.83 -+
    5.84 -+ ret = DBUS_HANDLER_RESULT_HANDLED;
    5.85 -+ }
    5.86 -+ dbus_error_free(&error);
    5.87 -+ }
    5.88 -+
    5.89 -+ return ret;
    5.90 -+}
    5.91 -+
    5.92 -+/**
    5.93 -+ * Register a handler for the NameOwnerChanged signal.
    5.94 -+ */
    5.95 -+static BOOL
    5.96 -+listen_for_startup(DBusConnection *connection, void *data)
    5.97 -+{
    5.98 -+ DBusObjectPathVTable vtable = { .message_function = ownerchanged_handler, };
    5.99 -+ DBusError error;
   5.100 -+ const char MATCH_RULE[] = "sender='org.freedesktop.DBus',"
   5.101 -+ "interface='org.freedesktop.DBus',"
   5.102 -+ "type='signal',"
   5.103 -+ "path='/org/freedesktop/DBus',"
   5.104 -+ "member='NameOwnerChanged'";
   5.105 -+ int rc = FALSE;
   5.106 -+
   5.107 -+ dbus_error_init(&error);
   5.108 -+ dbus_bus_add_match(connection, MATCH_RULE, &error);
   5.109 -+ if (!dbus_error_is_set(&error)) {
   5.110 -+ if (dbus_connection_register_object_path(connection,
   5.111 -+ "/org/freedesktop/DBus",
   5.112 -+ &vtable,
   5.113 -+ data))
   5.114 -+ rc = TRUE;
   5.115 -+ else
   5.116 -+ ErrorF("[config/hal] cannot register object path.\n");
   5.117 -+ } else {
   5.118 -+ ErrorF("[config/hal] couldn't add match rule: %s (%s)\n", error.name,
   5.119 -+ error.message);
   5.120 -+ ErrorF("[config/hal] cannot detect a HAL startup.\n");
   5.121 -+ }
   5.122 -+
   5.123 -+ dbus_error_free(&error);
   5.124 -+
   5.125 -+ return rc;
   5.126 -+}
   5.127 -+
   5.128 -+static void
   5.129 -+connect_hook(DBusConnection *connection, void *data)
   5.130 -+{
   5.131 -+ struct config_hal_info *info = data;
   5.132 -+
   5.133 -+ if (listen_for_startup(connection, data) &&
   5.134 -+ connect_and_register(connection, info))
   5.135 -+ dbus_connection_unregister_object_path(connection,
   5.136 -+ "/org/freedesktop/DBus");
   5.137 -+
   5.138 -return;
   5.139 -}