libxkbcommon: Changes to 'refs/tags/libxkbcommon-0.4.1-2'
Tag 'libxkbcommon-0.4.1-2' created by Michael Stapelberg at 2014-07-23 06:41 + Tagging upload of libxkbcommon 0.4.1-2 to unstable. -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABCgAGBQJTz1lGAAoJEE5xYO1KyO4dwbQP/Ajf16nfn357oIaVtaYTOdSU m2nZOiGeoB5A54wxJ0Yz/6MIOYxIH8vure6ccCvAcpLvRz8WKgMJZEwjV4A+VZCw jK0PE4vF6PJdWhR67Tfpkyvm5TTKkRMNFCzeQyXw99VI4vZK0XSwZ5hKY7tiyUW9 6Hv+zas3Tx856hv/wY+eLN+gYOTLdWuoRFt8MblBweFwULJQ6ZgpQ7MJVT7GfpV+ GT4j+nINpaozVrNKjBOcWlwucuVuqTb8y1t7cavtF4mshnbpgu0Ys/xHJGxeU4yV 2Oy2Bi5/OrOAfslqw3V99WzFeseKzSyvoBz9iHje2CLQteLVSCoY4bOH5VMDCneW 9bbDCT6MlSzSlDFEQ1/saU5224959eakXCPSmME4jYuNA1wcJD2iaQUf3UiJOmml J1Hv50x7KC1L2NjfOwJpUmoyhPfwefO3tmb9Qy4ZTRKjFmBLZyV6Dd0asYeY62T8 cE8BIupjhKuTSNbU9wEYHGR05kcIxLMSPaF45ymJeaErq274+omuBzFfyfiCXDgj d7s+WLCea0h6jfbXFb0d+d39UtbRQnPytCiuo/Uhf7E+DPCBteEWOY0TY0TMVvzE Z9ViQhWSFKsDtR1Nh+06/AIOsWP1jCyMAgkw4AUSuI1lL+/JtSvGcTLHdQwZVOay 3EkP6EjZjFF2KCBARoKj =H55j -END PGP SIGNATURE- Changes since libxkbcommon-0.4.1-1: Michael Stapelberg (1): Make libxkbcommon-x11 depend on the same version of libxkbcommon0 --- debian/changelog |7 +++ debian/control |1 + 2 files changed, 8 insertions(+) --- -- 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/e1x9qfp-0005kh...@moszumanska.debian.org
libxkbcommon: Changes to 'debian-unstable'
debian/changelog |7 +++ debian/control |1 + 2 files changed, 8 insertions(+) New commits: commit 0dc555e22a53eaa692fcc0091c8c6d51284037d5 Author: Michael Stapelberg Date: Wed Jul 23 08:36:03 2014 +0200 Make libxkbcommon-x11 depend on the same version of libxkbcommon0 Closes: #755724 diff --git a/debian/changelog b/debian/changelog index 0fcf069..469abdb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libxkbcommon (0.4.1-2) unstable; urgency=medium + + * Make libxkbcommon-x11 depend on the same version of libxkbcommon0 +(Closes: #755724) + + -- Michael Stapelberg Wed, 23 Jul 2014 08:35:57 +0200 + libxkbcommon (0.4.1-1) unstable; urgency=medium [ Timo Aaltonen ] diff --git a/debian/control b/debian/control index f3821e5..1bc2173 100644 --- a/debian/control +++ b/debian/control @@ -70,6 +70,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: + libxkbcommon0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: library to create keymaps with the XKB X11 protocol -- 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/e1x9qfp-0005jm...@moszumanska.debian.org
Processing of libxkbcommon_0.4.1-2_amd64.changes
libxkbcommon_0.4.1-2_amd64.changes uploaded successfully to localhost along with the files: libxkbcommon0_0.4.1-2_amd64.deb libxkbcommon-dev_0.4.1-2_amd64.deb libxkbcommon-x11-0_0.4.1-2_amd64.deb libxkbcommon-x11-dev_0.4.1-2_amd64.deb libxkbcommon_0.4.1-2.dsc libxkbcommon_0.4.1-2.diff.gz Greetings, Your Debian queue daemon (running on host franck.debian.org) -- 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/e1x9qfx-00044w...@franck.debian.org
libxkbcommon_0.4.1-2_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Wed, 23 Jul 2014 08:35:57 +0200 Source: libxkbcommon Binary: libxkbcommon0 libxkbcommon-dev libxkbcommon-x11-0 libxkbcommon-x11-dev Architecture: source amd64 Version: 0.4.1-2 Distribution: unstable Urgency: medium Maintainer: Debian X Strike Force Changed-By: Michael Stapelberg Description: libxkbcommon-dev - library interface to the XKB compiler - development files libxkbcommon-x11-0 - library to create keymaps with the XKB X11 protocol libxkbcommon-x11-dev - library to create keymaps with the XKB X11 protocol - development libxkbcommon0 - library interface to the XKB compiler - shared library Closes: 755724 Changes: libxkbcommon (0.4.1-2) unstable; urgency=medium . * Make libxkbcommon-x11 depend on the same version of libxkbcommon0 (Closes: #755724) Checksums-Sha1: 61e7a31bdb1282433b6027abf9f4b57686bfdf77 2303 libxkbcommon_0.4.1-2.dsc fee3fff6229d8b87e984cc789491556e247568b3 30386 libxkbcommon_0.4.1-2.diff.gz 93117861708df3bb19d83145cf993cee6bf787f4 112624 libxkbcommon0_0.4.1-2_amd64.deb 45f78f3bab3c9fa8e14204f1dbf33d5568ab2e2f 157566 libxkbcommon-dev_0.4.1-2_amd64.deb 2f9498fa8658e56193a55ed13b368ce98766c3b6 38584 libxkbcommon-x11-0_0.4.1-2_amd64.deb 8b4441c65394765c0106225a075ebe46f8074144 40220 libxkbcommon-x11-dev_0.4.1-2_amd64.deb Checksums-Sha256: 9046dbceda207ed7163b7c12c98399e6d119491a480dc908ae451d7fff0fb77c 2303 libxkbcommon_0.4.1-2.dsc d85cff2929193a73a462826f7b004362aa2a104f686ca9f4f2cf88e18c7b14c5 30386 libxkbcommon_0.4.1-2.diff.gz c2b3955ba9314a262b0cb9fca4e6ed36e48b4e1be03a9de4e058b86e1bb40d18 112624 libxkbcommon0_0.4.1-2_amd64.deb 15b28e4666768504853d5a57fa272ee760e5fd1cfd8565215715609cc16c5943 157566 libxkbcommon-dev_0.4.1-2_amd64.deb 98ab37457df78eeb084d16e37b885ebfcc0f8d0f81b77b0a4aafcb10105d5c4e 38584 libxkbcommon-x11-0_0.4.1-2_amd64.deb aa6c3bfae0a43254a87354cb425d5ee19e04bcf35517f28a53bf58caeb7e851e 40220 libxkbcommon-x11-dev_0.4.1-2_amd64.deb Files: c2a0bfc07cffc35da492d21b5bfb649d 112624 libs optional libxkbcommon0_0.4.1-2_amd64.deb 1956bb5668efc7fd41094b43ad9584e2 157566 libdevel extra libxkbcommon-dev_0.4.1-2_amd64.deb a37395bb8b380dbf9dcac577486f2623 38584 libs optional libxkbcommon-x11-0_0.4.1-2_amd64.deb 8bf7180376379f2152f20fe5f2ed47ea 40220 libdevel extra libxkbcommon-x11-dev_0.4.1-2_amd64.deb e5c692a573daada30e80c57017262549 2303 x11 optional libxkbcommon_0.4.1-2.dsc 5cc8b81d6be99f4afca9d37d682edb70 30386 x11 optional libxkbcommon_0.4.1-2.diff.gz -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJTz1j/AAoJEE5xYO1KyO4dGVwQAJgT9W4iBxu+rxp70EwzHuPq 9iUhf0C4JtKQ4LPPU19dglKTGf6S1Ta4pD+VQbMEnP5WrfSEYqrQ3l4FcAWwGKsD XXoHDltNuOPkLNPwFSYDAigmvgE9EjD+DuRrTyDpPimsMROGzpO+mkbX01hu16xO veeW39254jtl7L++M9mgdvPXaqSwUh83Wtt6CTsd02sewDIYeUI9S04Bv3kOuyFC hVcZ5Tpz3+jFFzLSYd+ZEUss1anhFMUVEc1CJ/UEJeUHCwtVG89JkxoE9L+AjFEK VeVCQ/mhtLpOAEH3wHjqUZS8q736MpQeAzDObtNRyG4o2oIz2exv9IrMAnUS+RSG moW4qfLOIOPf4YItaNJMA8lEj5DYZfJ5HM6rv61fQBbFSogge7EnWy3/yokw/aDu 8eAnJvKGKVh4Qeyks5X97V8ZvrHrXvGZcDX61s63lFI/ovX8ZOJyLRJDtnREfftZ F0QKqQsl2K1gr+KBloNssAvzg2FhyblizmoKeS/McIk7wA99H6/YRS3yJLe7yId0 3uIFXI6uIWlH5y0uCJM2koU+c5owPUdN0s2UvFu//Vc1nnl5hO+EJQFOWvsavOtm gCgu7NBwdqmMzHgWn/9mPuw4ssNo3X6DIEtKf4R1xGMT11H/5rQvIqU2YNELJ1FS SC8orJqsLmKAY4KhWNkd =4yMQ -END PGP SIGNATURE- Thank you for your contribution to Debian. -- 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/e1x9qlm-0004pm...@franck.debian.org
Bug#755809: xorg.conf.5 man page mentions an incorrect "Enable" option for Monitors
Package: xorg-server Version: 2:1.16.0-1 Severity: minor Tags: patch -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Hello, The xorg.conf.5 man page mention an "Enable" Option for Monitors, which does not work. The right option is in fact "Disable", as I indicated in a blog post: http://tanguy.ortolo.eu/blog/article128/ck-allow-suspend-xorg-disable-monitor This small patch corrects it, please consider adding it. Regards, - -- ,--. : /` ) ن Tanguy Ortolo | `-'Debian Developer \_ -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCgAGBQJTz7zmAAoJEOryzVHFAGgZBC4P/i7uLZ29STPqTaAds6UjTOn9 uIModwYUOp5nG/4LdVb5iPpf0lB72mIGbaDz54PkPr/UnnWBCaobJHc2o9PhRS1j 8I4YbVVovZhBYqCV3DZC4xbjZW5D2fiQUXtDFlwgsL2gC5Xrlz8fMQ2mGFG/RNh8 PCB+AR6D5mXcMkv7D59KjNJCegHWNo23H0IRQML5j/5moprkpHYRDKXZJ8I17Puy sdsCD1kQ+t6W5OHJBquDR4Itwg0UwPkZdqiRQ99JConBKRH87pbKcD+pBLIeLRl0 ADqugcVU/QA3zILUWMxUUp1ZZNNenvv5TsVnCNF9azx9pGnE/ZyXzqrSVVgJFtLy Mx2yO7+uxGMiNvow5UPLdOCW0gAl6JqnV8aAcQKV2zjxCJmF04O83avCf0xcsUjP 8pVC9S1KcT/SDckZ1pyeDkhprWUab2/50p0bh9zzsLz513h72+85omJc70wniYt7 vgOczHmofdKacp3J9w0vAoe+A05V+oAMfJqbg7G7HoHJxZrwkucWg493zEq+QKY4 P5V0jpSxyT0GTJLcX/v+2XAFGju4/CqklR6pWnLw9tw7B9n1v4waPgn9FSlSbFor g2eF+UIibpuphHOTfXfBpEsGnp5zF13SAvqTZzktuar3wW4gYzH6wWuCFa6kkbUE VTzdczq0Yl37asHQ84D0 =a7vq -END PGP SIGNATURE- Description: Correct the xorg.conf.5 manpage The xorg.conf.5 manpage mentions an incorrect "Enable" option for monitors. This patch corrects that by documenting the correct "Disable" option. Author: Tanguy Ortolo Last-Update: 2014-07-23 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: xorg-server/hw/xfree86/man/xorg.conf.man === --- xorg-server.orig/hw/xfree86/man/xorg.conf.man +++ xorg-server/hw/xfree86/man/xorg.conf.man @@ -1806,8 +1806,8 @@ This optional entry specifies that the m output (not monitor) of the given name. (RandR 1.2-supporting drivers only) .TP 7 -.BI "Option \*qEnable\*q \*q" bool \*q -This optional entry specifies whether the monitor should be turned on +.BI "Option \*qDisable\*q \*q" bool \*q +This optional entry specifies whether the monitor should be turned off at startup. By default, the server will attempt to enable all connected monitors. (RandR 1.2-supporting drivers only)
Bug#755809: xorg.conf.5 man page mentions an incorrect "Enable" option for Monitors
On Wed, Jul 23, 2014 at 15:47:23 +0200, Tanguy Ortolo wrote: > Package: xorg-server > Version: 2:1.16.0-1 > Severity: minor > Tags: patch > > Hello, > > The xorg.conf.5 man page mention an "Enable" Option for Monitors, which > does not work. The right option is in fact "Disable", as I indicated in > a blog post: > > http://tanguy.ortolo.eu/blog/article128/ck-allow-suspend-xorg-disable-monitor > > This small patch corrects it, please consider adding it. > I believe this patch is wrong. Cheers, Julien signature.asc Description: Digital signature
xserver-xorg-video-intel: Changes to 'upstream-experimental'
Makefile.am|2 NEWS | 106 + configure.ac |3 - libobj/Makefile.am |3 + libobj/ignore.c|6 ++ src/intel_module.c |6 ++ src/sna/Makefile.am|2 src/sna/sna.h | 23 + src/sna/sna_accel.c|3 - src/sna/sna_display.c | 87 +++- src/sna/sna_dri2.c | 52 ++ src/sna/sna_dri3.c |5 -- src/sna/sna_driver.c | 18 --- src/sna/sna_video_sprite.c | 15 ++ src/uxa/intel_driver.c |6 +- test/dri2-race.c |2 test/dri2-swap.c |2 test/dri2-test.c |2 test/dri3-test.c | 26 --- 19 files changed, 262 insertions(+), 107 deletions(-) New commits: commit 8d95e90b7b4bf5d6bae5443f92d77d30f4443f24 Author: Chris Wilson Date: Wed Jul 23 15:45:31 2014 +0100 2.99.914 snapshot diff --git a/NEWS b/NEWS index 72fe0bb..f5e8317 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +Snapshot 2.99.914 (2014-07-23) +== +And a brown paper bag to hide the rebuilding from the tarball with +'autoreconf -fi' error that arose from not distributing the libobj/ +directory. + + Snapshot 2.99.913 (2014-07-23) == This should be it... A few fixes from testing the new code, we should be diff --git a/configure.ac b/configure.ac index fd997fb..5c3dd20 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-intel], -[2.99.913], +[2.99.914], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-intel]) AC_CONFIG_SRCDIR([Makefile.am]) commit 57f0e65d5186412835f282af59141626e4a87a00 Author: Chris Wilson Date: Wed Jul 23 16:42:46 2014 +0100 sna/dri2: Compile fix for old xorg/dri2 We have to do conditional compilation as we touch structure members that may not exist in older Xserver headers. Signed-off-by: Chris Wilson diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c index e4f1c84..9388992 100644 --- a/src/sna/sna_dri2.c +++ b/src/sna/sna_dri2.c @@ -3253,11 +3253,13 @@ bool sna_dri2_open(struct sna *sna, ScreenPtr screen) driverNames[1] = info.driverName; #endif +#if DRI2INFOREC_VERSION >= 6 if (xorg_can_triple_buffer(sna)) { info.version = 6; info.SwapLimitValidate = sna_dri2_swap_limit_validate; info.ReuseBufferNotify = sna_dri2_reuse_buffer; } +#endif #if USE_ASYNC_SWAP info.version = 10; commit 4ed0937640b54246440421114b697f75d1b8c835 Author: Chris Wilson Date: Wed Jul 23 15:41:29 2014 +0100 Add automake magic required for libobj/ So libobj/ wasn't included in the tarball, and nor was the compatability functions being added to the driver when they were needed. The oddity is that using the ./configure script (and thus make distcheck) succeeds. It was only when 'autoreconf -fi' was run was the first error encoutered. Signed-off-by: Chris Wilson Reported-by: Tobias Klausmann diff --git a/Makefile.am b/Makefile.am index 6bb4854..418fdc9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -SUBDIRS = man xvmc src tools +SUBDIRS = man libobj xvmc src tools MAINTAINERCLEANFILES = ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 280bfc9..fd997fb 100644 --- a/configure.ac +++ b/configure.ac @@ -839,6 +839,7 @@ AC_DEFINE_DIR([LIBEXEC_PATH], libexecdir, [libexec directory]) AC_CONFIG_FILES([ Makefile man/Makefile + libobj/Makefile src/Makefile src/legacy/Makefile src/legacy/i810/Makefile diff --git a/libobj/Makefile.am b/libobj/Makefile.am new file mode 100644 index 000..92c9ac5 --- /dev/null +++ b/libobj/Makefile.am @@ -0,0 +1,3 @@ +noinst_LTLIBRARIES = libcompat.la +libcompat_la_SOURCES = ignore.c # for portability, always build something +libcompat_la_LIBADD = $(LIBOBJS) $(ALLOCA) diff --git a/libobj/ignore.c b/libobj/ignore.c new file mode 100644 index 000..3c56f2f --- /dev/null +++ b/libobj/ignore.c @@ -0,0 +1,6 @@ +extern void ignore(void); + +void ignore(void) +{ + /* libcompat.a cannot be empty therefore I exist */ +} diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am index a299ea2..7ec1c36 100644 --- a/src/sna/Makefile.am +++ b/src/sna/Makefile.am @@ -35,7 +35,7 @@ endif noinst_LTLIBRARIES = libsna.la libsna_la_LDFLAGS = -pthread -libsna_la_LIBADD = $(UDEV_LIBS) -lm $(DRM_LIBS) brw/libbrw.la fb/libfb.la +libsna_la_LIBADD = $(UDEV_LIBS) -lm $(DRM_LIBS) brw/libbrw.la fb/libfb.la ../../libobj/libcompat.la libsna_la_SOURCES = \ atomic.h \ commit dcf9ce4a
xserver-xorg-video-intel: Changes to 'refs/tags/2.99.914'
Tag '2.99.914' created by Chris Wilson at 2014-07-23 15:47 + Intel 2.99.914 snapshot Changes since 2.21.15: Adam Jackson (1): configure: Don't link the driver against libX11 Chris Wilson (1240): sna/gen7: Prefer the render ring for more operations sna/video: Disable the existing sprite when switching CRTCs sna/dri: Make async blits async again intel: Add experimental rendernode support sna: Don't copy fbcon if hosted sna: Trust the preferred-depth returned by the host sna: Don't restrict the frontbuffer to be scanout capable if hosted sna: Fix reversed logic and loss of trust in the host sna/dri: Prefer the source ring sna: Add a few more checks for a hosted Xserver before walking CRTC lists sna: Make SetScreenPixmap do as it says sna/gen7: Combine a couple of pipe-flushes sna: Make sure we assert our Master status before copying the fbcon sna: Fix ordering of assert vs the state it checks sna: Promote no COWs assertion to a condition check before operating inplace sna/video: Update sprite destination colorkey command sna/video: Copy the ClipRegion for the sprite sna/gen6+: Improve ring stickyness for BLT composite ops sna/gen6+: Don't force a ring switch for likely TLB misses if already busy sna: Allow user specification of number of VirtualHeads sna/dri: Correct the target_msc for immediate double-buffering sna: Protect against unattached pixmaps when peeking inside for a GPU bo sna: Mark fake outputs as disconnected until a user applies a mode sna: Open the device non-blocking tools: Add intel-virtual-output to extend the local desktop with remote outputs configure; Remember to disable building the tools intel-virtual-output: use XRender for format conversion if required intel-virtual-output: use depth-16 transfers for remote hosts or low bpp targets intel-virtual-output: Fix calculation of image stride to include bitmap unit sna: Expand the array of fake outputs if the last is used intel-virtual-output: Third time lucky for computing the correct stride? intel-virtual-output: Clone all outputs on the remote display intel-virtual-output: Try to hide races with gnome-shell intel-virtual-output: Manage multiple destination CRTCs intel-virtual-output: Prevent cloning the same output twice intel-virtual-output: Fix overun with the record Display connection intel-virtual-output: Register as a singleton intel-virtual-output: Rebuild pointers after realloc intel-virtual-output: Refer to the new memory block after realloc intel-virtual-output: Restore the lost POLLIN on the timerfd intel-virtual-output: Add missing whitespace, s/while(1)/while (1)/ intel-virtual-output: Probe and automatically enable sibling screens sna: Process winSize region sna: Check for output->randr_output before dereferencing intel-virtual-output: Decouple the fake mode before deleting intel-virtual-overlay: Prevent buffer overrun reading the XEvent intel-virtual-output: Fallback to Xinerama if RandR is not supported by the target intel-virtual-output: Don't forget to name the mode intel-virtual-overlay: Fix logic inversion from previous commit intel-virtual-output: Refactor the image resizing code intel-virtual-output: Reorder the fds intel-virtual-ouptput: Filter and rate-limit cursor events intel-virtual-output: Perform pixel type conversion from XfixesCursorImage intel-virtual-overlay: Fix the bumblebee query parsing intel-virtual-overlay: Don't do a sibling search if bumblebee is explicitly requested intel-virtual-overlay: Disable the timer after flushing intel-virtual-overlay: Keep bumblebeed awake intel-virtual-output: Fallback to probing GetScreenResources intel-virtual-overlay: Try to shutdown gracefully intel-virtual-output: Don't set the SHM active flag along !SHM composite paths intel-virtual-output: Remove the stray 1 intel-virtual-output: Don't clobber the XID inside the ShmSegmentInfo intel-virtual-output: Remember to mark the timer as active when moving the mouse intel-virtual-output: Clear send flags when doing XSync sna: Add some more DBG sna: Mark imported PRIME fd as starting in DOMAIN_NONE sna/dri: Handle failure to move the pixmap into the GPU for CopyRegion sna: Tidy walking the window tree for updating our pixmaps sna/dri: Refine proposed async swap interface sna: Fix sna_pixmap_move_area_to_gpu() to return the sna_pixmap configure: Check for required UMS headers before enabling sna: WriteThrough support is now upstream sna: Add XMir support intel: Select SNA as the default acceleration method 2.99.901 snapshot sna: Add a DBG to track calls to S
xserver-xorg-video-intel: Changes to 'debian-experimental'
Makefile.am|2 NEWS | 106 + configure.ac |3 - libobj/Makefile.am |3 + libobj/ignore.c|6 ++ src/intel_module.c |6 ++ src/sna/Makefile.am|2 src/sna/sna.h | 23 + src/sna/sna_accel.c|3 - src/sna/sna_display.c | 87 +++- src/sna/sna_dri2.c | 52 ++ src/sna/sna_dri3.c |5 -- src/sna/sna_driver.c | 18 --- src/sna/sna_video_sprite.c | 15 ++ src/uxa/intel_driver.c |6 +- test/dri2-race.c |2 test/dri2-swap.c |2 test/dri2-test.c |2 test/dri3-test.c | 26 --- 19 files changed, 262 insertions(+), 107 deletions(-) New commits: commit 8d95e90b7b4bf5d6bae5443f92d77d30f4443f24 Author: Chris Wilson Date: Wed Jul 23 15:45:31 2014 +0100 2.99.914 snapshot diff --git a/NEWS b/NEWS index 72fe0bb..f5e8317 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +Snapshot 2.99.914 (2014-07-23) +== +And a brown paper bag to hide the rebuilding from the tarball with +'autoreconf -fi' error that arose from not distributing the libobj/ +directory. + + Snapshot 2.99.913 (2014-07-23) == This should be it... A few fixes from testing the new code, we should be diff --git a/configure.ac b/configure.ac index fd997fb..5c3dd20 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-intel], -[2.99.913], +[2.99.914], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-intel]) AC_CONFIG_SRCDIR([Makefile.am]) commit 57f0e65d5186412835f282af59141626e4a87a00 Author: Chris Wilson Date: Wed Jul 23 16:42:46 2014 +0100 sna/dri2: Compile fix for old xorg/dri2 We have to do conditional compilation as we touch structure members that may not exist in older Xserver headers. Signed-off-by: Chris Wilson diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c index e4f1c84..9388992 100644 --- a/src/sna/sna_dri2.c +++ b/src/sna/sna_dri2.c @@ -3253,11 +3253,13 @@ bool sna_dri2_open(struct sna *sna, ScreenPtr screen) driverNames[1] = info.driverName; #endif +#if DRI2INFOREC_VERSION >= 6 if (xorg_can_triple_buffer(sna)) { info.version = 6; info.SwapLimitValidate = sna_dri2_swap_limit_validate; info.ReuseBufferNotify = sna_dri2_reuse_buffer; } +#endif #if USE_ASYNC_SWAP info.version = 10; commit 4ed0937640b54246440421114b697f75d1b8c835 Author: Chris Wilson Date: Wed Jul 23 15:41:29 2014 +0100 Add automake magic required for libobj/ So libobj/ wasn't included in the tarball, and nor was the compatability functions being added to the driver when they were needed. The oddity is that using the ./configure script (and thus make distcheck) succeeds. It was only when 'autoreconf -fi' was run was the first error encoutered. Signed-off-by: Chris Wilson Reported-by: Tobias Klausmann diff --git a/Makefile.am b/Makefile.am index 6bb4854..418fdc9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -SUBDIRS = man xvmc src tools +SUBDIRS = man libobj xvmc src tools MAINTAINERCLEANFILES = ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 280bfc9..fd997fb 100644 --- a/configure.ac +++ b/configure.ac @@ -839,6 +839,7 @@ AC_DEFINE_DIR([LIBEXEC_PATH], libexecdir, [libexec directory]) AC_CONFIG_FILES([ Makefile man/Makefile + libobj/Makefile src/Makefile src/legacy/Makefile src/legacy/i810/Makefile diff --git a/libobj/Makefile.am b/libobj/Makefile.am new file mode 100644 index 000..92c9ac5 --- /dev/null +++ b/libobj/Makefile.am @@ -0,0 +1,3 @@ +noinst_LTLIBRARIES = libcompat.la +libcompat_la_SOURCES = ignore.c # for portability, always build something +libcompat_la_LIBADD = $(LIBOBJS) $(ALLOCA) diff --git a/libobj/ignore.c b/libobj/ignore.c new file mode 100644 index 000..3c56f2f --- /dev/null +++ b/libobj/ignore.c @@ -0,0 +1,6 @@ +extern void ignore(void); + +void ignore(void) +{ + /* libcompat.a cannot be empty therefore I exist */ +} diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am index a299ea2..7ec1c36 100644 --- a/src/sna/Makefile.am +++ b/src/sna/Makefile.am @@ -35,7 +35,7 @@ endif noinst_LTLIBRARIES = libsna.la libsna_la_LDFLAGS = -pthread -libsna_la_LIBADD = $(UDEV_LIBS) -lm $(DRM_LIBS) brw/libbrw.la fb/libfb.la +libsna_la_LIBADD = $(UDEV_LIBS) -lm $(DRM_LIBS) brw/libbrw.la fb/libfb.la ../../libobj/libcompat.la libsna_la_SOURCES = \ atomic.h \ commit dcf9ce4a
xserver-xorg-video-intel: Changes to 'debian-experimental'
debian/changelog |7 debian/upstream.changelog | 2834 ++ 2 files changed, 2841 insertions(+) New commits: commit 47c91e03d5e8de962841698d1f0c772ce277f695 Author: Vincent Cheng Date: Wed Jul 23 22:56:18 2014 -0700 update upstream changelog diff --git a/debian/changelog b/debian/changelog index c9d56a1..f9e01bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-intel (2:2.99.914-1~exp1) UNRELEASED; urgency=medium * New upstream prerelease 2.99.914. + * Update upstream changelog. -- Vincent Cheng Wed, 23 Jul 2014 22:49:08 -0700 diff --git a/debian/upstream.changelog b/debian/upstream.changelog index 80bee27..6aac4d2 100644 --- a/debian/upstream.changelog +++ b/debian/upstream.changelog @@ -1,3 +1,2837 @@ +commit 8d95e90b7b4bf5d6bae5443f92d77d30f4443f24 +Author: Chris Wilson +Date: Wed Jul 23 15:45:31 2014 +0100 + +2.99.914 snapshot + +commit 57f0e65d5186412835f282af59141626e4a87a00 +Author: Chris Wilson +Date: Wed Jul 23 16:42:46 2014 +0100 + +sna/dri2: Compile fix for old xorg/dri2 + +We have to do conditional compilation as we touch structure members that +may not exist in older Xserver headers. + +Signed-off-by: Chris Wilson + +commit 4ed0937640b54246440421114b697f75d1b8c835 +Author: Chris Wilson +Date: Wed Jul 23 15:41:29 2014 +0100 + +Add automake magic required for libobj/ + +So libobj/ wasn't included in the tarball, and nor was the compatability +functions being added to the driver when they were needed. The oddity is +that using the ./configure script (and thus make distcheck) succeeds. It +was only when 'autoreconf -fi' was run was the first error encoutered. + +Signed-off-by: Chris Wilson +Reported-by: Tobias Klausmann + +commit dcf9ce4a9f16c01f58797e4f899d51e23506aa6c +Author: Chris Wilson +Date: Wed Jul 23 14:19:44 2014 + + +Fix compile failure on old Xorg with XF86_ALLOCATE_GPU_SCREEN + +Sigh, a late fix was not compile checked against xorg-1.7. + +Signed-off-by: Chris Wilson + +commit 1c5e20716f192f0c38b4edd879d28e11126f7f01 +Author: Chris Wilson +Date: Sat Jul 5 08:47:16 2014 +0100 + +2.99.913 snapshot + +commit d242965979cf251383a6230dbd65cdc1d9e231ea +Author: Chris Wilson +Date: Wed Jul 23 14:25:25 2014 +0100 + +sna: Skip performing an async flip after fixup + +After the first async failure and we fix up the CRTC, ordinary we queue +a no-op flip in order to queue the event. For async flips, we do not +want that event so just skip the flip. + +Signed-off-by: Chris Wilson + +commit 4153d4b43004cd90c0d9a7a7db399dac4d30721e +Author: Chris Wilson +Date: Wed Jul 23 13:54:19 2014 +0100 + +sna/dri2: Tidy freeing the queued frame events + +Signed-off-by: Chris Wilson + +commit f2b2b6eda009924e5ec6974bb31be9d3749c9cf8 +Author: Chris Wilson +Date: Wed Jul 23 13:45:27 2014 +0100 + +test/dri2: Use the right device node + +Use the device node as instructed by Xorg. + +Signed-off-by: Chris Wilson + +commit 65c2376730e86d7502d8c47d49386be5f51e47ba +Author: Chris Wilson +Date: Wed Jul 23 12:12:03 2014 +0100 + +sna: Add a DBG message for slave damage propagation + +Signed-off-by: Chris Wilson + +commit 95c059b330e705ecd0e575e98d8edf5707e84a05 +Author: Chris Wilson +Date: Wed Jul 23 11:01:07 2014 +0100 + +sna: Reorder disabling scanout pixmap when updating slave + +The assertion caught that we would unregister an invalid drawable on +older Xorg. + +Signed-off-by: Chris Wilson + +commit d6830190bc9956f485db6c3420f7a4a79793a693 +Author: Chris Wilson +Date: Wed Jul 23 10:53:40 2014 +0100 + +sna: Disable all outputs when initializing as a slaved output provider + +When we are constructed as a slaved device, we need to disable all +outputs or else they are not correctly hooked into the master device +upon startup. + +Signed-off-by: Chris Wilson + +commit 70868c7aa881b15b7478f7ee4543fde0268a4ba6 +Author: Chris Wilson +Date: Wed Jul 23 08:37:46 2014 +0100 + +sna/dri2: Recreate buffer in reuse rather than force recreate + +By marking the buffer->attachment as invalid we forced the recreation of +the buffer on the next DRI2GetBuffers. The only small problem with that +was that the client didn't always immediately call DRI2GetBuffers after +the invalidation - and if they did a DRI2CopyRegion with its stale +buffers the unfound attachment would generate a BadValue and kill the +client. So instead of messing around with the attachment, explicitly +recreate the buffer if we attempt to reuse a buffer of the wrong size. + +Signed-off-by: Chris Wilson + +commit aa5351dbbe0a50080efee35a3d494b3a20b7c9f6 +Author: Chris Wilson +Date: Tue Jul 22 09:40:14 2014 +0100 + +sna: Ensure errno is set after failu
xserver-xorg-video-intel: Changes to 'debian-experimental'
debian/changelog |1 + debian/xserver-xorg-video-intel.install.kfreebsd-amd64 |4 debian/xserver-xorg-video-intel.install.kfreebsd-i386 |4 3 files changed, 9 insertions(+) New commits: commit 276bf9f547f115777df6632d8af2cca214c4430a Author: Vincent Cheng Date: Wed Jul 23 22:59:02 2014 -0700 fix ftbfs on kfreebsd diff --git a/debian/changelog b/debian/changelog index f9e01bd..ead65e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-video-intel (2:2.99.914-1~exp1) UNRELEASED; urgency=medium * New upstream prerelease 2.99.914. * Update upstream changelog. + * Fix FTBFS on kfreebsd by not installing non-existent files. -- Vincent Cheng Wed, 23 Jul 2014 22:49:08 -0700 diff --git a/debian/xserver-xorg-video-intel.install.kfreebsd-amd64 b/debian/xserver-xorg-video-intel.install.kfreebsd-amd64 new file mode 100644 index 000..48c5ed0 --- /dev/null +++ b/debian/xserver-xorg-video-intel.install.kfreebsd-amd64 @@ -0,0 +1,4 @@ +usr/lib/xorg/modules/drivers/*.so +usr/lib/libI810XvMC.so* +usr/lib/libIntelXvMC.so* +usr/share/man diff --git a/debian/xserver-xorg-video-intel.install.kfreebsd-i386 b/debian/xserver-xorg-video-intel.install.kfreebsd-i386 new file mode 100644 index 000..48c5ed0 --- /dev/null +++ b/debian/xserver-xorg-video-intel.install.kfreebsd-i386 @@ -0,0 +1,4 @@ +usr/lib/xorg/modules/drivers/*.so +usr/lib/libI810XvMC.so* +usr/lib/libIntelXvMC.so* +usr/share/man -- 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/e1xac3b-qb...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'debian-experimental'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 96b93034b1fcbe5ee22c3299b30e8edc8a49b5e5 Author: Vincent Cheng Date: Wed Jul 23 22:59:25 2014 -0700 finalize changelog diff --git a/debian/changelog b/debian/changelog index ead65e5..dd8264b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-intel (2:2.99.914-1~exp1) UNRELEASED; urgency=medium +xserver-xorg-video-intel (2:2.99.914-1~exp1) experimental; urgency=medium * New upstream prerelease 2.99.914. * Update upstream changelog. -- 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/e1xac3z-00017e...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'refs/tags/xserver-xorg-video-intel-2_2.99.914-1+exp1'
Tag 'xserver-xorg-video-intel-2_2.99.914-1+exp1' created by Vincent Cheng at 2014-07-24 06:02 + Debian release 2:2.99.914-1~exp1 Changes since xserver-xorg-video-intel-2_2.99.912-git20140719-1+exp1: Chris Wilson (18): dri3-test: Print line number for shm failures sna/video: Bump the maximum size for sprites sna/dri3: Don't forget to add SHM pixmaps to the list of exported DRI3 bo sna: Assert that we do not overwrite an earlier COW entry sna: Remove %# from DBG messages sna: Ensure errno is set after failure before reporting a modeset failure sna/dri2: Recreate buffer in reuse rather than force recreate sna: Disable all outputs when initializing as a slaved output provider sna: Reorder disabling scanout pixmap when updating slave sna: Add a DBG message for slave damage propagation test/dri2: Use the right device node sna/dri2: Tidy freeing the queued frame events sna: Skip performing an async flip after fixup 2.99.913 snapshot Fix compile failure on old Xorg with XF86_ALLOCATE_GPU_SCREEN Add automake magic required for libobj/ sna/dri2: Compile fix for old xorg/dri2 2.99.914 snapshot Vincent Cheng (6): Merge tag '2.99.914' into upstream-experimental Merge branch 'upstream-experimental' into debian-experimental new upstream prerelease 2.99.914 update upstream changelog fix ftbfs on kfreebsd finalize changelog --- Makefile.am|2 NEWS | 106 configure.ac |3 debian/changelog |8 debian/upstream.changelog | 2834 + debian/xserver-xorg-video-intel.install.kfreebsd-amd64 |4 debian/xserver-xorg-video-intel.install.kfreebsd-i386 |4 libobj/Makefile.am |3 libobj/ignore.c|6 src/intel_module.c |6 src/sna/Makefile.am|2 src/sna/sna.h | 23 src/sna/sna_accel.c|3 src/sna/sna_display.c | 87 src/sna/sna_dri2.c | 52 src/sna/sna_dri3.c |5 src/sna/sna_driver.c | 18 src/sna/sna_video_sprite.c | 15 src/uxa/intel_driver.c |6 test/dri2-race.c |2 test/dri2-swap.c |2 test/dri2-test.c |2 test/dri3-test.c | 26 23 files changed, 3112 insertions(+), 107 deletions(-) --- -- 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/e1xac74-0002ag...@moszumanska.debian.org
Processing of xserver-xorg-video-intel_2.99.914-1~exp1_amd64.changes
xserver-xorg-video-intel_2.99.914-1~exp1_amd64.changes uploaded successfully to localhost along with the files: xserver-xorg-video-intel_2.99.914-1~exp1_amd64.deb xserver-xorg-video-intel-dbg_2.99.914-1~exp1_amd64.deb xserver-xorg-video-intel_2.99.914-1~exp1.dsc xserver-xorg-video-intel_2.99.914.orig.tar.gz xserver-xorg-video-intel_2.99.914-1~exp1.debian.tar.xz Greetings, Your Debian queue daemon (running on host franck.debian.org) -- 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/e1xacer-0007q4...@franck.debian.org
xserver-xorg-video-intel_2.99.914-1~exp1_amd64.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Format: 1.8 Date: Wed, 23 Jul 2014 22:49:08 -0700 Source: xserver-xorg-video-intel Binary: xserver-xorg-video-intel xserver-xorg-video-intel-dbg Architecture: source amd64 Version: 2:2.99.914-1~exp1 Distribution: experimental Urgency: medium Maintainer: Debian X Strike Force Changed-By: Vincent Cheng Description: xserver-xorg-video-intel - X.Org X server -- Intel i8xx, i9xx display driver xserver-xorg-video-intel-dbg - X.Org X server -- Intel i8xx, i9xx display driver (debug symbols) Changes: xserver-xorg-video-intel (2:2.99.914-1~exp1) experimental; urgency=medium . * New upstream prerelease 2.99.914. * Update upstream changelog. * Fix FTBFS on kfreebsd by not installing non-existent files. Checksums-Sha1: cf81a9698d307f0fc1da85151bc770e29237503b 3117 xserver-xorg-video-intel_2.99.914-1~exp1.dsc e74591cad6968026e741e558fc51504bf61f62b8 2931049 xserver-xorg-video-intel_2.99.914.orig.tar.gz 5f88b969d7ec1150d56e27e22a223d6aa14e6b2d 690116 xserver-xorg-video-intel_2.99.914-1~exp1.debian.tar.xz a0c78753c1035c02f2d562478169306ac6e8c704 1572228 xserver-xorg-video-intel_2.99.914-1~exp1_amd64.deb b95cbb4d3dd6addfdbbdb815b760375f364f6f1c 2738028 xserver-xorg-video-intel-dbg_2.99.914-1~exp1_amd64.deb Checksums-Sha256: e3ffbab4b672556a0c720264447a2f6d4a5bd56149d7d86c8b363c617249873f 3117 xserver-xorg-video-intel_2.99.914-1~exp1.dsc 6c26e2d5bf440ef0028aae4e00a5432f9c88f4eb61eeadb7a169cbe909b9e81b 2931049 xserver-xorg-video-intel_2.99.914.orig.tar.gz bc6d1db12d55c9e7c3c39b0a2f793782120a1c7980936c6bdea28427fce5dc89 690116 xserver-xorg-video-intel_2.99.914-1~exp1.debian.tar.xz 33e86e9a7e117cd58acb8d893bc5f6343ca04dc41873659c223d998c7be7514d 1572228 xserver-xorg-video-intel_2.99.914-1~exp1_amd64.deb 2f2092993402df86f0ea309f9abc0cbd059b9bb7237300f117ebfd052fa41e13 2738028 xserver-xorg-video-intel-dbg_2.99.914-1~exp1_amd64.deb Files: 95775cc693af29e5f4d02ac706e43de3 1572228 x11 optional xserver-xorg-video-intel_2.99.914-1~exp1_amd64.deb 8000449782c32a7b4a611dd5b1ef1a35 2738028 debug extra xserver-xorg-video-intel-dbg_2.99.914-1~exp1_amd64.deb 22737bd4a7612a2cafc0cd166e34aae8 3117 x11 optional xserver-xorg-video-intel_2.99.914-1~exp1.dsc 1298bfa698fe60583a2b410473d24df9 2931049 x11 optional xserver-xorg-video-intel_2.99.914.orig.tar.gz f6d5c7c23b30aeb5ee8d4d438c5c3481 690116 x11 optional xserver-xorg-video-intel_2.99.914-1~exp1.debian.tar.xz -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCAAGBQJT0KI4AAoJEI7tzBuqHzL/KoMQANtL3L/2S5XtWfJ44FUu/kRp U12rOWWoKokIKQL1wFkrflZ/GAVQorMSliuBtcMYDC/AEEvF+JoO3JEaF7JXG5Nn Hp0WWgQ9+hPK8mUp7zrexDNiDodO7e9KTaE0c+lyesNN69x0n4cJHB0WJ8/gxUgx kgKzlC7/Tvtw5HQ1TVMy4k8FdJd+qva01hD5Q/GRT5uA+k/7w79ca3GEwPqdx8mr tePiWpY1zx5vJVyh8COiGyAe2K1/w+GuBQqQCaNIJiKubz5twDGKDIG/aQUFmsWd jrad2ud3B5bscmD+kbowX5PfPKiYz7MvzD6cFBT7l6PTjko9Wi3ljtV66ffjg0xg 7X6SdbbLBACp0nP70/tbLjunmnIWa6iAP8F82/Z1EeljeOq8QchdYqZpADWXlKSs WUd9AAbX63SuPj5HG6pVFyYCzMRTJvMJQqvQwiSEsNGPMu1jQip89l3wDBQMOuML 96OtIrEbL6YOGsxLqHBxmgQHxoa+lYVUymV7k2A3tbGQ7ZvBBdHaF5Ab63+Tls7I Pysa+LRKIEEFsqOYBM8ZaYpn3fOPdP3GRk82chIVI4EfZ4NRAl0WCTS+xf5Z/WU3 gXCSO2NVAbFCU3fZwoI6HhIq1l88ltEMgr5uQcJbZ7DOHKe4weDD8oYOAmyXiteI yKVQkDvsp6ovKYLFvK7B =lcdu -END PGP SIGNATURE- Thank you for your contribution to Debian. -- 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/e1xacmp-0008rc...@franck.debian.org