Hello community,
here is the log from the commit of package xorg-x11-proto-devel
checked in at Sat Jul 5 01:56:48 CEST 2008.
--------
--- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2008-06-12 23:04:47.000000000 +0200
+++ xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2008-07-04 22:24:53.631270000 +0200
@@ -1,0 +2,9 @@
+Fri Jul 4 05:01:41 CEST 2008 - sndirsch@suse.de
+
+- dri2proto 1.1/xf86driproto 2.0.4 (required for xorg-server 1.5)
+- randrproto 1.2.2
+ * Bug #16149: Make the field not be named 'delete' in C++ mode
+ * Delete duplicate B32's in xRRScreenChangeNotifyEvent
+ * Correct a copy'n'paste error in RRGetOutputInfo spec text
+
+-------------------------------------------------------------------
Old:
----
randrproto-1.2.1.tar.bz2
xf86driproto-X11R7.0-2.0.3.tar.bz2
New:
----
dri2proto-1.1.tar.bz2
randrproto-1.2.2.tar.bz2
xf86driproto-2.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-proto-devel.spec ++++++
--- /var/tmp/diff_new_pack.M10068/_old 2008-07-05 01:55:28.000000000 +0200
+++ /var/tmp/diff_new_pack.M10068/_new 2008-07-05 01:55:28.000000000 +0200
@@ -14,7 +14,7 @@
Name: xorg-x11-proto-devel
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 45
+Release: 47
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/X11
@@ -31,7 +31,7 @@
Source9: inputproto-1.4.3.tar.bz2
Source10: kbproto-1.0.3.tar.bz2
Source11: printproto-1.0.4.tar.bz2
-Source12: randrproto-1.2.1.tar.bz2
+Source12: randrproto-1.2.2.tar.bz2
Source13: recordproto-X11R7.0-1.13.2.tar.bz2
Source14: renderproto-0.9.3.tar.bz2
Source15: resourceproto-X11R7.0-1.0.2.tar.bz2
@@ -44,7 +44,7 @@
Source22: xextproto-7.0.3.tar.bz2
Source23: xf86bigfontproto-X11R7.0-1.1.2.tar.bz2
Source24: xf86dgaproto-2.0.3.tar.bz2
-Source25: xf86driproto-X11R7.0-2.0.3.tar.bz2
+Source25: xf86driproto-2.0.4.tar.bz2
Source26: xf86miscproto-X11R7.0-0.9.2.tar.bz2
Source27: xf86rushproto-X11R7.0-1.1.2.tar.bz2
Source28: xf86vidmodeproto-X11R7.0-2.2.2.tar.bz2
@@ -56,6 +56,7 @@
Source34: libpthread-stubs-0.1.tar.bz2
Source35: vncproto-20070501.tar.bz2
Source36: xcliplistproto-20070501.tar.bz2
+Source37: dri2proto-1.1.tar.bz2
Patch: inputproto.diff
%description
@@ -136,6 +137,12 @@
/usr/share/xcb/
%changelog
+* Fri Jul 04 2008 sndirsch@suse.de
+- dri2proto 1.1/xf86driproto 2.0.4 (required for xorg-server 1.5)
+- randrproto 1.2.2
+ * Bug #16149: Make the field not be named 'delete' in C++ mode
+ * Delete duplicate B32's in xRRScreenChangeNotifyEvent
+ * Correct a copy'n'paste error in RRGetOutputInfo spec text
* Fri Jun 13 2008 sndirsch@suse.de
- xproto 7.0.13
- xextproto 7.0.3
++++++ randrproto-1.2.1.tar.bz2 -> randrproto-1.2.2.tar.bz2 ++++++
++++ 2431 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.2.1/ChangeLog new/randrproto-1.2.2/ChangeLog
--- old/randrproto-1.2.1/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ new/randrproto-1.2.2/ChangeLog 2008-07-02 21:34:40.000000000 +0200
@@ -0,0 +1,489 @@
+commit 2be5a52d5f6bdd2aa70efcb06bd99a149c6db6ba
+Author: Adam Jackson
+Date: Wed Jul 2 15:34:31 2008 -0400
+
+ randrproto 1.2.2
+
+commit 9ab3d5cca3cf9a76c6873007b8d4345c838cc297
+Author: Adam Jackson
+Date: Mon Jun 23 14:52:12 2008 -0400
+
+ Bug #16149: Make the field not be named 'delete' in C++ mode.
+
+ Thanks for the upward compatibility, Bjarne.
+
+commit 2df8499d24d15bfca3c928b681f64b6e8a05f0af
+Author: James Cloos
+Date: Thu Dec 6 16:39:05 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 3243afaa593f95bb89b1381dac2b920111ce36b1
+Author: Jakob Bornecrantz
+Date: Tue Apr 17 14:25:38 2007 -0700
+
+ Correct a copy'n'paste error in RRGetOutputInfo spec text.
+
+commit d1c5739ae19f7cc01a6a5603d3fae93e1f9ee3d1
+Author: Alan Coopersmith
+Date: Mon Apr 9 14:31:10 2007 -0700
+
+ Delete duplicate B32's in xRRScreenChangeNotifyEvent
+
+ Caused compiler warnings:
+ "randrproto.h", line 567: warning: syntax error: empty member declaration
+ "randrproto.h", line 568: warning: syntax error: empty member declaration
+
+commit aada204b1fc9ba6461efad3fe6bd032ee98536e1
+Author: Keith Packard
+Date: Sun Feb 18 21:02:30 2007 -0800
+
+ Bump version to 1.2.1.
+
+ And add copyright to configure.ac file
+
+commit 0e689cecd65f420ec175046e4bb2b5386bf7b7c5
+Author: Keith Packard
+Date: Sun Feb 18 21:02:10 2007 -0800
+
+ Fix wording about requesting ConfigureNotify events.
+
+commit 34ebf25a88972afdc561f4525d02b3fe41ac84bf
+Author: Eric Anholt
+Date: Thu Feb 1 15:08:10 2007 -0800
+
+ Fix the size of the padding fields of xRRGetCrtcGamma.
+
+commit 615f8077c55593a2001ca4c84ff3ede5c2c2842a
+Author: Eric Anholt
+Date: Tue Jan 9 09:40:47 2007 -0800
+
+ Install the randr protocol description.
+
+commit 335639ba8f0df1364a6807187ba17eeae5b187e4
+Author: Keith Packard
+Date: Thu Nov 30 13:25:35 2006 -0800
+
+ More bugs found by Ian Osgood during the XCB work.
+
+ ListOutputProperties has no nProperties field.
+ Pad fields not mentioned in Gamma requests.
+ sz_xRROUtputChangeNotifyEvent -> sz_xRROutputChangeNotifyEvent
+
+commit 504556a9f886c84798ae8e0e46896a7c74b95c61
+Merge: c27ece2... 3d521b3...
+Author: Keith Packard
+Date: Thu Nov 30 09:44:20 2006 -0800
+
+ Merge branch 'multi-monitor'
+
+commit 3d521b3d38d10c5ec660d13514ef3e626bef90fa
+Author: Keith Packard
+Date: Thu Nov 30 09:43:10 2006 -0800
+
+ Fix padding bugs discovered in XCB work
+
+commit c27ece25924115448bf9e1dc461d5e7f4112f112
+Merge: 3305f63... 7363d44...
+Author: Eric Anholt
+Date: Mon Nov 27 15:31:33 2006 -0800
+
+ Merge branch 'multi-monitor'
+
+ This brings in the changes for RandR 1.2 protocol.
+
+commit 7363d448c77c2d2ec2928d9d4bc41aac1c2d36b7
+Author: Keith Packard
+Date: Fri Nov 24 13:45:25 2006 -0800
+
+ Use BYTE for one-byte values. #undef Drawable needed.
+
+commit a86f4b9442a48a3049e03a4c7d4fd022a860bf01
+Author: Keith Packard
+Date: Fri Nov 24 13:44:55 2006 -0800
+
+ Create Properties when configured. Pending defaults to Current
+
+ Change property semantics to create them with empty value
+ when they are configured.
+
+ When clients request the Pending value of a property without any pending
+ vlaue, the current value is returned instead.
+
+commit af852261efa5eb7f8d16e3e90b8832bf66d93de7
+Author: Keith Packard
+Date: Mon Nov 20 20:58:16 2006 -0800
+
+ Change properties to have a pending value and report valid values.
+
+ Pending values are transferred to current values at mode set, allowing a
+ queue of values to accrue in preparation for the modeset operation while
+ still reporting valid 'current' values for applications.
+
+ The set of valid values is also available so applications can present
+ a reasonable list to the user during configuration.
+
+ I renumbered a bunch of requests to keep property requests sequential.
+
+commit cdc282c2995dc17dee97c6da24a9705478cf792e
+Author: Keith Packard
+Date: Thu Nov 16 08:50:49 2006 -0800
+
+ Remove output options. Clean up other sizes.
+
+ Output options will be controlled by properties instead.
+ Also found a few instances in randrproto.txt using the wrong
+ size for MODEINFO.
+
+commit 96977842d01220bd4a294375c669b26ff30275d1
+Author: Keith Packard
+Date: Wed Nov 1 11:50:50 2006 -0800
+
+ Fix RRNumberErrors, start adding standard property names
+
+commit 0e858436af67256c0af49317183df4bf8092183c
+Author: Keith Packard
+Date: Wed Nov 1 00:23:37 2006 -0800
+
+ Move physical size information from mode to output.
+
+ Modes are stored in CRTCs which have no physical size.
+ Outputs have a physical size which can change, both in response
+ to mode changes as well as (potentially) other factors.
+
+ Placing the physical size information in the output also permits clone
+ mode to work across monitors of differing physical size.
+
+commit 369d4e7d2030c707cf2ce37d06c1d23b0570910c
+Author: Keith Packard
+Date: Wed Oct 4 20:03:35 2006 -0700
+
+ Remove mode origins. Add preferred mode count.
+
+ Switched from identifying source of mode line to listing which modes are
+ preferred by each output. This enables better CRTC sharing by making modes
+ less arbitrarily different.
+
+commit 3c354e7245dd7830b5600716185017831aff1316
+Author: Keith Packard
+Date: Wed Oct 4 14:51:48 2006 -0700
+
+ Get rid of mode origins.
+
+commit ee843ac7077f5dcae677ad1b7c794abb0b89e111
+Author: Keith Packard
+Date: Tue Oct 3 21:02:39 2006 -0700
+
+ Add mode origins and output options.
+
+ Mode origins indicate the source of the mode information, from VESA timings,
+ user config or whatever.
+
+ Output options currently include only panel fitting options; more may be
+ added later (this field is 32 bits wide)
+
+commit d6c9bdd0e6713a8c4dff53e88bd820ff1140758c
+Author: Keith Packard
+Date: Tue Oct 3 11:01:56 2006 -0700
+
+ Add mode origins and output options.
+
+ Also document non-obvious defined types. Eliminate mode options.
+
+commit 61d60a93dc0c827ef970f21f6b80099cc6c958f1
+Author: Keith Packard
+Date: Tue Sep 19 16:33:40 2006 -0700
+
+ Update package version to 1.2.0. Fix various goofs found by building stuff.
+
+commit ce292d7cad17be4b13e4b7fad27b0ecbed101689
+Author: Keith Packard
+Date: Sun Sep 17 23:41:55 2006 -0700
+
+ Fix various random typos found while attempting to use header files
+
+ Fix RRNumberRequests
+ Rename errors to include RR to avoid conflicting with Xi.
+ Add RR to various request/reply structs (oops).
+ Remove nOutputs from SetCrtcConfigReq -- length is sufficient.
+ Remove bogus members from SetCrtcConfigReply.
+ Add MODEOPTION. Document protocol error encoding.
+
+commit d6992dd3b7fcf22e4d670b29e8d0e2aba0d8e81d
+Author: Keith Packard
+Date: Fri Sep 15 15:41:02 2006 -0700
+
+ Add CONNECTION values to spec and header.
+
+ Missing CONNECTION values in encoding and header file.
+
+commit e9a5a489acd591ff53823b406dca13c622439c14
+Author: Keith Packard
+Date: Thu Sep 14 23:53:04 2006 -0700
+
+ Update header files for new 1.2 spec. Fix missing bits in spec.
+
+ Spec was missing a few things in the encoding section.
+
+commit 81ecda4300e007d62b36942fd6ac56a3ee1a1fa0
+Author: Keith Packard
+Date: Wed Sep 13 12:35:05 2006 -0700
+
+ Add .gitignore
+
+commit 1cb8f4cda51fc256908a199c2599f46211c0cd52
+Author: Keith Packard
+Date: Wed Sep 13 12:33:58 2006 -0700
+
+ Fix RandR opcodes
+
+commit b34676e8f709c4f8f6a2112c83103dfd0cabcbd7
+Author: Keith Packard
+Date: Wed Sep 13 12:23:08 2006 -0700
+
+ Add Output properties and CRTC Gamma ramps. Move sub-pixel to Output.
+
+ The property requests mirror the core window property requests, except that
+ notify events are delivered to windows, rather than to outputs.
+
+ Gamma ramps lifted from XFree86V-idModeExtension; clients get to deal with
+ converting single value to ramp though.
+
+ Subpixel moved to output; clients get to figure out the effect of rotation
+ on subpixel ordering.
+
+commit 1ec6ea06b8b7182b465e5c0d34475c20de76812b
+Author: Keith Packard
+Date: Tue Sep 12 18:40:03 2006 -0700
+
+ Spelling and formatting fixes.
+
+commit e81693720d5d1acf31780de3f5fa90bf0f46a801
+Author: Keith Packard
+Date: Tue Sep 12 16:48:22 2006 -0700
+
+ Rearrange modes to be listed with screen resources. Encoding.
+
+ Modes are now listed as screen resources instead of with the output; they're
+ shared across outputs for cloning.
+
+ Wrote up encoding.
+
+commit 4e47d7af0574690dcf00516337bf0bbe567c9c75
+Author: Keith Packard
+Date: Mon Sep 11 22:49:15 2006 -0700
+
+ Finish basic request descriptions for version 1.2
+
+ outputs now report list of valid modes. crtcs accept a valid mode which must
+ be supported on all connected outputs.
+
+ outputs also report connection status.
+
+commit dd19f8fbfcc4b8863347ce422006715ed95a7c00
+Author: Keith Packard
+Date: Mon Sep 11 22:19:28 2006 -0700
+
+ Move supported mode list from CRTC to OUTPUT.
+
+commit 62decb70de5bbe623859764e7cb492209478e304
+Author: Keith Packard
+Date: Mon Sep 11 21:29:39 2006 -0700
+
+ Start rework for screen/CRTC/monitor scheme.
+
+commit 3305f634fae79603edc1d3aab1671a91caeb24d4
+Author: Alan Coopersmith
+Date: Fri Jul 14 18:56:26 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 5220e7d7dfa64d95918b6f5ad52089fe87540b61
+Author: Keith Packard
+Date: Tue Jun 27 22:38:32 2006 +0200
+
+ Swizzle protocol contents to fix errors discovered while implementing X server piece
+
+commit c414ce4494f0d062bc25fa671cf50a556c9e1d8c
+Author: Keith Packard
+Date: Tue Jun 27 02:27:10 2006 +0200
+
+ Just use CARD16 for indices
+
+commit bbaabdd10585aed3bc44f2179ec4a68975a599cc
+Author: Keith Packard
+Date: Mon Jun 26 14:33:18 2006 +0200
+
+ Finish randerproto.h change for 1.2. Use Window instead of Drawable for 1.2.
+
+commit d606ad207ccef5c050374b535acb0bd3ed3b95aa
+Author: Keith Packard
+Date: Mon Jun 26 12:42:50 2006 +0200
+
+ move protocol.txt to randrproto.txt. Start updating headers for version 1.2
+
+commit 69f5562610a94cb7c67b5e8bcd7d1e3df53bbcad
+Author: Keith Packard
+Date: Sun Jun 25 08:51:27 2006 +0200
+
+ Finish encodings for 1.2 additions.
+
+commit efde5d9569afef58317905ce30910f80cb3d01c8
+Author: Keith Packard
+Date: Sun Jun 25 03:35:24 2006 +0200
+
+ Start specifying the encoding for 1.2 requests
+
+commit bb97699dcd1e274a1abc20f1a818aaf53b269a1b
+Author: Keith Packard
+Date: Sun Jun 25 03:25:59 2006 +0200
+
+ Describe relationship between RandR, Xinerama and XFree86-VidModeExtension
+
+commit 66cb6d24ecd161c9f0b42ba55d8ae642fe02729e
+Author: Keith Packard
+Date: Sun Jun 25 03:10:20 2006 +0200
+
+ Add RRMonitorChangeNotify event. Complete RRSetMonitorConfig.
+
+commit 3b72072c31258d1f12b93eba77b5e30cf46c5309
+Author: Keith Packard
+Date: Sat Jun 24 17:35:35 2006 -0700
+
+ Repair broken parts of spec. Add RRGetMonitorInfo and RRSetMonitorConfig
+
+commit 2907236309d2862f61dcb0c032df1abdb9adc80e
+Author: Keith Packard
+Date: Sat Jun 24 16:58:16 2006 -0700
+
+ Clean up really broken text in the spec
+
+commit 2370c88074c63bbe8d37d510e7e1f5c28fe6e573
+Author: Keith Packard
+Date: Sat Jun 24 16:22:44 2006 -0700
+
+ Reformat license text, add Intel copyright
+
+commit 79af1c0351dbac7c89433b7ae141835a4566c428
+Author: Keith Packard
+Date: Sat Jun 24 16:14:07 2006 -0700
+
+ Introduce Xinerama changes. Remove spurious 'Bad' error name prefix.
+
+commit 914084f13a379ee85dc1b8f6fd3f46c8ba7f7797
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:38 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 49011800c0c000799428b543cc4fe72204abdd7f
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:14 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 6f41ee7aa447ea8245249dca9a665151f5b65725
+Author: Eric Anholt
+Date: Tue Aug 2 19:19:39 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 224663a4c053377b30ded5676a9438618969d92c
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:56 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit fd007cfa47c96f73c16d12c8498f4735addd2f4e
+Author: Daniel Stone
+Date: Sat May 21 04:14:00 2005 +0000
+
+ Set version to 1.1.
+
+commit 0e6b22b5729df01528a78ce25780395f1ddbb7c4
+Author: Adam Jackson
+Date: Thu May 19 00:22:40 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit b805a556617f9a29e812a988b8be6056c654cd82
+Author: Adam Jackson
+Date: Thu May 19 00:10:18 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit cede321965b378548cd0c43528451d47c70ea5b8
+Author: Josh Triplett
+Date: Tue May 17 06:34:47 2005 +0000
+
+ Add COPYING file for Randr. Note that the two included licenses are very
+ similar, but contain a few minor differences when referring to the
+ companies granting the license, HP and Compaq.
+
+commit b3b508a6b8761d6a117639935ad4b18407846c61
+Author: Søren Sandmann Pedersen
+Date: Mon May 9 18:20:05 2005 +0000
+
+ Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit b385d6eefab1555f48255edbdc2c8c8fe101cf80
+Author: Kevin E Martin
+Date: Fri May 6 01:46:31 2005 +0000
+
+ Initial build system files for proto module.
+
+commit 05a69617948c14bc149d0d1c2a78894a9ba1970d
+Author: Markus Kuhn
+Date: Sat Dec 4 00:42:46 2004 +0000
+
+ Encoding of numerous files changed to UTF-8
+
+commit 3b8859eca5103b50149e0274182cf55d80ec7909
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 17d50f3cdcf97b0d39c376c73d60750bff912f8b
+Author: Egbert Eich
+Date: Sun Mar 14 08:31:36 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit cbbd2e5ed80cda31163a0d481232aecb96295656
+Author: Egbert Eich
+Date: Wed Mar 3 12:10:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit a94538f86fbcab3c57a723036c03490d9a3eb120
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:14 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 359fc691ebea1276937657d34fccf8f4a8d9e33d
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:28 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit f37a7bf7eeaaf96461797ea4c06c3208d2cbdeb4
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:43 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 7ad444f10407c94b55911966c10cba0533cf8f74
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:43 2003 +0000
+
+ Initial revision
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.2.1/configure.ac new/randrproto-1.2.2/configure.ac
--- old/randrproto-1.2.1/configure.ac 2007-02-19 05:59:47.000000000 +0100
+++ new/randrproto-1.2.2/configure.ac 2008-07-02 21:34:24.000000000 +0200
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT([RandrProto], [1.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RandrProto], [1.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.2.1/Makefile.am new/randrproto-1.2.2/Makefile.am
--- old/randrproto-1.2.1/Makefile.am 2007-02-02 08:40:53.000000000 +0100
+++ new/randrproto-1.2.2/Makefile.am 2008-06-23 20:50:35.000000000 +0200
@@ -10,3 +10,13 @@
randrdoc_DATA = randrproto.txt
EXTRA_DIST = autogen.sh randrproto.pc.in $(randrdoc_DATA)
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.2.1/missing new/randrproto-1.2.2/missing
--- old/randrproto-1.2.1/missing 2006-07-10 23:24:04.000000000 +0200
+++ new/randrproto-1.2.2/missing 2008-07-02 21:34:38.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.2.1/randrproto.h new/randrproto-1.2.2/randrproto.h
--- old/randrproto-1.2.1/randrproto.h 2007-02-02 08:40:53.000000000 +0100
+++ new/randrproto-1.2.2/randrproto.h 2008-06-23 20:51:58.000000000 +0200
@@ -376,7 +376,11 @@
Atom type B32;
CARD32 longOffset B32;
CARD32 longLength B32;
+#ifdef __cplusplus
+ BOOL _delete;
+#else
BOOL delete;
+#endif
BOOL pending;
CARD16 pad1 B16;
} xRRGetOutputPropertyReq;
@@ -564,8 +568,8 @@
CARD8 type; /* always evBase + ScreenChangeNotify */
CARD8 rotation; /* new rotation */
CARD16 sequenceNumber B16;
- Time timestamp B32; B32; /* time screen was changed */
- Time configTimestamp B32; B32; /* time config data was changed */
+ Time timestamp B32; /* time screen was changed */
+ Time configTimestamp B32; /* time config data was changed */
Window root B32; /* root window */
Window window B32; /* window requesting notification */
SizeID sizeID B16; /* new size ID */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/randrproto-1.2.1/randrproto.txt new/randrproto-1.2.2/randrproto.txt
--- old/randrproto-1.2.1/randrproto.txt 2007-02-15 17:51:58.000000000 +0100
+++ new/randrproto-1.2.2/randrproto.txt 2008-06-23 20:50:35.000000000 +0200
@@ -547,7 +547,7 @@
widthInMillimeters, heightInMillimeters: CARD32
crtcs: LISTofCRTC
clones: LISTofOUTPUT
- modes: LISTofOUTPUT
+ modes: LISTofMODE
num-preferred: CARD16
└───
Errors: Output
++++++ xf86driproto-X11R7.0-2.0.3.tar.bz2 -> xf86driproto-2.0.4.tar.bz2 ++++++
++++ 7282 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86driproto-X11R7.0-2.0.3/ChangeLog new/xf86driproto-2.0.4/ChangeLog
--- old/xf86driproto-X11R7.0-2.0.3/ChangeLog 2005-12-21 03:30:07.000000000 +0100
+++ new/xf86driproto-2.0.4/ChangeLog 2008-04-01 19:42:46.000000000 +0200
@@ -1,9 +1,133 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit beafefcb82089ec0bd629a66054e2982bdcaee51
+Author: James Cloos
+Date: Thu Dec 6 16:39:12 2007 -0500
- * configure.ac:
- Update package version for X11R7 release.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 55dd8f55f3f99051c4579e9574c10ecc9863830e
+Author: Kristian Høgsberg
+Date: Mon Oct 29 20:35:58 2007 -0400
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ dri_interface.h doesn't belong here, remove function protos from xf86dri.h.
+
+commit 28590a910f78fcdac526c61e9e427360128f3131
+Author: James Cloos
+Date: Mon Sep 3 05:54:29 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit a9000b5b3756af2bddb9f3212a682ef647712ff8
+Author: Alan Coopersmith
+Date: Fri Jul 14 18:56:46 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 3b20ea7958208c3ada4d6949c0f0da5525f0980c
+Author: Kevin E Martin
+Date: Wed Dec 21 02:30:07 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 43fec892e803cb16399e104570ec2fdbaa325d07
+Author: Adam Jackson
+Date: Mon Dec 19 16:32:25 2005 +0000
+
+ Stub COPYING files
+
+commit 02508b373e5a11b7c2cd2b4b8d7cb4180ffd436c
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:39 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 61151bb21165ca3bde0adad4d7b05ce1203779ac
+Author: Kevin E Martin
+Date: Thu Dec 1 03:11:36 2005 +0000
+
+ Mesa 6.4.1 import
+
+commit 035d99d0f33c9ef3ec1715b0ada02a072a9f427e
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:16 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit f863e56ae8d60345523a493a0fe77c1080aa0892
+Author: Adam Jackson
+Date: Tue Oct 18 06:05:04 2005 +0000
+
+ dri_interface.h in xf86driproto
+
+commit a2df5606ccf0402178efcb04e198d474a20e4528
+Author: Kevin E Martin
+Date: Tue Oct 18 02:51:49 2005 +0000
+
+ Mesa 6.4 20051017 import
+
+commit c519c132d102b08d6d6953833e3d62f7e83111b3
+Author: Eric Anholt
+Date: Tue Aug 2 19:19:40 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 9b14371827ade0593d580fcf531484c88013ddef
+Author: Adam Jackson
+Date: Sun Jul 31 16:45:58 2005 +0000
+
+ Mesa 6.3.1 import
+
+commit 27eed01842ea01f890b160a197810359ba7f107f
+Author: Adam Jackson
+Date: Sun Jul 31 16:45:58 2005 +0000
+
+ Initial revision
+
+commit 13245a0c846a04833b37a0c61e4cec02a6c23b02
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:57 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 10bc0e6d7b8c056459928d97e238027b5c016708
+Author: Kevin E Martin
+Date: Thu Jul 14 22:19:19 2005 +0000
+
+ Install xf86drstr.h as well Update the .pc file to include the correct path
+
+commit fa615bf684434a31c637eba45ba0fe01906a765e
+Author: Adam Jackson
+Date: Sun Jul 10 23:15:32 2005 +0000
+
+ DRI protocol module
+
+commit 267dc158de53bd25b8ad55c75d043570425d5bff
+Author: Adam Jackson
+Date: Tue Dec 14 19:26:25 2004 +0000
+
+ Import Mesa 6.2.1 (trimmed).
+
+commit 19d9bf1b083dc6717dde51952a10a77c85515b38
+Author: Eric Anholt
+Date: Thu Jul 22 06:49:46 2004 +0000
+
+ Mesa 6.1 20040721 import
+
+commit be488358cb2ffeeb86e9fa458d9955191222ef75
+Author: Eric Anholt
+Date: Wed Jun 16 09:16:34 2004 +0000
+
+ Mesa 6.1 20040613 import
+
+commit c32e91d7460e39cecd345f4cf3caffcce128a6e6
+Author: Eric Anholt
+Date: Wed Jun 16 09:16:34 2004 +0000
+
+ Initial revision
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86driproto-X11R7.0-2.0.3/configure.ac new/xf86driproto-2.0.4/configure.ac
--- old/xf86driproto-X11R7.0-2.0.3/configure.ac 2005-12-21 03:30:07.000000000 +0100
+++ new/xf86driproto-2.0.4/configure.ac 2008-04-01 19:41:37.000000000 +0200
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([XF86DRIProto], [2.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XF86DRIProto], [2.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86driproto-X11R7.0-2.0.3/dri_interface.h new/xf86driproto-2.0.4/dri_interface.h
--- old/xf86driproto-X11R7.0-2.0.3/dri_interface.h 2005-12-01 04:11:36.000000000 +0100
+++ new/xf86driproto-2.0.4/dri_interface.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,477 +0,0 @@
-/*
- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * (C) Copyright IBM Corporation 2004
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, and/or sell copies of the Software, and to permit persons to whom
- * the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * \file dri_interface.h
- *
- * This file contains all the types and functions that define the interface
- * between a DRI driver and driver loader. Currently, the most common driver
- * loader is the XFree86 libGL.so. However, other loaders do exist, and in
- * the future the server-side libglx.a will also be a loader.
- *
- * \author Kevin E. Martin
- * \author Ian Romanick
- */
-
-#ifndef DRI_INTERFACE_H
-#define DRI_INTERFACE_H
-
-#include
-#include
-
-/**
- * \name DRI interface structures
- *
- * The following structures define the interface between the GLX client
- * side library and the DRI (direct rendering infrastructure).
- */
-/*@{*/
-typedef struct __DRIdisplayRec __DRIdisplay;
-typedef struct __DRIscreenRec __DRIscreen;
-typedef struct __DRIcontextRec __DRIcontext;
-typedef struct __DRIdrawableRec __DRIdrawable;
-typedef struct __DRIdriverRec __DRIdriver;
-typedef struct __DRIframebufferRec __DRIframebuffer;
-typedef struct __DRIversionRec __DRIversion;
-typedef struct __DRIinterfaceMethodsRec __DRIinterfaceMethods;
-typedef unsigned long __DRIid;
-typedef void __DRInativeDisplay;
-/*@}*/
-
-
-/**
- * \name Functions provided by the driver loader.
- */
-/*@{*/
-/**
- * Type of a pointer to \c glXGetScreenDriver, as returned by
- * \c glXGetProcAddress. This function is used to get the name of the DRI
- * driver for the specified screen of the specified display. The driver
- * name is typically used with \c glXGetDriverConfig.
- *
- * \sa glXGetScreenDriver, glXGetProcAddress, glXGetDriverConfig
- */
-typedef const char * (* PFNGLXGETSCREENDRIVERPROC) (__DRInativeDisplay *dpy, int scrNum);
-
-/**
- * Type of a pointer to \c glXGetDriverConfig, as returned by
- * \c glXGetProcAddress. This function is used to get the XML document
- * describing the configuration options available for the specified driver.
- *
- * \sa glXGetDriverConfig, glXGetProcAddress, glXGetScreenDriver
- */
-typedef const char * (* PFNGLXGETDRIVERCONFIGPROC) (const char *driverName);
-
-/**
- * Type of a pointer to \c glxEnableExtension, as returned by
- * \c __DRIinterfaceMethods::getProcAddress. This function is used to enable
- * a GLX extension on the specified screen.
- */
-typedef void (* PFNGLXSCRENABLEEXTENSIONPROC) ( void *psc, const char * name );
-/*@}*/
-
-
-/**
- * \name Functions and data provided by the driver.
- */
-/*@{*/
-
-typedef void *(CREATENEWSCREENFUNC)(__DRInativeDisplay *dpy, int scrn,
- __DRIscreen *psc, const __GLcontextModes * modes,
- const __DRIversion * ddx_version, const __DRIversion * dri_version,
- const __DRIversion * drm_version, const __DRIframebuffer * frame_buffer,
- void * pSAREA, int fd, int internal_api_version,
- const __DRIinterfaceMethods * interface,
- __GLcontextModes ** driver_modes);
-typedef CREATENEWSCREENFUNC* PFNCREATENEWSCREENFUNC;
-extern CREATENEWSCREENFUNC __driCreateNewScreen_20050727;
-
-
-/**
- * XML document describing the configuration options supported by the
- * driver.
- */
-extern const char __driConfigOptions[];
-
-/*@}*/
-
-
-/**
- * Stored version of some component (i.e., server-side DRI module, kernel-side
- * DRM, etc.).
- *
- * \todo
- * There are several data structures that explicitly store a major version,
- * minor version, and patch level. These structures should be modified to
- * have a \c __DRIversionRec instead.
- */
-struct __DRIversionRec {
- int major; /**< Major version number. */
- int minor; /**< Minor version number. */
- int patch; /**< Patch-level. */
-};
-
-
-typedef void (*__DRIfuncPtr)(void);
-
-struct __DRIinterfaceMethodsRec {
- /**
- * Get pointer to named function.
- */
- __DRIfuncPtr (*getProcAddress)( const char * proc_name );
-
- /**
- * Create a list of \c __GLcontextModes structures.
- */
- __GLcontextModes * (*createContextModes)(unsigned count,
- size_t minimum_bytes_per_struct);
-
- /**
- * Destroy a list of \c __GLcontextModes structures.
- *
- * \todo
- * Determine if the drivers actually need to call this.
- */
- void (*destroyContextModes)( __GLcontextModes * modes );
-
- /**
- * Get the \c __DRIscreen for a given display and screen number.
- */
- __DRIscreen *(*getScreen)(__DRInativeDisplay *dpy, int screenNum);
-
-
- /**
- * \name Client/server protocol functions.
- *
- * These functions implement the DRI client/server protocol for
- * context and drawable operations. Platforms that do not implement
- * the wire protocol (e.g., EGL) will implement glorified no-op functions.
- */
- /*@{*/
- /**
- * Determine if the specified window ID still exists.
- *
- * \note
- * Implementations may assume that the driver will only pass an ID into
- * this function that actually corresponds to a window. On
- * implementations where windows can only be destroyed by the DRI driver
- * (e.g., EGL), this function is allowed to always return \c GL_TRUE.
- */
- GLboolean (*windowExists)(__DRInativeDisplay *dpy, __DRIid draw);
-
- /**
- * Create the server-side portion of the GL context.
- */
- GLboolean (* createContext)( __DRInativeDisplay *dpy, int screenNum,
- int configID, void * contextID, drm_context_t * hw_context );
-
- /**
- * Destroy the server-side portion of the GL context.
- */
- GLboolean (* destroyContext)( __DRInativeDisplay *dpy, int screenNum,
- __DRIid context );
-
- /**
- * Create the server-side portion of the drawable.
- */
- GLboolean (*createDrawable)( __DRInativeDisplay * ndpy, int screen,
- __DRIid drawable, drm_drawable_t * hHWDrawable );
-
- /**
- * Destroy the server-side portion of the drawable.
- */
- GLboolean (*destroyDrawable)( __DRInativeDisplay * ndpy, int screen,
- __DRIid drawable );
-
- /**
- * This function is used to get information about the position, size, and
- * clip rects of a drawable.
- */
- GLboolean (* getDrawableInfo) ( __DRInativeDisplay *dpy, int scrn,
- __DRIid draw, unsigned int * index, unsigned int * stamp,
- int * x, int * y, int * width, int * height,
- int * numClipRects, drm_clip_rect_t ** pClipRects,
- int * backX, int * backY,
- int * numBackClipRects, drm_clip_rect_t ** pBackClipRects );
- /*@}*/
-
-
- /**
- * \name Timing related functions.
- */
- /*@{*/
- /**
- * Get the 64-bit unadjusted system time (UST).
- */
- int (*getUST)(int64_t * ust);
-
- /**
- * Get the media stream counter (MSC) rate.
- *
- * Matching the definition in GLX_OML_sync_control, this function returns
- * the rate of the "media stream counter". In practical terms, this is
- * the frame refresh rate of the display.
- */
- GLboolean (*getMSCRate)(__DRInativeDisplay * dpy, __DRIid drawable,
- int32_t * numerator, int32_t * denominator);
- /*@}*/
-};
-
-
-/**
- * Framebuffer information record. Used by libGL to communicate information
- * about the framebuffer to the driver's \c __driCreateNewScreen function.
- *
- * In XFree86, most of this information is derrived from data returned by
- * calling \c XF86DRIGetDeviceInfo.
- *
- * \sa XF86DRIGetDeviceInfo __DRIdisplayRec::createNewScreen
- * __driUtilCreateNewScreen CallCreateNewScreen
- *
- * \bug This structure could be better named.
- */
-struct __DRIframebufferRec {
- unsigned char *base; /**< Framebuffer base address in the CPU's
- * address space. This value is calculated by
- * calling \c drmMap on the framebuffer handle
- * returned by \c XF86DRIGetDeviceInfo (or a
- * similar function).
- */
- int size; /**< Framebuffer size, in bytes. */
- int stride; /**< Number of bytes from one line to the next. */
- int width; /**< Pixel width of the framebuffer. */
- int height; /**< Pixel height of the framebuffer. */
- int dev_priv_size; /**< Size of the driver's dev-priv structure. */
- void *dev_priv; /**< Pointer to the driver's dev-priv structure. */
-};
-
-
-/**
- * Screen dependent methods. This structure is initialized during the
- * \c __DRIdisplayRec::createScreen call.
- */
-struct __DRIscreenRec {
- /**
- * Method to destroy the private DRI screen data.
- */
- void (*destroyScreen)(__DRInativeDisplay *dpy, int scrn, void *screenPrivate);
-
- /**
- * Method to create the private DRI drawable data and initialize the
- * drawable dependent methods.
- */
- void *(*createNewDrawable)(__DRInativeDisplay *dpy, const __GLcontextModes *modes,
- __DRIid draw, __DRIdrawable *pdraw,
- int renderType, const int *attrs);
-
- /**
- * Method to return a pointer to the DRI drawable data.
- */
- __DRIdrawable *(*getDrawable)(__DRInativeDisplay *dpy, __DRIid draw,
- void *drawablePrivate);
-
- /**
- * Opaque pointer to private per screen direct rendering data. \c NULL
- * if direct rendering is not supported on this screen. Never
- * dereferenced in libGL.
- */
- void *private;
-
- /**
- * Get the number of vertical refreshes since some point in time before
- * this function was first called (i.e., system start up).
- *
- * \since Internal API version 20030317.
- */
- int (*getMSC)( void *screenPrivate, int64_t *msc );
-
- /**
- * Opaque pointer that points back to the containing
- * \c __GLXscreenConfigs. This data structure is shared with DRI drivers
- * but \c __GLXscreenConfigs is not. However, they are needed by some GLX
- * functions called by DRI drivers.
- *
- * \since Internal API version 20030813.
- */
- void *screenConfigs;
-
- /**
- * Functions associated with MESA_allocate_memory.
- *
- * \since Internal API version 20030815.
- */
- /*@{*/
- void *(*allocateMemory)(__DRInativeDisplay *dpy, int scrn, GLsizei size,
- GLfloat readfreq, GLfloat writefreq,
- GLfloat priority);
-
- void (*freeMemory)(__DRInativeDisplay *dpy, int scrn, GLvoid *pointer);
-
- GLuint (*memoryOffset)(__DRInativeDisplay *dpy, int scrn, const GLvoid *pointer);
- /*@}*/
-
- /**
- * Method to create the private DRI context data and initialize the
- * context dependent methods.
- *
- * \since Internal API version 20031201.
- */
- void * (*createNewContext)(__DRInativeDisplay *dpy, const __GLcontextModes *modes,
- int render_type,
- void *sharedPrivate, __DRIcontext *pctx);
-};
-
-/**
- * Context dependent methods. This structure is initialized during the
- * \c __DRIscreenRec::createContext call.
- */
-struct __DRIcontextRec {
- /**
- * Method to destroy the private DRI context data.
- */
- void (*destroyContext)(__DRInativeDisplay *dpy, int scrn, void *contextPrivate);
-
- /**
- * Opaque pointer to private per context direct rendering data.
- * \c NULL if direct rendering is not supported on the display or
- * screen used to create this context. Never dereferenced in libGL.
- */
- void *private;
-
- /**
- * Pointer to the mode used to create this context.
- *
- * \since Internal API version 20040317.
- */
- const __GLcontextModes * mode;
-
- /**
- * Method to bind a DRI drawable to a DRI graphics context.
- *
- * \since Internal API version 20050727.
- */
- GLboolean (*bindContext)(__DRInativeDisplay *dpy, int scrn, __DRIid draw,
- __DRIid read, __DRIcontext *ctx);
-
- /**
- * Method to unbind a DRI drawable from a DRI graphics context.
- *
- * \since Internal API version 20050727.
- */
- GLboolean (*unbindContext)(__DRInativeDisplay *dpy, int scrn, __DRIid draw,
- __DRIid read, __DRIcontext *ctx);
-};
-
-/**
- * Drawable dependent methods. This structure is initialized during the
- * \c __DRIscreenRec::createDrawable call. \c createDrawable is not called
- * by libGL at this time. It's currently used via the dri_util.c utility code
- * instead.
- */
-struct __DRIdrawableRec {
- /**
- * Method to destroy the private DRI drawable data.
- */
- void (*destroyDrawable)(__DRInativeDisplay *dpy, void *drawablePrivate);
-
- /**
- * Method to swap the front and back buffers.
- */
- void (*swapBuffers)(__DRInativeDisplay *dpy, void *drawablePrivate);
-
- /**
- * Opaque pointer to private per drawable direct rendering data.
- * \c NULL if direct rendering is not supported on the display or
- * screen used to create this drawable. Never dereferenced in libGL.
- */
- void *private;
-
- /**
- * Get the number of completed swap buffers for this drawable.
- *
- * \since Internal API version 20030317.
- */
- int (*getSBC)(__DRInativeDisplay *dpy, void *drawablePrivate, int64_t *sbc );
-
- /**
- * Wait for the SBC to be greater than or equal target_sbc.
- *
- * \since Internal API version 20030317.
- */
- int (*waitForSBC)( __DRInativeDisplay * dpy, void *drawablePriv,
- int64_t target_sbc,
- int64_t * msc, int64_t * sbc );
-
- /**
- * Wait for the MSC to equal target_msc, or, if that has already passed,
- * the next time (MSC % divisor) is equal to remainder. If divisor is
- * zero, the function will return as soon as MSC is greater than or equal
- * to target_msc.
- *
- * \since Internal API version 20030317.
- */
- int (*waitForMSC)( __DRInativeDisplay * dpy, void *drawablePriv,
- int64_t target_msc, int64_t divisor, int64_t remainder,
- int64_t * msc, int64_t * sbc );
-
- /**
- * Like \c swapBuffers, but does NOT have an implicit \c glFlush. Once
- * rendering is complete, waits until MSC is equal to target_msc, or
- * if that has already passed, waits until (MSC % divisor) is equal
- * to remainder. If divisor is zero, the swap will happen as soon as
- * MSC is greater than or equal to target_msc.
- *
- * \since Internal API version 20030317.
- */
- int64_t (*swapBuffersMSC)(__DRInativeDisplay *dpy, void *drawablePrivate,
- int64_t target_msc,
- int64_t divisor, int64_t remainder);
-
- /**
- * Enable or disable frame usage tracking.
- *
- * \since Internal API version 20030317.
- */
- int (*frameTracking)(__DRInativeDisplay *dpy, void *drawablePrivate, GLboolean enable);
-
- /**
- * Retrieve frame usage information.
- *
- * \since Internal API version 20030317.
- */
- int (*queryFrameTracking)(__DRInativeDisplay *dpy, void *drawablePrivate,
- int64_t * sbc, int64_t * missedFrames,
- float * lastMissedUsage, float * usage );
-
- /**
- * Used by drivers that implement the GLX_SGI_swap_control or
- * GLX_MESA_swap_control extension.
- *
- * \since Internal API version 20030317.
- */
- unsigned swap_interval;
-};
-
-#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86driproto-X11R7.0-2.0.3/Makefile.am new/xf86driproto-2.0.4/Makefile.am
--- old/xf86driproto-X11R7.0-2.0.3/Makefile.am 2005-10-18 08:05:04.000000000 +0200
+++ new/xf86driproto-2.0.4/Makefile.am 2008-04-01 19:28:44.000000000 +0200
@@ -1,10 +1,17 @@
xf86dridir = $(includedir)/X11/dri
xf86dri_HEADERS = xf86dri.h xf86dristr.h
-driinterfacedir = $(includedir)/GL/internal
-driinterface_HEADERS = dri_interface.h
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xf86driproto.pc
EXTRA_DIST = autogen.sh xf86driproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86driproto-X11R7.0-2.0.3/missing new/xf86driproto-2.0.4/missing
--- old/xf86driproto-X11R7.0-2.0.3/missing 2005-12-21 07:57:18.000000000 +0100
+++ new/xf86driproto-2.0.4/missing 2008-04-01 19:42:41.000000000 +0200
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -29,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,18 +44,24 @@
configure_ac=configure.in
fi
-case "$1" in
+msg="missing on your system"
+
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -67,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +87,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +104,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $1 in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +149,8 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +158,8 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -130,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +177,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,20 +188,15 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -185,74 +212,67 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -262,32 +282,36 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -300,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,8 +347,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +358,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86driproto-X11R7.0-2.0.3/xf86dri.h new/xf86driproto-2.0.4/xf86dri.h
--- old/xf86driproto-X11R7.0-2.0.3/xf86dri.h 2005-07-31 18:45:58.000000000 +0200
+++ new/xf86driproto-2.0.4/xf86dri.h 2008-04-01 19:28:44.000000000 +0200
@@ -63,60 +63,5 @@
#define XF86DRIOperationNotSupported 1
#define XF86DRINumberErrors (XF86DRIOperationNotSupported + 1)
-#ifndef _XF86DRI_SERVER_
-
-#include
-
-_XFUNCPROTOBEGIN
-
-Bool XF86DRIQueryExtension( Display *dpy, int *event_base, int *error_base );
-
-Bool XF86DRIQueryVersion( Display *dpy, int *majorVersion, int *minorVersion,
- int *patchVersion );
-
-Bool XF86DRIQueryDirectRenderingCapable( Display *dpy, int screen,
- Bool *isCapable );
-
-Bool XF86DRIOpenConnection( Display *dpy, int screen, drm_handle_t *hSAREA,
- char **busIDString );
-
-Bool XF86DRIAuthConnection( Display *dpy, int screen, drm_magic_t magic );
-
-Bool XF86DRICloseConnection( Display *dpy, int screen );
-
-Bool XF86DRIGetClientDriverName( Display *dpy, int screen,
- int *ddxDriverMajorVersion, int *ddxDriverMinorVersion,
- int *ddxDriverPatchVersion, char **clientDriverName );
-
-Bool XF86DRICreateContext( Display *dpy, int screen, Visual *visual,
- XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
-
-Bool XF86DRICreateContextWithConfig( Display *dpy, int screen, int configID,
- XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
-
-extern GLboolean XF86DRIDestroyContext( __DRInativeDisplay *dpy, int screen,
- __DRIid context_id );
-
-extern GLboolean XF86DRICreateDrawable( __DRInativeDisplay *dpy, int screen,
- __DRIid drawable, drm_drawable_t *hHWDrawable );
-
-extern GLboolean XF86DRIDestroyDrawable( __DRInativeDisplay *dpy, int screen,
- __DRIid drawable);
-
-Bool XF86DRIGetDrawableInfo( Display *dpy, int screen, Drawable drawable,
- unsigned int *index, unsigned int *stamp,
- int *X, int *Y, int *W, int *H,
- int *numClipRects, drm_clip_rect_t ** pClipRects,
- int *backX, int *backY,
- int *numBackClipRects, drm_clip_rect_t **pBackClipRects );
-
-Bool XF86DRIGetDeviceInfo( Display *dpy, int screen,
- drm_handle_t *hFrameBuffer, int *fbOrigin, int *fbSize,
- int *fbStride, int *devPrivateSize, void **pDevPrivate );
-
-_XFUNCPROTOEND
-
-#endif /* _XF86DRI_SERVER_ */
-
#endif /* _XF86DRI_H_ */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org