mesa: Changes to 'ubuntu+1'
debian/changelog | 47 +++++++++++++++++++++++++++
debian/control | 38 ++++++++++++++++++++-
debian/libegl1-mesa-dev.install.linux.in | 2 -
debian/libegl1-mesa-dev.links.in | 1
debian/libegl1-mesa-drivers.install.linux.in | 4 --
debian/libgl1-mesa-dri.install.in | 1
debian/libgl1-mesa-dri.install.kfreebsd.in | 1
debian/libwayland-egl1-mesa.install.in | 3 +
debian/libwayland-egl1-mesa.symbols | 5 ++
debian/rules | 12 ++----
10 files changed, 97 insertions(+), 17 deletions(-)
New commits:
commit 10700ab361dccad37a1035f3c9d44238b058192a
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Mar 31 11:56:23 2014 +0200
release to trusty
diff --git a/debian/changelog b/debian/changelog
index 23fcb87..49e46dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (10.1.0-4ubuntu1) UNRELEASED; urgency=medium
+mesa (10.1.0-4ubuntu1) trusty; urgency=medium
* Merge from unreleased debian sid.
* Add explicit libudev1 | libudev0 dependency. (LP: #1296947)
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 31 Mar 2014 11:25:48 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 31 Mar 2014 09:56:17 +0000
mesa (10.1.0-5) UNRELEASED; urgency=low
commit 8bd9360fd4b10bcae76bec18b952844c3935f171
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Mar 31 11:56:12 2014 +0200
Add explicit libudev1 | libudev0 dependency. (LP: #1296947)
diff --git a/debian/changelog b/debian/changelog
index 520f49b..23fcb87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0-4ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge from unreleased debian sid.
+ * Add explicit libudev1 | libudev0 dependency. (LP: #1296947)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 31 Mar 2014 11:25:48 +0200
+
mesa (10.1.0-5) UNRELEASED; urgency=low
* Add explicit libudev1 dependency.
diff --git a/debian/control b/debian/control
index 9b1415a..a1f52c4 100644
--- a/debian/control
+++ b/debian/control
@@ -99,7 +99,7 @@ Architecture: linux-any
Depends:
${shlibs:Depends},
${misc:Depends},
- libudev1 [linux-any],
+ libudev1 | libudev0,
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: generic buffer management API -- runtime
@@ -147,7 +147,7 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
- libudev1 [linux-any],
+ libudev1 | libudev0,
Recommends: libegl1-mesa-drivers
Provides: libegl1-x11
Conflicts: libegl1-x11
@@ -220,7 +220,7 @@ Depends:
libegl1-mesa (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
libwayland-egl1-mesa (= ${binary:Version}) [linux-any],
- libudev1 [linux-any],
+ libudev1 | libudev0,
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: free implementation of the EGL API -- hardware drivers
@@ -478,7 +478,7 @@ Depends:
${shlibs:Depends},
${misc:Depends}
libglapi-mesa (= ${binary:Version}),
- libudev1 [linux-any],
+ libudev1 | libudev0,
Recommends: libgl1-mesa-dri (>= 7.2)
Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
commit aaf71bc6cf1ad69d3770ef9d7ff78295be61abd0
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Mar 31 11:35:43 2014 +0200
Add explicit libudev1 dependency.
libudev is being dlsym'd now, but still a dependency.
diff --git a/debian/changelog b/debian/changelog
index a37517d..398c6c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0-5) UNRELEASED; urgency=low
+
+ * Add explicit libudev1 dependency.
+ - libudev is being dlsym'd now, but still a dependency.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 31 Mar 2014 11:25:48 +0200
+
mesa (10.1.0-4) unstable; urgency=medium
[ Andreas Boll ]
diff --git a/debian/control b/debian/control
index 063f59b..768634e 100644
--- a/debian/control
+++ b/debian/control
@@ -205,6 +205,7 @@ Architecture: linux-any
Depends:
${shlibs:Depends},
${misc:Depends},
+ libudev1 [linux-any],
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: generic buffer management API -- runtime
@@ -252,6 +253,7 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
+ libudev1 [linux-any],
Recommends: libegl1-mesa-drivers
Provides: libegl1-x11
Conflicts: libegl1-x11
@@ -323,6 +325,7 @@ Depends:
libegl1-mesa (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
libwayland-egl1-mesa (= ${binary:Version}) [linux-any],
+ libudev1 [linux-any],
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: free implementation of the EGL API -- hardware drivers
@@ -578,8 +581,9 @@ Section: libs
Architecture: any
Depends:
${shlibs:Depends},
- libglapi-mesa (= ${binary:Version}),
${misc:Depends}
+ libglapi-mesa (= ${binary:Version}),
+ libudev1 [linux-any],
Recommends: libgl1-mesa-dri (>= 7.2)
Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
commit c6a70c6c932c473530046c8bd9c0071a36b1ea26
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Mar 22 10:39:26 2014 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 2915d1e..a37517d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-mesa (10.1.0-4) UNRELEASED; urgency=medium
+mesa (10.1.0-4) unstable; urgency=medium
+ [ Andreas Boll ]
* Fix unsatisfiable libwayland-egl1-mesa and libwayland-dev dependency on
!linux (Closes: #742306).
* Install /etc/drirc on hurd (Closes: #741572).
- -- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 20 Mar 2014 18:12:38 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 22 Mar 2014 10:39:12 +0100
mesa (10.1.0-3) unstable; urgency=medium
commit e6197c676a887dac80dd577ab3d254d61c76e112
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Mar 20 18:17:18 2014 +0100
Install /etc/drirc on hurd (Closes: #741572).
diff --git a/debian/changelog b/debian/changelog
index 2c47bb8..2915d1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (10.1.0-4) UNRELEASED; urgency=medium
* Fix unsatisfiable libwayland-egl1-mesa and libwayland-dev dependency on
!linux (Closes: #742306).
+ * Install /etc/drirc on hurd (Closes: #741572).
-- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 20 Mar 2014 18:12:38 +0100
diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in
new file mode 100644
index 0000000..1d835ea
--- /dev/null
+++ b/debian/libgl1-mesa-dri.install.in
@@ -0,0 +1 @@
+dri/etc/drirc etc
diff --git a/debian/libgl1-mesa-dri.install.kfreebsd.in b/debian/libgl1-mesa-dri.install.kfreebsd.in
deleted file mode 100644
index 1d835ea..0000000
--- a/debian/libgl1-mesa-dri.install.kfreebsd.in
+++ /dev/null
@@ -1 +0,0 @@
-dri/etc/drirc etc
commit 2b8ea351a52eb7433f66914f34a2c0939946f8c9
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Mar 20 18:13:56 2014 +0100
Fix unsatisfiable libwayland-egl1-mesa and libwayland-dev dependency on !linux
Closes: #742306
diff --git a/debian/changelog b/debian/changelog
index bada1b8..2c47bb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0-4) UNRELEASED; urgency=medium
+
+ * Fix unsatisfiable libwayland-egl1-mesa and libwayland-dev dependency on
+ !linux (Closes: #742306).
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 20 Mar 2014 18:12:38 +0100
+
mesa (10.1.0-3) unstable; urgency=medium
[ Andreas Boll ]
diff --git a/debian/control b/debian/control
index 7d78cb9..063f59b 100644
--- a/debian/control
+++ b/debian/control
@@ -303,7 +303,7 @@ Depends:
libxcb-sync-dev,
libxshmfence-dev,
libx11-xcb-dev,
- libwayland-dev (>= 1.2.0),
+ libwayland-dev (>= 1.2.0) [linux-any],
${misc:Depends},
Description: free implementation of the EGL API -- development files
This package contains the development environment required for compiling
@@ -322,7 +322,7 @@ Depends:
${misc:Depends},
libegl1-mesa (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
- libwayland-egl1-mesa (= ${binary:Version}),
+ libwayland-egl1-mesa (= ${binary:Version}) [linux-any],
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: free implementation of the EGL API -- hardware drivers
commit 383895831f1412e1bf331e2443bc0abb61a2bc95
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Mar 19 22:48:11 2014 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 11f04ba..bada1b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.1.0-3) UNRELEASED; urgency=medium
+mesa (10.1.0-3) unstable; urgency=medium
[ Andreas Boll ]
* Build OpenCL only on architectures where we have LLVM enabled.
@@ -10,8 +10,9 @@ mesa (10.1.0-3) UNRELEASED; urgency=medium
[ Julien Cristau ]
* Steal Ubuntu patch to work around build failure on armhf
(https://bugs.freedesktop.org/show_bug.cgi?id=72064)
+ * Upload to unstable.
- -- Andreas Boll <andreas.boll.dev@gmail.com> Wed, 19 Mar 2014 21:23:46 +0100
+ -- Julien Cristau <jcristau@debian.org> Wed, 19 Mar 2014 22:48:14 +0100
mesa (10.1.0-2) experimental; urgency=medium
commit a176787ee2c074968f66dfd34d534f508dfade62
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Mar 19 22:47:58 2014 +0100
Steal Ubuntu patch to work around build failure on armhf
https://bugs.freedesktop.org/show_bug.cgi?id=72064
diff --git a/debian/changelog b/debian/changelog
index fece1ca..11f04ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ mesa (10.1.0-3) UNRELEASED; urgency=medium
[ Sven Joachim ]
* Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri again.
+ [ Julien Cristau ]
+ * Steal Ubuntu patch to work around build failure on armhf
+ (https://bugs.freedesktop.org/show_bug.cgi?id=72064)
+
-- 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/rules b/debian/rules
index 9076c33..760c3e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,8 +23,14 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
+ifeq (,$(filter $(DEB_HOST_ARCH), armhf))
buildflags = \
$(shell DEB_CFLAGS_MAINT_APPEND=-Wall DEB_CXXFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
+else
+# Workaround for a variant of LP: #725126
+buildflags = \
+ $(shell DEB_CFLAGS_MAINT_APPEND="-Wall -fno-optimize-sibling-calls" DEB_CXXFLAGS_MAINT_APPEND="-Wall -fno-optimize-sibling-calls" dpkg-buildflags --export=configure)
+endif
buildflags-i686 = \
$(shell DEB_CFLAGS_MAINT_APPEND="-Wall -march=i686" DEB_CXXFLAGS_MAINT_APPEND="-Wall -march=i686" dpkg-buildflags --export=configure)
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:
commit e31eb247bbf94678ecf7308e0b7257498f59eb5e
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 17 23:11:24 2014 +0100
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 219b25f..8a2952f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-mesa (10.1.0-2) UNRELEASED; urgency=medium
+mesa (10.1.0-2) experimental; urgency=medium
- * Install libwayland-egl in a seperate library package (libwayland-egl1-mesa)
+ [ Sjoerd Simons ]
+ * Install libwayland-egl in a separate library package (libwayland-egl1-mesa)
and provide a virtual libwayland-egl1 package. (Closes: #739269).
- -- Sjoerd Simons <sjoerd@debian.org> Sun, 16 Mar 2014 22:03:02 +0100
+ -- Julien Cristau <jcristau@debian.org> Mon, 17 Mar 2014 23:11:14 +0100
mesa (10.1.0-1) experimental; urgency=low
commit 39bbc9b2e0f1780939168e1189b9ea7f363e92b5
Author: Sjoerd Simons <sjoerd@luon.net>
Date: Mon Mar 17 10:54:19 2014 +0100
libwayland-egl1-mesa: Add breaks/replaces and improve description
Add breaks & replaces to libegl1-mesa-drivers to ensure upgrades work
successfully as libwayland-egl1-mesa replaces files in that package and
improve the description
diff --git a/debian/control b/debian/control
index a58be87..69e4497 100644
--- a/debian/control
+++ b/debian/control
@@ -361,15 +361,12 @@ Depends:
Recommends: libegl1-mesa-drivers
Provides: libwayland-egl1
Conflicts: libwayland-egl1
-Replaces: libwayland-egl1
+Replaces: libwayland-egl1, libegl1-mesa-drivers (<< 10.1.0-2)
+Breaks: libegl1-mesa-drivers (<< 10.1.0-2)
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Description: free implementation of the EGL API -- runtime
- This package contains the EGL native platform graphics interface library.
- EGL provides a platform-agnostic mechanism for creating rendering surfaces
- for use with other graphics libraries, such as OpenGL|ES and OpenVG.
- .
- This package contains wayland specific interface for use with EGL.
+Description: implementation of the Wayland EGL platform -- runtime
+ This package contains the mesa implementation of the Wayland EGL platform
Package: libwayland-egl1-mesa-dbg
Section: debug
@@ -379,12 +376,9 @@ Depends:
libwayland-egl1-mesa (= ${binary:Version}),
${misc:Depends},
Multi-Arch: same
-Description: free implementation of the EGL API -- debugging symbols
- This package contains the EGL native platform graphics interface library.
- EGL provides a platform-agnostic mechanism for creating rendering surfaces
- for use with other graphics libraries, such as OpenGL|ES and OpenVG.
- .
- This package contains the debugging symbols for the wayland EGL library.
+Description: implementation of the Wayland EGL platform -- debugging symbols
+ This package contains the debugging symbols for the mesa implementation of the
+ Wayland EGL platform
Package: libopenvg1-mesa
Section: libs
commit 3d2e8e66ce9c5c07a73f45ef01b9ade475ef5a13
Author: Sjoerd Simons <sjoerd@luon.net>
Date: Sun Mar 16 22:07:07 2014 +0100
Install libwayland-egl in a seperate library package (libwayland-egl1-mesa) and provide a virtual libwayland-egl1 package. (Closes: #739269).
diff --git a/debian/changelog b/debian/changelog
index c34f774..219b25f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0-2) UNRELEASED; urgency=medium
+
+ * Install libwayland-egl in a seperate library package (libwayland-egl1-mesa)
+ and provide a virtual libwayland-egl1 package. (Closes: #739269).
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 16 Mar 2014 22:03:02 +0100
+
mesa (10.1.0-1) experimental; urgency=low
[ Andreas Boll ]
diff --git a/debian/control b/debian/control
index ed08431..a58be87 100644
--- a/debian/control
+++ b/debian/control
@@ -322,6 +322,9 @@ Depends:
${misc: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
@@ -348,6 +351,41 @@ Description: free implementation of the EGL API -- driver debugging symbols
This package contains the debugging symbols for the drivers required for
hardware accelerated rendering of EGL-based graphics libraries.
+Package: libwayland-egl1-mesa
+Section: libs
+Architecture: linux-any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libegl1-mesa (= ${binary:Version})
+Recommends: libegl1-mesa-drivers
+Provides: libwayland-egl1
+Conflicts: libwayland-egl1
+Replaces: libwayland-egl1
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: free implementation of the EGL API -- runtime
+ This package contains the EGL native platform graphics interface library.
+ EGL provides a platform-agnostic mechanism for creating rendering surfaces
+ for use with other graphics libraries, such as OpenGL|ES and OpenVG.
+ .
+ This package contains wayland specific interface for use with EGL.
+
+Package: libwayland-egl1-mesa-dbg
+Section: debug
+Priority: extra
+Architecture: linux-any
+Depends:
+ libwayland-egl1-mesa (= ${binary:Version}),
+ ${misc:Depends},
+Multi-Arch: same
+Description: free implementation of the EGL API -- debugging symbols
+ This package contains the EGL native platform graphics interface library.
+ EGL provides a platform-agnostic mechanism for creating rendering surfaces
+ for use with other graphics libraries, such as OpenGL|ES and OpenVG.
+ .
+ This package contains the debugging symbols for the wayland EGL library.
+
Package: libopenvg1-mesa
Section: libs
Architecture: linux-any kfreebsd-any
diff --git a/debian/libegl1-mesa-drivers.install.linux.in b/debian/libegl1-mesa-drivers.install.linux.in
index 2c4c266..741f962 100644
--- a/debian/libegl1-mesa-drivers.install.linux.in
+++ b/debian/libegl1-mesa-drivers.install.linux.in
@@ -1,6 +1,2 @@
# OS-independent part (from libegl1-mesa-drivers.install.in):
dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.so usr/lib/${DEB_HOST_MULTIARCH}/egl
-
-# Wayland support, only on Linux:
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1 usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0.0 usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libwayland-egl1-mesa.install.in b/debian/libwayland-egl1-mesa.install.in
new file mode 100644
index 0000000..9adea44
--- /dev/null
+++ b/debian/libwayland-egl1-mesa.install.in
@@ -0,0 +1,3 @@
+# Wayland support, only on Linux:
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1 usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0.0 usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libwayland-egl1-mesa.symbols b/debian/libwayland-egl1-mesa.symbols
new file mode 100644
index 0000000..4ec0edc
--- /dev/null
+++ b/debian/libwayland-egl1-mesa.symbols
@@ -0,0 +1,5 @@
+libwayland-egl.so.1 libwayland-egl1-mesa #MINVER# | libwayland-egl1
+ wl_egl_window_create@Base 10.0.2
+ wl_egl_window_destroy@Base 10.0.2
+ wl_egl_window_get_attached_size@Base 10.0.2
+ wl_egl_window_resize@Base 10.0.2
Reply to: