diff options
author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-08 17:48:03 +0000 |
---|---|---|
committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-08 17:48:03 +0000 |
commit | 32107cdd57b4796c3f41ac56c9ba683be3d894af (patch) | |
tree | 11add59c706cd1b5cbde1dd7c6c8fc7a5fc13943 | |
parent | 84264cf7a9ce88850f3bc18428e2c046ff0251ed (diff) |
Check in build system for Xrandr
-rw-r--r-- | AUTHORS | 2 | ||||
-rw-r--r-- | COPYING | 19 | ||||
-rw-r--r-- | ChangeLog | 153 | ||||
-rw-r--r-- | INSTALL | 8 | ||||
-rw-r--r-- | Makefile.am | 31 | ||||
-rw-r--r-- | NEWS | 0 | ||||
-rw-r--r-- | README | 0 | ||||
-rwxr-xr-x | autogen.sh | 12 | ||||
-rw-r--r-- | configure.ac | 95 | ||||
-rw-r--r-- | man/Makefile.am | 3 | ||||
-rw-r--r-- | src/Makefile.am | 20 | ||||
-rw-r--r-- | xrandr.pc.in | 10 |
12 files changed, 353 insertions, 0 deletions
@@ -0,0 +1,2 @@ +Jim Gettys, Compaq and Hewlett-Packard, and Keith Packard, + SuSE and Hewlett-Packard @@ -0,0 +1,19 @@ +Copyright © 2000, Compaq Computer Corporation, +Copyright © 2002, Hewlett Packard, Inc. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Compaq or HP not be used in advertising +or publicity pertaining to distribution of the software without specific, +written prior permission. HP makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + +HP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL HP +BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..0e0fed1 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,153 @@ +2005-01-16 Chris Larson <kergoth@handhelds.org> + + * configure.ac: Fix to work with automake 1.9.x. + +2004-09-19 Carlos Romero <kidcrash@freedesktop.org> + + * Makefile.am: + Include man pages in EXTRA_DIST. + +2004-02-03 Jim Gettys <jg@freedesktop.org> + + * AUTHORS: Get a author's list. + +2004-01-15 Daniel Stone <daniel@fooishbar.org> + * Tag release 1.0.2 for first freedesktop.org clientside lib release. + +2004-01-15 Harold L Hunt II <huntharo@msu.edu> + * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. Add + -lXext and -lXrender to LIBADD. + +2003-06-12 07:12 eich + + * Xrandr.man: 214. Changed any occurance of x86_64 to AMD64, the + official name of the + architecture (Egbert Eich). + 213. Removed Copyright sign from man pages as this causes some + formatters + to choke (Egbert Eich). + +2003-05-29 14:48 herrb + + * Xrandr.man: Fix manual pages typos (Bugzilla #316, Jens + Schweikhardt). + +2003-05-29 08:04 dawes + + * Xrandr.man: Remove reference to non-existent Xrender(3) man page + (reported to webmaster). + +2003-05-27 15:26 tsi + + * Xrandr.c: 194. IRIX 6.5 build fixes and noise reductions (Marc + La France). + +2003-03-24 20:18 dawes + + * Xrandr-def.cpp: 26. Updates for building on OS/2 (#5650, Frank + Giessler). + +2003-02-07 03:21 eich + + * Xrandr.c: - followup for patch 844 - fixed typo in savage driver + +2003-02-05 04:59 eich + + * Xrandr.c: 844. Fixing a double free in libXRandr (Egbert Eich). + +2002-11-29 18:27 tsi + + * Xrandr.c: Build fix + +2002-11-26 21:37 keithp + + * Xrandr.c: LockDisplay re-executed during configuration fetching + +2002-11-03 16:21 keithp + + * Xrandr.c: correct randr reply length computation + +2002-10-14 11:01 keithp + + * Xrandr.c, Xrandr.h, Xrandrint.h: Add refresh rates to RandR + (v1.1) + +2002-10-08 06:00 keithp + + * Xrandr.man: Add comments about interaction of reflection and + rotation (from Jim Gettys) + +2002-10-02 15:11 tsi + + * Xrandr.man: Fix man page + +2002-10-02 09:55 keithp + + * Imakefile, Xrandr.man: Add Xrandr manual, update xrandr manual + +2002-10-01 11:24 keithp + + * Xrandr.h: Remove spurious member from XRRScreenSize structure. + +2002-09-29 16:39 keithp + + * Xrandr.c, Xrandr.h, Xrandrint.h: Update RandR to 1.0 (library + version 2.0) + +2001-11-23 15:26 keithp + + * Xrandr.h: Add C++ support to RandR library header + +2001-08-19 08:22 alanh + + * Xrandr-def.cpp: new file + +2001-08-06 14:46 dawes + + * test.c: missing ident lines + +2001-07-31 17:44 tsi + + * Xrandr.h: 168. Fix 16bpp colour maps on Mach64's (Marc La + France). + 167. Fix Mach64 DPMS bug (Marc La France). + 166. Fix bug that prevented hardware cursors on Mach64 CT's (Marc + La France). + 165. Document what a ChipAdjustFrame() function should to to + prevent moving + of hardware cursors during mode switches (Marc La France). + 164. -Wimplicit warning cleanup [`make World` >required<] (Marc La + France). + 163. Ensure installed headers can find the headers they, in turn, + #include + (Marc La France). + 162. Make imake pass its -W* flags to cpp (Marc La France). + 161. More accomodations for newer GCC's (Mike A. Harris). + +2001-06-10 18:37 keithp + + * Xrandr.c, Xrandr.h: Add XRRCurrentConfig to get current setup, + implement XRRTimes as per header + +2001-06-07 10:54 keithp + + * Xrandr.c, Xrandr.h: Change randr event and set config reply + +2001-06-07 08:33 keithp + + * Xrandr.c, Xrandr.h, Xrandrint.h: Update Xrandr library to add + events + +2001-06-03 14:52 keithp + + * Xrandr.c, Xrandr.h: Update RandR protocol + +2001-05-25 18:25 keithp + + * Xrandr.c, Xrandr.h: Add initial RandR support to Xvesa + +2001-05-22 20:29 keithp + + * Imakefile, Xrandr.c, Xrandr.h, Xrandrint.h, test.c: Add RandR + extension + @@ -0,0 +1,8 @@ +Xrender is built with the traditional configure script: + + $ ./configure --prefix=/usr/X11R6 + +This should generate valid Makefiles, then: + + $ make + $ make install diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..7cf800b --- /dev/null +++ b/Makefile.am @@ -0,0 +1,31 @@ +# +# $Id$ +# +# Copyright © 2003 Keith Packard, Noah Levitt +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Keith Packard not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Keith Packard makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +SUBDIRS = src man + +AM_CFLAGS = $(RANDR_CFLAGS) $(X_CFLAGS) + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = xrandr.pc + +EXTRA_DIST = xrandr.pc.in autogen.sh test.c diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..904cd67 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..0ab00f9 --- /dev/null +++ b/configure.ac @@ -0,0 +1,95 @@ +dnl +dnl $Id$ +dnl +dnl Copyright © 2003 Keith Packard, Noah Levitt +dnl +dnl Permission to use, copy, modify, distribute, and sell this software and its +dnl documentation for any purpose is hereby granted without fee, provided that +dnl the above copyright notice appear in all copies and that both that +dnl copyright notice and this permission notice appear in supporting +dnl documentation, and that the name of Keith Packard not be used in +dnl advertising or publicity pertaining to distribution of the software without +dnl specific, written prior permission. Keith Packard makes no +dnl representations about the suitability of this software for any purpose. It +dnl is provided "as is" without express or implied warranty. +dnl +dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +dnl PERFORMANCE OF THIS SOFTWARE. +dnl +dnl Process this file with autoconf to create configure. + +AC_PREREQ([2.57]) + +dnl +dnl Version should match the current Render version. XRenderQueryVersion +dnl returns the version from randr.h, NOT the version we set here. But we +dnl try to keep these the same. Note that the library has an extra +dnl digit in the version number to track changes which don't affect the +dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n +dnl +AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr) +AC_CONFIG_AUX_DIR(.) +AM_INIT_AUTOMAKE([dist-bzip2]) +AM_MAINTAINER_MODE + +AM_CONFIG_HEADER(config.h) + +# Check for progs +AC_PROG_CC +AC_PROG_LIBTOOL + +# Check for X +PKG_CHECK_MODULES(X, x11, + [x_found_with_pkgconfig=yes], + [x_found_with_pkgconfig=no]) + +if test "$x_found_with_pkgconfig" = "no" +then + AC_PATH_XTRA + X_LIBS="$X_LIBS -lX11" + + if test "x$no_x" = "xyes" + then + AC_MSG_ERROR([X is required, but it was either disabled or not found.]) + fi + + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $X_CFLAGS" + LIBS="$LIBS $X_LIBS" + + AC_MSG_CHECKING([for XTHREADS in Xlib]) + AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], + [[return XInitThreads() == 0 ? 0 : 1;]])], + [xthreads=no], + [xthreads=yes], + [xthreads=yes]) + + AC_MSG_RESULT($xthreads) + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + if test "x$xthreads" = "xyes" + then + X_CFLAGS="$X_CFLAGS -DXTHREADS" + fi +fi + +# Check randr configuration, strip extra digits from package version to +# find the required protocol version + +RANDR_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] +PKG_CHECK_MODULES(RANDR, randr >= $RANDR_VERSION xext xrender render) + +AC_OUTPUT([Makefile + src/Makefile + man/Makefile + xrandr.pc]) + diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..7126612 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,3 @@ +man3_MANS = Xrandr.man + +EXTRA_DIST = $(man3_MANS) diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..df8f640 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,20 @@ +lib_LTLIBRARIES = libXrandr.la + +libXrandr_la_SOURCES = \ + Xrandr.c \ + Xrandr.h \ + Xrandrint.h + +libXrandr_la_LIBADD = @X_LIBS@ -lX11 -lXext -lXrender + +INCLUDES = -I$(top_srcdir)/include/X11/extensions + +# +# Library version info. Check the libtool docs for +# instructions on when and how to change this value +# +libXrandr_la_LDFLAGS = -version-info 2:1:0 -no-undefined + +libXrandrincludedir = $(includedir)/X11/extensions +libXrandrinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xrandr.h + diff --git a/xrandr.pc.in b/xrandr.pc.in new file mode 100644 index 0000000..326f0e2 --- /dev/null +++ b/xrandr.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Xrandr +Description: X RandR Library +Version: @VERSION@ +Cflags: -I${includedir} @RANDR_CFLAGS@ @X_CFLAGS@ +Libs: -L${libdir} -lXrandr @RANDR_LIBS@ @X_LIBS@ |