Hello community, here is the log from the commit of package xf86-video-mga for openSUSE:Factory checked in at 2012-10-16 12:12:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-mga (Old) and /work/SRC/openSUSE:Factory/.xf86-video-mga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-mga", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-mga/xf86-video-mga.changes 2012-09-20 15:48:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-mga.new/xf86-video-mga.changes 2012-10-16 12:12:46.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Oct 13 11:03:21 UTC 2012 - [email protected] + +- Update to version 1.6.2: + + Bring dri1 back to life. + + Add stub storm functions if not using XAA. + + Remove mibstore.h. + +------------------------------------------------------------------- Old: ---- xf86-video-mga-1.6.1.tar.bz2 New: ---- xf86-video-mga-1.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-mga.spec ++++++ --- /var/tmp/diff_new_pack.wuTfEY/_old 2012-10-16 12:12:47.000000000 +0200 +++ /var/tmp/diff_new_pack.wuTfEY/_new 2012-10-16 12:12:47.000000000 +0200 @@ -17,7 +17,7 @@ Name: xf86-video-mga -Version: 1.6.1 +Version: 1.6.2 Release: 0 Summary: Matrox video driver for the Xorg X server License: MIT ++++++ xf86-video-mga-1.6.1.tar.bz2 -> xf86-video-mga-1.6.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-mga-1.6.1/ChangeLog new/xf86-video-mga-1.6.2/ChangeLog --- old/xf86-video-mga-1.6.1/ChangeLog 2012-07-17 08:23:18.000000000 +0200 +++ new/xf86-video-mga-1.6.2/ChangeLog 2012-09-28 03:38:33.000000000 +0200 @@ -1,3 +1,40 @@ +commit fcd27b2b4ab2a181d5263296e71cda2d8772ba2d +Author: Dave Airlie <[email protected]> +Date: Fri Sep 28 11:36:44 2012 +1000 + + mga: bump release to 1.6.2 + +commit 29de36da0ed031815bd302f55f2ef5cc0cce6cc6 +Author: Dave Airlie <[email protected]> +Date: Fri Sep 28 10:54:00 2012 +1000 + + mga: bring dri1 back to life. + + we need to at least setup the memory manager bits so dri1 clients + get a backbuffer. this at least gets gears working again without XAA. + + Signed-off-by: Dave Airlie <[email protected]> + +commit e777a2845bfeefad386db35d694e4b1cd74a0dd5 +Author: Dave Airlie <[email protected]> +Date: Wed Sep 26 15:18:44 2012 +1000 + + mga: add stub storm functions if not using XAA + + If we aren't using XAA just add stub storm init/sync functions. + + This lets the driver load yay. + + Signed-off-by: Dave Airlie <[email protected]> + +commit 220e06fefe77175d9827954e61549eadda245d9a +Author: Adam Jackson <[email protected]> +Date: Tue Sep 25 08:54:42 2012 -0400 + + Remove mibstore.h + + Signed-off-by: Adam Jackson <[email protected]> + commit cd41eacaeabf8227197d605b055713ca654633d5 Author: Dave Airlie <[email protected]> Date: Tue Jul 17 16:05:09 2012 +1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-mga-1.6.1/configure new/xf86-video-mga-1.6.2/configure --- old/xf86-video-mga-1.6.1/configure 2012-07-17 08:23:07.000000000 +0200 +++ new/xf86-video-mga-1.6.2/configure 2012-09-28 03:37:28.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for xf86-video-mga 1.6.1. +# Generated by GNU Autoconf 2.68 for xf86-video-mga 1.6.2. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-mga' PACKAGE_TARNAME='xf86-video-mga' -PACKAGE_VERSION='1.6.1' -PACKAGE_STRING='xf86-video-mga 1.6.1' +PACKAGE_VERSION='1.6.2' +PACKAGE_STRING='xf86-video-mga 1.6.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1350,7 +1350,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-mga 1.6.1 to adapt to many kinds of systems. +\`configure' configures xf86-video-mga 1.6.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1420,7 +1420,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-mga 1.6.1:";; + short | recursive ) echo "Configuration of xf86-video-mga 1.6.2:";; esac cat <<\_ACEOF @@ -1551,7 +1551,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-video-mga configure 1.6.1 +xf86-video-mga configure 1.6.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1966,7 +1966,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-mga $as_me 1.6.1, which was +It was created by xf86-video-mga $as_me 1.6.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -10476,7 +10476,7 @@ # Define the identity of the package. PACKAGE='xf86-video-mga' - VERSION='1.6.1' + VERSION='1.6.2' cat >>confdefs.h <<_ACEOF @@ -19045,7 +19045,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-video-mga $as_me 1.6.1, which was +This file was extended by xf86-video-mga $as_me 1.6.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19111,7 +19111,7 @@ 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-mga config.status 1.6.1 +xf86-video-mga config.status 1.6.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-mga-1.6.1/configure.ac new/xf86-video-mga-1.6.2/configure.ac --- old/xf86-video-mga-1.6.1/configure.ac 2012-07-17 08:00:16.000000000 +0200 +++ new/xf86-video-mga-1.6.2/configure.ac 2012-09-28 03:37:15.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-mga], - [1.6.1], + [1.6.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-mga]) AC_CONFIG_SRCDIR([Makefile.am]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-mga-1.6.1/src/Makefile.am new/xf86-video-mga-1.6.2/src/Makefile.am --- old/xf86-video-mga-1.6.1/src/Makefile.am 2012-07-17 07:21:15.000000000 +0200 +++ new/xf86-video-mga-1.6.2/src/Makefile.am 2012-09-28 03:37:15.000000000 +0200 @@ -55,6 +55,7 @@ mga_ucode.h \ mga_vga.c \ mga_video.c \ + mga_storm.c \ compat-api.h if DRI @@ -71,6 +72,5 @@ if XAA mga_drv_la_SOURCES += \ - mga_arc.c \ - mga_storm.c + mga_arc.c endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-mga-1.6.1/src/Makefile.in new/xf86-video-mga-1.6.2/src/Makefile.in --- old/xf86-video-mga-1.6.1/src/Makefile.in 2012-07-17 08:23:06.000000000 +0200 +++ new/xf86-video-mga-1.6.2/src/Makefile.in 2012-09-28 03:37:27.000000000 +0200 @@ -63,8 +63,7 @@ @USE_EXA_TRUE@ mga_exa.c @XAA_TRUE@am__append_3 = \ -@XAA_TRUE@ mga_arc.c \ -@XAA_TRUE@ mga_storm.c +@XAA_TRUE@ mga_arc.c subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -111,16 +110,16 @@ mga_driver.c mga_esc.c mga_g450pll.c mga.h mga_halmod.c \ mga_hwcurs.c mga_macros.h mga_maven.h mga_merge.c mga_merge.h \ mgareg_flags.h mga_reg.h mga_sarea.h mga_shadow.c mga_ucode.h \ - mga_vga.c mga_video.c compat-api.h mga_dri.c mga_dri.h \ - mga_dripriv.h mga_exa.c mga_arc.c mga_storm.c + mga_vga.c mga_video.c mga_storm.c compat-api.h mga_dri.c \ + mga_dri.h mga_dripriv.h mga_exa.c mga_arc.c @DRI_TRUE@am__objects_1 = mga_dri.lo @USE_EXA_TRUE@am__objects_2 = mga_exa.lo -@XAA_TRUE@am__objects_3 = mga_arc.lo mga_storm.lo +@XAA_TRUE@am__objects_3 = mga_arc.lo am_mga_drv_la_OBJECTS = mga_bios.lo mga_dac3026.lo mga_dacG.lo \ mga_dga.lo mga_dh.lo mga_driver.lo mga_esc.lo mga_g450pll.lo \ mga_halmod.lo mga_hwcurs.lo mga_merge.lo mga_shadow.lo \ - mga_vga.lo mga_video.lo $(am__objects_1) $(am__objects_2) \ - $(am__objects_3) + mga_vga.lo mga_video.lo mga_storm.lo $(am__objects_1) \ + $(am__objects_2) $(am__objects_3) mga_drv_la_OBJECTS = $(am_mga_drv_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -320,7 +319,7 @@ mga_esc.c mga_g450pll.c mga.h mga_halmod.c mga_hwcurs.c \ mga_macros.h mga_maven.h mga_merge.c mga_merge.h \ mgareg_flags.h mga_reg.h mga_sarea.h mga_shadow.c mga_ucode.h \ - mga_vga.c mga_video.c compat-api.h $(am__append_1) \ + mga_vga.c mga_video.c mga_storm.c compat-api.h $(am__append_1) \ $(am__append_2) $(am__append_3) all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-mga-1.6.1/src/mga_dri.c new/xf86-video-mga-1.6.2/src/mga_dri.c --- old/xf86-video-mga-1.6.1/src/mga_dri.c 2012-07-17 07:21:15.000000000 +0200 +++ new/xf86-video-mga-1.6.2/src/mga_dri.c 2012-09-28 03:37:15.000000000 +0200 @@ -922,13 +922,11 @@ } #endif -#ifdef USE_EXA static void MGADRIInitBuffersEXA(WindowPtr pWin, RegionPtr prgn, CARD32 index) { /* FIXME */ } -#endif #ifdef USE_XAA /* @@ -1078,13 +1076,11 @@ } #endif -#ifdef USE_EXA static void MGADRIMoveBuffersEXA(WindowPtr pParent, DDXPointRec ptOldOrg, RegionPtr prgnSrc, CARD32 index) { /* FIXME */ } -#endif Bool MGADRIScreenInit( ScreenPtr pScreen ) { @@ -1231,6 +1227,8 @@ pDRIInfo->SwapContext = MGADRISwapContext; } + pDRIInfo->InitBuffers = MGADRIInitBuffersEXA; + pDRIInfo->MoveBuffers = MGADRIMoveBuffersEXA; #ifdef USE_EXA if (pMga->Exa) { pDRIInfo->InitBuffers = MGADRIInitBuffersEXA; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-mga-1.6.1/src/mga_driver.c new/xf86-video-mga-1.6.2/src/mga_driver.c --- old/xf86-video-mga-1.6.1/src/mga_driver.c 2012-07-17 07:21:15.000000000 +0200 +++ new/xf86-video-mga-1.6.2/src/mga_driver.c 2012-09-28 03:37:15.000000000 +0200 @@ -73,9 +73,6 @@ /* All drivers initialising the SW cursor need this */ #include "mipointer.h" -/* All drivers implementing backing store need this */ -#include "mibstore.h" - #include "micmap.h" #include "xf86DDC.h" @@ -3401,14 +3398,9 @@ mgaExaInit(pScreen); else #endif -#ifdef XAA MGAStormAccelInit(pScreen); -#else - ; -#endif } - miInitializeBackingStore(pScreen); xf86SetBackingStore(pScreen); xf86SetSilkenMouse(pScreen); @@ -4188,4 +4180,3 @@ OUTREG(MGAREG_MACCESS, 1<<15); usleep(10); } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-mga-1.6.1/src/mga_storm.c new/xf86-video-mga-1.6.2/src/mga_storm.c --- old/xf86-video-mga-1.6.1/src/mga_storm.c 2012-06-06 10:23:51.000000000 +0200 +++ new/xf86-video-mga-1.6.2/src/mga_storm.c 2012-09-28 03:37:15.000000000 +0200 @@ -15,8 +15,10 @@ #include "xf86Pci.h" /* Drivers that use XAA need this */ +#ifdef HAVE_XAA_H #include "xaa.h" #include "xaalocal.h" +#endif #include "xf86fbman.h" #include "miline.h" #include "servermd.h" @@ -59,6 +61,7 @@ XAAMoveDWORDS((d),(s),(c)); \ } while (0) +#ifdef HAVE_XAA_H static void mgaSetupForSolidFill( ScrnInfoPtr pScrn, int color, int rop, unsigned int planemask ); @@ -569,10 +572,13 @@ #endif /* defined(RENDER) */ +#endif Bool mgaAccelInit( ScreenPtr pScreen ) { +#ifdef HAVE_XAA_H XAAInfoRecPtr infoPtr; +#endif ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); MGAPtr pMga = MGAPTR(pScrn); int maxFastBlitMem, maxlines; @@ -583,8 +589,10 @@ pMga->ScratchBuffer = malloc(((pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel) + 127) >> 3); if(!pMga->ScratchBuffer) return FALSE; +#ifdef HAVE_XAA_H pMga->AccelInfoRec = infoPtr = XAACreateInfoRec(); if(!infoPtr) return FALSE; +#endif pMga->RenderTime = 0; pMga->LinearScratch = 0; @@ -617,6 +625,7 @@ pMga->AtypeNoBLK = MGAAtypeNoBLK; } +#ifdef HAVE_XAA_H /* fill out infoPtr here */ infoPtr->Flags = PIXMAP_CACHE | OFFSCREEN_PIXMAPS | @@ -782,6 +791,8 @@ pMga->MaxFastBlitY = maxFastBlitMem / (pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel / 8); } +#endif + switch (pMga->Chipset) { case PCI_CHIP_MGAG200_SE_A_PCI: case PCI_CHIP_MGAG200_SE_B_PCI: @@ -917,6 +928,7 @@ } +#ifdef HAVE_XAA_H for (i = 0; i < pScrn->numEntities; i++) { if (xf86IsEntityShared(pScrn->entityList[i])) { infoPtr->RestoreAccelState = mgaRestoreAccelState; @@ -949,9 +961,13 @@ #endif /* defined(RENDER) */ return(XAAInit(pScreen, infoPtr)); +#else + return TRUE; +#endif } +#ifdef HAVE_XAA_H /* Support for multiscreen */ static void mgaRestoreAccelState(ScrnInfoPtr pScrn) { @@ -994,7 +1010,7 @@ OUTREG(MGAREG_YBOT, 0x007FFFFF); /* maxPixelPointer */ pMga->AccelFlags &= ~CLIPPER_ON; } - +#endif CARD32 MGAAtype[16] = { MGADWG_RPL | 0x00000000, MGADWG_RSTR | 0x00080000, @@ -1080,9 +1096,11 @@ opmode &= ~0x30000; #endif +#ifdef HAVE_XAA_H pMga->SetupForSolidFill = mgaSetupForSolidFill; pMga->SubsequentSolidFillRect = mgaSubsequentSolidFillRect; pMga->RestoreAccelState = mgaRestoreAccelState; +#endif pMga->fifoCount = 0; @@ -1155,6 +1173,7 @@ } +#ifdef HAVE_XAA_H static void MGASetClippingRectangle( ScrnInfoPtr pScrn, @@ -2534,3 +2553,4 @@ SET_SYNC_FLAG(infoRec); } +#endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
