mesa: Changes to 'ubuntu'
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 <maarten.lankhorst@ubuntu.com>
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 <tjaalton@debian.org> Tue, 13 Jan 2015 15:33:54 +0200
mesa (10.4.2-2) UNRELEASED; urgency=medium
commit 6cc22fa459ff47661c7a3f6ee5397b1fd93c0699
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
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..0000000
--- 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 <tjaalton@debian.org>
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 <tjaalton@debian.org> Wed, 14 Jan 2015 15:12:07 +0200
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 15 Jan 2015 15:28:40 +0200
mesa (10.4.2-1) experimental; urgency=medium
commit 44fbb19b001aed8e20174761301d088b5541b07a
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Jan 15 15:28:00 2015 +0200
control: Mark libegl1-mesa-drivers M-A: same again. (Closes: #775370)
diff --git a/debian/changelog b/debian/changelog
index 92c6a73..b909256 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mesa (10.4.2-2) UNRELEASED; urgency=medium
gone now.
* control: Add depends on libwayland-egl1-mesa to libegl1-mesa-dev,
since it ships libwayland-egl.so on Linux.
+ * control: Mark libegl1-mesa-drivers M-A: same again. (Closes:
+ #775370)
-- Timo Aaltonen <tjaalton@debian.org> Wed, 14 Jan 2015 15:12:07 +0200
diff --git a/debian/control b/debian/control
index d10a178..fa9ef9d 100644
--- a/debian/control
+++ b/debian/control
@@ -322,6 +322,7 @@ Section: libs
Architecture: linux-any kfreebsd-any
Depends:
${misc:Depends},
+Multi-Arch: same
Description: transitional dummy package
This is a transitional dummy package, it can be safely removed.
commit 678bac99cf695f83b528b516ff48f3d9d359165c
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Jan 15 14:26:50 2015 +0200
control: Add depends on libwayland-egl1-mesa to libegl1-mesa-dev, since it ships libwayland-egl.so on Linux.
diff --git a/debian/changelog b/debian/changelog
index 47f4715..92c6a73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mesa (10.4.2-2) UNRELEASED; urgency=medium
* rules: Drop dh_makeshlibs exception on gbm_gallium_drm.so as it's
gone now.
+ * control: Add depends on libwayland-egl1-mesa to libegl1-mesa-dev,
+ since it ships libwayland-egl.so on Linux.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 14 Jan 2015 15:12:07 +0200
diff --git a/debian/control b/debian/control
index 640ba63..d10a178 100644
--- a/debian/control
+++ b/debian/control
@@ -289,6 +289,7 @@ Section: libdevel
Architecture: any
Depends:
libegl1-mesa (= ${binary:Version}),
+ libwayland-egl1-mesa (= ${binary:Version}) [linux-any],
libdrm-dev (>= 2.4.52) [!hurd-any],
x11proto-dri2-dev (>= 2.6),
x11proto-gl-dev (>= 1.4.14),
Reply to: