mesa: Changes to 'debian-experimental'
debian/changelog | 11 +++++++++++
debian/control | 10 ++++------
debian/rules | 14 +++++++-------
3 files changed, 22 insertions(+), 13 deletions(-)
New commits:
commit 6d4e41f6701ce600d260743ca6697dad3414981e
Author: Sven Joachim <svenjoac@gmx.de>
Date: Wed Mar 5 21:27:08 2014 +0100
Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri
This was only necessary due to egl_gallium.so being linked against
libllvmradeon, and there is no shared llvmradeon library anymore.
Conflicts:
debian/changelog
debian/control
diff --git a/debian/changelog b/debian/changelog
index e11ae3f..fece1ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
mesa (10.1.0-3) UNRELEASED; urgency=medium
+ [ Andreas Boll ]
* Build OpenCL only on architectures where we have LLVM enabled.
* Actually enable radeonsi on kfreebsd.
+ [ Sven Joachim ]
+ * Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri again.
+
-- Andreas Boll <andreas.boll.dev@gmail.com> Wed, 19 Mar 2014 21:23:46 +0100
mesa (10.1.0-2) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 35f3ed0..7d78cb9 100644
--- a/debian/control
+++ b/debian/control
@@ -323,8 +323,6 @@ Depends:
libegl1-mesa (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
libwayland-egl1-mesa (= ${binary:Version}),
-# for libllvmradeon
- libgl1-mesa-dri (= ${binary:Version}) [any-i386 any-amd64],
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: free implementation of the EGL API -- hardware drivers
commit 834aba4f446414025d5d4fff6b678c6d0a8f470a
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Mar 19 21:32:43 2014 +0100
Actually enable radeonsi on kfreebsd.
Acked-by: Julien Cristau <jcristau@debian.org>
diff --git a/debian/changelog b/debian/changelog
index ca14c15..e11ae3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mesa (10.1.0-3) UNRELEASED; urgency=medium
* Build OpenCL only on architectures where we have LLVM enabled.
+ * Actually enable radeonsi on kfreebsd.
-- Andreas Boll <andreas.boll.dev@gmail.com> Wed, 19 Mar 2014 21:23:46 +0100
diff --git a/debian/rules b/debian/rules
index 3953ecf..9076c33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,9 +92,6 @@ else
GALLIUM_DRIVERS += r600 r300
endif
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 armhf))
- # Radeonsi needs LLVM, so only build it on the subset of archs
- # where we have LLVM enabled.
- GALLIUM_DRIVERS += radeonsi
# 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
@@ -102,8 +99,9 @@ else
confflags_GALLIUM += --enable-opencl --enable-opencl-icd
endif
- # LLVM is required for r300g and llvmpipe:
+ # LLVM is required for r300g, radeonsi and llvmpipe:
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf))
+ GALLIUM_DRIVERS += radeonsi
confflags_GALLIUM += --enable-gallium-llvm
confflags_GALLIUM += --with-llvm-shared-libs
endif
commit ca03c0988565c2a7a6e4531904e4e96a81e1c80e
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Mar 19 21:17:36 2014 +0100
Build OpenCL only on architectures where we have LLVM enabled.
Acked-by: Julien Cristau <jcristau@debian.org>
diff --git a/debian/changelog b/debian/changelog
index 8a2952f..ca14c15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.1.0-3) UNRELEASED; urgency=medium
+
+ * Build OpenCL only on architectures where we have LLVM enabled.
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Wed, 19 Mar 2014 21:23:46 +0100
+
mesa (10.1.0-2) experimental; urgency=medium
[ Sjoerd Simons ]
diff --git a/debian/control b/debian/control
index 69e4497..35f3ed0 100644
--- a/debian/control
+++ b/debian/control
@@ -41,8 +41,8 @@ Build-Depends:
llvm-3.4-dev [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.4-dev [linux-any],
- libclc-dev [linux-any],
+ libclang-3.4-dev [amd64 i386 armhf],
+ libclc-dev [amd64 i386 armhf],
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
Homepage: http://mesa3d.sourceforge.net/
@@ -821,7 +821,7 @@ Description: Debugging symbols for the Mesa VDPAU video acceleration drivers
Package: mesa-opencl-icd
Section: libs
-Architecture: linux-any
+Architecture: amd64 i386 armhf
Depends:
libclc-r600,
ocl-icd-libopencl1,
@@ -837,7 +837,7 @@ Description: free implementation of the OpenCL API -- ICD runtime
Package: mesa-opencl-icd-dbg
Section: debug
Priority: extra
-Architecture: linux-any
+Architecture: amd64 i386 armhf
Depends:
mesa-opencl-icd (= ${binary:Version}),
${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 481ea7a..3953ecf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,9 +70,6 @@ else
EGL_DISPLAYS += drm
# Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
EGL_DISPLAYS += wayland
-# < aboll> opencl needs gallium-pipe-loader which needs udev
-# so no opencl for kbsd
- confflags_GALLIUM += --enable-opencl --enable-opencl-icd
ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += nouveau
endif
@@ -98,6 +95,11 @@ else
# Radeonsi needs LLVM, so only build it on the subset of archs
# where we have LLVM enabled.
GALLIUM_DRIVERS += radeonsi
+ # 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 and llvmpipe:
Reply to: