libdrm: Changes to 'debian-experimental'

2017-06-09 Thread Andreas Boll 
 amdgpu/amdgpu-symbol-check|1 
 amdgpu/amdgpu.h   |   31 
 amdgpu/amdgpu_bo.c|2 
 amdgpu/amdgpu_cs.c|  106 +++---
 amdgpu/amdgpu_gpu_info.c  |5 +
 configure.ac  |6 +-
 debian/changelog  |7 ++
 debian/libdrm-amdgpu1.symbols |1 
 debian/libdrm2.symbols|1 
 debian/rules  |4 -
 freedreno/freedreno_device.c  |6 +-
 include/drm/amdgpu_drm.h  |5 +
 tests/amdgpu/basic_tests.c|  100 +++
 tests/modetest/modetest.c |   11 +++-
 tests/util/kms.c  |3 +
 xf86drm.c |   18 +++
 xf86drm.h |2 
 17 files changed, 263 insertions(+), 46 deletions(-)

New commits:
commit a0fccb4e8e84fc3e51b1109ef0f683609857ca06
Author: Andreas Boll 
Date:   Fri Jun 9 10:41:49 2017 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 59c4ec9..f650792 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdrm (2.4.81-1) UNRELEASED; urgency=medium
+libdrm (2.4.81-1) experimental; urgency=medium
 
   * New upstream release.
   * Bump libdrm2's and libdrm-amdgpu1's symbols and shlibs.
 
- -- Andreas Boll   Fri, 09 Jun 2017 10:23:51 +0200
+ -- Andreas Boll   Fri, 09 Jun 2017 10:41:36 +0200
 
 libdrm (2.4.80-1) experimental; urgency=medium
 

commit f5c87ed386133650e304eb041dcccbafa5b1cab5
Author: Andreas Boll 
Date:   Fri Jun 9 10:34:51 2017 +0200

Bump libdrm2's and libdrm-amdgpu1's symbols and shlibs.

diff --git a/debian/changelog b/debian/changelog
index 0ffeff9..59c4ec9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.81-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Bump libdrm2's and libdrm-amdgpu1's symbols and shlibs.
 
  -- Andreas Boll   Fri, 09 Jun 2017 10:23:51 +0200
 
diff --git a/debian/libdrm-amdgpu1.symbols b/debian/libdrm-amdgpu1.symbols
index 8ffcb42..842463b 100644
--- a/debian/libdrm-amdgpu1.symbols
+++ b/debian/libdrm-amdgpu1.symbols
@@ -22,6 +22,7 @@ libdrm_amdgpu.so.1 libdrm-amdgpu1 #MINVER#
  amdgpu_cs_query_reset_state@Base 2.4.63
  amdgpu_cs_signal_semaphore@Base 2.4.67
  amdgpu_cs_submit@Base 2.4.63
+ amdgpu_cs_wait_fences@Base 2.4.81
  amdgpu_cs_wait_semaphore@Base 2.4.67
  amdgpu_device_deinitialize@Base 2.4.63
  amdgpu_device_initialize@Base 2.4.63
diff --git a/debian/libdrm2.symbols b/debian/libdrm2.symbols
index 75aaf4b..0d73704 100644
--- a/debian/libdrm2.symbols
+++ b/debian/libdrm2.symbols
@@ -36,6 +36,7 @@ libdrm.so.2 libdrm2 #MINVER#
  drmDelContextTag@Base 2.3.1
  drmDestroyContext@Base 2.3.1
  drmDestroyDrawable@Base 2.3.1
+ drmDevicesEqual@Base 2.4.81
  drmDropMaster@Base 2.4.3
  drmError@Base 2.3.1
  drmFinish@Base 2.3.1
diff --git a/debian/rules b/debian/rules
index c49a7be..bf130d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,7 +100,7 @@ override_dh_install:
dh_install --fail-missing
 
 override_dh_makeshlibs:
-   dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.75)' --add-udeb=libdrm2-udeb 
-- -c4
+   dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.81)' --add-udeb=libdrm2-udeb 
-- -c4
 ifeq ($(INTEL), yes)
dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.75)' -- -c4
 endif
@@ -108,7 +108,7 @@ ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (>= 2.4.66)' -- -c4
 endif
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.39)' -- -c4
-   dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.80)' -- -c4
+   dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.81)' -- -c4
 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

commit 1b40719c922f5fd8d99022d72e979c2215b19c02
Author: Andreas Boll 
Date:   Fri Jun 9 10:24:13 2017 +0200

Bump changelog

diff --git a/debian/changelog b/debian/changelog
index 01d3d76..0ffeff9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.81-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Boll   Fri, 09 Jun 2017 10:23:51 +0200
+
 libdrm (2.4.80-1) experimental; urgency=medium
 
   * New upstream release.

commit 81312f3730c14a2930a7784493701809c7f04a26
Author: Marek Olšák 
Date:   Wed May 24 17:01:36 2017 +0200

Bump version to 2.4.81

diff --git a/configure.ac b/configure.ac
index 43fcf68..1cfb8c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.80],
+[2.4.81],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],

libdrm: Changes to 'debian-experimental'

2017-04-19 Thread Andreas Boll 
 amdgpu/amdgpu-symbol-check |1 
 amdgpu/amdgpu.h|   18 
 amdgpu/amdgpu_gpu_info.c   |   15 +
 configure.ac   |4 +--
 debian/changelog   |8 +++
 debian/control |1 
 debian/libdrm-amdgpu1.symbols  |1 
 debian/libdrm-etnaviv1.symbols |1 
 debian/rules   |4 +--
 etnaviv/etnaviv-symbol-check   |1 
 etnaviv/etnaviv_cmd_stream.c   |   33 ++
 etnaviv/etnaviv_drm.h  |8 +++
 etnaviv/etnaviv_drmif.h|2 +
 exynos/exynos_drmif.h  |8 +++
 include/drm/drm.h  |3 +-
 include/drm/drm_mode.h |   45 -
 intel/intel_bufmgr_gem.c   |1 
 man/drm-kms.xml|4 +--
 man/drm-memory.xml |4 +--
 man/drm.xml|6 ++---
 man/drmAvailable.xml   |4 +--
 man/drmHandleEvent.xml |4 +--
 man/drmModeGetResources.xml|4 +--
 xf86drm.h  |9 +++-
 xf86drmMode.c  |   24 ++---
 25 files changed, 166 insertions(+), 47 deletions(-)

New commits:
commit 46437947b197de7b29a44e621d8aa6f8ccb3a29b
Author: Andreas Boll 
Date:   Wed Apr 19 15:35:30 2017 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 61c8c80..01d3d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.4.80-1) UNRELEASED; urgency=medium
+libdrm (2.4.80-1) experimental; urgency=medium
 
   * New upstream release.
   * Bump libdrm-amdgpu1's and libdrm-etnaviv1's symbols and shlibs.
   * Remove libpthread-stubs0-dev build-dep per configure.ac.
 
- -- Andreas Boll   Wed, 19 Apr 2017 14:32:11 +0200
+ -- Andreas Boll   Wed, 19 Apr 2017 15:35:21 +0200
 
 libdrm (2.4.77-1) experimental; urgency=medium
 

commit b96599896ad49b2a89fd50dddab3cf2300bd0fc9
Author: Andreas Boll 
Date:   Wed Apr 19 15:15:45 2017 +0200

Remove libpthread-stubs0-dev build-dep per configure.ac.

diff --git a/debian/changelog b/debian/changelog
index 2c063cc..61c8c80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.80-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Bump libdrm-amdgpu1's and libdrm-etnaviv1's symbols and shlibs.
+  * Remove libpthread-stubs0-dev build-dep per configure.ac.
 
  -- Andreas Boll   Wed, 19 Apr 2017 14:32:11 +0200
 
diff --git a/debian/control b/debian/control
index 28a1788..dc9d271 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends:
  libx11-dev,
  pkg-config,
  xutils-dev (>= 1:7.6+2),
- libpthread-stubs0-dev,
  libudev-dev [linux-any],
  libpciaccess-dev,
  valgrind [amd64 armhf i386 mips mipsel powerpc s390x],

commit 242b6dce383a533d0c24b134326475b57ede6a8c
Author: Andreas Boll 
Date:   Wed Apr 19 15:14:26 2017 +0200

Bump libdrm-amdgpu1's and libdrm-etnaviv1's symbols and shlibs.

diff --git a/debian/changelog b/debian/changelog
index 655ba84..2c063cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.80-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Bump libdrm-amdgpu1's and libdrm-etnaviv1's symbols and shlibs.
 
  -- Andreas Boll   Wed, 19 Apr 2017 14:32:11 +0200
 
diff --git a/debian/libdrm-amdgpu1.symbols b/debian/libdrm-amdgpu1.symbols
index f9e2702..8ffcb42 100644
--- a/debian/libdrm-amdgpu1.symbols
+++ b/debian/libdrm-amdgpu1.symbols
@@ -35,6 +35,7 @@ libdrm_amdgpu.so.1 libdrm-amdgpu1 #MINVER#
  amdgpu_query_hw_ip_count@Base 2.4.63
  amdgpu_query_hw_ip_info@Base 2.4.63
  amdgpu_query_info@Base 2.4.63
+ amdgpu_query_sensor_info@Base 2.4.80
  amdgpu_read_mm_registers@Base 2.4.63
  amdgpu_va_range_alloc@Base 2.4.63
  amdgpu_va_range_free@Base 2.4.63
diff --git a/debian/libdrm-etnaviv1.symbols b/debian/libdrm-etnaviv1.symbols
index b64859f..804ea27 100644
--- a/debian/libdrm-etnaviv1.symbols
+++ b/debian/libdrm-etnaviv1.symbols
@@ -13,6 +13,7 @@ libdrm_etnaviv.so.1 libdrm-etnaviv1 #MINVER#
  etna_bo_size@Base 0
  etna_cmd_stream_del@Base 0
  etna_cmd_stream_finish@Base 0
+ etna_cmd_stream_flush2@Base 2.4.80
  etna_cmd_stream_flush@Base 0
  etna_cmd_stream_new@Base 0
  etna_cmd_stream_reloc@Base 0
diff --git a/debian/rules b/debian/rules
index a86efea..c49a7be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,13 +108,13 @@ ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (>= 2.4.66)' -- -c4
 endif
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.39)' -- -c4
-   dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.77)' -- -c4
+   dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.80)' -- -c4
 ifeq

libdrm: Changes to 'debian-experimental'

2017-04-05 Thread Jordan Justen 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6c07d1158da1d1d4a7285f23cccfce189076b865
Author: Jordan Justen 
Date:   Wed Apr 5 02:32:12 2017 -0700

Upload to experimental

Signed-off-by: Jordan Justen 

diff --git a/debian/changelog b/debian/changelog
index 56e69dc..2aac5a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-libdrm (2.4.77-1) UNRELEASED; urgency=medium
+libdrm (2.4.77-1) experimental; urgency=medium
 
+  * Team upload.
   * New upstream release.
   * Bump libdrm-amdgpu1 symbols.
   * Update debian/upstream/signing-key.asc
 
- -- Jordan Justen   Tue, 04 Apr 2017 23:14:32 -0700
+ -- Jordan Justen   Wed, 05 Apr 2017 02:30:35 -0700
 
 libdrm (2.4.76-1) experimental; urgency=medium

libdrm: Changes to 'debian-experimental'

2017-04-05 Thread Jordan Justen 
 debian/changelog|1 +
 debian/upstream/signing-key.asc |   29 +
 2 files changed, 30 insertions(+)

New commits:
commit 8ad72f62c4e424994d2c260358de475a7d843bd2
Author: Jordan Justen 
Date:   Wed Apr 5 02:05:45 2017 -0700

Update debian/upstream/signing-key.asc for 2.4.77 release

Signed-off-by: Jordan Justen 

diff --git a/debian/changelog b/debian/changelog
index 27ecdda..56e69dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.77-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Bump libdrm-amdgpu1 symbols.
+  * Update debian/upstream/signing-key.asc
 
  -- Jordan Justen   Tue, 04 Apr 2017 23:14:32 -0700
 
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index e632747..a64788b 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -598,3 +598,32 @@ 
EIzR31UpdSl7BfsAniKIAni1DrAS4TqxwrtBFVRcuzONAJ0RP4DQCKBzcJGXntI0
 U9e5j9NIWQ==
 =+7XN
 -END PGP PUBLIC KEY BLOCK-
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+mQENBEs4zy4BCADrgW7vSDg+wgCONNN3jiu2ieWvBzuYyFH8dyHkQRk7FB1Zje+z
+ZBq2QQ+oylTHhJrppW6HPDhHUcaRt5TmZ2nmcCPBs+FtwOYLpxr9wMCYFYllDLIH
+WYMPcVXcL10I+KiVzl+jGPVk/e/xedem6H0z6v27EmITwJ7016TbVy+pCIT+wCSV
+kAyqi5Wm0klUXJfuHkim4GNubWd/3MC7cRwUA53XRteHHB5WQ1Zd+kQ9Air7o6ds
+sZBW0tVTUck8VpLWrcYKH+1xF0ka2Jqt4zShH5u2okxt/epUq/J/+qAvyc35+mIa
+8ZvqivXzjKqRe9ewGNwkpdZJPbPJnU5zPeN5ABEBAAG0IE1hcmVrIE9sxaHDoWsg
+PG1hcmFlb0BnbWFpbC5jb20+iQE3BBMBAgAhBQJLOM8uAhsDBgsJCAcDAgYVCAIJ
+CgsDFgIBAh4BAheAAAoJEP3RXVrO8PKxfzMH/2o94lpBwoMZkejjbf0DfdMzEHPL
+wA7Op6/xlZ1piXDltEBQejf9wqg07wO2gilG+cK/BT1kwuHzvFa4zGxsYwO3TgBW
+7Yk9vHMClC2NAHalLVADOronmLQQ8mIVFz4n397ruItpxNWXZMzwbT+13P3BHRKF
+KXYGEFEJhzplBjxHnArvz2z7wqKzZ7FVAEENy9VzNBNsVQ6SNgaMfNRIrk4tA5pr
+c1WanAPMjEvY14MF56HiraVWOpEfcLb0MhXan90OqLH3fLp0PTLuYluVxmV83uC4
+WARJgwFJ75aD0Pwc+J4aA0l3xWIHnaW4VGQ4tq+k4W1uASf2hlh0qEh9qy+5AQ0E
+SzjPLgEIAMqxvL8X+yUyfcEnsdSu0NopvGQJK7m9DIK6tmqKvG/MrttN2yCTgVDy
+kgeOfDQc/NLbqYGcql9tUj2o49fMriOBaVcmwERtOKtZxyhJndurpErZOoOERusZ
++8jDSk9zNM+DOf42OcXdkA8X3MrFXBLxyVinhm8KZfpzPZfYWAncIXbJOJxlsuld
+GgpIX1kdjlt6Ubr5bqh5DfEL8x9zE67IxRNii8izAAxHXe4zz+Shw32zLmBakfg5
+Y+mZV4gH7ZAK6tehXVMyQKMMysBsj7htyZfGsWKQQiCyh/khRYD1FX1B4EA+F+yi
+e1G5VC//+3q3zQtgaeTB785PUmwaYw0AEQEAAYkBHwQYAQIACQUCSzjPLgIbDAAK
+CRD90V1azvDysbHFB/9np2y7CDRcDyNxbuR2dEqljmKzqUaD544ndZ7sogRgD/bX
+zsYdO2a2DjzhV5K1tLbHS4iKXcCf4kUhp66PZUrFv3mwTy7bzLjyrjcTrsCc5EBT
+GGxNTO68jxXZk/Ub0l0ucsMifHQ0xDwPaRsHeyorO3zY8AxUwNdXkvvUACVGbBAR
+B3NmKY/eKQuoui5gkcUpRgx+CoPkG9blkzm0//yVCTw9W/CYIx3gfwhHsEBG8EY9
+WFky7Rfc+n74AJyQiyJrB+4zuVZh/6htoF4M/UdVog2sjCox+jWa4/Y9kvsmkKxV
+/Q9EzbofA9OOmDKsfVaG8ZsLy9S6wWj2IcWibYCD
+=/DNd
+-END PGP PUBLIC KEY BLOCK-

libdrm: Changes to 'debian-experimental'

2017-04-05 Thread Jordan Justen 
 Android.common.mk |4 +-
 Android.mk|2 +
 amdgpu/amdgpu-symbol-check|1 
 amdgpu/amdgpu.h   |   28 ++
 amdgpu/amdgpu_bo.c|   28 +++---
 configure.ac  |   22 ---
 debian/changelog  |7 +++
 debian/libdrm-amdgpu1.symbols |1 
 debian/rules  |2 -
 etnaviv/etnaviv_gpu.c |   72 ++
 etnaviv/etnaviv_priv.h|   22 +--
 exynos/exynos_drm.c   |2 -
 exynos/exynos_fimg2d.c|   14 ---
 include/drm/README|4 --
 include/drm/amdgpu_drm.h  |   56 +
 tegra/tegra-symbol-check  |7 ++-
 tests/etnaviv/Makefile.am |1 
 tests/exynos/exynos_fimg2d_test.c |   43 --
 tests/util/Android.mk |2 +
 xf86drm.c |   18 ++---
 20 files changed, 212 insertions(+), 124 deletions(-)

New commits:
commit 677169e627f6fffe0518d6f6f6a056b01c1d50c2
Author: Jordan Justen 
Date:   Tue Apr 4 23:30:06 2017 -0700

Bump libdrm-amdgpu1 symbols

Signed-off-by: Jordan Justen 

diff --git a/debian/changelog b/debian/changelog
index 50ca4a7..27ecdda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.77-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Bump libdrm-amdgpu1 symbols.
 
  -- Jordan Justen   Tue, 04 Apr 2017 23:14:32 -0700
 
diff --git a/debian/libdrm-amdgpu1.symbols b/debian/libdrm-amdgpu1.symbols
index b4e4d68..f9e2702 100644
--- a/debian/libdrm-amdgpu1.symbols
+++ b/debian/libdrm-amdgpu1.symbols
@@ -11,6 +11,7 @@ libdrm_amdgpu.so.1 libdrm-amdgpu1 #MINVER#
  amdgpu_bo_query_info@Base 2.4.63
  amdgpu_bo_set_metadata@Base 2.4.63
  amdgpu_bo_va_op@Base 2.4.63
+ amdgpu_bo_va_op_raw@Base 2.4.77
  amdgpu_bo_wait_for_idle@Base 2.4.63
  amdgpu_create_bo_from_user_mem@Base 2.4.63
  amdgpu_cs_create_semaphore@Base 2.4.67
diff --git a/debian/rules b/debian/rules
index eb92a40..a86efea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,7 +108,7 @@ ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (>= 2.4.66)' -- -c4
 endif
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.39)' -- -c4
-   dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.73)' -- -c4
+   dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.77)' -- -c4
 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

commit 9116ff106b759d87053ad8a188068354282970d7
Author: Jordan Justen 
Date:   Tue Apr 4 23:15:22 2017 -0700

Start 2.4.77-1 changelog entry

Signed-off-by: Jordan Justen 

diff --git a/debian/changelog b/debian/changelog
index 7608577..50ca4a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.77-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Jordan Justen   Tue, 04 Apr 2017 23:14:32 -0700
+
 libdrm (2.4.76-1) experimental; urgency=medium
 
   * New upstream release.

commit e61e999838faa65f1c5cbddfbda06125be19e353
Author: Marek Olšák 
Date:   Tue Apr 4 11:36:00 2017 +0200

configure.ac: bump the version to 2.4.77

diff --git a/configure.ac b/configure.ac
index f1a1309..036f65a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.76],
+[2.4.77],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit 63120172668610cebfd01e89f67e73037037dfd9
Author: Emil Velikov 
Date:   Thu Mar 30 18:01:12 2017 +0100

configure.ac: bring back pthread-stubs check

Accidentally removed with earlier commit. Although rather than simply
adding the check for all platforms, use the same heuristics as we do in
mesa.

Namely: pthread-stubs is a thing only for BSD platforms. Everyone else
should have lightweight pthread API in their C runtime library.

Fixes: 4ecd1ef010b ("xf86drm: fix null termination of string buffer")
Signed-off-by: Emil Velikov 
Reviewed-by: Eric Engestrom 

diff --git a/configure.ac b/configure.ac
index 6a60ffc..f1a1309 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,10 +61,22 @@ AC_CHECK_HEADERS([sys/sysctl.h sys/select.h])
 LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
-
-
-AC_SUBST(PTHREADSTUBS_CFLAGS)
-AC_SUBST(PTHREADSTUBS_LIBS)
+dnl pthread-stubs is mandatory on BSD platforms, due to the nature of the
+dnl project. Even then there's a notable issue as

libdrm: Changes to 'debian-experimental'

2017-03-30 Thread Andreas Boll 
 amdgpu/amdgpu_device.c |   24 --
 amdgpu/amdgpu_gpu_info.c   |   72 +++
 amdgpu/amdgpu_internal.h   |4 
 amdgpu/amdgpu_vamgr.c  |6 
 autogen.sh |   10 
 configure.ac   |3 
 debian/changelog   |7 
 debian/source/local-options|3 
 freedreno/Makefile.am  |1 
 freedreno/freedreno_bo.c   |   12 +
 freedreno/freedreno_bo_cache.c |4 
 freedreno/freedreno_device.c   |3 
 freedreno/freedreno_priv.h |   56 +
 freedreno/kgsl/kgsl_device.c   |2 
 freedreno/msm/msm_device.c |2 
 freedreno/msm/msm_ringbuffer.c |7 
 include/drm/README |2 
 include/drm/amdgpu_drm.h   |  409 +---
 intel/intel_bufmgr_gem.c   |   50 +---
 intel/intel_decode.c   |3 
 tests/amdgpu/basic_tests.c |   27 ++
 tests/amdgpu/cs_tests.c|   41 ++--
 tests/amdgpu/vce_tests.c   |   54 -
 tests/drmstat.c|  419 -
 24 files changed, 521 insertions(+), 700 deletions(-)

New commits:
commit eeabddf723b1c57d758ea60c8c0fd490b759e295
Author: Andreas Boll 
Date:   Thu Mar 30 10:41:27 2017 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 3d1faa6..7608577 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdrm (2.4.76-1) UNRELEASED; urgency=medium
+libdrm (2.4.76-1) experimental; urgency=medium
 
   * New upstream release.
   * Update extend-diff-ignore.
 
- -- Andreas Boll   Thu, 30 Mar 2017 10:22:45 +0200
+ -- Andreas Boll   Thu, 30 Mar 2017 10:41:10 +0200
 
 libdrm (2.4.75-2) experimental; urgency=medium
 

commit a7a448b94733dc8ee92999bc87eeea3be6a283bd
Author: Andreas Boll 
Date:   Thu Mar 30 10:23:38 2017 +0200

Update extend-diff-ignore.

diff --git a/debian/changelog b/debian/changelog
index 9268004..3d1faa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.76-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Update extend-diff-ignore.
 
  -- Andreas Boll   Thu, 30 Mar 2017 10:22:45 +0200
 
diff --git a/debian/source/local-options b/debian/source/local-options
index 91254fb..7c47457 100644
--- a/debian/source/local-options
+++ b/debian/source/local-options
@@ -8,6 +8,3 @@ extend-diff-ignore = Android.*mk|CleanSpec\.mk
 
 # misc. files and scripts used by libdrm developers but not required for the 
build
 extend-diff-ignore = \.editorconfig|RELEASING|autogen\.sh|freedreno/kgsl/README
-
-# dead code
-extend-diff-ignore = tests/drmstat\.c

commit 45c309d8103e245aa3b6377ba9d7cf8e20094812
Author: Andreas Boll 
Date:   Thu Mar 30 10:22:54 2017 +0200

Bump changelog

diff --git a/debian/changelog b/debian/changelog
index 9a24258..9268004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.76-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Boll   Thu, 30 Mar 2017 10:22:45 +0200
+
 libdrm (2.4.75-2) experimental; urgency=medium
 
   * Cherry-pick 19c4cfc (intel: Add handle to hashtable before freeing

commit 8d61a9a923c1ced974180609611ef615034fd484
Author: Marek Olšák 
Date:   Wed Mar 29 20:06:22 2017 +0200

configure.ac: bump version for release

diff --git a/configure.ac b/configure.ac
index 2e50d3e..6a60ffc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.75],
+[2.4.76],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit c7b5aaeb1f77a53a46c091b1ba999a76baa6c3fb
Author: Leo Liu 
Date:   Thu Mar 23 10:43:40 2017 -0400

amdgpu_drm: add AMDGPU_HW_IP_UVD_ENC

Signed-off-by: Leo Liu 
Reviewed-by: Alex Deucher 
Signed-off-by: Marek Olšák 

diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h
index 1e25a87..fa56499 100644
--- a/include/drm/amdgpu_drm.h
+++ b/include/drm/amdgpu_drm.h
@@ -388,7 +388,8 @@ struct drm_amdgpu_gem_va {
 #define AMDGPU_HW_IP_DMA  2
 #define AMDGPU_HW_IP_UVD  3
 #define AMDGPU_HW_IP_VCE  4
-#define AMDGPU_HW_IP_NUM  5
+#define AMDGPU_HW_IP_UVD_ENC  5
+#define AMDGPU_HW_IP_NUM  6
 
 #define AMDGPU_HW_IP_INSTANCE_MAX_COUNT 1
 

commit f684bb109fcdb85faa1b212bb6efcc352d8cbcdc
Author: Christian König 
Date:   Mon Mar 27 15:44:14 2017 +0200

amdgpu: stop reading CC_RB_BACKEND_DISABLE on Vega10

Follow up to 'drm: don't access deprecated register on Vega10'.

The same information is available in enabled_rb_pipes_mask and reading that
register can

libdrm: Changes to 'debian-experimental'

2017-03-21 Thread Andreas Boll 
 debian/changelog |7 +++
 intel/intel_bufmgr_gem.c |8 
 2 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit bdecb10d8715d2ef31972801d24f3797f14dbaf7
Author: Andreas Boll 
Date:   Tue Mar 21 18:29:27 2017 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 7a3157b..9a24258 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdrm (2.4.75-2) UNRELEASED; urgency=medium
+libdrm (2.4.75-2) experimental; urgency=medium
 
   * Cherry-pick 19c4cfc (intel: Add handle to hashtable before freeing
 along an error path) from upstream (LP: #1671377).
 
- -- Andreas Boll   Tue, 21 Mar 2017 18:18:31 +0100
+ -- Andreas Boll   Tue, 21 Mar 2017 18:29:17 +0100
 
 libdrm (2.4.75-1) experimental; urgency=medium
 

commit c5b078451cc016e236ae7899b660710fdfc7b0a5
Author: Andreas Boll 
Date:   Tue Mar 21 18:19:19 2017 +0100

Document the cherry-pick in debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 07f871e..7a3157b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.75-2) UNRELEASED; urgency=medium
+
+  * Cherry-pick 19c4cfc (intel: Add handle to hashtable before freeing
+along an error path) from upstream (LP: #1671377).
+
+ -- Andreas Boll   Tue, 21 Mar 2017 18:18:31 +0100
+
 libdrm (2.4.75-1) experimental; urgency=medium
 
   * New upstream release.

commit 7de1dfe3906bddabda1519c98f1c37900a34b41e
Author: Chris Wilson 
Date:   Wed Mar 8 21:00:59 2017 +

intel: Add handle to hashtable before freeing along an error path

drm_intel_gem_bo_free() unconditionally attempts to remove the handle
from the hashtable. This goes horribly wrong if we haven't already added
the bo to the hashtable.

Reported-by: Michael Thayer 
Signed-off-by: Chris Wilson 
(cherry picked from commit 19c4cfc54918d361f2535aec16650e9f0be667cd)

diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index a665600..459cc4f 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -832,6 +832,10 @@ retry:
}
 
bo_gem->gem_handle = create.handle;
+   HASH_ADD(handle_hh, bufmgr_gem->handle_table,
+gem_handle, sizeof(bo_gem->gem_handle),
+bo_gem);
+
bo_gem->bo.handle = bo_gem->gem_handle;
bo_gem->bo.bufmgr = bufmgr;
bo_gem->bo.align = alignment;
@@ -844,10 +848,6 @@ retry:
 tiling_mode,
 stride))
goto err_free;
-
-   HASH_ADD(handle_hh, bufmgr_gem->handle_table,
-gem_handle, sizeof(bo_gem->gem_handle),
-bo_gem);
}
 
bo_gem->name = name;

libdrm: Changes to 'debian-experimental'

2017-02-01 Thread Andreas Boll 
 .editorconfig|   19 
 Android.common.mk|   12 
 Android.mk   |   17 
 README   |6 
 amdgpu/Android.mk|8 
 autogen.sh   |6 
 configure.ac |   11 
 debian/changelog |9 
 debian/libdrm-intel1.symbols |4 
 debian/libdrm2.symbols   |2 
 debian/rules |4 
 debian/source/format |1 
 debian/source/local-options  |6 
 etnaviv/Android.mk   |8 
 freedreno/Android.mk |8 
 include/drm/i915_drm.h   |  276 +++-
 intel/Android.mk |8 
 intel/intel-symbol-check |4 
 intel/intel_bufmgr.h |   11 
 intel/intel_bufmgr_gem.c |  106 
 libkms/Android.mk|6 
 libkms/Makefile.am   |4 
 libkms/exynos.c  |3 
 libkms/linux.c   |   94 
 nouveau/Android.mk   |8 
 radeon/Android.mk|8 
 tests/Makefile.am|   46 --
 tests/amdgpu/amdgpu_test.c   |  259 ++-
 tests/amdgpu/amdgpu_test.h   |3 
 tests/amdgpu/basic_tests.c   |7 
 tests/amdgpu/bo_tests.c  |   13 
 tests/amdgpu/cs_tests.c  |8 
 tests/amdgpu/vce_tests.c |8 
 tests/auth.c |  138 --
 tests/dristat.c  |  285 
 tests/drmdevice.c|   60 ++
 tests/drmtest.c  |  135 --
 tests/drmtest.h  |   40 -
 tests/exynos/Makefile.am |4 
 tests/getclient.c|   61 --
 tests/getstats.c |   50 --
 tests/getversion.c   |   49 --
 tests/lock.c |  264 ---
 tests/modetest/Android.mk|3 
 tests/modetest/Makefile.am   |4 
 tests/modetest/modetest.c|   28 -
 tests/name_from_fd.c |   58 --
 tests/nouveau/Makefile.am|8 
 tests/openclose.c|   37 -
 tests/proptest/Android.mk|3 
 tests/setversion.c   |   91 
 tests/updatedraw.c   |  154 --
 tests/util/Android.mk|7 
 tests/util/kms.c |1 
 xf86drm.c|  962 +++
 xf86drm.h|   45 +-
 xf86drmMode.c|2 
 xf86drmMode.h|   19 
 58 files changed, 1747 insertions(+), 1754 deletions(-)

New commits:
commit c42cc002ab6ec4f757c3fe8fed52fe8915a052cb
Author: Andreas Boll 
Date:   Wed Feb 1 17:08:39 2017 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index c14b7dd..07f871e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdrm (2.4.75-1) UNRELEASED; urgency=medium
+libdrm (2.4.75-1) experimental; urgency=medium
 
   * New upstream release.
   * Bump libdrm2's and libdrm-intel1's symbols and shlibs.
   * Update extend-diff-ignore.
   * Add debian/source/format file.
 
- -- Andreas Boll   Wed, 01 Feb 2017 15:56:49 +0100
+ -- Andreas Boll   Wed, 01 Feb 2017 17:08:17 +0100
 
 libdrm (2.4.74-2) experimental; urgency=medium
 

commit b7994bd7068cfd5956933abea1f06282a3a1a465
Author: Andreas Boll 
Date:   Wed Feb 1 16:54:40 2017 +0100

Add debian/source/format file.

diff --git a/debian/changelog b/debian/changelog
index eda5cd3..c14b7dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libdrm (2.4.75-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump libdrm2's and libdrm-intel1's symbols and shlibs.
   * Update extend-diff-ignore.
+  * Add debian/source/format file.
 
  -- Andreas Boll   Wed, 01 Feb 2017 15:56:49 +0100
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0

commit c408f868497cc33e2cc2b94522ab5e7bb328d97a
Author: Andreas Boll 
Date:   Wed Feb 1 16:52:42 2017 +0100

Update extend-diff-ignore.

diff --git a/debian/changelog b/debian/changelog
index af6bbac..eda5cd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.75-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Bump libdrm2's and libdrm-intel1's symbols and shlibs.
+  * Update extend-diff-ignore.
 
  -- Andreas Boll   Wed, 01 Feb 2017 15:56:49 +0100
 
diff --git a/debian/source/local-options b/debian/source/local-options
index b0c5d03..91254fb 100644
--- a/debian/source/local-options
+++ b/debian/source/local-options
@@ -4,10 +4,10 @@ extend-diff-ignore = intel/tests/g.*batch.sh
 ## The following files aren't shipped in the upstream tarball
 
 # Android Makefiles
-extend-diff-ignore = Android\.mk|CleanSpec\.mk
+extend-diff-ignore = Android.*mk|CleanSpec\.mk
 
 # misc. files and scripts used by libdrm developers but not required for

libdrm: Changes to 'debian-experimental'

2017-01-31 Thread Emilio Pozuelo Monfort 
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c486c35147217096a37bb8435fb74e3f287bf317
Author: Emilio Pozuelo Monfort 
Date:   Tue Jan 31 00:50:33 2017 +0100

Actually, release to experimenal

diff --git a/debian/changelog b/debian/changelog
index 59fef5f..5e2e240 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.74-2) unstable; urgency=medium
+libdrm (2.4.74-2) experimental; urgency=medium
 
   [ Andreas Boll ]
   * Switch to dbgsym packages.

