xserver-xorg-video-intel: Changes to 'refs/tags/xserver-xorg-video-intel-2_2.21.15-1'
Tag 'xserver-xorg-video-intel-2_2.21.15-1' created by Michael Stapelberg at 2013-10-01 16:29 + Upload to unstable Changes since 2.21.15: Adam Jackson (1): Quirk: No LVDS on Dell Studio Hybrid Alan Coopersmith (3): Define DEFFILEMODE for OS'es that don't have it Man page typo fixes Remove xorgconfig & xorgcfg from See Also list in man page Albert Damen (3): Non-GEM allocations incorrectly force TILE_NONE (bug 20797) Fix crash with XV with large virtual display Drop frontbuffer from crtc in I830CloseScreen Arnaud Fontaine (3): Update Build-Depends following xcb-util 0.3.8 release. Add to xserver-xorg-video-intel-dbg Depends. Upload to unstable. Bernhard Rosenkraenzer (1): UXA: Declare glyph cache picture as component-alpha when necessary. Bill Nottingham (1): Quirk MSI IM-945GSE-A LVDS, TV outputs. Branden Robinson (4): Set svn:keywords property to "Id" (keyword already present). Note probable out-of-dateness of maplink() function body. Add high-level documentation to XSFBS shell library, intended to reduce Test for existence of debian/patches directory before creating a symlink to it. Brice Goglin (98): Build a xserver-xorg-video-intel-dbg package with debugging symbols. Fix XvMC support for only i810 and i815 in the long description. Fix displaying of patches applied by quilt. Minor fixes in the patching system. Fix "display the output of quilt push/pop". Fix typo in intel.man Define INTEL_VERSION_MAJOR/MINOR/PATCH using PACKAGE_VERSION_* Do not call laptop-detect, let the only user call it directly Merge branch 'upstream-unstable' into debian-unstable New upstream release Prepare changelog for upload Merge branch 'xf86-video-intel-2.2-branch' of git://git.freedesktop.org/git/xorg/driver/xf86-video-intel into debian-unstable Prepare changelog for new upload Merge tag 'xf86-video-intel-2.2.1' into debian-unstable New upstream release Partial revert of 3e7c2a3f7211f0c167e831366aa5bb1ca9215334 Merge tag 'xf86-video-intel-2.2.99.901' into debian-experimental New upstream release candidate Install libIntelXvMC.so Merge tag 'xf86-video-intel-2.2.99.902' into debian-experimental New upstream release candidate Merge branch 'debian-unstable' into debian-experimental Merge tag 'xf86-video-intel-2.2.99.903' into debian-experimental New upstream release candidate Prepare changelog for upload Merge tag 'xf86-video-intel-2.3.1' into debian-unstable New upstream release Update xsfbs/quilt patching rules to be compatible with the Merge tag 'xf86-video-intel-2.3.2' into debian-unstable New upstream release Prepare changelog for upload Merge tag 'xf86-video-intel-2.6.0' into debian-experimental New upstream release Prepare changelog for upload Merge branch 'upstream-unstable' into tmp Merge branch 'tmp' into debian-experimental New upstream release candidate Prepare changelog for upload Merge branch '2.7' of git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel into debian-experimental New upstream release Prepare changelog for upload to unstable Install the upstream NEWS file Move -dbg package to section debug Merge tag '2.7.99.1' into debian-experimental New upstream release candidate Stop installing libI810XvMC.so and libIntelXvMC.so Prepare changelog for upload Merge tag '2.7.1' into debian-unstable New upstream release Don't try to install the now missing pci ids file Prepare changelog for upload Merge tag '2.7.99.901' into debian-experimental New upstream release candidate Prepare changelog for upload Merge tag '2.7.99.902' into debian-experimental New upstream release candidate Prepare Changelog for upload Merge tag '2.8.0' into debian-experimental New upstream release Prepare changelog for upload Prepare changelog for upload Merge tag '2.8.1' into debian-unstable New upstream release Prepare changelog for upload Merge tag '2.8.99.902' into debian-experimental New upstream release candidate Prepare changelog for upload Merge tag '2.9.0' into debian-unstable New upstream release Prepare changelog for upload Build against Xserver 1.7 Prepare Changelog for upload Merge branch 'upstream-unstable' into merge_upstream_unstable_in_experimental Merge branch 'merge_upstream_unstable_in_experimental' into debian-experimental New upstream release Bump xutils-dev build dependency for new util-macros Bump libdrm build dependency to 2.4.16 Build depend on libx11-xcb-dev, libxcb-aux0-dev and libxcb-dri2-0-dev for XVMC Merge branch 'debian-un
xserver-xorg-video-intel: Changes to 'debian-unstable'
debian/source/format |1 - 1 file changed, 1 deletion(-) New commits: commit 9bda522369888228929592f3c4818b4f38c45fa4 Author: Michael Stapelberg Date: Tue Oct 1 18:25:56 2013 +0200 Revert "specify '3.0 (quilt)' source format" This reverts commit 34fa27e8d6282aee1e2134b07bdae0f6930c5ee8. Turns out that debian-x is in two worlds at the same time: We use the orig tarball to build the package, but we directly track upstream in git in the packaging. source format 1.0 is better than 3.0 (quilt) for that workflow. With 3.0 (quilt), as an example, the following fails when upstream has differences between the git repository and the released tarball (and upstream does, in our case): git clone git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel cd xserver-xorg-video-intel uscan --download-current-version debuild -S diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vr2oc-0002kk...@vasks.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5fe113590ec4517a28d9f82a087dbddbbb69eab2 Author: Timo Aaltonen Date: Tue Oct 1 17:27:18 2013 +0300 close some bugs diff --git a/debian/changelog b/debian/changelog index cebe397..668541e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ xserver-xorg-video-intel (2:2.99.903-0ubuntu1) UNRELEASED; urgency=low - * Merge from unreleased debian git + * Merge from unreleased debian git (LP: #103, #1224106, #1228677) * Drop patches that were from upstream. * source: Revert to source format 1.0. * xmir.patch: Refresh. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vr1q8-0005xi...@vasks.debian.org
Bug#724944: xserver-xorg-video-intel: segfaults when trying to play movies
On Tue, Oct 01, 2013 at 04:51:01PM +0200, Julien Cristau wrote: > Still no info about what's going on in the driver. On Tue, Oct 01, 2013 at 02:25:28AM +0200, Bas Wijnen wrote: > Please tell me what to do or install if you need more information. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20131001150101.gt9...@fmf.nl
Bug#724944: xserver-xorg-video-intel: segfaults when trying to play movies
On Tue, Oct 1, 2013 at 02:25:28 +0200, Bas Wijnen wrote: > #9 > #10 0xb6f16d79 in ?? () from /usr/lib/xorg/modules/drivers/intel_drv.so > #11 0xb6f12215 in ?? () from /usr/lib/xorg/modules/drivers/intel_drv.so Still no info about what's going on in the driver. Cheers, Julien signature.asc Description: Digital signature
Re: Removing old unmaintained X drivers
On 29.09.2013 07:34, Bob Tracy wrote: > On Sun, Sep 29, 2013 at 04:32:05AM +0100, Ben Hutchings wrote: >> On Sat, 2013-09-28 at 10:16 -0500, Bob Tracy wrote: >>> On Sat, Sep 28, 2013 at 02:29:05PM +0100, Jurij Smakov wrote: On Thu, Sep 26, 2013 at 10:26 PM, Julien Cristau wrote: > (...) > xserver-xorg-video-sis > (...) >>> >>> The SiS chipset was, unfortunately, really popular with manufacturers of >>> relatively expensive micro PeeCees (EzGo, Jadetec, etc.), which were >>> essentially notebook hardware crammed into a small desktop case. Here's >>> a link with good pics: >>> http://www.tomshardware.com/reviews/smallest,530-2.html >>> and see also http://www.snotmonkey.com/work/ezgo/ for detailed specs. >>> It's based on the P4, and I've got one of them. Case has the footprint >>> of a "shuttle", but is about half the height. If I *could* switch video >>> cards, I'd do it in a heartbeat because SiS video cards have given me >>> nothing >>> but grief through the years. >>> >>> In the "unsolved wontfix" ubuntu bug list for the driver, mention is >>> made of the fact XAA support went bye-bye, and the attempted use of EXA >>> causes looping segfaults on X server startup. Only current workaround >>> is to disable acceleration. Truly a case of "bad breath is better than >>> no breath". >> >> This sounds like a good reason to remove it, unless both vesa and fbdev >> also fail on this hardware. > > (k)ubuntu's "plymouth" can't figure out a supported mode for a graphical > boot, so I'm guessing vesa and fbdev fail worse than sis. Only way to > see anything besides a blank screen during boot is to tell grub not to > do the whole splash screen thing. Installs from scratch on this machine > are "interesting." plymouth has no use for the X driver, so issues with plymouth should be shared by all use cases. -- t -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/524ae0bf.3040...@ubuntu.com
xserver-xorg-video-intel: Changes to 'upstream-experimental'
Makefile.am|7 NEWS | 152 + configure.ac | 591 +++- man/intel.man | 34 src/Makefile.am| 78 src/brw_defines.h | 881 --- src/brw_structs.h | 1723 -- src/common.h | 73 src/compat-api.h |4 src/i830_3d.c | 225 - src/i830_reg.h | 805 -- src/i830_render.c | 876 --- src/i915_3d.c | 110 src/i915_3d.h | 619 - src/i915_pciids.h | 211 + src/i915_reg.h | 844 --- src/i915_render.c | 1010 src/i915_video.c | 486 src/i965_3d.c | 443 --- src/i965_reg.h | 476 src/i965_render.c | 2962 src/i965_video.c | 1939 src/intel.h| 663 - src/intel_batchbuffer.c| 314 -- src/intel_batchbuffer.h| 226 - src/intel_device.c | 90 src/intel_display.c| 2124 - src/intel_dri.c| 1639 - src/intel_driver.c | 1310 --- src/intel_driver.h | 239 -- src/intel_glamor.c | 254 -- src/intel_glamor.h | 67 src/intel_hwmc.c | 260 -- src/intel_hwmc.h | 75 src/intel_memory.c | 286 -- src/intel_module.c | 394 +-- src/intel_options.c|5 src/intel_options.h|4 src/intel_uxa.c| 1420 --- src/intel_video.c | 1776 -- src/intel_video.h | 95 src/legacy/Makefile.am |2 src/legacy/i810/Makefile.am|4 src/legacy/i810/i810_accel.c |1 src/legacy/i810/i810_cursor.c |1 src/legacy/i810/i810_dga.c |1 src/legacy/i810/i810_dri.c |3 src/legacy/i810/i810_driver.c |1 src/legacy/i810/i810_hwmc.c|1 src/legacy/i810/i810_memory.c |1 src/legacy/i810/i810_video.c |1 src/legacy/i810/i810_wmark.c |1 src/legacy/i810/i810_xaa.c |1 src/legacy/i810/xvmc/Makefile.am |4 src/sna/Makefile.am|7 src/sna/blt.c | 10 src/sna/brw/Makefile.am|1 src/sna/compiler.h | 10 src/sna/fb/Makefile.am |2 src/sna/fb/fbclip.c|2 src/sna/fb/fbclip.h|7 src/sna/fb/fbpict.h|1 src/sna/gen2_render.c |3 src/sna/gen3_render.c | 61 src/sna/gen4_render.c | 47 src/sna/gen4_vertex.c | 85 src/sna/gen5_render.c | 75 src/sna/gen6_render.c | 158 + src/sna/gen7_render.c | 280 +- src/sna/kgem.c | 675 +++-- src/sna/kgem.h | 48 src/sna/sna.h | 118 src/sna/sna_accel.c| 1695 +- src/sna/sna_acpi.c | 223 + src/sna/sna_blt.c | 47 src/sna/sna_composite.c| 312 +- src/sna/sna_cpu.c | 20 src/sna/sna_cpuid.h| 86 src/sna/sna_damage.c | 10 src/sna/sna_damage.h | 13 src/sna/sna_display.c | 805 -- src/sna/sna_display_fake.c | 199 + src/sna/sna_dri.c | 959 src/sna/sna_driver.c | 283 +- src/sna/sna_glyphs.c | 538 +
xserver-xorg-video-intel: Changes to 'debian-experimental'
ChangeLog |68103 Makefile.am|7 NEWS | 152 configure.ac | 591 debian/changelog | 48 debian/control | 16 debian/patches/series |1 debian/rules | 21 debian/source/format |1 debian/upstream.changelog |69797 + man/intel.man | 34 src/Makefile.am| 78 src/brw_defines.h | 881 src/brw_structs.h | 1723 src/common.h | 73 src/compat-api.h |4 src/i830_3d.c | 225 src/i830_reg.h | 805 src/i830_render.c | 876 src/i915_3d.c | 110 src/i915_3d.h | 619 src/i915_pciids.h | 211 src/i915_reg.h | 844 src/i915_render.c | 1010 src/i915_video.c | 486 src/i965_3d.c | 443 src/i965_reg.h | 476 src/i965_render.c | 2962 - src/i965_video.c | 1939 src/intel.h| 663 src/intel_batchbuffer.c| 314 src/intel_batchbuffer.h| 226 src/intel_device.c | 90 src/intel_display.c| 2124 src/intel_dri.c| 1639 src/intel_driver.c | 1310 src/intel_driver.h | 239 src/intel_glamor.c | 254 src/intel_glamor.h | 67 src/intel_hwmc.c | 260 src/intel_hwmc.h | 75 src/intel_memory.c | 286 src/intel_module.c | 394 src/intel_options.c|5 src/intel_options.h|4 src/intel_uxa.c| 1420 src/intel_video.c | 1776 src/intel_video.h | 95 src/legacy/Makefile.am |2 src/legacy/i810/Makefile.am|4 src/legacy/i810/i810_accel.c |1 src/legacy/i810/i810_cursor.c |1 src/legacy/i810/i810_dga.c |1 src/legacy/i810/i810_dri.c |3 src/legacy/i810/i810_driver.c |1 src/legacy/i810/i810_hwmc.c|1 src/legacy/i810/i810_memory.c |1 src/legacy/i810/i810_video.c |1 src/legacy/i810/i810_wmark.c |1 src/legacy/i810/i810_xaa.c |1 src/legacy/i810/xvmc/Makefile.am |4 src/sna/Makefile.am|7 src/sna/blt.c | 10 src/sna/brw/Makefile.am|1 src/sna/compiler.h | 10 src/sna/fb/Makefile.am |2 src/sna/fb/fbclip.c|2 src/sna/fb/fbclip.h|7 src/sna/fb/fbpict.h|1 src/sna/gen2_render.c |3 src/sna/gen3_render.c | 61 src/sna/gen4_render.c | 47 src/sna/gen4_vertex.c | 85 src/sna/gen5_render.c | 75 src/sna/gen6_render.c | 158 src/sna/gen7_render.c | 280 src/sna/kgem.c | 675 src/sna/kgem.h | 48 src/sna/sna.h | 118 src/sna/sna_accel.c| 1695 src/sna/sna_acpi.c | 223 src/sna/sna_blt.c | 47 src/sna/sna_composite.c| 312 src/sna/sna_cpu.c | 20 src/sna/sna_cpuid.h| 86 src/sna/sna_damage.c | 10 src/sna/sna_damage.h | 13 src/sna/sna_display.c | 805 src/sna/sna_display_
xserver-xorg-video-intel: Changes to 'ubuntu'
ChangeLog |69207 - Makefile.am |4 NEWS | 97 configure.ac | 534 debian/changelog | 28 debian/control | 10 debian/patches/0001-sna-Make-sure-the-frontbuffer-exists-before-doing-pi.patch | 60 debian/patches/Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch | 51 debian/patches/Link-the-driver-against-pixman.patch | 38 debian/patches/check-hosted-initialisation-succeeds.patch | 26 debian/patches/disable-unneeded-functions-when-hosted.patch | 261 debian/patches/dont-copy-fbcon-if-hosted.patch | 26 debian/patches/fix-spelling-of-caching.patch | 180 debian/patches/more-modesetting-disablement-when-hosted.patch | 235 debian/patches/series | 10 debian/patches/unwrap-legacy-modesetting-when-hosted.patch | 57 debian/patches/xmir.patch | 220 debian/rules |3 debian/source/format |1 debian/upstream.changelog |69797 ++ man/intel.man | 34 src/Makefile.am |2 src/compat-api.h |4 src/intel_device.c | 90 src/intel_driver.h |4 src/intel_module.c | 36 src/intel_options.c |5 src/intel_options.h |4 src/legacy/Makefile.am |2 src/legacy/i810/i810_accel.c |1 src/legacy/i810/i810_cursor.c |1 src/legacy/i810/i810_dga.c |1 src/legacy/i810/i810_dri.c |1 src/legacy/i810/i810_driver.c |1 src/legacy/i810/i810_hwmc.c |1 src/legacy/i810/i810_memory.c |1 src/legacy/i810/i810_video.c |1 src/legacy/i810/i810_wmark.c |1 src/legacy/i810/i810_xaa.c |1 src/sna/Makefile.am |1 src/sna/compiler.h |6 src/sna/fb/fbclip.c |2 src/sna/fb/fbclip.h |7 src/sna/fb/fbpict.h |1 src/sna/gen2_render.c |3 src/sna/gen3_render.c | 61 src/sna/gen4_render.c | 45 src/sna/gen4_vertex.c | 85 src/sna/gen5_render.c | 39 src/sna/gen6_render.c | 152 src/sna/gen7_render.c | 188 src/sna/kgem.c | 603 src/sna/kgem.h | 30 src/sna/sna.h | 104 src/sna/sna_accel.c | 1180 src/sna/sna_acpi.c | 2
mesa: Changes to 'ubuntu'
debian/changelog |8 ++
debian/patches/i915-dont-default-to-2.1.patch | 91 ++
debian/patches/series |1
3 files changed, 100 insertions(+)
New commits:
commit 7139d549ad9e6577d539d45b16eb57f063bc82be
Author: Robert Hooker
Date: Tue Oct 1 09:43:35 2013 -0400
debian/patches: Add revert of i915 forced OpenGL 2.1 commit
diff --git a/debian/changelog b/debian/changelog
index 11f736f..72cea95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (9.2-1ubuntu4) UNRELEASED; urgency=low
+
+ * Add i915-dont-default-to-2.1.patch: Stop defaulting to OpenGL 2.1 that is
not
+fully implemented in hardware on gen3 GPUs, the software fallbacks make
Unity
+unusably slow. (LP: #1222602)
+
+ -- Robert Hooker Tue, 01 Oct 2013 09:41:40 -0400
+
mesa (9.2-1ubuntu3) saucy; urgency=low
* Create a libglapi.so symlink. (LP: #1232000)
diff --git a/debian/patches/i915-dont-default-to-2.1.patch
b/debian/patches/i915-dont-default-to-2.1.patch
new file mode 100644
index 000..ee95d14
--- /dev/null
+++ b/debian/patches/i915-dont-default-to-2.1.patch
@@ -0,0 +1,91 @@
+This is a revert of
http://cgit.freedesktop.org/mesa/mesa/commit/?id=97217a40f97cdeae0304798b607f704deb0c3558
+
+i915: Always enable GL 2.0 support.
+There's no point in shipping a non-GL2 driver today.
+
+From upstream mesa.
+
+diff --git a/src/mesa/drivers/dri/i915/intel_extensions.c
b/src/mesa/drivers/dri/i915/intel_extensions.c
+index 1e48231..7dc37d8 100644
+--- a/src/mesa/drivers/dri/i915/intel_extensions.c
b/src/mesa/drivers/dri/i915/intel_extensions.c
+@@ -95,8 +95,12 @@ intelInitExtensions(struct gl_context *ctx)
+ ctx->Extensions.ATI_separate_stencil = true;
+ ctx->Extensions.ATI_texture_env_combine3 = true;
+ ctx->Extensions.NV_texture_env_combine4 = true;
+- ctx->Extensions.ARB_fragment_shader = true;
+- ctx->Extensions.ARB_occlusion_query = true;
++
++ if (driQueryOptionb(&intel->optionCache, "fragment_shader"))
++ ctx->Extensions.ARB_fragment_shader = true;
++
++ if (driQueryOptionb(&intel->optionCache, "stub_occlusion_query"))
++ ctx->Extensions.ARB_occlusion_query = true;
+}
+
+if (intel->ctx.Mesa_DXTn
+diff --git a/src/mesa/drivers/dri/i915/intel_screen.c
b/src/mesa/drivers/dri/i915/intel_screen.c
+index 30a867e..2522b47 100644
+--- a/src/mesa/drivers/dri/i915/intel_screen.c
b/src/mesa/drivers/dri/i915/intel_screen.c
+@@ -58,6 +58,10 @@ PUBLIC const char __driConfigOptions[] =
+DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable,
945-only).")
+ DRI_CONF_OPT_END
+
++ DRI_CONF_OPT_BEGIN_B(fragment_shader, "true")
++ DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on
915/945.")
++ DRI_CONF_OPT_END
++
+DRI_CONF_SECTION_END
+DRI_CONF_SECTION_QUALITY
+ DRI_CONF_FORCE_S3TC_ENABLE("false")
+@@ -71,13 +75,17 @@ PUBLIC const char __driConfigOptions[] =
+ DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS("false")
+ DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED("false")
+
++ DRI_CONF_OPT_BEGIN_B(stub_occlusion_query, "false")
++ DRI_CONF_DESC(en, "Enable stub ARB_occlusion_query support on
915/945.")
++ DRI_CONF_OPT_END
++
+ DRI_CONF_OPT_BEGIN_B(shader_precompile, "true")
+DRI_CONF_DESC(en, "Perform code generation at shader link time.")
+ DRI_CONF_OPT_END
+DRI_CONF_SECTION_END
+ DRI_CONF_END;
+
+-const GLuint __driNConfigOptions = 12;
++const GLuint __driNConfigOptions = 14;
+
+ #include "intel_batchbuffer.h"
+ #include "intel_buffers.h"
+@@ -1064,12 +1072,27 @@ set_max_gl_versions(struct intel_screen *screen)
+int gl_version_override = _mesa_get_gl_version_override();
+
+switch (screen->gen) {
+- case 3:
++ case 3: {
++ bool has_fragment_shader = driQueryOptionb(&screen->optionCache,
"fragment_shader");
++ bool has_occlusion_query = driQueryOptionb(&screen->optionCache,
"stub_occlusion_query");
++
+ screen->max_gl_core_version = 0;
+ screen->max_gl_es1_version = 11;
+- screen->max_gl_compat_version = 21;
+- screen->max_gl_es2_version = 20;
++
++ if (has_fragment_shader && has_occlusion_query) {
++ screen->max_gl_compat_version = 21;
++ } else {
++ screen->max_gl_compat_version = 14;
++ }
++
++ if (has_fragment_shader) {
++ screen->max_gl_es2_version = 20;
++ } else {
++ screen->max_gl_es2_version = 0;
++ }
+ break;
++ }
++
+case 2:
+ screen->max_gl_core_version = 0;
+ screen->max_gl_compat_version = 13;
diff --git a/debian/patches/series b/debian/patches/series
index 2a99eea..b7e60f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
120-hide-x86sse.patch
aarch64.diff
egl-platform-mir.patch
+i915-dont-default-to-2.1.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
wit
xorg-server: Changes to 'ubuntu'
debian/changelog |7
debian/control|2
debian/patches/glx-corner-case-drawablegone.patch | 39 ++
debian/patches/glx-fix-memory-leak.patch | 237
debian/patches/glx-link-against-glapi.patch | 31 +
debian/patches/glx-remove-current-context-cache.patch | 338 ++
debian/patches/series |4
7 files changed, 657 insertions(+), 1 deletion(-)
New commits:
commit 201a6567e25a84cc4beff414c513b80d1ce556a0
Author: Maarten Lankhorst
Date: Tue Oct 1 14:42:41 2013 +0200
release to saucy
diff --git a/debian/changelog b/debian/changelog
index 2579614..28c2a30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.14.2.901-2ubuntu7) UNRELEASED; urgency=low
+xorg-server (2:1.14.2.901-2ubuntu7) saucy; urgency=low
* Make glx link against glapi for the dispatch table symbols. (LP: #1232000)
* Cherry pick a few related glx fixes from upstream.
- -- Maarten Lankhorst Mon, 30 Sep 2013
16:54:11 +0200
+ -- Maarten Lankhorst Tue, 01 Oct 2013
13:30:59 +0200
xorg-server (2:1.14.2.901-2ubuntu6) saucy; urgency=low
commit db9140f4e552c930d2f4d286002d5d4f2d22907c
Author: Maarten Lankhorst
Date: Tue Oct 1 13:30:51 2013 +0200
Make glx link against glapi for the dispatch table symbols. (LP: #1232000)
Cherry pick a few related glx fixes from upstream.
diff --git a/debian/changelog b/debian/changelog
index 32e9e3e..2579614 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.14.2.901-2ubuntu7) UNRELEASED; urgency=low
+
+ * Make glx link against glapi for the dispatch table symbols. (LP: #1232000)
+ * Cherry pick a few related glx fixes from upstream.
+
+ -- Maarten Lankhorst Mon, 30 Sep 2013
16:54:11 +0200
+
xorg-server (2:1.14.2.901-2ubuntu6) saucy; urgency=low
* xmir.patch: Drop vestigial libatomic-ops dependency, fixing
diff --git a/debian/control b/debian/control
index 95fe273..6a16bc1 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,7 @@ Build-Depends:
libdrm-dev (>= 2.4.38-0ubuntu2~) [!hurd-i386],
x11proto-gl-dev (>= 1.4.16),
mesa-common-dev (>= 7.10.3-0ubuntu1),
- libgl1-mesa-dev (>= 7.8),
+ libgl1-mesa-dev (>= 9.2-1ubuntu3),
libxmuu-dev (>= 1:0.99.1),
libxext-dev (>= 1:0.99.1),
libx11-dev (>= 1:0.99.2),
diff --git a/debian/patches/glx-corner-case-drawablegone.patch
b/debian/patches/glx-corner-case-drawablegone.patch
new file mode 100644
index 000..13af4e3
--- /dev/null
+++ b/debian/patches/glx-corner-case-drawablegone.patch
@@ -0,0 +1,39 @@
+From: Adam Jackson
+To: xorg-de...@lists.x.org
+Subject: [PATCH 3/3] glx: Fix a corner case in DrawableGone
+Date: Mon, 30 Sep 2013 12:11:24 -0400
+Message-Id: <1380557484-23805-4-git-send-email-a...@redhat.com>
+
+Losing the drawable does not change our notion of current client. Since
+the GL under us doesn't understand having a current context without
+current drawables (sigh), we do still need to loseCurrent so that we
+re-bind the context on the next request.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65030
+Signed-off-by: Adam Jackson
+---
+ glx/glxext.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glx/glxext.c b/glx/glxext.c
+index 534c791..75260a0 100644
+--- a/glx/glxext.c
b/glx/glxext.c
+@@ -132,8 +132,8 @@ DrawableGone(__GLXdrawable * glxPriv, XID xid)
+ next = c->next;
+ if (c->currentClient &&
+ (c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
++/* just force a re-bind the next time through */
+ (*c->loseCurrent) (c);
+-c->currentClient = NULL;
+ }
+ if (c->drawPriv == glxPriv)
+ c->drawPriv = NULL;
+--
+1.8.3.1
+
+___
+xorg-de...@lists.x.org: X.Org development
+Archives: http://lists.x.org/archives/xorg-devel
+Info: http://lists.x.org/mailman/listinfo/xorg-devel
+
diff --git a/debian/patches/glx-fix-memory-leak.patch
b/debian/patches/glx-fix-memory-leak.patch
new file mode 100644
index 000..a627909
--- /dev/null
+++ b/debian/patches/glx-fix-memory-leak.patch
@@ -0,0 +1,237 @@
+From: Adam Jackson
+To: xorg-de...@lists.x.org
+Subject: [PATCH 2/3] glx: Fix memory leak in context garbage collection
+Date: Mon, 30 Sep 2013 12:11:23 -0400
+Message-Id: <1380557484-23805-3-git-send-email-a...@redhat.com>
+
+I broke this, back in:
+
+commit a48dadc98a28c969741979b70b7a639f24f4cbbd
+Author: Adam Jackson
+Date: Mon Mar 21 11:59:29 2011 -0400
+
+ glx: Reimplement context tags
+
+In that, I changed the glx client state to not explicitly track the list
+of current contexts for the client (since that was what we were deriving
+tags from). The bug was that I removed the code for same from
+glxClientCallback without noticing that it had the side e
mesa: Changes to 'ubuntu'
debian/changelog |8 +++-
debian/libgl1-mesa-dev.install.in |1 +
debian/rules |1 -
3 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 7611f36d78a647120605be4edfe9f6acb1a40ec6
Author: Maarten Lankhorst
Date: Tue Oct 1 13:10:32 2013 +0200
Create a libglapi.so symlink. (LP: #1232000)
diff --git a/debian/changelog b/debian/changelog
index 37396f3..11f736f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (9.2-1ubuntu3) saucy; urgency=low
+
+ * Create a libglapi.so symlink. (LP: #1232000)
+
+ -- Maarten Lankhorst Tue, 01 Oct 2013
13:09:38 +0200
+
mesa (9.2-1ubuntu2) saucy; urgency=low
* Fix double-free in Mir EGL platform (LP: #1221974)
diff --git a/debian/libgl1-mesa-dev.install.in
b/debian/libgl1-mesa-dev.install.in
index 79c3d4a..a9a001f 100644
--- a/debian/libgl1-mesa-dev.install.in
+++ b/debian/libgl1-mesa-dev.install.in
@@ -1,2 +1,3 @@
dri/usr/lib/${DEB_HOST_MULTIARCH}/libGL.so usr/lib/${DEB_HOST_MULTIARCH}/mesa
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so usr/lib/${DEB_HOST_MULTIARCH}
dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/rules b/debian/rules
index e6c4504..9a8046c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -226,7 +226,6 @@ binary-arch: install
# Files only in git, not in tarballs, OK to use rm -f here:
set -e; for file in $(NOT_INSTALLED_EITHER); do rm -f
debian/tmp/$$file; done
# No need for these .so, they're just convenience libraries:
- rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
rm -f debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so
rm -f debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libgallium*.so
# purge .la files
commit e0a9f24ad3b0e6e215cc28b96bde7cf3a040f9bb
Author: Maarten Lankhorst
Date: Mon Sep 30 15:42:38 2013 +0200
kill extra space in changelog
diff --git a/debian/changelog b/debian/changelog
index 47a76eb..37396f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
mesa (9.2-1ubuntu2) saucy; urgency=low
- * Fix double-free in Mir EGL platform (LP: #1221974)
+ * Fix double-free in Mir EGL platform (LP: #1221974)
-- Christopher James Halse Rogers Tue, 17 Sep 2013
12:05:36 -0400
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vqzhw-0003nt...@vasks.debian.org
glamor-egl: Changes to 'ubuntu'
debian/changelog|6 ++
debian/control |2 +-
debian/patches/glapi-link.patch | 13 +
debian/patches/series |1 +
4 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 4e5a18e19955208822d7eb198b975c1fbe986624
Author: Maarten Lankhorst
Date: Tue Oct 1 14:41:31 2013 +0200
Link against libglapi to fix a symbol error. (LP: #1232658)
diff --git a/debian/changelog b/debian/changelog
index f9b316c..c43bb95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+glamor-egl (0.5.1-0ubuntu4) saucy; urgency=low
+
+ * Link against libglapi to fix a symbol error. (LP: #1232658)
+
+ -- Maarten Lankhorst Tue, 01 Oct 2013
13:51:50 +0200
+
glamor-egl (0.5.1-0ubuntu3) saucy; urgency=low
* temporarily add libatomic-ops-dev to build-depends.
diff --git a/debian/control b/debian/control
index 85213f7..80f6759 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
x11proto-dri2-dev,
libdrm-dev (>= 2.4.23),
xserver-xorg-dev (>= 2:1.10),
- libgl1-mesa-dev,
+ libgl1-mesa-dev (>= 9.2-1ubuntu3),
libpixman-1-dev,
libegl1-mesa-dev,
libgbm-dev,
diff --git a/debian/patches/glapi-link.patch b/debian/patches/glapi-link.patch
new file mode 100644
index 000..4c9efbc
--- /dev/null
+++ b/debian/patches/glapi-link.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index acde38f..76d09c6 100644
+--- a/configure.ac
b/configure.ac
+@@ -175,7 +175,7 @@ AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
+
+ if test "x$GLX_USE_TLS" = xyes ; then
+ GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
+-GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread"
++GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread -lglapi"
+ fi
+ AC_SUBST([GLX_DEFINES])
+ AC_SUBST([GLX_SYS_LIBS])
diff --git a/debian/patches/series b/debian/patches/series
index d92f925..05d1c8f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
fix-fdo65964.diff
+glapi-link.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vqzgh-0003gx...@vasks.debian.org
libegl1-mesa and libegl1-mesa-drivers
hi, Do we need libwayland-client0 and libwayland-server0 as dependency from libegl1-mesa? (http://packages.debian.org/jessie/libegl1-mesa) Shouldnt be the libwayland-client0 depending from libegl1-mesa? thx, Saulo A. Moraes
-intel 3.0 rc3
Hi I'd like to merge the latest rc to ubuntu, but I heard you take care of the Debian package these days. So do you prefer to have this in d-e or can I just update the d-u branch? ps. join #debian-x already -- t -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/524a8622.3030...@ubuntu.com
