date:20150312

xserver-xorg-video-ati: Changes to 'ubuntu'

2015-03-12 Thread Maarten Bernardus Lankhorst

 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit b119ff956f2e6f8f27f14ac03d8fd43cb441493d
Author: Maarten Lankhorst 
Date:   Thu Mar 12 19:03:55 2015 +0100

rebuild bump

diff --git a/debian/changelog b/debian/changelog
index f547ff4..2b68855 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:7.5.0-1ubuntu2) vivid; urgency=medium
+
+  * Bump build-depends to xorg 1.17.
+
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
19:00:15 +0100
+
 xserver-xorg-video-ati (1:7.5.0-1ubuntu1) vivid; urgency=medium
 
   * Merge with released debian-unstable. (LP: #1421601)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw7sm-0005a4...@moszumanska.debian.org

xserver-xorg-video-ati: Changes to 'ubuntu'

2015-03-12 Thread Maarten Bernardus Lankhorst

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7f90a36b0cd531b43ce25522af84ecedb6ed3c23
Author: Maarten Lankhorst 
Date:   Thu Mar 12 13:29:00 2015 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index 73dd11c..f547ff4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-ati (1:7.5.0-1ubuntu1) UNRELEASED; urgency=medium
+xserver-xorg-video-ati (1:7.5.0-1ubuntu1) vivid; urgency=medium
 
   * Merge with released debian-unstable. (LP: #1421601)
 
- -- Maarten Lankhorst   Mon, 09 Mar 2015 
10:44:44 +0100
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
13:28:50 +0100
 
 xserver-xorg-video-ati (1:7.5.0-1) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw2eb-0002w0...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu+1'

2015-03-12 Thread Maarten Bernardus Lankhorst

 debian/control |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4ffaa00df4f7a4356aa56f405352bceac747d946
Author: Maarten Lankhorst 
Date:   Mon Mar 9 11:34:07 2015 +0100

Set a version for replacing modesetting, fixing some lintian warnings.

diff --git a/debian/control b/debian/control
index 71b16cc..908135f 100644
--- a/debian/control
+++ b/debian/control
@@ -143,9 +143,9 @@ Breaks:
  xserver-xorg-video-vga (<= 1:4.1.0-8),
  libgl1-mesa-dri (<< 7.10.2-4),
  libgl1-mesa-dri-experimental (<< 7.10.2-4),
- xserver-xorg-video-modesetting,
+ xserver-xorg-video-modesetting (<< 0.10),
 Replaces:
- xserver-xorg-video-modesetting,
+ xserver-xorg-video-modesetting (<< 0.10),
 Conflicts:
  xserver-xorg-input-evtouch,
 Provides:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw1gn-0006gf...@moszumanska.debian.org

xserver-xorg-video-mga: Changes to 'ubuntu'

2015-03-12 Thread Maarten Bernardus Lankhorst

 debian/control |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 0be10fc8a0dcec2235c6275b83258675f70be373
Author: Maarten Lankhorst 
Date:   Thu Mar 12 12:23:06 2015 +0100

Kill off modesetting recommends too.

diff --git a/debian/control b/debian/control
index 738c9ee..6abd046 100644
--- a/debian/control
+++ b/debian/control
@@ -32,8 +32,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${xviddriver:Depends},
-Recommends:
- xserver-xorg-video-modesetting,
 Provides:
  ${xviddriver:Provides}
 Suggests:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw1d1-0004oj...@moszumanska.debian.org

xserver-xorg-video-tdfx: Changes to 'ubuntu'

2015-03-12 Thread Maarten Bernardus Lankhorst

 debian/changelog   |6 ++
 debian/control |5 +-
 debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff |   21 
++
 3 files changed, 22 insertions(+), 10 deletions(-)

New commits:
commit 7637bd1290a57765a84fba480b63ea1d8b5cca09
Author: Maarten Lankhorst 
Date:   Thu Mar 12 12:17:41 2015 +0100

refresh patch

diff --git a/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff 
b/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
index 588f513..75eddfb 100644
--- a/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
+++ b/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
@@ -1,6 +1,6 @@
 xserver-xorg-video-tdfx.orig/src/tdfx_driver.c
-+++ xserver-xorg-video-tdfx/src/tdfx_driver.c
-@@ -2689,8 +2689,16 @@
+--- a/src/tdfx_driver.c
 b/src/tdfx_driver.c
+@@ -2591,26 +2591,39 @@
TDFXPtr pTDFX;
  
TDFXTRACE("TDFXValidMode start\n");
@@ -16,16 +16,21 @@
 +return MODE_BAD;
 +  }
/* Banshee doesn't support interlace, but Voodoo 3 and higher do. */
-   pScrn = xf86Screens[scrnIndex];
pTDFX = TDFXPTR(pScrn);
-@@ -2704,13 +2712,19 @@
+   if (mode->Flags&V_INTERLACE) {
+ switch (pTDFX->ChipType) {
+-  case PCI_CHIP_BANSHEE:
+-return MODE_BAD;
+   case PCI_CHIP_VELOCITY:
+   case PCI_CHIP_VOODOO3:
+   case PCI_CHIP_VOODOO4:
+   case PCI_CHIP_VOODOO5:
  return MODE_OK;
- break;
++  case PCI_CHIP_BANSHEE:
default:
 +xf86DrvMsg(pScrn->scrnIndex, X_INFO, "rejecting mode with unsupported"
-+ " interlace flag\n");
++   " interlace flag\n");
  return MODE_BAD;
- break;
  }
}
/* In clock doubled mode widths must be divisible by 16 instead of 8 */

