debian/changelog | 9 ---
debian/control | 63 ---------------------------
debian/libegl1-mesa-drivers.install.linux.in | 4 +
debian/libvdpau1-drivers-mesa.install.in | 1
debian/libwayland-egl1-mesa.install.in | 3 -
debian/libwayland-egl1-mesa.symbols | 5 --
debian/rules | 5 --
7 files changed, 7 insertions(+), 83 deletions(-)
New commits:
commit 34dd1077d35c155606bbb0cd0cc4e586d52ba5bf
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Mar 2 20:22:54 2014 +0100
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 41b03b7..a67725d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.1.0~rc2-1) UNRELEASED; urgency=medium
+mesa (10.1.0~rc2-1) experimental; urgency=medium
[ Maarten Lankhorst ]
* Add missing depends to keep lib(e)gl1-dev usable.
@@ -22,7 +22,7 @@ mesa (10.1.0~rc2-1) UNRELEASED; urgency=medium
* gallium: fix build failure on powerpcspe (closes: #695746). Thanks, Roland
Stigge!
- -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Thu, 20 Feb 2014
19:12:12 +0100
+ -- Julien Cristau <jcris...@debian.org> Sun, 02 Mar 2014 20:22:47 +0100
mesa (10.1.0~rc1-1) experimental; urgency=low
commit 7ce8ea1d2e5fb9b91031defd292afba51d8fb62e
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Mar 2 20:21:56 2014 +0100
Revert "Install libwayland-egl in a seperate library package"
The package split was missing Conflicts/Replaces, and introduced a
useless .symbols file for a private library.
This reverts commit 7c07f5494122021ce55a333be5a8489021595868.
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 8d31982..41b03b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,6 @@ mesa (10.1.0~rc2-1) UNRELEASED; urgency=medium
* Add missing depends to keep lib(e)gl1-dev usable.
* Bump to rc2.
- [ Sjoerd Simons ]
- * Install libwayland-egl in a seperate library package (libwayland-egl1-mesa)
- and provide a virtual libwayland-egl1 package. (Closes: #739269).
-
[ Emilio Pozuelo Monfort ]
* Update build dependencies and dependencies minimum versions. Thanks to
Fabio Pedretti <fabio....@libero.it> for the patch.
diff --git a/debian/control b/debian/control
index 4a796a4..16ca5cf 100644
--- a/debian/control
+++ b/debian/control
@@ -319,7 +319,6 @@ 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}
@@ -348,41 +347,6 @@ 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 741f962..2c4c266 100644
--- a/debian/libegl1-mesa-drivers.install.linux.in
+++ b/debian/libegl1-mesa-drivers.install.linux.in
@@ -1,2 +1,6 @@
# 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
deleted file mode 100644
index 9adea44..0000000
--- a/debian/libwayland-egl1-mesa.install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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
deleted file mode 100644
index 4ec0edc..0000000
--- a/debian/libwayland-egl1-mesa.symbols
+++ /dev/null
@@ -1,5 +0,0 @@
-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
commit 59e29f9c802d7acf33f1cc4efc181a9707971a52
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Mar 2 20:19:04 2014 +0100
Revert "Enable building drivers for libvdpau1."
The name of the package kind of sucks IMO, and the packaging had a sucky
long description and typo in Depends. Somebody can try again at a later
time.
This reverts commit 9559b86f515721152a0a2ce2347f1b61102d3f61.
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 39ea647..8d31982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ mesa (10.1.0~rc2-1) UNRELEASED; urgency=medium
[ Maarten Lankhorst ]
* Add missing depends to keep lib(e)gl1-dev usable.
- * Enable building drivers for libvdpau1 (Closes: #705558).
* Bump to rc2.
[ Sjoerd Simons ]
diff --git a/debian/control b/debian/control
index 668d803..4a796a4 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Build-Depends:
libxfixes-dev,
libxdamage-dev,
libxext-dev,
- libvdpau-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
autoconf,
automake,
libtool,
@@ -787,16 +786,4 @@ Description: Mesa Off-screen rendering extension --
development files
.
For more information on OSmesa see the libosmesa6 package.
-Package: libvdpau1-drivers-mesa
-Section: libs
-Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf
-Depends:
- libvdpau1,
- ${shlib:Depends},
- ${misc:Depends},
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Description: Mesa acceleration support for vdpau.
- This package enables support for VDPAU for some gallium drivers.
-
# vim: tw=0
diff --git a/debian/libvdpau1-drivers-mesa.install.in
b/debian/libvdpau1-drivers-mesa.install.in
deleted file mode 100644
index 50c703c..0000000
--- a/debian/libvdpau1-drivers-mesa.install.in
+++ /dev/null
@@ -1 +0,0 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/*.so*
usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
diff --git a/debian/rules b/debian/rules
index 4ea269c..e6207ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,9 +98,6 @@ else
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386
armhf))
confflags_GALLIUM += --enable-gallium-llvm
confflags_GALLIUM += --with-llvm-shared-libs
- confflags_GALLIUM += --enable-vdpau
- else
- confflags_GALLIUM += --disable-vdpau
endif
confflags_DIRECT_RENDERING = --enable-driglx-direct
@@ -120,7 +117,7 @@ confflags-dri = \
--enable-shared-glapi \
--enable-texture-float \
--enable-xa \
- --disable-xvmc \
+ --disable-xvmc --disable-vdpau \
$(confflags_DIRECT_RENDERING) \
$(confflags_EGL) \
$(confflags_GALLIUM) \
commit 3360e3d198ac6df77a7ac8a35c9817430b48425e
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Mar 2 20:17:50 2014 +0100
Revert "add -dbg package for libvdpau1-drivers-mesa"
This reverts commit 9e40f3d44cadf87bdf238c84027452780f0c74ed.
diff --git a/debian/control b/debian/control
index c057086..668d803 100644
--- a/debian/control
+++ b/debian/control
@@ -799,18 +799,4 @@ Pre-Depends: ${misc:Pre-Depends}
Description: Mesa acceleration support for vdpau.
This package enables support for VDPAU for some gallium drivers.
-Package: libvdpau1-drivers-mesa-dbg
-Section: debug
-Priority: extra
-Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf
-Depends:
- libvdpau1-mesa-drivers (= ${binary:Version}),
- ${misc:Depends},
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Description: Mesa acceleration support for vdpau.
- This package enables support for VDPAU for some gallium drivers.
- .
- This package contains the debugging symbols for the vdpau drivers.
-
# vim: tw=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/e1wkcft-0007l0...@moszumanska.debian.org