libdrm: Changes to 'debian-experimental'

2017-01-29 Thread Emilio Pozuelo Monfort 
 debian/changelog |9 +++--
 debian/rules |5 +
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit f86cfaab07a02543f48dca559f9476ad5ea31bba
Author: Emilio Pozuelo Monfort 
Date:   Fri Jan 27 17:54:06 2017 +0100

Release to unstable

diff --git a/debian/changelog b/debian/changelog
index 535df57..59fef5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.74-2) UNRELEASED; urgency=medium
+libdrm (2.4.74-2) unstable; urgency=medium
 
   [ Andreas Boll ]
   * Switch to dbgsym packages.
@@ -8,7 +8,7 @@ libdrm (2.4.74-2) UNRELEASED; urgency=medium
   * Stop passing --disable-silent-rules to configure, debhelper does it now.
   * Don't override dh_auto_install, it defaults to debian/tmp.
 
- -- Andreas Boll   Fri, 27 Jan 2017 15:15:41 +0100
+ -- Emilio Pozuelo Monfort   Fri, 27 Jan 2017 17:54:01 +0100
 
 libdrm (2.4.74-1) unstable; urgency=medium
 

commit 350d2c1854152f4a91dd36f571f5b890437e08cd
Author: Emilio Pozuelo Monfort 
Date:   Fri Jan 27 17:51:57 2017 +0100

Don't override dh_auto_install

diff --git a/debian/changelog b/debian/changelog
index 6d2105b..535df57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libdrm (2.4.74-2) UNRELEASED; urgency=medium
 
   [ Emilio Pozuelo Monfort ]
   * Stop passing --disable-silent-rules to configure, debhelper does it now.
+  * Don't override dh_auto_install, it defaults to debian/tmp.
 
  -- Andreas Boll   Fri, 27 Jan 2017 15:15:41 +0100
 
diff --git a/debian/rules b/debian/rules
index 9513d3a..067ed60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,9 +95,6 @@ override_dh_auto_configure:
 override_dh_auto_test:
dh_auto_test || echo "Test suite failure, but keeping on anyway"
 
-override_dh_auto_install:
-   dh_auto_install --destdir=debian/tmp
-
 override_dh_install:
find debian/tmp -name '*.la' -delete
dh_install --fail-missing

commit fe520bb902fc71b532ae921024e1e4ef3b82388b
Author: Emilio Pozuelo Monfort 
Date:   Fri Jan 27 17:50:25 2017 +0100

Stop passing --disable-silent-rules to configure

diff --git a/debian/changelog b/debian/changelog
index d807bf6..6d2105b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 libdrm (2.4.74-2) UNRELEASED; urgency=medium
 
+  [ Andreas Boll ]
   * Switch to dbgsym packages.
   * Enable building etnaviv on armhf (Closes: #852685).
 
+  [ Emilio Pozuelo Monfort ]
+  * Stop passing --disable-silent-rules to configure, debhelper does it now.
+
  -- Andreas Boll   Fri, 27 Jan 2017 15:15:41 +0100
 
 libdrm (2.4.74-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 7ba2a69..9513d3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,7 +90,7 @@ endif
 ###
 
 override_dh_auto_configure:
-   dh_auto_configure -- --disable-silent-rules --enable-static=yes 
$(confflags)
+   dh_auto_configure -- --enable-static=yes $(confflags)
 
 override_dh_auto_test:
dh_auto_test || echo "Test suite failure, but keeping on anyway"

libdrm: Changes to 'debian-experimental'

2017-01-27 Thread Andreas Boll 
 .gitignore  |   15 
 Android.mk  |   43 
 CleanSpec.mk|1 
 Makefile.am |   35 
 Makefile.sources|   14 
 README  |2 
 RELEASING   |   39 
 amdgpu/Android.mk   |   18 
 amdgpu/Makefile.am  |   47 
 amdgpu/Makefile.sources |   15 
 amdgpu/amdgpu-symbol-check  |   56 
 amdgpu/amdgpu.h | 1258 +++
 amdgpu/amdgpu_asic_id.h |  165 ++
 amdgpu/amdgpu_bo.c  |  705 +++
 amdgpu/amdgpu_cs.c  |  544 
 amdgpu/amdgpu_device.c  |  320 +
 amdgpu/amdgpu_gpu_info.c|  316 
 amdgpu/amdgpu_internal.h|  204 +++
 amdgpu/amdgpu_vamgr.c   |  287 
 amdgpu/libdrm_amdgpu.pc.in  |   11 
 amdgpu/util_hash.c  |  387 ++
 amdgpu/util_hash.h  |  107 +
 amdgpu/util_hash_table.c|  262 
 amdgpu/util_hash_table.h|   73 +
 configure.ac|  160 ++
 debian/changelog|  171 ++
 debian/compat   |2 
 debian/control  |  170 --
 debian/copyright|2 
 debian/libdrm-amdgpu1.install   |1 
 debian/libdrm-amdgpu1.symbols   |   40 
 debian/libdrm-etnaviv1.install  |1 
 debian/libdrm-etnaviv1.symbols  |   31 
 debian/libdrm-exynos1.symbols   |3 
 debian/libdrm-freedreno1.symbols|8 
 debian/libdrm-intel1.symbols|8 
 debian/libdrm-nouveau2.symbols  |8 
 debian/libdrm2.symbols  |   19 
 debian/patches/01_default_perms.diff|   12 
 debian/rules|   74 -
 debian/source/local-options |   14 
 debian/upstream/signing-key.asc |  600 +
 debian/watch|3 
 etnaviv/Android.mk  |   18 
 etnaviv/Makefile.am |   26 
 etnaviv/Makefile.sources|   12 
 etnaviv/etnaviv-symbol-check|   48 
 etnaviv/etnaviv_bo.c|  347 +
 etnaviv/etnaviv_bo_cache.c  |  196 +++
 etnaviv/etnaviv_cmd_stream.c|  243 +++
 etnaviv/etnaviv_device.c|  119 +
 etnaviv/etnaviv_drm.h   |  233 +++
 etnaviv/etnaviv_drmif.h |  191 +++
 etnaviv/etnaviv_gpu.c   |  175 ++
 etnaviv/etnaviv_pipe.c  |   83 +
 etnaviv/etnaviv_priv.h  |  201 +++
 etnaviv/libdrm_etnaviv.pc.in|   11 
 exynos/Makefile.am  |5 
 exynos/exynos-symbol-check  |   40 
 exynos/exynos_drm.c |  104 +
 exynos/exynos_drm.h |   12 
 exynos/exynos_drmif.h   |   26 
 exynos/exynos_fimg2d.c  |  589 ++---
 exynos/exynos_fimg2d.h  |   18 
 exynos/libdrm_exynos.pc.in  |2 
 freedreno/Android.mk|   13 
 freedreno/Makefile.am   |   10 
 freedreno/Makefile.sources  |4 
 freedreno/README|   16 
 freedreno/freedreno-symbol-check|   60 
 freedreno/freedreno_bo.c|  226 ---
 freedreno/freedreno_bo_cache.c  |  222 +++
 freedreno/freedreno_device.c|   77 -
 freedreno/freedreno_drmif.h |   21 
 freedreno/freedreno_pipe.c  |   20 
 freedreno/freedreno_priv.h  |   57 
 freedreno/freedreno_ringbuffer.c|   95 +
 freedreno/freedreno_ringbuffer.h|   29 
 freedreno/kgsl/README   |   26 
 freedreno/kgsl/kgsl_bo.c|   21 
 freedreno/kgsl/kgsl_device.c|4 
 freedreno/kgsl/kgsl_drm.h   |2 
 freedreno/kgsl/kgsl_pipe.c  |   34 
 freedreno/kgsl/kgsl_priv.h  |   33 
 freedreno/kgsl/kgsl_ringbuffer.c|   23 
 freedreno/kgsl/msm_kgsl.h   |4 
 freedreno/list.h|  137 --
 freedreno/msm/msm_bo.c  |   32 
 freedreno/msm/msm_device.c  |7 
 freedreno/msm/msm_drm.h |  131 +-
 freedreno/msm/msm_pipe.c|   57 
 freedreno/msm/msm_priv.h|   27 
 freedreno/msm/msm_ringbuffer.c  |  515 ++--
 include/drm/README  |  157 ++
 include/drm/amdgpu_drm.h|  657 ++
 include/drm/drm.h   |   90 +
 include/drm/drm_fourcc.h|  108 +
 include/drm/drm_mode.h  |  259 +++-
 include/drm/drm_sarea.h

libdrm: Changes to 'debian-experimental'

2015-04-20 Thread Timo Aaltonen 
 debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c6c6dc7c420384ffa03d8e1c245258c25ec09a2
Author: Timo Aaltonen tjaal...@debian.org
Date:   Tue Apr 21 07:56:29 2015 +0300

fix a typo

diff --git a/debian/control b/debian/control
index a311726..aba1715 100644
--- a/debian/control
+++ b/debian/control
@@ -285,7 +285,7 @@ Depends:
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
-Description: Userspace interface to exynos-specific kernel DRM services -- 
runtime
+Description: Userspace interface to tegra-specific kernel DRM services -- 
runtime
  This library implements the userspace interface to the kernel DRM
  services.  DRM stands for Direct Rendering Manager, which is the
  kernelspace portion of the Direct Rendering Infrastructure (DRI).


-- 
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/e1ykqek-000376...@moszumanska.debian.org

libdrm: Changes to 'debian-experimental'

2015-04-20 Thread Timo Aaltonen 
 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit b7cb83801c91a64950f27dd6f80f209969419b9e
Author: Timo Aaltonen tjaal...@debian.org
Date:   Tue Apr 21 08:08:58 2015 +0300

changelog for previous

diff --git a/debian/changelog b/debian/changelog
index 02797f3..f4a428f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.60-3) UNRELEASED; urgency=medium
+
+  * control: Add a typo in libdrm-tegra0 description.
+
+ -- Timo Aaltonen tjaal...@debian.org  Tue, 21 Apr 2015 08:08:08 +0300
+
 libdrm (2.4.60-2) experimental; urgency=medium
 
   [ Maarten Lankhorst ]


-- 
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/e1ykqqj-0005lk...@moszumanska.debian.org

libdrm: Changes to 'debian-experimental'

2015-04-08 Thread Timo Aaltonen 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 621b14add0723d7c54a6ddca9f6d9fad36b56eeb
Author: Timo Aaltonen tjaal...@debian.org
Date:   Wed Apr 8 09:21:30 2015 +0300

release to experimental

diff --git a/debian/changelog b/debian/changelog
index d534449..02797f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libdrm (2.4.60-2) UNRELEASED; urgency=medium
+libdrm (2.4.60-2) experimental; urgency=medium
 
+  [ Maarten Lankhorst ]
   * Fix ftbfs on armhf.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Sat, 21 Mar 2015 
19:13:25 +0100
+ -- Timo Aaltonen tjaal...@debian.org  Wed, 08 Apr 2015 09:21:00 +0300
 
 libdrm (2.4.60-1) experimental; urgency=medium
 


-- 
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/e1yfjqj-0005ww...@moszumanska.debian.org

libdrm: Changes to 'debian-experimental'

2015-03-21 Thread Maarten Bernardus Lankhorst 
 debian/changelog  |6 ++
 debian/libdrm-exynos1.symbols |1 +
 2 files changed, 7 insertions(+)

New commits:
commit 3d3021cf4c7e5861e5630079c9bcfa5ca133924d
Author: Maarten Lankhorst d...@mblankhorst.nl
Date:   Sat Mar 21 19:13:57 2015 +0100

Fix ftbfs on armhf.

diff --git a/debian/changelog b/debian/changelog
index bf0f03a..d534449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.60-2) UNRELEASED; urgency=medium
+
+  * Fix ftbfs on armhf.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Sat, 21 Mar 2015 
19:13:25 +0100
+
 libdrm (2.4.60-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/libdrm-exynos1.symbols b/debian/libdrm-exynos1.symbols
index 445f2b4..46b445b 100644
--- a/debian/libdrm-exynos1.symbols
+++ b/debian/libdrm-exynos1.symbols
@@ -17,4 +17,5 @@ libdrm_exynos.so.1 libdrm-exynos1 #MINVER#
  g2d_exec@Base 0
  g2d_fini@Base 0
  g2d_init@Base 0
+ g2d_scale_and_blend@Base 2.4.60
  g2d_solid_fill@Base 0


-- 
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/e1yzoal-0004z5...@moszumanska.debian.org

libdrm: Changes to 'debian-experimental'

2015-02-16 Thread Maarten Bernardus Lankhorst 
New branch 'debian-experimental' available with the following commits:
commit dc19569b312468c05c83f79ab2dadfe8bb82cf66
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Mon Feb 16 11:53:13 2015 +0100

suppress dpkg-source errors from building against a source with copies 
instead of symlinks

commit 442664a7f27581adb9bae16b5288a4285cbc0f60
Merge: efa46b3 d3ae9a1
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Wed Jan 21 13:30:39 2015 +0100

Merge correct debian-unstable into debian-experimental

Sorry about the mess.

commit d3ae9a1811ffd947d301ac73e63d76ec9b4df67c
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Wed Jan 21 13:24:34 2015 +0100

release to experimental

commit f326aeba862c98e48bc2d5db6b97e5c6afa4dbf9
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Wed Jan 21 13:11:38 2015 +0100

New upstream release.

Add libdrm-tegra0 on arm.
Update symbols for intel userptr support.
Update symbols for freedreno dma-buf support.

commit 9575b00185e283658a3ad392b088e999658628fb
Merge: 61c5e63 d2e0f55
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Wed Jan 21 12:28:43 2015 +0100

Merge branch 'upstream' into debian-experimental

commit d2e0f552467ca11162fe04dfed55de4590280f23
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Wed Jan 21 11:11:55 2015 +0100

configure.ac: bump version to 2.4.59 for release

commit d5bfbdc62ffc3eee4beabc84e78f47970eb9dbae
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Wed Jan 21 11:46:04 2015 +0100

only enable support for freedreno on arm automatically

Users can still override this by explicitly passing --enable-freedreno
to configure.

Signed-off-by: Maarten Lankhorst maarten.lankho...@ubuntu.com

commit eca91cf163d50090db36d0b2abbffcff813a2adf
Author: Dave Airlie airl...@redhat.com
Date:   Fri Jan 9 13:34:41 2015 +1000

radeon: align r600/700 fmask to 128 X blocks.

After much searching and empricial testing, and reading of
things I've no justifcation for this fix, other than it really
appears this is what the hw is doing or close enough.

It makes sense that each entry in the FMASK corresponds to
an entry in the CMASKm and the CMASK is organised into 128x128
blocks, but I can't find anything in any of the docs/info from AMD.

But I've spent a lot of time on this, and this seems to be the
simplest fix, in that we don't over allocate things too much,
once this fix in place we can nuke the extra multiplier in mesa.

Reviewed-by: Alex Deucher alexander.deuc...@amd.com
Reviewed-by: Marek Olšák marek.ol...@amd.com
Signed-off-by: Dave Airlie airl...@redhat.com

commit a5003c6f859c90d6e7693ce085c1cb4dd7d95f26
Author: Rob Clark robcl...@freedesktop.org
Date:   Tue Jan 13 11:00:09 2015 -0500

configure/freedreno: enable freedreno by default

Now that enabling freedreno doesn't automatically enable kgsl, lets
enable it by default.  The drm/msm driver has been upstream for a
while now, and it's ABI is locked.  So I don't think we need to keep
calling it experimental.

Signed-off-by: Rob Clark robcl...@freedesktop.org

commit 28662b77ee0631af8ac659f1c9cba82f94182e0c
Author: Rob Clark robcl...@freedesktop.org
Date:   Tue Jan 13 10:53:42 2015 -0500

configure/freedreno: make KGSL support optional

libdrm_freedreno currently supports two backends, 'msm' for the upstream
drm/msm driver, and 'kgsl' which supports (to some extent), the android/
downstream kgsl driver plus a sort of drm shim nonsense to get flink
names.

However, kgsl support is strictly on a best-effort basis.  Different
android devices with different versions of kgsl may have different
abi's.  And the existing kgsl interface (at least the parts of it that
we use) is completely broken for 64bit.  Lets disable it by default lest
anyone actually try to use it.

Signed-off-by: Rob Clark robcl...@freedesktop.org

commit 13fcc697ee194060f949449bf37491d8abd7119b
Author: Zhenyu Wang zhen...@linux.intel.com
Date:   Thu Jan 8 15:23:04 2015 +0800

intel: Fix GTT entry setup for aub dump

On recent emulator GTT entry setup for aub dump needs mem type as
GTT_ENTRY instead of NONLOCAL. NONLOCAL would write data in main
memory space which is wrong with new memory layout. GTT_ENTRY write
would setup GTT memory pool and other required internal buffers. With
this I can run aub dump on latest release without crash.

Signed-off-by: Zhenyu Wang zhen...@linux.intel.com

commit d7c0a08bc576deb07df6c3f91f393ca8edd0c4bf
Author: Laurent Pinchart laurent.pinch...@ideasonboard.com
Date:   Tue Dec 9 22:00:58 2014 +0200

modetest: Allocate dumb buffers with the correct bpp

The modetest application uses libkms to allocate dumb buffers, leading
to overallocation due to the

libdrm: Changes to 'debian-experimental'

2013-06-06 Thread Emilio Pozuelo Monfort 
Rebased ref, commits from common ancestor:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ukjbj-0006rb...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2013-05-30 Thread Julien Cristau 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 687b4feafcf2696727eb62c0d781ec0de42c723e
Author: Julien Cristau jcris...@debian.org
Date:   Thu May 30 10:03:45 2013 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 04a89c4..c0c519a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-libdrm (2.4.45-2) UNRELEASED; urgency=low
+libdrm (2.4.45-2) experimental; urgency=low
 
+  [ Sven Joachim ]
   * Only build-depend on valgrind on architectures where
 valgrind is actually available.
 
- -- Sven Joachim svenj...@gmx.de  Fri, 17 May 2013 17:56:43 +0200
+ -- Julien Cristau jcris...@debian.org  Thu, 30 May 2013 10:03:37 +0200
 
 libdrm (2.4.45-1) experimental; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uhyjk-00027t...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2013-05-17 Thread Sven Joachim 
 debian/changelog |7 +++
 debian/control   |2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit c3b713090840df937677c0827aa76ca798ea9ff3
Author: Sven Joachim svenj...@gmx.de
Date:   Fri May 17 18:00:06 2013 +0200

Make valgrind build-dependency archictecture specific

diff --git a/debian/changelog b/debian/changelog
index fdc788c..04a89c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.45-2) UNRELEASED; urgency=low
+
+  * Only build-depend on valgrind on architectures where
+valgrind is actually available.
+
+ -- Sven Joachim svenj...@gmx.de  Fri, 17 May 2013 17:56:43 +0200
+
 libdrm (2.4.45-1) experimental; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 8175dfc..ec12408 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  libpthread-stubs0-dev,
  libudev-dev [linux-any],
  libpciaccess-dev,
- valgrind,
+ valgrind [amd64 armel armhf i386 mips mipsel powerpc s390x],
 Standards-Version: 3.9.4
 Section: libs
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1udn7p-0005tc...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2013-05-15 Thread Maarten Lankhorst 
 .gitignore   |1 
 ChangeLog|  116 +
 configure.ac |2 
 debian/changelog |2 
 freedreno/freedreno_bo.c |   68 +
 freedreno/freedreno_drmif.h  |1 
 freedreno/freedreno_pipe.c   |   26 ++
 freedreno/freedreno_priv.h   |   10 ++
 freedreno/freedreno_ringbuffer.c |4 -
 include/drm/Makefile.am  |4 -
 include/drm/i915_drm.h   |2 
 include/drm/qxl_drm.h|  152 +++
 intel/intel_bufmgr_gem.c |9 ++
 radeon/r600_pci_ids.h|   12 +++
 radeon/radeon_surface.c  |   10 +-
 radeon/radeon_surface.h  |1 
 16 files changed, 409 insertions(+), 11 deletions(-)

New commits:
commit ef470fa9bd9a65897788519f67d4b8fa20750c60
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed May 15 21:57:50 2013 +0200

bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 74b1902..51c7a9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,119 @@
+commit 63aeae123848d0bfbc0a35102cb9717cf496eab6
+Author: Marek Olšák mar...@gmail.com
+Date:   Wed May 15 19:32:05 2013 +0200
+
+configure.ac: bump version to 2.4.45 for release
+
+commit e5e51c2110ebf6e1edaa14b7567c5d6a79008a90
+Author: Marek Olšák mar...@gmail.com
+Date:   Wed Apr 24 20:39:45 2013 +0200
+
+radeon: add RADEON_SURF_FMASK flag which disables 2D-1D tiling transition
+
+Signed-off-by: Marek Olšák mar...@gmail.com
+Reviewed-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 96e90aabc4c0238de2f2d245899f991a3b996587
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Mon May 13 16:14:28 2013 -0400
+
+radeon: add HAINAN pci ids
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+commit c56729cc1564bb4204ca30a18499a78a39f48892
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Mon May 13 16:15:17 2013 -0400
+
+radeon: add HAINAN family
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 040f6b015ef7d9c1bda09f78a8873f6da45d5e95
+Author: Dave Airlie airl...@redhat.com
+Date:   Thu May 9 12:55:42 2013 +1000
+
+drm: add qxl drm header file
+
+Now that this driver is merged add the header file.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit 01127f76a7e9ba8f047fae4b4e084da6c2c3
+Author: Xiang, Haihao haihao.xi...@intel.com
+Date:   Wed Nov 14 12:46:39 2012 +0800
+
+intel: Add support for VEBOX ring (v2)
+
+v2: Fix the test for has_vebox
+
+Signed-off-by: Xiang, Haihao haihao.xi...@intel.com
+Signed-off-by: Ben Widawsky b...@bwidawsk.net
+
+commit b3a3a77823ada2eb37233678b5a49efaec9b75cb
+Author: Rob Clark robcl...@freedesktop.org
+Date:   Thu Apr 25 16:36:15 2013 -0400
+
+freedreno: add synchronization between mesa and ddx
+
+Super-cheezy way to synchronization between mesa and ddx..  the
+SET_ACTIVE ioctl gives us a way to stash a 32b # w/ a GEM bo, and
+GET_BUFINFO gives us a way to retrieve it.  We use this to stash
+the timestamp of the last ISSUEIBCMDS on the buffer.
+
+To avoid an obscene amount of syscalls, we:
+ 1) Only set the timestamp for buffers w/ an flink name, ie.
+only buffers shared across processes.  This is enough to
+catch the DRI2 buffers.
+ 2) Only set the timestamp for buffers submitted to the 3d ring
+and only check the timestamps on buffers submitted to the
+2d ring.  This should be enough to handle synchronizing of
+presentation blit.  We could do synchronization in the other
+direction too, but that would be problematic if we are using
+the 3d ring from DDX, since client side wouldn't know this.
+
+The waiting on timestamp happens before flush, and setting of
+timestamp happens after flush.  It is transparent to the user
+of libdrm_freedreno as all the tracking of buffers happens via
+_emit_reloc()..
+
+Signed-off-by: Rob Clark robcl...@freedesktop.org
+
+commit ec3c257eb6958da493aee6f010f51a07d7ba4160
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Thu Apr 25 14:13:52 2013 -0400
+
+radeon: add new richland pci ids
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 439d7d74320a148a2d53aec1ca28eba672ad9353
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Thu Apr 25 14:12:50 2013 -0400
+
+radeon: add new SI pci ids
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 12464a70ed502d9f401931156005afd717a9992f
+Author: Rob Clark robcl...@freedesktop.org
+Date:   Mon Apr 22 14:50:57 2013 -0400
+
+Add exynos_fimg2d_test to .gitignore
+
+Signed-off-by: Rob Clark robcl...@freedesktop.org
+
+commit 86709ba5373730a438602459e104bf0a9a49559d
+Author: Rob Clark robcl...@freedesktop.org
+Date:   Mon Apr 22 14:49:28 2013 -0400
+
+freedreno: add

libdrm: Changes to 'debian-experimental'

2013-05-15 Thread Emilio Pozuelo Monfort 
 debian/changelog |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 157efcb996b5e5e366947ebd3cdd69f96a7c129f
Author: Emilio Pozuelo Monfort po...@debian.org
Date:   Thu May 16 00:17:04 2013 +0200

Upload 2.4.45 to experimental

diff --git a/debian/changelog b/debian/changelog
index 99ca0fc..fdc788c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libdrm (2.4.45-1) UNRELEASED; urgency=low
+libdrm (2.4.45-1) experimental; urgency=low
+
+  * Team upload.
 
   [ Julien Cristau ]
   * Bump libdrm2 shlibs to 2.4.38.
@@ -11,7 +13,10 @@ libdrm (2.4.45-1) UNRELEASED; urgency=low
   [ Timo Aaltonen ]
   * control: Bump policy to 3.9.4, no changes.
 
- -- Julien Cristau jcris...@debian.org  Tue, 25 Dec 2012 13:17:28 +0100
+  [ Emilio Pozuelo Monfort ]
+  * Upload to experimental.
+
+ -- Emilio Pozuelo Monfort po...@debian.org  Thu, 16 May 2013 00:09:59 +0200
 
 libdrm (2.4.40-1) experimental; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uck7s-0001hf...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2013-05-03 Thread Maarten Lankhorst 
 ChangeLog |  194 +++
 configure.ac  |2 
 debian/changelog  |2 
 exynos/Makefile.am|6 
 freedreno/Makefile.am |   10 
 freedreno/freedreno_ringbuffer.c  |   12 
 freedreno/freedreno_ringbuffer.h  |2 
 include/drm/radeon_drm.h  |   81 
 intel/intel_chipset.h |   18 -
 intel/intel_decode.c  |2 
 intel/tests/gen6-3d.batch-ref.txt |6 
 libkms/api.c  |2 
 libkms/libkms.h   |8 
 radeon/radeon_surface.c   |  658 +++---
 radeon/radeon_surface.h   |   31 +
 tests/modetest/buffers.c  |  195 ---
 tests/modetest/modetest.c |   10 
 xf86drm.c |2 
 xf86mm.h  |  198 ---
 19 files changed, 1130 insertions(+), 309 deletions(-)

New commits:
commit d54a4da2c89a72f308bb56e20265aa11a5093954
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu May 2 09:15:44 2013 +0200

bump changelog

diff --git a/ChangeLog b/ChangeLog
index 4f07fdb..74b1902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,197 @@
+commit 9768af201e9aba2093c80a8da3632fe9e4c044fe
+Author: Jerome Glisse jgli...@redhat.com
+Date:   Thu Apr 18 15:01:19 2013 -0400
+
+libdrm 2.4.44
+
+commit 83e77461249d535a77c3ed055d198e26f0c1b390
+Author: Ville Syrjälä ville.syrj...@linux.intel.com
+Date:   Thu Apr 18 15:26:59 2013 +
+
+modetest: Add YUV420 support and fix YVU420 Cb/Cr ordering
+
+YUV420 support is trivial to add since the code already supports
+YVU420.
+
+But it looks like the YVU420 support is a bit broken. The chroma
+planes are passed in the wrong order to the fill functions, so
+fix that while were at it.
+
+Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
+
+commit 3f024f85d816a648473373bccc8ccc915951886a
+Author: Ville Syrjälä ville.syrj...@linux.intel.com
+Date:   Thu Apr 18 15:26:57 2013 +
+
+modetest: Pass format_info to fill_tiles functions
+
+The fourcc is inside the format_info structure, so if we want to use
+it inside the various fill_tiles functions, we need to pass down the
+whole format_info, not just the rgb/yuv infos.
+
+Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
+Acked-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
+
+commit 2c26a106fcfb692badef4c42faaed46508a3d1d3
+Author: Ville Syrjälä ville.syrj...@linux.intel.com
+Date:   Wed Apr 17 19:18:05 2013 +
+
+modetest: Reduce the length of the connector type string
+
+Spelling out eDP or DP make for a ridicilously long string which plays
+havoc with formatting. Just say eDP or DP.
+
+Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
+Acked-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
+
+commit 8e56579b203a11c718c5e3da6fdb03b4f9b9fe56
+Author: Ville Syrjälä ville.syrj...@linux.intel.com
+Date:   Wed Apr 17 19:18:04 2013 +
+
+modetest: Print possible_crtcs for planes
+
+Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
+Acked-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
+
+commit fa2925aa342158037ef972f3ef095442fb1fe430
+Author: Ville Syrjälä ville.syrj...@linux.intel.com
+Date:   Wed Apr 17 19:18:03 2013 +
+
+modetest: Add support for all 16/32 bpp RGB formats
+
+Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
+Acked-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
+
+commit c2988eb211ecad2db60081f1000cf19b350703db
+Author: Ville Syrjälä ville.syrj...@linux.intel.com
+Date:   Wed Apr 17 19:18:02 2013 +
+
+modetest: Fix pitches, somewhat
+
+libkms only has the xrgb format, so we're overallocating the bo by
+quite a lot in some cases. But we still need to get the pitch from the
+libkms since it's the driver that decides how to align it.
+
+Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
+Acked-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
+
+commit aa4afdf0b3be20aa6037b64f90983ea0146b2893
+Author: Laurent Pinchart laurent.pinch...@ideasonboard.com
+Date:   Thu Nov 1 09:38:42 2012 +
+
+kms: Return a negative error code in kms_bo_create()
+
+The function returns returns 0 on success or a negative value in case of an
+error, except when given invalid attributes in which case it returns the
+positive EINVAL value. Replace that with -EINVAL to allow the caller to 
detect
+errors with a  0 check.
+
+Signed-off-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
+Reviewed-by: Jakob Bornecrantz wallbra...@gmail.com
+
+commit 9fa4a4b1a894fa8fffe2075bc3376b7fa5e18104
+Author: Laurent Pinchart laurent.pinch...@ideasonboard.com
+Date:   Thu Nov 1 09:40:30 2012 +
+
+kms: Make libkms.h usable in C++
+
+Wrap

libdrm: Changes to 'debian-experimental'

2013-03-27 Thread Maarten Lankhorst 
 .gitignore|1 
 ChangeLog |  209 +++
 Makefile.am   |6 
 configure.ac  |   28 +
 debian/changelog  |2 
 exynos/Makefile.am|2 
 exynos/exynos_drm.h   |   52 ++
 exynos/exynos_fimg2d.c|  630 ++
 exynos/fimg2d.h   |  325 +
 exynos/fimg2d_reg.h   |  114 ++
 freedreno/Makefile.am |   19 +
 freedreno/README  |   16 
 freedreno/freedreno_bo.c  |  274 ++
 freedreno/freedreno_device.c  |   45 ++
 freedreno/freedreno_drmif.h   |   99 +
 freedreno/freedreno_pipe.c|  227 
 freedreno/freedreno_priv.h|  117 ++
 freedreno/freedreno_ringbuffer.c  |  249 +
 freedreno/freedreno_ringbuffer.h  |   87 
 freedreno/kgsl_drm.h  |  192 ++
 freedreno/libdrm_freedreno.pc.in  |   11 
 freedreno/list.h  |  137 +++
 freedreno/msm_kgsl.h  |  519 
 intel/intel_bufmgr_gem.c  |2 
 intel/intel_chipset.h |  378 +++-
 intel/intel_decode.c  |2 
 nouveau/nouveau.c |   18 
 nouveau/private.h |1 
 nouveau/pushbuf.c |8 
 radeon/r600_pci_ids.h |   11 
 radeon/radeon_surface.c   |8 
 tests/Makefile.am |4 
 tests/exynos/Makefile.am  |   19 +
 tests/exynos/exynos_fimg2d_test.c |  695 ++
 tests/kmstest/Makefile.am |5 
 tests/modeprint/Makefile.am   |5 
 tests/modetest/Makefile.am|5 
 tests/vbltest/Makefile.am |6 
 38 files changed, 4339 insertions(+), 189 deletions(-)

New commits:
commit 2f54887cd7a0fcb6f8f913c9e828e842960d4e5d
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Mar 27 11:08:01 2013 +0100

bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 275a4de..4f07fdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,212 @@
+commit c005f043dcb4df5ed8a36b9f4b70fcf9e92d52a5
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+Date:   Wed Mar 27 10:42:20 2013 +0100
+
+configure.ac: bump version to 2.4.43 for release
+
+Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com
+
+commit 93d12593e5f1b251a09b112d7beaf5cfca026896
+Author: Ville Syrjälä ville.syrj...@linux.intel.com
+Date:   Mon Feb 18 20:50:01 2013 +0200
+
+intel_chipset: Fix up VLV confusion
+
+Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
+
+commit 6e55fd7dee48dabcd46939df1aa8729eba426298
+Author: Ville Syrjälä ville.syrj...@linux.intel.com
+Date:   Mon Feb 18 20:22:21 2013 +0200
+
+intel_chipset: Use parens around macro arguments
+
+Protect the macro argument evaluations with parens.
+
+This is already touching most lines, so while at it, fix up all white
+space to uniform style throughout the file.
+
+Signed-off-by: Ville Syrjälä ville.syrj...@linux.intel.com
+
+commit f92d7969bf6ba636d193423cf2388956badde3ff
+Author: Marcin Slusarz marcin.slus...@gmail.com
+Date:   Sun Mar 3 22:34:38 2013 +0100
+
+nouveau: add a way to override single pushbuffer memory limits
+
+Currently single pushbuffer can take up to 80% of VRAM and 80% of GART.
+As this value seems to be arbitrary (and user may need to set it 
differently)
+this patch adds support for 2 environment variables:
+NOUVEAU_LIBDRM_VRAM_LIMIT_PERCENT (default 80)
+NOUVEAU_LIBDRM_GART_LIMIT_PERCENT (default 80)
+which will let users override pushbuffer VRAM/GART limits.
+
+Signed-off-by: Marcin Slusarz marcin.slus...@gmail.com
+
+commit 284421a56921337aaabcec7ad2790034249c7b31
+Author: Marcin Slusarz marcin.slus...@gmail.com
+Date:   Sun Mar 3 22:13:38 2013 +0100
+
+nouveau: return error from pushbuf_validate
+
+Signed-off-by: Marcin Slusarz marcin.slus...@gmail.com
+
+commit 9b0c7f23a261d9bfa857a7e0efd2c5f97d404485
+Author: Benjamin Gaignard benjamin.gaign...@st.com
+Date:   Tue Mar 26 11:11:41 2013 +0100
+
+tests: allow tests programs to be installed (cumulative patch)
+
+fix error in previous patch
+
+Signed-off-by: Benjamin Gaignard benjamin.gaign...@linaro.com
+Signed-off-by: Andreas Boll andreas.boll@gmail.com
+
+commit 62d8866021f04bc8afc8e63d366c71d11c817bc9
+Author: Benjamin Gaignard benjamin.gaign...@stericsson.com
+Date:   Wed Jan 30 14:34:00 2013 +0100
+
+tests: allow tests programs to be installed
+
+Install test programs is useful in cross compilation case.  By default
+the behavior is the same and test programs aren't installed in $bindir.
+If --enable-install-test-programs is set then test programs are
+installed in $bindir.
+
+

libdrm: Changes to 'debian-experimental'

2013-03-14 Thread Maarten Lankhorst 
 debian/changelog |1 +
 debian/control   |1 +
 2 files changed, 2 insertions(+)

New commits:
commit bdef5df2220cf98a885232888655510f9aec9f7f
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Mar 14 12:42:35 2013 +0100

Add valgrind to build-depends.

diff --git a/debian/changelog b/debian/changelog
index 49574f0..0050d34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libdrm (2.4.42-1) UNRELEASED; urgency=low
   [ Maarten Lankhorst ]
   * New upstream release.
   * Build-depend on xsltproc and docbook-xsl.
+  * Add valgrind to build-depends.
 
   [ Timo Aaltonen ]
   * control: Bump policy to 3.9.4, no changes.
diff --git a/debian/control b/debian/control
index d634ed5..8175dfc 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends:
  libpthread-stubs0-dev,
  libudev-dev [linux-any],
  libpciaccess-dev,
+ valgrind,
 Standards-Version: 3.9.4
 Section: libs
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ug6cu-0005ue...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2013-02-08 Thread Maarten Lankhorst 
 debian/changelog  |1 +
 debian/control|1 +
 debian/libdrm-dev.install |4 ++--
 tests/Makefile.am |2 ++
 xf86drm.h |2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 2434d92d8d36dac8a94a76ab21f014d562b6deb1
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Feb 8 13:22:23 2013 +0100

Re-enable building of manpages, and build-depend on xsltproc

diff --git a/debian/changelog b/debian/changelog
index 1982623..835fac9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libdrm (2.4.42-1) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]
   * New upstream release.
+  * Re-enable building of manpages, and build-depend on xsltproc
 
   [ Timo Aaltonen ]
   * control: Bump policy to 3.9.4, no changes.
diff --git a/debian/control b/debian/control
index 8ae824c..acfa4f3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Build-Depends:
  debhelper (= 9),
  dh-autoreconf,
  quilt,
+ xsltproc,
  libx11-dev,
  pkg-config,
  libpthread-stubs0-dev,
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a3a59bd..ea9026e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,6 +10,8 @@ check_PROGRAMS = \
dristat \
drmstat
 
+dristat_LDADD = $(CLOCK_LIB)
+
 SUBDIRS = modeprint
 
 if HAVE_LIBKMS
diff --git a/xf86drm.h b/xf86drm.h
index 5ecb284..ad9653e 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -74,7 +74,7 @@ extern C {
 /* Default /dev/dri directory permissions 0755 */
 #define DRM_DEV_DIRMODE\
(S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
-#define DRM_DEV_MODE(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
+#define DRM_DEV_MODE(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
 
 #define DRM_DIR_NAME  /dev/dri
 #define DRM_DEV_NAME  %s/card%d

commit 34041b5572dd4ad7057cc6d801a17f2ac8d02679
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Feb 8 13:17:35 2013 +0100

add manpages back to libdrm-dev

diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install
index 078a4c3..50b9af9 100644
--- a/debian/libdrm-dev.install
+++ b/debian/libdrm-dev.install
@@ -2,5 +2,5 @@ usr/include/*
 usr/lib/*/lib*.a
 usr/lib/*/lib*.so
 usr/lib/*/pkgconfig/*
-#usr/share/man/man3
-#usr/share/man/man7
+usr/share/man/man3/*
+usr/share/man/man7/*


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1u3mzx-00041s...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2013-02-08 Thread Maarten Lankhorst 
 debian/control |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1c2190cb05ebbe7a76905de6a4051387ac2c3904
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Feb 8 13:30:56 2013 +0100

add docbook-xsl to build-depends too

diff --git a/debian/control b/debian/control
index acfa4f3..d634ed5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends:
  dh-autoreconf,
  quilt,
  xsltproc,
+ docbook-xsl,
  libx11-dev,
  pkg-config,
  libpthread-stubs0-dev,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1u3naf-0008ng...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2013-02-08 Thread Sven Joachim 
 debian/changelog  |2 +-
 tests/Makefile.am |2 --
 xf86drm.h |2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit b3fd78c9285cdc7d4eee01c1ee97f9ffe94622d9
Author: Sven Joachim svenj...@gmx.de
Date:   Fri Feb 8 19:00:41 2013 +0100

Fix up debian/changelog

Manpages were never disabled in versions uploaded to Debian, and
docbook-xsl build dependency was added in commit
2434d92d8d36dac8a94a76ab21f014d562b6deb1.

diff --git a/debian/changelog b/debian/changelog
index 835fac9..49574f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ libdrm (2.4.42-1) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]
   * New upstream release.
-  * Re-enable building of manpages, and build-depend on xsltproc
+  * Build-depend on xsltproc and docbook-xsl.
 
   [ Timo Aaltonen ]
   * control: Bump policy to 3.9.4, no changes.

commit 63bcd055b68839354145c4e09beda855ad05ea36
Author: Sven Joachim svenj...@gmx.de
Date:   Fri Feb 8 18:52:48 2013 +0100

Undo accidental changes to upstream files

Made in commit 2434d92d8d36dac8a94a76ab21f014d562b6deb1.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ea9026e..a3a59bd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,8 +10,6 @@ check_PROGRAMS = \
dristat \
drmstat
 
-dristat_LDADD = $(CLOCK_LIB)
-
 SUBDIRS = modeprint
 
 if HAVE_LIBKMS
diff --git a/xf86drm.h b/xf86drm.h
index ad9653e..5ecb284 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -74,7 +74,7 @@ extern C {
 /* Default /dev/dri directory permissions 0755 */
 #define DRM_DEV_DIRMODE\
(S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
-#define DRM_DEV_MODE(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
+#define DRM_DEV_MODE(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
 
 #define DRM_DIR_NAME  /dev/dri
 #define DRM_DEV_NAME  %s/card%d


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1u3sjn-0001pq...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2013-02-07 Thread Timo Aaltonen 
 .gitignore   |1 
 ChangeLog|   96 +
 Makefile.am  |4 -
 configure.ac |   22 ++-
 debian/changelog |6 +-
 debian/control   |2 
 debian/patches/02_fix_build.diff |   12 
 debian/patches/series|1 
 intel/intel_chipset.h|8 ++
 man/Makefile.am  |   37 
 nouveau/libdrm_nouveau.pc.in |2 
 radeon/r600_pci_ids.h|   14 
 radeon/radeon_surface.c  |  112 ++-
 13 files changed, 257 insertions(+), 60 deletions(-)

New commits:
commit 98e413f259a029f8cd30d73c346331c6627f0832
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Feb 7 10:51:25 2013 +0200

control: Bump policy to 3.9.4, no changes.

diff --git a/debian/changelog b/debian/changelog
index 180ebf5..1982623 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ libdrm (2.4.42-1) UNRELEASED; urgency=low
   [ Maarten Lankhorst ]
   * New upstream release.
 
+  [ Timo Aaltonen ]
+  * control: Bump policy to 3.9.4, no changes.
+
  -- Julien Cristau jcris...@debian.org  Tue, 25 Dec 2012 13:17:28 +0100
 
 libdrm (2.4.40-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 12171e7..8ae824c 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  libpthread-stubs0-dev,
  libudev-dev [linux-any],
  libpciaccess-dev,
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Section: libs
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git

commit b133b92d52fe8c5b0becd29c6a5072209526
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Feb 7 10:50:54 2013 +0200

drop 02_fix_build.diff, FTBFS with sbuild

diff --git a/debian/changelog b/debian/changelog
index 11b7635..180ebf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,6 @@ libdrm (2.4.42-1) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]
   * New upstream release.
-  * Add 02_fix_build.diff fix a build error.
 
  -- Julien Cristau jcris...@debian.org  Tue, 25 Dec 2012 13:17:28 +0100
 
diff --git a/debian/patches/02_fix_build.diff b/debian/patches/02_fix_build.diff
deleted file mode 100644
index 234101b..000
--- a/debian/patches/02_fix_build.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 10cc9a4..1776610 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -348,7 +348,6 @@ AC_CONFIG_FILES([
-   tests/vbltest/Makefile
-   include/Makefile
-   include/drm/Makefile
--  man/Makefile
-   libdrm.pc])
- AC_OUTPUT
- 
diff --git a/debian/patches/series b/debian/patches/series
index e64f736..2e425c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_default_perms.diff
-02_fix_build.diff
 03_build_against_librt.diff

commit ce6151da5bc5d767adff7f36f5b9f473286d1209
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Feb 7 10:39:56 2013 +0200

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index e1df3ae..275a4de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,99 @@
+commit 183b5f20b59c83f57967b41d1e3a90c073e8df76
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+Date:   Tue Feb 5 14:08:41 2013 +0100
+
+configure.ac: bump version to 2.4.42 for release
+
+Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com
+
+commit f9a9311c5e96606de9726ae4021209897b9bb2d7
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+Date:   Tue Feb 5 14:12:06 2013 +0100
+
+libdrm: remove DISTCHECK_CONFIGURE_FLAGS
+
+I'm fairly sure the extra flags it specifies no longer exist, so
+there is no point in keeping it. It only adds a warning when
+running make distcheck.
+
+Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com
+
+commit 353f073bc134a94d13fe82e4f3d983efe3cf70ad
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Thu Jan 24 17:53:37 2013 -0500
+
+radeon: add OLAND pci ids
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 76ae1f4837ceb2c15ccf847e4abe2b5c4f66df85
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Thu Jan 24 17:37:10 2013 -0500
+
+radeon: add OLAND family
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+commit ef866c7293e699b119ae61738e221857a36a5362
+Author: Jesse Barnes jbar...@virtuousgeek.org
+Date:   Sat Feb 2 11:10:24 2013 +0100
+
+intel: add more VLV PCI IDs
+
+commit 9dc0072e8d5a47fb0b2ada50fb897cb2c740bb40
+Author: Thierry Reding thierry.red...@avionic-design.de
+Date:   Fri Jan 18 13:22:01 2013 +0100
+
+man: Fix typo and use $() for make expressions
+
+Due to the typo, none of the .xml files would end up in the release
+tarball and cause make distcheck as well as builds from the tarball to
+fail.

libdrm: Changes to 'debian-experimental'

2013-01-16 Thread Maarten Lankhorst 
 .gitignore   |4 
 ChangeLog|  174 +++
 Makefile.am  |2 
 configure.ac |   26 --
 debian/changelog |7 
 debian/libdrm-dev.install|3 
 debian/libdrm-nouveau2.symbols   |1 
 debian/patches/02_fix_build.diff |   12 +
 debian/patches/series|1 
 intel/intel_bufmgr_gem.c |   10 
 libkms/intel.c   |1 
 libkms/linux.c   |2 
 libkms/nouveau.c |1 
 man/Makefile.am  |   65 -
 man/drm-kms.xml  |  342 +++
 man/drm-memory.xml   |  430 +++
 man/drm.xml  |  137 
 man/drmAvailable.man |   25 --
 man/drmAvailable.xml |   75 ++
 man/drmHandleEvent.man   |   45 
 man/drmHandleEvent.xml   |  102 +
 man/drmModeGetResources.man  |   79 ---
 man/drmModeGetResources.xml  |  139 
 nouveau/abi16.c  |   28 ++
 nouveau/libdrm_nouveau.pc.in |2 
 nouveau/nouveau.c|3 
 nouveau/nouveau.h|   16 +
 nouveau/private.h|1 
 nouveau/pushbuf.c|8 
 radeon/r600_pci_ids.h|1 
 radeon/radeon_bo_gem.c   |   16 -
 31 files changed, 1559 insertions(+), 199 deletions(-)

New commits:
commit 9ab7a43c4e57e618854b3641101fcd707736dbf0
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jan 16 14:04:59 2013 +0100

Add 02_fix_build.diff fix a build error.

diff --git a/debian/changelog b/debian/changelog
index c1edea0..9111d6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libdrm (2.4.41-1) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]
   * New upstream release.
+  * Add 02_fix_build.diff fix a build error.
 
  -- Julien Cristau jcris...@debian.org  Tue, 25 Dec 2012 13:17:28 +0100
 
diff --git a/debian/patches/02_fix_build.diff b/debian/patches/02_fix_build.diff
new file mode 100644
index 000..234101b
--- /dev/null
+++ b/debian/patches/02_fix_build.diff
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index 10cc9a4..1776610 100644
+--- a/configure.ac
 b/configure.ac
+@@ -348,7 +348,6 @@ AC_CONFIG_FILES([
+   tests/vbltest/Makefile
+   include/Makefile
+   include/drm/Makefile
+-  man/Makefile
+   libdrm.pc])
+ AC_OUTPUT
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2e425c0..e64f736 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_default_perms.diff
+02_fix_build.diff
 03_build_against_librt.diff

commit ed2ab427f7d40fcd52a16e8aa0360d440fbf3385
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jan 16 13:41:45 2013 +0100

New upstream release.

Manpage building has temporarily been disabled upstream,
but when it's re-enabled we should require xsltproc.

diff --git a/ChangeLog b/ChangeLog
index 53b397c..e1df3ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,177 @@
+commit 007bff7a034741dcf9d1716583f91fc4453d4112
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+Date:   Wed Jan 16 13:06:52 2013 +0100
+
+configure.ac: bump version to 2.4.41 for release
+
+commit c41b494c47f8e514e69cb8c2f2ace41d5fa17c94
+Author: Ben Skeggs bske...@redhat.com
+Date:   Fri Nov 23 12:40:30 2012 +1000
+
+nouveau: expose channel engine selection on kepler chipsets
+
+v2: Take Maarten Lankhorst's suggestion of nesting the struct to prevent
+sizeof() issues due to padding on older revisions.
+
+Signed-off-by: Ben Skeggs bske...@redhat.com
+Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com
+
+commit 9e6f96a579fc2ed241e9a31a35a5995129ee8f7a
+Author: Marcin Slusarz marcin.slus...@gmail.com
+Date:   Sun Dec 16 19:28:24 2012 +0100
+
+libdrm_nouveau.pc: don't include I${includedir}/nouveau
+
+Nouveau headers are installed in I${includedir}/libdrm.
+
+commit fdda97007b1dbf95beb16a0e3510fd36c89e8c33
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Fri Jan 11 00:55:12 2013 +
+
+intel: Remove the fence count contributions when clearing relocs
+
+As we clear the relocs from the bo, we also need to clear the
+contribution of the reloc_target_bo from the fence count. Otherwise they
+are leaked and prevent any further relocations being added to the bo.
+
+commit 1dbd873700f281d9773e64931ff0c1cf96e13793
+Author: Jesse Barnes jbar...@virtuousgeek.org
+Date:   Wed Jan 9 17:28:41 2013 -0800
+
+man: disable man page building until David saves us all
+
+I must have botched something in the push of the xml switchover, since I
+now get errors when building the pages and aliases.  Just disable for
+now.
+
+commit

libdrm: Changes to 'debian-experimental'

2012-12-25 Thread Julien Cristau 
 debian/changelog |6 ++
 debian/rules |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 43a03a3c81bee6dc8864d6990cf51592ea54d253
Author: Julien Cristau jcris...@debian.org
Date:   Tue Dec 25 13:17:40 2012 +0100

Bump libdrm2 shlibs to 2.4.38.

diff --git a/debian/changelog b/debian/changelog
index 1389fa9..806159d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.40-2) UNRELEASED; urgency=low
+
+  * Bump libdrm2 shlibs to 2.4.38.
+
+ -- Julien Cristau jcris...@debian.org  Tue, 25 Dec 2012 13:17:28 +0100
+
 libdrm (2.4.40-1) experimental; urgency=low
 
   [ Maarten Lankhorst ]
diff --git a/debian/rules b/debian/rules
index 5019c24..78ea6f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,7 +88,7 @@ endif
dh_strip -s --remaining-packages
 
 override_dh_makeshlibs:
-   dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.31)' --add-udeb=libdrm2-udeb 
-- -c4
+   dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.38)' --add-udeb=libdrm2-udeb 
-- -c4
 ifeq ($(INTEL), yes)
dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.38)' -- -c4
 endif


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tntsj-0001xt...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2012-11-17 Thread Julien Cristau 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c809c030bde630e994149c70f9df94617d70e74d
Author: Julien Cristau jcris...@debian.org
Date:   Sat Nov 17 18:53:30 2012 +0100

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 670b870..1389fa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.40-1) UNRELEASED; urgency=low
+libdrm (2.4.40-1) experimental; urgency=low
 
   [ Maarten Lankhorst ]
   * New upstream release.
@@ -17,7 +17,7 @@ libdrm (2.4.40-1) UNRELEASED; urgency=low
   * Mark some internal libdrm-nouveau2 symbols as private.
   * Drop patch 02_build_libkms_against_in_tree_drm.diff, applied upstream.
 
- -- Christopher James Halse Rogers r...@ubuntu.com  Tue, 21 Aug 2012 
14:05:52 +1000
+ -- Julien Cristau jcris...@debian.org  Sat, 17 Nov 2012 18:50:33 +0100
 
 libdrm (2.4.33-3) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tzmb0-00013v...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2012-11-15 Thread Sven Joachim 
 .gitignore  |4 
 ChangeLog   |  254 
 Makefile.am |2 
 configure.ac|   50 ++
 debian/changelog|3 
 debian/libdrm-dev.install   |1 
 debian/patches/02_build_libkms_against_in_tree_drm.diff |   17 
 debian/patches/series   |1 
 debian/rules|4 
 intel/intel_bufmgr_gem.c|   10 
 intel/intel_chipset.h   |7 
 intel/intel_decode.c|2 
 libkms/Makefile.am  |2 
 man/Makefile.am |   11 
 man/drmAvailable.man|   25 +
 man/drmHandleEvent.man  |   45 ++
 man/drmModeGetResources.man |   79 +++
 omap/omap_drm.c |2 
 radeon/r600_pci_ids.h   |3 
 radeon/radeon_cs_gem.c  |2 
 radeon/radeon_surface.c |  333 
 radeon/radeon_surface.h |2 
 tests/modetest/Makefile.am  |   11 
 xf86drmMode.c   |5 
 24 files changed, 758 insertions(+), 117 deletions(-)

New commits:
commit c8352e15c1f267e3d6e97cd1aaf2f9942c3f8224
Author: Sven Joachim svenj...@gmx.de
Date:   Thu Nov 15 20:31:16 2012 +0100

Install section manpages into the libdrm-dev package

Commit 2426a6a7112ae62755408a371831eddbe2d89d99 introduced these
manpages.

diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install
index 76f28fa..e1ca993 100644
--- a/debian/libdrm-dev.install
+++ b/debian/libdrm-dev.install
@@ -2,3 +2,4 @@ usr/include/*
 usr/lib/*/lib*.a
 usr/lib/*/lib*.so
 usr/lib/*/pkgconfig/*
+usr/share/man/man3

commit fb429907b6d74074557b41d9fbe098b5f4235904
Author: Sven Joachim svenj...@gmx.de
Date:   Thu Nov 15 20:31:00 2012 +0100

Fix vmwgfx confflags

Since commit 7080bfdfd9b6c5f003daaef37ae9c329f2d46a6c vmwgfx is no
longer considered experimental.

diff --git a/debian/rules b/debian/rules
index 616c968..5019c24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ ifeq (linux, $(DEB_HOST_ARCH_OS))
confflags += --enable-udev
confflags += --enable-libkms
LIBKMS = yes
-   confflags += --enable-vmwgfx-experimental-api
+   confflags += --enable-vmwgfx
confflags += --enable-nouveau
NOUVEAU = yes
confflags += --enable-radeon
@@ -22,7 +22,7 @@ else
confflags += --disable-udev
confflags += --disable-libkms
LIBKMS = no
-   confflags += --disable-vmwgfx-experimental-api
+   confflags += --disable-vmwgfx
confflags += --disable-nouveau
NOUVEAU = no
confflags += --disable-radeon

commit 1d729dd500fc700cf75c61e11fdaadbe8c76298b
Author: Sven Joachim svenj...@gmx.de
Date:   Thu Nov 15 20:30:43 2012 +0100

Drop patch 02_build_libkms_against_in_tree_drm.diff

Applied upstream in commit 9c3c95fc0cb0945492279f0c7dcc0c2b1e8f463d.

diff --git a/debian/changelog b/debian/changelog
index 92f7b15..670b870 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ libdrm (2.4.40-1) UNRELEASED; urgency=low
   [ Sven Joachim ]
   * Bump libdrm-radeon1's symbols and shlibs.
   * Mark some internal libdrm-nouveau2 symbols as private.
+  * Drop patch 02_build_libkms_against_in_tree_drm.diff, applied upstream.
 
  -- Christopher James Halse Rogers r...@ubuntu.com  Tue, 21 Aug 2012 
14:05:52 +1000
 
diff --git a/debian/patches/02_build_libkms_against_in_tree_drm.diff 
b/debian/patches/02_build_libkms_against_in_tree_drm.diff
deleted file mode 100644
index 25f8e43..000
--- a/debian/patches/02_build_libkms_against_in_tree_drm.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Add libdrm to LIBADD as libkms uses symbols from libdrm
-Author: Christopher Halse Rogers christopher.halse.rog...@canonical.com
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=26852
-
-Index: libdrm/libkms/Makefile.am
-===
 libdrm.orig/libkms/Makefile.am
-+++ libdrm/libkms/Makefile.am
-@@ -6,7 +6,7 @@ AM_CFLAGS = \
- libkms_la_LTLIBRARIES = libkms.la
- libkms_ladir = $(libdir)
- libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libkms_la_LIBADD =
-+libkms_la_LIBADD = ../libdrm.la
- 
- #if HAVE_LIBUDEV
- #libkms_la_LIBADD += $(LIBUDEV_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index b1a73f8..2e425c0 100644
--- a/debian/patches/series
+++

libdrm: Changes to 'debian-experimental'

2012-09-05 Thread Sven Joachim 
 debian/changelog   |7 
 debian/control |   31 
 debian/libdrm-nouveau1a.install|1 
 debian/libdrm-nouveau1a.lintian-overrides  |1 
 debian/libdrm-nouveau1a.symbols|   46 
 debian/patches/04_libdrm-2.4.37-nouveau-1.diff | 2921 -
 debian/patches/series  |1 
 debian/rules   |8 
 8 files changed, 1 insertion(+), 3015 deletions(-)

New commits:
commit d05a296c523daed4558ea01b0eac7c896c66a63d
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Sep 5 19:19:24 2012 +0200

Remove libdrm-nouveau1a

Since Plymouth in Wheezy no longer links against libdrm_nouveau and
Mesa 9.0 uses the new nouveau ABI, this package is redundant.

diff --git a/debian/changelog b/debian/changelog
index 11f33a7..51d7487 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,7 @@ libdrm (2.4.39-1) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]
   * New upstream release.
-  * Modify libdrm-2.4.37-nouveau-1.patch from fedora 17
-- Allows building libdrm_nouveau.so.1 and 2 simultaneously
-- libdrm_nouveau1.{so,pc} links to legacy libdrm_nouveau.so.1
-- libdrm_nouveau.{so,pc} links to new api libdrm_nouveau.so.2
-- This is done to allow building upstream unmodified,
-  while retaining compatibility with mesa stable
+- Nouveau ABI change, replace libdrm-nouveau1a with libdrm-nouveau2.
 
   [ Timo Aaltonen ]
   * Bump libdrm-intel1's and libdrm-nouveau2's shlibs due to new symbols.
diff --git a/debian/control b/debian/control
index 96826f3..12171e7 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,6 @@ Depends:
  libdrm2 (= ${binary:Version}),
  libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
  libdrm-radeon1 (= ${binary:Version}) [linux-any],
- libdrm-nouveau1a (= ${binary:Version}) [linux-any],
  libdrm-nouveau2 (= ${binary:Version}) [linux-any],
  libdrm-omap1 (= ${binary:Version}) [any-arm],
  libkms1 (= ${binary:Version}) [linux-any],
@@ -113,36 +112,6 @@ Description: Userspace interface to intel-specific kernel 
DRM services -- debugg
  .
  This package provides the debugging symbols for the libdrm-intel1 package.
 
-Package: libdrm-nouveau1a
-Section: libs
-Architecture: linux-any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
-Conflicts: libdrm-nouveau1
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: Userspace interface to nouveau-specific kernel DRM services -- 
runtime
- This library implements the userspace interface to the nouveau-specific kernel
- DRM services. DRM stands for Direct Rendering Manager, which is the
- kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
- currently used on Linux to provide hardware-accelerated OpenGL drivers.
-
-Package: libdrm-nouveau1a-dbg
-Section: debug
-Priority: extra
-Architecture: linux-any
-Depends: libdrm-nouveau1a (= ${binary:Version}),
- ${misc:Depends},
-Conflicts: libdrm-nouveau1-dbg
-Multi-Arch: same
-Description: Userspace interface to nouveau-specific kernel DRM -- debugging 
symbols
- This library implements the userspace interface to the kernel DRM services.
- DRM stands for Direct Rendering Manager, which is the kernelspace portion
- of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
- Linux to provide hardware-accelerated OpenGL drivers.
- .
- This package provides the debugging symbols for the libdrm-nouveau1a package.
-
 Package: libdrm-nouveau2
 Section: libs
 Architecture: linux-any
diff --git a/debian/libdrm-nouveau1a.install b/debian/libdrm-nouveau1a.install
deleted file mode 100644
index 6c55080..000
--- a/debian/libdrm-nouveau1a.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libdrm_nouveau.so.1*
diff --git a/debian/libdrm-nouveau1a.lintian-overrides 
b/debian/libdrm-nouveau1a.lintian-overrides
deleted file mode 100644
index 76c525b..000
--- a/debian/libdrm-nouveau1a.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libdrm-nouveau1a: package-name-doesnt-match-sonames libdrm-nouveau1
diff --git a/debian/libdrm-nouveau1a.symbols b/debian/libdrm-nouveau1a.symbols
deleted file mode 100644
index a2ba922..000
--- a/debian/libdrm-nouveau1a.symbols
+++ /dev/null
@@ -1,46 +0,0 @@
-libdrm_nouveau.so.1 libdrm-nouveau1a #MINVER#
- nouveau_bo_busy@Base 2.4.23
- nouveau_bo_emit_buffer@Base 2.4.23
- nouveau_bo_handle_get@Base 2.4.23
- nouveau_bo_handle_ref@Base 2.4.23
- nouveau_bo_init@Base 2.4.23
- nouveau_bo_map@Base 2.4.23
- nouveau_bo_map_flush@Base 2.4.23
- nouveau_bo_map_range@Base 2.4.23
- nouveau_bo_new@Base 2.4.23
- nouveau_bo_new_tile@Base 2.4.23
- nouveau_bo_pending@Base 2.4.23
- nouveau_bo_ref@Base 2.4.23
- nouveau_bo_takedown@Base 2.4.23
- nouveau_bo_unmap@Base 2.4.23
- nouveau_bo_user@Base 2.4.23
- nouveau_bo_wrap@Base 2.4.23
- nouveau_channel_alloc@Base 2.4.23
- nouveau_channel_free@Base 2.4.23
-

libdrm: Changes to 'debian-experimental'

2012-09-01 Thread Sven Joachim 
 ChangeLog|   68 +++
 configure.ac |2 
 debian/changelog |8 ++-
 debian/libdrm-nouveau2.lintian-overrides |1 
 debian/libdrm-nouveau2.symbols   |   15 +++---
 debian/libdrm-radeon1.symbols|2 
 debian/rules |2 
 intel/intel_bufmgr_gem.c |2 
 omap/omap_drm.h  |3 -
 radeon/Makefile.am   |2 
 radeon/radeon_bo_gem.c   |   48 +
 radeon/radeon_bo_gem.h   |4 +
 radeon/radeon_surface.c  |4 -
 tests/modetest/modetest.c|1 
 14 files changed, 146 insertions(+), 16 deletions(-)

New commits:
commit f1c5b014206e6eac3cf5b9db55f6cf3d12d20475
Author: Sven Joachim svenj...@gmx.de
Date:   Sat Sep 1 18:31:02 2012 +0200

Mark symbols declared in nouveau/private.h as private

Those are not part of the public API.

diff --git a/debian/changelog b/debian/changelog
index 3157335..11f33a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ libdrm (2.4.39-1) UNRELEASED; urgency=low
 
   [ Sven Joachim ]
   * Bump libdrm-radeon1's symbols and shlibs.
+  * Mark some internal libdrm-nouveau2 symbols as private.
 
  -- Christopher James Halse Rogers r...@ubuntu.com  Tue, 21 Aug 2012 
14:05:52 +1000
 
diff --git a/debian/libdrm-nouveau2.lintian-overrides 
b/debian/libdrm-nouveau2.lintian-overrides
new file mode 100644
index 000..730972c
--- /dev/null
+++ b/debian/libdrm-nouveau2.lintian-overrides
@@ -0,0 +1 @@
+libdrm-nouveau2: symbols-declares-dependency-on-other-package 
libdrm-nouveau-private
diff --git a/debian/libdrm-nouveau2.symbols b/debian/libdrm-nouveau2.symbols
index 8fbd8a9..1b5ee4c 100644
--- a/debian/libdrm-nouveau2.symbols
+++ b/debian/libdrm-nouveau2.symbols
@@ -1,10 +1,11 @@
 libdrm_nouveau.so.2 libdrm-nouveau2 #MINVER#
- abi16_bo_info@Base 2.4.34
- abi16_bo_init@Base 2.4.34
- abi16_chan_nv04@Base 2.4.34
- abi16_chan_nvc0@Base 2.4.34
- abi16_engobj@Base 2.4.34
- abi16_ntfy@Base 2.4.34
+| libdrm-nouveau-private
+ abi16_bo_info@Base 0 1
+ abi16_bo_init@Base 0 1
+ abi16_chan_nv04@Base 0 1
+ abi16_chan_nvc0@Base 0 1
+ abi16_engobj@Base 0 1
+ abi16_ntfy@Base 0 1
  nouveau_bo_map@Base 2.4.34
  nouveau_bo_name_get@Base 2.4.34
  nouveau_bo_name_ref@Base 2.4.34
@@ -24,7 +25,7 @@ libdrm_nouveau.so.2 libdrm-nouveau2 #MINVER#
  nouveau_debug@Base 2.4.34
  nouveau_device_del@Base 2.4.34
  nouveau_device_open@Base 2.4.34
- nouveau_device_open_existing@Base 2.4.34
+ nouveau_device_open_existing@Base 0 1
  nouveau_device_wrap@Base 2.4.34
  nouveau_getparam@Base 2.4.34
  nouveau_object_del@Base 2.4.34

commit 1f1e50dc6ce624c39a1f2c08c93acfb0eca4bca1
Author: Sven Joachim svenj...@gmx.de
Date:   Sat Sep 1 18:07:06 2012 +0200

Bump libdrm-radeon1's symbols and shlibs

As per commit 3163cfe4db925429760407e77140e2d595338bc2.

diff --git a/debian/changelog b/debian/changelog
index c95d22e..3157335 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,10 @@ libdrm (2.4.39-1) UNRELEASED; urgency=low
   [ Christopher James Halse Rogers ]
   * Add libdrm2-udeb; Xserver 1.13 wants libdrm for hotplug config, so
 will be needed for the 1.13 xserver-xorg-core-udeb.
-  
+
+  [ Sven Joachim ]
+  * Bump libdrm-radeon1's symbols and shlibs.
+
  -- Christopher James Halse Rogers r...@ubuntu.com  Tue, 21 Aug 2012 
14:05:52 +1000
 
 libdrm (2.4.33-3) unstable; urgency=low
diff --git a/debian/libdrm-radeon1.symbols b/debian/libdrm-radeon1.symbols
index 557be89..e9578a6 100644
--- a/debian/libdrm-radeon1.symbols
+++ b/debian/libdrm-radeon1.symbols
@@ -52,9 +52,11 @@ libdrm_radeon.so.1 libdrm-radeon1 #MINVER#
  radeon_cs_space_reset_bos@Base 2.4.17
  radeon_cs_space_set_flush@Base 2.4.17
  radeon_cs_write_reloc@Base 2.4.17
+ radeon_gem_bo_open_prime@Base 2.4.39
  radeon_gem_get_kernel_name@Base 2.4.17
  radeon_gem_get_reloc_in_cs@Base 2.4.20
  radeon_gem_name_bo@Base 2.4.17
+ radeon_gem_prime_share_bo@Base 2.4.39
  radeon_gem_set_domain@Base 2.4.17
  radeon_surface_best@Base 2.4.31
  radeon_surface_init@Base 2.4.31
diff --git a/debian/rules b/debian/rules
index 95e94d6..2a2708f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,7 +104,7 @@ ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (= 2.4.38)' -- -c4
 endif
 ifeq ($(RADEON), yes)
-   dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.31)' -- -c4
+   dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.39)' -- -c4
 endif
 ifeq ($(OMAP), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (= 2.4.38)' -- -c4

commit a393b3645ea2c96ce446ad73e6094bbb590e277e
Author: Sven Joachim svenj...@gmx.de
Date:   Sat Sep 1 17:58:40 2012 +0200

New upstream release

diff --git a/ChangeLog b/ChangeLog
index b8e9743..461676b 100644
--- a/ChangeLog
+++

libdrm: Changes to 'debian-experimental'

2012-08-21 Thread Christopher Halse Rogers 
 debian/changelog|6 +-
 debian/control  |   10 ++
 debian/libdrm2-udeb.install |1 +
 debian/rules|2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit fad0ec6ef31b2a29b55d0eb65eec9a8d9e3479e6
Author: Christopher James Halse Rogers ch...@cooperteam.net
Date:   Tue Aug 21 14:13:39 2012 +1000

Add a libdrm2-udeb for Xserver 1.13

diff --git a/debian/changelog b/debian/changelog
index c1fbd3a..0042f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,11 @@ libdrm (2.4.38-1) UNRELEASED; urgency=low
   * Bump libdrm-intel1's and libdrm-nouveau2's shlibs due to new symbols.
   * Hardcode the version for libdrm-omap1's shlibs.
 
- -- Maarten Lankhorst maarten.lankho...@canonical.com  Tue, 03 Jul 2012 
10:34:04 +0200
+  [ Christopher James Halse Rogers ]
+  * Add libdrm2-udeb; Xserver 1.13 wants libdrm for hotplug config, so
+will be needed for the 1.13 xserver-xorg-core-udeb.
+  
+ -- Christopher James Halse Rogers r...@ubuntu.com  Tue, 21 Aug 2012 
14:05:52 +1000
 
 libdrm (2.4.33-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 21ce5bf..96826f3 100644
--- a/debian/control
+++ b/debian/control
@@ -56,6 +56,16 @@ Description: Userspace interface to kernel DRM services -- 
runtime
  .
  This package provides the runtime environment for libdrm.
 
+Package: libdrm2-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Description: Userspace interface to kernel DRM services -- runtime
+ This is a udeb, or a microdeb, for the debian-installer.
+
 Package: libdrm2-dbg
 Section: debug
 Priority: extra
diff --git a/debian/libdrm2-udeb.install b/debian/libdrm2-udeb.install
new file mode 100644
index 000..6e2fd9b
--- /dev/null
+++ b/debian/libdrm2-udeb.install
@@ -0,0 +1 @@
+usr/lib/*/libdrm.so.2*
diff --git a/debian/rules b/debian/rules
index bcda3a7..95e94d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,7 +95,7 @@ endif
dh_strip -s --remaining-packages
 
 override_dh_makeshlibs:
-   dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.31)' -- -c4
+   dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.31)' --add-udeb=libdrm2-udeb 
-- -c4
 ifeq ($(INTEL), yes)
dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.38)' -- -c4
 endif


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t3hmz-0007rg...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2012-08-13 Thread Maarten Lankhorst 
 ChangeLog  |  397 +++
 configure.ac   |6 
 debian/changelog   |2 
 debian/libdrm-intel1.symbols   |3 
 debian/libdrm-nouveau2.symbols |2 
 debian/libdrm-omap1.symbols|3 
 debian/libdrm2.symbols |2 
 exynos/exynos_drm.h|4 
 include/drm/drm.h  |   12 
 include/drm/i915_drm.h |   33 +
 intel/Makefile.am  |2 
 intel/intel_bufmgr.h   |7 
 intel/intel_bufmgr_gem.c   |   97 +++
 intel/intel_chipset.h  |   68 ++
 intel/test_decode.c|2 
 nouveau/nouveau.c  |   35 +
 nouveau/nouveau.h  |3 
 omap/omap_drm.c|  176 ++-
 omap/omap_drmif.h  |3 
 radeon/r600_pci_ids.h  |6 
 radeon/radeon_surface.c|   93 ++-
 tests/modetest/Makefile.am |3 
 tests/modetest/buffers.c   | 1021 +
 tests/modetest/buffers.h   |   45 +
 tests/modetest/modetest.c  |  445 +++--
 xf86drm.c  |   31 +
 xf86drm.h  |3 
 27 files changed, 2079 insertions(+), 425 deletions(-)

New commits:
commit 0061694cb071e8a9a476a0f02c1c2563137bc543
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Aug 13 10:52:29 2012 +0200

Add new symbols for 2.4.38

diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index 21887ca..8f5b9fe 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -11,6 +11,8 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_bo_fake_disable_backing_store@Base 2.4.1
  drm_intel_bo_flink@Base 2.4.1
  drm_intel_bo_gem_create_from_name@Base 2.4.1
+ drm_intel_bo_gem_create_from_prime@Base 2.4.38
+ drm_intel_bo_gem_export_to_prime@Base 2.4.38
  drm_intel_bo_get_subdata@Base 2.4.1
  drm_intel_bo_get_tiling@Base 2.4.1
  drm_intel_bo_is_reusable@Base 2.4.21
@@ -62,6 +64,7 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_gem_context_destroy@Base 2.4.37
  drm_intel_get_aperture_sizes@Base 2.4.26
  drm_intel_get_pipe_from_crtc_id@Base 2.4.11
+ drm_intel_reg_read@Base 2.4.38
  drm_mmAllocMem@Base 2.4.1
  drm_mmDestroy@Base 2.4.1
  drm_mmDumpMemInfo@Base 2.4.1
diff --git a/debian/libdrm-nouveau2.symbols b/debian/libdrm-nouveau2.symbols
index 4433983..8fbd8a9 100644
--- a/debian/libdrm-nouveau2.symbols
+++ b/debian/libdrm-nouveau2.symbols
@@ -9,7 +9,9 @@ libdrm_nouveau.so.2 libdrm-nouveau2 #MINVER#
  nouveau_bo_name_get@Base 2.4.34
  nouveau_bo_name_ref@Base 2.4.34
  nouveau_bo_new@Base 2.4.34
+ nouveau_bo_prime_handle_ref@Base 2.4.38
  nouveau_bo_ref@Base 2.4.34
+ nouveau_bo_set_prime@Base 2.4.38
  nouveau_bo_wait@Base 2.4.34
  nouveau_bo_wrap@Base 2.4.34
  nouveau_bufctx_del@Base 2.4.34
diff --git a/debian/libdrm-omap1.symbols b/debian/libdrm-omap1.symbols
index c15e79c..0c12475 100644
--- a/debian/libdrm-omap1.symbols
+++ b/debian/libdrm-omap1.symbols
@@ -3,14 +3,17 @@ libdrm_omap.so.1 libdrm-omap1 #MINVER#
  omap_bo_cpu_prep@Base 2.4.33
  omap_bo_del@Base 2.4.33
  omap_bo_dmabuf@Base 2.4.34
+ omap_bo_from_dmabuf@Base 2.4.38
  omap_bo_from_name@Base 2.4.33
  omap_bo_get_name@Base 2.4.33
  omap_bo_handle@Base 2.4.33
  omap_bo_map@Base 2.4.33
  omap_bo_new@Base 2.4.33
  omap_bo_new_tiled@Base 2.4.33
+ omap_bo_ref@Base 2.4.38
  omap_bo_size@Base 2.4.33
  omap_device_del@Base 2.4.33
  omap_device_new@Base 2.4.33
+ omap_device_ref@Base 2.4.38
  omap_get_param@Base 2.4.33
  omap_set_param@Base 2.4.33
diff --git a/debian/libdrm2.symbols b/debian/libdrm2.symbols
index 84f5462..c4047c4 100644
--- a/debian/libdrm2.symbols
+++ b/debian/libdrm2.symbols
@@ -116,6 +116,8 @@ libdrm.so.2 libdrm2 #MINVER#
  drmOpen@Base 2.3.1
  drmOpenControl@Base 2.4.3
  drmOpenOnce@Base 2.3.1
+ drmPrimeFDToHandle@Base 2.4.38
+ drmPrimeHandleToFD@Base 2.4.38
  drmRandom@Base 2.3.1
  drmRandomCreate@Base 2.3.1
  drmRandomDestroy@Base 2.3.1

commit 70a0cfaab587afe4377456f27e37baa546dbc48b
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Aug 13 10:37:22 2012 +0200

New upstream release

diff --git a/ChangeLog b/ChangeLog
index 41ed7c5..b8e9743 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,400 @@
+commit d1de6831b9f49b1f450324948b6a4759b3f7ae04
+Author: Marek Olšák mar...@gmail.com
+Date:   Sat Aug 11 20:05:24 2012 +0200
+
+configure: bump version for 2.4.38 release
+
+commit 10481fec55b422843d3f15eef3aa9617ae98843b
+Author: Marek Olšák mar...@gmail.com
+Date:   Sat Aug 11 20:02:03 2012 +0200
+
+tests/modetest: fix distcheck
+
+commit 2607dad20b8dffce96608103def75d26ea0e42b2
+Author: Eric Anholt e...@anholt.net
+Date:   Wed Aug 1 16:43:16 2012 -0700
+
+intel: Add a function for the new register read ioctl.
+
+Reviewed-by: Ben Widawsky b...@bwidawsk.net
+
+commit 934ea3b32127ea2a4ba5bf14228af6c60d3437b6
+Author: Eric Anholt e...@anholt.net
+Date:   Wed Aug 1 16:38:19 2012 -0700
+
+

libdrm: Changes to 'debian-experimental'

2012-08-13 Thread Timo Aaltonen 
 debian/changelog |3 +++
 debian/rules |4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5c0a95a6291848f30112181e8100443e9e01db11
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Mon Aug 13 12:28:34 2012 +0300

Bump libdrm-intel1's and libdrm-nouveau2's shlibs due to new symbols.

diff --git a/debian/changelog b/debian/changelog
index b0ef02f..f4f1367 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ libdrm (2.4.38-1) UNRELEASED; urgency=low
 - This is done to allow building upstream unmodified,
   while retaining compatibility with mesa stable
 
+  [ Timo Aaltonen ]
+  * Bump libdrm-intel1's and libdrm-nouveau2's shlibs due to new symbols.
+
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Tue, 03 Jul 2012 
10:34:04 +0200
 
 libdrm (2.4.33-3) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 24d7986..ca97948 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,11 +97,11 @@ endif
 override_dh_makeshlibs:
dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.31)' -- -c4
 ifeq ($(INTEL), yes)
-   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.32)' -- -c4
+   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.38)' -- -c4
 endif
 ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (= 2.4.23)' -- -c4
-   dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (= 2.4.34)' -- -c4
+   dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (= 2.4.38)' -- -c4
 endif
 ifeq ($(RADEON), yes)
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.31)' -- -c4


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t0qxr-0002bm...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2012-08-13 Thread Timo Aaltonen 
 debian/changelog |1 +
 debian/rules |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5f06d43a684f6ca69124bade4233b7df905cecc1
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Mon Aug 13 12:34:10 2012 +0300

Hardcode the version for libdrm-omap1's shlibs.

diff --git a/debian/changelog b/debian/changelog
index f4f1367..c1fbd3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ libdrm (2.4.38-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * Bump libdrm-intel1's and libdrm-nouveau2's shlibs due to new symbols.
+  * Hardcode the version for libdrm-omap1's shlibs.
 
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Tue, 03 Jul 2012 
10:34:04 +0200
 
diff --git a/debian/rules b/debian/rules
index ca97948..bcda3a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -107,7 +107,7 @@ ifeq ($(RADEON), yes)
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.31)' -- -c4
 endif
 ifeq ($(OMAP), yes)
-   dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1' -- -c4
+   dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (= 2.4.38)' -- -c4
 endif
 ifeq ($(LIBKMS), yes)
dh_makeshlibs -plibkms1 -V'libkms1' -- -c4


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t0r3b-0002jh...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2012-07-12 Thread Maarten Lankhorst 
 debian/libdrm-omap1.symbols |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dfd2321060f7e78753003ae8238f825a572d9d8e
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jul 12 13:13:01 2012 +0200

add missing symbol for omap1 to fix arm build

diff --git a/debian/libdrm-omap1.symbols b/debian/libdrm-omap1.symbols
index 5ad0f17..c15e79c 100644
--- a/debian/libdrm-omap1.symbols
+++ b/debian/libdrm-omap1.symbols
@@ -2,6 +2,7 @@ libdrm_omap.so.1 libdrm-omap1 #MINVER#
  omap_bo_cpu_fini@Base 2.4.33
  omap_bo_cpu_prep@Base 2.4.33
  omap_bo_del@Base 2.4.33
+ omap_bo_dmabuf@Base 2.4.34
  omap_bo_from_name@Base 2.4.33
  omap_bo_get_name@Base 2.4.33
  omap_bo_handle@Base 2.4.33


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sphkq-0001j7...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2012-07-10 Thread Maarten Lankhorst 
 debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b03e5aa5c2e64baa82fc2aedf5bffe1245590fcc
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jul 10 08:27:15 2012 +0200

rely on debhelper = 9

diff --git a/debian/control b/debian/control
index 358556e..21ce5bf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Cyril Brulebois k...@debian.org
 Build-Depends:
- debhelper (= 8.1.2ubuntu2),
+ debhelper (= 9),
  dh-autoreconf,
  quilt,
  libx11-dev,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sotzk-0006cd...@vasks.debian.org

libdrm: Changes to 'debian-experimental'

2011-04-18 Thread Cyril Brulebois 
 ChangeLog  |  264 
 Makefile.am|2 
 autogen.sh |   14 
 configure.ac   |   47 +-
 debian/README.source   |   24 -
 debian/changelog   |   25 +
 debian/compat  |2 
 debian/control |   11 
 debian/libdrm2.symbols |1 
 debian/libkms1.symbols |1 
 debian/patches/03_build_against_librt.diff |   11 
 debian/patches/series  |1 
 debian/rules   |  129 +-
 debian/watch   |2 
 debian/xsfbs/repack.sh |   32 -
 debian/xsfbs/xsfbs.mk  |  285 -
 debian/xsfbs/xsfbs.sh  |  622 -
 include/drm/drm.h  |   14 
 include/drm/drm_mode.h |   29 +
 intel/intel_bufmgr.c   |9 
 intel/intel_bufmgr_gem.c   |7 
 libkms/Makefile.am |1 
 libkms/dumb.c  |  220 ++
 libkms/internal.h  |2 
 libkms/linux.c |3 
 m4/.gitignore  |5 
 tests/Makefile.am  |   12 
 xf86drm.c  |   12 
 xf86drm.h  |4 
 29 files changed, 673 insertions(+), 1118 deletions(-)

New commits:
commit e039fac82ba1dbbaa431fbe3d841fd90ca57ca19
Author: Cyril Brulebois k...@debian.org
Date:   Tue Apr 19 02:57:39 2011 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 4e98ba1..e9ad98a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.25-1) UNRELEASED; urgency=low
+libdrm (2.4.25-1) experimental; urgency=low
 
   * New upstream release.
   * Update libdrm2.symbols and shlibs.
@@ -15,7 +15,7 @@ libdrm (2.4.25-1) UNRELEASED; urgency=low
   * Remove xsfbs as it's no longer needed.
   * Bump Standards-Version (no changes needed).
 
- -- Cyril Brulebois k...@debian.org  Mon, 18 Apr 2011 22:23:18 +0200
+ -- Cyril Brulebois k...@debian.org  Tue, 19 Apr 2011 02:57:29 +0200
 
 libdrm (2.4.24-2) unstable; urgency=low
 

commit 5d77322c4117871de92b16a9ed8b6c9c476f2dfe
Author: Cyril Brulebois k...@debian.org
Date:   Tue Apr 19 02:57:26 2011 +0200

Bump Standards-Version (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index a847774..4e98ba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libdrm (2.4.25-1) UNRELEASED; urgency=low
   * Add libudev-dev build-dep on Linux so that detection works.
   * Since the testsuite just got enabled, let's not bail out if it fails.
   * Remove xsfbs as it's no longer needed.
+  * Bump Standards-Version (no changes needed).
 
  -- Cyril Brulebois k...@debian.org  Mon, 18 Apr 2011 22:23:18 +0200
 
diff --git a/debian/control b/debian/control
index 740832d..793dbb2 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  pkg-config,
  libpthread-stubs0-dev,
  libudev-dev [linux-any],
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Section: libs
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git

commit ef9924c5181125101556d2bc4dbe15ebcdb21098
Author: Cyril Brulebois k...@debian.org
Date:   Tue Apr 19 02:56:09 2011 +0200

Remove xsfbs as it's no longer needed.

diff --git a/debian/README.source b/debian/README.source
index b09a1ab..4ecd5e6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -47,27 +47,3 @@ are involved:
   case, it appears directly in the .diff.gz.
 * Otherwise, the patch is added to debian/patches/ which is managed
   with quilt as documented in /usr/share/doc/quilt/README.source.
-
-quilt is actually invoked by the Debian X packaging through a larger
-set of scripts called XSFBS. XSFBS brings some other X specific
-features such as managing dependencies and conflicts due to the video
-and input driver ABIs.
-XSFBS itself is maintained in a separate repository at
-  git://git.debian.org/pkg-xorg/xsfbs.git
-and it is pulled inside the other Debian X repositories when needed.
-
-The XSFBS patching system requires a build dependency on quilt. Also
-a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
-so that the XSFBS patching occurs before the actual build. So the
-very first target of the build (likely the one running autoreconf)
-should depend on $(STAMP_DIR)/patch. It should also not depend on
-anything so that parallel builds are correctly supported (nothing
-should probably run while patching is being done). And finally, the
-clean target should depend on the xsfclean target so that patches

libdrm: Changes to 'debian-experimental'

2011-03-05 Thread Christopher Halse Rogers 
 configure.ac |5 
 debian/changelog |   33 +
 debian/control   |2 
 debian/libdrm-intel1.symbols |2 
 debian/libkms1.symbols   |1 
 debian/rules |2 
 include/drm/i915_drm.h   |   14 ++
 intel/intel_bufmgr.c |8 +
 intel/intel_bufmgr.h |2 
 intel/intel_bufmgr_gem.c |   51 +++--
 intel/intel_bufmgr_priv.h|4 
 libkms/Makefile.am   |4 
 libkms/internal.h|2 
 libkms/linux.c   |4 
 libkms/radeon.c  |  242 +++
 nouveau/Makefile.am  |2 
 nouveau/nouveau_channel.c|   37 +++---
 nouveau/nouveau_grobj.c  |   11 +
 nouveau/nouveau_pushbuf.h|   38 --
 nouveau/nouveau_reloc.c  |   34 --
 nouveau/nv04_pushbuf.h   |   66 +++
 nouveau/nvc0_pushbuf.h   |   92 
 tests/modeprint/Makefile.am  |4 
 tests/modeprint/modeprint.c  |4 
 tests/modetest/Makefile.am   |4 
 tests/modetest/modetest.c|  137 ++--
 26 files changed, 659 insertions(+), 146 deletions(-)

New commits:
commit a11ea35f4ffb32591da33dba6e242d246d58ad7d
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Fri Mar 4 12:56:52 2011 +1100

Add new radeon symbols to libkms

diff --git a/debian/changelog b/debian/changelog
index 9f791eb..9f5f54d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.24-1) UNRELEASED; urgency=low
 
   * New upstream release.
 - Contains intel cherry-picks taken in 2.4.23-3.
+  * Add new internal radeon symbols to libkms1.symbols
 
  -- Christopher James Halse Rogers r...@ubuntu.com  Fri, 04 Mar 2011 
11:24:07 +1100
 
diff --git a/debian/libkms1.symbols b/debian/libkms1.symbols
index 0458f6e..bb782d1 100644
--- a/debian/libkms1.symbols
+++ b/debian/libkms1.symbols
@@ -11,4 +11,5 @@ libkms.so.1 libkms1 #MINVER#
  kms_get_prop@Base 0
  linux_create@Base 0 1
  nouveau_create@Base 0 1
+ radeon_create@Base 2.4.24 1
  vmwgfx_create@Base 0 1

commit 5be062e94c857e8c76b6e8a87ec5e0d5ceb0f9b6
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Fri Mar 4 12:53:37 2011 +1100

Changelog entry for new upstream

diff --git a/debian/changelog b/debian/changelog
index 9e5318e..9f791eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.24-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+- Contains intel cherry-picks taken in 2.4.23-3.
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Fri, 04 Mar 2011 
11:24:07 +1100
+
 libdrm (2.4.23-3) unstable; urgency=low
 
   * Cherry-pick from upstream:

commit d9f77af478d9d4b9225df97632701b18588a0bab
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Fri Mar 4 12:32:59 2011 +1100

Revert intel: Fallback to old exec if no mrb_exec is available

It seems git got confused by an upstream rebase and didn't merge this
cherry-pick with the original commit which causes the build to fail.

This reverts commit e4aa4696a44b2bb571bf7ba56ccdff921e562205.

diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c
index a1d846b..e949ff2 100644
--- a/intel/intel_bufmgr.c
+++ b/intel/intel_bufmgr.c
@@ -147,10 +147,6 @@ drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used,
return bo-bufmgr-bo_exec(bo, used,
   cliprects, num_cliprects, DR4);
 
-   if (ring_flag == 0)
-   return bo-bufmgr-bo_exec(bo, used,
-  cliprects, num_cliprects, DR4);
-
return -ENODEV;
 }
 

commit a926a043b8079a8e283aa231e3c2347f5ad5864f
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Tue Mar 1 18:24:14 2011 +

configure: Bump version to 2.4.24

New kernel headers.

Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk

diff --git a/configure.ac b/configure.ac
index 23ccedf..1998204 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 AC_PREREQ(2.60)
-AC_INIT([libdrm], 2.4.23, [dri-de...@lists.sourceforge.net], libdrm)
+AC_INIT([libdrm], 2.4.24, [dri-de...@lists.sourceforge.net], libdrm)
 AC_USE_SYSTEM_EXTENSIONS
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2])

commit 0209428b3918c4336018da9293cdcbf7f8fedfb6
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Tue Mar 1 16:01:53 2011 +

intel: Add I915_PARAM_HAS_RELAXED_DELTA

Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk

diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 98e1597..adc2392 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -281,6 +281,7 @@ typedef struct drm_i915_irq_wait {
 #define I915_PARAM_HAS_RELAXED_FENCING  12
 #define I915_PARAM_HAS_COHERENT_RINGS   13

libdrm: Changes to 'debian-experimental'

2011-03-05 Thread Cyril Brulebois 
 debian/changelog |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 6c26ff465e0f680800864db026da6a98723a8412
Author: Cyril Brulebois k...@debian.org
Date:   Sat Mar 5 20:27:33 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 375199f..b9229e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.24-1) UNRELEASED; urgency=low
+libdrm (2.4.24-1) experimental; urgency=low
 
   [ Christopher James Halse Rogers ]
   * New upstream release.
@@ -9,7 +9,7 @@ libdrm (2.4.24-1) UNRELEASED; urgency=low
 warning, since patches were sent upstream to stop exporting private
 symbols: symbols-declares-dependency-on-other-package
 
- -- Christopher James Halse Rogers r...@ubuntu.com  Fri, 04 Mar 2011 
11:24:07 +1100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Mar 2011 20:27:23 +0100
 
 libdrm (2.4.23-3) unstable; urgency=low
 

commit 80190376c877b3cc1fbd9888e225071f4d2bf1bd
Author: Cyril Brulebois k...@debian.org
Date:   Sat Mar 5 20:27:07 2011 +0100

No need to mention previous cherry-picks.

diff --git a/debian/changelog b/debian/changelog
index 886c938..375199f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ libdrm (2.4.24-1) UNRELEASED; urgency=low
 
   [ Christopher James Halse Rogers ]
   * New upstream release.
-- Contains intel cherry-picks taken in 2.4.23-3.
   * Add new internal radeon symbols to libkms1.symbols
 
   [ Cyril Brulebois ]

commit fefbe7bcf96610372f6344ecd626d8b54b369b4a
Author: Cyril Brulebois k...@debian.org
Date:   Sat Mar 5 20:17:49 2011 +0100

Add a reminder for lintian warning.

diff --git a/debian/changelog b/debian/changelog
index 9f5f54d..886c938 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 libdrm (2.4.24-1) UNRELEASED; urgency=low
 
+  [ Christopher James Halse Rogers ]
   * New upstream release.
 - Contains intel cherry-picks taken in 2.4.23-3.
   * Add new internal radeon symbols to libkms1.symbols
 
+  [ Cyril Brulebois ]
+  * Just as a reminder, not adding a lintian override for the following
+warning, since patches were sent upstream to stop exporting private
+symbols: symbols-declares-dependency-on-other-package
+
  -- Christopher James Halse Rogers r...@ubuntu.com  Fri, 04 Mar 2011 
11:24:07 +1100
 
 libdrm (2.4.23-3) unstable; urgency=low


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pvxcb-00029v...@alioth.debian.org

libdrm: Changes to 'debian-experimental'

2010-12-23 Thread Julien Cristau 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 27afd439e485e6ed52290d4114604eca2f28bc58
Author: Julien Cristau jcris...@debian.org
Date:   Thu Dec 23 17:57:26 2010 +0100

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 8def930..dc81cc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libdrm (2.4.23-1) UNRELEASED; urgency=low
+libdrm (2.4.23-1) experimental; urgency=low
 
+  [ Sven Joachim ]
   * New upstream release.
   * Rename the libdrm-nouveau1 package to libdrm-nouveau1a, since upstream
 broke the ABI without changing the soname.
@@ -9,7 +10,7 @@ libdrm (2.4.23-1) UNRELEASED; urgency=low
 - Bump libdrm-nouveau shlibs and symbols versions to 2.4.23.
   * Use dh_prep instead of the deprecated dh_clean -k in debian/rules.
   
- -- Sven Joachim svenj...@gmx.de  Tue, 14 Dec 2010 14:28:11 +0100
+ -- Julien Cristau jcris...@debian.org  Thu, 23 Dec 2010 17:56:54 +0100
 
 libdrm (2.4.22-2) experimental; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pvojx-00077z...@alioth.debian.org

libdrm: Changes to 'debian-experimental'

2010-12-14 Thread Sven Joachim 
 ChangeLog |  243 ++
 configure.ac  |2 
 debian/changelog  |   13 +
 debian/control|   13 -
 debian/libdrm-nouveau1.install|1 
 debian/libdrm-nouveau1.lintian-overrides  |1 
 debian/libdrm-nouveau1.symbols|   46 -
 debian/libdrm-nouveau1a.install   |1 
 debian/libdrm-nouveau1a.lintian-overrides |1 
 debian/libdrm-nouveau1a.symbols   |   46 +
 debian/rules  |6 
 include/drm/nouveau_drm.h |8 
 intel/intel_bufmgr.c  |   14 -
 intel/intel_bufmgr.h  |6 
 intel/intel_bufmgr_fake.c |   18 ++
 intel/intel_bufmgr_gem.c  |  144 -
 nouveau/nouveau_bo.c  |   12 +
 nouveau/nouveau_bo.h  |6 
 nouveau/nouveau_channel.c |5 
 nouveau/nouveau_channel.h |2 
 nouveau/nouveau_device.c  |5 
 nouveau/nouveau_drmif.h   |1 
 nouveau/nouveau_grobj.c   |2 
 nouveau/nouveau_notifier.c|2 
 nouveau/nouveau_private.h |7 
 nouveau/nouveau_pushbuf.c |8 
 radeon/radeon_bo_gem.c|2 
 radeon/radeon_cs_gem.c|2 
 tests/gem_flink.c |2 
 tests/gem_mmap.c  |2 
 tests/gem_readwrite.c |4 
 xf86drm.c |   27 ---
 32 files changed, 468 insertions(+), 184 deletions(-)

New commits:
commit 2abd407d29cc6509728e2897e7b50f0d7f9a924e
Author: Sven Joachim svenj...@gmx.de
Date:   Tue Dec 14 16:09:14 2010 +0100

Use dh_prep instead of dh_clean -k

The latter is deprecated, and we're build-depending on a new enough
debhelper to use the former.

diff --git a/debian/changelog b/debian/changelog
index 542c9dc..8def930 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libdrm (2.4.23-1) UNRELEASED; urgency=low
   remove the Breaks against xserver-xorg-video-nouveau.
 - Adjust the lintian override.
 - Bump libdrm-nouveau shlibs and symbols versions to 2.4.23.
+  * Use dh_prep instead of the deprecated dh_clean -k in debian/rules.
   
  -- Sven Joachim svenj...@gmx.de  Tue, 14 Dec 2010 14:28:11 +0100
 
diff --git a/debian/rules b/debian/rules
index e2dc066..82741af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,7 +108,7 @@ clean: xsfclean
 install: build
dh_testdir
dh_testroot
-   dh_clean -k
+   dh_prep
dh_installdirs
 
cd build  $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp

commit b8a75a799d9412320e07cddaf145c5d4d900e199
Author: Sven Joachim svenj...@gmx.de
Date:   Tue Dec 14 14:44:05 2010 +0100

Bump symbols and shlibs versions of libdrm-nouveau1a

Mostly for documentary purposes, the numbers do not really matter.

diff --git a/debian/changelog b/debian/changelog
index bc9..542c9dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libdrm (2.4.23-1) UNRELEASED; urgency=low
 - Make libdrm-nouveau1a{,-dbg} conflict with libdrm-nouveau1{,-dbg} and
   remove the Breaks against xserver-xorg-video-nouveau.
 - Adjust the lintian override.
+- Bump libdrm-nouveau shlibs and symbols versions to 2.4.23.
   
  -- Sven Joachim svenj...@gmx.de  Tue, 14 Dec 2010 14:28:11 +0100
 
diff --git a/debian/libdrm-nouveau1a.symbols b/debian/libdrm-nouveau1a.symbols
index 4da10ea..a2ba922 100644
--- a/debian/libdrm-nouveau1a.symbols
+++ b/debian/libdrm-nouveau1a.symbols
@@ -1,46 +1,46 @@
 libdrm_nouveau.so.1 libdrm-nouveau1a #MINVER#
- nouveau_bo_b...@base 2.4.21-1
- nouveau_bo_emit_buf...@base 2.4.21-1
- nouveau_bo_handle_...@base 2.4.21-1
- nouveau_bo_handle_...@base 2.4.21-1
- nouveau_bo_i...@base 2.4.21-1
- nouveau_bo_...@base 2.4.21-1
- nouveau_bo_map_fl...@base 2.4.21-1
- nouveau_bo_map_ra...@base 2.4.21-1
- nouveau_bo_...@base 2.4.21-1
- nouveau_bo_new_t...@base 2.4.21-1
- nouveau_bo_pend...@base 2.4.21-1
- nouveau_bo_...@base 2.4.21-1
- nouveau_bo_taked...@base 2.4.21-1
- nouveau_bo_un...@base 2.4.21-1
- nouveau_bo_u...@base 2.4.21-1
- nouveau_bo_w...@base 2.4.21-1
- nouveau_channel_al...@base 2.4.21-1
- nouveau_channel_f...@base 2.4.21-1
- nouveau_device_cl...@base 2.4.21-1
- nouveau_device_get_pa...@base 2.4.21-1
- nouveau_device_o...@base 2.4.21-1
- nouveau_device_open_exist...@base 2.4.21-1
- nouveau_device_set_pa...@base 2.4.21-1
- nouveau_grobj_al...@base 2.4.21-1
- nouveau_grobj_autob...@base 2.4.21-1
- nouveau_grobj_f...@base 2.4.21-1
- nouveau_grobj_...@base 2.4.21-1
- nouveau_notifier_al...@base 2.4.21-1
- nouveau_notifier_f...@base 2.4.21-1
- nouveau_notifier_re...@base 2.4.21-1
- nouveau_notifier_return_...@base 2.4.21-1
-

libdrm: Changes to 'debian-experimental'

2010-11-07 Thread Cyril Brulebois 
 debian/changelog |   10 ++
 include/drm/i915_drm.h   |8 +++-
 intel/intel_bufmgr_gem.c |   40 +---
 3 files changed, 50 insertions(+), 8 deletions(-)

New commits:
commit 2589d4b9c64fb34dbcd4b0d815806b4fd2731b16
Author: Cyril Brulebois k...@debian.org
Date:   Sun Nov 7 22:51:31 2010 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 8c05b22..40aaf55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.22-2) UNRELEASED; urgency=low
+libdrm (2.4.22-2) experimental; urgency=low
 
   * Cherry-pick some commits from upstream to make the intel video driver
 2.13.901 buildable:
@@ -6,7 +6,7 @@ libdrm (2.4.22-2) UNRELEASED; urgency=low
  - 36245771: intel: enable relaxed fence allocation for i915
  - 49447a9b: intel: initialize bufmgr.bo_mrb_exec unconditionally
 
- -- Cyril Brulebois k...@debian.org  Sun, 07 Nov 2010 22:41:56 +0100
+ -- Cyril Brulebois k...@debian.org  Sun, 07 Nov 2010 22:51:12 +0100
 
 libdrm (2.4.22-1) experimental; urgency=low
 

commit bb47f01566c9bb6c73d99b3649cf617366ccd941
Author: Cyril Brulebois k...@debian.org
Date:   Sun Nov 7 22:47:37 2010 +0100

Document the cherry-pick.

diff --git a/debian/changelog b/debian/changelog
index 3f87190..8c05b22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.4.22-2) UNRELEASED; urgency=low
+
+  * Cherry-pick some commits from upstream to make the intel video driver
+2.13.901 buildable:
+ - 057fab33: intel: Prepare for BLT ring split
+ - 36245771: intel: enable relaxed fence allocation for i915
+ - 49447a9b: intel: initialize bufmgr.bo_mrb_exec unconditionally
+
+ -- Cyril Brulebois k...@debian.org  Sun, 07 Nov 2010 22:41:56 +0100
+
 libdrm (2.4.22-1) experimental; urgency=low
 
   [ Sven Joachim ]

commit afce75cb0902190c35627ecfdc14da2fb545dd3a
Author: Albert Damen al...@gmx.net
Date:   Sun Nov 7 15:54:32 2010 +0100

intel: initialize bufmgr.bo_mrb_exec unconditionally

If bufmgr.bo_mrb_exec is not set, drm_intel_bo_mrb_exec returns ENODEV
even though drm_intel_gem_bo_mrb_exec2 will work fine for the RENDER ring.
Fixes xf86-video-intel after commit 'add BLT ring support' (5bed685f76)
with kernels without BSD or BLT ring support (2.6.34 and before).

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31443
Signed-off-by: Albert Damen al...@gmx.net
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
(cherry picked from commit 49447a9b957047db2549b8a929e763bbd87808ba)

Signed-off-by: Cyril Brulebois k...@debian.org

diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 56e0183..7aff867 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -2201,8 +2201,7 @@ drm_intel_bufmgr_gem_init(int fd, int batch_size)
/* Use the new one if available */
if (exec2) {
bufmgr_gem-bufmgr.bo_exec = drm_intel_gem_bo_exec2;
-   if (bufmgr_gem-has_bsd|bufmgr_gem-has_blt)
-   bufmgr_gem-bufmgr.bo_mrb_exec = 
drm_intel_gem_bo_mrb_exec2;
+   bufmgr_gem-bufmgr.bo_mrb_exec = drm_intel_gem_bo_mrb_exec2;
} else
bufmgr_gem-bufmgr.bo_exec = drm_intel_gem_bo_exec;
bufmgr_gem-bufmgr.bo_busy = drm_intel_gem_bo_busy;

commit ef3a6654bee1aa76a2b95b0a2c7653230537e00c
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Fri Oct 29 10:49:54 2010 +0100

intel: enable relaxed fence allocation for i915

The kernel has always allowed userspace to underallocate objects
supplied for fencing. However, the kernel only allocated the object size
for the fence in the GTT and so caused tiling corruption. More recently
the kernel does allocate the full fence region in the GTT for an
under-sized object and so advertises that clients may finally make use
of this feature. The biggest benefit is for texture-heavy GL games on
i945 such as World of Padman which go from needing over 1GiB of RAM to
play to fitting in the GTT!

Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
(cherry picked from commit 362457715faacd3101929e5f0d8ae250d0ad09df)

Signed-off-by: Cyril Brulebois k...@debian.org

diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index bd93061..19da2c0 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -278,6 +278,7 @@ typedef struct drm_i915_irq_wait {
 #define I915_PARAM_HAS_EXECBUF2  9
 #define I915_PARAM_HAS_BSD  10
 #define I915_PARAM_HAS_BLT  11
+#define I915_PARAM_HAS_RELAXED_FENCING  12
 
 typedef struct drm_i915_getparam {
int param;
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 161a007..56e0183 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -99,9 +99,10 @@ typedef struct _drm_intel_bufmgr_gem {
int available_fences;

libdrm: Changes to 'debian-experimental'

2010-10-01 Thread Cyril Brulebois 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b6edb32cd66c8c06e1e8f3a25a5e15447ae513e0
Author: Cyril Brulebois k...@debian.org
Date:   Sat Oct 2 00:41:16 2010 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 1f4f3c1..3f87190 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libdrm (2.4.22-1) UNRELEASED; urgency=low
+libdrm (2.4.22-1) experimental; urgency=low
 
+  [ Sven Joachim ]
   * New upstream release.
 
- -- Sven Joachim svenj...@gmx.de  Wed, 29 Sep 2010 08:57:51 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 02 Oct 2010 00:41:05 +0200
 
 libdrm (2.4.21-2) experimental; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1p1ovx-0003on...@alioth.debian.org

Re: libdrm: Changes to 'debian-experimental'

2010-10-01 Thread Cyril Brulebois 
Hi Sven,

Sven Joachim joachim-gu...@alioth.debian.org (29/09/2010):
  ChangeLog |  245 +++
  configure.ac  |2
  debian/changelog  |6
  include/drm/drm.h |4
  include/drm/drm_mode.h|4
  include/drm/i915_drm.h|4
  include/drm/nouveau_drm.h |1
  include/drm/radeon_drm.h  |4
  include/drm/vmwgfx_drm.h  |   69 +++
  intel/intel_bufmgr.h  |6
  intel/intel_bufmgr_gem.c  |  282 
 --
  nouveau/nouveau_device.c  |   21 +--
  tests/modetest/modetest.c |   96 ++-
  xf86drm.c |   30 
  xf86drmMode.c |   44 +++
  15 files changed, 588 insertions(+), 230 deletions(-)

 New commits:
 commit 55eca8de3790c3d67f6e05da3001c2aa0da5aca7
 Author: Sven Joachim svenj...@gmx.de
 Date:   Wed Sep 29 08:59:48 2010 +0200

 Bump changelogs
 […]

thanks, uploaded. -intel 2.13.0 will follow shortly (or tomorrow).

Mraw,
KiBi.


signature.asc
Description: Digital signature

libdrm: Changes to 'debian-experimental'

2010-09-29 Thread Sven Joachim 
 ChangeLog |  245 +++
 configure.ac  |2 
 debian/changelog  |6 
 include/drm/drm.h |4 
 include/drm/drm_mode.h|4 
 include/drm/i915_drm.h|4 
 include/drm/nouveau_drm.h |1 
 include/drm/radeon_drm.h  |4 
 include/drm/vmwgfx_drm.h  |   69 +++
 intel/intel_bufmgr.h  |6 
 intel/intel_bufmgr_gem.c  |  282 --
 nouveau/nouveau_device.c  |   21 +--
 tests/modetest/modetest.c |   96 ++-
 xf86drm.c |   30 
 xf86drmMode.c |   44 +++
 15 files changed, 588 insertions(+), 230 deletions(-)

New commits:
commit 55eca8de3790c3d67f6e05da3001c2aa0da5aca7
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Sep 29 08:59:48 2010 +0200

Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index d5a1664..3ae6795 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,248 @@
+commit 624e58e3e43c0b2c6803cb9263863444abeb3acb
+Author: Carl Worth cwo...@cworth.org
+Date:   Tue Sep 28 20:40:37 2010 -0700
+
+Increment version to 2.4.22
+
+For the upcoming 2.4.22 release.
+
+commit 6299722c478234a759b1ce748436197ca1a17ebf
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Sat Sep 25 21:32:59 2010 +0100
+
+intel: Replace open-coded drmIoctl with calls to drmIoctl()
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit 81fa7a9f56b1efb04658db921e5228c102548921
+Author: Ben Skeggs bske...@redhat.com
+Date:   Tue Sep 21 13:02:07 2010 +1000
+
+nouveau: fix drm version check some more
+
+... and make a mental note to not push commits before having coffee
+
+Signed-off-by: Ben Skeggs bske...@redhat.com
+
+commit d1cec6d2a9d63411c70c6c37509129ea4afe07d8
+Author: Ben Skeggs bske...@redhat.com
+Date:   Mon Sep 20 08:07:28 2010 +1000
+
+nouveau: fix thinko in drm version check
+
+Signed-off-by: Ben Skeggs bske...@redhat.com
+
+commit 7ec9a1effa4f551897f91f3b017723a8adf011d9
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Thu Sep 9 18:52:28 2010 +0100
+
+modetest: Fix drawing routines to use stride.
+
+commit 0da84f89c2cb25416bd3bdecae24f287b08cdb76
+Author: Jesse Barnes jbar...@virtuousgeek.org
+Date:   Thu Sep 9 10:27:22 2010 -0700
+
+modetest: align fb pitch to 64 bytes
+
+Docs say this is necessary, and the kernel now enforces this.
+
+commit b8abe6139e5c6779ee87d983346f0f65bf67462e
+Author: Jesse Barnes jbar...@virtuousgeek.org
+Date:   Tue Sep 7 13:10:15 2010 -0700
+
+modetest: add edp and TV connector names to the connector name array
+
+commit 23287f05cf2443ddf9e028e29beb5bd30979c6cf
+Author: Eric Anholt e...@anholt.net
+Date:   Thu Aug 26 15:39:28 2010 -0700
+
+Avoid use of c++ reserved keyword virtual when using a C++ compiler.
+
+Avoids requiring nasty hacks around libdrm headers in the new C++
+parts of Mesa drivers.
+
+commit 8a76244a0fd09d0e3298fe68af812d7eaa4dbcb5
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Tue Aug 24 21:29:31 2010 +0100
+
+Free the property blob along the error path.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit b61e81a191d3a5c269c5f7c40199aebc9ebc034c
+Author: Ben Skeggs bske...@redhat.com
+Date:   Wed Aug 18 12:06:48 2010 +1000
+
+nouveau: accept both 0.0.16 and 1.x.x
+
+Signed-off-by: Ben Skeggs bske...@redhat.com
+
+commit b04515c5d6c95f573457a94267b855cceb639105
+Author: Benjamin Herrenschmidt b...@kernel.crashing.org
+Date:   Fri Aug 6 13:55:11 2010 +1000
+
+libdrm: Fix PCI domain domain support
+
+This works in conjunction with newer kernels. If we succeed in requesting
+interface 1.4, the we know the kernel provides proper domain numbers. If
+not, ignore the domain number as it's bogus (except on Alpha).
+
+Signed-off-by: Benjamin Herrenschmidt b...@kernel.crashing.org
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 431f7f00db844534dbcf9a63da0d2832a3d91bff
+Author: Dave Airlie airl...@redhat.com
+Date:   Wed Aug 4 08:41:23 2010 +1000
+
+Copy headers from kernel drm-core-next
+
+commit b803918f3f77c62edf22e78cb2095be399753423
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Thu Jul 1 22:38:54 2010 +0100
+
+drm mode: Return -errno on drmIoctl() failure
+
+The high layers expect to receive a status code on error (on the
+pessimistic assumption that the errno value will have been overwritten
+by the time the failure is propagated all the way up), so convert
+xf86drmMode.c to return -errno on an ioctl error and be consistent with
+the rest of the libdrm API.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+commit c570b4b97b8ff71da9294aaf8242ed665f0c09c3
+Author: Fernando Carrijo fcarr...@yahoo.com.br
+Date:   Thu Jul 1 09:28:29 2010 -0700
+
+Purge macro NEED_REPLIES
+
+Signed-off-by: Fernando Carrijo fcarr...@yahoo.com.br
+

libdrm: Changes to 'debian-experimental'

2010-08-25 Thread Sven Joachim 
 debian/changelog |   10 +++
 debian/compat|2 
 debian/libdrm-nouveau1.lintian-overrides |1 
 debian/libdrm-nouveau1.symbols   |   90 +++
 debian/rules |3 -
 5 files changed, 59 insertions(+), 47 deletions(-)

New commits:
commit 7649f7ab7bd2cfaf61b5d6901a2fe82b7128b9a0
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Aug 25 18:25:39 2010 +0200

Add lintian override for symbols-file-contains-debian-revision

We actually need 2.4.21-1 as minimal version, 2.4.21 or 2.4.21-1~
would not work.

Bump debhelper compatibility level to 6 so that we can use dh_lintian.

diff --git a/debian/changelog b/debian/changelog
index 581ad17..82b3f55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libdrm (2.4.21-2) UNRELEASED; urgency=low
   * Bump libdrm-nouveau shlibs and symbols versions to 2.4.21-1 to ensure
 that packages built against this version are not used with squeeze's
 libdrm-nouveau1.
+  * Add a lintian override for the symbols-file-contains-debian-revision
+warning.  Bump debhelper compatibility level to 6 for dh_lintian.
 
  -- Sven Joachim svenj...@gmx.de  Wed, 25 Aug 2010 14:38:22 +0200
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..1e8b314 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+6
diff --git a/debian/libdrm-nouveau1.lintian-overrides 
b/debian/libdrm-nouveau1.lintian-overrides
new file mode 100644
index 000..5ce3941
--- /dev/null
+++ b/debian/libdrm-nouveau1.lintian-overrides
@@ -0,0 +1 @@
+libdrm-nouveau1: symbols-file-contains-debian-revision on symbol 
nouveau_bo_b...@base and 44 others
diff --git a/debian/rules b/debian/rules
index 5b3bec3..b9b097e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -157,6 +157,7 @@ ifeq ($(LIBKMS), yes)
 endif
dh_installdeb -s
dh_shlibdeps -s
+   dh_lintian -s
dh_gencontrol -s
dh_md5sums -s
dh_builddeb -s

commit fa6c8eadbb8e39582fea1035a0f5a03e18071508
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Aug 25 14:52:06 2010 +0200

Bump libdrm-nouveau shlibs and symbols versions to 2.4.21-1

Needed because sid has 2.4.21-1~squeeze2 now.

diff --git a/debian/changelog b/debian/changelog
index c937346..581ad17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdrm (2.4.21-2) UNRELEASED; urgency=low
+
+  * Bump libdrm-nouveau shlibs and symbols versions to 2.4.21-1 to ensure
+that packages built against this version are not used with squeeze's
+libdrm-nouveau1.
+
+ -- Sven Joachim svenj...@gmx.de  Wed, 25 Aug 2010 14:38:22 +0200
+
 libdrm (2.4.21-1) experimental; urgency=low
 
   [ Christopher James Halse Rogers ]
diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1.symbols
index e71dbab..a7c48d0 100644
--- a/debian/libdrm-nouveau1.symbols
+++ b/debian/libdrm-nouveau1.symbols
@@ -1,46 +1,46 @@
 libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER#
- nouveau_bo_b...@base 2.4.20-3~
- nouveau_bo_emit_buf...@base 2.4.20-3~
- nouveau_bo_handle_...@base 2.4.20-3~
- nouveau_bo_handle_...@base 2.4.20-3~
- nouveau_bo_i...@base 2.4.20-3~
- nouveau_bo_...@base 2.4.20-3~
- nouveau_bo_map_fl...@base 2.4.20-3~
- nouveau_bo_map_ra...@base 2.4.20-3~
- nouveau_bo_...@base 2.4.20-3~
- nouveau_bo_new_t...@base 2.4.20-3~
- nouveau_bo_pend...@base 2.4.20-3~
- nouveau_bo_...@base 2.4.20-3~
- nouveau_bo_taked...@base 2.4.20-3~
- nouveau_bo_un...@base 2.4.20-3~
- nouveau_bo_u...@base 2.4.20-3~
- nouveau_bo_w...@base 2.4.20-3~
- nouveau_channel_al...@base 2.4.20-3~
- nouveau_channel_f...@base 2.4.20-3~
- nouveau_device_cl...@base 2.4.20-3~
- nouveau_device_get_pa...@base 2.4.20-3~
- nouveau_device_o...@base 2.4.20-3~
- nouveau_device_open_exist...@base 2.4.20-3~
- nouveau_device_set_pa...@base 2.4.20-3~
- nouveau_grobj_al...@base 2.4.20-3~
- nouveau_grobj_autob...@base 2.4.20-3~
- nouveau_grobj_f...@base 2.4.20-3~
- nouveau_grobj_...@base 2.4.20-3~
- nouveau_notifier_al...@base 2.4.20-3~
- nouveau_notifier_f...@base 2.4.20-3~
- nouveau_notifier_re...@base 2.4.20-3~
- nouveau_notifier_return_...@base 2.4.20-3~
- nouveau_notifier_sta...@base 2.4.20-3~
- nouveau_notifier_wait_sta...@base 2.4.20-3~
- nouveau_pushbuf_emit_re...@base 2.4.20-3~
- nouveau_pushbuf_f...@base 2.4.20-3~
- nouveau_pushbuf_fl...@base 2.4.20-3~
- nouveau_pushbuf_i...@base 2.4.20-3~
- nouveau_pushbuf_marker_e...@base 2.4.20-3~
- nouveau_pushbuf_marker_u...@base 2.4.20-3~
- nouveau_pushbuf_sub...@base 2.4.20-3~
- nouveau_reloc_e...@base 2.4.20-3~
- nouveau_resource_al...@base 2.4.20-3~
- nouveau_resource_dest...@base 2.4.20-3~
- nouveau_resource_f...@base 2.4.20-3~
- nouveau_resource_i...@base 2.4.20-3~
+ nouveau_bo_b...@base 2.4.21-1
+ nouveau_bo_emit_buf...@base 2.4.21-1
+ nouveau_bo_handle_...@base 2.4.21-1
+ nouveau_bo_handle_...@base 2.4.21-1
+ nouveau_bo_i...@base 2.4.21-1
+ nouveau_bo_...@base 2.4.21-1
+

libdrm: Changes to 'debian-experimental'

2010-08-25 Thread Julien Cristau 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a2b8270f6a31c51a6bacdfe9a62cac7ce54256db
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 25 23:14:56 2010 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 82b3f55..a9a9d1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-libdrm (2.4.21-2) UNRELEASED; urgency=low
+libdrm (2.4.21-2) experimental; urgency=low
 
+  [ Sven Joachim ]
   * Bump libdrm-nouveau shlibs and symbols versions to 2.4.21-1 to ensure
 that packages built against this version are not used with squeeze's
 libdrm-nouveau1.
   * Add a lintian override for the symbols-file-contains-debian-revision
 warning.  Bump debhelper compatibility level to 6 for dh_lintian.
 
- -- Sven Joachim svenj...@gmx.de  Wed, 25 Aug 2010 14:38:22 +0200
+ -- Julien Cristau jcris...@debian.org  Wed, 25 Aug 2010 23:14:40 +0200
 
 libdrm (2.4.21-1) experimental; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1oonrl-00020h...@alioth.debian.org

libdrm: Changes to 'debian-experimental'

2010-06-10 Thread Julien Cristau 
 debian/changelog|   15 
 debian/copyright|  291 ++--
 debian/libdrm-radeon1.symbols   |   37 +-
 debian/libkms1.symbols  |   25 -
 debian/patches/02_build_libkms_against_in_tree_drm.diff |4 
 debian/rules|4 
 6 files changed, 311 insertions(+), 65 deletions(-)

New commits:
commit 119602662fcb75d635d79445a96ad68ab08ed58f
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 10 23:09:44 2010 +0200

Upload to experimental

Also adjust patch description to fit its update.

diff --git a/debian/changelog b/debian/changelog
index 533ae0e..c937346 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.21-1) UNRELEASED; urgency=low
+libdrm (2.4.21-1) experimental; urgency=low
 
   [ Christopher James Halse Rogers ]
   * debian/rules:
@@ -8,8 +8,7 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low
   * debian/control:
 - Add libkms1, libkms1-dbg packages on linux
   * debian/patches/02_build_libkms_against_in_tree_drm:
-- Build libkms against in-tree headers and link against libdrm as it
-  uses symbols from libdrm.
+- Link libkms against libdrm as it uses symbols from libdrm.
 
   [ Robert Hooker ]
   * New upstream release.
@@ -24,7 +23,7 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low
   * Same with libkms.  Also don't set a minimum version to 2.4.20, since we
 didn't ship it before anyway.
 
- -- Robert Hooker sarv...@ubuntu.com  Thu, 10 Jun 2010 14:44:36 -0400
+ -- Julien Cristau jcris...@debian.org  Thu, 10 Jun 2010 23:24:54 +0200
 
 libdrm (2.4.20-3) experimental; urgency=low
 
diff --git a/debian/patches/02_build_libkms_against_in_tree_drm.diff 
b/debian/patches/02_build_libkms_against_in_tree_drm.diff
index 7cbde37..25f8e43 100644
--- a/debian/patches/02_build_libkms_against_in_tree_drm.diff
+++ b/debian/patches/02_build_libkms_against_in_tree_drm.diff
@@ -1,6 +1,4 @@
-Description: Build libkms against in-tree xf86drm.h header
- libkms requires xf86drm.h, and uses symbols from libdrm.  Add
- libdrm to LIBADD.
+Description: Add libdrm to LIBADD as libkms uses symbols from libdrm
 Author: Christopher Halse Rogers christopher.halse.rog...@canonical.com
 Bug: https://bugs.freedesktop.org/show_bug.cgi?id=26852
 

commit 5dfb61589b4964c7413fb72953c845d8bd060f15
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 10 23:23:59 2010 +0200

Mark libkms private symbols as such

Also don't set a minimum version to 2.4.20, since we didn't ship it
before anyway.

diff --git a/debian/changelog b/debian/changelog
index f256f88..533ae0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low
 copyright statements from the source tree.
   * Mark new libdrm_radeon symbols private.  They shouldn't actually be
 exported.
+  * Same with libkms.  Also don't set a minimum version to 2.4.20, since we
+didn't ship it before anyway.
 
  -- Robert Hooker sarv...@ubuntu.com  Thu, 10 Jun 2010 14:44:36 -0400
 
diff --git a/debian/libkms1.symbols b/debian/libkms1.symbols
index 27f5638..0458f6e 100644
--- a/debian/libkms1.symbols
+++ b/debian/libkms1.symbols
@@ -1,13 +1,14 @@
 libkms.so.1 libkms1 #MINVER#
- intel_cre...@base 2.4.20
- kms_bo_cre...@base 2.4.20
- kms_bo_dest...@base 2.4.20
- kms_bo_get_p...@base 2.4.20
- kms_bo_...@base 2.4.20
- kms_bo_un...@base 2.4.20
- kms_cre...@base 2.4.20
- kms_dest...@base 2.4.20
- kms_get_p...@base 2.4.20
- linux_cre...@base 2.4.20
- nouveau_cre...@base 2.4.20
- vmwgfx_cre...@base 2.4.20
+| libkms-private
+ intel_cre...@base 0 1
+ kms_bo_cre...@base 0
+ kms_bo_dest...@base 0
+ kms_bo_get_p...@base 0
+ kms_bo_...@base 0
+ kms_bo_un...@base 0
+ kms_cre...@base 0
+ kms_dest...@base 0
+ kms_get_p...@base 0
+ linux_cre...@base 0 1
+ nouveau_cre...@base 0 1
+ vmwgfx_cre...@base 0 1
diff --git a/debian/rules b/debian/rules
index 07904d8..f9b9a16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -153,7 +153,7 @@ ifeq ($(RADEON), yes)
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.20)' -- -c4
 endif
 ifeq ($(LIBKMS), yes)
-   dh_makeshlibs -plibkms1 -V'libkms1 (=2.4.20)' -- -c4
+   dh_makeshlibs -plibkms1 -V'libkms1' -- -c4
 endif
dh_installdeb -s
dh_shlibdeps -s

commit de345b3bae0d92e531cc9abf0e15651962ba9f23
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 10 23:16:13 2010 +0200

Mark new libdrm_radeon symbols private.

They shouldn't actually be exported.

diff --git a/debian/changelog b/debian/changelog
index ab9c7c5..f256f88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Update the copyright file to hopefully include all licenses variations and
 copyright statements from the source tree.
+  * Mark new

libdrm: Changes to 'debian-experimental'

2010-06-10 Thread Robert Hooker 
 debian/changelog|5 
 debian/patches/02_build_libkms_against_in_tree_drm.diff |   19 
 debian/patches/series   |1 
 3 files changed, 25 insertions(+)

New commits:
commit 12dedbc4491331de9f13e66aa10328560f28f2f0
Author: Robert Hooker sarv...@ubuntu.com
Date:   Thu Jun 10 16:37:51 2010 -0400

Add 02_build_libkms_against_in_tree_drm.diff back, refresh it with just the 
needed hunk.

diff --git a/debian/changelog b/debian/changelog
index ee8066e..1ef2372 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,14 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low
   kernel so we might as well build the userspace bits.
   * debian/control:
 - Add libkms1, libkms1-dbg packages on linux
+  * debian/patches/02_build_libkms_against_in_tree_drm:
+- Build libkms against in-tree headers and link against libdrm as it
+  uses symbols from libdrm.
 
   [ Robert Hooker ]
   * New upstream release.
+  * Refresh 02_build_libkms_against_in_tree_drm.
+  * Update libdrm-intel1.symbols, libdrm-radeon1.symbols and shlibs.
 
  -- Robert Hooker sarv...@ubuntu.com  Thu, 10 Jun 2010 14:44:36 -0400
 
diff --git a/debian/patches/02_build_libkms_against_in_tree_drm.diff 
b/debian/patches/02_build_libkms_against_in_tree_drm.diff
new file mode 100644
index 000..7cbde37
--- /dev/null
+++ b/debian/patches/02_build_libkms_against_in_tree_drm.diff
@@ -0,0 +1,19 @@
+Description: Build libkms against in-tree xf86drm.h header
+ libkms requires xf86drm.h, and uses symbols from libdrm.  Add
+ libdrm to LIBADD.
+Author: Christopher Halse Rogers christopher.halse.rog...@canonical.com
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=26852
+
+Index: libdrm/libkms/Makefile.am
+===
+--- libdrm.orig/libkms/Makefile.am
 libdrm/libkms/Makefile.am
+@@ -6,7 +6,7 @@ AM_CFLAGS = \
+ libkms_la_LTLIBRARIES = libkms.la
+ libkms_ladir = $(libdir)
+ libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libkms_la_LIBADD =
++libkms_la_LIBADD = ../libdrm.la
+ 
+ #if HAVE_LIBUDEV
+ #libkms_la_LIBADD += $(LIBUDEV_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index 8ca2297..e23f0b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_default_perms.diff
+02_build_libkms_against_in_tree_drm.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1omow1-0006ki...@alioth.debian.org

libdrm: Changes to 'debian-experimental'

2010-06-10 Thread Robert Hooker 
 .gitignore  |1 
 ChangeLog   |  280 
 configure.ac|   18 
 debian/changelog|   11 
 debian/libdrm-intel1.symbols|2 
 debian/libdrm-radeon1.symbols   |   18 
 debian/patches/02_build_libkms_against_in_tree_drm.diff |   25 
 debian/patches/series   |1 
 debian/rules|4 
 include/drm/drm.h   |2 
 include/drm/drm_mode.h  |   37 
 include/drm/i915_drm.h  |5 
 intel/intel_bufmgr.c|   20 
 intel/intel_bufmgr.h|4 
 intel/intel_bufmgr_fake.c   |4 
 intel/intel_bufmgr_gem.c|  197 
 intel/intel_bufmgr_priv.h   |   14 
 libkms/Makefile.am  |3 
 nouveau/Makefile.am |1 
 nouveau/nouveau_class.h | 9019 
 radeon/Makefile.am  |4 
 radeon/bof.c|  477 
 radeon/bof.h|   90 
 radeon/radeon_cs.h  |2 
 radeon/radeon_cs_gem.c  |  102 
 tests/Makefile.am   |   10 
 tests/vbltest/Makefile.am   |   11 
 tests/vbltest/vbltest.c |  188 
 xf86atomic.h|4 
 29 files changed, 1418 insertions(+), 9136 deletions(-)

New commits:
commit b47654f4e18616d3e2c2810aba8eba205fedeb6a
Author: Robert Hooker sarv...@ubuntu.com
Date:   Thu Jun 10 15:08:53 2010 -0400

Refresh intel and radeon symbols.

diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index 68b9c37..24b01cb 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -13,8 +13,10 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_bo_gem_create_from_n...@base 2.4.1
  drm_intel_bo_get_subd...@base 2.4.1
  drm_intel_bo_get_til...@base 2.4.1
+ drm_intel_bo_is_reusa...@base 2.4.21
  drm_intel_bo_madv...@base 2.4.16
  drm_intel_bo_...@base 2.4.1
+ drm_intel_bo_mrb_e...@base 2.4.21
  drm_intel_bo_...@base 2.4.1
  drm_intel_bo_refere...@base 2.4.1
  drm_intel_bo_referen...@base 2.4.15
diff --git a/debian/libdrm-radeon1.symbols b/debian/libdrm-radeon1.symbols
index 2cc83e9..fdc67ae 100644
--- a/debian/libdrm-radeon1.symbols
+++ b/debian/libdrm-radeon1.symbols
@@ -1,4 +1,22 @@
 libdrm_radeon.so.1 libdrm-radeon1 #MINVER#
+ bof_ar...@base 2.4.21
+ bof_array_app...@base 2.4.21
+ bof_array_...@base 2.4.21
+ bof_array_s...@base 2.4.21
+ bof_b...@base 2.4.21
+ bof_blob_s...@base 2.4.21
+ bof_blob_va...@base 2.4.21
+ bof_dec...@base 2.4.21
+ bof_dump_f...@base 2.4.21
+ bof_inc...@base 2.4.21
+ bof_in...@base 2.4.21
+ bof_int32_va...@base 2.4.21
+ bof_load_f...@base 2.4.21
+ bof_obj...@base 2.4.21
+ bof_object_...@base 2.4.21
+ bof_object_...@base 2.4.21
+ bof_pr...@base 2.4.21
+ bof_str...@base 2.4.21
  radeon_bo_de...@base 2.4.17
  radeon_bo_get_han...@base 2.4.17
  radeon_bo_get_src_dom...@base 2.4.17
diff --git a/debian/rules b/debian/rules
index 8f55cda..c2c42f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -144,13 +144,13 @@ endif
dh_fixperms -s
dh_makeshlibs -plibdrm2 -V'libdrm2 (= 2.4.17)' -- -c4
 ifeq ($(INTEL), yes)
-   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.20)' -- -c4
+   dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (= 2.4.21)' -- -c4
 endif
 ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau1 -V'libdrm-nouveau1 (= 2.4.20-3~)' -- 
-c4
 endif
 ifeq ($(RADEON), yes)
-   dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.20)' -- -c4
+   dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.21)' -- -c4
 endif
 ifeq ($(LIBKMS), yes)
dh_makeshlibs -plibkms1 -V'libkms1 (=2.4.20)' -- -c4

commit 8165277148da2669892f3da6c34da49565f2ba3a
Author: Robert Hooker sarv...@ubuntu.com
Date:   Thu Jun 10 14:59:54 2010 -0400

Drop 02_build_libkms_against_in_tree_drm.diff (upstream)

diff --git a/debian/changelog b/debian/changelog
index 026aa47..ee8066e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,6 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low
   kernel so we might as well build the userspace bits.
   * debian/control:
 - Add libkms1, libkms1-dbg packages on linux
-  * debian/patches/02_build_libkms_against_in_tree_drm:
-- Build libkms against in-tree headers and link against libdrm as it
-  uses

libdrm: Changes to 'debian-experimental'

2010-05-27 Thread Christopher Halse Rogers 
 debian/libkms1.install |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit df58a9b5773568ce9e504acc552c175a1170d740
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Thu May 27 19:03:36 2010 +1000

Install libkms to /usr/lib.

Ubuntu installing libdrm to /lib doesn't make it right for Debian.  Gah.

diff --git a/debian/libkms1.install b/debian/libkms1.install
index e72408b..2d29800 100644
--- a/debian/libkms1.install
+++ b/debian/libkms1.install
@@ -1 +1 @@
-usr/lib/libkms.so.1* /lib
+usr/lib/libkms.so.1*


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ohz1g-0001hu...@alioth.debian.org

libdrm: Changes to 'debian-experimental'

2010-05-26 Thread Christopher Halse Rogers 
 debian/changelog|   14 
 debian/control  |   19 
 debian/libkms1.install  |1 
 debian/libkms1.symbols  |   13 
 debian/patches/02_build_libkms_against_in_tree_drm.diff |   25 
 debian/patches/series   |1 
 debian/rules|6 +++
 7 files changed, 77 insertions(+), 2 deletions(-)

New commits:
commit 7eea8050f79d164bd1ffd40a481bb5e30d2dd467
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Wed May 26 17:31:08 2010 +1000

* Add libkms package
* Enable vmwgfx API; the kernel module is available in 2.6.34

diff --git a/debian/changelog b/debian/changelog
index ee6125e..df4ba46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libdrm (2.4.20-3) UNRELEASED; urgency=low
 
+  [ Sven Joachim ]
   * Update libdrm-nouveau1 to the ABI of Linux 2.6.34.
 - Drop 03_revert_abi_change.diff.
 - Bump libdrm-nouveau shlibs and symbols versions to 2.4.20-3~
@@ -10,7 +11,18 @@ libdrm (2.4.20-3) UNRELEASED; urgency=low
   * Include full SONAME in libdrm-nouveau1.install.
   * Update xsfbs to 81fc271788605b52e85c2d11635a0371fb44605e0.
 
