mesa: Changes to 'ubuntu'

2015-01-19 Thread Maarten Bernardus Lankhorst
 debian/changelog  |   12 ++--
 debian/control|   38 ++
 debian/mesa-opencl-icd.install.in |3 ---
 debian/rules  |7 ---
 4 files changed, 12 insertions(+), 48 deletions(-)

New commits:
commit ecb805fea6f6241258cb1ef1bc3cb5d96c81346d
Author: Maarten Lankhorst 
Date:   Mon Jan 19 14:30:36 2015 +0100

Disable opencl after it was re-enabled accidentally in the merge.

diff --git a/debian/changelog b/debian/changelog
index c70fc64..ff832e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 mesa (10.4.2-1ubuntu1) UNRELEASED; urgency=medium
 
+  [ Timo Aaltonen ]
   * Merge from Debian experimental.
 
+  [ Maarten Lankhorst ]
+  * Disable opencl after it was re-enabled accidentally in the merge.
+
  -- Timo Aaltonen   Tue, 13 Jan 2015 15:33:54 +0200
 
 mesa (10.4.2-2) UNRELEASED; urgency=medium

commit 6cc22fa459ff47661c7a3f6ee5397b1fd93c0699
Author: Maarten Lankhorst 
Date:   Mon Jan 19 14:29:30 2015 +0100

disable opencl again for now

