Update to xf86-video-dummy 0.4.1

pull/1/head
matthieu 2023-05-08 16:03:58 +00:00
parent c44033d58f
commit 94b291fab9
6 changed files with 131 additions and 53 deletions

View File

@ -1,3 +1,53 @@
commit 1fffb785d67cf21d6ff83d04b8ba7f5c50dc7dfb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun May 7 13:22:40 2023 -0700
xf86-video-dummy 0.4.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 234cb0271bbf69ef3bd0b90a2efdd8fb724b78f0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Mar 17 15:33:38 2023 -0700
List argument types in dummyRec->CreateWindow() function declaration
Will be needed for C23 builds, since C23 treats () as (void),
not as an unspecified argument list.
Fixes warning from Solaris Studio C compiler with -fd flag:
"dummy.h", line 55: warning: old style function declaration
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 22c15ee0e696f6c250edbd8a3cf4c235a78b9f7d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Apr 19 20:13:52 2022 -0700
gitlab CI: stop requiring Signed-off-by in commits
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit ffcae9381f914871cc51c80112ce39e83dc8d04b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Apr 19 20:12:30 2022 -0700
Avoid leaking pixel memory if DUMMYScreenInit fails
Resolves issues reported by Oracle Parfait static analyzer:
Error: Memory leak
Memory leak [memory-leak] (CWE 401):
Memory leak of pointer pixels allocated with malloc((pScrn->videoRam * 1024))
at line 803 of dummy_driver.c in function 'DUMMYScreenInit'.
pixels allocated at line 790 with malloc((pScrn->videoRam * 1024))
Memory leak [memory-leak] (CWE 401):
Memory leak of pointer pixels allocated with malloc((pScrn->videoRam * 1024))
at line 805 of dummy_driver.c in function 'DUMMYScreenInit'.
pixels allocated at line 790 with malloc((pScrn->videoRam * 1024))
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 68e02860d9ee6d65733457e689d180653fc9829f
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Apr 5 10:16:22 2022 -0700
@ -34,7 +84,7 @@ Date: Sat Jan 22 10:17:54 2022 -0800
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 9e8dce17c0c9aaa9ee193cc7280d7132163765ec
Author: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
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
@ -44,7 +94,7 @@ Date: Tue Sep 27 22:26:30 2016 +0200
Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
commit a87cfeca7dca26a840793024cc44f5aea5adc7bf
Author: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Author: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Date: Fri Jul 22 02:40:29 2016 +0200
xf86-video-dummy: changeable physical output size
@ -59,7 +109,7 @@ Date: Fri Jul 22 02:40:29 2016 +0200
Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
commit 327a25c4c3ab0b79a1103794449a1f7ccd6faff3
Author: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Author: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Date: Tue Oct 16 16:48:47 2018 +0200
RandR support in dummy video driver
@ -872,7 +922,7 @@ Date: Thu Aug 18 09:03:46 2005 +0000
Update autogen.sh to one that does objdir != srcdir.
commit d43c40d00ab34ae85e4684cc3860f641b0bea65c
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 10 14:07:24 2005 +0000
Don\'t lose existing CFLAGS in all the input drivers and some of the video
@ -893,14 +943,14 @@ Date: Fri Jul 29 21:22:43 2005 +0000
- Update modular Xorg version
commit c5f63f703d838cfae54269c595e14a06ea04f243
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 13 21:52:24 2005 +0000
Add Makefile.am here. Also, for the record, CVS needs a bullet through its
head
commit 30a2cce4b61e2b0e550479ee87f25c895cbca513
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 13 21:45:21 2005 +0000
Build system for dummy video driver

View File

