diff -urN xf86-video-sunffb-1.0.0.1/aclocal.m4 xf86-video-sunffb-1.0.1/aclocal.m4 --- xf86-video-sunffb-1.0.0.1/aclocal.m4 2005-10-18 22:39:29.000000000 -0700 +++ xf86-video-sunffb-1.0.1/aclocal.m4 2005-11-09 18:59:01.000000000 -0800 @@ -4539,6 +4539,55 @@ AC_MSG_RESULT([$SED]) ]) +dnl Copyright 2005 Red Hat, Inc +dnl +dnl Permission to use, copy, modify, distribute, and sell this software and its +dnl documentation for any purpose is hereby granted without fee, provided that +dnl the above copyright notice appear in all copies and that both that +dnl copyright notice and this permission notice appear in supporting +dnl documentation. +dnl +dnl The above copyright notice and this permission notice shall be included +dnl in all copies or substantial portions of the Software. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +dnl OTHER DEALINGS IN THE SOFTWARE. +dnl +dnl Except as contained in this notice, the name of the copyright holders shall +dnl not be used in advertising or otherwise to promote the sale, use or +dnl other dealings in this Software without prior written authorization +dnl from the copyright holders. +dnl + +# XORG_DRIVER_CHECK_EXT() +# -------------------------- +# Checks for the $1 define in xorg-server.h (from the sdk). If it +# is defined, then add $1 to $REQUIRED_MODULES. + +AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include "xorg-server.h" +#if !defined $1 +#error $1 not defined +#endif + ]])], + [_EXT_CHECK=yes], + [_EXT_CHECK=no]) + CFLAGS="$SAVE_CFLAGS" + AC_MSG_CHECKING([if $1 is defined]) + AC_MSG_RESULT([$_EXT_CHECK]) + if test "$_EXT_CHECK" != no; then + REQUIRED_MODULES="$REQUIRED_MODULES $2" + fi +]) + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # # Copyright © 2004 Scott James Remnant . diff -urN xf86-video-sunffb-1.0.0.1/ChangeLog xf86-video-sunffb-1.0.1/ChangeLog --- xf86-video-sunffb-1.0.0.1/ChangeLog 1969-12-31 16:00:00.000000000 -0800 +++ xf86-video-sunffb-1.0.1/ChangeLog 2005-11-09 13:15:21.000000000 -0800 @@ -0,0 +1,9 @@ +2005-11-09 Kevin E. Martin + + * configure.ac: + Update package version number for X11R7 RC2 release. + +2005-11-01 Kevin E. Martin + + * configure.ac: + Update pkgcheck dependencies to work with separate build roots. diff -urN xf86-video-sunffb-1.0.0.1/configure xf86-video-sunffb-1.0.1/configure --- xf86-video-sunffb-1.0.0.1/configure 2005-10-18 22:39:34.000000000 -0700 +++ xf86-video-sunffb-1.0.1/configure 2005-11-09 22:50:42.000000000 -0800 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57 for xf86-video-sunffb 1.0.0.1. +# Generated by GNU Autoconf 2.57 for xf86-video-sunffb 1.0.1. # # Report bugs to . # @@ -427,8 +427,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-sunffb' PACKAGE_TARNAME='xf86-video-sunffb' -PACKAGE_VERSION='1.0.0.1' -PACKAGE_STRING='xf86-video-sunffb 1.0.0.1' +PACKAGE_VERSION='1.0.1' +PACKAGE_STRING='xf86-video-sunffb 1.0.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -958,7 +958,7 @@ # 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-sunffb 1.0.0.1 to adapt to many kinds of systems. +\`configure' configures xf86-video-sunffb 1.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1024,7 +1024,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-sunffb 1.0.0.1:";; + short | recursive ) echo "Configuration of xf86-video-sunffb 1.0.1:";; esac cat <<\_ACEOF @@ -1132,7 +1132,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xf86-video-sunffb configure 1.0.0.1 +xf86-video-sunffb configure 1.0.1 generated by GNU Autoconf 2.57 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -1147,7 +1147,7 @@ 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-sunffb $as_me 1.0.0.1, which was +It was created by xf86-video-sunffb $as_me 1.0.1, which was generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1761,7 +1761,7 @@ # Define the identity of the package. PACKAGE='xf86-video-sunffb' - VERSION='1.0.0.1' + VERSION='1.0.1' cat >>confdefs.h <<_ACEOF @@ -8650,6 +8650,168 @@ else DRI=auto fi; + +# Checks for extensions + + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include "xorg-server.h" +#if !defined RANDR +#error RANDR not defined +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + _EXT_CHECK=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +_EXT_CHECK=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVE_CFLAGS" + echo "$as_me:$LINENO: checking if RANDR is defined" >&5 +echo $ECHO_N "checking if RANDR is defined... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $_EXT_CHECK" >&5 +echo "${ECHO_T}$_EXT_CHECK" >&6 + if test "$_EXT_CHECK" != no; then + REQUIRED_MODULES="$REQUIRED_MODULES randrproto" + fi + + + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include "xorg-server.h" +#if !defined RENDER +#error RENDER not defined +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + _EXT_CHECK=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +_EXT_CHECK=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVE_CFLAGS" + echo "$as_me:$LINENO: checking if RENDER is defined" >&5 +echo $ECHO_N "checking if RENDER is defined... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $_EXT_CHECK" >&5 +echo "${ECHO_T}$_EXT_CHECK" >&6 + if test "$_EXT_CHECK" != no; then + REQUIRED_MODULES="$REQUIRED_MODULES renderproto" + fi + + + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include "xorg-server.h" +#if !defined DPMSExtension +#error DPMSExtension not defined +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + _EXT_CHECK=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +_EXT_CHECK=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVE_CFLAGS" + echo "$as_me:$LINENO: checking if DPMSExtension is defined" >&5 +echo $ECHO_N "checking if DPMSExtension is defined... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $_EXT_CHECK" >&5 +echo "${ECHO_T}$_EXT_CHECK" >&6 + if test "$_EXT_CHECK" != no; then + REQUIRED_MODULES="$REQUIRED_MODULES xextproto" + fi + + # Checks for pkg-config packages @@ -8763,12 +8925,12 @@ if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto\"") >&5 - ($PKG_CONFIG --exists --print-errors "xorg-server xproto") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server xproto" 2>/dev/null` + pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server xproto fontsproto $REQUIRED_MODULES" 2>/dev/null` else pkg_failed=yes fi @@ -8777,12 +8939,12 @@ fi if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto\"") >&5 - ($PKG_CONFIG --exists --print-errors "xorg-server xproto") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5 + ($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server xproto" 2>/dev/null` + pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server xproto fontsproto $REQUIRED_MODULES" 2>/dev/null` else pkg_failed=yes fi @@ -8791,18 +8953,18 @@ fi if test $pkg_failed = yes; then - XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server xproto"` + XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES"` # Put the nasty error message in config.log where it belongs echo "$XORG_PKG_ERRORS" 1>&5 - { { echo "$as_me:$LINENO: error: Package requirements (xorg-server xproto) were not met. + { { echo "$as_me:$LINENO: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively you may set the XORG_CFLAGS and XORG_LIBS environment variables to avoid the need to call pkg-config. See the pkg-config man page for more details." >&5 -echo "$as_me: error: Package requirements (xorg-server xproto) were not met. +echo "$as_me: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. @@ -8839,6 +9001,8 @@ echo "${ECHO_T}yes" >&6 : fi +echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. @@ -9655,7 +9819,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by xf86-video-sunffb $as_me 1.0.0.1, which was +This file was extended by xf86-video-sunffb $as_me 1.0.1, which was generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9718,7 +9882,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-sunffb config.status 1.0.0.1 +xf86-video-sunffb config.status 1.0.1 configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN xf86-video-sunffb-1.0.0.1/configure.ac xf86-video-sunffb-1.0.1/configure.ac --- xf86-video-sunffb-1.0.0.1/configure.ac 2005-10-18 19:48:05.000000000 -0700 +++ xf86-video-sunffb-1.0.1/configure.ac 2005-11-09 13:15:21.000000000 -0800 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-sunffb], - 1.0.0.1, + 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-sunffb) @@ -50,8 +50,15 @@ [Disable DRI support [[default=auto]]]), [DRI="$enableval"], [DRI=auto]) + +# Checks for extensions +XORG_DRIVER_CHECK_EXT(RANDR, randrproto) +XORG_DRIVER_CHECK_EXT(RENDER, renderproto) +XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) + # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server xproto]) +PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES]) +AC_MSG_RESULT([yes]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. diff -urN xf86-video-sunffb-1.0.0.1/Makefile.in xf86-video-sunffb-1.0.1/Makefile.in --- xf86-video-sunffb-1.0.0.1/Makefile.in 2005-10-18 22:39:38.000000000 -0700 +++ xf86-video-sunffb-1.0.1/Makefile.in 2005-11-09 23:11:06.000000000 -0800 @@ -171,9 +171,10 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/configure Makefile.am \ - aclocal.m4 config.guess config.h.in config.sub configure \ - configure.ac depcomp install-sh ltmain.sh missing mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/configure ChangeLog \ + Makefile.am aclocal.m4 config.guess config.h.in config.sub \ + configure configure.ac depcomp install-sh ltmain.sh missing \ + mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff -urN xf86-video-sunffb-1.0.0.1/src/ffb_dri.c xf86-video-sunffb-1.0.1/src/ffb_dri.c --- xf86-video-sunffb-1.0.0.1/src/ffb_dri.c 2005-08-15 00:30:05.000000000 -0700 +++ xf86-video-sunffb-1.0.1/src/ffb_dri.c 2005-10-21 11:40:19.000000000 -0700 @@ -207,8 +207,6 @@ */ if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) return FALSE; - if (!xf86LoaderCheckSymbol("DRIScreenInit")) - return FALSE; if (!xf86LoaderCheckSymbol("drmAvailable")) return FALSE; if (!xf86LoaderCheckSymbol("DRIQueryVersion")) { diff -urN xf86-video-sunffb-1.0.0.1/src/ffb_driver.c xf86-video-sunffb-1.0.1/src/ffb_driver.c --- xf86-video-sunffb-1.0.0.1/src/ffb_driver.c 2005-07-10 19:30:01.000000000 -0700 +++ xf86-video-sunffb-1.0.1/src/ffb_driver.c 2005-11-09 13:31:21.000000000 -0800 @@ -71,7 +71,7 @@ #define FFB_DRIVER_NAME "sunffb" #define FFB_MAJOR_VERSION 1 #define FFB_MINOR_VERSION 0 -#define FFB_PATCHLEVEL 0 +#define FFB_PATCHLEVEL 1 /* * This contains the functions needed by the server after loading the driver