VERSION | 2 debian/changelog | 43 ++++- debian/control | 75 ++++++---- debian/libegl1-mesa-drivers.install.linux.in | 6 debian/libgbm1.install.in | 2 debian/libgbm1.symbols | 15 -- debian/libgl1-mesa-dri.install.hurd.in | 2 debian/libgl1-mesa-dri.install.in | 4 debian/libopenvg1-mesa-dev.install.in | 6 debian/libopenvg1-mesa.install.in | 2 debian/patches/03_gbm_make_devices_static.diff | 27 +++ debian/patches/05_fix-defaults-glxfbconfig.patch | 55 +++++++ debian/patches/06_fix-sort-glxfbconfig.patch | 58 +++++++ debian/patches/07_gallium-fix-build-failure-on-powerpcspe.diff | 40 +++++ debian/patches/fix-defaults-glxfbconfig.patch | 55 ------- debian/patches/fix-sort-glxfbconfig.patch | 58 ------- debian/patches/series | 6 debian/rules | 52 ++---- src/gallium/drivers/r600/r600_hw_context.c | 2 src/gallium/drivers/r600/r600_pipe.c | 8 - src/gallium/drivers/r600/r600_pipe.h | 1 src/gallium/drivers/radeon/r600_buffer_common.c | 2 src/gallium/drivers/radeon/r600_pipe_common.c | 2 src/gallium/drivers/radeon/r600_pipe_common.h | 3 src/gallium/drivers/radeon/r600_texture.c | 2 src/gallium/drivers/radeonsi/si_hw_context.c | 4 src/gallium/targets/r600/vdpau/Makefile.am | 6 src/glsl/ast_to_hir.cpp | 13 + src/glsl/builtin_functions.cpp | 11 + src/glsl/glcpp/glcpp-parse.y | 22 ++ src/glsl/glcpp/tests/086-reserved-macro-names.c.expected | 4 src/glsl/linker.cpp | 9 - src/glsl/opt_vectorize.cpp | 14 + src/mesa/drivers/dri/i965/brw_context.c | 12 - src/mesa/drivers/dri/nouveau/nouveau_context.c | 7 src/mesa/drivers/dri/nouveau/nouveau_context.h | 3 src/mesa/drivers/dri/nouveau/nouveau_driver.h | 1 src/mesa/drivers/dri/nouveau/nv04_context.c | 5 src/mesa/drivers/dri/nouveau/nv10_context.c | 13 - src/mesa/drivers/dri/nouveau/nv10_state_fb.c | 4 src/mesa/drivers/dri/nouveau/nv10_state_raster.c | 3 src/mesa/drivers/dri/nouveau/nv20_context.c | 5 src/mesa/main/attrib.c | 1 src/mesa/main/shaderobj.c | 1 src/mesa/main/texparam.c | 3 45 files changed, 409 insertions(+), 260 deletions(-)
New commits: commit 0f9ca5a14ec4b4d0709d72d729f12f361ea8b9fc Author: Maarten Lankhorst <[email protected]> Date: Mon Mar 3 12:12:45 2014 +0100 Enable egl, libopenvg, gbm and vdpau for all archs. This simplifies the build rules considerably, and is closer to debian behavior. diff --git a/debian/changelog b/debian/changelog index c0cf069..99e5133 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,10 @@ -mesa (10.1.0~rc2-0ubuntu1) trusty; urgency=medium +mesa (10.1.0~rc2-1ubuntu1) UNRELEASED; urgency=medium [ Maarten Lankhorst ] - * Merge from unreleased debian-experimental. + * Merge from released debian-experimental. + * Enable egl, libopenvg, gbm and vdpau for all archs. + - This simplifies the build rules considerably, and + is closer to debian behavior. -- Maarten Lankhorst <[email protected]> Tue, 25 Feb 2014 14:29:26 +0100 diff --git a/debian/control b/debian/control index aaa5b0b..6bcb9a0 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: libxfixes-dev, libxdamage-dev, libxext-dev, - libvdpau-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf], + libvdpau-dev [linux-any kfreebsd-any], autoconf, automake, libtool, @@ -49,7 +49,7 @@ Homepage: http://mesa3d.sourceforge.net/ Package: libxatracker2 Section: libs -Architecture: amd64 armel armhf i386 powerpc +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -64,7 +64,7 @@ Description: X acceleration library -- runtime Package: libxatracker2-dbg Section: debug Priority: extra -Architecture: amd64 armel armhf i386 powerpc +Architecture: linux-any Depends: libxatracker2 (= ${binary:Version}), ${misc:Depends}, @@ -80,7 +80,7 @@ Description: X acceleration library -- debugging symbols Package: libxatracker-dev Section: libdevel -Architecture: amd64 armel armhf i386 powerpc +Architecture: linux-any Depends: libxatracker2 (= ${binary:Version}), ${misc:Depends}, @@ -251,7 +251,7 @@ Description: free implementation of the EGL API -- driver debugging symbols Package: libopenvg1-mesa Section: libs -Architecture: amd64 armel armhf i386 powerpc kfreebsd-any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -270,7 +270,7 @@ Description: free implementation of the OpenVG API -- runtime Package: libopenvg1-mesa-dbg Section: debug Priority: extra -Architecture: amd64 armel armhf i386 powerpc kfreebsd-any +Architecture: linux-any Depends: libopenvg1-mesa (= ${binary:Version}), ${misc:Depends}, @@ -286,7 +286,7 @@ Description: free implementation of the OpenVG API -- debugging symbols Package: libopenvg1-mesa-dev Section: libdevel -Architecture: amd64 armel armhf i386 powerpc kfreebsd-any +Architecture: linux-any Depends: libopenvg1-mesa (= ${binary:Version}), libegl1-mesa-dev, @@ -658,7 +658,7 @@ Description: Mesa Off-screen rendering extension -- development files Package: libvdpau1-drivers-mesa Section: libs -Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf +Architecture: linux-any kfreebsd-any Depends: libvdpau1, ${shlib:Depends}, @@ -671,7 +671,7 @@ Description: Mesa acceleration support for vdpau. Package: libvdpau1-drivers-mesa-dbg Section: debug Priority: extra -Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf +Architecture: linux-any kfreebsd-any Depends: libvdpau1-drivers-mesa (= ${binary:Version}), ${misc:Depends}, diff --git a/debian/libvdpau1-drivers-mesa.install.in b/debian/libvdpau1-drivers-mesa.install.in new file mode 100644 index 0000000..50c703c --- /dev/null +++ b/debian/libvdpau1-drivers-mesa.install.in @@ -0,0 +1 @@ +dri/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/*.so* usr/lib/${DEB_HOST_MULTIARCH}/vdpau/ diff --git a/debian/rules b/debian/rules index 7735def..eea1fda 100755 --- a/debian/rules +++ b/debian/rules @@ -104,10 +104,9 @@ else confflags_GALLIUM += --enable-gallium-llvm confflags_GALLIUM += --with-llvm-shared-libs endif - confflags_DIRECT_RENDERING = --enable-driglx-direct confflags_OPENVG = --enable-openvg --enable-gallium-egl - endif + confflags_GALLIUM += --enable-vdpau endif confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)" confflags_GLES = --enable-gles1 --enable-gles2 @@ -123,7 +122,7 @@ confflags-dri = \ --enable-shared-glapi \ --enable-texture-float \ --enable-xa \ - --disable-xvmc --enable-vdpau \ + --disable-xvmc \ $(confflags_DIRECT_RENDERING) \ $(confflags_EGL) \ $(confflags_GALLIUM) \ @@ -270,21 +269,12 @@ binary-arch: install # Resolve EGL/GLES/OpenVG symbols in the private library path. # Because there's no packaging problem so onerous that accomodating # proprietary alternatives can't make more difficult… -ifneq (,$(filter $(DEB_HOST_ARCH),arm64 ppc64 ppc64el)) - set -e ; for PACKAGE in \ - libegl1-mesa libgles1-mesa libgles2-mesa ; do \ - dh_makeshlibs -p$$PACKAGE -- -c4 \ - -edebian/$$PACKAGE/usr/lib/$(DEB_HOST_MULTIARCH)/mesa-egl/\* \ - ; done - dh_makeshlibs -s -Nlibopenvg1-mesa --remaining-packages -- -c4 -else set -e ; for PACKAGE in \ libegl1-mesa libgles1-mesa libgles2-mesa libopenvg1-mesa ; do \ dh_makeshlibs -p$$PACKAGE -- -c4 \ -edebian/$$PACKAGE/usr/lib/$(DEB_HOST_MULTIARCH)/mesa-egl/\* \ ; done dh_makeshlibs -s --remaining-packages -- -c4 -endif dh_installdeb -s dh_shlibdeps -s -l/usr/lib/$(DEB_HOST_MULTIARCH)/mesa:\ commit 34dd1077d35c155606bbb0cd0cc4e586d52ba5bf Author: Julien Cristau <[email protected]> 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 <[email protected]> Thu, 20 Feb 2014 19:12:12 +0100 + -- Julien Cristau <[email protected]> Sun, 02 Mar 2014 20:22:47 +0100 mesa (10.1.0~rc1-1) experimental; urgency=low commit 7ce8ea1d2e5fb9b91031defd292afba51d8fb62e Author: Julien Cristau <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 commit 752d29f1eef8733c69b515bd5fcbf9acf0d75767 Author: Julien Cristau <[email protected]> Date: Sun Mar 2 20:03:49 2014 +0100 gallium: fix build failure on powerpcspe (closes: #695746). Thanks, Roland Stigge! diff --git a/debian/changelog b/debian/changelog index a5286a9..39ea647 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ mesa (10.1.0~rc2-1) UNRELEASED; urgency=medium * libgbm1.symbols: try to avoid listing private symbols. * Enable radeon/r200/r300/r600/radeonsi on kfreebsd (closes: #732337). Thanks, Robert Millan! + * gallium: fix build failure on powerpcspe (closes: #695746). Thanks, Roland + Stigge! -- Maarten Lankhorst <[email protected]> Thu, 20 Feb 2014 19:12:12 +0100 diff --git a/debian/patches/07_gallium-fix-build-failure-on-powerpcspe.diff b/debian/patches/07_gallium-fix-build-failure-on-powerpcspe.diff new file mode 100644 index 0000000..f404454 --- /dev/null +++ b/debian/patches/07_gallium-fix-build-failure-on-powerpcspe.diff @@ -0,0 +1,40 @@ +From a4f14e7239780b02af8d74669c5458d4b0957d4d Mon Sep 17 00:00:00 2001 +From: Roland Stigge <[email protected]> +Date: Sun, 2 Mar 2014 19:52:56 +0100 +Subject: [PATCH] gallium: fix build failure on powerpcspe + +In the case of powerpc, mesa activates some altivec instructions +that are unknown on the powerpcspe architecture (see +https://wiki.debian.org/PowerPCSPEPort), causing a build failure as the +'vand' opcode is not recognized by the assembler. + +This patch fixes this by preventing the PPC-specialcasing in case of +powerpcspe (__NO_FPRS__ is only defined there). + +https://bugs.debian.org/695746 +--- + src/gallium/include/pipe/p_config.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h +index d603681..8189a73 100644 +--- a/src/gallium/include/pipe/p_config.h ++++ b/src/gallium/include/pipe/p_config.h +@@ -107,12 +107,14 @@ + #endif + #endif + ++#ifndef __NO_FPRS__ + #if defined(__ppc__) || defined(__ppc64__) || defined(__PPC__) + #define PIPE_ARCH_PPC + #if defined(__ppc64__) || defined(__PPC64__) + #define PIPE_ARCH_PPC_64 + #endif + #endif ++#endif + + #if defined(__s390x__) + #define PIPE_ARCH_S390 +-- +1.9.0 + diff --git a/debian/patches/series b/debian/patches/series index 5da44f2..f3bc8f1d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 04_osmesa_version.diff 05_fix-defaults-glxfbconfig.patch 06_fix-sort-glxfbconfig.patch +07_gallium-fix-build-failure-on-powerpcspe.diff commit 3134e1406817adc366770492650fb94f4fa4efb8 Author: Julien Cristau <[email protected]> Date: Sun Mar 2 19:41:23 2014 +0100 Enable radeon/r200/r300/r600/radeonsi on kfreebsd (closes: #732337). Thanks, Robert Millan! diff --git a/debian/changelog b/debian/changelog index 7bfb282..a5286a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ mesa (10.1.0~rc2-1) UNRELEASED; urgency=medium [ Julien Cristau ] * libgbm1.symbols: try to avoid listing private symbols. + * Enable radeon/r200/r300/r600/radeonsi on kfreebsd (closes: #732337). + Thanks, Robert Millan! -- Maarten Lankhorst <[email protected]> Thu, 20 Feb 2014 19:12:12 +0100 diff --git a/debian/rules b/debian/rules index 86464e6..4ea269c 100755 --- a/debian/rules +++ b/debian/rules @@ -60,7 +60,7 @@ ifeq ($(DEB_HOST_ARCH_OS), hurd) else ifeq ($(DEB_HOST_ARCH_OS), linux) # Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux - GALLIUM_DRIVERS += nouveau r600 r300 svga + GALLIUM_DRIVERS += nouveau svga # # Although the KMS egl drivers will probably build on kfreebsd & hurd # only linux actually has KMS drivers implemented at this point. @@ -68,12 +68,7 @@ else # Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet: EGL_DISPLAYS += wayland ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x)) - DRI_DRIVERS += r200 radeon nouveau - 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 + DRI_DRIVERS += nouveau endif endif @@ -89,6 +84,16 @@ else DRI_DRIVERS += swrast endif + ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x)) + DRI_DRIVERS += r200 radeon + 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 + endif + # LLVM is required for r300g and llvmpipe: ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf)) confflags_GALLIUM += --enable-gallium-llvm commit 24060fe65801091e6c93beb7095f4fb55528d923 Author: Julien Cristau <[email protected]> Date: Sun Mar 2 18:10:39 2014 +0100 Don't export a symbol named "devices" from libgbm diff --git a/debian/patches/03_gbm_make_devices_static.diff b/debian/patches/03_gbm_make_devices_static.diff new file mode 100644 index 0000000..3b3be9b --- /dev/null +++ b/debian/patches/03_gbm_make_devices_static.diff @@ -0,0 +1,27 @@ +From 5956d0a70600fe3f70282419c3328e68e8b68f1a Mon Sep 17 00:00:00 2001 +From: Julien Cristau <[email protected]> +Date: Sun, 2 Mar 2014 17:44:29 +0100 +Subject: [PATCH] gbm: make 'devices' array static + +It's only used in this one file, and exporting a symbol named 'devices' +from a shared library is terribly wrong. +--- + src/gbm/main/gbm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gbm/main/gbm.c b/src/gbm/main/gbm.c +index 72eeabf..04cd90c 100644 +--- a/src/gbm/main/gbm.c ++++ b/src/gbm/main/gbm.c +@@ -43,7 +43,7 @@ + + #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) + +-struct gbm_device *devices[16]; ++static struct gbm_device *devices[16]; + + static int device_num = 0; + +-- +1.9.0 + diff --git a/debian/patches/series b/debian/patches/series index dce198a..5da44f2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,6 @@ 01_hurd.diff 02_gbm_no_undefined.diff +03_gbm_make_devices_static.diff 04_osmesa_version.diff 05_fix-defaults-glxfbconfig.patch 06_fix-sort-glxfbconfig.patch commit e7519c73d80a6937addbffa2b9ddd89ea8dd7d6c Author: Julien Cristau <[email protected]> Date: Sun Mar 2 17:01:19 2014 +0100 libgbm1.symbols: try to avoid listing private symbols Symbols whose name starts with an underscore, as well as wl_drm_interface, are not public symbols, so shouldn't be listed here. diff --git a/debian/changelog b/debian/changelog index efb315a..7bfb282 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ mesa (10.1.0~rc2-1) UNRELEASED; urgency=medium [ Samuel Thibault ] * Enable egl and gles on hurd (closes: #729260) + [ Julien Cristau ] + * libgbm1.symbols: try to avoid listing private symbols. + -- Maarten Lankhorst <[email protected]> Thu, 20 Feb 2014 19:12:12 +0100 mesa (10.1.0~rc1-1) experimental; urgency=low diff --git a/debian/libgbm1.symbols b/debian/libgbm1.symbols index 7d51566..9a04f8b 100644 --- a/debian/libgbm1.symbols +++ b/debian/libgbm1.symbols @@ -1,19 +1,11 @@ libgbm.so.1 libgbm1 #MINVER# - _gbm_create_device@Base 8.1~0 -# _gbm_fd_get_device_name@Base 7.11~1 -# _gbm_log@Base 7.11~1 - _gbm_mesa_get_device@Base 7.11~1 -# _gbm_udev_device_new_from_fd@Base 7.11~1 - devices@Base 8.1~0 -# dri_fd_get_driver_name@Base 8.1~0 +| libgbm1-private gbm_bo_create@Base 7.11~1 -#MISSING: 8.1~0 gbm_bo_create_from_egl_image@Base 7.11~1 gbm_bo_destroy@Base 7.11~1 gbm_bo_get_device@Base 8.1~0 gbm_bo_get_format@Base 8.1~0 gbm_bo_get_handle@Base 7.11~1 gbm_bo_get_height@Base 7.11~1 -#MISSING: 8.1~0 gbm_bo_get_pitch@Base 7.11~1 gbm_bo_get_stride@Base 8.1~0 gbm_bo_get_user_data@Base 8.1~0 gbm_bo_get_width@Base 7.11~1 @@ -31,4 +23,7 @@ libgbm.so.1 libgbm1 #MINVER# gbm_surface_has_free_buffers@Base 8.1~0 gbm_surface_lock_front_buffer@Base 8.1~0 gbm_surface_release_buffer@Base 8.1~0 - (arch=linux-any)wl_drm_interface@Base 9.2~0 + (regex)"^_gbm_.*@Base$" 0 1 +# stupid side effect of code generation from +# src/egl/wayland/wayland-drm/wayland-drm.xml which ought to be private. + (arch=linux-any)wl_drm_interface@Base 0 1 commit 5d8d13096d5727ed92876391c201389e008d7334 Author: Julien Cristau <[email protected]> Date: Sun Mar 2 16:32:00 2014 +0100 Adjust hurd debian/rules changes to make common things common diff --git a/debian/rules b/debian/rules index c7cb6ba..86464e6 100755 --- a/debian/rules +++ b/debian/rules @@ -51,18 +51,13 @@ include /usr/share/quilt/quilt.make DRI_DRIVERS = GALLIUM_DRIVERS = +EGL_DISPLAYS = x11 # hurd doesn't do direct rendering ifeq ($(DEB_HOST_ARCH_OS), hurd) - EGL_DISPLAYS = x11 confflags_DIRECT_RENDERING = --disable-driglx-direct - confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)" - confflags_GALLIUM = --with-gallium-drivers= - confflags_GLES = --enable-gles-overlay --enable-gles1 --enable-gles2 DRI_DRIVERS += swrast else - EGL_DISPLAYS = x11 - ifeq ($(DEB_HOST_ARCH_OS), linux) # Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux GALLIUM_DRIVERS += nouveau r600 r300 svga @@ -104,11 +99,11 @@ else endif confflags_DIRECT_RENDERING = --enable-driglx-direct - confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)" - confflags_GALLIUM += --with-gallium-drivers="$(GALLIUM_DRIVERS)" - confflags_GLES = --enable-gles1 --enable-gles2 confflags_OPENVG = --enable-openvg --enable-gallium-egl endif +confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)" +confflags_GLES = --enable-gles1 --enable-gles2 +confflags_GALLIUM += --with-gallium-drivers="$(GALLIUM_DRIVERS)" confflags-dri = \ --enable-dri \ commit 9ca9b0e0d208fa31d525af21c13cfffc3e6781a5 Author: Samuel Thibault <[email protected]> Date: Sun Mar 2 16:15:19 2014 +0100 Enable egl and gles on hurd (closes: #729260) diff --git a/debian/changelog b/debian/changelog index 3f82a07..efb315a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ mesa (10.1.0~rc2-1) UNRELEASED; urgency=medium * Attempt to fix FTBFS on hurd. * Cherry pick some fixes for GLX fbconfig. (Closes: #739691) + [ Samuel Thibault ] + * Enable egl and gles on hurd (closes: #729260) + -- Maarten Lankhorst <[email protected]> Thu, 20 Feb 2014 19:12:12 +0100 mesa (10.1.0~rc1-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 7a0a2ee..c057086 100644 --- a/debian/control +++ b/debian/control @@ -246,7 +246,7 @@ Description: generic buffer management API -- development files Package: libegl1-mesa Section: libs -Architecture: linux-any kfreebsd-any +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -268,7 +268,7 @@ Description: free implementation of the EGL API -- runtime Package: libegl1-mesa-dbg Section: debug Priority: extra -Architecture: linux-any kfreebsd-any +Architecture: any Depends: libegl1-mesa (= ${binary:Version}), ${misc:Depends}, @@ -282,7 +282,7 @@ Description: free implementation of the EGL API -- debugging symbols Package: libegl1-mesa-dev Section: libdevel -Architecture: linux-any kfreebsd-any +Architecture: any Depends: libegl1-mesa (= ${binary:Version}), libegl1-mesa-drivers (= ${binary:Version}), @@ -438,7 +438,7 @@ Description: free implementation of the OpenVG API -- development files Package: libgles1-mesa Section: libs -Architecture: linux-any kfreebsd-any +Architecture: any Depends: libglapi-mesa (= ${binary:Version}), ${shlibs:Depends}, @@ -459,7 +459,7 @@ Description: free implementation of the OpenGL|ES 1.x API -- runtime Package: libgles1-mesa-dbg Section: debug Priority: extra -Architecture: linux-any kfreebsd-any +Architecture: any Depends: libgles1-mesa (= ${binary:Version}), ${misc:Depends}, @@ -476,7 +476,7 @@ Description: free implementation of the OpenGL|ES 1.x API -- debugging symbols Package: libgles1-mesa-dev Section: libdevel -Architecture: linux-any kfreebsd-any +Architecture: any Depends: libgles1-mesa (= ${binary:Version}), libegl1-mesa-dev, @@ -494,7 +494,7 @@ Description: free implementation of the OpenGL|ES 1.x API -- development files Package: libgles2-mesa Section: libs -Architecture: linux-any kfreebsd-any +Architecture: any Depends: libglapi-mesa (= ${binary:Version}), ${shlibs:Depends}, @@ -516,7 +516,7 @@ Description: free implementation of the OpenGL|ES 2.x API -- runtime Package: libgles2-mesa-dbg Section: debug Priority: extra -Architecture: linux-any kfreebsd-any +Architecture: any Depends: libgles2-mesa (= ${binary:Version}), ${misc:Depends}, @@ -534,7 +534,7 @@ Description: free implementation of the OpenGL|ES 2.x API -- debugging symbols Package: libgles2-mesa-dev Section: libdevel -Architecture: linux-any kfreebsd-any +Architecture: any Depends: libgles2-mesa (= ${binary:Version}), libegl1-mesa-dev, diff --git a/debian/rules b/debian/rules index e8a3bfa..c7cb6ba 100755 --- a/debian/rules +++ b/debian/rules @@ -54,9 +54,11 @@ GALLIUM_DRIVERS = # hurd doesn't do direct rendering ifeq ($(DEB_HOST_ARCH_OS), hurd) + EGL_DISPLAYS = x11 confflags_DIRECT_RENDERING = --disable-driglx-direct - confflags_EGL = --disable-egl + confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)" confflags_GALLIUM = --with-gallium-drivers= + confflags_GLES = --enable-gles-overlay --enable-gles1 --enable-gles2 DRI_DRIVERS += swrast else EGL_DISPLAYS = x11 commit b7a73b0a8e88798064c99691d5586117dbae5d1c Author: Maarten Lankhorst <[email protected]> Date: Tue Feb 25 14:46:42 2014 +0100 fixup depends in dbg package diff --git a/debian/control b/debian/control index 7a0a2ee..82c3e14 100644 --- a/debian/control +++ b/debian/control @@ -804,7 +804,7 @@ Section: debug Priority: extra Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf Depends: - libvdpau1-mesa-drivers (= ${binary:Version}), + libvdpau1-drivers-mesa (= ${binary:Version}), ${misc:Depends}, Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} commit 15815d5522660b08e28a6c8e7a73528442a6f3e0 Author: Maarten Lankhorst <[email protected]> Date: Tue Feb 25 14:45:51 2014 +0100 annotate merge diff --git a/debian/changelog b/debian/changelog index c80f43e..10d5bea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mesa (10.1.0~rc2-0ubuntu1) trusty; urgency=medium + + [ Maarten Lankhorst ] + * Merge from unreleased debian-experimental. + + -- Maarten Lankhorst <[email protected]> Tue, 25 Feb 2014 14:29:26 +0100 + mesa (10.1.0~rc2-1) UNRELEASED; urgency=medium [ Maarten Lankhorst ] commit cf3baf547de7c530d2080e67fd8fec918cbb4a2f Author: Andreas Boll <[email protected]> Date: Mon Feb 24 22:49:15 2014 +0100 debian/changelog: Close #705558 diff --git a/debian/changelog b/debian/changelog index c920231..3f82a07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ 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. + * Enable building drivers for libvdpau1 (Closes: #705558). * Bump to rc2. [ Sjoerd Simons ] commit 75c8abd584efb7e89cbdd21b6f4f39c3a89ad526 Author: Maarten Lankhorst <[email protected]> Date: Wed Feb 19 10:07:45 2014 +0100 Cherry pick some fixes for GLX fbconfig. (Closes: #739691) Signed-off-by: Andreas Boll <[email protected]> diff --git a/debian/changelog b/debian/changelog index 39cfb7c..c920231 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ mesa (10.1.0~rc2-1) UNRELEASED; urgency=medium [ Andreas Boll ] * Attempt to fix FTBFS on hurd. + * Cherry pick some fixes for GLX fbconfig. (Closes: #739691) -- Maarten Lankhorst <[email protected]> Thu, 20 Feb 2014 19:12:12 +0100 diff --git a/debian/patches/05_fix-defaults-glxfbconfig.patch b/debian/patches/05_fix-defaults-glxfbconfig.patch new file mode 100644 index 0000000..5e61098 --- /dev/null +++ b/debian/patches/05_fix-defaults-glxfbconfig.patch @@ -0,0 +1,55 @@ +From patchwork Mon Feb 17 22:10:17 2014 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [Mesa-dev] glx: Fix the default values for GLXFBConfig attributes +From: =?utf-8?q?Fredrik_H=C3=B6glund?= <[email protected]> +X-Patchwork-Id: 20458 +Message-Id: <[email protected]> +To: [email protected] +Cc: "9.2 10.0 10.1" <[email protected]> +Date: Mon, 17 Feb 2014 23:10:17 +0100 + +The default values for GLX_DRAWABLE_TYPE and GLX_RENDER_TYPE are +GLX_WINDOW_BIT and GLX_RGBA_BIT respectively, as specified in +the GLX 1.4 specification. + +This fixes the glx-choosefbconfig-defaults piglit test. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