- -- Sven Joachim svenj...@gmx.de  Sat, 22 May 2010 13:47:34 +0200
+  [ Christopher James Halse Rogers ]
+  * debian/rules:
+- Add libkms to build
+- Build vmwgfx experimental API.  The drm module is available in the 2.6.34
+  kernel so we might as well build the userspace bits.
+  * debian/control:
+- Add libkms1, libkms1-dbg packages on linux
+  * debian/patches/02_build_libkms_against_in_tree_drm:
+- Build libkms against in-tree headers and link against libdrm as it
+  uses symbols from libdrm.
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Wed, 26 May 2010 
17:03:23 +1000
 
 libdrm (2.4.20-2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 947dce4..e66caa1 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Depends:
  libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
  libdrm-radeon1 (= ${binary:Version}) [linux-any],
  libdrm-nouveau1 (= ${binary:Version}) [linux-any],
+ libkms1 (= ${binary:Version}) [linux-any],
  ${misc:Depends},
 Replaces:
  linux-libc-dev ( 2.6.32-10)
@@ -147,3 +148,21 @@ Description: Userspace interface to radeon-specific kernel 
DRM services -- debug
  .
  This package provides the debugging symbols for the libdrm-radeon1 package.
 
+Package: libkms1
+Section: libs
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Library that abstract aways the different mm interface for kernel 
drivers
+ This library implements a unified userspace interface to the different buffer
+ management interfaces of the kernel DRM hardware drivers.
+
+Package: libkms1-dbg
+Section: debug
+Priority: extra
+Architecture: linux-any
+Depends: libkms1 (= ${binary:Version}), ${misc:Depends}
+Description: Library that abstract aways the different mm interface for kernel 
drivers -- debugging symbols
+ This library implements a unified userspace interface to the different buffer
+ management interfaces of the kernel DRM hardware drivers.
+ .
+ This package provides the debugging symbols for the libkms1 package.
diff --git a/debian/libkms1.install b/debian/libkms1.install
new file mode 100644
index 000..e72408b
--- /dev/null
+++ b/debian/libkms1.install
@@ -0,0 +1 @@
+usr/lib/libkms.so.1* /lib
diff --git a/debian/libkms1.symbols b/debian/libkms1.symbols
new file mode 100644
index 000..27f5638
--- /dev/null
+++ b/debian/libkms1.symbols
@@ -0,0 +1,13 @@
+libkms.so.1 libkms1 #MINVER#
+ intel_cre...@base 2.4.20
+ kms_bo_cre...@base 2.4.20
+ kms_bo_dest...@base 2.4.20
+ kms_bo_get_p...@base 2.4.20
+ kms_bo_...@base 2.4.20
+ kms_bo_un...@base 2.4.20
+ kms_cre...@base 2.4.20
+ kms_dest...@base 2.4.20
+ kms_get_p...@base 2.4.20
+ linux_cre...@base 2.4.20
+ nouveau_cre...@base 2.4.20
+ vmwgfx_cre...@base 2.4.20
diff --git a/debian/patches/02_build_libkms_against_in_tree_drm.diff 
b/debian/patches/02_build_libkms_against_in_tree_drm.diff
new file mode 100644
index 000..a80d734
--- /dev/null
+++ b/debian/patches/02_build_libkms_against_in_tree_drm.diff
@@ -0,0 +1,25 @@
+Description: Build libkms against in-tree xf86drm.h header
+ libkms requires xf86drm.h, and uses symbols from libdrm.  Add
+ an appropriate search path to CFLAGS, and libdrm to LIBADD.
+Author: Christopher Halse Rogers christopher.halse.rog...@canonical.com
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=26852
+
+Index: libdrm/libkms/Makefile.am
+===
+--- libdrm.orig/libkms/Makefile.am 2010-05-26 16:35:15.092706440 +1000
 libdrm/libkms/Makefile.am  2010-05-26 16:42:41.722739824 +1000

libdrm: Changes to 'debian-experimental'

2010-05-26 Thread Christopher Halse Rogers 
 debian/control |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6f106971b54479b2d9c42773f3def889169cf045
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Wed May 26 17:32:50 2010 +1000

Better short description for libkms

diff --git a/debian/control b/debian/control
index e66caa1..e15bc87 100644
--- a/debian/control
+++ b/debian/control
@@ -152,7 +152,7 @@ Package: libkms1
 Section: libs
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Library that abstract aways the different mm interface for kernel 
drivers
+Description: Userspace interface to kernel DRM buffer management
  This library implements a unified userspace interface to the different buffer
  management interfaces of the kernel DRM hardware drivers.
 
@@ -161,7 +161,7 @@ Section: debug
 Priority: extra
 Architecture: linux-any
 Depends: libkms1 (= ${binary:Version}), ${misc:Depends}
-Description: Library that abstract aways the different mm interface for kernel 
drivers -- debugging symbols
+Description: Userspace interface to kernel DRM buffer management -- debugging 
symbols
  This library implements a unified userspace interface to the different buffer
  management interfaces of the kernel DRM hardware drivers.
  .


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ohb7u-00025h...@alioth.debian.org

libdrm: Changes to 'debian-experimental'

2010-05-26 Thread Julien Cristau 
 debian/changelog |   29 -
 1 file changed, 16 insertions(+), 13 deletions(-)

New commits:
commit 8ebeda2f0a902dd1d8c0abfab431729173bd1fef
Author: Julien Cristau jcris...@debian.org
Date:   Wed May 26 10:38:15 2010 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index ee6125e..7b10164 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libdrm (2.4.20-3) UNRELEASED; urgency=low
+libdrm (2.4.20-3) experimental; urgency=low
 
+  [ Sven Joachim ]
   * Update libdrm-nouveau1 to the ABI of Linux 2.6.34.
 - Drop 03_revert_abi_change.diff.
 - Bump libdrm-nouveau shlibs and symbols versions to 2.4.20-3~
@@ -10,7 +11,7 @@ libdrm (2.4.20-3) UNRELEASED; urgency=low
   * Include full SONAME in libdrm-nouveau1.install.
   * Update xsfbs to 81fc271788605b52e85c2d11635a0371fb44605e0.
 
- -- Sven Joachim svenj...@gmx.de  Sat, 22 May 2010 13:47:34 +0200
+ -- Julien Cristau jcris...@debian.org  Wed, 26 May 2010 10:33:22 +0200
 
 libdrm (2.4.20-2) experimental; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ohccl-s1...@alioth.debian.org

Re: libdrm: Changes to 'debian-experimental'

2010-05-26 Thread Julien Cristau 
On Wed, May 26, 2010 at 07:31:46 +, Christopher Halse Rogers wrote:

 @@ -25,12 +24,15 @@ else
  endif
  ifeq (linux, $(DEB_HOST_ARCH_OS))
   confflags += --enable-udev
 + confflags += --enable-libkms
 + confflags += --enable-vmwgfx-experimental-api
   confflags += --enable-nouveau-experimental-api
   NOUVEAU = yes
   confflags += --enable-radeon
   RADEON = yes
  else
   confflags += --disable-udev
 + confflags += --disable-libkms
   confflags += --disable-nouveau-experimental-api
   NOUVEAU = no
   confflags += --disable-radeon
 @@ -132,6 +134,7 @@ endif
  ifeq ($(RADEON), yes)
   dh_strip -plibdrm-radeon1 --dbg-package=libdrm-radeon1-dbg
  endif
 + dh_strip -p libkms1 --dbg-package=libkms1-dbg

this should be conditional on whether the libkms1 package is being
built.

   dh_strip -s --remaining-packages
   dh_compress -s
   dh_fixperms -s
 @@ -145,6 +148,7 @@ endif
  ifeq ($(RADEON), yes)
   dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.20)' -- -c4
  endif
 + dh_makeshlibs -plibkms1 -V'libkms1 (=2.4.20)' -- -c4

and same here.  See how the libdrm-foo packages are handled.

Cheers,
Julien


signature.asc
Description: Digital signature

libdrm: Changes to 'debian-experimental'

2010-05-26 Thread Christopher Halse Rogers 
 debian/rules |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit a4dc0bccb3fd7717dd756fbd4ae4f5422a236580
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Wed May 26 20:23:29 2010 +1000

Only act on libkms when we're building libkms

diff --git a/debian/rules b/debian/rules
index 4be7e37..8f55cda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,7 @@ endif
 ifeq (linux, $(DEB_HOST_ARCH_OS))
confflags += --enable-udev
confflags += --enable-libkms
+   LIBKMS = yes
confflags += --enable-vmwgfx-experimental-api
confflags += --enable-nouveau-experimental-api
NOUVEAU = yes
@@ -33,6 +34,7 @@ ifeq (linux, $(DEB_HOST_ARCH_OS))
 else
confflags += --disable-udev
confflags += --disable-libkms
+   LIBKMS=no
confflags += --disable-nouveau-experimental-api
NOUVEAU = no
confflags += --disable-radeon
@@ -134,7 +136,9 @@ endif
 ifeq ($(RADEON), yes)
dh_strip -plibdrm-radeon1 --dbg-package=libdrm-radeon1-dbg
 endif
+ifeq ($(LIBKMS), yes)
dh_strip -p libkms1 --dbg-package=libkms1-dbg
+endif
dh_strip -s --remaining-packages
dh_compress -s
dh_fixperms -s
@@ -148,7 +152,9 @@ endif
 ifeq ($(RADEON), yes)
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (= 2.4.20)' -- -c4
 endif
+ifeq ($(LIBKMS), yes)
dh_makeshlibs -plibkms1 -V'libkms1 (=2.4.20)' -- -c4
+endif
dh_installdeb -s
dh_shlibdeps -s
dh_gencontrol -s


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ohdmq-dy...@alioth.debian.org

libdrm: Changes to 'debian-experimental'

2010-05-22 Thread Sven Joachim 
 debian/README.source |2 
 debian/changelog |   14 
 debian/control   |1 
 debian/libdrm-nouveau1.install   |2 
 debian/libdrm-nouveau1.symbols   |  103 -
 debian/patches/03_revert_abi_change.diff | 2118 ---
 debian/patches/series|1 
 debian/rules |2 
 debian/xsfbs/xsfbs.mk|   35 
 9 files changed, 85 insertions(+), 2193 deletions(-)

New commits:
commit 0005bf184af82c1e74d372383ac266c8621598a7
Author: Sven Joachim svenj...@gmx.de
Date:   Sat May 22 17:13:58 2010 +0200

Include full SONAME in libdrm-nouveau1.install

diff --git a/debian/changelog b/debian/changelog
index 3c3882f..ee6125e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libdrm (2.4.20-3) UNRELEASED; urgency=low
   with an older libdrm-nouveau1 version.
 - Add versioned Breaks against xserver-xorg-video-nouveau to force
   an upgrade of that package and prevent X segfaults.
+  * Include full SONAME in libdrm-nouveau1.install.
   * Update xsfbs to 81fc271788605b52e85c2d11635a0371fb44605e0.
 
  -- Sven Joachim svenj...@gmx.de  Sat, 22 May 2010 13:47:34 +0200
diff --git a/debian/libdrm-nouveau1.install b/debian/libdrm-nouveau1.install
index 7650858..b19813f 100644
--- a/debian/libdrm-nouveau1.install
+++ b/debian/libdrm-nouveau1.install
@@ -1 +1 @@
-usr/lib/libdrm_nouveau.so.*
+usr/lib/libdrm_nouveau.so.1*

commit e09302a94cf5446ea4539e75fb07b497ac566989
Author: Sven Joachim svenj...@gmx.de
Date:   Sat May 22 14:22:31 2010 +0200

Update libdrm-nouveau1 to the ABI of Linux 2.6.34

Drop 03_revert_abi_change.diff.  Bump libdrm-nouveau shlibs and
symbols versions to 2.4.20-3~ to ensure that packages built against
this version are not used with an older libdrm-nouveau1 version.

Add versioned Breaks against older xserver-xorg-video-nouveau packages
which would segfault if used with this version of libdrm.

diff --git a/debian/changelog b/debian/changelog
index 6a60758..3c3882f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
 libdrm (2.4.20-3) UNRELEASED; urgency=low
 
+  * Update libdrm-nouveau1 to the ABI of Linux 2.6.34.
+- Drop 03_revert_abi_change.diff.
+- Bump libdrm-nouveau shlibs and symbols versions to 2.4.20-3~
+  to ensure that packages built against this version are not used
+  with an older libdrm-nouveau1 version.
+- Add versioned Breaks against xserver-xorg-video-nouveau to force
+  an upgrade of that package and prevent X segfaults.
   * Update xsfbs to 81fc271788605b52e85c2d11635a0371fb44605e0.
 
  -- Sven Joachim svenj...@gmx.de  Sat, 22 May 2010 13:47:34 +0200
diff --git a/debian/control b/debian/control
index cf271d8..947dce4 100644
--- a/debian/control
+++ b/debian/control
@@ -99,6 +99,7 @@ Section: libs
 Architecture: linux-any
 Depends: ${shlibs:Depends},
  ${misc:Depends},
+Breaks: xserver-xorg-video-nouveau ( 1:0.0.16)
 Description: Userspace interface to nouveau-specific kernel DRM services -- 
runtime
  This library implements the userspace interface to the nouveau-specific kernel
  DRM services. DRM stands for Direct Rendering Manager, which is the
diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1.symbols
index 48ce118..e71dbab 100644
--- a/debian/libdrm-nouveau1.symbols
+++ b/debian/libdrm-nouveau1.symbols
@@ -1,59 +1,46 @@
 libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER#
-#MISSING: 2.4.12+git20090729.5a73f066# d...@base 2.4.4
- nouveau_bo_b...@base 2.4.4
- nouveau_bo_emit_buf...@base 2.4.4
-#MISSING: 2.4.12+git20090729.5a73f066# nouveau_bo_f...@base 2.4.4
- nouveau_bo_handle_...@base 2.4.4
- nouveau_bo_handle_...@base 2.4.4
- nouveau_bo_i...@base 2.4.4
- nouveau_bo_...@base 2.4.4
- nouveau_bo_map_fl...@base 2.4.11-1ubuntu1~
- nouveau_bo_map_ra...@base 2.4.11-1ubuntu1~
- nouveau_bo_...@base 2.4.4
- nouveau_bo_new_t...@base 2.4.11-1ubuntu1~
- nouveau_bo_pend...@base 2.4.16
- nouveau_bo_...@base 2.4.4
- nouveau_bo_...@base 2.4.4
- nouveau_bo_taked...@base 2.4.4
-#MISSING: 2.4.12+git20090729.5a73f066# nouveau_bo_t...@base 2.4.4
- nouveau_bo_un...@base 2.4.4
- nouveau_bo_un...@base 2.4.4
- nouveau_bo_u...@base 2.4.4
-#MISSING: 2.4.12+git20090729.5a73f066# nouveau_bo_validate_n...@base 2.4.4
- nouveau_bo_w...@base 2.4.11-1ubuntu1~
- nouveau_channel_al...@base 2.4.4
- nouveau_channel_f...@base 2.4.4
- nouveau_device_cl...@base 2.4.4
- nouveau_device_get_pa...@base 2.4.4
- nouveau_device_o...@base 2.4.4
- nouveau_device_open_exist...@base 2.4.4
- nouveau_device_set_pa...@base 2.4.4
-#MISSING: 2.4.12+git20090729.5a73f066# nouveau_dma_channel_i...@base 2.4.4
-#MISSING: 2.4.12+git20090729.5a73f066# nouveau_dma_kick...@base 2.4.4
-#MISSING: 2.4.12+git20090729.5a73f066# nouveau_dma_w...@base 2.4.4
-#MISSING: 2.4.12+git20090729.5a73f066# nouveau_fence_e...@base 2.4.4
-#MISSING: 2.4.12+git20090729.5a73f066#

libdrm: Changes to 'debian-experimental'

2010-04-27 Thread Cyril Brulebois 
 debian/changelog |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit bd991873133218605efe521715d0891ebfc61aed
Author: Cyril Brulebois k...@debian.org
Date:   Wed Apr 28 03:11:59 2010 +0200

Upload again, faking a new upstream version, since a screw-up on ftpmaster 
side trashed all files from experimental.

diff --git a/debian/changelog b/debian/changelog
index 0f3e99d..d866d4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.20-2) experimental; urgency=low
+
+  * Upload again, faking a new upstream version, since a screw-up on
+ftpmaster side trashed all files from experimental.
+
+ -- Cyril Brulebois k...@debian.org  Wed, 28 Apr 2010 01:54:44 +0200
+
 libdrm (2.4.20-1) experimental; urgency=low
 
   * New upstream release.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1o6vpz-00079y...@alioth.debian.org

libdrm: Changes to 'debian-experimental'

2010-04-15 Thread Cyril Brulebois 
 debian/changelog  |4 
 debian/libdrm-radeon1.symbols |   36 ++--
 2 files changed, 22 insertions(+), 18 deletions(-)

New commits:
commit c1b787096efdce395b8a2dd4a5dc56119715e880
Author: Cyril Brulebois k...@debian.org
Date:   Thu Apr 15 23:36:25 2010 +0200

Remove Debian revision for new symbols in libdrm-radeon1.symbols

diff --git a/debian/changelog b/debian/changelog
index 6c6a399..3189c9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 libdrm (2.4.20-1) UNRELEASED; urgency=low
 
+  [ Brice Goglin ]
   * New upstream release.
   * Pull upstream master up to commit 3506173b for bug fixes.
   * Update libdrm-intel1.symbols, libdrm-radeon1.symbols and shlibs.
   * Disable libkms for now.
 
+  [ Cyril Brulebois ]
+  * Remove Debian revision for new symbols in libdrm-radeon1.symbols
+
  -- Brice Goglin bgog...@debian.org  Wed, 14 Apr 2010 14:35:23 +0200
 
 libdrm (2.4.18-5) unstable; urgency=low
diff --git a/debian/libdrm-radeon1.symbols b/debian/libdrm-radeon1.symbols
index 11012d0..7422b00 100644
--- a/debian/libdrm-radeon1.symbols
+++ b/debian/libdrm-radeon1.symbols
@@ -1,22 +1,22 @@
 libdrm_radeon.so.1 libdrm-radeon1 #MINVER#
- bof_ar...@base 2.4.20-1
- bof_array_app...@base 2.4.20-1
- bof_array_...@base 2.4.20-1
- bof_array_s...@base 2.4.20-1
- bof_b...@base 2.4.20-1
- bof_blob_s...@base 2.4.20-1
- bof_blob_va...@base 2.4.20-1
- bof_dec...@base 2.4.20-1
- bof_dump_f...@base 2.4.20-1
- bof_inc...@base 2.4.20-1
- bof_in...@base 2.4.20-1
- bof_int32_va...@base 2.4.20-1
- bof_load_f...@base 2.4.20-1
- bof_obj...@base 2.4.20-1
- bof_object_...@base 2.4.20-1
- bof_object_...@base 2.4.20-1
- bof_pr...@base 2.4.20-1
- bof_str...@base 2.4.20-1
+ bof_ar...@base 2.4.20
+ bof_array_app...@base 2.4.20
+ bof_array_...@base 2.4.20
+ bof_array_s...@base 2.4.20
+ bof_b...@base 2.4.20
+ bof_blob_s...@base 2.4.20
+ bof_blob_va...@base 2.4.20
+ bof_dec...@base 2.4.20
+ bof_dump_f...@base 2.4.20
+ bof_inc...@base 2.4.20
+ bof_in...@base 2.4.20
+ bof_int32_va...@base 2.4.20
+ bof_load_f...@base 2.4.20
+ bof_obj...@base 2.4.20
+ bof_object_...@base 2.4.20
+ bof_object_...@base 2.4.20
+ bof_pr...@base 2.4.20
+ bof_str...@base 2.4.20
  radeon_bo_de...@base 2.4.17
  radeon_bo_get_han...@base 2.4.17
  radeon_bo_get_src_dom...@base 2.4.17


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1o2wv7-0002yk...@alioth.debian.org

libdrm: Changes to 'debian-experimental'

2010-04-15 Thread Brice Goglin 
Rebased ref, commits from common ancestor:
commit a8ecb929d9f72b24dc7b45c03eaf606bc6c64bee
Author: Brice Goglin bgog...@debian.org
Date:   Fri Apr 16 07:09:36 2010 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index c6b7091..0f3e99d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdrm (2.4.20-1) UNRELEASED; urgency=low
+libdrm (2.4.20-1) experimental; urgency=low
 
   * New upstream release.
 + Cherry-pick upstream fixes 107ccd92 and 332739e3.
   * Update libdrm-intel1.symbols, libdrm-radeon1.symbols and shlibs.
   * Disable libkms for now.
 
- -- Brice Goglin bgog...@debian.org  Tue, 06 Apr 2010 21:46:57 +0200
+ -- Brice Goglin bgog...@debian.org  Fri, 16 Apr 2010 07:14:41 +0200
 
 libdrm (2.4.18-5) unstable; urgency=low
 

commit 882cf719a5ddd2182b454c578658a89465e86a03
Author: Brice Goglin bgog...@debian.org
Date:   Fri Apr 16 07:08:27 2010 +0200

Update changelog with cherry-picked commits

diff --git a/debian/changelog b/debian/changelog
index 48020ef..c91bc71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.20-1) UNRELEASED; urgency=low
 
   * New upstream release.
++ Cherry-pick upstream fixes 107ccd92 and 332739e3.
   * Update libdrm-intel1.symbols, libdrm-radeon1.symbols and shlibs.
   * Disable libkms for now.
 

commit 332739e3074135b00e781468ad8aaed1950f5453
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sun Apr 11 18:40:38 2010 +0100

intel: Use the correct size when allocating reloc_target_info array

Thomas tracked down this error with kdm and commit b509640:

==4320== Invalid write of size 8
==4320==at 0x9A97998: do_bo_emit_reloc (in 
/usr/lib/libdrm_intel.so.1.0.0)
==4320==by 0x9A97B9C: drm_intel_gem_bo_emit_reloc (in 
/usr/lib/libdrm_intel.so.1.0.0)
==4320==by 0xAED3234: intel_batchbuffer_emit_reloc (in 
/usr/lib/xorg/modules/dri/i965_dri.so)
==4320==by 0xAF13827: brw_emit_vertices (in 
/usr/lib/xorg/modules/dri/i965_dri.so)
==4320==by 0xAF1F14D: brw_upload_state (in 
/usr/lib/xorg/modules/dri/i965_dri.so)
==4320==by 0xAF12122: brw_draw_prims (in 
/usr/lib/xorg/modules/dri/i965_dri.so)
==4320==by 0xB256824: vbo_exec_vtx_flush (in 
/usr/lib/xorg/modules/dri/libdricore.so)
==4320==by 0xB2523BB: vbo_exec_FlushVertices_internal (in 
/usr/lib/xorg/modules/dri/libdricore.so)
==4320==by 0xB252411: vbo_exec_FlushVertices (in 
/usr/lib/xorg/modules/dri/libdricore.so)
==4320==by 0xB195A3D: _mesa_PopAttrib (in 
/usr/lib/xorg/modules/dri/libdricore.so)
==4320==by 0x8DF0F02: __glXDisp_Render (in 
/usr/lib/xorg/modules/extensions/libglx.xorg)
==4320==by 0x8DF517F: __glXDispatch (in 
/usr/lib/xorg/modules/extensions/libglx.xorg)
==4320==  Address 0x126a8b80 is 0 bytes after a block of size 16,368 alloc'd
==4320==at 0x4C23E03: malloc (in 
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==4320==by 0x9A97A64: do_bo_emit_reloc (in 
/usr/lib/libdrm_intel.so.1.0.0)
==4320==by 0x9A97B9C: drm_intel_gem_bo_emit_reloc (in 
/usr/lib/libdrm_intel.so.1.0.0)
==4320==by 0xAED3234: intel_batchbuffer_emit_reloc (in 
/usr/lib/xorg/modules/dri/i965_dri.so)
==4320==by 0xAF191DB: upload_binding_table_pointers (in 
/usr/lib/xorg/modules/dri/i965_dri.so)
==4320==by 0xAF1F14D: brw_upload_state (in 
/usr/lib/xorg/modules/dri/i965_dri.so)
==4320==by 0xAF12122: brw_draw_prims (in 
/usr/lib/xorg/modules/dri/i965_dri.so)
==4320==by 0xB255EF6: vbo_exec_DrawArrays (in 
/usr/lib/xorg/modules/dri/libdricore.so)
==4320==by 0x8DF67A3: __glXDisp_DrawArrays (in 
/usr/lib/xorg/modules/extensions/libglx.xorg)
==4320==by 0x8DF0F02: __glXDisp_Render (in 
/usr/lib/xorg/modules/extensions/libglx.xorg)
==4320==by 0x8DF517F: __glXDispatch (in 
/usr/lib/xorg/modules/extensions/libglx.xorg)
==4320==by 0x446293: ??? (in /usr/bin/Xorg)

which is simply due to only allocating space for the pointers and not
the structs themselves. D'oh.

Reported-by: Thomas Bächler tho...@archlinux.org
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk

diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 8e46e37..a2cf6e6 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -470,7 +470,7 @@ drm_intel_setup_reloc_list(drm_intel_bo *bo)
bo_gem-relocs = malloc(max_relocs *
sizeof(struct drm_i915_gem_relocation_entry));
bo_gem-reloc_target_info = malloc(max_relocs *
-  sizeof(drm_intel_reloc_target *));
+  sizeof(drm_intel_reloc_target));
if (bo_gem-relocs == NULL || bo_gem-reloc_target_info == NULL) {
bo_gem-has_error = 1;
 

commit 107ccd92d4c5b34e99b70a2af3f83253ceb24b46
Author: Kristian Høgsberg k...@bitplanet.net
Date:

libdrm: Changes to 'debian-experimental'

2010-04-14 Thread Brice Goglin 
 ChangeLog|  471 +
 Makefile.am  |1 
 configure.ac |   51 
 debian/changelog |   15 
 debian/libdrm-intel1.symbols |2 
 debian/libdrm-radeon1.symbols|   20 
 debian/patches/03_revert_abi_change.diff | 9100 ++-
 debian/rules |5 
 include/drm/Makefile.am  |2 
 include/drm/i915_drm.h   |   56 
 include/drm/radeon_drm.h |1 
 include/drm/vmwgfx_drm.h |   63 
 intel/Makefile.am|3 
 intel/intel_atomic.h |   93 
 intel/intel_bufmgr.c |   12 
 intel/intel_bufmgr.h |5 
 intel/intel_bufmgr_gem.c |  348 +
 intel/intel_bufmgr_priv.h|5 
 intel/intel_chipset.h|   90 
 intel/libdrm_intel.pc.in |2 
 libdrm.pc.in |2 
 libkms/Makefile.am   |5 
 libkms/intel.c   |2 
 libkms/internal.h|2 
 libkms/libkms.pc.in  |2 
 libkms/linux.c   |4 
 libkms/nouveau.c |  220 
 nouveau/Makefile.am  |3 
 nouveau/libdrm_nouveau.pc.in |3 
 nouveau/nouveau_bo.c |2 
 nouveau/nouveau_channel.c|2 
 nouveau/nouveau_class.h  | 9041 --
 nouveau/nouveau_private.h|1 
 nouveau/nouveau_reloc.c  |6 
 radeon/Makefile.am   |5 
 radeon/bof.c |  477 +
 radeon/bof.h |   90 
 radeon/libdrm_radeon.pc.in   |2 
 radeon/radeon_bo.h   |1 
 radeon/radeon_bo_gem.c   |9 
 radeon/radeon_bo_gem.h   |1 
 radeon/radeon_cs.c   |6 
 radeon/radeon_cs.h   |2 
 radeon/radeon_cs_gem.c   |  231 
 radeon/radeon_cs_int.h   |1 
 tests/kmstest/main.c |1 
 tests/modeprint/modeprint.c  |4 
 tests/modetest/modetest.c|   29 
 xf86atomic.h |   99 
 xf86drmMode.h|2 
 50 files changed, 11251 insertions(+), 9349 deletions(-)

New commits:
commit 227cebf8981fab5c24dde6af0b76a92d506ef596
Author: Brice Goglin bgog...@debian.org
Date:   Wed Apr 14 14:46:30 2010 +0200

Disable libkms for now

diff --git a/debian/changelog b/debian/changelog
index 604bb71..6c6a399 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libdrm (2.4.20-1) UNRELEASED; urgency=low
   * New upstream release.
   * Pull upstream master up to commit 3506173b for bug fixes.
   * Update libdrm-intel1.symbols, libdrm-radeon1.symbols and shlibs.
+  * Disable libkms for now.
 
  -- Brice Goglin bgog...@debian.org  Wed, 14 Apr 2010 14:35:23 +0200
 
diff --git a/debian/rules b/debian/rules
index 711da00..41b99db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture 
-qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH_OS?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
+confflags += --disable-libkms
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
 else

commit bbb086ba6afe95a258e56b39d25158e9db97ff60
Author: Brice Goglin bgog...@debian.org
Date:   Wed Apr 14 14:45:46 2010 +0200

Update libdrm-radeon1.symbols and shlibs.

diff --git a/debian/changelog b/debian/changelog
index e42fad5..604bb71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ libdrm (2.4.20-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Pull upstream master up to commit 3506173b for bug fixes.
-  * Update libdrm-intel1.symbols and shlibs.
+  * Update libdrm-intel1.symbols, libdrm-radeon1.symbols and shlibs.
 
  -- Brice Goglin bgog...@debian.org  Wed, 14 Apr 2010 14:35:23 +0200
 
diff --git a/debian/libdrm-radeon1.symbols b/debian/libdrm-radeon1.symbols
index 12b1231..11012d0 100644
--- a/debian/libdrm-radeon1.symbols
+++ b/debian/libdrm-radeon1.symbols
@@ -1,4 +1,22 @@
 libdrm_radeon.so.1 libdrm-radeon1 #MINVER#
+ bof_ar...@base 2.4.20-1
+ bof_array_app...@base 2.4.20-1
+ bof_array_...@base 2.4.20-1
+ bof_array_s...@base 2.4.20-1
+ bof_b...@base 2.4.20-1
+ bof_blob_s...@base 2.4.20-1
+ bof_blob_va...@base 2.4.20-1
+ bof_dec...@base 2.4.20-1
+ bof_dump_f...@base 2.4.20-1
+ bof_inc...@base 2.4.20-1
+ bof_in...@base 2.4.20-1
+ bof_int32_va...@base 2.4.20-1
+ bof_load_f...@base 2.4.20-1
+ bof_obj...@base

libdrm: Changes to 'debian-experimental'

2010-03-24 Thread Brice Goglin 
Rebased ref, commits from common ancestor:
commit 197bdde16f9c405936f7a6cdce30322770022562
Author: Brice Goglin bgog...@debian.org
Date:   Wed Mar 24 22:19:10 2010 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index c1d3dda..79153c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.18-4) UNRELEASED; urgency=low
+libdrm (2.4.18-4) experimental; urgency=low
 
   * Steal 03_revert_abi_change.diff from Ubuntu to revert the nouveau ABI
 change.  Current Debian kernels support only the old ABI.
@@ -6,7 +6,7 @@ libdrm (2.4.18-4) UNRELEASED; urgency=low
   * Build a libdrm-nouveau1 package on Linux architectures (Closes: #568162).
 Patch adapted from the Ubuntu package. Thanks Sven Joachim!
 
- -- Brice Goglin bgog...@debian.org  Wed, 24 Mar 2010 22:12:36 +0100
+ -- Brice Goglin bgog...@debian.org  Wed, 24 Mar 2010 22:27:00 +0100
 
 libdrm (2.4.18-3) unstable; urgency=low
 

commit 9f62499e2dd1df046001d174d9a6518b3db929e4
Author: Brice Goglin bgog...@debian.org
Date:   Wed Mar 24 22:18:36 2010 +0100

Build a libdrm-nouveau1 package on Linux architectures (Closes: #568162).

diff --git a/debian/changelog b/debian/changelog
index fe4f1f0..c1d3dda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libdrm (2.4.18-4) UNRELEASED; urgency=low
   * Steal 03_revert_abi_change.diff from Ubuntu to revert the nouveau ABI
 change.  Current Debian kernels support only the old ABI.
 Thanks Sven Joachim!
+  * Build a libdrm-nouveau1 package on Linux architectures (Closes: #568162).
+Patch adapted from the Ubuntu package. Thanks Sven Joachim!
 
  -- Brice Goglin bgog...@debian.org  Wed, 24 Mar 2010 22:12:36 +0100
 
diff --git a/debian/control b/debian/control
index 65f013a..cf271d8 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Depends:
  libdrm2 (= ${binary:Version}),
  libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
  libdrm-radeon1 (= ${binary:Version}) [linux-any],
+ libdrm-nouveau1 (= ${binary:Version}) [linux-any],
  ${misc:Depends},
 Replaces:
  linux-libc-dev ( 2.6.32-10)
@@ -93,6 +94,31 @@ Description: Userspace interface to intel-specific kernel 
DRM services -- debugg
  .
  This package provides the debugging symbols for the libdrm-intel1 package.
 
+Package: libdrm-nouveau1
+Section: libs
+Architecture: linux-any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+Description: Userspace interface to nouveau-specific kernel DRM services -- 
runtime
+ This library implements the userspace interface to the nouveau-specific kernel
+ DRM services. DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
+ currently used on Linux to provide hardware-accelerated OpenGL drivers.
+
+Package: libdrm-nouveau1-dbg
+Section: debug
+Priority: extra
+Architecture: linux-any
+Depends: libdrm-nouveau1 (= ${binary:Version}),
+ ${misc:Depends},
+Description: Userspace interface to nouveau-specific kernel DRM -- debugging 
symbols
+ This library implements the userspace interface to the kernel DRM services.
+ DRM stands for Direct Rendering Manager, which is the kernelspace portion
+ of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
+ Linux to provide hardware-accelerated OpenGL drivers.
+ .
+ This package provides the debugging symbols for the libdrm-nouveau1 package.
+
 Package: libdrm-radeon1
 Section: libs
 Architecture: linux-any
diff --git a/debian/libdrm-nouveau1.install b/debian/libdrm-nouveau1.install
new file mode 100644
index 000..7650858
--- /dev/null
+++ b/debian/libdrm-nouveau1.install
@@ -0,0 +1 @@
+usr/lib/libdrm_nouveau.so.*
diff --git a/debian/libdrm-nouveau1.symbols b/debian/libdrm-nouveau1.symbols
new file mode 100644
index 000..48ce118
--- /dev/null
+++ b/debian/libdrm-nouveau1.symbols
@@ -0,0 +1,59 @@
+libdrm_nouveau.so.1 libdrm-nouveau1 #MINVER#
+#MISSING: 2.4.12+git20090729.5a73f066# d...@base 2.4.4
+ nouveau_bo_b...@base 2.4.4
+ nouveau_bo_emit_buf...@base 2.4.4
+#MISSING: 2.4.12+git20090729.5a73f066# nouveau_bo_f...@base 2.4.4
+ nouveau_bo_handle_...@base 2.4.4
+ nouveau_bo_handle_...@base 2.4.4
+ nouveau_bo_i...@base 2.4.4
+ nouveau_bo_...@base 2.4.4
+ nouveau_bo_map_fl...@base 2.4.11-1ubuntu1~
+ nouveau_bo_map_ra...@base 2.4.11-1ubuntu1~
+ nouveau_bo_...@base 2.4.4
+ nouveau_bo_new_t...@base 2.4.11-1ubuntu1~
+ nouveau_bo_pend...@base 2.4.16
+ nouveau_bo_...@base 2.4.4
+ nouveau_bo_...@base 2.4.4
+ nouveau_bo_taked...@base 2.4.4
+#MISSING: 2.4.12+git20090729.5a73f066# nouveau_bo_t...@base 2.4.4
+ nouveau_bo_un...@base 2.4.4
+ nouveau_bo_un...@base 2.4.4
+ nouveau_bo_u...@base 2.4.4
+#MISSING: 2.4.12+git20090729.5a73f066# nouveau_bo_validate_n...@base 2.4.4
+ nouveau_bo_w...@base 2.4.11-1ubuntu1~
+ nouveau_channel_al...@base 2.4.4
+ nouveau_channel_f...@base 2.4.4
+ nouveau_device_cl...@base 2.4.4
+ nouveau_device_get_pa...@base 2.4.4
+

libdrm: Changes to 'debian-experimental'

2009-04-11 Thread Brice Goglin 
 .gitignore  |2 
 ChangeLog   | 1316 +++-
 Makefile.am |4 
 README  |9 
 bsd-core/drm_mode.h |1 
 configure.ac|   27 
 debian/changelog|   30 
 debian/control  |4 
 debian/libdrm-dev.dirs  |2 
 debian/libdrm-intel1.symbols|4 
 debian/libdrm2.dirs |1 
 debian/rules|   10 
 debian/xsfbs/repack.sh  |   32 
 debian/xsfbs/xsfbs.sh   |   66 
 libdrm/Makefile.am  |6 
 libdrm/intel/Makefile.am|1 
 libdrm/intel/intel_bufmgr.c |7 
 libdrm/intel/intel_bufmgr.h |5 
 libdrm/intel/intel_bufmgr_fake.c|   20 
 libdrm/intel/intel_bufmgr_gem.c |  233 
 libdrm/intel/intel_bufmgr_priv.h|   10 
 libdrm/intel/intel_chipset.h|   71 
 libdrm/libdrm_lists.h   |2 
 libdrm/nouveau/Makefile.am  |   42 
 libdrm/nouveau/libdrm_nouveau.pc.in |   10 
 libdrm/nouveau/nouveau_bo.c |  848 ++
 libdrm/nouveau/nouveau_bo.h |   97 
 libdrm/nouveau/nouveau_channel.c|  178 
 libdrm/nouveau/nouveau_channel.h|   56 
 libdrm/nouveau/nouveau_class.h  | 8006 +
 libdrm/nouveau/nouveau_device.c |  202 
 libdrm/nouveau/nouveau_device.h |   31 
 libdrm/nouveau/nouveau_dma.c|  216 
 libdrm/nouveau/nouveau_dma.h|  154 
 libdrm/nouveau/nouveau_drmif.h  |   62 
 libdrm/nouveau/nouveau_fence.c  |  243 
 libdrm/nouveau/nouveau_grobj.c  |  138 
 libdrm/nouveau/nouveau_grobj.h  |   48 
 libdrm/nouveau/nouveau_notifier.c   |  146 
 libdrm/nouveau/nouveau_notifier.h   |   63 
 libdrm/nouveau/nouveau_private.h|  203 
 libdrm/nouveau/nouveau_pushbuf.c|  276 
 libdrm/nouveau/nouveau_pushbuf.h|  160 
 libdrm/nouveau/nouveau_resource.c   |  115 
 libdrm/nouveau/nouveau_resource.h   |   48 
 libdrm/xf86drm.h|   48 
 libdrm/xf86drmMode.c|8 
 libdrm/xf86drmMode.h|  127 
 libdrm/xf86mm.h |  198 
 libdrm_intel.pc.in  |   10 
 linux-core/drm_mode.h   |1 
 shared-core/drm_internal.h  |   40 
 shared-core/drm_pciids.txt  |  594 -
 shared-core/i915_drm.h  |2 
 shared-core/i915_reg.h  | 1422 
 shared-core/nouveau_dma.h   |   96 
 shared-core/nouveau_drm.h   |  123 
 shared-core/nouveau_reg.h   |  593 -
 shared-core/nouveau_swmthd.h|   33 
 shared-core/nv50_grctx.h|11512 
 shared-core/sis_ds.h|  146 
 shared-core/via_ds.h|  104 
 shared-core/via_mm.h|   40 
 shared-core/via_verifier.h  |   62 
 tests/Makefile.am   |   47 
 tests/drmtest.c |  117 
 tests/drmtest.h |3 
 tests/gem_basic.c   |6 
 tests/gem_flink.c   |6 
 tests/gem_mmap.c|6 
 tests/gem_readwrite.c   |6 
 tests/getversion.c  |3 
 tests/modetest/Makefile.am  |6 
 tests/modetest/modetest.c   |  272 
 tests/setversion.c  |5 
 tests/ttmtest/AUTHORS   |1 
 tests/ttmtest/ChangeLog |   23 
 tests/ttmtest/Makefile.am   |1 
 tests/ttmtest/configure.ac  |   33 
 tests/ttmtest/reconf|2 
 tests/ttmtest/src/Makefile.am   |8 
 tests/ttmtest/src/ttmtest.c |  430 -
 tests/ttmtest/src/xf86dri.c |  604 -
 tests/ttmtest/src/xf86dri.h |  116 
 tests/ttmtest/src/xf86dristr.h  |  390 -
 tests/updatedraw.c  |5 
 86 files changed, 14976 insertions(+), 15478 deletions(-)

New commits:
commit 4a4bb02f1d5084c799298f7b2c553c0dc70054eb
Author: Brice Goglin bgog...@debian.org
Date:   Sat Apr 11 22:06:32 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 510e585..c9da78d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
-libdrm (2.4.9-1) UNRELEASED; urgency=low
+libdrm (2.4.9-1) experimental; urgency=low
 
   [ Brice Goglin�]
   * New upstream release.
 + Remove buggy symlinks for the upstream tarball.
+  * Add myself to Uploaders.
 
   [ Julien Cristau�]
   * Make the linux-libc-dev dependency linux-only (closes: #521253).  Thanks,
 Petr Salinger!
 
- -- Brice Goglin bgog...@debian.org  Sat, 11 Apr 2009 23:11:50 +0200
+ -- Brice Goglin bgog...@debian.org  Sat, 11 Apr 2009 23:12:49 +0200
 
 libdrm (2.4.5-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c199c61..b353b9f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source:

libdrm: Changes to 'debian-experimental'

2008-12-02 Thread Timo Aaltonen 
Rebased ref, commits from common ancestor:
commit ca444377f6c83b1f59f75679a6ffde79c813d3b9
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Tue Dec 2 17:52:37 2008 +0200

Remove more unneeded files from the merge.

diff --git a/bsd-core/i915_suspend.c b/bsd-core/i915_suspend.c
deleted file mode 12
index b55754c..000
--- a/bsd-core/i915_suspend.c
+++ /dev/null
@@ -1 +0,0 @@
-../shared-core/i915_suspend.c
\ No newline at end of file
diff --git a/bsd-core/radeon_microcode.h b/bsd-core/radeon_microcode.h
deleted file mode 12
index 709fff3..000
--- a/bsd-core/radeon_microcode.h
+++ /dev/null
@@ -1 +0,0 @@
-../shared-core/radeon_microcode.h
\ No newline at end of file
diff --git a/linux-core/drm-gem.txt b/linux-core/drm-gem.txt
deleted file mode 100644
index 5cda87f..000
--- a/linux-core/drm-gem.txt
+++ /dev/null
@@ -1,805 +0,0 @@
-  The Graphics Execution Manager
- Part of the Direct Rendering Manager
-  ==
- 
-Keith Packard [EMAIL PROTECTED]
-  Eric Anholt [EMAIL PROTECTED]
-  2008-5-9
-
-Contents:
-
- 1. GEM Overview
- 2. API overview and conventions
- 3. Object Creation/Destruction
- 4. Reading/writing contents
- 5. Mapping objects to userspace
- 6. Memory Domains
- 7. Execution (Intel specific)
- 8. Other misc Intel-specific functions
-
-1. Graphics Execution Manager Overview
-
-Gem is designed to manage graphics memory, control access to the graphics
-device execution context and handle the essentially NUMA environment unique
-to modern graphics hardware. Gem allows multiple applications to share
-graphics device resources without the need to constantly reload the entire
-graphics card. Data may be shared between multiple applications with gem
-ensuring that the correct memory synchronization occurs.
-
-Graphics data can consume arbitrary amounts of memory, with 3D applications
-constructing ever larger sets of textures and vertices. With graphics cards
-memory space growing larger every year, and graphics APIs growing more
-complex, we can no longer insist that each application save a complete copy
-of their graphics state so that the card can be re-initialized from user
-space at each context switch. Ensuring that graphics data remains persistent
-across context switches allows applications significant new functionality
-while also improving performance for existing APIs.
-
-Modern linux desktops include significant 3D rendering as a fundemental
-component of the desktop image construction process. 2D and 3D applications
-paint their content to offscreen storage and the central 'compositing
-manager' constructs the final screen image from those window contents.  This
-means that pixel image data from these applications must move within reach
-of the compositing manager and used as source operands for screen image
-rendering operations.
-
-Gem provides simple mechanisms to manage graphics data and control execution
-flow within the linux operating system. Using many existing kernel
-subsystems, it does this with a modest amount of code.
-
-2. API Overview and Conventions
-
-All APIs here are defined in terms of ioctls appplied to the DRM file
-descriptor. To create and manipulate objects, an application must be
-'authorized' using the DRI or DRI2 protocols with the X server. To relax
-that, we will need to implement some better access control mechanisms within
-the hardware portion of the driver to prevent inappropriate
-cross-application data access.
-
-Any DRM driver which does not support GEM will return -ENODEV for all of
-these ioctls. Invalid object handles return -EINVAL. Invalid object names
-return -ENOENT. Other errors are as documented in the specific API below.
-
-To avoid the need to translate ioctl contents on mixed-size systems (with
-32-bit user space running on a 64-bit kernel), the ioctl data structures
-contain explicitly sized objects, using 64-bits for all size and pointer
-data and 32-bits for identifiers. In addition, the 64-bit objects are all
-carefully aligned on 64-bit boundaries. Because of this, all pointers in the
-ioctl data structures are passed as uint64_t values. Suitable casts will
-be necessary.
-
-One significant operation which is explicitly left out of this API is object
-locking. Applications are expected to perform locking of shared objects
-outside of the GEM api. This kind of locking is not necessary to safely
-manipulate the graphics engine, and with multiple objects interacting in
-unknown ways, per-object locking would likely introduce all kinds of
-lock-order issues. Punting this to the application seems like the only
-sensible plan. Given that DRM already offers a global lock on the hardware,
-this doesn't change the current situation.
-
-3. Object Creation and Destruction
-
-Gem provides explicit memory management primitives. System pages are
-allocated when the object is created, either as

libdrm: Changes to 'debian-experimental'

2008-12-02 Thread Julien Cristau 
 ChangeLog| 3363 ++-
 debian/changelog |4 
 debian/control   |2 
 debian/rules |6 
 4 files changed, 3363 insertions(+), 12 deletions(-)

New commits:
commit 182fb9ca263d2e662d2c0a722d55678c55ba7aca
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Dec 2 17:27:05 2008 +0100

Restrict the libdrm-dev dep on libdrm-intel1 to x86

diff --git a/debian/changelog b/debian/changelog
index 83d5649..9246eba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,7 @@ libdrm (2.4.1-1) UNRELEASED; urgency=low
   * Build-depend on pkg-config and libpthread-stubs0-dev (closes: #502078).
 Thanks, Frank Lichtenheld!
   * Don't mention *.la in libdrm-dev.install.
-  * Make libdrm-dev depend on libdrm-intel1.
+  * Make libdrm-dev depend on libdrm-intel1 on x86.
   * On Linux, let udev create the device files.
 
  -- Timo Aaltonen [EMAIL PROTECTED]  Thu, 27 Nov 2008 09:33:05 +0200
diff --git a/debian/control b/debian/control
index 38fcf72..7f8d86e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
 Package: libdrm-dev
 Section: libdevel
 Architecture: any
-Depends: libdrm2 (= ${binary:Version}), libdrm-intel1 (= ${binary:Version})
+Depends: libdrm2 (= ${binary:Version}), libdrm-intel1 (= ${binary:Version}) 
[amd64 i386 kfreebsd-amd64 kfreebsd-i386]
 Description: Userspace interface to kernel DRM services -- development files
  This library implements the userspace interface to the kernel DRM
  services.  DRM stands for Direct Rendering Manager, which is the

commit ca733ec7775279bb20b98c071ff1e8549549a4ab
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Oct 19 17:48:17 2008 +0200

On Linux, let udev create the device files.

diff --git a/debian/changelog b/debian/changelog
index 99b1df1..83d5649 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libdrm (2.4.1-1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release. (closes: #505740)
   * debian/rules:
 -Run autoreconf at build time, build-depend on automake and libtool.
@@ -13,6 +14,7 @@ libdrm (2.4.1-1) UNRELEASED; urgency=low
 Thanks, Frank Lichtenheld!
   * Don't mention *.la in libdrm-dev.install.
   * Make libdrm-dev depend on libdrm-intel1.
+  * On Linux, let udev create the device files.
 
  -- Timo Aaltonen [EMAIL PROTECTED]  Thu, 27 Nov 2008 09:33:05 +0200
 
diff --git a/debian/rules b/debian/rules
index b59865b..783093a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,12 +15,18 @@ include debian/xsfbs/xsfbs.mk
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
 else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
+ifeq (linux, $(DEB_HOST_ARCH_OS))
+   confflags += --enable-udev
+else
+   confflags += --disable-udev
+endif
 
 CFLAGS = -Wall -g
 

commit ea8b9a8aac129ba28b2a966102b84ade351d728a
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Oct 19 17:19:05 2008 +0200

Update upstream changelog

diff --git a/ChangeLog b/ChangeLog
index 17934b7..cefcb74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,23 +1,2612 @@
-commit 409d6818eba8a2e2938e0f9281c9318928ba5a35
+commit 00847dabe0fa5ccf796658f486e8f6f7a77e043b
+Author: Eric Anholt [EMAIL PROTECTED]
+Date:   Thu Oct 30 11:36:46 2008 -0700
+
+libdrm 2.4.1.
+
+commit 4b9826408f65976a1a13387beda748b65e03ec52
+Author: Eric Anholt [EMAIL PROTECTED]
+Date:   Thu Oct 30 09:33:07 2008 -0700
+
+intel: Rename dri_ and intel_ symbols to drm_intel_.
+
+I wanted to avoid doing this, as it's a bunch of churn, but there was a
+conflict between the dri_ symbols in libdrm and the symbols that were in
+Mesa in 7.2, which broke Mesa 7.2 AIGLX when the 2D driver had loaded new
+libdrm symbols.  The new naming was recommended by cworth for giving the
+code a unique prefix identifying where the code lives.
+
+Additionally, take the opportunity to fix up two API mistakes: emit_reloc's
+arguments were in a nonsensical order, and set_tiling lacked the stride
+argument that the kernel will want to use soon.  API compatibility with
+released code is maintained using #defines.
+
+commit 0e867312323fa51af324228b98bff4f49a813481
+Author: Eric Anholt [EMAIL PROTECTED]
+Date:   Tue Oct 21 00:10:54 2008 -0700
+
+intel: Add dri_bufmgr_check_aperture support for bufmgr_gem.
+
+This relies on a new kernel ioctl to get the available aperture size.
+
+In order to provide reasonable performance from dri_bufmgr_check_aperture, 
we
+now require that once a buffer has been used as

libdrm: Changes to 'debian-experimental'

2008-12-02 Thread Julien Cristau 
 scripts/create_lk_gpu.sh |   58 ---
 1 file changed, 58 deletions(-)

New commits:
commit 0f9a2f2c7c431dde70856718632f673018495446
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Dec 2 17:56:47 2008 +0100

Remove scripts/ directory

diff --git a/scripts/create_lk_gpu.sh b/scripts/create_lk_gpu.sh
deleted file mode 100755
index 4b323f7..000
--- a/scripts/create_lk_gpu.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/bash
-# script to create a Linux Kernel tree from the DRM tree for diffing etc..
-#
-# Original author - Dave Airlie (C) 2004 - [EMAIL PROTECTED]
-# kernel_version to remove below (e.g. 2.6.24)
-
-if [ $# -lt 2 ] ;then
-   echo usage: $0 output_dir kernel_version
-   exit 1
-fi
-
-if [ ! -d shared-core -o ! -d linux-core ]  ;then
-   echo not in DRM toplevel
-   exit 1
-fi
-
-DRMDIR=$1/drivers/gpu/drm/
-HDRDIR=$1/include/drm/
-KERNEL_VERS=$2
-echo Copying kernel independent files
-mkdir -p $DRMDIR/.tmp
-mkdir -p $HDRDIR/.tmp
-
-( cd linux-core/ ; make drm_pciids.h )
-cp shared-core/*.[ch] $DRMDIR/.tmp
-cp linux-core/*.[ch] $DRMDIR/.tmp
-cp linux-core/Makefile.kernel $DRMDIR/.tmp/Makefile
-
-echo Copying 2.6 Kernel files
-cp linux-core/Kconfig $DRMDIR/.tmp
-
-./scripts/drm-scripts-gentree.pl $KERNEL_VERS $DRMDIR/.tmp $DRMDIR
-mv $DRMDIR/drm*.h $HDRDIR
-mv $DRMDIR/*_drm.h $HDRDIR
-
-cd $DRMDIR
-rm -rf .tmp
-rm via_ds.[ch]
-rm sis_ds.[ch]
-rm amd*.[ch]
-rm radeon_ms*.[ch]
-
-for i in radeon mach64 r128 mga i915 i810 via savage sis xgi nouveau tdfx ffb 
imagine
-do
-mkdir ./$i
-mv $i*.[ch] $i/
-done
-
-mv r300*.[ch] radeon/
-mv r600*.[ch] radeon/
-mv ObjectID.h radeon/
-mv atom*.[ch] radeon/
-
-mv nv*.[ch] nouveau/
-mv intel*.[ch] i915/
-mv dvo*.[ch] i915/
-
-cd -


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

libdrm: Changes to 'debian-experimental'

2008-11-27 Thread Timo Aaltonen 
 debian/libdrm2.symbols |   36 
 1 file changed, 36 deletions(-)

New commits:
commit 5aa8a9e9cf0f43d4dceb0b70f3925022be65e61e
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Thu Nov 27 09:49:53 2008 +0200

libdrm2.symbols: remove references to libdrm-intel1 symbols.

diff --git a/debian/libdrm2.symbols b/debian/libdrm2.symbols
index b5e3368..bf1ef1f 100644
--- a/debian/libdrm2.symbols
+++ b/debian/libdrm2.symbols
@@ -99,39 +99,3 @@ libdrm.so.2 libdrm2 #MINVER#
  [EMAIL PROTECTED] 2.3.1
  [EMAIL PROTECTED] 2.3.1
  [EMAIL PROTECTED] 2.3.1
-libdrm_intel.so.1 libdrm2 #MINVER#
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1
- [EMAIL PROTECTED] 2.4.1


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

libdrm: Changes to 'debian-experimental'

2008-11-26 Thread Timo Aaltonen 
 debian/changelog |   10 --
 debian/control   |   36 ++--
 debian/libdrm-dev.install|1 -
 debian/libdrm-intel1.install |1 +
 debian/libdrm-intel1.symbols |   36 
 debian/libdrm2.install   |2 +-
 debian/libdrm2.shlibs|1 -
 debian/rules |6 --
 8 files changed, 84 insertions(+), 9 deletions(-)

New commits:
commit ed71e828c924436c6808570a746d32bd240654c8
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Thu Nov 27 09:38:32 2008 +0200

Various changes from drm-snapshot.

 * Add a new package for the intel-specific bits (libdrm-intel1)
 * Build-depend on pkg-config and libpthread-stubs0-dev (closes: #502078).
 * Don't mention *.la in libdrm-dev.install.
 * Make libdrm-dev depend on libdrm-intel1.

diff --git a/debian/changelog b/debian/changelog
index 2a0a424..99b1df1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,20 @@
 libdrm (2.4.1-1) UNRELEASED; urgency=low
 
   * New upstream release. (closes: #505740)
-  * Bump the shlibs to 2.4.1.
   * debian/rules:
 -Run autoreconf at build time, build-depend on automake and libtool.
  (closes: #482727)
 -Add a debian/libdrm2.symbols file and '-c4' parameter to dh_makeshlibs
  to fail if new symbols are added. Don't use Debian versions for now.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 25 Nov 2008 13:15:26 +0200
+  [ Julien Cristau ]
+  * Add a new package for the intel-specific bits (libdrm-intel1)
+  * Build-depend on pkg-config and libpthread-stubs0-dev (closes: #502078).
+Thanks, Frank Lichtenheld!
+  * Don't mention *.la in libdrm-dev.install.
+  * Make libdrm-dev depend on libdrm-intel1.
+
+ -- Timo Aaltonen [EMAIL PROTECTED]  Thu, 27 Nov 2008 09:33:05 +0200
 
 libdrm (2.3.1-2) unstable; urgency=high
 
diff --git a/debian/control b/debian/control
index 6e86d53..38fcf72 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libdrm
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Thierry Reding [EMAIL PROTECTED], Julien Cristau [EMAIL 
PROTECTED], David Nusinow [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5.0.0), libx11-dev, dpkg-dev (= 1.13.19), quilt 
(= 0.40), automake, libtool
+Build-Depends: debhelper (= 5.0.0), libx11-dev, dpkg-dev (= 1.13.19), quilt 
(= 0.40), automake, libtool, pkg-config, libpthread-stubs0-dev
 Standards-Version: 3.7.3
 Section: libs
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
 Package: libdrm-dev
 Section: libdevel
 Architecture: any
-Depends: libdrm2 (= ${binary:Version})
+Depends: libdrm2 (= ${binary:Version}), libdrm-intel1 (= ${binary:Version})
 Description: Userspace interface to kernel DRM services -- development files
  This library implements the userspace interface to the kernel DRM
  services.  DRM stands for Direct Rendering Manager, which is the
@@ -47,3 +47,35 @@ Description: Userspace interface to kernel DRM services -- 
debugging symbols
  OpenGL drivers.
  .
  This package provides debugging symbols for the libdrm2 package.
+
+Package: libdrm-intel1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Userspace interface to intel-specific kernel DRM services -- 
runtime
+ This library implements the userspace interface to the intel-specific kernel
+ DRM services.  DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
+ currently used on Linux to provide hardware-accelerated OpenGL drivers.
+ .
+ This package is built from a snapshot of DRM development code, to provide the
+ features necessary for testing new X.org drivers.  Do NOT expect this package
+ to be stable!
+
+Package: libdrm-intel1-dbg
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: libdrm-intel1 (= ${binary:Version}), ${misc:Depends}
+Description: Userspace interface to intel-specific kernel DRM services -- 
debugging symbols
+ This library implements the userspace interface to the kernel DRM services.
+ DRM stands for Direct Rendering Manager, which is the kernelspace portion
+ of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
+ Linux to provide hardware-accelerated OpenGL drivers.
+ .
+ This package is built from a snapshot of DRM development code, to provide the
+ features necessary for testing new X.org drivers. Do NOT expect this package
+ to be stable!
+ .
+ This package provides the debugging symbols for the libdrm-intel1 package.
+
diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install
index 68a175d..6cd8ddd 100644
--- a/debian/libdrm-dev.install
+++ b/debian/libdrm-dev.install
@@ -2,4 +2,3 @@ usr/include/*
 usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/pkgconfig/*
-usr/lib/*.la
diff --git a/debian/libdrm-intel1.install

libdrm: Changes to 'debian-experimental'

2008-11-25 Thread Timo Aaltonen 
 Makefile.in  |  674 -
 aclocal.m4   | 7532 --
 bsd-core/i915_suspend.c  |1 
 bsd-core/radeon_microcode.h  |1 
 config.guess | 1526 --
 config.sub   | 1658 ---
 configure|22485 ---
 debian/changelog |7 
 debian/control   |2 
 debian/libdrm2.shlibs|2 
 debian/libdrm2.symbols   |  137 
 debian/rules |   46 
 debian/xsfbs/xsfbs.mk|  293 
 debian/xsfbs/xsfbs.sh|  931 +
 depcomp  |  589 -
 install-sh   |  519 
 libdrm/Makefile.in   |  540 -
 libdrm/config.h.in   |   61 
 linux-core/drm-gem.txt   |  805 -
 linux-core/drm_gem.c |  444 
 linux-core/i915_gem.c| 2502 
 linux-core/i915_gem_debug.c  |  202 
 linux-core/i915_gem_proc.c   |  293 
 linux-core/i915_gem_tiling.c |  309 
 linux-core/i915_opregion.c   |  389 
 linux-core/i915_suspend.c|1 
 linux-core/nv50_grctx.h  |1 
 ltmain.sh| 6964 -
 missing  |  367 
 shared-core/Makefile.in  |  438 
 tests/Makefile.in|  611 -
 31 files changed, 1399 insertions(+), 48931 deletions(-)

New commits:
commit 3d9e1c4f852673afa5ad372cc580226ded539a8e
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Tue Nov 25 12:31:28 2008 +0200

Use dh_makeshlibs properly

Add a debian/libdrm2.symbols file and '-c4' parameter to dh_makeshlibs
to fail if new symbols are added. Don't use Debian versions for now.

diff --git a/debian/changelog b/debian/changelog
index fe90602..40068af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,12 @@ libdrm (2.4.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump the shlibs to 2.4.1.
-  * Run autoreconf at build time, build-depend on automake and libtool.
+  * debian/rules:
+-Run autoreconf at build time, build-depend on automake and libtool.
+-Add a debian/libdrm2.symbols file and '-c4' parameter to dh_makeshlibs
+ to fail if new symbols are added. Don't use Debian versions for now.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 25 Nov 2008 10:52:54 +0200
+ -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 25 Nov 2008 12:28:20 +0200
 
 libdrm (2.3.1-2) unstable; urgency=high
 
diff --git a/debian/libdrm2.symbols b/debian/libdrm2.symbols
new file mode 100644
index 000..b5e3368
--- /dev/null
+++ b/debian/libdrm2.symbols
@@ -0,0 +1,137 @@
+libdrm.so.2 libdrm2 #MINVER#
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL PROTECTED] 2.3.1
+ [EMAIL

libdrm: Changes to 'debian-experimental'

2008-11-25 Thread Timo Aaltonen 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2d39f9f8e9a69e761353c7be50f4813ddabf8a6e
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Tue Nov 25 13:16:34 2008 +0200

Update the changelog, close a couple of bugs.

diff --git a/debian/changelog b/debian/changelog
index 40068af..2a0a424 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
 libdrm (2.4.1-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream release. (closes: #505740)
   * Bump the shlibs to 2.4.1.
   * debian/rules:
 -Run autoreconf at build time, build-depend on automake and libtool.
+ (closes: #482727)
 -Add a debian/libdrm2.symbols file and '-c4' parameter to dh_makeshlibs
  to fail if new symbols are added. Don't use Debian versions for now.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 25 Nov 2008 12:28:20 +0200
+ -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 25 Nov 2008 13:15:26 +0200
 
 libdrm (2.3.1-2) unstable; urgency=high
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

libdrm: Changes to 'debian-experimental'

2008-11-19 Thread Timo Aaltonen 
 .gitignore   |4 
 bsd-core/i915_suspend.c  |1 
 bsd-core/radeon_microcode.h  |1 
 configure.ac |   81 
 debian/changelog |   12 
 debian/rules |   11 
 libdrm/Makefile.am   |6 
 libdrm/intel/Makefile.am |   46 
 libdrm/intel/intel_bufmgr.c  |  207 
 libdrm/intel/intel_bufmgr.h  |  174 
 libdrm/intel/intel_bufmgr_fake.c | 1522 ++
 libdrm/intel/intel_bufmgr_gem.c  | 1134 
 libdrm/intel/intel_bufmgr_priv.h |  175 
 libdrm/intel/mm.c|  281 +
 libdrm/intel/mm.h|   96 
 libdrm/libdrm_lists.h|   87 
 libdrm/xf86drm.c |  167 
 libdrm/xf86drm.h |1 
 libdrm/xf86mm.h  |   12 
 linux-core/drm-gem.txt   |  805 +++
 linux-core/drm_gem.c |  444 +
 linux-core/i915_gem.c| 2502 ++
 linux-core/i915_gem_debug.c  |  202 
 linux-core/i915_gem_proc.c   |  293 +
 linux-core/i915_gem_tiling.c |  309 +
 linux-core/i915_opregion.c   |  389 +
 linux-core/i915_suspend.c|1 
 linux-core/nv50_grctx.h  |1 
 scripts/create_lk_gpu.sh |   58 
 shared-core/drm.h|  350 +
 shared-core/drm_pciids.txt   |   63 
 shared-core/i915_dma.c   |  316 -
 shared-core/i915_drm.h   |  388 +
 shared-core/i915_drv.h   | 2132 ++---
 shared-core/i915_irq.c   |  305 -
 shared-core/i915_suspend.c   |  520 ++
 shared-core/mach64_dma.c |6 
 shared-core/nouveau_drm.h|   24 
 shared-core/nouveau_drv.h|   19 
 shared-core/nouveau_fifo.c   |7 
 shared-core/nouveau_mem.c|  140 
 shared-core/nouveau_notifier.c   |2 
 shared-core/nouveau_object.c |   15 
 shared-core/nouveau_state.c  |  171 
 shared-core/nv04_fifo.c  |4 
 shared-core/nv20_graph.c |   32 
 shared-core/nv40_graph.c |   10 
 shared-core/nv50_fifo.c  |4 
 shared-core/nv50_graph.c | 1977 
 shared-core/nv50_grctx.h | 9232 +++
 shared-core/r300_cmdbuf.c|  214 
 shared-core/r300_reg.h   |  229 
 shared-core/radeon_cp.c  |  141 
 shared-core/radeon_drv.h |   88 
 shared-core/radeon_irq.c |   57 
 shared-core/radeon_mem.c |8 
 shared-core/radeon_state.c   |   30 
 shared-core/xgi_drm.h|4 
 tests/Makefile.am|6 
 tests/drmtest.c  |2 
 tests/gem_basic.c|   98 
 tests/gem_flink.c|  128 
 tests/gem_mmap.c |  132 
 tests/gem_readwrite.c|  135 
 64 files changed, 22799 insertions(+), 3212 deletions(-)

New commits:
commit 5bf2abb853fdc5723bea205c58ed6473f715841a
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed Nov 19 15:25:41 2008 +0200

Update the changelog.

diff --git a/debian/changelog b/debian/changelog
index dfad06f..a1a6489 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.3.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 19 Nov 2008 13:41:16 +0200
+
 libdrm (2.3.1-1) unstable; urgency=low
 
   [ Brice Goglin ]

commit 00847dabe0fa5ccf796658f486e8f6f7a77e043b
Author: Eric Anholt [EMAIL PROTECTED]
Date:   Thu Oct 30 11:36:46 2008 -0700

libdrm 2.4.1.

diff --git a/configure.ac b/configure.ac
index 92507cb..0f7c79e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 AC_PREREQ(2.57)
-AC_INIT([libdrm], 2.4.0, [EMAIL PROTECTED], libdrm)
+AC_INIT([libdrm], 2.4.1, [EMAIL PROTECTED], libdrm)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2])
 

commit 4b9826408f65976a1a13387beda748b65e03ec52
Author: Eric Anholt [EMAIL PROTECTED]
Date:   Thu Oct 30 09:33:07 2008 -0700

intel: Rename dri_ and intel_ symbols to drm_intel_.

I wanted to avoid doing this, as it's a bunch of churn, but there was a
conflict between the dri_ symbols in libdrm and the symbols that were in
Mesa in 7.2, which broke Mesa 7.2 AIGLX when the 2D driver had loaded new
libdrm symbols.  The new naming was recommended by cworth for giving the
code a unique prefix identifying where the code lives.

Additionally, take the opportunity to fix up two API mistakes: emit_reloc's
arguments were in a nonsensical order, and set_tiling lacked the stride
argument that the kernel will want to use soon.  API compatibility with
released code is maintained using #defines.

diff --git a/libdrm/intel/intel_bufmgr.c b/libdrm/intel/intel_bufmgr.c
index 92b6046..188eac2 100644
--- a/libdrm/intel/intel_bufmgr.c
+++ b/libdrm/intel/intel_bufmgr.c
@@ -39,26 +39,26 @@
 #include intel_bufmgr.h
 #include intel_bufmgr_priv.h
 
-/** @file

libdrm: Changes to 'debian-experimental'

2008-11-19 Thread Timo Aaltonen 
 debian/changelog   |   10 
 shared-core/i915_dma.c | 1280 ---
 shared-core/i915_drv.h | 2123 --
 shared-core/i915_irq.c | 1010 --
 shared-core/i915_mem.c |  386 -
 shared-core/imagine_drv.h  |   43 
 shared-core/mach64_dma.c   | 1778 -
 shared-core/mach64_drv.h   |  859 --
 shared-core/mach64_irq.c   |  159 
 shared-core/mach64_state.c |  910 --
 shared-core/mga_dma.c  | 1161 ---
 shared-core/mga_drv.h  |  691 -
 shared-core/mga_irq.c  |  182 
 shared-core/mga_state.c| 1139 ---
 shared-core/mga_ucode.h|11645 -
 shared-core/mga_warp.c |  198 
 shared-core/nouveau_dma.c  |  172 
 shared-core/nouveau_drv.h  |  621 -
 shared-core/nouveau_fifo.c |  601 -
 shared-core/nouveau_irq.c  |  568 -
 shared-core/nouveau_mem.c  |  872 --
 shared-core/nouveau_notifier.c |  165 
 shared-core/nouveau_object.c   | 1178 ---
 shared-core/nouveau_state.c|  871 --
 shared-core/nouveau_swmthd.c   |  191 
 shared-core/nv04_fb.c  |   23 
 shared-core/nv04_fifo.c|  138 
 shared-core/nv04_graph.c   |  516 -
 shared-core/nv04_instmem.c |  159 
 shared-core/nv04_mc.c  |   22 
 shared-core/nv04_timer.c   |   53 
 shared-core/nv10_fb.c  |   25 
 shared-core/nv10_fifo.c|  169 
 shared-core/nv10_graph.c   |  914 --
 shared-core/nv20_graph.c   |  913 --
 shared-core/nv40_fb.c  |   62 
 shared-core/nv40_fifo.c|  209 
 shared-core/nv40_graph.c   | 2193 --
 shared-core/nv40_mc.c  |   38 
 shared-core/nv50_fifo.c|  343 
 shared-core/nv50_graph.c   |  315 
 shared-core/nv50_instmem.c |  324 
 shared-core/nv50_mc.c  |   43 
 shared-core/nv_drv.h   |   52 
 shared-core/r128_cce.c |  933 --
 shared-core/r128_drv.h |  525 -
 shared-core/r128_irq.c |  116 
 shared-core/r128_state.c   | 1681 
 shared-core/r300_cmdbuf.c  | 1198 ---
 shared-core/r600_microcode.h   |14275 -
 shared-core/radeon_cp.c| 1792 -
 shared-core/radeon_drv.h   | 1470 
 shared-core/radeon_irq.c   |  390 -
 shared-core/radeon_mem.c   |  302 
 shared-core/radeon_microcode.h | 1844 -
 shared-core/radeon_state.c | 3263 -
 shared-core/savage_bci.c   | 1092 ---
 shared-core/savage_drv.h   |  575 -
 shared-core/savage_state.c | 1165 ---
 shared-core/sis_drv.h  |   90 
 shared-core/sis_ds.c   |  299 
 shared-core/sis_mm.c   |  386 -
 shared-core/tdfx_drv.h |   47 
 shared-core/via_dma.c  |  763 --
 shared-core/via_drv.c  |  157 
 shared-core/via_drv.h  |  211 
 shared-core/via_ds.c   |  274 
 shared-core/via_irq.c  |  403 -
 shared-core/via_map.c  |  139 
 shared-core/via_mm.c   |  347 
 shared-core/via_verifier.c | 1121 ---
 shared-core/via_video.c|   93 
 tests/Makefile.in  |  611 +
 73 files changed, 620 insertions(+), 70266 deletions(-)

New commits:
commit aa22f2e494ca7b7bdf60a9cdddce3f2ddccd4e49
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Oct 19 14:56:43 2008 +0200

Add missing Makefile.in

diff --git a/tests/Makefile.in b/tests/Makefile.in
new file mode 100644
index 000..3c18824
--- /dev/null
+++ b/tests/Makefile.in
@@ -0,0 +1,611 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
[EMAIL PROTECTED]@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+noinst_PROGRAMS = dristat$(EXEEXT) drmstat$(EXEEXT)
+TESTS = auth$(EXEEXT) openclose$(EXEEXT) getversion$(EXEEXT) \
+   getclient$(EXEEXT) getstats$(EXEEXT) lock$(EXEEXT) \
+   setversion$(EXEEXT) updatedraw$(EXEEXT)
+EXTRA_PROGRAMS = $(am__EXEEXT_1)
+subdir = tests
+DIST_COMMON = $(srcdir)/Makefile.am

libdrm: Changes to 'debian-experimental'

2008-07-01 Thread Julien Cristau 
 .gitignore   |   66 
 ChangeLog|21514 +++
 Makefile.am  |2 
 Makefile.in  |  170 
 README   |   71 
 aclocal.m4   |  963 -
 config.guess |   60 
 config.sub   |   66 
 configure| 9387 ---
 configure.ac |9 
 debian/changelog |   23 
 debian/control   |6 
 debian/copyright |7 
 debian/patches/01_default_perms.diff |6 
 debian/rules |2 
 depcomp  |   93 
 install-sh   |  514 
 libdrm/Makefile.am   |5 
 libdrm/Makefile.in   |  162 
 libdrm/xf86drm.c | 1351 --
 libdrm/xf86drm.h |6 
 libdrm/xf86drmHash.c |   20 
 libdrm/xf86drmRandom.c   |   20 
 libdrm/xf86drmSL.c   |   23 
 libdrm/xf86mm.h  |  121 
 ltmain.sh|  277 
 missing  |   61 
 shared-core/Makefile.in  |  112 
 shared-core/drm.h|  575 
 shared-core/drm_drawable.c   |  330 
 shared-core/drm_internal.h   |   40 
 shared-core/drm_pciids.txt   |  151 
 shared-core/drm_sarea.h  |   30 
 shared-core/i915_dma.c   |  824 -
 shared-core/i915_drm.h   |  118 
 shared-core/i915_drv.h   | 1141 +
 shared-core/i915_irq.c   |  953 +
 shared-core/i915_mem.c   |  139 
 shared-core/mach64_dma.c |  507 
 shared-core/mach64_drm.h |4 
 shared-core/mach64_drv.h |  557 
 shared-core/mach64_irq.c |  103 
 shared-core/mach64_state.c   |  237 
 shared-core/mga_dma.c|  307 
 shared-core/mga_drm.h|   22 
 shared-core/mga_drv.h|  178 
 shared-core/mga_irq.c|   88 
 shared-core/mga_state.c  |  261 
 shared-core/mga_warp.c   |8 
 shared-core/nouveau_dma.c|  172 
 shared-core/nouveau_dma.h|   96 
 shared-core/nouveau_drm.h|  170 
 shared-core/nouveau_drv.h|  606 
 shared-core/nouveau_fifo.c   |  598 
 shared-core/nouveau_irq.c|  568 
 shared-core/nouveau_mem.c|  784 +
 shared-core/nouveau_notifier.c   |  165 
 shared-core/nouveau_object.c | 1171 +
 shared-core/nouveau_reg.h|  593 
 shared-core/nouveau_state.c  |  700 +
 shared-core/nouveau_swmthd.c |  191 
 shared-core/nouveau_swmthd.h |   33 
 shared-core/nv04_fb.c|   23 
 shared-core/nv04_fifo.c  |  138 
 shared-core/nv04_graph.c |  516 
 shared-core/nv04_instmem.c   |  159 
 shared-core/nv04_mc.c|   22 
 shared-core/nv04_timer.c |   53 
 shared-core/nv10_fb.c|   25 
 shared-core/nv10_fifo.c  |  169 
 shared-core/nv10_graph.c |  914 +
 shared-core/nv20_graph.c |  909 +
 shared-core/nv40_fb.c|   62 
 shared-core/nv40_fifo.c  |  209 
 shared-core/nv40_graph.c | 2195 +++
 shared-core/nv40_mc.c|   38 
 shared-core/nv50_fifo.c  |  339 
 shared-core/nv50_graph.c | 2196 +++
 shared-core/nv50_instmem.c   |  324 
 shared-core/nv50_mc.c|   43 
 shared-core/r128_cce.c   |  183 
 shared-core/r128_drm.h   |   22 
 shared-core/r128_drv.h   |   53 
 shared-core/r128_irq.c   |   64 
 shared-core/r128_state.c |  452 
 shared-core/r300_cmdbuf.c|  367 
 shared-core/r300_reg.h   | 1096 +
 shared-core/r600_microcode.h |14275 +++
 shared-core/radeon_cp.c  | 1392 --
 shared-core/radeon_drm.h |   41 
 shared-core/radeon_drv.h |  408 
 shared-core/radeon_irq.c |  303 
 shared-core/radeon_mem.c |  114 
 shared-core/radeon_microcode.h   | 1844 ++
 shared-core/radeon_state.c   |  894 -
 shared-core/savage_bci.c |  211 
 shared-core/savage_drm.h |4 
 shared-core/savage_drv.h |   32 
 shared-core/savage_state.c   |  403 
 shared-core/sis_drv.h|   29 
 shared-core/sis_mm.c |  190 
 shared-core/via_3d_reg.h |1 
 shared-core/via_dma.c|  454 
 shared-core/via_drm.h|   48 
 shared-core/via_drv.c|   51 
 shared-core/via_drv.h|  115 
 shared-core/via_irq.c

libdrm: Changes to 'debian-experimental'

2008-07-01 Thread Timo Aaltonen 
 debian/changelog  |5 -
 debian/libdrm2.shlibs |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit a08e2c8f3be381251cab345bfec1374962731b52
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Tue Jul 1 18:23:19 2008 +0300

Bump the shlibs to 2.3.1

diff --git a/debian/changelog b/debian/changelog
index 10146f4..581a872 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,10 @@ libdrm (2.3.1-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * New upstream release (needed for mesa 7.1 and newer xserver).
 
- -- Brice Goglin [EMAIL PROTECTED]  Fri, 13 Jun 2008 11:50:19 +0200
+  [ Timo Aaltonen ]
+  * Bump the shlibs to 2.3.1.
+
+ -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 01 Jul 2008 18:20:08 +0300
 
 libdrm (2.3.0-4) unstable; urgency=low
 
diff --git a/debian/libdrm2.shlibs b/debian/libdrm2.shlibs
index e987c72..ebc4f02 100644
--- a/debian/libdrm2.shlibs
+++ b/debian/libdrm2.shlibs
@@ -1 +1 @@
-libdrm 2 libdrm2 (= 2.3.0)
+libdrm 2 libdrm2 (= 2.3.1)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Re: libdrm: Changes to 'debian-experimental'

2007-04-19 Thread Michel Dänzer 
On Wed, 2007-04-18 at 21:46 -0400, David Nusinow wrote:
 On Tue, Apr 17, 2007 at 10:25:29AM +0200, Michel Dänzer wrote:
  On Sun, 2007-04-15 at 17:11 +, David Nusinow wrote:
   
   commit 7901afcce99a8af97e560d34e3685fd55eaa9c1a
   Author: David Nusinow [EMAIL PROTECTED]
   Date:   Sun Apr 15 13:11:06 2007 -0400
   
   * Add myself to uploaders
   * Patch libdrm to default to device permission 666 so we don't have 
   to do it
 in xorg.conf. The only way libdrm can do anything is through the 
   server
 anyway. 
  
  This last sentence doesn't make sense, please elaborate.
 
 It's essentially what ajax told me, although I may have misinterpreted. My
 impression was that in pretty much all cases, the server controls all
 access via libdrm because all dri clients are running through the X server.
 Is this wrong?

I assume what he meant is that exploiting any potential DRM security
holes would usually require authenticating with the corresponding X
display first. I think the idea of not giving everybody access to the
DRM device is basically to give others access to a DRI enabled X display
while preventing them from accessing the DRM device. That way they can
enjoy the 2D performance benefits that enabling the DRI may bring while
not being able to exploit DRM security holes directly.


   This can still be overridden by a user's xorg.conf.
  
  It might make sense to alert administrators to change this if they have
  untrusted users.
 
 That's a good idea, I'll add a NEWS.Debian item for libdrm.

Thanks.


-- 
Earthling Michel Dänzer   |  http://tungstengraphics.com
Libre software enthusiast |  Debian, X and DRI developer

libdrm: Changes to 'debian-experimental'

2007-04-18 Thread David Nusinow 
 debian/changelog|7 +++
 debian/libdrm2.NEWS |8 
 2 files changed, 15 insertions(+)

New commits:
commit 851a9fd0e56d4bba68aba0073ef7017f79156e76
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Apr 18 22:50:39 2007 -0400

* Add NEWS.Debian explaining the change in the last upload to interested
  administrators.

diff --git a/debian/changelog b/debian/changelog
index 5c77673..47966a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.3.0-4) experimental; urgency=low
+
+  * Add NEWS.Debian explaining the change in the last upload to interested
+administrators. 
+
+ -- David Nusinow [EMAIL PROTECTED]  Wed, 18 Apr 2007 22:44:21 -0400
+
 libdrm (2.3.0-3) experimental; urgency=low
 
   * Add myself to uploaders
diff --git a/debian/libdrm2.NEWS b/debian/libdrm2.NEWS
new file mode 100644
index 000..f99652b
--- /dev/null
+++ b/debian/libdrm2.NEWS
@@ -0,0 +1,8 @@
+libdrm (2.3.0-4) experimental; urgency=low
+
+  * We are now shipping libdrm with the default permissions set to 666,
+rather than the upstream default of 660. If you have untrusted users,
+you should configure the X server to explicitly use a mode of 660 in
+the xorg.conf.
+
+ -- David Nusinow [EMAIL PROTECTED]  Wed, 18 Apr 2007 22:44:21 -0400


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Re: libdrm: Changes to 'debian-experimental'

2007-04-17 Thread Michel Dänzer 
On Sun, 2007-04-15 at 17:11 +, David Nusinow wrote:
 
 commit 7901afcce99a8af97e560d34e3685fd55eaa9c1a
 Author: David Nusinow [EMAIL PROTECTED]
 Date:   Sun Apr 15 13:11:06 2007 -0400
 
 * Add myself to uploaders
 * Patch libdrm to default to device permission 666 so we don't have to do 
 it
   in xorg.conf. The only way libdrm can do anything is through the server
   anyway. 

This last sentence doesn't make sense, please elaborate.

 This can still be overridden by a user's xorg.conf.

It might make sense to alert administrators to change this if they have
untrusted users.


-- 
Earthling Michel Dänzer   |  http://tungstengraphics.com
Libre software enthusiast |  Debian, X and DRI developer

libdrm: Changes to 'debian-experimental'

2007-04-15 Thread David Nusinow 
 debian/changelog |   10 ++
 debian/control   |4 ++--
 debian/patches/01_default_perms.diff |   13 +
 debian/patches/series|1 +
 debian/rules |5 +++--
 5 files changed, 29 insertions(+), 4 deletions(-)

New commits:
commit 7901afcce99a8af97e560d34e3685fd55eaa9c1a
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Apr 15 13:11:06 2007 -0400

* Add myself to uploaders
* Patch libdrm to default to device permission 666 so we don't have to do it
  in xorg.conf. The only way libdrm can do anything is through the server
  anyway. This can still be overridden by a user's xorg.conf. This change
  also requires adding quilt to the build-depends

diff --git a/debian/changelog b/debian/changelog
index e1fcbca..fbbf428 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.3.0-2) experimental; urgency=low
+
+  * Add myself to uploaders
+  * Patch libdrm to default to device permission 666 so we don't have to do it
+in xorg.conf. The only way libdrm can do anything is through the server
+anyway. This can still be overridden by a user's xorg.conf. This change
+also requires adding quilt to the build-depends
+
+ -- David Nusinow [EMAIL PROTECTED]  Sun, 15 Apr 2007 13:08:50 -0400
+
 libdrm (2.3.0-1) experimental; urgency=low
 
   [ Thierry Reding ]
diff --git a/debian/control b/debian/control
index bc273d1..7e67d85 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: libdrm
 Priority: optional
 Maintainer: Debian X Strike Force [EMAIL PROTECTED]
-Uploaders: Thierry Reding [EMAIL PROTECTED], Julien Cristau [EMAIL 
PROTECTED]
-Build-Depends: debhelper (= 5.0.0), autotools-dev, libx11-dev, dpkg-dev (= 
1.13.19)
+Uploaders: Thierry Reding [EMAIL PROTECTED], Julien Cristau [EMAIL 
PROTECTED], David Nusinow [EMAIL PROTECTED]
+Build-Depends: debhelper (= 5.0.0), autotools-dev, libx11-dev, dpkg-dev (= 
1.13.19), quilt (= 0.40)
 Standards-Version: 3.7.2
 Section: libs
 
diff --git a/debian/patches/01_default_perms.diff 
b/debian/patches/01_default_perms.diff
new file mode 100644
index 000..371fc05
--- /dev/null
+++ b/debian/patches/01_default_perms.diff
@@ -0,0 +1,13 @@
+Index: libdrm/libdrm/xf86drm.h
+===
+--- libdrm.orig/libdrm/xf86drm.h   2007-04-15 12:37:15.0 -0400
 libdrm/libdrm/xf86drm.h2007-04-15 12:39:16.0 -0400
+@@ -46,7 +46,7 @@
+ /* Default /dev/dri directory permissions 0755 */
+ #define DRM_DEV_DIRMODE   \
+   (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
+-#define DRM_DEV_MODE   (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
++#define DRM_DEV_MODE   (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
+ 
+ #define DRM_DIR_NAME  /dev/dri
+ #define DRM_DEV_NAME  %s/card%d
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..8ca2297
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_default_perms.diff
diff --git a/debian/rules b/debian/rules
index 18ce9ba..7c2b2c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -28,13 +29,13 @@ config.status: configure
dh_testdir
CFLAGS=$(CFLAGS) ./configure --host=$(DEB_HOST_GNU_TYPE) 
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man 
--infodir=\$${prefix}/share/info --enable-static=yes
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:  config.status
dh_testdir
$(MAKE)
touch build-stamp
 
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

libdrm: Changes to 'debian-experimental'

2007-04-15 Thread David Nusinow 
 .gitignore |   99 
 autogen.sh |   12 
 debian/changelog   |   10 
 debian/control |5 
 debian/docs|1 
 shared-core/drm_drawable.c |  330 +
 shared-core/drm_pciids.txt |  464 +
 shared-core/i915_dma.c |  846 +++
 shared-core/i915_drv.h |  342 +
 shared-core/i915_irq.c |  578 ++
 shared-core/i915_mem.c |  397 +
 shared-core/imagine_drv.h  |   43 
 shared-core/mach64_dma.c   | 1539 +
 shared-core/mach64_drv.h   | 1048 
 shared-core/mach64_irq.c   |  136 
 shared-core/mach64_state.c |  903 +++
 shared-core/mga_dma.c  | 1182 
 shared-core/mga_drv.h  |  683 ++
 shared-core/mga_irq.c  |  150 
 shared-core/mga_state.c| 1178 
 shared-core/mga_ucode.h|11645 +
 shared-core/mga_warp.c |  198 
 shared-core/nv_drv.h   |   52 
 shared-core/r128_cce.c |  948 +++
 shared-core/r128_drv.h |  520 ++
 shared-core/r128_irq.c |  102 
 shared-core/r128_state.c   | 1713 ++
 shared-core/r300_cmdbuf.c  |  973 +++
 shared-core/radeon_cp.c| 2257 
 shared-core/radeon_drv.h   | 1170 
 shared-core/radeon_irq.c   |  244 
 shared-core/radeon_mem.c   |  314 +
 shared-core/radeon_state.c | 3301 
 shared-core/savage_bci.c   | 1109 
 shared-core/savage_drv.h   |  575 ++
 shared-core/savage_state.c | 1164 
 shared-core/sis_drv.h  |   91 
 shared-core/sis_ds.c   |  299 +
 shared-core/sis_ds.h   |  146 
 shared-core/sis_mm.c   |  418 +
 shared-core/tdfx_drv.h |   47 
 shared-core/via_dma.c  |  777 +++
 shared-core/via_drv.c  |  114 
 shared-core/via_drv.h  |  164 
 shared-core/via_ds.c   |  274 +
 shared-core/via_ds.h   |  104 
 shared-core/via_irq.c  |  393 +
 shared-core/via_map.c  |  133 
 shared-core/via_mm.c   |  362 +
 shared-core/via_mm.h   |   40 
 shared-core/via_verifier.c | 1101 
 shared-core/via_verifier.h |   63 
 shared-core/via_video.c|   97 
 53 files changed, 40850 insertions(+), 4 deletions(-)

New commits:
commit 72d63aec8bd29cc334025ebcb4136c2db2efae12
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Apr 12 19:10:32 2007 +0200

Prepare upload to unstable.

* update my email address in debian/control
* add XS-Vcs-*
* delete useless debian/{dirs,docs} files

diff --git a/debian/changelog b/debian/changelog
index e1fcbca..4ac3363 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdrm (2.3.0-2) unstable; urgency=low
+
+  * Update my email address in debian/control.
+  * Add XS-Vcs-Git and XS-Vcs-Browser in debian/control.
+  * Upload to unstable.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Thu, 12 Apr 2007 19:06:57 +0200
+
 libdrm (2.3.0-1) experimental; urgency=low
 
   [ Thierry Reding ]
diff --git a/debian/control b/debian/control
index d00fe8e..b3b1264 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,12 @@
 Source: libdrm
 Priority: optional
 Maintainer: Debian X Strike Force [EMAIL PROTECTED]
-Uploaders: Thierry Reding [EMAIL PROTECTED], Julien Cristau [EMAIL 
PROTECTED]
+Uploaders: Thierry Reding [EMAIL PROTECTED], Julien Cristau [EMAIL 
PROTECTED]
 Build-Depends: debhelper (= 5.0.0), autotools-dev, libx11-dev, dpkg-dev (= 
1.13.19)
 Standards-Version: 3.7.2
 Section: libs
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
 
 Package: libdrm-dev
 Section: libdevel
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bb..000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e845566..000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README

commit d51e1bb56ca2f7858cdeac6f61a7b747c1e15b1e
Author: Dave Airlie [EMAIL PROTECTED]
Date:   Thu Nov 9 08:55:58 2006 +1100

libdrm: add drmOpenOnce + drmCloseOnce to libdrm

diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index 05b40f7..56450e8 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -3215,3 +3215,64 @@ int drmMMUnlock(int fd, unsigned memType)
 
 return ret;
 }
+
+#define DRM_MAX_FDS 16
+static struct {
+   char *BusID;
+   int fd;
+   int refcount;
+} connection[DRM_MAX_FDS];
+
+static int nr_fds = 0;
+
+int drmOpenOnce(void *unused, 
+   const char *BusID,
+   int *newlyopened)
+{
+   int i;
+   int fd;
+   
+   for (i = 0; i  nr_fds; i++)
+  if (strcmp(BusID, connection[i].BusID) == 0) {
+connection[i].refcount++;
+*newlyopened = 0;
+return connection[i].fd;
+  }
+
+   fd = drmOpen(unused, BusID);
+   if (fd = 0 || nr_fds == DRM_MAX_FDS)
+  return fd;
+   
+   connection[nr_fds].BusID = strdup(BusID);
+   connection[nr_fds].fd = fd;
+   connection[nr_fds].refcount = 1;
+   *newlyopened = 1;
+
+   if (0)
+  fprintf(stderr, saved connection %d for %s

libdrm: Changes to 'debian-experimental'

2007-01-31 Thread Julien Cristau 
 debian/watch |2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 109ecb8964f9de83d7b50dc9804b6f30223dcb5b
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Jan 31 08:54:28 2007 +0100

Update watch file.

diff --git a/debian/watch b/debian/watch
index 3da64b4..60b4b63 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 
-http://people.freedesktop.org/~ajax/libdrm/libdrm-(.*)\.tar\.gz
+http://dri.freedesktop.org/libdrm/libdrm-(.*)\.tar\.gz


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

libdrm: Changes to 'debian-experimental'

2007-01-04 Thread Thierry Reding 
New branch 'debian-experimental' available with the following commits:
commit 42fcf6eb88aba9c6e0b912bfab4e41421acea348
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Wed Dec 13 17:30:55 2006 +0100

Add upstream remotes file.

This file can be symlinked into the .git/remotes directory to fetch the
upstream repositories.

commit dc334cfbe9e0f6a00e0d284f0a97f4c76fca737c
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Sun Nov 26 02:48:59 2006 +

Make the latest changelog entries look like non-maintainer uploads.

commit 53b75308657d3661cfb9726c0570f7c35eede7b5
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Sun Nov 26 02:45:46 2006 +

Add a debugging package for the libdrm2 library.

commit 10d7aeb497282b1c52be491a79d26ed3f9572f95
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Tue Nov 21 14:20:33 2006 +

Target the 2.2.0 and 2.3.0 releases at experimental.

commit d1a648f4c6f7baebf9eb3f6c260b99e29b95f08a
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Sat Nov 18 19:09:55 2006 +

Update to latest upstream version (2.3.0).

commit c1875e0af681619ab15de8d6705af27e0d4c007c
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Sat Nov 18 18:55:53 2006 +

Update to upstream version 2.2.0 and set the Debian X Strike Force as
maintainer.

Bump Standards-Version and debhelper compatibility.

Don't try to install pkgconfig files from usr/share/pkgconfig because there 
is
nothing in that directory.

commit d52c84976eb976ac2d44e3b164eafba88ce6c494
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Sat Nov 18 18:26:08 2006 +

Update to 2.0.2-0.1 from unstable.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

libdrm: Changes to 'debian-experimental'

2007-01-04 Thread Thierry Reding 
 debian/changelog |7 ---
 debian/control   |3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit f3b57497c5fac2a227ecfcdfa9636cea99c80f4c
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Thu Jan 4 17:28:44 2007 +0100

Hijack the package (set XSF as maintainer, add myself to uploaders).

diff --git a/debian/changelog b/debian/changelog
index a275910..6b85f10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-libdrm (2.3.0-0.1) experimental; urgency=low
+libdrm (2.3.0-1) experimental; urgency=low
 
-  * Non-maintainer upload.
   * New upstream release.
+  * Set the Debian X Strike Force as maintainer.
+  * Add myself to uploaders.
   * Add a debugging symbol package for libdrm2.
 
- -- Thierry Reding [EMAIL PROTECTED]  Sun, 26 Nov 2006 03:45:50 +0100
+ -- Thierry Reding [EMAIL PROTECTED]  Thu,  4 Jan 2007 17:26:10 +0100
 
 libdrm (2.2.0-0.1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index f359681..215a373 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: libdrm
 Priority: optional
-Maintainer: Marcelo E. Magallon [EMAIL PROTECTED]
+Maintainer: Debian X Strike Force debian-x@lists.debian.org
+Uploaders: Thierry Reding [EMAIL PROTECTED]
 Build-Depends: debhelper (= 5.0.0), autotools-dev, libx11-dev
 Standards-Version: 3.7.2
 Section: libs


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

libdrm: Changes to 'debian-experimental'

2007-01-04 Thread Julien Cristau 
 debian/changelog  |   11 ++-
 debian/control|5 +++--
 debian/dirs   |2 --
 debian/libdrm2.shlibs |1 +
 debian/rules  |2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 11ac757a12e56c4ec3480447bea712b59e944b0e
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Jan 4 19:08:53 2007 +0100

* Don't install libdrm.la, and use dh_install --list-missing.

diff --git a/debian/changelog b/debian/changelog
index 7cfe7e1..e1fcbca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ libdrm (2.3.0-1) experimental; urgency=l
   * Add build-dep on dpkg-dev = 1.13.19 to make sure that the binary:Version
 substvar is available.
   * libdrm2-dbg depends on libdrm2 (= ${binary:Version}).
+  * Don't install libdrm.la, and use dh_install --list-missing.
 
- -- Julien Cristau [EMAIL PROTECTED]  Thu,  4 Jan 2007 18:42:56 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Thu,  4 Jan 2007 18:56:08 +0100
 
 libdrm (2.2.0-0.1) experimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 74ef34e..18ce9ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,7 @@ binary-arch: build install
dh_installchangelogs
dh_installdocs
dh_installexamples
-   dh_install --sourcedir=debian/tmp
+   dh_install --sourcedir=debian/tmp -Xlibdrm.la --list-missing
dh_link
dh_strip -plibdrm2 --dbg-package=libdrm2-dbg
dh_strip

commit ff9f67c8519509175a08857f7adc8a2bd81a016a
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Jan 4 18:54:54 2007 +0100

Delete unused file.

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bb..000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin

commit 1a3cb6227d49236fe06c64583ada9bb96282f507
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Jan 4 18:44:03 2007 +0100

* Add build-dep on dpkg-dev = 1.13.19 to make sure that the binary:Version
  substvar is available.
* libdrm2-dbg depends on libdrm2 (= ${binary:Version}).

diff --git a/debian/changelog b/debian/changelog
index 715f1bd..7cfe7e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,11 @@ libdrm (2.3.0-1) experimental; urgency=l
   [ Julien Cristau ]
   * Bump shlibs to libdrm2 = 2.3.0.
   * Add myself to uploaders.
+  * Add build-dep on dpkg-dev = 1.13.19 to make sure that the binary:Version
+substvar is available.
+  * libdrm2-dbg depends on libdrm2 (= ${binary:Version}).
 
- -- Julien Cristau [EMAIL PROTECTED]  Thu,  4 Jan 2007 18:31:23 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Thu,  4 Jan 2007 18:42:56 +0100
 
 libdrm (2.2.0-0.1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 258b3e9..2068cf2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libdrm
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Thierry Reding [EMAIL PROTECTED], Julien Cristau [EMAIL 
PROTECTED]
-Build-Depends: debhelper (= 5.0.0), autotools-dev, libx11-dev
+Build-Depends: debhelper (= 5.0.0), autotools-dev, libx11-dev, dpkg-dev (= 
1.13.19)
 Standards-Version: 3.7.2
 Section: libs
 
@@ -36,6 +36,7 @@ Package: libdrm2-dbg
 Section: libs
 Priority: extra
 Architecture: any
+Depends: libdrm2 (= ${binary:Version})
 Description: Userspace interface to kernel DRM services -- debugging symbols
  This library implements the userspace interface to the kernel DRM
  services.  DRM stands for Direct Rendering Manager, which is the

commit cbb3eeafcee09240a34636d361d29ed0a5b7
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Jan 4 18:33:47 2007 +0100

* Add myself to uploaders.

diff --git a/debian/changelog b/debian/changelog
index 73c5f39..715f1bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ libdrm (2.3.0-1) experimental; urgency=l
 
   [ Julien Cristau ]
   * Bump shlibs to libdrm2 = 2.3.0.
+  * Add myself to uploaders.
 
- -- Julien Cristau [EMAIL PROTECTED]  Thu,  4 Jan 2007 18:17:58 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Thu,  4 Jan 2007 18:31:23 +0100
 
 libdrm (2.2.0-0.1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 215a373..258b3e9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libdrm
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Thierry Reding [EMAIL PROTECTED]
+Uploaders: Thierry Reding [EMAIL PROTECTED], Julien Cristau [EMAIL 
PROTECTED]
 Build-Depends: debhelper (= 5.0.0), autotools-dev, libx11-dev
 Standards-Version: 3.7.2
 Section: libs

commit 6212a637320d77f793db782885e0ae9c8a0ac900
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Jan 4 18:20:02 2007 +0100

* Bump shlibs to libdrm2 = 2.3.0.

diff --git a/debian/changelog b/debian/changelog
index 6b85f10..73c5f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 libdrm (2.3.0-1) experimental; urgency=low

libdrm: Changes to 'debian-experimental'

2007-01-04 Thread Julien Cristau 
 debian/control |2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2cf18d6a87ba4c488f294ef83b5b1939ec031c4a
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Jan 4 19:48:13 2007 +0100

Move libdrm2-dbg to the libdevel section.

diff --git a/debian/control b/debian/control
index 2068cf2..bc273d1 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Description: Userspace interface to kern
  This package provides the runtime environment for libdrm.
 
 Package: libdrm2-dbg
-Section: libs
+Section: libdevel
 Priority: extra
 Architecture: any
 Depends: libdrm2 (= ${binary:Version})


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]