X Strike Force X.Org X11 SVN commit: r3960 - in trunk/driver/xserver-xorg-video-mga: . debian debian/patches
Author: dnusinow
Date: 2006-11-06 23:59:52 -0500 (Mon, 06 Nov 2006)
New Revision: 3960
Added:
trunk/driver/xserver-xorg-video-mga/debian/patches/01_stupid_configure_error.diff
Removed:
trunk/driver/xserver-xorg-video-mga/debian/patches/01_manpage_typos.diff
trunk/driver/xserver-xorg-video-mga/debian/patches/02_mga_increase_minimum_pixel_clock.diff
Modified:
trunk/driver/xserver-xorg-video-mga/aclocal.m4
trunk/driver/xserver-xorg-video-mga/configure
trunk/driver/xserver-xorg-video-mga/debian/changelog
trunk/driver/xserver-xorg-video-mga/debian/patches/series
Log:
* Add 01_stupid_configure_error.diff
Modified: trunk/driver/xserver-xorg-video-mga/aclocal.m4
===================================================================
--- trunk/driver/xserver-xorg-video-mga/aclocal.m4 2006-11-07 04:43:34 UTC (rev 3959)
+++ trunk/driver/xserver-xorg-video-mga/aclocal.m4 2006-11-07 04:59:52 UTC (rev 3960)
@@ -6901,6 +6901,55 @@
]) # XORG_LINT_LIBRARY
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
+])
+
+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
Modified: trunk/driver/xserver-xorg-video-mga/configure
===================================================================
--- trunk/driver/xserver-xorg-video-mga/configure 2006-11-07 04:43:34 UTC (rev 3959)
+++ trunk/driver/xserver-xorg-video-mga/configure 2006-11-07 04:59:52 UTC (rev 3960)
@@ -1494,7 +1494,7 @@
--enable-dependency-tracking do not reject slow dependency extractors
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-dri Disable DRI support [default=auto]
- --disable-exa Disable EXA support [default], [enabled]
+ --disable-exa Disable EXA support [default=enabled]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -20628,11 +20628,307 @@
# Checks for extensions
-XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
-XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
-XORG_DRIVER_CHECK_EXT(XV, videoproto)
-XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+ cat >conftest.$ac_ext <<_ACEOF
+/* 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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 core conftest.err 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
+/* 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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 core conftest.err 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
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include "xorg-server.h"
+#if !defined XV
+#error XV not defined
+#endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$SAVE_CFLAGS"
+ { echo "$as_me:$LINENO: checking if XV is defined" >&5
+echo $ECHO_N "checking if XV 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 videoproto"
+ fi
+
+
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+ cat >conftest.$ac_ext <<_ACEOF
+/* 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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 core conftest.err 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
Modified: trunk/driver/xserver-xorg-video-mga/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-video-mga/debian/changelog 2006-11-07 04:43:34 UTC (rev 3959)
+++ trunk/driver/xserver-xorg-video-mga/debian/changelog 2006-11-07 04:59:52 UTC (rev 3960)
@@ -4,8 +4,9 @@
+ Fix some crasher bugs with DRI. Thanks Svante Signell. Closes: #395025
* Remove manpage typos patch, which was accepted upstream
* Remove minumum clock patch
+ * Add 01_stupid_configure_error.diff
- -- David Nusinow <dnusinow@debian.org> Mon, 6 Nov 2006 23:41:30 -0500
+ -- David Nusinow <dnusinow@debian.org> Mon, 6 Nov 2006 23:53:51 -0500
xserver-xorg-video-mga (1:1.4.2.dfsg.1-1) unstable; urgency=low
Deleted: trunk/driver/xserver-xorg-video-mga/debian/patches/01_manpage_typos.diff
===================================================================
--- trunk/driver/xserver-xorg-video-mga/debian/patches/01_manpage_typos.diff 2006-11-07 04:43:34 UTC (rev 3959)
+++ trunk/driver/xserver-xorg-video-mga/debian/patches/01_manpage_typos.diff 2006-11-07 04:59:52 UTC (rev 3960)
@@ -1,17 +0,0 @@
-Index: xserver-xorg-video-mga/man/mga.man
-===================================================================
---- xserver-xorg-video-mga.orig/man/mga.man 2006-09-20 20:39:44.000000000 -0400
-+++ xserver-xorg-video-mga/man/mga.man 2006-09-20 20:40:04.000000000 -0400
-@@ -52,10 +52,10 @@
- Millennium G200 and Mystique G200
- .TP
- .B G400
--Millenium G400, Millenium G400 MAX, Millenium G450, and Marvel G450 eTV
-+Millennium G400, Millennium G400 MAX, Millennium G450, and Marvel G450 eTV
- .TP
- .B G550
--Millenium G550 and Millenium G550 Dual DVI
-+Millennium G550 and Millennium G550 Dual DVI
- .SH "CONFIGURATION DETAILS"
- Please refer to __xconfigfile__(__filemansuffix__) for general configuration
- details. This section only covers configuration details specific to this
Added: trunk/driver/xserver-xorg-video-mga/debian/patches/01_stupid_configure_error.diff
===================================================================
--- trunk/driver/xserver-xorg-video-mga/debian/patches/01_stupid_configure_error.diff (rev 0)
+++ trunk/driver/xserver-xorg-video-mga/debian/patches/01_stupid_configure_error.diff 2006-11-07 04:59:52 UTC (rev 3960)
@@ -0,0 +1,13 @@
+Index: xserver-xorg-video-mga/configure.ac
+===================================================================
+--- xserver-xorg-video-mga.orig/configure.ac 2006-11-06 23:52:53.000000000 -0500
++++ xserver-xorg-video-mga/configure.ac 2006-11-06 23:53:00.000000000 -0500
+@@ -55,7 +55,7 @@
+ [DRI=auto])
+ AC_ARG_ENABLE(exa,
+ AC_HELP_STRING([--disable-exa],
+- [Disable EXA support [[default enabled]]]),
++ [Disable EXA support [[default=enabled]]]),
+ [EXA="$enableval"],
+ [EXA=yes])
+
Deleted: trunk/driver/xserver-xorg-video-mga/debian/patches/02_mga_increase_minimum_pixel_clock.diff
===================================================================
--- trunk/driver/xserver-xorg-video-mga/debian/patches/02_mga_increase_minimum_pixel_clock.diff 2006-11-07 04:43:34 UTC (rev 3959)
+++ trunk/driver/xserver-xorg-video-mga/debian/patches/02_mga_increase_minimum_pixel_clock.diff 2006-11-07 04:59:52 UTC (rev 3960)
@@ -1,21 +0,0 @@
-Index: xserver-xorg-video-mga/src/mga_driver.c
-===================================================================
---- xserver-xorg-video-mga.orig/src/mga_driver.c 2006-07-13 15:37:40.000000000 -0400
-+++ xserver-xorg-video-mga/src/mga_driver.c 2006-10-13 17:19:48.000000000 -0400
-@@ -1930,8 +1930,14 @@
-
- /* XXX Set HW cursor use */
-
-- /* Set the min pixel clock */
-- pMga->MinClock = 12000; /* XXX Guess, need to check this */
-+ /*
-+ * Set the min pixel clock; this was originally guessed to be 12000,
-+ * but an MGA G550 user reports that modes with clocks less than 17750
-+ * lock up the card. See
-+ * <URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=261993 >
-+ */
-+ pMga->MinClock = 17750;
-+
- xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT, "Min pixel clock is %d MHz\n",
- pMga->MinClock / 1000);
- /*
Modified: trunk/driver/xserver-xorg-video-mga/debian/patches/series
===================================================================
--- trunk/driver/xserver-xorg-video-mga/debian/patches/series 2006-11-07 04:43:34 UTC (rev 3959)
+++ trunk/driver/xserver-xorg-video-mga/debian/patches/series 2006-11-07 04:59:52 UTC (rev 3960)
@@ -1 +1,2 @@
+01_stupid_configure_error.diff
03_no_nonfree.diff
Reply to: