Bug#748203: file conflicts when building with patches
Hello! The xorg-setuid-wrapper.patch installs usr/bin/X in xserver-xorg-core package, but this file is already shipped by xserver-xorg package apparently. dpkg: error processing archive /var/cache/pbuilder/result/xserver-xorg-core_1.16.1.901-1.1_amd64.deb (--install): trying to overwrite '/usr/bin/X', which is also in package xserver-xorg 1:7.7+7 This is just a friendly reminder to not forget about Conflicts/Replaces once this is ready to go Regards, Andreas Henriksson -- 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/20141212214811.ga2...@fatal.se
Processed: found debian bug related to previous message.
Processing commands for cont...@bugs.debian.org: > block 742808 by 761608 Bug #742808 [xserver-xorg-core] Please allow the X server to run as a non-root user 742808 was blocked by: 748203 742808 was not blocking any bugs. Added blocking bug(s) of 742808: 761608 > thanks Stopping processing here. Please contact me if you need assistance. -- 742808: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=742808 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- 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/handler.s.c.141842056228823.transcr...@bugs.debian.org
Bug#742808: FTR, remaining work for non-root xserver
Hello! I asked on IRC about remaining work and I'm posting this here for the record. 21:47 < bigon> https://bugs.freedesktop.org/show_bug.cgi?id=83849 21:48 < bigon> and then we probably need to move the debconf question that generates Xwrapper.config from the current package to the xserver one to be correct (On top of the patches already posted in the bug report set as a blocker for this one I guess.) Regards, Andreas Henriksson -- 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/20141212211603.ga1...@fatal.se
xorg-server_1.12.4-6+deb7u3_amd64.changes ACCEPTED into proposed-updates->stable-new, proposed-updates
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Tue, 09 Dec 2014 04:41:14 +0100 Source: xorg-server Binary: xserver-xorg-core xserver-xorg-core-udeb xserver-xorg-dev xdmx xdmx-tools xnest xvfb xserver-xephyr xserver-xfbdev xserver-xorg-core-dbg xserver-common Architecture: source all amd64 Version: 2:1.12.4-6+deb7u3 Distribution: wheezy-security Urgency: high Maintainer: Debian X Strike Force Changed-By: Salvatore Bonaccorso Description: xdmx - distributed multihead X server xdmx-tools - Distributed Multihead X tools xnest - Nested X server xserver-common - common files used by various X servers xserver-xephyr - nested X server xserver-xfbdev - Linux framebuffer device tiny X server xserver-xorg-core - Xorg X server - core server xserver-xorg-core-dbg - Xorg - the X.Org X server (debugging symbols) xserver-xorg-core-udeb - Xorg X server - core server (udeb) xserver-xorg-dev - Xorg X server - development files xvfb - Virtual Framebuffer 'fake' X server Changes: xorg-server (2:1.12.4-6+deb7u3) wheezy-security; urgency=high . * Multiple new security issues, backports by Julien and myself Checksums-Sha1: 5285cc4c947818d2726d4ed7b51d36452cf2e579 4153 xorg-server_1.12.4-6+deb7u3.dsc ef0700f783ef96647b99909d81ad5fdcc58bb6e2 112384 xorg-server_1.12.4-6+deb7u3.diff.gz 474bbf4be18438cd73b244dd07ae99cc29488286 1396494 xserver-common_1.12.4-6+deb7u3_all.deb fba8c2bd2abdb883a8cff3ca5b8b4d461b389609 1765210 xserver-xorg-core_1.12.4-6+deb7u3_amd64.deb 4a31de9eb8e87319e86a9155bc94d3d11161e2d7 867622 xserver-xorg-core-udeb_1.12.4-6+deb7u3_amd64.udeb 733f4645a8c8d899a67673af4aebbce711eaa338 316084 xserver-xorg-dev_1.12.4-6+deb7u3_amd64.deb 48175cea622251645c3318502e61e5ceab53ba84 924072 xdmx_1.12.4-6+deb7u3_amd64.deb 591b095400768ce0629d4d0814d38f5b1185347a 127266 xdmx-tools_1.12.4-6+deb7u3_amd64.deb 0ae8db5d99d0a740ee8a0a3702235e4b7a7b0cba 823360 xnest_1.12.4-6+deb7u3_amd64.deb 99a7c8df9d6d3a6c4ee4902fca9d44691800a05f 927362 xvfb_1.12.4-6+deb7u3_amd64.deb b74665c212861026d833e5b722b022318f15b527 1018292 xserver-xephyr_1.12.4-6+deb7u3_amd64.deb e83b4a9306189158f357d40a20c684c1aa635858 941574 xserver-xfbdev_1.12.4-6+deb7u3_amd64.deb 5aa0c37050c19ea0e28b4fae1899dbf3f553574e 7295828 xserver-xorg-core-dbg_1.12.4-6+deb7u3_amd64.deb Checksums-Sha256: ca4a8e3a51e7b277c35e3ccc17cfa1d92b2c2759012f2323958534a37a48cd30 4153 xorg-server_1.12.4-6+deb7u3.dsc 6d5817f01334050a90efc84e9ab945b1ab805e1532fe123af9c5987991c534d9 112384 xorg-server_1.12.4-6+deb7u3.diff.gz f5d00e7a1bf258ec9c156c11e946c84d9aac1b62d4aac7047b9cb0a97a8cfa55 1396494 xserver-common_1.12.4-6+deb7u3_all.deb 38a65b66f5c417ac384e22405babf64442d900ce031a18648c83298bcf4ea0e1 1765210 xserver-xorg-core_1.12.4-6+deb7u3_amd64.deb 83cb41ebf29b340469d4e94a7ee739b60b8d2ab216c08f487ae5d49f96df1d16 867622 xserver-xorg-core-udeb_1.12.4-6+deb7u3_amd64.udeb ff0156e8cc9f72b941a88f92f067290269ca5e8e5d61e8d107e4f93254e0efee 316084 xserver-xorg-dev_1.12.4-6+deb7u3_amd64.deb ed2ea987cbaf3092706b821dd264ae68fa60216200df8946af60bac7495e654b 924072 xdmx_1.12.4-6+deb7u3_amd64.deb d92a18a76bdef950d24092a4a2ea1f9484d09737d7703693d3301eed345a7a3c 127266 xdmx-tools_1.12.4-6+deb7u3_amd64.deb ad7d439315ac28e12547c3fb2d1b3c0089273820d8ae9c754a8f460761f7596d 823360 xnest_1.12.4-6+deb7u3_amd64.deb 98ae5a778081641a69007bee4671ca80f11287c800ae6150b6d47eaeb690570a 927362 xvfb_1.12.4-6+deb7u3_amd64.deb cbcbaa2c8799011a3d09a49da5eaa91eb3e8fa26ac3dd05b6543511e123f6a09 1018292 xserver-xephyr_1.12.4-6+deb7u3_amd64.deb 48c3c575856c31e0ed07c26ffac43035fda78c8a5fa82eea676c03462b2d7824 941574 xserver-xfbdev_1.12.4-6+deb7u3_amd64.deb 0c313647e1dd8cc4a36ca399303d63a1a519ca29ba44024c3fb4653a9f30bfb7 7295828 xserver-xorg-core-dbg_1.12.4-6+deb7u3_amd64.deb Files: d4d68e9164ff7d3031a9b05a1b14ad82 4153 x11 optional xorg-server_1.12.4-6+deb7u3.dsc c2d5869ae08ea726cd35b888fa4c40cd 112384 x11 optional xorg-server_1.12.4-6+deb7u3.diff.gz f53276dcc1efc56afe67b41143685485 1396494 x11 optional xserver-common_1.12.4-6+deb7u3_all.deb aa119a343806c72c4dd43b1b389bae72 1765210 x11 optional xserver-xorg-core_1.12.4-6+deb7u3_amd64.deb 7fe63cedece15ed551ef0bd56ff626de 867622 debian-installer optional xserver-xorg-core-udeb_1.12.4-6+deb7u3_amd64.udeb bfe9e46fbaf4feb2149f28a9b53eef4f 316084 x11 optional xserver-xorg-dev_1.12.4-6+deb7u3_amd64.deb d5ea4feed500edfe1b09283a2d786cdb 924072 x11 optional xdmx_1.12.4-6+deb7u3_amd64.deb 0243403b58328d9a4549b60044a372c7 127266 x11 optional xdmx-tools_1.12.4-6+deb7u3_amd64.deb ceb654624d112a8af2fb30c0b27edc41 823360 x11 optional xnest_1.12.4-6+deb7u3_amd64.deb 1fd750f19847c93270e15ac48c02b88a 927362 x11 optional xvfb_1.12.4-6+deb7u3_amd64.deb e16a8dcb1720d8987d18657c76893940 1018292 x11 optional xserver-xephyr_1.12.4-6+deb7u3_amd64.deb 153de2eea5ef21f74484e4a7585fc247 941574 x11 optional xserver-xfbdev_1.12.4-6+deb7u3_amd64.deb ae64ae0f509d9c9d80bab343925a
xorg-server_1.12.4-6+deb7u5_amd64.changes ACCEPTED into proposed-updates->stable-new, proposed-updates
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Format: 1.8 Date: Tue, 09 Dec 2014 21:09:51 + Source: xorg-server Binary: xserver-xorg-core xserver-xorg-core-udeb xserver-xorg-dev xdmx xdmx-tools xnest xvfb xserver-xephyr xserver-xfbdev xserver-xorg-core-dbg xserver-common Architecture: source all amd64 Version: 2:1.12.4-6+deb7u5 Distribution: wheezy-security Urgency: low Maintainer: Debian X Strike Force Changed-By: Moritz Muehlenhoff Description: xdmx - distributed multihead X server xdmx-tools - Distributed Multihead X tools xnest - Nested X server xserver-common - common files used by various X servers xserver-xephyr - nested X server xserver-xfbdev - Linux framebuffer device tiny X server xserver-xorg-core - Xorg X server - core server xserver-xorg-core-dbg - Xorg - the X.Org X server (debugging symbols) xserver-xorg-core-udeb - Xorg X server - core server (udeb) xserver-xorg-dev - Xorg X server - development files xvfb - Virtual Framebuffer 'fake' X server Changes: xorg-server (2:1.12.4-6+deb7u5) wheezy-security; urgency=low . * Two followup patches by Keith Packard Checksums-Sha1: 473202ea9ea3b4e38ae65c8b7649dc64a7e55a39 4134 xorg-server_1.12.4-6+deb7u5.dsc dff2167df9f7dfc6561d06a33a991cd0ea1981e0 111680 xorg-server_1.12.4-6+deb7u5.diff.gz 60cc0d21003248d2bc1cad75f4b61783245edc16 1397094 xserver-common_1.12.4-6+deb7u5_all.deb 8edd3af972c7dfcbc6c764581ee360bf47fbd5d7 1766192 xserver-xorg-core_1.12.4-6+deb7u5_amd64.deb 7604320ae300e87fd0ae6b309cddb577bfc318bc 868324 xserver-xorg-core-udeb_1.12.4-6+deb7u5_amd64.udeb 69fb76ae064609b223dbb0abfd37f201ea496c38 318012 xserver-xorg-dev_1.12.4-6+deb7u5_amd64.deb 68237c046e058cbc6d0e35e5909a122ab4c8e9a5 923712 xdmx_1.12.4-6+deb7u5_amd64.deb dac90a0ce42edc556b1db6cb99d9fe986feaf680 127946 xdmx-tools_1.12.4-6+deb7u5_amd64.deb a766045c057953bd789c6fc3eb2f144fc12af211 823324 xnest_1.12.4-6+deb7u5_amd64.deb 256a0ddef05d53a3d3a70ecef62e2b8cfac75012 927588 xvfb_1.12.4-6+deb7u5_amd64.deb 447d66f4c9f547da41a252e22208d2a8512c5358 1019524 xserver-xephyr_1.12.4-6+deb7u5_amd64.deb 94f6444837e3dae6d52add89b1bdca169a233b3c 941238 xserver-xfbdev_1.12.4-6+deb7u5_amd64.deb 49f6372b99c0faa98c5e40e78bdec89e890187c6 7297918 xserver-xorg-core-dbg_1.12.4-6+deb7u5_amd64.deb Checksums-Sha256: e3ad83f631f751eda5bde2f4bdb70ae8df3685b0a2a345e992587fba27f1c535 4134 xorg-server_1.12.4-6+deb7u5.dsc 2e80809dd354816b1afafc3bf53e947b1152aa4ea40827978a5845dee3635998 111680 xorg-server_1.12.4-6+deb7u5.diff.gz 609c7ae6dcc102be00d96302680b52773c756367fee6cf691c2311ba66a8a921 1397094 xserver-common_1.12.4-6+deb7u5_all.deb e93b84e6250b8e13d4df618ba8ff182b41976aecf436b9520454bb8f682828b3 1766192 xserver-xorg-core_1.12.4-6+deb7u5_amd64.deb 41433c9190e58b8ec823b1047ba09729ba5ce5b46eeeb8d8d24f4af2928124d3 868324 xserver-xorg-core-udeb_1.12.4-6+deb7u5_amd64.udeb 87f7f9b3d7aa4d43fa77c2e619a1599f650545969bd4cfc9cbef110f8136da18 318012 xserver-xorg-dev_1.12.4-6+deb7u5_amd64.deb 74a14f3151618a0690f6830a2c853e8db642e4f7e07ce1d71e3bded5c6a4e77c 923712 xdmx_1.12.4-6+deb7u5_amd64.deb 2d8f1da0b2e8d255a9b5aa362d47bd7c68eeb8832fa3603d4ad0bb88d7ecf3f7 127946 xdmx-tools_1.12.4-6+deb7u5_amd64.deb 0df46772b11ab63b056e8cdc226ecff76a86853d4ed29bb1850bd5c9ba494361 823324 xnest_1.12.4-6+deb7u5_amd64.deb 14b98bbb56264b562877aca2fd040437820a2bd51655ddcbe19dd9eb5099259c 927588 xvfb_1.12.4-6+deb7u5_amd64.deb da2e2e4cda960a407e02eed4c4458a1532cf97d4fe71c73b6303a0e7b07f447e 1019524 xserver-xephyr_1.12.4-6+deb7u5_amd64.deb 6d27520b9d9770f4fcbca79266cfd718caf706595a9d45ff3be83ee46fe81060 941238 xserver-xfbdev_1.12.4-6+deb7u5_amd64.deb 67f4cd1b2dbe259b71c1c7e13d04012fc5fce3bfa34c672b09fd5250bb1e7732 7297918 xserver-xorg-core-dbg_1.12.4-6+deb7u5_amd64.deb Files: a739d0df1190c573d2faef39c30641fb 4134 x11 optional xorg-server_1.12.4-6+deb7u5.dsc 708d526e1c96e21f64090343fadbf538 111680 x11 optional xorg-server_1.12.4-6+deb7u5.diff.gz aaf7f18b99b75fa9be85c94f5e789c23 1397094 x11 optional xserver-common_1.12.4-6+deb7u5_all.deb 659e5f7d99a98a1b36d8c1d44ca93807 1766192 x11 optional xserver-xorg-core_1.12.4-6+deb7u5_amd64.deb 5d096a274594016efecfbd92c99bdcb5 868324 debian-installer optional xserver-xorg-core-udeb_1.12.4-6+deb7u5_amd64.udeb bb1b59af47d8d2e66063f02cf3b2b2da 318012 x11 optional xserver-xorg-dev_1.12.4-6+deb7u5_amd64.deb 95d8d3f5c8ac7fccc7d7bdda5c81c398 923712 x11 optional xdmx_1.12.4-6+deb7u5_amd64.deb 9829ec7e83f142a4383b9c7dbbe0ba1a 127946 x11 optional xdmx-tools_1.12.4-6+deb7u5_amd64.deb 3c97e40b5f9616694f542364ef0982e9 823324 x11 optional xnest_1.12.4-6+deb7u5_amd64.deb ecf6c71941b0579c7e5808ed2dcd9d26 927588 x11 optional xvfb_1.12.4-6+deb7u5_amd64.deb 83eed3b0c660c6a086ab7ba123ec66f2 1019524 x11 optional xserver-xephyr_1.12.4-6+deb7u5_amd64.deb af287a3277185a12ae44bb2cc58d7551 941238 x11 optional xserver-xfbdev_1.12.4-6+deb7u5_amd64.deb 64860720ff996ca3afb718fc4aa3ab8d 7297918 debug extra xse
xorg-server_1.12.4-6+deb7u4_amd64.changes ACCEPTED into proposed-updates->stable-new, proposed-updates
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Tue, 09 Dec 2014 09:52:20 +0100 Source: xorg-server Binary: xserver-xorg-core xserver-xorg-core-udeb xserver-xorg-dev xdmx xdmx-tools xnest xvfb xserver-xephyr xserver-xfbdev xserver-xorg-core-dbg xserver-common Architecture: source all amd64 Version: 2:1.12.4-6+deb7u4 Distribution: wheezy-security Urgency: high Maintainer: Debian X Strike Force Changed-By: Salvatore Bonaccorso Description: xdmx - distributed multihead X server xdmx-tools - Distributed Multihead X tools xnest - Nested X server xserver-common - common files used by various X servers xserver-xephyr - nested X server xserver-xfbdev - Linux framebuffer device tiny X server xserver-xorg-core - Xorg X server - core server xserver-xorg-core-dbg - Xorg - the X.Org X server (debugging symbols) xserver-xorg-core-udeb - Xorg X server - core server (udeb) xserver-xorg-dev - Xorg X server - development files xvfb - Virtual Framebuffer 'fake' X server Changes: xorg-server (2:1.12.4-6+deb7u4) wheezy-security; urgency=high . * Non-maintainer upload by the Security Team. * Fix encoding of debian/changelog to UTF-8. Checksums-Sha1: 184414a4f411f53b21aaa7c9c8acacfb898c32b3 4153 xorg-server_1.12.4-6+deb7u4.dsc e37209a280fb468eb8aa41bfff8140635442095a 112340 xorg-server_1.12.4-6+deb7u4.diff.gz 9fa0e154d7c1e690ba2e7db95ac540c4a7cc05b0 1396602 xserver-common_1.12.4-6+deb7u4_all.deb a7a4c2e7af0c8b4f3278cfa0d6fcd34af1446cc5 1765328 xserver-xorg-core_1.12.4-6+deb7u4_amd64.deb fe9fbf930791b93402faeb19a071b274c1da7873 868392 xserver-xorg-core-udeb_1.12.4-6+deb7u4_amd64.udeb bded867cb350415febd42b8206da236be6386407 316104 xserver-xorg-dev_1.12.4-6+deb7u4_amd64.deb 8eb652807198da7f3c938c0fb8c1857590e0daf9 924168 xdmx_1.12.4-6+deb7u4_amd64.deb b78d93447b03ae428270941ce73b2f1df3ef4326 127348 xdmx-tools_1.12.4-6+deb7u4_amd64.deb 5d3aee8b1a1685034b6c88a9a2b871a34056917a 823446 xnest_1.12.4-6+deb7u4_amd64.deb 5ac0f80c824b0620e31e92a3e00c4bd63b286660 927438 xvfb_1.12.4-6+deb7u4_amd64.deb 050ef01d45492bf264707bc265b033af6d20b329 1018364 xserver-xephyr_1.12.4-6+deb7u4_amd64.deb 91ea66c42eb715280285879543b5303fd7b66af3 941668 xserver-xfbdev_1.12.4-6+deb7u4_amd64.deb c7a39dc2a138c0321f33e32903b9983033a301d9 7296236 xserver-xorg-core-dbg_1.12.4-6+deb7u4_amd64.deb Checksums-Sha256: c39bdd195a9492ec9bf9a6846427fb765dada16983c43c36f3106c9d89eae18f 4153 xorg-server_1.12.4-6+deb7u4.dsc 8851637962e259d71178a7d998781d84d603181bbf5d118beb497ececea6f0a5 112340 xorg-server_1.12.4-6+deb7u4.diff.gz a45f0c5732310eda202ee1b3bc5aead7a5f033d25cd35dc4a565f96e329cbfa7 1396602 xserver-common_1.12.4-6+deb7u4_all.deb 4c3a0ed09dd9322854750220633723e0b0dbcb316301758bffb5fdd644b552f3 1765328 xserver-xorg-core_1.12.4-6+deb7u4_amd64.deb 3d73df3312f566e0e1b299ca04e68b660f5b4560aedf1c26d4b8a09f1d6db567 868392 xserver-xorg-core-udeb_1.12.4-6+deb7u4_amd64.udeb b273c23a1b49f2219a47c1f2425c895af43c1080e6647be593266c00eb3f973a 316104 xserver-xorg-dev_1.12.4-6+deb7u4_amd64.deb 0cc2ddffb37b0596c8abaff165ae2b25b533e19bcf8fc07f148e041008386598 924168 xdmx_1.12.4-6+deb7u4_amd64.deb bfa8606ed2c46d3988918ee9ecf5005556e67a38266bf582f8ce0d5455ac5510 127348 xdmx-tools_1.12.4-6+deb7u4_amd64.deb 846751d3b06e760763716d038c9faf114ea0a22d1592f41beae60b48295c1039 823446 xnest_1.12.4-6+deb7u4_amd64.deb 1a1564ad6e404496f682869edcecfe77d966a0bfd01027185ff5d818f53556d3 927438 xvfb_1.12.4-6+deb7u4_amd64.deb 881f574e879d6d40606d6ddc209060cb3ad0e0199dc5454276aac6bc2f98bf20 1018364 xserver-xephyr_1.12.4-6+deb7u4_amd64.deb 1d0b7740dfe48894dcc51ae1198bf28f71e3b9e86d33f848fc36b453d323c3d9 941668 xserver-xfbdev_1.12.4-6+deb7u4_amd64.deb 8609915e739c23185204f422b3cc03e5618222865039eaae63c82423e30a7486 7296236 xserver-xorg-core-dbg_1.12.4-6+deb7u4_amd64.deb Files: 6b677acf6c85de2e92e536438084787a 4153 x11 optional xorg-server_1.12.4-6+deb7u4.dsc f874488964c47d789d3e4271b179966e 112340 x11 optional xorg-server_1.12.4-6+deb7u4.diff.gz d3c4285e81471ec3944eeed62d0220c4 1396602 x11 optional xserver-common_1.12.4-6+deb7u4_all.deb 2fe8510b024a2a9495c678ef88a9e58b 1765328 x11 optional xserver-xorg-core_1.12.4-6+deb7u4_amd64.deb 9b56c2cce6af6da2332c52d7892d94ce 868392 debian-installer optional xserver-xorg-core-udeb_1.12.4-6+deb7u4_amd64.udeb 5106722bfe435b55b81d804b95d72ce1 316104 x11 optional xserver-xorg-dev_1.12.4-6+deb7u4_amd64.deb 96011d13b15682a50042ab98d2132c1c 924168 x11 optional xdmx_1.12.4-6+deb7u4_amd64.deb 68bc8ebc5961d3aea9c002e5d4260b0e 127348 x11 optional xdmx-tools_1.12.4-6+deb7u4_amd64.deb 1b8f877bb54a39dabbb5073efe37a5bd 823446 x11 optional xnest_1.12.4-6+deb7u4_amd64.deb e0620c80af80ab0d4372072839157a66 927438 x11 optional xvfb_1.12.4-6+deb7u4_amd64.deb acd9219c09f36051be4745469272bbc8 1018364 x11 optional xserver-xephyr_1.12.4-6+deb7u4_amd64.deb bbeb30d69caf221487e731be7821d00a 941668 x11 optional xserver-xfbdev_1.12.4-6+deb7u4_amd64.de
xserver-xorg-video-intel: Changes to 'ubuntu-trusty'
debian/changelog |8 -
debian/patches/series|1
debian/patches/sna-fix-gen8-blt.diff | 51 +++
3 files changed, 58 insertions(+), 2 deletions(-)
New commits:
commit de69fc8c50cd0981713aec3bbafb78deabfdd4a2
Author: Timo Aaltonen
Date: Fri Dec 12 11:10:25 2014 +0200
release to trusty
diff --git a/debian/changelog b/debian/changelog
index b3c5d88..5121f03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) trusty-proposed;
urgency=medium
* sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788)
commit 1b2ea030df615244b0041c42cda65597e1f35b7c
Author: Timo Aaltonen
Date: Fri Dec 12 11:08:22 2014 +0200
sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788)
diff --git a/debian/changelog b/debian/changelog
index 74b824f..b3c5d88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) UNRELEASED; urgency=medium
+
+ * sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788)
+
+ -- Timo Aaltonen Fri, 12 Dec 2014 11:06:26 +0200
+
xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) trusty-proposed;
urgency=medium
[ Maarten Lankhorst ]
diff --git a/debian/patches/series b/debian/patches/series
index fd5e9b5..98e9055 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ fix-no-backlight.diff
09-reduce-reflections-onto-rotations.diff
10-handle-rotated-slaves.diff
sna-use-vmask-in-3dstate-ps.diff
+sna-fix-gen8-blt.diff
diff --git a/debian/patches/sna-fix-gen8-blt.diff
b/debian/patches/sna-fix-gen8-blt.diff
new file mode 100644
index 000..2ec721d
--- /dev/null
+++ b/debian/patches/sna-fix-gen8-blt.diff
@@ -0,0 +1,51 @@
+commit 3a22b6f6d55a5b1e0a1c0a3d597996268ed439ad
+Author: Mika Kuoppala
+Date: Wed Nov 19 15:10:05 2014 +0200
+
+sna: gen8 BLT broken when address has bit 4 set
+
+With bit 4 set in address, the gen8 blitter fails and blits errorneously
+into the cacheline preceeding the destination and similarly when reading
from
+the source, corrupting memory.
+
+v2: Update the destination base offset pattern as revealed
+by igt/tests/gem_userptr_blits/destination-bo-align
+
+v3: Check base address as well
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79053
+Cc: Chris Wilson
+Tested-by: xunx.f...@intel.com [v2]
+Signed-off-by: Mika Kuoppala
+
+diff --git a/src/sna/kgem.h b/src/sna/kgem.h
+index 6adae3b..3275b4f 100644
+--- a/src/sna/kgem.h
b/src/sna/kgem.h
+@@ -551,6 +551,13 @@ static inline bool kgem_bo_blt_pitch_is_ok(struct kgem
*kgem,
+ struct kgem_bo *bo)
+ {
+ int pitch = bo->pitch;
++
++ if (kgem->gen >= 0100 && pitch & (1 << 4)) { /* bdw is broken */
++ DBG(("%s: can not blt to handle=%d, pitch=%d\n",
++ __FUNCTION__, bo->handle, pitch));
++ return false;
++ }
++
+ if (kgem->gen >= 040 && bo->tiling)
+ pitch /= 4;
+ if (pitch > MAXSHORT) {
+@@ -573,6 +580,12 @@ static inline bool kgem_bo_can_blt(struct kgem *kgem,
+ return false;
+ }
+
++ if (kgem->gen >= 0100 && bo->proxy && bo->delta & (1 << 4)) {
++ DBG(("%s: can not blt to handle=%d, delta=%d\n",
++ __FUNCTION__, bo->handle, bo->delta));
++ return false;
++ }
++
+ return kgem_bo_blt_pitch_is_ok(kgem, bo);
+ }
+
commit 9e8190b2386a3054c6396b6df9ae9e010e3e57e4
Author: Timo Aaltonen
Date: Thu Nov 6 23:38:09 2014 +0200
fix changelog again, disable-outputs-when-slaved.patch was added in 1.2...
diff --git a/debian/changelog b/debian/changelog
index 2020080..74b824f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) trusty-proposed;
urgency=medium
[ Maarten Lankhorst ]
- * Prevent crash when using SNA with fglrx.
-- disable-outputs-when-slaved.patch
* Backport support for rotation with SNA. (LP: #1386620)
[ Timo Aaltonen ]
--
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/e1xzmju-hi...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu-utopic'
debian/changelog |8 +
debian/patches/disable-dri3.diff | 30
debian/patches/series|2 +
debian/patches/sna-fix-gen8-blt.diff | 51 +++
4 files changed, 91 insertions(+)
New commits:
commit 7ed9494b2649bd24e93e7adc91040bd7f2fe2737
Author: Timo Aaltonen
Date: Fri Dec 12 11:14:33 2014 +0200
release to utopic
diff --git a/debian/changelog b/debian/changelog
index 804a8d1..ba34487 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) UNRELEASED;
urgency=medium
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) utopic-proposed;
urgency=medium
* Added patches:
- disable-dri3.diff: Disable DRI3. (LP: #1401784)
commit f1c06d9451a765980f8a8b65c8acbca5fdf67fcd
Author: Timo Aaltonen
Date: Fri Dec 12 11:02:16 2014 +0200
added patches
diff --git a/debian/changelog b/debian/changelog
index e89c63b..804a8d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) UNRELEASED;
urgency=medium
+
+ * Added patches:
+- disable-dri3.diff: Disable DRI3. (LP: #1401784)
+- sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788)
+
+ -- Timo Aaltonen Fri, 12 Dec 2014 10:53:54 +0200
+
xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.1) utopic-proposed;
urgency=medium
* sna-use-vmask-in-3dstate-ps.diff: Fix GPU hang on BDW with xvideo.
diff --git a/debian/patches/disable-dri3.diff b/debian/patches/disable-dri3.diff
new file mode 100644
index 000..ed0ff3f
--- /dev/null
+++ b/debian/patches/disable-dri3.diff
@@ -0,0 +1,30 @@
+commit b6eeb7a1f7efa591504070b606be655e27e6e9c2
+Author: Chris Wilson
+Date: Wed Nov 5 13:03:41 2014 +
+
+Disable DRI3 by default
+
+The external libraries, both in git, and especially shipping already
+enabled in distributions, are buggy and lead to server crashes and
+lockups. Caveat emptor.
+
+Signed-off-by: Chris Wilson
+
+diff --git a/configure.ac b/configure.ac
+index 328b4e9..cbfc472 100644
+--- a/configure.ac
b/configure.ac
+@@ -339,10 +339,10 @@ AC_ARG_ENABLE(dri2,
+ [DRI2=$enableval],
+ [DRI2=yes])
+ AC_ARG_ENABLE(dri3,
+-AS_HELP_STRING([--disable-dri3],
+- [Disable DRI3 support [[default=yes]]]),
++AS_HELP_STRING([--enable-dri3],
++ [Enable DRI3 support [[default=no]]]),
+ [DRI3=$enableval],
+-[DRI3=yes])
++[DRI3=no])
+
+ AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc],
+ [Disable XvMC support [[default=yes]]]),
diff --git a/debian/patches/series b/debian/patches/series
index 7ca1bfe..e8f787e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,5 @@ xmir.patch
sna-freescreen.diff
fix-uxa-fglrx-stealing.diff
sna-use-vmask-in-3dstate-ps.diff
+disable-dri3.diff
+sna-fix-gen8-blt.diff
diff --git a/debian/patches/sna-fix-gen8-blt.diff
b/debian/patches/sna-fix-gen8-blt.diff
new file mode 100644
index 000..2ec721d
--- /dev/null
+++ b/debian/patches/sna-fix-gen8-blt.diff
@@ -0,0 +1,51 @@
+commit 3a22b6f6d55a5b1e0a1c0a3d597996268ed439ad
+Author: Mika Kuoppala
+Date: Wed Nov 19 15:10:05 2014 +0200
+
+sna: gen8 BLT broken when address has bit 4 set
+
+With bit 4 set in address, the gen8 blitter fails and blits errorneously
+into the cacheline preceeding the destination and similarly when reading
from
+the source, corrupting memory.
+
+v2: Update the destination base offset pattern as revealed
+by igt/tests/gem_userptr_blits/destination-bo-align
+
+v3: Check base address as well
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79053
+Cc: Chris Wilson
+Tested-by: xunx.f...@intel.com [v2]
+Signed-off-by: Mika Kuoppala
+
+diff --git a/src/sna/kgem.h b/src/sna/kgem.h
+index 6adae3b..3275b4f 100644
+--- a/src/sna/kgem.h
b/src/sna/kgem.h
+@@ -551,6 +551,13 @@ static inline bool kgem_bo_blt_pitch_is_ok(struct kgem
*kgem,
+ struct kgem_bo *bo)
+ {
+ int pitch = bo->pitch;
++
++ if (kgem->gen >= 0100 && pitch & (1 << 4)) { /* bdw is broken */
++ DBG(("%s: can not blt to handle=%d, pitch=%d\n",
++ __FUNCTION__, bo->handle, pitch));
++ return false;
++ }
++
+ if (kgem->gen >= 040 && bo->tiling)
+ pitch /= 4;
+ if (pitch > MAXSHORT) {
+@@ -573,6 +580,12 @@ static inline bool kgem_bo_can_blt(struct kgem *kgem,
+ return false;
+ }
+
++ if (kgem->gen >= 0100 && bo->proxy && bo->delta & (1 << 4)) {
++ DBG(("%s: can not blt to handle=%d, delta=%d\n",
++ __FUNCTION__, bo->handle, bo->delta));
++ retu
Bug#767356: xserver-xorg-core: segfaults when starting on an AMD APU at glamor_set_screen_pixmap from within radeon_drv (Failed to create fbo, incomplete attachment)
Package: xserver-xorg-core
Version: 2:1.16.2.901-1
Followup-For: Bug #767356
Dear Maintainer,
Xorg segfaults with a backtrace at startup on my AMD desktop with
integrated (Radeon KAVERI) graphics. This looks like the same problem
as Yaroslav Halchenko's report in bug #767356. I've attached a more
detailed backtrace. I had this problem in 1.16.1.901 in testing,
upgraded to 1.16.2.901 from unstable, no apparent change.
There is discussion of what looks like the same bug at:
https://www.libreoffice.org/bugzilla/show_bug.cgi?id=84186
The crash happens in glamor_set_screen_pixmap() because pixmap_priv->base.fbo is
NULL, but (as the comments in the libreoffice bug mention) the real problem
is presumably earlier when it can't create the FBO. Here's a gdb session with
some extra debugging env vars turned on:
Reading symbols from /usr/bin/Xorg...Reading symbols from
/usr/lib/debug//usr/bin/Xorg...done.
done.
(gdb) set env GLAMOR_DEBUG=1
(gdb) set env EGL_LOG_LEVEL=debug
(gdb) run -keeptty
Starting program: /usr/bin/Xorg -keeptty
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
X.Org X Server 1.16.1.901 (1.16.2 RC 1)
Release Date: 2014-11-02
X Protocol Version 11, Revision 0
Build Operating System: Linux 3.2.0-4-amd64 x86_64 Debian
Current Operating System: Linux underwood 3.16.0-4-amd64 #1 SMP Debian 3.16.7-2
(2014-11-06) x86_64
Kernel command line: BOOT_IMAGE=/boot/vmlinuz-3.16.0-4-amd64
root=UUID=5fdbbdbd-c492-4d83-9452-7b8441374d18 ro quiet
Build Date: 03 November 2014 09:44:08PM
xorg-server 2:1.16.1.901-1 (http://www.debian.org/support)
Current version of pixman: 0.32.6
Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
(==) Log file: "/var/log/Xorg.0.log", Time: Thu Dec 11 15:44:53 2014
(==) Using system config directory "/usr/share/X11/xorg.conf.d"
(II) [KMS] Kernel modesetting enabled.
[New Thread 0x7fffed1ef700 (LWP 4694)]
libEGL debug: Native platform type: drm (autodetected)
libEGL debug: EGL search path is /usr/lib/x86_64-linux-gnu/egl
libEGL debug: added /usr/lib/x86_64-linux-gnu/egl/egl_gallium.so to module array
libEGL debug: added egl_dri2 to module array
libEGL debug: dlopen(/usr/lib/x86_64-linux-gnu/egl/egl_gallium.so)
libEGL info: use DRM for display 0x559dd4a0
libEGL debug: EGL user error 0x3001 (EGL_NOT_INITIALIZED) in eglInitialize(no
usable display)
libEGL debug: the best driver is DRI2
glamor_pixmap_ensure_fb: glamor: Failed to create fbo,
incomplete attachment
glamor_pixmap_ensure_fb: glamor: Failed to create fbo,
incomplete attachment
XXX fail to create fbo.
Program received signal SIGSEGV, Segmentation fault.
0x713883b0 in glamor_set_screen_pixmap
(screen_pixmap=screen_pixmap@entry=0x561f88d0, back_pixmap=0x0) at
../../glamor/glamor.c:122
122../../glamor/glamor.c: No such file or directory.
(gdb) bt
#0 0x713883b0 in glamor_set_screen_pixmap
(screen_pixmap=screen_pixmap@entry=0x561f88d0, back_pixmap=0x0) at
../../glamor/glamor.c:122
#1 0x71385060 in glamor_egl_create_textured_screen
(screen=screen@entry=0x559d77f0, handle=handle@entry=49,
stride=stride@entry=10240)
at ../../../../glamor/glamor_egl.c:239
#2 0x7138513d in glamor_egl_create_textured_screen_ext
(screen=screen@entry=0x559d77f0, handle=49, stride=10240,
back_pixmap=back_pixmap@entry=0x0)
at ../../../../glamor/glamor_egl.c:254
#3 0x7204048c in radeon_glamor_create_screen_resources
(screen=screen@entry=0x559d77f0) at ../../src/radeon_glamor.c:67
#4 0x72038e0a in RADEONCreateScreenResources_KMS
(pScreen=0x559d77f0) at ../../src/radeon_kms.c:258
#5 0x5561fc4e in xf86CrtcCreateScreenResources (screen=0x559d77f0)
at ../../../../hw/xfree86/modes/xf86Crtc.c:709
#6 0x555aef36 in dix_main (argc=2, argv=0x7fffe658,
envp=) at ../../dix/main.c:223
#7 0x75d16b45 in __libc_start_main (main=0x555994e0 ,
argc=2, argv=0x7fffe658, init=, fini=,
rtld_fini=, stack_end=0x7fffe648) at libc-start.c:287
#8 0x5559950e in _start ()
(gdb) inf loc
pixmap_priv = 0x5622f6f0
(gdb) p *pixmap_priv
$1 = {{type = GLAMOR_TEXTURE_DRM, base = {type = GLAMOR_TEXTURE_DRM, gl_fbo =
GLAMOR_FBO_UNATTACHED, map_access = GLAMOR_ACCESS_RO, is_picture = 0 '\000',
gl_tex = 0 '\000', fbo = 0x0, pixmap = 0x561f88d0, box = {x1 = 0, y1
= 0, x2 = 2560, y2 = 1440}, drm_stride = 0, glamor_priv = 0x55a1cc40,
picture = 0x0, image = 0x5622de30}, large = {{type =
GLAMOR_TEXTURE_DRM, base = {type = GLAMOR_TEXTURE_DRM, gl_fbo =
GLAMOR_FBO_UNATTACHED,
map_access = GLAMOR_ACCESS_RO, is_pictur
xserver-xorg-video-intel: Changes to 'ubuntu'
NEWS| 45 configure.ac| 113 +- debian/changelog| 27 debian/copyright| 360 +- debian/patches/fix-uxa-fglrx-stealing.diff | 646 --- debian/patches/series |4 debian/patches/sna-freescreen.diff | 19 debian/patches/sna-use-vmask-in-3dstate-ps.diff | 65 - debian/source/format|1 debian/upstream.changelog | 1088 +++ debian/xserver-xorg-video-intel.maintscript |1 man/intel.man | 11 src/backlight.c | 75 + src/backlight.h |4 src/compat-api.h| 32 src/fd.c| 24 src/fd.h|1 src/i915_pciids.h | 17 src/intel_device.c | 152 ++ src/intel_driver.h | 25 src/intel_module.c | 61 - src/legacy/i810/i810_driver.c |4 src/render_program/Makefile.am | 11 src/render_program/exa_wm_src_affine.g8a|1 src/render_program/exa_wm_src_sample_argb.g8a |1 src/render_program/exa_wm_src_sample_planar.g8a |1 src/render_program/exa_wm_write.g8a |1 src/render_program/exa_wm_yuv_rgb.g8a | 105 + src/render_program/exa_wm_yuv_rgb.g8b | 21 src/sna/Makefile.am |1 src/sna/brw/brw_eu.c|4 src/sna/brw/brw_eu.h|2 src/sna/brw/brw_test_gen4.c | 12 src/sna/brw/brw_test_gen5.c | 14 src/sna/brw/brw_test_gen6.c |6 src/sna/brw/brw_test_gen7.c |2 src/sna/brw/brw_wm.c|4 src/sna/fb/fbpict.c | 12 src/sna/gen2_render.c |4 src/sna/gen3_render.c |4 src/sna/gen4_render.c |6 src/sna/gen4_vertex.c |8 src/sna/gen5_render.c |8 src/sna/gen6_render.c | 139 +- src/sna/gen7_render.c | 22 src/sna/gen8_eu.c | 32 src/sna/gen8_render.c | 88 - src/sna/gen8_render.h | 30 src/sna/kgem.c | 1047 --- src/sna/kgem.h | 75 + src/sna/sna.h | 31 src/sna/sna_accel.c | 773 -- src/sna/sna_blt.c | 149 +- src/sna/sna_composite.c | 35 src/sna/sna_cpuid.h |4 src/sna/sna_damage.h| 56 - src/sna/sna_display.c | 1262 -- src/sna/sna_display_fake.c |7 src/sna/sna_dri2.c | 487 src/sna/sna_dri3.c |2 src/sna/sna_driver.c| 155 +- src/sna/sna_glyphs.c| 36 src/sna/sna_io.c| 67 - src/sna/sna_present.c | 29 src/sna/sna_render.c| 116 +- src/sna/sna_render.h|8 src/sna/sna_render_inline.h | 29 src/sna/sna_transform.c |8 src/sna/sna_trapezoids.c| 21 src/sna/sna_trapezoids.h| 74 + src/sna/sna_trapezoids_boxes.c | 45 src/sna/sna_trapezoids_imprecise.c | 783 ++ src/sna/sna_trapezoids_mono.c | 209 +++ src/sna/sna_trapezoids_precise.c| 879 ++- src/sna/sna_video.c | 41 src/sna/sna_video.h |1 src/sna/sna_video_hwmc.c|2 src/sna/sna_video_overlay.c | 50 src/sna/sna_video_sprite.c | 51 src/sna/sna_video_textured.c| 56 - src/sna/xassert.h | 42 src/uxa/Makefile.am | 14 src/uxa/i830_3d.c |1 src/uxa/i830_render.c | 83 - src/uxa/i915_3d.c |1
