mirror of
https://github.com/openbsd/xenocara.git
synced 2025-12-08 10:19:00 +00:00
xf86-video-dummy: update to version 0.4.0
This commit is contained in:
matthieu
@@ -1,3 +1,217 @@
|
||||
commit 68e02860d9ee6d65733457e689d180653fc9829f
|
||||
Author: Matt Turner <mattst88@gmail.com>
|
||||
Date: Tue Apr 5 10:16:22 2022 -0700
|
||||
|
||||
xf86-video-dummy 0.4.0
|
||||
|
||||
Signed-off-by: Matt Turner <mattst88@gmail.com>
|
||||
|
||||
commit f8ec326276aeef2c54bfdfc5ff084ed57ecf9b04
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Jan 22 10:19:23 2022 -0800
|
||||
|
||||
gitlab CI: add a basic build test
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 499f52324f0ccea081f1c9cae92f66b84811a33c
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Jan 22 10:18:32 2022 -0800
|
||||
|
||||
Fix spelling/wording issues
|
||||
|
||||
Found by using:
|
||||
codespell --builtin clear,rare,usage,informal,code,names
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 2428bbfab7eb0532c3fe3109e4215a705c526949
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Jan 22 10:17:54 2022 -0800
|
||||
|
||||
Build xz tarballs instead of bzip2
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 9e8dce17c0c9aaa9ee193cc7280d7132163765ec
|
||||
Author: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
|
||||
Date: Tue Sep 27 22:26:30 2016 +0200
|
||||
|
||||
Increase maximum number of video outputs to 16
|
||||
|
||||
Apparently 4 is too low. The number is totally arbitrary.
|
||||
|
||||
Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
|
||||
|
||||
commit a87cfeca7dca26a840793024cc44f5aea5adc7bf
|
||||
Author: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
|
||||
Date: Fri Jul 22 02:40:29 2016 +0200
|
||||
|
||||
xf86-video-dummy: changeable physical output size
|
||||
|
||||
Add WIDTH_MM and HEIGHT_MM output properties to allow setting "physical"
|
||||
size of the output. Normally this data is retrieved from EDID, but for
|
||||
obvious reasons it can't be done in the VM.
|
||||
This patch allows to set this properties from user space. This is later
|
||||
reported as output size (the header line describing the output in
|
||||
`xrandr` output).
|
||||
|
||||
Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
|
||||
|
||||
commit 327a25c4c3ab0b79a1103794449a1f7ccd6faff3
|
||||
Author: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
|
||||
Date: Tue Oct 16 16:48:47 2018 +0200
|
||||
|
||||
RandR support in dummy video driver
|
||||
|
||||
Properly initialize RandR extension, mostly with stubs. It creates four
|
||||
virtual outputs (lets hope that nobody will need more at once...). By
|
||||
default only the first one is in "connected" state, with preferred mode
|
||||
from xorg.conf. Other outputs get "connected" at first mode set (and
|
||||
left connected forever - you can always not use it).
|
||||
So without any xrandr calls it should work as before.
|
||||
|
||||
Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
|
||||
|
||||
commit 850c05161d554bbf6360e69294dbec9bc15dd64a
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sun Nov 25 13:56:38 2018 -0800
|
||||
|
||||
Update configure.ac bug URL for gitlab migration
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit ea2ad21c7a00a6a697f8561404b47cfb98137949
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sun Nov 18 12:27:18 2018 -0800
|
||||
|
||||
Update README for gitlab migration
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit bc8546e2bd5ed147ed5ef18ac086a1c50caff446
|
||||
Author: Antoine Martin <antoine@nagafix.co.uk>
|
||||
Date: Mon Aug 14 12:10:32 2017 -0400
|
||||
|
||||
Support for 30 bit depth in dummy driver
|
||||
|
||||
This patch makes it possible to start the server using the dummy driver
|
||||
with a 30 bit depth. The colormap size is changed from 256 to 1024 to
|
||||
prevent crashes.
|
||||
|
||||
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
||||
|
||||
commit 5e90221dc68ae0893acd5c9b12d702269202558d
|
||||
Author: Aaron Plattner <aplattner@nvidia.com>
|
||||
Date: Sat Aug 5 17:12:41 2017 -0700
|
||||
|
||||
DUMMYGetRec: Fix misleading indentation
|
||||
|
||||
GCC's -Wmisleading-indentation complains about this
|
||||
|
||||
dummy_driver.c: In function ‘DUMMYGetRec’:
|
||||
dummy_driver.c:181:5: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
|
||||
if (pScrn->driverPrivate == NULL)
|
||||
^~
|
||||
dummy_driver.c:183:9: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’
|
||||
return TRUE;
|
||||
^~~~~~
|
||||
|
||||
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
|
||||
|
||||
commit 7957ad83b53b57f376164b10742d4e35223c9dcc
|
||||
Author: Xiaolei Yu <dreifachstein@gmail.com>
|
||||
Date: Sat Aug 5 21:50:14 2017 +0700
|
||||
|
||||
fix a memory leak in probe
|
||||
|
||||
Signed-off-by: Xiaolei Yu <dreifachstein@gmail.com>
|
||||
Reviewed-by: Antoine Martin <antoine@nagafix.co.uk>
|
||||
Tested-by: Antoine Martin <antoine@nagafix.co.uk>
|
||||
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
|
||||
|
||||
commit 33e68185665b2d065525ac03332f080026b18d8d
|
||||
Author: Aaron Plattner <aplattner@nvidia.com>
|
||||
Date: Sat Aug 5 21:34:31 2017 +0700
|
||||
|
||||
Get rid of dPtr->FBBase
|
||||
|
||||
The pointer to the screen's pixels is stored in the screen pixmap's
|
||||
devPrivate.ptr field. Just use that instead of storing it
|
||||
redundantly.
|
||||
|
||||
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
|
||||
Reviewed-by: Bob Terek <xorg@esoterek.com>
|
||||
Tested-by: Antoine Martin <antoine@nagafix.co.uk>
|
||||
|
||||
commit 87249af5faf85c8d093e910c069faa4db0aee843
|
||||
Author: Aaron Plattner <aplattner@nvidia.com>
|
||||
Date: Sat Aug 5 21:31:13 2017 +0700
|
||||
|
||||
Remove DGA support
|
||||
|
||||
DGA was so 2004.
|
||||
|
||||
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
|
||||
Reviewed-by: Bob Terek <xorg@esoterek.com>
|
||||
Tested-by: Antoine Martin <antoine@nagafix.co.uk>
|
||||
|
||||
commit 7c3b090e80a9b364434120262f9bef5686cd2e2e
|
||||
Author: Aaron Plattner <aplattner@nvidia.com>
|
||||
Date: Sat Aug 5 21:27:30 2017 +0700
|
||||
|
||||
Delete dPtr->screenSaver
|
||||
|
||||
This is assigned, but never used.
|
||||
|
||||
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
|
||||
Reviewed-by: Bob Terek <xorg@esoterek.com>
|
||||
Tested-by: Antoine Martin <antoine@nagafix.co.uk>
|
||||
|
||||
commit 12e3e2030171b7a5df074a56293eb16da40cd99b
|
||||
Author: Aaron Plattner <aplattner@nvidia.com>
|
||||
Date: Sat Aug 5 21:25:03 2017 +0700
|
||||
|
||||
Delete XV stuff
|
||||
|
||||
As far as I can tell, this was never implemented or used.
|
||||
|
||||
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
|
||||
Reviewed-by: Bob Terek <xorg@esoterek.com>
|
||||
Tested-by: Antoine Martin <antoine@nagafix.co.uk>
|
||||
|
||||
commit af0f808922f2de77f4514819c0dbe062060f1433
|
||||
Author: Mihail Konev <k.mvc@ya.ru>
|
||||
Date: Thu Jan 26 14:00:22 2017 +1000
|
||||
|
||||
autogen: add default patch prefix
|
||||
|
||||
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
|
||||
|
||||
commit 50ba5531dc7a5ac4197cba1235470ed6531f84f2
|
||||
Author: Emil Velikov <emil.l.velikov@gmail.com>
|
||||
Date: Mon Mar 9 12:00:52 2015 +0000
|
||||
|
||||
autogen.sh: use quoted string variables
|
||||
|
||||
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
|
||||
fall-outs, when they contain space.
|
||||
|
||||
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 049573b57a33009c667533ad2b687b8fe8a72573
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Tue Jan 24 10:32:07 2017 +1000
|
||||
|
||||
autogen.sh: use exec instead of waiting for configure to finish
|
||||
|
||||
Syncs the invocation of configure with the one from the server.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
|
||||
|
||||
commit 4a6df6b4eecae769771eba0136bf8271d01258fb
|
||||
Author: Julien Cristau <jcristau@debian.org>
|
||||
Date: Wed Dec 14 21:57:18 2016 +0100
|
||||
|
||||
@@ -27,3 +27,5 @@ ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
EXTRA_DIST = README.md
|
||||
|
||||
@@ -70,9 +70,9 @@ POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = .
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
$(top_srcdir)/configure COPYING ChangeLog compile config.guess \
|
||||
$(top_srcdir)/configure COPYING ChangeLog config.guess \
|
||||
config.sub depcomp install-sh ltmain.sh missing
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -154,9 +154,9 @@ am__relativize = \
|
||||
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
|
||||
done; \
|
||||
reldir="$$dir2"
|
||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
|
||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
|
||||
GZIP_ENV = --best
|
||||
DIST_TARGETS = dist-bzip2 dist-gzip
|
||||
DIST_TARGETS = dist-xz dist-gzip
|
||||
distuninstallcheck_listfiles = find . -type f -print
|
||||
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
|
||||
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
|
||||
@@ -184,7 +184,6 @@ CWARNFLAGS = @CWARNFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DGA = @DGA@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||
@@ -295,6 +294,7 @@ pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
runstatedir = @runstatedir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
srcdir = @srcdir@
|
||||
@@ -305,6 +305,7 @@ top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
SUBDIRS = src
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
EXTRA_DIST = README.md
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
@@ -574,6 +575,7 @@ distdir: $(DISTFILES)
|
||||
dist-gzip: distdir
|
||||
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-bzip2: distdir
|
||||
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
|
||||
$(am__post_remove_distdir)
|
||||
@@ -581,7 +583,6 @@ dist-bzip2: distdir
|
||||
dist-lzip: distdir
|
||||
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-xz: distdir
|
||||
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
xf86-video-dummy - virtual/offscreen frame buffer driver for the Xorg X server
|
||||
|
||||
Please submit bugs & patches to the Xorg bugzilla:
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
|
||||
All questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||
|
||||
The master development code repository can be found at:
|
||||
|
||||
git://anongit.freedesktop.org/git/xorg/driver/xf86-video-dummy
|
||||
|
||||
http://cgit.freedesktop.org/xorg/driver/xf86-video-dummy
|
||||
|
||||
For more information on the git code manager, see:
|
||||
|
||||
http://wiki.x.org/wiki/GitPage
|
||||
18
driver/xf86-video-dummy/README.md
Normal file
18
driver/xf86-video-dummy/README.md
Normal file
@@ -0,0 +1,18 @@
|
||||
xf86-video-dummy - virtual/offscreen frame buffer driver for the Xorg X server
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
All questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
https://lists.x.org/mailman/listinfo/xorg
|
||||
|
||||
The primary development code repository can be found at:
|
||||
|
||||
https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy
|
||||
|
||||
Please submit bug reports and requests to merge patches there.
|
||||
|
||||
For patch submission instructions, see:
|
||||
|
||||
https://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
||||
|
||||
288
driver/xf86-video-dummy/aclocal.m4
vendored
288
driver/xf86-video-dummy/aclocal.m4
vendored
@@ -8606,32 +8606,63 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
|
||||
m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
|
||||
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
|
||||
|
||||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
# serial 1 (pkg-config-0.24)
|
||||
#
|
||||
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# General Public License for more details.
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
# serial 12 (pkg-config-0.29.2)
|
||||
|
||||
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
|
||||
# ----------------------------------
|
||||
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
|
||||
dnl
|
||||
dnl This program is free software; you can redistribute it and/or modify
|
||||
dnl it under the terms of the GNU General Public License as published by
|
||||
dnl the Free Software Foundation; either version 2 of the License, or
|
||||
dnl (at your option) any later version.
|
||||
dnl
|
||||
dnl This program is distributed in the hope that it will be useful, but
|
||||
dnl WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
dnl General Public License for more details.
|
||||
dnl
|
||||
dnl You should have received a copy of the GNU General Public License
|
||||
dnl along with this program; if not, write to the Free Software
|
||||
dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
dnl 02111-1307, USA.
|
||||
dnl
|
||||
dnl As a special exception to the GNU General Public License, if you
|
||||
dnl distribute this file as part of a program that contains a
|
||||
dnl configuration script generated by Autoconf, you may include it under
|
||||
dnl the same distribution terms that you use for the rest of that
|
||||
dnl program.
|
||||
|
||||
dnl PKG_PREREQ(MIN-VERSION)
|
||||
dnl -----------------------
|
||||
dnl Since: 0.29
|
||||
dnl
|
||||
dnl Verify that the version of the pkg-config macros are at least
|
||||
dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
|
||||
dnl installed version of pkg-config, this checks the developer's version
|
||||
dnl of pkg.m4 when generating configure.
|
||||
dnl
|
||||
dnl To ensure that this macro is defined, also add:
|
||||
dnl m4_ifndef([PKG_PREREQ],
|
||||
dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
|
||||
dnl
|
||||
dnl See the "Since" comment for each macro you use to see what version
|
||||
dnl of the macros you require.
|
||||
m4_defun([PKG_PREREQ],
|
||||
[m4_define([PKG_MACROS_VERSION], [0.29.2])
|
||||
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
|
||||
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
|
||||
])dnl PKG_PREREQ
|
||||
|
||||
dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
|
||||
dnl ----------------------------------
|
||||
dnl Since: 0.16
|
||||
dnl
|
||||
dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
|
||||
dnl first found in the path. Checks that the version of pkg-config found
|
||||
dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
|
||||
dnl used since that's the first version where most current features of
|
||||
dnl pkg-config existed.
|
||||
AC_DEFUN([PKG_PROG_PKG_CONFIG],
|
||||
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
|
||||
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
|
||||
@@ -8653,18 +8684,19 @@ if test -n "$PKG_CONFIG"; then
|
||||
PKG_CONFIG=""
|
||||
fi
|
||||
fi[]dnl
|
||||
])# PKG_PROG_PKG_CONFIG
|
||||
])dnl PKG_PROG_PKG_CONFIG
|
||||
|
||||
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
#
|
||||
# Check to see whether a particular set of modules exists. Similar
|
||||
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
|
||||
#
|
||||
# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
# only at the first occurence in configure.ac, so if the first place
|
||||
# it's called might be skipped (such as if it is within an "if", you
|
||||
# have to call PKG_CHECK_EXISTS manually
|
||||
# --------------------------------------------------------------
|
||||
dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
dnl -------------------------------------------------------------------
|
||||
dnl Since: 0.18
|
||||
dnl
|
||||
dnl Check to see whether a particular set of modules exists. Similar to
|
||||
dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
|
||||
dnl
|
||||
dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
dnl only at the first occurence in configure.ac, so if the first place
|
||||
dnl it's called might be skipped (such as if it is within an "if", you
|
||||
dnl have to call PKG_CHECK_EXISTS manually
|
||||
AC_DEFUN([PKG_CHECK_EXISTS],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
@@ -8674,8 +8706,10 @@ m4_ifvaln([$3], [else
|
||||
$3])dnl
|
||||
fi])
|
||||
|
||||
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
||||
# ---------------------------------------------
|
||||
dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
||||
dnl ---------------------------------------------
|
||||
dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
|
||||
dnl pkg_failed based on the result.
|
||||
m4_define([_PKG_CONFIG],
|
||||
[if test -n "$$1"; then
|
||||
pkg_cv_[]$1="$$1"
|
||||
@@ -8687,10 +8721,11 @@ m4_define([_PKG_CONFIG],
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi[]dnl
|
||||
])# _PKG_CONFIG
|
||||
])dnl _PKG_CONFIG
|
||||
|
||||
# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
# -----------------------------
|
||||
dnl _PKG_SHORT_ERRORS_SUPPORTED
|
||||
dnl ---------------------------
|
||||
dnl Internal check to see if pkg-config supports short errors.
|
||||
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
@@ -8698,26 +8733,24 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi[]dnl
|
||||
])# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
])dnl _PKG_SHORT_ERRORS_SUPPORTED
|
||||
|
||||
|
||||
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
||||
# [ACTION-IF-NOT-FOUND])
|
||||
#
|
||||
#
|
||||
# Note that if there is a possibility the first call to
|
||||
# PKG_CHECK_MODULES might not happen, you should be sure to include an
|
||||
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
|
||||
#
|
||||
#
|
||||
# --------------------------------------------------------------
|
||||
dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
||||
dnl [ACTION-IF-NOT-FOUND])
|
||||
dnl --------------------------------------------------------------
|
||||
dnl Since: 0.4.0
|
||||
dnl
|
||||
dnl Note that if there is a possibility the first call to
|
||||
dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
|
||||
dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
|
||||
AC_DEFUN([PKG_CHECK_MODULES],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
|
||||
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
|
||||
|
||||
pkg_failed=no
|
||||
AC_MSG_CHECKING([for $1])
|
||||
AC_MSG_CHECKING([for $2])
|
||||
|
||||
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
|
||||
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
|
||||
@@ -8727,11 +8760,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.])
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_RESULT([no])
|
||||
_PKG_SHORT_ERRORS_SUPPORTED
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
|
||||
else
|
||||
else
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
@@ -8748,7 +8781,7 @@ installed software in a non-standard prefix.
|
||||
_PKG_TEXT])[]dnl
|
||||
])
|
||||
elif test $pkg_failed = untried; then
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_RESULT([no])
|
||||
m4_default([$4], [AC_MSG_FAILURE(
|
||||
[The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
@@ -8764,16 +8797,40 @@ else
|
||||
AC_MSG_RESULT([yes])
|
||||
$3
|
||||
fi[]dnl
|
||||
])# PKG_CHECK_MODULES
|
||||
])dnl PKG_CHECK_MODULES
|
||||
|
||||
|
||||
# PKG_INSTALLDIR(DIRECTORY)
|
||||
# -------------------------
|
||||
# Substitutes the variable pkgconfigdir as the location where a module
|
||||
# should install pkg-config .pc files. By default the directory is
|
||||
# $libdir/pkgconfig, but the default can be changed by passing
|
||||
# DIRECTORY. The user can override through the --with-pkgconfigdir
|
||||
# parameter.
|
||||
dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
||||
dnl [ACTION-IF-NOT-FOUND])
|
||||
dnl ---------------------------------------------------------------------
|
||||
dnl Since: 0.29
|
||||
dnl
|
||||
dnl Checks for existence of MODULES and gathers its build flags with
|
||||
dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
|
||||
dnl and VARIABLE-PREFIX_LIBS from --libs.
|
||||
dnl
|
||||
dnl Note that if there is a possibility the first call to
|
||||
dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
|
||||
dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
|
||||
dnl configure.ac.
|
||||
AC_DEFUN([PKG_CHECK_MODULES_STATIC],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
_save_PKG_CONFIG=$PKG_CONFIG
|
||||
PKG_CONFIG="$PKG_CONFIG --static"
|
||||
PKG_CHECK_MODULES($@)
|
||||
PKG_CONFIG=$_save_PKG_CONFIG[]dnl
|
||||
])dnl PKG_CHECK_MODULES_STATIC
|
||||
|
||||
|
||||
dnl PKG_INSTALLDIR([DIRECTORY])
|
||||
dnl -------------------------
|
||||
dnl Since: 0.27
|
||||
dnl
|
||||
dnl Substitutes the variable pkgconfigdir as the location where a module
|
||||
dnl should install pkg-config .pc files. By default the directory is
|
||||
dnl $libdir/pkgconfig, but the default can be changed by passing
|
||||
dnl DIRECTORY. The user can override through the --with-pkgconfigdir
|
||||
dnl parameter.
|
||||
AC_DEFUN([PKG_INSTALLDIR],
|
||||
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
|
||||
m4_pushdef([pkg_description],
|
||||
@@ -8784,16 +8841,18 @@ AC_ARG_WITH([pkgconfigdir],
|
||||
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
|
||||
m4_popdef([pkg_default])
|
||||
m4_popdef([pkg_description])
|
||||
]) dnl PKG_INSTALLDIR
|
||||
])dnl PKG_INSTALLDIR
|
||||
|
||||
|
||||
# PKG_NOARCH_INSTALLDIR(DIRECTORY)
|
||||
# -------------------------
|
||||
# Substitutes the variable noarch_pkgconfigdir as the location where a
|
||||
# module should install arch-independent pkg-config .pc files. By
|
||||
# default the directory is $datadir/pkgconfig, but the default can be
|
||||
# changed by passing DIRECTORY. The user can override through the
|
||||
# --with-noarch-pkgconfigdir parameter.
|
||||
dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
|
||||
dnl --------------------------------
|
||||
dnl Since: 0.27
|
||||
dnl
|
||||
dnl Substitutes the variable noarch_pkgconfigdir as the location where a
|
||||
dnl module should install arch-independent pkg-config .pc files. By
|
||||
dnl default the directory is $datadir/pkgconfig, but the default can be
|
||||
dnl changed by passing DIRECTORY. The user can override through the
|
||||
dnl --with-noarch-pkgconfigdir parameter.
|
||||
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
|
||||
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
|
||||
m4_pushdef([pkg_description],
|
||||
@@ -8804,7 +8863,24 @@ AC_ARG_WITH([noarch-pkgconfigdir],
|
||||
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
|
||||
m4_popdef([pkg_default])
|
||||
m4_popdef([pkg_description])
|
||||
]) dnl PKG_NOARCH_INSTALLDIR
|
||||
])dnl PKG_NOARCH_INSTALLDIR
|
||||
|
||||
|
||||
dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
|
||||
dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
dnl -------------------------------------------
|
||||
dnl Since: 0.28
|
||||
dnl
|
||||
dnl Retrieves the value of the pkg-config variable for the given module.
|
||||
AC_DEFUN([PKG_CHECK_VAR],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
|
||||
|
||||
_PKG_CONFIG([$1], [variable="][$3]["], [$2])
|
||||
AS_VAR_COPY([$1], [pkg_cv_][$1])
|
||||
|
||||
AS_VAR_IF([$1], [""], [$5], [$4])dnl
|
||||
])dnl PKG_CHECK_VAR
|
||||
|
||||
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
|
||||
#
|
||||
@@ -9829,7 +9905,7 @@ AC_SUBST([am__untar])
|
||||
|
||||
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
|
||||
dnl
|
||||
dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
dnl
|
||||
dnl Permission is hereby granted, free of charge, to any person obtaining a
|
||||
dnl copy of this software and associated documentation files (the "Software"),
|
||||
@@ -9866,7 +9942,7 @@ dnl DEALINGS IN THE SOFTWARE.
|
||||
# See the "minimum version" comment for each macro you use to see what
|
||||
# version you require.
|
||||
m4_defun([XORG_MACROS_VERSION],[
|
||||
m4_define([vers_have], [1.19.0])
|
||||
m4_define([vers_have], [1.19.2])
|
||||
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
|
||||
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
|
||||
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
||||
@@ -9944,6 +10020,17 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
AC_REQUIRE([AC_PROG_SED])
|
||||
|
||||
case $host_os in
|
||||
solaris*)
|
||||
# Solaris 2.0 - 11.3 use SysV man page section numbers, so we
|
||||
# check for a man page file found in later versions that use
|
||||
# traditional section numbers instead
|
||||
AC_CHECK_FILE([/usr/share/man/man7/attributes.7],
|
||||
[SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true])
|
||||
;;
|
||||
*) SYSV_MAN_SECTIONS=false ;;
|
||||
esac
|
||||
|
||||
if test x$APP_MAN_SUFFIX = x ; then
|
||||
APP_MAN_SUFFIX=1
|
||||
fi
|
||||
@@ -9959,9 +10046,9 @@ if test x$LIB_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$FILE_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) FILE_MAN_SUFFIX=4 ;;
|
||||
*) FILE_MAN_SUFFIX=5 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) FILE_MAN_SUFFIX=4 ;;
|
||||
*) FILE_MAN_SUFFIX=5 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$FILE_MAN_DIR = x ; then
|
||||
@@ -9969,9 +10056,9 @@ if test x$FILE_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$MISC_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) MISC_MAN_SUFFIX=5 ;;
|
||||
*) MISC_MAN_SUFFIX=7 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) MISC_MAN_SUFFIX=5 ;;
|
||||
*) MISC_MAN_SUFFIX=7 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$MISC_MAN_DIR = x ; then
|
||||
@@ -9979,9 +10066,9 @@ if test x$MISC_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$DRIVER_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) DRIVER_MAN_SUFFIX=7 ;;
|
||||
*) DRIVER_MAN_SUFFIX=4 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) DRIVER_MAN_SUFFIX=7 ;;
|
||||
*) DRIVER_MAN_SUFFIX=4 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$DRIVER_MAN_DIR = x ; then
|
||||
@@ -9989,9 +10076,9 @@ if test x$DRIVER_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$ADMIN_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) ADMIN_MAN_SUFFIX=1m ;;
|
||||
*) ADMIN_MAN_SUFFIX=8 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) ADMIN_MAN_SUFFIX=1m ;;
|
||||
*) ADMIN_MAN_SUFFIX=8 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$ADMIN_MAN_DIR = x ; then
|
||||
@@ -10252,13 +10339,24 @@ m4_ifval([$1],
|
||||
fi])
|
||||
|
||||
# Test for the ability of xmlto to generate a text target
|
||||
#
|
||||
# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the
|
||||
# following test for empty XML docbook files.
|
||||
# For compatibility reasons use the following empty XML docbook file and if
|
||||
# it fails try it again with a non-empty XML file.
|
||||
have_xmlto_text=no
|
||||
cat > conftest.xml << "EOF"
|
||||
EOF
|
||||
AS_IF([test "$have_xmlto" = yes],
|
||||
[AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
|
||||
[have_xmlto_text=yes],
|
||||
[AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])
|
||||
[# Try it again with a non-empty XML file.
|
||||
cat > conftest.xml << "EOF"
|
||||
<x></x>
|
||||
EOF
|
||||
AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
|
||||
[have_xmlto_text=yes],
|
||||
[AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])])
|
||||
rm -f conftest.xml
|
||||
AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
|
||||
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
|
||||
@@ -11654,8 +11752,9 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
|
||||
INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
|
||||
mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \
|
||||
touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))"
|
||||
AC_SUBST([INSTALL_CMD])
|
||||
]) # XORG_INSTALL
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
@@ -11716,10 +11815,11 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
#
|
||||
#
|
||||
AC_DEFUN([XORG_CHANGELOG], [
|
||||
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
|
||||
CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
|
||||
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \
|
||||
touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
|
||||
AC_SUBST([CHANGELOG_CMD])
|
||||
]) # XORG_CHANGELOG
|
||||
|
||||
@@ -11756,7 +11856,7 @@ dnl
|
||||
AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
|
||||
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
SAVE_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
|
||||
CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||
#include "xorg-server.h"
|
||||
#if !defined $1
|
||||
|
||||
@@ -69,8 +69,5 @@
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
/* Support DGA extension */
|
||||
#undef USE_DGA
|
||||
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
223
driver/xf86-video-dummy/configure
vendored
223
driver/xf86-video-dummy/configure
vendored
@@ -1,8 +1,8 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for xf86-video-dummy 0.3.8.
|
||||
# Generated by GNU Autoconf 2.69 for xf86-video-dummy 0.4.0.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
# Report bugs to <https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/issues>.
|
||||
#
|
||||
#
|
||||
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
||||
@@ -275,7 +275,7 @@ fi
|
||||
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
|
||||
else
|
||||
$as_echo "$0: Please tell bug-autoconf@gnu.org and
|
||||
$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
$0: https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/issues
|
||||
$0: about your system, including any error possibly output
|
||||
$0: before this message. Then install a modern shell, or
|
||||
$0: manually run the script under such a shell if you do
|
||||
@@ -591,9 +591,9 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='xf86-video-dummy'
|
||||
PACKAGE_TARNAME='xf86-video-dummy'
|
||||
PACKAGE_VERSION='0.3.8'
|
||||
PACKAGE_STRING='xf86-video-dummy 0.3.8'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
PACKAGE_VERSION='0.4.0'
|
||||
PACKAGE_STRING='xf86-video-dummy 0.4.0'
|
||||
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/issues'
|
||||
PACKAGE_URL=''
|
||||
|
||||
ac_unique_file="Makefile.am"
|
||||
@@ -640,9 +640,6 @@ LIBOBJS
|
||||
DRIVER_NAME
|
||||
XORG_LIBS
|
||||
XORG_CFLAGS
|
||||
DGA_FALSE
|
||||
DGA_TRUE
|
||||
DGA
|
||||
moduledir
|
||||
OTOOL64
|
||||
OTOOL
|
||||
@@ -762,6 +759,7 @@ infodir
|
||||
docdir
|
||||
oldincludedir
|
||||
includedir
|
||||
runstatedir
|
||||
localstatedir
|
||||
sharedstatedir
|
||||
sysconfdir
|
||||
@@ -796,7 +794,6 @@ enable_fast_install
|
||||
with_gnu_ld
|
||||
with_sysroot
|
||||
enable_libtool_lock
|
||||
enable_dga
|
||||
with_xorg_module_dir
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -851,6 +848,7 @@ datadir='${datarootdir}'
|
||||
sysconfdir='${prefix}/etc'
|
||||
sharedstatedir='${prefix}/com'
|
||||
localstatedir='${prefix}/var'
|
||||
runstatedir='${localstatedir}/run'
|
||||
includedir='${prefix}/include'
|
||||
oldincludedir='/usr/include'
|
||||
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
||||
@@ -1103,6 +1101,15 @@ do
|
||||
| -silent | --silent | --silen | --sile | --sil)
|
||||
silent=yes ;;
|
||||
|
||||
-runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||
| --runstate | --runstat | --runsta | --runst | --runs \
|
||||
| --run | --ru | --r)
|
||||
ac_prev=runstatedir ;;
|
||||
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||
| --run=* | --ru=* | --r=*)
|
||||
runstatedir=$ac_optarg ;;
|
||||
|
||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||
ac_prev=sbindir ;;
|
||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||
@@ -1240,7 +1247,7 @@ fi
|
||||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||
libdir localedir mandir
|
||||
libdir localedir mandir runstatedir
|
||||
do
|
||||
eval ac_val=\$$ac_var
|
||||
# Remove trailing slashes.
|
||||
@@ -1353,7 +1360,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures xf86-video-dummy 0.3.8 to adapt to many kinds of systems.
|
||||
\`configure' configures xf86-video-dummy 0.4.0 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1393,6 +1400,7 @@ Fine tuning of the installation directories:
|
||||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||
--includedir=DIR C header files [PREFIX/include]
|
||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||
@@ -1424,7 +1432,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of xf86-video-dummy 0.3.8:";;
|
||||
short | recursive ) echo "Configuration of xf86-video-dummy 0.4.0:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1452,7 +1460,6 @@ Optional Features:
|
||||
--enable-fast-install[=PKGS]
|
||||
optimize for fast installation [default=yes]
|
||||
--disable-libtool-lock avoid locking (might break parallel builds)
|
||||
--disable-dga Build DGA extension (default: yes)
|
||||
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
@@ -1484,7 +1491,7 @@ Some influential environment variables:
|
||||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
|
||||
Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
Report bugs to <https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/issues>.
|
||||
_ACEOF
|
||||
ac_status=$?
|
||||
fi
|
||||
@@ -1547,7 +1554,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
xf86-video-dummy configure 0.3.8
|
||||
xf86-video-dummy configure 0.4.0
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@@ -1871,7 +1878,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by xf86-video-dummy $as_me 0.3.8, which was
|
||||
It was created by xf86-video-dummy $as_me 0.4.0, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -2700,7 +2707,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='xf86-video-dummy'
|
||||
VERSION='0.3.8'
|
||||
VERSION='0.4.0'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@@ -10344,10 +10351,11 @@ _ACEOF
|
||||
|
||||
|
||||
|
||||
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
|
||||
CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
|
||||
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \
|
||||
touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
|
||||
|
||||
|
||||
|
||||
@@ -10355,14 +10363,45 @@ echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||
macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
|
||||
INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
|
||||
mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \
|
||||
touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
case $host_os in
|
||||
solaris*)
|
||||
# Solaris 2.0 - 11.3 use SysV man page section numbers, so we
|
||||
# check for a man page file found in later versions that use
|
||||
# traditional section numbers instead
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5
|
||||
$as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; }
|
||||
if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
test "$cross_compiling" = yes &&
|
||||
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
|
||||
if test -r "/usr/share/man/man7/attributes.7"; then
|
||||
ac_cv_file__usr_share_man_man7_attributes_7=yes
|
||||
else
|
||||
ac_cv_file__usr_share_man_man7_attributes_7=no
|
||||
fi
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5
|
||||
$as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; }
|
||||
if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then :
|
||||
SYSV_MAN_SECTIONS=false
|
||||
else
|
||||
SYSV_MAN_SECTIONS=true
|
||||
fi
|
||||
|
||||
;;
|
||||
*) SYSV_MAN_SECTIONS=false ;;
|
||||
esac
|
||||
|
||||
if test x$APP_MAN_SUFFIX = x ; then
|
||||
APP_MAN_SUFFIX=1
|
||||
fi
|
||||
@@ -10378,9 +10417,9 @@ if test x$LIB_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$FILE_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) FILE_MAN_SUFFIX=4 ;;
|
||||
*) FILE_MAN_SUFFIX=5 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) FILE_MAN_SUFFIX=4 ;;
|
||||
*) FILE_MAN_SUFFIX=5 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$FILE_MAN_DIR = x ; then
|
||||
@@ -10388,9 +10427,9 @@ if test x$FILE_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$MISC_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) MISC_MAN_SUFFIX=5 ;;
|
||||
*) MISC_MAN_SUFFIX=7 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) MISC_MAN_SUFFIX=5 ;;
|
||||
*) MISC_MAN_SUFFIX=7 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$MISC_MAN_DIR = x ; then
|
||||
@@ -10398,9 +10437,9 @@ if test x$MISC_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$DRIVER_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) DRIVER_MAN_SUFFIX=7 ;;
|
||||
*) DRIVER_MAN_SUFFIX=4 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) DRIVER_MAN_SUFFIX=7 ;;
|
||||
*) DRIVER_MAN_SUFFIX=4 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$DRIVER_MAN_DIR = x ; then
|
||||
@@ -10408,9 +10447,9 @@ if test x$DRIVER_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$ADMIN_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) ADMIN_MAN_SUFFIX=1m ;;
|
||||
*) ADMIN_MAN_SUFFIX=8 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) ADMIN_MAN_SUFFIX=1m ;;
|
||||
*) ADMIN_MAN_SUFFIX=8 ;;
|
||||
esac
|
||||
fi
|
||||
if test x$ADMIN_MAN_DIR = x ; then
|
||||
@@ -17605,13 +17644,6 @@ CC="$lt_save_CC"
|
||||
|
||||
|
||||
# Define a configure option for an alternate module directory
|
||||
# Check whether --enable-dga was given.
|
||||
if test "${enable_dga+set}" = set; then :
|
||||
enableval=$enable_dga; DGA=$enableval
|
||||
else
|
||||
DGA=yes
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --with-xorg-module-dir was given.
|
||||
if test "${with_xorg_module_dir+set}" = set; then :
|
||||
@@ -17627,7 +17659,7 @@ fi
|
||||
|
||||
|
||||
SAVE_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
|
||||
CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -17662,7 +17694,7 @@ $as_echo "$_EXT_CHECK" >&6; }
|
||||
|
||||
|
||||
SAVE_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
|
||||
CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -17695,96 +17727,11 @@ $as_echo "$_EXT_CHECK" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
|
||||
SAVE_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include "xorg-server.h"
|
||||
#if !defined XV
|
||||
#error XV not defined
|
||||
#endif
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
_EXT_CHECK=yes
|
||||
else
|
||||
_EXT_CHECK=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
CFLAGS="$SAVE_CFLAGS"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if XV is defined" >&5
|
||||
$as_echo_n "checking if XV is defined... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_EXT_CHECK" >&5
|
||||
$as_echo "$_EXT_CHECK" >&6; }
|
||||
if test "$_EXT_CHECK" != no; then
|
||||
REQUIRED_MODULES="$REQUIRED_MODULES videoproto"
|
||||
fi
|
||||
|
||||
|
||||
if test "x$DGA" = xyes; then
|
||||
|
||||
|
||||
SAVE_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include "xorg-server.h"
|
||||
#if !defined XFreeXDGA
|
||||
#error XFreeXDGA not defined
|
||||
#endif
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
_EXT_CHECK=yes
|
||||
else
|
||||
_EXT_CHECK=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
CFLAGS="$SAVE_CFLAGS"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if XFreeXDGA is defined" >&5
|
||||
$as_echo_n "checking if XFreeXDGA is defined... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_EXT_CHECK" >&5
|
||||
$as_echo "$_EXT_CHECK" >&6; }
|
||||
if test "$_EXT_CHECK" != no; then
|
||||
REQUIRED_MODULES="$REQUIRED_MODULES xf86dgaproto"
|
||||
fi
|
||||
|
||||
|
||||
$as_echo "#define USE_DGA 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
if test "x$DGA" = xyes; then
|
||||
DGA_TRUE=
|
||||
DGA_FALSE='#'
|
||||
else
|
||||
DGA_TRUE='#'
|
||||
DGA_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
# Obtain compiler/linker options for the driver dependencies
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG" >&5
|
||||
$as_echo_n "checking for XORG... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES" >&5
|
||||
$as_echo_n "checking for xorg-server >= 1.4.99.901 xproto fontsproto $REQUIRED_MODULES... " >&6; }
|
||||
|
||||
if test -n "$XORG_CFLAGS"; then
|
||||
pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
|
||||
@@ -17824,7 +17771,7 @@ fi
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
@@ -17851,7 +17798,7 @@ Alternatively, you may set the environment variables XORG_CFLAGS
|
||||
and XORG_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details." "$LINENO" 5
|
||||
elif test $pkg_failed = untried; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
@@ -18018,10 +17965,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
|
||||
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${DGA_TRUE}" && test -z "${DGA_FALSE}"; then
|
||||
as_fn_error $? "conditional \"DGA\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
|
||||
: "${CONFIG_STATUS=./config.status}"
|
||||
ac_write_fail=0
|
||||
@@ -18419,7 +18362,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by xf86-video-dummy $as_me 0.3.8, which was
|
||||
This file was extended by xf86-video-dummy $as_me 0.4.0, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -18479,13 +18422,13 @@ $config_headers
|
||||
Configuration commands:
|
||||
$config_commands
|
||||
|
||||
Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>."
|
||||
Report bugs to <https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/issues>."
|
||||
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
xf86-video-dummy config.status 0.3.8
|
||||
xf86-video-dummy config.status 0.4.0
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
@@ -23,15 +23,15 @@
|
||||
# Initialize Autoconf
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([xf86-video-dummy],
|
||||
[0.3.8],
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
[0.4.0],
|
||||
[https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/issues],
|
||||
[xf86-video-dummy])
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_AUX_DIR(.)
|
||||
|
||||
# Initialize Automake
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
AM_INIT_AUTOMAKE([foreign dist-xz])
|
||||
|
||||
# Require xorg-macros: XORG_DEFAULT_OPTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
@@ -46,7 +46,6 @@ AC_PROG_LIBTOOL
|
||||
AH_TOP([#include "xorg-server.h"])
|
||||
|
||||
# Define a configure option for an alternate module directory
|
||||
AC_ARG_ENABLE(dga, AS_HELP_STRING([--disable-dga], [Build DGA extension (default: yes)]), [DGA=$enableval], [DGA=yes])
|
||||
AC_ARG_WITH(xorg-module-dir, [ --with-xorg-module-dir=DIR ],
|
||||
[ moduledir="$withval" ],
|
||||
[ moduledir="$libdir/xorg/modules" ])
|
||||
@@ -56,14 +55,6 @@ AC_SUBST(moduledir)
|
||||
# Store the list of server defined optional extensions in REQUIRED_MODULES
|
||||
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
|
||||
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
|
||||
XORG_DRIVER_CHECK_EXT(XV, videoproto)
|
||||
|
||||
if test "x$DGA" = xyes; then
|
||||
XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
|
||||
AC_DEFINE(USE_DGA, 1, [Support DGA extension])
|
||||
fi
|
||||
AC_SUBST([DGA])
|
||||
AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
|
||||
|
||||
# Obtain compiler/linker options for the driver dependencies
|
||||
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4.99.901] xproto fontsproto $REQUIRED_MODULES)
|
||||
|
||||
@@ -37,8 +37,3 @@ dummy_drv_la_SOURCES = \
|
||||
dummy_cursor.c \
|
||||
dummy_driver.c \
|
||||
dummy.h
|
||||
|
||||
if DGA
|
||||
dummy_drv_la_SOURCES += \
|
||||
dummy_dga.c
|
||||
endif
|
||||
|
||||
@@ -76,9 +76,6 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
@DGA_TRUE@am__append_1 = \
|
||||
@DGA_TRUE@ dummy_dga.c
|
||||
|
||||
subdir = src
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
$(top_srcdir)/depcomp
|
||||
@@ -121,11 +118,7 @@ am__installdirs = "$(DESTDIR)$(dummy_drv_ladir)"
|
||||
LTLIBRARIES = $(dummy_drv_la_LTLIBRARIES)
|
||||
am__DEPENDENCIES_1 =
|
||||
dummy_drv_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||
am__dummy_drv_la_SOURCES_DIST = compat-api.h dummy_cursor.c \
|
||||
dummy_driver.c dummy.h dummy_dga.c
|
||||
@DGA_TRUE@am__objects_1 = dummy_dga.lo
|
||||
am_dummy_drv_la_OBJECTS = dummy_cursor.lo dummy_driver.lo \
|
||||
$(am__objects_1)
|
||||
am_dummy_drv_la_OBJECTS = dummy_cursor.lo dummy_driver.lo
|
||||
dummy_drv_la_OBJECTS = $(am_dummy_drv_la_OBJECTS)
|
||||
AM_V_lt = $(am__v_lt_@AM_V@)
|
||||
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
|
||||
@@ -169,7 +162,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
|
||||
am__v_CCLD_0 = @echo " CCLD " $@;
|
||||
am__v_CCLD_1 =
|
||||
SOURCES = $(dummy_drv_la_SOURCES)
|
||||
DIST_SOURCES = $(am__dummy_drv_la_SOURCES_DIST)
|
||||
DIST_SOURCES = $(dummy_drv_la_SOURCES)
|
||||
am__can_run_installinfo = \
|
||||
case $$AM_UPDATE_INFO_DIR in \
|
||||
n|no|NO) false;; \
|
||||
@@ -201,7 +194,6 @@ CWARNFLAGS = @CWARNFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DGA = @DGA@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||
@@ -312,6 +304,7 @@ pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
runstatedir = @runstatedir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
srcdir = @srcdir@
|
||||
@@ -325,8 +318,12 @@ dummy_drv_la_LTLIBRARIES = dummy_drv.la
|
||||
dummy_drv_la_LDFLAGS = -module -avoid-version
|
||||
dummy_drv_la_LIBADD = $(XORG_LIBS)
|
||||
dummy_drv_ladir = @moduledir@/drivers
|
||||
dummy_drv_la_SOURCES = compat-api.h dummy_cursor.c dummy_driver.c \
|
||||
dummy.h $(am__append_1)
|
||||
dummy_drv_la_SOURCES = \
|
||||
compat-api.h \
|
||||
dummy_cursor.c \
|
||||
dummy_driver.c \
|
||||
dummy.h
|
||||
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@@ -405,7 +402,6 @@ distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_cursor.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_dga.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_driver.Plo@am__quote@
|
||||
|
||||
.c.o:
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
|
||||
#include "compat-api.h"
|
||||
|
||||
#define DUMMY_MAX_SCREENS 16
|
||||
|
||||
/* Supported chipsets */
|
||||
typedef enum {
|
||||
DUMMY_CHIP
|
||||
@@ -28,12 +30,6 @@ extern Bool DUMMYCursorInit(ScreenPtr pScrn);
|
||||
extern void DUMMYShowCursor(ScrnInfoPtr pScrn);
|
||||
extern void DUMMYHideCursor(ScrnInfoPtr pScrn);
|
||||
|
||||
/* in dummy_dga.c */
|
||||
Bool DUMMYDGAInit(ScreenPtr pScreen);
|
||||
|
||||
/* in dummy_video.c */
|
||||
extern void DUMMYInitVideo(ScreenPtr pScreen);
|
||||
|
||||
/* globals */
|
||||
typedef struct _color
|
||||
{
|
||||
@@ -44,10 +40,6 @@ typedef struct _color
|
||||
|
||||
typedef struct dummyRec
|
||||
{
|
||||
DGAModePtr DGAModes;
|
||||
int numDGAModes;
|
||||
Bool DGAactive;
|
||||
int DGAViewportStatus;
|
||||
/* options */
|
||||
OptionInfoPtr Options;
|
||||
Bool swCursor;
|
||||
@@ -59,19 +51,15 @@ typedef struct dummyRec
|
||||
int cursorX, cursorY;
|
||||
int cursorFG, cursorBG;
|
||||
|
||||
Bool screenSaver;
|
||||
Bool video;
|
||||
#ifdef XvExtension
|
||||
XF86VideoAdaptorPtr overlayAdaptor;
|
||||
#endif
|
||||
int overlay;
|
||||
int overlay_offset;
|
||||
int videoKey;
|
||||
int interlace;
|
||||
dummy_colors colors[256];
|
||||
pointer* FBBase;
|
||||
dummy_colors colors[1024];
|
||||
Bool (*CreateWindow)() ; /* wrapped CreateWindow */
|
||||
Bool prop;
|
||||
/* XRANDR support begin */
|
||||
int num_screens;
|
||||
struct _xf86Crtc *paCrtcs[DUMMY_MAX_SCREENS];
|
||||
struct _xf86Output *paOutputs[DUMMY_MAX_SCREENS];
|
||||
int connected_outputs;
|
||||
/* XRANDR support end */
|
||||
} DUMMYRec, *DUMMYPtr;
|
||||
|
||||
/* The privates of the DUMMY driver */
|
||||
|
||||
@@ -39,8 +39,6 @@ dummySetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
|
||||
{
|
||||
DUMMYPtr dPtr = DUMMYPTR(pScrn);
|
||||
|
||||
/* unsigned char *_dest = ((unsigned char *)dPtr->FBBase + */
|
||||
/* pScrn->videoRam * 1024 - 1024); */
|
||||
dPtr->cursorX = x;
|
||||
dPtr->cursorY = y;
|
||||
}
|
||||
|
||||
@@ -1,175 +0,0 @@
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "dgaproc.h"
|
||||
#include "dummy.h"
|
||||
|
||||
static Bool DUMMY_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
|
||||
int *, int *, int *);
|
||||
static Bool DUMMY_SetMode(ScrnInfoPtr, DGAModePtr);
|
||||
static int DUMMY_GetViewport(ScrnInfoPtr);
|
||||
static void DUMMY_SetViewport(ScrnInfoPtr, int, int, int);
|
||||
|
||||
static
|
||||
DGAFunctionRec DUMMYDGAFuncs = {
|
||||
DUMMY_OpenFramebuffer,
|
||||
NULL,
|
||||
DUMMY_SetMode,
|
||||
DUMMY_SetViewport,
|
||||
DUMMY_GetViewport,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
#if 0
|
||||
DUMMY_BlitTransRect
|
||||
#else
|
||||
NULL
|
||||
#endif
|
||||
};
|
||||
|
||||
Bool
|
||||
DUMMYDGAInit(ScreenPtr pScreen)
|
||||
{
|
||||
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
|
||||
DUMMYPtr pDUMMY = DUMMYPTR(pScrn);
|
||||
DGAModePtr modes = NULL, newmodes = NULL, currentMode;
|
||||
DisplayModePtr pMode, firstMode;
|
||||
int Bpp = pScrn->bitsPerPixel >> 3;
|
||||
int num = 0, imlines, pixlines;
|
||||
|
||||
imlines = (pScrn->videoRam * 1024) /
|
||||
(pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
|
||||
|
||||
pixlines = imlines;
|
||||
|
||||
pMode = firstMode = pScrn->modes;
|
||||
|
||||
while(pMode) {
|
||||
|
||||
newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
|
||||
|
||||
if(!newmodes) {
|
||||
free(modes);
|
||||
return FALSE;
|
||||
}
|
||||
modes = newmodes;
|
||||
|
||||
currentMode = modes + num;
|
||||
num++;
|
||||
|
||||
currentMode->mode = pMode;
|
||||
currentMode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE;
|
||||
if(pMode->Flags & V_DBLSCAN)
|
||||
currentMode->flags |= DGA_DOUBLESCAN;
|
||||
if(pMode->Flags & V_INTERLACE)
|
||||
currentMode->flags |= DGA_INTERLACED;
|
||||
currentMode->byteOrder = pScrn->imageByteOrder;
|
||||
currentMode->depth = pScrn->depth;
|
||||
currentMode->bitsPerPixel = pScrn->bitsPerPixel;
|
||||
currentMode->red_mask = pScrn->mask.red;
|
||||
currentMode->green_mask = pScrn->mask.green;
|
||||
currentMode->blue_mask = pScrn->mask.blue;
|
||||
currentMode->visualClass = (Bpp == 1) ? PseudoColor : TrueColor;
|
||||
currentMode->viewportWidth = pMode->HDisplay;
|
||||
currentMode->viewportHeight = pMode->VDisplay;
|
||||
currentMode->xViewportStep = 1;
|
||||
currentMode->yViewportStep = 1;
|
||||
currentMode->viewportFlags = DGA_FLIP_RETRACE;
|
||||
currentMode->offset = 0;
|
||||
currentMode->address = (unsigned char *)pDUMMY->FBBase;
|
||||
|
||||
currentMode->bytesPerScanline =
|
||||
((pScrn->displayWidth * Bpp) + 3) & ~3L;
|
||||
currentMode->imageWidth = pScrn->displayWidth;
|
||||
currentMode->imageHeight = imlines;
|
||||
currentMode->pixmapWidth = currentMode->imageWidth;
|
||||
currentMode->pixmapHeight = pixlines;
|
||||
currentMode->maxViewportX = currentMode->imageWidth -
|
||||
currentMode->viewportWidth;
|
||||
currentMode->maxViewportY = currentMode->imageHeight -
|
||||
currentMode->viewportHeight;
|
||||
|
||||
pMode = pMode->next;
|
||||
if(pMode == firstMode)
|
||||
break;
|
||||
}
|
||||
|
||||
pDUMMY->numDGAModes = num;
|
||||
pDUMMY->DGAModes = modes;
|
||||
|
||||
return DGAInit(pScreen, &DUMMYDGAFuncs, modes, num);
|
||||
}
|
||||
|
||||
static DisplayModePtr DUMMYSavedDGAModes[MAXSCREENS];
|
||||
|
||||
static Bool
|
||||
DUMMY_SetMode(
|
||||
ScrnInfoPtr pScrn,
|
||||
DGAModePtr pMode
|
||||
){
|
||||
int index = pScrn->pScreen->myNum;
|
||||
DUMMYPtr pDUMMY = DUMMYPTR(pScrn);
|
||||
|
||||
if(!pMode) { /* restore the original mode */
|
||||
if(pDUMMY->DGAactive) {
|
||||
pScrn->currentMode = DUMMYSavedDGAModes[index];
|
||||
DUMMYSwitchMode(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode));
|
||||
DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, 0, 0));
|
||||
pDUMMY->DGAactive = FALSE;
|
||||
}
|
||||
} else {
|
||||
if(!pDUMMY->DGAactive) { /* save the old parameters */
|
||||
DUMMYSavedDGAModes[index] = pScrn->currentMode;
|
||||
pDUMMY->DGAactive = TRUE;
|
||||
}
|
||||
|
||||
DUMMYSwitchMode(SWITCH_MODE_ARGS(pScrn, pMode->mode));
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static int
|
||||
DUMMY_GetViewport(
|
||||
ScrnInfoPtr pScrn
|
||||
){
|
||||
DUMMYPtr pDUMMY = DUMMYPTR(pScrn);
|
||||
|
||||
return pDUMMY->DGAViewportStatus;
|
||||
}
|
||||
|
||||
static void
|
||||
DUMMY_SetViewport(
|
||||
ScrnInfoPtr pScrn,
|
||||
int x, int y,
|
||||
int flags
|
||||
){
|
||||
DUMMYPtr pDUMMY = DUMMYPTR(pScrn);
|
||||
|
||||
DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, x, y));
|
||||
pDUMMY->DGAViewportStatus = 0;
|
||||
}
|
||||
|
||||
|
||||
static Bool
|
||||
DUMMY_OpenFramebuffer(
|
||||
ScrnInfoPtr pScrn,
|
||||
char **name,
|
||||
unsigned char **mem,
|
||||
int *size,
|
||||
int *offset,
|
||||
int *flags
|
||||
){
|
||||
DUMMYPtr pDUMMY = DUMMYPTR(pScrn);
|
||||
|
||||
*name = NULL; /* no special device */
|
||||
*mem = (unsigned char*)pDUMMY->FBBase;
|
||||
*size = pScrn->videoRam * 1024;
|
||||
*offset = 0;
|
||||
*flags = DGA_NEED_ROOT;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@@ -29,10 +29,7 @@
|
||||
|
||||
#include "picturestr.h"
|
||||
|
||||
#ifdef XvExtension
|
||||
#include "xf86xv.h"
|
||||
#include <X11/extensions/Xv.h>
|
||||
#endif
|
||||
#include "xf86Crtc.h"
|
||||
|
||||
/*
|
||||
* Driver data structures.
|
||||
@@ -44,10 +41,6 @@
|
||||
#include <X11/Xproto.h>
|
||||
#include "scrnintstr.h"
|
||||
#include "servermd.h"
|
||||
#ifdef USE_DGA
|
||||
#define _XF86DGA_SERVER_
|
||||
#include <X11/extensions/xf86dgaproto.h>
|
||||
#endif
|
||||
|
||||
/* Mandatory functions */
|
||||
static const OptionInfoRec * DUMMYAvailableOptions(int chipid, int busid);
|
||||
@@ -89,6 +82,10 @@ static Bool dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
|
||||
*/
|
||||
static int pix24bpp = 0;
|
||||
|
||||
Atom width_mm_atom = 0;
|
||||
#define WIDTH_MM_NAME "WIDTH_MM"
|
||||
Atom height_mm_atom = 0;
|
||||
#define HEIGHT_MM_NAME "HEIGHT_MM"
|
||||
|
||||
/*
|
||||
* This contains the functions needed by the server after loading the driver
|
||||
@@ -141,6 +138,271 @@ static XF86ModuleVersionInfo dummyVersRec =
|
||||
{0,0,0,0}
|
||||
};
|
||||
|
||||
|
||||
/************************
|
||||
* XRANDR support begin *
|
||||
************************/
|
||||
|
||||
static Bool dummy_config_resize(ScrnInfoPtr pScrn, int cw, int ch);
|
||||
static Bool DUMMYAdjustScreenPixmap(ScrnInfoPtr pScrn, int width, int height);
|
||||
|
||||
static const xf86CrtcConfigFuncsRec DUMMYCrtcConfigFuncs = {
|
||||
.resize = dummy_config_resize
|
||||
};
|
||||
|
||||
|
||||
static void
|
||||
dummy_crtc_dpms(xf86CrtcPtr crtc, int mode)
|
||||
{
|
||||
}
|
||||
|
||||
static Bool
|
||||
dummy_crtc_lock (xf86CrtcPtr crtc)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static Bool
|
||||
dummy_crtc_mode_fixup (xf86CrtcPtr crtc, DisplayModePtr mode,
|
||||
DisplayModePtr adjusted_mode)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
dummy_crtc_stub (xf86CrtcPtr crtc)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
dummy_crtc_gamma_set (xf86CrtcPtr crtc, CARD16 *red,
|
||||
CARD16 *green, CARD16 *blue, int size)
|
||||
{
|
||||
}
|
||||
|
||||
static void *
|
||||
dummy_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
dummy_crtc_mode_set (xf86CrtcPtr crtc, DisplayModePtr mode,
|
||||
DisplayModePtr adjusted_mode, int x, int y)
|
||||
{
|
||||
}
|
||||
|
||||
static const xf86CrtcFuncsRec DUMMYCrtcFuncs = {
|
||||
.dpms = dummy_crtc_dpms,
|
||||
.save = NULL, /* These two are never called by the server. */
|
||||
.restore = NULL,
|
||||
.lock = dummy_crtc_lock,
|
||||
.unlock = NULL, /* This will not be invoked if lock returns FALSE. */
|
||||
.mode_fixup = dummy_crtc_mode_fixup,
|
||||
.prepare = dummy_crtc_stub,
|
||||
.mode_set = dummy_crtc_mode_set,
|
||||
.commit = dummy_crtc_stub,
|
||||
.gamma_set = dummy_crtc_gamma_set,
|
||||
.shadow_allocate = dummy_crtc_shadow_allocate,
|
||||
.shadow_create = NULL, /* These two should not be invoked if allocate
|
||||
returns NULL. */
|
||||
.shadow_destroy = NULL,
|
||||
.set_cursor_colors = NULL,
|
||||
.set_cursor_position = NULL,
|
||||
.show_cursor = NULL,
|
||||
.hide_cursor = NULL,
|
||||
.load_cursor_argb = NULL,
|
||||
.destroy = dummy_crtc_stub
|
||||
};
|
||||
|
||||
static void
|
||||
dummy_output_stub (xf86OutputPtr output)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
dummy_output_dpms (xf86OutputPtr output, int mode)
|
||||
{
|
||||
}
|
||||
|
||||
static int
|
||||
dummy_output_mode_valid (xf86OutputPtr output, DisplayModePtr mode)
|
||||
{
|
||||
return MODE_OK;
|
||||
}
|
||||
|
||||
static Bool
|
||||
dummy_output_mode_fixup (xf86OutputPtr output, DisplayModePtr mode,
|
||||
DisplayModePtr adjusted_mode)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
dummy_output_mode_set (xf86OutputPtr output, DisplayModePtr mode,
|
||||
DisplayModePtr adjusted_mode)
|
||||
{
|
||||
DUMMYPtr dPtr = DUMMYPTR(output->scrn);
|
||||
int index = (int64_t)output->driver_private;
|
||||
|
||||
/* set to connected at first mode set */
|
||||
dPtr->connected_outputs |= 1 << index;
|
||||
}
|
||||
|
||||
/* The first virtual monitor is always connected. Others only after setting its
|
||||
* mode */
|
||||
static xf86OutputStatus
|
||||
dummy_output_detect (xf86OutputPtr output)
|
||||
{
|
||||
DUMMYPtr dPtr = DUMMYPTR(output->scrn);
|
||||
int index = (int64_t)output->driver_private;
|
||||
|
||||
if (dPtr->connected_outputs & (1 << index))
|
||||
return XF86OutputStatusConnected;
|
||||
else
|
||||
return XF86OutputStatusDisconnected;
|
||||
}
|
||||
|
||||
static DisplayModePtr
|
||||
dummy_output_get_modes (xf86OutputPtr output)
|
||||
{
|
||||
DisplayModePtr pModes = NULL, pMode, pModeSrc;
|
||||
|
||||
/* copy modes from config */
|
||||
for (pModeSrc = output->scrn->modes; pModeSrc; pModeSrc = pModeSrc->next)
|
||||
{
|
||||
pMode = xnfcalloc(1, sizeof(DisplayModeRec));
|
||||
memcpy(pMode, pModeSrc, sizeof(DisplayModeRec));
|
||||
pMode->next = NULL;
|
||||
pMode->prev = NULL;
|
||||
pMode->name = strdup(pModeSrc->name);
|
||||
pModes = xf86ModesAdd(pModes, pMode);
|
||||
if (pModeSrc->next == output->scrn->modes)
|
||||
break;
|
||||
}
|
||||
return pModes;
|
||||
}
|
||||
|
||||
void dummy_output_register_prop(xf86OutputPtr output, Atom prop, uint64_t value)
|
||||
{
|
||||
INT32 dims_range[2] = { 0, 65535 };
|
||||
int err;
|
||||
|
||||
err = RRConfigureOutputProperty(output->randr_output, prop, FALSE,
|
||||
TRUE, FALSE, 2, dims_range);
|
||||
if (err != 0)
|
||||
xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
|
||||
"RRConfigureOutputProperty error, %d\n", err);
|
||||
|
||||
err = RRChangeOutputProperty(output->randr_output, prop, XA_INTEGER,
|
||||
32, PropModeReplace, 1, &value, FALSE, FALSE);
|
||||
if (err != 0)
|
||||
xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
|
||||
"RRChangeOutputProperty error, %d\n", err);
|
||||
}
|
||||
|
||||
void dummy_output_create_resources(xf86OutputPtr output)
|
||||
{
|
||||
if (!ValidAtom(width_mm_atom))
|
||||
width_mm_atom = MakeAtom(WIDTH_MM_NAME, strlen(WIDTH_MM_NAME), 1);
|
||||
if (!ValidAtom(height_mm_atom))
|
||||
height_mm_atom = MakeAtom(HEIGHT_MM_NAME, strlen(HEIGHT_MM_NAME), 1);
|
||||
|
||||
dummy_output_register_prop(output, width_mm_atom, 0);
|
||||
dummy_output_register_prop(output, height_mm_atom, 0);
|
||||
}
|
||||
|
||||
static Bool dummy_output_set_property(xf86OutputPtr output, Atom property,
|
||||
RRPropertyValuePtr value)
|
||||
{
|
||||
|
||||
if (property == width_mm_atom || property == height_mm_atom) {
|
||||
INT32 val;
|
||||
|
||||
if (value->type != XA_INTEGER || value->format != 32 ||
|
||||
value->size != 1)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
val = *(INT32 *)value->data;
|
||||
if (property == width_mm_atom)
|
||||
output->mm_width = val;
|
||||
else if (property == height_mm_atom)
|
||||
output->mm_height = val;
|
||||
return TRUE;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
static const xf86OutputFuncsRec DUMMYOutputFuncs = {
|
||||
.create_resources = dummy_output_create_resources,
|
||||
.dpms = dummy_output_dpms,
|
||||
.save = NULL, /* These two are never called by the server. */
|
||||
.restore = NULL,
|
||||
.mode_valid = dummy_output_mode_valid,
|
||||
.mode_fixup = dummy_output_mode_fixup,
|
||||
.prepare = dummy_output_stub,
|
||||
.commit = dummy_output_stub,
|
||||
.mode_set = dummy_output_mode_set,
|
||||
.detect = dummy_output_detect,
|
||||
.get_modes = dummy_output_get_modes,
|
||||
#ifdef RANDR_12_INTERFACE
|
||||
.set_property = dummy_output_set_property,
|
||||
#endif
|
||||
.destroy = dummy_output_stub
|
||||
};
|
||||
|
||||
static Bool
|
||||
dummy_config_resize(ScrnInfoPtr pScrn, int cw, int ch)
|
||||
{
|
||||
if (!pScrn->vtSema) {
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
||||
"We do not own the active VT, exiting.\n");
|
||||
return TRUE;
|
||||
}
|
||||
return DUMMYAdjustScreenPixmap(pScrn, cw, ch);
|
||||
}
|
||||
|
||||
Bool DUMMYAdjustScreenPixmap(ScrnInfoPtr pScrn, int width, int height)
|
||||
{
|
||||
ScreenPtr pScreen = pScrn->pScreen;
|
||||
PixmapPtr pPixmap = pScreen->GetScreenPixmap(pScreen);
|
||||
DUMMYPtr dPtr = DUMMYPTR(pScrn);
|
||||
uint64_t cbLine = (width * xf86GetBppFromDepth(pScrn, pScrn->depth) / 8 + 3) & ~3;
|
||||
int displayWidth = cbLine * 8 / xf86GetBppFromDepth(pScrn, pScrn->depth);
|
||||
|
||||
if ( width == pScrn->virtualX
|
||||
&& height == pScrn->virtualY
|
||||
&& displayWidth == pScrn->displayWidth)
|
||||
return TRUE;
|
||||
if (!pPixmap) {
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
||||
"Failed to get the screen pixmap.\n");
|
||||
return FALSE;
|
||||
}
|
||||
if (cbLine > UINT32_MAX || cbLine * height >= pScrn->videoRam * 1024)
|
||||
{
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
||||
"Unable to set up a virtual screen size of %dx%d with %d Kb of video memory available. Please increase the video memory size.\n",
|
||||
width, height, pScrn->videoRam);
|
||||
return FALSE;
|
||||
}
|
||||
pScreen->ModifyPixmapHeader(pPixmap, width, height,
|
||||
pScrn->depth, xf86GetBppFromDepth(pScrn, pScrn->depth), cbLine,
|
||||
pPixmap->devPrivate.ptr);
|
||||
pScrn->virtualX = width;
|
||||
pScrn->virtualY = height;
|
||||
pScrn->displayWidth = displayWidth;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/**********************
|
||||
* XRANDR support end *
|
||||
**********************/
|
||||
|
||||
/*
|
||||
* This is the module init data.
|
||||
* Its name has to be the driver name followed by ModuleData
|
||||
@@ -189,7 +451,7 @@ DUMMYGetRec(ScrnInfoPtr pScrn)
|
||||
|
||||
if (pScrn->driverPrivate == NULL)
|
||||
return FALSE;
|
||||
return TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -263,6 +525,9 @@ DUMMYProbe(DriverPtr drv, int flags)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
free(devSections);
|
||||
|
||||
return foundScreen;
|
||||
}
|
||||
|
||||
@@ -307,6 +572,7 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
case 15:
|
||||
case 16:
|
||||
case 24:
|
||||
case 30:
|
||||
break;
|
||||
default:
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
||||
@@ -510,7 +776,8 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
|
||||
DUMMYPtr dPtr;
|
||||
int ret;
|
||||
VisualPtr visual;
|
||||
|
||||
void *pixels;
|
||||
|
||||
/*
|
||||
* we need to get the ScrnInfoRec for this screen, so let's allocate
|
||||
* one first thing
|
||||
@@ -520,7 +787,7 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
|
||||
DUMMYScrn = pScrn;
|
||||
|
||||
|
||||
if (!(dPtr->FBBase = malloc(pScrn->videoRam * 1024)))
|
||||
if (!(pixels = malloc(pScrn->videoRam * 1024)))
|
||||
return FALSE;
|
||||
|
||||
/*
|
||||
@@ -541,7 +808,7 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
|
||||
* Call the framebuffer layer's ScreenInit function, and fill in other
|
||||
* pScreen fields.
|
||||
*/
|
||||
ret = fbScreenInit(pScreen, dPtr->FBBase,
|
||||
ret = fbScreenInit(pScreen, pixels,
|
||||
pScrn->virtualX, pScrn->virtualY,
|
||||
pScrn->xDpi, pScrn->yDpi,
|
||||
pScrn->displayWidth, pScrn->bitsPerPixel);
|
||||
@@ -568,10 +835,56 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
|
||||
|
||||
xf86SetBlackWhitePixels(pScreen);
|
||||
|
||||
#ifdef USE_DGA
|
||||
DUMMYDGAInit(pScreen);
|
||||
#endif
|
||||
|
||||
/* initialize XRANDR */
|
||||
xf86CrtcConfigInit(pScrn, &DUMMYCrtcConfigFuncs);
|
||||
/* FIXME */
|
||||
dPtr->num_screens = DUMMY_MAX_SCREENS;
|
||||
|
||||
for (int i=0; i < dPtr->num_screens; i++) {
|
||||
char szOutput[256];
|
||||
|
||||
dPtr->paCrtcs[i] = xf86CrtcCreate(pScrn, &DUMMYCrtcFuncs);
|
||||
dPtr->paCrtcs[i]->driver_private = (void *)(uintptr_t)i;
|
||||
|
||||
/* Set up our virtual outputs. */
|
||||
snprintf(szOutput, sizeof(szOutput), "DUMMY%u", i);
|
||||
dPtr->paOutputs[i] = xf86OutputCreate(pScrn, &DUMMYOutputFuncs,
|
||||
szOutput);
|
||||
|
||||
|
||||
xf86OutputUseScreenMonitor(dPtr->paOutputs[i], FALSE);
|
||||
dPtr->paOutputs[i]->possible_crtcs = 1 << i;
|
||||
dPtr->paOutputs[i]->possible_clones = 0;
|
||||
dPtr->paOutputs[i]->driver_private = (void *)(uintptr_t)i;
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Created crtc (%p) and output %s (%p)\n",
|
||||
(void *)dPtr->paCrtcs[i], szOutput,
|
||||
(void *)dPtr->paOutputs[i]);
|
||||
|
||||
}
|
||||
|
||||
/* bitmask */
|
||||
dPtr->connected_outputs = 1;
|
||||
|
||||
xf86CrtcSetSizeRange(pScrn, 64, 64, DUMMY_MAX_WIDTH, DUMMY_MAX_HEIGHT);
|
||||
|
||||
|
||||
/* Now create our initial CRTC/output configuration. */
|
||||
if (!xf86InitialConfiguration(pScrn, TRUE)) {
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Initial CRTC configuration failed!\n");
|
||||
return (FALSE);
|
||||
}
|
||||
|
||||
/* Initialise randr 1.2 mode-setting functions and set first mode.
|
||||
* Note that the mode won't be usable until the server has resized the
|
||||
* framebuffer to something reasonable. */
|
||||
if (!xf86CrtcScreenInit(pScreen)) {
|
||||
return FALSE;
|
||||
}
|
||||
if (!xf86SetDesiredModes(pScrn)) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* XRANDR initialization end */
|
||||
if (dPtr->swCursor)
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Using Software Cursor.\n");
|
||||
|
||||
@@ -612,14 +925,12 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
|
||||
if(!miCreateDefColormap(pScreen))
|
||||
return FALSE;
|
||||
|
||||
if (!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
|
||||
if (!xf86HandleColormaps(pScreen, 1024, pScrn->rgbBits,
|
||||
DUMMYLoadPalette, NULL,
|
||||
CMAP_PALETTED_TRUECOLOR
|
||||
| CMAP_RELOAD_ON_MODE_SWITCH))
|
||||
return FALSE;
|
||||
|
||||
/* DUMMYInitVideo(pScreen); */
|
||||
|
||||
pScreen->SaveScreen = DUMMYSaveScreen;
|
||||
|
||||
|
||||
@@ -659,9 +970,7 @@ DUMMYCloseScreen(CLOSE_SCREEN_ARGS_DECL)
|
||||
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
|
||||
DUMMYPtr dPtr = DUMMYPTR(pScrn);
|
||||
|
||||
if(pScrn->vtSema){
|
||||
free(dPtr->FBBase);
|
||||
}
|
||||
free(pScreen->GetScreenPixmap(pScreen)->devPrivate.ptr);
|
||||
|
||||
if (dPtr->CursorInfo)
|
||||
xf86DestroyCursorInfoRec(dPtr->CursorInfo);
|
||||
@@ -682,15 +991,6 @@ DUMMYFreeScreen(FREE_SCREEN_ARGS_DECL)
|
||||
static Bool
|
||||
DUMMYSaveScreen(ScreenPtr pScreen, int mode)
|
||||
{
|
||||
ScrnInfoPtr pScrn = NULL;
|
||||
DUMMYPtr dPtr;
|
||||
|
||||
if (pScreen != NULL) {
|
||||
pScrn = xf86ScreenToScrn(pScreen);
|
||||
dPtr = DUMMYPTR(pScrn);
|
||||
|
||||
dPtr->screenSaver = xf86IsUnblank(mode);
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user