diff --git a/debian/control b/debian/control
index bb4fc90..adfab80 100644
--- a/debian/control
+++ b/debian/control
@@ -41,8 +41,6 @@ Build-Depends:
  llvm-3.5-dev (>= 1:3.5-1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (>= 1.2.0) [linux-any],
- libclang-3.5-dev (>= 1:3.5-1) [amd64 i386 armhf],
- libclc-dev [amd64 i386 armhf],
  libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
@@ -644,38 +642,4 @@ Description: Debugging symbols for the Mesa VDPAU video 
acceleration drivers
  .
  This package contains the debugging symbols for the VDPAU drivers.
 
-Package: mesa-opencl-icd
-Section: libs
-Architecture: amd64 i386 armhf
-Depends:
- libclc-r600,
- ocl-icd-libopencl1 | libopencl1,
- ${shlibs:Depends},
- ${misc:Depends},
-Replaces:
- libgl1-mesa-dri (<< 10.3.0-1),
-Breaks:
- libgl1-mesa-dri (<< 10.3.0-1),
-Provides: opencl-icd
-Description: free implementation of the OpenCL API -- ICD runtime
- This package contains the mesa implementation of the OpenCL (Open Compute
- Language) library, which is intended for use with an ICD loader. OpenCL
- provides a standardized interface for computational analysis on graphical
- processing units.
-
-Package: mesa-opencl-icd-dbg
-Section: debug
-Priority: extra
-Architecture: amd64 i386 armhf
-Depends:
- mesa-opencl-icd (= ${binary:Version}),
- ${misc:Depends},
-Description: free implementation of the OpenCL API -- debugging symbols
- This package contains the mesa implementation of the OpenCL (Open Compute
- Language) library, which is intended for use with an ICD loader. OpenCL
- provides a standardized interface for computational analysis on graphical
- processing units.
- .
- This package contains the debugging symbols for the mesa OpenCL ICD library.
-
 # vim: tw=0
diff --git a/debian/mesa-opencl-icd.install.in 
b/debian/mesa-opencl-icd.install.in
deleted file mode 100644
index f8e8aef..000
--- a/debian/mesa-opencl-icd.install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-dri/etc/OpenCL/vendors/mesa.icd etc/OpenCL/vendors
-dri/usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe/*.so 
usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libMesaOpenCL* usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/rules b/debian/rules
index 633adeb..6d89ebe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,13 +104,6 @@ else
 DRI_DRIVERS += r200 radeon
 GALLIUM_DRIVERS += r600 r300
   endif
-  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 armhf))
-   # opencl needs gallium-pipe-loader which needs udev,
-   # so no opencl on kfreebsd.
-   # opencl needs LLVM and Clang, so only build it on the subset
-   # of arches where we have LLVM enabled.
-   confflags_GALLIUM += --enable-opencl --enable-opencl-icd
-  endif
 
   # LLVM is required for r300g, radeonsi and llvmpipe:
   ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 
armhf))

commit b0de79a9aa08642397f27655f4f240b0f8181caf
Author: Timo Aaltonen 
Date:   Thu Jan 15 15:29:06 2015 +0200

releasing package mesa version 10.4.2-2

diff --git a/debian/changelog b/debian/changelog
index b909256..3866e9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.4.2-2) UNRELEASED; urgency=medium
+mesa (10.4.2-2) unstable; urgency=medium
 
   * rules: Drop dh_makeshlibs exception on gbm_gallium_drm.so as it's
 gone now.
@@ -7,7 +7,7 @@ mesa (10.4.2-2) UNRELEASED; urgency=medium
   * control: Mark libegl1-mesa-drivers M-A: same again. (Closes:
 #775370)
 
- -- Timo Aaltonen   Wed, 14 Jan 2015 15:12:07 +0200
+ -- Timo Aaltonen   Thu, 15 Jan 2015 15:28:40 +0200
 
 mesa (10.4.2-1) experimental; urgency=medium
 

commit 44fbb19b001aed8e20174761301d088b5541b07a
Author: Timo Aaltonen 
Date:  

mesa: Changes to 'ubuntu'

2015-01-19 Thread Timo Aaltonen
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4c81f50f939534383f8a9bbe02b89b4104915508
Author: Timo Aaltonen 
Date:   Mon Jan 19 17:43:05 2015 +0200

fix version

diff --git a/debian/changelog b/debian/changelog
index d2ce6c2..fff7fe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.4.2-1ubuntu1) UNRELEASED; urgency=medium
+mesa (10.4.2-2ubuntu1) UNRELEASED; urgency=medium
 
   [ Timo Aaltonen ]
   * Merge from Debian experimental.


-- 
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/e1ydetz-0007ct...@moszumanska.debian.org



Bug#775781: mesa 10.4.2 from unstable won't build packages on jessie

2015-01-19 Thread Darius Spitznagel

Source: mesa
Version: 10.4.2
Severity: normal

Dear Maintainer,

since Mesa 10.4.x landed in Debian I cannot compile mesa anymore because 
the build process does not know what to do with gallium_drv_video.so.
I know how to solve this, but I am wondering why you guys don't have 
this problem and pushed mesa-10.4.2 into unstable already.



   * What led up to the situation?
Can't build mesa 10.4.2 from sid on jessie x86_64

   * What exactly did you do (or not do) that was effective (or
 ineffective)?
Added "deb-src http://ftp2.de.debian.org/debian/ sid main contrib 
non-free" to /etc/apt/sources.list

apt-get update > OK.
apt-get build-dep mesa > OK. All dependencies were installed.
cd /usr/local/src as root
apt-get source mesa
cd mesa-10.4.2
dpkg-buildpackage -tc -j8

   * What was the outcome of this action?
These are the last few lines before package building begins...
...
...
...
dh_testdir
dh_testroot
dh_installchangelogs -s
dh_installchangelogs -pmesa-common-dev
dh_installdocs -s
dh_installexamples -s
# Also get rid of other files which aren't installed. Do not
# use -f to ensure we notice disappearing files:
set -e; for file in dri/usr/include/GL/wglext.h 
dri/usr/include/GL/wmesa.h dri/usr/lib/*/libglapi.so 
usr/include/GL/glcorearb.h usr/include/GL/glext.h usr/include/GL/gl.h 
usr/include/GL/gl_mangle.h usr/include/GL/glxext.h usr/include/GL/glx.h 
usr/include/GL/glx_mangle.h usr/include/GL/osmesa.h 
usr/include/GL/wglext.h usr/include/GL/wmesa.h ; do rm debian/tmp/$file; 
done

# Files only in git, not in tarballs, OK to use rm -f here:
set -e; for file in ; do rm -f debian/tmp/$file; done
# purge .la files
find debian/tmp/ -name '*.la' -exec rm '{}' ';'
# Copy the hardlinked *_dri.so correctly.
install -m755 -d debian/libgl1-mesa-dri/usr/lib/x86_64-linux-gnu/dri/
mv debian/tmp/dri/usr/lib/x86_64-linux-gnu/dri/*_dri.so \
debian/libgl1-mesa-dri/usr/lib/x86_64-linux-gnu/dri/
# Copy the hardlinked vdpau drivers correctly.
install -m755 -d debian/mesa-vdpau-drivers/usr/lib/x86_64-linux-gnu/vdpau/
mv debian/tmp/dri/usr/lib/x86_64-linux-gnu/vdpau/libvdpau*.so* \
   debian/mesa-vdpau-drivers/usr/lib/x86_64-linux-gnu/vdpau/
dh_install -s --fail-missing
dh_install: dri/usr/lib/x86_64-linux-gnu/dri/gallium_drv_video.so exists 
in debian/tmp but is not installed to anywhere

dh_install: missing files, aborting
debian/rules:259: recipe for target 'binary-arch' failed
make: *** [binary-arch] Error 2
dpkg-buildpackage: error: debian/rules binary gave error exit status 2

   * What outcome did you expect instead?
All necessary mesa packages are being build.


-- System Information:
Debian Release: 8.0
  APT prefers testing-updates
  APT policy: (500, 'testing-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.17.7 (SMP w/8 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)


--
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/54bd6296@goodbytez.de



libxshmfence: Changes to 'debian-unstable'

2015-01-19 Thread Julien Cristau
 autogen.sh  |4 
 configure.ac|   22 +++-
 debian/changelog|7 +
 debian/upstream/signing-key.asc |  217 
 debian/watch|1 
 src/xshmfence_alloc.c   |   53 -
 src/xshmfence_futex.h   |   24 
 7 files changed, 315 insertions(+), 13 deletions(-)

New commits:
commit 9542d81ba6ea0ecafc7c4709bb60e3e41278d296
Author: Julien Cristau 
Date:   Mon Jan 19 23:16:31 2015 +0100

Let uscan check upstream tarball signatures.

diff --git a/debian/changelog b/debian/changelog
index 0142e92..1e4c2b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libxshmfence (1.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Let uscan check upstream tarball signatures.
 
  -- Julien Cristau   Mon, 19 Jan 2015 00:15:04 +0100
 
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 000..533fbca
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,217 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+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
+IzhNn2yM2wmm6yDm0

libxshmfence: Changes to 'upstream-unstable'

2015-01-19 Thread Julien Cristau
 autogen.sh|4 ++-
 configure.ac  |   22 
 src/xshmfence_alloc.c |   53 ++
 src/xshmfence_futex.h |   24 ++
 4 files changed, 90 insertions(+), 13 deletions(-)

New commits:
commit fe2d6dbba6356ff275649017dd516f0270d79595
Author: Keith Packard 
Date:   Fri Jan 2 10:44:39 2015 -0800

Bump version to 1.2

Release with memfd support

Signed-off-by: Keith Packard 

diff --git a/configure.ac b/configure.ac
index 84b49de..0c98875 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.60])
-AC_INIT([libxshmfence], [1.1],
+AC_INIT([libxshmfence], [1.2],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], 
[libxshmfence])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])

commit b63ea144a0439c54a3a147274afeeb115caced5a
Author: Keith Packard 
Date:   Thu Oct 9 14:01:21 2014 +0200

Use linux 3.17 memfd_create syscall when available

Linux 3.17 introduces a new anonymous memory allocation that returns a
file descriptor which we can pass around. Use this in preference to
creating a file in the filesystem where available.

Signed-off-by: Keith Packard 

diff --git a/configure.ac b/configure.ac
index ddf63dc..84b49de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,12 @@ AC_SUBST([XPROTO_CFLAGS])
 
 CFLAGS="$CFLAGS $XPROTO_CFLAGS"
 
+AC_CHECK_FUNCS(memfd_create)
+
+AC_CHECK_DECLS([__NR_memfd_create], [], [], [[#include ]])
+
+AC_CHECK_HEADERS([sys/memfd.h], [AC_DEFINE([HAVE_MEMFD_H], 1, [Has sys/memfd.h 
header])])
+
 AC_ARG_ENABLE(visibility, AC_HELP_STRING([--enable-visibility], [Enable 
symbol visibility (default: auto)]),
[SYMBOL_VISIBILITY=$enableval],
[SYMBOL_VISIBILITY=auto])
diff --git a/src/xshmfence_alloc.c b/src/xshmfence_alloc.c
index 58416cd..05cf953 100644
--- a/src/xshmfence_alloc.c
+++ b/src/xshmfence_alloc.c
@@ -26,6 +26,34 @@
 
 #include "xshmfenceint.h"
 
+#if !HAVE_MEMFD_CREATE
+#if HAVE_DECL___NR_MEMFD_CREATE
+#include 
+static int memfd_create(const char *name,
+   unsigned int flags)
+{
+   return syscall(__NR_memfd_create, name, flags);
+}
+#define HAVE_MEMFD_CREATE  1
+#endif
+#endif
+
+#if HAVE_MEMFD_CREATE
+
+/* Get defines for the memfd_create syscall, using the
+ * header if available, or just defining the constants otherwise
+ */
+
+#if HAVE_MEMFD_H
+#include 
+#else
+/* flags for memfd_create(2) (unsigned int) */
+#define MFD_CLOEXEC0x0001U
+#define MFD_ALLOW_SEALING  0x0002U
+#endif
+
+#endif
+
 /**
  * xshmfence_alloc_shm:
  *
@@ -41,16 +69,22 @@ xshmfence_alloc_shm(void)
chartemplate[] = SHMDIR "/shmfd-XX";
int fd;
 
-#ifdef O_TMPFILE
-   fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
+#if HAVE_MEMFD_CREATE
+   fd = memfd_create("xshmfence", MFD_CLOEXEC|MFD_ALLOW_SEALING);
if (fd < 0)
 #endif
-{
-fd = mkstemp(template);
-if (fd < 0)
-   return fd;
-unlink(template);
-}
+   {
+#ifdef O_TMPFILE
+   fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
+   if (fd < 0)
+#endif
+   {
+   fd = mkstemp(template);
+   if (fd < 0)
+   return fd;
+   unlink(template);
+   }
+   }
if (ftruncate(fd, sizeof (struct xshmfence)) < 0) {
 close(fd);
 return -1;

commit 9c4f070e1304a3503cfab08f68573443025fc4c9
Author: Keith Packard 
Date:   Tue Jun 17 13:45:24 2014 -0700

Use /dev/shm as an optional shared memory directory

This is the path coded into glibc, so it should exist and be useful on
any glibc-based system

Signed-off-by: Keith Packard 

diff --git a/configure.ac b/configure.ac
index 74b70e0..ddf63dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,7 +130,7 @@ AC_ARG_WITH(shared-memory-dir, 
AS_HELP_STRING([--with-shared-memory-dir=PATH], [
 [],
 [with_shared_memory_dir=yes])
 
-shmdirs="/run/shm /var/tmp /tmp"
+shmdirs="/run/shm /dev/shm /var/tmp /tmp"
 
 case x"$with_shared_memory_dir" in
 xyes)

commit d3efccb33fa599d48004b22f2e07a19da4aaf789
Author: Jung-uk Kim 
Date:   Mon Dec 9 18:35:45 2013 -0500

Add support for FreeBSD using umtx (v3).

This fixes a sign-extension bug in the previous versions.

Signed-off-by: Jung-uk Kim 
Signed-off-by: Keith Packard 

diff --git a/configure.ac b/configure.ac
index b855029..74b70e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,16 @@ AC_ARG_ENABLE(futex, AS_HELP_STRING([--enable-futex], 
[Enable futexes (default:
[FUTEX=$enableval], [FUTEX=auto])
 
 if test "x$FUTEX" = "xauto"; then
-  

Bug#775781: mesa 10.4.2 from unstable won't build packages on jessie

2015-01-19 Thread Timo Aaltonen
On 19.01.2015 22:01, Darius Spitznagel wrote:
> Source: mesa
> Version: 10.4.2
> Severity: normal
> 
> Dear Maintainer,
> 
> since Mesa 10.4.x landed in Debian I cannot compile mesa anymore because
> the build process does not know what to do with gallium_drv_video.so.
> I know how to solve this, but I am wondering why you guys don't have
> this problem and pushed mesa-10.4.2 into unstable already.
> 
> 
>* What led up to the situation?
> Can't build mesa 10.4.2 from sid on jessie x86_64

You likely have extra packages installed that enable features that
normally aren't. I couldn't reproduce this.

Besides if you want to build the jessie version then grab that source
instead.


-- 
t


-- 
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/54be05af.5040...@debian.org