wok rev 6787
merge
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Mon Oct 18 16:46:27 2010 +0000 (2010-10-18) |
| parents | 66d952425df7 894e4ab15d39 |
| children | d4fabad5ae11 |
| files | xorg-server-Xephyr/receipt xorg-server-Xvesa/receipt xorg-server-tinyX/receipt xorg-server-tinyX/stuff/xorg-server-tinyX-1.5.3-boottimestamp.u xorg-server-tinyX/stuff/xorg-server-tinyX-1.5.3-hal_parallel.u |
line diff
1.1 --- a/aufs-utils/receipt Mon Oct 18 16:44:00 2010 +0000 1.2 +++ b/aufs-utils/receipt Mon Oct 18 16:46:27 2010 +0000 1.3 @@ -25,8 +25,8 @@ 1.4 cd $src 1.5 patch -p1 -R < $WOK/$PACKAGE/stuff/fix-kdir.patch 1.6 sed -i 's/-m 644 -T/-m 644/' Makefile 1.7 - make && 1.8 - make DESTDIR=$PWD/_pkg install 1.9 + make KDIR=$WOK/linux/linux-$KERNEL_VERSION && 1.10 + make KDIR=$WOK/linux/linux-$KERNEL_VERSION DESTDIR=$PWD/_pkg install 1.11 } 1.12 1.13 # Rules to gen a SliTaz package suitable for Tazpkg.
2.1 --- a/xorg-server-Xephyr/receipt Mon Oct 18 16:44:00 2010 +0000 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,21 +0,0 @@ 2.4 -# SliTaz package receipt. 2.5 - 2.6 -PACKAGE="xorg-server-Xephyr" 2.7 -VERSION="1.5.3" 2.8 -CATEGORY="x-window" 2.9 -SHORT_DESC="Xephyr server used to creat chrooted X env." 2.10 -MAINTAINER="pankso@slitaz.org" 2.11 -DEPENDS="freetype xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont \ 2.12 -xorg-libXext xorg-libX11 zlib pixman hal libcrypto xorg-libXv" 2.13 -WANTED="xorg-server-tinyX" 2.14 -SOURCE="xorg-server" 2.15 -WEB_SITE="http://www.x.org/" 2.16 - 2.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.18 -genpkg_rules() 2.19 -{ 2.20 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 2.21 - mkdir -p $fs/usr/bin 2.22 - cp -a $_pkg/usr/bin/Xephyr $fs/usr/bin 2.23 - chmod 4711 $fs/usr/bin/Xephyr 2.24 -}
3.1 --- a/xorg-server-Xvesa/receipt Mon Oct 18 16:44:00 2010 +0000 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,35 +0,0 @@ 3.4 -# SliTaz package receipt. 3.5 - 3.6 -PACKAGE="xorg-server-Xvesa" 3.7 -VERSION="1.5.3" 3.8 -CATEGORY="x-window" 3.9 -SHORT_DESC="Xorg kdrive server Xvesa (tinyX)." 3.10 -MAINTAINER="pankso@slitaz.org" 3.11 -DEPENDS="xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont \ 3.12 -xorg-base-fonts freetype zlib hal dbus pixman libcrypto" 3.13 -SUGGESTED="xorg-xrandr" 3.14 -WANTED="xorg-server-tinyX" 3.15 -SOURCE="xorg-server" 3.16 -WEB_SITE="http://www.x.org/" 3.17 - 3.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 3.19 -genpkg_rules() 3.20 -{ 3.21 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 3.22 - mkdir -p $fs/usr/bin $fs/etc/X11 3.23 - cp -a $_pkg/usr/bin/Xvesa $fs/usr/bin 3.24 - chmod 4711 $fs/usr/bin/Xvesa 3.25 -} 3.26 - 3.27 -post_install() 3.28 -{ 3.29 - # Upgrade from 1.2.0 to 1.5.3 3.30 - if ! grep -q "\-keybd keyboard" $1/etc/slim.conf; then 3.31 - echo -n "Updating Slim configuration..." 3.32 - res=$(grep ^xserver_arguments $1/etc/slim.conf | \ 3.33 - sed 's/xserver_arguments.*-screen *//' | awk '{ print $1 }') 3.34 - sed -i s/"-screen $res"/"-screen $res -keybd keyboard -mouse mouse,5,\/dev\/input\/mice -nolisten tcp"/ \ 3.35 - $1/etc/slim.conf 3.36 - status 3.37 - fi 3.38 -}
4.1 --- a/xorg-server-tinyX/receipt Mon Oct 18 16:44:00 2010 +0000 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,74 +0,0 @@ 4.4 -# SliTaz package receipt. 4.5 - 4.6 -PACKAGE="xorg-server-tinyX" 4.7 -VERSION="1.5.3" 4.8 -CATEGORY="meta" 4.9 -SHORT_DESC="Xorg tinyX servers meta package." 4.10 -MAINTAINER="pankso@slitaz.org" 4.11 -DEPENDS="xorg-libX11 xorg-server-Xvesa" 4.12 -BUILD_DEPENDS="xorg-dev-proto xorg-libXfont-dev xorg-xtrans xorg-libxkbfile-dev \ 4.13 -xorg-libfontenc-dev xorg-libxkbfile xorg-evieext" 4.14 -SOURCE="xorg-server" 4.15 -TARBALL="$SOURCE-$VERSION.tar.bz2" 4.16 -WEB_SITE="http://www.x.org/" 4.17 -WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL" 4.18 -KDRIVE=" 4.19 -Xchips 4.20 -Xvesa 4.21 -Xephyr 4.22 -Xi810 4.23 -Xnvidia 4.24 -Xepson 4.25 -Xsmi 4.26 -Xr128 4.27 -Xvia 4.28 -Xpm2 4.29 -Xati 4.30 -Xfake 4.31 -Xneomagic 4.32 -Xmach64 4.33 -Xfbdev 4.34 -Xmga 4.35 -Xvfb 4.36 -Xnest" 4.37 - 4.38 -# Rules to configure and make the package. 4.39 -compile_rules() 4.40 -{ 4.41 - cd $src 4.42 - while read file; do 4.43 - [ -f done.$file ] && continue 4.44 - echo "Apply $file..." 4.45 - busybox patch -p1 < ../stuff/$PACKAGE-$VERSION-$file || return 1 4.46 - touch done.$file 4.47 - done <<EOT 4.48 -hal_parallel.u 4.49 -boottimestamp.u 4.50 -EOT 4.51 - ./configure \ 4.52 - --prefix=/usr \ 4.53 - --sysconfdir=/etc \ 4.54 - --mandir=/usr/share/man \ 4.55 - --localstatedir=/var \ 4.56 - --with-module-dir=/usr/lib/X11/modules \ 4.57 - --with-xkb-output=/var/lib/xkb \ 4.58 - --with-serverconfig-path=/etc/X11 \ 4.59 - --with-fontdir=/usr/share/fonts/X11 \ 4.60 - --enable-install-setuid \ 4.61 - --disable-xorg \ 4.62 - --enable-kdrive \ 4.63 - --enable-kdrive-vesa \ 4.64 - --with-os-name="SliTaz GNU/Linux" \ 4.65 - --with-builder-addr=$MAINTAINER \ 4.66 - --disable-dri \ 4.67 - --disable-xorgcfg \ 4.68 - $CONFIGURE_ARGS && 4.69 - make && 4.70 - make DESTDIR=$PWD/_pkg install 4.71 -} 4.72 - 4.73 -# Rules to gen a SliTaz package suitable for Tazpkg. 4.74 -genpkg_rules() 4.75 -{ 4.76 - mkdir -p $fs/usr 4.77 -}
5.1 --- a/xorg-server-tinyX/stuff/xorg-server-tinyX-1.5.3-boottimestamp.u Mon Oct 18 16:44:00 2010 +0000 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,38 +0,0 @@ 5.4 -diff --git xorg-server-1.5.3/os/log.c xorg-server-1.5.3/os/log.c 5.5 -index 0860847..2c46f1a 100644 5.6 ---- xorg-server-1.5.3/os/log.c 5.7 -+++ xorg-server-1.5.3/os/log.c 5.8 -@@ -255,6 +255,33 @@ LogVWrite(int verb, const char *f, va_list args) 5.9 - static char tmpBuffer[1024]; 5.10 - int len = 0; 5.11 - 5.12 -+ struct timeval time; 5.13 -+ time_t tv_sec; 5.14 -+ suseconds_t tv_usec; 5.15 -+ static Bool first = TRUE; 5.16 -+ static time_t start_tv_sec; 5.17 -+ static suseconds_t start_usec; 5.18 -+ int diff_sec, diff_usec; 5.19 -+ 5.20 -+ gettimeofday(&time, NULL); 5.21 -+ tv_sec = time.tv_sec; 5.22 -+ tv_usec = time.tv_usec; 5.23 -+ if (first == TRUE) { 5.24 -+ start_tv_sec = tv_sec; 5.25 -+ start_usec = tv_usec; 5.26 -+ first = FALSE; 5.27 -+ } 5.28 -+ diff_sec = (int)difftime(tv_sec, start_tv_sec); 5.29 -+ diff_usec = (tv_usec - start_usec); 5.30 -+ if (diff_usec < 0) { 5.31 -+ diff_sec--; 5.32 -+ diff_usec += 1000000; 5.33 -+ } 5.34 -+ sprintf(tmpBuffer, "[%d sec: %06d usec]", diff_sec , diff_usec); 5.35 -+ len = strlen(tmpBuffer); 5.36 -+ if (logFile) 5.37 -+ fwrite(tmpBuffer, len, 1, logFile); 5.38 -+ 5.39 - /* 5.40 - * Since a va_list can only be processed once, write the string to a 5.41 - * buffer, and then write the buffer out to the appropriate output
6.1 --- a/xorg-server-tinyX/stuff/xorg-server-tinyX-1.5.3-hal_parallel.u Mon Oct 18 16:44:00 2010 +0000 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,136 +0,0 @@ 6.4 -diff --git xorg-server-1.5.3/config/hal.c xorg-server-1.5.3/config/hal.c 6.5 -index 8dfbb07..36fa839 100644 6.6 ---- xorg-server-1.5.3/config/hal.c 6.7 -+++ xorg-server-1.5.3/config/hal.c 6.8 -@@ -467,11 +467,10 @@ disconnect_hook(void *data) 6.9 -info->system_bus = NULL; 6.10 -} 6.11 --static void 6.12 --connect_hook(DBusConnection *connection, void *data) 6.13 -+static BOOL 6.14 -+connect_and_register(DBusConnection *connection, struct config_hal_info *info) 6.15 -{ 6.16 -DBusError error; 6.17 -- struct config_hal_info *info = data; 6.18 -char **devices; 6.19 -int num_devices, i; 6.20 -@@ -479,8 +478,10 @@ connect_hook(DBusConnection *connection, void *data) 6.21 -dbus_error_init(&error); 6.22 -- if (!info->hal_ctx) 6.23 -- info->hal_ctx = libhal_ctx_new(); 6.24 -+ if (info->hal_ctx) 6.25 -+ return TRUE; /* already registered, pretend we did something */ 6.26 -+ 6.27 -+ info->hal_ctx = libhal_ctx_new(); 6.28 -if (!info->hal_ctx) { 6.29 -LogMessage(X_ERROR, "config/hal: couldn't create HAL context\n"); 6.30 -goto out_err; 6.31 -@@ -512,7 +513,7 @@ connect_hook(DBusConnection *connection, void *data) 6.32 -dbus_error_free(&error); 6.33 -- return; 6.34 -+ return TRUE; 6.35 -out_ctx2: 6.36 -if (!libhal_ctx_shutdown(info->hal_ctx, &error)) 6.37 -@@ -525,6 +526,104 @@ out_err: 6.38 -info->hal_ctx = NULL; 6.39 -info->system_bus = NULL; 6.40 -+ return FALSE; 6.41 -+} 6.42 -+ 6.43 -+ 6.44 -+/** 6.45 -+ * Handle NewOwnerChanged signals to deal with HAL startup at X server runtime. 6.46 -+ * 6.47 -+ * NewOwnerChanged is send once when HAL shuts down, and once again when it 6.48 -+ * comes back up. Message has three arguments, first is the name 6.49 -+ * (org.freedesktop.Hal), the second one is the old owner, third one is new 6.50 -+ * owner. 6.51 -+ */ 6.52 -+static DBusHandlerResult 6.53 -+ownerchanged_handler(DBusConnection *connection, DBusMessage *message, void *data) 6.54 -+{ 6.55 -+ int ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; 6.56 -+ 6.57 -+ if (dbus_message_is_signal(message, 6.58 -+ "org.freedesktop.DBus", 6.59 -+ "NameOwnerChanged")) { 6.60 -+ DBusError error; 6.61 -+ char *name, *old_owner, *new_owner; 6.62 -+ 6.63 -+ dbus_error_init(&error); 6.64 -+ dbus_message_get_args(message, &error, 6.65 -+ DBUS_TYPE_STRING, &name, 6.66 -+ DBUS_TYPE_STRING, &old_owner, 6.67 -+ DBUS_TYPE_STRING, &new_owner, 6.68 -+ DBUS_TYPE_INVALID); 6.69 -+ 6.70 -+ if (dbus_error_is_set(&error)) { 6.71 -+ ErrorF("[config/hal] failed to get NameOwnerChanged args: %s (%s)\n", 6.72 -+ error.name, error.message); 6.73 -+ } else if (name && strcmp(name, "org.freedesktop.Hal") == 0) { 6.74 -+ 6.75 -+ if (!old_owner || !strlen(old_owner)) { 6.76 -+ DebugF("[config/hal] HAL startup detected.\n"); 6.77 -+ if (connect_and_register(connection, (struct config_hal_info*)data)) 6.78 -+ dbus_connection_unregister_object_path(connection, 6.79 -+ "/org/freedesktop/DBus"); 6.80 -+ else 6.81 -+ ErrorF("[config/hal] Failed to connect to HAL bus.\n"); 6.82 -+ } 6.83 -+ 6.84 -+ ret = DBUS_HANDLER_RESULT_HANDLED; 6.85 -+ } 6.86 -+ dbus_error_free(&error); 6.87 -+ } 6.88 -+ 6.89 -+ return ret; 6.90 -+} 6.91 -+ 6.92 -+/** 6.93 -+ * Register a handler for the NameOwnerChanged signal. 6.94 -+ */ 6.95 -+static BOOL 6.96 -+listen_for_startup(DBusConnection *connection, void *data) 6.97 -+{ 6.98 -+ DBusObjectPathVTable vtable = { .message_function = ownerchanged_handler, }; 6.99 -+ DBusError error; 6.100 -+ const char MATCH_RULE[] = "sender='org.freedesktop.DBus'," 6.101 -+ "interface='org.freedesktop.DBus'," 6.102 -+ "type='signal'," 6.103 -+ "path='/org/freedesktop/DBus'," 6.104 -+ "member='NameOwnerChanged'"; 6.105 -+ int rc = FALSE; 6.106 -+ 6.107 -+ dbus_error_init(&error); 6.108 -+ dbus_bus_add_match(connection, MATCH_RULE, &error); 6.109 -+ if (!dbus_error_is_set(&error)) { 6.110 -+ if (dbus_connection_register_object_path(connection, 6.111 -+ "/org/freedesktop/DBus", 6.112 -+ &vtable, 6.113 -+ data)) 6.114 -+ rc = TRUE; 6.115 -+ else 6.116 -+ ErrorF("[config/hal] cannot register object path.\n"); 6.117 -+ } else { 6.118 -+ ErrorF("[config/hal] couldn't add match rule: %s (%s)\n", error.name, 6.119 -+ error.message); 6.120 -+ ErrorF("[config/hal] cannot detect a HAL startup.\n"); 6.121 -+ } 6.122 -+ 6.123 -+ dbus_error_free(&error); 6.124 -+ 6.125 -+ return rc; 6.126 -+} 6.127 -+ 6.128 -+static void 6.129 -+connect_hook(DBusConnection *connection, void *data) 6.130 -+{ 6.131 -+ struct config_hal_info *info = data; 6.132 -+ 6.133 -+ if (listen_for_startup(connection, data) && 6.134 -+ connect_and_register(connection, info)) 6.135 -+ dbus_connection_unregister_object_path(connection, 6.136 -+ "/org/freedesktop/DBus"); 6.137 -+ 6.138 -return; 6.139 -}