commit c788f85d8a54a9595e59b4a64b8d3169447bf897
Author: Maarten Lankhorst 
Date:   Thu Mar 12 12:12:54 2015 +0100

Merge from unreleased debian-experimental to fix a ftbfs with 1.17.

diff --git a/debian/changelog b/debian/changelog
index 116b375..a1a1cf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-tdfx (1:1.4.6-0ubuntu1) vivid; urgency=medium
+
+  * Merge from unreleased debian-experimental to fix a ftbfs with 1.17.
+
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
12:10:16 +0100
+
 xserver-xorg-video-tdfx (1:1.4.6-1) UNRELEASED; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 0d58405..4728596 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
 Source: xserver-xorg-video-tdfx
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force 
+Maintainer: Ubuntu X-SWAT 
+XSBC-Orig-Maintainer: Debian X Strike Force 
 Uploaders: Cyril Brulebois 
 Build-Depends:
  debhelper (>= 8),
  dh-autoreconf,
  pkg-config,
  xutils-dev,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.16.99.901),
  x11proto-gl-dev,
  x11proto-video-dev,
  x11proto-xf86dga-dev,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw1ae-wu...@moszumanska.debian.org

xserver-xorg-video-savage: Changes to 'ubuntu'

2015-03-12 Thread Maarten Bernardus Lankhorst

 debian/changelog   |7 
 debian/control |2 -
 debian/patches/fix-ftbfs-1.17.diff |   53 +
 debian/patches/series  |1 
 4 files changed, 62 insertions(+), 1 deletion(-)

New commits:
commit db307af1abfa18a019066dbf85f00d6b020f9e48
Author: Maarten Lankhorst 
Date:   Thu Mar 12 11:48:56 2015 +0100

Rebuild against xserver 1.17.

fix-ftbfs-1.17.diff

diff --git a/debian/changelog b/debian/changelog
index 24158fb..d9dde83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-savage (1:2.3.7-2ubuntu4) vivid; urgency=medium
+
+  * Rebuild against xserver 1.17.
+- fix-ftbfs-1.17.diff
+
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
11:48:33 +0100
+
 xserver-xorg-video-savage (1:2.3.7-2ubuntu3) utopic; urgency=low
 
   * Rebuild for xorg 1.16 abi.
diff --git a/debian/control b/debian/control
index 9f98894..a7f4b53 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  debhelper (>= 8),
  dh-autoreconf,
  pkg-config,
- xserver-xorg-dev (>= 2:1.9.99.901+git20110131),
+ xserver-xorg-dev (>= 2:1.16.99.901),
  x11proto-video-dev,
  x11proto-xext-dev,
  x11proto-gl-dev,
diff --git a/debian/patches/fix-ftbfs-1.17.diff 
b/debian/patches/fix-ftbfs-1.17.diff
new file mode 100644
index 000..fed4834
--- /dev/null
+++ b/debian/patches/fix-ftbfs-1.17.diff
@@ -0,0 +1,53 @@
+diff --git a/src/savage_dri.c b/src/savage_dri.c
+index bdb78e4..0842821 100644
+--- a/src/savage_dri.c
 b/src/savage_dri.c
+@@ -875,9 +875,6 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen )
+psav->coreWakeupHandler = pDRIInfo->wrap.WakeupHandler;
+pDRIInfo->wrap.WakeupHandler = SAVAGEWakeupHandler;
+ 
+-   pDRIInfo->wrap.ValidateTree = NULL;
+-   pDRIInfo->wrap.PostValidateTree = NULL;
+-
+pDRIInfo->createDummyCtx = TRUE;
+pDRIInfo->createDummyCtxPriv = FALSE;
+ 
+diff --git a/src/savage_driver.c b/src/savage_driver.c
+index bca2c60..e82794f 100644
+--- a/src/savage_driver.c
 b/src/savage_driver.c
+@@ -4576,6 +4576,12 @@ SavageDDC1Read(ScrnInfoPtr pScrn)
+ return ((unsigned int) (tmp & 0x08));
+ }
+ 
++static void
++SavageDDC1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
++{
++vgaHWddc1SetSpeed(pScrn, speed);
++}
++
+ static Bool
+ SavageDDC1(ScrnInfoPtr pScrn)
+ {
+@@ -4589,7 +4595,8 @@ SavageDDC1(ScrnInfoPtr pScrn)
+ InI2CREG(byte,psav->I2CPort);
+ OutI2CREG(byte | 0x12,psav->I2CPort);
+ 
+-pMon = 
xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),SavageDDC1Read);
++pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), SavageDDC1SetSpeed,
++ SavageDDC1Read);
+ if (!pMon)
+ return FALSE;
+ 
+diff --git a/src/savage_driver.h b/src/savage_driver.h
+index ec4b1ea..de042af 100644
+--- a/src/savage_driver.h
 b/src/savage_driver.h
+@@ -54,6 +54,7 @@
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
+ #endif
++#include "xf86Modes.h"
+ #include "xf86Pci.h"
+ #include "xf86_OSproc.h"
+ #include "xf86Cursor.h"
diff --git a/debian/patches/series b/debian/patches/series
index f420099..3ceb913 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 03_request_16bit_depth.diff
 100_bustype_pci_by_default.diff
 101-pointer.diff
+fix-ftbfs-1.17.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw1a8-0007py...@moszumanska.debian.org

xserver-xorg-video-tdfx: Changes to 'debian-experimental'

2015-03-12 Thread Maarten Bernardus Lankhorst

 debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff |   21 
++
 1 file changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 8859a01e9fb6730dbc559a0a60ab9584581ca4b2
Author: Maarten Lankhorst 
Date:   Thu Mar 12 12:17:41 2015 +0100

refresh patch

diff --git a/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff 
b/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
index 588f513..75eddfb 100644
--- a/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
+++ b/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
@@ -1,6 +1,6 @@
 xserver-xorg-video-tdfx.orig/src/tdfx_driver.c
-+++ xserver-xorg-video-tdfx/src/tdfx_driver.c
-@@ -2689,8 +2689,16 @@
+--- a/src/tdfx_driver.c
 b/src/tdfx_driver.c
+@@ -2591,26 +2591,39 @@
TDFXPtr pTDFX;
  
TDFXTRACE("TDFXValidMode start\n");
@@ -16,16 +16,21 @@
 +return MODE_BAD;
 +  }
/* Banshee doesn't support interlace, but Voodoo 3 and higher do. */
-   pScrn = xf86Screens[scrnIndex];
pTDFX = TDFXPTR(pScrn);
-@@ -2704,13 +2712,19 @@
+   if (mode->Flags&V_INTERLACE) {
+ switch (pTDFX->ChipType) {
+-  case PCI_CHIP_BANSHEE:
+-return MODE_BAD;
+   case PCI_CHIP_VELOCITY:
+   case PCI_CHIP_VOODOO3:
+   case PCI_CHIP_VOODOO4:
+   case PCI_CHIP_VOODOO5:
  return MODE_OK;
- break;
++  case PCI_CHIP_BANSHEE:
default:
 +xf86DrvMsg(pScrn->scrnIndex, X_INFO, "rejecting mode with unsupported"
-+ " interlace flag\n");
++   " interlace flag\n");
  return MODE_BAD;
- break;
  }
}
/* In clock doubled mode widths must be divisible by 16 instead of 8 */


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw1ae-vz...@moszumanska.debian.org

xserver-xorg-video-siliconmotion: Changes to 'ubuntu'

2015-03-12 Thread Maarten Bernardus Lankhorst

 debian/changelog   |7 +++
 debian/control |6 +-
 debian/patches/fix-ftbfs-1.17.diff |   75 +
 debian/patches/series  |2 
 4 files changed, 87 insertions(+), 3 deletions(-)

New commits:
commit e76dfa6f7ef803f2d058534ec58c90fd0dc1984d
Author: Maarten Lankhorst 
Date:   Thu Mar 12 11:59:53 2015 +0100

Rebuild against 1.17.

fix-ftbfs-1.17.diff

diff --git a/debian/changelog b/debian/changelog
index 5b5afca..a6a585a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-siliconmotion (1:1.7.7-2ubuntu1) vivid; urgency=medium
+
+  * Rebuild against 1.17.
+- fix-ftbfs-1.17.diff
+
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
11:53:23 +0100
+
 xserver-xorg-video-siliconmotion (1:1.7.7-2) unstable; urgency=low
 
   * Release to unstable.
diff --git a/debian/control b/debian/control
index fff5fe8..ad75033 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,15 @@
 Source: xserver-xorg-video-siliconmotion
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force 
+Maintainer: Ubuntu X-SWAT 
+XSBC-Orig-Maintainer: Debian X Strike Force 
 Uploaders: Cyril Brulebois 
 Build-Depends:
  debhelper (>= 8),
  dh-autoreconf,
+ quilt,
  pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.16.99.901),
  x11proto-video-dev,
  x11proto-xext-dev,
  x11proto-core-dev,
diff --git a/debian/patches/fix-ftbfs-1.17.diff 
b/debian/patches/fix-ftbfs-1.17.diff
new file mode 100644
index 000..5d1c210
--- /dev/null
+++ b/debian/patches/fix-ftbfs-1.17.diff
@@ -0,0 +1,75 @@
+diff --git a/src/smi.h b/src/smi.h
+index 956c14f..dce82e6 100644
+--- a/src/smi.h
 b/src/smi.h
+@@ -37,7 +37,6 @@ authorization from the XFree86 Project and Silicon Motion.
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+ #include "xf86Cursor.h"
+ #include "vgaHW.h"
+@@ -68,6 +67,15 @@ authorization from the XFree86 Project and Silicon Motion.
+ /*D E F I N I T I O N S */
+ 
/**/
+ 
++#define PCI_VENDOR_SMI0x126F
++#define PCI_CHIP_SMI910   0x0910
++#define PCI_CHIP_SMI810   0x0810
++#define PCI_CHIP_SMI820   0x0820
++#define PCI_CHIP_SMI710   0x0710
++#define PCI_CHIP_SMI712   0x0712
++#define PCI_CHIP_SMI720   0x0720
++#define PCI_CHIP_SMI731   0x0730
++
+ #ifndef SMI_DEBUG
+ #define SMI_DEBUG 0
+ #endif
+@@ -221,7 +229,7 @@ typedef struct
+ CARD8 *   DataPortBase;   /* Base of data port */
+ int   DataPortSize;   /* Size of data port */
+ CARD8 *   IOBase; /* Base of MMIO VGA ports */
+-IOADDRESS PIOBase;/* Base of I/O ports */
++unsigned int  PIOBase;/* Base of I/O ports */
+ unsigned char *   FBBase; /* Base of FB */
+ CARD32fbMapOffset;/* offset for fb mapping */
+ CARD32FBOffset;   /* Current visual FB starting
+diff --git a/src/smi_i2c.c b/src/smi_i2c.c
+index f38b514..ecf350e 100644
+--- a/src/smi_i2c.c
 b/src/smi_i2c.c
+@@ -35,7 +35,6 @@ authorization from the XFree86 Project and Silicon Motion.
+ #include "xf86_OSproc.h"
+ #include "compiler.h"
+ #include "xf86Pci.h"
+-#include "xf86PciInfo.h"
+ #include "vgaHW.h"
+ 
+ #include "smi.h"
+diff --git a/src/smilynx_hw.c b/src/smilynx_hw.c
+index 9a10a31..b2ee8a5 100644
+--- a/src/smilynx_hw.c
 b/src/smilynx_hw.c
+@@ -572,6 +572,12 @@ SMILynx_ddc1Read(ScrnInfoPtr pScrn)
+ LEAVE(ret);
+ }
+ 
++static void
++SMILynx_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
++{
++vgaHWddc1SetSpeed(pScrn, speed);
++}
++
+ xf86MonPtr
+ SMILynx_ddc1(ScrnInfoPtr pScrn)
+ {
+@@ -585,7 +591,7 @@ SMILynx_ddc1(ScrnInfoPtr pScrn)
+ VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp | 0x20);
+ 
+ pMon = xf86PrintEDID(xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),
+-   vgaHWddc1SetSpeedWeak(),
++   SMILynx_ddc1SetSpeed,
+SMILynx_ddc1Read));
+ VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index fdffa2a..b2731a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# placeholder
+fix-ftbfs-1.17.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw19x-0007qv...@moszumanska.debian.org

xserver-xorg-video-tdfx: Changes to 'ubuntu'

2015-03-12 Thread Maarten Bernardus Lankhorst

New branch 'ubuntu' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw11m-00076o...@moszumanska.debian.org

xserver-xorg-video-siliconmotion: Changes to 'ubuntu'

2015-03-12 Thread Maarten Bernardus Lankhorst

New branch 'ubuntu' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw0jv-00073w...@moszumanska.debian.org

xserver-xorg-video-neomagic: Changes to 'ubuntu'

2015-03-12 Thread Maarten Bernardus Lankhorst

 debian/changelog   |7 ++
 debian/control |5 ++--
 debian/patches/fix-ftbfs-1.17.diff |   38 +
 debian/patches/series  |3 +-
 4 files changed, 50 insertions(+), 3 deletions(-)

New commits:
commit 1fda50a5cf894399b8217da7a9c2f1fa461e1ac5
Author: Maarten Lankhorst 
Date:   Thu Mar 12 11:21:59 2015 +0100

Rebuild against 1.17.

fix-ftbfs-1.17.diff

diff --git a/debian/changelog b/debian/changelog
index 0ffed78..9ca7673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-neomagic (1:1.2.8-1ubuntu1) vivid; urgency=medium
+
+  * Rebuild against 1.17.
+- fix-ftbfs-1.17.diff
+
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
11:21:26 +0100
+
 xserver-xorg-video-neomagic (1:1.2.8-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index eb115e4..95634d7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
 Source: xserver-xorg-video-neomagic
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force 
+Maintainer: Ubuntu X-SWAT 
+XSBC-Orig-Maintainer: Debian X Strike Force 
 Uploaders: Cyril Brulebois 
 Build-Depends:
  debhelper (>= 8),
  dh-autoreconf,
  quilt,
  pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.16.99.901),
  x11proto-video-dev,
  x11proto-xf86dga-dev,
  x11proto-core-dev,
diff --git a/debian/patches/fix-ftbfs-1.17.diff 
b/debian/patches/fix-ftbfs-1.17.diff
new file mode 100644
index 000..da1ac14
--- /dev/null
+++ b/debian/patches/fix-ftbfs-1.17.diff
@@ -0,0 +1,38 @@
+commit 6661bdd4551e4e63e983685464a277845aed3012
+Author: Dave Airlie 
+Date:   Sun Sep 21 09:51:37 2014 +1000
+
+neomagic: fix build against master X server.
+
+Signed-off-by: Dave Airlie 
+
+diff --git a/src/neo_driver.c b/src/neo_driver.c
+index 1b0da34..da01962 100644
+--- a/src/neo_driver.c
 b/src/neo_driver.c
+@@ -1994,10 +1994,12 @@ neoMapMem(ScrnInfoPtr pScrn)
+ }
+ #endif
+ } else
++#ifdef VIDMEM_MMIO
+ nPtr->NeoMMIOBase =
+ xf86MapVidMem(pScrn->scrnIndex,
+   VIDMEM_MMIO, nPtr->NeoMMIOAddr,
+   0x20L);
++#endif
+ if (nPtr->NeoMMIOBase == NULL)
+ return FALSE;
+ }
+@@ -2024,10 +2026,12 @@ neoMapMem(ScrnInfoPtr pScrn)
+ }
+ #endif
+ else
++#ifdef VIDMEM_FRAMEBUFFER
+ nPtr->NeoFbBase =
+ xf86MapVidMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
+   (unsigned long)nPtr->NeoLinearAddr,
+   nPtr->NeoFbMapSize);
++#endif
+ if (nPtr->NeoFbBase == NULL)
+ return FALSE;
+ return TRUE;
diff --git a/debian/patches/series b/debian/patches/series
index fdffa2a..eccfa20 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-# placeholder
+fix-ftbfs-1.17.diff
+


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw0gw-00056h...@moszumanska.debian.org

xserver-xorg-video-neomagic: Changes to 'ubuntu'

2015-03-12 Thread Maarten Bernardus Lankhorst

New branch 'ubuntu' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw0dh-0004vr...@moszumanska.debian.org

xserver-xorg-video-cirrus: Changes to 'ubuntu'

2015-03-12 Thread Maarten Bernardus Lankhorst

Rebased ref, commits from common ancestor:
commit 32d2ff984b923966f63c3ad6b92918c7daff3f77
Author: Maarten Lankhorst 
Date:   Thu Mar 12 11:04:22 2015 +0100

Rebuild against 1.17.

- Add 11-pci-tag.diff to get rid of a build error.
- Get rid of modesetting recommends, part of xorg-server now.

diff --git a/debian/changelog b/debian/changelog
index 859f2d4..7bcfc6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-cirrus (1:1.5.2-2ubuntu1) vivid; urgency=medium
+
+  * Rebuild against 1.17.
+- Add 11-pci-tag.diff to get rid of a build error.
+- Get rid of modesetting recommends, part of xorg-server now.
+
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
11:02:14 +0100
+
 xserver-xorg-video-cirrus (1:1.5.2-2) unstable; urgency=medium
 
   * Remove Cyril Brulebois from Uploaders.
diff --git a/debian/control b/debian/control
index a732a03..97804fb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  dh-autoreconf,
  quilt,
  pkg-config,
- xserver-xorg-dev (>= 2:1.12),
+ xserver-xorg-dev (>= 2:1.16.99.901),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,
@@ -25,8 +25,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${xviddriver:Depends},
-Recommends:
- xserver-xorg-video-modesetting,
 Provides:
  ${xviddriver:Provides}
 Description: X.Org X server -- Cirrus display driver
diff --git a/debian/patches/11-pci-tag.diff b/debian/patches/11-pci-tag.diff
new file mode 100644
index 000..3d68f9f
--- /dev/null
+++ b/debian/patches/11-pci-tag.diff
@@ -0,0 +1,54 @@
+commit df389885adf71ed3b045c2fde9fd3ba4329e1a58
+Author: Dave Airlie 
+Date:   Sat Sep 20 18:51:17 2014 +1000
+
+cirrus: don't use pciTag
+
+Signed-off-by: Dave Airlie 
+
+diff --git a/src/alp_driver.c b/src/alp_driver.c
+index 36f2039..bd5e52f 100644
+--- a/src/alp_driver.c
 b/src/alp_driver.c
+@@ -519,9 +519,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+   pCir->Chipset = pCir->pEnt->chipset;
+   /* Find the PCI info for this screen */
+   pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
++#ifndef XSERVER_LIBPCIACCESS
+   pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
+ PCI_DEV_DEV(pCir->PciInfo),
+ PCI_DEV_FUNC(pCir->PciInfo));
++#endif
+ 
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ if (!xf86IsPc98())
+diff --git a/src/cir.h b/src/cir.h
+index 0a5d403..84f64b5 100644
+--- a/src/cir.h
 b/src/cir.h