@ -9905,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, 2015, Oracle and/or its affiliates. All rights reserved.
dnl Copyright (c) 2005, 2023, Oracle and/or its affiliates.
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"),
@ -9942,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.2])
m4_define([vers_have], [1.20.0])
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,,
@ -9963,7 +9963,7 @@ AM_MAINTAINER_MODE
# such as man pages and config files
AC_DEFUN([XORG_PROG_RAWCPP],[
AC_REQUIRE([AC_PROG_CPP])
AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}],
[$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
# Check for flag to avoid builtin definitions - assumes unix is predefined,
@ -10273,7 +10273,7 @@ AC_SUBST(MAKE_HTML)
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-xmlto option, it allows maximum flexibilty in making decisions
# the --with-xmlto option, it allows maximum flexibility in making decisions
# as whether or not to use the xmlto package. When DEFAULT is not specified,
# --with-xmlto assumes 'auto'.
#
@ -10487,7 +10487,7 @@ AM_CONDITIONAL([HAVE_PERL], [test "$have_perl" = yes])
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-asciidoc option, it allows maximum flexibilty in making decisions
# the --with-asciidoc option, it allows maximum flexibility in making decisions
# as whether or not to use the asciidoc package. When DEFAULT is not specified,
# --with-asciidoc assumes 'auto'.
#
@ -10557,7 +10557,7 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-doxygen option, it allows maximum flexibilty in making decisions
# the --with-doxygen option, it allows maximum flexibility in making decisions
# as whether or not to use the doxygen package. When DEFAULT is not specified,
# --with-doxygen assumes 'auto'.
#
@ -10641,7 +10641,7 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-groff option, it allows maximum flexibilty in making decisions
# the --with-groff option, it allows maximum flexibility in making decisions
# as whether or not to use the groff package. When DEFAULT is not specified,
# --with-groff assumes 'auto'.
#
@ -10749,7 +10749,7 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-fop option, it allows maximum flexibilty in making decisions
# the --with-fop option, it allows maximum flexibility in making decisions
# as whether or not to use the fop package. When DEFAULT is not specified,
# --with-fop assumes 'auto'.
#
@ -10843,7 +10843,7 @@ AC_SUBST([M4], [$ac_cv_path_M4])
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-ps2pdf option, it allows maximum flexibilty in making decisions
# the --with-ps2pdf option, it allows maximum flexibility in making decisions
# as whether or not to use the ps2pdf package. When DEFAULT is not specified,
# --with-ps2pdf assumes 'auto'.
#
@ -10898,7 +10898,7 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
# not at the appropriate level. This macro enables a builder to skip all
# documentation targets except traditional man pages.
# Combined with the specific tool checking macros XORG_WITH_*, it provides
# maximum flexibilty in controlling documentation building.
# maximum flexibility in controlling documentation building.
# Refer to:
# XORG_WITH_XMLTO --with-xmlto
# XORG_WITH_ASCIIDOC --with-asciidoc
@ -10931,7 +10931,7 @@ AC_MSG_RESULT([$build_docs])
#
# This macro enables a builder to skip all developer documentation.
# Combined with the specific tool checking macros XORG_WITH_*, it provides
# maximum flexibilty in controlling documentation building.
# maximum flexibility in controlling documentation building.
# Refer to:
# XORG_WITH_XMLTO --with-xmlto
# XORG_WITH_ASCIIDOC --with-asciidoc
@ -10964,7 +10964,7 @@ AC_MSG_RESULT([$build_devel_docs])
#
# This macro enables a builder to skip all functional specification targets.
# Combined with the specific tool checking macros XORG_WITH_*, it provides
# maximum flexibilty in controlling documentation building.
# maximum flexibility in controlling documentation building.
# Refer to:
# XORG_WITH_XMLTO --with-xmlto
# XORG_WITH_ASCIIDOC --with-asciidoc
@ -11439,7 +11439,11 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
AC_DEFUN([XORG_COMPILER_BRAND], [
AC_LANG_CASE(
[C], [
AC_REQUIRE([AC_PROG_CC_C99])
dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC
dnl and complains that AC_PROG_CC_C99 is obsolete
m4_version_prereq([2.70],
[AC_REQUIRE([AC_PROG_CC])],
[AC_REQUIRE([AC_PROG_CC_C99])])
],
[C++], [
AC_REQUIRE([AC_PROG_CXX])
@ -11455,7 +11459,7 @@ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
# Minimum version: 1.16.0
#
# Test if the compiler works when passed the given flag as a command line argument.
# If it succeeds, the flag is appeneded to the given variable. If not, it tries the
# If it succeeds, the flag is appended to the given variable. If not, it tries the
# next flag in the list until there are no more options.
#
# Note that this does not guarantee that the compiler supports the flag as some
@ -11471,7 +11475,11 @@ AC_LANG_COMPILER_REQUIRE
AC_LANG_CASE(
[C], [
AC_REQUIRE([AC_PROG_CC_C99])
dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC
dnl and complains that AC_PROG_CC_C99 is obsolete
m4_version_prereq([2.70],
[AC_REQUIRE([AC_PROG_CC])],
[AC_REQUIRE([AC_PROG_CC_C99])])
define([PREFIX], [C])
define([CACHE_PREFIX], [cc])
define([COMPILER], [$CC])
@ -11612,7 +11620,7 @@ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
# Turn some warnings into errors, so we don't accidently get successful builds
# Turn some warnings into errors, so we don't accidentally get successful builds
# when there are problems that should be fixed.
if test "x$SELECTIVE_WERROR" = "xyes" ; then
@ -11721,23 +11729,35 @@ AC_SUBST([BASE_]PREFIX[FLAGS])
AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS]))
]) # XORG_STRICT_OPTION
# XORG_DEFAULT_OPTIONS
# --------------------
# Minimum version: 1.3.0
# XORG_DEFAULT_NOCODE_OPTIONS
# ---------------------------
# Minimum version: 1.20.0
#
# Defines default options for X.Org modules.
# Defines default options for X.Org modules which don't compile code,
# such as fonts, bitmaps, cursors, and docs.
#
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
AC_DEFUN([XORG_DEFAULT_NOCODE_OPTIONS], [
AC_REQUIRE([AC_PROG_INSTALL])
XORG_COMPILER_FLAGS
XORG_CWARNFLAGS
XORG_STRICT_OPTION
XORG_RELEASE_VERSION
XORG_CHANGELOG
XORG_INSTALL
XORG_MANPAGE_SECTIONS
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
[AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
]) # XORG_DEFAULT_NOCODE_OPTIONS
# XORG_DEFAULT_OPTIONS
# --------------------
# Minimum version: 1.3.0
#
# Defines default options for X.Org modules which compile code.
#
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
AC_REQUIRE([AC_PROG_INSTALL])
XORG_COMPILER_FLAGS
XORG_CWARNFLAGS
XORG_STRICT_OPTION
XORG_DEFAULT_NOCODE_OPTIONS
]) # XORG_DEFAULT_OPTIONS
# XORG_INSTALL()

View File

@ -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.4.0.
# Generated by GNU Autoconf 2.69 for xf86-video-dummy 0.4.1.
#
# Report bugs to <https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/issues>.
# 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://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/issues
$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.4.0'
PACKAGE_STRING='xf86-video-dummy 0.4.0'
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/issues'
PACKAGE_VERSION='0.4.1'
PACKAGE_STRING='xf86-video-dummy 0.4.1'
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/-/issues'
PACKAGE_URL=''
ac_unique_file="Makefile.am"
@ -1360,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.4.0 to adapt to many kinds of systems.
\`configure' configures xf86-video-dummy 0.4.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1432,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.4.0:";;
short | recursive ) echo "Configuration of xf86-video-dummy 0.4.1:";;
esac
cat <<\_ACEOF
@ -1491,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://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/issues>.
Report bugs to <https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/-/issues>.
_ACEOF
ac_status=$?
fi
@ -1554,7 +1554,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
xf86-video-dummy configure 0.4.0
xf86-video-dummy configure 0.4.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1878,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.4.0, which was
It was created by xf86-video-dummy $as_me 0.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2707,7 +2707,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-dummy'
VERSION='0.4.0'
VERSION='0.4.1'
cat >>confdefs.h <<_ACEOF
@ -6655,7 +6655,7 @@ $as_echo "$supported" >&6; }
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
# Turn some warnings into errors, so we don't accidently get successful builds
# Turn some warnings into errors, so we don't accidentally get successful builds
# when there are problems that should be fixed.
if test "x$SELECTIVE_WERROR" = "xyes" ; then
@ -10327,6 +10327,8 @@ fi
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
_ACEOF
@ -10529,6 +10531,7 @@ AM_BACKSLASH='\'
# Initialize libtool
# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then :
@ -18362,7 +18365,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.4.0, which was
This file was extended by xf86-video-dummy $as_me 0.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -18422,13 +18425,13 @@ $config_headers
Configuration commands:
$config_commands
Report bugs to <https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/issues>."
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.4.0
xf86-video-dummy config.status 0.4.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

View File

@ -23,8 +23,8 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-dummy],
[0.4.0],
[https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/issues],
[0.4.1],
[https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/-/issues],
[xf86-video-dummy])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])

View File

@ -52,7 +52,7 @@ typedef struct dummyRec
int cursorFG, cursorBG;
dummy_colors colors[1024];
Bool (*CreateWindow)() ; /* wrapped CreateWindow */
Bool (*CreateWindow)(WindowPtr) ; /* wrapped CreateWindow */
Bool prop;
/* XRANDR support begin */
int num_screens;

View File

@ -798,11 +798,16 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
/* Setup the visuals we support. */
if (!miSetVisualTypes(pScrn->depth,
miGetDefaultVisualMask(pScrn->depth),
pScrn->rgbBits, pScrn->defaultVisual))
return FALSE;
miGetDefaultVisualMask(pScrn->depth),
pScrn->rgbBits, pScrn->defaultVisual)) {
free(pixels);
return FALSE;
}
if (!miSetPixmapDepths ()) return FALSE;
if (!miSetPixmapDepths ()) {
free(pixels);
return FALSE;
}
/*
* Call the framebuffer layer's ScreenInit function, and fill in other