API tools faq
paste
Advertisement
Guest User

xorg forx romster

a guest
Jun 14th, 2012
119
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 219.03 KB | None | 0 0
raw download clone embed print report
  1. diff -pruN xorg/libdrm/.footprint version-updates_xorg/libdrm/.footprint
  2. --- xorg/libdrm/.footprint  1970-01-01 10:00:00.000000000 +1000
  3. +++ version-updates_xorg/libdrm/.footprint  2012-06-09 08:49:43.000000000 +1000
  4. @@ -0,0 +1,59 @@
  5. +drwxr-xr-x root/root   usr/
  6. +drwxr-xr-x root/root   usr/include/
  7. +drwxr-xr-x root/root   usr/include/libdrm/
  8. +-rw-r--r-- root/root   usr/include/libdrm/drm.h
  9. +-rw-r--r-- root/root   usr/include/libdrm/drm_fourcc.h
  10. +-rw-r--r-- root/root   usr/include/libdrm/drm_mode.h
  11. +-rw-r--r-- root/root   usr/include/libdrm/drm_sarea.h
  12. +-rw-r--r-- root/root   usr/include/libdrm/i915_drm.h
  13. +-rw-r--r-- root/root   usr/include/libdrm/intel_aub.h
  14. +-rw-r--r-- root/root   usr/include/libdrm/intel_bufmgr.h
  15. +-rw-r--r-- root/root   usr/include/libdrm/intel_debug.h
  16. +-rw-r--r-- root/root   usr/include/libdrm/mach64_drm.h
  17. +-rw-r--r-- root/root   usr/include/libdrm/mga_drm.h
  18. +-rw-r--r-- root/root   usr/include/libdrm/nouveau.h
  19. +-rw-r--r-- root/root   usr/include/libdrm/nouveau_drm.h
  20. +-rw-r--r-- root/root   usr/include/libdrm/r128_drm.h
  21. +-rw-r--r-- root/root   usr/include/libdrm/r600_pci_ids.h
  22. +-rw-r--r-- root/root   usr/include/libdrm/radeon_bo.h
  23. +-rw-r--r-- root/root   usr/include/libdrm/radeon_bo_gem.h
  24. +-rw-r--r-- root/root   usr/include/libdrm/radeon_bo_int.h
  25. +-rw-r--r-- root/root   usr/include/libdrm/radeon_cs.h
  26. +-rw-r--r-- root/root   usr/include/libdrm/radeon_cs_gem.h
  27. +-rw-r--r-- root/root   usr/include/libdrm/radeon_cs_int.h
  28. +-rw-r--r-- root/root   usr/include/libdrm/radeon_drm.h
  29. +-rw-r--r-- root/root   usr/include/libdrm/radeon_surface.h
  30. +-rw-r--r-- root/root   usr/include/libdrm/savage_drm.h
  31. +-rw-r--r-- root/root   usr/include/libdrm/sis_drm.h
  32. +-rw-r--r-- root/root   usr/include/libdrm/via_drm.h
  33. +drwxr-xr-x root/root   usr/include/libkms/
  34. +-rw-r--r-- root/root   usr/include/libkms/libkms.h
  35. +-rw-r--r-- root/root   usr/include/xf86drm.h
  36. +-rw-r--r-- root/root   usr/include/xf86drmMode.h
  37. +drwxr-xr-x root/root   usr/lib/
  38. +-rwxr-xr-x root/root   usr/lib/libdrm.la
  39. +lrwxrwxrwx root/root   usr/lib/libdrm.so -> libdrm.so.2.4.0
  40. +lrwxrwxrwx root/root   usr/lib/libdrm.so.2 -> libdrm.so.2.4.0
  41. +-rwxr-xr-x root/root   usr/lib/libdrm.so.2.4.0
  42. +-rwxr-xr-x root/root   usr/lib/libdrm_intel.la
  43. +lrwxrwxrwx root/root   usr/lib/libdrm_intel.so -> libdrm_intel.so.1.0.0
  44. +lrwxrwxrwx root/root   usr/lib/libdrm_intel.so.1 -> libdrm_intel.so.1.0.0
  45. +-rwxr-xr-x root/root   usr/lib/libdrm_intel.so.1.0.0
  46. +-rwxr-xr-x root/root   usr/lib/libdrm_nouveau.la
  47. +lrwxrwxrwx root/root   usr/lib/libdrm_nouveau.so -> libdrm_nouveau.so.2.0.0
  48. +lrwxrwxrwx root/root   usr/lib/libdrm_nouveau.so.2 -> libdrm_nouveau.so.2.0.0
  49. +-rwxr-xr-x root/root   usr/lib/libdrm_nouveau.so.2.0.0
  50. +-rwxr-xr-x root/root   usr/lib/libdrm_radeon.la
  51. +lrwxrwxrwx root/root   usr/lib/libdrm_radeon.so -> libdrm_radeon.so.1.0.0
  52. +lrwxrwxrwx root/root   usr/lib/libdrm_radeon.so.1 -> libdrm_radeon.so.1.0.0
  53. +-rwxr-xr-x root/root   usr/lib/libdrm_radeon.so.1.0.0
  54. +-rwxr-xr-x root/root   usr/lib/libkms.la
  55. +lrwxrwxrwx root/root   usr/lib/libkms.so -> libkms.so.1.0.0
  56. +lrwxrwxrwx root/root   usr/lib/libkms.so.1 -> libkms.so.1.0.0
  57. +-rwxr-xr-x root/root   usr/lib/libkms.so.1.0.0
  58. +drwxr-xr-x root/root   usr/lib/pkgconfig/
  59. +-rw-r--r-- root/root   usr/lib/pkgconfig/libdrm.pc
  60. +-rw-r--r-- root/root   usr/lib/pkgconfig/libdrm_intel.pc
  61. +-rw-r--r-- root/root   usr/lib/pkgconfig/libdrm_nouveau.pc
  62. +-rw-r--r-- root/root   usr/lib/pkgconfig/libdrm_radeon.pc
  63. +-rw-r--r-- root/root   usr/lib/pkgconfig/libkms.pc
  64. diff -pruN xorg/libdrm/.md5sum version-updates_xorg/libdrm/.md5sum
  65. --- xorg/libdrm/.md5sum 1970-01-01 10:00:00.000000000 +1000
  66. +++ version-updates_xorg/libdrm/.md5sum 2012-06-09 08:49:43.000000000 +1000
  67. @@ -0,0 +1 @@
  68. +a40f5293dc0a7b49d2a1e959d7d60194  libdrm-2.4.35.tar.bz2
  69. diff -pruN xorg/libdrm/Pkgfile version-updates_xorg/libdrm/Pkgfile
  70. --- xorg/libdrm/Pkgfile 1970-01-01 10:00:00.000000000 +1000
  71. +++ version-updates_xorg/libdrm/Pkgfile 2012-06-09 09:11:15.000000000 +1000
  72. @@ -0,0 +1,16 @@
  73. +# Description: Userspace interface to kernel DRM services
  74. +# URL: http://dri.freedesktop.org/
  75. +# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  76. +# Depends on: libpthread-stubs xorg-libpciaccess
  77. +
  78. +name=libdrm
  79. +version=2.4.35
  80. +release=1
  81. +source=(http://dri.freedesktop.org/libdrm/libdrm-$version.tar.bz2)
  82. +
  83. +build() {
  84. +    cd $name-$version
  85. +    ./configure --prefix=/usr --enable-udev
  86. +    make
  87. +    make DESTDIR=$PKG install
  88. +}
  89. diff -pruN xorg/libpthread-stubs/.footprint version-updates_xorg/libpthread-stubs/.footprint
  90. --- xorg/libpthread-stubs/.footprint    2012-06-14 19:08:50.000000000 +1000
  91. +++ version-updates_xorg/libpthread-stubs/.footprint    2012-06-09 08:49:43.000000000 +1000
  92. @@ -1,9 +1,4 @@
  93.  drwxr-xr-x root/root   usr/
  94.  drwxr-xr-x root/root   usr/lib/
  95. --rw-r--r-- root/root   usr/lib/libpthread-stubs.a
  96. --rwxr-xr-x root/root   usr/lib/libpthread-stubs.la
  97. -lrwxrwxrwx root/root   usr/lib/libpthread-stubs.so -> libpthread-stubs.so.0.0.0
  98. -lrwxrwxrwx root/root   usr/lib/libpthread-stubs.so.0 -> libpthread-stubs.so.0.0.0
  99. --rwxr-xr-x root/root   usr/lib/libpthread-stubs.so.0.0.0
  100.  drwxr-xr-x root/root   usr/lib/pkgconfig/
  101.  -rw-r--r-- root/root   usr/lib/pkgconfig/pthread-stubs.pc
  102. diff -pruN xorg/libpthread-stubs/.md5sum version-updates_xorg/libpthread-stubs/.md5sum
  103. --- xorg/libpthread-stubs/.md5sum   2012-06-14 19:08:50.000000000 +1000
  104. +++ version-updates_xorg/libpthread-stubs/.md5sum   2012-06-09 08:49:43.000000000 +1000
  105. @@ -1 +1 @@
  106. -2ba9ce2d46da0a2a1090384ece3387ff  libpthread-stubs-0.2.tar.bz2
  107. +e8fa31b42e13f87e8f5a7a2b731db7ee  libpthread-stubs-0.3.tar.bz2
  108. diff -pruN xorg/libpthread-stubs/Pkgfile version-updates_xorg/libpthread-stubs/Pkgfile
  109. --- xorg/libpthread-stubs/Pkgfile   2012-06-14 19:08:50.000000000 +1000
  110. +++ version-updates_xorg/libpthread-stubs/Pkgfile   2012-06-09 08:49:43.000000000 +1000
  111. @@ -3,7 +3,7 @@
  112.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  113.  
  114.  name=libpthread-stubs
  115. -version=0.2
  116. +version=0.3
  117.  release=1
  118.  source=(http://xcb.freedesktop.org/dist/$name-$version.tar.bz2)
  119.  
  120. diff -pruN xorg/mesa3d/.footprint version-updates_xorg/mesa3d/.footprint
  121. --- xorg/mesa3d/.footprint  2012-06-14 19:08:50.000000000 +1000
  122. +++ version-updates_xorg/mesa3d/.footprint  2012-06-09 08:49:43.000000000 +1000
  123. @@ -1,21 +1,14 @@
  124.  drwxr-xr-x root/root   usr/
  125. -drwxr-xr-x root/root   usr/bin/
  126. --rwxr-xr-x root/root   usr/bin/glxgears
  127. --rwxr-xr-x root/root   usr/bin/glxinfo
  128.  drwxr-xr-x root/root   usr/include/
  129.  drwxr-xr-x root/root   usr/include/EGL/
  130.  -rw-r--r-- root/root   usr/include/EGL/egl.h
  131.  -rw-r--r-- root/root   usr/include/EGL/eglext.h
  132. +-rw-r--r-- root/root   usr/include/EGL/eglmesaext.h
  133.  -rw-r--r-- root/root   usr/include/EGL/eglplatform.h
  134.  drwxr-xr-x root/root   usr/include/GL/
  135. --rw-r--r-- root/root   usr/include/GL/GLwDrawA.h
  136. --rw-r--r-- root/root   usr/include/GL/GLwDrawAP.h
  137. --rw-r--r-- root/root   usr/include/GL/GLwMDrawA.h
  138. --rw-r--r-- root/root   usr/include/GL/GLwMDrawAP.h
  139.  -rw-r--r-- root/root   usr/include/GL/gl.h
  140.  -rw-r--r-- root/root   usr/include/GL/gl_mangle.h
  141.  -rw-r--r-- root/root   usr/include/GL/glext.h
  142. --rw-r--r-- root/root   usr/include/GL/glfbdev.h
  143.  -rw-r--r-- root/root   usr/include/GL/glu.h
  144.  -rw-r--r-- root/root   usr/include/GL/glu_mangle.h
  145.  -rw-r--r-- root/root   usr/include/GL/glx.h
  146. @@ -23,7 +16,6 @@ drwxr-xr-x    root/root   usr/include/GL/
  147.  -rw-r--r-- root/root   usr/include/GL/glxext.h
  148.  drwxr-xr-x root/root   usr/include/GL/internal/
  149.  -rw-r--r-- root/root   usr/include/GL/internal/dri_interface.h
  150. --rw-r--r-- root/root   usr/include/GL/mesa_wgl.h
  151.  -rw-r--r-- root/root   usr/include/GL/osmesa.h
  152.  -rw-r--r-- root/root   usr/include/GL/vms_x_fix.h
  153.  -rw-r--r-- root/root   usr/include/GL/wglext.h
  154. @@ -32,29 +24,13 @@ drwxr-xr-x  root/root   usr/include/KHR/
  155.  -rw-r--r-- root/root   usr/include/KHR/khrplatform.h
  156.  drwxr-xr-x root/root   usr/lib/
  157.  drwxr-xr-x root/root   usr/lib/dri/
  158. --rwxr-xr-x root/root   usr/lib/dri/i810_dri.so
  159.  -rwxr-xr-x root/root   usr/lib/dri/i915_dri.so
  160.  -rwxr-xr-x root/root   usr/lib/dri/i965_dri.so
  161. --rwxr-xr-x root/root   usr/lib/dri/mach64_dri.so
  162. --rwxr-xr-x root/root   usr/lib/dri/mga_dri.so
  163. --rwxr-xr-x root/root   usr/lib/dri/r128_dri.so
  164.  -rwxr-xr-x root/root   usr/lib/dri/r200_dri.so
  165. --rwxr-xr-x root/root   usr/lib/dri/r300_dri.so
  166.  -rwxr-xr-x root/root   usr/lib/dri/r600_dri.so
  167.  -rwxr-xr-x root/root   usr/lib/dri/radeon_dri.so
  168. --rwxr-xr-x root/root   usr/lib/dri/savage_dri.so
  169. --rwxr-xr-x root/root   usr/lib/dri/sis_dri.so
  170.  -rwxr-xr-x root/root   usr/lib/dri/swrast_dri.so
  171. --rwxr-xr-x root/root   usr/lib/dri/swrastg_dri.so
  172. --rwxr-xr-x root/root   usr/lib/dri/tdfx_dri.so
  173. --rwxr-xr-x root/root   usr/lib/dri/unichrome_dri.so
  174. -drwxr-xr-x root/root   usr/lib/egl/
  175. --rwxr-xr-x root/root   usr/lib/egl/egl_dri2.so
  176. --rwxr-xr-x root/root   usr/lib/egl/egl_gallium.so
  177. --rwxr-xr-x root/root   usr/lib/egl/egl_glx.so
  178. --rwxr-xr-x root/root   usr/lib/egl/pipe_r300.so
  179. --rwxr-xr-x root/root   usr/lib/egl/pipe_swrast.so
  180. --rwxr-xr-x root/root   usr/lib/egl/st_GL.so
  181. +-rwxr-xr-x root/root   usr/lib/dri/vmwgfx_dri.so
  182.  lrwxrwxrwx root/root   usr/lib/libEGL.so -> libEGL.so.1
  183.  lrwxrwxrwx root/root   usr/lib/libEGL.so.1 -> libEGL.so.1.0
  184.  -rwxr-xr-x root/root   usr/lib/libEGL.so.1.0
  185. @@ -62,14 +38,10 @@ lrwxrwxrwx  root/root   usr/lib/libGL.so ->
  186.  lrwxrwxrwx root/root   usr/lib/libGL.so.1 -> libGL.so.1.2
  187.  -rwxr-xr-x root/root   usr/lib/libGL.so.1.2
  188.  lrwxrwxrwx root/root   usr/lib/libGLU.so -> libGLU.so.1
  189. -lrwxrwxrwx root/root   usr/lib/libGLU.so.1 -> libGLU.so.1.3.071000
  190. --rwxr-xr-x root/root   usr/lib/libGLU.so.1.3.071000
  191. -lrwxrwxrwx root/root   usr/lib/libGLw.so -> libGLw.so.1
  192. -lrwxrwxrwx root/root   usr/lib/libGLw.so.1 -> libGLw.so.1.0.0
  193. --rwxr-xr-x root/root   usr/lib/libGLw.so.1.0.0
  194. +lrwxrwxrwx root/root   usr/lib/libGLU.so.1 -> libGLU.so.1.3.08003
  195. +-rwxr-xr-x root/root   usr/lib/libGLU.so.1.3.08003
  196.  drwxr-xr-x root/root   usr/lib/pkgconfig/
  197.  -rw-r--r-- root/root   usr/lib/pkgconfig/dri.pc
  198.  -rw-r--r-- root/root   usr/lib/pkgconfig/egl.pc
  199.  -rw-r--r-- root/root   usr/lib/pkgconfig/gl.pc
  200.  -rw-r--r-- root/root   usr/lib/pkgconfig/glu.pc
  201. --rw-r--r-- root/root   usr/lib/pkgconfig/glw.pc
  202. diff -pruN xorg/mesa3d/glxgears.c version-updates_xorg/mesa3d/glxgears.c
  203. --- xorg/mesa3d/glxgears.c  2012-06-14 19:08:50.000000000 +1000
  204. +++ version-updates_xorg/mesa3d/glxgears.c  1970-01-01 10:00:00.000000000 +1000
  205. @@ -1,787 +0,0 @@
  206. -/*
  207. - * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
  208. - *
  209. - * Permission is hereby granted, free of charge, to any person obtaining a
  210. - * copy of this software and associated documentation files (the "Software"),
  211. - * to deal in the Software without restriction, including without limitation
  212. - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  213. - * and/or sell copies of the Software, and to permit persons to whom the
  214. - * Software is furnished to do so, subject to the following conditions:
  215. - *
  216. - * The above copyright notice and this permission notice shall be included
  217. - * in all copies or substantial portions of the Software.
  218. - *
  219. - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  220. - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  221. - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  222. - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
  223. - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  224. - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  225. - */
  226. -
  227. -/*
  228. - * This is a port of the infamous "gears" demo to straight GLX (i.e. no GLUT)
  229. - * Port by Brian Paul  23 March 2001
  230. - *
  231. - * See usage() below for command line options.
  232. - */
  233. -
  234. -
  235. -#include <math.h>
  236. -#include <stdlib.h>
  237. -#include <stdio.h>
  238. -#include <string.h>
  239. -#include <X11/Xlib.h>
  240. -#include <X11/keysym.h>
  241. -#include <GL/gl.h>
  242. -#include <GL/glx.h>
  243. -#include <GL/glxext.h>
  244. -
  245. -#ifndef GLX_MESA_swap_control
  246. -#define GLX_MESA_swap_control 1
  247. -typedef int (*PFNGLXGETSWAPINTERVALMESAPROC)(void);
  248. -#endif
  249. -
  250. -
  251. -#define BENCHMARK
  252. -
  253. -#ifdef BENCHMARK
  254. -
  255. -/* XXX this probably isn't very portable */
  256. -
  257. -#include <sys/time.h>
  258. -#include <unistd.h>
  259. -
  260. -/* return current time (in seconds) */
  261. -static double
  262. -current_time(void)
  263. -{
  264. -   struct timeval tv;
  265. -#ifdef __VMS
  266. -   (void) gettimeofday(&tv, NULL );
  267. -#else
  268. -   struct timezone tz;
  269. -   (void) gettimeofday(&tv, &tz);
  270. -#endif
  271. -   return (double) tv.tv_sec + tv.tv_usec / 1000000.0;
  272. -}
  273. -
  274. -#else /*BENCHMARK*/
  275. -
  276. -/* dummy */
  277. -static double
  278. -current_time(void)
  279. -{
  280. -   /* update this function for other platforms! */
  281. -   static double t = 0.0;
  282. -   static int warn = 1;
  283. -   if (warn) {
  284. -      fprintf(stderr, "Warning: current_time() not implemented!!\n");
  285. -      warn = 0;
  286. -   }
  287. -   return t += 1.0;
  288. -}
  289. -
  290. -#endif /*BENCHMARK*/
  291. -
  292. -
  293. -
  294. -#ifndef M_PI
  295. -#define M_PI 3.14159265
  296. -#endif
  297. -
  298. -
  299. -/** Event handler results: */
  300. -#define NOP 0
  301. -#define EXIT 1
  302. -#define DRAW 2
  303. -
  304. -static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
  305. -static GLint gear1, gear2, gear3;
  306. -static GLfloat angle = 0.0;
  307. -
  308. -static GLboolean fullscreen = GL_FALSE;    /* Create a single fullscreen window */
  309. -static GLboolean stereo = GL_FALSE;    /* Enable stereo.  */
  310. -static GLboolean animate = GL_TRUE;    /* Animation */
  311. -static GLfloat eyesep = 5.0;       /* Eye separation. */
  312. -static GLfloat fix_point = 40.0;   /* Fixation point distance.  */
  313. -static GLfloat left, right, asp;   /* Stereo frustum params.  */
  314. -
  315. -
  316. -/*
  317. - *
  318. - *  Draw a gear wheel.  You'll probably want to call this function when
  319. - *  building a display list since we do a lot of trig here.
  320. - *
  321. - *  Input:  inner_radius - radius of hole at center
  322. - *          outer_radius - radius at center of teeth
  323. - *          width - width of gear
  324. - *          teeth - number of teeth
  325. - *          tooth_depth - depth of tooth
  326. - */
  327. -static void
  328. -gear(GLfloat inner_radius, GLfloat outer_radius, GLfloat width,
  329. -     GLint teeth, GLfloat tooth_depth)
  330. -{
  331. -   GLint i;
  332. -   GLfloat r0, r1, r2;
  333. -   GLfloat angle, da;
  334. -   GLfloat u, v, len;
  335. -
  336. -   r0 = inner_radius;
  337. -   r1 = outer_radius - tooth_depth / 2.0;
  338. -   r2 = outer_radius + tooth_depth / 2.0;
  339. -
  340. -   da = 2.0 * M_PI / teeth / 4.0;
  341. -
  342. -   glShadeModel(GL_FLAT);
  343. -
  344. -   glNormal3f(0.0, 0.0, 1.0);
  345. -
  346. -   /* draw front face */
  347. -   glBegin(GL_QUAD_STRIP);
  348. -   for (i = 0; i <= teeth; i++) {
  349. -      angle = i * 2.0 * M_PI / teeth;
  350. -      glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5);
  351. -      glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5);
  352. -      if (i < teeth) {
  353. -    glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5);
  354. -    glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da),
  355. -           width * 0.5);
  356. -      }
  357. -   }
  358. -   glEnd();
  359. -
  360. -   /* draw front sides of teeth */
  361. -   glBegin(GL_QUADS);
  362. -   da = 2.0 * M_PI / teeth / 4.0;
  363. -   for (i = 0; i < teeth; i++) {
  364. -      angle = i * 2.0 * M_PI / teeth;
  365. -
  366. -      glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5);
  367. -      glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), width * 0.5);
  368. -      glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da),
  369. -        width * 0.5);
  370. -      glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da),
  371. -        width * 0.5);
  372. -   }
  373. -   glEnd();
  374. -
  375. -   glNormal3f(0.0, 0.0, -1.0);
  376. -
  377. -   /* draw back face */
  378. -   glBegin(GL_QUAD_STRIP);
  379. -   for (i = 0; i <= teeth; i++) {
  380. -      angle = i * 2.0 * M_PI / teeth;
  381. -      glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5);
  382. -      glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5);
  383. -      if (i < teeth) {
  384. -    glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da),
  385. -           -width * 0.5);
  386. -    glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5);
  387. -      }
  388. -   }
  389. -   glEnd();
  390. -
  391. -   /* draw back sides of teeth */
  392. -   glBegin(GL_QUADS);
  393. -   da = 2.0 * M_PI / teeth / 4.0;
  394. -   for (i = 0; i < teeth; i++) {
  395. -      angle = i * 2.0 * M_PI / teeth;
  396. -
  397. -      glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da),
  398. -        -width * 0.5);
  399. -      glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da),
  400. -        -width * 0.5);
  401. -      glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), -width * 0.5);
  402. -      glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5);
  403. -   }
  404. -   glEnd();
  405. -
  406. -   /* draw outward faces of teeth */
  407. -   glBegin(GL_QUAD_STRIP);
  408. -   for (i = 0; i < teeth; i++) {
  409. -      angle = i * 2.0 * M_PI / teeth;
  410. -
  411. -      glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5);
  412. -      glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5);
  413. -      u = r2 * cos(angle + da) - r1 * cos(angle);
  414. -      v = r2 * sin(angle + da) - r1 * sin(angle);
  415. -      len = sqrt(u * u + v * v);
  416. -      u /= len;
  417. -      v /= len;
  418. -      glNormal3f(v, -u, 0.0);
  419. -      glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), width * 0.5);
  420. -      glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), -width * 0.5);
  421. -      glNormal3f(cos(angle), sin(angle), 0.0);
  422. -      glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da),
  423. -        width * 0.5);
  424. -      glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da),
  425. -        -width * 0.5);
  426. -      u = r1 * cos(angle + 3 * da) - r2 * cos(angle + 2 * da);
  427. -      v = r1 * sin(angle + 3 * da) - r2 * sin(angle + 2 * da);
  428. -      glNormal3f(v, -u, 0.0);
  429. -      glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da),
  430. -        width * 0.5);
  431. -      glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da),
  432. -        -width * 0.5);
  433. -      glNormal3f(cos(angle), sin(angle), 0.0);
  434. -   }
  435. -
  436. -   glVertex3f(r1 * cos(0), r1 * sin(0), width * 0.5);
  437. -   glVertex3f(r1 * cos(0), r1 * sin(0), -width * 0.5);
  438. -
  439. -   glEnd();
  440. -
  441. -   glShadeModel(GL_SMOOTH);
  442. -
  443. -   /* draw inside radius cylinder */
  444. -   glBegin(GL_QUAD_STRIP);
  445. -   for (i = 0; i <= teeth; i++) {
  446. -      angle = i * 2.0 * M_PI / teeth;
  447. -      glNormal3f(-cos(angle), -sin(angle), 0.0);
  448. -      glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5);
  449. -      glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5);
  450. -   }
  451. -   glEnd();
  452. -}
  453. -
  454. -
  455. -static void
  456. -draw(void)
  457. -{
  458. -   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
  459. -
  460. -   glPushMatrix();
  461. -   glRotatef(view_rotx, 1.0, 0.0, 0.0);
  462. -   glRotatef(view_roty, 0.0, 1.0, 0.0);
  463. -   glRotatef(view_rotz, 0.0, 0.0, 1.0);
  464. -
  465. -   glPushMatrix();
  466. -   glTranslatef(-3.0, -2.0, 0.0);
  467. -   glRotatef(angle, 0.0, 0.0, 1.0);
  468. -   glCallList(gear1);
  469. -   glPopMatrix();
  470. -
  471. -   glPushMatrix();
  472. -   glTranslatef(3.1, -2.0, 0.0);
  473. -   glRotatef(-2.0 * angle - 9.0, 0.0, 0.0, 1.0);
  474. -   glCallList(gear2);
  475. -   glPopMatrix();
  476. -
  477. -   glPushMatrix();
  478. -   glTranslatef(-3.1, 4.2, 0.0);
  479. -   glRotatef(-2.0 * angle - 25.0, 0.0, 0.0, 1.0);
  480. -   glCallList(gear3);
  481. -   glPopMatrix();
  482. -
  483. -   glPopMatrix();
  484. -}
  485. -
  486. -
  487. -static void
  488. -draw_gears(void)
  489. -{
  490. -   if (stereo) {
  491. -      /* First left eye.  */
  492. -      glDrawBuffer(GL_BACK_LEFT);
  493. -
  494. -      glMatrixMode(GL_PROJECTION);
  495. -      glLoadIdentity();
  496. -      glFrustum(left, right, -asp, asp, 5.0, 60.0);
  497. -
  498. -      glMatrixMode(GL_MODELVIEW);
  499. -
  500. -      glPushMatrix();
  501. -      glTranslated(+0.5 * eyesep, 0.0, 0.0);
  502. -      draw();
  503. -      glPopMatrix();
  504. -
  505. -      /* Then right eye.  */
  506. -      glDrawBuffer(GL_BACK_RIGHT);
  507. -
  508. -      glMatrixMode(GL_PROJECTION);
  509. -      glLoadIdentity();
  510. -      glFrustum(-right, -left, -asp, asp, 5.0, 60.0);
  511. -
  512. -      glMatrixMode(GL_MODELVIEW);
  513. -
  514. -      glPushMatrix();
  515. -      glTranslated(-0.5 * eyesep, 0.0, 0.0);
  516. -      draw();
  517. -      glPopMatrix();
  518. -   }
  519. -   else {
  520. -      draw();
  521. -   }
  522. -}
  523. -
  524. -
  525. -/** Draw single frame, do SwapBuffers, compute FPS */
  526. -static void
  527. -draw_frame(Display *dpy, Window win)
  528. -{
  529. -   static int frames = 0;
  530. -   static double tRot0 = -1.0, tRate0 = -1.0;
  531. -   double dt, t = current_time();
  532. -
  533. -   if (tRot0 < 0.0)
  534. -      tRot0 = t;
  535. -   dt = t - tRot0;
  536. -   tRot0 = t;
  537. -
  538. -   if (animate) {
  539. -      /* advance rotation for next frame */
  540. -      angle += 70.0 * dt;  /* 70 degrees per second */
  541. -      if (angle > 3600.0)
  542. -         angle -= 3600.0;
  543. -   }
  544. -
  545. -   draw_gears();
  546. -   glXSwapBuffers(dpy, win);
  547. -
  548. -   frames++;
  549. -  
  550. -   if (tRate0 < 0.0)
  551. -      tRate0 = t;
  552. -   if (t - tRate0 >= 5.0) {
  553. -      GLfloat seconds = t - tRate0;
  554. -      GLfloat fps = frames / seconds;
  555. -      printf("%d frames in %3.1f seconds = %6.3f FPS\n", frames, seconds,
  556. -             fps);
  557. -      tRate0 = t;
  558. -      frames = 0;
  559. -   }
  560. -}
  561. -
  562. -
  563. -/* new window size or exposure */
  564. -static void
  565. -reshape(int width, int height)
  566. -{
  567. -   glViewport(0, 0, (GLint) width, (GLint) height);
  568. -
  569. -   if (stereo) {
  570. -      GLfloat w;
  571. -
  572. -      asp = (GLfloat) height / (GLfloat) width;
  573. -      w = fix_point * (1.0 / 5.0);
  574. -
  575. -      left = -5.0 * ((w - 0.5 * eyesep) / fix_point);
  576. -      right = 5.0 * ((w + 0.5 * eyesep) / fix_point);
  577. -   }
  578. -   else {
  579. -      GLfloat h = (GLfloat) height / (GLfloat) width;
  580. -
  581. -      glMatrixMode(GL_PROJECTION);
  582. -      glLoadIdentity();
  583. -      glFrustum(-1.0, 1.0, -h, h, 5.0, 60.0);
  584. -   }
  585. -  
  586. -   glMatrixMode(GL_MODELVIEW);
  587. -   glLoadIdentity();
  588. -   glTranslatef(0.0, 0.0, -40.0);
  589. -}
  590. -  
  591. -
  592. -
  593. -static void
  594. -init(void)
  595. -{
  596. -   static GLfloat pos[4] = { 5.0, 5.0, 10.0, 0.0 };
  597. -   static GLfloat red[4] = { 0.8, 0.1, 0.0, 1.0 };
  598. -   static GLfloat green[4] = { 0.0, 0.8, 0.2, 1.0 };
  599. -   static GLfloat blue[4] = { 0.2, 0.2, 1.0, 1.0 };
  600. -
  601. -   glLightfv(GL_LIGHT0, GL_POSITION, pos);
  602. -   glEnable(GL_CULL_FACE);
  603. -   glEnable(GL_LIGHTING);
  604. -   glEnable(GL_LIGHT0);
  605. -   glEnable(GL_DEPTH_TEST);
  606. -
  607. -   /* make the gears */
  608. -   gear1 = glGenLists(1);
  609. -   glNewList(gear1, GL_COMPILE);
  610. -   glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, red);
  611. -   gear(1.0, 4.0, 1.0, 20, 0.7);
  612. -   glEndList();
  613. -
  614. -   gear2 = glGenLists(1);
  615. -   glNewList(gear2, GL_COMPILE);
  616. -   glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, green);
  617. -   gear(0.5, 2.0, 2.0, 10, 0.7);
  618. -   glEndList();
  619. -
  620. -   gear3 = glGenLists(1);
  621. -   glNewList(gear3, GL_COMPILE);
  622. -   glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, blue);
  623. -   gear(1.3, 2.0, 0.5, 10, 0.7);
  624. -   glEndList();
  625. -
  626. -   glEnable(GL_NORMALIZE);
  627. -}
  628. -
  629. -
  630. -/**
  631. - * Remove window border/decorations.
  632. - */
  633. -static void
  634. -no_border( Display *dpy, Window w)
  635. -{
  636. -   static const unsigned MWM_HINTS_DECORATIONS = (1 << 1);
  637. -   static const int PROP_MOTIF_WM_HINTS_ELEMENTS = 5;
  638. -
  639. -   typedef struct
  640. -   {
  641. -      unsigned long       flags;
  642. -      unsigned long       functions;
  643. -      unsigned long       decorations;
  644. -      long                inputMode;
  645. -      unsigned long       status;
  646. -   } PropMotifWmHints;
  647. -
  648. -   PropMotifWmHints motif_hints;
  649. -   Atom prop, proptype;
  650. -   unsigned long flags = 0;
  651. -
  652. -   /* setup the property */
  653. -   motif_hints.flags = MWM_HINTS_DECORATIONS;
  654. -   motif_hints.decorations = flags;
  655. -
  656. -   /* get the atom for the property */
  657. -   prop = XInternAtom( dpy, "_MOTIF_WM_HINTS", True );
  658. -   if (!prop) {
  659. -      /* something went wrong! */
  660. -      return;
  661. -   }
  662. -
  663. -   /* not sure this is correct, seems to work, XA_WM_HINTS didn't work */
  664. -   proptype = prop;
  665. -
  666. -   XChangeProperty( dpy, w,                         /* display, window */
  667. -                    prop, proptype,                 /* property, type */
  668. -                    32,                             /* format: 32-bit datums */
  669. -                    PropModeReplace,                /* mode */
  670. -                    (unsigned char *) &motif_hints, /* data */
  671. -                    PROP_MOTIF_WM_HINTS_ELEMENTS    /* nelements */
  672. -                  );
  673. -}
  674. -
  675. -
  676. -/*
  677. - * Create an RGB, double-buffered window.
  678. - * Return the window and context handles.
  679. - */
  680. -static void
  681. -make_window( Display *dpy, const char *name,
  682. -             int x, int y, int width, int height,
  683. -             Window *winRet, GLXContext *ctxRet)
  684. -{
  685. -   int attribs[] = { GLX_RGBA,
  686. -                     GLX_RED_SIZE, 1,
  687. -                     GLX_GREEN_SIZE, 1,
  688. -                     GLX_BLUE_SIZE, 1,
  689. -                     GLX_DOUBLEBUFFER,
  690. -                     GLX_DEPTH_SIZE, 1,
  691. -                     None };
  692. -   int stereoAttribs[] = { GLX_RGBA,
  693. -                           GLX_RED_SIZE, 1,
  694. -                           GLX_GREEN_SIZE, 1,
  695. -                           GLX_BLUE_SIZE, 1,
  696. -                           GLX_DOUBLEBUFFER,
  697. -                           GLX_DEPTH_SIZE, 1,
  698. -                           GLX_STEREO,
  699. -                           None };
  700. -   int scrnum;
  701. -   XSetWindowAttributes attr;
  702. -   unsigned long mask;
  703. -   Window root;
  704. -   Window win;
  705. -   GLXContext ctx;
  706. -   XVisualInfo *visinfo;
  707. -
  708. -   scrnum = DefaultScreen( dpy );
  709. -   root = RootWindow( dpy, scrnum );
  710. -
  711. -   if (fullscreen) {
  712. -      x = 0; y = 0;
  713. -      width = DisplayWidth( dpy, scrnum );
  714. -      height = DisplayHeight( dpy, scrnum );
  715. -   }
  716. -
  717. -   if (stereo)
  718. -      visinfo = glXChooseVisual( dpy, scrnum, stereoAttribs );
  719. -   else
  720. -      visinfo = glXChooseVisual( dpy, scrnum, attribs );
  721. -   if (!visinfo) {
  722. -      if (stereo) {
  723. -         printf("Error: couldn't get an RGB, "
  724. -                "Double-buffered, Stereo visual\n");
  725. -      } else
  726. -         printf("Error: couldn't get an RGB, Double-buffered visual\n");
  727. -      exit(1);
  728. -   }
  729. -
  730. -   /* window attributes */
  731. -   attr.background_pixel = 0;
  732. -   attr.border_pixel = 0;
  733. -   attr.colormap = XCreateColormap( dpy, root, visinfo->visual, AllocNone);
  734. -   attr.event_mask = StructureNotifyMask | ExposureMask | KeyPressMask;
  735. -   /* XXX this is a bad way to get a borderless window! */
  736. -   mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
  737. -
  738. -   win = XCreateWindow( dpy, root, x, y, width, height,
  739. -               0, visinfo->depth, InputOutput,
  740. -               visinfo->visual, mask, &attr );
  741. -
  742. -   if (fullscreen)
  743. -      no_border(dpy, win);
  744. -
  745. -   /* set hints and properties */
  746. -   {
  747. -      XSizeHints sizehints;
  748. -      sizehints.x = x;
  749. -      sizehints.y = y;
  750. -      sizehints.width  = width;
  751. -      sizehints.height = height;
  752. -      sizehints.flags = USSize | USPosition;
  753. -      XSetNormalHints(dpy, win, &sizehints);
  754. -      XSetStandardProperties(dpy, win, name, name,
  755. -                              None, (char **)NULL, 0, &sizehints);
  756. -   }
  757. -
  758. -   ctx = glXCreateContext( dpy, visinfo, NULL, True );
  759. -   if (!ctx) {
  760. -      printf("Error: glXCreateContext failed\n");
  761. -      exit(1);
  762. -   }
  763. -
  764. -   XFree(visinfo);
  765. -
  766. -   *winRet = win;
  767. -   *ctxRet = ctx;
  768. -}
  769. -
  770. -
  771. -/**
  772. - * Determine whether or not a GLX extension is supported.
  773. - */
  774. -static int
  775. -is_glx_extension_supported(Display *dpy, const char *query)
  776. -{
  777. -   const int scrnum = DefaultScreen(dpy);
  778. -   const char *glx_extensions = NULL;
  779. -   const size_t len = strlen(query);
  780. -   const char *ptr;
  781. -
  782. -   if (glx_extensions == NULL) {
  783. -      glx_extensions = glXQueryExtensionsString(dpy, scrnum);
  784. -   }
  785. -
  786. -   ptr = strstr(glx_extensions, query);
  787. -   return ((ptr != NULL) && ((ptr[len] == ' ') || (ptr[len] == '\0')));
  788. -}
  789. -
  790. -
  791. -/**
  792. - * Attempt to determine whether or not the display is synched to vblank.
  793. - */
  794. -static void
  795. -query_vsync(Display *dpy, GLXDrawable drawable)
  796. -{
  797. -   int interval = 0;
  798. -
  799. -#if defined(GLX_EXT_swap_control)
  800. -   if (is_glx_extension_supported(dpy, "GLX_EXT_swap_control")) {
  801. -       unsigned int tmp = -1;
  802. -       glXQueryDrawable(dpy, drawable, GLX_SWAP_INTERVAL_EXT, &tmp);
  803. -       interval = tmp;
  804. -   } else
  805. -#endif
  806. -   if (is_glx_extension_supported(dpy, "GLX_MESA_swap_control")) {
  807. -      PFNGLXGETSWAPINTERVALMESAPROC pglXGetSwapIntervalMESA =
  808. -          (PFNGLXGETSWAPINTERVALMESAPROC)
  809. -          glXGetProcAddressARB((const GLubyte *) "glXGetSwapIntervalMESA");
  810. -
  811. -      interval = (*pglXGetSwapIntervalMESA)();
  812. -   } else if (is_glx_extension_supported(dpy, "GLX_SGI_swap_control")) {
  813. -      /* The default swap interval with this extension is 1.  Assume that it
  814. -       * is set to the default.
  815. -       *
  816. -       * Many Mesa-based drivers default to 0, but all of these drivers also
  817. -       * export GLX_MESA_swap_control.  In that case, this branch will never
  818. -       * be taken, and the correct result should be reported.
  819. -       */
  820. -      interval = 1;
  821. -   }
  822. -
  823. -
  824. -   if (interval > 0) {
  825. -      printf("Running synchronized to the vertical refresh.  The framerate should be\n");
  826. -      if (interval == 1) {
  827. -         printf("approximately the same as the monitor refresh rate.\n");
  828. -      } else if (interval > 1) {
  829. -         printf("approximately 1/%d the monitor refresh rate.\n",
  830. -                interval);
  831. -      }
  832. -   }
  833. -}
  834. -
  835. -/**
  836. - * Handle one X event.
  837. - * \return NOP, EXIT or DRAW
  838. - */
  839. -static int
  840. -handle_event(Display *dpy, Window win, XEvent *event)
  841. -{
  842. -   (void) dpy;
  843. -   (void) win;
  844. -
  845. -   switch (event->type) {
  846. -   case Expose:
  847. -      return DRAW;
  848. -   case ConfigureNotify:
  849. -      reshape(event->xconfigure.width, event->xconfigure.height);
  850. -      break;
  851. -   case KeyPress:
  852. -      {
  853. -         char buffer[10];
  854. -         int r, code;
  855. -         code = XLookupKeysym(&event->xkey, 0);
  856. -         if (code == XK_Left) {
  857. -            view_roty += 5.0;
  858. -         }
  859. -         else if (code == XK_Right) {
  860. -            view_roty -= 5.0;
  861. -         }
  862. -         else if (code == XK_Up) {
  863. -            view_rotx += 5.0;
  864. -         }
  865. -         else if (code == XK_Down) {
  866. -            view_rotx -= 5.0;
  867. -         }
  868. -         else {
  869. -            r = XLookupString(&event->xkey, buffer, sizeof(buffer),
  870. -                              NULL, NULL);
  871. -            if (buffer[0] == 27) {
  872. -               /* escape */
  873. -               return EXIT;
  874. -            }
  875. -            else if (buffer[0] == 'a' || buffer[0] == 'A') {
  876. -               animate = !animate;
  877. -            }
  878. -         }
  879. -         return DRAW;
  880. -      }
  881. -   }
  882. -   return NOP;
  883. -}
  884. -
  885. -
  886. -static void
  887. -event_loop(Display *dpy, Window win)
  888. -{
  889. -   while (1) {
  890. -      int op;
  891. -      while (!animate || XPending(dpy) > 0) {
  892. -         XEvent event;
  893. -         XNextEvent(dpy, &event);
  894. -         op = handle_event(dpy, win, &event);
  895. -         if (op == EXIT)
  896. -            return;
  897. -         else if (op == DRAW)
  898. -            break;
  899. -      }
  900. -
  901. -      draw_frame(dpy, win);
  902. -   }
  903. -}
  904. -
  905. -
  906. -static void
  907. -usage(void)
  908. -{
  909. -   printf("Usage:\n");
  910. -   printf("  -display <displayname>  set the display to run on\n");
  911. -   printf("  -stereo                 run in stereo mode\n");
  912. -   printf("  -fullscreen             run in fullscreen mode\n");
  913. -   printf("  -info                   display OpenGL renderer info\n");
  914. -   printf("  -geometry WxH+X+Y       window geometry\n");
  915. -}
  916. -
  917. -
  918. -int
  919. -main(int argc, char *argv[])
  920. -{
  921. -   unsigned int winWidth = 300, winHeight = 300;
  922. -   int x = 0, y = 0;
  923. -   Display *dpy;
  924. -   Window win;
  925. -   GLXContext ctx;
  926. -   char *dpyName = NULL;
  927. -   GLboolean printInfo = GL_FALSE;
  928. -   int i;
  929. -
  930. -   for (i = 1; i < argc; i++) {
  931. -      if (strcmp(argv[i], "-display") == 0) {
  932. -         dpyName = argv[i+1];
  933. -         i++;
  934. -      }
  935. -      else if (strcmp(argv[i], "-info") == 0) {
  936. -         printInfo = GL_TRUE;
  937. -      }
  938. -      else if (strcmp(argv[i], "-stereo") == 0) {
  939. -         stereo = GL_TRUE;
  940. -      }
  941. -      else if (strcmp(argv[i], "-fullscreen") == 0) {
  942. -         fullscreen = GL_TRUE;
  943. -      }
  944. -      else if (i < argc-1 && strcmp(argv[i], "-geometry") == 0) {
  945. -         XParseGeometry(argv[i+1], &x, &y, &winWidth, &winHeight);
  946. -         i++;
  947. -      }
  948. -      else {
  949. -         usage();
  950. -         return -1;
  951. -      }
  952. -   }
  953. -
  954. -   dpy = XOpenDisplay(dpyName);
  955. -   if (!dpy) {
  956. -      printf("Error: couldn't open display %s\n",
  957. -        dpyName ? dpyName : getenv("DISPLAY"));
  958. -      return -1;
  959. -   }
  960. -
  961. -   make_window(dpy, "glxgears", x, y, winWidth, winHeight, &win, &ctx);
  962. -   XMapWindow(dpy, win);
  963. -   glXMakeCurrent(dpy, win, ctx);
  964. -   query_vsync(dpy, win);
  965. -
  966. -   if (printInfo) {
  967. -      printf("GL_RENDERER   = %s\n", (char *) glGetString(GL_RENDERER));
  968. -      printf("GL_VERSION    = %s\n", (char *) glGetString(GL_VERSION));
  969. -      printf("GL_VENDOR     = %s\n", (char *) glGetString(GL_VENDOR));
  970. -      printf("GL_EXTENSIONS = %s\n", (char *) glGetString(GL_EXTENSIONS));
  971. -   }
  972. -
  973. -   init();
  974. -
  975. -   /* Set initial projection/viewing transformation.
  976. -    * We can't be sure we'll get a ConfigureNotify event when the window
  977. -    * first appears.
  978. -    */
  979. -   reshape(winWidth, winHeight);
  980. -
  981. -   event_loop(dpy, win);
  982. -
  983. -   glDeleteLists(gear1, 1);
  984. -   glDeleteLists(gear2, 1);
  985. -   glDeleteLists(gear3, 1);
  986. -   glXMakeCurrent(dpy, None, NULL);
  987. -   glXDestroyContext(dpy, ctx);
  988. -   XDestroyWindow(dpy, win);
  989. -   XCloseDisplay(dpy);
  990. -
  991. -   return 0;
  992. -}
  993. diff -pruN xorg/mesa3d/glxinfo.c version-updates_xorg/mesa3d/glxinfo.c
  994. --- xorg/mesa3d/glxinfo.c   2012-06-14 19:08:50.000000000 +1000
  995. +++ version-updates_xorg/mesa3d/glxinfo.c   1970-01-01 10:00:00.000000000 +1000
  996. @@ -1,1195 +0,0 @@
  997. -/*
  998. - * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  999. - *
  1000. - * Permission is hereby granted, free of charge, to any person obtaining a
  1001. - * copy of this software and associated documentation files (the "Software"),
  1002. - * to deal in the Software without restriction, including without limitation
  1003. - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  1004. - * and/or sell copies of the Software, and to permit persons to whom the
  1005. - * Software is furnished to do so, subject to the following conditions:
  1006. - *
  1007. - * The above copyright notice and this permission notice shall be included
  1008. - * in all copies or substantial portions of the Software.
  1009. - *
  1010. - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  1011. - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  1012. - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  1013. - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
  1014. - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  1015. - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  1016. - */
  1017. -
  1018. -
  1019. -/*
  1020. - * This program is a work-alike of the IRIX glxinfo program.
  1021. - * Command line options:
  1022. - *  -t                     print wide table
  1023. - *  -v                     print verbose information
  1024. - *  -display DisplayName   specify the X display to interogate
  1025. - *  -b                     only print ID of "best" visual on screen 0
  1026. - *  -i                     use indirect rendering connection only
  1027. - *  -l                     print interesting OpenGL limits (added 5 Sep 2002)
  1028. - *
  1029. - * Brian Paul  26 January 2000
  1030. - */
  1031. -
  1032. -#define GLX_GLXEXT_PROTOTYPES
  1033. -
  1034. -#include <X11/Xlib.h>
  1035. -#include <X11/Xutil.h>
  1036. -#include <GL/gl.h>
  1037. -#include <GL/glx.h>
  1038. -#include <stdio.h>
  1039. -#include <string.h>
  1040. -#include <stdlib.h>
  1041. -
  1042. -
  1043. -#ifndef GLX_NONE_EXT
  1044. -#define GLX_NONE_EXT  0x8000
  1045. -#endif
  1046. -
  1047. -#ifndef GLX_TRANSPARENT_RGB
  1048. -#define GLX_TRANSPARENT_RGB 0x8008
  1049. -#endif
  1050. -
  1051. -#ifndef GLX_RGBA_BIT
  1052. -#define GLX_RGBA_BIT           0x00000001
  1053. -#endif
  1054. -
  1055. -#ifndef GLX_COLOR_INDEX_BIT
  1056. -#define GLX_COLOR_INDEX_BIT        0x00000002
  1057. -#endif
  1058. -
  1059. -typedef enum
  1060. -{
  1061. -   Normal,
  1062. -   Wide,
  1063. -   Verbose
  1064. -} InfoMode;
  1065. -
  1066. -
  1067. -struct visual_attribs
  1068. -{
  1069. -   /* X visual attribs */
  1070. -   int id;
  1071. -   int klass;
  1072. -   int depth;
  1073. -   int redMask, greenMask, blueMask;
  1074. -   int colormapSize;
  1075. -   int bitsPerRGB;
  1076. -
  1077. -   /* GL visual attribs */
  1078. -   int supportsGL;
  1079. -   int transparentType;
  1080. -   int transparentRedValue;
  1081. -   int transparentGreenValue;
  1082. -   int transparentBlueValue;
  1083. -   int transparentAlphaValue;
  1084. -   int transparentIndexValue;
  1085. -   int bufferSize;
  1086. -   int level;
  1087. -   int render_type;
  1088. -   int doubleBuffer;
  1089. -   int stereo;
  1090. -   int auxBuffers;
  1091. -   int redSize, greenSize, blueSize, alphaSize;
  1092. -   int depthSize;
  1093. -   int stencilSize;
  1094. -   int accumRedSize, accumGreenSize, accumBlueSize, accumAlphaSize;
  1095. -   int numSamples, numMultisample;
  1096. -   int visualCaveat;
  1097. -};
  1098. -
  1099. -  
  1100. -/*
  1101. - * Print a list of extensions, with word-wrapping.
  1102. - */
  1103. -static void
  1104. -print_extension_list(const char *ext)
  1105. -{
  1106. -   const char *indentString = "    ";
  1107. -   const int indent = 4;
  1108. -   const int max = 79;
  1109. -   int width, i, j;
  1110. -
  1111. -   if (!ext || !ext[0])
  1112. -      return;
  1113. -
  1114. -   width = indent;
  1115. -   printf("%s", indentString);
  1116. -   i = j = 0;
  1117. -   while (1) {
  1118. -      if (ext[j] == ' ' || ext[j] == 0) {
  1119. -         /* found end of an extension name */
  1120. -         const int len = j - i;
  1121. -         if (width + len > max) {
  1122. -            /* start a new line */
  1123. -            printf("\n");
  1124. -            width = indent;
  1125. -            printf("%s", indentString);
  1126. -         }
  1127. -         /* print the extension name between ext[i] and ext[j] */
  1128. -         while (i < j) {
  1129. -            printf("%c", ext[i]);
  1130. -            i++;
  1131. -         }
  1132. -         /* either we're all done, or we'll continue with next extension */
  1133. -         width += len + 1;
  1134. -         if (ext[j] == 0) {
  1135. -            break;
  1136. -         }
  1137. -         else {
  1138. -            i++;
  1139. -            j++;
  1140. -            if (ext[j] == 0)
  1141. -               break;
  1142. -            printf(", ");
  1143. -            width += 2;
  1144. -         }
  1145. -      }
  1146. -      j++;
  1147. -   }
  1148. -   printf("\n");
  1149. -}
  1150. -
  1151. -
  1152. -static void
  1153. -print_display_info(Display *dpy)
  1154. -{
  1155. -   printf("name of display: %s\n", DisplayString(dpy));
  1156. -}
  1157. -
  1158. -
  1159. -/**
  1160. - * Print interesting limits for vertex/fragment programs.
  1161. - */
  1162. -static void
  1163. -print_program_limits(GLenum target)
  1164. -{
  1165. -#if defined(GL_ARB_vertex_program) || defined(GL_ARB_fragment_program)
  1166. -   struct token_name {
  1167. -      GLenum token;
  1168. -      const char *name;
  1169. -   };
  1170. -   static const struct token_name common_limits[] = {
  1171. -      { GL_MAX_PROGRAM_INSTRUCTIONS_ARB, "GL_MAX_PROGRAM_INSTRUCTIONS_ARB" },
  1172. -      { GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, "GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB" },
  1173. -      { GL_MAX_PROGRAM_TEMPORARIES_ARB, "GL_MAX_PROGRAM_TEMPORARIES_ARB" },
  1174. -      { GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB, "GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB" },
  1175. -      { GL_MAX_PROGRAM_PARAMETERS_ARB, "GL_MAX_PROGRAM_PARAMETERS_ARB" },
  1176. -      { GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB, "GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB" },
  1177. -      { GL_MAX_PROGRAM_ATTRIBS_ARB, "GL_MAX_PROGRAM_ATTRIBS_ARB" },
  1178. -      { GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB, "GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB" },
  1179. -      { GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB, "GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB" },
  1180. -      { GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB, "GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB" },
  1181. -      { GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB, "GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB" },
  1182. -      { GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, "GL_MAX_PROGRAM_ENV_PARAMETERS_ARB" },
  1183. -      { (GLenum) 0, NULL }
  1184. -   };
  1185. -   static const struct token_name fragment_limits[] = {
  1186. -      { GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB, "GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB" },
  1187. -      { GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB, "GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB" },
  1188. -      { GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB, "GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB" },
  1189. -      { GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB, "GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB" },
  1190. -      { GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB, "GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB" },
  1191. -      { GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB, "GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB" },
  1192. -      { (GLenum) 0, NULL }
  1193. -   };
  1194. -
  1195. -   PFNGLGETPROGRAMIVARBPROC GetProgramivARB_func = (PFNGLGETPROGRAMIVARBPROC)
  1196. -      glXGetProcAddressARB((GLubyte *) "glGetProgramivARB");
  1197. -
  1198. -   GLint max[1];
  1199. -   int i;
  1200. -
  1201. -   if (target == GL_VERTEX_PROGRAM_ARB) {
  1202. -      printf("    GL_VERTEX_PROGRAM_ARB:\n");
  1203. -   }
  1204. -   else if (target == GL_FRAGMENT_PROGRAM_ARB) {
  1205. -      printf("    GL_FRAGMENT_PROGRAM_ARB:\n");
  1206. -   }
  1207. -   else {
  1208. -      return; /* something's wrong */
  1209. -   }
  1210. -
  1211. -   for (i = 0; common_limits[i].token; i++) {
  1212. -      GetProgramivARB_func(target, common_limits[i].token, max);
  1213. -      if (glGetError() == GL_NO_ERROR) {
  1214. -         printf("        %s = %d\n", common_limits[i].name, max[0]);
  1215. -      }
  1216. -   }
  1217. -   if (target == GL_FRAGMENT_PROGRAM_ARB) {
  1218. -      for (i = 0; fragment_limits[i].token; i++) {
  1219. -         GetProgramivARB_func(target, fragment_limits[i].token, max);
  1220. -         if (glGetError() == GL_NO_ERROR) {
  1221. -            printf("        %s = %d\n", fragment_limits[i].name, max[0]);
  1222. -         }
  1223. -      }
  1224. -   }
  1225. -#endif /* GL_ARB_vertex_program / GL_ARB_fragment_program */
  1226. -}
  1227. -
  1228. -
  1229. -/**
  1230. - * Print interesting limits for vertex/fragment shaders.
  1231. - */
  1232. -static void
  1233. -print_shader_limits(GLenum target)
  1234. -{
  1235. -   struct token_name {
  1236. -      GLenum token;
  1237. -      const char *name;
  1238. -   };
  1239. -#if defined(GL_ARB_vertex_shader)
  1240. -   static const struct token_name vertex_limits[] = {
  1241. -      { GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, "GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB" },
  1242. -      { GL_MAX_VARYING_FLOATS_ARB, "GL_MAX_VARYING_FLOATS_ARB" },
  1243. -      { GL_MAX_VERTEX_ATTRIBS_ARB, "GL_MAX_VERTEX_ATTRIBS_ARB" },
  1244. -      { GL_MAX_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_TEXTURE_IMAGE_UNITS_ARB" },
  1245. -      { GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB" },
  1246. -      { GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB" },
  1247. -      { GL_MAX_TEXTURE_COORDS_ARB, "GL_MAX_TEXTURE_COORDS_ARB" },
  1248. -      { (GLenum) 0, NULL }
  1249. -   };
  1250. -#endif
  1251. -#if defined(GL_ARB_fragment_shader)
  1252. -   static const struct token_name fragment_limits[] = {
  1253. -      { GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB" },
  1254. -      { GL_MAX_TEXTURE_COORDS_ARB, "GL_MAX_TEXTURE_COORDS_ARB" },
  1255. -      { GL_MAX_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_TEXTURE_IMAGE_UNITS_ARB" },
  1256. -      { (GLenum) 0, NULL }
  1257. -   };
  1258. -#endif
  1259. -   GLint max[1];
  1260. -   int i;
  1261. -
  1262. -#if defined(GL_ARB_vertex_shader)
  1263. -   if (target == GL_VERTEX_SHADER_ARB) {
  1264. -      printf("    GL_VERTEX_SHADER_ARB:\n");
  1265. -      for (i = 0; vertex_limits[i].token; i++) {
  1266. -         glGetIntegerv(vertex_limits[i].token, max);
  1267. -         if (glGetError() == GL_NO_ERROR) {
  1268. -            printf("        %s = %d\n", vertex_limits[i].name, max[0]);
  1269. -         }
  1270. -      }
  1271. -   }
  1272. -#endif
  1273. -#if defined(GL_ARB_fragment_shader)
  1274. -   if (target == GL_FRAGMENT_SHADER_ARB) {
  1275. -      printf("    GL_FRAGMENT_SHADER_ARB:\n");
  1276. -      for (i = 0; fragment_limits[i].token; i++) {
  1277. -         glGetIntegerv(fragment_limits[i].token, max);
  1278. -         if (glGetError() == GL_NO_ERROR) {
  1279. -            printf("        %s = %d\n", fragment_limits[i].name, max[0]);
  1280. -         }
  1281. -      }
  1282. -   }
  1283. -#endif
  1284. -}
  1285. -
  1286. -
  1287. -/**
  1288. - * Print interesting OpenGL implementation limits.
  1289. - */
  1290. -static void
  1291. -print_limits(const char *extensions)
  1292. -{
  1293. -   struct token_name {
  1294. -      GLuint count;
  1295. -      GLenum token;
  1296. -      const char *name;
  1297. -   };
  1298. -   static const struct token_name limits[] = {
  1299. -      { 1, GL_MAX_ATTRIB_STACK_DEPTH, "GL_MAX_ATTRIB_STACK_DEPTH" },
  1300. -      { 1, GL_MAX_CLIENT_ATTRIB_STACK_DEPTH, "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH" },
  1301. -      { 1, GL_MAX_CLIP_PLANES, "GL_MAX_CLIP_PLANES" },
  1302. -      { 1, GL_MAX_COLOR_MATRIX_STACK_DEPTH, "GL_MAX_COLOR_MATRIX_STACK_DEPTH" },
  1303. -      { 1, GL_MAX_ELEMENTS_VERTICES, "GL_MAX_ELEMENTS_VERTICES" },
  1304. -      { 1, GL_MAX_ELEMENTS_INDICES, "GL_MAX_ELEMENTS_INDICES" },
  1305. -      { 1, GL_MAX_EVAL_ORDER, "GL_MAX_EVAL_ORDER" },
  1306. -      { 1, GL_MAX_LIGHTS, "GL_MAX_LIGHTS" },
  1307. -      { 1, GL_MAX_LIST_NESTING, "GL_MAX_LIST_NESTING" },
  1308. -      { 1, GL_MAX_MODELVIEW_STACK_DEPTH, "GL_MAX_MODELVIEW_STACK_DEPTH" },
  1309. -      { 1, GL_MAX_NAME_STACK_DEPTH, "GL_MAX_NAME_STACK_DEPTH" },
  1310. -      { 1, GL_MAX_PIXEL_MAP_TABLE, "GL_MAX_PIXEL_MAP_TABLE" },
  1311. -      { 1, GL_MAX_PROJECTION_STACK_DEPTH, "GL_MAX_PROJECTION_STACK_DEPTH" },
  1312. -      { 1, GL_MAX_TEXTURE_STACK_DEPTH, "GL_MAX_TEXTURE_STACK_DEPTH" },
  1313. -      { 1, GL_MAX_TEXTURE_SIZE, "GL_MAX_TEXTURE_SIZE" },
  1314. -      { 1, GL_MAX_3D_TEXTURE_SIZE, "GL_MAX_3D_TEXTURE_SIZE" },
  1315. -      { 2, GL_MAX_VIEWPORT_DIMS, "GL_MAX_VIEWPORT_DIMS" },
  1316. -      { 2, GL_ALIASED_LINE_WIDTH_RANGE, "GL_ALIASED_LINE_WIDTH_RANGE" },
  1317. -      { 2, GL_SMOOTH_LINE_WIDTH_RANGE, "GL_SMOOTH_LINE_WIDTH_RANGE" },
  1318. -      { 2, GL_ALIASED_POINT_SIZE_RANGE, "GL_ALIASED_POINT_SIZE_RANGE" },
  1319. -      { 2, GL_SMOOTH_POINT_SIZE_RANGE, "GL_SMOOTH_POINT_SIZE_RANGE" },
  1320. -#if defined(GL_ARB_texture_cube_map)
  1321. -      { 1, GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, "GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB" },
  1322. -#endif
  1323. -#if defined(GLX_NV_texture_rectangle)
  1324. -      { 1, GL_MAX_RECTANGLE_TEXTURE_SIZE_NV, "GL_MAX_RECTANGLE_TEXTURE_SIZE_NV" },
  1325. -#endif
  1326. -#if defined(GL_ARB_texture_compression)
  1327. -      { 1, GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB, "GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB" },
  1328. -#endif
  1329. -#if defined(GL_ARB_multitexture)
  1330. -      { 1, GL_MAX_TEXTURE_UNITS_ARB, "GL_MAX_TEXTURE_UNITS_ARB" },
  1331. -#endif
  1332. -#if defined(GL_EXT_texture_lod_bias)
  1333. -      { 1, GL_MAX_TEXTURE_LOD_BIAS_EXT, "GL_MAX_TEXTURE_LOD_BIAS_EXT" },
  1334. -#endif
  1335. -#if defined(GL_EXT_texture_filter_anisotropic)
  1336. -      { 1, GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, "GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT" },
  1337. -#endif
  1338. -#if defined(GL_ARB_draw_buffers)
  1339. -      { 1, GL_MAX_DRAW_BUFFERS_ARB, "GL_MAX_DRAW_BUFFERS_ARB" },
  1340. -#endif
  1341. -      { 0, (GLenum) 0, NULL }
  1342. -   };
  1343. -   GLint i, max[2];
  1344. -
  1345. -   printf("OpenGL limits:\n");
  1346. -   for (i = 0; limits[i].count; i++) {
  1347. -      glGetIntegerv(limits[i].token, max);
  1348. -      if (glGetError() == GL_NO_ERROR) {
  1349. -         if (limits[i].count == 1)
  1350. -            printf("    %s = %d\n", limits[i].name, max[0]);
  1351. -         else /* XXX fix if we ever query something with more than 2 values */
  1352. -            printf("    %s = %d, %d\n", limits[i].name, max[0], max[1]);
  1353. -      }
  1354. -   }
  1355. -
  1356. -   /* these don't fit into the above mechanism, unfortunately */
  1357. -   glGetConvolutionParameteriv(GL_CONVOLUTION_2D, GL_MAX_CONVOLUTION_WIDTH, max);
  1358. -   glGetConvolutionParameteriv(GL_CONVOLUTION_2D, GL_MAX_CONVOLUTION_HEIGHT, max+1);
  1359. -   if (glGetError() == GL_NONE) {
  1360. -      printf("    GL_MAX_CONVOLUTION_WIDTH/HEIGHT = %d, %d\n", max[0], max[1]);
  1361. -   }
  1362. -
  1363. -#if defined(GL_ARB_vertex_program)
  1364. -   if (strstr(extensions, "GL_ARB_vertex_program")) {
  1365. -      print_program_limits(GL_VERTEX_PROGRAM_ARB);
  1366. -   }
  1367. -#endif
  1368. -#if defined(GL_ARB_fragment_program)
  1369. -   if (strstr(extensions, "GL_ARB_fragment_program")) {
  1370. -      print_program_limits(GL_FRAGMENT_PROGRAM_ARB);
  1371. -   }
  1372. -#endif
  1373. -#if defined(GL_ARB_vertex_shader)
  1374. -   if (strstr(extensions, "GL_ARB_vertex_shader")) {
  1375. -      print_shader_limits(GL_VERTEX_SHADER_ARB);
  1376. -   }
  1377. -#endif
  1378. -#if defined(GL_ARB_fragment_shader)
  1379. -   if (strstr(extensions, "GL_ARB_fragment_shader")) {
  1380. -      print_shader_limits(GL_FRAGMENT_SHADER_ARB);
  1381. -   }
  1382. -#endif
  1383. -}
  1384. -
  1385. -
  1386. -static void
  1387. -print_screen_info(Display *dpy, int scrnum, Bool allowDirect, GLboolean limits)
  1388. -{
  1389. -   Window win;
  1390. -   int attribSingle[] = {
  1391. -      GLX_RGBA,
  1392. -      GLX_RED_SIZE, 1,
  1393. -      GLX_GREEN_SIZE, 1,
  1394. -      GLX_BLUE_SIZE, 1,
  1395. -      None };
  1396. -   int attribDouble[] = {
  1397. -      GLX_RGBA,
  1398. -      GLX_RED_SIZE, 1,
  1399. -      GLX_GREEN_SIZE, 1,
  1400. -      GLX_BLUE_SIZE, 1,
  1401. -      GLX_DOUBLEBUFFER,
  1402. -      None };
  1403. -
  1404. -   XSetWindowAttributes attr;
  1405. -   unsigned long mask;
  1406. -   Window root;
  1407. -   GLXContext ctx = NULL;
  1408. -   XVisualInfo *visinfo;
  1409. -   int width = 100, height = 100;
  1410. -
  1411. -   root = RootWindow(dpy, scrnum);
  1412. -
  1413. -   /*
  1414. -    * Find a basic GLX visual.  We'll then create a rendering context and
  1415. -    * query various info strings.
  1416. -    */
  1417. -   visinfo = glXChooseVisual(dpy, scrnum, attribSingle);
  1418. -   if (!visinfo)
  1419. -      visinfo = glXChooseVisual(dpy, scrnum, attribDouble);
  1420. -
  1421. -   if (visinfo)
  1422. -      ctx = glXCreateContext( dpy, visinfo, NULL, allowDirect );
  1423. -
  1424. -#ifdef GLX_VERSION_1_3
  1425. -   /* Try glXChooseFBConfig() if glXChooseVisual didn't work.
  1426. -    * XXX when would that happen?
  1427. -    */
  1428. -   if (!visinfo) {
  1429. -      int fbAttribSingle[] = {
  1430. -    GLX_RENDER_TYPE,   GLX_RGBA_BIT,
  1431. -    GLX_RED_SIZE,      1,
  1432. -    GLX_GREEN_SIZE,    1,
  1433. -    GLX_BLUE_SIZE,     1,
  1434. -    GLX_DOUBLEBUFFER,  GL_FALSE,
  1435. -    None };
  1436. -      int fbAttribDouble[] = {
  1437. -    GLX_RENDER_TYPE,   GLX_RGBA_BIT,
  1438. -    GLX_RED_SIZE,      1,
  1439. -    GLX_GREEN_SIZE,    1,
  1440. -    GLX_BLUE_SIZE,     1,
  1441. -    GLX_DOUBLEBUFFER,  GL_TRUE,
  1442. -    None };
  1443. -      GLXFBConfig *configs = NULL;
  1444. -      int nConfigs;
  1445. -
  1446. -      configs = glXChooseFBConfig(dpy, scrnum, fbAttribSingle, &nConfigs);
  1447. -      if (!configs)
  1448. -    configs = glXChooseFBConfig(dpy, scrnum, fbAttribDouble, &nConfigs);
  1449. -
  1450. -      if (configs) {
  1451. -    visinfo = glXGetVisualFromFBConfig(dpy, configs[0]);
  1452. -    ctx = glXCreateNewContext(dpy, configs[0], GLX_RGBA_TYPE, NULL, allowDirect);
  1453. -    XFree(configs);
  1454. -      }
  1455. -   }
  1456. -#endif
  1457. -
  1458. -   if (!visinfo) {
  1459. -      fprintf(stderr, "Error: couldn't find RGB GLX visual or fbconfig\n");
  1460. -      return;
  1461. -   }
  1462. -
  1463. -   if (!ctx) {
  1464. -      fprintf(stderr, "Error: glXCreateContext failed\n");
  1465. -      XFree(visinfo);
  1466. -      return;
  1467. -   }
  1468. -
  1469. -   attr.background_pixel = 0;
  1470. -   attr.border_pixel = 0;
  1471. -   attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone);
  1472. -   attr.event_mask = StructureNotifyMask | ExposureMask;
  1473. -   mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
  1474. -   win = XCreateWindow(dpy, root, 0, 0, width, height,
  1475. -              0, visinfo->depth, InputOutput,
  1476. -              visinfo->visual, mask, &attr);
  1477. -
  1478. -   if (glXMakeCurrent(dpy, win, ctx)) {
  1479. -      const char *serverVendor = glXQueryServerString(dpy, scrnum, GLX_VENDOR);
  1480. -      const char *serverVersion = glXQueryServerString(dpy, scrnum, GLX_VERSION);
  1481. -      const char *serverExtensions = glXQueryServerString(dpy, scrnum, GLX_EXTENSIONS);
  1482. -      const char *clientVendor = glXGetClientString(dpy, GLX_VENDOR);
  1483. -      const char *clientVersion = glXGetClientString(dpy, GLX_VERSION);
  1484. -      const char *clientExtensions = glXGetClientString(dpy, GLX_EXTENSIONS);
  1485. -      const char *glxExtensions = glXQueryExtensionsString(dpy, scrnum);
  1486. -      const char *glVendor = (const char *) glGetString(GL_VENDOR);
  1487. -      const char *glRenderer = (const char *) glGetString(GL_RENDERER);
  1488. -      const char *glVersion = (const char *) glGetString(GL_VERSION);
  1489. -      const char *glExtensions = (const char *) glGetString(GL_EXTENSIONS);
  1490. -      int glxVersionMajor;
  1491. -      int glxVersionMinor;
  1492. -      char *displayName = NULL;
  1493. -      char *colon = NULL, *period = NULL;
  1494. -      
  1495. -      if (! glXQueryVersion( dpy, & glxVersionMajor, & glxVersionMinor )) {
  1496. -         fprintf(stderr, "Error: glXQueryVersion failed\n");
  1497. -         exit(1);
  1498. -      }
  1499. -
  1500. -      /* Strip the screen number from the display name, if present. */
  1501. -      if (!(displayName = (char *) malloc(strlen(DisplayString(dpy)) + 1))) {
  1502. -         fprintf(stderr, "Error: malloc() failed\n");
  1503. -         exit(1);
  1504. -      }
  1505. -      strcpy(displayName, DisplayString(dpy));
  1506. -      colon = strrchr(displayName, ':');
  1507. -      if (colon) {
  1508. -         period = strchr(colon, '.');
  1509. -         if (period)
  1510. -            *period = '\0';
  1511. -      }
  1512. -      printf("display: %s  screen: %d\n", displayName, scrnum);
  1513. -      free(displayName);
  1514. -      printf("direct rendering: ");
  1515. -      if (glXIsDirect(dpy, ctx)) {
  1516. -         printf("Yes\n");
  1517. -      } else {
  1518. -         if (!allowDirect) {
  1519. -            printf("No (-i specified)\n");
  1520. -         } else if (getenv("LIBGL_ALWAYS_INDIRECT")) {
  1521. -            printf("No (LIBGL_ALWAYS_INDIRECT set)\n");
  1522. -         } else {
  1523. -            printf("No (If you want to find out why, try setting "
  1524. -                   "LIBGL_DEBUG=verbose)\n");
  1525. -         }
  1526. -      }
  1527. -      printf("server glx vendor string: %s\n", serverVendor);
  1528. -      printf("server glx version string: %s\n", serverVersion);
  1529. -      printf("server glx extensions:\n");
  1530. -      print_extension_list(serverExtensions);
  1531. -      printf("client glx vendor string: %s\n", clientVendor);
  1532. -      printf("client glx version string: %s\n", clientVersion);
  1533. -      printf("client glx extensions:\n");
  1534. -      print_extension_list(clientExtensions);
  1535. -      printf("GLX version: %u.%u\n", glxVersionMajor, glxVersionMinor);
  1536. -      printf("GLX extensions:\n");
  1537. -      print_extension_list(glxExtensions);
  1538. -      printf("OpenGL vendor string: %s\n", glVendor);
  1539. -      printf("OpenGL renderer string: %s\n", glRenderer);
  1540. -      printf("OpenGL version string: %s\n", glVersion);
  1541. -#ifdef GL_VERSION_2_0
  1542. -      if (glVersion[0] >= '2' && glVersion[1] == '.') {
  1543. -         char *v = (char *) glGetString(GL_SHADING_LANGUAGE_VERSION);
  1544. -         printf("OpenGL shading language version string: %s\n", v);
  1545. -      }
  1546. -#endif
  1547. -
  1548. -      printf("OpenGL extensions:\n");
  1549. -      print_extension_list(glExtensions);
  1550. -      if (limits)
  1551. -         print_limits(glExtensions);
  1552. -   }
  1553. -   else {
  1554. -      fprintf(stderr, "Error: glXMakeCurrent failed\n");
  1555. -   }
  1556. -
  1557. -   glXDestroyContext(dpy, ctx);
  1558. -   XFree(visinfo);
  1559. -   XDestroyWindow(dpy, win);
  1560. -}
  1561. -
  1562. -
  1563. -static const char *
  1564. -visual_class_name(int cls)
  1565. -{
  1566. -   switch (cls) {
  1567. -      case StaticColor:
  1568. -         return "StaticColor";
  1569. -      case PseudoColor:
  1570. -         return "PseudoColor";
  1571. -      case StaticGray:
  1572. -         return "StaticGray";
  1573. -      case GrayScale:
  1574. -         return "GrayScale";
  1575. -      case TrueColor:
  1576. -         return "TrueColor";
  1577. -      case DirectColor:
  1578. -         return "DirectColor";
  1579. -      default:
  1580. -         return "";
  1581. -   }
  1582. -}
  1583. -
  1584. -
  1585. -static const char *
  1586. -visual_class_abbrev(int cls)
  1587. -{
  1588. -   switch (cls) {
  1589. -      case StaticColor:
  1590. -         return "sc";
  1591. -      case PseudoColor:
  1592. -         return "pc";
  1593. -      case StaticGray:
  1594. -         return "sg";
  1595. -      case GrayScale:
  1596. -         return "gs";
  1597. -      case TrueColor:
  1598. -         return "tc";
  1599. -      case DirectColor:
  1600. -         return "dc";
  1601. -      default:
  1602. -         return "";
  1603. -   }
  1604. -}
  1605. -
  1606. -static const char *
  1607. -visual_render_type_name(int type)
  1608. -{
  1609. -   switch (type) {
  1610. -      case GLX_RGBA_BIT:
  1611. -         return "rgba";
  1612. -      case GLX_COLOR_INDEX_BIT:
  1613. -         return "ci";
  1614. -      case GLX_RGBA_BIT | GLX_COLOR_INDEX_BIT:
  1615. -         return "rgba|ci";
  1616. -      default:
  1617. -         return "";
  1618. -      }
  1619. -}
  1620. -
  1621. -static GLboolean
  1622. -get_visual_attribs(Display *dpy, XVisualInfo *vInfo,
  1623. -                   struct visual_attribs *attribs)
  1624. -{
  1625. -   const char *ext = glXQueryExtensionsString(dpy, vInfo->screen);
  1626. -   int rgba;
  1627. -
  1628. -   memset(attribs, 0, sizeof(struct visual_attribs));
  1629. -
  1630. -   attribs->id = vInfo->visualid;
  1631. -#if defined(__cplusplus) || defined(c_plusplus)
  1632. -   attribs->klass = vInfo->c_class;
  1633. -#else
  1634. -   attribs->klass = vInfo->class;
  1635. -#endif
  1636. -   attribs->depth = vInfo->depth;
  1637. -   attribs->redMask = vInfo->red_mask;
  1638. -   attribs->greenMask = vInfo->green_mask;
  1639. -   attribs->blueMask = vInfo->blue_mask;
  1640. -   attribs->colormapSize = vInfo->colormap_size;
  1641. -   attribs->bitsPerRGB = vInfo->bits_per_rgb;
  1642. -
  1643. -   if (glXGetConfig(dpy, vInfo, GLX_USE_GL, &attribs->supportsGL) != 0 ||
  1644. -       !attribs->supportsGL)
  1645. -      return GL_FALSE;
  1646. -   glXGetConfig(dpy, vInfo, GLX_BUFFER_SIZE, &attribs->bufferSize);
  1647. -   glXGetConfig(dpy, vInfo, GLX_LEVEL, &attribs->level);
  1648. -   glXGetConfig(dpy, vInfo, GLX_RGBA, &rgba);
  1649. -   if (rgba)
  1650. -      attribs->render_type = GLX_RGBA_BIT;
  1651. -   else
  1652. -      attribs->render_type = GLX_COLOR_INDEX_BIT;
  1653. -  
  1654. -   glXGetConfig(dpy, vInfo, GLX_DOUBLEBUFFER, &attribs->doubleBuffer);
  1655. -   glXGetConfig(dpy, vInfo, GLX_STEREO, &attribs->stereo);
  1656. -   glXGetConfig(dpy, vInfo, GLX_AUX_BUFFERS, &attribs->auxBuffers);
  1657. -   glXGetConfig(dpy, vInfo, GLX_RED_SIZE, &attribs->redSize);
  1658. -   glXGetConfig(dpy, vInfo, GLX_GREEN_SIZE, &attribs->greenSize);
  1659. -   glXGetConfig(dpy, vInfo, GLX_BLUE_SIZE, &attribs->blueSize);
  1660. -   glXGetConfig(dpy, vInfo, GLX_ALPHA_SIZE, &attribs->alphaSize);
  1661. -   glXGetConfig(dpy, vInfo, GLX_DEPTH_SIZE, &attribs->depthSize);
  1662. -   glXGetConfig(dpy, vInfo, GLX_STENCIL_SIZE, &attribs->stencilSize);
  1663. -   glXGetConfig(dpy, vInfo, GLX_ACCUM_RED_SIZE, &attribs->accumRedSize);
  1664. -   glXGetConfig(dpy, vInfo, GLX_ACCUM_GREEN_SIZE, &attribs->accumGreenSize);
  1665. -   glXGetConfig(dpy, vInfo, GLX_ACCUM_BLUE_SIZE, &attribs->accumBlueSize);
  1666. -   glXGetConfig(dpy, vInfo, GLX_ACCUM_ALPHA_SIZE, &attribs->accumAlphaSize);
  1667. -
  1668. -   /* get transparent pixel stuff */
  1669. -   glXGetConfig(dpy, vInfo,GLX_TRANSPARENT_TYPE, &attribs->transparentType);
  1670. -   if (attribs->transparentType == GLX_TRANSPARENT_RGB) {
  1671. -     glXGetConfig(dpy, vInfo, GLX_TRANSPARENT_RED_VALUE, &attribs->transparentRedValue);
  1672. -     glXGetConfig(dpy, vInfo, GLX_TRANSPARENT_GREEN_VALUE, &attribs->transparentGreenValue);
  1673. -     glXGetConfig(dpy, vInfo, GLX_TRANSPARENT_BLUE_VALUE, &attribs->transparentBlueValue);
  1674. -     glXGetConfig(dpy, vInfo, GLX_TRANSPARENT_ALPHA_VALUE, &attribs->transparentAlphaValue);
  1675. -   }
  1676. -   else if (attribs->transparentType == GLX_TRANSPARENT_INDEX) {
  1677. -     glXGetConfig(dpy, vInfo, GLX_TRANSPARENT_INDEX_VALUE, &attribs->transparentIndexValue);
  1678. -   }
  1679. -
  1680. -   /* multisample attribs */
  1681. -#ifdef GLX_ARB_multisample
  1682. -   if (ext && strstr(ext, "GLX_ARB_multisample")) {
  1683. -      glXGetConfig(dpy, vInfo, GLX_SAMPLE_BUFFERS_ARB, &attribs->numMultisample);
  1684. -      glXGetConfig(dpy, vInfo, GLX_SAMPLES_ARB, &attribs->numSamples);
  1685. -   }
  1686. -#endif
  1687. -   else {
  1688. -      attribs->numSamples = 0;
  1689. -      attribs->numMultisample = 0;
  1690. -   }
  1691. -
  1692. -#if defined(GLX_EXT_visual_rating)
  1693. -   if (ext && strstr(ext, "GLX_EXT_visual_rating")) {
  1694. -      glXGetConfig(dpy, vInfo, GLX_VISUAL_CAVEAT_EXT, &attribs->visualCaveat);
  1695. -   }
  1696. -   else {
  1697. -      attribs->visualCaveat = GLX_NONE_EXT;
  1698. -   }
  1699. -#else
  1700. -   attribs->visualCaveat = 0;
  1701. -#endif
  1702. -
  1703. -   return GL_TRUE;
  1704. -}
  1705. -
  1706. -#ifdef GLX_VERSION_1_3
  1707. -
  1708. -static int
  1709. -glx_token_to_visual_class(int visual_type)
  1710. -{
  1711. -   switch (visual_type) {
  1712. -   case GLX_TRUE_COLOR:
  1713. -      return TrueColor;
  1714. -   case GLX_DIRECT_COLOR:
  1715. -      return DirectColor;
  1716. -   case GLX_PSEUDO_COLOR:
  1717. -      return PseudoColor;
  1718. -   case GLX_STATIC_COLOR:
  1719. -      return StaticColor;
  1720. -   case GLX_GRAY_SCALE:
  1721. -      return GrayScale;
  1722. -   case GLX_STATIC_GRAY:
  1723. -      return StaticGray;
  1724. -   case GLX_NONE:
  1725. -   default:
  1726. -      return None;
  1727. -   }
  1728. -}
  1729. -
  1730. -static GLboolean
  1731. -get_fbconfig_attribs(Display *dpy, GLXFBConfig fbconfig,
  1732. -            struct visual_attribs *attribs)
  1733. -{
  1734. -   int visual_type;
  1735. -
  1736. -   memset(attribs, 0, sizeof(struct visual_attribs));
  1737. -
  1738. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_FBCONFIG_ID, &attribs->id);
  1739. -
  1740. -#if 0
  1741. -   attribs->depth = vInfo->depth;
  1742. -   attribs->redMask = vInfo->red_mask;
  1743. -   attribs->greenMask = vInfo->green_mask;
  1744. -   attribs->blueMask = vInfo->blue_mask;
  1745. -   attribs->colormapSize = vInfo->colormap_size;
  1746. -   attribs->bitsPerRGB = vInfo->bits_per_rgb;
  1747. -#endif
  1748. -
  1749. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_X_VISUAL_TYPE, &visual_type);
  1750. -   attribs->klass = glx_token_to_visual_class(visual_type);
  1751. -
  1752. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_BUFFER_SIZE, &attribs->bufferSize);
  1753. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_LEVEL, &attribs->level);
  1754. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_RENDER_TYPE, &attribs->render_type);
  1755. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_DOUBLEBUFFER, &attribs->doubleBuffer);
  1756. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_STEREO, &attribs->stereo);
  1757. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_AUX_BUFFERS, &attribs->auxBuffers);
  1758. -
  1759. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_RED_SIZE, &attribs->redSize);
  1760. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_GREEN_SIZE, &attribs->greenSize);
  1761. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_BLUE_SIZE, &attribs->blueSize);
  1762. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_ALPHA_SIZE, &attribs->alphaSize);
  1763. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_DEPTH_SIZE, &attribs->depthSize);
  1764. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_STENCIL_SIZE, &attribs->stencilSize);
  1765. -
  1766. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_ACCUM_RED_SIZE, &attribs->accumRedSize);
  1767. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_ACCUM_GREEN_SIZE, &attribs->accumGreenSize);
  1768. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_ACCUM_BLUE_SIZE, &attribs->accumBlueSize);
  1769. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_ACCUM_ALPHA_SIZE, &attribs->accumAlphaSize);
  1770. -
  1771. -   /* get transparent pixel stuff */
  1772. -   glXGetFBConfigAttrib(dpy, fbconfig,GLX_TRANSPARENT_TYPE, &attribs->transparentType);
  1773. -   if (attribs->transparentType == GLX_TRANSPARENT_RGB) {
  1774. -     glXGetFBConfigAttrib(dpy, fbconfig, GLX_TRANSPARENT_RED_VALUE, &attribs->transparentRedValue);
  1775. -     glXGetFBConfigAttrib(dpy, fbconfig, GLX_TRANSPARENT_GREEN_VALUE, &attribs->transparentGreenValue);
  1776. -     glXGetFBConfigAttrib(dpy, fbconfig, GLX_TRANSPARENT_BLUE_VALUE, &attribs->transparentBlueValue);
  1777. -     glXGetFBConfigAttrib(dpy, fbconfig, GLX_TRANSPARENT_ALPHA_VALUE, &attribs->transparentAlphaValue);
  1778. -   }
  1779. -   else if (attribs->transparentType == GLX_TRANSPARENT_INDEX) {
  1780. -     glXGetFBConfigAttrib(dpy, fbconfig, GLX_TRANSPARENT_INDEX_VALUE, &attribs->transparentIndexValue);
  1781. -   }
  1782. -
  1783. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_SAMPLE_BUFFERS, &attribs->numMultisample);
  1784. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_SAMPLES, &attribs->numSamples);
  1785. -   glXGetFBConfigAttrib(dpy, fbconfig, GLX_CONFIG_CAVEAT, &attribs->visualCaveat);
  1786. -
  1787. -   return GL_TRUE;
  1788. -}
  1789. -
  1790. -#endif
  1791. -
  1792. -
  1793. -
  1794. -static void
  1795. -print_visual_attribs_verbose(const struct visual_attribs *attribs)
  1796. -{
  1797. -   printf("Visual ID: %x  depth=%d  class=%s\n",
  1798. -          attribs->id, attribs->depth, visual_class_name(attribs->klass));
  1799. -   printf("    bufferSize=%d level=%d renderType=%s doubleBuffer=%d stereo=%d\n",
  1800. -          attribs->bufferSize, attribs->level,
  1801. -     visual_render_type_name(attribs->render_type),
  1802. -          attribs->doubleBuffer, attribs->stereo);
  1803. -   printf("    rgba: redSize=%d greenSize=%d blueSize=%d alphaSize=%d\n",
  1804. -          attribs->redSize, attribs->greenSize,
  1805. -          attribs->blueSize, attribs->alphaSize);
  1806. -   printf("    auxBuffers=%d depthSize=%d stencilSize=%d\n",
  1807. -          attribs->auxBuffers, attribs->depthSize, attribs->stencilSize);
  1808. -   printf("    accum: redSize=%d greenSize=%d blueSize=%d alphaSize=%d\n",
  1809. -          attribs->accumRedSize, attribs->accumGreenSize,
  1810. -          attribs->accumBlueSize, attribs->accumAlphaSize);
  1811. -   printf("    multiSample=%d  multiSampleBuffers=%d\n",
  1812. -          attribs->numSamples, attribs->numMultisample);
  1813. -#ifdef GLX_EXT_visual_rating
  1814. -   if (attribs->visualCaveat == GLX_NONE_EXT || attribs->visualCaveat == 0)
  1815. -      printf("    visualCaveat=None\n");
  1816. -   else if (attribs->visualCaveat == GLX_SLOW_VISUAL_EXT)
  1817. -      printf("    visualCaveat=Slow\n");
  1818. -   else if (attribs->visualCaveat == GLX_NON_CONFORMANT_VISUAL_EXT)
  1819. -      printf("    visualCaveat=Nonconformant\n");
  1820. -#endif
  1821. -   if (attribs->transparentType == GLX_NONE) {
  1822. -     printf("    Opaque.\n");
  1823. -   }
  1824. -   else if (attribs->transparentType == GLX_TRANSPARENT_RGB) {
  1825. -     printf("    Transparent RGB: Red=%d Green=%d Blue=%d Alpha=%d\n",attribs->transparentRedValue,attribs->transparentGreenValue,attribs->transparentBlueValue,attribs->transparentAlphaValue);
  1826. -   }
  1827. -   else if (attribs->transparentType == GLX_TRANSPARENT_INDEX) {
  1828. -     printf("    Transparent index=%d\n",attribs->transparentIndexValue);
  1829. -   }
  1830. -}
  1831. -
  1832. -
  1833. -static void
  1834. -print_visual_attribs_short_header(void)
  1835. -{
  1836. - printf("   visual  x  bf lv rg d st colorbuffer ax dp st accumbuffer  ms  cav\n");
  1837. - printf(" id dep cl sp sz l  ci b ro  r  g  b  a bf th cl  r  g  b  a ns b eat\n");
  1838. - printf("----------------------------------------------------------------------\n");
  1839. -}
  1840. -
  1841. -
  1842. -static void
  1843. -print_visual_attribs_short(const struct visual_attribs *attribs)
  1844. -{
  1845. -   char *caveat = NULL;
  1846. -#ifdef GLX_EXT_visual_rating
  1847. -   if (attribs->visualCaveat == GLX_NONE_EXT || attribs->visualCaveat == 0)
  1848. -      caveat = "None";
  1849. -   else if (attribs->visualCaveat == GLX_SLOW_VISUAL_EXT)
  1850. -      caveat = "Slow";
  1851. -   else if (attribs->visualCaveat == GLX_NON_CONFORMANT_VISUAL_EXT)
  1852. -      caveat = "Ncon";
  1853. -   else
  1854. -      caveat = "None";
  1855. -#else
  1856. -   caveat = "None";
  1857. -#endif
  1858. -
  1859. -   printf("0x%02x %2d %2s %2d %2d %2d %c%c %c  %c %2d %2d %2d %2d %2d %2d %2d",
  1860. -          attribs->id,
  1861. -          attribs->depth,
  1862. -          visual_class_abbrev(attribs->klass),
  1863. -          attribs->transparentType != GLX_NONE,
  1864. -          attribs->bufferSize,
  1865. -          attribs->level,
  1866. -          (attribs->render_type & GLX_RGBA_BIT) ? 'r' : ' ',
  1867. -          (attribs->render_type & GLX_COLOR_INDEX_BIT) ? 'c' : ' ',
  1868. -          attribs->doubleBuffer ? 'y' : '.',
  1869. -          attribs->stereo ? 'y' : '.',
  1870. -          attribs->redSize, attribs->greenSize,
  1871. -          attribs->blueSize, attribs->alphaSize,
  1872. -          attribs->auxBuffers,
  1873. -          attribs->depthSize,
  1874. -          attribs->stencilSize
  1875. -          );
  1876. -
  1877. -   printf(" %2d %2d %2d %2d %2d %1d %s\n",
  1878. -          attribs->accumRedSize, attribs->accumGreenSize,
  1879. -          attribs->accumBlueSize, attribs->accumAlphaSize,
  1880. -          attribs->numSamples, attribs->numMultisample,
  1881. -          caveat
  1882. -          );
  1883. -}
  1884. -
  1885. -
  1886. -static void
  1887. -print_visual_attribs_long_header(void)
  1888. -{
  1889. - printf("Vis  Vis   Visual Trans  buff lev render DB ste  r   g   b   a  aux dep ste  accum buffers  MS   MS\n");
  1890. - printf(" ID Depth   Type  parent size el   type     reo sz  sz  sz  sz  buf th  ncl  r   g   b   a  num bufs\n");
  1891. - printf("----------------------------------------------------------------------------------------------------\n");
  1892. -}
  1893. -
  1894. -
  1895. -static void
  1896. -print_visual_attribs_long(const struct visual_attribs *attribs)
  1897. -{
  1898. -   printf("0x%2x %2d %-11s %2d     %2d %2d  %4s %3d %3d %3d %3d %3d %3d",
  1899. -          attribs->id,
  1900. -          attribs->depth,
  1901. -          visual_class_name(attribs->klass),
  1902. -          attribs->transparentType != GLX_NONE,
  1903. -          attribs->bufferSize,
  1904. -          attribs->level,
  1905. -          visual_render_type_name(attribs->render_type),
  1906. -          attribs->doubleBuffer,
  1907. -          attribs->stereo,
  1908. -          attribs->redSize, attribs->greenSize,
  1909. -          attribs->blueSize, attribs->alphaSize
  1910. -          );
  1911. -
  1912. -   printf(" %3d %4d %2d %3d %3d %3d %3d  %2d  %2d\n",
  1913. -          attribs->auxBuffers,
  1914. -          attribs->depthSize,
  1915. -          attribs->stencilSize,
  1916. -          attribs->accumRedSize, attribs->accumGreenSize,
  1917. -          attribs->accumBlueSize, attribs->accumAlphaSize,
  1918. -          attribs->numSamples, attribs->numMultisample
  1919. -          );
  1920. -}
  1921. -
  1922. -
  1923. -static void
  1924. -print_visual_info(Display *dpy, int scrnum, InfoMode mode)
  1925. -{
  1926. -   XVisualInfo theTemplate;
  1927. -   XVisualInfo *visuals;
  1928. -   int numVisuals, numGlxVisuals;
  1929. -   long mask;
  1930. -   int i;
  1931. -   struct visual_attribs attribs;
  1932. -
  1933. -   /* get list of all visuals on this screen */
  1934. -   theTemplate.screen = scrnum;
  1935. -   mask = VisualScreenMask;
  1936. -   visuals = XGetVisualInfo(dpy, mask, &theTemplate, &numVisuals);
  1937. -
  1938. -   numGlxVisuals = 0;
  1939. -   for (i = 0; i < numVisuals; i++) {
  1940. -      if (get_visual_attribs(dpy, &visuals[i], &attribs))
  1941. -    numGlxVisuals++;
  1942. -   }
  1943. -
  1944. -   if (numGlxVisuals == 0)
  1945. -      return;
  1946. -
  1947. -   printf("%d GLX Visuals\n", numGlxVisuals);
  1948. -
  1949. -   if (mode == Normal)
  1950. -      print_visual_attribs_short_header();
  1951. -   else if (mode == Wide)
  1952. -      print_visual_attribs_long_header();
  1953. -
  1954. -   for (i = 0; i < numVisuals; i++) {
  1955. -      if (!get_visual_attribs(dpy, &visuals[i], &attribs))
  1956. -    continue;
  1957. -
  1958. -      if (mode == Verbose)
  1959. -    print_visual_attribs_verbose(&attribs);
  1960. -      else if (mode == Normal)
  1961. -         print_visual_attribs_short(&attribs);
  1962. -      else if (mode == Wide)
  1963. -         print_visual_attribs_long(&attribs);
  1964. -   }
  1965. -   printf("\n");
  1966. -
  1967. -   XFree(visuals);
  1968. -}
  1969. -
  1970. -#ifdef GLX_VERSION_1_3
  1971. -
  1972. -static void
  1973. -print_fbconfig_info(Display *dpy, int scrnum, InfoMode mode)
  1974. -{
  1975. -   int numFBConfigs = 0;
  1976. -   struct visual_attribs attribs;
  1977. -   GLXFBConfig *fbconfigs;
  1978. -   int i;
  1979. -
  1980. -   /* get list of all fbconfigs on this screen */
  1981. -   fbconfigs = glXGetFBConfigs(dpy, scrnum, &numFBConfigs);
  1982. -
  1983. -   if (numFBConfigs == 0) {
  1984. -      XFree(fbconfigs);
  1985. -      return;
  1986. -   }
  1987. -
  1988. -   printf("%d GLXFBConfigs:\n", numFBConfigs);
  1989. -   if (mode == Normal)
  1990. -      print_visual_attribs_short_header();
  1991. -   else if (mode == Wide)
  1992. -      print_visual_attribs_long_header();
  1993. -
  1994. -   for (i = 0; i < numFBConfigs; i++) {
  1995. -      get_fbconfig_attribs(dpy, fbconfigs[i], &attribs);
  1996. -
  1997. -      if (mode == Verbose)
  1998. -         print_visual_attribs_verbose(&attribs);
  1999. -      else if (mode == Normal)
  2000. -    print_visual_attribs_short(&attribs);
  2001. -      else if (mode == Wide)
  2002. -         print_visual_attribs_long(&attribs);
  2003. -   }
  2004. -   printf("\n");
  2005. -
  2006. -   XFree(fbconfigs);
  2007. -}
  2008. -
  2009. -#endif
  2010. -
  2011. -/*
  2012. - * Stand-alone Mesa doesn't really implement the GLX protocol so it
  2013. - * doesn't really know the GLX attributes associated with an X visual.
  2014. - * The first time a visual is presented to Mesa's pseudo-GLX it
  2015. - * attaches ancilliary buffers to it (like depth and stencil).
  2016. - * But that usually only works if glXChooseVisual is used.
  2017. - * This function calls glXChooseVisual() to sort of "prime the pump"
  2018. - * for Mesa's GLX so that the visuals that get reported actually
  2019. - * reflect what applications will see.
  2020. - * This has no effect when using true GLX.
  2021. - */
  2022. -static void
  2023. -mesa_hack(Display *dpy, int scrnum)
  2024. -{
  2025. -   static int attribs[] = {
  2026. -      GLX_RGBA,
  2027. -      GLX_RED_SIZE, 1,
  2028. -      GLX_GREEN_SIZE, 1,
  2029. -      GLX_BLUE_SIZE, 1,
  2030. -      GLX_DEPTH_SIZE, 1,
  2031. -      GLX_STENCIL_SIZE, 1,
  2032. -      GLX_ACCUM_RED_SIZE, 1,
  2033. -      GLX_ACCUM_GREEN_SIZE, 1,
  2034. -      GLX_ACCUM_BLUE_SIZE, 1,
  2035. -      GLX_ACCUM_ALPHA_SIZE, 1,
  2036. -      GLX_DOUBLEBUFFER,
  2037. -      None
  2038. -   };
  2039. -   XVisualInfo *visinfo;
  2040. -
  2041. -   visinfo = glXChooseVisual(dpy, scrnum, attribs);
  2042. -   if (visinfo)
  2043. -      XFree(visinfo);
  2044. -}
  2045. -
  2046. -
  2047. -/*
  2048. - * Examine all visuals to find the so-called best one.
  2049. - * We prefer deepest RGBA buffer with depth, stencil and accum
  2050. - * that has no caveats.
  2051. - */
  2052. -static int
  2053. -find_best_visual(Display *dpy, int scrnum)
  2054. -{
  2055. -   XVisualInfo theTemplate;
  2056. -   XVisualInfo *visuals;
  2057. -   int numVisuals;
  2058. -   long mask;
  2059. -   int i;
  2060. -   struct visual_attribs bestVis;
  2061. -
  2062. -   /* get list of all visuals on this screen */
  2063. -   theTemplate.screen = scrnum;
  2064. -   mask = VisualScreenMask;
  2065. -   visuals = XGetVisualInfo(dpy, mask, &theTemplate, &numVisuals);
  2066. -
  2067. -   /* init bestVis with first visual info */
  2068. -   get_visual_attribs(dpy, &visuals[0], &bestVis);
  2069. -
  2070. -   /* try to find a "better" visual */
  2071. -   for (i = 1; i < numVisuals; i++) {
  2072. -      struct visual_attribs vis;
  2073. -
  2074. -      get_visual_attribs(dpy, &visuals[i], &vis);
  2075. -
  2076. -      /* always skip visuals with caveats */
  2077. -      if (vis.visualCaveat != GLX_NONE_EXT)
  2078. -         continue;
  2079. -
  2080. -      /* see if this vis is better than bestVis */
  2081. -      if ((!bestVis.supportsGL && vis.supportsGL) ||
  2082. -          (bestVis.visualCaveat != GLX_NONE_EXT) ||
  2083. -          (!(bestVis.render_type & GLX_RGBA_BIT) && (vis.render_type & GLX_RGBA_BIT)) ||
  2084. -          (!bestVis.doubleBuffer && vis.doubleBuffer) ||
  2085. -          (bestVis.redSize < vis.redSize) ||
  2086. -          (bestVis.greenSize < vis.greenSize) ||
  2087. -          (bestVis.blueSize < vis.blueSize) ||
  2088. -          (bestVis.alphaSize < vis.alphaSize) ||
  2089. -          (bestVis.depthSize < vis.depthSize) ||
  2090. -          (bestVis.stencilSize < vis.stencilSize) ||
  2091. -          (bestVis.accumRedSize < vis.accumRedSize)) {
  2092. -         /* found a better visual */
  2093. -         bestVis = vis;
  2094. -      }
  2095. -   }
  2096. -
  2097. -   XFree(visuals);
  2098. -
  2099. -   return bestVis.id;
  2100. -}
  2101. -
  2102. -
  2103. -static void
  2104. -usage(void)
  2105. -{
  2106. -   printf("Usage: glxinfo [-v] [-t] [-h] [-i] [-b] [-display <dname>]\n");
  2107. -   printf("\t-v: Print visuals info in verbose form.\n");
  2108. -   printf("\t-t: Print verbose table.\n");
  2109. -   printf("\t-display <dname>: Print GLX visuals on specified server.\n");
  2110. -   printf("\t-h: This information.\n");
  2111. -   printf("\t-i: Force an indirect rendering context.\n");
  2112. -   printf("\t-b: Find the 'best' visual and print its number.\n");
  2113. -   printf("\t-l: Print interesting OpenGL limits.\n");
  2114. -}
  2115. -
  2116. -
  2117. -int
  2118. -main(int argc, char *argv[])
  2119. -{
  2120. -   char *displayName = NULL;
  2121. -   Display *dpy;
  2122. -   int numScreens, scrnum;
  2123. -   InfoMode mode = Normal;
  2124. -   GLboolean findBest = GL_FALSE;
  2125. -   GLboolean limits = GL_FALSE;
  2126. -   Bool allowDirect = True;
  2127. -   int i;
  2128. -
  2129. -   for (i = 1; i < argc; i++) {
  2130. -      if (strcmp(argv[i], "-display") == 0 && i + 1 < argc) {
  2131. -         displayName = argv[i + 1];
  2132. -         i++;
  2133. -      }
  2134. -      else if (strcmp(argv[i], "-t") == 0) {
  2135. -         mode = Wide;
  2136. -      }
  2137. -      else if (strcmp(argv[i], "-v") == 0) {
  2138. -         mode = Verbose;
  2139. -      }
  2140. -      else if (strcmp(argv[i], "-b") == 0) {
  2141. -         findBest = GL_TRUE;
  2142. -      }
  2143. -      else if (strcmp(argv[i], "-i") == 0) {
  2144. -         allowDirect = False;
  2145. -      }
  2146. -      else if (strcmp(argv[i], "-l") == 0) {
  2147. -         limits = GL_TRUE;
  2148. -      }
  2149. -      else if (strcmp(argv[i], "-h") == 0) {
  2150. -         usage();
  2151. -         return 0;
  2152. -      }
  2153. -      else {
  2154. -         printf("Unknown option `%s'\n", argv[i]);
  2155. -         usage();
  2156. -         return 0;
  2157. -      }
  2158. -   }
  2159. -
  2160. -   dpy = XOpenDisplay(displayName);
  2161. -   if (!dpy) {
  2162. -      fprintf(stderr, "Error: unable to open display %s\n", XDisplayName(displayName));
  2163. -      return -1;
  2164. -   }
  2165. -
  2166. -   if (findBest) {
  2167. -      int b;
  2168. -      mesa_hack(dpy, 0);
  2169. -      b = find_best_visual(dpy, 0);
  2170. -      printf("%d\n", b);
  2171. -   }
  2172. -   else {
  2173. -      numScreens = ScreenCount(dpy);
  2174. -      print_display_info(dpy);
  2175. -      for (scrnum = 0; scrnum < numScreens; scrnum++) {
  2176. -         mesa_hack(dpy, scrnum);
  2177. -         print_screen_info(dpy, scrnum, allowDirect, limits);
  2178. -         printf("\n");
  2179. -         print_visual_info(dpy, scrnum, mode);
  2180. -#ifdef GLX_VERSION_1_3
  2181. -         print_fbconfig_info(dpy, scrnum, mode);
  2182. -#endif
  2183. -         if (scrnum + 1 < numScreens)
  2184. -            printf("\n\n");
  2185. -      }
  2186. -   }
  2187. -
  2188. -   XCloseDisplay(dpy);
  2189. -
  2190. -   return 0;
  2191. -}
  2192. diff -pruN xorg/mesa3d/Makefile version-updates_xorg/mesa3d/Makefile
  2193. --- xorg/mesa3d/Makefile    2012-06-14 19:08:50.000000000 +1000
  2194. +++ version-updates_xorg/mesa3d/Makefile    1970-01-01 10:00:00.000000000 +1000
  2195. @@ -1,77 +0,0 @@
  2196. -# progs/xdemos/Makefile
  2197. -
  2198. -TOP = ../..
  2199. -include $(TOP)/configs/current
  2200. -
  2201. -
  2202. -INCDIR = $(TOP)/include
  2203. -
  2204. -LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
  2205. -
  2206. -# Add X11 and pthread libs to satisfy GNU gold.
  2207. -APP_LIB_DEPS += -lX11 -lpthread
  2208. -
  2209. -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) $(APP_LIB_DEPS)
  2210. -
  2211. -PROGS = \
  2212. -   glxgears \
  2213. -   glxinfo
  2214. -
  2215. -# Don't build these by default because of extra library dependencies
  2216. -EXTRA_PROGS = \
  2217. -   shape \
  2218. -   yuvrect_client \
  2219. -   xdemo
  2220. -
  2221. -
  2222. -
  2223. -##### RULES #####
  2224. -
  2225. -.o: $(LIB_DEP)
  2226. -   $(APP_CC) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
  2227. -
  2228. -.c.o:
  2229. -   $(APP_CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $< -c -o $@
  2230. -
  2231. -
  2232. -##### TARGETS #####
  2233. -
  2234. -default: $(PROGS)
  2235. -
  2236. -$(PROGS): $(PROGS:%=%.o)
  2237. -
  2238. -extra: $(EXTRA_PROGS)
  2239. -
  2240. -
  2241. -clean:
  2242. -   -rm -f $(PROGS) $(EXTRA_PROGS)
  2243. -   -rm -f *.o *~
  2244. -
  2245. -
  2246. -# special cases
  2247. -pbutil.o: pbutil.h
  2248. -pbinfo.o: pbutil.h
  2249. -pbinfo: pbinfo.o pbutil.o
  2250. -   $(APP_CC) $(CFLAGS) $(LDFLAGS) pbinfo.o pbutil.o $(LIBS) -o $@
  2251. -
  2252. -pbdemo.o: pbutil.h
  2253. -pbdemo: pbdemo.o pbutil.o
  2254. -   $(APP_CC) $(CFLAGS) $(LDFLAGS) pbdemo.o pbutil.o $(LIBS) -o $@
  2255. -
  2256. -glxgears_fbconfig.o: pbutil.h
  2257. -glxgears_fbconfig: glxgears_fbconfig.o pbutil.o
  2258. -   $(APP_CC) $(CFLAGS) $(LDFLAGS) glxgears_fbconfig.o pbutil.o $(LIBS) -o $@
  2259. -
  2260. -xuserotfont.o: xuserotfont.h
  2261. -xrotfontdemo.o: xuserotfont.h
  2262. -xrotfontdemo: xrotfontdemo.o xuserotfont.o
  2263. -   $(APP_CC) $(CFLAGS) $(LDFLAGS) xrotfontdemo.o xuserotfont.o $(LIBS) -o $@
  2264. -
  2265. -ipc.o: ipc.h
  2266. -corender.o: ipc.h
  2267. -corender: corender.o ipc.o
  2268. -   $(APP_CC) $(CFLAGS) $(LDFLAGS) corender.o ipc.o $(LIBS) -o $@
  2269. -
  2270. -yuvrect_client: yuvrect_client.o
  2271. -   $(APP_CC) $(CFLAGS) $< $(LDFLAGS) $(LIBS) -l$(GLU_LIB) -o $@
  2272. -
  2273. diff -pruN xorg/mesa3d/.md5sum version-updates_xorg/mesa3d/.md5sum
  2274. --- xorg/mesa3d/.md5sum 2012-06-14 19:08:50.000000000 +1000
  2275. +++ version-updates_xorg/mesa3d/.md5sum 2012-06-09 08:49:43.000000000 +1000
  2276. @@ -1,4 +1 @@
  2277. -1ef1b3af508887003a0e0076c5d2cc74  Makefile
  2278. -f5de82852f1243f42cc004039e10b771  MesaLib-7.10.2.tar.bz2
  2279. -2ce4a8684cea9529a6e72c7220b1192f  glxgears.c
  2280. -9f306d954d8c135ee326887707bc0fb1  glxinfo.c
  2281. +cc5ee15e306b8c15da6a478923797171  MesaLib-8.0.3.tar.bz2
  2282. diff -pruN xorg/mesa3d/Pkgfile version-updates_xorg/mesa3d/Pkgfile
  2283. --- xorg/mesa3d/Pkgfile 2012-06-14 19:08:50.000000000 +1000
  2284. +++ version-updates_xorg/mesa3d/Pkgfile 2012-06-09 08:49:43.000000000 +1000
  2285. @@ -4,26 +4,20 @@
  2286.  # Depends on: libdrm, xorg-makedepend, xorg-glproto, xorg-xextproto, xorg-dri2proto, xorg-libx11, xorg-xf86vidmodeproto, xorg-libxext, xorg-libxxf86vm, xorg-libxt, xorg-libxdamage, xorg-libpciaccess, expat, talloc, libxml2-python
  2287.  
  2288.  name=mesa3d
  2289. -version=7.10.2
  2290. +version=8.0.3
  2291.  release=1
  2292. -source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2 \
  2293. -        Makefile glxgears.c glxinfo.c)
  2294. +source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2)
  2295.  
  2296.  build() {
  2297.     cd Mesa-$version
  2298.  
  2299. -   mkdir -p progs/xdemos
  2300. -   mv $SRC/{Makefile,glx{gears,info}.c} progs/xdemos
  2301. -
  2302.     ./configure --prefix=/usr \
  2303. -               --with-driver=dri \
  2304. -               --with-dri-driverdir=/usr/lib/dri
  2305. +               --with-driver=dri \
  2306. +               --with-dri-drivers=i915,r200,swrast,i965,radeon \
  2307. +               --with-dri-driverdir=/usr/lib/dri \
  2308. +               --with-gallium-drivers=i915,svga,r600 \
  2309. +               --disable-gallium-llvm
  2310.  
  2311.     make
  2312. -   make -C progs/xdemos
  2313. -
  2314.     make DESTDIR=$PKG install
  2315. -
  2316. -   install -d $PKG/usr/bin
  2317. -   install -m 755 progs/xdemos/glx{gears,info} $PKG/usr/bin
  2318.  }
  2319. diff -pruN xorg/mesa-demos/.footprint version-updates_xorg/mesa-demos/.footprint
  2320. --- xorg/mesa-demos/.footprint  1970-01-01 10:00:00.000000000 +1000
  2321. +++ version-updates_xorg/mesa-demos/.footprint  2012-03-26 01:12:20.000000000 +1100
  2322. @@ -0,0 +1,29 @@
  2323. +drwxr-xr-x root/root   usr/
  2324. +drwxr-xr-x root/root   usr/bin/
  2325. +-rwxr-xr-x root/root   usr/bin/corender
  2326. +-rwxr-xr-x root/root   usr/bin/glsync
  2327. +-rwxr-xr-x root/root   usr/bin/glthreads
  2328. +-rwxr-xr-x root/root   usr/bin/glxcontexts
  2329. +-rwxr-xr-x root/root   usr/bin/glxdemo
  2330. +-rwxr-xr-x root/root   usr/bin/glxgears
  2331. +-rwxr-xr-x root/root   usr/bin/glxgears_fbconfig
  2332. +-rwxr-xr-x root/root   usr/bin/glxgears_pixmap
  2333. +-rwxr-xr-x root/root   usr/bin/glxheads
  2334. +-rwxr-xr-x root/root   usr/bin/glxinfo
  2335. +-rwxr-xr-x root/root   usr/bin/glxpbdemo
  2336. +-rwxr-xr-x root/root   usr/bin/glxpixmap
  2337. +-rwxr-xr-x root/root   usr/bin/glxsnoop
  2338. +-rwxr-xr-x root/root   usr/bin/glxswapcontrol
  2339. +-rwxr-xr-x root/root   usr/bin/manywin
  2340. +-rwxr-xr-x root/root   usr/bin/multictx
  2341. +-rwxr-xr-x root/root   usr/bin/offset
  2342. +-rwxr-xr-x root/root   usr/bin/overlay
  2343. +-rwxr-xr-x root/root   usr/bin/pbdemo
  2344. +-rwxr-xr-x root/root   usr/bin/pbinfo
  2345. +-rwxr-xr-x root/root   usr/bin/shape
  2346. +-rwxr-xr-x root/root   usr/bin/sharedtex
  2347. +-rwxr-xr-x root/root   usr/bin/sharedtex_mt
  2348. +-rwxr-xr-x root/root   usr/bin/texture_from_pixmap
  2349. +-rwxr-xr-x root/root   usr/bin/wincopy
  2350. +-rwxr-xr-x root/root   usr/bin/xfont
  2351. +-rwxr-xr-x root/root   usr/bin/xrotfontdemo
  2352. diff -pruN xorg/mesa-demos/.md5sum version-updates_xorg/mesa-demos/.md5sum
  2353. --- xorg/mesa-demos/.md5sum 1970-01-01 10:00:00.000000000 +1000
  2354. +++ version-updates_xorg/mesa-demos/.md5sum 2012-03-26 01:12:20.000000000 +1100
  2355. @@ -0,0 +1 @@
  2356. +320c2a4b6edc6faba35d9cb1e2a30bf4  mesa-demos-8.0.1.tar.bz2
  2357. diff -pruN xorg/mesa-demos/Pkgfile version-updates_xorg/mesa-demos/Pkgfile
  2358. --- xorg/mesa-demos/Pkgfile 1970-01-01 10:00:00.000000000 +1000
  2359. +++ version-updates_xorg/mesa-demos/Pkgfile 2012-03-26 01:12:20.000000000 +1100
  2360. @@ -0,0 +1,18 @@
  2361. +# Description: Mesa 3D demos
  2362. +# URL: http://www.mesa3d.org
  2363. +# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2364. +# Depends on: mesa3d, glew
  2365. +
  2366. +name=mesa-demos
  2367. +version=8.0.1
  2368. +release=1
  2369. +source=(ftp://ftp.freedesktop.org/pub/mesa/demos/$version/$name-$version.tar.bz2)
  2370. +
  2371. +build() {
  2372. +   cd $name-$version
  2373. +
  2374. +   ./configure --prefix=/usr
  2375. +
  2376. +   make
  2377. +   make DESTDIR=$PKG install
  2378. +}
  2379. diff -pruN xorg/mtdev/.footprint version-updates_xorg/mtdev/.footprint
  2380. --- xorg/mtdev/.footprint   1970-01-01 10:00:00.000000000 +1000
  2381. +++ version-updates_xorg/mtdev/.footprint   2012-03-25 18:29:53.000000000 +1100
  2382. @@ -0,0 +1,15 @@
  2383. +drwxr-xr-x root/root   usr/
  2384. +drwxr-xr-x root/root   usr/bin/
  2385. +-rwxr-xr-x root/root   usr/bin/mtdev-test
  2386. +drwxr-xr-x root/root   usr/include/
  2387. +-rw-r--r-- root/root   usr/include/mtdev-mapping.h
  2388. +-rw-r--r-- root/root   usr/include/mtdev-plumbing.h
  2389. +-rw-r--r-- root/root   usr/include/mtdev.h
  2390. +drwxr-xr-x root/root   usr/lib/
  2391. +-rw-r--r-- root/root   usr/lib/libmtdev.a
  2392. +-rwxr-xr-x root/root   usr/lib/libmtdev.la
  2393. +lrwxrwxrwx root/root   usr/lib/libmtdev.so -> libmtdev.so.1.0.0
  2394. +lrwxrwxrwx root/root   usr/lib/libmtdev.so.1 -> libmtdev.so.1.0.0
  2395. +-rwxr-xr-x root/root   usr/lib/libmtdev.so.1.0.0
  2396. +drwxr-xr-x root/root   usr/lib/pkgconfig/
  2397. +-rw-r--r-- root/root   usr/lib/pkgconfig/mtdev.pc
  2398. diff -pruN xorg/mtdev/.md5sum version-updates_xorg/mtdev/.md5sum
  2399. --- xorg/mtdev/.md5sum  1970-01-01 10:00:00.000000000 +1000
  2400. +++ version-updates_xorg/mtdev/.md5sum  2012-03-25 18:29:53.000000000 +1100
  2401. @@ -0,0 +1 @@
  2402. +ee2474587ca4c4762f08388668fdab20  mtdev-1.1.2.tar.gz
  2403. diff -pruN xorg/mtdev/Pkgfile version-updates_xorg/mtdev/Pkgfile
  2404. --- xorg/mtdev/Pkgfile  1970-01-01 10:00:00.000000000 +1000
  2405. +++ version-updates_xorg/mtdev/Pkgfile  2012-03-25 18:29:53.000000000 +1100
  2406. @@ -0,0 +1,17 @@
  2407. +# Description: Kernel multi-touch transformation library
  2408. +# URL: http://launchpad.net/mtdev
  2409. +# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2410. +
  2411. +name=mtdev
  2412. +version=1.1.2
  2413. +release=1
  2414. +source=(http://launchpad.net/$name/trunk/$version/+download/$name-$version.tar.gz)
  2415. +
  2416. +build() {
  2417. +   cd $name-$version
  2418. +
  2419. +   ./configure --prefix=/usr --mandir=/usr/man
  2420. +
  2421. +   make
  2422. +   make DESTDIR=$PKG install
  2423. +}
  2424. diff -pruN xorg/polyglotman/Pkgfile version-updates_xorg/polyglotman/Pkgfile
  2425. --- xorg/polyglotman/Pkgfile    2012-06-14 19:08:50.000000000 +1000
  2426. +++ version-updates_xorg/polyglotman/Pkgfile    2012-04-09 01:07:54.000000000 +1000
  2427. @@ -1,11 +1,11 @@
  2428.  # Description: man page translator
  2429. -# URL: http://polyglotman.sourceforge.net
  2430. +# URL: http://sourceforge.net/projects/polyglotman/
  2431.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2432.  
  2433.  name=polyglotman
  2434.  version=3.2
  2435.  release=1
  2436. -source=(http://dl.sourceforge.net/$name/rman-$version.tar.gz)
  2437. +source=(http://downloads.sourceforge.net/project/$name/$name/$version/rman-$version.tar.gz)
  2438.  
  2439.  build() {
  2440.     cd rman-$version
  2441. diff -pruN xorg/xkeyboard-config/.footprint version-updates_xorg/xkeyboard-config/.footprint
  2442. --- xorg/xkeyboard-config/.footprint    2012-06-14 19:08:51.000000000 +1000
  2443. +++ version-updates_xorg/xkeyboard-config/.footprint    2012-06-09 08:49:43.000000000 +1000
  2444. @@ -1,25 +1,24 @@
  2445.  drwxr-xr-x root/root   usr/
  2446. +drwxr-xr-x root/root   usr/man/
  2447. +drwxr-xr-x root/root   usr/man/man7/
  2448. +-rw-r--r-- root/root   usr/man/man7/xkeyboard-config.7.gz
  2449.  drwxr-xr-x root/root   usr/share/
  2450.  drwxr-xr-x root/root   usr/share/X11/
  2451.  drwxr-xr-x root/root   usr/share/X11/xkb/
  2452.  -rw-r--r-- root/root   usr/share/X11/xkb/compat.dir
  2453.  drwxr-xr-x root/root   usr/share/X11/xkb/compat/
  2454. --rw-r--r-- root/root   usr/share/X11/xkb/compat/README
  2455.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/accessx
  2456.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/basic
  2457.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/caps
  2458.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/complete
  2459. --rw-r--r-- root/root   usr/share/X11/xkb/compat/default
  2460.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/iso9995
  2461.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/japan
  2462. --rw-r--r-- root/root   usr/share/X11/xkb/compat/keypad
  2463.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/ledcaps
  2464.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/lednum
  2465.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/ledscroll
  2466.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/level5
  2467.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/misc
  2468.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/mousekeys
  2469. --rw-r--r-- root/root   usr/share/X11/xkb/compat/norepeat
  2470.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/olpc
  2471.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/pc
  2472.  -rw-r--r-- root/root   usr/share/X11/xkb/compat/pc98
  2473. @@ -28,7 +27,6 @@ drwxr-xr-x    root/root   usr/share/X11/xkb/c
  2474.  lrwxrwxrwx root/root   usr/share/X11/xkb/compiled -> /var/lib/xkb
  2475.  -rw-r--r-- root/root   usr/share/X11/xkb/geometry.dir
  2476.  drwxr-xr-x root/root   usr/share/X11/xkb/geometry/
  2477. --rw-r--r-- root/root   usr/share/X11/xkb/geometry/README
  2478.  -rw-r--r-- root/root   usr/share/X11/xkb/geometry/amiga
  2479.  -rw-r--r-- root/root   usr/share/X11/xkb/geometry/ataritt
  2480.  -rw-r--r-- root/root   usr/share/X11/xkb/geometry/chicony
  2481. @@ -61,7 +59,6 @@ drwxr-xr-x    root/root   usr/share/X11/xkb/g
  2482.  -rw-r--r-- root/root   usr/share/X11/xkb/geometry/winbook
  2483.  -rw-r--r-- root/root   usr/share/X11/xkb/keycodes.dir
  2484.  drwxr-xr-x root/root   usr/share/X11/xkb/keycodes/
  2485. --rw-r--r-- root/root   usr/share/X11/xkb/keycodes/README
  2486.  -rw-r--r-- root/root   usr/share/X11/xkb/keycodes/aliases
  2487.  -rw-r--r-- root/root   usr/share/X11/xkb/keycodes/amiga
  2488.  -rw-r--r-- root/root   usr/share/X11/xkb/keycodes/ataritt
  2489. @@ -82,55 +79,7 @@ drwxr-xr-x   root/root   usr/share/X11/xkb/k
  2490.  -rw-r--r-- root/root   usr/share/X11/xkb/keycodes/sun
  2491.  -rw-r--r-- root/root   usr/share/X11/xkb/keycodes/xfree86
  2492.  -rw-r--r-- root/root   usr/share/X11/xkb/keycodes/xfree98
  2493. --rw-r--r-- root/root   usr/share/X11/xkb/keymap.dir
  2494. -drwxr-xr-x root/root   usr/share/X11/xkb/keymap/
  2495. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/README
  2496. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/amiga
  2497. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/ataritt
  2498. -drwxr-xr-x root/root   usr/share/X11/xkb/keymap/digital_vndr/
  2499. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/digital_vndr/us
  2500. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/macintosh
  2501. -drwxr-xr-x root/root   usr/share/X11/xkb/keymap/sgi_vndr/
  2502. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/be
  2503. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/bg
  2504. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/ca
  2505. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/ch
  2506. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/cz
  2507. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/de
  2508. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/dk
  2509. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/dvorak
  2510. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/es
  2511. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/fi
  2512. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/fr
  2513. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/gb
  2514. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/hu
  2515. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/it
  2516. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/jp
  2517. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/no
  2518. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/pl
  2519. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/pt
  2520. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/ru
  2521. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/se
  2522. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/sk
  2523. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/th
  2524. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sgi_vndr/us
  2525. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sony
  2526. -drwxr-xr-x root/root   usr/share/X11/xkb/keymap/sun_vndr/
  2527. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sun_vndr/all
  2528. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sun_vndr/de
  2529. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sun_vndr/es
  2530. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sun_vndr/fi
  2531. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sun_vndr/fr
  2532. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sun_vndr/no
  2533. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sun_vndr/pl
  2534. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sun_vndr/ru
  2535. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sun_vndr/se
  2536. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sun_vndr/uk
  2537. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/sun_vndr/us
  2538. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/xfree86
  2539. --rw-r--r-- root/root   usr/share/X11/xkb/keymap/xfree98
  2540.  drwxr-xr-x root/root   usr/share/X11/xkb/rules/
  2541. --rw-r--r-- root/root   usr/share/X11/xkb/rules/README
  2542.  -rw-r--r-- root/root   usr/share/X11/xkb/rules/base
  2543.  -rw-r--r-- root/root   usr/share/X11/xkb/rules/base.extras.xml
  2544.  -rw-r--r-- root/root   usr/share/X11/xkb/rules/base.lst
  2545. @@ -144,12 +93,6 @@ drwxr-xr-x  root/root   usr/share/X11/xkb/r
  2546.  lrwxrwxrwx root/root   usr/share/X11/xkb/rules/xorg -> base
  2547.  lrwxrwxrwx root/root   usr/share/X11/xkb/rules/xorg.lst -> base.lst
  2548.  lrwxrwxrwx root/root   usr/share/X11/xkb/rules/xorg.xml -> base.xml
  2549. --rw-r--r-- root/root   usr/share/X11/xkb/semantics.dir
  2550. -drwxr-xr-x root/root   usr/share/X11/xkb/semantics/
  2551. --rw-r--r-- root/root   usr/share/X11/xkb/semantics/basic
  2552. --rw-r--r-- root/root   usr/share/X11/xkb/semantics/complete
  2553. --rw-r--r-- root/root   usr/share/X11/xkb/semantics/default
  2554. --rw-r--r-- root/root   usr/share/X11/xkb/semantics/xtest
  2555.  -rw-r--r-- root/root   usr/share/X11/xkb/symbols.dir
  2556.  drwxr-xr-x root/root   usr/share/X11/xkb/symbols/
  2557.  -rw-r--r-- root/root   usr/share/X11/xkb/symbols/ad
  2558. @@ -342,7 +285,6 @@ drwxr-xr-x  root/root   usr/share/X11/xkb/s
  2559.  -rw-r--r-- root/root   usr/share/X11/xkb/symbols/za
  2560.  -rw-r--r-- root/root   usr/share/X11/xkb/types.dir
  2561.  drwxr-xr-x root/root   usr/share/X11/xkb/types/
  2562. --rw-r--r-- root/root   usr/share/X11/xkb/types/README
  2563.  -rw-r--r-- root/root   usr/share/X11/xkb/types/basic
  2564.  -rw-r--r-- root/root   usr/share/X11/xkb/types/cancel
  2565.  -rw-r--r-- root/root   usr/share/X11/xkb/types/caps
  2566. @@ -355,8 +297,5 @@ drwxr-xr-x  root/root   usr/share/X11/xkb/t
  2567.  -rw-r--r-- root/root   usr/share/X11/xkb/types/nokia
  2568.  -rw-r--r-- root/root   usr/share/X11/xkb/types/numpad
  2569.  -rw-r--r-- root/root   usr/share/X11/xkb/types/pc
  2570. -drwxr-xr-x root/root   usr/share/man/
  2571. -drwxr-xr-x root/root   usr/share/man/man7/
  2572. --rw-r--r-- root/root   usr/share/man/man7/xkeyboard-config.7.gz
  2573.  drwxr-xr-x root/root   usr/share/pkgconfig/
  2574.  -rw-r--r-- root/root   usr/share/pkgconfig/xkeyboard-config.pc
  2575. diff -pruN xorg/xkeyboard-config/.md5sum version-updates_xorg/xkeyboard-config/.md5sum
  2576. --- xorg/xkeyboard-config/.md5sum   2012-06-14 19:08:51.000000000 +1000
  2577. +++ version-updates_xorg/xkeyboard-config/.md5sum   2012-06-09 08:49:43.000000000 +1000
  2578. @@ -1 +1 @@
  2579. -8cd1d7e074a810ef21b09ea963c43ad3  xkeyboard-config-2.5.tar.bz2
  2580. +e7e31da9adb56ba52b5c18226b8cbef3  xkeyboard-config-2.6.tar.bz2
  2581. diff -pruN xorg/xkeyboard-config/Pkgfile version-updates_xorg/xkeyboard-config/Pkgfile
  2582. --- xorg/xkeyboard-config/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  2583. +++ version-updates_xorg/xkeyboard-config/Pkgfile   2012-06-10 18:18:06.000000000 +1000
  2584. @@ -4,14 +4,15 @@
  2585.  # Depends on: xorg-xkbcomp, intltool
  2586.  
  2587.  name=xkeyboard-config
  2588. -version=2.5
  2589. +version=2.6
  2590.  release=1
  2591. -source=(http://www.x.org/releases/individual/data/$name/$name-$version.tar.bz2)
  2592. +source=(http://xorg.freedesktop.org/releases/individual/data/$name/$name-$version.tar.bz2)
  2593.  
  2594.  build() {
  2595. -   cd xkeyboard-config-$version
  2596. +   cd $name-$version
  2597.  
  2598.     ./configure --prefix=/usr \
  2599. +               --mandir=/usr/man \
  2600.                 --with-xkb-base=/usr/share/X11/xkb \
  2601.                 --with-xkb-rules-symlink=xorg
  2602.  
  2603. @@ -21,4 +22,5 @@ build() {
  2604.     rm -rf $PKG/usr/share/locale
  2605.  
  2606.     ln -s /var/lib/xkb $PKG/usr/share/X11/xkb/compiled
  2607. +   find $PKG -name README -delete
  2608.  }
  2609. diff -pruN xorg/xorg/Pkgfile version-updates_xorg/xorg/Pkgfile
  2610. --- xorg/xorg/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  2611. +++ version-updates_xorg/xorg/Pkgfile   2012-06-09 08:49:43.000000000 +1000
  2612. @@ -4,7 +4,7 @@
  2613.  # Depends on: xorg-server, xorg-xf86-input-mouse, xorg-xf86-input-keyboard, xorg-xf86-input-evdev, xorg-xf86-video-vesa, xorg-xinit, xorg-xauth, xorg-rgb, xkeyboard-config
  2614.  
  2615.  name=xorg
  2616. -version=7.6
  2617. +version=7.7
  2618.  release=1
  2619.  source=()
  2620.  
  2621. diff -pruN xorg/xorg-bigreqsproto/.md5sum version-updates_xorg/xorg-bigreqsproto/.md5sum
  2622. --- xorg/xorg-bigreqsproto/.md5sum  2012-06-14 19:08:51.000000000 +1000
  2623. +++ version-updates_xorg/xorg-bigreqsproto/.md5sum  2012-03-25 18:29:53.000000000 +1100
  2624. @@ -1 +1 @@
  2625. -6f6c24436c2b3ab235eb14a85b9aaacf  bigreqsproto-1.1.1.tar.bz2
  2626. +1a05fb01fa1d5198894c931cf925c025  bigreqsproto-1.1.2.tar.bz2
  2627. diff -pruN xorg/xorg-bigreqsproto/Pkgfile version-updates_xorg/xorg-bigreqsproto/Pkgfile
  2628. --- xorg/xorg-bigreqsproto/Pkgfile  2012-06-14 19:08:51.000000000 +1000
  2629. +++ version-updates_xorg/xorg-bigreqsproto/Pkgfile  2012-03-25 18:29:53.000000000 +1100
  2630. @@ -3,7 +3,7 @@
  2631.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2632.  
  2633.  name=xorg-bigreqsproto
  2634. -version=1.1.1
  2635. +version=1.1.2
  2636.  release=1
  2637.  source=(http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-$version.tar.bz2)
  2638.  
  2639. diff -pruN xorg/xorg-font-adobe-100dpi/Pkgfile version-updates_xorg/xorg-font-adobe-100dpi/Pkgfile
  2640. --- xorg/xorg-font-adobe-100dpi/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  2641. +++ version-updates_xorg/xorg-font-adobe-100dpi/Pkgfile 2012-04-09 19:41:47.000000000 +1000
  2642. @@ -1,7 +1,7 @@
  2643.  # Description: xorg font font-adobe-100dpi
  2644.  # URL: http://xorg.freedesktop.org
  2645.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2646. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2647. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2648.  
  2649.  name=xorg-font-adobe-100dpi
  2650.  version=1.0.3
  2651. diff -pruN xorg/xorg-font-adobe-75dpi/Pkgfile version-updates_xorg/xorg-font-adobe-75dpi/Pkgfile
  2652. --- xorg/xorg-font-adobe-75dpi/Pkgfile  2012-06-14 19:08:51.000000000 +1000
  2653. +++ version-updates_xorg/xorg-font-adobe-75dpi/Pkgfile  2012-04-09 19:41:47.000000000 +1000
  2654. @@ -1,7 +1,7 @@
  2655.  # Description: xorg font font-adobe-75dpi
  2656.  # URL: http://xorg.freedesktop.org
  2657.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2658. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2659. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2660.  
  2661.  name=xorg-font-adobe-75dpi
  2662.  version=1.0.3
  2663. diff -pruN xorg/xorg-font-adobe-utopia-100dpi/Pkgfile version-updates_xorg/xorg-font-adobe-utopia-100dpi/Pkgfile
  2664. --- xorg/xorg-font-adobe-utopia-100dpi/Pkgfile  2012-06-14 19:08:51.000000000 +1000
  2665. +++ version-updates_xorg/xorg-font-adobe-utopia-100dpi/Pkgfile  2012-04-09 19:41:47.000000000 +1000
  2666. @@ -1,7 +1,7 @@
  2667.  # Description: xorg font font-adobe-utopia-100dpi
  2668.  # URL: http://xorg.freedesktop.org
  2669.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2670. -# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-font-util
  2671. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-font-util, xorg-bdftopcf
  2672.  
  2673.  name=xorg-font-adobe-utopia-100dpi
  2674.  version=1.0.4
  2675. diff -pruN xorg/xorg-font-adobe-utopia-75dpi/Pkgfile version-updates_xorg/xorg-font-adobe-utopia-75dpi/Pkgfile
  2676. --- xorg/xorg-font-adobe-utopia-75dpi/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  2677. +++ version-updates_xorg/xorg-font-adobe-utopia-75dpi/Pkgfile   2012-04-09 19:41:47.000000000 +1000
  2678. @@ -1,7 +1,7 @@
  2679.  # Description: xorg font font-adobe-utopia-75dpi
  2680.  # URL: http://xorg.freedesktop.org
  2681.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2682. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2683. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2684.  
  2685.  name=xorg-font-adobe-utopia-75dpi
  2686.  version=1.0.4
  2687. diff -pruN xorg/xorg-font-alias/.md5sum version-updates_xorg/xorg-font-alias/.md5sum
  2688. --- xorg/xorg-font-alias/.md5sum    2012-06-14 19:08:51.000000000 +1000
  2689. +++ version-updates_xorg/xorg-font-alias/.md5sum    2012-03-19 20:05:32.000000000 +1100
  2690. @@ -1 +1 @@
  2691. -9d40dba6fb8cb58dacb433fc7bcaafca  font-alias-1.0.2.tar.bz2
  2692. +6d25f64796fef34b53b439c2e9efa562  font-alias-1.0.3.tar.bz2
  2693. diff -pruN xorg/xorg-font-alias/Pkgfile version-updates_xorg/xorg-font-alias/Pkgfile
  2694. --- xorg/xorg-font-alias/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  2695. +++ version-updates_xorg/xorg-font-alias/Pkgfile    2012-03-19 20:05:32.000000000 +1100
  2696. @@ -3,7 +3,7 @@
  2697.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2698.  
  2699.  name=xorg-font-alias
  2700. -version=1.0.2
  2701. +version=1.0.3
  2702.  release=1
  2703.  source=(http://xorg.freedesktop.org/releases/individual/font/font-alias-$version.tar.bz2)
  2704.  
  2705. diff -pruN xorg/xorg-font-arabic-misc/Pkgfile version-updates_xorg/xorg-font-arabic-misc/Pkgfile
  2706. --- xorg/xorg-font-arabic-misc/Pkgfile  2012-06-14 19:08:51.000000000 +1000
  2707. +++ version-updates_xorg/xorg-font-arabic-misc/Pkgfile  2012-04-09 19:41:47.000000000 +1000
  2708. @@ -1,7 +1,7 @@
  2709.  # Description: xorg font font-arabic-misc
  2710.  # URL: http://xorg.freedesktop.org
  2711.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2712. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2713. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2714.  
  2715.  name=xorg-font-arabic-misc
  2716.  version=1.0.3
  2717. diff -pruN xorg/xorg-font-bh-100dpi/Pkgfile version-updates_xorg/xorg-font-bh-100dpi/Pkgfile
  2718. --- xorg/xorg-font-bh-100dpi/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  2719. +++ version-updates_xorg/xorg-font-bh-100dpi/Pkgfile    2012-04-09 19:41:47.000000000 +1000
  2720. @@ -1,7 +1,7 @@
  2721.  # Description: xorg font font-bh-100dpi
  2722.  # URL: http://xorg.freedesktop.org
  2723.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2724. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2725. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2726.  
  2727.  name=xorg-font-bh-100dpi
  2728.  version=1.0.3
  2729. diff -pruN xorg/xorg-font-bh-75dpi/Pkgfile version-updates_xorg/xorg-font-bh-75dpi/Pkgfile
  2730. --- xorg/xorg-font-bh-75dpi/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  2731. +++ version-updates_xorg/xorg-font-bh-75dpi/Pkgfile 2012-04-09 19:41:47.000000000 +1000
  2732. @@ -1,7 +1,7 @@
  2733.  # Description: xorg font font-bh-75dpi
  2734.  # URL: http://xorg.freedesktop.org
  2735.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2736. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2737. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2738.  
  2739.  name=xorg-font-bh-75dpi
  2740.  version=1.0.3
  2741. diff -pruN xorg/xorg-font-bh-lucidatypewriter-100dpi/Pkgfile version-updates_xorg/xorg-font-bh-lucidatypewriter-100dpi/Pkgfile
  2742. --- xorg/xorg-font-bh-lucidatypewriter-100dpi/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  2743. +++ version-updates_xorg/xorg-font-bh-lucidatypewriter-100dpi/Pkgfile   2012-04-09 19:41:47.000000000 +1000
  2744. @@ -1,7 +1,7 @@
  2745.  # Description: xorg font font-bh-lucidatypewriter-100dpi
  2746.  # URL: http://xorg.freedesktop.org
  2747.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2748. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2749. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2750.  
  2751.  name=xorg-font-bh-lucidatypewriter-100dpi
  2752.  version=1.0.3
  2753. diff -pruN xorg/xorg-font-bh-lucidatypewriter-75dpi/Pkgfile version-updates_xorg/xorg-font-bh-lucidatypewriter-75dpi/Pkgfile
  2754. --- xorg/xorg-font-bh-lucidatypewriter-75dpi/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  2755. +++ version-updates_xorg/xorg-font-bh-lucidatypewriter-75dpi/Pkgfile    2012-04-09 19:41:47.000000000 +1000
  2756. @@ -1,7 +1,7 @@
  2757.  # Description: xorg font font-bh-lucidatypewriter-75dpi
  2758.  # URL: http://xorg.freedesktop.org
  2759.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2760. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2761. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2762.  
  2763.  name=xorg-font-bh-lucidatypewriter-75dpi
  2764.  version=1.0.3
  2765. diff -pruN xorg/xorg-font-bh-ttf/Pkgfile version-updates_xorg/xorg-font-bh-ttf/Pkgfile
  2766. --- xorg/xorg-font-bh-ttf/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  2767. +++ version-updates_xorg/xorg-font-bh-ttf/Pkgfile   2012-04-12 01:16:08.000000000 +1000
  2768. @@ -5,7 +5,7 @@
  2769.  
  2770.  name=xorg-font-bh-ttf
  2771.  version=1.0.3
  2772. -release=1
  2773. +release=2
  2774.  source=(http://xorg.freedesktop.org/releases/individual/font/font-bh-ttf-$version.tar.bz2)
  2775.  
  2776.  build() {
  2777. @@ -17,5 +17,4 @@ build() {
  2778.     make DESTDIR=$PKG install
  2779.  
  2780.     rm $PKG/usr/share/fonts/X11/TTF/fonts.{dir,scale}
  2781. -   mv $PKG/usr/etc $PKG/
  2782.  }
  2783. diff -pruN xorg/xorg-font-bitstream-speedo/Pkgfile version-updates_xorg/xorg-font-bitstream-speedo/Pkgfile
  2784. --- xorg/xorg-font-bitstream-speedo/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  2785. +++ version-updates_xorg/xorg-font-bitstream-speedo/Pkgfile 2012-04-09 19:41:47.000000000 +1000
  2786. @@ -1,6 +1,7 @@
  2787.  # Description: xorg font font-bitstream-speedo
  2788.  # URL: http://xorg.freedesktop.org
  2789.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2790. +# Depends on: xorg-bdftopcf, xorg-mkfontdir, xorg-mkfontscale
  2791.  
  2792.  name=xorg-font-bitstream-speedo
  2793.  version=1.0.2
  2794. diff -pruN xorg/xorg-font-cronyx-cyrillic/Pkgfile version-updates_xorg/xorg-font-cronyx-cyrillic/Pkgfile
  2795. --- xorg/xorg-font-cronyx-cyrillic/Pkgfile  2012-06-14 19:08:51.000000000 +1000
  2796. +++ version-updates_xorg/xorg-font-cronyx-cyrillic/Pkgfile  2012-04-09 19:41:47.000000000 +1000
  2797. @@ -1,7 +1,7 @@
  2798.  # Description: xorg font font-cronyx-cyrillic
  2799.  # URL: http://xorg.freedesktop.org
  2800.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2801. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2802. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2803.  
  2804.  name=xorg-font-cronyx-cyrillic
  2805.  version=1.0.3
  2806. diff -pruN xorg/xorg-font-cursor-misc/Pkgfile version-updates_xorg/xorg-font-cursor-misc/Pkgfile
  2807. --- xorg/xorg-font-cursor-misc/Pkgfile  2012-06-14 19:08:51.000000000 +1000
  2808. +++ version-updates_xorg/xorg-font-cursor-misc/Pkgfile  2012-04-09 19:41:47.000000000 +1000
  2809. @@ -1,7 +1,7 @@
  2810.  # Description: xorg font font-cursor-misc
  2811.  # URL: http://xorg.freedesktop.org
  2812.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2813. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2814. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf
  2815.  
  2816.  name=xorg-font-cursor-misc
  2817.  version=1.0.3
  2818. diff -pruN xorg/xorg-font-daewoo-misc/Pkgfile version-updates_xorg/xorg-font-daewoo-misc/Pkgfile
  2819. --- xorg/xorg-font-daewoo-misc/Pkgfile  2012-06-14 19:08:51.000000000 +1000
  2820. +++ version-updates_xorg/xorg-font-daewoo-misc/Pkgfile  2012-04-09 19:41:47.000000000 +1000
  2821. @@ -1,7 +1,7 @@
  2822.  # Description: xorg font font-daewoo-misc
  2823.  # URL: http://xorg.freedesktop.org
  2824.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2825. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2826. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2827.  
  2828.  name=xorg-font-daewoo-misc
  2829.  version=1.0.3
  2830. diff -pruN xorg/xorg-font-dec-misc/Pkgfile version-updates_xorg/xorg-font-dec-misc/Pkgfile
  2831. --- xorg/xorg-font-dec-misc/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  2832. +++ version-updates_xorg/xorg-font-dec-misc/Pkgfile 2012-04-09 19:41:47.000000000 +1000
  2833. @@ -1,7 +1,7 @@
  2834.  # Description: xorg font font-dec-misc
  2835.  # URL: http://xorg.freedesktop.org
  2836.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2837. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2838. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2839.  
  2840.  name=xorg-font-dec-misc
  2841.  version=1.0.3
  2842. diff -pruN xorg/xorg-font-isas-misc/Pkgfile version-updates_xorg/xorg-font-isas-misc/Pkgfile
  2843. --- xorg/xorg-font-isas-misc/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  2844. +++ version-updates_xorg/xorg-font-isas-misc/Pkgfile    2012-04-09 19:41:47.000000000 +1000
  2845. @@ -1,7 +1,7 @@
  2846.  # Description: xorg font font-isas-misc
  2847.  # URL: http://xorg.freedesktop.org
  2848.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2849. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2850. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2851.  
  2852.  name=xorg-font-isas-misc
  2853.  version=1.0.3
  2854. diff -pruN xorg/xorg-font-jis-misc/Pkgfile version-updates_xorg/xorg-font-jis-misc/Pkgfile
  2855. --- xorg/xorg-font-jis-misc/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  2856. +++ version-updates_xorg/xorg-font-jis-misc/Pkgfile 2012-04-09 19:41:47.000000000 +1000
  2857. @@ -1,7 +1,7 @@
  2858.  # Description: xorg font font-jis-misc
  2859.  # URL: http://xorg.freedesktop.org
  2860.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2861. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2862. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2863.  
  2864.  name=xorg-font-jis-misc
  2865.  version=1.0.3
  2866. diff -pruN xorg/xorg-font-micro-misc/Pkgfile version-updates_xorg/xorg-font-micro-misc/Pkgfile
  2867. --- xorg/xorg-font-micro-misc/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  2868. +++ version-updates_xorg/xorg-font-micro-misc/Pkgfile   2012-04-09 19:41:47.000000000 +1000
  2869. @@ -1,7 +1,7 @@
  2870.  # Description: xorg font font-micro-misc
  2871.  # URL: http://xorg.freedesktop.org
  2872.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2873. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2874. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2875.  
  2876.  name=xorg-font-micro-misc
  2877.  version=1.0.3
  2878. diff -pruN xorg/xorg-font-misc-cyrillic/Pkgfile version-updates_xorg/xorg-font-misc-cyrillic/Pkgfile
  2879. --- xorg/xorg-font-misc-cyrillic/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  2880. +++ version-updates_xorg/xorg-font-misc-cyrillic/Pkgfile    2012-04-09 19:41:47.000000000 +1000
  2881. @@ -1,7 +1,7 @@
  2882.  # Description: xorg font font-misc-cyrillic
  2883.  # URL: http://xorg.freedesktop.org
  2884.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2885. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2886. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2887.  
  2888.  name=xorg-font-misc-cyrillic
  2889.  version=1.0.3
  2890. diff -pruN xorg/xorg-font-mutt-misc/Pkgfile version-updates_xorg/xorg-font-mutt-misc/Pkgfile
  2891. --- xorg/xorg-font-mutt-misc/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  2892. +++ version-updates_xorg/xorg-font-mutt-misc/Pkgfile    2012-04-09 19:41:47.000000000 +1000
  2893. @@ -1,7 +1,7 @@
  2894.  # Description: xorg font font-mutt-misc
  2895.  # URL: http://xorg.freedesktop.org
  2896.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2897. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2898. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2899.  
  2900.  name=xorg-font-mutt-misc
  2901.  version=1.0.3
  2902. diff -pruN xorg/xorg-font-schumacher-misc/Pkgfile version-updates_xorg/xorg-font-schumacher-misc/Pkgfile
  2903. --- xorg/xorg-font-schumacher-misc/Pkgfile  2012-06-14 19:08:51.000000000 +1000
  2904. +++ version-updates_xorg/xorg-font-schumacher-misc/Pkgfile  2012-04-09 19:41:47.000000000 +1000
  2905. @@ -1,7 +1,7 @@
  2906.  # Description: xorg font font-schumacher-misc
  2907.  # URL: http://xorg.freedesktop.org
  2908.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2909. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2910. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2911.  
  2912.  name=xorg-font-schumacher-misc
  2913.  version=1.1.2
  2914. diff -pruN xorg/xorg-font-screen-cyrillic/Pkgfile version-updates_xorg/xorg-font-screen-cyrillic/Pkgfile
  2915. --- xorg/xorg-font-screen-cyrillic/Pkgfile  2012-06-14 19:08:51.000000000 +1000
  2916. +++ version-updates_xorg/xorg-font-screen-cyrillic/Pkgfile  2012-04-09 19:41:47.000000000 +1000
  2917. @@ -1,7 +1,7 @@
  2918.  # Description: xorg font font-screen-cyrillic
  2919.  # URL: http://xorg.freedesktop.org
  2920.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2921. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2922. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2923.  
  2924.  name=xorg-font-screen-cyrillic
  2925.  version=1.0.4
  2926. diff -pruN xorg/xorg-font-sony-misc/Pkgfile version-updates_xorg/xorg-font-sony-misc/Pkgfile
  2927. --- xorg/xorg-font-sony-misc/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  2928. +++ version-updates_xorg/xorg-font-sony-misc/Pkgfile    2012-04-09 19:41:47.000000000 +1000
  2929. @@ -1,7 +1,7 @@
  2930.  # Description: xorg font font-sony-misc
  2931.  # URL: http://xorg.freedesktop.org
  2932.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2933. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2934. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2935.  
  2936.  name=xorg-font-sony-misc
  2937.  version=1.0.3
  2938. diff -pruN xorg/xorg-fontsproto/.md5sum version-updates_xorg/xorg-fontsproto/.md5sum
  2939. --- xorg/xorg-fontsproto/.md5sum    2012-06-14 19:08:51.000000000 +1000
  2940. +++ version-updates_xorg/xorg-fontsproto/.md5sum    2012-03-25 18:29:53.000000000 +1100
  2941. @@ -1 +1 @@
  2942. -37102ffcaa73f77d700acd6f7a25d8f0  fontsproto-2.1.1.tar.bz2
  2943. +c5f4f1fb4ba7766eedbc9489e81f3be2  fontsproto-2.1.2.tar.bz2
  2944. diff -pruN xorg/xorg-fontsproto/Pkgfile version-updates_xorg/xorg-fontsproto/Pkgfile
  2945. --- xorg/xorg-fontsproto/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  2946. +++ version-updates_xorg/xorg-fontsproto/Pkgfile    2012-03-25 18:29:53.000000000 +1100
  2947. @@ -3,7 +3,7 @@
  2948.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2949.  
  2950.  name=xorg-fontsproto
  2951. -version=2.1.1
  2952. +version=2.1.2
  2953.  release=1
  2954.  source=(http://xorg.freedesktop.org/releases/individual/proto/fontsproto-$version.tar.bz2)
  2955.  
  2956. diff -pruN xorg/xorg-font-sun-misc/Pkgfile version-updates_xorg/xorg-font-sun-misc/Pkgfile
  2957. --- xorg/xorg-font-sun-misc/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  2958. +++ version-updates_xorg/xorg-font-sun-misc/Pkgfile 2012-04-09 19:41:47.000000000 +1000
  2959. @@ -1,7 +1,7 @@
  2960.  # Description: xorg font font-sun-misc
  2961.  # URL: http://xorg.freedesktop.org
  2962.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2963. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2964. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2965.  
  2966.  name=xorg-font-sun-misc
  2967.  version=1.0.3
  2968. diff -pruN xorg/xorg-font-util/.md5sum version-updates_xorg/xorg-font-util/.md5sum
  2969. --- xorg/xorg-font-util/.md5sum 2012-06-14 19:08:51.000000000 +1000
  2970. +++ version-updates_xorg/xorg-font-util/.md5sum 2012-03-19 20:05:32.000000000 +1100
  2971. @@ -1 +1 @@
  2972. -1bdd8ed070e02b2165d7b0f0ed93280b  font-util-1.2.0.tar.bz2
  2973. +ddfc8a89d597651408369d940d03d06b  font-util-1.3.0.tar.bz2
  2974. diff -pruN xorg/xorg-font-util/Pkgfile version-updates_xorg/xorg-font-util/Pkgfile
  2975. --- xorg/xorg-font-util/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  2976. +++ version-updates_xorg/xorg-font-util/Pkgfile 2012-03-19 20:05:32.000000000 +1100
  2977. @@ -3,7 +3,7 @@
  2978.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2979.  
  2980.  name=xorg-font-util
  2981. -version=1.2.0
  2982. +version=1.3.0
  2983.  release=1
  2984.  source=(http://xorg.freedesktop.org/releases/individual/font/font-util-$version.tar.bz2)
  2985.  
  2986. diff -pruN xorg/xorg-font-winitzki-cyrillic/Pkgfile version-updates_xorg/xorg-font-winitzki-cyrillic/Pkgfile
  2987. --- xorg/xorg-font-winitzki-cyrillic/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  2988. +++ version-updates_xorg/xorg-font-winitzki-cyrillic/Pkgfile    2012-04-09 19:41:47.000000000 +1000
  2989. @@ -1,7 +1,7 @@
  2990.  # Description: xorg font font-winitzki-cyrillic
  2991.  # URL: http://xorg.freedesktop.org
  2992.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  2993. -# Depends on: xorg-mkfontdir, xorg-mkfontscale
  2994. +# Depends on: xorg-mkfontdir, xorg-mkfontscale, xorg-bdftopcf, xorg-font-util
  2995.  
  2996.  name=xorg-font-winitzki-cyrillic
  2997.  version=1.0.3
  2998. diff -pruN xorg/xorg-gccmakedep/gccmakedep-1.0.2-cc.patch version-updates_xorg/xorg-gccmakedep/gccmakedep-1.0.2-cc.patch
  2999. --- xorg/xorg-gccmakedep/gccmakedep-1.0.2-cc.patch  1970-01-01 10:00:00.000000000 +1000
  3000. +++ version-updates_xorg/xorg-gccmakedep/gccmakedep-1.0.2-cc.patch  2012-04-09 19:41:47.000000000 +1000
  3001. @@ -0,0 +1,12 @@
  3002. +diff -pruN gccmakedep-1.0.2.orig/Makefile.in gccmakedep-1.0.2/Makefile.in
  3003. +--- gccmakedep-1.0.2.orig/Makefile.in  2012-04-09 07:02:21.276427152 +0000
  3004. ++++ gccmakedep-1.0.2/Makefile.in   2012-04-09 07:03:09.634425757 +0000
  3005. +@@ -117,7 +117,7 @@ CPP = @CPP@
  3006. + CPPFLAGS = @CPPFLAGS@
  3007. + CYGPATH_W = @CYGPATH_W@
  3008. + DEFS = \
  3009. +-  -DCCCMD=$(CC)\
  3010. ++  -DCCCMD="$(CC)"\
  3011. +   -DRMCMD='"rm -f"'\
  3012. +   -DLNCMD="ln"\
  3013. +   -DMVCMD="mv"
  3014. diff -pruN xorg/xorg-gccmakedep/.md5sum version-updates_xorg/xorg-gccmakedep/.md5sum
  3015. --- xorg/xorg-gccmakedep/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3016. +++ version-updates_xorg/xorg-gccmakedep/.md5sum    2012-04-09 19:41:47.000000000 +1000
  3017. @@ -1 +1,2 @@
  3018. +50c7c7b4d120088ea2c38a7f6c893fb5  gccmakedep-1.0.2-cc.patch
  3019.  b533c0771dbbaf9b041ff35bb941d3a2  gccmakedep-1.0.2.tar.bz2
  3020. diff -pruN xorg/xorg-gccmakedep/Pkgfile version-updates_xorg/xorg-gccmakedep/Pkgfile
  3021. --- xorg/xorg-gccmakedep/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3022. +++ version-updates_xorg/xorg-gccmakedep/Pkgfile    2012-04-09 19:41:47.000000000 +1000
  3023. @@ -4,12 +4,15 @@
  3024.  
  3025.  name=xorg-gccmakedep
  3026.  version=1.0.2
  3027. -release=1
  3028. -source=(http://xorg.freedesktop.org/releases/individual/util/gccmakedep-$version.tar.bz2)
  3029. +release=2
  3030. +source=(http://xorg.freedesktop.org/releases/individual/util/gccmakedep-$version.tar.bz2
  3031. +   gccmakedep-1.0.2-cc.patch)
  3032.  
  3033.  build() {
  3034.     cd gccmakedep-$version
  3035.  
  3036. +   patch -p 1 -i $SRC/gccmakedep-1.0.2-cc.patch
  3037. +
  3038.     ./configure --prefix=/usr
  3039.  
  3040.     make
  3041. diff -pruN xorg/xorg-glproto/.md5sum version-updates_xorg/xorg-glproto/.md5sum
  3042. --- xorg/xorg-glproto/.md5sum   2012-06-14 19:08:51.000000000 +1000
  3043. +++ version-updates_xorg/xorg-glproto/.md5sum   2012-03-19 20:05:32.000000000 +1100
  3044. @@ -1 +1 @@
  3045. -f48257daf0017f7a7667e5bf48ca3578  glproto-1.4.14.tar.bz2
  3046. +d1ff0c1acc605689919c1ee2fc9b5582  glproto-1.4.15.tar.bz2
  3047. diff -pruN xorg/xorg-glproto/Pkgfile version-updates_xorg/xorg-glproto/Pkgfile
  3048. --- xorg/xorg-glproto/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  3049. +++ version-updates_xorg/xorg-glproto/Pkgfile   2012-03-19 20:05:32.000000000 +1100
  3050. @@ -3,7 +3,7 @@
  3051.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  3052.  
  3053.  name=xorg-glproto
  3054. -version=1.4.14
  3055. +version=1.4.15
  3056.  release=1
  3057.  source=(http://xorg.freedesktop.org/releases/individual/proto/glproto-$version.tar.bz2)
  3058.  
  3059. diff -pruN xorg/xorg-imake/.md5sum version-updates_xorg/xorg-imake/.md5sum
  3060. --- xorg/xorg-imake/.md5sum 2012-06-14 19:08:51.000000000 +1000
  3061. +++ version-updates_xorg/xorg-imake/.md5sum 2012-03-19 20:05:32.000000000 +1100
  3062. @@ -1 +1 @@
  3063. -48133c75bd77c127c7eff122e08ebbf6  imake-1.0.4.tar.bz2
  3064. +797ec5dcad4df56eaafa0c701d6aa5ce  imake-1.0.5.tar.bz2
  3065. diff -pruN xorg/xorg-imake/Pkgfile version-updates_xorg/xorg-imake/Pkgfile
  3066. --- xorg/xorg-imake/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  3067. +++ version-updates_xorg/xorg-imake/Pkgfile 2012-03-19 20:05:32.000000000 +1100
  3068. @@ -4,7 +4,7 @@
  3069.  # Depends on: xorg-xproto, xorg-cf-files
  3070.  
  3071.  name=xorg-imake
  3072. -version=1.0.4
  3073. +version=1.0.5
  3074.  release=1
  3075.  source=(http://xorg.freedesktop.org/releases/individual/util/imake-$version.tar.bz2)
  3076.  
  3077. diff -pruN xorg/xorg-inputproto/.md5sum version-updates_xorg/xorg-inputproto/.md5sum
  3078. --- xorg/xorg-inputproto/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3079. +++ version-updates_xorg/xorg-inputproto/.md5sum    2012-03-19 20:05:32.000000000 +1100
  3080. @@ -1 +1 @@
  3081. -07d54ae098ed4e6dce472f6ef3de05ce  inputproto-2.0.2.tar.bz2
  3082. +13c8aedaf98a92e282b7e456c0a5bed9  inputproto-2.2.tar.bz2
  3083. diff -pruN xorg/xorg-inputproto/Pkgfile version-updates_xorg/xorg-inputproto/Pkgfile
  3084. --- xorg/xorg-inputproto/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3085. +++ version-updates_xorg/xorg-inputproto/Pkgfile    2012-03-19 20:05:32.000000000 +1100
  3086. @@ -3,7 +3,7 @@
  3087.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  3088.  
  3089.  name=xorg-inputproto
  3090. -version=2.0.2
  3091. +version=2.2
  3092.  release=1
  3093.  source=(http://xorg.freedesktop.org/releases/individual/proto/inputproto-$version.tar.bz2)
  3094.  
  3095. @@ -15,6 +15,5 @@ build() {
  3096.     make
  3097.     make DESTDIR=$PKG install
  3098.  
  3099. -   rm $PKG/usr/share/doc/inputproto/{XI,XI2}proto.txt
  3100.     find $PKG/usr/share -type d -delete
  3101.  }
  3102. diff -pruN xorg/xorg-kbproto/.md5sum version-updates_xorg/xorg-kbproto/.md5sum
  3103. --- xorg/xorg-kbproto/.md5sum   2012-06-14 19:08:51.000000000 +1000
  3104. +++ version-updates_xorg/xorg-kbproto/.md5sum   2012-03-25 18:29:53.000000000 +1100
  3105. @@ -1 +1 @@
  3106. -e7edb59a3f54af15f749e8f3e314ee62  kbproto-1.0.5.tar.bz2
  3107. +677ea8523eec6caca86121ad2dca0b71  kbproto-1.0.6.tar.bz2
  3108. diff -pruN xorg/xorg-kbproto/Pkgfile version-updates_xorg/xorg-kbproto/Pkgfile
  3109. --- xorg/xorg-kbproto/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  3110. +++ version-updates_xorg/xorg-kbproto/Pkgfile   2012-03-25 18:29:53.000000000 +1100
  3111. @@ -3,7 +3,7 @@
  3112.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  3113.  
  3114.  name=xorg-kbproto
  3115. -version=1.0.5
  3116. +version=1.0.6
  3117.  release=1
  3118.  source=(http://xorg.freedesktop.org/releases/individual/proto/kbproto-$version.tar.bz2)
  3119.  
  3120. @@ -14,4 +14,6 @@ build() {
  3121.  
  3122.     make
  3123.     make DESTDIR=$PKG install
  3124. +   rm -r $PKG/usr/share/doc
  3125. +   rmdir $PKG/usr/share
  3126.  }
  3127. diff -pruN xorg/xorg-libdmx/.md5sum version-updates_xorg/xorg-libdmx/.md5sum
  3128. --- xorg/xorg-libdmx/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3129. +++ version-updates_xorg/xorg-libdmx/.md5sum    2012-03-20 01:17:56.000000000 +1100
  3130. @@ -1 +1 @@
  3131. -75fd328fab3bd4a55cccaa6d5dfff749  libdmx-1.1.1.tar.bz2
  3132. +782ced3a9e754dfeb53a8a006a75eb1a  libdmx-1.1.2.tar.bz2
  3133. diff -pruN xorg/xorg-libdmx/Pkgfile version-updates_xorg/xorg-libdmx/Pkgfile
  3134. --- xorg/xorg-libdmx/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3135. +++ version-updates_xorg/xorg-libdmx/Pkgfile    2012-03-20 01:17:56.000000000 +1100
  3136. @@ -4,7 +4,7 @@
  3137.  # Depends on: xorg-libx11, xorg-libxext, xorg-dmxproto
  3138.  
  3139.  name=xorg-libdmx
  3140. -version=1.1.1
  3141. +version=1.1.2
  3142.  release=1
  3143.  source=(http://xorg.freedesktop.org/releases/individual/lib/libdmx-$version.tar.bz2)
  3144.  
  3145. diff -pruN xorg/xorg-libfontenc/.md5sum version-updates_xorg/xorg-libfontenc/.md5sum
  3146. --- xorg/xorg-libfontenc/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3147. +++ version-updates_xorg/xorg-libfontenc/.md5sum    2012-03-19 20:05:32.000000000 +1100
  3148. @@ -1 +1 @@
  3149. -11d3c292f05a90f6f67840a9e9c3d9b8  libfontenc-1.1.0.tar.bz2
  3150. +a2a861f142c3b4367f14fc14239fc1f7  libfontenc-1.1.1.tar.bz2
  3151. diff -pruN xorg/xorg-libfontenc/Pkgfile version-updates_xorg/xorg-libfontenc/Pkgfile
  3152. --- xorg/xorg-libfontenc/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3153. +++ version-updates_xorg/xorg-libfontenc/Pkgfile    2012-03-19 20:05:32.000000000 +1100
  3154. @@ -4,7 +4,7 @@
  3155.  # Depends on: xorg-xproto
  3156.  
  3157.  name=xorg-libfontenc
  3158. -version=1.1.0
  3159. +version=1.1.1
  3160.  release=1
  3161.  source=(http://xorg.freedesktop.org/releases/individual/lib/libfontenc-$version.tar.bz2)
  3162.  
  3163. diff -pruN xorg/xorg-libfs/.md5sum version-updates_xorg/xorg-libfs/.md5sum
  3164. --- xorg/xorg-libfs/.md5sum 2012-06-14 19:08:51.000000000 +1000
  3165. +++ version-updates_xorg/xorg-libfs/.md5sum 2012-03-19 20:05:32.000000000 +1100
  3166. @@ -1 +1 @@
  3167. -8e68a3a6f3cac936042b240b20d1fb7d  libFS-1.0.3.tar.bz2
  3168. +645f83160cf7b562734e2038045106d1  libFS-1.0.4.tar.bz2
  3169. diff -pruN xorg/xorg-libfs/Pkgfile version-updates_xorg/xorg-libfs/Pkgfile
  3170. --- xorg/xorg-libfs/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  3171. +++ version-updates_xorg/xorg-libfs/Pkgfile 2012-03-19 20:05:32.000000000 +1100
  3172. @@ -4,7 +4,7 @@
  3173.  # Depends on: xorg-xproto, xorg-fontsproto, xorg-xtrans
  3174.  
  3175.  name=xorg-libfs
  3176. -version=1.0.3
  3177. +version=1.0.4
  3178.  release=1
  3179.  source=(http://xorg.freedesktop.org/releases/individual/lib/libFS-$version.tar.bz2)
  3180.  
  3181. diff -pruN xorg/xorg-libice/.md5sum version-updates_xorg/xorg-libice/.md5sum
  3182. --- xorg/xorg-libice/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3183. +++ version-updates_xorg/xorg-libice/.md5sum    2012-03-19 20:05:32.000000000 +1100
  3184. @@ -1 +1 @@
  3185. -bb72a732b15e9dc25c3036559387eed5  libICE-1.0.7.tar.bz2
  3186. +471b5ca9f5562ac0d6eac7a0bf650738  libICE-1.0.8.tar.bz2
  3187. diff -pruN xorg/xorg-libice/Pkgfile version-updates_xorg/xorg-libice/Pkgfile
  3188. --- xorg/xorg-libice/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3189. +++ version-updates_xorg/xorg-libice/Pkgfile    2012-03-19 20:05:32.000000000 +1100
  3190. @@ -4,7 +4,7 @@
  3191.  # Depends on: xorg-xproto, xorg-xtrans
  3192.  
  3193.  name=xorg-libice
  3194. -version=1.0.7
  3195. +version=1.0.8
  3196.  release=1
  3197.  source=(http://xorg.freedesktop.org/releases/individual/lib/libICE-$version.tar.bz2)
  3198.  
  3199. diff -pruN xorg/xorg-libpciaccess/.footprint version-updates_xorg/xorg-libpciaccess/.footprint
  3200. --- xorg/xorg-libpciaccess/.footprint   2012-06-14 19:08:51.000000000 +1000
  3201. +++ version-updates_xorg/xorg-libpciaccess/.footprint   2012-04-16 01:19:26.000000000 +1000
  3202. @@ -4,8 +4,8 @@ drwxr-xr-x  root/root   usr/include/
  3203.  drwxr-xr-x root/root   usr/lib/
  3204.  -rw-r--r-- root/root   usr/lib/libpciaccess.a
  3205.  -rwxr-xr-x root/root   usr/lib/libpciaccess.la
  3206. -lrwxrwxrwx root/root   usr/lib/libpciaccess.so -> libpciaccess.so.0.10.8
  3207. -lrwxrwxrwx root/root   usr/lib/libpciaccess.so.0 -> libpciaccess.so.0.10.8
  3208. --rwxr-xr-x root/root   usr/lib/libpciaccess.so.0.10.8
  3209. +lrwxrwxrwx root/root   usr/lib/libpciaccess.so -> libpciaccess.so.0.11.1
  3210. +lrwxrwxrwx root/root   usr/lib/libpciaccess.so.0 -> libpciaccess.so.0.11.1
  3211. +-rwxr-xr-x root/root   usr/lib/libpciaccess.so.0.11.1
  3212.  drwxr-xr-x root/root   usr/lib/pkgconfig/
  3213.  -rw-r--r-- root/root   usr/lib/pkgconfig/pciaccess.pc
  3214. diff -pruN xorg/xorg-libpciaccess/.md5sum version-updates_xorg/xorg-libpciaccess/.md5sum
  3215. --- xorg/xorg-libpciaccess/.md5sum  2012-06-14 19:08:51.000000000 +1000
  3216. +++ version-updates_xorg/xorg-libpciaccess/.md5sum  2012-04-16 01:19:26.000000000 +1000
  3217. @@ -1 +1 @@
  3218. -d6363ee9f4df79f6fc47cba7c67b0d35  libpciaccess-0.12.1.tar.bz2
  3219. +399a419ac6a54f0fc07c69c9bdf452dc  libpciaccess-0.13.1.tar.bz2
  3220. diff -pruN xorg/xorg-libpciaccess/Pkgfile version-updates_xorg/xorg-libpciaccess/Pkgfile
  3221. --- xorg/xorg-libpciaccess/Pkgfile  2012-06-14 19:08:51.000000000 +1000
  3222. +++ version-updates_xorg/xorg-libpciaccess/Pkgfile  2012-04-16 01:19:26.000000000 +1000
  3223. @@ -1,9 +1,10 @@
  3224.  # Description: Generic PCI access library
  3225.  # URL: http://xorg.freedesktop.org
  3226.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  3227. +# Depends on: xorg-util-macros
  3228.  
  3229.  name=xorg-libpciaccess
  3230. -version=0.12.1
  3231. +version=0.13.1
  3232.  release=1
  3233.  source=(http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-$version.tar.bz2)
  3234.  
  3235. diff -pruN xorg/xorg-libpixman/.footprint version-updates_xorg/xorg-libpixman/.footprint
  3236. --- xorg/xorg-libpixman/.footprint  2012-06-14 19:08:51.000000000 +1000
  3237. +++ version-updates_xorg/xorg-libpixman/.footprint  2012-06-04 22:49:22.000000000 +1000
  3238. @@ -6,8 +6,8 @@ drwxr-xr-x  root/root   usr/include/pixman-
  3239.  drwxr-xr-x root/root   usr/lib/
  3240.  -rw-r--r-- root/root   usr/lib/libpixman-1.a
  3241.  -rwxr-xr-x root/root   usr/lib/libpixman-1.la
  3242. -lrwxrwxrwx root/root   usr/lib/libpixman-1.so -> libpixman-1.so.0.24.0
  3243. -lrwxrwxrwx root/root   usr/lib/libpixman-1.so.0 -> libpixman-1.so.0.24.0
  3244. --rwxr-xr-x root/root   usr/lib/libpixman-1.so.0.24.0
  3245. +lrwxrwxrwx root/root   usr/lib/libpixman-1.so -> libpixman-1.so.0.26.0
  3246. +lrwxrwxrwx root/root   usr/lib/libpixman-1.so.0 -> libpixman-1.so.0.26.0
  3247. +-rwxr-xr-x root/root   usr/lib/libpixman-1.so.0.26.0
  3248.  drwxr-xr-x root/root   usr/lib/pkgconfig/
  3249.  -rw-r--r-- root/root   usr/lib/pkgconfig/pixman-1.pc
  3250. diff -pruN xorg/xorg-libpixman/.md5sum version-updates_xorg/xorg-libpixman/.md5sum
  3251. --- xorg/xorg-libpixman/.md5sum 2012-06-14 19:08:51.000000000 +1000
  3252. +++ version-updates_xorg/xorg-libpixman/.md5sum 2012-06-04 22:49:22.000000000 +1000
  3253. @@ -1 +1 @@
  3254. -db5ffcd50064421176e8afb7b85fd1a7  pixman-0.24.0.tar.bz2
  3255. +d0c41a51db89efec669812e66a5582fa  pixman-0.26.0.tar.bz2
  3256. diff -pruN xorg/xorg-libpixman/Pkgfile version-updates_xorg/xorg-libpixman/Pkgfile
  3257. --- xorg/xorg-libpixman/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  3258. +++ version-updates_xorg/xorg-libpixman/Pkgfile 2012-06-04 22:49:22.000000000 +1000
  3259. @@ -3,7 +3,7 @@
  3260.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  3261.  
  3262.  name=xorg-libpixman
  3263. -version=0.24.0
  3264. +version=0.26.0
  3265.  release=1
  3266.  source=(http://xorg.freedesktop.org/releases/individual/lib/pixman-$version.tar.bz2)
  3267.  
  3268. diff -pruN xorg/xorg-libsm/.md5sum version-updates_xorg/xorg-libsm/.md5sum
  3269. --- xorg/xorg-libsm/.md5sum 2012-06-14 19:08:51.000000000 +1000
  3270. +++ version-updates_xorg/xorg-libsm/.md5sum 2012-03-19 20:05:32.000000000 +1100
  3271. @@ -1 +1 @@
  3272. -e78c447bf1790552b644eca81b542742  libSM-1.2.0.tar.bz2
  3273. +766de9d1e1ecf8bf74cebe2111d8e2bd  libSM-1.2.1.tar.bz2
  3274. diff -pruN xorg/xorg-libsm/Pkgfile version-updates_xorg/xorg-libsm/Pkgfile
  3275. --- xorg/xorg-libsm/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  3276. +++ version-updates_xorg/xorg-libsm/Pkgfile 2012-03-19 20:05:32.000000000 +1100
  3277. @@ -4,7 +4,7 @@
  3278.  # Depends on: xorg-libice, xorg-xproto, xorg-xtrans
  3279.  
  3280.  name=xorg-libsm
  3281. -version=1.2.0
  3282. +version=1.2.1
  3283.  release=1
  3284.  source=(http://xorg.freedesktop.org/releases/individual/lib/libSM-$version.tar.bz2)
  3285.  
  3286. diff -pruN xorg/xorg-libx11/.md5sum version-updates_xorg/xorg-libx11/.md5sum
  3287. --- xorg/xorg-libx11/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3288. +++ version-updates_xorg/xorg-libx11/.md5sum    2012-06-09 08:49:43.000000000 +1000
  3289. @@ -1 +1 @@
  3290. -ed7c382cbf8c13425b6a66bcac0ca5d9  libX11-1.4.4.tar.bz2
  3291. +78b4b3bab4acbdf0abcfca30a8c70cc6  libX11-1.5.0.tar.bz2
  3292. diff -pruN xorg/xorg-libx11/Pkgfile version-updates_xorg/xorg-libx11/Pkgfile
  3293. --- xorg/xorg-libx11/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3294. +++ version-updates_xorg/xorg-libx11/Pkgfile    2012-06-09 08:49:43.000000000 +1000
  3295. @@ -4,7 +4,7 @@
  3296.  # Depends on: xorg-libxcb, xorg-xf86bigfontproto, xorg-xextproto, xorg-xtrans, xorg-kbproto, xorg-inputproto
  3297.  
  3298.  name=xorg-libx11
  3299. -version=1.4.4
  3300. +version=1.5.0
  3301.  release=1
  3302.  source=(http://xorg.freedesktop.org/releases/individual/lib/libX11-$version.tar.bz2)
  3303.  
  3304. diff -pruN xorg/xorg-libxau/.footprint version-updates_xorg/xorg-libxau/.footprint
  3305. --- xorg/xorg-libxau/.footprint 2012-06-14 19:08:51.000000000 +1000
  3306. +++ version-updates_xorg/xorg-libxau/.footprint 2012-06-09 08:49:43.000000000 +1000
  3307. @@ -8,6 +8,8 @@ drwxr-xr-x  root/root   usr/lib/
  3308.  lrwxrwxrwx root/root   usr/lib/libXau.so -> libXau.so.6.0.0
  3309.  lrwxrwxrwx root/root   usr/lib/libXau.so.6 -> libXau.so.6.0.0
  3310.  -rwxr-xr-x root/root   usr/lib/libXau.so.6.0.0
  3311. +drwxr-xr-x root/root   usr/lib/pkgconfig/
  3312. +-rw-r--r-- root/root   usr/lib/pkgconfig/xau.pc
  3313.  drwxr-xr-x root/root   usr/man/
  3314.  drwxr-xr-x root/root   usr/man/man3/
  3315.  -rw-r--r-- root/root   usr/man/man3/Xau.3.gz
  3316. @@ -19,5 +21,3 @@ drwxr-xr-x    root/root   usr/man/man3/
  3317.  -rw-r--r-- root/root   usr/man/man3/XauReadAuth.3.gz
  3318.  -rw-r--r-- root/root   usr/man/man3/XauUnlockAuth.3.gz
  3319.  -rw-r--r-- root/root   usr/man/man3/XauWriteAuth.3.gz
  3320. -drwxr-xr-x root/root   usr/lib/pkgconfig/
  3321. --rw-r--r-- root/root   usr/lib/pkgconfig/xau.pc
  3322. diff -pruN xorg/xorg-libxau/.md5sum version-updates_xorg/xorg-libxau/.md5sum
  3323. --- xorg/xorg-libxau/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3324. +++ version-updates_xorg/xorg-libxau/.md5sum    2012-03-19 20:05:32.000000000 +1100
  3325. @@ -1 +1 @@
  3326. -4a2cbd83727682f9ee1c1e719bac6adb  libXau-1.0.6.tar.bz2
  3327. +2d241521df40d27034413436d1a1465c  libXau-1.0.7.tar.bz2
  3328. diff -pruN xorg/xorg-libxau/Pkgfile version-updates_xorg/xorg-libxau/Pkgfile
  3329. --- xorg/xorg-libxau/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3330. +++ version-updates_xorg/xorg-libxau/Pkgfile    2012-03-19 20:05:32.000000000 +1100
  3331. @@ -4,7 +4,7 @@
  3332.  # Depends on: xorg-xproto
  3333.  
  3334.  name=xorg-libxau
  3335. -version=1.0.6
  3336. +version=1.0.7
  3337.  release=1
  3338.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXau-$version.tar.bz2)
  3339.  
  3340. diff -pruN xorg/xorg-libxaw/.md5sum version-updates_xorg/xorg-libxaw/.md5sum
  3341. --- xorg/xorg-libxaw/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3342. +++ version-updates_xorg/xorg-libxaw/.md5sum    2012-06-09 08:49:43.000000000 +1000
  3343. @@ -1 +1 @@
  3344. -ccc57478c41b7a75b9702241b889b1d4  libXaw-1.0.9.tar.bz2
  3345. +f39942f2cab379fc9b4c3731bf191b84  libXaw-1.0.11.tar.bz2
  3346. diff -pruN xorg/xorg-libxaw/Pkgfile version-updates_xorg/xorg-libxaw/Pkgfile
  3347. --- xorg/xorg-libxaw/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3348. +++ version-updates_xorg/xorg-libxaw/Pkgfile    2012-06-09 08:49:43.000000000 +1000
  3349. @@ -4,7 +4,7 @@
  3350.  # Depends on: xorg-xproto, xorg-libx11, xorg-xextproto, xorg-libxext, xorg-libxt, xorg-libxmu, xorg-libxpm, xorg-libxau
  3351.  
  3352.  name=xorg-libxaw
  3353. -version=1.0.9
  3354. +version=1.0.11
  3355.  release=1
  3356.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXaw-$version.tar.bz2)
  3357.  
  3358. diff -pruN xorg/xorg-libxcb/.footprint version-updates_xorg/xorg-libxcb/.footprint
  3359. --- xorg/xorg-libxcb/.footprint 2012-06-14 19:08:51.000000000 +1000
  3360. +++ version-updates_xorg/xorg-libxcb/.footprint 2012-03-25 22:43:00.000000000 +1100
  3361. @@ -23,6 +23,7 @@ drwxr-xr-x    root/root   usr/include/xcb/
  3362.  -rw-r--r-- root/root   usr/include/xcb/xfixes.h
  3363.  -rw-r--r-- root/root   usr/include/xcb/xinerama.h
  3364.  -rw-r--r-- root/root   usr/include/xcb/xinput.h
  3365. +-rw-r--r-- root/root   usr/include/xcb/xkb.h
  3366.  -rw-r--r-- root/root   usr/include/xcb/xprint.h
  3367.  -rw-r--r-- root/root   usr/include/xcb/xproto.h
  3368.  -rw-r--r-- root/root   usr/include/xcb/xselinux.h
  3369. diff -pruN xorg/xorg-libxcb/.md5sum version-updates_xorg/xorg-libxcb/.md5sum
  3370. --- xorg/xorg-libxcb/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3371. +++ version-updates_xorg/xorg-libxcb/.md5sum    2012-03-19 20:05:32.000000000 +1100
  3372. @@ -1 +1 @@
  3373. -925699df361b99491165ebc12068056b  libxcb-1.7.tar.bz2
  3374. +9da03df9e2f4c048202920d9f6a7e123  libxcb-1.8.1.tar.bz2
  3375. diff -pruN xorg/xorg-libxcb/Pkgfile version-updates_xorg/xorg-libxcb/Pkgfile
  3376. --- xorg/xorg-libxcb/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3377. +++ version-updates_xorg/xorg-libxcb/Pkgfile    2012-03-19 20:05:32.000000000 +1100
  3378. @@ -4,7 +4,7 @@
  3379.  # Depends on: xorg-xcb-proto, xorg-libxdmcp, xorg-libxau, libxslt, libpthread-stubs
  3380.  
  3381.  name=xorg-libxcb
  3382. -version=1.7
  3383. +version=1.8.1
  3384.  release=1
  3385.  source=(http://xcb.freedesktop.org/dist/libxcb-$version.tar.bz2)
  3386.  
  3387. diff -pruN xorg/xorg-libxcursor/.md5sum version-updates_xorg/xorg-libxcursor/.md5sum
  3388. --- xorg/xorg-libxcursor/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3389. +++ version-updates_xorg/xorg-libxcursor/.md5sum    2012-03-19 20:05:32.000000000 +1100
  3390. @@ -1 +1 @@
  3391. -866ed46f7e0d85b8c0003cebbb78a4af  libXcursor-1.1.11.tar.bz2
  3392. +52efa81b7f26c8eda13510a2fba98eea  libXcursor-1.1.13.tar.bz2
  3393. diff -pruN xorg/xorg-libxcursor/Pkgfile version-updates_xorg/xorg-libxcursor/Pkgfile
  3394. --- xorg/xorg-libxcursor/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3395. +++ version-updates_xorg/xorg-libxcursor/Pkgfile    2012-03-19 20:05:32.000000000 +1100
  3396. @@ -4,7 +4,7 @@
  3397.  # Depends on: xorg-libxrender, xorg-libxfixes, xorg-libx11, xorg-fixesproto
  3398.  
  3399.  name=xorg-libxcursor
  3400. -version=1.1.11
  3401. +version=1.1.13
  3402.  release=1
  3403.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXcursor-$version.tar.bz2)
  3404.  
  3405. diff -pruN xorg/xorg-libxdmcp/.md5sum version-updates_xorg/xorg-libxdmcp/.md5sum
  3406. --- xorg/xorg-libxdmcp/.md5sum  2012-06-14 19:08:51.000000000 +1000
  3407. +++ version-updates_xorg/xorg-libxdmcp/.md5sum  2012-03-19 20:05:32.000000000 +1100
  3408. @@ -1 +1 @@
  3409. -762b6bbaff7b7d0831ddb4f072f939a5  libXdmcp-1.1.0.tar.bz2
  3410. +b94af6cef211cf3ee256f7e81f70fcd9  libXdmcp-1.1.1.tar.bz2
  3411. diff -pruN xorg/xorg-libxdmcp/Pkgfile version-updates_xorg/xorg-libxdmcp/Pkgfile
  3412. --- xorg/xorg-libxdmcp/Pkgfile  2012-06-14 19:08:51.000000000 +1000
  3413. +++ version-updates_xorg/xorg-libxdmcp/Pkgfile  2012-03-19 20:05:32.000000000 +1100
  3414. @@ -4,7 +4,7 @@
  3415.  # Depends on: xorg-xproto
  3416.  
  3417.  name=xorg-libxdmcp
  3418. -version=1.1.0
  3419. +version=1.1.1
  3420.  release=1
  3421.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-$version.tar.bz2)
  3422.  
  3423. diff -pruN xorg/xorg-libxext/.md5sum version-updates_xorg/xorg-libxext/.md5sum
  3424. --- xorg/xorg-libxext/.md5sum   2012-06-14 19:08:51.000000000 +1000
  3425. +++ version-updates_xorg/xorg-libxext/.md5sum   2012-03-19 20:05:32.000000000 +1100
  3426. @@ -1 +1 @@
  3427. -161d200b690ace818db1cc7537e70ba9  libXext-1.3.0.tar.bz2
  3428. +71251a22bc47068d60a95f50ed2ec3cf  libXext-1.3.1.tar.bz2
  3429. diff -pruN xorg/xorg-libxext/Pkgfile version-updates_xorg/xorg-libxext/Pkgfile
  3430. --- xorg/xorg-libxext/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  3431. +++ version-updates_xorg/xorg-libxext/Pkgfile   2012-03-19 20:05:32.000000000 +1100
  3432. @@ -4,7 +4,7 @@
  3433.  # Depends on: xorg-xproto, xorg-libx11, xorg-xextproto, xorg-libxau
  3434.  
  3435.  name=xorg-libxext
  3436. -version=1.3.0
  3437. +version=1.3.1
  3438.  release=1
  3439.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXext-$version.tar.bz2)
  3440.  
  3441. @@ -16,6 +16,7 @@ build() {
  3442.     make
  3443.     make DESTDIR=$PKG install
  3444.  
  3445. -   #rm $PKG/usr/share/doc/libXext/{dbe,dpms,shape,sync}lib.xml
  3446. -   #find $PKG/usr/share -type d -delete
  3447. +   rm $PKG/usr/share/doc/libXext/{dbe,dpms,shape,sync}lib.xml
  3448. +   rm $PKG/usr/share/doc/libXext/xtest1.xml
  3449. +   find $PKG/usr/share -type d -delete
  3450.  }
  3451. diff -pruN xorg/xorg-libxfont/.md5sum version-updates_xorg/xorg-libxfont/.md5sum
  3452. --- xorg/xorg-libxfont/.md5sum  2012-06-14 19:08:51.000000000 +1000
  3453. +++ version-updates_xorg/xorg-libxfont/.md5sum  2012-03-19 20:05:32.000000000 +1100
  3454. @@ -1 +1 @@
  3455. -f9942bc818d39094d7295b156a729393  libXfont-1.4.4.tar.bz2
  3456. +6851da5dae0a6cf5f7c9b9e2b05dd3b4  libXfont-1.4.5.tar.bz2
  3457. diff -pruN xorg/xorg-libxfont/Pkgfile version-updates_xorg/xorg-libxfont/Pkgfile
  3458. --- xorg/xorg-libxfont/Pkgfile  2012-06-14 19:08:51.000000000 +1000
  3459. +++ version-updates_xorg/xorg-libxfont/Pkgfile  2012-03-19 20:05:32.000000000 +1100
  3460. @@ -4,7 +4,7 @@
  3461.  # Depends on: freetype, xorg-xproto, xorg-xtrans, xorg-fontsproto, xorg-libfontenc
  3462.  
  3463.  name=xorg-libxfont
  3464. -version=1.4.4
  3465. +version=1.4.5
  3466.  release=1
  3467.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXfont-$version.tar.bz2)
  3468.  
  3469. diff -pruN xorg/xorg-libxft/.footprint version-updates_xorg/xorg-libxft/.footprint
  3470. --- xorg/xorg-libxft/.footprint 2012-06-14 19:08:51.000000000 +1000
  3471. +++ version-updates_xorg/xorg-libxft/.footprint 2012-06-09 08:49:43.000000000 +1000
  3472. @@ -7,9 +7,9 @@ drwxr-xr-x  root/root   usr/include/X11/Xft
  3473.  drwxr-xr-x root/root   usr/lib/
  3474.  -rw-r--r-- root/root   usr/lib/libXft.a
  3475.  -rwxr-xr-x root/root   usr/lib/libXft.la
  3476. -lrwxrwxrwx root/root   usr/lib/libXft.so -> libXft.so.2.2.0
  3477. -lrwxrwxrwx root/root   usr/lib/libXft.so.2 -> libXft.so.2.2.0
  3478. --rwxr-xr-x root/root   usr/lib/libXft.so.2.2.0
  3479. +lrwxrwxrwx root/root   usr/lib/libXft.so -> libXft.so.2.3.1
  3480. +lrwxrwxrwx root/root   usr/lib/libXft.so.2 -> libXft.so.2.3.1
  3481. +-rwxr-xr-x root/root   usr/lib/libXft.so.2.3.1
  3482.  drwxr-xr-x root/root   usr/lib/pkgconfig/
  3483.  -rw-r--r-- root/root   usr/lib/pkgconfig/xft.pc
  3484.  drwxr-xr-x root/root   usr/man/
  3485. diff -pruN xorg/xorg-libxft/.md5sum version-updates_xorg/xorg-libxft/.md5sum
  3486. --- xorg/xorg-libxft/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3487. +++ version-updates_xorg/xorg-libxft/.md5sum    2012-06-09 08:49:43.000000000 +1000
  3488. @@ -1 +1 @@
  3489. -cce3c327258116493b753f157e0360c7  libXft-2.2.0.tar.bz2
  3490. +78d64dece560c9e8699199f3faa521c0  libXft-2.3.1.tar.bz2
  3491. diff -pruN xorg/xorg-libxft/Pkgfile version-updates_xorg/xorg-libxft/Pkgfile
  3492. --- xorg/xorg-libxft/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3493. +++ version-updates_xorg/xorg-libxft/Pkgfile    2012-06-09 08:49:43.000000000 +1000
  3494. @@ -4,7 +4,7 @@
  3495.  # Depends on: xorg-libxrender, freetype, fontconfig
  3496.  
  3497.  name=xorg-libxft
  3498. -version=2.2.0
  3499. +version=2.3.1
  3500.  release=1
  3501.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXft-$version.tar.bz2)
  3502.  
  3503. diff -pruN xorg/xorg-libxi/.md5sum version-updates_xorg/xorg-libxi/.md5sum
  3504. --- xorg/xorg-libxi/.md5sum 2012-06-14 19:08:51.000000000 +1000
  3505. +++ version-updates_xorg/xorg-libxi/.md5sum 2012-06-09 08:49:43.000000000 +1000
  3506. @@ -1 +1 @@
  3507. -792e8a7ddc7175911d69f823d38eaff6  libXi-1.4.3.tar.bz2
  3508. +78ee882e1ff3b192cf54070bdb19938e  libXi-1.6.1.tar.bz2
  3509. diff -pruN xorg/xorg-libxi/Pkgfile version-updates_xorg/xorg-libxi/Pkgfile
  3510. --- xorg/xorg-libxi/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  3511. +++ version-updates_xorg/xorg-libxi/Pkgfile 2012-06-09 08:49:43.000000000 +1000
  3512. @@ -4,7 +4,7 @@
  3513.  # Depends on: xorg-xproto, xorg-libx11, xorg-xextproto, xorg-libxext, xorg-inputproto
  3514.  
  3515.  name=xorg-libxi
  3516. -version=1.4.3
  3517. +version=1.6.1
  3518.  release=1
  3519.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXi-$version.tar.bz2)
  3520.  
  3521. @@ -16,7 +16,6 @@ build() {
  3522.     make
  3523.     make DESTDIR=$PKG install
  3524.  
  3525. -   rm $PKG/usr/share/doc/libXi/doc/porting.xml
  3526. -   rm $PKG/usr/share/doc/libXi/specs/{encoding,inputlib,library}.xml
  3527. +   rm $PKG/usr/share/doc/libXi/{encoding,inputlib,library}.xml
  3528.     find $PKG/usr/share -type d -delete
  3529.  }
  3530. diff -pruN xorg/xorg-libxinerama/.md5sum version-updates_xorg/xorg-libxinerama/.md5sum
  3531. --- xorg/xorg-libxinerama/.md5sum   2012-06-14 19:08:51.000000000 +1000
  3532. +++ version-updates_xorg/xorg-libxinerama/.md5sum   2012-03-19 20:05:32.000000000 +1100
  3533. @@ -1 +1 @@
  3534. -ecd4839ad01f6f637c6fb5327207f89b  libXinerama-1.1.1.tar.bz2
  3535. +cb45d6672c93a608f003b6404f1dd462  libXinerama-1.1.2.tar.bz2
  3536. diff -pruN xorg/xorg-libxinerama/Pkgfile version-updates_xorg/xorg-libxinerama/Pkgfile
  3537. --- xorg/xorg-libxinerama/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  3538. +++ version-updates_xorg/xorg-libxinerama/Pkgfile   2012-03-19 20:05:32.000000000 +1100
  3539. @@ -4,7 +4,7 @@
  3540.  # Depends on: xorg-libx11, xorg-xextproto, xorg-libxext, xorg-xineramaproto
  3541.  
  3542.  name=xorg-libxinerama
  3543. -version=1.1.1
  3544. +version=1.1.2
  3545.  release=1
  3546.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXinerama-$version.tar.bz2)
  3547.  
  3548. diff -pruN xorg/xorg-libxkbfile/.md5sum version-updates_xorg/xorg-libxkbfile/.md5sum
  3549. --- xorg/xorg-libxkbfile/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3550. +++ version-updates_xorg/xorg-libxkbfile/.md5sum    2012-03-19 20:05:32.000000000 +1100
  3551. @@ -1 +1 @@
  3552. -59b4fe0bdf8d9b05e45b59e8fe9e7516  libxkbfile-1.0.7.tar.bz2
  3553. +19e6533ae64abba0773816a23f2b9507  libxkbfile-1.0.8.tar.bz2
  3554. diff -pruN xorg/xorg-libxkbfile/Pkgfile version-updates_xorg/xorg-libxkbfile/Pkgfile
  3555. --- xorg/xorg-libxkbfile/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3556. +++ version-updates_xorg/xorg-libxkbfile/Pkgfile    2012-03-19 20:05:32.000000000 +1100
  3557. @@ -4,7 +4,7 @@
  3558.  # Depends on: xorg-libx11, xorg-kbproto
  3559.  
  3560.  name=xorg-libxkbfile
  3561. -version=1.0.7
  3562. +version=1.0.8
  3563.  release=1
  3564.  source=(http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-$version.tar.bz2)
  3565.  
  3566. diff -pruN xorg/xorg-libxmu/.md5sum version-updates_xorg/xorg-libxmu/.md5sum
  3567. --- xorg/xorg-libxmu/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3568. +++ version-updates_xorg/xorg-libxmu/.md5sum    2012-03-19 20:05:32.000000000 +1100
  3569. @@ -1 +1 @@
  3570. -6836883a0120e8346cf7f58dc42e465a  libXmu-1.1.0.tar.bz2
  3571. +a4efff8de85bd45dd3da124285d10c00  libXmu-1.1.1.tar.bz2
  3572. diff -pruN xorg/xorg-libxmu/Pkgfile version-updates_xorg/xorg-libxmu/Pkgfile
  3573. --- xorg/xorg-libxmu/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3574. +++ version-updates_xorg/xorg-libxmu/Pkgfile    2012-03-19 20:05:32.000000000 +1100
  3575. @@ -4,7 +4,7 @@
  3576.  # Depends on: xorg-libxt, xorg-xextproto, xorg-libxext, xorg-libx11
  3577.  
  3578.  name=xorg-libxmu
  3579. -version=1.1.0
  3580. +version=1.1.1
  3581.  release=1
  3582.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXmu-$version.tar.bz2)
  3583.  
  3584. diff -pruN xorg/xorg-libxpm/.footprint version-updates_xorg/xorg-libxpm/.footprint
  3585. --- xorg/xorg-libxpm/.footprint 2012-06-14 19:08:51.000000000 +1000
  3586. +++ version-updates_xorg/xorg-libxpm/.footprint 2012-06-09 08:49:43.000000000 +1000
  3587. @@ -11,9 +11,9 @@ drwxr-xr-x    root/root   usr/lib/
  3588.  lrwxrwxrwx root/root   usr/lib/libXpm.so -> libXpm.so.4.11.0
  3589.  lrwxrwxrwx root/root   usr/lib/libXpm.so.4 -> libXpm.so.4.11.0
  3590.  -rwxr-xr-x root/root   usr/lib/libXpm.so.4.11.0
  3591. +drwxr-xr-x root/root   usr/lib/pkgconfig/
  3592. +-rw-r--r-- root/root   usr/lib/pkgconfig/xpm.pc
  3593.  drwxr-xr-x root/root   usr/man/
  3594.  drwxr-xr-x root/root   usr/man/man1/
  3595.  -rw-r--r-- root/root   usr/man/man1/cxpm.1.gz
  3596.  -rw-r--r-- root/root   usr/man/man1/sxpm.1.gz
  3597. -drwxr-xr-x root/root   usr/lib/pkgconfig/
  3598. --rw-r--r-- root/root   usr/lib/pkgconfig/xpm.pc
  3599. diff -pruN xorg/xorg-libxpm/.md5sum version-updates_xorg/xorg-libxpm/.md5sum
  3600. --- xorg/xorg-libxpm/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3601. +++ version-updates_xorg/xorg-libxpm/.md5sum    2012-03-19 20:05:32.000000000 +1100
  3602. @@ -1 +1 @@
  3603. -2de3a1b9541f4b3a6f9d84b69d25530e  libXpm-3.5.9.tar.bz2
  3604. +7ae7eff7a14d411e84a67bd166bcec1a  libXpm-3.5.10.tar.bz2
  3605. diff -pruN xorg/xorg-libxpm/Pkgfile version-updates_xorg/xorg-libxpm/Pkgfile
  3606. --- xorg/xorg-libxpm/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3607. +++ version-updates_xorg/xorg-libxpm/Pkgfile    2012-03-19 20:05:32.000000000 +1100
  3608. @@ -4,7 +4,7 @@
  3609.  # Depends on: xorg-xproto, xorg-libx11, xorg-libxt, xorg-xextproto, xorg-libxext
  3610.  
  3611.  name=xorg-libxpm
  3612. -version=3.5.9
  3613. +version=3.5.10
  3614.  release=1
  3615.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXpm-$version.tar.bz2)
  3616.  
  3617. diff -pruN xorg/xorg-libxrandr/.md5sum version-updates_xorg/xorg-libxrandr/.md5sum
  3618. --- xorg/xorg-libxrandr/.md5sum 2012-06-14 19:08:51.000000000 +1000
  3619. +++ version-updates_xorg/xorg-libxrandr/.md5sum 2012-03-19 20:05:32.000000000 +1100
  3620. @@ -1 +1 @@
  3621. -7785c3f7cff2735c94657e8f87ed8ad3  libXrandr-1.3.1.tar.bz2
  3622. +92473da2fccf5fac665be4fa4f2037fa  libXrandr-1.3.2.tar.bz2
  3623. diff -pruN xorg/xorg-libxrandr/Pkgfile version-updates_xorg/xorg-libxrandr/Pkgfile
  3624. --- xorg/xorg-libxrandr/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  3625. +++ version-updates_xorg/xorg-libxrandr/Pkgfile 2012-03-19 20:05:32.000000000 +1100
  3626. @@ -4,7 +4,7 @@
  3627.  # Depends on: xorg-libx11, xorg-randrproto, xorg-xextproto, xorg-libxext, xorg-libxrender, xorg-renderproto
  3628.  
  3629.  name=xorg-libxrandr
  3630. -version=1.3.1
  3631. +version=1.3.2
  3632.  release=1
  3633.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXrandr-$version.tar.bz2)
  3634.  
  3635. diff -pruN xorg/xorg-libxrender/.md5sum version-updates_xorg/xorg-libxrender/.md5sum
  3636. --- xorg/xorg-libxrender/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3637. +++ version-updates_xorg/xorg-libxrender/.md5sum    2012-03-19 20:05:32.000000000 +1100
  3638. @@ -1 +1 @@
  3639. -3b3b7d076c2384b6c600c0b5f4ba971f  libXrender-0.9.6.tar.bz2
  3640. +ee62f4c7f0f16ced4da63308963ccad2  libXrender-0.9.7.tar.bz2
  3641. diff -pruN xorg/xorg-libxrender/Pkgfile version-updates_xorg/xorg-libxrender/Pkgfile
  3642. --- xorg/xorg-libxrender/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3643. +++ version-updates_xorg/xorg-libxrender/Pkgfile    2012-03-19 20:05:32.000000000 +1100
  3644. @@ -4,7 +4,7 @@
  3645.  # Depends on: xorg-libx11, xorg-renderproto
  3646.  
  3647.  name=xorg-libxrender
  3648. -version=0.9.6
  3649. +version=0.9.7
  3650.  release=1
  3651.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXrender-$version.tar.bz2)
  3652.  
  3653. diff -pruN xorg/xorg-libxres/.footprint version-updates_xorg/xorg-libxres/.footprint
  3654. --- xorg/xorg-libxres/.footprint    2012-06-14 19:08:51.000000000 +1000
  3655. +++ version-updates_xorg/xorg-libxres/.footprint    2012-06-09 08:49:43.000000000 +1000
  3656. @@ -9,6 +9,8 @@ drwxr-xr-x  root/root   usr/lib/
  3657.  lrwxrwxrwx root/root   usr/lib/libXRes.so -> libXRes.so.1.0.0
  3658.  lrwxrwxrwx root/root   usr/lib/libXRes.so.1 -> libXRes.so.1.0.0
  3659.  -rwxr-xr-x root/root   usr/lib/libXRes.so.1.0.0
  3660. +drwxr-xr-x root/root   usr/lib/pkgconfig/
  3661. +-rw-r--r-- root/root   usr/lib/pkgconfig/xres.pc
  3662.  drwxr-xr-x root/root   usr/man/
  3663.  drwxr-xr-x root/root   usr/man/man3/
  3664.  -rw-r--r-- root/root   usr/man/man3/XRes.3.gz
  3665. @@ -17,5 +19,3 @@ drwxr-xr-x    root/root   usr/man/man3/
  3666.  -rw-r--r-- root/root   usr/man/man3/XResQueryClients.3.gz
  3667.  -rw-r--r-- root/root   usr/man/man3/XResQueryExtension.3.gz
  3668.  -rw-r--r-- root/root   usr/man/man3/XResQueryVersion.3.gz
  3669. -drwxr-xr-x root/root   usr/lib/pkgconfig/
  3670. --rw-r--r-- root/root   usr/lib/pkgconfig/xres.pc
  3671. diff -pruN xorg/xorg-libxres/.md5sum version-updates_xorg/xorg-libxres/.md5sum
  3672. --- xorg/xorg-libxres/.md5sum   2012-06-14 19:08:51.000000000 +1000
  3673. +++ version-updates_xorg/xorg-libxres/.md5sum   2012-03-19 20:05:32.000000000 +1100
  3674. @@ -1 +1 @@
  3675. -d08f0b6df3f96c051637d37009f4e55a  libXres-1.0.5.tar.bz2
  3676. +80d0c6d8522fa7a645e4f522e9a9cd20  libXres-1.0.6.tar.bz2
  3677. diff -pruN xorg/xorg-libxres/Pkgfile version-updates_xorg/xorg-libxres/Pkgfile
  3678. --- xorg/xorg-libxres/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  3679. +++ version-updates_xorg/xorg-libxres/Pkgfile   2012-03-19 20:05:32.000000000 +1100
  3680. @@ -4,7 +4,7 @@
  3681.  # Depends on: xorg-libx11, xorg-libxext, xorg-resourceproto
  3682.  
  3683.  name=xorg-libxres
  3684. -version=1.0.5
  3685. +version=1.0.6
  3686.  release=1
  3687.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXres-$version.tar.bz2)
  3688.  
  3689. diff -pruN xorg/xorg-libxscrnsaver/.md5sum version-updates_xorg/xorg-libxscrnsaver/.md5sum
  3690. --- xorg/xorg-libxscrnsaver/.md5sum 2012-06-14 19:08:51.000000000 +1000
  3691. +++ version-updates_xorg/xorg-libxscrnsaver/.md5sum 2012-03-19 20:05:32.000000000 +1100
  3692. @@ -1 +1 @@
  3693. -898794bf6812fc9be9bf1bb7aa4d2b08  libXScrnSaver-1.2.1.tar.bz2
  3694. +7a773b16165e39e938650bcc9027c1d5  libXScrnSaver-1.2.2.tar.bz2
  3695. diff -pruN xorg/xorg-libxscrnsaver/Pkgfile version-updates_xorg/xorg-libxscrnsaver/Pkgfile
  3696. --- xorg/xorg-libxscrnsaver/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  3697. +++ version-updates_xorg/xorg-libxscrnsaver/Pkgfile 2012-03-19 20:05:32.000000000 +1100
  3698. @@ -4,7 +4,7 @@
  3699.  # Depends on: xorg-libx11, xorg-xextproto, xorg-libxext, xorg-scrnsaverproto
  3700.  
  3701.  name=xorg-libxscrnsaver
  3702. -version=1.2.1
  3703. +version=1.2.2
  3704.  release=1
  3705.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-$version.tar.bz2)
  3706.  
  3707. diff -pruN xorg/xorg-libxt/.md5sum version-updates_xorg/xorg-libxt/.md5sum
  3708. --- xorg/xorg-libxt/.md5sum 2012-06-14 19:08:51.000000000 +1000
  3709. +++ version-updates_xorg/xorg-libxt/.md5sum 2012-03-19 20:05:32.000000000 +1100
  3710. @@ -1 +1 @@
  3711. -eb22c0a1f172b06b97a3f5ae89768412  libXt-1.1.1.tar.bz2
  3712. +a6f137ae100e74ebe3b71eb4a38c40b3  libXt-1.1.3.tar.bz2
  3713. diff -pruN xorg/xorg-libxt/Pkgfile version-updates_xorg/xorg-libxt/Pkgfile
  3714. --- xorg/xorg-libxt/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  3715. +++ version-updates_xorg/xorg-libxt/Pkgfile 2012-03-19 20:05:32.000000000 +1100
  3716. @@ -4,7 +4,7 @@
  3717.  # Depends on: xorg-libsm, xorg-libx11, xorg-xproto, xorg-kbproto
  3718.  
  3719.  name=xorg-libxt
  3720. -version=1.1.1
  3721. +version=1.1.3
  3722.  release=1
  3723.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXt-$version.tar.bz2)
  3724.  
  3725. @@ -15,4 +15,8 @@ build() {
  3726.  
  3727.     make
  3728.     make DESTDIR=$PKG install
  3729. +
  3730. +   rm -r $PKG/usr/share/doc/libXt
  3731. +   rmdir $PKG/usr/share/doc
  3732. +   rmdir $PKG/usr/share
  3733.  }
  3734. diff -pruN xorg/xorg-libxtst/.md5sum version-updates_xorg/xorg-libxtst/.md5sum
  3735. --- xorg/xorg-libxtst/.md5sum   2012-06-14 19:08:51.000000000 +1000
  3736. +++ version-updates_xorg/xorg-libxtst/.md5sum   2012-03-21 00:42:32.000000000 +1100
  3737. @@ -1 +1 @@
  3738. -7c592c72da6676f8b0aeec9133b81686  libXtst-1.2.0.tar.bz2
  3739. +e8abc5c00c666f551cf26aa53819d592  libXtst-1.2.1.tar.bz2
  3740. diff -pruN xorg/xorg-libxtst/Pkgfile version-updates_xorg/xorg-libxtst/Pkgfile
  3741. --- xorg/xorg-libxtst/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  3742. +++ version-updates_xorg/xorg-libxtst/Pkgfile   2012-03-21 00:42:32.000000000 +1100
  3743. @@ -4,7 +4,7 @@
  3744.  # Depends on: xorg-libx11, xorg-libxext, xorg-libxi, xorg-recordproto
  3745.  
  3746.  name=xorg-libxtst
  3747. -version=1.2.0
  3748. +version=1.2.1
  3749.  release=1
  3750.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXtst-$version.tar.bz2)
  3751.  
  3752. diff -pruN xorg/xorg-libxv/.md5sum version-updates_xorg/xorg-libxv/.md5sum
  3753. --- xorg/xorg-libxv/.md5sum 2012-06-14 19:08:51.000000000 +1000
  3754. +++ version-updates_xorg/xorg-libxv/.md5sum 2012-03-19 20:05:32.000000000 +1100
  3755. @@ -1 +1 @@
  3756. -e292445a64b63e918bbc8b6aae6391dd  libXv-1.0.6.tar.bz2
  3757. +5e1ac203ccd3ce3e89755ed1fbe75b0b  libXv-1.0.7.tar.bz2
  3758. diff -pruN xorg/xorg-libxv/Pkgfile version-updates_xorg/xorg-libxv/Pkgfile
  3759. --- xorg/xorg-libxv/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  3760. +++ version-updates_xorg/xorg-libxv/Pkgfile 2012-03-19 20:05:32.000000000 +1100
  3761. @@ -4,7 +4,7 @@
  3762.  # Depends on: xorg-libx11, xorg-libxext, xorg-videoproto
  3763.  
  3764.  name=xorg-libxv
  3765. -version=1.0.6
  3766. +version=1.0.7
  3767.  release=1
  3768.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXv-$version.tar.bz2)
  3769.  
  3770. diff -pruN xorg/xorg-libxvmc/.md5sum version-updates_xorg/xorg-libxvmc/.md5sum
  3771. --- xorg/xorg-libxvmc/.md5sum   2012-06-14 19:08:51.000000000 +1000
  3772. +++ version-updates_xorg/xorg-libxvmc/.md5sum   2012-03-19 20:05:32.000000000 +1100
  3773. @@ -1 +1 @@
  3774. -bfc7524646f890dfc30dea1d676004a3  libXvMC-1.0.6.tar.bz2
  3775. +3340c99ff556ea2457b4be47f5cb96fa  libXvMC-1.0.7.tar.bz2
  3776. diff -pruN xorg/xorg-libxvmc/Pkgfile version-updates_xorg/xorg-libxvmc/Pkgfile
  3777. --- xorg/xorg-libxvmc/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  3778. +++ version-updates_xorg/xorg-libxvmc/Pkgfile   2012-03-19 20:05:32.000000000 +1100
  3779. @@ -4,7 +4,7 @@
  3780.  # Depends on: xorg-libx11, xorg-libxext, xorg-libxv
  3781.  
  3782.  name=xorg-libxvmc
  3783. -version=1.0.6
  3784. +version=1.0.7
  3785.  release=1
  3786.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXvMC-$version.tar.bz2)
  3787.  
  3788. diff -pruN xorg/xorg-libxxf86dga/.md5sum version-updates_xorg/xorg-libxxf86dga/.md5sum
  3789. --- xorg/xorg-libxxf86dga/.md5sum   2012-06-14 19:08:51.000000000 +1000
  3790. +++ version-updates_xorg/xorg-libxxf86dga/.md5sum   2012-03-20 01:17:56.000000000 +1100
  3791. @@ -1 +1 @@
  3792. -bbd5fdf63d4c107c8cb710d4df2012b4  libXxf86dga-1.1.2.tar.bz2
  3793. +b7f38465c46e7145782d37dbb9da8c09  libXxf86dga-1.1.3.tar.bz2
  3794. diff -pruN xorg/xorg-libxxf86dga/Pkgfile version-updates_xorg/xorg-libxxf86dga/Pkgfile
  3795. --- xorg/xorg-libxxf86dga/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  3796. +++ version-updates_xorg/xorg-libxxf86dga/Pkgfile   2012-03-20 01:17:56.000000000 +1100
  3797. @@ -4,7 +4,7 @@
  3798.  # Depends on: xorg-xproto, xorg-libx11, xorg-libxext, xorg-xf86dgaproto
  3799.  
  3800.  name=xorg-libxxf86dga
  3801. -version=1.1.2
  3802. +version=1.1.3
  3803.  release=1
  3804.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-$version.tar.bz2)
  3805.  
  3806. diff -pruN xorg/xorg-libxxf86vm/.md5sum version-updates_xorg/xorg-libxxf86vm/.md5sum
  3807. --- xorg/xorg-libxxf86vm/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3808. +++ version-updates_xorg/xorg-libxxf86vm/.md5sum    2012-03-21 00:42:32.000000000 +1100
  3809. @@ -1 +1 @@
  3810. -34dc3df888c164378da89a7deeb245a0  libXxf86vm-1.1.1.tar.bz2
  3811. +ffd93bcedd8b2b5aeabf184e7b91f326  libXxf86vm-1.1.2.tar.bz2
  3812. diff -pruN xorg/xorg-libxxf86vm/Pkgfile version-updates_xorg/xorg-libxxf86vm/Pkgfile
  3813. --- xorg/xorg-libxxf86vm/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3814. +++ version-updates_xorg/xorg-libxxf86vm/Pkgfile    2012-03-21 00:42:32.000000000 +1100
  3815. @@ -4,7 +4,7 @@
  3816.  # Depends on: xorg-xproto, xorg-libx11, xorg-libxext, xorg-xf86vidmodeproto
  3817.  
  3818.  name=xorg-libxxf86vm
  3819. -version=1.1.1
  3820. +version=1.1.2
  3821.  release=1
  3822.  source=(http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-$version.tar.bz2)
  3823.  
  3824. diff -pruN xorg/xorg-makedepend/.md5sum version-updates_xorg/xorg-makedepend/.md5sum
  3825. --- xorg/xorg-makedepend/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3826. +++ version-updates_xorg/xorg-makedepend/.md5sum    2012-03-19 20:05:32.000000000 +1100
  3827. @@ -1 +1 @@
  3828. -4e6cb97bbecfbb34f3f644a75e513093  makedepend-1.0.3.tar.bz2
  3829. +7acb9a831817fdd11ba7f7aaa3c74fd8  makedepend-1.0.4.tar.bz2
  3830. diff -pruN xorg/xorg-makedepend/Pkgfile version-updates_xorg/xorg-makedepend/Pkgfile
  3831. --- xorg/xorg-makedepend/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3832. +++ version-updates_xorg/xorg-makedepend/Pkgfile    2012-03-19 20:05:32.000000000 +1100
  3833. @@ -4,7 +4,7 @@
  3834.  # Depends on: xorg-xproto
  3835.  
  3836.  name=xorg-makedepend
  3837. -version=1.0.3
  3838. +version=1.0.4
  3839.  release=1
  3840.  source=(http://xorg.freedesktop.org/releases/individual/util/makedepend-$version.tar.bz2)
  3841.  
  3842. diff -pruN xorg/xorg-mkfontdir/.md5sum version-updates_xorg/xorg-mkfontdir/.md5sum
  3843. --- xorg/xorg-mkfontdir/.md5sum 2012-06-14 19:08:51.000000000 +1000
  3844. +++ version-updates_xorg/xorg-mkfontdir/.md5sum 2012-03-19 20:05:32.000000000 +1100
  3845. @@ -1 +1 @@
  3846. -dc342dd8858416254bb5f71a9ddce589  mkfontdir-1.0.6.tar.bz2
  3847. +18c429148c96c2079edda922a2b67632  mkfontdir-1.0.7.tar.bz2
  3848. diff -pruN xorg/xorg-mkfontdir/Pkgfile version-updates_xorg/xorg-mkfontdir/Pkgfile
  3849. --- xorg/xorg-mkfontdir/Pkgfile 2012-06-14 19:08:51.000000000 +1000
  3850. +++ version-updates_xorg/xorg-mkfontdir/Pkgfile 2012-03-19 20:05:32.000000000 +1100
  3851. @@ -3,7 +3,7 @@
  3852.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  3853.  
  3854.  name=xorg-mkfontdir
  3855. -version=1.0.6
  3856. +version=1.0.7
  3857.  release=1
  3858.  source=(http://xorg.freedesktop.org/releases/individual/app/mkfontdir-$version.tar.bz2)
  3859.  
  3860. diff -pruN xorg/xorg-mkfontscale/.md5sum version-updates_xorg/xorg-mkfontscale/.md5sum
  3861. --- xorg/xorg-mkfontscale/.md5sum   2012-06-14 19:08:51.000000000 +1000
  3862. +++ version-updates_xorg/xorg-mkfontscale/.md5sum   2012-03-20 01:17:56.000000000 +1100
  3863. @@ -1 +1 @@
  3864. -3d1dc487f3e859f4e5c46540cb49abd3  mkfontscale-1.0.9.tar.bz2
  3865. +414fcb053418fb1418e3a39f4a37e0f7  mkfontscale-1.1.0.tar.bz2
  3866. diff -pruN xorg/xorg-mkfontscale/Pkgfile version-updates_xorg/xorg-mkfontscale/Pkgfile
  3867. --- xorg/xorg-mkfontscale/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  3868. +++ version-updates_xorg/xorg-mkfontscale/Pkgfile   2012-03-20 01:17:56.000000000 +1100
  3869. @@ -4,7 +4,7 @@
  3870.  # Depends on: xorg-libx11, xorg-libfontenc, freetype
  3871.  
  3872.  name=xorg-mkfontscale
  3873. -version=1.0.9
  3874. +version=1.1.0
  3875.  release=1
  3876.  source=(http://xorg.freedesktop.org/releases/individual/app/mkfontscale-$version.tar.bz2)
  3877.  
  3878. diff -pruN xorg/xorg-recordproto/.md5sum version-updates_xorg/xorg-recordproto/.md5sum
  3879. --- xorg/xorg-recordproto/.md5sum   2012-06-14 19:08:51.000000000 +1000
  3880. +++ version-updates_xorg/xorg-recordproto/.md5sum   2012-03-25 18:29:53.000000000 +1100
  3881. @@ -1 +1 @@
  3882. -24541a30b399213def35f48efd926c63  recordproto-1.14.1.tar.bz2
  3883. +1b4e5dede5ea51906f1530ca1e21d216  recordproto-1.14.2.tar.bz2
  3884. diff -pruN xorg/xorg-recordproto/Pkgfile version-updates_xorg/xorg-recordproto/Pkgfile
  3885. --- xorg/xorg-recordproto/Pkgfile   2012-06-14 19:08:51.000000000 +1000
  3886. +++ version-updates_xorg/xorg-recordproto/Pkgfile   2012-03-25 18:29:53.000000000 +1100
  3887. @@ -3,7 +3,7 @@
  3888.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  3889.  
  3890.  name=xorg-recordproto
  3891. -version=1.14.1
  3892. +version=1.14.2
  3893.  release=1
  3894.  source=(http://xorg.freedesktop.org/releases/individual/proto/recordproto-$version.tar.bz2)
  3895.  
  3896. diff -pruN xorg/xorg-scrnsaverproto/.md5sum version-updates_xorg/xorg-scrnsaverproto/.md5sum
  3897. --- xorg/xorg-scrnsaverproto/.md5sum    2012-06-14 19:08:51.000000000 +1000
  3898. +++ version-updates_xorg/xorg-scrnsaverproto/.md5sum    2012-03-25 18:29:53.000000000 +1100
  3899. @@ -1 +1 @@
  3900. -6af0f2e3369f5f74e69345e214f5fd0d  scrnsaverproto-1.2.1.tar.bz2
  3901. +edd8a73775e8ece1d69515dd17767bfb  scrnsaverproto-1.2.2.tar.bz2
  3902. diff -pruN xorg/xorg-scrnsaverproto/Pkgfile version-updates_xorg/xorg-scrnsaverproto/Pkgfile
  3903. --- xorg/xorg-scrnsaverproto/Pkgfile    2012-06-14 19:08:51.000000000 +1000
  3904. +++ version-updates_xorg/xorg-scrnsaverproto/Pkgfile    2012-03-25 18:29:53.000000000 +1100
  3905. @@ -3,7 +3,7 @@
  3906.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  3907.  
  3908.  name=xorg-scrnsaverproto
  3909. -version=1.2.1
  3910. +version=1.2.2
  3911.  release=1
  3912.  source=(http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-$version.tar.bz2)
  3913.  
  3914. diff -pruN xorg/xorg-server/.footprint version-updates_xorg/xorg-server/.footprint
  3915. --- xorg/xorg-server/.footprint 2012-06-14 19:08:52.000000000 +1000
  3916. +++ version-updates_xorg/xorg-server/.footprint 2012-03-19 20:05:32.000000000 +1100
  3917. @@ -100,6 +100,7 @@ drwxr-xr-x  root/root   usr/include/xorg/
  3918.  -rw-r--r-- root/root   usr/include/xorg/mizerarc.h
  3919.  -rw-r--r-- root/root   usr/include/xorg/msp3430.h
  3920.  -rw-r--r-- root/root   usr/include/xorg/opaque.h
  3921. +-rw-r--r-- root/root   usr/include/xorg/optionstr.h
  3922.  -rw-r--r-- root/root   usr/include/xorg/os.h
  3923.  -rw-r--r-- root/root   usr/include/xorg/panoramiX.h
  3924.  -rw-r--r-- root/root   usr/include/xorg/panoramiXsrv.h
  3925. @@ -154,6 +155,7 @@ drwxr-xr-x  root/root   usr/include/xorg/
  3926.  -rw-r--r-- root/root   usr/include/xorg/xf86Modes.h
  3927.  -rw-r--r-- root/root   usr/include/xorg/xf86Module.h
  3928.  -rw-r--r-- root/root   usr/include/xorg/xf86Opt.h
  3929. +-rw-r--r-- root/root   usr/include/xorg/xf86Optionstr.h
  3930.  -rw-r--r-- root/root   usr/include/xorg/xf86Optrec.h
  3931.  -rw-r--r-- root/root   usr/include/xorg/xf86Parser.h
  3932.  -rw-r--r-- root/root   usr/include/xorg/xf86Pci.h
  3933. diff -pruN xorg/xorg-server/.md5sum version-updates_xorg/xorg-server/.md5sum
  3934. --- xorg/xorg-server/.md5sum    2012-06-14 19:08:52.000000000 +1000
  3935. +++ version-updates_xorg/xorg-server/.md5sum    2012-06-04 22:49:22.000000000 +1000
  3936. @@ -1,2 +1 @@
  3937. -a7194c437963627e1db0dd2d6c1a1984  xorg-server-1.11.3.tar.bz2
  3938. -78e30fd3724246e67ed29794695856c7  xorg-server.diff
  3939. +791f0323b886abb7954de7f042bb7dc6  xorg-server-1.12.2.tar.bz2
  3940. diff -pruN xorg/xorg-server/Pkgfile version-updates_xorg/xorg-server/Pkgfile
  3941. --- xorg/xorg-server/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  3942. +++ version-updates_xorg/xorg-server/Pkgfile    2012-06-04 22:49:22.000000000 +1000
  3943. @@ -1,18 +1,16 @@
  3944.  # Description: X Window System server
  3945.  # URL: http://xorg.freedesktop.org
  3946.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  3947. -# Depends on: mesa3d, xorg-bdftopcf, xorg-mkfontdir, xorg-mkfontscale, xorg-xf86driproto, xorg-dri2proto, xorg-libxkbui, xorg-xcmiscproto, xorg-scrnsaverproto, xorg-bigreqsproto, xorg-libxtst, xorg-libdmx, xorg-libxxf86misc, xorg-libxaw, xorg-libxvmc, xorg-libxi, xorg-libxres, xorg-libxcomposite, xorg-libxinerama, xorg-libxrandr, xorg-libxft, xorg-libxcursor, xorg-libxxf86dga, xorg-libpixman, xorg-libpciaccess
  3948. +# Depends on: mesa3d, xorg-bdftopcf, xorg-mkfontdir, xorg-mkfontscale, xorg-xf86driproto, xorg-dri2proto, xorg-libxkbui, xorg-xcmiscproto, xorg-scrnsaverproto, xorg-bigreqsproto, xorg-libxtst, xorg-libdmx, xorg-libxxf86misc, xorg-libxaw, xorg-libxvmc, xorg-libxi, xorg-libxres, xorg-libxcomposite, xorg-libxinerama, xorg-libxrandr, xorg-libxft, xorg-libxcursor, xorg-libxxf86dga, xorg-libpixman
  3949.  
  3950.  name=xorg-server
  3951. -version=1.11.3
  3952. +version=1.12.2
  3953.  release=1
  3954. -source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.bz2 $name.diff)
  3955. +source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.bz2)
  3956.  
  3957.  build() {
  3958.     cd $name-$version
  3959.  
  3960. -   patch -Rp1 -i $SRC/$name.diff
  3961. -
  3962.     ./configure --prefix=/usr --enable-dri \
  3963.                 --localstatedir=/var --mandir=/usr/man \
  3964.                 --with-xkb-output=/var/lib/xkb \
  3965. @@ -20,7 +18,7 @@ build() {
  3966.                 --with-sha1=libcrypto \
  3967.                 --disable-config-dbus
  3968.  
  3969. -   make -j 1
  3970. +   make
  3971.     make DESTDIR=$PKG install
  3972.  
  3973.     rmdir $PKG/var/log
  3974. diff -pruN xorg/xorg-server/xorg-server.diff version-updates_xorg/xorg-server/xorg-server.diff
  3975. --- xorg/xorg-server/xorg-server.diff   2012-06-14 19:08:52.000000000 +1000
  3976. +++ version-updates_xorg/xorg-server/xorg-server.diff   1970-01-01 10:00:00.000000000 +1000
  3977. @@ -1,44 +0,0 @@
  3978. -This commit causes drawing issues with i945, urxvt and xcompmgr.
  3979. -
  3980. -From 8d7b7a0d71e0b89321b3341b781bc8845386def6 Mon Sep 17 00:00:00 2001
  3981. -From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
  3982. -Date: Thu, 29 Jul 2010 20:36:25 -0400
  3983. -Subject: [PATCH 01/29] Set DamageSetReportAfterOp to true for the damage extension
  3984. -MIME-Version: 1.0
  3985. -Content-Type: text/plain; charset=UTF-8
  3986. -Content-Transfer-Encoding: 8bit
  3987. -
  3988. -Change the damage extension reporter to queue up events after we chain
  3989. -to the wrapped functions.  Damage events are typically sent out after
  3990. -the rendering happens anyway, since we submit batch buffers from the
  3991. -flush callback chain and then flush client io buffers.  Compositing
  3992. -managers relie on this order, and there is no way we could reliably
  3993. -provide damage events to clients before the rendering happens anyway.
  3994. -
  3995. -By queueing up the damage events before the rendering happens, there's
  3996. -a risk that the client io buffer may overflow and send the damage
  3997. -events to the client before the driver has even seen the rendering
  3998. -request.  Reporting damage events after the rendering fixes this
  3999. -corner case and better corresponds with how we expect this to work.
  4000. -
  4001. -Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
  4002. -Reviewed-by: Keith Packard <keithp@keithp.com>
  4003. ----
  4004. - damageext/damageext.c |    1 +
  4005. - 1 files changed, 1 insertions(+), 0 deletions(-)
  4006. -
  4007. -diff --git a/damageext/damageext.c b/damageext/damageext.c
  4008. -index f5265dd..b4bb478 100644
  4009. ---- a/damageext/damageext.c
  4010. -+++ b/damageext/damageext.c
  4011. -@@ -217,6 +217,7 @@ ProcDamageCreate (ClientPtr client)
  4012. -     if (!AddResource (stuff->damage, DamageExtType, (pointer) pDamageExt))
  4013. -   return BadAlloc;
  4014. -
  4015. -+    DamageSetReportAfterOp (pDamageExt->pDamage, TRUE);
  4016. -     DamageRegister (pDamageExt->pDrawable, pDamageExt->pDamage);
  4017. -
  4018. -     if (pDrawable->type == DRAWABLE_WINDOW)
  4019. ---
  4020. -1.7.2.2
  4021. -
  4022. diff -pruN xorg/xorg-sessreg/.md5sum version-updates_xorg/xorg-sessreg/.md5sum
  4023. --- xorg/xorg-sessreg/.md5sum   2012-06-14 19:08:52.000000000 +1000
  4024. +++ version-updates_xorg/xorg-sessreg/.md5sum   2012-03-19 20:05:32.000000000 +1100
  4025. @@ -1 +1 @@
  4026. -8c8fcda19f4cffe573d43ec9b8255f8e  sessreg-1.0.6.tar.bz2
  4027. +e99172cbd72700eeeae99f64632b5dc2  sessreg-1.0.7.tar.bz2
  4028. diff -pruN xorg/xorg-sessreg/Pkgfile version-updates_xorg/xorg-sessreg/Pkgfile
  4029. --- xorg/xorg-sessreg/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  4030. +++ version-updates_xorg/xorg-sessreg/Pkgfile   2012-03-19 20:05:32.000000000 +1100
  4031. @@ -4,7 +4,7 @@
  4032.  # Depends on: xorg-libx11
  4033.  
  4034.  name=xorg-sessreg
  4035. -version=1.0.6
  4036. +version=1.0.7
  4037.  release=1
  4038.  source=(http://xorg.freedesktop.org/releases/individual/app/sessreg-$version.tar.bz2)
  4039.  
  4040. diff -pruN xorg/xorg-setxkbmap/.md5sum version-updates_xorg/xorg-setxkbmap/.md5sum
  4041. --- xorg/xorg-setxkbmap/.md5sum 2012-06-14 19:08:52.000000000 +1000
  4042. +++ version-updates_xorg/xorg-setxkbmap/.md5sum 2012-03-25 18:29:53.000000000 +1100
  4043. @@ -1 +1 @@
  4044. -2f6df89201eb9a2cbfb905d6b82a191e  setxkbmap-1.2.0.tar.bz2
  4045. +1001771344608e120e943a396317c33a  setxkbmap-1.3.0.tar.bz2
  4046. diff -pruN xorg/xorg-setxkbmap/Pkgfile version-updates_xorg/xorg-setxkbmap/Pkgfile
  4047. --- xorg/xorg-setxkbmap/Pkgfile 2012-06-14 19:08:52.000000000 +1000
  4048. +++ version-updates_xorg/xorg-setxkbmap/Pkgfile 2012-03-25 18:29:53.000000000 +1100
  4049. @@ -4,7 +4,7 @@
  4050.  # Depends on: xorg-libx11, xorg-libxkbfile
  4051.  
  4052.  name=xorg-setxkbmap
  4053. -version=1.2.0
  4054. +version=1.3.0
  4055.  release=1
  4056.  source=(http://xorg.freedesktop.org/releases/individual/app/setxkbmap-$version.tar.bz2)
  4057.  
  4058. diff -pruN xorg/xorg-util-macros/.md5sum version-updates_xorg/xorg-util-macros/.md5sum
  4059. --- xorg/xorg-util-macros/.md5sum   2012-06-14 19:08:52.000000000 +1000
  4060. +++ version-updates_xorg/xorg-util-macros/.md5sum   2012-04-19 09:24:42.000000000 +1000
  4061. @@ -1 +1 @@
  4062. -357efdfa69f3e092de3b7000b90f6f4a  util-macros-1.15.0.tar.bz2
  4063. +4f41667e1bf4938bb2b24fa09d517f77  util-macros-1.17.tar.bz2
  4064. diff -pruN xorg/xorg-util-macros/Pkgfile version-updates_xorg/xorg-util-macros/Pkgfile
  4065. --- xorg/xorg-util-macros/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  4066. +++ version-updates_xorg/xorg-util-macros/Pkgfile   2012-04-19 09:24:42.000000000 +1000
  4067. @@ -3,7 +3,7 @@
  4068.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  4069.  
  4070.  name=xorg-util-macros
  4071. -version=1.15.0
  4072. +version=1.17
  4073.  release=1
  4074.  source=(http://xorg.freedesktop.org/releases/individual/util/util-macros-$version.tar.bz2)
  4075.  
  4076. diff -pruN xorg/xorg-x11perf/.md5sum version-updates_xorg/xorg-x11perf/.md5sum
  4077. --- xorg/xorg-x11perf/.md5sum   2012-06-14 19:08:52.000000000 +1000
  4078. +++ version-updates_xorg/xorg-x11perf/.md5sum   2012-03-20 17:45:35.000000000 +1100
  4079. @@ -1 +1 @@
  4080. -c3ac3667a6f5c3cead9847fbf4b5f36e  x11perf-1.5.3.tar.bz2
  4081. +5c3c7431a38775caaea6051312a49bc9  x11perf-1.5.4.tar.bz2
  4082. diff -pruN xorg/xorg-x11perf/Pkgfile version-updates_xorg/xorg-x11perf/Pkgfile
  4083. --- xorg/xorg-x11perf/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  4084. +++ version-updates_xorg/xorg-x11perf/Pkgfile   2012-03-20 17:45:35.000000000 +1100
  4085. @@ -4,7 +4,7 @@
  4086.  # Depends on: xorg-libxmu, xorg-libxft, xorg-libxext
  4087.  
  4088.  name=xorg-x11perf
  4089. -version=1.5.3
  4090. +version=1.5.4
  4091.  release=1
  4092.  source=(http://xorg.freedesktop.org/releases/individual/app/x11perf-$version.tar.bz2)
  4093.  
  4094. diff -pruN xorg/xorg-xauth/.md5sum version-updates_xorg/xorg-xauth/.md5sum
  4095. --- xorg/xorg-xauth/.md5sum 2012-06-14 19:08:52.000000000 +1000
  4096. +++ version-updates_xorg/xorg-xauth/.md5sum 2012-03-25 18:29:53.000000000 +1100
  4097. @@ -1 +1 @@
  4098. -105f5b00bb9293b3db36f7e500d4f950  xauth-1.0.6.tar.bz2
  4099. +cbcbd8f2156a53b609800bec4c6b6c0e  xauth-1.0.7.tar.bz2
  4100. diff -pruN xorg/xorg-xauth/Pkgfile version-updates_xorg/xorg-xauth/Pkgfile
  4101. --- xorg/xorg-xauth/Pkgfile 2012-06-14 19:08:52.000000000 +1000
  4102. +++ version-updates_xorg/xorg-xauth/Pkgfile 2012-03-25 18:29:53.000000000 +1100
  4103. @@ -4,7 +4,7 @@
  4104.  # Depends on: xorg-server
  4105.  
  4106.  name=xorg-xauth
  4107. -version=1.0.6
  4108. +version=1.0.7
  4109.  release=1
  4110.  source=(http://xorg.freedesktop.org/releases/individual/app/xauth-$version.tar.bz2)
  4111.  
  4112. diff -pruN xorg/xorg-xcb-proto/.footprint version-updates_xorg/xorg-xcb-proto/.footprint
  4113. --- xorg/xorg-xcb-proto/.footprint  2012-06-14 19:08:52.000000000 +1000
  4114. +++ version-updates_xorg/xorg-xcb-proto/.footprint  2012-03-25 18:29:53.000000000 +1100
  4115. @@ -30,6 +30,7 @@ drwxr-xr-x    root/root   usr/share/xcb/
  4116.  -rw-r--r-- root/root   usr/share/xcb/damage.xml
  4117.  -rw-r--r-- root/root   usr/share/xcb/dpms.xml
  4118.  -rw-r--r-- root/root   usr/share/xcb/dri2.xml
  4119. +-rw-r--r-- root/root   usr/share/xcb/ge.xml
  4120.  -rw-r--r-- root/root   usr/share/xcb/glx.xml
  4121.  -rw-r--r-- root/root   usr/share/xcb/randr.xml
  4122.  -rw-r--r-- root/root   usr/share/xcb/record.xml
  4123. @@ -43,9 +44,11 @@ drwxr-xr-x   root/root   usr/share/xcb/
  4124.  -rw-r--r-- root/root   usr/share/xcb/xcb.xsd
  4125.  -rw-r--r-- root/root   usr/share/xcb/xevie.xml
  4126.  -rw-r--r-- root/root   usr/share/xcb/xf86dri.xml
  4127. +-rw-r--r-- root/root   usr/share/xcb/xf86vidmode.xml
  4128.  -rw-r--r-- root/root   usr/share/xcb/xfixes.xml
  4129.  -rw-r--r-- root/root   usr/share/xcb/xinerama.xml
  4130.  -rw-r--r-- root/root   usr/share/xcb/xinput.xml
  4131. +-rw-r--r-- root/root   usr/share/xcb/xkb.xml
  4132.  -rw-r--r-- root/root   usr/share/xcb/xprint.xml
  4133.  -rw-r--r-- root/root   usr/share/xcb/xproto.xml
  4134.  -rw-r--r-- root/root   usr/share/xcb/xselinux.xml
  4135. diff -pruN xorg/xorg-xcb-proto/.md5sum version-updates_xorg/xorg-xcb-proto/.md5sum
  4136. --- xorg/xorg-xcb-proto/.md5sum 2012-06-14 19:08:52.000000000 +1000
  4137. +++ version-updates_xorg/xorg-xcb-proto/.md5sum 2012-03-25 18:29:53.000000000 +1100
  4138. @@ -1 +1 @@
  4139. -04313e1d914b44d0e457f6c494fc178b  xcb-proto-1.6.tar.bz2
  4140. +948fec39dd42f3694edd5d9689735ec4  xcb-proto-1.7.1.tar.bz2
  4141. diff -pruN xorg/xorg-xcb-proto/Pkgfile version-updates_xorg/xorg-xcb-proto/Pkgfile
  4142. --- xorg/xorg-xcb-proto/Pkgfile 2012-06-14 19:08:52.000000000 +1000
  4143. +++ version-updates_xorg/xorg-xcb-proto/Pkgfile 2012-03-25 18:29:53.000000000 +1100
  4144. @@ -4,8 +4,8 @@
  4145.  # Depends on: python
  4146.  
  4147.  name=xorg-xcb-proto
  4148. -version=1.6
  4149. -release=2
  4150. +version=1.7.1
  4151. +release=1
  4152.  source=(http://xcb.freedesktop.org/dist/xcb-proto-$version.tar.bz2)
  4153.  
  4154.  build() {
  4155. diff -pruN xorg/xorg-xcb-util/.footprint version-updates_xorg/xorg-xcb-util/.footprint
  4156. --- xorg/xorg-xcb-util/.footprint   2012-06-14 19:08:52.000000000 +1000
  4157. +++ version-updates_xorg/xorg-xcb-util/.footprint   2012-06-04 22:49:22.000000000 +1000
  4158. @@ -3,68 +3,16 @@ drwxr-xr-x    root/root   usr/include/
  4159.  drwxr-xr-x root/root   usr/include/xcb/
  4160.  -rw-r--r-- root/root   usr/include/xcb/xcb_atom.h
  4161.  -rw-r--r-- root/root   usr/include/xcb/xcb_aux.h
  4162. --rw-r--r-- root/root   usr/include/xcb/xcb_bitops.h
  4163.  -rw-r--r-- root/root   usr/include/xcb/xcb_event.h
  4164. --rw-r--r-- root/root   usr/include/xcb/xcb_icccm.h
  4165. --rw-r--r-- root/root   usr/include/xcb/xcb_image.h
  4166. --rw-r--r-- root/root   usr/include/xcb/xcb_keysyms.h
  4167. --rw-r--r-- root/root   usr/include/xcb/xcb_pixel.h
  4168. --rw-r--r-- root/root   usr/include/xcb/xcb_property.h
  4169. --rw-r--r-- root/root   usr/include/xcb/xcb_renderutil.h
  4170. --rw-r--r-- root/root   usr/include/xcb/xcb_reply.h
  4171. +-rw-r--r-- root/root   usr/include/xcb/xcb_util.h
  4172.  drwxr-xr-x root/root   usr/lib/
  4173. --rw-r--r-- root/root   usr/lib/libxcb-atom.a
  4174. --rwxr-xr-x root/root   usr/lib/libxcb-atom.la
  4175. -lrwxrwxrwx root/root   usr/lib/libxcb-atom.so -> libxcb-atom.so.1.0.0
  4176. -lrwxrwxrwx root/root   usr/lib/libxcb-atom.so.1 -> libxcb-atom.so.1.0.0
  4177. --rwxr-xr-x root/root   usr/lib/libxcb-atom.so.1.0.0
  4178. --rw-r--r-- root/root   usr/lib/libxcb-aux.a
  4179. --rwxr-xr-x root/root   usr/lib/libxcb-aux.la
  4180. -lrwxrwxrwx root/root   usr/lib/libxcb-aux.so -> libxcb-aux.so.0.0.0
  4181. -lrwxrwxrwx root/root   usr/lib/libxcb-aux.so.0 -> libxcb-aux.so.0.0.0
  4182. --rwxr-xr-x root/root   usr/lib/libxcb-aux.so.0.0.0
  4183. --rw-r--r-- root/root   usr/lib/libxcb-event.a
  4184. --rwxr-xr-x root/root   usr/lib/libxcb-event.la
  4185. -lrwxrwxrwx root/root   usr/lib/libxcb-event.so -> libxcb-event.so.1.0.0
  4186. -lrwxrwxrwx root/root   usr/lib/libxcb-event.so.1 -> libxcb-event.so.1.0.0
  4187. --rwxr-xr-x root/root   usr/lib/libxcb-event.so.1.0.0
  4188. --rw-r--r-- root/root   usr/lib/libxcb-icccm.a
  4189. --rwxr-xr-x root/root   usr/lib/libxcb-icccm.la
  4190. -lrwxrwxrwx root/root   usr/lib/libxcb-icccm.so -> libxcb-icccm.so.1.0.0
  4191. -lrwxrwxrwx root/root   usr/lib/libxcb-icccm.so.1 -> libxcb-icccm.so.1.0.0
  4192. --rwxr-xr-x root/root   usr/lib/libxcb-icccm.so.1.0.0
  4193. --rw-r--r-- root/root   usr/lib/libxcb-image.a
  4194. --rwxr-xr-x root/root   usr/lib/libxcb-image.la
  4195. -lrwxrwxrwx root/root   usr/lib/libxcb-image.so -> libxcb-image.so.0.0.0
  4196. -lrwxrwxrwx root/root   usr/lib/libxcb-image.so.0 -> libxcb-image.so.0.0.0
  4197. --rwxr-xr-x root/root   usr/lib/libxcb-image.so.0.0.0
  4198. --rw-r--r-- root/root   usr/lib/libxcb-keysyms.a
  4199. --rwxr-xr-x root/root   usr/lib/libxcb-keysyms.la
  4200. -lrwxrwxrwx root/root   usr/lib/libxcb-keysyms.so -> libxcb-keysyms.so.1.0.0
  4201. -lrwxrwxrwx root/root   usr/lib/libxcb-keysyms.so.1 -> libxcb-keysyms.so.1.0.0
  4202. --rwxr-xr-x root/root   usr/lib/libxcb-keysyms.so.1.0.0
  4203. --rw-r--r-- root/root   usr/lib/libxcb-property.a
  4204. --rwxr-xr-x root/root   usr/lib/libxcb-property.la
  4205. -lrwxrwxrwx root/root   usr/lib/libxcb-property.so -> libxcb-property.so.1.0.0
  4206. -lrwxrwxrwx root/root   usr/lib/libxcb-property.so.1 -> libxcb-property.so.1.0.0
  4207. --rwxr-xr-x root/root   usr/lib/libxcb-property.so.1.0.0
  4208. --rw-r--r-- root/root   usr/lib/libxcb-render-util.a
  4209. --rwxr-xr-x root/root   usr/lib/libxcb-render-util.la
  4210. -lrwxrwxrwx root/root   usr/lib/libxcb-render-util.so -> libxcb-render-util.so.0.0.0
  4211. -lrwxrwxrwx root/root   usr/lib/libxcb-render-util.so.0 -> libxcb-render-util.so.0.0.0
  4212. --rwxr-xr-x root/root   usr/lib/libxcb-render-util.so.0.0.0
  4213. --rw-r--r-- root/root   usr/lib/libxcb-reply.a
  4214. --rwxr-xr-x root/root   usr/lib/libxcb-reply.la
  4215. -lrwxrwxrwx root/root   usr/lib/libxcb-reply.so -> libxcb-reply.so.1.0.0
  4216. -lrwxrwxrwx root/root   usr/lib/libxcb-reply.so.1 -> libxcb-reply.so.1.0.0
  4217. --rwxr-xr-x root/root   usr/lib/libxcb-reply.so.1.0.0
  4218. +-rw-r--r-- root/root   usr/lib/libxcb-util.a
  4219. +-rwxr-xr-x root/root   usr/lib/libxcb-util.la
  4220. +lrwxrwxrwx root/root   usr/lib/libxcb-util.so -> libxcb-util.so.1.0.0
  4221. +lrwxrwxrwx root/root   usr/lib/libxcb-util.so.1 -> libxcb-util.so.1.0.0
  4222. +-rwxr-xr-x root/root   usr/lib/libxcb-util.so.1.0.0
  4223.  drwxr-xr-x root/root   usr/lib/pkgconfig/
  4224.  -rw-r--r-- root/root   usr/lib/pkgconfig/xcb-atom.pc
  4225.  -rw-r--r-- root/root   usr/lib/pkgconfig/xcb-aux.pc
  4226.  -rw-r--r-- root/root   usr/lib/pkgconfig/xcb-event.pc
  4227. --rw-r--r-- root/root   usr/lib/pkgconfig/xcb-icccm.pc
  4228. --rw-r--r-- root/root   usr/lib/pkgconfig/xcb-image.pc
  4229. --rw-r--r-- root/root   usr/lib/pkgconfig/xcb-keysyms.pc
  4230. --rw-r--r-- root/root   usr/lib/pkgconfig/xcb-property.pc
  4231. --rw-r--r-- root/root   usr/lib/pkgconfig/xcb-renderutil.pc
  4232. --rw-r--r-- root/root   usr/lib/pkgconfig/xcb-reply.pc
  4233. +-rw-r--r-- root/root   usr/lib/pkgconfig/xcb-util.pc
  4234. diff -pruN xorg/xorg-xcb-util/.md5sum version-updates_xorg/xorg-xcb-util/.md5sum
  4235. --- xorg/xorg-xcb-util/.md5sum  2012-06-14 19:08:52.000000000 +1000
  4236. +++ version-updates_xorg/xorg-xcb-util/.md5sum  2012-06-04 22:49:22.000000000 +1000
  4237. @@ -1 +1 @@
  4238. -dd8968b8ee613cb027a8ef1fcbdc8fc9  xcb-util-0.3.6.tar.bz2
  4239. +01dcc7a16d5020530552712710646ea2  xcb-util-0.3.9.tar.bz2
  4240. diff -pruN xorg/xorg-xcb-util/Pkgfile version-updates_xorg/xorg-xcb-util/Pkgfile
  4241. --- xorg/xorg-xcb-util/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  4242. +++ version-updates_xorg/xorg-xcb-util/Pkgfile  2012-06-04 22:49:22.000000000 +1000
  4243. @@ -4,7 +4,7 @@
  4244.  # Depends on: xorg-libxcb gperf
  4245.  
  4246.  name=xorg-xcb-util
  4247. -version=0.3.6
  4248. +version=0.3.9
  4249.  release=1
  4250.  source=(http://xcb.freedesktop.org/dist/xcb-util-$version.tar.bz2)
  4251.  
  4252. diff -pruN xorg/xorg-xcmiscproto/.md5sum version-updates_xorg/xorg-xcmiscproto/.md5sum
  4253. --- xorg/xorg-xcmiscproto/.md5sum   2012-06-14 19:08:52.000000000 +1000
  4254. +++ version-updates_xorg/xorg-xcmiscproto/.md5sum   2012-03-25 18:29:53.000000000 +1100
  4255. @@ -1 +1 @@
  4256. -cd7372cd827bfd7ca7e9238f2ce274b1  xcmiscproto-1.2.1.tar.bz2
  4257. +5f4847c78e41b801982c8a5e06365b24  xcmiscproto-1.2.2.tar.bz2
  4258. diff -pruN xorg/xorg-xcmiscproto/Pkgfile version-updates_xorg/xorg-xcmiscproto/Pkgfile
  4259. --- xorg/xorg-xcmiscproto/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  4260. +++ version-updates_xorg/xorg-xcmiscproto/Pkgfile   2012-03-25 18:29:53.000000000 +1100
  4261. @@ -3,7 +3,7 @@
  4262.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  4263.  
  4264.  name=xorg-xcmiscproto
  4265. -version=1.2.1
  4266. +version=1.2.2
  4267.  release=1
  4268.  source=(http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-$version.tar.bz2)
  4269.  
  4270. diff -pruN xorg/xorg-xcompmgr/.md5sum version-updates_xorg/xorg-xcompmgr/.md5sum
  4271. --- xorg/xorg-xcompmgr/.md5sum  2012-06-14 19:08:52.000000000 +1000
  4272. +++ version-updates_xorg/xorg-xcompmgr/.md5sum  2012-03-19 20:05:32.000000000 +1100
  4273. @@ -1 +1 @@
  4274. -bf8faa8c540bfdcd0252801d8f16d868  xcompmgr-1.1.5.tar.bz2
  4275. +d45afaf2a153e8a5dd93a92955060c9a  xcompmgr-1.1.6.tar.bz2
  4276. diff -pruN xorg/xorg-xcompmgr/Pkgfile version-updates_xorg/xorg-xcompmgr/Pkgfile
  4277. --- xorg/xorg-xcompmgr/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  4278. +++ version-updates_xorg/xorg-xcompmgr/Pkgfile  2012-03-19 20:05:32.000000000 +1100
  4279. @@ -4,7 +4,7 @@
  4280.  # Depends on: xorg-libxdamage, xorg-libxcomposite, xorg-libxrender
  4281.  
  4282.  name=xorg-xcompmgr
  4283. -version=1.1.5
  4284. +version=1.1.6
  4285.  release=1
  4286.  source=(http://xorg.freedesktop.org/releases/individual/app/xcompmgr-$version.tar.bz2)
  4287.  
  4288. diff -pruN xorg/xorg-xcursorgen/.md5sum version-updates_xorg/xorg-xcursorgen/.md5sum
  4289. --- xorg/xorg-xcursorgen/.md5sum    2012-06-14 19:08:52.000000000 +1000
  4290. +++ version-updates_xorg/xorg-xcursorgen/.md5sum    2012-03-25 18:29:53.000000000 +1100
  4291. @@ -1 +1 @@
  4292. -731c39ea88217c12ddd37f8627d97f3f  xcursorgen-1.0.4.tar.bz2
  4293. +09f56978a62854534deacc8aa8ff3031  xcursorgen-1.0.5.tar.bz2
  4294. diff -pruN xorg/xorg-xcursorgen/Pkgfile version-updates_xorg/xorg-xcursorgen/Pkgfile
  4295. --- xorg/xorg-xcursorgen/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  4296. +++ version-updates_xorg/xorg-xcursorgen/Pkgfile    2012-03-25 18:29:53.000000000 +1100
  4297. @@ -4,7 +4,7 @@
  4298.  # Depends on: xorg-libxcursor, libpng
  4299.  
  4300.  name=xorg-xcursorgen
  4301. -version=1.0.4
  4302. +version=1.0.5
  4303.  release=1
  4304.  source=(http://xorg.freedesktop.org/releases/individual/app/xcursorgen-$version.tar.bz2)
  4305.  
  4306. diff -pruN xorg/xorg-xdpyinfo/.md5sum version-updates_xorg/xorg-xdpyinfo/.md5sum
  4307. --- xorg/xorg-xdpyinfo/.md5sum  2012-06-14 19:08:52.000000000 +1000
  4308. +++ version-updates_xorg/xorg-xdpyinfo/.md5sum  2012-03-20 01:17:56.000000000 +1100
  4309. @@ -1 +1 @@
  4310. -c52fda7bbc80e74b7839f29298cb1d77  xdpyinfo-1.2.0.tar.bz2
  4311. +1ef08f4c8d0e669c2edd49e4a1bf650d  xdpyinfo-1.3.0.tar.bz2
  4312. diff -pruN xorg/xorg-xdpyinfo/Pkgfile version-updates_xorg/xorg-xdpyinfo/Pkgfile
  4313. --- xorg/xorg-xdpyinfo/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  4314. +++ version-updates_xorg/xorg-xdpyinfo/Pkgfile  2012-03-20 01:17:56.000000000 +1100
  4315. @@ -4,7 +4,7 @@
  4316.  # Depends on: xorg-libx11, xorg-libxext, xorg-libxtst, xorg-libxxf86vm, xorg-libxxf86dga, xorg-libxxf86misc, xorg-libxi, xorg-libxrender, xorg-libxinerama, xorg-libdmx
  4317.  
  4318.  name=xorg-xdpyinfo
  4319. -version=1.2.0
  4320. +version=1.3.0
  4321.  release=1
  4322.  source=(http://xorg.freedesktop.org/releases/individual/app/xdpyinfo-$version.tar.bz2)
  4323.  
  4324. diff -pruN xorg/xorg-xdriinfo/Pkgfile version-updates_xorg/xorg-xdriinfo/Pkgfile
  4325. --- xorg/xorg-xdriinfo/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  4326. +++ version-updates_xorg/xorg-xdriinfo/Pkgfile  2012-04-09 19:41:47.000000000 +1000
  4327. @@ -1,7 +1,7 @@
  4328.  # Description: Query configuration information of DRI drivers
  4329.  # URL: http://xorg.freedesktop.org
  4330.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  4331. -# Depends on: xorg-libx11, xorg-glproto
  4332. +# Depends on: xorg-libx11, xorg-glproto, mesa3d
  4333.  
  4334.  name=xorg-xdriinfo
  4335.  version=1.0.4
  4336. diff -pruN xorg/xorg-xev/.md5sum version-updates_xorg/xorg-xev/.md5sum
  4337. --- xorg/xorg-xev/.md5sum   2012-06-14 19:08:52.000000000 +1000
  4338. +++ version-updates_xorg/xorg-xev/.md5sum   2012-03-19 20:05:32.000000000 +1100
  4339. @@ -1 +1 @@
  4340. -515cfd1fe857b66abe43ec3343634954  xev-1.1.0.tar.bz2
  4341. +2727c72f3eba0c23f8f6b2e618d195a2  xev-1.2.0.tar.bz2
  4342. diff -pruN xorg/xorg-xev/Pkgfile version-updates_xorg/xorg-xev/Pkgfile
  4343. --- xorg/xorg-xev/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  4344. +++ version-updates_xorg/xorg-xev/Pkgfile   2012-03-19 20:05:32.000000000 +1100
  4345. @@ -1,10 +1,10 @@
  4346.  # Description: Print contents of X events
  4347.  # URL: http://xorg.freedesktop.org
  4348.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  4349. -# Depends on: xorg-libx11
  4350. +# Depends on: xorg-xrandr
  4351.  
  4352.  name=xorg-xev
  4353. -version=1.1.0
  4354. +version=1.2.0
  4355.  release=1
  4356.  source=(http://xorg.freedesktop.org/releases/individual/app/xev-$version.tar.bz2)
  4357.  
  4358. diff -pruN xorg/xorg-xextproto/.md5sum version-updates_xorg/xorg-xextproto/.md5sum
  4359. --- xorg/xorg-xextproto/.md5sum 2012-06-14 19:08:52.000000000 +1000
  4360. +++ version-updates_xorg/xorg-xextproto/.md5sum 2012-03-25 18:29:53.000000000 +1100
  4361. @@ -1 +1 @@
  4362. -220732210ceffb01bf1caf970e3b1bfb  xextproto-7.2.0.tar.bz2
  4363. +eaac343af094e6b608cf15cfba0f77c5  xextproto-7.2.1.tar.bz2
  4364. diff -pruN xorg/xorg-xextproto/Pkgfile version-updates_xorg/xorg-xextproto/Pkgfile
  4365. --- xorg/xorg-xextproto/Pkgfile 2012-06-14 19:08:52.000000000 +1000
  4366. +++ version-updates_xorg/xorg-xextproto/Pkgfile 2012-03-25 18:29:53.000000000 +1100
  4367. @@ -3,7 +3,7 @@
  4368.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  4369.  
  4370.  name=xorg-xextproto
  4371. -version=7.2.0
  4372. +version=7.2.1
  4373.  release=1
  4374.  source=(http://xorg.freedesktop.org/releases/individual/proto/xextproto-$version.tar.bz2)
  4375.  
  4376. diff -pruN xorg/xorg-xf86-input-aiptek/.md5sum version-updates_xorg/xorg-xf86-input-aiptek/.md5sum
  4377. --- xorg/xorg-xf86-input-aiptek/.md5sum 2012-06-14 19:08:52.000000000 +1000
  4378. +++ version-updates_xorg/xorg-xf86-input-aiptek/.md5sum 2012-03-21 00:42:32.000000000 +1100
  4379. @@ -1 +1 @@
  4380. -fd1044fde3b6bedfb9294db0d1b887f3  xf86-input-aiptek-1.4.0.tar.bz2
  4381. +8231f6ce1c477eac653c9deb527fa3cb  xf86-input-aiptek-1.4.1.tar.bz2
  4382. diff -pruN xorg/xorg-xf86-input-aiptek/Pkgfile version-updates_xorg/xorg-xf86-input-aiptek/Pkgfile
  4383. --- xorg/xorg-xf86-input-aiptek/Pkgfile 2012-06-14 19:08:52.000000000 +1000
  4384. +++ version-updates_xorg/xorg-xf86-input-aiptek/Pkgfile 2012-03-21 00:42:32.000000000 +1100
  4385. @@ -1,9 +1,10 @@
  4386.  # Description: xorg driver xf86-input-aiptek
  4387.  # URL: http://xorg.freedesktop.org
  4388.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  4389. +# Depends on: xorg-server
  4390.  
  4391.  name=xorg-xf86-input-aiptek
  4392. -version=1.4.0
  4393. +version=1.4.1
  4394.  release=1
  4395.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-$version.tar.bz2)
  4396.  
  4397. diff -pruN xorg/xorg-xf86-input-elographics/.md5sum version-updates_xorg/xorg-xf86-input-elographics/.md5sum
  4398. --- xorg/xorg-xf86-input-elographics/.md5sum    2012-06-14 19:08:52.000000000 +1000
  4399. +++ version-updates_xorg/xorg-xf86-input-elographics/.md5sum    2012-03-21 00:42:32.000000000 +1100
  4400. @@ -1 +1 @@
  4401. -c4dbc216b2ddfcec93ae74ca00fae95a  xf86-input-elographics-1.2.4.tar.bz2
  4402. +9c6616048cd589d6e8540c1d397f64ab  xf86-input-elographics-1.3.0.tar.bz2
  4403. diff -pruN xorg/xorg-xf86-input-elographics/Pkgfile version-updates_xorg/xorg-xf86-input-elographics/Pkgfile
  4404. --- xorg/xorg-xf86-input-elographics/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  4405. +++ version-updates_xorg/xorg-xf86-input-elographics/Pkgfile    2012-03-21 00:42:32.000000000 +1100
  4406. @@ -4,7 +4,7 @@
  4407.  # Depends on: xorg-server
  4408.  
  4409.  name=xorg-xf86-input-elographics
  4410. -version=1.2.4
  4411. +version=1.3.0
  4412.  release=1
  4413.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-$version.tar.bz2)
  4414.  
  4415. diff -pruN xorg/xorg-xf86-input-evdev/.md5sum version-updates_xorg/xorg-xf86-input-evdev/.md5sum
  4416. --- xorg/xorg-xf86-input-evdev/.md5sum  2012-06-14 19:08:52.000000000 +1000
  4417. +++ version-updates_xorg/xorg-xf86-input-evdev/.md5sum  2012-03-20 17:45:35.000000000 +1100
  4418. @@ -1 +1 @@
  4419. -f33fe9413bde68936d8909206a13e8a1  xf86-input-evdev-2.6.0.tar.bz2
  4420. +4449b2e94900e98d2f41c2f46dd0397e  xf86-input-evdev-2.7.0.tar.bz2
  4421. diff -pruN xorg/xorg-xf86-input-evdev/Pkgfile version-updates_xorg/xorg-xf86-input-evdev/Pkgfile
  4422. --- xorg/xorg-xf86-input-evdev/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  4423. +++ version-updates_xorg/xorg-xf86-input-evdev/Pkgfile  2012-03-20 17:45:35.000000000 +1100
  4424. @@ -4,7 +4,7 @@
  4425.  # Depends on: xorg-server
  4426.  
  4427.  name=xorg-xf86-input-evdev
  4428. -version=2.6.0
  4429. +version=2.7.0
  4430.  release=1
  4431.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-$version.tar.bz2)
  4432.  
  4433. diff -pruN xorg/xorg-xf86-input-joystick/.md5sum version-updates_xorg/xorg-xf86-input-joystick/.md5sum
  4434. --- xorg/xorg-xf86-input-joystick/.md5sum   2012-06-14 19:08:52.000000000 +1000
  4435. +++ version-updates_xorg/xorg-xf86-input-joystick/.md5sum   2012-03-20 17:45:35.000000000 +1100
  4436. @@ -1 +1 @@
  4437. -19b55812b018a63e597d579d4cec9cdb  xf86-input-joystick-1.6.0.tar.bz2
  4438. +01f416753016f01e328b1098157a5266  xf86-input-joystick-1.6.1.tar.bz2
  4439. diff -pruN xorg/xorg-xf86-input-joystick/Pkgfile version-updates_xorg/xorg-xf86-input-joystick/Pkgfile
  4440. --- xorg/xorg-xf86-input-joystick/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  4441. +++ version-updates_xorg/xorg-xf86-input-joystick/Pkgfile   2012-03-20 17:45:35.000000000 +1100
  4442. @@ -4,7 +4,7 @@
  4443.  # Depends on: xorg-server
  4444.  
  4445.  name=xorg-xf86-input-joystick
  4446. -version=1.6.0
  4447. +version=1.6.1
  4448.  release=1
  4449.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-$version.tar.bz2)
  4450.  
  4451. diff -pruN xorg/xorg-xf86-input-keyboard/.md5sum version-updates_xorg/xorg-xf86-input-keyboard/.md5sum
  4452. --- xorg/xorg-xf86-input-keyboard/.md5sum   2012-06-14 19:08:52.000000000 +1000
  4453. +++ version-updates_xorg/xorg-xf86-input-keyboard/.md5sum   2012-03-20 01:17:56.000000000 +1100
  4454. @@ -1 +1 @@
  4455. -e2abe9f13e526a73cb68a7d257546eba  xf86-input-keyboard-1.6.0.tar.bz2
  4456. +09744e8dc9a1fe5e61927c1073cd3428  xf86-input-keyboard-1.6.1.tar.bz2
  4457. diff -pruN xorg/xorg-xf86-input-keyboard/Pkgfile version-updates_xorg/xorg-xf86-input-keyboard/Pkgfile
  4458. --- xorg/xorg-xf86-input-keyboard/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  4459. +++ version-updates_xorg/xorg-xf86-input-keyboard/Pkgfile   2012-03-20 01:17:56.000000000 +1100
  4460. @@ -4,7 +4,7 @@
  4461.  # Depends on: xorg-server
  4462.  
  4463.  name=xorg-xf86-input-keyboard
  4464. -version=1.6.0
  4465. +version=1.6.1
  4466.  release=1
  4467.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-$version.tar.bz2)
  4468.  
  4469. diff -pruN xorg/xorg-xf86-input-mouse/.md5sum version-updates_xorg/xorg-xf86-input-mouse/.md5sum
  4470. --- xorg/xorg-xf86-input-mouse/.md5sum  2012-06-14 19:08:52.000000000 +1000
  4471. +++ version-updates_xorg/xorg-xf86-input-mouse/.md5sum  2012-03-20 17:45:35.000000000 +1100
  4472. @@ -1 +1 @@
  4473. -7f31472689c15b6de62eff04d0fb57d7  xf86-input-mouse-1.7.0.tar.bz2
  4474. +871c828b88e9c973f1457724b35576fb  xf86-input-mouse-1.7.2.tar.bz2
  4475. diff -pruN xorg/xorg-xf86-input-mouse/Pkgfile version-updates_xorg/xorg-xf86-input-mouse/Pkgfile
  4476. --- xorg/xorg-xf86-input-mouse/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  4477. +++ version-updates_xorg/xorg-xf86-input-mouse/Pkgfile  2012-03-20 17:45:35.000000000 +1100
  4478. @@ -4,7 +4,7 @@
  4479.  # Depends on: xorg-server
  4480.  
  4481.  name=xorg-xf86-input-mouse
  4482. -version=1.7.0
  4483. +version=1.7.2
  4484.  release=1
  4485.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-$version.tar.bz2)
  4486.  
  4487. diff -pruN xorg/xorg-xf86-input-penmount/.md5sum version-updates_xorg/xorg-xf86-input-penmount/.md5sum
  4488. --- xorg/xorg-xf86-input-penmount/.md5sum   2012-06-14 19:08:52.000000000 +1000
  4489. +++ version-updates_xorg/xorg-xf86-input-penmount/.md5sum   2012-03-21 00:42:32.000000000 +1100
  4490. @@ -1 +1 @@
  4491. -e5984e43ce31d45659eb6ee91c02aba5  xf86-input-penmount-1.4.1.tar.bz2
  4492. +b23d71e0b4159a6a4e81fdcef8b2e4f9  xf86-input-penmount-1.5.0.tar.bz2
  4493. diff -pruN xorg/xorg-xf86-input-penmount/Pkgfile version-updates_xorg/xorg-xf86-input-penmount/Pkgfile
  4494. --- xorg/xorg-xf86-input-penmount/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  4495. +++ version-updates_xorg/xorg-xf86-input-penmount/Pkgfile   2012-03-21 00:42:32.000000000 +1100
  4496. @@ -4,7 +4,7 @@
  4497.  # Depends on: xorg-server
  4498.  
  4499.  name=xorg-xf86-input-penmount
  4500. -version=1.4.1
  4501. +version=1.5.0
  4502.  release=1
  4503.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-penmount-$version.tar.bz2)
  4504.  
  4505. diff -pruN xorg/xorg-xf86-input-synaptics/.md5sum version-updates_xorg/xorg-xf86-input-synaptics/.md5sum
  4506. --- xorg/xorg-xf86-input-synaptics/.md5sum  2012-06-14 19:08:52.000000000 +1000
  4507. +++ version-updates_xorg/xorg-xf86-input-synaptics/.md5sum  2012-05-16 13:02:13.000000000 +1000
  4508. @@ -1 +1 @@
  4509. -41ee749ecbfef98f7fba708cb2afae87  xf86-input-synaptics-1.5.0.tar.bz2
  4510. +d10a7ee362d015975fbef11c6beaac97  xf86-input-synaptics-1.6.1.tar.bz2
  4511. diff -pruN xorg/xorg-xf86-input-synaptics/Pkgfile version-updates_xorg/xorg-xf86-input-synaptics/Pkgfile
  4512. --- xorg/xorg-xf86-input-synaptics/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  4513. +++ version-updates_xorg/xorg-xf86-input-synaptics/Pkgfile  2012-05-16 13:02:13.000000000 +1000
  4514. @@ -1,10 +1,10 @@
  4515.  # Description: Synaptics touchpad input driver
  4516.  # URL: http://xorg.freedesktop.org
  4517.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  4518. -# Depends on: xorg-server
  4519. +# Depends on: xorg-server, mtdev
  4520.  
  4521.  name=xorg-xf86-input-synaptics
  4522. -version=1.5.0
  4523. +version=1.6.1
  4524.  release=1
  4525.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-$version.tar.bz2)
  4526.  
  4527. diff -pruN xorg/xorg-xf86-input-vmmouse/.md5sum version-updates_xorg/xorg-xf86-input-vmmouse/.md5sum
  4528. --- xorg/xorg-xf86-input-vmmouse/.md5sum    2012-06-14 19:08:52.000000000 +1000
  4529. +++ version-updates_xorg/xorg-xf86-input-vmmouse/.md5sum    2012-06-09 08:49:43.000000000 +1000
  4530. @@ -1 +1 @@
  4531. -dc77181330f983c7d0ec1ea1592c2ca7  xf86-input-vmmouse-12.7.0.tar.bz2
  4532. +2b3bfea9ba1f73d9d68bddd0d6b20112  xf86-input-vmmouse-12.9.0.tar.bz2
  4533. diff -pruN xorg/xorg-xf86-input-vmmouse/Pkgfile version-updates_xorg/xorg-xf86-input-vmmouse/Pkgfile
  4534. --- xorg/xorg-xf86-input-vmmouse/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  4535. +++ version-updates_xorg/xorg-xf86-input-vmmouse/Pkgfile    2012-06-09 08:49:43.000000000 +1000
  4536. @@ -4,7 +4,7 @@
  4537.  # Depends on: xorg-server
  4538.  
  4539.  name=xorg-xf86-input-vmmouse
  4540. -version=12.7.0
  4541. +version=12.9.0
  4542.  release=1
  4543.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-vmmouse-$version.tar.bz2)
  4544.  
  4545. diff -pruN xorg/xorg-xf86-video-apm/.md5sum version-updates_xorg/xorg-xf86-video-apm/.md5sum
  4546. --- xorg/xorg-xf86-video-apm/.md5sum    2012-06-14 19:08:52.000000000 +1000
  4547. +++ version-updates_xorg/xorg-xf86-video-apm/.md5sum    2012-05-16 13:02:13.000000000 +1000
  4548. @@ -1 +1 @@
  4549. -a3743a971b3acb7de3d2eefc8b1a4834  xf86-video-apm-1.2.3.tar.bz2
  4550. +7692dac140c15172935872a77417bed2  xf86-video-apm-1.2.4.tar.bz2
  4551. diff -pruN xorg/xorg-xf86-video-apm/Pkgfile version-updates_xorg/xorg-xf86-video-apm/Pkgfile
  4552. --- xorg/xorg-xf86-video-apm/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  4553. +++ version-updates_xorg/xorg-xf86-video-apm/Pkgfile    2012-05-16 13:02:13.000000000 +1000
  4554. @@ -4,7 +4,7 @@
  4555.  # Depends on: xorg-server
  4556.  
  4557.  name=xorg-xf86-video-apm
  4558. -version=1.2.3
  4559. +version=1.2.4
  4560.  release=1
  4561.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-$version.tar.bz2)
  4562.  
  4563. diff -pruN xorg/xorg-xf86-video-ark/.md5sum version-updates_xorg/xorg-xf86-video-ark/.md5sum
  4564. --- xorg/xorg-xf86-video-ark/.md5sum    2012-06-14 19:08:52.000000000 +1000
  4565. +++ version-updates_xorg/xorg-xf86-video-ark/.md5sum    2012-03-21 00:42:32.000000000 +1100
  4566. @@ -1 +1 @@
  4567. -ff0cb9cb0a7f36cc6f556deed7327798  xf86-video-ark-0.7.3.tar.bz2
  4568. +21f5db0beca2d3d99aae739174d5b44f  xf86-video-ark-0.7.4.tar.bz2
  4569. diff -pruN xorg/xorg-xf86-video-ark/Pkgfile version-updates_xorg/xorg-xf86-video-ark/Pkgfile
  4570. --- xorg/xorg-xf86-video-ark/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  4571. +++ version-updates_xorg/xorg-xf86-video-ark/Pkgfile    2012-03-21 00:42:32.000000000 +1100
  4572. @@ -4,7 +4,7 @@
  4573.  # Depends on: xorg-server
  4574.  
  4575.  name=xorg-xf86-video-ark
  4576. -version=0.7.3
  4577. +version=0.7.4
  4578.  release=1
  4579.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-$version.tar.bz2)
  4580.  
  4581. diff -pruN xorg/xorg-xf86-video-ati/.md5sum version-updates_xorg/xorg-xf86-video-ati/.md5sum
  4582. --- xorg/xorg-xf86-video-ati/.md5sum    2012-06-14 19:08:52.000000000 +1000
  4583. +++ version-updates_xorg/xorg-xf86-video-ati/.md5sum    2012-06-09 08:49:43.000000000 +1000
  4584. @@ -1 +1 @@
  4585. -17dd4f0bf4dbe9839e5f7d1161994222  xf86-video-ati-6.14.4.tar.bz2
  4586. +5ea726eed9cd5a9cc5132cbee18ad686  xf86-video-ati-6.14.5.tar.bz2
  4587. diff -pruN xorg/xorg-xf86-video-ati/Pkgfile version-updates_xorg/xorg-xf86-video-ati/Pkgfile
  4588. --- xorg/xorg-xf86-video-ati/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  4589. +++ version-updates_xorg/xorg-xf86-video-ati/Pkgfile    2012-06-09 08:49:43.000000000 +1000
  4590. @@ -4,7 +4,7 @@
  4591.  # Depends on: xorg-server
  4592.  
  4593.  name=xorg-xf86-video-ati
  4594. -version=6.14.4
  4595. +version=6.14.5
  4596.  release=1
  4597.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-$version.tar.bz2)
  4598.  
  4599. diff -pruN xorg/xorg-xf86-video-cirrus/.md5sum version-updates_xorg/xorg-xf86-video-cirrus/.md5sum
  4600. --- xorg/xorg-xf86-video-cirrus/.md5sum 2012-06-14 19:08:52.000000000 +1000
  4601. +++ version-updates_xorg/xorg-xf86-video-cirrus/.md5sum 2012-03-25 18:29:53.000000000 +1100
  4602. @@ -1 +1 @@
  4603. -8195d03ed0be0975c03441e66a9f53b3  xf86-video-cirrus-1.3.2.tar.bz2
  4604. +1e449789da866f974dbf6cbe3c8cc7bf  xf86-video-cirrus-1.4.0.tar.bz2
  4605. diff -pruN xorg/xorg-xf86-video-cirrus/Pkgfile version-updates_xorg/xorg-xf86-video-cirrus/Pkgfile
  4606. --- xorg/xorg-xf86-video-cirrus/Pkgfile 2012-06-14 19:08:52.000000000 +1000
  4607. +++ version-updates_xorg/xorg-xf86-video-cirrus/Pkgfile 2012-03-25 18:29:53.000000000 +1100
  4608. @@ -4,7 +4,7 @@
  4609.  # Depends on: xorg-server
  4610.  
  4611.  name=xorg-xf86-video-cirrus
  4612. -version=1.3.2
  4613. +version=1.4.0
  4614.  release=1
  4615.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-$version.tar.bz2)
  4616.  
  4617. diff -pruN xorg/xorg-xf86-video-dummy/.md5sum version-updates_xorg/xorg-xf86-video-dummy/.md5sum
  4618. --- xorg/xorg-xf86-video-dummy/.md5sum  2012-06-14 19:08:52.000000000 +1000
  4619. +++ version-updates_xorg/xorg-xf86-video-dummy/.md5sum  2012-03-20 17:45:35.000000000 +1100
  4620. @@ -1 +1 @@
  4621. -1cf99415c998994f2e88575f942b364c  xf86-video-dummy-0.3.4.tar.bz2
  4622. +89701f372eed9ed541cf00d57c78e7ef  xf86-video-dummy-0.3.5.tar.bz2
  4623. diff -pruN xorg/xorg-xf86-video-dummy/Pkgfile version-updates_xorg/xorg-xf86-video-dummy/Pkgfile
  4624. --- xorg/xorg-xf86-video-dummy/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  4625. +++ version-updates_xorg/xorg-xf86-video-dummy/Pkgfile  2012-03-20 17:45:35.000000000 +1100
  4626. @@ -4,7 +4,7 @@
  4627.  # Depends on: xorg-server
  4628.  
  4629.  name=xorg-xf86-video-dummy
  4630. -version=0.3.4
  4631. +version=0.3.5
  4632.  release=1
  4633.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-$version.tar.bz2)
  4634.  
  4635. diff -pruN xorg/xorg-xf86-video-geode/.md5sum version-updates_xorg/xorg-xf86-video-geode/.md5sum
  4636. --- xorg/xorg-xf86-video-geode/.md5sum  2012-06-14 19:08:52.000000000 +1000
  4637. +++ version-updates_xorg/xorg-xf86-video-geode/.md5sum  2012-03-20 17:45:35.000000000 +1100
  4638. @@ -1 +1 @@
  4639. -a99c521db731c2f1df309057a8465e4c  xf86-video-geode-2.11.12.tar.bz2
  4640. +0c5a3cac3531aec0eae7f5f6b3212eb4  xf86-video-geode-2.11.13.tar.bz2
  4641. diff -pruN xorg/xorg-xf86-video-geode/Pkgfile version-updates_xorg/xorg-xf86-video-geode/Pkgfile
  4642. --- xorg/xorg-xf86-video-geode/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  4643. +++ version-updates_xorg/xorg-xf86-video-geode/Pkgfile  2012-03-20 17:45:35.000000000 +1100
  4644. @@ -4,7 +4,7 @@
  4645.  # Depends on: xorg-server
  4646.  
  4647.  name=xorg-xf86-video-geode
  4648. -version=2.11.12
  4649. +version=2.11.13
  4650.  release=1
  4651.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-$version.tar.bz2)
  4652.  
  4653. diff -pruN xorg/xorg-xf86-video-glint/.md5sum version-updates_xorg/xorg-xf86-video-glint/.md5sum
  4654. --- xorg/xorg-xf86-video-glint/.md5sum  2012-06-14 19:08:52.000000000 +1000
  4655. +++ version-updates_xorg/xorg-xf86-video-glint/.md5sum  2012-03-20 01:17:56.000000000 +1100
  4656. @@ -1 +1 @@
  4657. -77313a32280bdfee6269e28eca144274  xf86-video-glint-1.2.5.tar.bz2
  4658. +c4edb998485020debffeafc491ea759e  xf86-video-glint-1.2.7.tar.bz2
  4659. diff -pruN xorg/xorg-xf86-video-glint/Pkgfile version-updates_xorg/xorg-xf86-video-glint/Pkgfile
  4660. --- xorg/xorg-xf86-video-glint/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  4661. +++ version-updates_xorg/xorg-xf86-video-glint/Pkgfile  2012-03-20 01:17:56.000000000 +1100
  4662. @@ -4,7 +4,7 @@
  4663.  # Depends on: xorg-server
  4664.  
  4665.  name=xorg-xf86-video-glint
  4666. -version=1.2.5
  4667. +version=1.2.7
  4668.  release=1
  4669.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-$version.tar.bz2)
  4670.  
  4671. diff -pruN xorg/xorg-xf86-video-i128/.md5sum version-updates_xorg/xorg-xf86-video-i128/.md5sum
  4672. --- xorg/xorg-xf86-video-i128/.md5sum   2012-06-14 19:08:52.000000000 +1000
  4673. +++ version-updates_xorg/xorg-xf86-video-i128/.md5sum   2012-03-25 18:29:53.000000000 +1100
  4674. @@ -1 +1 @@
  4675. -103316abb2dc466219c027afc5a71691  xf86-video-i128-1.3.4.tar.bz2
  4676. +392c4ffd3c752af6f92e71e1efd68c66  xf86-video-i128-1.3.5.tar.bz2
  4677. diff -pruN xorg/xorg-xf86-video-i128/Pkgfile version-updates_xorg/xorg-xf86-video-i128/Pkgfile
  4678. --- xorg/xorg-xf86-video-i128/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  4679. +++ version-updates_xorg/xorg-xf86-video-i128/Pkgfile   2012-03-25 18:29:53.000000000 +1100
  4680. @@ -4,7 +4,7 @@
  4681.  # Depends on: xorg-server
  4682.  
  4683.  name=xorg-xf86-video-i128
  4684. -version=1.3.4
  4685. +version=1.3.5
  4686.  release=1
  4687.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-$version.tar.bz2)
  4688.  
  4689. diff -pruN xorg/xorg-xf86-video-i740/.md5sum version-updates_xorg/xorg-xf86-video-i740/.md5sum
  4690. --- xorg/xorg-xf86-video-i740/.md5sum   2012-06-14 19:08:52.000000000 +1000
  4691. +++ version-updates_xorg/xorg-xf86-video-i740/.md5sum   2012-05-16 13:02:13.000000000 +1000
  4692. @@ -1 +1 @@
  4693. -4ac1318788f62159965f15131c869e7a  xf86-video-i740-1.3.2.tar.bz2
  4694. +6cf0c3c63bb099dbcaa5b901caa554b2  xf86-video-i740-1.3.3.tar.bz2
  4695. diff -pruN xorg/xorg-xf86-video-i740/Pkgfile version-updates_xorg/xorg-xf86-video-i740/Pkgfile
  4696. --- xorg/xorg-xf86-video-i740/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  4697. +++ version-updates_xorg/xorg-xf86-video-i740/Pkgfile   2012-05-16 13:02:13.000000000 +1000
  4698. @@ -4,7 +4,7 @@
  4699.  # Depends on: xorg-server
  4700.  
  4701.  name=xorg-xf86-video-i740
  4702. -version=1.3.2
  4703. +version=1.3.3
  4704.  release=1
  4705.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-$version.tar.bz2)
  4706.  
  4707. diff -pruN xorg/xorg-xf86-video-intel/.md5sum version-updates_xorg/xorg-xf86-video-intel/.md5sum
  4708. --- xorg/xorg-xf86-video-intel/.md5sum  2012-06-14 19:08:52.000000000 +1000
  4709. +++ version-updates_xorg/xorg-xf86-video-intel/.md5sum  2012-05-02 01:31:20.000000000 +1000
  4710. @@ -1 +1 @@
  4711. -6d7b1f199dba5820f250888b136186ff  xf86-video-intel-2.17.0.tar.bz2
  4712. +f397bddfc88d4c9b30b56526c1e02e8e  xf86-video-intel-2.19.0.tar.bz2
  4713. diff -pruN xorg/xorg-xf86-video-intel/Pkgfile version-updates_xorg/xorg-xf86-video-intel/Pkgfile
  4714. --- xorg/xorg-xf86-video-intel/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  4715. +++ version-updates_xorg/xorg-xf86-video-intel/Pkgfile  2012-05-02 01:31:20.000000000 +1000
  4716. @@ -4,7 +4,7 @@
  4717.  # Depends on: xorg-server, xorg-xcb-util
  4718.  
  4719.  name=xorg-xf86-video-intel
  4720. -version=2.17.0
  4721. +version=2.19.0
  4722.  release=1
  4723.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-$version.tar.bz2)
  4724.  
  4725. diff -pruN xorg/xorg-xf86-video-mach64/.md5sum version-updates_xorg/xorg-xf86-video-mach64/.md5sum
  4726. --- xorg/xorg-xf86-video-mach64/.md5sum 2012-06-14 19:08:52.000000000 +1000
  4727. +++ version-updates_xorg/xorg-xf86-video-mach64/.md5sum 2012-03-25 18:29:53.000000000 +1100
  4728. @@ -1 +1 @@
  4729. -ae62936e11af4fc0fac9f2db601a844f  xf86-video-mach64-6.9.0.tar.bz2
  4730. +8484c18f08e77564a56ccbf226694038  xf86-video-mach64-6.9.1.tar.bz2
  4731. diff -pruN xorg/xorg-xf86-video-mach64/Pkgfile version-updates_xorg/xorg-xf86-video-mach64/Pkgfile
  4732. --- xorg/xorg-xf86-video-mach64/Pkgfile 2012-06-14 19:08:52.000000000 +1000
  4733. +++ version-updates_xorg/xorg-xf86-video-mach64/Pkgfile 2012-03-25 18:29:53.000000000 +1100
  4734. @@ -4,7 +4,7 @@
  4735.  # Depends on: xorg-server
  4736.  
  4737.  name=xorg-xf86-video-mach64
  4738. -version=6.9.0
  4739. +version=6.9.1
  4740.  release=1
  4741.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-$version.tar.bz2)
  4742.  
  4743. diff -pruN xorg/xorg-xf86-video-mga/.md5sum version-updates_xorg/xorg-xf86-video-mga/.md5sum
  4744. --- xorg/xorg-xf86-video-mga/.md5sum    2012-06-14 19:08:52.000000000 +1000
  4745. +++ version-updates_xorg/xorg-xf86-video-mga/.md5sum    2012-03-25 18:29:53.000000000 +1100
  4746. @@ -1 +1 @@
  4747. -f967fb3e655f6f68aa3f495eaadcaac2  xf86-video-mga-1.4.13.tar.bz2
  4748. +ff7a9d63978f538a7d5ff5dafe431562  xf86-video-mga-1.5.0.tar.bz2
  4749. diff -pruN xorg/xorg-xf86-video-mga/Pkgfile version-updates_xorg/xorg-xf86-video-mga/Pkgfile
  4750. --- xorg/xorg-xf86-video-mga/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  4751. +++ version-updates_xorg/xorg-xf86-video-mga/Pkgfile    2012-03-25 18:29:53.000000000 +1100
  4752. @@ -4,7 +4,7 @@
  4753.  # Depends on: xorg-server
  4754.  
  4755.  name=xorg-xf86-video-mga
  4756. -version=1.4.13
  4757. +version=1.5.0
  4758.  release=1
  4759.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-$version.tar.bz2)
  4760.  
  4761. diff -pruN xorg/xorg-xf86-video-neomagic/.md5sum version-updates_xorg/xorg-xf86-video-neomagic/.md5sum
  4762. --- xorg/xorg-xf86-video-neomagic/.md5sum   2012-06-14 19:08:52.000000000 +1000
  4763. +++ version-updates_xorg/xorg-xf86-video-neomagic/.md5sum   2012-03-25 18:29:53.000000000 +1100
  4764. @@ -1 +1 @@
  4765. -423b82b776444f88adbf207fb6a82c1a  xf86-video-neomagic-1.2.5.tar.bz2
  4766. +e5f25c01492d96ddd0171454a8e6bd39  xf86-video-neomagic-1.2.6.tar.bz2
  4767. diff -pruN xorg/xorg-xf86-video-neomagic/Pkgfile version-updates_xorg/xorg-xf86-video-neomagic/Pkgfile
  4768. --- xorg/xorg-xf86-video-neomagic/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  4769. +++ version-updates_xorg/xorg-xf86-video-neomagic/Pkgfile   2012-03-25 18:29:53.000000000 +1100
  4770. @@ -4,7 +4,7 @@
  4771.  # Depends on: xorg-server
  4772.  
  4773.  name=xorg-xf86-video-neomagic
  4774. -version=1.2.5
  4775. +version=1.2.6
  4776.  release=1
  4777.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-$version.tar.bz2)
  4778.  
  4779. diff -pruN xorg/xorg-xf86-video-newport/.md5sum version-updates_xorg/xorg-xf86-video-newport/.md5sum
  4780. --- xorg/xorg-xf86-video-newport/.md5sum    2012-06-14 19:08:52.000000000 +1000
  4781. +++ version-updates_xorg/xorg-xf86-video-newport/.md5sum    2012-05-16 13:02:13.000000000 +1000
  4782. @@ -1 +1 @@
  4783. -923baa1ee0429f03ed19ec0be6a4f62b  xf86-video-newport-0.2.3.tar.bz2
  4784. +cf624826ba007127c5b1955ac561ab06  xf86-video-newport-0.2.4.tar.bz2
  4785. diff -pruN xorg/xorg-xf86-video-newport/Pkgfile version-updates_xorg/xorg-xf86-video-newport/Pkgfile
  4786. --- xorg/xorg-xf86-video-newport/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  4787. +++ version-updates_xorg/xorg-xf86-video-newport/Pkgfile    2012-05-16 13:02:13.000000000 +1000
  4788. @@ -4,7 +4,7 @@
  4789.  # Depends on: xorg-server
  4790.  
  4791.  name=xorg-xf86-video-newport
  4792. -version=0.2.3
  4793. +version=0.2.4
  4794.  release=1
  4795.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-newport-$version.tar.bz2)
  4796.  
  4797. diff -pruN xorg/xorg-xf86-video-openchrome/.footprint version-updates_xorg/xorg-xf86-video-openchrome/.footprint
  4798. --- xorg/xorg-xf86-video-openchrome/.footprint  2012-06-14 19:08:52.000000000 +1000
  4799. +++ version-updates_xorg/xorg-xf86-video-openchrome/.footprint  2012-03-21 00:42:32.000000000 +1100
  4800. @@ -1,4 +1,5 @@
  4801.  drwxr-xr-x root/root   usr/
  4802. +drwxr-xr-x root/root   usr/bin/
  4803.  drwxr-xr-x root/root   usr/lib/
  4804.  -rwxr-xr-x root/root   usr/lib/libchromeXvMC.la
  4805.  lrwxrwxrwx root/root   usr/lib/libchromeXvMC.so -> libchromeXvMC.so.1.0.0
  4806. diff -pruN xorg/xorg-xf86-video-openchrome/.md5sum version-updates_xorg/xorg-xf86-video-openchrome/.md5sum
  4807. --- xorg/xorg-xf86-video-openchrome/.md5sum 2012-06-14 19:08:52.000000000 +1000
  4808. +++ version-updates_xorg/xorg-xf86-video-openchrome/.md5sum 2012-05-17 08:46:30.000000000 +1000
  4809. @@ -1 +1 @@
  4810. -f2481d98ef54febf5bffbb88a2a2426d  xf86-video-openchrome-0.2.904.tar.bz2
  4811. +244507baf1900f1e923604c4a0f05925  xf86-video-openchrome-0.2.906.tar.bz2
  4812. diff -pruN xorg/xorg-xf86-video-openchrome/Pkgfile version-updates_xorg/xorg-xf86-video-openchrome/Pkgfile
  4813. --- xorg/xorg-xf86-video-openchrome/Pkgfile 2012-06-14 19:08:52.000000000 +1000
  4814. +++ version-updates_xorg/xorg-xf86-video-openchrome/Pkgfile 2012-05-17 08:46:30.000000000 +1000
  4815. @@ -4,7 +4,7 @@
  4816.  # Depends on: xorg-server
  4817.  
  4818.  name=xorg-xf86-video-openchrome
  4819. -version=0.2.904
  4820. +version=0.2.906
  4821.  release=1
  4822.  source=(http://www.openchrome.org/releases/xf86-video-openchrome-$version.tar.bz2)
  4823.  
  4824. diff -pruN xorg/xorg-xf86-video-r128/.md5sum version-updates_xorg/xorg-xf86-video-r128/.md5sum
  4825. --- xorg/xorg-xf86-video-r128/.md5sum   2012-06-14 19:08:52.000000000 +1000
  4826. +++ version-updates_xorg/xorg-xf86-video-r128/.md5sum   2012-03-25 18:29:53.000000000 +1100
  4827. @@ -1 +1 @@
  4828. -2b90854a62a4d45d652062f582dc8d13  xf86-video-r128-6.8.1.tar.bz2
  4829. +31e0358b5d1189e3f30f5b11e9b86865  xf86-video-r128-6.8.2.tar.bz2
  4830. diff -pruN xorg/xorg-xf86-video-r128/Pkgfile version-updates_xorg/xorg-xf86-video-r128/Pkgfile
  4831. --- xorg/xorg-xf86-video-r128/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  4832. +++ version-updates_xorg/xorg-xf86-video-r128/Pkgfile   2012-03-25 18:29:53.000000000 +1100
  4833. @@ -4,7 +4,7 @@
  4834.  # Depends on: xorg-server
  4835.  
  4836.  name=xorg-xf86-video-r128
  4837. -version=6.8.1
  4838. +version=6.8.2
  4839.  release=1
  4840.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-$version.tar.bz2)
  4841.  
  4842. diff -pruN xorg/xorg-xf86-video-s3/.md5sum version-updates_xorg/xorg-xf86-video-s3/.md5sum
  4843. --- xorg/xorg-xf86-video-s3/.md5sum 2012-06-14 19:08:52.000000000 +1000
  4844. +++ version-updates_xorg/xorg-xf86-video-s3/.md5sum 2012-05-16 13:02:13.000000000 +1000
  4845. @@ -1 +1 @@
  4846. -5eb06d88533fb327d067928faeb20860  xf86-video-s3-0.6.3.tar.bz2
  4847. +c8d27317de8f38be0548c25634e89350  xf86-video-s3-0.6.4.tar.bz2
  4848. diff -pruN xorg/xorg-xf86-video-s3/Pkgfile version-updates_xorg/xorg-xf86-video-s3/Pkgfile
  4849. --- xorg/xorg-xf86-video-s3/Pkgfile 2012-06-14 19:08:52.000000000 +1000
  4850. +++ version-updates_xorg/xorg-xf86-video-s3/Pkgfile 2012-05-16 13:02:13.000000000 +1000
  4851. @@ -4,7 +4,7 @@
  4852.  # Depends on: xorg-server
  4853.  
  4854.  name=xorg-xf86-video-s3
  4855. -version=0.6.3
  4856. +version=0.6.4
  4857.  release=1
  4858.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-$version.tar.bz2)
  4859.  
  4860. diff -pruN xorg/xorg-xf86-video-s3virge/.md5sum version-updates_xorg/xorg-xf86-video-s3virge/.md5sum
  4861. --- xorg/xorg-xf86-video-s3virge/.md5sum    2012-06-14 19:08:52.000000000 +1000
  4862. +++ version-updates_xorg/xorg-xf86-video-s3virge/.md5sum    2012-05-16 13:02:13.000000000 +1000
  4863. @@ -1 +1 @@
  4864. -6517bbbf808c700502d51acdc44662f8  xf86-video-s3virge-1.10.4.tar.bz2
  4865. +5b5468c5c58a2e3870567eb7eb935e5e  xf86-video-s3virge-1.10.5.tar.bz2
  4866. diff -pruN xorg/xorg-xf86-video-s3virge/Pkgfile version-updates_xorg/xorg-xf86-video-s3virge/Pkgfile
  4867. --- xorg/xorg-xf86-video-s3virge/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  4868. +++ version-updates_xorg/xorg-xf86-video-s3virge/Pkgfile    2012-05-16 13:02:13.000000000 +1000
  4869. @@ -4,7 +4,7 @@
  4870.  # Depends on: xorg-server
  4871.  
  4872.  name=xorg-xf86-video-s3virge
  4873. -version=1.10.4
  4874. +version=1.10.5
  4875.  release=1
  4876.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-$version.tar.bz2)
  4877.  
  4878. diff -pruN xorg/xorg-xf86-video-savage/.md5sum version-updates_xorg/xorg-xf86-video-savage/.md5sum
  4879. --- xorg/xorg-xf86-video-savage/.md5sum 2012-06-14 19:08:52.000000000 +1000
  4880. +++ version-updates_xorg/xorg-xf86-video-savage/.md5sum 2012-03-25 18:29:53.000000000 +1100
  4881. @@ -1 +1 @@
  4882. -09782fc710a1ce5a81c27d71951234c2  xf86-video-savage-2.3.2.tar.bz2
  4883. +664c7d9c93049ebe96af262ec448451f  xf86-video-savage-2.3.4.tar.bz2
  4884. diff -pruN xorg/xorg-xf86-video-savage/Pkgfile version-updates_xorg/xorg-xf86-video-savage/Pkgfile
  4885. --- xorg/xorg-xf86-video-savage/Pkgfile 2012-06-14 19:08:52.000000000 +1000
  4886. +++ version-updates_xorg/xorg-xf86-video-savage/Pkgfile 2012-03-25 18:29:53.000000000 +1100
  4887. @@ -4,7 +4,7 @@
  4888.  # Depends on: xorg-server
  4889.  
  4890.  name=xorg-xf86-video-savage
  4891. -version=2.3.2
  4892. +version=2.3.4
  4893.  release=1
  4894.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-$version.tar.bz2)
  4895.  
  4896. diff -pruN xorg/xorg-xf86-video-siliconmotion/.md5sum version-updates_xorg/xorg-xf86-video-siliconmotion/.md5sum
  4897. --- xorg/xorg-xf86-video-siliconmotion/.md5sum  2012-06-14 19:08:52.000000000 +1000
  4898. +++ version-updates_xorg/xorg-xf86-video-siliconmotion/.md5sum  2012-03-25 18:29:53.000000000 +1100
  4899. @@ -1 +1 @@
  4900. -9ca392e16028a2f7c3ebc57f0aa4c1aa  xf86-video-siliconmotion-1.7.5.tar.bz2
  4901. +b5acd392d799e2bb67ea702a83feb4a0  xf86-video-siliconmotion-1.7.6.tar.bz2
  4902. diff -pruN xorg/xorg-xf86-video-siliconmotion/Pkgfile version-updates_xorg/xorg-xf86-video-siliconmotion/Pkgfile
  4903. --- xorg/xorg-xf86-video-siliconmotion/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  4904. +++ version-updates_xorg/xorg-xf86-video-siliconmotion/Pkgfile  2012-03-25 18:29:53.000000000 +1100
  4905. @@ -4,7 +4,7 @@
  4906.  # Depends on: xorg-server
  4907.  
  4908.  name=xorg-xf86-video-siliconmotion
  4909. -version=1.7.5
  4910. +version=1.7.6
  4911.  release=1
  4912.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-$version.tar.bz2)
  4913.  
  4914. diff -pruN xorg/xorg-xf86-video-sis/.md5sum version-updates_xorg/xorg-xf86-video-sis/.md5sum
  4915. --- xorg/xorg-xf86-video-sis/.md5sum    2012-06-14 19:08:52.000000000 +1000
  4916. +++ version-updates_xorg/xorg-xf86-video-sis/.md5sum    2012-03-27 09:47:31.000000000 +1100
  4917. @@ -1 +1 @@
  4918. -dd930928b5ed7fcf34e3be4d43202ec7  xf86-video-sis-0.10.3.tar.bz2
  4919. +e1dda5365ad28ef3165fd0ed25952d9c  xf86-video-sis-0.10.4.tar.bz2
  4920. diff -pruN xorg/xorg-xf86-video-sis/Pkgfile version-updates_xorg/xorg-xf86-video-sis/Pkgfile
  4921. --- xorg/xorg-xf86-video-sis/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  4922. +++ version-updates_xorg/xorg-xf86-video-sis/Pkgfile    2012-03-27 09:47:31.000000000 +1100
  4923. @@ -4,7 +4,7 @@
  4924.  # Depends on: xorg-server
  4925.  
  4926.  name=xorg-xf86-video-sis
  4927. -version=0.10.3
  4928. +version=0.10.4
  4929.  release=1
  4930.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-$version.tar.bz2)
  4931.  
  4932. diff -pruN xorg/xorg-xf86-video-tdfx/.md5sum version-updates_xorg/xorg-xf86-video-tdfx/.md5sum
  4933. --- xorg/xorg-xf86-video-tdfx/.md5sum   2012-06-14 19:08:52.000000000 +1000
  4934. +++ version-updates_xorg/xorg-xf86-video-tdfx/.md5sum   2012-03-25 18:29:53.000000000 +1100
  4935. @@ -1 +1 @@
  4936. -8161bbf2b100c21b609163f0010766b3  xf86-video-tdfx-1.4.3.tar.bz2
  4937. +890d6c96c12e91e22b4ceaa9ef93b442  xf86-video-tdfx-1.4.4.tar.bz2
  4938. diff -pruN xorg/xorg-xf86-video-tdfx/Pkgfile version-updates_xorg/xorg-xf86-video-tdfx/Pkgfile
  4939. --- xorg/xorg-xf86-video-tdfx/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  4940. +++ version-updates_xorg/xorg-xf86-video-tdfx/Pkgfile   2012-03-25 18:29:53.000000000 +1100
  4941. @@ -4,7 +4,7 @@
  4942.  # Depends on: xorg-server
  4943.  
  4944.  name=xorg-xf86-video-tdfx
  4945. -version=1.4.3
  4946. +version=1.4.4
  4947.  release=1
  4948.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-$version.tar.bz2)
  4949.  
  4950. diff -pruN xorg/xorg-xf86-video-trident/.md5sum version-updates_xorg/xorg-xf86-video-trident/.md5sum
  4951. --- xorg/xorg-xf86-video-trident/.md5sum    2012-06-14 19:08:52.000000000 +1000
  4952. +++ version-updates_xorg/xorg-xf86-video-trident/.md5sum    2012-03-25 18:29:53.000000000 +1100
  4953. @@ -1 +1 @@
  4954. -7a646ba7033dd4eb10d38dca8682b391  xf86-video-trident-1.3.4.tar.bz2
  4955. +5ca073f0ca52b83e51def3115e6cae4a  xf86-video-trident-1.3.5.tar.bz2
  4956. diff -pruN xorg/xorg-xf86-video-trident/Pkgfile version-updates_xorg/xorg-xf86-video-trident/Pkgfile
  4957. --- xorg/xorg-xf86-video-trident/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  4958. +++ version-updates_xorg/xorg-xf86-video-trident/Pkgfile    2012-03-25 18:29:53.000000000 +1100
  4959. @@ -4,7 +4,7 @@
  4960.  # Depends on: xorg-server
  4961.  
  4962.  name=xorg-xf86-video-trident
  4963. -version=1.3.4
  4964. +version=1.3.5
  4965.  release=1
  4966.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-$version.tar.bz2)
  4967.  
  4968. diff -pruN xorg/xorg-xf86-video-vesa/.md5sum version-updates_xorg/xorg-xf86-video-vesa/.md5sum
  4969. --- xorg/xorg-xf86-video-vesa/.md5sum   2012-06-14 19:08:52.000000000 +1000
  4970. +++ version-updates_xorg/xorg-xf86-video-vesa/.md5sum   2012-03-24 00:00:41.000000000 +1100
  4971. @@ -1 +1 @@
  4972. -07fa32958aff9b463dd3af5481ef6626  xf86-video-vesa-2.3.0.tar.bz2
  4973. +02e6eacc2d1e07ac893b62481905d6f0  xf86-video-vesa-2.3.1.tar.bz2
  4974. diff -pruN xorg/xorg-xf86-video-vesa/Pkgfile version-updates_xorg/xorg-xf86-video-vesa/Pkgfile
  4975. --- xorg/xorg-xf86-video-vesa/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  4976. +++ version-updates_xorg/xorg-xf86-video-vesa/Pkgfile   2012-03-24 00:00:41.000000000 +1100
  4977. @@ -4,7 +4,7 @@
  4978.  # Depends on: xorg-server
  4979.  
  4980.  name=xorg-xf86-video-vesa
  4981. -version=2.3.0
  4982. +version=2.3.1
  4983.  release=1
  4984.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-$version.tar.bz2)
  4985.  
  4986. diff -pruN xorg/xorg-xf86-video-vesa/xf86-video-vesa-2.3.0.patch version-updates_xorg/xorg-xf86-video-vesa/xf86-video-vesa-2.3.0.patch
  4987. --- xorg/xorg-xf86-video-vesa/xf86-video-vesa-2.3.0.patch   1970-01-01 10:00:00.000000000 +1000
  4988. +++ version-updates_xorg/xorg-xf86-video-vesa/xf86-video-vesa-2.3.0.patch   2012-03-21 00:42:32.000000000 +1100
  4989. @@ -0,0 +1,111 @@
  4990. +http://lists.debian.org/debian-x/2012/01/msg00023.html
  4991. +
  4992. +commit 1f84310ddf49778f776a39810aa98211c812e8ab
  4993. +Author: Jeremy Huddleston <jeremyhu@apple.com>
  4994. +Date:   Wed Oct 19 01:33:07 2011 -0700
  4995. +
  4996. +    Build fix for ABI Version 12
  4997. +    
  4998. +    ABI Version 12 removes support for multiple PCI domains.  If you need to
  4999. +    use this driver on a system with more than one PCI domain, you should
  5000. +    either port this driver to using libpciaccess directly or stick with an
  5001. +    older server.
  5002. +    
  5003. +    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
  5004. +
  5005. +diff --git a/src/vesa.c b/src/vesa.c
  5006. +index 1136ac3..5a0120c 100644
  5007. +--- a/src/vesa.c
  5008. ++++ b/src/vesa.c
  5009. +@@ -1268,14 +1268,16 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
  5010. +                   & pVesa->base);
  5011. +     }
  5012. +     else
  5013. +-  pVesa->base = xf86MapDomainMemory(pScrn->scrnIndex, 0, pVesa->pciInfo,
  5014. +-                    pScrn->memPhysBase, pVesa->mapSize);
  5015. ++  (void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase,
  5016. ++                               pVesa->mapSize,
  5017. ++                               PCI_DEV_MAP_FLAG_WRITABLE,
  5018. ++                               & pVesa->base);
  5019. +
  5020. +     if (pVesa->base) {
  5021. +   if (pVesa->mapPhys != 0xa0000)
  5022. +-      pVesa->VGAbase = xf86MapDomainMemory(pScrn->scrnIndex, 0,
  5023. +-                       pVesa->pciInfo,
  5024. +-                       0xa0000, 0x10000);
  5025. ++      (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000,
  5026. ++                                   PCI_DEV_MAP_FLAG_WRITABLE,
  5027. ++                                   & pVesa->VGAbase);
  5028. +   else
  5029. +       pVesa->VGAbase = pVesa->base;
  5030. +
  5031. +@@ -1325,10 +1327,12 @@ VESAUnmapVidMem(ScrnInfoPtr pScrn)
  5032. +     if (pVesa->mapPhys != 0xa0000) {
  5033. +   (void) pci_device_unmap_range(pVesa->pciInfo, pVesa->base,
  5034. +                     pVesa->mapSize);
  5035. +-  xf86UnMapVidMem(pScrn->scrnIndex, pVesa->VGAbase, 0x10000);
  5036. ++  (void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->VGAbase,
  5037. ++                                 0x10000);
  5038. +     }
  5039. +     else {
  5040. +-  xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize);
  5041. ++  (void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->base,
  5042. ++                                 pVesa->mapSize);
  5043. +     }
  5044. + #else
  5045. +     xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize);
  5046. +
  5047. +commit 1a60e9068284e1ef22d8c470a85410a54ee668e8
  5048. +Author: Jeremy Huddleston <jeremyhu@apple.com>
  5049. +Date:   Wed Oct 19 01:15:13 2011 -0700
  5050. +
  5051. +    Use unsigned long rather than deprecated IOADDRESS
  5052. +    
  5053. +    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
  5054. +
  5055. +diff --git a/src/vesa.h b/src/vesa.h
  5056. +index 89245b9..bcc9e37 100644
  5057. +--- a/src/vesa.h
  5058. ++++ b/src/vesa.h
  5059. +@@ -114,7 +114,7 @@ typedef struct _VESARec
  5060. +     xf86EnableDisableFBAccessProc *EnableDisableFBAccess;
  5061. +     Bool accessEnabled;
  5062. +     OptionInfoPtr Options;
  5063. +-    IOADDRESS ioBase;
  5064. ++    unsigned long ioBase;
  5065. +     Bool ModeSetClearScreen;
  5066. +     void *shadow;
  5067. +     ShadowUpdateProc update;
  5068. +
  5069. +commit 463886df688d3521afc47ec88f9aaf67e924ec7f
  5070. +Author: Jeremy Huddleston <jeremyhu@apple.com>
  5071. +Date:   Wed Oct 19 01:15:03 2011 -0700
  5072. +
  5073. +    Build fix for ABI Version 12
  5074. +    
  5075. +    ABI Version 12 removes support for multiple PCI domains.  If you need to
  5076. +    use this driver on a system with more than one PCI domain, you should
  5077. +    either port this driver to using libpciaccess directly or stick with an
  5078. +    older server.
  5079. +    
  5080. +    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
  5081. +
  5082. +diff --git a/src/vesa.c b/src/vesa.c
  5083. +index 61d3550..1136ac3 100644
  5084. +--- a/src/vesa.c
  5085. ++++ b/src/vesa.c
  5086. +@@ -1299,7 +1299,11 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
  5087. +     }
  5088. + #endif
  5089. +
  5090. ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
  5091. +     pVesa->ioBase = pScrn->domainIOBase;
  5092. ++#else
  5093. ++    pVesa->ioBase = 0;
  5094. ++#endif
  5095. +
  5096. +     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB,
  5097. +          "virtual address = %p,\n"
  5098. +
  5099. +
  5100. +
  5101. diff -pruN xorg/xorg-xf86-video-vmware/.footprint version-updates_xorg/xorg-xf86-video-vmware/.footprint
  5102. --- xorg/xorg-xf86-video-vmware/.footprint  2012-06-14 19:08:52.000000000 +1000
  5103. +++ version-updates_xorg/xorg-xf86-video-vmware/.footprint  2012-03-20 17:45:35.000000000 +1100
  5104. @@ -5,8 +5,6 @@ drwxr-xr-x  root/root   usr/lib/xorg/module
  5105.  drwxr-xr-x root/root   usr/lib/xorg/modules/drivers/
  5106.  -rwxr-xr-x root/root   usr/lib/xorg/modules/drivers/vmware_drv.la
  5107.  -rwxr-xr-x root/root   usr/lib/xorg/modules/drivers/vmware_drv.so
  5108. --rwxr-xr-x root/root   usr/lib/xorg/modules/drivers/vmwlegacy_drv.la
  5109. --rwxr-xr-x root/root   usr/lib/xorg/modules/drivers/vmwlegacy_drv.so
  5110.  drwxr-xr-x root/root   usr/man/
  5111.  drwxr-xr-x root/root   usr/man/man4/
  5112.  -rw-r--r-- root/root   usr/man/man4/vmware.4.gz
  5113. diff -pruN xorg/xorg-xf86-video-vmware/.md5sum version-updates_xorg/xorg-xf86-video-vmware/.md5sum
  5114. --- xorg/xorg-xf86-video-vmware/.md5sum 2012-06-14 19:08:52.000000000 +1000
  5115. +++ version-updates_xorg/xorg-xf86-video-vmware/.md5sum 2012-03-25 18:29:53.000000000 +1100
  5116. @@ -1 +1 @@
  5117. -579bee487309b1bdc8329bf627d43413  xf86-video-vmware-11.0.3.tar.bz2
  5118. +0743ec7c479603fba60d118858fd5783  xf86-video-vmware-12.0.2.tar.bz2
  5119. diff -pruN xorg/xorg-xf86-video-vmware/Pkgfile version-updates_xorg/xorg-xf86-video-vmware/Pkgfile
  5120. --- xorg/xorg-xf86-video-vmware/Pkgfile 2012-06-14 19:08:52.000000000 +1000
  5121. +++ version-updates_xorg/xorg-xf86-video-vmware/Pkgfile 2012-03-25 18:29:53.000000000 +1100
  5122. @@ -4,7 +4,7 @@
  5123.  # Depends on: xorg-server
  5124.  
  5125.  name=xorg-xf86-video-vmware
  5126. -version=11.0.3
  5127. +version=12.0.2
  5128.  release=1
  5129.  source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-$version.tar.bz2)
  5130.  
  5131. diff -pruN xorg/xorg-xfontsel/.md5sum version-updates_xorg/xorg-xfontsel/.md5sum
  5132. --- xorg/xorg-xfontsel/.md5sum  2012-06-14 19:08:52.000000000 +1000
  5133. +++ version-updates_xorg/xorg-xfontsel/.md5sum  2012-03-25 18:29:53.000000000 +1100
  5134. @@ -1 +1 @@
  5135. -299fabe7d7be92b6572d814895ce3bb1  xfontsel-1.0.3.tar.bz2
  5136. +3f7e8ba9e34589a07d190575ae6c86cf  xfontsel-1.0.4.tar.bz2
  5137. diff -pruN xorg/xorg-xfontsel/Pkgfile version-updates_xorg/xorg-xfontsel/Pkgfile
  5138. --- xorg/xorg-xfontsel/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  5139. +++ version-updates_xorg/xorg-xfontsel/Pkgfile  2012-03-25 18:29:53.000000000 +1100
  5140. @@ -4,7 +4,7 @@
  5141.  # Depends on: xorg-libxaw
  5142.  
  5143.  name=xorg-xfontsel
  5144. -version=1.0.3
  5145. +version=1.0.4
  5146.  release=1
  5147.  source=(http://xorg.freedesktop.org/releases/individual/app/xfontsel-$version.tar.bz2)
  5148.  
  5149. diff -pruN xorg/xorg-xgamma/.md5sum version-updates_xorg/xorg-xgamma/.md5sum
  5150. --- xorg/xorg-xgamma/.md5sum    2012-06-14 19:08:52.000000000 +1000
  5151. +++ version-updates_xorg/xorg-xgamma/.md5sum    2012-03-25 18:29:53.000000000 +1100
  5152. @@ -1 +1 @@
  5153. -34d22b130bffd8aa857eae6d9da4bbb1  xgamma-1.0.4.tar.bz2
  5154. +c06067f572bc4a5298f324f27340da95  xgamma-1.0.5.tar.bz2
  5155. diff -pruN xorg/xorg-xgamma/Pkgfile version-updates_xorg/xorg-xgamma/Pkgfile
  5156. --- xorg/xorg-xgamma/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  5157. +++ version-updates_xorg/xorg-xgamma/Pkgfile    2012-03-25 18:29:53.000000000 +1100
  5158. @@ -4,7 +4,7 @@
  5159.  # Depends on: xorg-libx11, xorg-libxxf86vm
  5160.  
  5161.  name=xorg-xgamma
  5162. -version=1.0.4
  5163. +version=1.0.5
  5164.  release=1
  5165.  source=(http://xorg.freedesktop.org/releases/individual/app/xgamma-$version.tar.bz2)
  5166.  
  5167. diff -pruN xorg/xorg-xhost/.md5sum version-updates_xorg/xorg-xhost/.md5sum
  5168. --- xorg/xorg-xhost/.md5sum 2012-06-14 19:08:52.000000000 +1000
  5169. +++ version-updates_xorg/xorg-xhost/.md5sum 2012-03-25 18:29:53.000000000 +1100
  5170. @@ -1 +1 @@
  5171. -2be663a0afbcc0856c1591477d5bf32a  xhost-1.0.4.tar.bz2
  5172. +a0fcd2cb6ddd9f378944cc6f4f83cd7c  xhost-1.0.5.tar.bz2
  5173. diff -pruN xorg/xorg-xhost/Pkgfile version-updates_xorg/xorg-xhost/Pkgfile
  5174. --- xorg/xorg-xhost/Pkgfile 2012-06-14 19:08:52.000000000 +1000
  5175. +++ version-updates_xorg/xorg-xhost/Pkgfile 2012-03-25 18:29:53.000000000 +1100
  5176. @@ -4,7 +4,7 @@
  5177.  # Depends on: xorg-libxmu
  5178.  
  5179.  name=xorg-xhost
  5180. -version=1.0.4
  5181. +version=1.0.5
  5182.  release=1
  5183.  source=(http://xorg.freedesktop.org/releases/individual/app/xhost-$version.tar.bz2)
  5184.  
  5185. diff -pruN xorg/xorg-xinit/.md5sum version-updates_xorg/xorg-xinit/.md5sum
  5186. --- xorg/xorg-xinit/.md5sum 2012-06-14 19:08:52.000000000 +1000
  5187. +++ version-updates_xorg/xorg-xinit/.md5sum 2012-03-19 20:05:32.000000000 +1100
  5188. @@ -1 +1 @@
  5189. -bc4e8b7d1919597cc37a0d24aa149dda  xinit-1.3.0.tar.bz2
  5190. +9c0943cbd83e489ad1b05221b97efd44  xinit-1.3.2.tar.bz2
  5191. diff -pruN xorg/xorg-xinit/Pkgfile version-updates_xorg/xorg-xinit/Pkgfile
  5192. --- xorg/xorg-xinit/Pkgfile 2012-06-14 19:08:52.000000000 +1000
  5193. +++ version-updates_xorg/xorg-xinit/Pkgfile 2012-03-19 20:05:32.000000000 +1100
  5194. @@ -4,7 +4,7 @@
  5195.  # Depends on: xorg-server
  5196.  
  5197.  name=xorg-xinit
  5198. -version=1.3.0
  5199. +version=1.3.2
  5200.  release=1
  5201.  source=(http://xorg.freedesktop.org/releases/individual/app/xinit-$version.tar.bz2)
  5202.  
  5203. diff -pruN xorg/xorg-xinput/.md5sum version-updates_xorg/xorg-xinput/.md5sum
  5204. --- xorg/xorg-xinput/.md5sum    2012-06-14 19:08:52.000000000 +1000
  5205. +++ version-updates_xorg/xorg-xinput/.md5sum    2012-06-09 08:49:43.000000000 +1000
  5206. @@ -1 +1 @@
  5207. -1e2f0ad4f3fa833b65c568907f171d28  xinput-1.5.3.tar.bz2
  5208. +d2459d35b4e0b41ded26a1d1159b7ac6  xinput-1.6.0.tar.bz2
  5209. diff -pruN xorg/xorg-xinput/Pkgfile version-updates_xorg/xorg-xinput/Pkgfile
  5210. --- xorg/xorg-xinput/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  5211. +++ version-updates_xorg/xorg-xinput/Pkgfile    2012-06-09 08:49:43.000000000 +1000
  5212. @@ -1,9 +1,10 @@
  5213.  # Description: Utility to configure and test XInput devices
  5214.  # URL: http://xorg.freedesktop.org
  5215.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  5216. +# Depends on: xorg-libxi
  5217.  
  5218.  name=xorg-xinput
  5219. -version=1.5.3
  5220. +version=1.6.0
  5221.  release=1
  5222.  source=(http://xorg.freedesktop.org/releases/individual/app/xinput-$version.tar.bz2)
  5223.  
  5224. diff -pruN xorg/xorg-xkbcomp/.footprint version-updates_xorg/xorg-xkbcomp/.footprint
  5225. --- xorg/xorg-xkbcomp/.footprint    2012-06-14 19:08:52.000000000 +1000
  5226. +++ version-updates_xorg/xorg-xkbcomp/.footprint    2012-03-25 18:29:53.000000000 +1100
  5227. @@ -1,6 +1,9 @@
  5228.  drwxr-xr-x root/root   usr/
  5229.  drwxr-xr-x root/root   usr/bin/
  5230.  -rwxr-xr-x root/root   usr/bin/xkbcomp
  5231. +drwxr-xr-x root/root   usr/lib/
  5232. +drwxr-xr-x root/root   usr/lib/pkgconfig/
  5233. +-rw-r--r-- root/root   usr/lib/pkgconfig/xkbcomp.pc
  5234.  drwxr-xr-x root/root   usr/man/
  5235.  drwxr-xr-x root/root   usr/man/man1/
  5236.  -rw-r--r-- root/root   usr/man/man1/xkbcomp.1.gz
  5237. diff -pruN xorg/xorg-xkbcomp/.md5sum version-updates_xorg/xorg-xkbcomp/.md5sum
  5238. --- xorg/xorg-xkbcomp/.md5sum   2012-06-14 19:08:52.000000000 +1000
  5239. +++ version-updates_xorg/xorg-xkbcomp/.md5sum   2012-03-25 18:29:53.000000000 +1100
  5240. @@ -1 +1 @@
  5241. -35622a497894c1cff9182d42696c3e27  xkbcomp-1.2.3.tar.bz2
  5242. +a0fc1ac3fc4fe479ade09674347c5aa0  xkbcomp-1.2.4.tar.bz2
  5243. diff -pruN xorg/xorg-xkbcomp/Pkgfile version-updates_xorg/xorg-xkbcomp/Pkgfile
  5244. --- xorg/xorg-xkbcomp/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  5245. +++ version-updates_xorg/xorg-xkbcomp/Pkgfile   2012-03-25 18:29:53.000000000 +1100
  5246. @@ -4,7 +4,7 @@
  5247.  # Depends on: xorg-libx11, xorg-libxkbfile
  5248.  
  5249.  name=xorg-xkbcomp
  5250. -version=1.2.3
  5251. +version=1.2.4
  5252.  release=1
  5253.  source=(http://xorg.freedesktop.org/releases/individual/app/xkbcomp-$version.tar.bz2)
  5254.  
  5255. diff -pruN xorg/xorg-xlsfonts/.md5sum version-updates_xorg/xorg-xlsfonts/.md5sum
  5256. --- xorg/xorg-xlsfonts/.md5sum  2012-06-14 19:08:52.000000000 +1000
  5257. +++ version-updates_xorg/xorg-xlsfonts/.md5sum  2012-04-27 02:30:50.000000000 +1000
  5258. @@ -1 +1 @@
  5259. -bf6f3e7074479839d5182ffed735d2be  xlsfonts-1.0.3.tar.bz2
  5260. +5a2b476c2d84759529f01e0cd06145fe  xlsfonts-1.0.4.tar.bz2
  5261. diff -pruN xorg/xorg-xlsfonts/Pkgfile version-updates_xorg/xorg-xlsfonts/Pkgfile
  5262. --- xorg/xorg-xlsfonts/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  5263. +++ version-updates_xorg/xorg-xlsfonts/Pkgfile  2012-04-27 02:30:50.000000000 +1000
  5264. @@ -4,7 +4,7 @@
  5265.  # Depends on: xorg-libx11
  5266.  
  5267.  name=xorg-xlsfonts
  5268. -version=1.0.3
  5269. +version=1.0.4
  5270.  release=1
  5271.  source=(http://xorg.freedesktop.org/releases/individual/app/xlsfonts-$version.tar.bz2)
  5272.  
  5273. diff -pruN xorg/xorg-xmodmap/.md5sum version-updates_xorg/xorg-xmodmap/.md5sum
  5274. --- xorg/xorg-xmodmap/.md5sum   2012-06-14 19:08:52.000000000 +1000
  5275. +++ version-updates_xorg/xorg-xmodmap/.md5sum   2012-04-27 02:30:50.000000000 +1000
  5276. @@ -1 +1 @@
  5277. -b18850d373f3717dca569377c449d091  xmodmap-1.0.5.tar.bz2
  5278. +d9b65f6881afe0d6d9863b30e1081bde  xmodmap-1.0.7.tar.bz2
  5279. diff -pruN xorg/xorg-xmodmap/Pkgfile version-updates_xorg/xorg-xmodmap/Pkgfile
  5280. --- xorg/xorg-xmodmap/Pkgfile   2012-06-14 19:08:52.000000000 +1000
  5281. +++ version-updates_xorg/xorg-xmodmap/Pkgfile   2012-04-27 02:30:50.000000000 +1000
  5282. @@ -4,7 +4,7 @@
  5283.  # Depends on: xorg-libx11
  5284.  
  5285.  name=xorg-xmodmap
  5286. -version=1.0.5
  5287. +version=1.0.7
  5288.  release=1
  5289.  source=(http://xorg.freedesktop.org/releases/individual/app/xmodmap-$version.tar.bz2)
  5290.  
  5291. diff -pruN xorg/xorg-xprop/.md5sum version-updates_xorg/xorg-xprop/.md5sum
  5292. --- xorg/xorg-xprop/.md5sum 2012-06-14 19:08:52.000000000 +1000
  5293. +++ version-updates_xorg/xorg-xprop/.md5sum 2012-03-19 20:05:32.000000000 +1100
  5294. @@ -1 +1 @@
  5295. -e6d0673a1e1e469f0a6220a6868fb94b  xprop-1.2.0.tar.bz2
  5296. +d5529dc8d811efabd136ca2d8e857deb  xprop-1.2.1.tar.bz2
  5297. diff -pruN xorg/xorg-xprop/Pkgfile version-updates_xorg/xorg-xprop/Pkgfile
  5298. --- xorg/xorg-xprop/Pkgfile 2012-06-14 19:08:52.000000000 +1000
  5299. +++ version-updates_xorg/xorg-xprop/Pkgfile 2012-03-19 20:05:32.000000000 +1100
  5300. @@ -4,7 +4,7 @@
  5301.  # Depends on: xorg-libxmu, xorg-libx11
  5302.  
  5303.  name=xorg-xprop
  5304. -version=1.2.0
  5305. +version=1.2.1
  5306.  release=1
  5307.  source=(http://xorg.freedesktop.org/releases/individual/app/xprop-$version.tar.bz2)
  5308.  
  5309. diff -pruN xorg/xorg-xproto/.md5sum version-updates_xorg/xorg-xproto/.md5sum
  5310. --- xorg/xorg-xproto/.md5sum    2012-06-14 19:08:52.000000000 +1000
  5311. +++ version-updates_xorg/xorg-xproto/.md5sum    2012-03-19 20:05:32.000000000 +1100
  5312. @@ -1 +1 @@
  5313. -da0b0eb2f432b7cc1d665b05422a0457  xproto-7.0.22.tar.bz2
  5314. +d4d241a4849167e4e694fe73371c328c  xproto-7.0.23.tar.bz2
  5315. diff -pruN xorg/xorg-xproto/Pkgfile version-updates_xorg/xorg-xproto/Pkgfile
  5316. --- xorg/xorg-xproto/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  5317. +++ version-updates_xorg/xorg-xproto/Pkgfile    2012-03-19 20:05:32.000000000 +1100
  5318. @@ -3,7 +3,7 @@
  5319.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  5320.  
  5321.  name=xorg-xproto
  5322. -version=7.0.22
  5323. +version=7.0.23
  5324.  release=1
  5325.  source=(http://xorg.freedesktop.org/releases/individual/proto/xproto-$version.tar.bz2)
  5326.  
  5327. diff -pruN xorg/xorg-xrandr/.md5sum version-updates_xorg/xorg-xrandr/.md5sum
  5328. --- xorg/xorg-xrandr/.md5sum    2012-06-14 19:08:52.000000000 +1000
  5329. +++ version-updates_xorg/xorg-xrandr/.md5sum    2012-03-19 20:05:32.000000000 +1100
  5330. @@ -1 +1 @@
  5331. -d6d20038257eba5178b523e10239d51c  xrandr-1.3.4.tar.bz2
  5332. +9735173a84dca9b05e06fd4686196b07  xrandr-1.3.5.tar.bz2
  5333. diff -pruN xorg/xorg-xrandr/Pkgfile version-updates_xorg/xorg-xrandr/Pkgfile
  5334. --- xorg/xorg-xrandr/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  5335. +++ version-updates_xorg/xorg-xrandr/Pkgfile    2012-03-19 20:05:32.000000000 +1100
  5336. @@ -4,7 +4,7 @@
  5337.  # Depends on: xorg-libxrandr
  5338.  
  5339.  name=xorg-xrandr
  5340. -version=1.3.4
  5341. +version=1.3.5
  5342.  release=1
  5343.  source=(http://xorg.freedesktop.org/releases/individual/app/xrandr-$version.tar.bz2)
  5344.  
  5345. diff -pruN xorg/xorg-xtrans/.md5sum version-updates_xorg/xorg-xtrans/.md5sum
  5346. --- xorg/xorg-xtrans/.md5sum    2012-06-14 19:08:52.000000000 +1000
  5347. +++ version-updates_xorg/xorg-xtrans/.md5sum    2012-03-25 18:29:53.000000000 +1100
  5348. @@ -1 +1 @@
  5349. -c66f9ffd2da4fb012220c6c40ebc7609  xtrans-1.2.6.tar.bz2
  5350. +84c66908cf003ad8c272b0eecbdbaee3  xtrans-1.2.7.tar.bz2
  5351. diff -pruN xorg/xorg-xtrans/Pkgfile version-updates_xorg/xorg-xtrans/Pkgfile
  5352. --- xorg/xorg-xtrans/Pkgfile    2012-06-14 19:08:52.000000000 +1000
  5353. +++ version-updates_xorg/xorg-xtrans/Pkgfile    2012-03-25 18:29:53.000000000 +1100
  5354. @@ -3,7 +3,7 @@
  5355.  # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
  5356.  
  5357.  name=xorg-xtrans
  5358. -version=1.2.6
  5359. +version=1.2.7
  5360.  release=1
  5361.  source=(http://xorg.freedesktop.org/releases/individual/lib/xtrans-$version.tar.bz2)
  5362.  
  5363. diff -pruN xorg/xorg-xwininfo/.md5sum version-updates_xorg/xorg-xwininfo/.md5sum
  5364. --- xorg/xorg-xwininfo/.md5sum  2012-06-14 19:08:52.000000000 +1000
  5365. +++ version-updates_xorg/xorg-xwininfo/.md5sum  2012-03-19 20:05:32.000000000 +1100
  5366. @@ -1 +1 @@
  5367. -7a7f44b826d877ba39c19cf5913978d7  xwininfo-1.1.1.tar.bz2
  5368. +9e8b58c8aa6172e87ab4f9cf3612fedd  xwininfo-1.1.2.tar.bz2
  5369. diff -pruN xorg/xorg-xwininfo/Pkgfile version-updates_xorg/xorg-xwininfo/Pkgfile
  5370. --- xorg/xorg-xwininfo/Pkgfile  2012-06-14 19:08:52.000000000 +1000
  5371. +++ version-updates_xorg/xorg-xwininfo/Pkgfile  2012-03-19 20:05:32.000000000 +1100
  5372. @@ -4,7 +4,7 @@
  5373.  # Depends on: xorg-libxmu, xorg-libx11, xorg-libxext
  5374.  
  5375.  name=xorg-xwininfo
  5376. -version=1.1.1
  5377. +version=1.1.2
  5378.  release=1
  5379.  source=(http://xorg.freedesktop.org/releases/individual/app/xwininfo-$version.tar.bz2)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!