From 4b73c0d60c0d37b72667697a18ef3209d2dfd630 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 30 May 2007 07:57:58 +0000 Subject: [PATCH] Clifford Wolf: Updated xorg (X11R7.2) [2007052518245825890] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8472 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/xorg/appres/appres.desc | 4 +- package/xorg/beforelight/beforelight.desc | 4 +- package/xorg/editres/editres.desc | 4 +- package/xorg/encodings/encodings.desc | 4 +- .../font-screen-cyrillic.desc | 4 +- package/xorg/fonttosfnt/fonttosfnt.desc | 4 +- package/xorg/fonttosfnt/freetype2.patch | 10 - package/xorg/glproto/glproto.desc | 4 +- package/xorg/kbproto/kbproto.desc | 4 +- package/xorg/libfontenc/libfontenc.desc | 4 +- package/xorg/libice/libice.desc | 4 +- .../libpthread-stubs/libpthread-stubs.desc | 43 +++ package/xorg/libsm/libsm.desc | 4 +- package/xorg/libx11/libx11.desc | 4 +- package/xorg/libxau/libxau.desc | 4 +- package/xorg/libxcb/libxcb.desc | 43 +++ package/xorg/libxcomposite/libxcomposite.desc | 4 +- package/xorg/libxcursor/libxcursor.desc | 4 +- package/xorg/libxdamage/libxdamage.desc | 4 +- package/xorg/libxdmcp/libxdmcp.desc | 4 +- package/xorg/libxevie/libxevie.desc | 4 +- package/xorg/libxext/libxext.desc | 4 +- package/xorg/libxfixes/libxfixes.desc | 4 +- package/xorg/libxfont/freetype2.patch | 256 ------------------ package/xorg/libxfont/libxfont.desc | 4 +- package/xorg/libxfontcache/libxfontcache.desc | 4 +- package/xorg/libxft/libxft.desc | 4 +- package/xorg/libxi/libxi.desc | 4 +- package/xorg/libxkbfile/libxkbfile.desc | 4 +- package/xorg/libxmu/libxmu.desc | 4 +- package/xorg/libxpm/libxpm.desc | 4 +- package/xorg/libxrandr/libxrandr.desc | 4 +- package/xorg/libxrender/libxrender.desc | 4 +- package/xorg/libxres/libxres.desc | 4 +- package/xorg/libxscrnsaver/libxscrnsaver.desc | 4 +- package/xorg/libxt/libxt.desc | 4 +- package/xorg/libxv/libxv.desc | 4 +- package/xorg/libxvmc/libxvmc.desc | 4 +- package/xorg/luit/luit.desc | 4 +- package/xorg/mesalib/installdirs.patch | 13 - package/xorg/mesalib/mesalib.conf | 26 +- package/xorg/mesalib/mesalib.desc | 5 +- package/xorg/mesalib/no_broken_demos.patch | 39 +++ package/xorg/mkfontscale/mkfontscale.desc | 4 +- package/xorg/sessreg/sessreg.desc | 4 +- package/xorg/setxkbmap/setxkbmap.desc | 4 +- package/xorg/twm/twm.desc | 4 +- package/xorg/util-macros/util-macros.desc | 4 +- package/xorg/xauth/xauth.desc | 4 +- package/xorg/xcb-proto/xcb-proto.desc | 43 +++ package/xorg/xdbedizzy/xdbedizzy.desc | 4 +- package/xorg/xdm/xdm.desc | 4 +- .../xf86-input-keyboard.desc | 4 +- .../xf86-input-mouse/xf86-input-mouse.desc | 4 +- .../xf86-input-penmount.desc | 4 +- .../xorg/xf86-video-ati/xf86-video-ati.desc | 4 +- .../xf86-video-fbdev/xf86-video-fbdev.desc | 4 +- .../xorg/xf86-video-i128/xf86-video-i128.desc | 4 +- .../xorg/xf86-video-i810/xf86-video-i810.desc | 4 +- .../xorg/xf86-video-mga/xf86-video-mga.desc | 4 +- .../xf86-video-newport.desc | 4 +- .../xorg/xf86-video-nsc/xf86-video-nsc.desc | 4 +- package/xorg/xf86-video-nv/xf86-video-nv.desc | 4 +- .../xf86-video-rendition.desc | 4 +- package/xorg/xf86-video-s3/xf86-video-s3.desc | 4 +- .../xf86-video-savage/xf86-video-savage.desc | 4 +- .../xf86-video-siliconmotion.desc | 4 +- .../xorg/xf86-video-sis/xf86-video-sis.desc | 4 +- .../xorg/xf86-video-tdfx/xf86-video-tdfx.desc | 4 +- .../xf86-video-trident.desc | 4 +- .../xf86-video-tseng/xf86-video-tseng.desc | 4 +- .../xorg/xf86-video-vesa/xf86-video-vesa.desc | 4 +- .../xorg/xf86-video-via/xf86-video-via.desc | 4 +- .../xf86-video-vmware/xf86-video-vmware.desc | 4 +- .../xf86-video-voodoo/xf86-video-voodoo.desc | 4 +- package/xorg/xf86dga/xf86dga.desc | 4 +- package/xorg/xfs/xfs.desc | 4 +- package/xorg/xinit/xinit.desc | 4 +- package/xorg/xkbcomp/xkbcomp.desc | 4 +- .../xkeyboard-config/xkeyboard-config.desc | 43 +++ package/xorg/xmodmap/xmodmap.desc | 4 +- package/xorg/xorg-server/xorg-server.conf | 6 +- package/xorg/xorg-server/xorg-server.desc | 9 +- .../xorg-sgml-doctools.desc | 4 +- package/xorg/xorg-update.sh | 13 +- package/xorg/xprop/xprop.desc | 4 +- package/xorg/xproto/xproto.desc | 4 +- package/xorg/xtrans/xtrans.desc | 4 +- 88 files changed, 408 insertions(+), 441 deletions(-) delete mode 100644 package/xorg/fonttosfnt/freetype2.patch create mode 100644 package/xorg/libpthread-stubs/libpthread-stubs.desc create mode 100644 package/xorg/libxcb/libxcb.desc delete mode 100644 package/xorg/libxfont/freetype2.patch delete mode 100644 package/xorg/mesalib/installdirs.patch create mode 100644 package/xorg/mesalib/no_broken_demos.patch create mode 100644 package/xorg/xcb-proto/xcb-proto.desc create mode 100644 package/xorg/xkeyboard-config/xkeyboard-config.desc diff --git a/package/xorg/appres/appres.desc b/package/xorg/appres/appres.desc index b5d1b4c5d..79f972fd7 100644 --- a/package/xorg/appres/appres.desc +++ b/package/xorg/appres/appres.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.0 +[V] 1.0.1 [P] X -----5---9 110.830 -[D] 481476150 appres-X11R7.0-1.0.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/app/ +[D] 1347339127 appres-X11R7.2-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/beforelight/beforelight.desc b/package/xorg/beforelight/beforelight.desc index c85387fde..f8005f3e8 100644 --- a/package/xorg/beforelight/beforelight.desc +++ b/package/xorg/beforelight/beforelight.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.2 [P] X -----5---9 110.830 -[D] 262064975 beforelight-X11R7.0-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/app/ +[D] 1097328661 beforelight-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/editres/editres.desc b/package/xorg/editres/editres.desc index 3c76e7c88..ba0babda9 100644 --- a/package/xorg/editres/editres.desc +++ b/package/xorg/editres/editres.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.2 [P] X -----5---9 110.830 -[D] 1573788200 editres-X11R7.0-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/app/ +[D] 4124731040 editres-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/encodings/encodings.desc b/package/xorg/encodings/encodings.desc index 816c03e1c..ea7754481 100644 --- a/package/xorg/encodings/encodings.desc +++ b/package/xorg/encodings/encodings.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.0 +[V] 1.0.2 [P] X -----5---9 110.899 -[D] 584048233 encodings-X11R7.0-1.0.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font/ +[D] 3060076724 encodings-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/font/ diff --git a/package/xorg/font-screen-cyrillic/font-screen-cyrillic.desc b/package/xorg/font-screen-cyrillic/font-screen-cyrillic.desc index 5d668bdd7..625b932b2 100644 --- a/package/xorg/font-screen-cyrillic/font-screen-cyrillic.desc +++ b/package/xorg/font-screen-cyrillic/font-screen-cyrillic.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.0 +[V] 1.0.1 [P] X -----5---9 110.860 -[D] 1615481805 font-screen-cyrillic-X11R7.0-1.0.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font/ +[D] 769612152 font-screen-cyrillic-X11R7.2-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/font/ diff --git a/package/xorg/fonttosfnt/fonttosfnt.desc b/package/xorg/fonttosfnt/fonttosfnt.desc index 42e9021a0..69fef73fc 100644 --- a/package/xorg/fonttosfnt/fonttosfnt.desc +++ b/package/xorg/fonttosfnt/fonttosfnt.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.3 [P] X -----5---9 110.830 -[D] 3841264432 fonttosfnt-X11R7.0-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/app/ +[D] 2950373618 fonttosfnt-X11R7.2-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/fonttosfnt/freetype2.patch b/package/xorg/fonttosfnt/freetype2.patch deleted file mode 100644 index 2a1b517c0..000000000 --- a/package/xorg/fonttosfnt/freetype2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- fonttosfnt-X11R7.0-1.0.1/util.c~ 2005-11-08 07:33:31.000000000 +0100 -+++ fonttosfnt-X11R7.0-1.0.1/util.c 2006-07-28 13:35:23.000000000 +0200 -@@ -35,7 +35,6 @@ - - #include - #include FT_FREETYPE_H --#include FT_INTERNAL_OBJECTS_H - #include FT_BDF_H - #include "X11/Xos.h" - #include "fonttosfnt.h" diff --git a/package/xorg/glproto/glproto.desc b/package/xorg/glproto/glproto.desc index bd6c95ac5..f4316d4b9 100644 --- a/package/xorg/glproto/glproto.desc +++ b/package/xorg/glproto/glproto.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.4.7 +[V] 1.4.8 [P] X -----5---9 110.803 -[D] 2411216876 glproto-X11R7.1-1.4.7.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/proto/ +[D] 2650033611 glproto-X11R7.2-1.4.8.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/proto/ diff --git a/package/xorg/kbproto/kbproto.desc b/package/xorg/kbproto/kbproto.desc index 925dbe4b5..5603687c7 100644 --- a/package/xorg/kbproto/kbproto.desc +++ b/package/xorg/kbproto/kbproto.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.2 +[V] 1.0.3 [P] X -----5---9 110.803 -[D] 4094851365 kbproto-X11R7.0-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/ +[D] 2820802911 kbproto-X11R7.2-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/proto/ diff --git a/package/xorg/libfontenc/libfontenc.desc b/package/xorg/libfontenc/libfontenc.desc index 9c3da9c2e..1e77c983e 100644 --- a/package/xorg/libfontenc/libfontenc.desc +++ b/package/xorg/libfontenc/libfontenc.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.2 +[V] 1.0.4 [P] X -----5---9 110.812 -[D] 2766870222 libfontenc-X11R7.1-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 656941561 libfontenc-X11R7.2-1.0.4.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libice/libice.desc b/package/xorg/libice/libice.desc index b1643e979..5c54a6d2b 100644 --- a/package/xorg/libice/libice.desc +++ b/package/xorg/libice/libice.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.3 [P] X -----5---9 110.814 -[D] 886952805 libICE-X11R7.1-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 1534148063 libICE-X11R7.2-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libpthread-stubs/libpthread-stubs.desc b/package/xorg/libpthread-stubs/libpthread-stubs.desc new file mode 100644 index 000000000..99fb99e70 --- /dev/null +++ b/package/xorg/libpthread-stubs/libpthread-stubs.desc @@ -0,0 +1,43 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/x11/libxp/libxp.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] X.Org X11 libXp component + +[T] The libXp component for the X.Org Foundation X11 Release 7 and above. + +[U] http://www.x.org + +[A] The X.Org Foundation {The X.Org Sourcecode} +[A] The Open Group X Project Team {Original Sourcecode} +[M] The ROCK Linux Project + +[C] base/x11 +[F] CORE + +[L] OpenSource +[S] Stable +[V] 0.1 +[P] X -----5---9 110.822 + +[D] 3080657266 libpthread-stubs-0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/extras/ + diff --git a/package/xorg/libsm/libsm.desc b/package/xorg/libsm/libsm.desc index e8dcac47d..5d66753ed 100644 --- a/package/xorg/libsm/libsm.desc +++ b/package/xorg/libsm/libsm.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.2 [P] X -----5---9 110.816 -[D] 1397318015 libSM-X11R7.1-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 3372940485 libSM-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libx11/libx11.desc b/package/xorg/libx11/libx11.desc index 434568d81..383031f8b 100644 --- a/package/xorg/libx11/libx11.desc +++ b/package/xorg/libx11/libx11.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.1.1 [P] X -----5---9 110.808 -[D] 1022365453 libX11-X11R7.1-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 854190689 libX11-X11R7.2-1.1.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxau/libxau.desc b/package/xorg/libxau/libxau.desc index fd768e90e..16434838b 100644 --- a/package/xorg/libxau/libxau.desc +++ b/package/xorg/libxau/libxau.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.3 [P] X -----5---9 110.805 -[D] 1506352583 libXau-X11R7.1-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 3491956869 libXau-X11R7.2-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxcb/libxcb.desc b/package/xorg/libxcb/libxcb.desc new file mode 100644 index 000000000..40ea9d0b3 --- /dev/null +++ b/package/xorg/libxcb/libxcb.desc @@ -0,0 +1,43 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/x11/libxp/libxp.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] X.Org X11 libXp component + +[T] The libXp component for the X.Org Foundation X11 Release 7 and above. + +[U] http://www.x.org + +[A] The X.Org Foundation {The X.Org Sourcecode} +[A] The Open Group X Project Team {Original Sourcecode} +[M] The ROCK Linux Project + +[C] base/x11 +[F] CORE + +[L] OpenSource +[S] Stable +[V] 1.0 +[P] X -----5---9 110.823 + +[D] 466470052 libxcb-1.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/extras/ + diff --git a/package/xorg/libxcomposite/libxcomposite.desc b/package/xorg/libxcomposite/libxcomposite.desc index 86af39a6f..9043c4401 100644 --- a/package/xorg/libxcomposite/libxcomposite.desc +++ b/package/xorg/libxcomposite/libxcomposite.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 0.3 +[V] 0.3.1 [P] X -----5---9 110.824 -[D] 1424330776 libXcomposite-X11R7.1-0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 1588452085 libXcomposite-X11R7.2-0.3.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxcursor/libxcursor.desc b/package/xorg/libxcursor/libxcursor.desc index d6dea2146..eafe71104 100644 --- a/package/xorg/libxcursor/libxcursor.desc +++ b/package/xorg/libxcursor/libxcursor.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.1.6 +[V] 1.1.8 [P] X -----5---9 110.824 -[D] 3069740097 libXcursor-X11R7.1-1.1.6.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 3041364080 libXcursor-X11R7.2-1.1.8.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxdamage/libxdamage.desc b/package/xorg/libxdamage/libxdamage.desc index 7a807f1bb..5ca9d15c7 100644 --- a/package/xorg/libxdamage/libxdamage.desc +++ b/package/xorg/libxdamage/libxdamage.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.3 +[V] 1.0.4 [P] X -----5---9 110.824 -[D] 3868534986 libXdamage-X11R7.1-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 2777887589 libXdamage-X11R7.2-1.0.4.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxdmcp/libxdmcp.desc b/package/xorg/libxdmcp/libxdmcp.desc index 47c6189c5..7ec3f4001 100644 --- a/package/xorg/libxdmcp/libxdmcp.desc +++ b/package/xorg/libxdmcp/libxdmcp.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.2 [P] X -----5---9 110.806 -[D] 1251575850 libXdmcp-X11R7.1-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 1655940709 libXdmcp-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxevie/libxevie.desc b/package/xorg/libxevie/libxevie.desc index 489d2a1ad..919d28d51 100644 --- a/package/xorg/libxevie/libxevie.desc +++ b/package/xorg/libxevie/libxevie.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.2 [P] X -----5---9 110.824 -[D] 2246456205 libXevie-X11R7.1-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 3844126001 libXevie-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxext/libxext.desc b/package/xorg/libxext/libxext.desc index 2b4d5e637..78808fb88 100644 --- a/package/xorg/libxext/libxext.desc +++ b/package/xorg/libxext/libxext.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.2 [P] X -----5---9 110.810 -[D] 2966926931 libXext-X11R7.1-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 1216990846 libXext-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxfixes/libxfixes.desc b/package/xorg/libxfixes/libxfixes.desc index 226f736c1..5603e3ab3 100644 --- a/package/xorg/libxfixes/libxfixes.desc +++ b/package/xorg/libxfixes/libxfixes.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 4.0.1 +[V] 4.0.3 [P] X -----5---9 110.822 -[D] 3857306718 libXfixes-X11R7.1-4.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 1110801028 libXfixes-X11R7.2-4.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxfont/freetype2.patch b/package/xorg/libxfont/freetype2.patch deleted file mode 100644 index 726104ed2..000000000 --- a/package/xorg/libxfont/freetype2.patch +++ /dev/null @@ -1,256 +0,0 @@ -diff -dur libXfont-X11R7.1-1.1.0-o/src/FreeType/ftfuncs.c libXfont-X11R7.1-1.1.0/src/FreeType/ftfuncs.c ---- libXfont-X11R7.1-1.1.0-o/src/FreeType/ftfuncs.c 2005-10-23 20:32:05.000000000 +0200 -+++ libXfont-X11R7.1-1.1.0/src/FreeType/ftfuncs.c 2006-07-01 19:51:39.000000000 +0200 -@@ -54,10 +54,7 @@ - #include FT_TYPE1_TABLES_H - #include FT_XFREE86_H - #include FT_BBOX_H --#include FT_INTERNAL_TRUETYPE_TYPES_H - #include FT_TRUETYPE_TAGS_H --#include FT_INTERNAL_SFNT_H --#include FT_INTERNAL_STREAM_H - /* - * If you want to use FT_Outline_Get_CBox instead of - * FT_Outline_Get_BBox, define here. -@@ -123,6 +120,46 @@ - }; - - -+/* read 2-byte value from a SFNT table */ -+static FT_UShort -+sfnt_get_ushort( FT_Face face, -+ FT_ULong table_tag, -+ FT_ULong table_offset ) -+{ -+ FT_Byte buff[2]; -+ FT_ULong len = sizeof(buff); -+ FT_UShort result = 0; -+ -+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) ); -+ result = (FT_UShort)( (buff[0] << 8) | buff[1] ); -+ -+ return result; -+} -+ -+#define sfnt_get_short(f,t,o) ((FT_Short)sfnt_get_ushort((f),(t),(o))) -+ -+ -+#if 0 -+static FT_ULong -+sfnt_get_ulong( FT_Face face, -+ FT_ULong table_tag, -+ FT_ULong table_offset ) -+{ -+ FT_Byte buff[4]; -+ FT_ULong len = sizeof(buff); -+ FT_UShort result = 0; -+ -+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ); -+ result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) | -+ ((FT_ULong)buff[2] << 8) | (FT_ULong)buff[3]; -+ -+ return result; -+} -+#endif -+ -+ -+ -+ - static int ftypeInitP = 0; /* is the engine initialised? */ - FT_Library ftypeLibrary; - -@@ -211,6 +248,10 @@ - if(maxp && maxp->maxContours == 0) - face->bitmap = 1; - } -+ -+ face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face, -+ TTAG_hhea, 34 ); -+ - /* Insert face in hashtable and return it */ - face->next = faceTable[bucket]; - faceTable[bucket] = face; -@@ -462,6 +503,29 @@ - } - - if( FT_IS_SFNT( face->face ) ) { -+#if 1 -+ FT_F26Dot6 tt_char_width, tt_char_height, tt_dim_x, tt_dim_y; -+ FT_UInt nn; -+ -+ instance->strike_index=0xFFFFU; -+ -+ tt_char_width = (int)(trans->scale*(1<<6) + 0.5); -+ tt_char_height = (int)(trans->scale*(1<<6) + 0.5); -+ -+ tt_dim_x = ( ( tt_char_width * trans->xres + (36+32*72) ) / 72 ) & -64; -+ tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) & -64; -+ -+ for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ ) -+ { -+ FT_Bitmap_Size* sz = &face->face->available_sizes[nn]; -+ -+ if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem ) -+ { -+ instance->strike_index = nn; -+ break; -+ } -+ } -+#else - /* See Set_Char_Sizes() in ttdriver.c */ - FT_Error err; - TT_Face tt_face; -@@ -486,6 +550,7 @@ - sfnt = (SFNT_Service)tt_face->sfnt; - err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index); - if ( err ) instance->strike_index=0xFFFFU; -+#endif - } - - /* maintain a linked list of instances */ -@@ -803,31 +868,36 @@ - * parse the htmx field in TrueType font. - */ - --/* from src/truetype/ttgload.c */ - static void --tt_get_metrics( TT_HoriHeader* header, -+tt_get_metrics( FT_Face face, - FT_UInt idx, - FT_Short* bearing, -+ FT_UInt num_hmetrics, - FT_UShort* advance ) --/* Copyright 1996-2001, 2002 by */ --/* David Turner, Robert Wilhelm, and Werner Lemberg. */ - { -- TT_LongMetrics longs_m; -- FT_UShort k = header->number_Of_HMetrics; -+ /* read the metrics directly from the horizontal header, we -+ * parse the SFNT table directly through the standard FreeType API. -+ * this works with any version of the library and doesn't need to -+ * peek at its internals. Maybe a bit less -+ */ -+ FT_UInt count = num_hmetrics; - -- if ( k == 0 ) { -- *bearing = *advance = 0; -- return; -+ if ( count == 0 ) -+ { -+ *advance = 0; -+ *bearing = 0; - } -+ else if ( idx < count ) -+ { -+ FT_ULong offset = idx*4; - -- if ( idx < (FT_UInt)k ) { -- longs_m = (TT_LongMetrics )header->long_metrics + idx; -- *bearing = longs_m->bearing; -- *advance = longs_m->advance; -+ *advance = sfnt_get_ushort( face, TTAG_hmtx, offset ); -+ *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 ); - } -- else { -- *bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k]; -- *advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance; -+ else -+ { -+ *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 ); -+ *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 ); - } - } - -@@ -835,6 +904,7 @@ - ft_get_very_lazy_bbox( FT_UInt index, - FT_Face face, - FT_Size size, -+ FT_UInt num_hmetrics, - double slant, - FT_Matrix *matrix, - FT_BBox *bbox, -@@ -842,14 +912,13 @@ - FT_Long *vertAdvance) - { - if ( FT_IS_SFNT( face ) ) { -- TT_Face ttface = (TT_Face)face; - FT_Size_Metrics *smetrics = &size->metrics; - FT_Short leftBearing = 0; - FT_UShort advance = 0; - FT_Vector p0, p1, p2, p3; - - /* horizontal */ -- tt_get_metrics(&ttface->horizontal, index, -+ tt_get_metrics( face, num_hmetrics, index, - &leftBearing, &advance); - - #if 0 -@@ -910,7 +979,27 @@ - FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return, - int *sbitchk_incomplete_but_exist ) - { --#if (FREETYPE_VERSION >= 2001008) -+#if 1 -+ if ( strike_index != 0xFFFFU && ft_face->available_sizes != NULL ) -+ { -+ FT_Error error; -+ FT_Bitmap_Size* sz = &ft_face->available_sizes[strike_index]; -+ -+ error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 ); -+ if ( !error ) -+ { -+ error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY ); -+ if ( !error ) -+ { -+ if ( metrics_return != NULL ) -+ *metrics_return = ft_face->glyph->metrics; -+ -+ return 0; -+ } -+ } -+ } -+ return -1; -+#elif (FREETYPE_VERSION >= 2001008) - SFNT_Service sfnt; - TT_Face face; - FT_Error error; -@@ -1043,6 +1132,7 @@ - if( bitmap_metrics == NULL ) { - if ( sbitchk_incomplete_but_exist==0 && (instance->ttcap.flags & TTCAP_IS_VERY_LAZY) ) { - if( ft_get_very_lazy_bbox( idx, face->face, instance->size, -+ face->num_hmetrics, - instance->ttcap.vl_slant, - &instance->transformation.matrix, - &bbox, &outline_hori_advance, -@@ -1221,6 +1311,7 @@ - if( is_outline == 1 ){ - if( correct ){ - if( ft_get_very_lazy_bbox( idx, face->face, instance->size, -+ face->num_hmetrics, - instance->ttcap.vl_slant, - &instance->transformation.matrix, - &bbox, &outline_hori_advance, -Nur in libXfont-X11R7.1-1.1.0/src/FreeType: ftfuncs.c~. -Nur in libXfont-X11R7.1-1.1.0/src/FreeType: ftfuncs.c.rej. -diff -dur libXfont-X11R7.1-1.1.0-o/src/FreeType/ftfuncs.h libXfont-X11R7.1-1.1.0/src/FreeType/ftfuncs.h ---- libXfont-X11R7.1-1.1.0-o/src/FreeType/ftfuncs.h 2005-07-07 16:59:47.000000000 +0200 -+++ libXfont-X11R7.1-1.1.0/src/FreeType/ftfuncs.h 2006-07-01 19:41:37.000000000 +0200 -@@ -47,6 +47,7 @@ - char *filename; - FT_Face face; - int bitmap; -+ FT_UInt num_hmetrics; - struct _FTInstance *instances; - struct _FTInstance *active_instance; - struct _FTFace *next; /* link to next face in bucket */ -diff -dur libXfont-X11R7.1-1.1.0-o/src/FreeType/ftsystem.c libXfont-X11R7.1-1.1.0/src/FreeType/ftsystem.c ---- libXfont-X11R7.1-1.1.0-o/src/FreeType/ftsystem.c 2005-07-09 08:36:10.000000000 +0200 -+++ libXfont-X11R7.1-1.1.0/src/FreeType/ftsystem.c 2006-07-01 19:41:37.000000000 +0200 -@@ -35,7 +35,6 @@ - #endif - #include - #include FT_CONFIG_CONFIG_H --#include FT_INTERNAL_DEBUG_H - #include FT_SYSTEM_H - #include FT_ERRORS_H - #include FT_TYPES_H diff --git a/package/xorg/libxfont/libxfont.desc b/package/xorg/libxfont/libxfont.desc index 8e06fb4be..44574daa7 100644 --- a/package/xorg/libxfont/libxfont.desc +++ b/package/xorg/libxfont/libxfont.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.1.0 +[V] 1.2.7 [P] X -----5---9 110.824 -[D] 574616649 libXfont-X11R7.1-1.1.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 3490835497 libXfont-X11R7.2-1.2.7.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxfontcache/libxfontcache.desc b/package/xorg/libxfontcache/libxfontcache.desc index 79ca817a1..79b51b32d 100644 --- a/package/xorg/libxfontcache/libxfontcache.desc +++ b/package/xorg/libxfontcache/libxfontcache.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.2 +[V] 1.0.4 [P] X -----5---9 110.824 -[D] 3113917060 libXfontcache-X11R7.1-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 1745666749 libXfontcache-X11R7.2-1.0.4.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxft/libxft.desc b/package/xorg/libxft/libxft.desc index 4928f2114..1eb2ff7cb 100644 --- a/package/xorg/libxft/libxft.desc +++ b/package/xorg/libxft/libxft.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 2.1.8.2 +[V] 2.1.12 [P] X -----5---9 110.824 -[D] 3453433378 libXft-X11R7.0-2.1.8.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib/ +[D] 3047158205 libXft-X11R7.2-2.1.12.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxi/libxi.desc b/package/xorg/libxi/libxi.desc index 6a2d9542a..beb1ac7de 100644 --- a/package/xorg/libxi/libxi.desc +++ b/package/xorg/libxi/libxi.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.2 [P] X -----5---9 110.824 -[D] 2058067981 libXi-X11R7.1-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 2048878106 libXi-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxkbfile/libxkbfile.desc b/package/xorg/libxkbfile/libxkbfile.desc index 9c8b30a76..99f70cc77 100644 --- a/package/xorg/libxkbfile/libxkbfile.desc +++ b/package/xorg/libxkbfile/libxkbfile.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.3 +[V] 1.0.4 [P] X -----5---9 110.824 -[D] 1570319275 libxkbfile-X11R7.1-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 3954319843 libxkbfile-X11R7.2-1.0.4.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxmu/libxmu.desc b/package/xorg/libxmu/libxmu.desc index 90d1b797d..775956f5c 100644 --- a/package/xorg/libxmu/libxmu.desc +++ b/package/xorg/libxmu/libxmu.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.3 [P] X -----5---9 110.820 -[D] 598247464 libXmu-X11R7.1-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 1435303584 libXmu-X11R7.2-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxpm/libxpm.desc b/package/xorg/libxpm/libxpm.desc index c32cf8e0f..d08884726 100644 --- a/package/xorg/libxpm/libxpm.desc +++ b/package/xorg/libxpm/libxpm.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -----5---9 110.820 -[D] 1733963784 libXpm-X11R7.1-3.5.5.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 2274348243 libXpm-X11R7.2-3.5.6.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxrandr/libxrandr.desc b/package/xorg/libxrandr/libxrandr.desc index 30f47cc4f..c326a16b6 100644 --- a/package/xorg/libxrandr/libxrandr.desc +++ b/package/xorg/libxrandr/libxrandr.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.1.1 +[V] 1.1.2 [P] X -----5---9 110.826 -[D] 2754710434 libXrandr-X11R7.1-1.1.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 1422947678 libXrandr-X11R7.2-1.1.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxrender/libxrender.desc b/package/xorg/libxrender/libxrender.desc index c1b52d090..7c379e9ca 100644 --- a/package/xorg/libxrender/libxrender.desc +++ b/package/xorg/libxrender/libxrender.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 0.9.1 +[V] 0.9.2 [P] X -----5---9 110.823 -[D] 4269307861 libXrender-X11R7.1-0.9.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 1745228674 libXrender-X11R7.2-0.9.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxres/libxres.desc b/package/xorg/libxres/libxres.desc index e8afab4cf..b39750dda 100644 --- a/package/xorg/libxres/libxres.desc +++ b/package/xorg/libxres/libxres.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.3 [P] X -----5---9 110.826 -[D] 3288550884 libXres-X11R7.1-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 208178690 libXres-X11R7.2-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxscrnsaver/libxscrnsaver.desc b/package/xorg/libxscrnsaver/libxscrnsaver.desc index 92e8b43dd..182ab7551 100644 --- a/package/xorg/libxscrnsaver/libxscrnsaver.desc +++ b/package/xorg/libxscrnsaver/libxscrnsaver.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.1.0 +[V] 1.1.2 [P] X -----5---9 110.826 -[D] 1198414554 libXScrnSaver-X11R7.1-1.1.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 2215434036 libXScrnSaver-X11R7.2-1.1.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxt/libxt.desc b/package/xorg/libxt/libxt.desc index 94705763c..942a5c77a 100644 --- a/package/xorg/libxt/libxt.desc +++ b/package/xorg/libxt/libxt.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.2 +[V] 1.0.4 [P] X -----5---9 110.818 -[D] 4166373876 libXt-X11R7.1-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 3795268236 libXt-X11R7.2-1.0.4.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxv/libxv.desc b/package/xorg/libxv/libxv.desc index 3a7f930a4..a2a3a7f01 100644 --- a/package/xorg/libxv/libxv.desc +++ b/package/xorg/libxv/libxv.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.3 [P] X -----5---9 110.826 -[D] 2535860932 libXv-X11R7.0-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib/ +[D] 1218505407 libXv-X11R7.2-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/libxvmc/libxvmc.desc b/package/xorg/libxvmc/libxvmc.desc index fd716c763..a7d58a0fd 100644 --- a/package/xorg/libxvmc/libxvmc.desc +++ b/package/xorg/libxvmc/libxvmc.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.2 +[V] 1.0.4 [P] X -----5---9 110.826 -[D] 668413037 libXvMC-X11R7.1-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/lib/ +[D] 1503991527 libXvMC-X11R7.2-1.0.4.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/ diff --git a/package/xorg/luit/luit.desc b/package/xorg/luit/luit.desc index aef3999a0..448c42217 100644 --- a/package/xorg/luit/luit.desc +++ b/package/xorg/luit/luit.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.2 [P] X -----5---9 110.830 -[D] 2953604714 luit-X11R7.0-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/app/ +[D] 334512212 luit-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/mesalib/installdirs.patch b/package/xorg/mesalib/installdirs.patch deleted file mode 100644 index a21f7531c..000000000 --- a/package/xorg/mesalib/installdirs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Mesa-6.5/bin/installmesa~ 2006-02-22 18:22:23.000000000 +0100 -+++ Mesa-6.5/bin/installmesa 2006-06-07 02:15:38.000000000 +0200 -@@ -9,8 +9,8 @@ - - TOP=. - --INCLUDE_DIR="/usr/local/include" --LIB_DIR="/usr/local/lib" -+INCLUDE_DIR="/usr/include" -+LIB_DIR="/usr/lib" - - if [ "x$#" = "x0" ] ; then - echo diff --git a/package/xorg/mesalib/mesalib.conf b/package/xorg/mesalib/mesalib.conf index 77ce787c2..cb1338037 100644 --- a/package/xorg/mesalib/mesalib.conf +++ b/package/xorg/mesalib/mesalib.conf @@ -1,5 +1,29 @@ -# FIXME: use a different makeopt if arch != x86 +mesalib_prepatch() { + tar xvjf $archdir/MesaDemos-$ver.tar.bz2 -C .. + find progs/ -type f -perm +111 | xargs -r chmod -x + sed -i 's,/usr/local,/usr,g' configs/* +} + +mesalib_postmake() { + find progs/ -type f -perm +111 | while read src; do + if [[ `basename $src` == gl* ]]; then + trg=`basename $src` + else + trg=${src//\//-}; trg=${trg/progs-/mesa-} + fi + echo "installing $src: $root/usr/X11/bin/$trg" + install $src $root/usr/X11/bin/$trg + done +} + +var_append CC_WRAPPER_FILTER "|" \ + "sed -r 's,-lglut,-L/usr/X11/lib\n-lXmu\n-lXi\n-lglut,g'" + +# FIXME: use a different makeopt if arch != x86 makeopt="linux-x86" +prepatch="mesalib_prepatch" +postmake="mesalib_postmake" export CFLAGS="$CFLAGS -I/usr/X11/include" + diff --git a/package/xorg/mesalib/mesalib.desc b/package/xorg/mesalib/mesalib.desc index 068cb3b7a..b4eb63372 100644 --- a/package/xorg/mesalib/mesalib.desc +++ b/package/xorg/mesalib/mesalib.desc @@ -37,8 +37,9 @@ [L] OpenSource [S] Stable # Keep in sync with the xorg-server package. -[V] 6.5 +[V] 6.5.2 [P] X -----5---9 110.829 -[D] 3434560735 MesaLib-6.5.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/mesa3d/ +[D] 3520516574 MesaLib-6.5.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/extras/ +[D] 3978233672 MesaDemos-6.5.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/extras/ diff --git a/package/xorg/mesalib/no_broken_demos.patch b/package/xorg/mesalib/no_broken_demos.patch new file mode 100644 index 000000000..0bcfeeb66 --- /dev/null +++ b/package/xorg/mesalib/no_broken_demos.patch @@ -0,0 +1,39 @@ +--- ./progs/demos/Makefile.orig 2007-05-24 10:23:15.000000000 +0200 ++++ ./progs/demos/Makefile 2007-05-24 10:24:38.000000000 +0200 +@@ -14,8 +14,6 @@ + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + + PROGS = \ +- arbfplight \ +- arbfslight \ + arbocclude \ + bounce \ + clearspd \ +@@ -23,16 +21,13 @@ + drawpix \ + engine \ + fire \ +- fogcoord \ + fplight \ +- fslight \ + gamma \ + gearbox \ + gears \ + geartrain \ + glinfo \ + gloss \ +- glslnoise \ + gltestperf \ + glutfx \ + isosurf \ +@@ -61,9 +56,7 @@ + texobj \ + trispd \ + tunnel \ +- tunnel2 \ +- vao_demo \ +- winpos ++ tunnel2 + + + ##### RULES ##### diff --git a/package/xorg/mkfontscale/mkfontscale.desc b/package/xorg/mkfontscale/mkfontscale.desc index 0276bb8bb..841a49274 100644 --- a/package/xorg/mkfontscale/mkfontscale.desc +++ b/package/xorg/mkfontscale/mkfontscale.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.3 [P] X -----5---9 110.830 -[D] 785856286 mkfontscale-X11R7.0-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/app/ +[D] 2621323864 mkfontscale-X11R7.2-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/sessreg/sessreg.desc b/package/xorg/sessreg/sessreg.desc index b9df3255a..9f40320ca 100644 --- a/package/xorg/sessreg/sessreg.desc +++ b/package/xorg/sessreg/sessreg.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.0 +[V] 1.0.2 [P] X -----5---9 110.830 -[D] 2120603700 sessreg-X11R7.0-1.0.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/app/ +[D] 2630659226 sessreg-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/setxkbmap/setxkbmap.desc b/package/xorg/setxkbmap/setxkbmap.desc index f6b0c57e5..57c73c8ff 100644 --- a/package/xorg/setxkbmap/setxkbmap.desc +++ b/package/xorg/setxkbmap/setxkbmap.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.2 +[V] 1.0.3 [P] X -----5---9 110.830 -[D] 398923825 setxkbmap-X11R7.1-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/app/ +[D] 2041350980 setxkbmap-X11R7.2-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/twm/twm.desc b/package/xorg/twm/twm.desc index 20fe44993..e94b2bb98 100644 --- a/package/xorg/twm/twm.desc +++ b/package/xorg/twm/twm.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.3 [P] X -----5---9 110.830 -[D] 891279852 twm-X11R7.0-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/app/ +[D] 3231994620 twm-X11R7.2-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/util-macros/util-macros.desc b/package/xorg/util-macros/util-macros.desc index 6fa464f1f..adbdd54a7 100644 --- a/package/xorg/util-macros/util-macros.desc +++ b/package/xorg/util-macros/util-macros.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.2 +[V] 1.1.5 [P] X -----5---9 110.800 -[D] 1994072261 util-macros-X11R7.1-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/util/ +[D] 4206384116 util-macros-X11R7.2-1.1.5.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/util/ diff --git a/package/xorg/xauth/xauth.desc b/package/xorg/xauth/xauth.desc index ce6588bdd..28abb6de6 100644 --- a/package/xorg/xauth/xauth.desc +++ b/package/xorg/xauth/xauth.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.2 [P] X -----5---9 110.830 -[D] 3943842578 xauth-X11R7.0-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/app/ +[D] 2886945429 xauth-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/xcb-proto/xcb-proto.desc b/package/xorg/xcb-proto/xcb-proto.desc new file mode 100644 index 000000000..5064dd820 --- /dev/null +++ b/package/xorg/xcb-proto/xcb-proto.desc @@ -0,0 +1,43 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/x11/libxp/libxp.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] X.Org X11 libXp component + +[T] The libXp component for the X.Org Foundation X11 Release 7 and above. + +[U] http://www.x.org + +[A] The X.Org Foundation {The X.Org Sourcecode} +[A] The Open Group X Project Team {Original Sourcecode} +[M] The ROCK Linux Project + +[C] base/x11 +[F] CORE + +[L] OpenSource +[S] Stable +[V] 1.0 +[P] X -----5---9 110.823 + +[D] 2257274246 xcb-proto-1.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/extras/ + diff --git a/package/xorg/xdbedizzy/xdbedizzy.desc b/package/xorg/xdbedizzy/xdbedizzy.desc index eec3f8167..b242d1de5 100644 --- a/package/xorg/xdbedizzy/xdbedizzy.desc +++ b/package/xorg/xdbedizzy/xdbedizzy.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.2 [P] X -----5---9 110.830 -[D] 1134029130 xdbedizzy-X11R7.0-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/app/ +[D] 3975866076 xdbedizzy-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/xdm/xdm.desc b/package/xorg/xdm/xdm.desc index 916414ff1..1b106e623 100644 --- a/package/xorg/xdm/xdm.desc +++ b/package/xorg/xdm/xdm.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.4 +[V] 1.1.3 [P] X -----5---9 110.830 -[D] 2243374384 xdm-X11R7.1-1.0.4.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/app/ +[D] 2976125292 xdm-X11R7.2-1.1.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/xf86-input-keyboard/xf86-input-keyboard.desc b/package/xorg/xf86-input-keyboard/xf86-input-keyboard.desc index f43c6aa93..7740d9561 100644 --- a/package/xorg/xf86-input-keyboard/xf86-input-keyboard.desc +++ b/package/xorg/xf86-input-keyboard/xf86-input-keyboard.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.1.0 +[V] 1.1.1 [P] X -----5---9 110.834 -[D] 61941336 xf86-input-keyboard-X11R7.1-1.1.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 3863435499 xf86-input-keyboard-X11R7.2-1.1.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-input-mouse/xf86-input-mouse.desc b/package/xorg/xf86-input-mouse/xf86-input-mouse.desc index 49f29b097..1cd1cae49 100644 --- a/package/xorg/xf86-input-mouse/xf86-input-mouse.desc +++ b/package/xorg/xf86-input-mouse/xf86-input-mouse.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.1.0 +[V] 1.1.2 [P] X -----5---9 110.834 -[D] 2144073059 xf86-input-mouse-X11R7.1-1.1.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 11920389 xf86-input-mouse-X11R7.2-1.1.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-input-penmount/xf86-input-penmount.desc b/package/xorg/xf86-input-penmount/xf86-input-penmount.desc index 9fa4f4b60..00ddabfb7 100644 --- a/package/xorg/xf86-input-penmount/xf86-input-penmount.desc +++ b/package/xorg/xf86-input-penmount/xf86-input-penmount.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.1.0 +[V] 1.2.0 [P] X -----5---9 110.834 -[D] 3977583579 xf86-input-penmount-X11R7.1-1.1.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 40335830 xf86-input-penmount-X11R7.2-1.2.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-ati/xf86-video-ati.desc b/package/xorg/xf86-video-ati/xf86-video-ati.desc index 533131e53..04c9e6f3f 100644 --- a/package/xorg/xf86-video-ati/xf86-video-ati.desc +++ b/package/xorg/xf86-video-ati/xf86-video-ati.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 6.6.0 +[V] 6.6.3 [P] X -----5---9 110.836 -[D] 1674728691 xf86-video-ati-X11R7.1-6.6.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 2076797282 xf86-video-ati-X11R7.2-6.6.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-fbdev/xf86-video-fbdev.desc b/package/xorg/xf86-video-fbdev/xf86-video-fbdev.desc index 9cb9aaeae..bcd9a24ed 100644 --- a/package/xorg/xf86-video-fbdev/xf86-video-fbdev.desc +++ b/package/xorg/xf86-video-fbdev/xf86-video-fbdev.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 0.3.0 +[V] 0.3.1 [P] X -----5---9 110.836 -[D] 1256114952 xf86-video-fbdev-X11R7.1-0.3.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 3984518873 xf86-video-fbdev-X11R7.2-0.3.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-i128/xf86-video-i128.desc b/package/xorg/xf86-video-i128/xf86-video-i128.desc index 68dbebc4c..fb34e0bd6 100644 --- a/package/xorg/xf86-video-i128/xf86-video-i128.desc +++ b/package/xorg/xf86-video-i128/xf86-video-i128.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.1.0.5 +[V] 1.2.1 [P] X -----5---9 110.836 -[D] 4220376459 xf86-video-i128-X11R7.1-1.1.0.5.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 866679505 xf86-video-i128-X11R7.2-1.2.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-i810/xf86-video-i810.desc b/package/xorg/xf86-video-i810/xf86-video-i810.desc index 178656013..57686dfc9 100644 --- a/package/xorg/xf86-video-i810/xf86-video-i810.desc +++ b/package/xorg/xf86-video-i810/xf86-video-i810.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.6.0 +[V] 1.6.5 [P] X -----5---9 110.836 -[D] 3344239880 xf86-video-i810-X11R7.1-1.6.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 3067155912 xf86-video-i810-X11R7.2-1.6.5.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-mga/xf86-video-mga.desc b/package/xorg/xf86-video-mga/xf86-video-mga.desc index 1bbf3b447..f006c35af 100644 --- a/package/xorg/xf86-video-mga/xf86-video-mga.desc +++ b/package/xorg/xf86-video-mga/xf86-video-mga.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.4.1 +[V] 1.4.6.1 [P] X -----5---9 110.836 -[D] 3468091092 xf86-video-mga-X11R7.1-1.4.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 3636249263 xf86-video-mga-X11R7.2-1.4.6.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-newport/xf86-video-newport.desc b/package/xorg/xf86-video-newport/xf86-video-newport.desc index 6affec2af..92d2c5732 100644 --- a/package/xorg/xf86-video-newport/xf86-video-newport.desc +++ b/package/xorg/xf86-video-newport/xf86-video-newport.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 0.2.0 +[V] 0.2.1 [P] X -----5---9 110.836 -[D] 13311756 xf86-video-newport-X11R7.1-0.2.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 3258531065 xf86-video-newport-X11R7.2-0.2.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-nsc/xf86-video-nsc.desc b/package/xorg/xf86-video-nsc/xf86-video-nsc.desc index b168b958b..5ff6a5015 100644 --- a/package/xorg/xf86-video-nsc/xf86-video-nsc.desc +++ b/package/xorg/xf86-video-nsc/xf86-video-nsc.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 2.8.1 +[V] 2.8.2 [P] X -----5---9 110.836 -[D] 3639667480 xf86-video-nsc-X11R7.1-2.8.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 525628951 xf86-video-nsc-X11R7.2-2.8.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-nv/xf86-video-nv.desc b/package/xorg/xf86-video-nv/xf86-video-nv.desc index 8258acfe4..2dae34cff 100644 --- a/package/xorg/xf86-video-nv/xf86-video-nv.desc +++ b/package/xorg/xf86-video-nv/xf86-video-nv.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.1.1 +[V] 1.2.2.1 [P] X -----5---9 110.836 -[D] 1904930804 xf86-video-nv-X11R7.1-1.1.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 622387787 xf86-video-nv-X11R7.2-1.2.2.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-rendition/xf86-video-rendition.desc b/package/xorg/xf86-video-rendition/xf86-video-rendition.desc index 5f8521a31..f6022a68a 100644 --- a/package/xorg/xf86-video-rendition/xf86-video-rendition.desc +++ b/package/xorg/xf86-video-rendition/xf86-video-rendition.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 4.1.0 +[V] 4.1.3 [P] X -----5---9 110.836 -[D] 2425675582 xf86-video-rendition-X11R7.1-4.1.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 1542358161 xf86-video-rendition-X11R7.2-4.1.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-s3/xf86-video-s3.desc b/package/xorg/xf86-video-s3/xf86-video-s3.desc index 3ddcf15a1..6f34367fa 100644 --- a/package/xorg/xf86-video-s3/xf86-video-s3.desc +++ b/package/xorg/xf86-video-s3/xf86-video-s3.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 0.4.1 +[V] 0.5.0 [P] X -----5---9 110.836 -[D] 1420631297 xf86-video-s3-X11R7.1-0.4.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 41730922 xf86-video-s3-X11R7.2-0.5.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-savage/xf86-video-savage.desc b/package/xorg/xf86-video-savage/xf86-video-savage.desc index d6c0c67a4..3dcf9d1e2 100644 --- a/package/xorg/xf86-video-savage/xf86-video-savage.desc +++ b/package/xorg/xf86-video-savage/xf86-video-savage.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 2.1.1 +[V] 2.1.2 [P] X -----5---9 110.836 -[D] 770754002 xf86-video-savage-X11R7.1-2.1.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 1123382655 xf86-video-savage-X11R7.2-2.1.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-siliconmotion/xf86-video-siliconmotion.desc b/package/xorg/xf86-video-siliconmotion/xf86-video-siliconmotion.desc index 8b7bbcb98..97b3a462d 100644 --- a/package/xorg/xf86-video-siliconmotion/xf86-video-siliconmotion.desc +++ b/package/xorg/xf86-video-siliconmotion/xf86-video-siliconmotion.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.4.1 +[V] 1.4.2 [P] X -----5---9 110.836 -[D] 1749493484 xf86-video-siliconmotion-X11R7.1-1.4.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 1902322612 xf86-video-siliconmotion-X11R7.2-1.4.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-sis/xf86-video-sis.desc b/package/xorg/xf86-video-sis/xf86-video-sis.desc index 57a626501..514ecb45d 100644 --- a/package/xorg/xf86-video-sis/xf86-video-sis.desc +++ b/package/xorg/xf86-video-sis/xf86-video-sis.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 0.9.1 +[V] 0.9.3 [P] X -----5---9 110.836 -[D] 2975443356 xf86-video-sis-X11R7.1-0.9.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 307091693 xf86-video-sis-X11R7.2-0.9.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-tdfx/xf86-video-tdfx.desc b/package/xorg/xf86-video-tdfx/xf86-video-tdfx.desc index 3fb02a85a..38806c982 100644 --- a/package/xorg/xf86-video-tdfx/xf86-video-tdfx.desc +++ b/package/xorg/xf86-video-tdfx/xf86-video-tdfx.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.2.1 +[V] 1.3.0 [P] X -----5---9 110.836 -[D] 217527620 xf86-video-tdfx-X11R7.1-1.2.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 1464229664 xf86-video-tdfx-X11R7.2-1.3.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-trident/xf86-video-trident.desc b/package/xorg/xf86-video-trident/xf86-video-trident.desc index 709774061..ce2cf894f 100644 --- a/package/xorg/xf86-video-trident/xf86-video-trident.desc +++ b/package/xorg/xf86-video-trident/xf86-video-trident.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.2.1 +[V] 1.2.3 [P] X -----5---9 110.836 -[D] 4203547556 xf86-video-trident-X11R7.1-1.2.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 2246031423 xf86-video-trident-X11R7.2-1.2.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-tseng/xf86-video-tseng.desc b/package/xorg/xf86-video-tseng/xf86-video-tseng.desc index a004e012b..ec8971830 100644 --- a/package/xorg/xf86-video-tseng/xf86-video-tseng.desc +++ b/package/xorg/xf86-video-tseng/xf86-video-tseng.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.1.0 +[V] 1.1.1 [P] X -----5---9 110.836 -[D] 667980930 xf86-video-tseng-X11R7.1-1.1.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 622816230 xf86-video-tseng-X11R7.2-1.1.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-vesa/xf86-video-vesa.desc b/package/xorg/xf86-video-vesa/xf86-video-vesa.desc index 9955d1a1b..88f8854e5 100644 --- a/package/xorg/xf86-video-vesa/xf86-video-vesa.desc +++ b/package/xorg/xf86-video-vesa/xf86-video-vesa.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.2.0 +[V] 1.3.0 [P] X -----5---9 110.836 -[D] 3622961543 xf86-video-vesa-X11R7.1-1.2.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 744154747 xf86-video-vesa-X11R7.2-1.3.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-via/xf86-video-via.desc b/package/xorg/xf86-video-via/xf86-video-via.desc index 38d4d9b94..c1b80f3f0 100644 --- a/package/xorg/xf86-video-via/xf86-video-via.desc +++ b/package/xorg/xf86-video-via/xf86-video-via.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 0.2.1 +[V] 0.2.2 [P] X -----5---9 110.836 -[D] 1393963851 xf86-video-via-X11R7.1-0.2.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 468071944 xf86-video-via-X11R7.2-0.2.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-vmware/xf86-video-vmware.desc b/package/xorg/xf86-video-vmware/xf86-video-vmware.desc index 03f8ceebc..e6ae60e2c 100644 --- a/package/xorg/xf86-video-vmware/xf86-video-vmware.desc +++ b/package/xorg/xf86-video-vmware/xf86-video-vmware.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 10.13.0 +[V] 10.14.1 [P] X -----5---9 110.836 -[D] 2101330757 xf86-video-vmware-X11R7.1-10.13.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 585129427 xf86-video-vmware-X11R7.2-10.14.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86-video-voodoo/xf86-video-voodoo.desc b/package/xorg/xf86-video-voodoo/xf86-video-voodoo.desc index 94ed9f6a5..18582afbb 100644 --- a/package/xorg/xf86-video-voodoo/xf86-video-voodoo.desc +++ b/package/xorg/xf86-video-voodoo/xf86-video-voodoo.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.1.0 +[V] 1.1.1 [P] X -----5---9 110.836 -[D] 1165455938 xf86-video-voodoo-X11R7.1-1.1.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/driver/ +[D] 3609411679 xf86-video-voodoo-X11R7.2-1.1.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/driver/ diff --git a/package/xorg/xf86dga/xf86dga.desc b/package/xorg/xf86dga/xf86dga.desc index adf87defc..076d431c2 100644 --- a/package/xorg/xf86dga/xf86dga.desc +++ b/package/xorg/xf86dga/xf86dga.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.2 [P] X -----5---9 110.830 -[D] 3791707565 xf86dga-X11R7.0-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/app/ +[D] 203336845 xf86dga-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/xfs/xfs.desc b/package/xorg/xfs/xfs.desc index 18fe68563..18080e188 100644 --- a/package/xorg/xfs/xfs.desc +++ b/package/xorg/xfs/xfs.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.2 +[V] 1.0.4 [P] X -----5---9 110.830 -[D] 4054049842 xfs-X11R7.1-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/app/ +[D] 579712373 xfs-X11R7.2-1.0.4.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/xinit/xinit.desc b/package/xorg/xinit/xinit.desc index ea7e3a0ce..43550bdbd 100644 --- a/package/xorg/xinit/xinit.desc +++ b/package/xorg/xinit/xinit.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.2 +[V] 1.0.3 [P] X -----5---9 110.830 -[D] 4194930805 xinit-X11R7.1-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/app/ +[D] 1663032034 xinit-X11R7.2-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/xkbcomp/xkbcomp.desc b/package/xorg/xkbcomp/xkbcomp.desc index 3eb6b1a13..33cc933be 100644 --- a/package/xorg/xkbcomp/xkbcomp.desc +++ b/package/xorg/xkbcomp/xkbcomp.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.2 +[V] 1.0.3 [P] X -----5---9 110.830 -[D] 1471048503 xkbcomp-X11R7.1-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/app/ +[D] 2840482020 xkbcomp-X11R7.2-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/xkeyboard-config/xkeyboard-config.desc b/package/xorg/xkeyboard-config/xkeyboard-config.desc new file mode 100644 index 000000000..aa8b0e796 --- /dev/null +++ b/package/xorg/xkeyboard-config/xkeyboard-config.desc @@ -0,0 +1,43 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/x11/xkbutils/xkbutils.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] X.Org X11 xkbutils component + +[T] The xkbutils component for the X.Org Foundation X11 Release 7 and above. + +[U] http://www.x.org + +[A] The X.Org Foundation {The X.Org Sourcecode} +[A] The Open Group X Project Team {Original Sourcecode} +[M] The ROCK Linux Project + +[C] base/x11 +[F] CORE + +[L] OpenSource +[S] Stable +[V] 0.9 +[P] X -----5---9 110.830 + +[D] 1198596491 xkeyboard-config-0.9.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/extras/ + diff --git a/package/xorg/xmodmap/xmodmap.desc b/package/xorg/xmodmap/xmodmap.desc index d28d2a561..1888867b6 100644 --- a/package/xorg/xmodmap/xmodmap.desc +++ b/package/xorg/xmodmap/xmodmap.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.2 [P] X -----5---9 110.830 -[D] 2092273307 xmodmap-X11R7.1-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/app/ +[D] 2857394488 xmodmap-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/xorg-server/xorg-server.conf b/package/xorg/xorg-server/xorg-server.conf index 9d8202b05..7778e36ae 100644 --- a/package/xorg/xorg-server/xorg-server.conf +++ b/package/xorg/xorg-server/xorg-server.conf @@ -19,6 +19,10 @@ xorg_server_postmake () } hook_add preconf 5 "tar $taropt $archdir/MesaLib-$mesa_ver.tar.bz2" +var_append extraconfopt " " '--with-mesa-source=`dirs`/Mesa-$mesa_ver' + +# this little hack makes xorg build in 20 minutes instead of 2 hours +var_append CC_WRAPPER_FILTER "|" "sed -r 's,^xf86ScanPci.c$,&\n-O0,g'" + hook_add postmake 5 xorg_server_postmake -var_append extraconfopt " " '--with-mesa-source=`dirs`/Mesa-$mesa_ver' diff --git a/package/xorg/xorg-server/xorg-server.desc b/package/xorg/xorg-server/xorg-server.desc index 83b689d2f..7ba879ff4 100644 --- a/package/xorg/xorg-server/xorg-server.desc +++ b/package/xorg/xorg-server/xorg-server.desc @@ -36,9 +36,10 @@ [L] OpenSource [S] Stable -[V] 1.1.0 -[O] mesa_ver=6.5 +[V] 1.2.0 +[O] mesa_ver=6.5.2 [P] X -----5---9 110.832 -[D] 3473516090 xorg-server-X11R7.1-1.1.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/xserver/ -[D] 3434560735 MesaLib-6.5.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/mesa3d/ +[D] 569854329 xorg-server-X11R7.2-1.2.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/xserver/ +[D] 3520516574 MesaLib-6.5.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/extras/ + diff --git a/package/xorg/xorg-sgml-doctools/xorg-sgml-doctools.desc b/package/xorg/xorg-sgml-doctools/xorg-sgml-doctools.desc index 5c179f966..e84bc25be 100644 --- a/package/xorg/xorg-sgml-doctools/xorg-sgml-doctools.desc +++ b/package/xorg/xorg-sgml-doctools/xorg-sgml-doctools.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.1 +[V] 1.1.1 [P] X -----5---9 110.801 -[D] 495485044 xorg-sgml-doctools-X11R7.1-1.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/doc/ +[D] 1641899774 xorg-sgml-doctools-X11R7.2-1.1.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/doc/ diff --git a/package/xorg/xorg-update.sh b/package/xorg/xorg-update.sh index c4932636a..db51f717d 100644 --- a/package/xorg/xorg-update.sh +++ b/package/xorg/xorg-update.sh @@ -1,7 +1,7 @@ #!/bin/bash # # Usage: -# cd package/xorg && bash xorg-update.sh X11R7.1 +# cd package/xorg && bash xorg-update.sh X11R7.2 xver="$1" URL="ftp://ftp.gwdg.de/pub/x11/x.org/pub/$xver/src" @@ -24,17 +24,23 @@ do pname="`echo $P | tr '[A-Z]' '[a-z]'`" pname="${pname%.tar.bz2}" + pver="${pname#*-x11r*-}" pname="${pname%-x11r*}" + if [ "$pver" = "$pname" ]; then + pver="$( echo "$pname" | sed -r 's/.*-([0-9].*)/\1/'; )" + pname="$( echo "$pname" | sed -r 's/(.*)-[0-9].*/\1/'; )" + fi + if [ ! -f "$pname/$pname.desc" ]; then - echo "Not found: $pname/$pname.desc ($N) [$lowxver]" + echo "Not found: $pname/$pname.desc ($N)" else if ! egrep -q "^\[V\] $pver( |\$)" "$pname/$pname.desc"; then sed -i -e"s,\[V\].*,[V] $pver," "$pname/$pname.desc" fi if ! egrep -q "^\[D\] .* $P " "$pname/$pname.desc"; then - sed -i -e"s,\[D\].*,\[D\] 0 $P $URL/$N," "$pname/$pname.desc" + sed -i -e"s,\[D\].*,\[D\] 0 $P $URL/$N/," "$pname/$pname.desc" fi fi @@ -46,7 +52,6 @@ done < <( curl -s -S -l "$URL/"; ) for pkg in * do [ -d "$pkg" ] || continue - [ "$pkg" = "mesalib" ] && continue if grep -qv " $pkg " <( echo "$module_list "; ); then echo "Not found on FTP server: $pkg" diff --git a/package/xorg/xprop/xprop.desc b/package/xorg/xprop/xprop.desc index 04ac0cbcb..a31a95190 100644 --- a/package/xorg/xprop/xprop.desc +++ b/package/xorg/xprop/xprop.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.1 +[V] 1.0.2 [P] X -----5---9 110.830 -[D] 3987437783 xprop-X11R7.0-1.0.1.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/app/ +[D] 3808553995 xprop-X11R7.2-1.0.2.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/app/ diff --git a/package/xorg/xproto/xproto.desc b/package/xorg/xproto/xproto.desc index a9e99b807..b87110d52 100644 --- a/package/xorg/xproto/xproto.desc +++ b/package/xorg/xproto/xproto.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 7.0.5 +[V] 7.0.10 [P] X -----5---9 110.803 -[D] 2011717683 xproto-X11R7.1-7.0.5.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.1/src/proto/ +[D] 1594220290 xproto-X11R7.2-7.0.10.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/proto/ diff --git a/package/xorg/xtrans/xtrans.desc b/package/xorg/xtrans/xtrans.desc index fe3b25097..9597581ff 100644 --- a/package/xorg/xtrans/xtrans.desc +++ b/package/xorg/xtrans/xtrans.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 1.0.0 +[V] 1.0.3 [P] X -----5---9 110.804 -[D] 404080239 xtrans-X11R7.0-1.0.0.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib/ +[D] 1688675919 xtrans-X11R7.2-1.0.3.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.2/src/lib/