xorg-server: Changes to 'ubuntu'
debian/changelog | 12 ++ debian/patches/xmir.patch | 248 +++--- 2 files changed, 180 insertions(+), 80 deletions(-) New commits: commit 858b1addb8c1a46c427a6199d7f631ef79af651e Author: Robert AncellDate: Thu Jul 21 15:17:26 2016 +0200 Update xmir.patch diff --git a/debian/changelog b/debian/changelog index ff9b686..70d2704 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +xorg-server (2:1.18.4-1ubuntu3) yakkety; urgency=medium + + * debian/patches/xmir.patch: +- Fix bottom/right edge corruption. (LP: #1510849) +- Fix key repeat. (LP: #1591356) +- Don't delete outputs without replacing them. (LP: #1504422) (LP: #1602561) +- Xmir -debug: Log WM types by name and number. +- Implement fake GLX frame notification/timing. +- Improve focus tracking. + + -- Robert Ancell Thu, 21 Jul 2016 11:42:03 +0200 + xorg-server (2:1.18.4-1ubuntu2) yakkety; urgency=medium * debian/control, debian/rules: diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch index e7ff8d7..d4eccf3 100644 --- a/debian/patches/xmir.patch +++ b/debian/patches/xmir.patch @@ -1,4 +1,4 @@ -From eb0fb72f618ea17a90d6c535d38e12b5f95fcec8 Mon Sep 17 00:00:00 2001 +From c93f490c0c560c82ffc2dd3b6095f6e390b0fb81 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Fri, 29 Apr 2016 14:57:53 +0200 Subject: [PATCH xserver 1/3] XMir DDX @@ -16,20 +16,20 @@ Contributions from: hw/xmir/.gitignore |1 + hw/xmir/Makefile.am | 61 ++ hw/xmir/dri2/Makefile.am| 14 + - hw/xmir/dri2/dri2.c | 1398 + - hw/xmir/dri2/dri2.h | 364 ++ - hw/xmir/dri2/dri2ext.c | 683 ++ + hw/xmir/dri2/dri2.c | 1398 +++ + hw/xmir/dri2/dri2.h | 364 + + hw/xmir/dri2/dri2ext.c | 683 + hw/xmir/dri2/dri2int.h | 26 + hw/xmir/xmir-cursor.c | 210 ++ hw/xmir/xmir-cvt.c | 304 - hw/xmir/xmir-dri2.c | 551 +++ - hw/xmir/xmir-glamor.c | 1160 +++ - hw/xmir/xmir-input.c| 592 - hw/xmir/xmir-output.c | 449 - hw/xmir/xmir-thread-proxy.c | 109 +++ - hw/xmir/xmir.c | 1622 +++ - hw/xmir/xmir.h | 227 ++ - 18 files changed, 7803 insertions(+), 2 deletions(-) + hw/xmir/xmir-dri2.c | 551 ++ + hw/xmir/xmir-glamor.c | 1160 + + hw/xmir/xmir-input.c| 595 +++ + hw/xmir/xmir-output.c | 428 +++ + hw/xmir/xmir-thread-proxy.c | 115 +++ + hw/xmir/xmir.c | 1719 +++ + hw/xmir/xmir.h | 230 ++ + 18 files changed, 7891 insertions(+), 2 deletions(-) create mode 100644 hw/xmir/.gitignore create mode 100644 hw/xmir/Makefile.am create mode 100644 hw/xmir/dri2/Makefile.am @@ -48,10 +48,10 @@ Contributions from: create mode 100644 hw/xmir/xmir.h diff --git a/configure.ac b/configure.ac -index 77cf234..8bf62a0 100644 +index 868e859..dac8887 100644 --- a/configure.ac +++ b/configure.ac -@@ -628,6 +628,7 @@ AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server +@@ -638,6 +638,7 @@ AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server AC_ARG_ENABLE(xnest,AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto]) AC_ARG_ENABLE(xquartz,AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto]) AC_ARG_ENABLE(xwayland, AS_HELP_STRING([--enable-xwayland], [Build Xwayland server (default: auto)]), [XWAYLAND=$enableval], [XWAYLAND=auto]) @@ -59,7 +59,7 @@ index 77cf234..8bf62a0 100644 AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no]) AC_ARG_ENABLE(xwin, AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto]) AC_ARG_ENABLE(glamor, AS_HELP_STRING([--enable-glamor], [Build glamor dix module (default: no)]), [GLAMOR=$enableval], [GLAMOR=no]) -@@ -746,6 +747,7 @@ case $host_os in +@@ -756,6 +757,7 @@ case $host_os in XVFB=no XNEST=no XWAYLAND=no @@ -67,7 +67,7 @@ index 77cf234..8bf62a0 100644 COMPOSITE=no DGA=no -@@ -2482,6 +2484,27 @@ if test
libdrm_2.4.69-1_source.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Thu, 21 Jul 2016 10:25:17 +0200 Source: libdrm Binary: libdrm-dev libdrm2 libdrm2-udeb libdrm2-dbg libdrm-intel1 libdrm-intel1-dbg libdrm-nouveau2 libdrm-nouveau2-dbg libdrm-radeon1 libdrm-radeon1-dbg libdrm-omap1 libdrm-omap1-dbg libdrm-freedreno1 libdrm-freedreno1-dbg libdrm-exynos1 libdrm-exynos1-dbg libdrm-tegra0 libdrm-tegra0-dbg libdrm-amdgpu1 libdrm-amdgpu1-dbg Architecture: source Version: 2.4.69-1 Distribution: unstable Urgency: medium Maintainer: Debian X Strike ForceChanged-By: Andreas Boll Description: libdrm-amdgpu1 - Userspace interface to amdgpu-specific kernel DRM services -- run libdrm-amdgpu1-dbg - Userspace interface to amdgpu-specific kernel DRM services -- deb libdrm-dev - Userspace interface to kernel DRM services -- development files libdrm-exynos1 - Userspace interface to exynos-specific kernel DRM services -- run libdrm-exynos1-dbg - Userspace interface to exynos-specific kernel DRM services -- deb libdrm-freedreno1 - Userspace interface to msm/kgsl kernel DRM services -- runtime libdrm-freedreno1-dbg - Userspace interface to msm/kgsl kernel DRM services -- debugging libdrm-intel1 - Userspace interface to intel-specific kernel DRM services -- runt libdrm-intel1-dbg - Userspace interface to intel-specific kernel DRM services -- debu libdrm-nouveau2 - Userspace interface to nouveau-specific kernel DRM services -- ru libdrm-nouveau2-dbg - Userspace interface to nouveau-specific kernel DRM -- debugging s libdrm-omap1 - Userspace interface to omap-specific kernel DRM services -- runti libdrm-omap1-dbg - Userspace interface to omap-specific kernel DRM services -- debug libdrm-radeon1 - Userspace interface to radeon-specific kernel DRM services -- run libdrm-radeon1-dbg - Userspace interface to radeon-specific kernel DRM services -- deb libdrm-tegra0 - Userspace interface to tegra-specific kernel DRM services -- runt libdrm-tegra0-dbg - Userspace interface to tegra-specific kernel DRM services -- debu libdrm2- Userspace interface to kernel DRM services -- runtime libdrm2-dbg - Userspace interface to kernel DRM services -- debugging symbols libdrm2-udeb - Userspace interface to kernel DRM services -- runtime (udeb) Closes: 828023 Changes: libdrm (2.4.69-1) unstable; urgency=medium . [ Andreas Boll ] * New upstream release. * Update debian/upstream/signing-key.asc. * Bump Standards-Version to 3.9.8, no changes needed. * Update watch url to use https instead of http. . [ Julien Cristau ] * Build libdrm-tegra on arm64 (closes: #828023). Thanks, Martin Michlmayr! Checksums-Sha1: 4dcd559f9efe1c6dedc3cf5814e050910b36241d 3406 libdrm_2.4.69-1.dsc a42c29fc1506ed6374e16f7f615d5d553b24ef1c 1065604 libdrm_2.4.69.orig.tar.gz b0ea352d47c779368fe26448ef2d36f331081955 51003 libdrm_2.4.69-1.diff.gz Checksums-Sha256: 3d9a85ab4bf12830b84fc467a0cd1ae7ffde1257c073b5cf96b49e909f1f5921 3406 libdrm_2.4.69-1.dsc 50cd24f1ee1331a2dfa3c865ff528061eb8269d273fb0782ff3e07de263d187a 1065604 libdrm_2.4.69.orig.tar.gz 5634148aaa63de6a739003319df58ed61868471bac52cb7a8a2e0b39c3589a8e 51003 libdrm_2.4.69-1.diff.gz Files: 8a021ffd2f966f16d9a50e77e8d6ee8d 3406 libs optional libdrm_2.4.69-1.dsc f15566e3e17eab931fdf97d5d4f7d3bf 1065604 libs optional libdrm_2.4.69.orig.tar.gz c989e35eeba59e47a06e952d953bcc7b 51003 libs optional libdrm_2.4.69-1.diff.gz -BEGIN PGP SIGNATURE- iQIcBAEBCgAGBQJXkIcmAAoJEB7vU9OKOpxn/nsQAKeE0jBjw+Ft36LIpXIhI6Lf S/5PMuuxhSRRvH4N6LUrrMS9wLLDJMSyg8yS8hrNw1kg+8wuRd9eTezuQQZOHOAq C20ats0EQo7WTLE64v9n3W19kbTLU24fpvMHhkpK6V6RJ67lopJ0PhSL+Godjwy2 NMKqjzJGxQyBcFEZFr+eSfeIj17JBrIITUtccwCulNWxF+86GIblZhtt7Tq4870B P0Se8Tww71t7/p7aF5Xd24YQSq+FdSOflMdwhXiFXxNFr0T4ny0wB/ygK50YYp0A vTNEPqhnM/QLpRqFr2WczhWnbldOzqIWQHfFf7+OnVskInNfhpWjLngqoDM7ZNEE XiWu2XviOCwR6n8qI2/XtG5mRVWkRJeeiA27HazgNehnGb2cK8pkYiN6UmBlaRlb 9nDukDim/PcVvjM6pIqtxN6Zq6lk3zvMIv9ZjWip0MsuVsb56aNuTcUVt8JXNK4J Qfeiy0m5vypobbXe8n6gD3g+Ev1E/BOj7lhqpyauH/Y+EeRq5zDaN78modT+MOA6 sqGCxCz3LOvjhAWUgXKf6HyY2UeGnEcx+uQ2eSWsUN46xSwWx/Ool7VvAZ9PRX8g 8CnDPw+h3DmGfkzaRSTj4W15XTFUZuZBZzuY3br26b0D6RMw4oIDM0uFYnDxyYi3 /lNAnMrTihp/4lZ9n7mL =yu1b -END PGP SIGNATURE- Thank you for your contribution to Debian.
libdrm: Changes to 'refs/tags/libdrm-2.4.69-1'
Tag 'libdrm-2.4.69-1' created by Andreas Bollat 2016-07-21 08:25 + Tagging upload of libdrm 2.4.69-1 to unstable. -BEGIN PGP SIGNATURE- iQIcBAABCgAGBQJXkIcMAAoJEB7vU9OKOpxn75IP/2Q5HPp5fenDvwpjnaJNizTM MvfMoi4KPZpOoQzFXf5nIty3e9U8jDsjo6Z0H6fV5MoLLgAE4iOL44ZREXOqyDLm R4puGTLQ+X8wyQ3upKHUqrLfVVtFaqBAj87FxQcE40YIK1vfq+X+DRAuM0nXAZsY tMTys6icoImKipaVZXIJPgNY127DaSdlC8dLH/TgOOA4HBi4qj2B0M3wE3u8XDH4 cSkhPDHZU/xe0Z26uaXEybmMoinMThBcvVXhEejJuag4hvDxTFb5tTrZIY9kXZB5 tm9utOfmhVFqrrxonKp4ZcDvEY2tTbMPW2xSLNsYnPO5cPZiD+fO8zG0qX1qlJVi A/pyxFmcaHsG6q6WF8Zgl4FsBrbzv8+A3a1jbXQsW98Gft34krp6S1GEyRO0Ac1x DgjAQYmPNcNvTaefug6sjuFoIgklt+eVUW1/x0o125m/EiRgmgX14izKTz85x341 4Gg3gE01Ab3/mjwHID+wJn6YOKBvlXvXinf6PQyosuJTmGM2HDjoZirqwFUYixbh XNWWCipG1uXIgPrsUBAym6Jl9vABXShj3eoFlKINowtor77mrKNjMTmURwM5F1Su Pla33ZDcqgYY3wnYg1Qs2Fy1zyH3JpjpgRtEgpsSNqW1NT5L78zL5OGcGgiLDwBD iX/og+VRG0dCDAZFCQe/ =fas8 -END PGP SIGNATURE- Changes since libdrm-2.4.68-1: Alex Deucher (2): tests/amdgpu: expand write/copy tests to compute tests/amdgpu: expand write/copy tests to compute Andreas Boll (7): Update debian/upstream/signing-key.asc Bump Standards-Version to 3.9.8, no changes needed. Update watch url to use https instead of http. Update debian/upstream/signing-key.asc Merge tag 'libdrm-2.4.69' into debian-unstable Bump changelog. Upload to unstable. Christian König (1): amdgpu: fix fence status query Eric Anholt (2): vc4: Update kernel headers for getparam addition. Bump version to 2.4.69 for release. Jan Vesely (1): xf86drm.c: Fix mix of tabs and spaces Julien Cristau (1): Build libdrm-tegra on arm64 (closes: #828023). Leo Liu (1): tests/amdgpu: add interface to adapt firmware requirement Marek Olšák (1): radeon: use SAMPLE_SPLIT=2 for better MSAA perf on EG/CM Mike Frysinger (1): pull in sys/sysmacros.h when available Nicolai Hähnle (1): xf86drm: ensure proper alignment of pointers in drmProcessPciDevice Qiang Yu (1): drm: fix multi GPU drmGetDevices only return one device Rob Clark (1): freedreno/msm: fix memory leak on ringbuffer free Rob Herring (1): Android: strip out header files from sources list Rodrigo Vivi (2): intel: Add more Kabylake PCI IDs. intel: Removing PCI IDs that are no longer listed as Kabylake. Sonny Jiang (1): tests/amdgpu: adapt to new polaris10/11 uvd fw --- Android.mk |4 amdgpu/Android.mk |2 configure.ac|5 debian/changelog| 13 debian/control |8 debian/rules| 14 debian/upstream/signing-key.asc | 302 debian/watch|2 freedreno/Android.mk|2 freedreno/msm/msm_ringbuffer.c |5 include/drm/vc4_drm.h | 21 intel/Android.mk|2 intel/intel_chipset.h | 26 libkms/Android.mk |2 libkms/linux.c |5 nouveau/Android.mk |2 radeon/Android.mk |2 radeon/radeon_surface.c |6 tests/amdgpu/basic_tests.c | 56 + tests/amdgpu/cs_tests.c | 51 + tests/modetest/Android.mk |2 tests/proptest/Android.mk |2 tests/util/Android.mk |2 xf86drm.c | 1454 24 files changed, 1212 insertions(+), 778 deletions(-) ---
libdrm: Changes to 'debian-unstable'
Android.mk |4 amdgpu/Android.mk |2 configure.ac|5 debian/changelog|5 debian/upstream/signing-key.asc | 226 ++ freedreno/Android.mk|2 freedreno/msm/msm_ringbuffer.c |5 include/drm/vc4_drm.h | 21 intel/Android.mk|2 intel/intel_chipset.h | 26 libkms/Android.mk |2 libkms/linux.c |5 nouveau/Android.mk |2 radeon/Android.mk |2 radeon/radeon_surface.c |6 tests/amdgpu/basic_tests.c | 56 + tests/amdgpu/cs_tests.c | 51 + tests/modetest/Android.mk |2 tests/proptest/Android.mk |2 tests/util/Android.mk |2 xf86drm.c | 1454 21 files changed, 1108 insertions(+), 774 deletions(-) New commits: commit 108c9902ef556e3d841a95f41b0c0431053363f1 Author: Andreas BollDate: Thu Jul 21 10:25:26 2016 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index adb8c16..1a625e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.69-1) UNRELEASED; urgency=medium +libdrm (2.4.69-1) unstable; urgency=medium [ Andreas Boll ] * New upstream release. @@ -9,7 +9,7 @@ libdrm (2.4.69-1) UNRELEASED; urgency=medium [ Julien Cristau ] * Build libdrm-tegra on arm64 (closes: #828023). Thanks, Martin Michlmayr! - -- Andreas Boll Tue, 10 May 2016 14:45:31 +0200 + -- Andreas Boll Thu, 21 Jul 2016 10:25:17 +0200 libdrm (2.4.68-1) unstable; urgency=medium commit e36e80c3fefb3bcee9c0b81f7b1b92345a5375bc Author: Andreas Boll Date: Thu Jul 21 09:42:29 2016 +0200 Bump changelog. diff --git a/debian/changelog b/debian/changelog index 5af53f2..adb8c16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -libdrm (2.4.68-2) UNRELEASED; urgency=medium +libdrm (2.4.69-1) UNRELEASED; urgency=medium [ Andreas Boll ] + * New upstream release. * Update debian/upstream/signing-key.asc. * Bump Standards-Version to 3.9.8, no changes needed. * Update watch url to use https instead of http. commit 9d92a1f02032b2598d44d93567a425356bb8c773 Author: Andreas Boll Date: Thu Jul 21 09:34:11 2016 +0200 Update debian/upstream/signing-key.asc Add Eric Anholt's key D1FC9EE8. diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index 0feee56..825d341 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -343,3 +343,229 @@ Lz7boQFSm/REGmPIUtRdE7hHCHijczuqvzhRQ1H7N3yGlbiCip6vH9VJTH4tkqK4 F2vRWhurk3aFZO7UT1FhAoX62bY6JPsotqQQJg4XP/M7uM6PMg== =z5S1 -END PGP PUBLIC KEY BLOCK- +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBFH8yAsBEAC8tpEivCRFjoVPjwNrRr1xAh9NQQ0aQdjYLva+RFGFRYG9IQTf +ZgzrXXeG6p5kGW9ywtaYAi9M4ekKtzVoRMHWILEYMhNeu26syjJsK7oyzzLhLURn +7UPsBJSsdn0eJ2Dyzk4mKny/eCaKIWmPtwu1lDgQFpM8YozIA816kHuTiWsqUXeG +4CZlfHh05jYUW/4UMAC2UXJrHeO0USl0OgnIwI4Y+P1f1ygCXRBcD6A+9V5Wjhzz +7Gd8IA1y16VyVkYQNs4E0C8/MDtxpAHfqe8PuSFzGVbXF+WZT8H4Ii2y5a6Xa0VN +m2ZnKR0kEJRE1UW7KDmX4oIi3w0485ZtyzGP5v6+xYLRkAjH6uUQ/7DsbHqtHFu9 +cwRQ4LPqOgcrSKNK0LqDrKHssqOhy9vjXEKZPjtn1Lb5zFhR33ENck375pY9SbGB +l230r1j6iYounIp1bv31mSoRNhi4uB9LzuQHWoyF+maLlhPBNBnJgQ9o7bDs6veo +HUbIatZr0g79c93IXH8bWf0uaDUvDDNi3favwyhHa/j1lkDd8ZipbSXMxhlpuiAb +enYd3An7ueAqCM/v0mXNBcOjVNJZaoCf2AT/G2wTegk5WHDb3aECDG3a36OE+ciP +rFs4/WnFYaK7voRFj/97e2pLFiqSWSk9BZ4hdP/2IuigASN81vAXT4RVNwARAQAB +tB1FcmljIEFuaG9sdCA8ZXJpY0BhbmhvbHQubmV0PokCOgQTAQgAJAIbAwULCQgH +AwUVCgkICwUWAgMBAAIeAQIXgAUCUg6UHAIZAQAKCRC11ik20fye6IqnEACFmoAF +EhJJWXTyJdqV96wDA11Y1rFmrglsm4fNPaYCRRyWe8CtSkzOsTEZyKn/Ry0PqxnL +4dTk0/y3EKIOlxn1UMC+enwrPqMP5kLHHz3uMKm/vl0LXou7m9jbzVmQzFLbu03T +94oU0pFPQKcanCxh5EqyFmuVDuak3GwTrnOIcJpgAULP1bj41u4MXa5LivcZctTC +jhIhVVBNvf7Vv66x9mvbiccDHBdxQIt9s1a4OfHTPeObOH9yo6lZ6sQB5lck5HOd +xqdkX0NMc4uFwr02Xjf8rAG6pHsxfZ0WDQzSmMaSSW4CoPSeSFUWQLQZSPZ3k3UI +p7gFMF1eHeFlI4HaKZy/mjGPs8GwrBOwEwjuZlJsdxQvNqABq4SqTJ2kWc7qPfsw +VYGC2JrEcoSBRM95FaFKfV2ioYX2BZW/mqCUFRqrznXvHag7vel26/HGmY3m6qJk +09TD5SxT2ds0X5syx4gNaMUQ+D4BvbgrgOWfrPtkS5kAsjSIxqnmQZE4nOt5XS7T +DBq1j7+SO2mIq88ecxrxj3s+TBO8ANQagO+HfPinbMwc/EiI5iqHbSS/O4J+HmKT +v8JMUQaqwVulwS7i1DHi53sOUbQ2oSak5TD9sDLCXev/fG+e2fXaXgdR9OuKcG4c +CvDgQIi0BMRzCR4bTVi1S7EQsIjA0eBTRippfLQeRXJpYyBBbmhvbHQgPGFuaG9s +dEBnbWFpbC5jb20+iQI3BBMBCAAhBQJR/MlWAhsDBQsJCAcDBRUKCQgLBRYCAwEA +Ah4BAheAAAoJELXWKTbR/J7okCcP+wQKwF7L/6lvAJ7xXfg/kEjBTxlonv6sGTYb +uZYJX00F5tyfXQtE2cUeX3M3CvEU9Y+pQLbSTaC5oUVwwwSLgvf4OyGHU5n1d/g4 +Y0sbkO5nnyEim6dgV1DBuht/9XBFH11rnXLwU1GLAMuQhcuzakmWutWA2zEW5KOd +0fXRdxCsaA1ZcXDbZ70mJ2gi7bW23V4fwa5jwpnupmbPkI394oCd7G0zVG1hUaib
libdrm: Changes to 'upstream-unstable'
Android.mk |4 amdgpu/Android.mk |2 configure.ac |5 freedreno/Android.mk |2 freedreno/msm/msm_ringbuffer.c |5 include/drm/vc4_drm.h | 21 intel/Android.mk |2 intel/intel_chipset.h | 26 libkms/Android.mk |2 libkms/linux.c |5 nouveau/Android.mk |2 radeon/Android.mk |2 radeon/radeon_surface.c|6 tests/amdgpu/basic_tests.c | 56 + tests/amdgpu/cs_tests.c| 51 + tests/modetest/Android.mk |2 tests/proptest/Android.mk |2 tests/util/Android.mk |2 xf86drm.c | 1454 - 19 files changed, 879 insertions(+), 772 deletions(-) New commits: commit 5d830819480b089f62637fecc3aad11c5d1d5857 Author: Eric AnholtDate: Wed Jul 20 11:42:45 2016 -0700 Bump version to 2.4.69 for release. Signed-off-by: Eric Anholt diff --git a/configure.ac b/configure.ac index 90fc455..0f91d43 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ([2.63]) AC_INIT([libdrm], -[2.4.68], +[2.4.69], [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI], [libdrm]) commit 2212a6465d1597fbc4d4ee0ea5ff87816bfa336e Author: Eric Anholt Date: Sat Jul 2 14:18:43 2016 -0700 vc4: Update kernel headers for getparam addition. This also brings over the C++ guard introduced recently in the kernel headers. Signed-off-by: Eric Anholt diff --git a/include/drm/vc4_drm.h b/include/drm/vc4_drm.h index da3caa0..919eece 100644 --- a/include/drm/vc4_drm.h +++ b/include/drm/vc4_drm.h @@ -26,6 +26,10 @@ #include "drm.h" +#if defined(__cplusplus) +extern "C" { +#endif + #define DRM_VC4_SUBMIT_CL 0x00 #define DRM_VC4_WAIT_SEQNO0x01 #define DRM_VC4_WAIT_BO 0x02 @@ -33,6 +37,7 @@ #define DRM_VC4_MMAP_BO 0x04 #define DRM_VC4_CREATE_SHADER_BO 0x05 #define DRM_VC4_GET_HANG_STATE0x06 +#define DRM_VC4_GET_PARAM 0x07 #define DRM_IOCTL_VC4_SUBMIT_CL DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_SUBMIT_CL, struct drm_vc4_submit_cl) #define DRM_IOCTL_VC4_WAIT_SEQNO DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_WAIT_SEQNO, struct drm_vc4_wait_seqno) @@ -41,6 +46,7 @@ #define DRM_IOCTL_VC4_MMAP_BO DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_MMAP_BO, struct drm_vc4_mmap_bo) #define DRM_IOCTL_VC4_CREATE_SHADER_BODRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_CREATE_SHADER_BO, struct drm_vc4_create_shader_bo) #define DRM_IOCTL_VC4_GET_HANG_STATE DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_GET_HANG_STATE, struct drm_vc4_get_hang_state) +#define DRM_IOCTL_VC4_GET_PARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_GET_PARAM, struct drm_vc4_get_param) struct drm_vc4_submit_rcl_surface { __u32 hindex; /* Handle index, or ~0 if not present. */ @@ -276,4 +282,19 @@ struct drm_vc4_get_hang_state { __u32 pad[16]; }; +#define DRM_VC4_PARAM_V3D_IDENT0 0 +#define DRM_VC4_PARAM_V3D_IDENT1 1 +#define DRM_VC4_PARAM_V3D_IDENT2 2 +#define DRM_VC4_PARAM_SUPPORTS_BRANCHES3 + +struct drm_vc4_get_param { + __u32 param; + __u32 pad; + __u64 value; +}; + +#if defined(__cplusplus) +} +#endif + #endif /* _VC4_DRM_H_ */ commit 8c8d5dd76fb80637031e824a48ceaa0f9f65d2dd Author: Mike Frysinger Date: Tue Jun 21 12:18:15 2016 -0400 pull in sys/sysmacros.h when available This header provides major/minor/makedev funcs under most Linux C libs. Pull it in to fix building with newer versions that drop the implicit include via sys/types.h. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94231 Signed-off-by: Mike Frysinger diff --git a/configure.ac b/configure.ac index a04ce87..90fc455 100644 --- a/configure.ac +++ b/configure.ac @@ -53,7 +53,8 @@ AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE AC_FUNC_ALLOCA -AC_CHECK_HEADERS([sys/mkdev.h sys/sysctl.h sys/select.h]) +AC_HEADER_MAJOR +AC_CHECK_HEADERS([sys/sysctl.h sys/select.h]) # Initialize libtool LT_PREREQ([2.2]) diff --git a/libkms/linux.c b/libkms/linux.c index 6e0da83..69eb1aa 100644 --- a/libkms/linux.c +++ b/libkms/linux.c @@ -41,9 +41,12 @@ #include #include #include -#ifdef HAVE_SYS_MKDEV_H +#ifdef MAJOR_IN_MKDEV #include #endif +#ifdef MAJOR_IN_SYSMACROS +#include +#endif #include "libdrm_macros.h" #include "internal.h" diff --git a/xf86drm.c b/xf86drm.c index e99f2e2..8a858ef 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -54,8 +54,11 @@ #include #include #include -#ifdef
Bug#828023: marked as done (libdrm-tegra for arm64)
Your message dated Thu, 21 Jul 2016 09:50:01 + with message-idand subject line Bug#828023: fixed in libdrm 2.4.69-1 has caused the Debian Bug report #828023, regarding libdrm-tegra for arm64 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 828023: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=828023 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems --- Begin Message --- Package: libdrm Version: 2.4.68-1 Severity: wishlist Tags: patch Can you please build libdrm-tegra0 for arm64. NVIDIA has 64-bit ARM Tegra CPUs (e.g. Tegra X1). The attached patch works for me. -- Martin Michlmayr http://www.cyrius.com/ diff --git a/debian/control b/debian/control index e81dff2..82f78e3 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,7 @@ Depends: libdrm-omap1 (= ${binary:Version}) [any-arm], libdrm-freedreno1 (= ${binary:Version}) [any-arm arm64], libdrm-exynos1 (= ${binary:Version}) [any-arm], - libdrm-tegra0 (= ${binary:Version}) [any-arm], + libdrm-tegra0 (= ${binary:Version}) [any-arm arm64], ${misc:Depends}, Multi-Arch: same Description: Userspace interface to kernel DRM services -- development files @@ -274,7 +274,7 @@ Description: Userspace interface to exynos-specific kernel DRM services -- debug This package provides the debugging symbols for the libdrm-exynos1 package. Package: libdrm-tegra0 -Architecture: any-arm +Architecture: any-arm arm64 Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -290,7 +290,7 @@ Description: Userspace interface to tegra-specific kernel DRM services -- runtim Package: libdrm-tegra0-dbg Section: debug Priority: extra -Architecture: any-arm +Architecture: any-arm arm64 Depends: libdrm-tegra0 (= ${binary:Version}), ${misc:Depends}, diff --git a/debian/rules b/debian/rules index 2dd69bc..169f648 100755 --- a/debian/rules +++ b/debian/rules @@ -49,10 +49,18 @@ endif ifeq ($(ARM), yes) confflags += --enable-exynos-experimental-api confflags += --enable-omap-experimental-api - confflags += --enable-tegra-experimental-api else confflags += --disable-exynos-experimental-api confflags += --disable-omap-experimental-api +endif + +# Tegra is on arm and arm64 +ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU))) + TEGRA = yes +endif +ifeq ($(TEGRA), yes) + confflags += --enable-tegra-experimental-api +else confflags += --disable-tegra-experimental-api endif @@ -96,6 +104,8 @@ endif ifeq ($(ARM), yes) dh_strip -plibdrm-omap1 --dbg-package=libdrm-omap1-dbg dh_strip -plibdrm-exynos1 --dbg-package=libdrm-exynos1-dbg +endif +ifeq ($(TEGRA), yes) dh_strip -plibdrm-tegra0 --dbg-package=libdrm-tegra0-dbg endif ifeq ($(FREEDRENO), yes) @@ -116,6 +126,8 @@ endif ifeq ($(ARM), yes) dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4 dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1 (>= 2.4.66)' -- -c4 +endif +ifeq ($(TEGRA), yes) dh_makeshlibs -plibdrm-tegra0 -V'libdrm-tegra0' -- -c4 endif ifeq ($(FREEDRENO), yes) --- End Message --- --- Begin Message --- Source: libdrm Source-Version: 2.4.69-1 We believe that the bug you reported is fixed in the latest version of libdrm, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 828...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Andreas Boll (supplier of updated libdrm package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Thu, 21 Jul 2016 10:25:17 +0200 Source: libdrm Binary: libdrm-dev libdrm2 libdrm2-udeb libdrm2-dbg libdrm-intel1 libdrm-intel1-dbg libdrm-nouveau2 libdrm-nouveau2-dbg libdrm-radeon1 libdrm-radeon1-dbg libdrm-omap1 libdrm-omap1-dbg libdrm-freedreno1 libdrm-freedreno1-dbg libdrm-exynos1 libdrm-exynos1-dbg libdrm-tegra0 libdrm-tegra0-dbg libdrm-amdgpu1 libdrm-amdgpu1-dbg Architecture: source Version: 2.4.69-1 Distribution: unstable Urgency: medium Maintainer: Debian X Strike Force Changed-By: Andreas Boll Description: libdrm-amdgpu1 - Userspace interface to amdgpu-specific kernel DRM services -- run libdrm-amdgpu1-dbg - Userspace interface to
Processing of libdrm_2.4.69-1_source.changes
libdrm_2.4.69-1_source.changes uploaded successfully to localhost along with the files: libdrm_2.4.69-1.dsc libdrm_2.4.69.orig.tar.gz libdrm_2.4.69-1.diff.gz Greetings, Your Debian queue daemon (running on host franck.debian.org)