mesa: Changes to 'debian-experimental'
debian/changelog | 14 ++++++++-
debian/clean | 2 +
debian/control | 48 ++++++++++++++++++++++++++++++-
debian/libegl1-mesa-dev.install.in | 4 +-
debian/libegl1-mesa-drivers.install.in | 5 +--
debian/libegl1-mesa.install.in | 1
debian/libegl1-mesa.symbols | 2 -
debian/libgbm-dev.install.in | 3 +
debian/libgbm1.install.in | 1
debian/libgbm1.symbols | 16 ++++++++++
debian/libopenvg1-mesa.install.in | 1
debian/patches/12-llvm-config-check.diff | 39 -------------------------
debian/patches/series | 1
debian/rules | 36 ++++++++++++-----------
14 files changed, 106 insertions(+), 67 deletions(-)
New commits:
commit fbccacd9524aa2f6540a5c9724f387250a2ec06f
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Jun 28 21:49:34 2011 +0100
Drop 12-llvm-config-check.diff; now upstream
diff --git a/debian/changelog b/debian/changelog
index 8218a0b..b0cd15e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ mesa (7.11~1-1) UNRELEASED; urgency=low
- Stop tryingStop trying to install st_{GL,OpenVG} and pipe_*
as they are all now built in to egl_gallium.so
* Add libgbm{1,1-dbg,-dev} packages for the new buffer-manager library.
+ * Drop 12-llvm-config-check.diff; upstream.
-- Christopher James Halse Rogers <raof@ubuntu.com> Tue, 28 Jun 2011 21:34:53 +0100
diff --git a/debian/patches/12-llvm-config-check.diff b/debian/patches/12-llvm-config-check.diff
deleted file mode 100644
index a8f8b74..0000000
--- a/debian/patches/12-llvm-config-check.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From a51da020f1e746e9c288cf09214b552d7293f4eb Mon Sep 17 00:00:00 2001
-From: Cyril Brulebois <kibi@debian.org>
-Date: Wed, 15 Jun 2011 15:47:12 +0200
-Subject: [PATCH] configure.ac: Avoid running llvm-config when it hadn't been
- checked for.
-
-If --disable-gallium is passed, llvm-config isn't checked for, so mark
-it explicitly as absent, through LLVM_CONFIG=no.
-
-Passing --disable-gallium would result in:
-| ../configure: line 9739: --version: command not found
-| ../configure: line 9740: --cppflags: command not found
-| ../configure: line 9741: --libs: command not found
-| ../configure: line 9743: --ldflags: command not found
-
-With this fix, one gets that instead:
-| configure: error: LLVM is required to build Gallium R300 on x86 and x86_64
-
-Signed-off-by: Cyril Brulebois <kibi@debian.org>
----
- configure.ac | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 69513c1..5d7288c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1459,6 +1459,8 @@ fi
- if test "x$enable_gallium" = xyes; then
- SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"
- AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
-+else
-+ LLVM_CONFIG=no
- fi
-
- AC_SUBST([LLVM_CFLAGS])
---
-1.7.5.4
-
diff --git a/debian/patches/series b/debian/patches/series
index ccaf55f..63e9bf8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@
08-kfreebsd-gallium.diff
10-hurd-configure-tweaks.diff
11-hurd-ftbfs-again.diff
-12-llvm-config-check.diff
13-llvm-config-pick-a-version.diff
commit 80334e3760e56b7b9b3ab71584a2bff9be9f9254
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Jun 28 21:46:58 2011 +0100
Add libgbm library packages
diff --git a/debian/changelog b/debian/changelog
index 8717b37..8218a0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ mesa (7.11~1-1) UNRELEASED; urgency=low
* debian/libegl1-mesa-drivers.install.in:
- Stop tryingStop trying to install st_{GL,OpenVG} and pipe_*
as they are all now built in to egl_gallium.so
+ * Add libgbm{1,1-dbg,-dev} packages for the new buffer-manager library.
-- Christopher James Halse Rogers <raof@ubuntu.com> Tue, 28 Jun 2011 21:34:53 +0100
diff --git a/debian/clean b/debian/clean
index e215d39..43c0f3c 100644
--- a/debian/clean
+++ b/debian/clean
@@ -14,3 +14,5 @@ debian/libgl1-mesa-dri-experimental.install
debian/libegl1-mesa.install
debian/libegl1-mesa-drivers.install
debian/libegl1-mesa-dev.install
+debian/libgbm1.install
+debian/libgbm-dev.install
diff --git a/debian/control b/debian/control
index 696cb38..823040c 100644
--- a/debian/control
+++ b/debian/control
@@ -142,6 +142,52 @@ Description: free implementation of the OpenGL API -- development files
a direct rendering-capable library, or one which uses GLX. For that,
please see libgl1-mesa-dev.
+Package: libgbm1
+Section: libs
+Architecture: linux-any kfreebsd-any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: generic buffer management API -- runtime
+ This package contains the GBM buffer management library. It provides a
+ mechanism for allocating buffers for graphics rendering tied to Mesa.
+ .
+ GBM is intended to be used as a native platform for EGL on drm or openwfd.
+
+Package: libgbm1-dbg
+Section: debug
+Priority: extra
+Architecture: linux-any kfreebsd-any
+Depends:
+ libgbm1 (= ${binary:Version}),
+ ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: generic buffer management API -- debugging symbols
+ This package contains the GBM buffer management library. It provides a
+ mechanism for allocating buffers for graphics rendering tied to Mesa.
+ .
+ GBM is intended to be used as a native platform for EGL on drm or openwfd.
+ .
+ This package contains the debugging symbols for the GBM library.
+
+Package: libgbm-dev
+Section: libdevel
+Architecture: linux-any kfreebsd-any
+Depends:
+ libgbm1 (= ${binary:Version}),
+ ${misc:Depends},
+Description: generic buffer management API -- development files
+ This package contains the GBM buffer management library. It provides a
+ mechanism for allocating buffers for graphics rendering tied to Mesa.
+ .
+ GBM is intended to be used as a native platform for EGL on drm or openwfd.
+ .
+ This package provides the development environment for compiling programs
+ against the GBM library.
+
Package: libegl1-mesa
Section: libs
Architecture: linux-any kfreebsd-any
diff --git a/debian/libgbm-dev.install.in b/debian/libgbm-dev.install.in
new file mode 100644
index 0000000..f5b413a
--- /dev/null
+++ b/debian/libgbm-dev.install.in
@@ -0,0 +1,3 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libgbm.so usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gbm.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+dri/usr/include/gbm.h usr/include/gbm.h
diff --git a/debian/libgbm1.install.in b/debian/libgbm1.install.in
new file mode 100644
index 0000000..44a4050
--- /dev/null
+++ b/debian/libgbm1.install.in
@@ -0,0 +1 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libgbm.so.1* usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libgbm1.symbols b/debian/libgbm1.symbols
new file mode 100644
index 0000000..ea06a9e
--- /dev/null
+++ b/debian/libgbm1.symbols
@@ -0,0 +1,16 @@
+libgbm.so.1 libgbm1 #MINVER#
+ _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
+ gbm_bo_create@Base 7.11~1
+ gbm_bo_create_from_egl_image@Base 7.11~1
+ gbm_bo_destroy@Base 7.11~1
+ gbm_bo_get_handle@Base 7.11~1
+ gbm_bo_get_height@Base 7.11~1
+ gbm_bo_get_pitch@Base 7.11~1
+ gbm_bo_get_width@Base 7.11~1
+ gbm_create_device@Base 7.11~1
+ gbm_device_destroy@Base 7.11~1
+ gbm_device_get_backend_name@Base 7.11~1
+ gbm_device_get_fd@Base 7.11~1
diff --git a/debian/rules b/debian/rules
index bccfa87..61c649c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -250,6 +250,7 @@ install: build
libgl1-mesa-dri.install.linux libegl1-mesa.install \
libgl1-mesa-dri-experimental.install \
libegl1-mesa-drivers.install libegl1-mesa-dev.install \
+ libgbm1.install libgbm-dev.install \
libglapi-mesa.install; \
do \
sed -e"s,\$${DEB_HOST_MULTIARCH},$(DEB_HOST_MULTIARCH),g" \
@@ -319,6 +320,7 @@ endif
dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
dh_strip -plibgl1-mesa-dri-experimental --dbg-package=libgl1-mesa-dri-experimental-dbg
dh_strip -plibopenvg1-mesa --dbg-package=libopenvg1-mesa-dbg
+ dh_strip -plibgbm1 --dbg-package=libgbm1-dbg
dh_strip -plibegl1-mesa --dbg-package=libegl1-mesa-dbg
dh_strip -plibglapi-mesa --dbg-package=libglapi-mesa-dbg
dh_strip -plibgles1-mesa --dbg-package=libgles1-mesa-dbg
@@ -328,6 +330,7 @@ endif
# builds (see changelog for mesa 7.10-1):
dh_strip \
-plibegl1-mesa-dev \
+ -plibgbm-dev \
-plibgl1-mesa-dev \
-plibgl1-mesa-swx11-dev \
-plibgles1-mesa-dev \
commit a34be115da0d7c056c43106b9b1ebf6fae124b36
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Jun 28 21:45:13 2011 +0100
Update for new unified egl_gallium.so EGL driver
diff --git a/debian/changelog b/debian/changelog
index 3c329eb..8717b37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,11 @@ mesa (7.11~1-1) UNRELEASED; urgency=low
[ Christopher James Halse Rogers ]
* Temporarily disable Wayland EGL backend as it requires a newer
libwayland-dev
- * Update rules for configure changes:
+ * Update rules for configure changes
+ * debian/lib{egl1,openvg1}-mesa.install.in:
+ * debian/libegl1-mesa-drivers.install.in:
+ - Stop tryingStop trying to install st_{GL,OpenVG} and pipe_*
+ as they are all now built in to egl_gallium.so
-- Christopher James Halse Rogers <raof@ubuntu.com> Tue, 28 Jun 2011 21:34:53 +0100
diff --git a/debian/libegl1-mesa.install.in b/debian/libegl1-mesa.install.in
index dfeeff7..57d1a21 100644
--- a/debian/libegl1-mesa.install.in
+++ b/debian/libegl1-mesa.install.in
@@ -1,2 +1 @@
dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1* usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/st_GL.so usr/lib/${DEB_HOST_MULTIARCH}/egl
diff --git a/debian/libopenvg1-mesa.install.in b/debian/libopenvg1-mesa.install.in
index 20b4164..a0e0686 100644
--- a/debian/libopenvg1-mesa.install.in
+++ b/debian/libopenvg1-mesa.install.in
@@ -1,2 +1 @@
dri/usr/lib/${DEB_HOST_MULTIARCH}/libOpenVG.so.1* usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/st_OpenVG.so usr/lib/${DEB_HOST_MULTIARCH}/egl
commit f11bbd2d527790930ae7c37a573a27cf2bca94a2
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Jun 28 21:39:11 2011 +0100
Migrate to new configure flags
diff --git a/debian/changelog b/debian/changelog
index c13e5e6..3c329eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ mesa (7.11~1-1) UNRELEASED; urgency=low
[ Christopher James Halse Rogers ]
* Temporarily disable Wayland EGL backend as it requires a newer
libwayland-dev
+ * Update rules for configure changes:
-- Christopher James Halse Rogers <raof@ubuntu.com> Tue, 28 Jun 2011 21:34:53 +0100
diff --git a/debian/rules b/debian/rules
index f4a0a70..bccfa87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,11 +70,10 @@ DRI_DRIVERS = swrast
ifeq ($(DEB_HOST_ARCH_OS), hurd)
confflags_DIRECT_RENDERING = --disable-driglx-direct
confflags_EGL = --disable-egl
- confflags_GALLIUM = --disable-gallium --disable-gallium-r300
+ confflags_GALLIUM = --with-gallium-drivers=
else
EGL_DISPLAYS = x11
GALLIUM_DRIVERS = swrast
- GALLIUM_STATE_TRACKERS = egl,glx,dri,vega
ifeq ($(DEB_HOST_ARCH_OS), linux)
# Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux
@@ -98,15 +97,14 @@ else
# LLVM is required for r300g, and x86-ish:
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386))
GALLIUM_DRIVERS += r300
- else
- confflags_GALLIUM = --disable-gallium-r300
+ confflags_GALLIUM += --enable-gallium-llvm
endif
confflags_DIRECT_RENDERING = --enable-driglx-direct
confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
- confflags_GALLIUM += $(addprefix --enable-gallium-,$(GALLIUM_DRIVERS))
+ confflags_GALLIUM += --with-gallium-drivers="$(GALLIUM_DRIVERS)"
confflags_GLES = --enable-gles1 --enable-gles2
- confflags_STATE_TRACKERS = --with-state-trackers="$(GALLIUM_STATE_TRACKERS)"
+ confflags_OPENVG = --enable-openvg --enable-gallium-egl
endif
confflags-dri = \
@@ -115,36 +113,37 @@ confflags-dri = \
--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
--with-dri-searchpath='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
--enable-glx-tls \
+ --enable-shared-glapi \
$(confflags_DIRECT_RENDERING) \
$(confflags_EGL) \
$(confflags_GALLIUM) \
$(confflags_GLES) \
- $(confflags_STATE_TRACKERS) \
+ $(confflags_OPENVG) \
$(confflags-common)
confflags-osmesa = \
--disable-egl \
- --disable-gallium \
+ --with-gallium-drivers= \
--with-driver=osmesa \
$(confflags-common)
confflags-osmesa-static = \
--disable-egl \
- --disable-gallium \
+ --with-gallium-drivers= \
--with-driver=osmesa \
--enable-static \
$(confflags-common)
confflags-osmesa16 = \
--disable-egl \
- --disable-gallium \
+ --with-gallium-drivers= \
--with-driver=osmesa \
--with-osmesa-bits=16 \
$(confflags-common)
confflags-osmesa16-static = \
--disable-egl \
- --disable-gallium \
+ --with-gallium-drivers= \
--with-driver=osmesa \
--with-osmesa-bits=16 \
--enable-static \
@@ -152,14 +151,14 @@ confflags-osmesa16-static = \
confflags-osmesa32 = \
--disable-egl \
- --disable-gallium \
+ --with-gallium-drivers= \
--with-driver=osmesa \
--with-osmesa-bits=32 \
$(confflags-common)
confflags-osmesa32-static = \
--disable-egl \
- --disable-gallium \
+ --with-gallium-drivers= \
--with-driver=osmesa \
--with-osmesa-bits=32 \
--enable-static \
@@ -167,7 +166,7 @@ confflags-osmesa32-static = \
confflags-swx11+glu = \
--disable-egl \
- --disable-gallium \
+ --with-gallium-drivers= \
--with-driver=xlib \
--disable-gl-osmesa \
--disable-egl \
@@ -178,7 +177,7 @@ confflags-swx11+glu = \
confflags-swx11+glu-static = \
--disable-egl \
- --disable-gallium \
+ --with-gallium-drivers= \
--with-driver=xlib \
--disable-gl-osmesa \
--enable-static \
@@ -190,7 +189,7 @@ confflags-swx11+glu-static = \
confflags-swx11+glu-i386-i686 = \
--disable-egl \
- --disable-gallium \
+ --with-gallium-drivers= \
--with-driver=xlib \
--disable-gl-osmesa \
--disable-glut \
commit dc26b0de07f5d214ddf49aee86db3579f40e645f
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Jun 28 21:36:37 2011 +0100
Temporarily disable Wayland EGL backend, which needs newer libwayland-dev
diff --git a/debian/changelog b/debian/changelog
index 3f3620b..c13e5e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
mesa (7.11~1-1) UNRELEASED; urgency=low
+ [ Cyril Brulebois ]
* New upstream snapshot from the 7.11 branch (up to 1ad06c7a25):
- Fix regression from 7.10, missing characters in text display with
intel drivers (Closes: #631516). Thanks to Martin Steigerwald for
the report and the tests.
- -- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 12:06:59 +0200
+ [ Christopher James Halse Rogers ]
+ * Temporarily disable Wayland EGL backend as it requires a newer
+ libwayland-dev
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Tue, 28 Jun 2011 21:34:53 +0100
mesa (7.11~0-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 30aab61..696cb38 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
flex,
bison,
llvm-2.9-dev [amd64 i386],
- libwayland-dev,
+# libwayland-dev,
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/
diff --git a/debian/libegl1-mesa-dev.install.in b/debian/libegl1-mesa-dev.install.in
index b6f8614..3f3094f 100644
--- a/debian/libegl1-mesa-dev.install.in
+++ b/debian/libegl1-mesa-dev.install.in
@@ -1,6 +1,6 @@
dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so usr/lib/${DEB_HOST_MULTIARCH}
+#dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so usr/lib/${DEB_HOST_MULTIARCH}
dri/usr/include/EGL usr/include
dri/usr/include/KHR usr/include
dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/wayland-egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+#dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/wayland-egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libegl1-mesa-drivers.install.in b/debian/libegl1-mesa-drivers.install.in
index f591401..c226c5e 100644
--- a/debian/libegl1-mesa-drivers.install.in
+++ b/debian/libegl1-mesa-drivers.install.in
@@ -1,4 +1,3 @@
dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.so usr/lib/${DEB_HOST_MULTIARCH}/egl
-dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/pipe_*.so usr/lib/${DEB_HOST_MULTIARCH}/egl
-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 usr/lib/${DEB_HOST_MULTIARCH}
+#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 usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libegl1-mesa.symbols b/debian/libegl1-mesa.symbols
index 6d56af4..987e9a9 100644
--- a/debian/libegl1-mesa.symbols
+++ b/debian/libegl1-mesa.symbols
@@ -62,4 +62,4 @@ libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11
eglWaitClient@Base 7.8.1
eglWaitGL@Base 7.8.1
eglWaitNative@Base 7.8.1
- wl_drm_interface@Base 7.11~0
+# wl_drm_interface@Base 7.11~0
diff --git a/debian/rules b/debian/rules
index 3f6e704..f4a0a70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,7 +81,7 @@ else
GALLIUM_DRIVERS += nouveau r600
# Although the KMS egl drivers will probably build on kfreebsd & hurd
# only linux actually has KMS drivers implemented at this point.
- EGL_DISPLAYS += drm wayland
+ EGL_DISPLAYS += drm
# Nouveau requires KMS, so even the classic DRI driver only works on linux
DRI_DRIVERS += nouveau
endif
Reply to: