xserver-xorg-video-intel: Changes to 'ubuntu-vivid'
debian/changelog | 7 ++ debian/patches/series | 1 debian/patches/sna-reject-cpu-blits-that-require-format-conversions.patch | 24 ++ debian/rules | 1 4 files changed, 33 insertions(+) New commits: commit 626be268acfddb3e53db5d1e5311acbdcac869be Author: Robert Hooker Date: Wed Oct 28 11:19:54 2015 -0400 Add sna-reject-cpu-blits-that-require-format-conversions.patch and build with --enable-wc-mmap diff --git a/debian/changelog b/debian/changelog index 2b82360..777e0c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2.3) UNRELEASED; urgency=medium + + * Add sna-reject-cpu-blits-that-require-format-conversions.patch and build with +--enable-wc-mmap: Fix webcam problems on Skylake (LP: #1506107) + + -- Robert Hooker Tue, 13 Oct 2015 12:25:21 -0400 + xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2.2) vivid-proposed; urgency=medium * fix-yuv-to-rgb-shared-on-intel-gen8.patch: Fix faulty yuv2rgb translation diff --git a/debian/patches/series b/debian/patches/series index ceb8885..e6ebe90 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ xmir.patch sna-force-frontbuffer-to-cpu-for-randr-fallback.diff fix-yuv-to-rgb-shared-on-intel-gen8.patch +sna-reject-cpu-blits-that-require-format-conversions.patch diff --git a/debian/patches/sna-reject-cpu-blits-that-require-format-conversions.patch b/debian/patches/sna-reject-cpu-blits-that-require-format-conversions.patch new file mode 100644 index 000..23db417 --- /dev/null +++ b/debian/patches/sna-reject-cpu-blits-that-require-format-conversions.patch @@ -0,0 +1,24 @@ +From cc9d7f603037d0d7eff346dd350f4d8b3f31 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Tue, 6 Jan 2015 13:29:49 + +Subject: sna: Reject CPU blits that require format conversions + +Signed-off-by: Chris Wilson + +diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c +index 3fbb9ec..92c5afc 100644 +--- a/src/sna/sna_render.c b/src/sna/sna_render.c +@@ -2336,6 +2336,9 @@ memcpy_copy_boxes(struct sna *sna, uint8_t op, + if (op != GXcopy) + return false; + ++ if (src_draw->depth != dst_draw->depth) ++ return false; ++ + clipped = (n > 1 || + box->x1 + dx > 0 || + box->y1 + dy > 0 || +-- +cgit v0.10.2 + diff --git a/debian/rules b/debian/rules index 037f617..241bcf1 100755 --- a/debian/rules +++ b/debian/rules @@ -24,6 +24,7 @@ override_dh_auto_configure: --with-default-accel=sna \ --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))" \ --disable-silent-rules \ + --enable-wc-mmap \ $(valgrind) # Install in debian/tmp to retain control through dh_install:
xserver-xorg-video-intel: Changes to 'ubuntu'
| 94 src/sna/sna_io.c| 31 src/sna/sna_present.c | 510 ++ src/sna/sna_render.c| 20 src/sna/sna_render.h|9 src/sna/sna_render_inline.h |6 src/sna/sna_tiling.c|4 src/sna/sna_trapezoids_boxes.c |4 src/sna/sna_trapezoids_imprecise.c | 344 - src/sna/sna_trapezoids_mono.c | 125 src/sna/sna_trapezoids_precise.c| 344 - src/sna/sna_video.c | 66 src/sna/sna_video.h |3 src/sna/sna_video_overlay.c | 12 src/sna/sna_video_sprite.c | 27 src/sna/sna_video_textured.c|5 src/sna/xassert.h | 17 src/uxa/i965_video.c|1 src/uxa/intel.h | 16 src/uxa/intel_display.c | 174 src/uxa/intel_dri.c | 484 +- src/uxa/intel_driver.c | 36 src/uxa/intel_memory.c |2 src/uxa/intel_present.c | 24 test/.gitignore |5 test/Makefile.am|5 test/basic-copyplane.c | 99 test/dri2-race.c| 274 + test/dri2-speed.c | 342 + test/dri2-test.c| 78 test/dri3-test.c| 62 test/dri3.c | 34 test/present-speed.c| 615 +++ test/present-test.c | 1432 ++- test/render-glyphs.c| 441 ++ test/render-trapezoid.c | 125 test/render-triangle.c | 180 test/test.h |9 test/test_image.c | 36 tools/.gitignore|4 tools/Makefile.am | 21 tools/backlight_helper.c|6 tools/cursor.c | 111 tools/dri3info.c| 329 + tools/virtual.c | 261 - 109 files changed, 12527 insertions(+), 4230 deletions(-) New commits: commit 5254fdd5cfe1b8cf673eda161f8fcc597e240e3c Author: Robert Hooker Date: Wed Aug 19 00:47:38 2015 -0400 Drop upstream patches diff --git a/debian/changelog b/debian/changelog index e139932..0e7222c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1) UNRELEASED; urgency=medium + + * Merge from debian-experimental +- debian/patches/fix-sna-external-slave-rotation.patch + debian/patches/fix-sna-fstat-include.patch + debian/patches/fix-uxa-fstat-include.patch + debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch + debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff + Drop all upstream patches. + + -- Robert Hooker Wed, 19 Aug 2015 00:42:34 -0400 + xserver-xorg-video-intel (2:2.99.917+git20150808-1~exp1) UNRELEASED; urgency=medium * New upstream snapshot. diff --git a/debian/patches/fix-sna-external-slave-rotation.patch b/debian/patches/fix-sna-external-slave-rotation.patch deleted file mode 100644 index 5251194..000 --- a/debian/patches/fix-sna-external-slave-rotation.patch +++ /dev/null @@ -1,70 +0,0 @@ -commit 1cffbd9a8e96642bdbabf4e40829a5f1473b5bf9 -Author: Chris Wilson -Date: Tue Jan 13 10:50:36 2015 + -Bug-Ubuntu: https://launchpad.net/bugs/1410238 - -sna: Combine slave CRTC offsets with rotation - -When applying both a slave offset and an output rotation, order is
libdrm: Changes to 'debian-unstable'
amdgpu/amdgpu.h |5 + amdgpu/amdgpu_device.c | 33 +++- amdgpu/amdgpu_internal.h | 13 +-- amdgpu/amdgpu_vamgr.c| 63 +++ configure.ac |2 debian/changelog |7 + debian/libdrm-freedreno1.symbols |1 debian/rules |2 freedreno/freedreno-symbol-check |1 freedreno/freedreno_drmif.h |3 freedreno/freedreno_pipe.c |8 +- freedreno/freedreno_priv.h |2 freedreno/kgsl/kgsl_pipe.c |3 freedreno/msm/msm_bo.c |6 - freedreno/msm/msm_pipe.c |5 - freedreno/msm/msm_priv.h | 21 - freedreno/msm/msm_ringbuffer.c | 155 +-- tests/amdgpu/amdgpu_test.c |5 + tests/amdgpu/basic_tests.c |5 + tests/amdgpu/bo_tests.c |5 + tests/amdgpu/cs_tests.c |5 + tests/amdgpu/vce_tests.c |6 + tests/modetest/modetest.c| 94 --- xf86drmMode.c| 12 --- 24 files changed, 326 insertions(+), 136 deletions(-) New commits: commit 50949b57acc5860b036410683b69a98e12e3fffc Author: Robert Hooker Date: Tue Aug 18 16:40:35 2015 -0400 Bump symbols and shlibs for freedreno diff --git a/debian/changelog b/debian/changelog index c1df6aa..e9214e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libdrm (2.4.64-1) UNRELEASED; urgency=medium * New upstream release. + * Bump symbols file and shlibs for libdrm-freedreno1. -- Robert Hooker Tue, 18 Aug 2015 16:05:01 -0400 diff --git a/debian/libdrm-freedreno1.symbols b/debian/libdrm-freedreno1.symbols index b7602f9..efb91a9 100644 --- a/debian/libdrm-freedreno1.symbols +++ b/debian/libdrm-freedreno1.symbols @@ -21,6 +21,7 @@ libdrm_freedreno.so.1 libdrm-freedreno1 #MINVER# fd_pipe_get_param@Base 0 fd_pipe_new@Base 0 fd_pipe_wait@Base 0 + fd_pipe_wait_timeout@Base 2.4.64 fd_ringbuffer_del@Base 0 fd_ringbuffer_emit_reloc_ring@Base 0 fd_ringbuffer_flush@Base 0 diff --git a/debian/rules b/debian/rules index ec465df..dee3894 100755 --- a/debian/rules +++ b/debian/rules @@ -106,7 +106,7 @@ endif dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.39)' -- -c4 ifeq ($(ARM), yes) dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4 - dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1 (>= 2.4.57)' -- -c4 + dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1 (>= 2.4.64)' -- -c4 dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1 (>= 2.4.60)' -- -c4 dh_makeshlibs -plibdrm-tegra0 -V'libdrm-tegra0' -- -c4 endif commit 564ab8aa8535474c295406154c1626529b518da4 Author: Robert Hooker Date: Tue Aug 18 16:38:41 2015 -0400 Bump changelog. diff --git a/debian/changelog b/debian/changelog index 6f71a39..c1df6aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.4.64-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Robert Hooker Tue, 18 Aug 2015 16:05:01 -0400 + libdrm (2.4.63-1) unstable; urgency=medium [ Robert Hooker ] commit ab2fadabde3829b1ec56bd4756165dd9bd281488 Author: Rob Clark Date: Tue Aug 18 11:56:50 2015 -0400 Bump version for release Signed-off-by: Rob Clark diff --git a/configure.ac b/configure.ac index e2a2f16..f07507b 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ([2.63]) AC_INIT([libdrm], -[2.4.63], +[2.4.64], [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI], [libdrm]) commit 04a118d800280c88aed5cb4a5f29fdfb5a38e36b Author: Rob Clark Date: Tue Aug 18 10:53:36 2015 -0400 freedreno: update freedreno-symbol-check Signed-off-by: Rob Clark diff --git a/freedreno/freedreno-symbol-check b/freedreno/freedreno-symbol-check index 7115448..e593df4 100755 --- a/freedreno/freedreno-symbol-check +++ b/freedreno/freedreno-symbol-check @@ -32,6 +32,7 @@ fd_pipe_del fd_pipe_get_param fd_pipe_new fd_pipe_wait +fd_pipe_wait_timeout fd_ringbuffer_del fd_ringbuffer_emit_reloc_ring fd_ringbuffer_flush commit 5e5a3c48b83fb3929e57cb4e7261624a327137f3 Author: Thierry Reding Date: Wed Apr 9 09:00:49 2014 +0200 libdrm: Make indentation consistent Use tabs and spaces consistently to align function arguments on subsequent lines with those of the first line. Acked-by: Laurent Pinchart Signed-off-by: Thierry Reding diff --git a/xf86drmMode.c b/xf86drmMode.c index 23348d7..9b70ce8 100644 --- a/xf86drmMode.c +++ b/xf86drmMode.c @@ -249,7 +249,7 @@ err_allocs: } int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth, - uint8_t bpp, uint32_t pitch, uint32_t bo_handle, +uint8_t bpp, uint32_t pitc
libdrm: Changes to 'upstream-unstable'
amdgpu/amdgpu.h |5 +
amdgpu/amdgpu_device.c | 33 +++-
amdgpu/amdgpu_internal.h | 13 +--
amdgpu/amdgpu_vamgr.c| 63 +++
configure.ac |2
freedreno/freedreno-symbol-check |1
freedreno/freedreno_drmif.h |3
freedreno/freedreno_pipe.c |8 +-
freedreno/freedreno_priv.h |2
freedreno/kgsl/kgsl_pipe.c |3
freedreno/msm/msm_bo.c |6 -
freedreno/msm/msm_pipe.c |5 -
freedreno/msm/msm_priv.h | 21 -
freedreno/msm/msm_ringbuffer.c | 155 +--
tests/amdgpu/amdgpu_test.c |5 +
tests/amdgpu/basic_tests.c |5 +
tests/amdgpu/bo_tests.c |5 +
tests/amdgpu/cs_tests.c |5 +
tests/amdgpu/vce_tests.c |6 +
tests/modetest/modetest.c| 94 ---
xf86drmMode.c| 12 ---
21 files changed, 317 insertions(+), 135 deletions(-)
New commits:
commit ab2fadabde3829b1ec56bd4756165dd9bd281488
Author: Rob Clark
Date: Tue Aug 18 11:56:50 2015 -0400
Bump version for release
Signed-off-by: Rob Clark
diff --git a/configure.ac b/configure.ac
index e2a2f16..f07507b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
AC_PREREQ([2.63])
AC_INIT([libdrm],
-[2.4.63],
+[2.4.64],
[https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
[libdrm])
commit 04a118d800280c88aed5cb4a5f29fdfb5a38e36b
Author: Rob Clark
Date: Tue Aug 18 10:53:36 2015 -0400
freedreno: update freedreno-symbol-check
Signed-off-by: Rob Clark
diff --git a/freedreno/freedreno-symbol-check b/freedreno/freedreno-symbol-check
index 7115448..e593df4 100755
--- a/freedreno/freedreno-symbol-check
+++ b/freedreno/freedreno-symbol-check
@@ -32,6 +32,7 @@ fd_pipe_del
fd_pipe_get_param
fd_pipe_new
fd_pipe_wait
+fd_pipe_wait_timeout
fd_ringbuffer_del
fd_ringbuffer_emit_reloc_ring
fd_ringbuffer_flush
commit 5e5a3c48b83fb3929e57cb4e7261624a327137f3
Author: Thierry Reding
Date: Wed Apr 9 09:00:49 2014 +0200
libdrm: Make indentation consistent
Use tabs and spaces consistently to align function arguments on
subsequent lines with those of the first line.
Acked-by: Laurent Pinchart
Signed-off-by: Thierry Reding
diff --git a/xf86drmMode.c b/xf86drmMode.c
index 23348d7..9b70ce8 100644
--- a/xf86drmMode.c
+++ b/xf86drmMode.c
@@ -249,7 +249,7 @@ err_allocs:
}
int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth,
- uint8_t bpp, uint32_t pitch, uint32_t bo_handle,
+uint8_t bpp, uint32_t pitch, uint32_t bo_handle,
uint32_t *buf_id)
{
struct drm_mode_fb_cmd f;
@@ -374,7 +374,7 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
}
int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
- uint32_t x, uint32_t y, uint32_t *connectors, int count,
+ uint32_t x, uint32_t y, uint32_t *connectors, int count,
drmModeModeInfoPtr mode)
{
struct drm_mode_crtc crtc;
commit d2d361cddd2bdf8f1bf627b9ebe8ca802156f8af
Author: Thierry Reding
Date: Wed Apr 9 08:59:04 2014 +0200
libdrm: Remove gratuitous blank lines
Usage of blank lines can be a matter of taste, of course, but for these
we can surely all agree that they're not needed and inconsistent.
Acked-by: Laurent Pinchart
Signed-off-by: Thierry Reding
diff --git a/xf86drmMode.c b/xf86drmMode.c
index fc19504..23348d7 100644
--- a/xf86drmMode.c
+++ b/xf86drmMode.c
@@ -114,7 +114,6 @@ void drmModeFreeResources(drmModeResPtr ptr)
drmFree(ptr->connectors);
drmFree(ptr->encoders);
drmFree(ptr);
-
}
void drmModeFreeFB(drmModeFBPtr ptr)
@@ -132,7 +131,6 @@ void drmModeFreeCrtc(drmModeCrtcPtr ptr)
return;
drmFree(ptr);
-
}
void drmModeFreeConnector(drmModeConnectorPtr ptr)
@@ -145,7 +143,6 @@ void drmModeFreeConnector(drmModeConnectorPtr ptr)
drmFree(ptr->props);
drmFree(ptr->modes);
drmFree(ptr);
-
}
void drmModeFreeEncoder(drmModeEncoderPtr ptr)
@@ -340,7 +337,6 @@ int drmModeDirtyFB(int fd, uint32_t bufferId,
return DRM_IOCTL(fd, DRM_IOCTL_MODE_DIRTYFB, &dirty);
}
-
/*
* Crtc functions
*/
@@ -377,7 +373,6 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
return r;
}
-
int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
uint32_t x, uint32_t y, uint32_t *connectors, int count,
drmModeModeInfoPtr mode)
@@ -610,7 +605,6 @@ int drmModeDetachMode(int fd, uint32_t connector_id,
drmModeModeInfoPtr mode_inf
return DRM_IOCTL(fd, DRM_IOCTL_MODE_DETACHMODE, &res);
}
-
drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id)
{
struct drm
libdrm: Changes to 'debian-unstable'
.gitignore |2 Makefile.am|6 Makefile.sources |5 amdgpu/Makefile.am | 57 amdgpu/amdgpu-symbol-check | 51 amdgpu/amdgpu.h| 1178 +++ amdgpu/amdgpu_bo.c | 705 amdgpu/amdgpu_cs.c | 372 ++ amdgpu/amdgpu_device.c | 274 + amdgpu/amdgpu_gpu_info.c | 310 ++ amdgpu/amdgpu_internal.h | 190 + amdgpu/amdgpu_vamgr.c | 288 + amdgpu/libdrm_amdgpu.pc.in | 10 amdgpu/util_hash.c | 387 ++ amdgpu/util_hash.h | 107 amdgpu/util_hash_table.c | 262 + amdgpu/util_hash_table.h | 73 configure.ac | 46 debian/changelog |8 debian/control | 32 debian/libdrm-amdgpu1.install |1 debian/libdrm-amdgpu1.symbols | 35 debian/patches/Fix-headers-inclusion-in-xf86drmMode.c.diff | 39 debian/patches/series |1 debian/rules |4 freedreno/Makefile.sources |3 freedreno/freedreno_bo.c |6 freedreno/freedreno_priv.h |2 freedreno/kgsl/kgsl_bo.c |1 freedreno/kgsl/kgsl_pipe.c |2 freedreno/list.h | 137 freedreno/msm/msm_bo.c |1 include/drm/amdgpu_drm.h | 645 intel/intel_bufmgr.h |8 intel/intel_bufmgr_gem.c | 414 -- intel/test_decode.c|2 libkms/libkms.h|4 libkms/linux.c |4 man/Makefile.am| 11 omap/omap_drm.c|4 radeon/r600_pci_ids.h |1 tests/Makefile.am | 12 tests/amdgpu/Makefile.am | 29 tests/amdgpu/amdgpu_test.c | 222 + tests/amdgpu/amdgpu_test.h | 236 + tests/amdgpu/basic_tests.c | 838 + tests/amdgpu/bo_tests.c| 181 + tests/amdgpu/cs_tests.c| 387 ++ tests/amdgpu/frame.h | 1949 + tests/amdgpu/uvd_messages.h| 813 + tests/amdgpu/vce_ib.h | 318 ++ tests/amdgpu/vce_tests.c | 489 +++ tests/kmstest/main.c |1 tests/modeprint/modeprint.c|4 tests/name_from_fd.c |2 tests/radeon/Makefile.am |1 tests/radeon/list.h| 137 tests/radeon/rbo.h |2 util_double_list.h | 137 util_math.h| 33 xf86drm.c | 28 xf86drm.h | 11 xf86drmMode.c | 30 xf86drmMode.h |4 64 files changed, 10804 insertions(+), 748 deletions(-) New commits: commit d89c15de45d69133ad8b2f5c438c96e54a742155 Author: Robert Hooker Date: Fri Aug 14 13:43:14 2015 -0400 Update changelog diff --git a/debian/changelog b/debian/changelog index 45e4cb5..9bd4434 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libdrm (2.4.63-1) UNRELEASED; urgency=medium * New upstream release. - Drop Fix-headers-inclusion-in-xf86drmMode.c.diff, upstream. + * Add new libdrm-amdgpu1 package. -- Robert Hooker Fri, 14 Aug 2015 13:15:14 -0400
libdrm: Changes to 'upstream-unstable'
.gitignore |2
Makefile.am |6
Makefile.sources|5
amdgpu/Makefile.am | 57 +
amdgpu/amdgpu-symbol-check | 51 +
amdgpu/amdgpu.h | 1178 ++
amdgpu/amdgpu_bo.c | 705 +++
amdgpu/amdgpu_cs.c | 372
amdgpu/amdgpu_device.c | 274 ++
amdgpu/amdgpu_gpu_info.c| 310 ++
amdgpu/amdgpu_internal.h| 190
amdgpu/amdgpu_vamgr.c | 288 ++
amdgpu/libdrm_amdgpu.pc.in | 10
amdgpu/util_hash.c | 387
amdgpu/util_hash.h | 107 ++
amdgpu/util_hash_table.c| 262 +
amdgpu/util_hash_table.h| 73 +
configure.ac| 48 +
freedreno/Makefile.sources |3
freedreno/freedreno_bo.c|6
freedreno/freedreno_priv.h |2
freedreno/kgsl/kgsl_bo.c|1
freedreno/kgsl/kgsl_pipe.c |2
freedreno/list.h| 137 ---
freedreno/msm/msm_bo.c |1
include/drm/amdgpu_drm.h| 645 ++
intel/intel_bufmgr.h|8
intel/intel_bufmgr_gem.c| 414 -
intel/test_decode.c |2
libkms/libkms.h |4
libkms/linux.c |4
man/Makefile.am | 11
omap/omap_drm.c |4
radeon/r600_pci_ids.h |1
tests/Makefile.am | 12
tests/amdgpu/Makefile.am| 29
tests/amdgpu/amdgpu_test.c | 222 +
tests/amdgpu/amdgpu_test.h | 236 +
tests/amdgpu/basic_tests.c | 838 ++
tests/amdgpu/bo_tests.c | 181
tests/amdgpu/cs_tests.c | 387
tests/amdgpu/frame.h| 1949
tests/amdgpu/uvd_messages.h | 813 ++
tests/amdgpu/vce_ib.h | 318 +++
tests/amdgpu/vce_tests.c| 489 +++
tests/kmstest/main.c|1
tests/modeprint/modeprint.c |4
tests/name_from_fd.c|2
tests/radeon/Makefile.am|1
tests/radeon/list.h | 137 ---
tests/radeon/rbo.h |2
util_double_list.h | 137 +++
util_math.h | 33
xf86drm.c | 28
xf86drm.h | 11
xf86drmMode.c | 30
xf86drmMode.h |4
57 files changed, 10725 insertions(+), 709 deletions(-)
New commits:
commit f045da45fee94a7179cced09a20b691c5167cef4
Author: Marek Olšák
Date: Fri Aug 14 14:19:29 2015 +0200
Bump version for release
diff --git a/configure.ac b/configure.ac
index 81e0f80..e2a2f16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
AC_PREREQ([2.63])
AC_INIT([libdrm],
-[2.4.62],
+[2.4.63],
[https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
[libdrm])
commit 15350568ccae525899aeb963f1cb66287e876e63
Author: Emil Velikov
Date: Fri Aug 7 17:29:11 2015 +0100
amdgpu: add symbols check test
Signed-off-by: Emil Velikov
Reviewed-by: Alex Deucher
Reviewed-by: Christian König
Reviewed-by: Jammy Zhou
diff --git a/amdgpu/Makefile.am b/amdgpu/Makefile.am
index 82e78c7..ed97803 100644
--- a/amdgpu/Makefile.am
+++ b/amdgpu/Makefile.am
@@ -52,3 +52,6 @@ libdrm_amdgpuinclude_HEADERS = \
pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libdrm_amdgpu.pc
+
+TESTS = amdgpu-symbol-check
+EXTRA_DIST = $(TESTS)
diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbol-check
new file mode 100755
index 000..9a0b36c
--- /dev/null
+++ b/amdgpu/amdgpu-symbol-check
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# The following symbols (past the first five) are taken from the public
headers.
+# A list of the latter should be available
Makefile.am/libdrm_amdgpuinclude_HEADERS
+
+FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_amdgpu.so} | awk
'{print $3}' | while read func; do
+( grep -q "^$func$" || echo $func ) <
Date: Fri Aug 7 17:09:35 2015 +0100
amdgpu: hide the final internal functions from global namespace
Thus the only symbols that we export are the ones officially provided by
the API.
Signed-off-by: Emil Velikov
Reviewed-by: Alex Deucher
Reviewed-by: Christian König
Reviewed-by: Jammy Zhou
diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c
index aacb42c..7607f2c 100644
--- a/amdgpu/amdgpu_bo.c
+++ b/amdgpu/amdgpu_bo.c
@@ -53,7 +53,7 @@ static void amdgpu_close_kms_handle(amdgpu_device_handle dev,
drmIoctl(dev->fd, DRM_IOCTL_GEM_CLOSE, &args);
}
-void amdgpu_bo_free_internal(amdgpu_bo_handle bo)
+drm_private void amdgpu_bo_free_internal(amdgpu_bo_handle bo)
{
/* Remove the buffer from the hash tables. */
pthread_mutex_lock(&bo->dev->bo_table_mutex);
diff --git a/amdgpu/amdgpu_cs.c b/amdgpu/amdgpu_cs.c
index fd28bd9..ea35326 100644
--- a/amdgpu/amdgpu_cs.c
+++ b/amdgpu/amdgpu_cs.c
@@ -290,7 +290,7 @@ int amdgpu_cs_submit(amdgpu_context_handle context,
*
*
xserver-xorg-video-intel: Changes to 'ubuntu-utopic'
debian/changelog |6 +++
debian/patches/series |1
debian/patches/sna-clear-cursor-image-after-rotation.patch | 24 +
3 files changed, 31 insertions(+)
New commits:
commit 241a672570698fb69504334103c36c567ae6c54c
Author: Robert Hooker
Date: Thu May 28 17:57:04 2015 -0400
Add a patch to fix lp1376760, double cursor on rotation
diff --git a/debian/changelog b/debian/changelog
index 426edc8..8ba312b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.5) UNRELEASED;
urgency=medium
+ [ Timo Aaltonen ]
* sna-gen8-clear-instancing-enabled-bit-between-batches.diff: Fix
corruptions and missing letters on 2nd head. (LP: #1432194)
+ [ Robert Hooker ]
+ * sna-clear-cursor-image-after-rotation.patch: Fix a double cursor problem
after
+rotating the screen (LP: #1376760) (LP: #1443345) backport from
+a88795c641 upstream.
+
-- Timo Aaltonen Mon, 11 May 2015 13:41:20 +0300
xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.4) utopic; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index 83950b0..557bed1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ bdw-annotate-more-64bit-pointer-locations.diff
bdw-clamp-urb-allocations-for-gt3.diff
fix-sna-trapezoids.patch
sna-gen8-clear-instancing-enabled-bit-between-batches.diff
+sna-clear-cursor-image-after-rotation.patch
diff --git a/debian/patches/sna-clear-cursor-image-after-rotation.patch
b/debian/patches/sna-clear-cursor-image-after-rotation.patch
new file mode 100644
index 000..b71b118
--- /dev/null
+++ b/debian/patches/sna-clear-cursor-image-after-rotation.patch
@@ -0,0 +1,24 @@
+From a88795c64123e4084044451d8861838ea904abd9 Mon Sep 17 00:00:00 2001
+From: Chris Wilson
+Date: Tue, 29 Jul 2014 21:11:09 +0100
+Subject: sna: Clear cursor image after rotation
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81886
+Signed-off-by: Chris Wilson
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index 8964e77..eed68d3 100644
+--- a/src/sna/sna_display.c
b/src/sna/sna_display.c
+@@ -4294,7 +4294,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna
*sna, xf86CrtcPtr crtc)
+ image = sna->cursor.scratch;
+ cursor->last_width = cursor->last_height = size;
+ }
+- if (width < cursor->last_width || height < cursor->last_height)
++ if (width < cursor->last_width || height < cursor->last_height ||
rotation != cursor->rotation)
+ memset(image, 0, 4*size*size);
+ if (rotation == RR_Rotate_0) {
+ if (argb == NULL) {
+--
+cgit v0.10.2
+
--
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/e1yy5na-0007on...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu-utopic'
debian/changelog | 15 +
debian/patches/bdw-annotate-more-64bit-pointer-locations.diff | 20 -
debian/patches/bdw-clamp-urb-allocations-for-gt3.diff |9
debian/patches/fix-sna-trapezoids.patch | 122 ++
debian/patches/series |1
5 files changed, 154 insertions(+), 13 deletions(-)
New commits:
commit a867797fedf60067a88f4ecfb6e44cc0a270802a
Author: Robert Hooker
Date: Thu May 28 09:58:38 2015 -0400
Update to what's currently in Utopic.
diff --git a/debian/changelog b/debian/changelog
index 680ee24..dd711c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.4) utopic; urgency=medium
+
+ * fix-sna-trapezoids.patch: Fix client-side shadows for GTK+ 3.14
+(LP: #1378188).
+
+ -- Marius Gedminas Tue, 05 May 2015 11:25:15 +0100
+
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.3) utopic; urgency=medium
+
+ * bdw-annotate-more-64bit-pointer-locations.diff
+bdw-clamp-urb-allocations-for-gt3.diff:
+Fix BDW GT3. (#136)
+
+ -- Timo Aaltonen Wed, 22 Apr 2015 19:57:12 +0300
+
xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) utopic-proposed;
urgency=medium
[ Timo Aaltonen ]
diff --git a/debian/patches/bdw-annotate-more-64bit-pointer-locations.diff
b/debian/patches/bdw-annotate-more-64bit-pointer-locations.diff
index 3ba449b..d42090d 100644
--- a/debian/patches/bdw-annotate-more-64bit-pointer-locations.diff
+++ b/debian/patches/bdw-annotate-more-64bit-pointer-locations.diff
@@ -8,7 +8,7 @@ Date: Wed Oct 22 19:30:21 2014 +0100
--- a/src/sna/gen8_render.c
+++ b/src/sna/gen8_render.c
-@@ -474,7 +474,7 @@ gen8_emit_vs_invariant(struct sna *sna)
+@@ -523,7 +523,7 @@ gen8_emit_vs_invariant(struct sna *sna)
OUT_BATCH(GEN8_3DSTATE_VS | (9 - 2));
OUT_BATCH64(0); /* no VS kernel */
OUT_BATCH(0);
@@ -17,7 +17,7 @@ Date: Wed Oct 22 19:30:21 2014 +0100
OUT_BATCH(0);
OUT_BATCH(1 << 1); /* pass-through */
OUT_BATCH(1 << 16 | 1 << 21); /* urb write to SBE */
-@@ -500,12 +500,10 @@ static void
+@@ -549,12 +549,10 @@ static void
gen8_emit_hs_invariant(struct sna *sna)
{
OUT_BATCH(GEN8_3DSTATE_HS | (9 - 2));
@@ -32,7 +32,7 @@ Date: Wed Oct 22 19:30:21 2014 +0100
OUT_BATCH(0);
OUT_BATCH(0); /* pass-through */
-@@ -541,11 +539,9 @@ static void
+@@ -590,11 +588,9 @@ static void
gen8_emit_ds_invariant(struct sna *sna)
{
OUT_BATCH(GEN8_3DSTATE_DS | (9 - 2));
@@ -46,7 +46,7 @@ Date: Wed Oct 22 19:30:21 2014 +0100
OUT_BATCH(0);
OUT_BATCH(0);
OUT_BATCH(0);
-@@ -573,15 +569,13 @@ static void
+@@ -622,15 +618,13 @@ static void
gen8_emit_gs_invariant(struct sna *sna)
{
OUT_BATCH(GEN8_3DSTATE_GS | (10 - 2));
@@ -65,7 +65,7 @@ Date: Wed Oct 22 19:30:21 2014 +0100
#if SIM
OUT_BATCH(GEN8_3DSTATE_CONSTANT_GS | (11 - 2));
-@@ -690,13 +684,15 @@ gen8_emit_wm_invariant(struct sna *sna)
+@@ -744,13 +738,15 @@ gen8_emit_wm_invariant(struct sna *sna)
OUT_BATCH(WM_PERSPECTIVE_PIXEL_BARYCENTRIC);
#if SIM
@@ -84,7 +84,7 @@ Date: Wed Oct 22 19:30:21 2014 +0100
OUT_BATCH(0);
#endif
-@@ -834,6 +830,7 @@ gen8_emit_cc(struct sna *sna, uint32_t b
+@@ -891,6 +887,7 @@ gen8_emit_cc(struct sna *sna, uint32_t b
} else
OUT_BATCH(PS_BLEND_HAS_WRITEABLE_RT);
@@ -92,7 +92,7 @@ Date: Wed Oct 22 19:30:21 2014 +0100
OUT_BATCH(GEN8_3DSTATE_BLEND_STATE_POINTERS | (2 - 2));
OUT_BATCH((render->cc_blend + blend * GEN8_BLEND_STATE_PADDED_SIZE) |
1);
-@@ -896,6 +893,9 @@ gen8_emit_wm(struct sna *sna, int kernel
+@@ -953,6 +950,9 @@ gen8_emit_wm(struct sna *sna, int kernel
wm_kernels[kernel].name,
wm_kernels[kernel].num_surfaces,
kernels[0], kernels[1], kernels[2]));
@@ -102,7 +102,7 @@ Date: Wed Oct 22 19:30:21 2014 +0100
OUT_BATCH(GEN8_3DSTATE_PS | (12 - 2));
OUT_BATCH64(kernels[0] ?: kernels[1] ?: kernels[2]);
-@@ -1185,8 +1185,8 @@ static bool gen8_magic_ca_pass(struct sn
+@@ -1242,8 +1242,8 @@ static bool gen8_magic_ca_pass(struct sn
true, true,
op->is_affine));
@@ -113,7 +113,7 @@ Date: Wed Oct 22 19:30:21 2014 +0100
OUT_BATCH(sna->render.vertex_index - sna->render.vertex_start);
OUT_BATCH(sna->render.vertex_start);
OUT_BATCH(1); /* single instance */
-@@ -1371,7 +1371,7 @@ static void gen8_emit_primitive(struct s
+@@ -1435,7 +1435,7 @@ static void gen8_emit_primitive(struct s
}
OUT_BATCH(GEN8_3DPRIMITIVE | (7 - 2));
@@ -122,7 +122,7 @@ Date: Wed Oct 22 19:30:21 2014 +0100
sna->render.vertex_offset = sna->kgem.nbatch;
OUT_BATCH(
xserver-xorg-video-ati: Changes to 'ubuntu'
debian/patches/fix-xorg-configure.patch | 28 1 file changed, 28 insertions(+) New commits: commit 288b67145ee18a8bf50b19fca5b4985e068d030b Author: Robert Hooker Date: Tue Mar 11 10:22:14 2014 -0400 Actually add fix-xorg-configure.patch diff --git a/debian/patches/fix-xorg-configure.patch b/debian/patches/fix-xorg-configure.patch new file mode 100644 index 000..a2b7135 --- /dev/null +++ b/debian/patches/fix-xorg-configure.patch @@ -0,0 +1,28 @@ +commit 7cd972a85705341dd8306eefc558ed9e5def05d7 +Author: Maarten Lankhorst +Date: Thu Feb 20 11:14:03 2014 +0100 + +return immediately in preinit when called with PROBE_DETECT + +This fixes a crash with Xorg -configure. + +Bug: +https://bugs.launchpad.net/ubuntu/+source/xorg/+bug/1278046 + +Signed-off-by: Maarten Lankhorst +Reviewed-by: Alex Deucher + +diff --git a/src/radeon_kms.c b/src/radeon_kms.c +index 21a420f..4a6c38e 100644 +--- a/src/radeon_kms.c b/src/radeon_kms.c +@@ -781,6 +781,9 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags) + uint32_t tiling = 0; + int cpp; + ++if (flags & PROBE_DETECT) ++return TRUE; ++ + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, + "RADEONPreInit_KMS\n"); + if (pScrn->numEntities != 1) return FALSE; -- 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/e1wnnzy-9a...@moszumanska.debian.org
xserver-xorg-input-synaptics: Changes to 'ubuntu'
debian/changelog |6 ++ 1 file changed, 6 insertions(+) New commits: commit 8eed9cbe6d4a9c342cefb7e2dd5ff3c2e56ed4db Author: Robert Hooker Date: Thu Feb 6 11:26:32 2014 -0500 Add missing changelog entry not pushed to git. diff --git a/debian/changelog b/debian/changelog index 09f66f1..4482754 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,12 @@ xserver-xorg-input-synaptics (1.7.3-1ubuntu1) trusty; urgency=low -- Robert Hooker Thu, 06 Feb 2014 11:11:26 -0500 +xserver-xorg-input-synaptics (1.7.1-0ubuntu2) trusty; urgency=medium + + * Rebuild for xorg 1.15 abi. + + -- Maarten Lankhorst Wed, 05 Feb 2014 09:40:08 + + xserver-xorg-input-synaptics (1.7.3-1) unstable; urgency=medium [ Michele Cane ] -- 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/e1wbrmv-0005sp...@moszumanska.debian.org
xserver-xorg-input-synaptics: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4d6cffe6bfa0f2ad308da040815985c06efc6a94 Author: Robert Hooker Date: Thu Feb 6 11:23:08 2014 -0500 Upload to trusty diff --git a/debian/changelog b/debian/changelog index c8430a2..09f66f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-synaptics (1.7.3-1ubuntu1) UNRELEASED; urgency=low +xserver-xorg-input-synaptics (1.7.3-1ubuntu1) trusty; urgency=low * Merge from debian-unstable. * Drop long disabled patches from the archive. -- 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/e1wbrjv-ns...@moszumanska.debian.org
libpciaccess: Changes to 'debian-unstable'
debian/changelog |7 +++
debian/control |4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 07dfb14eba868d110da6d1eec3f06f6cc299343f
Author: Robert Hooker
Date: Wed Jan 29 16:40:34 2014 -0500
debian/control: Fix typo in package descriptions
diff --git a/debian/changelog b/debian/changelog
index 5145de4..f051ecf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libpciaccess (0.13.2-2) UNRELEASED; urgency=low
+
+ * Fix typo in libpciaccess0 and libpciaccess-dev package descriptions.
+Thanks Steve Magoun! (LP: #1274241)
+
+ -- Robert Hooker Wed, 29 Jan 2014 16:35:07 -0500
+
libpciaccess (0.13.2-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index c20dd94..2eb1d83 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: Generic PCI access library for X
Provides functionality for X to access the PCI bus and devices
- in a platform-independant way.
+ in a platform-independent way.
Package: libpciaccess0-udeb
XC-Package-Type: udeb
@@ -44,6 +44,6 @@ Multi-Arch: same
Depends: libpciaccess0 (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Description: Generic PCI access library for X - development files
Provides functionality for X to access the PCI bus and devices
- in a platform-independant way.
+ in a platform-independent way.
.
This package contains the development files for libpciaccess.
--
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/e1w8csv-00037m...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu-saucy'
debian/changelog|7 +++
debian/patches/baytrail-sna-vsync.patch | 70
debian/patches/haswell-sna-vsync.patch | 33 +++
debian/patches/series |2
4 files changed, 112 insertions(+)
New commits:
commit 63a2c517608379e61cd30a29ad4e88b031d59d37
Author: Robert Hooker
Date: Fri Jan 10 11:28:39 2014 -0500
Backport 2 fixes to fix vsync on baytrail and haswell.
diff --git a/debian/changelog b/debian/changelog
index 2dc47d9..c064fda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.904-0ubuntu2.1) saucy-proposed; urgency=low
+
+ * Add two patch series to fix vsync hangs on haswell and baytrail devices.
+Thanks timo-jyrinki and timchen119! (LP: #1243261)
+
+ -- Robert Hooker Fri, 10 Jan 2014 11:24:45 -0500
+
xserver-xorg-video-intel (2:2.99.904-0ubuntu2) saucy-proposed; urgency=low
* sna-sanitize-output-crtc.diff: Fix a crash when failing to probe the
diff --git a/debian/patches/baytrail-sna-vsync.patch
b/debian/patches/baytrail-sna-vsync.patch
new file mode 100644
index 000..1147847
--- /dev/null
+++ b/debian/patches/baytrail-sna-vsync.patch
@@ -0,0 +1,70 @@
+This is a squash of bd22abee8f33b20ff6bc7297b0a9ae8708d18727 and
+0e692800055827cf526c7539515c71aecb58bf30 from xf86-video-intel git backported
+to 2.99.904.
+
+=== modified file 'src/sna/sna_display.c'
+--- a/src/sna/sna_display.c2014-01-10 04:13:58 +
b/src/sna/sna_display.c2014-01-10 08:15:02 +
+@@ -3571,6 +3571,52 @@
+ return true;
+ }
+
++static bool sna_emit_wait_for_scanline_vlv(struct sna *sna,
++ xf86CrtcPtr crtc,
++ int pipe, int y1, int y2,
++ bool full_height)
++{
++ uint32_t display_base = 0x18;
++ uint32_t event;
++ uint32_t *b;
++
++ return false; /* synchronisation? I've heard of that */
++
++ if (!sna->kgem.has_secure_batches)
++ return false;
++
++ assert(y1 >= 0);
++ assert(y2 > y1);
++ assert(sna->kgem.mode);
++
++ /* Always program one less than the desired value */
++ if (--y1 < 0)
++ y1 = crtc->bounds.y2;
++ y2--;
++
++ b = kgem_get_batch(&sna->kgem);
++ sna->kgem.nbatch += 4;
++
++ if (pipe == 0) {
++ if (full_height)
++ event = MI_WAIT_FOR_PIPEA_SVBLANK;
++ else
++ event = MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW;
++ } else {
++ if (full_height)
++ event = MI_WAIT_FOR_PIPEB_SVBLANK;
++ else
++ event = MI_WAIT_FOR_PIPEB_SCAN_LINE_WINDOW;
++ }
++ b[0] = MI_LOAD_REGISTER_IMM | 1;
++ b[1] = display_base + 0x70004 + 0x1000 * pipe;
++ b[2] = (1 << 31) | (y1 << 16) | y2;
++ b[3] = MI_WAIT_FOR_EVENT | event;
++
++ sna->kgem.batch_flags |= I915_EXEC_SECURE;
++ return true;
++}
++
+ static bool sna_emit_wait_for_scanline_ivb(struct sna *sna,
+ xf86CrtcPtr crtc,
+ int pipe, int y1, int y2,
+@@ -3792,7 +3838,7 @@
+ else if (sna->kgem.gen >= 075)
+ ret = sna_emit_wait_for_scanline_hsw(sna, crtc, pipe, y1, y2,
full_height);
+ else if (sna->kgem.gen == 071)
+- ret =sna_emit_wait_for_scanline_gen6(sna, crtc, pipe, y1, y2,
full_height);
++ ret =sna_emit_wait_for_scanline_vlv(sna, crtc, pipe, y1, y2,
full_height);
+ else if (sna->kgem.gen >= 070)
+ ret = sna_emit_wait_for_scanline_ivb(sna, crtc, pipe, y1, y2,
full_height);
+ else if (sna->kgem.gen >= 060)
+
diff --git a/debian/patches/haswell-sna-vsync.patch
b/debian/patches/haswell-sna-vsync.patch
new file mode 100644
index 000..c0f33b6
--- /dev/null
+++ b/debian/patches/haswell-sna-vsync.patch
@@ -0,0 +1,33 @@
+From 68cef6cd281572fcfb76a341dc45b7c8e5baffe6 Mon Sep 17 00:00:00 2001
+From: Chris Wilson
+Date: Thu, 07 Nov 2013 13:09:25 +
+Subject: sna/gen7: Request secure batches for Haswell vsync
+
+Since commit 8ff8eb2b38dc705f5c86f524c1cd74a811a7b04c
+Author: Chris Wilson
+Date: Mon Sep 9 16:23:04 2013 +0100
+
+sna/hsw: Scanline waits require both DERRMR and forcewake
+
+we have been emitting LRI to enable vsync on the render ring. This
+requires a privileged batch buffer, and whilst we were checking for
+kernel support, we forgot to actually tell the kernel to submit the
+batch with the right privileges.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71328
+Signed-off-by: Chris Wilson
+---
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index eb30dfa..889019c 100644
+--- a/src/sna/sna_display.c
b/src/sna/sna_display.c
+@@
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
ind
x11-utils: Changes to 'debian-unstable'
debian/changelog |3 xdpyinfo/ChangeLog| 102 xdpyinfo/Makefile.in | 434 +-- xdpyinfo/aclocal.m4 | 1299 ++--- xdpyinfo/config.guess | 307 +- xdpyinfo/config.sub | 237 + xdpyinfo/configure| 6300 - xdpyinfo/configure.ac |4 xdpyinfo/depcomp | 530 ++- xdpyinfo/install-sh | 35 xdpyinfo/man/Makefile.in | 132 xdpyinfo/man/xdpyinfo.man |5 xdpyinfo/missing | 461 +-- xdpyinfo/xdpyinfo.c | 44 xfd/ChangeLog | 65 xfd/Makefile.in | 458 +-- xfd/aclocal.m4| 997 --- xfd/app-defaults/Xfd |6 xfd/compile | 347 ++ xfd/config.guess | 407 +- xfd/config.sub| 237 + xfd/configure | 1882 - xfd/configure.ac | 12 xfd/depcomp | 531 ++- xfd/grid.c| 10 xfd/grid.h|2 xfd/gridP.h |2 xfd/install-sh| 35 xfd/man/Makefile.in | 131 xfd/man/xfd.man |5 xfd/missing | 461 +-- xfd/xfd.c | 49 xprop/ChangeLog | 86 xprop/Makefile.in | 440 +-- xprop/README |3 xprop/aclocal.m4 | 1413 ++ xprop/compile | 347 ++ xprop/config.guess| 407 +- xprop/config.sub | 237 + xprop/configure | 6325 -- xprop/configure.ac|9 xprop/depcomp | 531 ++- xprop/dsimple.c |4 xprop/dsimple.h |6 xprop/install-sh | 35 xprop/man/Makefile.in | 132 xprop/missing | 461 +-- xprop/xprop.c | 66 48 files changed, 20600 insertions(+), 5432 deletions(-) New commits: commit 636a13930304d5aa0ac9830ff1bd175b1883b489 Author: Robert Hooker Date: Fri Aug 9 12:02:13 2013 -0400 xprop 1.2.2 diff --git a/debian/changelog b/debian/changelog index e05ebff..333156b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ x11-utils (7.7+1) UNRELEASED; urgency=low * xwininfo 1.1.3 * xdpyinfo 1.3.1 * xfd 1.1.2 + * xprop 1.2.2 * Update copyright. -- Robert Hooker Mon, 20 May 2013 12:01:44 -0400 diff --git a/xprop/ChangeLog b/xprop/ChangeLog index a953887..7e84e5d 100644 --- a/xprop/ChangeLog +++ b/xprop/ChangeLog @@ -1,3 +1,89 @@ +commit 9e0f57f6a271313d1b49b5019753b4410f407cc5 +Author: Alan Coopersmith +Date: Thu Aug 8 20:04:00 2013 -0700 + +xprop 1.2.2 + +Signed-off-by: Alan Coopersmith + +commit b150b99c56bc4c98bf416be66764fb49dce425dc +Author: Alan Coopersmith +Date: Fri Jul 19 18:38:25 2013 -0700 + +Mark usage() as noreturn, as suggested by gcc -Wmissing-noreturn + +Signed-off-by: Alan Coopersmith + +commit 7ed5afd77941f89467e57ec8562992dd27ea3e7f +Author: Alan Coopersmith +Date: Fri Jul 19 18:36:17 2013 -0700 + +Fix const conversion warnings from gcc + +Signed-off-by: Alan Coopersmith + +commit 6f16b22c4a6a878ca0f07e57da50f7ac04fef306 +Author: Alan Coopersmith +Date: Sun Jan 20 13:21:57 2013 -0800 + +Add unicode argument to Format_Len_String to reduce code duplication + +Allows us to get rid of a second copy of the code that differed only +in the unicode argument passed on to Format_String. + +Signed-off-by: Alan Coopersmith +Reviewed-by: Peter Hutterer + +commit 0384b1c6567d3f90975665ed4e7b3a09947cabee +Author: Alan Coopersmith +Date: Sun Jan 20 13:03:15 2013 -0800 + +Replace strlen/malloc/memcpy set with strdup + +Signed-off-by: Alan Coopersmith +Reviewed-by: Peter Hutterer + +commit 7dba9bf178878e09aaad09be9ed9bdccb60c08b9 +Author: Alan Coopersmith +Date: Sun Jan 20 12:56:43 2013 -0800 + +Mark FatalError() as taking printf-style arguments + +Silences -Wformat-nonliteral warnings about passing through +unknown format arguments to vfprintf. + +Signed-off-by: Alan Coopersmith + +commit db9c65f2b12b25a56f4e364ec6dd2dac0412413d +Author: Alan Coopersmith +Date: Sun Jan 20 12:52:18 2013 -0800 + +config: Add missing AC_CONFIG_SRCDIR + +Regroup AC statements under the Autoconf initialization section. +Regroup AM statements under the Automake initialization section. + +Signed-off-by: Alan Coopersmith + +commit 0d069c0edae83f70ac10fab1a3c04d8197e277c4 +Author: lolilolicon +Date: Tue Jan 10 23:39:04 2012 -0500 + +Enable setting property of type UTF8_STRING. + +Fix "bad format character: u" error for format '8u', e.g.: +xprop -root -f _NET_WM_NAME 8u -set _NET_WM_NAME LG3D + +Signed-off-by: James Cloos + +commit 3e7b1528b1d8aa4b999789bccc5513ed5c3451f8 +Author: Alan Coopersmith +Date: Wed Jun 29 21:16:32 2011 -0700 + +Expand descriptio
x11-xserver-utils: Changes to 'debian-unstable'
debian/changelog|2 iceauth/ChangeLog | 98 iceauth/Makefile.in | 443 +- iceauth/aclocal.m4 | 1240 -- iceauth/compile | 347 + iceauth/config.guess| 405 +- iceauth/config.h.in |3 iceauth/config.sub | 277 - iceauth/configure | 6356 +- iceauth/configure.ac|8 iceauth/depcomp | 531 +- iceauth/iceauth.c |7 iceauth/install-sh | 35 iceauth/man/Makefile.in | 135 iceauth/missing | 461 -- iceauth/process.c | 133 xset/ChangeLog | 113 xset/Makefile.in| 440 +- xset/aclocal.m4 | 1413 +-- xset/compile| 347 + xset/config.guess | 407 +- xset/config.h.in| 32 xset/config.sub | 237 - xset/configure | 8732 xset/configure.ac |3 xset/depcomp| 531 +- xset/install-sh | 35 xset/man/Makefile.in| 132 xset/man/xset.man |7 xset/missing| 461 -- xset/xset.c | 293 - 31 files changed, 19070 insertions(+), 4594 deletions(-) New commits: commit d06dd4175a9fe32a1704797b2b42f41e653264d5 Author: Robert Hooker Date: Fri Aug 9 11:45:45 2013 -0400 xset 1.2.3 diff --git a/debian/changelog b/debian/changelog index 17f0a97..eeb3b12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low * xrefresh 1.0.5 * xhost 1.0.6 * iceauth 1.0.6 + * xset 1.2.3 * Update copyright [ Timo Aaltonen ] diff --git a/xset/ChangeLog b/xset/ChangeLog index f32696d..d009b41 100644 --- a/xset/ChangeLog +++ b/xset/ChangeLog @@ -1,3 +1,116 @@ +commit bee5b8e13837a02b5f2ac09e0c2b90fa5616e0fb +Author: Alan Coopersmith +Date: Thu Aug 8 20:43:18 2013 -0700 + +xset 1.2.3 + +Signed-off-by: Alan Coopersmith + +commit e44841fdd4552cde3aca28471a59ad64c5a05547 +Author: Alan Coopersmith +Date: Fri Jul 19 22:58:47 2013 -0700 + +Pass buf size to on_or_off instead of just assuming it is big enough + +Signed-off-by: Alan Coopersmith + +commit 86fda0478065488dfc423b67ea1747817106335f +Author: Alan Coopersmith +Date: Fri Jul 19 22:47:38 2013 -0700 + +Add -version flag + +Signed-off-by: Alan Coopersmith + +commit 8d49ad3f03c858222863fa986de850d5a554d69f +Author: Alan Coopersmith +Date: Fri Jul 19 22:32:38 2013 -0700 + +Fix integer sign/size conversion warnings from clang + +Signed-off-by: Alan Coopersmith + +commit 72296976365e6f91129f25468771fa864b20e862 +Author: Alan Coopersmith +Date: Fri Jul 19 22:05:07 2013 -0700 + +Add printf attribute to usage function and fix warnings it causes + +gcc suggested it: + xset.c: In function ‘usage’: + xset.c:1577:2: warning: function might be possible candidate for ‘gnu_printf’ + format attribute [-Wmissing-format-attribute] + +But adding it unveiled many complaints about extra trailing NULL args +from before usage took a variable number of arguments: + +xset.c:186:3: warning: too many arguments for format [-Wformat-extra-args] +xset.c:193:2: warning: too many arguments for format [-Wformat-extra-args] +xset.c:362:3: warning: too many arguments for format [-Wformat-extra-args] +xset.c:370:3: warning: too many arguments for format [-Wformat-extra-args] +xset.c:376:3: warning: too many arguments for format [-Wformat-extra-args] +xset.c:382:3: warning: too many arguments for format [-Wformat-extra-args] +xset.c:388:3: warning: too many arguments for format [-Wformat-extra-args] +xset.c:402:7: warning: too many arguments for format [-Wformat-extra-args] +xset.c:425:7: warning: too many arguments for format [-Wformat-extra-args] +xset.c:542:4: warning: too many arguments for format [-Wformat-extra-args] +xset.c:735:3: warning: too many arguments for format [-Wformat-extra-args] + +so those were deleted. + +Signed-off-by: Alan Coopersmith + +commit d3f87090b92b0c77a75027ba660351d18a733c8b +Author: Alan Coopersmith +Date: Fri Jul 19 22:00:51 2013 -0700 + +Fix gcc warnings about discarded const qualifiers + +Signed-off-by: Alan Coopersmith + +commit c42515672b2552b2ce604fe523cf133593ab88ec +Author: Alan Coopersmith +Date: Wed Feb 20 19:43:46 2013 -0800 + +Combine error message strings + +Signed-off-by: Alan Coopersmith + +commit 5e3ab67c50ddfda53a0e8366bc854562cf297442 +Author: Alan Coopersmith +Date: Wed Feb 20 19:41:38 2013 -0800 + +Combine usage message strings + +Signed-off-by: Alan Coopersmith + +commit 50c8bd6121e5a4c679fb7c9762cf2dc591f0c3ef +Author: Alan Coopersmith +Date: Fri Jan 4 18:56:01 2013 -0800 + +Drop usleep fallbacks for ancient OS versions + +Unix 98 requires usleep() so assume most supported non-Win32 platforms +have it and don&#
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog |5 +
debian/patches/series|3
debian/patches/sna-fall-back-to-proc-cpuinfo.patch | 85 +
debian/patches/sna-fix-typo-in-computing-box.patch | 77
debian/patches/sna-note-that-borderClip-region.patch | 90 +++
5 files changed, 260 insertions(+)
New commits:
commit 0f0f30ba9741cc6ba0d3f0d614fd759eb831961c
Author: Robert Hooker
Date: Fri Jul 19 13:38:13 2013 -0400
Cherry-pick 3 SNA fixes needed for 2.21.12.
diff --git a/debian/changelog b/debian/changelog
index 25a3735..b25ec80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
xserver-xorg-video-intel (2:2.21.12-1ubuntu1) UNRELEASED; urgency=low
+ [ Maarten Lankhorst ]
* Merge from unreleased debian git (LP: #1198409, #1173557, #1199746,
#1200766)
Remaining changes:
- Use SNA by default.
+ [ Robert Hooker ]
+ * Cherry-pick 3 commits from upstream git to fix SNA regressions in 2.21.12
+(34c9b759f, 7f76a2bf3, a764a6e69b)
+
-- Maarten Lankhorst Thu, 18 Jul 2013
13:51:58 +0200
xserver-xorg-video-intel (2:2.21.12-1) UNRELEASED; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 9ed72bb..2c1177d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
# empty for now
+sna-note-that-borderClip-region.patch
+sna-fix-typo-in-computing-box.patch
+sna-fall-back-to-proc-cpuinfo.patch
diff --git a/debian/patches/sna-fall-back-to-proc-cpuinfo.patch
b/debian/patches/sna-fall-back-to-proc-cpuinfo.patch
new file mode 100644
index 000..0af1a3b
--- /dev/null
+++ b/debian/patches/sna-fall-back-to-proc-cpuinfo.patch
@@ -0,0 +1,85 @@
+From 7f76a2bf319f59d463a1f96974b03d7c651847dd Mon Sep 17 00:00:00 2001
+From: Chris Wilson
+Date: Wed, 17 Jul 2013 09:22:17 +
+Subject: sna: Fall back to /proc/cpuinfo parsing if cpuid cache size probe
fails
+
+Older hardware does not support cache size probing via cpuid4, so we
+need to implement the older algorithm which requires a table based
+lookup. (And in hindsight, why I thought cache probing via cpuid to be
+quite hairy.) For the moment, just use the value found in /proc/cpuinfo.
+
+Reported-by: Oscar Dario Trujillo Tejada
+Reported-by: Ferry Toth
+Signed-off-by: Chris Wilson
+---
+diff --git a/src/sna/kgem.c b/src/sna/kgem.c
+index 605e049..0054cdf 100644
+--- a/src/sna/kgem.c
b/src/sna/kgem.c
+@@ -698,7 +698,7 @@ total_ram_size(void)
+ }
+
+ static unsigned
+-cpu_cache_size(void)
++cpu_cache_size__cpuid4(void)
+ {
+ /* Deterministic Cache Parmaeters (Function 04h)":
+*When EAX is initialized to a value of 4, the CPUID instruction
+@@ -740,6 +740,39 @@ cpu_cache_size(void)
+return llc_size;
+ }
+
++static unsigned
++cpu_cache_size(void)
++{
++ unsigned size;
++ FILE *file;
++
++ size = cpu_cache_size__cpuid4();
++ if (size)
++ return size;
++
++ file = fopen("/proc/cpuinfo", "r");
++ if (file) {
++ size_t len = 0;
++ char *line = NULL;
++ while (getline(&line, &len, file) != -1) {
++ int kb;
++ if (sscanf(line, "cache size : %d KB", &kb) == 1) {
++ /* Paranoid check against gargantuan caches */
++ if (kb <= 1<<20)
++ size = kb * 1024;
++ break;
++ }
++ }
++ free(line);
++ fclose(file);
++ }
++
++ if (size == 0)
++ size = 64 * 1024;
++
++ return size;
++}
++
+ static int gem_param(struct kgem *kgem, int name)
+ {
+ drm_i915_getparam_t gp;
+@@ -1242,6 +1275,7 @@ void kgem_init(struct kgem *kgem, int fd, struct
pci_device *dev, unsigned gen)
+ kgem->buffer_size = kgem->half_cpu_cache_pages << 12;
+ DBG(("%s: buffer size=%d [%d KiB]\n", __FUNCTION__,
+kgem->buffer_size, kgem->buffer_size / 1024));
++ assert(kgem->buffer_size);
+
+ kgem->max_object_size = 3 * (kgem->aperture_high >> 12) << 10;
+ kgem->max_gpu_size = kgem->max_object_size;
+@@ -5616,6 +5650,7 @@ struct kgem_bo *kgem_create_buffer(struct kgem *kgem,
+ alloc = ALIGN(size, kgem->buffer_size);
+ if (alloc > MAX_CACHE_SIZE)
+ alloc = PAGE_ALIGN(size);
++ assert(alloc);
+
+ if (alloc > kgem->aperture_mappable / 4)
+ flags &= ~KGEM_BUFFER_INPLACE;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/debian/patches/sna-fix-typo-in-computing-box.patch
b/debian/patches/sna-fix-typo-in-computing-box.patch
new file mode 100644
index 000..f5214f8
--- /dev/null
+++ b/debian/patches/sna-fix-typo-in-computing-box.patch
@@ -0,
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog |8 1 file changed, 8 insertions(+) New commits: commit 5fcf9659c2702132c26ebddeed65495c24333036 Author: Robert Hooker Date: Thu Jul 18 17:10:16 2013 -0400 Bump changelog and mark bug closures diff --git a/debian/changelog b/debian/changelog index 1b35f0c..25a3735 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-intel (2:2.21.12-1ubuntu1) UNRELEASED; urgency=low + + * Merge from unreleased debian git (LP: #1198409, #1173557, #1199746, #1200766) +Remaining changes: +- Use SNA by default. + + -- Maarten Lankhorst Thu, 18 Jul 2013 13:51:58 +0200 + xserver-xorg-video-intel (2:2.21.12-1) UNRELEASED; urgency=low [ Timo Aaltonen ] -- 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/e1uzvt4-0001z4...@vasks.debian.org
x11-xserver-utils: Changes to 'debian-unstable'
debian/changelog |3 xhost/ChangeLog| 199 + xhost/Makefile.in | 440 ++- xhost/aclocal.m4 | 705 +++--- xhost/compile | 347 +++ xhost/config.guess | 407 ++- xhost/config.sub | 237 +- xhost/configure| 692 -- xhost/configure.ac | 15 xhost/depcomp | 531 +++- xhost/install-sh | 35 xhost/man/Makefile.in | 131 - xhost/missing | 461 +--- xhost/xhost.c | 189 - xrandr/ChangeLog | 97 xrandr/Makefile.in | 366 +-- xrandr/aclocal.m4 | 5519 + xrandr/compile | 347 +++ xrandr/config.guess| 184 - xrandr/config.sub | 95 xrandr/configure | 352 ++- xrandr/configure.ac|2 xrandr/depcomp | 487 ++-- xrandr/install-sh | 14 xrandr/man/Makefile.in | 102 xrandr/man/xrandr.man |6 xrandr/missing | 414 +-- xrandr/xrandr.c| 131 - 28 files changed, 7233 insertions(+), 5275 deletions(-) New commits: commit e7c164c36de31b004f0016450b2823828564d4a4 Author: Robert Hooker Date: Thu Jul 18 11:40:30 2013 -0400 xhost 1.0.6 diff --git a/debian/changelog b/debian/changelog index 8b5be5a..ced8b40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low * xstdcmap 1.0.3 * xvidtune 1.0.3 * xrefresh 1.0.5 + * xhost 1.0.6 * Update copyright [ Timo Aaltonen ] diff --git a/xhost/ChangeLog b/xhost/ChangeLog index 1e33528..4bed0dd 100644 --- a/xhost/ChangeLog +++ b/xhost/ChangeLog @@ -1,3 +1,202 @@ +commit 6c3d341467acd10eafc1462ee94c3efd3a4788ef +Author: Alan Coopersmith +Date: Tue Jul 16 23:10:37 2013 -0700 + +xhost 1.0.6 + +Signed-off-by: Alan Coopersmith + +commit 4ffd1c45709bf8aa41e57d23a5241c4b4817d318 +Author: Alan Coopersmith +Date: Fri Jun 14 00:02:21 2013 -0700 + +Fix const warning for FamilyLocalHost empty address string + +xhost.c: In function ‘change_host’: +xhost.c:452:13: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default] + +Signed-off-by: Alan Coopersmith + +commit e100ad533203fdc0d80078835c557f1bc47954bd +Author: Alan Coopersmith +Date: Sat Mar 2 08:49:40 2013 -0800 + +Mark argument to nameserver_lost signal handler as unused + +Quiets clang warning: +xhost.c:812:21: warning: unused parameter 'sig' [-Wunused-parameter] +nameserver_lost(int sig) +^ +Signed-off-by: Alan Coopersmith + +commit 214c90d6b01017fe02675e133129cf389e740533 +Author: Jon TURNEY +Date: Fri Oct 26 14:48:03 2012 +0100 + +If SIGALRM isn't available, don't use alarm() to timeout gethostaddr(), just wait + +Win32 has neither SIGALRM nor sigaction(), so don't use SIGALRM to timeout +gethostaddr(), just wait + +Signed-off-by: Jon TURNEY +Reviewed-by: Colin Harrison + +commit 19250c1aed852e151bf66819e75f8d796018223b +Author: Alan Coopersmith +Date: Sat Feb 23 09:47:42 2013 -0800 + +Drop pre-POSIX signal handling support in favor of sigaction() + +X_NOT_POSIX has never been defined by our autoconf scripts, only for a few +platforms in , of which MinGW seems to be the most relevant +today, and since that doesn't have alarm() it doesn't need this code either. + +First pass was done with 'unifdef -UX_NOT_POSIX', followed by +manual tweaking to adjust indent levels, etc. + +Signed-off-by: Alan Coopersmith +Reviewed-by: Jon TURNEY + +commit 618eebf5aa99138f6ab3b8a96f93eb422f1a138e +Author: Jon TURNEY +Date: Fri Oct 26 14:46:51 2012 +0100 + +Provide dummy sethostent(),endhostent() for Win32 also + +Signed-off-by: Jon TURNEY +Reviewed-by: Colin Harrison + +commit 4dc834b5d98a6b07bee7ec8d06ed63efe03d1076 +Author: Jon TURNEY +Date: Fri Oct 26 14:52:45 2012 +0100 + +Link with winsock for MinGW + +Signed-off-by: Jon TURNEY +Reviewed-by: Colin Harrison + +commit 9316e88c68c2a2189cf90c55e9850d7428bcd356 +Author: Jon TURNEY +Date: Wed Jan 4 18:25:26 2012 + + +Use Xwinsock.h on WIN32 + +Signed-off-by: Jon TURNEY +Reviewed-by: Colin Harrison + +commit 01433c7bdd169ae8a59ffe79842de55e318bc3b8 +Author: Alan Coopersmith +Date: Sat Feb 23 09:40:22 2013 -0800 + +Fix some integer sign/size conversion warnings flagged by clang + +xhost.c:154:19: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare] +for (i = 0; i < FAMILIES; i++) +~ ^ +xhost.c:310:15: warning: implicit conversion loses integer precision: 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32] +namelen = strlen(name); +~ ^~~~ +xhost.c:311:40:
libx11: Changes to 'debian-unstable'
debian/changelog|4 debian/libx11-6.symbols | 10 +- 2 files changed, 9 insertions(+), 5 deletions(-) New commits: commit 3eea23c7499e23829e14b046e88794a507470315 Author: Robert Hooker Date: Tue Jul 2 13:33:52 2013 -0400 libx11-6.symbols: Also add arm64. diff --git a/debian/changelog b/debian/changelog index c192f6e..83d18e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ libx11 (2:1.6.0-2) UNRELEASED; urgency=low + [ Julien Cristau ] * libx11-6.symbols: add powerpc64 to the list of 64bit archs (closes: #613820) + [ Wookey ] + * Update symbols file for arm64 + -- Julien Cristau Sat, 15 Jun 2013 18:59:56 +0200 libx11 (2:1.6.0-1) unstable; urgency=low diff --git a/debian/libx11-6.symbols b/debian/libx11-6.symbols index 72497f3..6706aa0 100644 --- a/debian/libx11-6.symbols +++ b/debian/libx11-6.symbols @@ -791,7 +791,7 @@ libX11.so.6 libx11-6 #MINVER# _XCopyEventCookie@Base 2:1.2.99.901 (optional)_XCopyToArg@Base 0 1 _XCreateMutex_fn@Base 0 - (arch=alpha amd64 kfreebsd-amd64 ia64 powerpc64 s390x sparc64)_XData32@Base 0 + (arch=arm64 alpha amd64 kfreebsd-amd64 ia64 powerpc64 s390x sparc64)_XData32@Base 0 _XDefaultError@Base 0 _XDefaultIOError@Base 0 (optional)_XDefaultOpenIM@Base 0 1 @@ -854,7 +854,7 @@ libX11.so.6 libx11-6 #MINVER# _XProcessInternalConnection@Base 0 _XProcessWindowAttributes@Base 0 _XPutBackEvent@Base 0 - (arch=alpha amd64 kfreebsd-amd64 ia64 powerpc64 s390x sparc64)_XRead32@Base 0 + (arch=arm64 alpha amd64 kfreebsd-amd64 ia64 powerpc64 s390x sparc64)_XRead32@Base 0 _XRead@Base 0 _XReadEvents@Base 0 _XReadPad@Base 0 @@ -1102,9 +1102,9 @@ libX11.so.6 libx11-6 #MINVER# (optional)_XkbInternAtomFunc@Base 0 1 (optional)_XkbNoteCoreMapChanges@Base 0 1 (optional)_XkbPeekAtReadBuffer@Base 0 1 - (optional|arch=alpha amd64 kfreebsd-amd64 ia64 powerpc64 s390x sparc64)_XkbReadBufferCopy32@Base 0 1 + (optional|arch=arm64 alpha amd64 kfreebsd-amd64 ia64 powerpc64 s390x sparc64)_XkbReadBufferCopy32@Base 0 1 (optional)_XkbReadBufferCopyKeySyms@Base 0 1 - (optional|arch=alpha amd64 kfreebsd-amd64 ia64 powerpc64 s390x sparc64)_XkbReadCopyData32@Base 0 1 + (optional|arch=arm64 alpha amd64 kfreebsd-amd64 ia64 powerpc64 s390x sparc64)_XkbReadCopyData32@Base 0 1 (optional)_XkbReadCopyKeySyms@Base 0 1 (optional)_XkbReadGetCompatMapReply@Base 0 1 (optional)_XkbReadGetGeometryReply@Base 0 1 @@ -1113,7 +1113,7 @@ libX11.so.6 libx11-6 #MINVER# (optional)_XkbReadGetNamesReply@Base 0 1 (optional)_XkbReloadDpy@Base 0 1 (optional)_XkbSkipReadBufferData@Base 0 1 - (optional|arch=alpha amd64 kfreebsd-amd64 ia64 powerpc64 s390x sparc64)_XkbWriteCopyData32@Base 0 1 + (optional|arch=arm64 alpha amd64 kfreebsd-amd64 ia64 powerpc64 s390x sparc64)_XkbWriteCopyData32@Base 0 1 (optional)_XkbWriteCopyKeySyms@Base 0 1 (optional)_XkeyTable@Base 0 1 (optional)_XlcAddCT@Base 0 1 -- 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/e1uu4tt-0007qt...@vasks.debian.org
Re: [PATCH mesa-demos 1/3] debian: Add mesa-utils-extra package
All applied with a minor change adding a changelog entry from you in 2/3, thanks and sorry it took so long :) -- 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/CADF2A9xKQ0b=NihjJGeeXCJKtePzTLpr=sgeggfacr7kmkm...@mail.gmail.com
mesa-demos: Changes to 'debian-unstable'
debian/changelog | 11 +++
debian/control | 26 +-
debian/es2_info.1| 21 +
debian/es2gears.1| 14 ++
debian/es2tri.1 | 14 ++
debian/install |4
debian/mesa-utils-extra.install |4
debian/mesa-utils-extra.links|1 +
debian/mesa-utils-extra.manpages |3 +++
debian/mesa-utils.install|4
src/egl/opengles2/es2_info.c |1 +
11 files changed, 86 insertions(+), 17 deletions(-)
New commits:
commit 6b0479e9496f2091b1212e798545457ec4bba294
Author: Robert Hooker
Date: Fri May 31 15:28:27 2013 -0400
Install es2gears_x11 and es2gears_screen
Also create an es2gears symlink pointing to es2gears_x11 for general usage.
Signed-off-by: Robert Hooker
Signed-off-by: Andreas Boll
diff --git a/debian/changelog b/debian/changelog
index 842243f..a4bb33a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ mesa-demos (8.1.0-1) UNRELEASED; urgency=low
* Add package mesa-utils-extra containing the EGL/GLES2 demos.
(Closes: #635764)
+ [ Robert Hooker ]
+ * Install es2gears_x11 and es2gears_screen, create es2gears symlink
+pointing to es2gears_x11 for general usage.
+
-- Sven Joachim Wed, 24 Apr 2013 17:48:21 +0200
mesa-demos (8.0.1-2) unstable; urgency=low
diff --git a/debian/mesa-utils-extra.install b/debian/mesa-utils-extra.install
index 4592e03..491aba4 100644
--- a/debian/mesa-utils-extra.install
+++ b/debian/mesa-utils-extra.install
@@ -1,3 +1,4 @@
usr/bin/es2_info
-usr/bin/es2gears
+usr/bin/es2gears_x11
+usr/bin/es2gears_screen
usr/bin/es2tri
diff --git a/debian/mesa-utils-extra.links b/debian/mesa-utils-extra.links
new file mode 100644
index 000..288bf06
--- /dev/null
+++ b/debian/mesa-utils-extra.links
@@ -0,0 +1 @@
+/usr/bin/es2gears_x11 /usr/bin/es2gears
commit d0606bd536c845bfe77adc69144e8b0cc3097014
Author: Andreas Boll
Date: Fri May 31 15:24:47 2013 -0400
debian: Fix typo in es2_info manpage
Signed-off-by: Andreas Boll
diff --git a/debian/changelog b/debian/changelog
index 0d785f3..842243f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ mesa-demos (8.1.0-1) UNRELEASED; urgency=low
* New upstream release (Closes: #706022).
* Build-depend on libglew-dev rather than libglew1.5-dev.
+ [ Andreas Boll ]
+ * Fix typo in es2_info man page.
+
[ Riku Voipio ]
* Add package mesa-utils-extra containing the EGL/GLES2 demos.
(Closes: #635764)
diff --git a/debian/es2_info.1 b/debian/es2_info.1
index 43387d0..3c49331 100644
--- a/debian/es2_info.1
+++ b/debian/es2_info.1
@@ -15,7 +15,7 @@ Specify the X display to run on.
.B \-h
Print usage information.
.SH AUTHOR
-es2_info was written by Tunsgten Graphics.
+es2_info was written by Tungsten Graphics.
.PP
This manual page was written by Ricardo Salveti de Araujo
,
for the Debian project (but may be used by others).
commit c9fe03209fd7911392769cdee9436e1621a206ab
Author: Riku Voipio
Date: Fri May 31 15:24:27 2013 -0400
debian: Add mesa-utils-extra package
Add a package with OpenGL ES 2.0 test applications
Package mostly from ubuntu.
Signed-off-by: Riku Voipio
Signed-off-by: Andreas Boll
diff --git a/debian/changelog b/debian/changelog
index 569cdc4..0d785f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ mesa-demos (8.1.0-1) UNRELEASED; urgency=low
* New upstream release (Closes: #706022).
* Build-depend on libglew-dev rather than libglew1.5-dev.
+ [ Riku Voipio ]
+ * Add package mesa-utils-extra containing the EGL/GLES2 demos.
+(Closes: #635764)
+
-- Sven Joachim Wed, 24 Apr 2013 17:48:21 +0200
mesa-demos (8.0.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6af6927..aa4992c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ Build-Depends: debhelper (>= 7.2.7),
libgl1-mesa-dev,
libglew-dev,
libglu1-mesa-dev,
-# libegl1-mesa-dev,
-# libgles1-mesa-dev,
-# libgles2-mesa-dev,
+ libegl1-mesa-dev,
+ libgles1-mesa-dev,
+ libgles2-mesa-dev,
Homepage: http://mesa3d.org/
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/mesa-demos.git
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/mesa-demos.git
@@ -31,13 +31,13 @@ Description: Miscellaneous Mesa GL utilities
This package provides several basic GL utilities built by Mesa, including
glxinfo and glxgears.
-#Package: mesa-utils-extra
-#Section: x11
-#Priority: optional
-#Architecture: any
-#Depends:
-# ${shlibs:Depends},
-# ${misc:Depends},
-#Description: Miscellaneous Mesa utilies (opengles, egl)
-# This package provides several basic utilities built from Mesa, including
-# eglgears, eglinfo, glesgears
+Package: mesa-utils-extra
+Section: x11
+Priority: optional
+Architecture: any
+Depends:
+ ${shlibs:Depe
mesa-demos: Changes to 'ubuntu'
debian/changelog|6 +++--- debian/compat |2 +- debian/control |3 +-- debian/mesa-utils-extra.install |3 +-- debian/mesa-utils-extra.links |1 + debian/rules|2 +- 6 files changed, 8 insertions(+), 9 deletions(-) New commits: commit 92afbdf63f02663f066a545849e1b34b68cf1e66 Author: Robert Hooker Date: Wed May 29 15:11:25 2013 -0400 debian/rules: Drop quilt usage. diff --git a/debian/changelog b/debian/changelog index 9124fab..1fe860a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ mesa-demos (8.1.0-0ubuntu1) UNRELEASED; urgency=low - Dropped, upstream. * Install es2gears_x11 and es2gears_screen, create es2gears symlink pointing to es2gears_x11 to retain old functionality. + * Drop quilt usage from debian/rules. -- Robert Hooker Wed, 01 May 2013 21:23:58 -0400 diff --git a/debian/rules b/debian/rules index 1bfde17..01b542e 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ get-orig-source: rm -rf $(deb_source)-$(upstream_version) %: - dh --with=quilt --with=autoreconf $@ + dh --with=autoreconf $@ override_dh_auto_install: dh_auto_install --destdir=debian/tmp commit 5df5556b694a7d5c7a8b27221a895ac79619003a Author: Robert Hooker Date: Wed May 29 15:10:40 2013 -0400 Fix mismerge from debian-unstable, switch to libglew-dev as a build dep. diff --git a/debian/control b/debian/control index 13fca36..eaf67b5 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 7.2.7), libx11-dev, libxext-dev, libgl1-mesa-dev, - libglew1.5-dev, + libglew-dev, libglu1-mesa-dev, libegl1-mesa-dev, libgles1-mesa-dev, commit 5e755dd67aa662dfe9d99b20e8fe253790cb79de Author: Robert Hooker Date: Wed May 29 15:10:05 2013 -0400 Install es2gears_x11 and es2gears_screen, create es2gears symlink pointing to es2gears_x11 to retain old functionality. diff --git a/debian/changelog b/debian/changelog index a3cc94c..9124fab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ mesa-demos (8.1.0-0ubuntu1) UNRELEASED; urgency=low * Added package mesa-utils-extra containing the EGL/GLES2 demos * debian/patches/properly_defining_default_precision_es2gears.patch: - Dropped, upstream. + * Install es2gears_x11 and es2gears_screen, create es2gears symlink +pointing to es2gears_x11 to retain old functionality. -- Robert Hooker Wed, 01 May 2013 21:23:58 -0400 diff --git a/debian/mesa-utils-extra.install b/debian/mesa-utils-extra.install index 4592e03..491aba4 100644 --- a/debian/mesa-utils-extra.install +++ b/debian/mesa-utils-extra.install @@ -1,3 +1,4 @@ usr/bin/es2_info -usr/bin/es2gears +usr/bin/es2gears_x11 +usr/bin/es2gears_screen usr/bin/es2tri diff --git a/debian/mesa-utils-extra.links b/debian/mesa-utils-extra.links new file mode 100644 index 000..288bf06 --- /dev/null +++ b/debian/mesa-utils-extra.links @@ -0,0 +1 @@ +/usr/bin/es2gears_x11 /usr/bin/es2gears commit c0408511868d80b74d6d7a9ce2d6930e16417227 Author: Robert Hooker Date: Wed May 29 15:07:45 2013 -0400 Revert "debian/: Multiple packaging adjustments" This reverts commit 3811b65e3f8a539be10f1b8b6ba73e3be5f8c1c9. diff --git a/debian/changelog b/debian/changelog index f7caa91..a3cc94c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,9 +5,6 @@ mesa-demos (8.1.0-0ubuntu1) UNRELEASED; urgency=low * Added package mesa-utils-extra containing the EGL/GLES2 demos * debian/patches/properly_defining_default_precision_es2gears.patch: - Dropped, upstream. - * Switch to dh 9 - * Add dh-exec to build deps and drop quilt. - * Install es2gears_screen along with es2gears in mesa-utils-extra. -- Robert Hooker Wed, 01 May 2013 21:23:58 -0400 diff --git a/debian/compat b/debian/compat index ec63514..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +7 diff --git a/debian/control b/debian/control index 0efff5c..13fca36 100644 --- a/debian/control +++ b/debian/control @@ -3,16 +3,15 @@ Section: utils Priority: optional Maintainer: Ubuntu X-SWAT Standards-Version: 3.9.1 -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 7.2.7), pkg-config, autoconf, automake, dh-autoreconf, - dh-exec, libx11-dev, libxext-dev, libgl1-mesa-dev, - libglew-dev, + libglew1.5-dev, libglu1-mesa-dev, libegl1-mesa-dev, libgles1-mesa-dev, diff --git a/debian/mesa-utils-extra.install b/debian/mesa-utils-extra.install old mode 100755 new mode 100644 index e5cc8d4..4592e03 --- a/debian/mesa-utils-extra.install +++ b/debian/mesa-utils-extra.install @@ -1,5 +1,3 @@ -#!/usr/bin/dh-exec usr/bin/es2_info -usr/bin/es2gears_screen -usr/bin/es2gears_x11 => /usr/bin/es2gears +usr/bin/es2gears usr/bin/es2tri diff --git a/debian/rules b/debian/rules index a4279c3..1bfde17 100755 --- a/debian/rules +++ b/debia
x11-apps: Changes to 'debian-unstable'
debian/changelog |3 debian/copyright | 498 -- debian/copyright.head |6 debian/rules | 10 + 4 files changed, 298 insertions(+), 219 deletions(-) New commits: commit de064411b7c759a63e3387541472a114e5bd6c91 Author: Robert Hooker Date: Mon May 20 16:25:55 2013 -0400 debian/copyright: refresh diff --git a/debian/changelog b/debian/changelog index 2f19786..7aea006 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ x11-apps (7.7+1) UNRELEASED; urgency=low * transset 1.0.1 * Add an update-copyright target to refresh debian/copyright using upstream's COPYING files, thanks to Julien Cristau. + * Refresh copyright. -- Robert Hooker Sat, 15 Dec 2012 18:36:39 -0500 diff --git a/debian/copyright b/debian/copyright index 5d290af..91eea29 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,20 +2,21 @@ The contents of this package were downloaded from http://xorg.freedesktop.org/releases/individual/app/ It contains the bitmap, ico, oclock, transset, x11perf, xbiff, xcalc, xclipboard, xclock, xcursorgen, xconsole, xditview, xedit, xeyes, xgc, -xload, xlogo, xmag, xman, xmore, xmd and xwd applications. +xload, xlogo, xmag, xman, xmore, xmd, rendercheck, and xwd applications. + bitmap: Copyright 1988, 1993, 1998 The Open Group - + Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -23,7 +24,7 @@ bitmap: OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - + Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization @@ -31,33 +32,33 @@ bitmap: ico: Copyright (c) 1987, 1994 X Consortium - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - + Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. - - + + Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. - + All Rights Reserved - + Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that @@ -65,7 +66,7 @@ ico: supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. - + DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR @@ -73,9 +74,9 @@ ico: WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - + -- -
x11-utils: Changes to 'debian-unstable'
debian/changelog |1 + debian/copyright | 33 + 2 files changed, 22 insertions(+), 12 deletions(-) New commits: commit 00c852bc8810928aeea3454f05ce9ef49ccf866c Author: Robert Hooker Date: Mon May 20 13:28:54 2013 -0400 debian/copyright: update diff --git a/debian/changelog b/debian/changelog index f641795..df841c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ x11-utils (7.7+1) UNRELEASED; urgency=low * xmessage 1.0.4 * xvinfo 1.1.2 * xwininfo 1.1.3 + * Update copyright. -- Robert Hooker Mon, 20 May 2013 12:01:44 -0400 diff --git a/debian/copyright b/debian/copyright index f5df658..b409857 100644 --- a/debian/copyright +++ b/debian/copyright @@ -246,13 +246,13 @@ xfontsel: All Rights Reserved - Permission to use, copy, modify, and distribute this software and its - documentation for any purpose and without fee is hereby granted, + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that - both that copyright notice and this permission notice appear in + both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the - software without specific, written prior permission. + software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -356,18 +356,27 @@ xlsclients: DEALINGS IN THE SOFTWARE. xlsfonts: - This is a stub file. This package has not yet had its complete licensing - information compiled. Please see the individual source files for details on - your rights to use and modify this software. + Copyright 1989, 1993, 1998 The Open Group - Please submit updated COPYING files to the Xorg bugzilla: + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. - All licensing questions regarding this software should be directed at the - Xorg mailing list: + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - http://lists.freedesktop.org/mailman/listinfo/xorg + Except as contained in this notice, the name of The Open Group shall not be + used in advertising or otherwise to promote the sale, use or other dealings + in this Software without prior written authorization from The Open Group. xmessage: Copyright (c) 1988, 1991, 1994 X Consortium -- 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/e1uetth-0001f1...@vasks.debian.org
x11-xserver-utils: Changes to 'debian-unstable'
debian/changelog |1 + debian/copyright |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 5a1442efaef3ef422dc0612457ba7cac720a7b2b Author: Robert Hooker Date: Mon May 20 13:27:33 2013 -0400 debian/copyright: update diff --git a/debian/changelog b/debian/changelog index ce537bb..159e13f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low * xstdcmap 1.0.3 * xvidtune 1.0.3 * xrefresh 1.0.5 + * Update copyright [ Timo Aaltonen ] * control: Bump libxrandr-dev build-dependency. diff --git a/debian/copyright b/debian/copyright index eec7f4e..e3a39ee 100644 --- a/debian/copyright +++ b/debian/copyright @@ -100,7 +100,7 @@ sessreg: other dealings in this Software without prior written authorization from The Open Group. - Copyright 2005 Sun Microsystems, Inc. All rights reserved. + Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -- 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/e1uets6-00017l...@vasks.debian.org
x11-utils: Changes to 'debian-unstable'
| 74
xvinfo/install-sh | 29
xvinfo/man/Makefile.am | 12
xvinfo/man/Makefile.in | 423 +
xvinfo/man/xvinfo.man | 33
xvinfo/xvinfo.c| 516 +-
xvinfo/xvinfo.man | 30
xwininfo/ChangeLog | 206
xwininfo/Makefile.am |6
xwininfo/Makefile.in | 443 +
xwininfo/aclocal.m4| 2345 +++--
xwininfo/config.guess | 307 -
xwininfo/config.h.in |5
xwininfo/config.rpath | 690 ++
xwininfo/config.sub| 237
xwininfo/configure | 9365 +++--
xwininfo/configure.ac | 30
xwininfo/depcomp | 530 +-
xwininfo/dsimple.c | 69
xwininfo/dsimple.h |4
xwininfo/install-sh| 35
xwininfo/man/Makefile.in | 134
xwininfo/missing | 461 -
xwininfo/xwininfo.c| 150
132 files changed, 62766 insertions(+), 16147 deletions(-)
New commits:
commit 88af4dad56217ee7cfce6cfe840acff41ff5adb3
Author: Robert Hooker
Date: Mon May 20 12:14:44 2013 -0400
Update xwininfo to 1.1.3
diff --git a/debian/changelog b/debian/changelog
index dfeecb6..f641795 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x11-utils (7.7+1) UNRELEASED; urgency=low
* xfontsel 1.0.5
* xmessage 1.0.4
* xvinfo 1.1.2
+ * xwininfo 1.1.3
-- Robert Hooker Mon, 20 May 2013 12:01:44 -0400
diff --git a/xwininfo/ChangeLog b/xwininfo/ChangeLog
index 797f1a6..1b2abfa 100644
--- a/xwininfo/ChangeLog
+++ b/xwininfo/ChangeLog
@@ -1,3 +1,209 @@
+commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13
+Author: Alan Coopersmith
+Date: Fri May 17 21:04:26 2013 -0700
+
+xwininfo 1.1.3
+
+Signed-off-by: Alan Coopersmith
+
+commit 3e60a26559221e561770710a8c4ed0b8ebc31afb
+Author: Alan Coopersmith
+Date: Sat Jan 12 13:52:08 2013 -0800
+
+Quiet some clang warnings about implicit int <-> size_t conversions
+
+Signed-off-by: Alan Coopersmith
+
+commit f7b55bdf674fc790e879a2e25ef83925dd8379d6
+Author: Pierre-Loup A. Griffais
+Date: Tue Oct 9 20:33:10 2012 -0700
+
+xwininfo: report the Visual class of the selected Window
+
+Not of the root window.
+
+Signed-off-by: Pierre-Loup A. Griffais
+Signed-off-by: Julien Cristau
+
+commit aedc2ecc4de61211f5f6b8f27bd8681d0ab744dc
+Author: Alan Coopersmith
+Date: Sat Aug 25 14:05:18 2012 -0700
+
+Print more detailed error messages when xcb_connect fails
+
+Signed-off-by: Alan Coopersmith
+Reviewed-by: Jeremy Huddleston Sequoia
+
+commit 4176bffd0261d7734617dc73ae6013e86dbb841d
+Author: David Venz
+Date: Sat Aug 25 12:06:22 2012 -0700
+
+Bug 53242 - xwininfo segfaults on invalid screen
+
+Check number of screen entries before iterating past the end of the list
+
+Reviewed-by: Jeremy Huddleston Sequoia
+Reviewed-by: Alan Coopersmith
+Signed-off-by: Alan Coopersmith
+
+commit 53564df46e7f8e443c46b00080ea46c878c34263
+Author: Thomas Klausner
+Date: Sun Aug 26 00:07:52 2012 +0200
+
+Get rid of a number of warnings.
+
+Signed-off-by: Thomas Klausner
+Reviewed-by: Alan Coopersmith
+Signed-off-by: Alan Coopersmith
+
+commit 1279ed652f9f3408211c78b7bf8a0aef6b8488df
+Author: Jeremy Huddleston Sequoia
+Date: Sat Aug 25 12:16:29 2012 -0700
+
+Remove dead code (size_t is always >= 0)
+
+xwininfo.c:1886:15: warning: comparison of unsigned expression < 0 is
always false [-Wtautological-compare]
+if (inlen < 0) {
+~ ^ ~
+
+Signed-off-by: Jeremy Huddleston Sequoia
+
+commit fa40ecdfb5cd068ba531b4439df5bbf660469d3a
+Author: Jeremy Huddleston Sequoia
+Date: Sat Aug 25 12:15:02 2012 -0700
+
+Declare usage() as _X_NORETURN
+
+Signed-off-by: Jeremy Huddleston Sequoia
+
+commit 5037f79e8f6a36d3c524a2dd8150cf96c31b7106
+Author: Gaetan Nadon
+Date: Wed Jan 25 09:48:54 2012 -0500
+
+configure.ac: regroup statements and comment
+
+Add missing AC_CONFIG_SRCDIR([Makefile.am])
+
+Move AC_USE_SYSTEM_EXTENSIONS higher up in Autoconf init section
+which must come before XORG_DEFAULT_OPTIONS
+
+Move XORG_DEFAULT_OPTIONS to its usual place with X.Org macros
+Note that AC_FUNC_STRNLEN calls AC_REQUIRE(AC_USE_SYSTEM_EXTENSIONS)
+
+Comment the strnlen function replacement.
+http://pubs.opengroup.org/onlinepubs/9699919799/functions/strlen.html
+
+No functional changes. Following the layout in
+http://www.x.org/wiki/NewModuleGuidelines
+
+Signed-off-by: Gaetan Nadon
+
+commit 19a7184f76ee3c17586ad65a8424966dde5b91c3
+Author: Gaetan Nadon
+Date: Fri Jan 20 20:14:05 2012 -0500
+
+Revert "make: remove $(LIBOBJS) dead code"
+
+
x11-xserver-utils: Changes to 'debian-unstable'
debian/changelog |1 xrefresh/ChangeLog| 111 xrefresh/Makefile.am | 18 xrefresh/Makefile.in | 545 +- xrefresh/aclocal.m4 | 1655 +-- xrefresh/config.guess | 307 - xrefresh/config.h.in | 35 xrefresh/config.sub | 237 - xrefresh/configure|10104 -- xrefresh/configure.ac | 12 xrefresh/depcomp | 530 +- xrefresh/install-sh | 35 xrefresh/man/Makefile.am | 12 xrefresh/man/Makefile.in | 483 ++ xrefresh/man/xrefresh.man | 101 xrefresh/missing | 461 -- xrefresh/xrefresh.c | 61 xrefresh/xrefresh.man | 101 18 files changed, 11269 insertions(+), 3540 deletions(-) New commits: commit f857499cba97a431085cb8a804fa140c93ad5751 Author: Robert Hooker Date: Mon May 20 11:56:26 2013 -0400 Update xrefresh to 1.0.5 diff --git a/debian/changelog b/debian/changelog index 5e294bb..ce537bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low * xsetroot 1.1.1 * xstdcmap 1.0.3 * xvidtune 1.0.3 + * xrefresh 1.0.5 [ Timo Aaltonen ] * control: Bump libxrandr-dev build-dependency. diff --git a/xrefresh/ChangeLog b/xrefresh/ChangeLog index 3fab798..116c4dd 100644 --- a/xrefresh/ChangeLog +++ b/xrefresh/ChangeLog @@ -1,3 +1,114 @@ +commit 2c08f5dee8b3f2d2da9db8e3c1d4593a66db401e +Author: Alan Coopersmith +Date: Fri May 17 18:20:13 2013 -0700 + +xrefresh 1.0.5 + +Signed-off-by: Alan Coopersmith + +commit 1a26cd81c08c008f8252ca03211705ce4951bab2 +Author: Alan Coopersmith +Date: Sun Jan 13 09:09:19 2013 -0800 + +Use strcasecmp if available, instead of downcasing string before strcmp + +Signed-off-by: Alan Coopersmith + +commit 865c7c3da3a827cff080a763613d02729e9d4e33 +Author: Alan Coopersmith +Date: Sun Jan 13 08:37:49 2013 -0800 + +Fix implicit sign conversion & integer size truncation warnings + +xrefresh.c:125:14: warning: implicit conversion loses integer precision: + 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32] +arglen = strlen (arg); + ~ ^~~~ +xrefresh.c:126:12: warning: implicit conversion loses integer precision: + 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32] +slen = strlen (s); + ~ ^~ +xrefresh.c:132:26: warning: implicit conversion changes signedness: 'int' to + 'size_t' (aka 'unsigned long') [-Wsign-conversion] +if (strncmp (arg, s, slen) == 0) return (True); +~~~ ^~~~ + +Signed-off-by: Alan Coopersmith + +commit 4fa0dd48d6c9fcd54276a66c221fdafda2395c02 +Author: Alan Coopersmith +Date: Mon Apr 16 17:22:16 2012 -0700 + +Combine usage message strings + +Signed-off-by: Alan Coopersmith + +commit c0b077a85fb2e624ec87fb8bec906ce30bc473e4 +Author: Alan Coopersmith +Date: Mon Apr 16 17:18:35 2012 -0700 + +Mark Syntax() with _X_NORETURN to silence gcc warning + +Signed-off-by: Alan Coopersmith + +commit d944df52b7b2c5c9e6789b0ff7bb390108613c6c +Author: Alan Coopersmith +Date: Mon Apr 16 17:10:23 2012 -0700 + +Add const qualifiers to structs for mapping strings to values + +Signed-off-by: Alan Coopersmith + +commit 71c97a091a511d403fdb8587d0e1240ec3913820 +Author: Alan Coopersmith +Date: Mon Apr 16 17:04:35 2012 -0700 + +Add const qualifiers to fix gcc -Wwrite-strings warnings + +Signed-off-by: Alan Coopersmith + +commit cde30320d98b95f7c0cec5bed906b7107124f8fa +Author: Jeremy Huddleston +Date: Sun May 8 16:52:55 2011 -0700 + +Properly fallback on CWBackPixmap = None when failing to parse or allocate a solid color + +xrefresh.c:319:3: warning: Value stored to 'action' is never read +action = doNone; +^~~ + +Found-by: clang static analyzer +Signed-off-by: Jeremy Huddleston + +commit 289e8d27a8417ca94fd2063a44b84338ff499a3e +Author: Alan Coopersmith +Date: Fri Jan 28 20:53:06 2011 -0800 + +Fix allocateded typo in comment + +Signed-off-by: Alan Coopersmith + +commit 18f7dcdd9fb30b784b3d99cb91d9f5c80cc19f44 +Author: Gaetan Nadon +Date: Wed Jan 19 10:06:57 2011 -0500 + +config: move man pages into their own directory + +Use services provided by XORG_MANPAGE_SECTIONS. +Use standard Makefile for man pages. + +Signed-off-by: Gaetan Nadon + +commit d604128cf39507dc80a46449a15050f2a066d50f +Author: Gaetan Nadon +Date: Thu Jan 13 11:15:48 2011 -0500 + +man: remove trailing spaces and tabs + +Using s/[ \t]*$// + +Signed-off-by: Gaetan Nadon + commit 631be2568befbd4aee98a3cd4849403554db79d7 Author: Alan Coopersmith Date: Wed Nov 10 19:46:37
x11-apps: Changes to 'debian-unstable'
bitmap/Bitmap.c |8 bitmap/ChangeLog | 72 bitmap/Makefile.in| 565 ++-- bitmap/aclocal.m4 | 675 +++-- bitmap/atobm.c| 23 bitmap/bmtoa.c| 32 bitmap/compile| 232 + bitmap/config.guess | 307 +- bitmap/config.sub | 237 + bitmap/configure | 2650 +++-- bitmap/configure.ac |6 bitmap/depcomp| 530 ++-- bitmap/install-sh | 35 bitmap/man/Makefile.in| 131 - bitmap/man/bitmap.man |8 bitmap/missing| 461 +-- debian/changelog |2 transset/ChangeLog| 88 transset/Makefile.in | 355 +- transset/aclocal.m4 | 5553 +++--- transset/config.guess | 60 transset/config.h.in |3 transset/config.sub | 95 transset/configure| 709 +++-- transset/configure.ac |6 transset/depcomp | 454 ++- transset/install-sh | 14 transset/man/Makefile.in | 103 transset/man/transset.man | 103 transset/missing | 414 +-- transset/transSet.c | 65 31 files changed, 7532 insertions(+), 6464 deletions(-) New commits: commit 8167481058b543b9252ba73464785913f0d0e6cd Author: Robert Hooker Date: Mon May 20 11:51:06 2013 -0400 Update transset to 1.0.1 diff --git a/debian/changelog b/debian/changelog index 8dfc37d..01c3ed9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x11-apps (7.7+1) UNRELEASED; urgency=low * xgc 1.0.4 * xmag 1.0.5 * bitmap 1.0.7 + * transset 1.0.1 -- Robert Hooker Sat, 15 Dec 2012 18:36:39 -0500 diff --git a/transset/ChangeLog b/transset/ChangeLog index 378a9c2..478399e 100644 --- a/transset/ChangeLog +++ b/transset/ChangeLog @@ -1,3 +1,91 @@ +commit 39db25e110cfedcec99394dfa7614ca248685c0d +Author: Alan Coopersmith +Date: Fri May 17 17:47:14 2013 -0700 + +transset 1.0.1 + +Signed-off-by: Alan Coopersmith + +commit fc4bf3cda6d14cac9272f8399bb6dc614c1ef956 +Author: Alan Coopersmith +Date: Fri Feb 22 22:05:39 2013 -0800 + +Add the options to the man page (they were all missing before) + +Signed-off-by: Alan Coopersmith + +commit f59b8db649c1596a38ce20025417c4060d442d64 +Author: Alan Coopersmith +Date: Fri Feb 22 21:33:25 2013 -0800 + +Store min & max as doubles, not floats + +Since atof generates doubles, and we use them to compare/limit the values +of the double "d", might as well keep them in the same format instead of +doing unnecessary conversions. + +Signed-off-by: Alan Coopersmith + +commit e79903a50b0a9cba9d0e41fc2e389117f3ff42ef +Author: Alan Coopersmith +Date: Fri Feb 22 21:27:00 2013 -0800 + +Typo fixes in verbose message & comment + +Signed-off-by: Alan Coopersmith + +commit da0682051e880faa2ef1accac388040bb52b46d8 +Author: Alan Coopersmith +Date: Fri Feb 22 21:22:43 2013 -0800 + +Use correct variable for printing current opacity + +Found by clang: +transSet.c:303:30: warning: variable 'opacity' is uninitialized when used here + [-Wuninitialized] +(double) opacity / OPAQUE); + ^~~ + +When running transset -v, it prints the current opacity of a window +before changing it, but was printing garbage - after this fix, correctly +prints the value set by the previous run. + +Signed-off-by: Alan Coopersmith + +commit 65f010b8c4ef0e4fa5fc6a0679173f81c7a4b626 +Author: Alan Coopersmith +Date: Fri Feb 22 21:17:59 2013 -0800 + +Move release date from transset.c to configure.ac so we remember to update it + +Currently our 2012 release prints: + released: 2007-09-21 +when you run transset --version + +Signed-off-by: Alan Coopersmith + +commit 6cd34b45c87717ae7901993e32b99a43652fa0f3 +Author: Alan Coopersmith +Date: Fri Feb 22 21:14:09 2013 -0800 + +Include PACKAGE_STRING in --version output + +Signed-off-by: Alan Coopersmith + +commit 2b57aeb0ea616cfca8e6fcbd844960269af8c533 +Author: Alan Coopersmith +Date: Fri Feb 22 21:11:04 2013 -0800 + +Combine usage message into single string/call + +Signed-off-by: Alan Coopersmith + +commit a2485424bd0f184700dd0a4f0823fb4c4cf25f66 +Author: Arnaud Fontaine +Date: Thu Jun 7 19:33:28 2012 +0900 + +Fix program name in usage information, transset instead of transset-df. + commit 49d17bde62694c2f0e2bb7883641bd60830c6bd5 Author: Arnaud Fontaine Date: Tue Jun 5 14:55:54 2012 +0900 diff --git a/transset/Makefile.in b/transset/Makefile.in index 8536b82..1e3393b 100644 --- a/transset/Makefile.in +++ b/transset/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.2 from Makefile.am. # @configure_input@ -# Copyright (C)
x11-apps: Changes to 'debian-unstable'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a2b4d29bfa1c63103aec719ee167eedb56a1db65 Author: Robert Hooker Date: Fri May 17 10:39:39 2013 -0400 Fix version to 7.7+1. diff --git a/debian/changelog b/debian/changelog index 92994af..dac21ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11-apps (7.7-1) UNRELEASED; urgency=low +x11-apps (7.7+1) UNRELEASED; urgency=low * Add transset to conflicts/replaces to fix upgrades. * Add rendercheck to x11-apps. -- 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/e1udlp6-00070k...@vasks.debian.org
x11-xserver-utils: Changes to 'debian-unstable'
| 15 xstdcmap/depcomp | 74 xstdcmap/install-sh | 29 xstdcmap/man/Makefile.am | 12 xstdcmap/man/Makefile.in | 423 xstdcmap/man/xstdcmap.man | 116 xstdcmap/xstdcmap.c | 92 xstdcmap/xstdcmap.man | 113 xvidtune/ChangeLog | 145 xvidtune/Makefile.am | 36 xvidtune/Makefile.in | 369 xvidtune/aclocal.m4 | 1980 ++ xvidtune/config.guess | 235 xvidtune/config.sub | 184 xvidtune/configure | 7395 -- xvidtune/configure.ac | 28 xvidtune/depcomp | 74 xvidtune/install-sh | 29 xvidtune/man/Makefile.am | 12 xvidtune/man/Makefile.in | 424 xvidtune/man/xvidtune.man | 178 xvidtune/xvidtune.c |1 xvidtune/xvidtune.man | 178 76 files changed, 43222 insertions(+), 7848 deletions(-) New commits: commit 6275371121aafb08944f7e2f4f5f01a5af29e2d7 Author: Robert Hooker Date: Wed May 15 12:31:59 2013 -0400 Update xvidtune to 1.0.3 diff --git a/debian/changelog b/debian/changelog index 6b4c1e4..9bdc3cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x11-xserver-utils (7.7-1) UNRELEASED; urgency=low * rgb 1.0.5 * xsetroot 1.1.1 * xstdcmap 1.0.3 + * xvidtune 1.0.3 -- Robert Hooker Wed, 15 May 2013 12:08:34 -0400 diff --git a/xvidtune/ChangeLog b/xvidtune/ChangeLog index 3bc1587..0a0c9da 100644 --- a/xvidtune/ChangeLog +++ b/xvidtune/ChangeLog @@ -1,3 +1,148 @@ +commit 2726b9d640d07d771742879f08523f02ee82246b +Author: Alan Coopersmith +Date: Mon Jan 14 13:50:05 2013 -0800 + +xvidtune 1.0.3 + +Signed-off-by: Alan Coopersmith + +commit b0c28d499be063330121d14f4e76337bd806c713 +Author: Alan Coopersmith +Date: Sun Jan 13 14:05:42 2013 -0800 + +Remove unneeded second declaration of buf that shadows the first + +Fixes gcc warnings: +xvidtune.c:1281:7: warning: declaration of ‘buf’ shadows a previous local [-Wshadow] +xvidtune.c:1129:10: warning: shadowed declaration is here [-Wshadow] + +Signed-off-by: Alan Coopersmith + +commit 971cd6f5721eccb166772a700e4561f2fc74eb09 +Author: Alan Coopersmith +Date: Sun Jan 13 13:00:10 2013 -0800 + +config: Add missing AC_CONFIG_SRCDIR + +Regroup AC statements under the Autoconf initialization section. +Regroup AM statements under the Automake initialization section. + +Signed-off-by: Alan Coopersmith + +commit f1797764df83b3677aacc4819f30a467c1d7487a +Author: Gaetan Nadon +Date: Wed Jan 19 10:06:57 2011 -0500 + +config: move man pages into their own directory + +Use services provided by XORG_MANPAGE_SECTIONS. +Use standard Makefile for man pages. + +Signed-off-by: Gaetan Nadon + +commit 8e13f80621f91a714c821f7a680c47366ddae8ee +Author: Gaetan Nadon +Date: Thu Jan 13 11:15:48 2011 -0500 + +man: remove trailing spaces and tabs + +Using s/[ \t]*$// + +Signed-off-by: Gaetan Nadon + +commit 01d8f4d4f91544863f4a082e5a9b8fb6f64ac91a +Author: Gaetan Nadon +Date: Wed Jan 12 16:28:02 2011 -0500 + +config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + +This silences an Autoconf warning + +commit f0a097fdd60a43255097102bf4ee678286e38f3a +Author: Gaetan Nadon +Date: Wed Jan 12 15:29:50 2011 -0500 + +config: replace deprecated AC_HELP_STRING with AS_HELP_STRING + +This silences an Automake warning. + +Signed-off-by: Gaetan Nadon + +commit 0d17870b3ab9cb5b74de55183190589adfea873f +Author: Gaetan Nadon +Date: Wed Jan 12 15:12:08 2011 -0500 + +config: remove unrequired AC_SUBST([*_LIBS]) + +This
x11-apps: Changes to 'debian-unstable'
+--
xmag/config.guess | 233 -
xmag/config.h.in |3
xmag/config.sub| 134
xmag/configure | 6164 +-
xmag/configure.ac | 19
xmag/depcomp | 74
xmag/install-sh| 29
xmag/man/Makefile.am | 12
xmag/man/Makefile.in | 424 ++
xmag/man/xmag.man | 99
xmag/xmag.man | 99
128 files changed, 57968 insertions(+), 7237 deletions(-)
New commits:
commit 09a0584b745646a34e854e58c89f8a91d4624278
Author: Robert Hooker
Date: Wed May 15 12:02:09 2013 -0400
Bump version to 7.7-1 because the 7.7 katamari has released.
diff --git a/debian/changelog b/debian/changelog
index d9068c2..92994af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.7~3) UNRELEASED; urgency=low
+x11-apps (7.7-1) UNRELEASED; urgency=low
* Add transset to conflicts/replaces to fix upgrades.
* Add rendercheck to x11-apps.
commit a976076586abeb4c5a34977723f4fac27fe408b0
Author: Robert Hooker
Date: Wed May 15 12:01:20 2013 -0400
debian/control: Fix up after 9bd0ac112 merge.
diff --git a/debian/control b/debian/control
index 1f3dec8..53f74ea 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
Source: x11-apps
Section: x11
Priority: optional
-Maintainer: Ubuntu X-SWAT
-XSBC-Original-Maintainer: Debian X Strike Force
+Maintainer: Debian X Strike Force
Uploaders: Cyril Brulebois
Build-Depends:
debhelper (>= 5.0.0),
commit 7597297bebcb02cdb4336e97eac762e2e0d7da97
Author: Robert Hooker
Date: Wed May 15 11:33:36 2013 -0400
Update xmag to 1.0.5
diff --git a/debian/changelog b/debian/changelog
index 174e2d2..d9068c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x11-apps (7.7~3) UNRELEASED; urgency=low
* xditview 1.0.3
* xedit 1.2.1
* xgc 1.0.4
+ * xmag 1.0.5
-- Robert Hooker Sat, 15 Dec 2012 18:36:39 -0500
diff --git a/xmag/ChangeLog b/xmag/ChangeLog
index dd90a25..5547a73 100644
--- a/xmag/ChangeLog
+++ b/xmag/ChangeLog
@@ -1,3 +1,74 @@
+commit 8c4b91ea40088bc80de9cc2695f77a27ce78b0d9
+Author: Alan Coopersmith
+Date: Sat Jan 12 22:16:24 2013 -0800
+
+xmag 1.0.5
+
+Signed-off-by: Alan Coopersmith
+
+commit 50ed4f69a5f5e535128c5e2d1abc252b093dff06
+Author: Alan Coopersmith
+Date: Tue Dec 20 20:40:06 2011 -0800
+
+Use lrint() from math library if available
+
+Moves -lm from being hardcoded in Makefile.am to being added via
+AC_SEARCH_LIBS in configure.ac setting it in $(LIBS)
+
+Using lrint() [returns long int] instead of rint() [returns double]
+clears a bunch of gcc warnings of the form:
+"cast from function call of type ‘double’ to non-matching type ‘short int’"
+
+Signed-off-by: Alan Coopersmith
+Reviewed-by: James Cloos
+
+commit 43ffa427238cdfb132205375624a25c5c28e9f86
+Author: Alan Coopersmith
+Date: Fri Feb 18 00:26:59 2011 -0800
+
+Remove obsolete ISC support
+
+Signed-off-by: Alan Coopersmith
+
+commit e81168403132afe71b38e41cd368d0d9869bd320
+Author: Gaetan Nadon
+Date: Wed Jan 19 10:06:56 2011 -0500
+
+config: move man pages into their own directory
+
+Use services provided by XORG_MANPAGE_SECTIONS.
+Use standard Makefile for man pages.
+
+Signed-off-by: Gaetan Nadon
+
+commit 857e73cfd8d79c8f81712fae8b4fa2d7e8565796
+Author: Gaetan Nadon
+Date: Thu Jan 13 11:15:47 2011 -0500
+
+man: remove trailing spaces and tabs
+
+Using s/[ \t]*$//
+
+Signed-off-by: Gaetan Nadon
+
+commit 4c3bfeaa40aaf817bffcf7b4e4adaab45ec0ca13
+Author: Gaetan Nadon
+Date: Wed Jan 12 16:28:02 2011 -0500
+
+config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+This silences an Autoconf warning
+
+commit 4c741b8945c886ce1cfaaeb57c3ce726b77b6ae1
+Author: Gaetan Nadon
+Date: Wed Jan 12 15:29:50 2011 -0500
+
+config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+This silences an Automake warning.
+
+Signed-off-by: Gaetan Nadon
+
commit 63cee7f38dc37fda89dc5aa689634bd8aeffabda
Author: Alan Coopersmith
Date: Sat Oct 30 17:22:41 2010 -0700
diff --git a/xmag/Makefile.am b/xmag/Makefile.am
index b52bebc..6c1a81c 100644
--- a/xmag/Makefile.am
+++ b/xmag/Makefile.am
@@ -19,10 +19,11 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
+SUBDIRS = man
bin_PROGRAMS = xmag
AM_CFLAGS = $(XMAG_CFLAGS) $(CWARNFLAGS)
-xmag_LDADD = $(XMAG_LIBS) -lm
+xmag_LDADD = $(XMAG_LIBS)
xmag_SOURCES = \
CutPaste.c \
@@ -35,9 +36,6 @@ xmag_SOURCES =\
ScaleP.h \
xmag.c
-appman_PRE = \
-xmag.man
-
# App default files (*.ad)
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
@@ -48,24 +46,9 @@ dist_appdefault_DATA = \
mesa-demos: Changes to 'ubuntu'
debian/changelog|3 +++ debian/compat |2 +- debian/control |5 +++-- debian/mesa-utils-extra.install |4 +++- debian/rules|2 +- src/egl/opengles2/es2_info.c|1 + 6 files changed, 12 insertions(+), 5 deletions(-) New commits: commit 3811b65e3f8a539be10f1b8b6ba73e3be5f8c1c9 Author: Robert Hooker Date: Thu May 2 07:44:25 2013 -0400 debian/: Multiple packaging adjustments Switch to dh 9 Add dh-exec to build deps Install es2gears_screen along with es2gears in mesa-utils-extra, and rename es2gears_x11. Reorder arguements in debian/rules for dh9 and drop quilt Fix mismerge from debian-unstable, switch to libglew-dev as a build dep. diff --git a/debian/changelog b/debian/changelog index a3cc94c..f7caa91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ mesa-demos (8.1.0-0ubuntu1) UNRELEASED; urgency=low * Added package mesa-utils-extra containing the EGL/GLES2 demos * debian/patches/properly_defining_default_precision_es2gears.patch: - Dropped, upstream. + * Switch to dh 9 + * Add dh-exec to build deps and drop quilt. + * Install es2gears_screen along with es2gears in mesa-utils-extra. -- Robert Hooker Wed, 01 May 2013 21:23:58 -0400 diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 13fca36..0efff5c 100644 --- a/debian/control +++ b/debian/control @@ -3,15 +3,16 @@ Section: utils Priority: optional Maintainer: Ubuntu X-SWAT Standards-Version: 3.9.1 -Build-Depends: debhelper (>= 7.2.7), +Build-Depends: debhelper (>= 9), pkg-config, autoconf, automake, dh-autoreconf, + dh-exec, libx11-dev, libxext-dev, libgl1-mesa-dev, - libglew1.5-dev, + libglew-dev, libglu1-mesa-dev, libegl1-mesa-dev, libgles1-mesa-dev, diff --git a/debian/mesa-utils-extra.install b/debian/mesa-utils-extra.install old mode 100644 new mode 100755 index 4592e03..e5cc8d4 --- a/debian/mesa-utils-extra.install +++ b/debian/mesa-utils-extra.install @@ -1,3 +1,5 @@ +#!/usr/bin/dh-exec usr/bin/es2_info -usr/bin/es2gears +usr/bin/es2gears_screen +usr/bin/es2gears_x11 => /usr/bin/es2gears usr/bin/es2tri diff --git a/debian/rules b/debian/rules index 1bfde17..a4279c3 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ get-orig-source: rm -rf $(deb_source)-$(upstream_version) %: - dh --with=quilt --with=autoreconf $@ + dh $@ --with=autoreconf override_dh_auto_install: dh_auto_install --destdir=debian/tmp commit e94cc2cf224253d7a823fd5ccb7c59526d636b9b Author: Robert Hooker Date: Thu May 2 07:15:53 2013 -0400 Revert "Delete old src/egl/opengles2/es2_info.c from the git repo, its a link in the tarball." This reverts commit 53b57053dfee074b022911f3d745538c90f7b7fe. diff --git a/src/egl/opengles2/es2_info.c b/src/egl/opengles2/es2_info.c new file mode 12 index 000..bde3140 --- /dev/null +++ b/src/egl/opengles2/es2_info.c @@ -0,0 +1 @@ +../opengles1/es1_info.c \ No newline at end of file -- 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/e1uxryn-0007aj...@vasks.debian.org
mesa-demos: Changes to 'ubuntu'
debian/README.source |7 +++ 1 file changed, 7 insertions(+) New commits: commit 523cead47822248d7d1af305eade963a3fd7a39e Author: Robert Hooker Date: Wed May 1 22:26:47 2013 -0400 Update debian/README.source to note how to fix symlink problems when building from git diff --git a/debian/README.source b/debian/README.source index 5dde0bf..11e03f7 100644 --- a/debian/README.source +++ b/debian/README.source @@ -56,3 +56,10 @@ run: You may need to run quilt pop -a to unapply patches first before running this command. + +While building from git, dpkg-source can complain about symlinks vs. +normal files mismatches. To work around this issue, before uploading, +and without committing: + + find -type l | while read dest; do src=$(readlink -f $dest); rm $dest; cp $src $dest; done + -- 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/e1uxjet-0008ff...@vasks.debian.org
mesa-demos: Changes to 'ubuntu'
debian/mesa-utils-extra.install |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 8b5f616c1d743dfac08cfde295c8a0b1e1713d66 Author: Robert Hooker Date: Wed May 1 22:11:28 2013 -0400 Revert "Install es2gears_screen and es2gears_x11 in mesa-utils-extra" This reverts commit b8dbde3de365ab3645aa57f68b00356f44475e83. diff --git a/debian/mesa-utils-extra.install b/debian/mesa-utils-extra.install index c57c567..4592e03 100644 --- a/debian/mesa-utils-extra.install +++ b/debian/mesa-utils-extra.install @@ -1,4 +1,3 @@ usr/bin/es2_info -usr/bin/es2gears_screen -usr/bin/es2gears_x11 +usr/bin/es2gears usr/bin/es2tri -- 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/e1uxj7o-00083p...@vasks.debian.org
mesa-demos: Changes to 'ubuntu'
src/egl/opengles2/es2_info.c |1 - 1 file changed, 1 deletion(-) New commits: commit 53b57053dfee074b022911f3d745538c90f7b7fe Author: Robert Hooker Date: Wed May 1 21:55:28 2013 -0400 Delete old src/egl/opengles2/es2_info.c from the git repo, its a link in the tarball. diff --git a/src/egl/opengles2/es2_info.c b/src/egl/opengles2/es2_info.c deleted file mode 12 index bde3140..000 --- a/src/egl/opengles2/es2_info.c +++ /dev/null @@ -1 +0,0 @@ -../opengles1/es1_info.c \ No newline at end of file -- 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/e1uxikd-0006lp...@vasks.debian.org
Bug#704604: libgl1-mesa-dri:amd64: Invalid configuration file /etc/drirc (according to driconf)
Sorry about that, yep it's a bug in the shipped /etc/drirc which http://cgit.freedesktop.org/mesa/mesa/commit/src/mesa/drivers/dri/common/drirc?id=668ed9599393de8b0a587c983da5b103249abc78 fixes On Wed, May 1, 2013 at 5:42 PM, Julien Cristau wrote: > Control: reopen -1 > > On Wed, May 1, 2013 at 17:21:56 -0400, Robert Hooker wrote: > >> This is something you installed yourself (did you save system wide in >> driconf in the past?) and not a bug in the package, we don't ship >> /etc/drirc in mesa. > > Actually we do, since 8.0.5-1: > > * Install drirc in libgl1-mesa-dri package with some settings for i965 > (closes: #671747). > > FWIW: > > < jcristau> MrCooper: is 704604 a bug in driconf, or in the default mesa > drirc? > < MrCooper> not sure > > This should probably be taken up on the mesa-dev list so either driconf > or mesa's drirc can be changed. > > Cheers, > Julien -- 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/cadf2a9y+dob9raksqb13kp0ldjfwzazkav8br-r8cickt8c...@mail.gmail.com
mesa: Changes to 'debian-experimental'
debian/changelog |1 + 1 file changed, 1 insertion(+) New commits: commit b650a142896085c4c9c1989a3f459b2b82855fa8 Author: Robert Hooker Date: Wed May 1 16:58:27 2013 -0400 debian/changelog: Note bug closer (#628758) diff --git a/debian/changelog b/debian/changelog index 35c0a53..22aa0c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mesa (9.1.2-1) UNRELEASED; urgency=low * New upstream release. - Set close on exec flag when opening dri devices (Closes: #651370). +- Don't emit a .note.ABI-tag section anymore (Closes: #628758). [ Timo Aaltonen ] * Refresh patches -- 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/e1uxe6z-00084e...@vasks.debian.org
mesa: Changes to 'ubuntu'
| 26 src/mesa/drivers/dri/i965/brw_clear.c |6 src/mesa/drivers/dri/i965/brw_defines.h | 39 src/mesa/drivers/dri/i965/brw_eu_emit.c | 15 src/mesa/drivers/dri/i965/brw_fs.cpp | 26 src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp | 54 - src/mesa/drivers/dri/i965/brw_state.h |2 src/mesa/drivers/dri/i965/brw_vs.c |8 src/mesa/drivers/dri/i965/brw_vs_surface_state.c |5 src/mesa/drivers/dri/i965/brw_wm_surface_state.c |8 src/mesa/drivers/dri/i965/gen6_cc.c |2 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 40 src/mesa/drivers/dri/intel/intel_screen.c |2 src/mesa/drivers/dri/nouveau/nv10_context.c |2 src/mesa/drivers/osmesa/Makefile.am |1 src/mesa/main/compiler.h | 59 - src/mesa/main/fbobject.c |4 src/mesa/main/get.c | 12 src/mesa/main/get_hash_params.py |2 src/mesa/main/mtypes.h |1 src/mesa/main/samplerobj.c | 12 src/mesa/main/samplerobj.h |2 src/mesa/main/tests/hash_table/Makefile.am |1 src/mesa/main/texgetimage.c |1 src/mesa/main/teximage.c | 23 src/mesa/main/texparam.c | 12 src/mesa/main/texstorage.c |1 src/mesa/main/version.h |4 src/mesa/vbo/vbo_save_draw.c |2 84 files changed, 951 insertions(+), 1310 deletions(-) New commits: commit 2bfae0f16f06aa812e0fabf12cde50cbdb3caf15 Author: Robert Hooker Date: Wed May 1 16:56:13 2013 -0400 debian/changelog: Mark as UNRELEASED, whoops diff --git a/debian/changelog b/debian/changelog index 2d234d3..2c839cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (9.1.2-0ubuntu1) saucy; urgency=low +mesa (9.1.2-0ubuntu1) UNRELEASED; urgency=low * New upstream bug-fix release. * Drop upstream patches: commit 8190e3a6530c3c34ba00055e5b51f3db16221821 Author: Robert Hooker Date: Wed May 1 16:55:06 2013 -0400 debian/patches/117-static-gallium.patch: Refresh diff --git a/debian/changelog b/debian/changelog index 344c837..2d234d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ mesa (9.1.2-0ubuntu1) saucy; urgency=low - 100_no_abi_tag.patch - 119-libllvmradeon-link.patch - vbo-fix-crash.diff + * debian/patches/117-static-gallium.patch: Refresh for minor change +in 9.1.2 -- Robert Hooker Wed, 01 May 2013 16:40:16 -0400 diff --git a/debian/patches/117-static-gallium.patch b/debian/patches/117-static-gallium.patch index ab72546..939cb73 100644 --- a/debian/patches/117-static-gallium.patch +++ b/debian/patches/117-static-gallium.patch @@ -1,6 +1,8 @@ +diff --git a/configure.ac b/configure.ac +index b9fcb0b..be89843 100644 --- a/configure.ac +++ b/configure.ac -@@ -733,6 +733,19 @@ +@@ -747,6 +747,19 @@ if test "x$enable_shared_glapi" = xyes; then fi AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes) @@ -20,9 +22,11 @@ dnl dnl Driver specific build directories dnl +diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am +index f14279b..3cdec83 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am -@@ -3,13 +3,19 @@ +@@ -3,14 +3,19 @@ AUTOMAKE_OPTIONS = subdir-objects include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc @@ -30,12 +34,13 @@ - AM_CFLAGS = \ -I$(top_srcdir)/src/gallium/auxiliary/util \ -- $(GALLIUM_CFLAGS) $(VISIBILITY_CFLAGS) +- $(GALLIUM_CFLAGS) \ +- $(VISIBILITY_CFLAGS) + $(GALLIUM_CFLAGS) -+ -+AM_CXXFLAGS = -AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) ++AM_CXXFLAGS = ++ +if HAVE_SHARED_GALLIUM +lib_LTLIBRARIES = libgallium.la +else @@ -46,7 +51,7 @@ libgallium_la_SOURCES = \
Bug#639423: mesa: graphical issues with Minecraft
Is this still an issue with mesa 8.0.5 in wheezy? -- 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/cadf2a9xzcbcznszv9vm6qbmayavz6bmw478kv6maj2bpbf9...@mail.gmail.com
mesa: Changes to 'debian-experimental'
Makefile.am |2 bin/.cherry-ignore|6 configure.ac | 19 - debian/changelog |6 debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch | 21 - debian/patches/10-hurd-configure-tweaks.diff | 14 - debian/patches/14-fix-osmesa-build.diff | 10 debian/patches/15-fix-oot-build.diff | 13 debian/patches/16-avoid-symbols-from-static-llvm.diff | 90 -- debian/patches/series |5 docs/relnotes-9.1.1.html |3 docs/relnotes-9.1.2.html | 235 ++ include/c99_compat.h | 147 +++ src/egl/main/eglcompiler.h| 44 --- src/gallium/auxiliary/Makefile.am |7 src/gallium/auxiliary/gallivm/lp_bld_tgsi.h |1 src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c | 20 + src/gallium/auxiliary/tgsi/tgsi_text.c|2 src/gallium/drivers/Makefile.am |1 src/gallium/drivers/llvmpipe/lp_scene.c | 22 + src/gallium/drivers/llvmpipe/lp_scene.h | 10 src/gallium/drivers/nv50/nv50_blit.h | 40 +++ src/gallium/drivers/nv50/nv50_state_validate.c| 12 src/gallium/drivers/nv50/nv50_surface.c | 77 - src/gallium/drivers/nvc0/nvc0_3d.xml.h|2 src/gallium/drivers/nvc0/nvc0_surface.c | 123 ++--- src/gallium/drivers/r300/compiler/radeon_optimize.c |4 src/gallium/drivers/r600/r600_pipe.c |2 src/gallium/drivers/r600/r600_query.c |5 src/gallium/drivers/radeon/Makefile.am|4 src/gallium/drivers/radeonsi/si_state_draw.c |5 src/gallium/drivers/rbug/Makefile.am |1 src/gallium/drivers/svga/Makefile.am |2 src/gallium/drivers/trace/Makefile.am |3 src/gallium/include/pipe/p_compiler.h | 74 - src/gallium/state_trackers/egl/Makefile.am|2 src/gallium/state_trackers/xa/Makefile.am |4 src/gallium/winsys/svga/drm/Makefile.am |2 src/glsl/glsl_types.cpp |2 src/glsl/ir_validate.cpp |6 src/glsl/linker.cpp |2 src/glx/Makefile.am |1 src/mapi/glapi/gen/gl_x86-64_asm.py | 13 src/mapi/glapi/gen/gl_x86_asm.py | 13 src/mapi/mapi/entry_x86-64_tls.h | 13 src/mapi/mapi/entry_x86_tls.h | 13 src/mapi/mapi/u_compiler.h| 26 - src/mesa/drivers/dri/i965/brw_clear.c |6 src/mesa/drivers/dri/i965/brw_defines.h | 39 ++ src/mesa/drivers/dri/i965/brw_eu_emit.c | 15 - src/mesa/drivers/dri/i965/brw_fs.cpp | 26 + src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp | 54 ++-- src/mesa/drivers/dri/i965/brw_state.h |2 src/mesa/drivers/dri/i965/brw_vs.c|8 src/mesa/drivers/dri/i965/brw_vs_surface_state.c |5 src/mesa/drivers/dri/i965/brw_wm_surface_state.c |8 src/mesa/drivers/dri/i965/gen6_cc.c |2 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 40 +++ src/mesa/drivers/dri/intel/intel_screen.c |2 src/mesa/drivers/dri/nouveau/nv10_context.c |2 src/mesa/drivers/osmesa/Makefile.am |1 src/mesa/main/compiler.h | 59 src/mesa/main/fbobject.c |4 src/mesa/main/get.c | 12 src/mesa/main/get_hash_params.py |2 src/mesa/main/mtypes.h|1 src/mesa/main/samplerobj.c| 12 src/mesa/main/samplerobj.h|2 src/mesa/main/tests/hash_table/Makefile.am|1 src/mesa/main/texgetimage.c |1 src/mesa/main/teximage.c | 23 - src/mesa/main/texparam.c | 12 src/mesa/main/texstorage.c|1 src/mesa/main/version.h |4 src/mesa/vbo/vbo_save_draw.c |2 75 files changed, 920 insertions(+), 555 deletions(-) New commits: commit 17b787fed4401b13f91144304b223e251fc29f69 Author: Robert Hooker Date: Wed May 1 16:28:04 2013 -0400 debian
Bug#628758: please include Ubuntu's "abi tag" patch into mesa
This is now fixed upstream in mesa 9.1.2 which is in debian-experimental git. -- 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/cadf2a9z2m7qowsswuownjod3fdiudgz+anhumbeefma0dmm...@mail.gmail.com
mesa: Changes to 'upstream-experimental'
Makefile.am |2 bin/.cherry-ignore |6 configure.ac| 19 - docs/relnotes-9.1.1.html|3 docs/relnotes-9.1.2.html| 235 include/c99_compat.h| 147 src/egl/main/eglcompiler.h | 44 --- src/gallium/auxiliary/Makefile.am |7 src/gallium/auxiliary/gallivm/lp_bld_tgsi.h |1 src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c | 20 + src/gallium/auxiliary/tgsi/tgsi_text.c |2 src/gallium/drivers/Makefile.am |1 src/gallium/drivers/llvmpipe/lp_scene.c | 22 + src/gallium/drivers/llvmpipe/lp_scene.h | 10 src/gallium/drivers/nv50/nv50_blit.h| 40 +++ src/gallium/drivers/nv50/nv50_state_validate.c | 12 - src/gallium/drivers/nv50/nv50_surface.c | 77 -- src/gallium/drivers/nvc0/nvc0_3d.xml.h |2 src/gallium/drivers/nvc0/nvc0_surface.c | 123 +++--- src/gallium/drivers/r300/compiler/radeon_optimize.c |4 src/gallium/drivers/r600/r600_pipe.c|2 src/gallium/drivers/r600/r600_query.c |5 src/gallium/drivers/radeon/Makefile.am |4 src/gallium/drivers/radeonsi/si_state_draw.c|5 src/gallium/drivers/rbug/Makefile.am|1 src/gallium/drivers/svga/Makefile.am|2 src/gallium/drivers/trace/Makefile.am |3 src/gallium/include/pipe/p_compiler.h | 74 -- src/gallium/state_trackers/egl/Makefile.am |2 src/gallium/state_trackers/xa/Makefile.am |4 src/gallium/winsys/svga/drm/Makefile.am |2 src/glsl/glsl_types.cpp |2 src/glsl/ir_validate.cpp|6 src/glsl/linker.cpp |2 src/glx/Makefile.am |1 src/mapi/glapi/gen/gl_x86-64_asm.py | 13 - src/mapi/glapi/gen/gl_x86_asm.py| 13 - src/mapi/mapi/entry_x86-64_tls.h| 13 - src/mapi/mapi/entry_x86_tls.h | 13 - src/mapi/mapi/u_compiler.h | 26 -- src/mesa/drivers/dri/i965/brw_clear.c |6 src/mesa/drivers/dri/i965/brw_defines.h | 39 +++ src/mesa/drivers/dri/i965/brw_eu_emit.c | 15 - src/mesa/drivers/dri/i965/brw_fs.cpp| 26 +- src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp | 54 ++-- src/mesa/drivers/dri/i965/brw_state.h |2 src/mesa/drivers/dri/i965/brw_vs.c |8 src/mesa/drivers/dri/i965/brw_vs_surface_state.c|5 src/mesa/drivers/dri/i965/brw_wm_surface_state.c|8 src/mesa/drivers/dri/i965/gen6_cc.c |2 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 40 +++ src/mesa/drivers/dri/intel/intel_screen.c |2 src/mesa/drivers/dri/nouveau/nouveau_driver.c |3 src/mesa/drivers/dri/nouveau/nv10_context.c |2 src/mesa/drivers/osmesa/Makefile.am |1 src/mesa/main/compiler.h| 59 - src/mesa/main/fbobject.c|4 src/mesa/main/get.c | 12 - src/mesa/main/get_hash_params.py|2 src/mesa/main/mtypes.h |1 src/mesa/main/samplerobj.c | 12 - src/mesa/main/samplerobj.h |2 src/mesa/main/tests/hash_table/Makefile.am |1 src/mesa/main/texgetimage.c |1 src/mesa/main/teximage.c| 23 + src/mesa/main/texparam.c| 12 + src/mesa/main/texstorage.c |1 src/mesa/main/version.h |4 src/mesa/vbo/vbo_save_draw.c|2 69 files changed, 917 insertions(+), 402 deletions(-) New commits: commit 8c2981b8e093c6a58723a1bde0ed8c83e1375d45 Author: Ian Romanick Date: Tue Apr 30 15:18:53 2013 -0700 docs: 9.1.2 release notes Signed-off-by: Ian Romanick diff --git a/docs/relnotes-9.1.2.html b/docs/relnotes-9.1.2.html new file mode 100644 index 000..98626a9 --- /dev/null +++ b/docs/relnotes-9.1.2.html @@ -0,0 +1,235 @@ +http://www.w3.org/TR/html4/loose.dtd";> + + + + Mesa Release Notes + + + + + + The Mesa 3D Graphics Library + + + + + +Mesa 9.1.2 Release Notes / April 30th, 2013 + + +Mesa 9.1.2 is a bug fix release which fixes bugs found since the 9.1.1 release. + + +Mesa 9.1 implement
Bug#675977: Please consider inclusion of this in Wheezy
aka 9 months ago it might have happened, its WAY too late now. -- 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/cadf2a9ylo5+wgybr_vz-pvpomok0yp5bgd05yxkypktnq6e...@mail.gmail.com
mesa: Changes to 'debian-experimental'
debian/changelog |2 -- debian/patches/04_osmesa_version.diff | 27 ++- 2 files changed, 18 insertions(+), 11 deletions(-) New commits: commit c263b342fdaabffbced5960c090dc1033b944ffc Author: Robert Hooker Date: Thu Feb 14 18:10:04 2013 -0500 Revert "debian/patches04_osmesa_version.diff: Switch to a less fragile way of forcing the version" This reverts commit a208628411c8141a99ab2e118c5aef4a9fe87402. It doesn't actually work, sorry about that! diff --git a/debian/changelog b/debian/changelog index 4d8af4f..7a4006e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,8 +61,6 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low * Drop xutils-dev build dep, makedepend is no longer required * Recommend libtxc-dxtn0 in libgl1-mesa-dri for easier use with multiarch installs (Closes: #668645). - * 04_osmesa_version.diff: Switch to a less fragile way of forcing the version -(Closes: 697745) -- Julien Cristau Fri, 03 Aug 2012 23:17:16 +0200 diff --git a/debian/patches/04_osmesa_version.diff b/debian/patches/04_osmesa_version.diff index 3232216..bad5f7b 100644 --- a/debian/patches/04_osmesa_version.diff +++ b/debian/patches/04_osmesa_version.diff @@ -1,11 +1,20 @@ a/configure.ac -+++ b/configure.ac -@@ -25,7 +25,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R - m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) +--- a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am +@@ -37,7 +37,7 @@ + nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp + lib@OSMESA_LIB@_la_SOURCES = osmesa.c - dnl Set internal versions --OSMESA_VERSION=8 -+OSMESA_VERSION=6:5:3 - AC_SUBST([OSMESA_VERSION]) +-lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -no-undefined ++lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number 6:5:3 -no-undefined - dnl Versions for external dependencies + if HAVE_SHARED_GLAPI + GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la +@@ -55,7 +55,7 @@ + all-local: lib@OSMESA_LIB@.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); + ln -f .libs/lib@OSMESA_LIB@.so $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so; +- ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@ $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@OSMESA_VERSION@; ++ ln -f .libs/lib@OSMESA_LIB@.so.6.5.3 $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.6.5.3; + endif + + pkgconfigdir = $(libdir)/pkgconfig -- 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/e1u67xf-0003bs...@vasks.debian.org
mesa: Changes to 'ubuntu'
debian/changelog | 12
debian/control|3 +--
debian/patches/04_osmesa_version.diff | 27 +--
3 files changed, 22 insertions(+), 20 deletions(-)
New commits:
commit 7b841a6f0e7f20d817ad55b1662a8fd78a95e1cb
Author: Robert Hooker
Date: Tue Feb 12 14:24:09 2013 -0500
debian/control: Drop libtxc-dxtn-s2tc0 recommends from libgl1-mesa-glx,
libgl1-mesa-dri now recommends libtxc-dxtn0.
diff --git a/debian/changelog b/debian/changelog
index af576f4..054acf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
mesa (9.1~git20130207.f1c46c84-0ubuntu1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Merge from unreleased debian git.
* Refresh patches.
+ [ Robert Hooker ]
+ * Drop ubuntu specific libtxc-dxtn-s2tc0 recommends from libgl1-mesa-glx,
+libgl1-mesa-dri now recommends libtxc-dxtn0.
+
-- Timo Aaltonen Thu, 07 Feb 2013 18:09:58 +0200
mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 32dbdca..cce6f60 100644
--- a/debian/control
+++ b/debian/control
@@ -453,7 +453,6 @@ Depends:
${misc:Depends}
Recommends:
libgl1-mesa-dri (>= 7.2),
- libtxc-dxtn-s2tc0
Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
Provides: libgl1
commit a208628411c8141a99ab2e118c5aef4a9fe87402
Author: Robert Hooker
Date: Tue Feb 12 11:08:28 2013 -0500
debian/patches04_osmesa_version.diff: Switch to a less fragile way of
forcing the version
diff --git a/debian/changelog b/debian/changelog
index 7a4006e..4d8af4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low
* Drop xutils-dev build dep, makedepend is no longer required
* Recommend libtxc-dxtn0 in libgl1-mesa-dri for easier use with multiarch
installs (Closes: #668645).
+ * 04_osmesa_version.diff: Switch to a less fragile way of forcing the version
+(Closes: 697745)
-- Julien Cristau Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/patches/04_osmesa_version.diff
b/debian/patches/04_osmesa_version.diff
index bad5f7b..3232216 100644
--- a/debian/patches/04_osmesa_version.diff
+++ b/debian/patches/04_osmesa_version.diff
@@ -1,20 +1,11 @@
a/src/mesa/drivers/osmesa/Makefile.am
-+++ b/src/mesa/drivers/osmesa/Makefile.am
-@@ -37,7 +37,7 @@
- nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp
- lib@OSMESA_LIB@_la_SOURCES = osmesa.c
+--- a/configure.ac
b/configure.ac
+@@ -25,7 +25,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
--lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@
-no-undefined
-+lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number 6:5:3 -no-undefined
+ dnl Set internal versions
+-OSMESA_VERSION=8
++OSMESA_VERSION=6:5:3
+ AC_SUBST([OSMESA_VERSION])
- if HAVE_SHARED_GLAPI
- GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-@@ -55,7 +55,7 @@
- all-local: lib@OSMESA_LIB@.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/lib@OSMESA_LIB@.so
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so;
-- ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@OSMESA_VERSION@;
-+ ln -f .libs/lib@OSMESA_LIB@.so.6.5.3
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.6.5.3;
- endif
-
- pkgconfigdir = $(libdir)/pkgconfig
+ dnl Versions for external dependencies
commit 5de85f7bceb3b0639d2ab7be9f2ac8b6b4ed5fc4
Author: Robert Hooker
Date: Tue Feb 12 10:57:38 2013 -0500
debian/control: Recommend libtxc-dxtn0 in libgl1-mesa-dri.
diff --git a/debian/changelog b/debian/changelog
index 3786286..7a4006e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,8 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low
[ Robert Hooker ]
* Drop xutils-dev build dep, makedepend is no longer required
+ * Recommend libtxc-dxtn0 in libgl1-mesa-dri for easier use with multiarch
+installs (Closes: #668645).
-- Julien Cristau Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/control b/debian/control
index 1c2af9a..8f19566 100644
--- a/debian/control
+++ b/debian/control
@@ -604,6 +604,7 @@ Pre-Depends: ${misc:Pre-Depends}
Depends:
${shlibs:Depends},
${misc:Depends}
+Recommends: libtxc-dxtn0
Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
Replaces: xlibmesa-dri (<< 1:7.0.0), libgl1-mesa-dri-experimental (<< 7.11.1)
commit a09438e1ad5363724b4f48495f3275e6bea22cd0
Author: Robert Hooker
Date: Mon Feb 11 14:33:16 2013 -0500
debian/control: Drop xutils-dev build dep, makedepend is no longer required.
diff --git a/debian/changelog b/debian/changelog
index 0860c01..3786286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,9 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low
* control:
mesa: Changes to 'debian-experimental'
debian/changelog |4
debian/control|1 +
debian/patches/04_osmesa_version.diff | 27 +--
3 files changed, 14 insertions(+), 18 deletions(-)
New commits:
commit a208628411c8141a99ab2e118c5aef4a9fe87402
Author: Robert Hooker
Date: Tue Feb 12 11:08:28 2013 -0500
debian/patches04_osmesa_version.diff: Switch to a less fragile way of
forcing the version
diff --git a/debian/changelog b/debian/changelog
index 7a4006e..4d8af4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low
* Drop xutils-dev build dep, makedepend is no longer required
* Recommend libtxc-dxtn0 in libgl1-mesa-dri for easier use with multiarch
installs (Closes: #668645).
+ * 04_osmesa_version.diff: Switch to a less fragile way of forcing the version
+(Closes: 697745)
-- Julien Cristau Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/patches/04_osmesa_version.diff
b/debian/patches/04_osmesa_version.diff
index bad5f7b..3232216 100644
--- a/debian/patches/04_osmesa_version.diff
+++ b/debian/patches/04_osmesa_version.diff
@@ -1,20 +1,11 @@
a/src/mesa/drivers/osmesa/Makefile.am
-+++ b/src/mesa/drivers/osmesa/Makefile.am
-@@ -37,7 +37,7 @@
- nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp
- lib@OSMESA_LIB@_la_SOURCES = osmesa.c
+--- a/configure.ac
b/configure.ac
+@@ -25,7 +25,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
--lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@
-no-undefined
-+lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number 6:5:3 -no-undefined
+ dnl Set internal versions
+-OSMESA_VERSION=8
++OSMESA_VERSION=6:5:3
+ AC_SUBST([OSMESA_VERSION])
- if HAVE_SHARED_GLAPI
- GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-@@ -55,7 +55,7 @@
- all-local: lib@OSMESA_LIB@.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/lib@OSMESA_LIB@.so
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so;
-- ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@OSMESA_VERSION@;
-+ ln -f .libs/lib@OSMESA_LIB@.so.6.5.3
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.6.5.3;
- endif
-
- pkgconfigdir = $(libdir)/pkgconfig
+ dnl Versions for external dependencies
commit 5de85f7bceb3b0639d2ab7be9f2ac8b6b4ed5fc4
Author: Robert Hooker
Date: Tue Feb 12 10:57:38 2013 -0500
debian/control: Recommend libtxc-dxtn0 in libgl1-mesa-dri.
diff --git a/debian/changelog b/debian/changelog
index 3786286..7a4006e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,8 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low
[ Robert Hooker ]
* Drop xutils-dev build dep, makedepend is no longer required
+ * Recommend libtxc-dxtn0 in libgl1-mesa-dri for easier use with multiarch
+installs (Closes: #668645).
-- Julien Cristau Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/control b/debian/control
index 1c2af9a..8f19566 100644
--- a/debian/control
+++ b/debian/control
@@ -604,6 +604,7 @@ Pre-Depends: ${misc:Pre-Depends}
Depends:
${shlibs:Depends},
${misc:Depends}
+Recommends: libtxc-dxtn0
Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
Replaces: xlibmesa-dri (<< 1:7.0.0), libgl1-mesa-dri-experimental (<< 7.11.1)
--
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/e1u5ipc-0001w1...@vasks.debian.org
mesa: Changes to 'debian-experimental'
debian/changelog |3 +++ debian/control |1 - 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit a09438e1ad5363724b4f48495f3275e6bea22cd0 Author: Robert Hooker Date: Mon Feb 11 14:33:16 2013 -0500 debian/control: Drop xutils-dev build dep, makedepend is no longer required. diff --git a/debian/changelog b/debian/changelog index 0860c01..3786286 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,9 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low * control: Bump libwayland-dev build-dep to 1.0.2. * Remove 13-llvm-config-pick-a-version.diff and just pass a flag to configure. + [ Robert Hooker ] + * Drop xutils-dev build dep, makedepend is no longer required + -- Julien Cristau Fri, 03 Aug 2012 23:17:16 +0200 mesa (8.0.4-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 87d0953..1c2af9a 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ Build-Depends: pkg-config, libdrm-dev (>= 2.4.39) [!hurd-any], libx11-dev, - xutils-dev, x11proto-gl-dev (>= 1.4.14), libxxf86vm-dev, libexpat1-dev, -- 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/e1u4z8k-0004i2...@vasks.debian.org
xorg-server: Changes to 'ubuntu+1'
ChangeLog | 523 ++ Xi/exevents.c | 38 -- config/udev.c |2 debian/changelog |5 debian/control|2 debian/serverminver |2 dix/events.c | 21 - dix/getevents.c |8 dix/ptrveloc.c|2 dix/touch.c | 38 +- hw/xfree86/common/xf86DGA.c | 10 hw/xfree86/common/xf86Events.c| 10 hw/xfree86/common/xf86Module.h|2 hw/xfree86/common/xf86Option.c|2 hw/xwin/winSetAppUserModelID.c|1 hw/xwin/winblock.c| 32 +- hw/xwin/winconfig.c |2 hw/xwin/winglobals.h |4 hw/xwin/winkeybd.c|8 hw/xwin/winmultiwindowwm.c| 115 +++- hw/xwin/winmultiwindowwndproc.c | 61 ++-- hw/xwin/wintrayicon.c |2 hw/xwin/winwakeup.c |4 hw/xwin/winwindow.h |1 include/input.h |4 include/inputstr.h| 22 - include/protocol-versions.h |2 include/xwin-config.h.in |3 mi/mieq.c |6 render/animcur.c |3 test/xi2/protocol-xiwarppointer.c |2 xkb/xkbUtils.c| 10 32 files changed, 782 insertions(+), 165 deletions(-) New commits: commit ebf6def1a1a0aafbc3f22a0301ffa19f8c06ba0b Author: Robert Hooker Date: Wed Feb 6 15:01:54 2013 -0500 Bump libxi-dev requirement and ABI_XINPUT_VERSION. diff --git a/debian/changelog b/debian/changelog index 81fdce7..6a15d8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,11 @@ xorg-server (2:1.13.99.901-1) UNRELEASED; urgency=low * Add patch to fix build failure of xserver-xorg-core-udeb. - 02_hide_panoramix_symbol.diff + [ Robert Hooker ] + * Update to a newer git snapshot, 7fe5e6dfa5c1e71 + * Bump input ABI version in serverminver + * Bump libxi-dev build requirement to 2:1.6.99.1 + -- Robert Hooker Wed, 22 Aug 2012 11:12:17 -0400 xorg-server (2:1.13.1.901-0ubuntu1) raring; urgency=low diff --git a/debian/control b/debian/control index 4c68425..4eee7de 100644 --- a/debian/control +++ b/debian/control @@ -63,7 +63,7 @@ Build-Depends: libxext-dev (>= 1:0.99.1), libx11-dev (>= 1:0.99.2), libxrender-dev (>= 1:0.9.0), - libxi-dev (>= 2:1.2.99.1), + libxi-dev (>= 2:1.6.99.1), x11proto-dmx-dev (>= 1:2.2.99.1), libdmx-dev (>= 1:1.0.1), libxpm-dev (>= 1:3.5.3), diff --git a/debian/serverminver b/debian/serverminver index b3cde97..2c9fb36 100644 --- a/debian/serverminver +++ b/debian/serverminver @@ -1,3 +1,3 @@ 2:1.13.99.901 ABI_VIDEODRV_VERSION:14.1 -ABI_XINPUT_VERSION:18.0 +ABI_XINPUT_VERSION:19.0 commit 0d6697915b78e811a6418a0a32b21a001b591cd0 Author: Robert Hooker Date: Wed Feb 6 14:56:34 2013 -0500 Bump ChangeLog diff --git a/ChangeLog b/ChangeLog index 3a69859..f010b72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,372 @@ +commit 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee +Author: Jasper St. Pierre +Date: Wed Jan 23 13:11:55 2013 -0500 + +protocol-versions: Bump minor version of XI + +This was accidentally excluded when we added barriers. + +Reviewed-by: Peter Hutterer +Signed-off-by: Keith Packard + +commit 70b127c9f1c53bdb42f078265e67f76b464deae2 +Author: Aaron Plattner +Date: Thu Jan 10 17:01:17 2013 -0800 + +config/udev: fix "removing GPU device" format string mistake + + udev.c: In function 'device_removed': + udev.c:270:9: warning: format '%d' expects argument of type 'int', but argument 3 has type 'const char *' [-Wformat] + +Signed-off-by: Aaron Plattner +Reviewed-by: Peter Hutterer +Signed-off-by: Keith Packard + +commit 605dfc6804a05ff2bda5692fec26c37344fd95cb +Author: Dave Airlie +Date: Tue Jan 22 07:39:53 2013 +1000 + +xserver: fix build regression since 91ab237358c6e33da854914d3de493a9cbea7637 + +inputstr, double defines TouchListener typedef, maybe some gcc handles it, +but not all. + +fixes tinderbox + +Reported-by: Jon TURNEY +Signed-off-by: Dave Airlie +Reviewed-by: Peter Hutterer +Signed-off-by: Keith Packard + +commit 069d8ed3eb659c48dd2b0f8b7b8c11f092fdb362 +Merge: 591c062 d6dcde7 +Author: Keith Packard +Date: Sun Jan 20 15:58:38 2013 -0800 + +Merge remote-tracking branch 'jturney/xserver-next' + +commit 591c06277bb120ab9615633f2d28addbd3a2aa5f +Merge: 6703a7c fa6ab7d +Author: Keith Packard +Date: Sun Jan 20 15:52:26 2013 -0800 + +Merge remote-tracking branch 'whot/for-keith' + +commit d6dcde7a03bb38c17ffc4ec5f0ca1c161e54569f +Author: Jon TURNEY +Date: Sat Feb 11 12:22:17 2012 + + +hw/xwin: Stop assum
xserver-xorg-video-intel: Changes to 'ubuntu-precise'
debian/changelog|8 ++
debian/patches/108-Add-support-for-IVB-GT2-server.patch | 44
debian/patches/series |1
3 files changed, 53 insertions(+)
New commits:
commit b021005c8542e0b14ba5f9f7cffc9e6b0a4b3846
Author: Robert Hooker
Date: Thu Jan 24 11:01:19 2013 -0500
Release 2:2.17.0-1ubuntu4.3: Backport IVB GT2 server support.
diff --git a/debian/changelog b/debian/changelog
index 20fa358..7609d6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.17.0-1ubuntu4.3) precise-proposed; urgency=low
+
+ * Add 108-Add-support-for-IVB-GT2-server.patch: Backport a commit from a
+later release that adds the Ivybridge Server GT2 PCI id used in newer
+Xeon processors. (lp: #1091068)
+
+ -- Robert Hooker Mon, 17 Dec 2012 13:28:49 -0500
+
xserver-xorg-video-intel (2:2.17.0-1ubuntu4.2) precise-proposed; urgency=low
* Add 106-uxa-only-consider-attached-outputs-valid.patch, two upstream
diff --git a/debian/patches/108-Add-support-for-IVB-GT2-server.patch
b/debian/patches/108-Add-support-for-IVB-GT2-server.patch
new file mode 100644
index 000..c8762c9
--- /dev/null
+++ b/debian/patches/108-Add-support-for-IVB-GT2-server.patch
@@ -0,0 +1,44 @@
+From ea36f2c4a3fa9afa8184eeaf944af9924c080368 Mon Sep 17 00:00:00 2001
+From: Eugeni Dodonov
+Date: Fri, 30 Mar 2012 00:08:29 +
+Subject: Add support for Ivy Bridge GT2 Server chipset
+
+Sometimes known as Bromlow.
+
+Signed-off-by: Eugeni Dodonov
+Signed-off-by: Chris Wilson
+---
+diff --git a/src/intel_driver.h b/src/intel_driver.h
+index e9d6d9e..98973e5 100644
+--- a/src/intel_driver.h
b/src/intel_driver.h
+@@ -190,6 +190,7 @@
+ #define PCI_CHIP_IVYBRIDGE_D_GT1 0x0152
+ #define PCI_CHIP_IVYBRIDGE_D_GT2 0x0162
+ #define PCI_CHIP_IVYBRIDGE_S_GT1 0x015a
++#define PCI_CHIP_IVYBRIDGE_S_GT2 0x016a
+
+ #endif
+
+diff --git a/src/intel_module.c b/src/intel_module.c
+index 2c0e5cc..c6f94f5 100644
+--- a/src/intel_module.c
b/src/intel_module.c
+@@ -142,6 +142,7 @@ static const SymTabRec _intel_chipsets[] = {
+ {PCI_CHIP_IVYBRIDGE_D_GT1, "Ivybridge Desktop (GT1)" },
+ {PCI_CHIP_IVYBRIDGE_D_GT2, "Ivybridge Desktop (GT2)" },
+ {PCI_CHIP_IVYBRIDGE_S_GT1, "Ivybridge Server" },
++ {PCI_CHIP_IVYBRIDGE_S_GT2, "Ivybridge Server (GT2)" },
+ {-1,NULL}
+ };
+ #define NUM_CHIPSETS (sizeof(_intel_chipsets) / sizeof(_intel_chipsets[0]))
+@@ -210,6 +211,7 @@ static const struct pci_id_match intel_device_match[] = {
+ INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_D_GT1, &intel_ivybridge_info ),
+ INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_D_GT2, &intel_ivybridge_info ),
+ INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_S_GT1, &intel_ivybridge_info ),
++ INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_S_GT2, &intel_ivybridge_info ),
+
+ { 0, 0, 0 },
+ };
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/debian/patches/series b/debian/patches/series
index c086e8a..e1f8a65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
105_reduce_ivb_gt1_max_thread_count.patch
106-uxa-only-consider-attached-outputs-valid.patch
107-uxa-fix-pageflip-race.patch
+108-Add-support-for-IVB-GT2-server.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/e1typfd-000767...@vasks.debian.org
x11-apps: Changes to 'debian-unstable'
debian/changelog |6 ++ debian/control |4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 636a7fdb14993e8d0e8b77430dfc5cd81f197ff0 Author: Robert Hooker Date: Sat Dec 15 18:38:09 2012 -0500 debian/control: Add transset to conflicts/replaces to fix upgrades. diff --git a/debian/changelog b/debian/changelog index 8a3a160..bc749e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11-apps (7.7~3) UNRELEASED; urgency=low + + * Add transset to conflicts/replaces to fix upgrades. + + -- Robert Hooker Sat, 15 Dec 2012 18:36:39 -0500 + x11-apps (7.7~2) unstable; urgency=low * Team upload. diff --git a/debian/control b/debian/control index dc10c9b..7cc6d27 100644 --- a/debian/control +++ b/debian/control @@ -58,10 +58,10 @@ Recommends: xbitmaps Suggests: mesa-utils Conflicts: bitmap, oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole, xcursorgen, xditview, xeyes, xgc, xload, xlogo, xmag, xman, xmore, xwd, - xwud + xwud, transset Replaces: xbase-clients (<= 1:7.2.ds2-3), bitmap, oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole, xcursorgen, xditview, xeyes, xgc, - xload, xlogo, xmag, xman, xmore, xwd, xwud + xload, xlogo, xmag, xman, xmore, xwd, xwud, transset Description: X applications This package provides a miscellaneous assortment of X applications that ship with the X Window System, including: -- 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/e1tk1jk-0003vg...@vasks.debian.org
x11-apps: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d764e6399abc46a1df4bd0ec1fffebff2d51bee0 Author: Robert Hooker Date: Thu Aug 23 16:31:38 2012 -0400 Bump for release diff --git a/debian/changelog b/debian/changelog index 05b6f0e..dc043ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11-apps (7.7~2ubuntu1) UNRELEASED; urgency=low +x11-apps (7.7~2ubuntu1) quantal; urgency=low * Merge new release from debian unstable. * Dropped 100-fix-linking-with-no-add-needed.patch, upstream. -- 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/e1t4e47-0007b0...@vasks.debian.org
xorg-server: Changes to 'ubuntu'
ChangeLog | 175 ++ configure.ac |6 - debian/changelog | 21 +++- dix/main.c| 18 +-- fb/fbseg.c| 18 +-- glx/glxscreens.c |3 hw/xfree86/common/xf86Module.h|2 hw/xfree86/modes/xf86Crtc.c | 11 +- hw/xquartz/X11Controller.m| 62 +++- hw/xquartz/console_redirect.c | 28 +++-- hw/xquartz/mach-startup/bundle-main.c | 17 +++ hw/xquartz/quartz.c |1 render/filter.c |5 13 files changed, 325 insertions(+), 42 deletions(-) New commits: commit ecfb7e4014989123dcf704ff1a6d2a8f0719d0b5 Author: Robert Hooker Date: Wed Aug 22 11:25:11 2012 -0400 Bump changelog version and fix merge error in it diff --git a/debian/changelog b/debian/changelog index 4e49959..5423bb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.12.99.905-0ubuntu1) UNRELEASED; urgency=low + + * New upstream release snapshot (1.13-rc5) + + -- Robert Hooker Wed, 22 Aug 2012 11:23:33 -0400 + xorg-server (2:1.12.99.905-1) UNRELEASED; urgency=low [ Maarten Lankhorst ] @@ -7,7 +13,6 @@ xorg-server (2:1.12.99.905-1) UNRELEASED; urgency=low [ Robert Hooker ] * New upstream release (rc5) - -- Robert Hooker Wed, 22 Aug 2012 11:12:17 -0400 xorg-server (2:1.12.99.904-0ubuntu2) quantal; urgency=low commit e9663c06d28fb8f6e2aead126a0a35e6dffa6737 Author: Robert Hooker Date: Wed Aug 22 11:14:30 2012 -0400 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 84f361b..8f15c51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,178 @@ +commit 6619f5c0e1086b57888ff7146e8ed5897b50d440 +Author: Keith Packard +Date: Tue Aug 21 13:46:34 2012 -0700 + +Relase 1.12.99.905 + +RC with updated ABI version numbers. + +Signed-off-by: Keith Packard + +commit 3e091e1075dc29120e54ab2ef110b04ce7383ffd +Author: Aaron Plattner +Date: Fri Aug 17 11:26:05 2012 -0700 + +xfree86: Bump extension ABI to 7.0 + +Commit 9d457f9c55f12106ba44c1c9db59d14f978f0ae8 added an array of +DevPrivateSetRec structures in the middle of the ScreenRec, which throws off +extension modules trying to call things like pScreen->DestroyPixmap. + +Signed-off-by: Aaron Plattner +Signed-off-by: Keith Packard + +commit ac616d8ed5a634c6b32775eb7b071a13c575fd97 +Author: Jeremy Huddleston Sequoia +Date: Thu Aug 16 19:09:42 2012 -0700 + +XQuartz: Use asl_log_descriptor for children as well + +This change is #if'd out due to a bug in asl_log_descriptor, but +it is left here as reference to be enabled in the future. + +Signed-off-by: Jeremy Huddleston Sequoia + +commit ad123071e54d890d36d1373f59b8a6eb4937e936 +Author: Jeremy Huddleston Sequoia +Date: Thu Aug 16 13:02:28 2012 -0700 + +XQuartz: Use asl_log_descriptor on Mountain Lion + +Signed-off-by: Jeremy Huddleston Sequoia + +commit 7c3d2e4828deb4e8ec38e8ef88d6f92b2d931033 +Author: Jeremy Huddleston Sequoia +Date: Thu Aug 16 19:42:54 2012 -0700 + +XQuartz: console_redirect: Properly zero-out the tail of the array on realloc() + +We forgot to multiply by sizeof(), so it wasn't fully zeroed out. + +Signed-off-by: Jeremy Huddleston Sequoia + +commit a32e01802ff1c938c0afe0cc007a273b9ada8610 +Author: Jeremy Huddleston Sequoia +Date: Thu Aug 16 15:43:34 2012 -0700 + +XQuartz: console_redirect: Set the correct location for reading into the buffer + +Prior to this change, it was possible that a large message would have some +of its data prepended to subsequent messages due to our not incorrectly +setting the location to write into the buffer. + +Signed-off-by: Jeremy Huddleston Sequoia + +commit ad5fe2d9614959b68bf71e23abf7e5abac9c2734 +Merge: 16d8da5 99b94af +Author: Keith Packard +Date: Wed Aug 15 13:29:17 2012 -0700 + +Merge remote-tracking branch 'jeremyhu/master' + +commit 16d8da5ca99211bd180f532d78d7c5943d38c8ad +Author: Paul Berry +Date: Tue Jul 31 15:15:56 2012 -0700 + +glx: Skip multisampled configs when matching pre-existing X visuals. + +In __glXScreenInit() we generate the set of GLX visuals in two steps: +first we match each pre-existing X visual with a corresponding +FBConfig, then we generate a new X visual to correspond to all the +remaining FBConfigs. + +The first step is used for the two default 24-bit visuals (true color +and direct color) and for the 32-bit visual. If windowsystem +multisampling is enabled in Mesa, we need to ensure that none of these +three visuals gets matched to a multisampled config. + +Fixes a bug with windowsystem multisampling in gnome-shell. If the X +server happens to match up a multisampled
xorg-server: Changes to 'debian-experimental'
ChangeLog | 175 ++
configure.ac |6 -
debian/changelog | 10 +
dix/main.c| 18 +--
fb/fbseg.c| 18 +--
glx/glxscreens.c |3
hw/xfree86/common/xf86Module.h|2
hw/xfree86/modes/xf86Crtc.c | 11 +-
hw/xquartz/X11Controller.m| 62 +++-
hw/xquartz/console_redirect.c | 28 +++--
hw/xquartz/mach-startup/bundle-main.c | 17 +++
hw/xquartz/quartz.c |1
render/filter.c |5
13 files changed, 313 insertions(+), 43 deletions(-)
New commits:
commit e9663c06d28fb8f6e2aead126a0a35e6dffa6737
Author: Robert Hooker
Date: Wed Aug 22 11:14:30 2012 -0400
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 84f361b..8f15c51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,178 @@
+commit 6619f5c0e1086b57888ff7146e8ed5897b50d440
+Author: Keith Packard
+Date: Tue Aug 21 13:46:34 2012 -0700
+
+Relase 1.12.99.905
+
+RC with updated ABI version numbers.
+
+Signed-off-by: Keith Packard
+
+commit 3e091e1075dc29120e54ab2ef110b04ce7383ffd
+Author: Aaron Plattner
+Date: Fri Aug 17 11:26:05 2012 -0700
+
+xfree86: Bump extension ABI to 7.0
+
+Commit 9d457f9c55f12106ba44c1c9db59d14f978f0ae8 added an array of
+DevPrivateSetRec structures in the middle of the ScreenRec, which throws
off
+extension modules trying to call things like pScreen->DestroyPixmap.
+
+Signed-off-by: Aaron Plattner
+Signed-off-by: Keith Packard
+
+commit ac616d8ed5a634c6b32775eb7b071a13c575fd97
+Author: Jeremy Huddleston Sequoia
+Date: Thu Aug 16 19:09:42 2012 -0700
+
+XQuartz: Use asl_log_descriptor for children as well
+
+This change is #if'd out due to a bug in asl_log_descriptor, but
+it is left here as reference to be enabled in the future.
+
+Signed-off-by: Jeremy Huddleston Sequoia
+
+commit ad123071e54d890d36d1373f59b8a6eb4937e936
+Author: Jeremy Huddleston Sequoia
+Date: Thu Aug 16 13:02:28 2012 -0700
+
+XQuartz: Use asl_log_descriptor on Mountain Lion
+
+Signed-off-by: Jeremy Huddleston Sequoia
+
+commit 7c3d2e4828deb4e8ec38e8ef88d6f92b2d931033
+Author: Jeremy Huddleston Sequoia
+Date: Thu Aug 16 19:42:54 2012 -0700
+
+XQuartz: console_redirect: Properly zero-out the tail of the array on
realloc()
+
+We forgot to multiply by sizeof(), so it wasn't fully zeroed out.
+
+Signed-off-by: Jeremy Huddleston Sequoia
+
+commit a32e01802ff1c938c0afe0cc007a273b9ada8610
+Author: Jeremy Huddleston Sequoia
+Date: Thu Aug 16 15:43:34 2012 -0700
+
+XQuartz: console_redirect: Set the correct location for reading into the
buffer
+
+Prior to this change, it was possible that a large message would have some
+of its data prepended to subsequent messages due to our not incorrectly
+setting the location to write into the buffer.
+
+Signed-off-by: Jeremy Huddleston Sequoia
+
+commit ad5fe2d9614959b68bf71e23abf7e5abac9c2734
+Merge: 16d8da5 99b94af
+Author: Keith Packard
+Date: Wed Aug 15 13:29:17 2012 -0700
+
+Merge remote-tracking branch 'jeremyhu/master'
+
+commit 16d8da5ca99211bd180f532d78d7c5943d38c8ad
+Author: Paul Berry
+Date: Tue Jul 31 15:15:56 2012 -0700
+
+glx: Skip multisampled configs when matching pre-existing X visuals.
+
+In __glXScreenInit() we generate the set of GLX visuals in two steps:
+first we match each pre-existing X visual with a corresponding
+FBConfig, then we generate a new X visual to correspond to all the
+remaining FBConfigs.
+
+The first step is used for the two default 24-bit visuals (true color
+and direct color) and for the 32-bit visual. If windowsystem
+multisampling is enabled in Mesa, we need to ensure that none of these
+three visuals gets matched to a multisampled config.
+
+Fixes a bug with windowsystem multisampling in gnome-shell. If the X
+server happens to match up a multisampled FBConfig to the 32-bit
+visual, gnome-shell will try to use it to read pixels from
+alpha-blended windows (such as gnome-terminal), resulting in no window
+appearing on screen.
+
+Reviewed-by: Ian Romanick
+Reviewed-by: Chad Versace
+Signed-off-by: Keith Packard
+
+commit 99b94af1ffbef7047f88e7d6c594242d172bec02
+Author: Jeremy Huddleston
+Date: Wed Aug 15 10:28:16 2012 -0700
+
+XQuartz: Fix build regression for GlxExtensionInit
+
+quartz.c:153:6: error: use of undeclared identifier 'GlxExtensionInit';
did you mean 'GEExtensionInit'? [Semantic Issue]
+{GlxExtensionInit, "GLX", &noGlxExtension},
+
+Regression-from: aad428b8e21c77397c623b78706eb64b1fea77c9
+Signed-off-by: Jeremy Huddleston
+
+commi
xorg-server: Changes to 'upstream-experimental'
configure.ac |6 +--
dix/main.c| 18 -
fb/fbseg.c| 18 -
glx/glxscreens.c |3 +
hw/xfree86/common/xf86Module.h|2 -
hw/xfree86/modes/xf86Crtc.c | 11 +++---
hw/xquartz/X11Controller.m| 62 --
hw/xquartz/console_redirect.c | 28 +--
hw/xquartz/mach-startup/bundle-main.c | 17 +
hw/xquartz/quartz.c |1
render/filter.c |5 ++
11 files changed, 131 insertions(+), 40 deletions(-)
New commits:
commit 6619f5c0e1086b57888ff7146e8ed5897b50d440
Author: Keith Packard
Date: Tue Aug 21 13:46:34 2012 -0700
Relase 1.12.99.905
RC with updated ABI version numbers.
Signed-off-by: Keith Packard
diff --git a/configure.ac b/configure.ac
index e126355..abfe727 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.12.99.904,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2012-08-07"
-RELEASE_NAME="Sweating Aardvark"
+AC_INIT([xorg-server], 1.12.99.905,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2012-08-21"
+RELEASE_NAME="Splashing Orca"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 3e091e1075dc29120e54ab2ef110b04ce7383ffd
Author: Aaron Plattner
Date: Fri Aug 17 11:26:05 2012 -0700
xfree86: Bump extension ABI to 7.0
Commit 9d457f9c55f12106ba44c1c9db59d14f978f0ae8 added an array of
DevPrivateSetRec structures in the middle of the ScreenRec, which throws off
extension modules trying to call things like pScreen->DestroyPixmap.
Signed-off-by: Aaron Plattner
Signed-off-by: Keith Packard
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index d93405e..83f9790 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -82,7 +82,7 @@ typedef enum {
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(13, 0)
#define ABI_XINPUT_VERSION SET_ABI_VERSION(18, 0)
-#define ABI_EXTENSION_VERSION SET_ABI_VERSION(6, 0)
+#define ABI_EXTENSION_VERSION SET_ABI_VERSION(7, 0)
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
#define MODINFOSTRING1 0xef23fdc5
commit ac616d8ed5a634c6b32775eb7b071a13c575fd97
Author: Jeremy Huddleston Sequoia
Date: Thu Aug 16 19:09:42 2012 -0700
XQuartz: Use asl_log_descriptor for children as well
This change is #if'd out due to a bug in asl_log_descriptor, but
it is left here as reference to be enabled in the future.
Signed-off-by: Jeremy Huddleston Sequoia
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 393bc1a..737db42 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -53,6 +53,11 @@
#include
#include
#include
+#include
+#include
+
+extern aslclient aslc;
+extern char *bundle_id_prefix;
@implementation X11Controller
@@ -342,9 +347,12 @@
const char *newargv[4];
char buf[128];
char *s;
+#if 0 && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+int stdout_pipe[2];
+int stderr_pipe[2];
+#endif
-newargv[0] =
-[X11App prefs_get_string:@PREFS_LOGIN_SHELL default:"/bin/sh"];
+newargv[0] = [X11App prefs_get_string:@PREFS_LOGIN_SHELL
default:"/bin/sh"];
newargv[1] = "-c";
newargv[2] = [filename UTF8String];
newargv[3] = NULL;
@@ -355,6 +363,40 @@
setenv("DISPLAY", buf, TRUE);
}
+#if 0 && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+if (asl_log_descriptor) {
+char *asl_sender;
+aslmsg amsg = asl_new(ASL_TYPE_MSG);
+assert(amsg);
+
+asprintf(&asl_sender, "%s.%s", bundle_id_prefix, newargv[2]);
+assert(asl_sender);
+for(s = asl_sender + strlen(bundle_id_prefix) + 1; *s; s++) {
+if(! ((*s >= 'a' && *s <= 'z') ||
+ (*s >= 'A' && *s <= 'Z') ||
+ (*s >= '0' && *s <= '9'))) {
+*s = '_';
+}
+}
+
+(void)asl_set(amsg, ASL_KEY_SENDER, asl_sender);
+free(asl_sender);
+
+assert(0 == pipe(stdout_pipe));
+fcntl(stdout_pipe[0], F_SETFD, FD_CLOEXEC);
+fcntl(stdout_pipe[0], F_SETFL, O_NONBLOCK);
+
+assert(0 == pipe(stderr_pipe));
+fcntl(stderr_pipe[0], F_SETFD, FD_CLOEXEC);
+fcntl(stderr_pipe[0], F_SETFL, O_NONBLOCK);
+
+asl_log_descriptor(aslc, amsg, ASL_LEVEL_INFO, stdout_pipe[0],
ASL_LOG_DESCRIPTOR_READ);
+asl_log_descriptor(aslc, amsg, ASL_LEVEL_NOTICE, stderr_pipe[0],
ASL_LOG_DESCRIPTOR_READ);
+
+asl_free(amsg);
+}
+#endif
+
/* Do the fork-twice trick to
x11-apps: Changes to 'ubuntu'
| 67 xwud/Makefile.am| 18 xwud/Makefile.in| 354 xwud/aclocal.m4 | 1131 + xwud/config.guess | 233 xwud/config.sub | 134 xwud/configure | 5896 +++ xwud/configure.ac |9 xwud/depcomp| 74 xwud/install-sh | 29 xwud/man/Makefile.am| 12 xwud/man/Makefile.in| 423 xwud/man/xwud.man | 154 xwud/xwud.c |6 xwud/xwud.man | 154 243 files changed, 118736 insertions(+), 12352 deletions(-) New commits: commit a7147f9cd3018b70a34aa04c1a938e287a091bc9 Author: Robert Hooker Date: Thu Aug 16 16:03:48 2012 -0400 Add rendercheck 1.4 to x11-apps. diff --git a/debian/control b/debian/control index 8db5440..71dcaae 100644 --- a/debian/control +++ b/debian/control @@ -69,6 +69,7 @@ Description: X applications - atobm, bitmap, and bmtoa, tools for manipulating bitmap images; - ico, a demo program animating polyhedrons; - oclock and xclock, graphical clocks; + - rendercheck, a program to test render extension implementations; - transset, a tool to set opacity property on a window; - xbiff, a tool which tells you when you have new email; - xcalc, a scientific calculator desktop accessory; diff --git a/debian/copyright b/debian/copyright index 2b785b4..5d290af 100644 --- a/debian/copyright +++ b/debian/copyright @@ -143,6 +143,27 @@ oclock: ings in this Software without prior written authorization from the X Consor- ium. +rendercheck: + Copyright 2004 Eric Anholt + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of Eric Anholt not be used in + advertising or publicity pertaining to distribution of the software without + specific, written prior permission. Eric Anholt makes no + representations about the suitability of this software for any purpose. It + is provided "as is" without express or implied warranty. + + ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + transset: Copyright © 2003-2004 Matthew Hawn Copyright © 2003-2004 Andreas Kohn diff --git a/debian/rules b/debian/rules index 5d0dbc8..77dc4da 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ include debian/xsfbs/xsfbs.mk # This package contains multiple modules as shipped by upstream. Each module is # contained in a subdirectory in the root dir of the package. You must list each # subdirectory explicitly so that the build system knows what to build -DEF_SUBDIRS=bitmap ico oclock transset x11perf xbiff xcalc xclipboard xclock xconsole xcursorgen xditview xedit xeyes xgc xload xlogo xmag xman xmore xwd xwud +DEF_SUBDIRS=bitmap ico oclock rendercheck transset x11perf xbiff xcalc xclipboard xclock xconsole xcursorgen xditview xedit xeyes xgc xload xlogo xmag xman xmore xwd xwud SUBDIRS=$(DEF_SUBDIRS) BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS)) diff --git a/debian/watch.rendercheck b/debian/watch.rendercheck new file mode 100644 index 000..65b00ef --- /dev/null +++ b/debian/watch.rendercheck @@ -0,0 +1,3 @@ +# Compulsory line, this is a version 3 file +version=3 +http://xorg.freedesktop.org/archive/individual/app/rendercheck-(.*)\.tar\.gz diff --git a/rendercheck/AUTHORS b/rendercheck/AUTHORS new file mode 100644 index 000..cf0203b --- /dev/null +++ b/rendercheck/AUTHORS @@ -0,0 +1,2 @@ +Written in 2004 by Eric Anholt. +Additional tests contributed by Lars Knoll. diff --git a/rendercheck/COPYING b/rendercheck/COPYING new file mode 100644 index 000..af1d06b --- /dev/null +++ b/rendercheck/COPYING @@ -0,0 +1,19 @@ +Copyright 2004 Eric Anholt + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this
mesa: Changes to 'ubuntu-oneiric'
debian/changelog| 17 +
debian/patches/120_fix_tfp_texture_free.patch | 37 --
debian/patches/121-i965-fix-border-color.patch | 48 +++
debian/patches/122-i965-apply-post-sync-workaround.patch| 40 +++
debian/patches/123-i965-emit-depth-stalls-and-flushes.patch | 153
debian/patches/124-i965-last-render-target-select.patch | 32 ++
debian/patches/series |5
7 files changed, 294 insertions(+), 38 deletions(-)
New commits:
commit 4f0c77a6b92fd851ef1529e329f885f91096c78a
Author: Robert Hooker
Date: Thu Jul 19 16:50:59 2012 -0400
Import changes from already released 7.11-0ubuntu3.2
diff --git a/debian/changelog b/debian/changelog
index e3cc9f8..ed508bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+mesa (7.11-0ubuntu3.2) oneiric-proposed; urgency=low
+
+ * Add patch series from upstream stable release to fix various issues:
+- 121-i965-fix-border-color.patch: Fixes wrong colors in lightsmark
+ (LP: #966399)
+- 122-i965-apply-post-sync-workaround.patch: Fixes GPU hangs in
+ Civilization 4, PlaneShift, Minecraft, Neverwinter Nights
+ (among others) on Sandybridge and Ivybridge. (LP: #966399)
+- 123-i965-emit-depth-stalls-and-flushes.patch: Fixes GPU hangs when
+ running qgears2, lightsmark, and openarena on Ivybridge. (LP: #966399)
+- 124-i965-last-render-target-select.patch: Fixes a GPU hang when
+ running Trine, or Unigine Heaven which crashes the desktop. (LP: #966399)
+ * Drop 120_fix_tfp_texture_free.patch from previous SRU, it was the
+incorrect patch.
+
+ -- Robert Hooker Tue, 20 Mar 2012 10:44:16 -0400
+
mesa (7.11-0ubuntu3.1) oneiric-proposed; urgency=low
* Add 120_fix_tfp_texture_free.patch: Fixes segmentation fault in
diff --git a/debian/patches/120_fix_tfp_texture_free.patch
b/debian/patches/120_fix_tfp_texture_free.patch
deleted file mode 100644
index f9e97ae..000
--- a/debian/patches/120_fix_tfp_texture_free.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit b2f1366c2825aeee3411c88db5c8e6b426191487
-Author: Bryce Harrington
-Date: Thu Jan 26 15:30:24 2012 -0800
-
-Backport of the following patch to oneiric:
-
-commit d430e81c3287eba4ee84ca1639a23f92bbe22c8e
-Author: Eric Anholt
-Date: Wed Sep 21 15:17:36 2011 -0700
-
-intel: Fix improper freeing of texture data in TFP.
-
-If there happened to be ->Data present, we assertion failed instead
-of handling it correctly.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35234
-Acked-by: Kenneth Graunke
-
-Most of the surrounding code has changed, so it's unclear if this change
-alone is sufficient to resolve the problem.
-
-diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c
b/src/mesa/drivers/dri/intel/intel_tex_image.c
-index 269faef..4d0968e 100644
a/src/mesa/drivers/dri/intel/intel_tex_image.c
-+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
-@@ -822,10 +822,7 @@ intelSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
-texImage = _mesa_get_tex_image(&intel->ctx, texObj, target, level);
-intelImage = intel_texture_image(texImage);
-
-- if (intelImage->mt) {
-- intel_miptree_release(intel, &intelImage->mt);
-- assert(!texImage->Data);
-- }
-+ ctx->Driver.FreeTextureImageBuffer(ctx, image);
-if (intelObj->mt)
- intel_miptree_release(intel, &intelObj->mt);
-
diff --git a/debian/patches/121-i965-fix-border-color.patch
b/debian/patches/121-i965-fix-border-color.patch
new file mode 100644
index 000..4e3e867
--- /dev/null
+++ b/debian/patches/121-i965-fix-border-color.patch
@@ -0,0 +1,48 @@
+From da33bb5fde8f752c74ca4cd15c067c3a593bac97 Mon Sep 17 00:00:00 2001
+From: Kenneth Graunke
+Date: Fri, 20 Jan 2012 03:33:40 -0800
+Subject: [PATCH] i965: Fix border color on Sandybridge and Ivybridge.
+
+While reading through the simulator, I found some interesting code that
+looks like it checks the sampler default color pointer against the bound
+set in STATE_BASE_ADDRESS. On failure, it appears to program it to the
+base address itself.
+
+So I decided to try programming a legitimate bound, and lo and behold,
+border color worked.
+
++92 piglits on Sandybridge. Also fixes Lightsmark on Ivybridge.
+
+NOTE: This is a candidate for stable release branches.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=28924
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38868
+Signed-off-by: Kenneth Graunke
+Reviewed-by: Yuanhan Liu
+Reviewed-by: Eric Anholt
+---
+ src/mesa/drivers/dri/i965/brw_misc_state.c |8 +++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c
b/src/mesa/drivers/dri/i965/brw_misc_state.c
+index 033c77c..fd3ac13 100644
+--- a/src/mesa/drivers/
mesa: Changes to 'ubuntu'
/mesa/drivers/dri/intel/intel_fbo.c | 59 - src/mesa/drivers/dri/intel/intel_fbo.h |3 src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 26 src/mesa/drivers/dri/intel/intel_pixel_bitmap.c |4 src/mesa/drivers/dri/intel/intel_regions.c |7 src/mesa/drivers/dri/intel/intel_tex.c |2 src/mesa/drivers/dri/intel/intel_tex_image.c| 17 src/mesa/drivers/dri/intel/intel_tex_obj.h |1 src/mesa/drivers/dri/intel/intel_tex_validate.c | 10 src/mesa/drivers/dri/r200/r200_maos_arrays.c|2 src/mesa/drivers/dri/radeon/radeon_maos_arrays.c|2 src/mesa/drivers/windows/gdi/wmesa.c| 97 -- src/mesa/main/api_arrayelt.c| 10 src/mesa/main/api_validate.c| 14 src/mesa/main/attrib.c | 24 src/mesa/main/bufferobj.c | 25 src/mesa/main/dlist.c | 46 + src/mesa/main/extensions.c |2 src/mesa/main/fbobject.c|4 src/mesa/main/format_unpack.c | 58 + src/mesa/main/formats.c |4 src/mesa/main/imports.c |2 src/mesa/main/light.c |2 src/mesa/main/mipmap.c |1 src/mesa/main/readpix.c | 71 +- src/mesa/main/teximage.c| 114 ++- src/mesa/main/uniform_query.cpp |6 src/mesa/main/varray.c |1 src/mesa/main/version.h |4 src/mesa/program/ir_to_mesa.cpp |2 src/mesa/state_tracker/st_cb_drawpixels.c | 10 src/mesa/state_tracker/st_extensions.c |2 src/mesa/swrast/s_aaline.c |1 src/mesa/swrast/s_aatriangle.c |1 src/mesa/swrast/s_blit.c|9 src/mesa/swrast/s_context.c |1 src/mesa/swrast/s_lines.c |1 src/mesa/swrast/s_texture.c | 21 src/mesa/swrast/s_triangle.c|1 src/mesa/swrast/swrast.h|4 src/mesa/vbo/vbo_attrib_tmp.h | 58 - src/mesa/vbo/vbo_exec_api.c | 95 ++ src/mesa/vbo/vbo_exec_array.c | 85 -- src/mesa/vbo/vbo_save_api.c | 57 + src/mesa/vbo/vbo_save_draw.c|4 121 files changed, 2144 insertions(+), 1263 deletions(-) New commits: commit c72295a5275780e2fd5c8ed48c1e370d7a2a42ba Author: Robert Hooker Date: Wed Jun 6 12:33:27 2012 -0400 Refresh ubuntu patches. diff --git a/debian/changelog b/debian/changelog index 07e1240..ed29ad2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mesa (8.0.3-0ubuntu1) UNRELEASED; urgency=low * New upstream stable release. * Drop 118_fix_rendering_from_textures.patch and 117_intel_fix_hiz_null_dereference.patch, both included upstream. + * Refresh patches. -- Robert Hooker Fri, 01 Jun 2012 13:01:35 -0400 diff --git a/debian/patches/100_no_abi_tag.patch b/debian/patches/100_no_abi_tag.patch index a6ad56a..18e6bb7 100644 --- a/debian/patches/100_no_abi_tag.patch +++ b/debian/patches/100_no_abi_tag.patch @@ -1,7 +1,9 @@ a/src/mapi/glapi/glapi_x86-64.S -+++ b/src/mapi/glapi/glapi_x86-64.S -@@ -30885,18 +30885,6 @@ GL_PREFIX(EGLImageTargetTexture2DOES): - .globl GL_PREFIX(FramebufferTextureLayer) ; .set GL_PREFIX(FramebufferTextureLayer), GL_PREFIX(FramebufferTextureLayerEXT) +Index: mesa/src/mapi/glapi/glapi_x86-64.S +=== +--- mesa.orig/src/mapi/glapi/glapi_x86-64.S2012-06-01 13:01:25.255165726 -0400 mesa/src/mapi/glapi/glapi_x86-64.S 2012-06-01 13:02:45.859167925 -0400 +@@ -37448,18 +37448,6 @@ + .globl GL_PREFIX(TransformFeedbackVaryings) ; .set GL_PREFIX(TransformFeedbackVaryings), GL_PREFIX(TransformFeedbackVaryingsEXT) .globl GL_PREFIX(ProvokingVertex) ; .set GL_PREFIX(ProvokingVertex), GL_PREFIX(ProvokingVertexEXT) -#if defined(GLX_USE_TLS) && defined(__linux__) @@ -19,9 +21,11 @@ #if defined (__ELF__) && defined (__linux__) .section .note.GNU-stack,"",%progbits a/src/mapi/glapi/glapi_x86.S -+++ b/src/mapi/glapi/glapi_x86.S -@@ -1279,18 +1279,6 @@ GLNAME(gl_dispatch_functions_start): +Index: mesa/
xserver-xorg-input-vmmouse: Changes to 'debian-unstable'
ChangeLog | 49 +
configure.ac |6 ++---
debian/changelog |8 ++
src/vmmouse.c | 21 +
tools/69-xorg-vmmouse.rules.in |2 -
5 files changed, 82 insertions(+), 4 deletions(-)
New commits:
commit 8e50791ac87c2bccb38958b8ec6bd19de7a984b8
Author: Robert Hooker
Date: Tue May 22 16:35:43 2012 -0400
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 0e850d9..b65c479 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+commit 3a828d876772d05577b9372e8f6dc068794f4704
+Author: Jakob Bornecrantz
+Date: Tue May 22 20:14:25 2012 +0200
+
+vmmouse 12.8.0
+
+Signed-off-by: Jakob Bornecrantz
+
+commit 2a321a39350aa020a8103813bed61ff559088195
+Author: Zack Rusin
+Date: Thu May 10 19:55:01 2012 -0400
+
+Revert "Adjust the kernel name in the udev file."
+
+This reverts commit 189dc266a66485d48303acbc1a4fbe4642c75e9f.
+
+It seems that for some reason the device routing is breaking with this.
+Possibly related to Win7 x64 hosts because it's not reproducible on
+GNU/Linux hosts. Semantially we'd still like to match only on mouse
+kernel but for the time being this seems to cause more problems
+than it solves. Hence the revert.
+
+commit 55efac85ca9bd2041240ca29316ca716ddc2185d
+Author: Gaetan Nadon
+Date: Tue May 1 16:20:59 2012 -0400
+
+config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+Moved up in the autoconf init section.
+It has been removed from Automake 1.12.
+
+Signed-off-by: Gaetan Nadon
+Signed-off-by: Zack Rusin
+
+commit 840dcbf947dd9d1383777c3cd811ff680cef5f16
+Author: Michal Srb
+Date: Thu May 3 17:55:24 2012 +0200
+
+Enable hardware access during vmmouse preinit.
+
+Vmmouse driver uses outl calls but never requests hardware access.
+In case there are no other drivers that requests it, vmmouse
+initialization will fail. (Found on KVM virtual machine with fbdev
+graphics driver and vmmouse input driver.)
+
+Request hardware access in same way xf86-input-keyboard does.
+
+Signed-off-by: Zack Rusin
+
commit e925b2e6e9d548db5a6646a76d513fb6881f69b4
Author: Zack Rusin
Date: Thu Mar 8 09:51:48 2012 -0500
diff --git a/debian/changelog b/debian/changelog
index add6cda..30cfa88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-input-vmmouse (1:12.9.0-1) UNRELEASED; urgency=low
+
+ * New upstream bugfix release.
+- Fixes erratic mouse behavior with a Windows x64 host. (LP: #996821)
+- Fixes initialization when no other drivers request hardware access.
+
+ -- Robert Hooker Tue, 22 May 2012 16:30:11 -0400
+
xserver-xorg-input-vmmouse (1:12.8.0-1) unstable; urgency=low
* New upstream release.
commit 3a828d876772d05577b9372e8f6dc068794f4704
Author: Jakob Bornecrantz
Date: Tue May 22 20:14:25 2012 +0200
vmmouse 12.8.0
Signed-off-by: Jakob Bornecrantz
diff --git a/configure.ac b/configure.ac
index 33fbd64..d2fb0b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
-[12.8.0],
+[12.9.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit 2a321a39350aa020a8103813bed61ff559088195
Author: Zack Rusin
Date: Thu May 10 19:55:01 2012 -0400
Revert "Adjust the kernel name in the udev file."
This reverts commit 189dc266a66485d48303acbc1a4fbe4642c75e9f.
It seems that for some reason the device routing is breaking with this.
Possibly related to Win7 x64 hosts because it's not reproducible on
GNU/Linux hosts. Semantially we'd still like to match only on mouse
kernel but for the time being this seems to cause more problems
than it solves. Hence the revert.
diff --git a/tools/69-xorg-vmmouse.rules.in b/tools/69-xorg-vmmouse.rules.in
index 9af3938..602afb6 100644
--- a/tools/69-xorg-vmmouse.rules.in
+++ b/tools/69-xorg-vmmouse.rules.in
@@ -1 +1 @@
-ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042
AUX port", KERNEL=="mouse[0-9]*", PROGRAM="__BIN_PREFIX__/vmmouse_detect",
ENV{ID_INPUT.tags}="vmmouse"
+ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042
AUX port", KERNEL=="event[0-9]*", PROGRAM="__BIN_PREFIX__/vmmouse_detect",
ENV{ID_INPUT.tags}="vmmouse"
commit 55efac85ca9bd2041240ca29316ca716ddc2185d
Author: Gaetan Nadon
Date: Tue May 1 16:20:59 2012 -0400
config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Moved up in the autoconf init section.
It has been removed from Automake 1.12.
Signed-off-by: Gaetan Nadon
Signed-off-by:
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
configure.ac |6 +++---
src/vmmouse.c | 21 +
tools/69-xorg-vmmouse.rules.in |2 +-
3 files changed, 25 insertions(+), 4 deletions(-)
New commits:
commit 3a828d876772d05577b9372e8f6dc068794f4704
Author: Jakob Bornecrantz
Date: Tue May 22 20:14:25 2012 +0200
vmmouse 12.8.0
Signed-off-by: Jakob Bornecrantz
diff --git a/configure.ac b/configure.ac
index 33fbd64..d2fb0b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
-[12.8.0],
+[12.9.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit 2a321a39350aa020a8103813bed61ff559088195
Author: Zack Rusin
Date: Thu May 10 19:55:01 2012 -0400
Revert "Adjust the kernel name in the udev file."
This reverts commit 189dc266a66485d48303acbc1a4fbe4642c75e9f.
It seems that for some reason the device routing is breaking with this.
Possibly related to Win7 x64 hosts because it's not reproducible on
GNU/Linux hosts. Semantially we'd still like to match only on mouse
kernel but for the time being this seems to cause more problems
than it solves. Hence the revert.
diff --git a/tools/69-xorg-vmmouse.rules.in b/tools/69-xorg-vmmouse.rules.in
index 9af3938..602afb6 100644
--- a/tools/69-xorg-vmmouse.rules.in
+++ b/tools/69-xorg-vmmouse.rules.in
@@ -1 +1 @@
-ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042
AUX port", KERNEL=="mouse[0-9]*", PROGRAM="__BIN_PREFIX__/vmmouse_detect",
ENV{ID_INPUT.tags}="vmmouse"
+ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042
AUX port", KERNEL=="event[0-9]*", PROGRAM="__BIN_PREFIX__/vmmouse_detect",
ENV{ID_INPUT.tags}="vmmouse"
commit 55efac85ca9bd2041240ca29316ca716ddc2185d
Author: Gaetan Nadon
Date: Tue May 1 16:20:59 2012 -0400
config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Moved up in the autoconf init section.
It has been removed from Automake 1.12.
Signed-off-by: Gaetan Nadon
Signed-off-by: Zack Rusin
diff --git a/configure.ac b/configure.ac
index 5938ca7..33fbd64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,8 @@ AC_INIT([xf86-input-vmmouse],
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.)
+AC_CONFIG_HEADERS([config.h])
+
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -41,8 +43,6 @@ XORG_DEFAULT_OPTIONS
DRIVER_NAME=vmmouse
AC_SUBST([DRIVER_NAME])
-AM_CONFIG_HEADER([config.h])
-
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
commit 840dcbf947dd9d1383777c3cd811ff680cef5f16
Author: Michal Srb
Date: Thu May 3 17:55:24 2012 +0200
Enable hardware access during vmmouse preinit.
Vmmouse driver uses outl calls but never requests hardware access.
In case there are no other drivers that requests it, vmmouse
initialization will fail. (Found on KVM virtual machine with fbdev
graphics driver and vmmouse input driver.)
Request hardware access in same way xf86-input-keyboard does.
Signed-off-by: Zack Rusin
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 285ba26..7778923 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -65,6 +65,7 @@
#include "xf86Xinput.h"
#include "xf86_OSproc.h"
#include "xf86OSmouse.h"
+#include "xf86Priv.h"
#include "compiler.h"
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
@@ -339,6 +340,16 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
#endif
/*
+* enable hardware access
+*/
+ if (!xorgHWAccess) {
+ if (xf86EnableIO())
+ xorgHWAccess = TRUE;
+ else
+ return NULL;
+ }
+
+ /*
* try to enable vmmouse here
*/
if (!VMMouseClient_Enable()) {
@@ -399,6 +410,16 @@ VMMousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int
flags)
VMMousePrivPtr mPriv = NULL;
int rc = Success;
+ /* Enable hardware access. */
+ if (!xorgHWAccess) {
+ if (xf86EnableIO())
+ xorgHWAccess = TRUE;
+ else {
+ rc = BadValue;
+ goto error;
+ }
+ }
+
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
/* For ABI < 12, we need to return the wrapped driver's pInfo (see
* above). ABI 12, we call NIDR and are done */
--
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/e1swvok-0001rl...@vasks.debian.org
mesa: Changes to 'debian-unstable'
debian/changelog |3 ++- debian/patches/06_kfreebsd-ftbfs.diff |6 +++--- debian/patches/10-hurd-configure-tweaks.diff |6 +++--- debian/patches/13-llvm-config-pick-a-version.diff |6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) New commits: commit 9564e43d9bc0b21bbdcd44d67ac828d226f6ef61 Author: Robert Hooker Date: Mon May 21 18:21:55 2012 -0400 Refresh patches diff --git a/debian/changelog b/debian/changelog index 82219c9..d2774dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ mesa (8.0.3-1) UNRELEASED; urgency=low * New upstream stable release (Closes: #673532) + * Refresh patches. - -- Robert Hooker Mon, 21 May 2012 16:03:26 -0400 + -- Robert Hooker Mon, 21 May 2012 18:21:40 -0400 mesa (8.0.2-2) unstable; urgency=low diff --git a/debian/patches/06_kfreebsd-ftbfs.diff b/debian/patches/06_kfreebsd-ftbfs.diff index 66b3842..e8a2881 100644 --- a/debian/patches/06_kfreebsd-ftbfs.diff +++ b/debian/patches/06_kfreebsd-ftbfs.diff @@ -7,9 +7,9 @@ Debian bug: http://bugs.debian.org/524690 Index: mesa/configure.ac === mesa.orig/configure.ac 2012-01-18 16:04:58.270652780 +0200 -+++ mesa/configure.ac 2012-01-18 16:05:57.376424418 +0200 -@@ -1218,7 +1218,7 @@ +--- mesa.orig/configure.ac 2012-05-21 18:19:36.835922738 -0400 mesa/configure.ac 2012-05-21 18:19:43.047922906 -0400 +@@ -1215,7 +1215,7 @@ ;; esac ;; diff --git a/debian/patches/10-hurd-configure-tweaks.diff b/debian/patches/10-hurd-configure-tweaks.diff index 3dbfa92..1bfe694 100644 --- a/debian/patches/10-hurd-configure-tweaks.diff +++ b/debian/patches/10-hurd-configure-tweaks.diff @@ -3,9 +3,9 @@ Enable x86 assembler on Hurd. Thanks to Pino Toscano. Index: mesa/configure.ac === mesa.orig/configure.ac 2012-01-18 16:05:57.376424418 +0200 -+++ mesa/configure.ac 2012-01-18 16:06:14.824947429 +0200 -@@ -473,7 +473,7 @@ +--- mesa.orig/configure.ac 2012-05-21 18:19:43.047922906 -0400 mesa/configure.ac 2012-05-21 18:19:43.639922922 -0400 +@@ -470,7 +470,7 @@ case "$host_cpu" in i?86) case "$host_os" in diff --git a/debian/patches/13-llvm-config-pick-a-version.diff b/debian/patches/13-llvm-config-pick-a-version.diff index a4ad365..432d2a9 100644 --- a/debian/patches/13-llvm-config-pick-a-version.diff +++ b/debian/patches/13-llvm-config-pick-a-version.diff @@ -3,9 +3,9 @@ writing, 2.8 and 2.9), so pick a version. Let's assume the last version receives bug fixes quickly, so pick 2.9 for now. Index: mesa/configure.ac === mesa.orig/configure.ac 2012-01-18 16:06:14.824947429 +0200 -+++ mesa/configure.ac 2012-01-18 16:06:19.117076083 +0200 -@@ -1765,7 +1765,7 @@ +--- mesa.orig/configure.ac 2012-05-21 18:19:43.639922922 -0400 mesa/configure.ac 2012-05-21 18:19:43.947922933 -0400 +@@ -1762,7 +1762,7 @@ esac fi if test "x$enable_gallium_llvm" = xyes; then -- 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/e1swazm-0002yp...@vasks.debian.org
mesa: Changes to 'debian-unstable'
/gdi/wmesa.c | 97 --- src/mesa/main/api_arrayelt.c | 10 src/mesa/main/api_validate.c | 14 src/mesa/main/attrib.c | 24 src/mesa/main/bufferobj.c | 25 src/mesa/main/dlist.c | 46 + src/mesa/main/extensions.c |2 src/mesa/main/fbobject.c |4 src/mesa/main/format_unpack.c | 58 + src/mesa/main/formats.c|4 src/mesa/main/imports.c|2 src/mesa/main/light.c |2 src/mesa/main/mipmap.c |1 src/mesa/main/readpix.c| 71 +- src/mesa/main/teximage.c | 114 +++ src/mesa/main/uniform_query.cpp|6 src/mesa/main/varray.c |1 src/mesa/main/version.h|4 src/mesa/program/ir_to_mesa.cpp|2 src/mesa/state_tracker/st_cb_drawpixels.c | 10 src/mesa/state_tracker/st_extensions.c |2 src/mesa/swrast/s_aaline.c |1 src/mesa/swrast/s_aatriangle.c |1 src/mesa/swrast/s_blit.c |9 src/mesa/swrast/s_context.c|1 src/mesa/swrast/s_lines.c |1 src/mesa/swrast/s_texture.c| 21 src/mesa/swrast/s_triangle.c |1 src/mesa/swrast/swrast.h |4 src/mesa/vbo/vbo_attrib_tmp.h | 58 - src/mesa/vbo/vbo_exec_api.c| 95 ++ src/mesa/vbo/vbo_exec_array.c | 85 -- src/mesa/vbo/vbo_save_api.c| 57 + src/mesa/vbo/vbo_save_draw.c |4 111 files changed, 2050 insertions(+), 912 deletions(-) New commits: commit 5ef1abddd3f484e9e54996f13482279e1149f955 Author: Robert Hooker Date: Mon May 21 16:13:23 2012 -0400 Bump changelog diff --git a/debian/changelog b/debian/changelog index a978941..82219c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mesa (8.0.3-1) UNRELEASED; urgency=low + + * New upstream stable release (Closes: #673532) + + -- Robert Hooker Mon, 21 May 2012 16:03:26 -0400 + mesa (8.0.2-2) unstable; urgency=low * Upload to unstable. commit 1659d87afe72bf6a6536c6154e684b72a0fb72e1 Author: Ian Romanick Date: Fri May 18 15:46:48 2012 -0700 docs: Add 8.0.3 release notes Signed-off-by: Ian Romanick diff --git a/docs/relnotes-8.0.3.html b/docs/relnotes-8.0.3.html new file mode 100644 index 000..4e81da4 --- /dev/null +++ b/docs/relnotes-8.0.3.html @@ -0,0 +1,317 @@ + + + +Mesa Release Notes + + + + + + + + +Mesa 8.0.3 Release Notes / May 18, 2012 + + +Mesa 8.0.3 is a bug fix release which fixes bugs found since the 8.0.2 release. + + +Mesa 8.0.3 implements the OpenGL 3.0 API, but the version reported by +glGetString(GL_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 3.0. + + +See the Compiling/Installing page for prerequisites +for DRI hardware acceleration. + + + +MD5 checksums + +TBD. + + +New features +None. + +Bug fixes + +This list is likely incomplete. + + + +https://bugs.freedesktop.org/show_bug.cgi?id=28138";>Bug 28138 - [G45] Regnum Online, sparkling in in-game rendering + +https://bugs.freedesktop.org/show_bug.cgi?id=30102";>Bug 30102 - glean depthStencil test fails BadLength with indirect non-swrast rendering + +https://bugs.freedesktop.org/show_bug.cgi?id=40361";>Bug 40361 - Glitches on X3100 after upgrade to 7.11 + +https://bugs.freedesktop.org/show_bug.cgi?id=41152";>Bug 41152 - [glsl] Shader backend in Regnum Online does not work + +https://bugs.freedesktop.org/show_bug.cgi?id=41216";>Bug 41216 - [bisected pineview]oglc filtercubemin(basic.sizedRGBA) fails + +https://bugs.freedesktop.org/show_bug.cgi?id=41372";>Bug 41372 - i830_state.c PBO crash + +https://bugs.freedesktop.org/show_bug.cgi?id=41495";>Bug 41495 - i830: intel_get_vb_max / intel_batchbuffer_space mismatch. + +https://bugs.freedesktop.org/show_bug.cgi?id=44701";>Bug 44701 - Regnum online textures flickering + +https://bugs.freedesktop.org/show_bug.cgi?id=44961";>Bug 44961 - [bisected i965] oglc sRGB(Mipmap.1D_textures) regressed + +https://bugs.freedesktop.org/show_bug.cgi?id=44970";>Bug 44970 - [i965]oglc max_values(negative.textureSize.textureCube) segfaults + +https://bugs.freedesktop.org/show_bug.cgi
mesa: Changes to 'upstream-unstable'
Rebased ref, commits from common ancestor: commit 1659d87afe72bf6a6536c6154e684b72a0fb72e1 Author: Ian Romanick Date: Fri May 18 15:46:48 2012 -0700 docs: Add 8.0.3 release notes Signed-off-by: Ian Romanick diff --git a/docs/relnotes-8.0.3.html b/docs/relnotes-8.0.3.html new file mode 100644 index 000..4e81da4 --- /dev/null +++ b/docs/relnotes-8.0.3.html @@ -0,0 +1,317 @@ + + + +Mesa Release Notes + + + + + + + + +Mesa 8.0.3 Release Notes / May 18, 2012 + + +Mesa 8.0.3 is a bug fix release which fixes bugs found since the 8.0.2 release. + + +Mesa 8.0.3 implements the OpenGL 3.0 API, but the version reported by +glGetString(GL_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 3.0. + + +See the Compiling/Installing page for prerequisites +for DRI hardware acceleration. + + + +MD5 checksums + +TBD. + + +New features +None. + +Bug fixes + +This list is likely incomplete. + + + +https://bugs.freedesktop.org/show_bug.cgi?id=28138";>Bug 28138 - [G45] Regnum Online, sparkling in in-game rendering + +https://bugs.freedesktop.org/show_bug.cgi?id=30102";>Bug 30102 - glean depthStencil test fails BadLength with indirect non-swrast rendering + +https://bugs.freedesktop.org/show_bug.cgi?id=40361";>Bug 40361 - Glitches on X3100 after upgrade to 7.11 + +https://bugs.freedesktop.org/show_bug.cgi?id=41152";>Bug 41152 - [glsl] Shader backend in Regnum Online does not work + +https://bugs.freedesktop.org/show_bug.cgi?id=41216";>Bug 41216 - [bisected pineview]oglc filtercubemin(basic.sizedRGBA) fails + +https://bugs.freedesktop.org/show_bug.cgi?id=41372";>Bug 41372 - i830_state.c PBO crash + +https://bugs.freedesktop.org/show_bug.cgi?id=41495";>Bug 41495 - i830: intel_get_vb_max / intel_batchbuffer_space mismatch. + +https://bugs.freedesktop.org/show_bug.cgi?id=44701";>Bug 44701 - Regnum online textures flickering + +https://bugs.freedesktop.org/show_bug.cgi?id=44961";>Bug 44961 - [bisected i965] oglc sRGB(Mipmap.1D_textures) regressed + +https://bugs.freedesktop.org/show_bug.cgi?id=44970";>Bug 44970 - [i965]oglc max_values(negative.textureSize.textureCube) segfaults + +https://bugs.freedesktop.org/show_bug.cgi?id=45214";>Bug 45214 - Textures disappearing or missing in RegnumOnline OpenGL game + +https://bugs.freedesktop.org/show_bug.cgi?id=45558";>Bug 45558 - cannot render on a drawable of size equal the max framebuffer size + +https://bugs.freedesktop.org/show_bug.cgi?id=45921";>Bug 45921 - [r300g, bisected] Multiple piglit regressions after glsl_to_tgsi changes + +https://bugs.freedesktop.org/show_bug.cgi?id=46303";>Bug 46303 - [SNB] segfault in intel_miptree_release() + +https://bugs.freedesktop.org/show_bug.cgi?id=46739";>Bug 46739 - [snb-m-gt2+] compiz crashed with SIGSEGV in intel_miptree_release() + +https://bugs.freedesktop.org/show_bug.cgi?id=46834";>Bug 46834 - small performance when playing flightgear (swrast fallback through GTT mapping) + +https://bugs.freedesktop.org/show_bug.cgi?id=47126";>Bug 47126 - tests/fbo/fbo-array.c:109: create_array_fbo: Assertion `glGetError() == 0' failed. + +https://bugs.freedesktop.org/show_bug.cgi?id=48218";>Bug 48218 - brw_fs_schedule_instructions.cpp segfault due to accessing not allocated last_mrf_write[16] + +https://bugs.freedesktop.org/show_bug.cgi?id=48545";>Bug 48545 - LLVMpipe glReadPixels Firefox hits the slow path (WebGL rendering) + +https://bugs.freedesktop.org/show_bug.cgi?id=49124";>Bug 49124 - swrast/s_texfetch.c:1156: set_fetch_functions: Assertion `texImage->FetchTexel' failed. + + + + + + +Changes +The full set of changes can be viewed by using the following GIT command: + + + git log mesa-8.0.2..mesa-8.0.3 + + +Alban Browaeys (1): + + dri/i915: Fix off-by-one in i830 clip region size. + + +Alex Deucher (2): + + r200: fix fog coordinate emit + radeon: fix fog coordinate emit + + +Alexander von Gluck (4): + + llvmpipe: fix symbol conflict on Haiku + svga: fix typedef conflicts on Haiku + mesa: Don't use newlocale on Haiku + glsl: Don't use newlocale on Haiku + + +Anuj Phogat (4): + + mesa: fix issues with texture border and array textures + mesa: Fix valid texture target test in _mesa_GetTexLevelParameteriv() + mesa: Fix the cause of piglit test fbo-array failure + intel: Fix a case when mapping large texture fails + + +Brian Paul (17): + + mesa: add a couple fast-paths to fast_read_rgba_pixels_memcpy() + mesa/gdi: remove wmesa_set_renderbuffer_funcs() function + mesa/gdi: remove clear_color() function + mesa: bump version to 8.0.2 in configs/default + swrast: include s_fragprog.h to silence warnings + mesa: remove LSB-first pixel packing check in glReadPixels + mesa: fix error in _mesa_format_matches_format_and_type() for RGB888 + mesa: add BGR888 code in _mesa_format_matches_format_and_type() + vbo: fix node_attrsz[] usage in vbo_bind_vertex_list() + mesa: add missing texture integer test in glTexSubImage() + mesa: add miss
xserver-xorg-video-vmware: Changes to 'ubuntu'
debian/changelog |8 debian/vmwgfx-fbdev.conf |1 + debian/xserver-xorg-video-vmware.install |2 ++ 3 files changed, 11 insertions(+) New commits: commit 1a79262a0292cf7892f095da6721ea8041cbd878 Author: Robert Hooker Date: Mon May 21 14:09:25 2012 -0400 Add modprobe conf file to enable vmwgfx kernel module option to fix s3 diff --git a/debian/changelog b/debian/changelog index 82723d4..d63a8e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-vmware (1:12.0.1-1ubuntu2) quantal; urgency=low + + * Install vmwgfx-fbdev.conf into /etc/modprobe.d/ to pass +enable_fbdev=1 to the vmwgfx module at load time fixing a crash on +suspend from inside of the guest in VMware hosts. (LP: #994888) + + -- Robert Hooker Wed, 11 Apr 2012 14:29:10 -0400 + xserver-xorg-video-vmware (1:12.0.1-1ubuntu1) precise; urgency=low * Add libxatracker-dev build dep, it was accidentally dropped by diff --git a/debian/vmwgfx-fbdev.conf b/debian/vmwgfx-fbdev.conf new file mode 100644 index 000..d652300 --- /dev/null +++ b/debian/vmwgfx-fbdev.conf @@ -0,0 +1 @@ +options vmwgfx enable_fbdev=1 diff --git a/debian/xserver-xorg-video-vmware.install b/debian/xserver-xorg-video-vmware.install index daa64ce..71e6dcf 100644 --- a/debian/xserver-xorg-video-vmware.install +++ b/debian/xserver-xorg-video-vmware.install @@ -1,3 +1,5 @@ usr/lib/xorg/modules/drivers/*.so usr/share/man/man4/* usr/bin/vmwarectrl + +../vmwgfx-fbdev.conf /etc/modprobe.d -- 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/e1swx3f-00057p...@vasks.debian.org
Bug#671086: libgl1-mesa-glx: Cannot install both libgl1-mesa-swx11 and libgl1-mesa-glx
The software driver compatible with libgl1-mesa-glx is in libgl1-mesa-dri (swrast_dri.so), libgl1-mesa-swx11 is an alternate implementation that can't be used at the same time. -- 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/CADF2A9z_JXO=slqycub2z0ts81xgusptc4dsc0tbp5mi+zo...@mail.gmail.com
Bug#668684: libdrm-nouveau1a: claims to be 2.4.33, but seems to really be 0.6
It's not a bug in the debian libdrm 2.4.33 package. In libdrm git they bumped the soname to 2 and changed the version exported in libdrm_nouveau.pc from 0.6 to 2.4.33 without releasing a new version. Mesa now requires the newer libdrm that hasn't been released yet. In libdrm 2.4.33 the version in libdrm_nouveau.pc is 0.6 http://cgit.freedesktop.org/mesa/drm/commit/?id=292da616fe1f936ca78a3fa8e1b1b19883e343b6 is the commit this all took place today. -- 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/CADF2A9yjQiPVoEX-eJN3703oXYLXs6wsveB6K1ZD19F=2vd...@mail.gmail.com
x11-utils: Changes to 'debian-unstable'
debian/changelog |3 xlsatoms/ChangeLog| 136 xlsatoms/Makefile.am | 36 xlsatoms/Makefile.in | 373 +- xlsatoms/aclocal.m4 | 1409 ++--- xlsatoms/config.guess | 235 - xlsatoms/config.sub | 184 - xlsatoms/configure| 7136 +- xlsatoms/configure.ac | 21 xlsatoms/depcomp | 74 xlsatoms/install-sh | 29 xlsatoms/man/Makefile.am | 12 xlsatoms/man/Makefile.in | 423 ++ xlsatoms/man/xlsatoms.man | 65 xlsatoms/xlsatoms.c | 20 xlsatoms/xlsatoms.man | 68 16 files changed, 8818 insertions(+), 1406 deletions(-) New commits: commit c0b31738bbd85508b20ed695227943ff959c562f Author: Robert Hooker Date: Wed Apr 4 14:31:28 2012 -0400 xlsatoms 1.1.1 diff --git a/debian/changelog b/debian/changelog index e546a34..51e2fb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,10 +6,11 @@ x11-utils (7.7~1) UNRELEASED; urgency=low * xev 1.2.0 * xfd 1.1.1 * xfontsel 1.0.4 + * xlsatoms 1.1.1 * Build with --disable-selective-werror to work around build problems caused by excessive -Werror's set in new xutils-dev. - -- Robert Hooker Fri, 23 Mar 2012 17:17:03 -0400 + -- Robert Hooker Wed, 04 Apr 2012 14:31:02 -0400 x11-utils (7.6+4) unstable; urgency=low diff --git a/xlsatoms/ChangeLog b/xlsatoms/ChangeLog index 0f2f244..f6c78ba 100644 --- a/xlsatoms/ChangeLog +++ b/xlsatoms/ChangeLog @@ -1,3 +1,139 @@ +commit d828ec2c209ea031891cbc7ab9c9d2f6832ebc4d +Author: Alan Coopersmith +Date: Sat Mar 31 16:48:11 2012 -0700 + +xlsatoms 1.1.1 + +Signed-off-by: Alan Coopersmith + +commit be56f627ae4c1324761332d7afc98cc64cd53d84 +Author: Alan Coopersmith +Date: Fri Nov 11 23:08:39 2011 -0800 + +Fix gcc -Wwrite-strings warnings + +Signed-off-by: Alan Coopersmith + +commit 39f6652cf2c0edfe336842718f7c5bc69961463c +Author: Gaetan Nadon +Date: Wed Jan 19 10:06:56 2011 -0500 + +config: move man pages into their own directory + +Use services provided by XORG_MANPAGE_SECTIONS. +Use standard Makefile for man pages. + +Signed-off-by: Gaetan Nadon + +commit e9e7baa39cff01acfbf90065df65dd0907f2273f +Author: Gaetan Nadon +Date: Thu Jan 13 17:15:36 2011 -0500 + +man: replace hard coded man page section with substitution strings + +Signed-off-by: Gaetan Nadon + +commit 095f461e49e050a34c0c0a0d082a1b99ed2f23ba +Author: Gaetan Nadon +Date: Thu Jan 13 11:15:47 2011 -0500 + +man: remove trailing spaces and tabs + +Using s/[ \t]*$// + +Signed-off-by: Gaetan Nadon + +commit 6051fa92d1c7da1579662d80aba3493b4cfb2b59 +Author: Gaetan Nadon +Date: Wed Jan 12 16:28:02 2011 -0500 + +config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + +This silences an Autoconf warning + +commit c1599d956b11a49c8b4d9dda897a7f27be0cbb12 +Author: Gaetan Nadon +Date: Wed Jan 12 15:12:08 2011 -0500 + +config: remove unrequired AC_SUBST([*_LIBS]) + +This macro is called by PKG_CHECK_MODULES + +Signed-off-by: Gaetan Nadon + +commit 65a27c5c6814fdfab9e83c210ddccbc93727755f +Author: Gaetan Nadon +Date: Wed Jan 12 13:33:48 2011 -0500 + +config: remove unrequired AC_SUBST([*_CFLAGS]) + +This macro is called by PKG_CHECK_MODULES + +Signed-off-by: Gaetan Nadon + +commit ab83284df85569164d6e79c1572d2a8da5202581 +Author: Gaetan Nadon +Date: Wed Jan 12 13:10:21 2011 -0500 + +config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 + +XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls +AC_PROG_C_C99. This sets gcc with -std=gnu99. +If AC_PROG_CC macro is called afterwards, it resets CC to gcc. + +Signed-off-by: Gaetan Nadon + +commit 5305f3d3d2eb1a62e9c7f2fa0cc4a4288f55a498 +Author: Gaetan Nadon +Date: Wed Jan 12 11:54:40 2011 -0500 + +config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS + +It depends on util-macros 1.8 or later +The existing statement can now be removed from the configuration file. + +Signed-off-by: Gaetan Nadon + +commit 2d0146545e6287f18872b4ed64595b79b05bf19b +Author: Gaetan Nadon +Date: Wed Jan 12 11:23:52 2011 -0500 + +config: upgrade to util-macros 1.8 for additional man page support + +Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS +The value of MAN_SUBST is the same for all X.Org packages. + +Signed-off-by: Gaetan Nadon + +commit 679ed6f298e1ffc40811ccb56b4d28e1940fab71 +Author: Gaetan Nadon +Date: Wed Jan 12 10:21:24 2011 -0500 + +config: update AC_PREREQ statement to 2.60 + +Unrelated to the previous patches, the new value simply reflects +the reality that the minimum level for autoconf to configure +all x.org modules in one pass is 2.60 dated June 2006. + +A version later than 2.60 can be used, but no new features from such +a later version can be
x11-apps: Changes to 'debian-unstable'
debian/changelog |3
xwud/ChangeLog | 67
xwud/Makefile.am | 18
xwud/Makefile.in | 354 ++-
xwud/aclocal.m4 | 1131 +++--
xwud/config.guess| 233 +-
xwud/config.sub | 134 -
xwud/configure | 5896 ++-
xwud/configure.ac|9
xwud/depcomp | 74
xwud/install-sh | 29
xwud/man/Makefile.am | 12
xwud/man/Makefile.in | 423 +++
xwud/man/xwud.man| 154 +
xwud/xwud.c |6
xwud/xwud.man| 154 -
16 files changed, 7932 insertions(+), 765 deletions(-)
New commits:
commit ba8ddabb52652566b01c45515a88726f32bf52a8
Author: Robert Hooker
Date: Wed Apr 4 14:28:25 2012 -0400
xwud 1.0.4
diff --git a/debian/changelog b/debian/changelog
index ae8349a..b8d4d56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,10 @@ x11-apps (7.7~1) UNRELEASED; urgency=low
* xcursorgen 1.0.5
* xload 1.1.1
* xlogo 1.0.4
+ * xwud 1.0.4
* Drop oclock-ftbfs.diff, upstream.
- -- Robert Hooker Fri, 23 Mar 2012 16:40:58 -0400
+ -- Robert Hooker Wed, 04 Apr 2012 14:24:17 -0400
x11-apps (7.6+5) unstable; urgency=low
diff --git a/xwud/ChangeLog b/xwud/ChangeLog
index c1d37c0..9c58a14 100644
--- a/xwud/ChangeLog
+++ b/xwud/ChangeLog
@@ -1,3 +1,70 @@
+commit 86d36843f3f087a6c1f3eb5a21385a116ae9e46a
+Author: Alan Coopersmith
+Date: Sat Mar 31 17:04:56 2012 -0700
+
+xwud 1.0.4
+
+Signed-off-by: Alan Coopersmith
+
+commit 2785ef0c967571977b78490eb501c5f9da91d48c
+Author: Alan Coopersmith
+Date: Fri Jan 6 20:07:40 2012 -0800
+
+Replace malloc(strlen) + strcpy() with strdup()
+
+Signed-off-by: Alan Coopersmith
+
+commit 05c9c12b6491708bc9ed9ea6b7a5321928d5ac93
+Author: Jeremy Huddleston
+Date: Sun May 8 09:48:55 2011 -0700
+
+Mark Error as _X_NORETURN
+
+xwud.c:1031:6: warning: Array access (from variable 'pixels') results in a
null pointer dereference
+pixels[i] = ~0L;
+^~
+xwud.c:1036:22: warning: Array access (from variable 'pixels') results in
a null pointer dereference
+if ((color.pixel = pixels[pix]) == ~0L) {
+ ^~
+xwud.c:1101:6: warning: Array access (from variable 'rpixels') results in
a null pointer dereference
+rpixels[i] = ~0L;
+^~~
+xwud.c:1100:6: warning: Array access (from variable 'pixels') results in a
null pointer dereference
+pixels[i] = ~0L;
+^~
+
+Found-by: clang static analyzer
+Signed-off-by: Jeremy Huddleston
+
+commit b7751c561e500e066273d618bfb9967b89767559
+Author: Gaetan Nadon
+Date: Wed Jan 19 10:06:57 2011 -0500
+
+config: move man pages into their own directory
+
+Use services provided by XORG_MANPAGE_SECTIONS.
+Use standard Makefile for man pages.
+
+Signed-off-by: Gaetan Nadon
+
+commit 4e97b1da43664f99400dc3b66afc416fb25c3bb1
+Author: Gaetan Nadon
+Date: Thu Jan 13 17:15:37 2011 -0500
+
+man: replace hard coded man page section with substitution strings
+
+Signed-off-by: Gaetan Nadon
+
+commit 70cc9502dc9757cffc165d73cfe8a29b1450df25
+Author: Gaetan Nadon
+Date: Thu Jan 13 11:15:48 2011 -0500
+
+man: remove trailing spaces and tabs
+
+Using s/[ \t]*$//
+
+Signed-off-by: Gaetan Nadon
+
commit 1693c1bba2c03acd151329fb8ecc3f5c267f9576
Author: Alan Coopersmith
Date: Sun Nov 7 10:40:46 2010 -0800
diff --git a/xwud/Makefile.am b/xwud/Makefile.am
index e2eb5b0..73942aa 100644
--- a/xwud/Makefile.am
+++ b/xwud/Makefile.am
@@ -19,6 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
+SUBDIRS = man
bin_PROGRAMS = xwud
AM_CFLAGS = $(CWARNFLAGS) $(XWUD_CFLAGS)
@@ -27,24 +28,7 @@ xwud_LDADD = $(XWUD_LIBS)
xwud_SOURCES = \
xwud.c
-appman_PRE = \
-xwud.man
-
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST = $(appman_PRE)
MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
.PHONY: ChangeLog INSTALL
diff --git a/xwud/Makefile.in b/xwud/Makefile.in
index 8068882..01a71c1 100644
--- a/xwud/Makefile.in
+++ b/xwud/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# Thi
x11-utils: Changes to 'debian-unstable'
debian/changelog | 13
debian/rules |2
listres/ChangeLog | 150
listres/Makefile.am| 36
listres/Makefile.in| 316 +
listres/aclocal.m4 | 1890 ---
listres/config.guess | 18
listres/config.sub | 76
listres/configure | 7009 ++---
listres/configure.ac | 26
listres/listres.c | 25
listres/listres.man| 83
listres/man/Makefile.am| 12
listres/man/Makefile.in| 414 ++
listres/man/listres.man| 83
luit/ChangeLog | 122
luit/Makefile.in |2
luit/aclocal.m4| 1168 +-
luit/charset.c |2
luit/charset.h |1
luit/config.h.in |6
luit/configure | 6140 ++-
luit/configure.ac | 10
luit/iso2022.c | 19
luit/luit.c|4
luit/luit.h| 20
luit/man/Makefile.in |2
luit/man/luit.man |4
luit/sys.c | 16
xdpyinfo/ChangeLog | 122
xdpyinfo/Makefile.am | 23
xdpyinfo/Makefile.in | 300 +
xdpyinfo/aclocal.m4| 514 ++-
xdpyinfo/configure | 121
xdpyinfo/configure.ac | 41
xdpyinfo/man/Makefile.am | 12
xdpyinfo/man/Makefile.in | 439 ++
xdpyinfo/man/xdpyinfo.man | 69
xdpyinfo/xdpyinfo.c| 196 -
xdpyinfo/xdpyinfo.man | 72
xev/ChangeLog | 130
xev/Makefile.am| 23
xev/Makefile.in| 302 +
xev/aclocal.m4 | 984 -
xev/configure | 5517 +++-
xev/configure.ac | 21
xev/man/Makefile.am| 12
xev/man/Makefile.in| 414 ++
xev/man/xev.man| 61
xev/xev.c | 308 +
xev/xev.man| 61
xfd/ChangeLog | 111
xfd/Makefile.am| 32
xfd/Makefile.in| 293 +
xfd/aclocal.m4 | 1075 --
xfd/config.h.in|3
xfd/configure | 5730 -
xfd/configure.ac | 20
xfd/grid.c | 108
xfd/grid.h |2
xfd/gridP.h|6
xfd/m4/ax_define_dir.m4| 49
xfd/man/Makefile.am| 12
xfd/man/Makefile.in| 418 ++
xfd/man/xfd.man| 201 +
xfd/xfd.c | 72
xfd/xfd.man| 201 -
xfontsel/COPYING |8
xfontsel/ChangeLog | 102
xfontsel/Makefile.am | 23
xfontsel/Makefile.in | 285 +
xfontsel/ULabel.c | 33
xfontsel/ULabel.h | 11
xfontsel/ULabelP.h | 18
xfontsel/aclocal.m4| 1168 +-
xfontsel/app-defaults/XFontSel |8
xfontsel/configure | 5873 ++
xfontsel/configure.ac | 15
xfontsel/man/Makefile.am | 12
xfontsel/man/Makefile.in | 417 ++
xfontsel/man/xfontsel.man | 227 +
xfontsel/xfontsel.c| 48
xfontsel/xfontsel.man | 229 -
83 files changed, 39380 insertions(+), 4841 deletions(-)
New commits:
commit da37dee89380963a9d43dd7548e26a75cdc4d27c
Author: Robert Hooker
Date: Fri Mar 23 17:19:41 2012 -0400
debian/rules: Pass --disable-selective-werror to configure to work around
util-macros craziness.
Needed for luit 1.1.1.
diff --git a/debian/changelog b/debian/changelog
index 06e9369..e546a34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ x11-utils (7.7~1) UNRELEASED; urgency=low
* xev 1.2.0
* xfd 1.1.1
* xfontsel 1.0.4
+ * Build with --disable-selective-werror to work around build problems
+caused by excessive -Werror's set in new xutils-dev.
- -- Robert Hooker Fri, 23 Mar 2012 17:09:24 -0400
+ -- Robert Hooker Fri, 23 Mar 2012 17:17:03 -0400
x11-utils (7.6+4) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index cc5e74e..65f3350 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts
$(STAMP_DIR)/patch
cd $*-build && \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
- CFLAGS="$(CFLAGS)"
+ --disable-selective-werror CFLAGS="$(CFLAGS)"
cd $*-build && $(MAKE)
>$@
commit 4af862516db3724751c6f43f7b4c77ad429b09
x11-apps: Changes to 'debian-unstable'
bitmap/BitEdit.c | 255 bitmap/Bitmap.c | 613 +- bitmap/Bitmap.h | 18 bitmap/BitmapP.h | 16 bitmap/ChangeLog | 187 bitmap/CutPaste.c | 40 bitmap/Dialog.c | 52 bitmap/Graphics.c | 478 - bitmap/Handlers.c | 302 - bitmap/Makefile.am| 10 bitmap/Makefile.in| 19 bitmap/ReqMach.c | 68 bitmap/Requests.h | 10 bitmap/aclocal.m4 | 1127 +++- bitmap/app-defaults/Bitmap|6 bitmap/app-defaults/Bitmap-nocase |6 bitmap/atobm.c| 36 bitmap/bmtoa.c| 39 bitmap/config.h.in|9 bitmap/configure | 6472 ++-- bitmap/configure.ac | 36 bitmap/man/Makefile.in|3 bitmap/man/bitmap.man |2 debian/changelog |8 xcursorgen/ChangeLog | 72 xcursorgen/Makefile.am| 15 xcursorgen/Makefile.in| 293 - xcursorgen/aclocal.m4 | 1168 +++- xcursorgen/autogen.sh | 13 xcursorgen/configure | 5873 ++ xcursorgen/configure.ac | 11 xcursorgen/man/Makefile.am| 12 xcursorgen/man/Makefile.in| 414 + xcursorgen/man/xcursorgen.man | 64 xcursorgen/xcursorgen.c | 22 xcursorgen/xcursorgen.man | 64 xload/ChangeLog | 186 xload/Makefile.am | 20 xload/Makefile.in | 285 - xload/aclocal.m4 | 1168 +++- xload/config.h.in | 41 xload/configure | 9987 ++ xload/configure.ac| 24 xload/get_load.c | 339 - xload/get_rload.c |1 xload/man/Makefile.am | 12 xload/man/Makefile.in | 419 + xload/man/xload.man | 109 xload/mkinstalldirs | 111 xload/xload.c |6 xload/xload.h |1 xload/xload.man | 113 xlogo/ChangeLog | 67 xlogo/Makefile.am | 24 xlogo/Makefile.in | 300 - xlogo/RenderLogo.c|4 xlogo/aclocal.m4 | 1078 +++- xlogo/configure | 6103 ++- xlogo/configure.ac| 16 xlogo/man/Makefile.am | 12 xlogo/man/Makefile.in | 417 + xlogo/man/xlogo.man | 90 xlogo/xlogo.man | 90 63 files changed, 32892 insertions(+), 5964 deletions(-) New commits: commit fb1173c9222bf6feecd5893e95a91018c1474d4b Author: Robert Hooker Date: Fri Mar 23 16:41:17 2012 -0400 xlogo 1.0.4 diff --git a/debian/changelog b/debian/changelog index 37205ef..ae8349a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,9 +10,10 @@ x11-apps (7.7~1) UNRELEASED; urgency=low * bitmap 1.0.6 * xcursorgen 1.0.5 * xload 1.1.1 + * xlogo 1.0.4 * Drop oclock-ftbfs.diff, upstream. - -- Robert Hooker Fri, 23 Mar 2012 16:39:31 -0400 + -- Robert Hooker Fri, 23 Mar 2012 16:40:58 -0400 x11-apps (7.6+5) unstable; urgency=low diff --git a/xlogo/ChangeLog b/xlogo/ChangeLog index 9eda074..6a8b287 100644 --- a/xlogo/ChangeLog +++ b/xlogo/ChangeLog @@ -1,3 +1,70 @@ +commit 81f58b56464520fde4e64c0764bc58d5d197b849 +Author: Alan Coopersmith +Date: Thu Mar 22 22:49:50 2012 -0700 + +xlogo 1.0.4 + +Signed-off-by: Alan Coopersmith + +commit 18e61546798d20b7b1c15a2ff5d554bee7ec6bdf +Author: Jeremy Huddleston +Date: Sun Sep 25 00:53:50 2011 -0700 + +Require xt >= 1.0 for appdefaultdir + +https://bugs.freedesktop.org/show_bug.cgi?id=7237 + +Signed-off-by: Jeremy Huddleston + +commit 0e96450836cc876d213e02491394da3f6fa7575d +Author: Gaetan Nadon +Date: Wed Jan 19 10:06:56 2011 -0500 + +config: move man pages into their own directory + +Use services provided by XORG_MANPAGE_SECTIONS. +Use standard Makefile for man pages. + +Signed-off-by: Gaetan Nadon + +commit 7c7b2beb9b94790f9f08049163b85a37d253f0f6 +Author: Gaetan Nadon +Date: Thu Jan 13 17:15:36 2011 -0500 + +man: replace hard coded man page section with substitution strings + +Signed-off-by: Gaetan Nadon + +commit 7a21422aa690f4734da047ee03ea49723acda342 +Author: Gaetan Nadon +Date: Wed Jan 12 16:28:02 2011 -0500 + +config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + +This silences an Autoconf warning + +commit d1fe51c3209702740a2b073fa690aa2ce138bc7e +Author: Gaetan Nadon +Date: Wed Jan 12 15:29:50 2011 -0500 + +config: replace depreca
xserver-xorg-video-vmware: Changes to 'ubuntu'
debian/changelog |4 debian/patches/100-vmwgfx-avoid-including-a-library-header.patch | 57 -- debian/patches/series|1 3 files changed, 3 insertions(+), 59 deletions(-) New commits: commit 3df8bb3ec022c00b516dabd701a2c5a3f1ee65fc Author: Robert Hooker Date: Thu Mar 22 18:11:38 2012 -0400 Drop upstream patch. diff --git a/debian/changelog b/debian/changelog index b89b455..82723d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ xserver-xorg-video-vmware (1:12.0.1-1ubuntu1) precise; urgency=low * Add libxatracker-dev build dep, it was accidentally dropped by syncing the newer version without it, breaking 3D accelerated passthrough support in vmware. (LP: #962599) + * Drop 100-vmwgfx-avoid-including-a-library-header.patch, included +in the update. - -- Robert Hooker Thu, 22 Mar 2012 18:03:40 -0400 + -- Robert Hooker Thu, 22 Mar 2012 18:11:07 -0400 xserver-xorg-video-vmware (1:12.0.1-1) unstable; urgency=low diff --git a/debian/patches/100-vmwgfx-avoid-including-a-library-header.patch b/debian/patches/100-vmwgfx-avoid-including-a-library-header.patch deleted file mode 100644 index 7c18bad..000 --- a/debian/patches/100-vmwgfx-avoid-including-a-library-header.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 8ff19c2b2f288d6851b444dbda39544980837b73 Mon Sep 17 00:00:00 2001 -From: Thomas Hellstrom -Date: Wed, 1 Feb 2012 16:59:13 +0100 -Subject: [PATCH 1/4] vmwgfx: Avoid including a library header and use pixman - for type conversion - -The PictTransform type is a typedef of a pixman type. - -Signed-off-by: Thomas Hellstrom - vmwgfx/vmwgfx_xa_composite.c | 20 ++-- - 1 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/vmwgfx/vmwgfx_xa_composite.c b/vmwgfx/vmwgfx_xa_composite.c -index a2e3970..32246e8 100644 a/vmwgfx/vmwgfx_xa_composite.c -+++ b/vmwgfx/vmwgfx_xa_composite.c -@@ -33,8 +33,8 @@ - #include "config.h" - #endif - -+#include - #include --#include - #include "xa_composite.h" - #include "vmwgfx_saa.h" - #include "vmwgfx_saa_priv.h" -@@ -75,17 +75,17 @@ vmwgfx_matrix_from_pict_transform(PictTransform *trans, float *matrix) -if (!trans) - return FALSE; - -- matrix[0] = XFixedToDouble(trans->matrix[0][0]); -- matrix[3] = XFixedToDouble(trans->matrix[0][1]); -- matrix[6] = XFixedToDouble(trans->matrix[0][2]); -+ matrix[0] = pixman_fixed_to_double(trans->matrix[0][0]); -+ matrix[3] = pixman_fixed_to_double(trans->matrix[0][1]); -+ matrix[6] = pixman_fixed_to_double(trans->matrix[0][2]); - -- matrix[1] = XFixedToDouble(trans->matrix[1][0]); -- matrix[4] = XFixedToDouble(trans->matrix[1][1]); -- matrix[7] = XFixedToDouble(trans->matrix[1][2]); -+ matrix[1] = pixman_fixed_to_double(trans->matrix[1][0]); -+ matrix[4] = pixman_fixed_to_double(trans->matrix[1][1]); -+ matrix[7] = pixman_fixed_to_double(trans->matrix[1][2]); - -- matrix[2] = XFixedToDouble(trans->matrix[2][0]); -- matrix[5] = XFixedToDouble(trans->matrix[2][1]); -- matrix[8] = XFixedToDouble(trans->matrix[2][2]); -+ matrix[2] = pixman_fixed_to_double(trans->matrix[2][0]); -+ matrix[5] = pixman_fixed_to_double(trans->matrix[2][1]); -+ matrix[8] = pixman_fixed_to_double(trans->matrix[2][2]); - -return TRUE; - } --- -1.7.8.3 - diff --git a/debian/patches/series b/debian/patches/series index 38bb76e..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -100-vmwgfx-avoid-including-a-library-header.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/e1saqeq-0007yd...@vasks.debian.org
xserver-xorg-video-vmware: Changes to 'ubuntu'
ChangeLog| 128 +++ Makefile.am |4 + configure.ac | 22 ++- debian/changelog | 16 + saa/Makefile.am |4 + saa/saa_unaccel.c| 102 ++ src/Makefile.am |9 ++- src/vmware.c | 20 -- src/vmware.h |8 +- src/vmware_bootstrap.c | 35 +++ vmwgfx/Makefile.am |6 +- vmwgfx/vmwgfx_ctrl.c | 40 ++--- vmwgfx/vmwgfx_driver.c |1 vmwgfx/vmwgfx_driver.h |9 +++ vmwgfx/vmwgfx_saa.c |2 vmwgfx/vmwgfx_xa_composite.c | 20 +++--- 16 files changed, 335 insertions(+), 91 deletions(-) New commits: commit 23ad157888431debe10d5a17b81330026b905c37 Author: Robert Hooker Date: Thu Mar 22 18:08:39 2012 -0400 Bump changelog and release. diff --git a/debian/changelog b/debian/changelog index c26c7dd..b89b455 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-vmware (1:12.0.1-1ubuntu1) precise; urgency=low + + * Add libxatracker-dev build dep, it was accidentally dropped by +syncing the newer version without it, breaking 3D accelerated +passthrough support in vmware. (LP: #962599) + + -- Robert Hooker Thu, 22 Mar 2012 18:03:40 -0400 + xserver-xorg-video-vmware (1:12.0.1-1) unstable; urgency=low * New upstream release. commit 36692128865ced49457fe4b67edb59d79a3a5eb9 Author: Cyril Brulebois Date: Mon Mar 19 22:07:43 2012 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 326b4f9..a682399 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -xserver-xorg-video-vmware (1:12.0.1-1) UNRELEASED; urgency=low +xserver-xorg-video-vmware (1:12.0.1-1) unstable; urgency=low * New upstream release. * Actually merge upstream master up to b70116b907 (one extra commit) to avoid memory corruptions. - -- Cyril Brulebois Mon, 19 Mar 2012 21:05:18 + + -- Cyril Brulebois Mon, 19 Mar 2012 22:07:38 +0100 xserver-xorg-video-vmware (1:11.0.99.901-1) unstable; urgency=low commit 89930ef7ee7c04545ffc2ac930a7d04a11d913f5 Author: Cyril Brulebois Date: Mon Mar 19 22:07:33 2012 +0100 New upstream release. Actually merge upstream master up to b70116b907 (one extra commit) to avoid memory corruptions. diff --git a/ChangeLog b/ChangeLog index 5ded524..34051cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,696 @@ +commit b70116b907aa8545f0275589a52275235083bb40 +Author: Zack Rusin +Date: Thu Mar 15 11:37:26 2012 -0400 + +Fix a memory corruption due to a redundant free. + +We use the empty rect purely as a placeholder and never +initialize it with its own memory so lets not try to free +it. +Spotted by Dave Airlie. + +Signed-off-by: Zack Rusin +Reviewed-by: Jakob Bornecrantz + +commit 57f1204292a116b35d5930752bc06f9065332879 +Author: Jakob Bornecrantz +Date: Tue Mar 13 21:41:11 2012 +0100 + +Bump version number for the release + +Signed-off-by: Jakob Bornecrantz + +commit e585f9ea04bbd17398d2fa804be38a4e75bc60e4 +Author: Gaetan Nadon +Date: Tue Mar 13 09:44:46 2012 -0400 + +config: move AC_SYS_LARGEFILE in autoconf init section + +There is no need for this statement to be conditionally included. +It adds support for large files without taking anything away. + +http://www.gnu.org/software/autoconf/manual/autoconf.html + +Signed-off-by: Gaetan Nadon +Signed-off-by: Jakob Bornecrantz + +commit 04169f3860e4a7d03485631bee40c05fc45b72c6 +Author: Gaetan Nadon +Date: Mon Mar 12 14:51:38 2012 -0400 + +config: include saa and vmwgfx subdirs in the tarball + +Use AM_CONDITIONAL. Automake knows what to distribute. +It needs to be able to navigate down the subdirs to find what +needs to be included in the tarball. + +To test reliably, create a tarball and expand it into a separate +directory and build with xatracker. Distcheck will not detect +missing code when such code is configured not to build. + +The content of a tarball *must* always be identical, regardless +of the configuration options used or on which platform it was configured. + +Signed-off-by: Gaetan Nadon +Signed-off-by: Jakob Bornecrantz + +commit e6836ff099e5565dea58a53bba9b2df377241ef7 +Author: Zack Rusin +Date: Thu Mar 8 09:55:07 2012 -0500 + +Bump version number for the release + +Signed-off-by: Zack Rusin + +commit c5c38bab8c493985349356be5fadc14d3aee8040 +Author: Thomas Hellstrom +Date: Wed Feb 8 15:00:20 2012 +0100 + +vmware/legacy: Fix initial mode size v2 + +Commit "vmwlegacy: Make the default be a minium of 800x600..." +read the dimensions from the incorrect register pair. + +v2: Also treat initial
mesa: Changes to 'ubuntu'
debian/changelog|7 ++
debian/patches/117_intel_fix_hiz_null_dereference.patch | 49
debian/patches/series |1
3 files changed, 57 insertions(+)
New commits:
commit dc58112603dd6fc1076fe758fb0a5f18d5182439
Author: Robert Hooker
Date: Thu Mar 22 15:25:11 2012 -0400
Add patch to fix compiz segfaults on intel
diff --git a/debian/changelog b/debian/changelog
index 24b356d..2dd099d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (8.0.2-0ubuntu2) UNRELEASED; urgency=low
+
+ * Add 117_intel_fix_hiz_null_dereference.patch fixing a null deference
+when processing HiZ buffers (LP: #926379)
+
+ -- Robert Hooker Thu, 22 Mar 2012 15:16:25 -0400
+
mesa (8.0.2-0ubuntu1) precise; urgency=low
[ Robert Hooker ]
diff --git a/debian/patches/117_intel_fix_hiz_null_dereference.patch
b/debian/patches/117_intel_fix_hiz_null_dereference.patch
new file mode 100644
index 000..a8125ab
--- /dev/null
+++ b/debian/patches/117_intel_fix_hiz_null_dereference.patch
@@ -0,0 +1,49 @@
+From 9c396be157cb4e8780145769851f99754830b5f6 Mon Sep 17 00:00:00 2001
+From: Dylan Noblesmith
+Date: Fri, 16 Mar 2012 18:38:49 +
+Subject: [PATCH] intel: fix null dereference processing HiZ buffer
+
+Or technically, a near-null dereference.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=46303
+https://bugs.freedesktop.org/show_bug.cgi?id=46739
+
+NOTE: This is a candidate for the 8.0 branch.
+---
+ src/mesa/drivers/dri/intel/intel_context.c |6 ++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/intel/intel_context.c
b/src/mesa/drivers/dri/intel/intel_context.c
+index ffd9536..7f94976 100644
+--- a/src/mesa/drivers/dri/intel/intel_context.c
b/src/mesa/drivers/dri/intel/intel_context.c
+@@ -1223,6 +1223,10 @@ intel_process_dri2_buffer_with_separate_stencil(struct
intel_context *intel,
+if (!rb)
+ return;
+
++ /* Check if we failed to allocate the depth miptree earlier. */
++ if (buffer->attachment == __DRI_BUFFER_HIZ && rb->mt == NULL)
++ return;
++
+/* If the renderbuffer's and DRIbuffer's regions match, then continue. */
+if ((buffer->attachment != __DRI_BUFFER_HIZ &&
+ rb->mt &&
+@@ -1264,6 +1268,7 @@ intel_process_dri2_buffer_with_separate_stencil(struct
intel_context *intel,
+ * due to failure to allocate new storage.
+ */
+if (buffer->attachment == __DRI_BUFFER_HIZ) {
++ assert(rb->mt);
+ intel_miptree_release(&rb->mt->hiz_mt);
+} else {
+ intel_miptree_release(&rb->mt);
+@@ -1289,6 +1294,7 @@ intel_process_dri2_buffer_with_separate_stencil(struct
intel_context *intel,
+
+/* Associate buffer with new storage. */
+if (buffer->attachment == __DRI_BUFFER_HIZ) {
++ assert(rb->mt);
+ rb->mt->hiz_mt = mt;
+} else {
+ rb->mt = mt;
+--
+1.7.4.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 50aa029..600de25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
113_fix_tls.diff
115_llvm_dynamic_linking.diff
116_use_shared_galliumcore.diff
+117_intel_fix_hiz_null_dereference.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/e1sandy-0003hr...@vasks.debian.org
libdrm: Changes to 'ubuntu'
ChangeLog| 557 +++
configure.ac | 22
debian/changelog | 25
debian/libdrm-intel1.symbols |4
debian/libdrm-radeon1.symbols|4
debian/libdrm2.symbols |1
debian/patches/100-revert-intel-fix-build-of-intel-drm.patch | 28
debian/patches/101-revert-dont-build-intel-drm.patch | 30
debian/patches/series|4
debian/rules |6
include/drm/drm_fourcc.h |6
include/drm/i915_drm.h | 37
include/drm/radeon_drm.h | 24
intel/Makefile.am|3
intel/intel_aub.h| 123
intel/intel_bufmgr.h | 19
intel/intel_bufmgr_gem.c | 532 +++
intel/intel_decode.c | 1708 ++-
intel/tests/gen7-2d-copy.batch |binary
intel/tests/gen7-2d-copy.batch-ref.txt | 14
intel/tests/gen7-2d-copy.batch.sh|1
intel/tests/gen7-3d.batch|binary
intel/tests/gen7-3d.batch-ref.txt| 1504 +
radeon/Makefile.am |5
radeon/r600_pci_ids.h| 271 +
radeon/radeon_cs_space.c | 15
radeon/radeon_surface.c | 1007 ++
radeon/radeon_surface.h | 114
xf86drmMode.c| 21
xf86drmMode.h|6
30 files changed, 3949 insertions(+), 2142 deletions(-)
New commits:
commit 05fa7aab66a25009b754b6a93def5aff582e6d18
Author: Robert Hooker
Date: Thu Mar 22 13:18:48 2012 -0400
Add patch series allowing libdrm-intel1 to build on powerpc/armel until
plymouth is updated.
diff --git a/debian/changelog b/debian/changelog
index b84d11c..f8127bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-libdrm (2.4.32-1ubuntu1) precise; urgency=low
+libdrm (2.4.32-1ubuntu1) UNRELEASED; urgency=low
* Merge from Debian unstable, remaining changes:
- debian/rules
- debian/control:
+ Build libdrm-intel1 everywhere rather than just {i386,amd64}
for Plymouth
+- 100-revert-intel-fix-build-of-intel-drm.patch
+ 101-revert-dont-build-intel-drm.patch
+ + Add patch series to reenable building libdrm-intel1 on !i386/amd64,
+(drop when plymouth is updated to 0.8.4.)
-- Robert Hooker Thu, 22 Mar 2012 13:10:48 -0400
diff --git a/debian/patches/100-revert-intel-fix-build-of-intel-drm.patch
b/debian/patches/100-revert-intel-fix-build-of-intel-drm.patch
new file mode 100644
index 000..fb99a1f
--- /dev/null
+++ b/debian/patches/100-revert-intel-fix-build-of-intel-drm.patch
@@ -0,0 +1,28 @@
+From eeaba3a4430f711e3dfddb9210ade1038854f13d Mon Sep 17 00:00:00 2001
+From: Robert Hooker
+Date: Thu, 22 Mar 2012 13:09:59 -0400
+Subject: [PATCH 1/2] Revert "intel: Fix build of Intel DRM on x86 systems"
+
+This reverts commit 82c6938d232327233caac743a07639ac91bceb7e.
+---
+ configure.ac |4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ff2c840..38aae0d 100644
+--- a/configure.ac
b/configure.ac
+@@ -246,8 +246,8 @@ if test "x$INTEL" != "xno" -o "x$RADEON" != "xno"; then
+
+ else
+if test "x$INTEL" != "xno"; then
+- case $host_cpu in
+- i?86|x86_64) INTEL=yes ;;
++ case $host_os in
++ i?86-*|x86_64-*) INTEL=yes ;;
+*) INTEL=no ;;
+esac
+fi
+--
+1.7.9.1
+
diff --git a/debian/patches/101-revert-dont-build-intel-drm.patch
b/debian/patches/101-revert-dont-build-intel-drm.patch
new file mode 100644
index 000..d413194
--- /dev/null
+++ b/debian/patches/101-revert-dont-build-intel-drm.patch
@@ -0,0 +1,30 @@
+From 1e13e415ca07b27d0ab064ff1ed8b4dd022d2065 Mon Sep 17 00:00:00 2001
+From: Robert Hooker
+Date: Thu, 22 Mar 2012 13:10:03 -0400
+Subject: [PATCH 2/2] Revert "Don't build Intel DRM if $CHOST is not i?86-* or
+ x86_64-*"
+
+This reverts commit efd6e81e2ba112105457887ae18a58dfa4bbc8ef.
+---
+ configure.ac |5 +
+ 1 files changed, 1 ins
mesa: Changes to 'ubuntu'
debian/changelog |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6bfad6297d710affa66dd010d4188875351c7339 Author: Robert Hooker Date: Thu Mar 22 10:28:58 2012 -0400 Fix up changelog. 0ubuntu1 instead of 1ubuntu1 and mention lzma diff --git a/debian/changelog b/debian/changelog index 0a9e16b..5b935d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -mesa (8.0.2-1ubuntu1) UNRELEASED; urgency=low +mesa (8.0.2-0ubuntu1) UNRELEASED; urgency=low * New upstream bugfix release. * Drop 117_i965_only_set_last_render_target_last.patch, applied upstream. + * Compress non-debug debs with lzma -- Robert Hooker Wed, 21 Mar 2012 18:46:48 -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/e1saj0u-0006an...@vasks.debian.org
mesa: Changes to 'ubuntu'
Makefile |8 configs/darwin | 23 - configs/darwin-fat-intel |7 debian/changelog | 59 --- debian/control |1 debian/libegl1-mesa-dev.install.linux.in |1 debian/patches/117_i965_only_set_last_render_target_last.patch | 30 - debian/patches/series |1 docs/news.html | 16 + docs/relnotes-8.0.1.html |4 docs/relnotes-8.0.2.html | 158 ++ docs/relnotes.html |2 src/gallium/auxiliary/draw/draw_context.h | 15 src/gallium/auxiliary/rtasm/rtasm_cpu.c| 48 +-- src/gallium/auxiliary/util/u_debug_memory.c|9 src/gallium/drivers/r300/compiler/radeon_program_alu.c | 64 +++- src/gallium/drivers/svga/svga_pipe_depthstencil.c |8 src/gallium/drivers/svga/svga_pipe_rasterizer.c|4 src/gallium/drivers/svga/svga_screen.c |4 src/gallium/drivers/svga/svga_state_need_swtnl.c |5 src/glx/apple/Makefile |1 src/glx/create_context.c |7 src/mesa/drivers/dri/i915/i915_fragprog.c |4 src/mesa/drivers/dri/i915/i915_texstate.c | 22 + src/mesa/drivers/dri/i915/i915_vtbl.c |7 src/mesa/drivers/dri/i965/brw_context.h|6 src/mesa/drivers/dri/i965/brw_eu_emit.c|2 src/mesa/drivers/dri/i965/brw_fs.cpp |9 src/mesa/drivers/dri/i965/brw_misc_state.c |3 src/mesa/drivers/dri/i965/brw_sf.c | 30 + src/mesa/drivers/dri/i965/brw_sf.h |1 src/mesa/drivers/dri/i965/brw_sf_emit.c|4 src/mesa/drivers/dri/intel/intel_context.c |2 src/mesa/drivers/dri/intel/intel_context.h |2 src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 14 src/mesa/drivers/dri/intel/intel_screen.c | 34 ++ src/mesa/drivers/dri/intel/intel_screen.h |3 src/mesa/drivers/dri/intel/intel_span.c| 28 - src/mesa/drivers/dri/intel/intel_span.h|2 src/mesa/main/bufferobj.c | 12 src/mesa/main/pack.c | 91 + src/mesa/main/pack.h |7 src/mesa/main/readpix.c| 26 + src/mesa/main/texgetimage.c| 103 +- src/mesa/main/uniform_query.cpp| 16 - src/mesa/main/uniforms.c |2 src/mesa/main/version.h|4 src/mesa/tnl/t_context.c |3 48 files changed, 644 insertions(+), 268 deletions(-) New commits: commit 929310bb91d83bf4a8886327005744ccbfd75feb Author: Robert Hooker Date: Wed Mar 21 18:47:25 2012 -0400 Drop 117_i965_only_set_last_render_target_last.patch (upstream) diff --git a/debian/changelog b/debian/changelog index 58d009a..0a9e16b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -mesa (8.0.2-1ubuntu1) precise; urgency=low +mesa (8.0.2-1ubuntu1) UNRELEASED; urgency=low * New upstream bugfix release. + * Drop 117_i965_only_set_last_render_target_last.patch, applied upstream. - -- Robert Hooker Wed, 21 Mar 2012 18:46:05 -0400 + -- Robert Hooker Wed, 21 Mar 2012 18:46:48 -0400 mesa (8.0.2-1) UNRELEASED; urgency=low diff --git a/debian/patches/117_i965_only_set_last_render_target_last.patch b/debian/patches/117_i965_only_set_last_render_target_last.patch deleted file mode 100644 index a2abf84..000 --- a/debian/patches/117_i965_only_set_last_render_target_last.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 172bb92db1a3c317867d9cfec6f15c09c37a0f6c -Author: Kenneth Graunke -Date: Sat Feb 18 21:29:29 2012 -0800 - -i965: Only set Last Render Target Select on the last FB write. - -Fixes GPU hangs in OilRush, Trine, and Amnesia: The Dark Descent, -which all use MRT (multiple render targets). - -NOTE: This is a candidate for release branches. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38720 -Bugzilla: https
mesa: Changes to 'debian-experimental'
Makefile |8 configs/darwin | 23 +- configs/darwin-fat-intel |7 debian/changelog |2 docs/news.html | 16 + docs/relnotes-8.0.1.html |4 docs/relnotes-8.0.2.html | 158 + docs/relnotes.html |2 src/gallium/auxiliary/draw/draw_context.h | 15 + src/gallium/auxiliary/rtasm/rtasm_cpu.c| 48 ++--- src/gallium/auxiliary/util/u_debug_memory.c|9 src/gallium/drivers/r300/compiler/radeon_program_alu.c | 64 +- src/gallium/drivers/svga/svga_pipe_depthstencil.c |8 src/gallium/drivers/svga/svga_pipe_rasterizer.c|4 src/gallium/drivers/svga/svga_screen.c |4 src/gallium/drivers/svga/svga_state_need_swtnl.c |5 src/glx/apple/Makefile |1 src/glx/create_context.c |7 src/mesa/drivers/dri/i915/i915_fragprog.c |4 src/mesa/drivers/dri/i915/i915_texstate.c | 22 ++ src/mesa/drivers/dri/i915/i915_vtbl.c |7 src/mesa/drivers/dri/i965/brw_context.h|6 src/mesa/drivers/dri/i965/brw_eu_emit.c|2 src/mesa/drivers/dri/i965/brw_fs.cpp |9 src/mesa/drivers/dri/i965/brw_misc_state.c |3 src/mesa/drivers/dri/i965/brw_sf.c | 30 ++- src/mesa/drivers/dri/i965/brw_sf.h |1 src/mesa/drivers/dri/i965/brw_sf_emit.c|4 src/mesa/drivers/dri/intel/intel_context.c |2 src/mesa/drivers/dri/intel/intel_context.h |2 src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 14 - src/mesa/drivers/dri/intel/intel_screen.c | 34 +++ src/mesa/drivers/dri/intel/intel_screen.h |3 src/mesa/drivers/dri/intel/intel_span.c| 28 +-- src/mesa/drivers/dri/intel/intel_span.h|2 src/mesa/main/bufferobj.c | 12 - src/mesa/main/pack.c | 91 + src/mesa/main/pack.h |7 src/mesa/main/readpix.c| 26 ++ src/mesa/main/texgetimage.c| 103 +++ src/mesa/main/uniform_query.cpp| 16 + src/mesa/main/uniforms.c |2 src/mesa/main/version.h|4 src/mesa/tnl/t_context.c |3 44 files changed, 634 insertions(+), 188 deletions(-) New commits: commit a503d12a654f3766fc5c572b0ccf3dc5a05fdc01 Author: Robert Hooker Date: Wed Mar 21 15:49:47 2012 -0400 Bump changelog. diff --git a/debian/changelog b/debian/changelog index 75e9e8d..c3cee7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (8.0.1-1) UNRELEASED; urgency=low +mesa (8.0.2-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * New upstream bugfix release. (LP: #926379) commit 5f7204c3bbc070fce2f3351419a64362fe15a8c6 Author: Jakob Bornecrantz Date: Wed Mar 21 16:51:06 2012 + docs: Add 8.0.2 release notes Signed-off-by: Jakob Bornecrantz diff --git a/docs/news.html b/docs/news.html index 346065c..e2fcca1 100644 --- a/docs/news.html +++ b/docs/news.html @@ -11,6 +11,14 @@ News +March 21, 2012 + + +Mesa 8.0.2 is released. +This is a bug fix release. + + + February 16, 2012 diff --git a/docs/relnotes-8.0.2.html b/docs/relnotes-8.0.2.html new file mode 100644 index 000..ad1818c --- /dev/null +++ b/docs/relnotes-8.0.2.html @@ -0,0 +1,158 @@ + + + +Mesa Release Notes + + + + + + + + +Mesa 8.0.2 Release Notes / March 21, 2012 + + +Mesa 8.0.2 is a bug fix release which fixes bugs found since the 8.0.1 release. + + +Mesa 8.0.2 implements the OpenGL 3.0 API, but the version reported by +glGetString(GL_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 3.0. + + +See the Compiling/Installing page for prerequisites +for DRI hardware acceleration. + + + +MD5 checksums + +tdb + + +New features +None. + +Bug fixes + +This list is likely incomplete. + + + +https://bugs.freedesktop.org/show_bug.cgi?id=38720";>Bug 38720 - [SNB] Trine triggers a GPU hang + +https://bugs.freedesktop.org/show_bug.cgi?id=40059";>Bug 40059 - [SNB] hang in "Amnesia: The Dark Descent" demo + +https://bugs.freedesktop.org/show_bug.cgi?id=45216";>Bug 45216 - [SNB] GPU hang in OilRush + +https://bugs.freedesktop.org/show_bug.cgi?id=46631";>Bug 46631
mesa: Changes to 'upstream-experimental'
Rebased ref, commits from common ancestor: commit 5f7204c3bbc070fce2f3351419a64362fe15a8c6 Author: Jakob Bornecrantz Date: Wed Mar 21 16:51:06 2012 + docs: Add 8.0.2 release notes Signed-off-by: Jakob Bornecrantz diff --git a/docs/news.html b/docs/news.html index 346065c..e2fcca1 100644 --- a/docs/news.html +++ b/docs/news.html @@ -11,6 +11,14 @@ News +March 21, 2012 + + +Mesa 8.0.2 is released. +This is a bug fix release. + + + February 16, 2012 diff --git a/docs/relnotes-8.0.2.html b/docs/relnotes-8.0.2.html new file mode 100644 index 000..ad1818c --- /dev/null +++ b/docs/relnotes-8.0.2.html @@ -0,0 +1,158 @@ + + + +Mesa Release Notes + + + + + + + + +Mesa 8.0.2 Release Notes / March 21, 2012 + + +Mesa 8.0.2 is a bug fix release which fixes bugs found since the 8.0.1 release. + + +Mesa 8.0.2 implements the OpenGL 3.0 API, but the version reported by +glGetString(GL_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 3.0. + + +See the Compiling/Installing page for prerequisites +for DRI hardware acceleration. + + + +MD5 checksums + +tdb + + +New features +None. + +Bug fixes + +This list is likely incomplete. + + + +https://bugs.freedesktop.org/show_bug.cgi?id=38720";>Bug 38720 - [SNB] Trine triggers a GPU hang + +https://bugs.freedesktop.org/show_bug.cgi?id=40059";>Bug 40059 - [SNB] hang in "Amnesia: The Dark Descent" demo + +https://bugs.freedesktop.org/show_bug.cgi?id=45216";>Bug 45216 - [SNB] GPU hang in OilRush + +https://bugs.freedesktop.org/show_bug.cgi?id=46631";>Bug 46631 - It's really hard to hit the fast path for the fallback glReadPixels code + +https://bugs.freedesktop.org/show_bug.cgi?id=46679";>Bug 46679 - glReadPixels on a luminance texture returns the wrong values + +https://bugs.freedesktop.org/show_bug.cgi?id=46311";>Bug 46311 - Missing support of point size in Mesa core + +https://bugs.freedesktop.org/show_bug.cgi?id=46665";>Bug 46665 - [PNV] webgl conformance case max texture fails + +https://bugs.freedesktop.org/show_bug.cgi?id=45975";>Bug 45975 - [Gen4 + ILK] render with pointcoord will fail to render + +https://bugs.freedesktop.org/show_bug.cgi?id=4";>Bug 4 - [PNV] webgl conformance case NPOT case fails with TEXTURE_MIN_FILTER set to LINEAR + + + + + + +Changes +The full set of changes can be viewed by using the following GIT command: + + + git log mesa-8.0.1..mesa-8.0.2 + + +Brian Paul (7): + + svga: add null vs pointer check in update_need_pipeline() + util: add mutex lock in u_debug_memory.c code + mesa: add _mesa_rebase_rgba_float/uint() functions + mesa: use _mesa_rebase_rgba_float/uint() in glReadPixels code + mesa: use _mesa_rebase_rgba_float/uint() in glGetTexImage code + mesa: fix GL_LUMINANCE handling in glGetTexImage + docs: add links to 8.0.1 release notes + + +Daniel Vetter (1): + + i965: fixup W-tile offset computation to take swizzling into account + + +Dylan Noblesmith (1): + + mesa: add back glGetnUniform*v() overflow error reporting + + +Ian Romanick (1): + + docs: Add 8.0.1 release md5sums + + +Jakob Bornecrantz (3): + + mesa: Include mesa ES mapi generated files + mesa: Bump version number to 8.0.2 + docs: Add 8.0.2 release notes + + +Jeremy Huddleston (3): + + darwin: config file cleanups + darwin: Build create_context.c + darwin: Link against libxcb + + +José Fonseca (1): + + svga: Clamp advertised PIPE_SHADER_CAP_MAX_TEMPS to SVGA3D_TEMPREG_MAX. + + +Kenneth Graunke (2): + + i965: Only set Last Render Target Select on the last FB write. + i965: Fix Gen6+ dynamic state upper bound on older kernels. + + +Marek Olšák (1): + + gallium/rtasm: properly detect SSE and SSE2 + + +Neil Roberts (1): + + mesa: Don't disable fast path for normalized types + + +Tom Stellard (1): + + r300/compiler: Fix bug when lowering KILP on r300 cards + + +Yuanhan Liu (6): + + mesa: let GL3 buf obj queries not depend on opengl major version + tnl: let _TNL_ATTRIB_POINTSIZE do not depend on ctx->VertexProgram._Enabled + i915: fix wrong rendering of gl_PointSize on Pineview + i915: move the FALLBACK_DRAW_OFFSET check outside the drawing rect check + i965: handle gl_PointCoord for Gen4 and Gen5 platforms + i915: fallback for NPOT cubemap texture + + +Zack Rusin (3): + + svga: fix a crash happening before setting fragment shaders. + svga: Fix stencil op mapping + svga: fix the rasterizer state resets + + + + + diff --git a/docs/relnotes.html b/docs/relnotes.html index d5c944a..23337cf 100644 --- a/docs/relnotes.html +++ b/docs/relnotes.html @@ -13,6 +13,7 @@ The release notes summarize what's new or changed in each Mesa release. +8.0.2 release notes 8.0.1 release notes 8.0 release notes 7.11 release notes commit dc20396a1416014c6762a3204bee7cd96cafa6f3 Author: Jakob Bornecrantz Date: Tue Mar 20 13:51:
mesa: Changes to 'debian-experimental'
debian/changelog |6 +-
debian/control |1 +
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit b5775fdf5eddf8aa1b63fa8b203ef992cb194a60
Author: Robert Hooker
Date: Mon Mar 19 17:11:29 2012 -0400
Add libudev-dev to libgbm-dev dependencies, as required by gbm.pc
diff --git a/debian/changelog b/debian/changelog
index 5b8392e..75e9e8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
mesa (8.0.1-1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* New upstream bugfix release. (LP: #926379)
* control: libegl1-mesa-dev should depend on -drivers so that the
symlinks work.
- -- Timo Aaltonen Thu, 23 Feb 2012 10:58:33 +0200
+ [ Robert Hooker ]
+ * Add libudev-dev to libgbm-dev dependencies.
+
+ -- Robert Hooker Mon, 19 Mar 2012 17:02:47 -0400
mesa (8.0-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index cd603a8..ec59840 100644
--- a/debian/control
+++ b/debian/control
@@ -224,6 +224,7 @@ Section: libdevel
Architecture: linux-any
Depends:
libgbm1 (= ${binary:Version}),
+ libudev-dev,
${misc:Depends},
Description: generic buffer management API -- development files
This package contains the GBM buffer management library. It provides a
--
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/e1s9jrn-00046f...@vasks.debian.org
xutils-dev: Changes to 'debian-unstable'
debian/changelog |5 +- debian/versions |2 - util-macros/ChangeLog | 73 ++ util-macros/configure | 20 +- util-macros/configure.ac |2 - util-macros/xorg-macros.m4.in | 79 +++--- 6 files changed, 148 insertions(+), 33 deletions(-) New commits: commit a723c9a64810d2f5ee1102cb770175446d5e2637 Author: Robert Hooker Date: Tue Mar 13 20:27:12 2012 -0400 util-macros 1.17.0 diff --git a/debian/changelog b/debian/changelog index 7f09e24..6351d3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,15 @@ xutils-dev (1:7.6+7) UNRELEASED; urgency=low * util-macros 1.16.0 (superseded) - * util-macros 1.16.2 + * util-macros 1.16.2 (superseded) * imake 1.0.5 * makedepend 1.0.4 * lndir 1.0.3 * Bump x11proto-core-dev build dep version, required by the lndir update. + * util-macros 1.17.0 - -- Robert Hooker Thu, 08 Mar 2012 16:19:15 -0500 + -- Robert Hooker Tue, 13 Mar 2012 20:26:24 -0400 xutils-dev (1:7.6+6) unstable; urgency=low diff --git a/debian/versions b/debian/versions index 9cdef11..619f4df 100644 --- a/debian/versions +++ b/debian/versions @@ -9,7 +9,7 @@ squeeze. As the most useful, util-macros comes first. util-macros | Debian -1.16.2| 1:7.6+7 +1.17.0| 1:7.6+7 1.15.0| 1:7.6+5 1.14.0| 1:7.6+4 1.13.0| 1:7.6+3 diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog index 1bad117..b55ec7a 100644 --- a/util-macros/ChangeLog +++ b/util-macros/ChangeLog @@ -1,3 +1,76 @@ +commit c0c42057e0d357c144e7933ee413b522950a0f17 +Author: Gaetan Nadon +Date: Tue Mar 13 19:45:12 2012 -0400 + +Version bump: 1.17 + +Signed-off-by: Gaetan Nadon + +commit 51f69514e65637f575df901ef942515e70314f6a +Author: Chase Douglas +Date: Mon Mar 12 11:49:28 2012 -0700 + +Separate unknown warning options by language + +If XORG_COMPILER_FLAGS is called more than once with separate languages, +the unknown warning options used internally for unknown warning checking +will be set the first time and then the cached value will be used for +subsequent languages. This is a problem if the compilers differ between +the languages. + +This change ensures that the unknown warning options are namespaced so +multiple XORG_COMPILER_FLAGS calls with different languages are checked +separately. + +Signed-off-by: Chase Douglas +Reviewed-by: Gaetan Nadon + +commit a1fec11ca3de6774fb70052f5f5ab167bf658690 +Author: Chase Douglas +Date: Mon Mar 12 10:59:55 2012 -0700 + +Fix cflag test compiler message and cache ids + +When the language is C++, the flag checking message references $CC +instead of $CXX. The cache id is also xorg_cv_cc_* instead of +xorg_cv_cxx_*. This change fixes both issues. + +Signed-off-by: Chase Douglas +Reviewed-by: Gaetan Nadon + +commit a02a9048a1b831d13d32413e2af429ac8d7a5c2b +Author: Jon TURNEY +Date: Sat Mar 10 15:04:28 2012 + + +Don't use AS_ECHO in XORG_TESTSET_CFLAG + +Further to commit 52ef6f6, since AS_ECHO isn't supported in autoconf 2.61 either, +rewrite use of cache variable in XORG_TESTSET_CFLAG so 'echo' isn't needed at all. + +Signed-off-by: Jon TURNEY +Reviewed-by: Gaetan Nadon +Reviewed-by: Chase Douglas +Signed-off-by: Chase Douglas + +commit 299ae797eff46900e7d5914ff4502662f97f2062 +Author: Chase Douglas +Date: Fri Mar 9 14:46:00 2012 -0800 + +Add XORG_ENABLE_INTEGRATION_TESTS + +This macro enables a builder to enable/disable integration testing +It makes no assumption about the test cases' implementation +Test cases may or may not use Automake "Support for test suites" + +Unit test support usually requires less dependencies and may be built +and run under less stringent environments than integration tests. Thus, +two separate options for unit and integration testing is desirable. + +Copied from XORG_ENABLE_UNIT_TESTS. + +Signed-off-by: Chase Douglas +Reviewed-by: Gaetan Nadon + commit db238c632bb7136e3e44345820d514106e317420 Author: Gaetan Nadon Date: Mon Mar 5 09:39:17 2012 -0500 diff --git a/util-macros/configure b/util-macros/configure index f9d69bd..b731e0f 100755 --- a/util-macros/configure +++ b/util-macros/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for util-macros 1.16.2. +# Generated by GNU Autoconf 2.68 for util-macros 1.17. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -560,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='util-macros' PACKAGE_TARNAME='util-macros' -PACKAGE_VERSION=&#
libxvmc: Changes to 'debian-unstable'
debian/changelog |3 ++- debian/control |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit c36afc83dd6e53f6a8460de3851bb5c959f08723 Author: Robert Hooker Date: Thu Mar 8 22:58:45 2012 -0500 debian/control: Bump xutils-dev build-dep, util-macros 1.8 is required. diff --git a/debian/changelog b/debian/changelog index e749e6d..48ffc3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,12 +2,13 @@ libxvmc (2:1.0.7-1) UNRELEASED; urgency=low [ Robert Hooker ] * New upstream release. + * Bump xutils-dev build-dep for new macros. [ Cyril Brulebois ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! - -- Robert Hooker Thu, 08 Mar 2012 22:34:03 -0500 + -- Robert Hooker Thu, 08 Mar 2012 22:57:45 -0500 libxvmc (2:1.0.6-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 7a1914d..b4d1c13 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: libxext-dev (>= 1:0.99.1), x11proto-video-dev, libxv-dev (>= 1:0.99.1), - xutils-dev (>= 1:7.5~1), + xutils-dev (>= 1:7.5+4), pkg-config, quilt, automake, -- 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/e1s5qyr-0003n0...@vasks.debian.org
libdmx: Changes to 'debian-unstable'
ChangeLog | 75 +
Makefile.am|6 +-
configure.ac | 74 ++--
debian/changelog |6 ++
include/X11/extensions/dmxext.h|2
man/DMXAddInput.man|4 -
man/DMXAddScreen.man |6 +-
man/DMXChangeDesktopAttributes.man |2
man/DMXForceWindowCreation.man |2
man/DMXGetInputAttributes.man |4 -
man/DMXGetScreenAttributes.man |6 +-
man/DMXGetScreenCount.man |4 -
man/Makefile.am|4 -
src/dmx.c | 20 -
14 files changed, 148 insertions(+), 67 deletions(-)
New commits:
commit 70ace426c2d7c009978b2b0f7b0ab82624fa2d4f
Author: Robert Hooker
Date: Thu Mar 8 22:56:09 2012 -0500
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 11cca72..cdc3e13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,78 @@
+commit 9f470c92bc2d194c8abb9154f42864e6c82f43ef
+Author: Alan Coopersmith
+Date: Wed Mar 7 21:43:10 2012 -0800
+
+libdmx 1.1.2
+
+Signed-off-by: Alan Coopersmith
+
+commit 94c2e8ba375d968bd648097a484edac5d1c87c78
+Author: Alan Coopersmith
+Date: Fri Mar 2 17:38:24 2012 -0800
+
+Stop casting away constness on dmx_extension_name
+
+Fixes gcc warning:
+dmx.c: In function 'find_display':
+dmx.c:78:1: warning: cast discards qualifiers from pointer target type
+
+Signed-off-by: Alan Coopersmith
+
+commit 19bea63b9b39d83da9b4aa277cc1db967a4928bd
+Author: Alan Coopersmith
+Date: Fri Sep 16 22:06:15 2011 -0700
+
+Strip trailing whitespace
+
+Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
+git diff -w & git diff -b show no diffs from this change
+
+Signed-off-by: Alan Coopersmith
+
+commit 1ab0d436ceac0acef0cd97d8b280727b02062cc8
+Author: Alan Coopersmith
+Date: Tue May 17 20:32:38 2011 -0700
+
+Fix various typos in man pages
+
+Signed-off-by: Alan Coopersmith
+
+commit 77701e9139f79db2e66026bebaab265a873b0856
+Author: Gaetan Nadon
+Date: Wed Feb 2 11:43:46 2011 -0500
+
+config: comment, minor upgrade, quote and layout configure.ac
+
+Group statements per section as per Autoconf standard layout
+Quote statements where appropriate.
+Autoconf recommends not using dnl instead of # for comments
+
+Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
+Add AC_CONFIG_SRCDIR([Makefile.am])
+
+This helps automated maintenance and release activities.
+Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
+
+commit d970eb0954c0400bdab923c0b9c433b2f33dbe9d
+Author: Gaetan Nadon
+Date: Fri Jan 28 19:41:37 2011 -0500
+
+config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+Signed-off-by: Gaetan Nadon
+
+commit b865861d72a86024daec36c517a214e75ef4b973
+Author: Gaetan Nadon
+Date: Thu Jan 27 19:20:39 2011 -0500
+
+config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+AC_PROG_C_C99. This sets gcc with -std=gnu99.
+If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+Signed-off-by: Gaetan Nadon
+
commit 09d2ddd805a00568e4b7f668b0f500a63c350940
Author: Alan Coopersmith
Date: Thu Oct 28 16:56:29 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 6e67e5e..357af71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdmx (1:1.1.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Robert Hooker Thu, 08 Mar 2012 22:54:54 -0500
+
libdmx (1:1.1.1-1) unstable; urgency=low
[ Julien Cristau ]
commit 9f470c92bc2d194c8abb9154f42864e6c82f43ef
Author: Alan Coopersmith
Date: Wed Mar 7 21:43:10 2012 -0800
libdmx 1.1.2
Signed-off-by: Alan Coopersmith
diff --git a/configure.ac b/configure.ac
index f47492e..24e03fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libdmx], [1.1.1],
+AC_INIT([libdmx], [1.1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libdmx])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 94c2e8ba375d968bd648097a484edac5d1c87c78
Author: Alan Coopersmith
Date: Fri Mar 2 17:38:24 2012 -0800
Stop casting away constness on dmx_extension_name
Fixes gcc warning:
dmx.c: In function 'find_display':
dmx.c:78:1: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith
diff --git a/src/dmx.c b/src/dmx.c
index 7388458..201568e 100644
--- a/src/dmx.c
+++ b/src/dmx.c
@@ -76,7 +76,7 @@ static /* const */ XExtensionHooks dmx_extension_hooks = {
};
static XEXT_GENERATE_FIND_DISPLAY(find_display, dmx_extension_info,
-
libdmx: Changes to 'upstream-unstable'
Makefile.am|6 +--
configure.ac | 74 ++---
include/X11/extensions/dmxext.h|2 -
man/DMXAddInput.man|4 +-
man/DMXAddScreen.man |6 +--
man/DMXChangeDesktopAttributes.man |2 -
man/DMXForceWindowCreation.man |2 -
man/DMXGetInputAttributes.man |4 +-
man/DMXGetScreenAttributes.man |6 +--
man/DMXGetScreenCount.man |4 +-
man/Makefile.am|4 +-
src/dmx.c | 20 +-
12 files changed, 67 insertions(+), 67 deletions(-)
New commits:
commit 9f470c92bc2d194c8abb9154f42864e6c82f43ef
Author: Alan Coopersmith
Date: Wed Mar 7 21:43:10 2012 -0800
libdmx 1.1.2
Signed-off-by: Alan Coopersmith
diff --git a/configure.ac b/configure.ac
index f47492e..24e03fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libdmx], [1.1.1],
+AC_INIT([libdmx], [1.1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libdmx])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 94c2e8ba375d968bd648097a484edac5d1c87c78
Author: Alan Coopersmith
Date: Fri Mar 2 17:38:24 2012 -0800
Stop casting away constness on dmx_extension_name
Fixes gcc warning:
dmx.c: In function 'find_display':
dmx.c:78:1: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith
diff --git a/src/dmx.c b/src/dmx.c
index 7388458..201568e 100644
--- a/src/dmx.c
+++ b/src/dmx.c
@@ -76,7 +76,7 @@ static /* const */ XExtensionHooks dmx_extension_hooks = {
};
static XEXT_GENERATE_FIND_DISPLAY(find_display, dmx_extension_info,
- (char *)dmx_extension_name,
+ dmx_extension_name,
&dmx_extension_hooks,
0, NULL)
commit 19bea63b9b39d83da9b4aa277cc1db967a4928bd
Author: Alan Coopersmith
Date: Fri Sep 16 22:06:15 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith
diff --git a/Makefile.am b/Makefile.am
index c1e1118..be67679 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-#
+#
# Copyright 2005 Red Hat, Inc.
-#
+#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@
# specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
-#
+#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/include/X11/extensions/dmxext.h b/include/X11/extensions/dmxext.h
index 492aabf..93a1bfa 100644
--- a/include/X11/extensions/dmxext.h
+++ b/include/X11/extensions/dmxext.h
@@ -87,7 +87,7 @@ typedef enum {
} DMXInputEnum;
/** Client-library input information structure, returned by
- * #DMXGetInputAttributes. */
+ * #DMXGetInputAttributes. */
typedef struct {
DMXInputEnum inputType;
int physicalScreen;
diff --git a/man/DMXGetInputAttributes.man b/man/DMXGetInputAttributes.man
index 43c7e27..4a0b1cf 100644
--- a/man/DMXGetInputAttributes.man
+++ b/man/DMXGetInputAttributes.man
@@ -74,7 +74,7 @@ For local devices, all other fields returned, except
.I isCore " and " sendsCore ,
are invalid.
.PP
-For console devices,
+For console devices,
.I physicalScreen " and " physicalID
will be invalid, and
.I name
diff --git a/man/Makefile.am b/man/Makefile.am
index c1027c0..c2129c9 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
# Copyright 2005 Red Hat, Inc.
-#
+#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
@@ -9,7 +9,7 @@
# specific, written prior permission. Red Hat makes no representations about
# the suitability of this software for any purpose. It is provided "as is"
without
# express or implied warranty.
-#
+#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/src/dmx.c b/src/dmx.c
index 6167a01..7388458 100644
--- a/src/dmx.c
+++ b/src/dmx.c
@@ -251,7 +251,7 @@ Bool DMXGet
libxxf86vm: Changes to 'debian-unstable'
COPYING|6 +--
ChangeLog | 61 +
configure.ac | 32 ++-
debian/changelog |6 +++
include/X11/extensions/xf86vmode.h | 10 +++---
man/XF86VM.man |8 ++--
src/XF86VMode.c| 50 +++---
7 files changed, 121 insertions(+), 52 deletions(-)
New commits:
commit 97899348d9d1f6fa61ea563ad48f976e7b6140cb
Author: Robert Hooker
Date: Thu Mar 8 22:49:23 2012 -0500
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index b0cbc19..08a7e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,64 @@
+commit a0bd361fe688590b7d62ffb3ad1c1648a22096d4
+Author: Alan Coopersmith
+Date: Wed Mar 7 21:39:46 2012 -0800
+
+libXxf86vm 1.1.2
+
+Signed-off-by: Alan Coopersmith
+
+commit 2bac2e232f56836faeab016ab44fe45a3f055fd0
+Author: Alan Coopersmith
+Date: Thu Nov 10 21:51:52 2011 -0800
+
+Fix gcc -Wwrite-strings warning
+
+commit 78b0baf7872234c7e0e5753be76a662e34d87984
+Author: Alan Coopersmith
+Date: Fri Sep 16 22:58:12 2011 -0700
+
+Strip trailing whitespace
+
+Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
+git diff -w & git diff -b show no diffs from this change
+
+Signed-off-by: Alan Coopersmith
+
+commit ad5a4792e35b63c5b193f09303bcc41b322750d0
+Author: Gaetan Nadon
+Date: Wed Feb 2 11:43:45 2011 -0500
+
+config: comment, minor upgrade, quote and layout configure.ac
+
+Group statements per section as per Autoconf standard layout
+Quote statements where appropriate.
+Autoconf recommends not using dnl instead of # for comments
+
+Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
+Add AC_CONFIG_SRCDIR([Makefile.am])
+
+This helps automated maintenance and release activities.
+Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
+
+commit 97d7aa6c8108800d3ccd30ce907ef32e769370a9
+Author: Gaetan Nadon
+Date: Fri Jan 28 19:41:38 2011 -0500
+
+config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+Signed-off-by: Gaetan Nadon
+
+commit 353b988717d474a77322a541a6ab56661cc0bedb
+Author: Gaetan Nadon
+Date: Thu Jan 27 18:50:15 2011 -0500
+
+config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+AC_PROG_C_C99. This sets gcc with -std=gnu99.
+If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+Signed-off-by: Gaetan Nadon
+
commit 6f22da39b65983a582d2055e9e43f5dbc0412f1f
Author: Alan Coopersmith
Date: Fri Oct 29 18:04:50 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index e3570c6..2f08bc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxxf86vm (1:1.1.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Robert Hooker Thu, 08 Mar 2012 22:48:16 -0500
+
libxxf86vm (1:1.1.1-2) unstable; urgency=low
* Team upload.
commit a0bd361fe688590b7d62ffb3ad1c1648a22096d4
Author: Alan Coopersmith
Date: Wed Mar 7 21:39:46 2012 -0800
libXxf86vm 1.1.2
Signed-off-by: Alan Coopersmith
diff --git a/configure.ac b/configure.ac
index a02451e..e9cfa1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXxf86vm], [1.1.1],
+AC_INIT([libXxf86vm], [1.1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[libXxf86vm])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS(src/config.h)
commit 2bac2e232f56836faeab016ab44fe45a3f055fd0
Author: Alan Coopersmith
Date: Thu Nov 10 21:51:52 2011 -0800
Fix gcc -Wwrite-strings warning
diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index 99a0073..4f19cf3 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -46,7 +46,7 @@ from Kaleb S. KEITHLEY.
static XExtensionInfo _xf86vidmode_info_data;
static XExtensionInfo *xf86vidmode_info = &_xf86vidmode_info_data;
-static char *xf86vidmode_extension_name = XF86VIDMODENAME;
+static const char *xf86vidmode_extension_name = XF86VIDMODENAME;
#define XF86VidModeCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, xf86vidmode_extension_name, val)
commit 78b0baf7872234c7e0e5753be76a662e34d87984
Author: Alan Coopersmith
Date: Fri Sep 16 22:58:12 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith
diff --git a/COPYING b/COPYING
index ef81e65..4ea858b 100644
--- a/COPYING
+++ b/COPYING
@@ -14,12 +14,12 @@ included in all copies or substantial portions of the
Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIM
libxxf86vm: Changes to 'upstream-unstable'
COPYING|6 ++--
configure.ac | 32 ---
include/X11/extensions/xf86vmode.h | 10 +++
man/XF86VM.man |8 ++---
src/XF86VMode.c| 50 ++---
5 files changed, 54 insertions(+), 52 deletions(-)
New commits:
commit a0bd361fe688590b7d62ffb3ad1c1648a22096d4
Author: Alan Coopersmith
Date: Wed Mar 7 21:39:46 2012 -0800
libXxf86vm 1.1.2
Signed-off-by: Alan Coopersmith
diff --git a/configure.ac b/configure.ac
index a02451e..e9cfa1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXxf86vm], [1.1.1],
+AC_INIT([libXxf86vm], [1.1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[libXxf86vm])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS(src/config.h)
commit 2bac2e232f56836faeab016ab44fe45a3f055fd0
Author: Alan Coopersmith
Date: Thu Nov 10 21:51:52 2011 -0800
Fix gcc -Wwrite-strings warning
diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index 99a0073..4f19cf3 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -46,7 +46,7 @@ from Kaleb S. KEITHLEY.
static XExtensionInfo _xf86vidmode_info_data;
static XExtensionInfo *xf86vidmode_info = &_xf86vidmode_info_data;
-static char *xf86vidmode_extension_name = XF86VIDMODENAME;
+static const char *xf86vidmode_extension_name = XF86VIDMODENAME;
#define XF86VidModeCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, xf86vidmode_extension_name, val)
commit 78b0baf7872234c7e0e5753be76a662e34d87984
Author: Alan Coopersmith
Date: Fri Sep 16 22:58:12 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith
diff --git a/COPYING b/COPYING
index ef81e65..4ea858b 100644
--- a/COPYING
+++ b/COPYING
@@ -14,12 +14,12 @@ included in all copies or substantial portions of the
Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
+IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
-Except as contained in this notice, the name of Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
+Except as contained in this notice, the name of Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
or other dealings in this Software without prior written authorization
from Kaleb S. KEITHLEY.
diff --git a/include/X11/extensions/xf86vmode.h
b/include/X11/extensions/xf86vmode.h
index 136ce9c..a7a3c5d 100644
--- a/include/X11/extensions/xf86vmode.h
+++ b/include/X11/extensions/xf86vmode.h
@@ -16,13 +16,13 @@ included in all copies or substantial portions of the
Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
+IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
-Except as contained in this notice, the name of Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
+Except as contained in this notice, the name of Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
or other dealings in this Software without prior written authorization
from Kaleb S. KEITHLEY
@@ -120,7 +120,7 @@ typedef struct {
unsigned char nvsync;
XF86VidModeSyncRange* vsync;
} XF86VidModeMonitor;
-
+
typedef struct {
int type; /* of event */
unsigned long serial; /* # of last request processed by server */
@@ -264,7 +264,7 @@ Bool XF86VidModeSetGamma(
Bool XF86VidModeSetGammaRamp(
Display*/* dpy */,
int /* screen */,
-int/* size */,
+int/* size */,
unsigned short* /* red array */,
unsigned short* /* green array */,
unsigned short* /* blue array */
diff --git a/man/XF86VM.man b/man/XF86VM.man
index 63fb76c..97431b1 100644
--- a/man/XF86VM.man
+++ b/m
libxv: Changes to 'debian-unstable'
COPYING|8 +-
ChangeLog | 75 +++
Makefile.am|6 +-
configure.ac | 84 +++
debian/changelog |6 ++
include/X11/extensions/Xvlib.h | 66
man/XvGetStill.man |4 -
man/XvQueryExtension.man |4 -
man/xv-library-v2.2.txt| 60 +++---
src/Xv.c | 110 -
src/Xvlibint.h | 12 ++--
11 files changed, 255 insertions(+), 180 deletions(-)
New commits:
commit 31f25631f15c8a7e0193981793ed27e07e565c30
Author: Robert Hooker
Date: Thu Mar 8 22:43:35 2012 -0500
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 34b370e..ab6871f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,78 @@
+commit 0f4fa1820041394e879517abb49c0391ecc796f7
+Author: Alan Coopersmith
+Date: Wed Mar 7 21:25:38 2012 -0800
+
+libXv 1.0.7
+
+Signed-off-by: Alan Coopersmith
+
+commit de5e2271b54b7fe8bb3f8b66a70b5b87853f51a2
+Author: Alan Coopersmith
+Date: Thu Nov 10 21:45:11 2011 -0800
+
+Fix gcc -Wwrite-strings warnings
+
+Signed-off-by: Alan Coopersmith
+
+commit ff45155aa59c22aa5abc5ffe941dfe3b0f4c288f
+Author: Jeremy Huddleston
+Date: Wed Oct 5 20:59:37 2011 -0700
+
+XvQueryExtension doesn't return XvBadAlloc
+
+https://bugs.freedesktop.org/show_bug.cgi?id=22829
+
+Signed-off-by: Jeremy Huddleston
+
+commit 21ce77de0fc1b92bb55699df7e93dd1aae988fc5
+Author: Alan Coopersmith
+Date: Fri Sep 16 22:56:12 2011 -0700
+
+Strip trailing whitespace
+
+Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
+git diff -w & git diff -b show no diffs from this change
+
+Signed-off-by: Alan Coopersmith
+
+commit 7091e73f39b813adcc8fa5e61ad336ba063d7e00
+Author: Gaetan Nadon
+Date: Wed Feb 2 11:43:45 2011 -0500
+
+config: comment, minor upgrade, quote and layout configure.ac
+
+Group statements per section as per Autoconf standard layout
+Quote statements where appropriate.
+Autoconf recommends not using dnl instead of # for comments
+
+Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
+Add AC_CONFIG_SRCDIR([Makefile.am])
+Remove redundant AC_SUBST(*_CFLAGS) and/or *_LIBS
+No functional configuration changes
+
+This helps automated maintenance and release activities.
+Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
+
+commit 50a2f154f20763c9e98bdcf705fa366c87c6bae4
+Author: Gaetan Nadon
+Date: Fri Jan 28 19:41:37 2011 -0500
+
+config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+Signed-off-by: Gaetan Nadon
+
+commit b9b6680cbc95501af70c3597bfdd51d17aace695
+Author: Gaetan Nadon
+Date: Thu Jan 27 18:50:15 2011 -0500
+
+config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+AC_PROG_C_C99. This sets gcc with -std=gnu99.
+If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+Signed-off-by: Gaetan Nadon
+
commit e34fff44ebc4f8c258df127f6f80d0a1aa86a25d
Author: Alan Coopersmith
Date: Fri Oct 29 17:52:32 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 0852b51..5225922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxv (2:1.0.7-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Robert Hooker Thu, 08 Mar 2012 22:42:45 -0500
+
libxv (2:1.0.6-2) unstable; urgency=low
* Build for multiarch.
commit 0f4fa1820041394e879517abb49c0391ecc796f7
Author: Alan Coopersmith
Date: Wed Mar 7 21:25:38 2012 -0800
libXv 1.0.7
Signed-off-by: Alan Coopersmith
diff --git a/configure.ac b/configure.ac
index 630889e..d3ad5bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXv], [1.0.6],
+AC_INIT([libXv], [1.0.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXv])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit de5e2271b54b7fe8bb3f8b66a70b5b87853f51a2
Author: Alan Coopersmith
Date: Thu Nov 10 21:45:11 2011 -0800
Fix gcc -Wwrite-strings warnings
Signed-off-by: Alan Coopersmith
diff --git a/src/Xv.c b/src/Xv.c
index f9efb91..b081e8a 100644
--- a/src/Xv.c
+++ b/src/Xv.c
@@ -57,7 +57,7 @@ SOFTWARE.
static XExtensionInfo _xv_info_data;
static XExtensionInfo *xv_info = &_xv_info_data;
-static char *xv_extension_name = XvName;
+static const char *xv_extension_name = XvName;
#define XvCheckExtension(dpy, i, val) \
XextCheckExtension(dpy, i, xv_extension_name, val)
@@ -82,7 +82,7 @@ static XExtensionHooks xv_extension_hooks = {
};
-static char *xv_error_list[] =
+static const char *xv_error_l
libxv: Changes to 'upstream-unstable'
COPYING|8 +-
Makefile.am|6 +-
configure.ac | 84 +++
include/X11/extensions/Xvlib.h | 66
man/XvGetStill.man |4 -
man/XvQueryExtension.man |4 -
man/xv-library-v2.2.txt| 60 +++---
src/Xv.c | 110 -
src/Xvlibint.h | 12 ++--
9 files changed, 174 insertions(+), 180 deletions(-)
New commits:
commit 0f4fa1820041394e879517abb49c0391ecc796f7
Author: Alan Coopersmith
Date: Wed Mar 7 21:25:38 2012 -0800
libXv 1.0.7
Signed-off-by: Alan Coopersmith
diff --git a/configure.ac b/configure.ac
index 630889e..d3ad5bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXv], [1.0.6],
+AC_INIT([libXv], [1.0.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXv])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit de5e2271b54b7fe8bb3f8b66a70b5b87853f51a2
Author: Alan Coopersmith
Date: Thu Nov 10 21:45:11 2011 -0800
Fix gcc -Wwrite-strings warnings
Signed-off-by: Alan Coopersmith
diff --git a/src/Xv.c b/src/Xv.c
index f9efb91..b081e8a 100644
--- a/src/Xv.c
+++ b/src/Xv.c
@@ -57,7 +57,7 @@ SOFTWARE.
static XExtensionInfo _xv_info_data;
static XExtensionInfo *xv_info = &_xv_info_data;
-static char *xv_extension_name = XvName;
+static const char *xv_extension_name = XvName;
#define XvCheckExtension(dpy, i, val) \
XextCheckExtension(dpy, i, xv_extension_name, val)
@@ -82,7 +82,7 @@ static XExtensionHooks xv_extension_hooks = {
};
-static char *xv_error_list[] =
+static const char *xv_error_list[] =
{
"BadPort", /* XvBadPort */
"BadEncoding", /* XvBadEncoding */
commit ff45155aa59c22aa5abc5ffe941dfe3b0f4c288f
Author: Jeremy Huddleston
Date: Wed Oct 5 20:59:37 2011 -0700
XvQueryExtension doesn't return XvBadAlloc
https://bugs.freedesktop.org/show_bug.cgi?id=22829
Signed-off-by: Jeremy Huddleston
diff --git a/man/XvQueryExtension.man b/man/XvQueryExtension.man
index 4cce6dc..56a0826 100644
--- a/man/XvQueryExtension.man
+++ b/man/XvQueryExtension.man
@@ -44,9 +44,5 @@ Returned if
completed successfully.
.IP [XvBadExtension] 8
Returned if the Xv video extension is not available for the named display.
-.IP [XvBadAlloc] 8
-Returned if
-.BR XvQueryExtension (__libmansuffix__)
-failed to allocate memory to process the request.
.SH SEE ALSO
.BR Xv (__libmansuffix__)
commit 21ce77de0fc1b92bb55699df7e93dd1aae988fc5
Author: Alan Coopersmith
Date: Fri Sep 16 22:56:12 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith
diff --git a/COPYING b/COPYING
index 7f66edf..83b3df2 100644
--- a/COPYING
+++ b/COPYING
@@ -3,13 +3,13 @@ and the Massachusetts Institute of Technology, Cambridge,
Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Digital or MIT not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/Makefile.am b/Makefile.am
index eba7178..909cef5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-#
+#
# Copyright 2005 Red Hat, Inc.
-#
+#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@
# specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
-#
+#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/include/X11/extensions/Xvlib.h b/include/X11/extensions/Xvlib.h
ind
libxvmc: Changes to 'debian-unstable'
ChangeLog| 83
Makefile.am |8
XvMC_API.txt | 230 +--
configure.ac | 91 ++--
debian/changelog |8
include/X11/extensions/XvMClib.h | 32 -
src/Makefile.am | 32 -
src/XvMC.c | 82 ++--
src/XvMCWrapper.c| 781 ---
wrapper/Makefile.am | 22 +
wrapper/XvMCWrapper.c| 781 +++
11 files changed, 1121 insertions(+), 1029 deletions(-)
New commits:
commit cc599c7fdc16cc474c1453eb022cfcb39a265b43
Author: Robert Hooker
Date: Thu Mar 8 22:35:29 2012 -0500
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index faafe8b..7beaae4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,86 @@
+commit bcc4c4f3b7ad3c880e97f27951c97cb7ba856658
+Author: Alan Coopersmith
+Date: Wed Mar 7 21:31:11 2012 -0800
+
+libXvMC 1.0.7
+
+Signed-off-by: Alan Coopersmith
+
+commit 4091e8b8b80e00b8abafdd630e5af8cab22d9054
+Author: Alan Coopersmith
+Date: Thu Nov 10 21:47:20 2011 -0800
+
+Fix gcc -Wwrite-strings warnings
+
+Signed-off-by: Alan Coopersmith
+
+commit 5d4953233392d22b8c92e64c23b5aa20df86e17c
+Author: Alan Coopersmith
+Date: Fri Sep 16 22:56:49 2011 -0700
+
+Strip trailing whitespace
+
+Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
+git diff -w & git diff -b show no diffs from this change
+
+Signed-off-by: Alan Coopersmith
+
+commit 4f64c8dd12786f6b0ef1e4c8c8d992d43de6f895
+Author: Gaetan Nadon
+Date: Sat Mar 5 11:56:54 2011 -0500
+
+config: use Automake defaults when checking for library functions.
+
+Which follows a uniform naming convention.
+
+Reviewed-by: Julien Cristau
+Signed-off-by: Gaetan Nadon
+
+commit a37fab2dde1cb4ea0fb93ed811b14b2be9e52566
+Author: Gaetan Nadon
+Date: Sat Mar 5 11:18:21 2011 -0500
+
+config: move wrapper in its own directory
+
+This prevents the use of per-target compiler flags.
+Makefiles are simpler.
+The -D flags for the wrapper are moved with pre-precessor flags.
+
+Signed-off-by: Gaetan Nadon
+
+commit 3b4040904d8fd5b8c7a20b0b187d70a00dd452ef
+Author: Gaetan Nadon
+Date: Mon Mar 7 10:30:12 2011 -0500
+
+Fix whitespace issues
+
+Signed-off-by: Gaetan Nadon
+
+commit ac00a51c3106188aebc98ce5f480768dcd95da5f
+Author: Gaetan Nadon
+Date: Wed Feb 2 11:43:45 2011 -0500
+
+config: comment, minor upgrade, quote and layout configure.ac
+
+Group statements per section as per Autoconf standard layout
+Quote statements where appropriate.
+Autoconf recommends not using dnl instead of # for comments
+
+Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
+Add AC_CONFIG_SRCDIR([Makefile.am])
+Update minimum version of util-macros to at least 1.8.
+
+This helps automated maintenance and release activities.
+Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
+
+commit bdd949b7d163bd9542eed89cf8fdb42197f86975
+Author: Gaetan Nadon
+Date: Fri Jan 28 19:41:37 2011 -0500
+
+config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+Signed-off-by: Gaetan Nadon
+
commit 97d0572191368f47854c795e524610e529787c85
Author: Alan Coopersmith
Date: Fri Aug 13 22:00:11 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 844e6e7..e749e6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-libxvmc (2:1.0.6-2) UNRELEASED; urgency=low
+libxvmc (2:1.0.7-1) UNRELEASED; urgency=low
+ [ Robert Hooker ]
+ * New upstream release.
+
+ [ Cyril Brulebois ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
- -- Cyril Brulebois Mon, 04 Apr 2011 05:56:30 +0200
+ -- Robert Hooker Thu, 08 Mar 2012 22:34:03 -0500
libxvmc (2:1.0.6-1) unstable; urgency=low
commit bcc4c4f3b7ad3c880e97f27951c97cb7ba856658
Author: Alan Coopersmith
Date: Wed Mar 7 21:31:11 2012 -0800
libXvMC 1.0.7
Signed-off-by: Alan Coopersmith
diff --git a/configure.ac b/configure.ac
index 0fa19e5..ae7d08b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXvMC], [1.0.6],
+AC_INIT([libXvMC], [1.0.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXvMC])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 4091e8b8b80e00b8abafdd630e5af8cab22d9054
Author: Alan Coopersmith
Date: Thu Nov 10 21:47:20 2011 -0800
Fix gcc -Wwrite-strings warnings
Signed-off-by: Alan Coopersmith
diff --git a/src/XvMC.c b/src/XvMC.c
index b6f718b..5a4cf0d 100644
--- a/src/XvMC.c
+++ b/src/XvMC.c
@@ -19,9 +19,9 @@
static XExtensionInfo _xvmc_info_data;
static
libxvmc: Changes to 'upstream-unstable'
Makefile.am |8
XvMC_API.txt | 230 +--
configure.ac | 91 ++--
include/X11/extensions/XvMClib.h | 32 -
src/Makefile.am | 32 -
src/XvMC.c | 82 ++--
src/XvMCWrapper.c| 781 ---
wrapper/Makefile.am | 22 +
wrapper/XvMCWrapper.c| 781 +++
9 files changed, 1032 insertions(+), 1027 deletions(-)
New commits:
commit bcc4c4f3b7ad3c880e97f27951c97cb7ba856658
Author: Alan Coopersmith
Date: Wed Mar 7 21:31:11 2012 -0800
libXvMC 1.0.7
Signed-off-by: Alan Coopersmith
diff --git a/configure.ac b/configure.ac
index 0fa19e5..ae7d08b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXvMC], [1.0.6],
+AC_INIT([libXvMC], [1.0.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXvMC])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 4091e8b8b80e00b8abafdd630e5af8cab22d9054
Author: Alan Coopersmith
Date: Thu Nov 10 21:47:20 2011 -0800
Fix gcc -Wwrite-strings warnings
Signed-off-by: Alan Coopersmith
diff --git a/src/XvMC.c b/src/XvMC.c
index b6f718b..5a4cf0d 100644
--- a/src/XvMC.c
+++ b/src/XvMC.c
@@ -19,9 +19,9 @@
static XExtensionInfo _xvmc_info_data;
static XExtensionInfo *xvmc_info = &_xvmc_info_data;
-static char *xvmc_extension_name = XvMCName;
+static const char *xvmc_extension_name = XvMCName;
-static char *xvmc_error_list[] =
+static const char *xvmc_error_list[] =
{
"BadContext",
"BadSurface",
commit 5d4953233392d22b8c92e64c23b5aa20df86e17c
Author: Alan Coopersmith
Date: Fri Sep 16 22:56:49 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith
diff --git a/Makefile.am b/Makefile.am
index bc315df..3b65d8d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-#
+#
# Copyright 2005 Red Hat, Inc.
-#
+#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@
# specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
-#
+#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/XvMC_API.txt b/XvMC_API.txt
index 9aded3a..a12dbee 100644
--- a/XvMC_API.txt
+++ b/XvMC_API.txt
@@ -14,7 +14,7 @@
XvMCSetAttribute.
fifth draft (6/26/01) - Change definition of XvMCCompositeSubpicture
plus some clarifications and fixed typographical errors.
- sixth draft (9/24/01) - Added XVMC_SECOND_FIELD and removed
+ sixth draft (9/24/01) - Added XVMC_SECOND_FIELD and removed
XVMC_PROGRESSIVE_FRAME and XVMC_TOP_FIELD_FIRST flags.
seventh draft (10/26/01) - Added XVMC_INTRA_UNSIGNED option.
eighth draft (11/13/02) - Removed IQ level acceleration and
@@ -31,12 +31,12 @@
//
XvMC extends the X-Video extension (Xv) and makes use of the
- familar concept of the XvPort. Ports have attributes that can be set
+ familar concept of the XvPort. Ports have attributes that can be set
and queried through Xv. In XvMC ports can also have hardware motion
- compensation contexts created for use with them. Ports which support
- XvImages (ie. they have an "XV_IMAGE" port encoding as described in
+ compensation contexts created for use with them. Ports which support
+ XvImages (ie. they have an "XV_IMAGE" port encoding as described in
the Xv version 2.2 API addendum) can be queried for the list of XvMCSurface
- types they support. If they support any XvMCSurface types an
+ types they support. If they support any XvMCSurface types an
XvMCContext can be created for that port.
An XvMCContext describes the state of the motion compensation
@@ -44,7 +44,7 @@
a single port, surface type, motion compensation type, width and
height combination. For example, a context might be created for a
particular port that does MPEG-2 motion compensation on 720 x 480
- 4:2:0 surfaces. Once the context is created, referencing it implies
+ 4:2:0 surfaces. Once the context is created, referencing it implies
the port, surface type, size and the motion compensation type. Contexts
may be "direct" or "indirect". For indirect contexts the X server
render
xutils-dev: Changes to 'debian-unstable'
debian/changelog |7 debian/control|2 debian/versions |4 imake/ChangeLog | 87 imake/Makefile.am |6 imake/Makefile.in |8 imake/aclocal.m4 | 1025 +++ imake/cleanlinks |4 imake/cleanlinks.man |4 imake/configure | 5732 + imake/configure.ac|6 imake/imake.c | 201 imake/imake.man | 30 imake/imakemdep.h |2 imake/makeg.man |8 imake/mdepend.cpp |6 imake/mergelib.cpp| 16 imake/mkdirhier.man | 22 imake/mkhtmlindex.man |4 imake/xmkmf.cpp |6 imake/xmkmf.man | 45 lndir/ChangeLog | 62 lndir/Makefile.in |2 lndir/aclocal.m4 | 1134 +++- lndir/config.guess| 18 lndir/config.sub | 76 lndir/configure | 9904 ++ lndir/configure.ac| 17 lndir/lndir.c | 43 makedepend/ChangeLog | 79 makedepend/Makefile.in|4 makedepend/README | 25 makedepend/aclocal.m4 | 1025 +++ makedepend/config.guess | 18 makedepend/config.sub | 76 makedepend/configure | 5732 + makedepend/configure.ac |2 makedepend/def.h | 49 makedepend/ifparser.c | 26 makedepend/ifparser.h | 26 makedepend/imakemdep.h|4 makedepend/include.c | 16 makedepend/main.c | 20 makedepend/makedepend.man | 32 makedepend/parse.c| 62 makedepend/pr.c | 11 makedepend/tests/28045/makedep.sh |2 47 files changed, 22448 insertions(+), 3242 deletions(-) New commits: commit e798d5051cd30bdcac925cc8c77e117a42f481a3 Author: Robert Hooker Date: Thu Mar 8 16:21:22 2012 -0500 debian/control: bump x11proto-core-dev build dep as required by the new lndir update. diff --git a/debian/changelog b/debian/changelog index 898e694..7f09e24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ xutils-dev (1:7.6+7) UNRELEASED; urgency=low * imake 1.0.5 * makedepend 1.0.4 * lndir 1.0.3 + * Bump x11proto-core-dev build dep version, required by the lndir +update. - -- Robert Hooker Thu, 08 Mar 2012 16:15:29 -0500 + -- Robert Hooker Thu, 08 Mar 2012 16:19:15 -0500 xutils-dev (1:7.6+6) unstable; urgency=low diff --git a/debian/control b/debian/control index a44c461..a0fcc9a 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, - x11proto-core-dev, + x11proto-core-dev (>= 7.0.17), Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git commit 08d910057bd30e53a6c116498bc8608882bfaeea Author: Robert Hooker Date: Thu Mar 8 16:17:56 2012 -0500 lndir 1.0.3 diff --git a/debian/changelog b/debian/changelog index 6160871..898e694 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ xutils-dev (1:7.6+7) UNRELEASED; urgency=low * util-macros 1.16.2 * imake 1.0.5 * makedepend 1.0.4 + * lndir 1.0.3 - -- Robert Hooker Thu, 08 Mar 2012 16:13:52 -0500 + -- Robert Hooker Thu, 08 Mar 2012 16:15:29 -0500 xutils-dev (1:7.6+6) unstable; urgency=low diff --git a/debian/versions b/debian/versions index b38287b..9cdef11 100644 --- a/debian/versions +++ b/debian/versions @@ -30,6 +30,7 @@ imake | Debian lndir | Debian +1.0.3 | 1:7.6+7 1.0.2 | 1:7.5+5 diff --git a/lndir/ChangeLog b/lndir/ChangeLog index 38e5bb6..0505b8e 100644 --- a/lndir/ChangeLog +++ b/lndir/ChangeLog @@ -1,3 +1,65 @@ +commit 70ac3aeac918c916fffb6b2ee09514f50beb0ce9 +Author: Alan Coopersmith +Date: Wed Mar 7 21:50:44 2012 -0800 + +lndir 1.0.3 + +Signed-off-by: Alan Coopersmith + +commit cc807bb858287537da97be0051318f15bf712a76 +Author: Alan Coopersmith +Date: Wed Sep 28 14:46:18 2011 -0700 + +Add printf & noreturn attributes for static analysis + +Signed-off-by: Alan Coopersmith + +commit 966e58a5522c56ad5144ad5fe51273f24e9e729e +Author: Alan Coopersmith +Date: Wed Sep 28 14:43:27 2011 -0700 + +Add const attributes to fix gcc -Wwrite-strings warnings + +Signed-off-by: Alan Coopersmith + +commit 2eb55c2ed3a0e01466cb64d2e74905461eac3c66 +Author: Alan Coopersmith +Date: Sat May 7 23:39:56 2011 -0700 + +conf
xutils-dev: Changes to 'debian-unstable'
debian/changelog |5 debian/versions |2 util-macros/ChangeLog | 110 ++ util-macros/configure | 20 +-- util-macros/configure.ac |2 util-macros/xorg-macros.m4.in | 244 +++--- 6 files changed, 285 insertions(+), 98 deletions(-) New commits: commit 9105f4dd8de384ac8f58011993f0214b242d7773 Author: Robert Hooker Date: Mon Mar 5 10:56:14 2012 -0500 util-macros 1.16.2 Also bump util-macros version mentioned in debian/versions diff --git a/debian/changelog b/debian/changelog index b68358c..2db8073 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ xutils-dev (1:7.6+7) UNRELEASED; urgency=low - * util-macros 1.16.0 + * util-macros 1.16.0 (superseded) + * util-macros 1.16.2 - -- Robert Hooker Thu, 08 Dec 2011 16:19:45 -0500 + -- Robert Hooker Mon, 05 Mar 2012 10:52:03 -0500 xutils-dev (1:7.6+6) unstable; urgency=low diff --git a/debian/versions b/debian/versions index eee105b..23f0213 100644 --- a/debian/versions +++ b/debian/versions @@ -9,7 +9,7 @@ squeeze. As the most useful, util-macros comes first. util-macros | Debian -1.16.0| 1:7.6+7 +1.16.2| 1:7.6+7 1.15.0| 1:7.6+5 1.14.0| 1:7.6+4 1.13.0| 1:7.6+3 diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog index 339ec60..1bad117 100644 --- a/util-macros/ChangeLog +++ b/util-macros/ChangeLog @@ -1,3 +1,113 @@ +commit db238c632bb7136e3e44345820d514106e317420 +Author: Gaetan Nadon +Date: Mon Mar 5 09:39:17 2012 -0500 + +Version bump: 1.16.2 + +Signed-off-by: Gaetan Nadon + +commit 44aa8e75c8e54c5bc09d0cbff2f7207abe80c980 +Author: Chase Douglas +Date: Wed Feb 29 12:18:51 2012 -0800 + +Define BASE_CXXFLAGS when C++ is the chosen language + +You can use this functionality by setting the language to C++ before +calling XORG_DEFAULT_OPTIONS. This can accomplished with AC_LANG(C++). + +Signed-off-by: Chase Douglas +Reviewed-by: Gaetan Nadon + +commit 543ce698747dc998ca0ed987ef1ab0c35fb501b1 +Author: Chase Douglas +Date: Wed Feb 29 09:51:02 2012 -0800 + +Make XORG_TESTSET_CFLAG work for multiple languages + +Signed-off-by: Chase Douglas +Reviewed-by: Gaetan Nadon + +commit 52ef6f666a4fb46b693c81dc7a44612e6b78239d +Author: Jon TURNEY +Date: Tue Feb 14 21:59:38 2012 + + +Use AS_ECHO rather than AS_ECHO_N in XORG_TESTSET_CFLAG + +The AS_ECHO_N macro was only introduced in autoconf 2.62. +Backticks remove trailing newlines, so we don't need to use echo -n + +Signed-off-by: Jon TURNEY +Reviewed-by: Gaetan Nadon + +commit a1809fde56e45639556a44fd3c3ef9213204c5a9 +Author: Jon TURNEY +Date: Mon Jan 2 19:42:10 2012 + + +Cache the results of checking compiler flag support in XORG_TESTSET_CFLAG + +Since checking all those warning flags takes an amount of time I find irritating, +here is an attempt at caching the results of checking compiler warning flag support + +A couple of aspects which need definitely need review or testing: + +* I've tried to get things right when not the first flag in the list of alternates is +supported, but this really needs testing with a compiler other than gcc + +* The cache variable naming policy is a bit opaque me, so the names used may need corecting + +* I've tried to be careful, but who knows what portability sins I have committed :-) + +This change reduces the time to run the ./configure script produced from a configure.ac +containing just + +AC_INIT([test], 1.0) +XORG_COMPILER_FLAGS +XORG_CWARNFLAGS +XORG_STRICT_OPTION +AC_OUTPUT() + +from ~60s to ~20s on my cygwin machine, and from ~15s to ~9s on a linux VM running on the +same hardware + +v2: AS_TR_SH transforms characters which are invalid in shell variable names, so we don't +have to use sed to transform spaces ourself + +Signed-off-by: Jon TURNEY +Reviewed-by: Gaetan Nadon + +commit 214132d470ef98b5d3cdc71662cb586025746bb5 +Author: Jeremy Huddleston +Date: Fri Jan 20 23:46:56 2012 -0800 + +Version bump: 1.16.1 + +Signed-off-by: Jeremy Huddleston + +commit 088c848e74ac47bbd84eac70ef18a3d2abe96936 +Author: Jeremy Huddleston +Date: Sun Dec 18 15:57:43 2011 -0800 + +Provide a configure option to turn off the selective -Werror=... CFLAGS + +Provide end users with a workaround if they find code doesn't build with +the -Werror=... flags provided by BASE_CFLAGS. This can be useful if +newer util-macros are used with older source code that had problems, or +in the rare case when warnings are expanded to hit more cases (although +this case should not happen too much in practice). + +Signed-off-by: Jer
x11-apps: Changes to 'debian-unstable'
debian/changelog|3 xwd/ChangeLog | 100 xwd/Makefile.am | 18 xwd/Makefile.in | 296 +- xwd/aclocal.m4 | 972 +++-- xwd/configure | 5507 +++- xwd/configure.ac|9 xwd/dsimple.c | 24 xwd/dsimple.h |8 xwd/man/Makefile.am | 12 xwd/man/Makefile.in | 414 +++ xwd/man/xwd.man | 130 + xwd/multiVis.c | 21 xwd/wsutils.h |4 xwd/xwd.c | 28 xwd/xwd.man | 130 - 16 files changed, 7121 insertions(+), 555 deletions(-) New commits: commit ff273035d76ec98766e6a508cf78f1ee71a97cf2 Author: Robert Hooker Date: Thu Feb 23 11:02:19 2012 -0500 xwd 1.0.5 diff --git a/debian/changelog b/debian/changelog index f95799b..6e3e615 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,9 +6,10 @@ x11-apps (7.6+6) UNRELEASED; urgency=low * x11perf 1.5.4 * xclipboard 1.1.2 * xclock 1.0.6 + * xwd 1.0.5 * Drop oclock-ftbfs.diff, upstream. - -- Robert Hooker Sat, 11 Feb 2012 14:22:27 -0500 + -- Robert Hooker Thu, 23 Feb 2012 11:01:47 -0500 x11-apps (7.6+5) unstable; urgency=low diff --git a/xwd/ChangeLog b/xwd/ChangeLog index 8b7d030..71cab42 100644 --- a/xwd/ChangeLog +++ b/xwd/ChangeLog @@ -1,3 +1,103 @@ +commit 431918bd9644dd5db2216e8ab61959e9a4b74bc0 +Author: Alan Coopersmith +Date: Wed Feb 22 20:19:03 2012 -0800 + +xwd 1.0.5 + +Signed-off-by: Alan Coopersmith + +commit 61fcdc321919a362bd46853537c136140421d746 +Author: Jeremy Huddleston +Date: Tue Dec 13 15:56:47 2011 -0800 + +Silence -Wshadow warnings + +Signed-off-by: Jeremy Huddleston + +commit 48ef3b5604dbe05d67c0f6e01d38cb718085b9b6 +Author: Jeremy Huddleston +Date: Tue Dec 13 15:54:13 2011 -0800 + +Mark usage as _X_NORETURN + +Signed-off-by: Jeremy Huddleston + +commit 8376c9c6098b69a47fc37817ecf9f57302d992fc +Author: Jeremy Huddleston +Date: Tue Dec 13 15:53:02 2011 -0800 + +Dead code removal + +Signed-off-by: Jeremy Huddleston + +commit 7d88d8ab44b17247753f7225a1d8133d55d8423e +Author: Pär Lidberg +Date: Mon Oct 3 00:24:06 2011 -0700 + +Fix LP64 bug + +https://bugs.freedesktop.org/show_bug.cgi?id=14321 + +Signed-off-by: Jeremy Huddleston + +commit 95315108d25d0a17aef488e2bd4df8e98415d5d7 +Author: Alan Coopersmith +Date: Thu Jun 9 20:27:46 2011 -0700 + +Replace local checks for gcc with _X_NORETURN from xproto 7.0.17 + +Signed-off-by: Alan Coopersmith + +commit 6d83294bae9ba7394716f62abb08cfb8b89ed373 +Author: Jeremy Huddleston +Date: Sun May 8 10:02:16 2011 -0700 + +Rewrite parse_long to not fail -Wformat-nonliteral + +Signed-off-by: Jeremy Huddleston + +commit 97085ba43fcd752271a9356c435d28b95211644d +Author: Jeremy Huddleston +Date: Sun May 8 09:52:49 2011 -0700 + +Dead code removal + +xwd.c:298:5: warning: Value stored to 'bw' is never read +bw = 0; +^~ + +Found-by: clang static analyzer +Signed-off-by: Jeremy Huddleston + +commit 4a148f172d83d5e7f0ace6f28d4b8894b5e10442 +Author: Gaetan Nadon +Date: Wed Jan 19 10:06:57 2011 -0500 + +config: move man pages into their own directory + +Use services provided by XORG_MANPAGE_SECTIONS. +Use standard Makefile for man pages. + +Signed-off-by: Gaetan Nadon + +commit 00bdfc48c8249d989282aeb4d14edac49df63a3a +Author: Gaetan Nadon +Date: Thu Jan 13 17:15:37 2011 -0500 + +man: replace hard coded man page section with substitution strings + +Signed-off-by: Gaetan Nadon + +commit 1560946f78332c86e51f5298500bad94d9130181 +Author: Gaetan Nadon +Date: Thu Jan 13 11:15:48 2011 -0500 + +man: remove trailing spaces and tabs + +Using s/[ \t]*$// + +Signed-off-by: Gaetan Nadon + commit d58fa4c8f990abbb12df3cca34ed413683604470 Author: Alan Coopersmith Date: Sun Nov 7 10:17:48 2010 -0800 diff --git a/xwd/Makefile.am b/xwd/Makefile.am index 311425b..497be4a 100644 --- a/xwd/Makefile.am +++ b/xwd/Makefile.am @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xwd AM_CFLAGS = $(CWARNFLAGS) $(XWD_CFLAGS) @@ -36,24 +37,7 @@ xwd_SOURCES =\ wsutils.h \ xwd.c -appman_PRE = \ -xwd.man - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - .PHONY: ChangeLog INSTALL diff --git a/xwd/Makefile.in b/xwd/Makefile.in index ee473cc..f2f25e2 100644 --- a/xwd/Makefile.in +++ b/xwd/Makefile.in @@ -36,7 +36,6 @@ # TORTIOUS ACTION, A
x11-apps: Changes to 'debian-unstable'
debian/changelog |9
debian/patches/oclock-ftbfs.diff | 57
debian/patches/series |1
oclock/ChangeLog | 97
oclock/Clock.c | 35
oclock/Clock.h |2
oclock/ClockP.h|4
oclock/Makefile.am | 23
oclock/Makefile.in | 288 +
oclock/aclocal.m4 | 1074 -
oclock/app-defaults/Clock-color|1
oclock/config.guess| 18
oclock/config.h.in |3
oclock/config.sub | 76
oclock/configure | 5768 ++-
oclock/configure.ac| 28
oclock/man/Makefile.am | 12
oclock/man/Makefile.in | 415 ++
oclock/man/oclock.man | 102
oclock/oclock.c| 36
oclock/oclock.man | 104
oclock/transform.c |6
oclock/transform.h | 14
x11perf/ChangeLog | 137
x11perf/Makefile.am| 45
x11perf/Makefile.in| 292 +
x11perf/Xmark.man | 66
x11perf/aclocal.m4 | 390 ++
x11perf/configure | 151
x11perf/configure.ac | 13
x11perf/do_blt.c | 58
x11perf/do_tests.c | 24
x11perf/man/Makefile.am| 12
x11perf/man/Makefile.in| 421 ++
x11perf/man/Xmark.man | 66
x11perf/man/x11perf.man| 1016 +
x11perf/man/x11perfcomp.man| 80
x11perf/x11pcomp.cpp | 103
x11perf/x11perf.h |3
x11perf/x11perf.man| 1016 -
x11perf/x11perfcomp.in | 108
x11perf/x11perfcomp.man| 80
xclipboard/ChangeLog | 78
xclipboard/Makefile.am | 21
xclipboard/Makefile.in | 282 +
xclipboard/aclocal.m4 | 972 -
xclipboard/app-defaults/XClipboard | 17
xclipboard/configure | 5507 +-
xclipboard/configure.ac| 11
xclipboard/man/Makefile.am | 12
xclipboard/man/Makefile.in | 417 ++
xclipboard/man/xclipboard.man | 151
xclipboard/man/xcutsel.man | 106
xclipboard/xclipboard.c|5
xclipboard/xclipboard.man | 151
xclipboard/xcutsel.c |8
xclipboard/xcutsel.man | 106
xclock/ChangeLog | 124
xclock/Clock.c |4
xclock/Makefile.am | 20
xclock/Makefile.in | 287 +
xclock/aclocal.m4 | 2492 +++--
xclock/config.h.in |5
xclock/config.rpath| 666 +++
xclock/configure | 6790 +
xclock/configure.ac| 23
xclock/man/Makefile.am | 12
xclock/man/Makefile.in | 423 ++
xclock/man/xclock.man | 273 +
xclock/xclock.man | 273 -
70 files changed, 27051 insertions(+), 4439 deletions(-)
New commits:
commit 9393f2bddaaa42b32cfea22ec1dab7a8bc1b021f
Author: Robert Hooker
Date: Sat Feb 11 14:24:01 2012 -0500
Drop oclock-ftbfs.diff, upstream.
diff --git a/debian/changelog b/debian/changelog
index 2e3b4d2..f95799b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ x11-apps (7.6+6) UNRELEASED; urgency=low
* x11perf 1.5.4
* xclipboard 1.1.2
* xclock 1.0.6
+ * Drop oclock-ftbfs.diff, upstream.
- -- Robert Hooker Sat, 11 Feb 2012 14:19:05 -0500
+ -- Robert Hooker Sat, 11 Feb 2012 14:22:27 -0500
x11-apps (7.6+5) unstable; urgency=low
diff --git a/debian/patches/oclock-ftbfs.diff b/debian/patches/oclock-ftbfs.diff
deleted file mode 100644
index edc8b7d..000
--- a/debian/patches/oclock-ftbfs.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/oclock/configure b/oclock/configure
-index e3f9cc5..9ad7c3a 100755
a/oclock/configure
-+++ b/oclock/configure
-@@ -4603,11 +4603,11 @@ if test -n "$OCLOCK_CFLAGS"; then
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"x11 xmu xext\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "x11 xmu xext") 2>&5
-+ ($PKG_CONFIG --exists --print-errors "x11 xmu xext xt") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_OCLOCK_CFLAGS=`$PKG_CONFIG --cflags "x11 xmu xext" 2>/dev/null`
-+ pkg_cv_OCLOCK_CFLAGS=`$PKG_CONFIG --cflags "x11 xmu xext xt" 2>/dev/null
x11-apps: Changes to 'debian-unstable'
debian/changelog |7 +++
debian/control |2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit aa4ee16fcca0716f766ffd7c63c298943c3829d1
Author: Robert Hooker
Date: Fri Feb 10 16:43:34 2012 -0500
debian/control: Fix recommends, xbitmap is xbitmaps.
diff --git a/debian/changelog b/debian/changelog
index b5f7085..d4672db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-apps (7.6+6) UNRELEASED; urgency=low
+
+ * Fix recommends, previous it was recommending xbitmap which didn't
+exist, the package is xbitmaps.
+
+ -- Robert Hooker Fri, 10 Feb 2012 16:42:32 -0500
+
x11-apps (7.6+5) unstable; urgency=low
[ Julien Viard de Galbert ]
diff --git a/debian/control b/debian/control
index ac8caa9..d051c06 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/app/x11-apps.git
Package: x11-apps
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
-Recommends: xbitmap
+Recommends: xbitmaps
Suggests: mesa-utils
Conflicts: bitmap, oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole,
xcursorgen, xditview, xeyes, xgc, xload, xlogo, xmag, xman, xmore, xwd,
--
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/e1rvyg5-qb...@vasks.debian.org
mesa: Changes to 'debian-experimental'
debian/changelog |3 +++
debian/control |1 +
2 files changed, 4 insertions(+)
New commits:
commit 2eb248e32e42a1945729669f4d18067058078e82
Author: Christopher James Halse Rogers
Date: Thu Feb 9 16:53:37 2012 +1100
Add libx11-xcb-dev to libegl1-mesa-dev depends.
We now have all the packages listed as Requires or Requires.private in
egl.pc. Yay!
Cherry-picked from the ubuntu branch, manually fixed up the changelog.
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index b81890f..e2ea063 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,9 @@ mesa (8.0~rc2-1) UNRELEASED; urgency=low
* Add libxatracker packaging.
* Add libxcb-glx0-dev to libegl1-mesa-dev depends.
+ [ Christopher James Halse Rogers ]
+ * debian/control: Add libx11-xcb-dev to libegl1-mesa-dev depends.
+
-- Robert Hooker Fri, 03 Feb 2012 10:19:43 -0500
mesa (7.11.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 9ffc929..33a7eb5 100644
--- a/debian/control
+++ b/debian/control
@@ -284,6 +284,7 @@ Depends:
libxdamage-dev,
libxfixes-dev,
libxcb-glx0-dev,
+ libx11-xcb-dev,
${misc:Depends},
Description: free implementation of the EGL API -- development files
This package contains the development environment required for compiling
--
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/e1rvc8h-0006yw...@vasks.debian.org
libdrm: Changes to 'upstream-unstable'
configure.ac |7
include/drm/i915_drm.h | 37
include/drm/radeon_drm.h | 24
intel/Makefile.am |1
intel/intel_bufmgr_gem.c | 20
intel/intel_decode.c | 1501 +
intel/tests/gen7-2d-copy.batch |binary
intel/tests/gen7-2d-copy.batch-ref.txt | 14
intel/tests/gen7-2d-copy.batch.sh |1
intel/tests/gen7-3d.batch-ref.txt | 1922 ++---
radeon/Makefile.am |5
radeon/r600_pci_ids.h | 271
radeon/radeon_surface.c| 995 +
radeon/radeon_surface.h| 114 +
xf86drmMode.c | 21
xf86drmMode.h |1
16 files changed, 3150 insertions(+), 1784 deletions(-)
New commits:
commit 230ec7d7bbf1e8a7e263d471b21afb08c28eba0c
Author: Jerome Glisse
Date: Mon Feb 6 15:22:58 2012 -0500
configure: Bump version for 2.4.31
diff --git a/configure.ac b/configure.ac
index b59bc54..6784566 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
AC_PREREQ([2.63])
AC_INIT([libdrm],
-[2.4.30],
+[2.4.31],
[https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
[libdrm])
commit 356b87d8b34daf9aeadd33465141bc212ad6e3ff
Author: Jerome Glisse
Date: Mon Feb 6 15:22:14 2012 -0500
radeon: add r600_pci_ids.h to header file
Signed-off-by: Jerome Glisse
diff --git a/radeon/Makefile.am b/radeon/Makefile.am
index e64aff4..37be8cc 100644
--- a/radeon/Makefile.am
+++ b/radeon/Makefile.am
@@ -52,7 +52,8 @@ libdrm_radeoninclude_HEADERS = \
radeon_bo_gem.h \
radeon_cs_gem.h \
radeon_bo_int.h \
- radeon_cs_int.h
+ radeon_cs_int.h \
+ r600_pci_ids.h
pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libdrm_radeon.pc
commit 10c0837780b2d4a33568c16bb92527e196d6c05e
Author: Jerome Glisse
Date: Fri Feb 3 12:22:11 2012 -0500
radeon: fix surface API for good before anyone start relying on it
The mipmap level computation was wrong, we need to know the block
width, height, depth of compressed texture to properly compute this.
Change API to provide block width, height, depth instead of nblk_x,
nblk_y, nblk_z.
Signed-off-by: Jerome Glisse
diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index b2e5511..d7e9187 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -144,12 +144,12 @@ static void surf_minify(struct radeon_surface *surf,
uint32_t xalign, uint32_t yalign, uint32_t zalign,
unsigned offset)
{
-surf->level[level].nblk_x = mip_minify(surf->nblk_x, level);
-surf->level[level].nblk_y = mip_minify(surf->nblk_y, level);
-surf->level[level].nblk_z = mip_minify(surf->nblk_z, level);
surf->level[level].npix_x = mip_minify(surf->npix_x, level);
surf->level[level].npix_y = mip_minify(surf->npix_y, level);
surf->level[level].npix_z = mip_minify(surf->npix_z, level);
+surf->level[level].nblk_x = (surf->level[level].npix_x + surf->blk_w - 1)
/ surf->blk_w;
+surf->level[level].nblk_y = (surf->level[level].npix_y + surf->blk_h - 1)
/ surf->blk_h;
+surf->level[level].nblk_z = (surf->level[level].npix_z + surf->blk_d - 1)
/ surf->blk_d;
if (surf->level[level].mode == RADEON_SURF_MODE_2D) {
if (surf->level[level].nblk_x < xalign || surf->level[level].nblk_y <
yalign) {
surf->level[level].mode = RADEON_SURF_MODE_1D;
@@ -499,12 +499,12 @@ static void eg_surf_minify(struct radeon_surface *surf,
{
unsigned mtile_pr, mtile_ps;
-surf->level[level].nblk_x = mip_minify(surf->nblk_x, level);
-surf->level[level].nblk_y = mip_minify(surf->nblk_y, level);
-surf->level[level].nblk_z = mip_minify(surf->nblk_z, level);
surf->level[level].npix_x = mip_minify(surf->npix_x, level);
surf->level[level].npix_y = mip_minify(surf->npix_y, level);
surf->level[level].npix_z = mip_minify(surf->npix_z, level);
+surf->level[level].nblk_x = (surf->level[level].npix_x + surf->blk_w - 1)
/ surf->blk_w;
+surf->level[level].nblk_y = (surf->level[level].npix_y + surf->blk_h - 1)
/ surf->blk_h;
+surf->level[level].nblk_z = (surf->level[level].npix_z + surf->blk_d - 1)
/ surf->blk_d;
if (surf->level[level].mode == RADEON_SURF_MODE_2D) {
if (surf->level[level].nblk_x < mtilew || surf->level[level].nblk_y <
mtileh) {
surf->level[level].mode = RADEON_SURF_MODE_1D;
@@ -595,12 +595,6 @@ static int eg_surface_init_2d(struct
radeon_surface_manager *surf_man,
/* macro tile bytes */
mtileb = (mtilew / tilew) * (mtileh / tileh) * tileb;
-/* check if surface is big enought */
-if (surf->nblk_x < mtilew || surf->nblk_y < mtileh) {
-surf->level[start_level].mode = RADE
libdrm: Changes to 'debian-unstable'
ChangeLog | 309 + configure.ac |7 debian/changelog |8 debian/libdrm-radeon1.symbols |4 debian/libdrm2.symbols |1 debian/rules |4 include/drm/i915_drm.h | 37 include/drm/radeon_drm.h | 24 intel/Makefile.am |1 intel/intel_bufmgr_gem.c | 20 intel/intel_decode.c | 1501 + intel/tests/gen7-2d-copy.batch |binary intel/tests/gen7-2d-copy.batch-ref.txt | 14 intel/tests/gen7-2d-copy.batch.sh |1 intel/tests/gen7-3d.batch-ref.txt | 1922 ++--- radeon/Makefile.am |5 radeon/r600_pci_ids.h | 271 radeon/radeon_surface.c| 995 + radeon/radeon_surface.h| 114 + xf86drmMode.c | 21 xf86drmMode.h |1 21 files changed, 3474 insertions(+), 1786 deletions(-) New commits: commit ef308a29b590f84a4283fe030ecaeeaeaca787bf Author: Robert Hooker Date: Tue Feb 7 11:20:35 2012 -0500 Refresh libdrm2 and libdrm-radeon1 symbols, bump shlibs. diff --git a/debian/changelog b/debian/changelog index a3f910a..94e2d44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ libdrm (2.4.31-1) UNRELEASED; urgency=low * New upstream release. + * Bump libdrm2 and libdrm-radeon1 symbols and shlibs to account for +recent changes. - -- Robert Hooker Tue, 07 Feb 2012 10:54:39 -0500 + -- Robert Hooker Tue, 07 Feb 2012 11:06:32 -0500 libdrm (2.4.30-1) unstable; urgency=low diff --git a/debian/libdrm-radeon1.symbols b/debian/libdrm-radeon1.symbols index c900ea9..557be89 100644 --- a/debian/libdrm-radeon1.symbols +++ b/debian/libdrm-radeon1.symbols @@ -56,3 +56,7 @@ libdrm_radeon.so.1 libdrm-radeon1 #MINVER# radeon_gem_get_reloc_in_cs@Base 2.4.20 radeon_gem_name_bo@Base 2.4.17 radeon_gem_set_domain@Base 2.4.17 + radeon_surface_best@Base 2.4.31 + radeon_surface_init@Base 2.4.31 + radeon_surface_manager_free@Base 2.4.31 + radeon_surface_manager_new@Base 2.4.31 diff --git a/debian/libdrm2.symbols b/debian/libdrm2.symbols index 29ce302..0f70434 100644 --- a/debian/libdrm2.symbols +++ b/debian/libdrm2.symbols @@ -90,6 +90,7 @@ libdrm.so.2 libdrm2 #MINVER# drmModeFreeFB@Base 2.4.3 drmModeFreeModeInfo@Base 2.4.3 drmModeFreePlane@Base 2.4.30 + drmModeFreePlaneResources@Base 2.4.31 drmModeFreeProperty@Base 2.4.3 drmModeFreePropertyBlob@Base 2.4.3 drmModeFreeResources@Base 2.4.3 diff --git a/debian/rules b/debian/rules index a620ec7..7857963 100755 --- a/debian/rules +++ b/debian/rules @@ -75,7 +75,7 @@ endif dh_strip -s --remaining-packages override_dh_makeshlibs: - dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.30)' -- -c4 + dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.31)' -- -c4 ifeq ($(INTEL), yes) dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.30)' -- -c4 endif @@ -83,7 +83,7 @@ ifeq ($(NOUVEAU), yes) dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (>= 2.4.23)' -- -c4 endif ifeq ($(RADEON), yes) - dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.20)' -- -c4 + dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.31)' -- -c4 endif ifeq ($(LIBKMS), yes) dh_makeshlibs -plibkms1 -V'libkms1' -- -c4 commit 1761b100e3e7b405bd8c12c92392a3c623081c9e Author: Robert Hooker Date: Tue Feb 7 10:58:36 2012 -0500 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index fe7581a..4d5e8df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,312 @@ +commit 230ec7d7bbf1e8a7e263d471b21afb08c28eba0c +Author: Jerome Glisse +Date: Mon Feb 6 15:22:58 2012 -0500 + +configure: Bump version for 2.4.31 + +commit 356b87d8b34daf9aeadd33465141bc212ad6e3ff +Author: Jerome Glisse +Date: Mon Feb 6 15:22:14 2012 -0500 + +radeon: add r600_pci_ids.h to header file + +Signed-off-by: Jerome Glisse + +commit 10c0837780b2d4a33568c16bb92527e196d6c05e +Author: Jerome Glisse +Date: Fri Feb 3 12:22:11 2012 -0500 + +radeon: fix surface API for good before anyone start relying on it + +The mipmap level computation was wrong, we need to know the block +width, height, depth of compressed texture to properly compute this. +Change API to provide block width, height, depth instead of nblk_x, +nblk_y, nblk_z. + +Signed-off-by: Jerome Glisse + +commit 6a720cb8660975acea1100e61a88a92a7cb3856e +Author: Jerome Glisse +Date: Thu Feb 2 14:17:10 2012 -0500 + +radeon: surface fix macro -> micro tile fallback + +We need to force 1D tiling only on old kernel the fallback was +broken along the way. + +
mesa: Changes to 'ubuntu'
debian/changelog |9 -
debian/control |1 +
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 429fa192b11263a4ed0799ddc9038a38afc1e585
Author: Robert Hooker
Date: Fri Feb 3 15:31:57 2012 -0500
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index 2e6d46e..2de7fe3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (8.0~rc2-0ubuntu5) precise; urgency=low
+
+ * debian/control: Add libxcb-glx0-dev to libegl1-mesa-dev depends.
+
+ -- Robert Hooker Fri, 03 Feb 2012 15:31:14 -0500
+
mesa (8.0~rc2-0ubuntu4) precise; urgency=low
* Drop drisearchdir handling, it is no longer needed with multiarch
commit ab1d2ea0e4c76aa9e29a2d28da18af5c191c52e6
Author: Robert Hooker
Date: Fri Feb 3 15:25:54 2012 -0500
debian/control: Add libxcb-glx0-dev to libegl1-mesa-dev depends.
Fixes:
configure: error: Package requirements (wayland-server egl >= 7.10 glesv2
pixman-1 libpng) were not met:
Package xcb-glx was not found in the pkg-config search path.
Perhaps you should add the directory containing `xcb-glx.pc'
to the PKG_CONFIG_PATH environment variable
Package 'xcb-glx', required by 'egl', not found
diff --git a/debian/changelog b/debian/changelog
index bab3925..b81890f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,8 +32,9 @@ mesa (8.0~rc2-1) UNRELEASED; urgency=low
* Bump libdrm build dep to 2.4.30, x11proto-gl-dev to 1.4.14, and
x11proto-dri2-dev to 2.6.
* Add libxatracker packaging.
+ * Add libxcb-glx0-dev to libegl1-mesa-dev depends.
- -- Robert Hooker Fri, 27 Jan 2012 10:45:34 -0500
+ -- Robert Hooker Fri, 03 Feb 2012 10:19:43 -0500
mesa (7.11.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 4c5ee41..9ffc929 100644
--- a/debian/control
+++ b/debian/control
@@ -283,6 +283,7 @@ Depends:
libxxf86vm-dev,
libxdamage-dev,
libxfixes-dev,
+ libxcb-glx0-dev,
${misc:Depends},
Description: free implementation of the EGL API -- development files
This package contains the development environment required for compiling
--
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/e1rtpny-0005wj...@vasks.debian.org
mesa: Changes to 'debian-experimental'
debian/changelog |3 ++-
debian/control |1 +
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit ab1d2ea0e4c76aa9e29a2d28da18af5c191c52e6
Author: Robert Hooker
Date: Fri Feb 3 15:25:54 2012 -0500
debian/control: Add libxcb-glx0-dev to libegl1-mesa-dev depends.
Fixes:
configure: error: Package requirements (wayland-server egl >= 7.10 glesv2
pixman-1 libpng) were not met:
Package xcb-glx was not found in the pkg-config search path.
Perhaps you should add the directory containing `xcb-glx.pc'
to the PKG_CONFIG_PATH environment variable
Package 'xcb-glx', required by 'egl', not found
diff --git a/debian/changelog b/debian/changelog
index bab3925..b81890f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,8 +32,9 @@ mesa (8.0~rc2-1) UNRELEASED; urgency=low
* Bump libdrm build dep to 2.4.30, x11proto-gl-dev to 1.4.14, and
x11proto-dri2-dev to 2.6.
* Add libxatracker packaging.
+ * Add libxcb-glx0-dev to libegl1-mesa-dev depends.
- -- Robert Hooker Fri, 27 Jan 2012 10:45:34 -0500
+ -- Robert Hooker Fri, 03 Feb 2012 10:19:43 -0500
mesa (7.11.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 4c5ee41..9ffc929 100644
--- a/debian/control
+++ b/debian/control
@@ -283,6 +283,7 @@ Depends:
libxxf86vm-dev,
libxdamage-dev,
libxfixes-dev,
+ libxcb-glx0-dev,
${misc:Depends},
Description: free implementation of the EGL API -- development files
This package contains the development environment required for compiling
--
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/e1rtpjq-0005zp...@vasks.debian.org
mesa: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9856cc21a613b09f1dbc12f18f2d7cf295b86be7 Author: Robert Hooker Date: Fri Feb 3 00:15:16 2012 -0500 Release to precise diff --git a/debian/changelog b/debian/changelog index 35788c2..56f266f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (8.0~rc2-0ubuntu4) UNRELEASED; urgency=low +mesa (8.0~rc2-0ubuntu4) precise; urgency=low * Drop drisearchdir handling, it is no longer needed with multiarch and dri-alternates being removed. -- 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/e1rtbut-0005tl...@vasks.debian.org