+@@ -23,7 +23,9 @@ typedef struct {
+   ScrnInfoPtr pScrn;
+   CARD32  properties;
+   pciVideoPtr PciInfo;
++#ifndef XSERVER_LIBPCIACCESS
+   PCITAG  PciTag;
++#endif
+   unsigned long   PIOReg;
+ union {
+   struct lgRec*lg;
+diff --git a/src/lg_driver.c b/src/lg_driver.c
+index c20bbd0..589d14e 100644
+--- a/src/lg_driver.c
 b/src/lg_driver.c
+@@ -382,9 +382,11 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
+ 
+   /* Find the PCI info for this screen */
+   pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
++#ifndef XSERVER_LIBPCIACCESS
+   pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
+ PCI_DEV_DEV(pCir->PciInfo),
+ PCI_DEV_FUNC(pCir->PciInfo));
++#endif
+ 
+   if (xf86LoadSubModule(pScrn, "int10")) {
+   xf86Int10InfoPtr int10InfoPtr;
diff --git a/debian/patches/series b/debian/patches/series
index 354eb33..fd80bac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 10-qemu.diff
+11-pci-tag.diff

commit 6f621833abdc3c3acb4b92838f5ec03c90386100
Author: Julien Cristau 
Date:   Sun May 11 01:22:56 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e0f76f6..859f2d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-cirrus (1:1.5.2-2) UNRELEASED; urgency=medium
+xserver-xorg-video-cirrus (1:1.5.2-2) unstable; urgency=medium
 
   * Remove Cyril Brulebois from Uploaders.
   * Recommend xserver-xorg-video-modesetting, for kms on qemu.
 
- -- Julien Cristau   Sun, 11 May 2014 01:13:54 +0200
+ -- Julien Cristau   Sun, 11 May 2014 01:22:34 +0200
 
 xserver-xorg-video-cirrus (1:1.5.2-1) unstable; urgency=low
 

commit c2b3486837fa203ec92dda88cddcd29bb3022741
Author: Julien Cristau 
Date:   Sun May 11 01:14:59 2014 +0200

Recommend xserver-xorg-video-modesetting, for kms on qemu.

diff --git a/debian/changelog b/debian/changelog
index 390c837..e0f76f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-cirrus (1:1.5.2-2) UNRELEASED; urgency=medium
 
   * Remove Cyril Brulebois from Uploaders.
+  * Recommend xserver-xorg-video-modesetting, for kms on qemu.
 
  -- Julien Cristau   Sun, 11 May 2014 01:13:54 +0200
 
diff --git a/debian/control b/debian/control
index dd9a046..a732a03 100644
--- a/debian/control
+++

xserver-xorg-video-cirrus: Changes to 'ubuntu-quantal'

2015-03-12 Thread Maarten Bernardus Lankhorst

 debian/changelog |7 
 debian/patches/fix-oob-shadowfb.diff |  408 +++
 debian/patches/series|1 
 3 files changed, 416 insertions(+)

New commits:
commit 9240a7d9e981184fa14986a99cd09e667c25e376
Author: Maarten Lankhorst 
Date:   Mon Jan 14 12:12:16 2013 +0100

Add patch to fix out of bounds access in shadowfb (LP: #1043513)

* Add patch to fix out of bounds access in shadowfb (LP: #1043513)
  - fix-oob-shadowfb.diff

diff --git a/debian/changelog b/debian/changelog
index 02d9ea7..4b70474 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-cirrus (1:1.5.1-0ubuntu2.1) UNRELEASED; urgency=low
+
+  * Add patch to fix out of bounds access in shadowfb (LP: #1043513)
+- fix-oob-shadowfb.diff
+
+ -- Maarten Lankhorst   Mon, 14 Jan 2013 
11:21:57 +0100
+
 xserver-xorg-video-cirrus (1:1.5.1-0ubuntu2) quantal; urgency=low
 
   * Add fix-fallback.diff from upstream git, if a kernel driver is found
diff --git a/debian/patches/fix-oob-shadowfb.diff 
b/debian/patches/fix-oob-shadowfb.diff
new file mode 100644
index 000..42d605b
--- /dev/null
+++ b/debian/patches/fix-oob-shadowfb.diff
@@ -0,0 +1,408 @@
+commit bade70ce71ea26fae4f250f0bd1729dfb0d392df
+Author: Maarten Lankhorst 
+Date:   Tue Jan 8 11:00:33 2013 +0100
+
+cirrus: fix out of bounds access to shadowfb
+
+Perform the same bounds checking other drivers do. Thanks to Dave Gilbert 
for feedback on this patch.
+
+Signed-off-by: Maarten Lankhorst 
+
+diff --git a/src/cir_shadow.c b/src/cir_shadow.c
+index a9b425b..6bde0fd 100644
+--- a/src/cir_shadow.c
 b/src/cir_shadow.c
+@@ -15,30 +15,41 @@
+ #include "cir.h"
+ #include "alp.h"
+ 
++#define MIN(a, b) (((a) < (b)) ? (a) : (b))
++#define MAX(a, b) (((a) > (b)) ? (a) : (b))
++
+ _X_EXPORT void
+ cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
+ {
+ CirPtr pCir = CIRPTR(pScrn);
+-int width, height, Bpp, FBPitch;
++int width, height, Bpp, FBPitch, x1, x2, y1, y2;
+ unsigned char *src, *dst;
+
+ Bpp = pScrn->bitsPerPixel >> 3;
+ FBPitch = BitmapBytePad(pScrn->displayWidth * pScrn->bitsPerPixel);
+ 
+ while(num--) {
+-  width = (pbox->x2 - pbox->x1) * Bpp;
+-  height = pbox->y2 - pbox->y1;
+-  src = pCir->ShadowPtr + (pbox->y1 * pCir->ShadowPitch) + 
+-  (pbox->x1 * Bpp);
+-  dst = pCir->FbBase + (pbox->y1 * FBPitch) + (pbox->x1 * Bpp);
+-
+-  while(height--) {
+-  memcpy(dst, src, width);
+-  dst += FBPitch;
+-  src += pCir->ShadowPitch;
+-  }
+-  
+-  pbox++;
++x1 = MAX(pbox->x1, 0);
++y1 = MAX(pbox->y1, 0);
++x2 = MIN(pbox->x2, pScrn->virtualX);
++y2 = MIN(pbox->y2, pScrn->virtualY);
++
++width = (x2 - x1) * Bpp;
++height = y2 - y1;
++
++if (width <= 0 || height <= 0)
++continue;
++
++src = pCir->ShadowPtr + (y1 * pCir->ShadowPitch) + (x1 * Bpp);
++dst = pCir->FbBase + (y1 * FBPitch) + (x1 * Bpp);
++
++while(height--) {
++memcpy(dst, src, width);
++dst += FBPitch;
++src += pCir->ShadowPitch;
++}
++
++pbox++;
+ }
+ } 
+ 
+@@ -64,7 +75,7 @@ _X_EXPORT void
+ cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
+ {
+ CirPtr pCir = CIRPTR(pScrn);
+-int count, width, height, y1, y2, dstPitch, srcPitch;
++int count, width, height, x1, x2, y1, y2, dstPitch, srcPitch;
+ CARD8 *dstPtr, *srcPtr, *src;
+ CARD32 *dst;
+ 
+@@ -72,36 +83,44 @@ cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
+ srcPitch = -pCir->rotate * pCir->ShadowPitch;
+ 
+ while(num--) {
+-  width = pbox->x2 - pbox->x1;
+-  y1 = pbox->y1 & ~3;
+-  y2 = (pbox->y2 + 3) & ~3;
+-  height = (y2 - y1) >> 2;  /* in dwords */
+-
+-  if(pCir->rotate == 1) {
+-  dstPtr = pCir->FbBase + 
+-  (pbox->x1 * dstPitch) + pScrn->virtualX - y2;
+-  srcPtr = pCir->ShadowPtr + ((1 - y2) * srcPitch) + pbox->x1;
+-  } else {
+-  dstPtr = pCir->FbBase + 
+-  ((pScrn->virtualY - pbox->x2) * dstPitch) + y1;
+-  srcPtr = pCir->ShadowPtr + (y1 * srcPitch) + pbox->x2 - 1;
+-  }
+-
+-  while(width--) {
+-  src = srcPtr;
+-  dst = (CARD32*)dstPtr;
+-  count = height;
+-  while(count--) {
+-  *(dst++) = src[0] | (src[srcPitch] << 8) | 
+-  (src[srcPitch * 2] << 16) | 
+-  (src[srcPitch * 3] << 24);
+-  src += srcPitch * 4;
+-  }
+-  srcPtr += pCir->rotate;
+-  dstPtr += dstPitch;
+-  }
+-
+-  pbox++;
++x1 = MAX(pbox->x1, 0);
++y1 = MAX(pbox->y1, 0);
++x2 = MIN(pbox->x2, pScrn->virtualX);
++y2 = MIN(pbox->y2, pScrn->virtua

Display chunks with xorg intel driver : which package for bug report

2015-03-12 Thread Fab Stz

Hello,

I have some display chunks as soon as I use some of my swap space. I noticed it 
first with a VirtualBox VM as it generally needs space from my swap partition. 
But it also appears when compiling programs as soon as it requires the swap 
partition.

I narrowed the issue down but don't know which package to report it towards.

I'm on an up-to-date jessie (kernel 3.16.7-ckt7-1 x86_64) and my Xorg uses 
intel driver.
The issue appears with default config (no xorg.conf, ie. driver intel, with DRI 
& Accel).
But I found this workaround : using either of these options in xorg.conf hides 
the issue
Option"NoAccel" "on"  
Option"AccelMethod" "off" 

Using driver fbdev is another workaround

The other AccesMethods "UXA, SNA, blt and DRI=off won't workaround the issue.

Which package should I report this bug upon ? linux kernel ? 
xserver-xorg-video-intel ? Other ?
BTW: Compiling & installing the last version of xserver-xorg-video-intel from 
experimental (2:2.99.917-1~exp1) doesn't fix the issue.

KR

Volkswagen Golf Sportsvan: Compacte Buitenkant, Ruim Interieur

2015-03-12 Thread CrmConnect

Volkswagen Golf Sportsvan: Compacte Buitenkant, Ruim Interieur  

  Be Exclusive, Get Connected. 

  Als u deze e-mail in tekstformaat ontvangt, zonder 
afbeeldingen,
klik hier [1]! 

   [2] 

  [3]

  Volkswagen Golf Sportsvan: Compacte Buitenkant, Ruim 
Interieur.  

 Design Flank:  Op de flanken toont hij zijn sportieve silhouet:
Slank en vloeiend, met zijn grote deuren en een dynamische zijlijn. 
Design Voorzijde:  Charismatisch over de hele lijn: Radiatorrooster,
koplampen en bumper kenmerken de voorzijde van de Golf Sportsvan
Design Achterzijde:   Het overvloedige gebruik van glas benadrukt de
uniforme en elegante lijn van de Golf Sportsvan en verleent hem een
optimale uitstraling. 

Wagen bezichtigen en/of testrijden
 Kom deze wagen bezichtigen en/of testrijden bij 1 van onze
partner-garages.
 Vraag uw dichtsbijzijnde partner-garage aan via i...@crmconnect.be
[4]
   Prijs:  

Catalogusprijs:
EUR 29.323,14 incl. btw

Fleetprijs:
EUR 24.865,50 incl. btw

Uw voordeel:
 EUR 4.457,64 incl. btw
   

 Neem contact op via: e-mail: i...@crmconnect.be [5] Tel.: +32 (0)56
65 02 71  

 Ik wil meer informatie! [6]

  [7]

 

  [8]

 

  [9]

 CrmConnect levert NOOIT aan de eindklant. Wij werken als
tussenpersoon.  Vraag naar onze parnervoorwaarden.  

  [10]

 

  CrmConnect
 Gentseweg 203, 8792 Desselgem

 +32 056 65 02 71

www.crmconnect.be [11]
i...@crmconnect.be [12]  

 

  [13]   [14]   [15]

  powered by Addemar [16]

 

 Deze e-mail werd verstuurd naar debian-x@lists.debian.org [17].
Klik hier [18] om uit te schrijven. 

 

 privacy policy [19]



Links:
--
[1]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42293/index.html
[2]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42294/index.html
[3]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42295/index.html
[4] mailto:i...@crmconnect.be
[5]
mailto:i...@crmconnect.be?subject=Meer%20info%20over%20de%20Volkswagen%20Golf%20Sportsvan
[6]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42296/index.html
[7]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42297/index.html
[8]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42298/index.html
[9]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42299/index.html
[10]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42300/index.html
[11]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42301/index.html
[12] mailto:i...@crmconnect.be
[13]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42302/index.html
[14]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42303/index.html
[15]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42304/index.html
[16]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42305/index.html
[17]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42306/index.html
[18]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42307/index.html
[19]
http://crmconnect.fb.email.addemar.com/c177/e1519305/h2489f/l42308/index.html

xserver-xorg-video-ati: Changes to 'ubuntu'

xserver-xorg-video-ati: Changes to 'ubuntu'

xorg-server: Changes to 'ubuntu+1'

xserver-xorg-video-mga: Changes to 'ubuntu'

xserver-xorg-video-tdfx: Changes to 'ubuntu'

xserver-xorg-video-savage: Changes to 'ubuntu'

xserver-xorg-video-tdfx: Changes to 'debian-experimental'

xserver-xorg-video-siliconmotion: Changes to 'ubuntu'

xserver-xorg-video-tdfx: Changes to 'ubuntu'

xserver-xorg-video-siliconmotion: Changes to 'ubuntu'

xserver-xorg-video-neomagic: Changes to 'ubuntu'

xserver-xorg-video-neomagic: Changes to 'ubuntu'

xserver-xorg-video-cirrus: Changes to 'ubuntu'

xserver-xorg-video-cirrus: Changes to 'ubuntu-quantal'

Display chunks with xorg intel driver : which package for bug report

Volkswagen Golf Sportsvan: Compacte Buitenkant, Ruim Interieur

16 matches

Site Navigation

Mail list logo

Footer information