xserver-xorg-video-intel: Changes to 'debian-experimental'
debian/changelog | 5 ++-
debian/patches/i8xx-shadow.diff | 32 ------------------------
debian/patches/series | 1
src/render_program/exa_wm_ca.g6a | 1
src/render_program/exa_wm_ca_srcalpha.g6a | 1
src/render_program/exa_wm_mask_sample_a.g6a | 1
src/render_program/exa_wm_mask_sample_argb.g6a | 1
src/render_program/exa_wm_noca.g6a | 1
src/render_program/exa_wm_src_sample_a.g6a | 1
src/render_program/exa_wm_src_sample_argb.g6a | 1
src/render_program/exa_wm_src_sample_planar.g6a | 1
src/render_program/exa_wm_yuv_rgb.g6a | 1
12 files changed, 3 insertions(+), 44 deletions(-)
New commits:
commit 83ab9738d89faee01a6d634f269c31a4331479b3
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 14:54:26 2010 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 0a502cc..be4cd0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-intel (2:2.13.901-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.13.901-1) experimental; urgency=low
* New upstream release candidate.
* Bump build-dep on libdrm-dev: 2.4.22-2 contains some cherry-picked
changes to allow this release candidate to build and run.
* Drop patch: i8xx-shadow.diff
- -- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 14:22:52 +0100
+ -- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 14:54:21 +0100
xserver-xorg-video-intel (2:2.13.0-2) unstable; urgency=low
commit d7de7b6e1f6f93b2ae0db4fd8dcbdf4566859e47
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 14:54:17 2010 +0100
Drop patch: i8xx-shadow.diff
diff --git a/debian/changelog b/debian/changelog
index 4a630d2..0a502cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-intel (2:2.13.901-1) UNRELEASED; urgency=low
* New upstream release candidate.
* Bump build-dep on libdrm-dev: 2.4.22-2 contains some cherry-picked
changes to allow this release candidate to build and run.
+ * Drop patch: i8xx-shadow.diff
-- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 14:22:52 +0100
diff --git a/debian/patches/i8xx-shadow.diff b/debian/patches/i8xx-shadow.diff
deleted file mode 100644
index c6df25c..0000000
--- a/debian/patches/i8xx-shadow.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: xserver-xorg-video-intel/src/intel_driver.c
-===================================================================
---- xserver-xorg-video-intel.orig/src/intel_driver.c
-+++ xserver-xorg-video-intel/src/intel_driver.c
-@@ -595,7 +595,6 @@
-
- intel->force_fallback =
- drmCommandNone(intel->drmSubFD, DRM_I915_GEM_THROTTLE) != 0;
-- intel->use_shadow = FALSE;
-
- /* Enable tiling by default */
- intel->tiling = TRUE;
-@@ -608,15 +607,13 @@
- intel->tiling = FALSE;
- }
-
-- if (xf86IsOptionSet(intel->Options, OPTION_SHADOW)) {
-- if (xf86ReturnOptValBool(intel->Options, OPTION_SHADOW, FALSE))
-- intel->force_fallback = intel->use_shadow = TRUE;
-- }
--
-+ intel->use_shadow = xf86ReturnOptValBool(intel->Options, OPTION_SHADOW, IS_I8XX(intel));
- if (intel->use_shadow) {
-- xf86DrvMsg(scrn->scrnIndex, X_CONFIG,
-+ xf86DrvMsg(scrn->scrnIndex,
-+ xf86IsOptionSet(intel->Options, OPTION_SHADOW) ? X_CONFIG : X_DEFAULT,
- "Shadow buffer enabled,"
- " GPU acceleration disabled.\n");
-+ intel->force_fallback = TRUE;
- }
-
- /* SwapBuffers delays to avoid tearing */
diff --git a/debian/patches/series b/debian/patches/series
index 6f457c7..cbe0755 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-i8xx-shadow.diff
libdrm-from-sid-is-ok.diff
commit 5c2f78336b1775ebadab1dea78ee2014e9b65fca
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 14:49:43 2010 +0100
Delete symlinks to make dpkg-source happy.
diff --git a/src/render_program/exa_wm_ca.g6a b/src/render_program/exa_wm_ca.g6a
deleted file mode 120000
index a29acb1..0000000
--- a/src/render_program/exa_wm_ca.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_ca.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_ca_srcalpha.g6a b/src/render_program/exa_wm_ca_srcalpha.g6a
deleted file mode 120000
index 3503521..0000000
--- a/src/render_program/exa_wm_ca_srcalpha.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_ca_srcalpha.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_mask_sample_a.g6a b/src/render_program/exa_wm_mask_sample_a.g6a
deleted file mode 120000
index 9e34bd1..0000000
--- a/src/render_program/exa_wm_mask_sample_a.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_mask_sample_a.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_mask_sample_argb.g6a b/src/render_program/exa_wm_mask_sample_argb.g6a
deleted file mode 120000
index b7443bd..0000000
--- a/src/render_program/exa_wm_mask_sample_argb.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_mask_sample_argb.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_noca.g6a b/src/render_program/exa_wm_noca.g6a
deleted file mode 120000
index cbf851e..0000000
--- a/src/render_program/exa_wm_noca.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_noca.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_src_sample_a.g6a b/src/render_program/exa_wm_src_sample_a.g6a
deleted file mode 120000
index c6e112c..0000000
--- a/src/render_program/exa_wm_src_sample_a.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_src_sample_a.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_src_sample_argb.g6a b/src/render_program/exa_wm_src_sample_argb.g6a
deleted file mode 120000
index 2684089..0000000
--- a/src/render_program/exa_wm_src_sample_argb.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_src_sample_argb.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_src_sample_planar.g6a b/src/render_program/exa_wm_src_sample_planar.g6a
deleted file mode 120000
index d4e34a1..0000000
--- a/src/render_program/exa_wm_src_sample_planar.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_src_sample_planar.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_yuv_rgb.g6a b/src/render_program/exa_wm_yuv_rgb.g6a
deleted file mode 120000
index d34d246..0000000
--- a/src/render_program/exa_wm_yuv_rgb.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_yuv_rgb.g4a
\ No newline at end of file
Reply to: