ChangeLog | 71 ++++++++++++++++++++++++++++++++++++++ configure.ac | 32 +++++++++-------- debian/changelog | 10 +++++ debian/control | 26 ++++++++++--- debian/libxxf86dga-dev.install | 6 +-- debian/libxxf86dga1.install | 2 - debian/rules | 19 ++++------ include/X11/extensions/Xxf86dga.h | 2 - include/X11/extensions/xf86dga1.h | 2 - man/XDGA.man | 14 +++---- src/Makefile.am | 2 - src/XF86DGA.c | 36 +++++++++---------- src/XF86DGA2.c | 60 ++++++++++++++++---------------- 13 files changed, 189 insertions(+), 93 deletions(-)
New commits: commit 2e2db6a5d56c8711ab2df4102eee2cf753277a91 Author: Julien Cristau <jcris...@debian.org> Date: Mon Apr 30 15:01:22 2012 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index ba55911..966dc6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxxf86dga (2:1.1.3-1) UNRELEASED; urgency=low +libxxf86dga (2:1.1.3-1) unstable; urgency=low * New upstream release. * Remove David and Andres from Uploaders. @@ -6,7 +6,7 @@ libxxf86dga (2:1.1.3-1) UNRELEASED; urgency=low * Build for multiarch. * Drop useless Depends on x11-common. - -- Julien Cristau <jcris...@debian.org> Mon, 30 Apr 2012 13:13:49 +0200 + -- Julien Cristau <jcris...@debian.org> Mon, 30 Apr 2012 15:11:07 +0200 libxxf86dga (2:1.1.2-1) unstable; urgency=low commit 936dfd1579299cf115753d9e1e9c8aa2e56b1f92 Author: Julien Cristau <jcris...@debian.org> Date: Mon Apr 30 14:15:14 2012 +0200 Drop useless Depends on x11-common. diff --git a/debian/changelog b/debian/changelog index 50840cd..ba55911 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libxxf86dga (2:1.1.3-1) UNRELEASED; urgency=low * Remove David and Andres from Uploaders. * d/rules: add build-{arch,indep} target, don't use dh_testroot in clean. * Build for multiarch. + * Drop useless Depends on x11-common. -- Julien Cristau <jcris...@debian.org> Mon, 30 Apr 2012 13:13:49 +0200 diff --git a/debian/control b/debian/control index 204e887..f84ba77 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,6 @@ Pre-Depends: Depends: ${shlibs:Depends}, ${misc:Depends}, - x11-common, Description: X11 Direct Graphics Access extension library libXxf86dga provides the XFree86-DGA extension, which allows direct graphics access to a framebuffer-like region, and also allows relative @@ -49,7 +48,6 @@ Pre-Depends: Depends: ${shlibs:Depends}, ${misc:Depends}, - x11-common, libxxf86dga1 (= ${binary:Version}), Description: X11 Direct Graphics Access extension library (debug package) libXxf86dga provides the XFree86-DGA extension, which allows direct commit bc4b4401ed5bda08fb5e8d7aeb7952030a298a6c Author: Julien Cristau <jcris...@debian.org> Date: Mon Apr 30 14:14:52 2012 +0200 Build for multiarch. diff --git a/debian/changelog b/debian/changelog index 9cfd4a0..50840cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libxxf86dga (2:1.1.3-1) UNRELEASED; urgency=low * New upstream release. * Remove David and Andres from Uploaders. * d/rules: add build-{arch,indep} target, don't use dh_testroot in clean. + * Build for multiarch. -- Julien Cristau <jcris...@debian.org> Mon, 30 Apr 2012 13:13:49 +0200 diff --git a/debian/control b/debian/control index 00d0954..204e887 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: Cyril Brulebois <k...@debian.org> Build-Depends: - debhelper (>= 5.0.0), + debhelper (>= 8.1.3), libx11-dev (>= 1:0.99.2), x11proto-xf86dga-dev (>= 2.0.99.1), libxext-dev (>= 1:0.99.1), @@ -19,8 +19,14 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxxf86dga.git Package: libxxf86dga1 Architecture: any +Multi-Arch: same Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common +Pre-Depends: + ${misc:Pre-Depends}, +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + x11-common, Description: X11 Direct Graphics Access extension library libXxf86dga provides the XFree86-DGA extension, which allows direct graphics access to a framebuffer-like region, and also allows relative @@ -35,9 +41,16 @@ Description: X11 Direct Graphics Access extension library Package: libxxf86dga1-dbg Architecture: any +Multi-Arch: same Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxxf86dga1 (= ${binary:Version}) +Pre-Depends: + ${misc:Pre-Depends}, +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + x11-common, + libxxf86dga1 (= ${binary:Version}), Description: X11 Direct Graphics Access extension library (debug package) libXxf86dga provides the XFree86-DGA extension, which allows direct graphics access to a framebuffer-like region, and also allows relative @@ -55,15 +68,18 @@ Description: X11 Direct Graphics Access extension library (debug package) Package: libxxf86dga-dev Architecture: any +Multi-Arch: same Section: libdevel +Pre-Depends: + ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, libxxf86dga1 (= ${binary:Version}), libx11-dev, - x11proto-xf86dga-dev (>= 2.0.99.1) + x11proto-xf86dga-dev (>= 2.0.99.1), Replaces: - x11proto-xf86dga-dev (<< 2.0.99.1) + x11proto-xf86dga-dev (<< 2.0.99.1), Description: X11 Direct Graphics Access extension library (development headers) libXxf86dga provides the XFree86-DGA extension, which allows direct graphics access to a framebuffer-like region, and also allows relative diff --git a/debian/libxxf86dga-dev.install b/debian/libxxf86dga-dev.install index 3a634fe..3f308d4 100644 --- a/debian/libxxf86dga-dev.install +++ b/debian/libxxf86dga-dev.install @@ -1,5 +1,5 @@ usr/share/man/* -usr/lib/libXxf86dga.a -usr/lib/libXxf86dga.so -usr/lib/pkgconfig/xxf86dga.pc +usr/lib/*/libXxf86dga.a +usr/lib/*/libXxf86dga.so +usr/lib/*/pkgconfig/xxf86dga.pc usr/include/X11/extensions/ diff --git a/debian/libxxf86dga1.install b/debian/libxxf86dga1.install index e74a942..95a7bd4 100644 --- a/debian/libxxf86dga1.install +++ b/debian/libxxf86dga1.install @@ -1 +1 @@ -usr/lib/libXxf86dga.so.1* +usr/lib/*/libXxf86dga.so.1* diff --git a/debian/rules b/debian/rules index c30ce38..aa02999 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) endif -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) @@ -45,6 +45,7 @@ build-stamp: configure $(STAMP_DIR)/genscripts mkdir -p build cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" cd build && $(MAKE) commit 58576ad853b8e9f8f13b2de788daff48016330eb Author: Julien Cristau <jcris...@debian.org> Date: Mon Apr 30 13:20:58 2012 +0200 d/rules: add build-{arch,indep} target, don't use dh_testroot in clean. diff --git a/debian/changelog b/debian/changelog index 47984d4..9cfd4a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libxxf86dga (2:1.1.3-1) UNRELEASED; urgency=low * New upstream release. * Remove David and Andres from Uploaders. + * d/rules: add build-{arch,indep} target, don't use dh_testroot in clean. -- Julien Cristau <jcris...@debian.org> Mon, 30 Apr 2012 13:13:49 +0200 diff --git a/debian/rules b/debian/rules index c0203c8..c30ce38 100755 --- a/debian/rules +++ b/debian/rules @@ -36,10 +36,12 @@ configure: $(STAMP_DIR)/patch dh_testdir autoreconf -vfi -build: build-stamp +build: build-arch +build-indep: + # Nothing to do +build-arch: build-stamp build-stamp: configure $(STAMP_DIR)/genscripts dh_testdir - mkdir -p build cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ @@ -50,9 +52,7 @@ build-stamp: configure $(STAMP_DIR)/genscripts clean: xsfclean dh_testdir - dh_testroot rm -f build-stamp - rm -f config.cache config.log config.status rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* @@ -61,8 +61,7 @@ clean: xsfclean rm -f aclocal.m4 compile config.guess config.sub configure rm -f depcomp install-sh ltmain.sh missing mkinstalldirs rm -f src/config.h.in - rm -f $$(find -name Makefile.in) - + find -name Makefile.in -delete dh_clean install: build @@ -70,14 +69,12 @@ install: build dh_testroot dh_clean -k dh_installdirs - cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot - dh_installdocs dh_install --sourcedir=debian/tmp --fail-missing -XlibXxf86dga.la dh_installchangelogs ChangeLog @@ -97,4 +94,5 @@ binary-indep: build install # Nothing to do binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build-indep build-arch build +.PHONY: clean binary-indep binary-arch binary install commit c9ee2b89a403cf73542a34a55e993d3e76aba99c Author: Julien Cristau <jcris...@debian.org> Date: Mon Apr 30 13:15:39 2012 +0200 Remove David and Andres from Uploaders. diff --git a/debian/changelog b/debian/changelog index 8200554..47984d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libxxf86dga (2:1.1.3-1) UNRELEASED; urgency=low * New upstream release. + * Remove David and Andres from Uploaders. -- Julien Cristau <jcris...@debian.org> Mon, 30 Apr 2012 13:13:49 +0200 diff --git a/debian/control b/debian/control index 0f02b5e..00d0954 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libxxf86dga Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <dnusi...@debian.org>, Andres Salomon <dilin...@debian.org>, Cyril Brulebois <k...@debian.org> +Uploaders: Cyril Brulebois <k...@debian.org> Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2), commit bb8c6a2cea474fd05c881cb69121eb99402e4c75 Author: Julien Cristau <jcris...@debian.org> Date: Mon Apr 30 13:14:56 2012 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index fe0a013..fd4d98b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,74 @@ +commit 3dad5d7c34c5787f0466b9ff50d7c26cd18e37bd +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Wed Mar 7 21:34:06 2012 -0800 + + libXxf86dga 1.1.3 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 870a35db2ad6eab47d1026a56e52c3f53a9877eb +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Thu Nov 10 21:50:52 2011 -0800 + + Fix gcc -Wwrite-strings warnings + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit e9936bbcfe7ae6430ec91fd5fca696c09f2b904c +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Sep 16 22:57:14 2011 -0700 + + Strip trailing whitespace + + Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' + git diff -w & git diff -b show no diffs from this change + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit c85b3c711d96331b4aa564ee4c9168d1aa0c10bc +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Tue May 17 20:54:52 2011 -0700 + + XDGA.man: Fix capitalization of ViewportStep to match xf86dgaproto headers + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 8d4356002f886417c1edb7b41aa1139d984bb861 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Feb 2 11:43:45 2011 -0500 + + config: comment, minor upgrade, quote and layout configure.ac + + Group statements per section as per Autoconf standard layout + Quote statements where appropriate. + Autoconf recommends not using dnl instead of # for comments + + Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters. + Add AC_CONFIG_SRCDIR([Makefile.am]) + + This helps automated maintenance and release activities. + Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines + +commit 1d8387fbb917fb47d27b20b369d3fb7d0947ab6a +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Fri Jan 28 19:41:38 2011 -0500 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 4aae82f7d0533ba696434b2c8d108e8d8206b8bc +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Thu Jan 27 18:50:15 2011 -0500 + + config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 + + XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls + AC_PROG_C_C99. This sets gcc with -std=gnu99. + If AC_PROG_CC macro is called afterwards, it resets CC to gcc. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + commit 3eb0d49a8d673c79ba9714d027f1ee056cf4b0b9 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Fri Oct 29 18:00:17 2010 -0700 diff --git a/debian/changelog b/debian/changelog index 9d76d04..8200554 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxxf86dga (2:1.1.3-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Julien Cristau <jcris...@debian.org> Mon, 30 Apr 2012 13:13:49 +0200 + libxxf86dga (2:1.1.2-1) unstable; urgency=low [ Julien Cristau ] commit 3dad5d7c34c5787f0466b9ff50d7c26cd18e37bd Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Wed Mar 7 21:34:06 2012 -0800 libXxf86dga 1.1.3 Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> diff --git a/configure.ac b/configure.ac index 7f9b97c..54585c9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXxf86dga], [1.1.2], +AC_INIT([libXxf86dga], [1.1.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXxf86dga]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS(src/config.h) commit 870a35db2ad6eab47d1026a56e52c3f53a9877eb Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Thu Nov 10 21:50:52 2011 -0800 Fix gcc -Wwrite-strings warnings Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> diff --git a/src/XF86DGA.c b/src/XF86DGA.c index 71484b7..4544507 100644 --- a/src/XF86DGA.c +++ b/src/XF86DGA.c @@ -65,7 +65,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc #include <X11/extensions/extutil.h> extern XExtDisplayInfo* xdga_find_display(Display*); -extern char *xdga_extension_name; +extern const char *xdga_extension_name; #define XF86DGACheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, xdga_extension_name, val) diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c index fbc84cb..e81b486 100644 --- a/src/XF86DGA2.c +++ b/src/XF86DGA2.c @@ -25,7 +25,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc /* If you change this, change the Bases[] array below as well */ #define MAX_HEADS 16 -char *xdga_extension_name = XF86DGANAME; +const char *xdga_extension_name = XF86DGANAME; static XExtensionInfo _xdga_info_data; static XExtensionInfo *xdga_info = &_xdga_info_data; @@ -760,7 +760,7 @@ typedef struct _DGAMapRec{ } DGAMapRec, *DGAMapPtr; static Bool -DGAMapPhysical(int, char*, unsigned char*, CARD32, CARD32, CARD32, DGAMapPtr); +DGAMapPhysical(int, const char*, unsigned char*, CARD32, CARD32, CARD32, DGAMapPtr); static void DGAUnmapPhysical(DGAMapPtr); static DGAMapPtr _Maps = NULL; @@ -852,7 +852,7 @@ XDGAUnmapFramebuffer(int screen) static Bool DGAMapPhysical( int screen, - char *name, /* optional device name */ + const char *name, /* optional device name */ unsigned char* base, /* physical memory */ CARD32 size, /* size */ CARD32 offset, /* optional offset */ commit e9936bbcfe7ae6430ec91fd5fca696c09f2b904c Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Fri Sep 16 22:57:14 2011 -0700 Strip trailing whitespace Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' git diff -w & git diff -b show no diffs from this change Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> diff --git a/include/X11/extensions/Xxf86dga.h b/include/X11/extensions/Xxf86dga.h index 3b14ff3..d78a032 100644 --- a/include/X11/extensions/Xxf86dga.h +++ b/include/X11/extensions/Xxf86dga.h @@ -150,7 +150,7 @@ int XDGAGetViewportStatus( Display *dpy, int screen ); - + void XDGASync( Display *dpy, int screen diff --git a/include/X11/extensions/xf86dga1.h b/include/X11/extensions/xf86dga1.h index 0fc97aa..8110438 100644 --- a/include/X11/extensions/xf86dga1.h +++ b/include/X11/extensions/xf86dga1.h @@ -37,7 +37,7 @@ Status XF86DGAGetVideoLL( unsigned int * /* base addr */, int * /* width */, int * /* bank_size */, - int * /* ram_size */ + int * /* ram_size */ ); Status XF86DGAGetVideo( diff --git a/man/XDGA.man b/man/XDGA.man index 2121787..4510bcd 100644 --- a/man/XDGA.man +++ b/man/XDGA.man @@ -1,4 +1,4 @@ -.\" +.\" .TH XDGA 3 __vendorversion__ .SH NAME XDGA \- Client library for the XFree86-DGA extension. @@ -230,7 +230,7 @@ Each corresponds to a different framebuffer layout. .PP .BR XDGAQueryModes () -returns a pointer to an array of +returns a pointer to an array of .IR XDGAMode s which are valid for the given screen. .I num @@ -382,7 +382,7 @@ function. .I maxViewportX .TP 8 .I maxViewportY -The maximum x and y positions possible with the +The maximum x and y positions possible with the .BR XDGASetViewport () function. .TP 8 diff --git a/src/Makefile.am b/src/Makefile.am index edfb90a..fbde550 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = -I $(top_srcdir)/include \ $(XXF86DGA_CFLAGS) \ $(MALLOC_ZERO_CFLAGS) \ $(CWARNFLAGS) - + libXxf86dga_la_LIBADD = $(XXF86DGA_LIBS) libXxf86dga_la_LDFLAGS = -version-number 1:0:0 diff --git a/src/XF86DGA.c b/src/XF86DGA.c index 4effcaf..71484b7 100644 --- a/src/XF86DGA.c +++ b/src/XF86DGA.c @@ -86,7 +86,7 @@ Bool XF86DGAQueryExtension ( Bool XF86DGAQueryVersion( Display* dpy, - int* majorVersion, + int* majorVersion, int* minorVersion ){ return XDGAQueryVersion(dpy, majorVersion, minorVersion); @@ -96,8 +96,8 @@ Bool XF86DGAGetVideoLL( Display* dpy, int screen, unsigned int *offset, - int *width, - int *bank_size, + int *width, + int *bank_size, int *ram_size ){ XExtDisplayInfo *info = xdga_find_display (dpy); @@ -121,13 +121,13 @@ Bool XF86DGAGetVideoLL( *width = rep.width; *bank_size = rep.bank_size; *ram_size = rep.ram_size; - + UnlockDisplay(dpy); SyncHandle(); return True; } - + Bool XF86DGADirectVideoLL( Display* dpy, int screen, @@ -153,7 +153,7 @@ Bool XF86DGADirectVideoLL( Bool XF86DGAGetViewPortSize( Display* dpy, int screen, - int *width, + int *width, int *height ){ XExtDisplayInfo *info = xdga_find_display (dpy); @@ -175,17 +175,17 @@ Bool XF86DGAGetViewPortSize( *width = rep.width; *height = rep.height; - + UnlockDisplay(dpy); SyncHandle(); return True; } - - + + Bool XF86DGASetViewPort( Display* dpy, int screen, - int x, + int x, int y ){ XExtDisplayInfo *info = xdga_find_display (dpy); @@ -206,7 +206,7 @@ Bool XF86DGASetViewPort( return True; } - + Bool XF86DGAGetVidPage( Display* dpy, int screen, @@ -235,7 +235,7 @@ Bool XF86DGAGetVidPage( return True; } - + Bool XF86DGASetVidPage( Display* dpy, int screen, @@ -342,7 +342,7 @@ Bool XF86DGAViewPortChanged( #include <stdlib.h> #include <stdio.h> #include <fcntl.h> -#if defined(ISC) +#if defined(ISC) # define HAS_SVR3_MMAP # include <sys/types.h> # include <errno.h> @@ -548,7 +548,7 @@ MapPhysAddress(unsigned long address, unsigned long size) if (rc != 0) return NULL; #elif defined(Lynx) && defined(NO_MMAP) - vaddr = (void *)smem_create("XF86DGA", (char *)offset, + vaddr = (void *)smem_create("XF86DGA", (char *)offset, size + delta, SM_READ|SM_WRITE); #else #ifndef MAP_FILE @@ -670,8 +670,8 @@ XF86DGAGetVideo( Display *dis, int screen, char **addr, - int *width, - int *bank, + int *width, + int *bank, int *ram ){ unsigned int offset; @@ -710,7 +710,7 @@ XF86DGAGetVideo( signal(SIGBUS, XF86cleanup); #endif signal(SIGHUP, XF86cleanup); - signal(SIGFPE, XF86cleanup); + signal(SIGFPE, XF86cleanup); } return 1; diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c index d241ff7..fbc84cb 100644 --- a/src/XF86DGA2.c +++ b/src/XF86DGA2.c @@ -30,7 +30,7 @@ char *xdga_extension_name = XF86DGANAME; static XExtensionInfo _xdga_info_data; static XExtensionInfo *xdga_info = &_xdga_info_data; - + Bool XDGAMapFramebuffer(int, char *, unsigned char*, CARD32, CARD32, CARD32); void XDGAUnmapFramebuffer(int); unsigned char* XDGAGetMappedMemory(int); @@ -66,9 +66,9 @@ static XEXT_GENERATE_CLOSE_DISPLAY (xdga_close_display, xdga_info) XExtDisplayInfo* xdga_find_display(Display*); -XEXT_GENERATE_FIND_DISPLAY (xdga_find_display, xdga_info, - "XFree86-DGA", - &xdga_extension_hooks, +XEXT_GENERATE_FIND_DISPLAY (xdga_find_display, xdga_info, + "XFree86-DGA", + &xdga_extension_hooks, 0, NULL) @@ -154,7 +154,7 @@ Bool XDGAQueryExtension ( Bool XDGAQueryVersion( Display *dpy, - int *majorVersion, + int *majorVersion, int *minorVersion ){ XExtDisplayInfo *info = xdga_find_display (dpy); @@ -182,7 +182,7 @@ Bool XDGAQueryVersion( for (i = 0, j = info->codes->first_event; i < XF86DGANumberEvents; - i++, j++) + i++, j++) { XESetWireToEvent (dpy, j, xdga_wire_to_event); XESetEventToWire (dpy, j, xdga_event_to_wire); @@ -240,11 +240,11 @@ Bool XDGAOpenFramebuffer( } ret = XDGAMapFramebuffer(screen, deviceName, - (unsigned char*)(long)rep.mem1, + (unsigned char*)(long)rep.mem1, rep.size, rep.offset, rep.extra); if(deviceName) - Xfree(deviceName); + Xfree(deviceName); UnlockDisplay(dpy); SyncHandle(); @@ -305,12 +305,12 @@ XDGAMode* XDGAQueryModes( offset = (char*)(&modes[rep.number]); /* start of text */ - if(modes) { + if(modes) { for(i = 0; i < rep.number; i++) { _XRead(dpy, (char*)(&info), sz_xXDGAModeInfo); modes[i].num = info.num; - modes[i].verticalRefresh = + modes[i].verticalRefresh = (float)info.vsync_num / (float)info.vsync_den; modes[i].flags = info.flags; modes[i].imageWidth = info.image_width; @@ -333,7 +333,7 @@ XDGAMode* XDGAQueryModes( modes[i].maxViewportY = info.viewport_ymax; modes[i].viewportFlags = info.viewport_flags; modes[i].reserved1 = info.reserved1; - modes[i].reserved2 = info.reserved2; + modes[i].reserved2 = info.reserved2; _XRead(dpy, offset, info.name_size); modes[i].name = offset; @@ -352,7 +352,7 @@ XDGAMode* XDGAQueryModes( } -XDGADevice * +XDGADevice * XDGASetMode( Display *dpy, int screen, @@ -373,7 +373,7 @@ XDGASetMode( req->screen = screen; req->mode = mode; req->pid = pid = XAllocID(dpy); - + if (_XReply(dpy, (xReply *)&rep, 0, xFalse)) { if(rep.length) { xXDGAModeInfo info; @@ -383,12 +383,12 @@ XDGASetMode( size -= sz_xXDGAModeInfo; /* get text size */ dev = (XDGADevice*)Xmalloc(sizeof(XDGADevice) + size); - + if(dev) { _XRead(dpy, (char*)(&info), sz_xXDGAModeInfo); dev->mode.num = info.num; - dev->mode.verticalRefresh = + dev->mode.verticalRefresh = (float)info.vsync_num / (float)info.vsync_den; dev->mode.flags = info.flags; dev->mode.imageWidth = info.image_width; @@ -413,7 +413,7 @@ XDGASetMode( dev->mode.reserved1 = info.reserved1; dev->mode.reserved2 = info.reserved2; - dev->mode.name = (char*)(&dev[1]); + dev->mode.name = (char*)(&dev[1]); _XRead(dpy, dev->mode.name, info.name_size); dev->pixmap = (rep.flags & XDGAPixmap) ? pid : 0; @@ -421,7 +421,7 @@ XDGASetMode( if(dev->data) dev->data += rep.offset; - } + } /* not sure what to do if the allocation fails */ } } @@ -591,7 +591,7 @@ void XDGACopyTransparentArea( int XDGAGetViewportStatus( Display *dpy, - int screen + int screen ){ XExtDisplayInfo *info = xdga_find_display (dpy); xXDGAGetViewportStatusReply rep; @@ -614,7 +614,7 @@ int XDGAGetViewportStatus( void XDGASync( Display *dpy, - int screen + int screen ){ XExtDisplayInfo *info = xdga_find_display (dpy); xXDGASyncReply rep; @@ -638,7 +638,7 @@ void XDGAChangePixmapMode( int screen, int *x, int *y, - int mode + int mode ){ XExtDisplayInfo *info = xdga_find_display (dpy); xXDGAChangePixmapModeReq *req; @@ -689,7 +689,7 @@ Colormap XDGACreateColormap( void XDGAKeyEventToXKeyEvent( - XDGAKeyEvent* dk, + XDGAKeyEvent* dk, XKeyEvent* xk ){ xk->type = dk->type; @@ -710,7 +710,7 @@ void XDGAKeyEventToXKeyEvent( #include <stdlib.h> #include <stdio.h> #include <fcntl.h> -#if defined(ISC) +#if defined(ISC) # define HAS_SVR3_MMAP # include <sys/types.h> # include <errno.h> @@ -760,7 +760,7 @@ typedef struct _DGAMapRec{ } DGAMapRec, *DGAMapPtr; static Bool -DGAMapPhysical(int, char*, unsigned char*, CARD32, CARD32, CARD32, DGAMapPtr); +DGAMapPhysical(int, char*, unsigned char*, CARD32, CARD32, CARD32, DGAMapPtr); static void DGAUnmapPhysical(DGAMapPtr); static DGAMapPtr _Maps = NULL; @@ -794,7 +794,7 @@ XDGAMapFramebuffer( ){ DGAMapPtr pMap = _Maps; Bool result; - + /* is it already mapped ? */ while(pMap != NULL) { if(pMap->screen == screen) @@ -815,9 +815,9 @@ XDGAMapFramebuffer( if(result) { pMap->next = _Maps; _Maps = pMap; - } else + } else Xfree(pMap); - + return result; } @@ -866,7 +866,7 @@ DGAMapPhysical( ULONG action; HFILE hfd; #endif - + base += offset; pMap->screen = screen; @@ -927,7 +927,7 @@ DGAMapPhysical( name = DEV_MEM; if ((pMap->fd = open(name, O_RDWR)) < 0) return False; - pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE, + pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base); if (pMap->virtual == (void *)-1) return False; commit c85b3c711d96331b4aa564ee4c9168d1aa0c10bc Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Tue May 17 20:54:52 2011 -0700 XDGA.man: Fix capitalization of ViewportStep to match xf86dgaproto headers Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> diff --git a/man/XDGA.man b/man/XDGA.man index 5bff838..2121787 100644 --- a/man/XDGA.man +++ b/man/XDGA.man @@ -372,9 +372,9 @@ etc. The dimensions of the portion of the framebuffer which will be displayed on the screen. .TP 8 -.I xViewPortStep +.I xViewportStep .TP 8 -.I yViewPortStep +.I yViewportStep The granularity of the x,y viewport positioning possible with the .BR XDGASetViewport () function. @@ -522,9 +522,9 @@ rectangle. sets the upper left-hand corner of the rectangle of framebuffer that is to be displayed on the screen. Not all locations may be supported by the hardware and requested locations will be adjusted according to the -.I xViewPortStep +.I xViewportStep and -.I yViewPortStep +.I yViewportStep fields in the .IR XDGAMode . .PP commit 8d4356002f886417c1edb7b41aa1139d984bb861 Author: Gaetan Nadon <mems...@videotron.ca> Date: Wed Feb 2 11:43:45 2011 -0500 config: comment, minor upgrade, quote and layout configure.ac Group statements per section as per Autoconf standard layout Quote statements where appropriate. Autoconf recommends not using dnl instead of # for comments Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters. Add AC_CONFIG_SRCDIR([Makefile.am]) This helps automated maintenance and release activities. Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines diff --git a/configure.ac b/configure.ac index 1796d23..7f9b97c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,27 +1,30 @@ -AC_PREREQ([2.60]) +# Initialize Autoconf +AC_PREREQ([2.60]) AC_INIT([libXxf86dga], [1.1.2], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - [libXxf86dga]) + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXxf86dga]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS(src/config.h) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1soqry-00065o...@vasks.debian.org