mesa: Changes to 'debian-experimental'
debian/changelog | 2
debian/control | 125 ++---------------------------
debian/libgl1-mesa-glx-i686.install.in | 1
debian/libgl1-mesa-swx11-dev.install.in | 3
debian/libgl1-mesa-swx11-i686.install.in | 1
debian/libgl1-mesa-swx11-i686.shlibs | 1
debian/libgl1-mesa-swx11.install.in | 1
debian/libgl1-mesa-swx11.lintian-overrides | 1
debian/libgl1-mesa-swx11.shlibs | 1
debian/not-installed | 24 -----
debian/rules | 52 ------------
11 files changed, 15 insertions(+), 197 deletions(-)
New commits:
commit 8a795ce6272c33107a7e98b59d904059770633b2
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri Aug 21 15:23:13 2015 +0200
control: Update package description.
diff --git a/debian/changelog b/debian/changelog
index ddf9d64..4170e3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mesa (11.0.0~git20150817-2) UNRELEASED; urgency=medium
* control: Update upstream url.
* control: Update Vcs-* fields.
* Drop libgl1-mesa-swx11* packages.
+ * control: Update package description.
[ Timo Aaltonen ]
* control: Delete commented out libgl1-mesa-glx-i686 from the file.
diff --git a/debian/control b/debian/control
index bc9b659..0e0c8e9 100644
--- a/debian/control
+++ b/debian/control
@@ -412,15 +412,19 @@ Breaks:
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: free implementation of the OpenGL API -- GLX runtime
+ Mesa is a 3-D graphics library with an API which is very similar to
+ that of OpenGL. To the extent that Mesa utilizes the OpenGL command
+ syntax or state machine, it is being used with authorization from
+ Silicon Graphics, Inc. However, the authors make no claim that Mesa
+ is in any way a compatible replacement for OpenGL or associated with
+ Silicon Graphics, Inc.
+ .
This version of Mesa provides GLX and DRI capabilities: it is capable of
both direct and indirect rendering. For direct rendering, it can use DRI
modules from the libgl1-mesa-dri package to accelerate drawing.
.
This package does not include the modules themselves: these can be found
in the libgl1-mesa-dri package.
- .
- For a complete description of Mesa, please look at the
- libgl1-mesa-swx11 package.
Package: libgl1-mesa-glx-dbg
Section: debug
@@ -439,7 +443,7 @@ Description: Debugging symbols for the Mesa GLX runtime
in the libgl1-mesa-dri package.
.
For a complete description of Mesa, please look at the
- libgl1-mesa-swx11 package.
+ libgl1-mesa-glx package.
.
This package contains debugging symbols for the GL library with GLX and DRI
capabilities.
@@ -471,7 +475,7 @@ Description: free implementation of the OpenGL API -- DRI modules
modules for accelerating direct rendering.
.
For a complete description of Mesa, please look at the
- libgl1-mesa-swx11 package.
+ libgl1-mesa-glx package.
Package: libgl1-mesa-dri-dbg
Section: debug
@@ -491,7 +495,7 @@ Description: Debugging symbols for the Mesa DRI modules
modules for accelerating direct rendering.
.
For a complete description of Mesa, please look at the
- libgl1-mesa-swx11 package.
+ libgl1-mesa-glx package.
.
This package contains debugging symbols for the DRI modules.
@@ -529,7 +533,7 @@ Description: free implementation of the OpenGL API -- GLX development files
This package includes headers and static libraries for compiling
programs with Mesa.
.
- For a complete description of Mesa, please look at the libgl1-mesa-swx11
+ For a complete description of Mesa, please look at the libgl1-mesa-glx
package.
Package: mesa-common-dev
commit 9d7d99d119ca08103fb9903687b68b9b5e61fa0b
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri Aug 21 13:40:40 2015 +0200
Drop libgl1-mesa-swx11* packages.
diff --git a/debian/changelog b/debian/changelog
index 54f34d5..ddf9d64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ mesa (11.0.0~git20150817-2) UNRELEASED; urgency=medium
* rules: Explicitly disable vaapi (Closes: #789100).
* control: Update upstream url.
* control: Update Vcs-* fields.
- * Drop libgl1-mesa-swx11-i686 package.
+ * Drop libgl1-mesa-swx11* packages.
[ Timo Aaltonen ]
* control: Delete commented out libgl1-mesa-glx-i686 from the file.
diff --git a/debian/control b/debian/control
index 54c8bd3..bc9b659 100644
--- a/debian/control
+++ b/debian/control
@@ -47,84 +47,6 @@ Vcs-Git: git://anonscm.debian.org/pkg-xorg/lib/mesa
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/lib/mesa.git
Homepage: http://mesa3d.org/
-Package: libgl1-mesa-swx11
-Section: libs
-Priority: extra
-Architecture: any
-Depends:
- libosmesa6 (>= 6.5.2-1),
- ${shlibs:Depends},
- ${misc:Depends},
-Conflicts: mesag3-glide, mesag3-glide2, mesag3+ggi, libgl1, nvidia-glx, mesag3, libgl1-mesa-swrast
-Provides: libgl1, mesag3, libgl1-mesa-swrast
-Replaces: libgl1, mesag3, libgl1-mesa-swrast
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: free implementation of the OpenGL API -- runtime
- Mesa is a 3-D graphics library with an API which is very similar to
- that of OpenGL. To the extent that Mesa utilizes the OpenGL command
- syntax or state machine, it is being used with authorization from
- Silicon Graphics, Inc. However, the author makes no claim that Mesa
- is in any way a compatible replacement for OpenGL or associated with
- Silicon Graphics, Inc.
- .
- This library provides a pure software rasteriser; it does not provide
- a direct rendering-capable library, or one which uses GLX. For that,
- please see libgl1-mesa-glx.
- .
- On Linux, this library is also known as libGL or libGL.so.1.
-
-Package: libgl1-mesa-swx11-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libgl1-mesa-swx11 (= ${binary:Version}),
- ${misc:Depends},
-Conflicts: libgl1-mesa-swrast-dbg
-Provides: libgl1-mesa-swrast-dbg
-Replaces: libgl1-mesa-swrast-dbg
-Multi-Arch: same
-Description: free implementation of the OpenGL API -- debugging symbols
- Mesa is a 3-D graphics library with an API which is very similar to
- that of OpenGL. To the extent that Mesa utilizes the OpenGL command
- syntax or state machine, it is being used with authorization from
- Silicon Graphics, Inc. However, the author makes no claim that Mesa
- is in any way a compatible replacement for OpenGL or associated with
- Silicon Graphics, Inc.
- .
- This library provides a pure software rasteriser; it does not provide
- a direct rendering-capable library, or one which uses GLX. For that,
- please see libgl1-mesa-glx.
- .
- On Linux, this library is also known as libGL or libGL.so.1.
- .
- This package contains debugging symbols for the software rasterization GL
- library.
-
-Package: libgl1-mesa-swx11-dev
-Section: libdevel
-Priority: extra
-Architecture: any
-Depends:
- libgl1-mesa-swx11 (= ${binary:Version}),
- libx11-dev,
- libxext6,
- mesa-common-dev (= ${binary:Version}),
- ${misc:Depends},
-Provides: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
-Conflicts: mesa-dev, libgl-dev, mesag3 (<< 3.1-1), nvidia-glx-dev, mesag-dev, libgl1-mesa-swrast-dev
-Replaces: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
-Multi-Arch: same
-Description: free implementation of the OpenGL API -- development files
- This package provides the development environment required for
- compiling programs with Mesa. For a complete description of Mesa,
- please look at the libgl1-mesa-swx11 package.
- .
- This library provides a pure software rasteriser; it does not provide
- a direct rendering-capable library, or one which uses GLX. For that,
- please see libgl1-mesa-dev.
-
Package: libxatracker2
Section: libs
Architecture: linux-any
diff --git a/debian/libgl1-mesa-swx11-dev.install.in b/debian/libgl1-mesa-swx11-dev.install.in
deleted file mode 100644
index e925ddd..0000000
--- a/debian/libgl1-mesa-swx11-dev.install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libGL.a
-usr/lib/${DEB_HOST_MULTIARCH}/libGL.so
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc
diff --git a/debian/libgl1-mesa-swx11.install.in b/debian/libgl1-mesa-swx11.install.in
deleted file mode 100644
index d333e7b..0000000
--- a/debian/libgl1-mesa-swx11.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libGL.so.*
diff --git a/debian/libgl1-mesa-swx11.lintian-overrides b/debian/libgl1-mesa-swx11.lintian-overrides
deleted file mode 100644
index a5252a9..0000000
--- a/debian/libgl1-mesa-swx11.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-package-name-doesnt-match-sonames libGL1
diff --git a/debian/libgl1-mesa-swx11.shlibs b/debian/libgl1-mesa-swx11.shlibs
deleted file mode 100644
index b8e0fba..0000000
--- a/debian/libgl1-mesa-swx11.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libGL 1 libgl1-mesa-glx | libgl1
diff --git a/debian/not-installed b/debian/not-installed
index a3ba40e..98e23cd 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -3,13 +3,4 @@
# Common list:
NOT_INSTALLED := \
dri/usr/include/GL/wglext.h \
- dri/usr/lib/*/libglapi.so \
- usr/include/GL/glcorearb.h \
- usr/include/GL/glext.h \
- usr/include/GL/gl.h \
- usr/include/GL/gl_mangle.h \
- usr/include/GL/glxext.h \
- usr/include/GL/glx.h \
- usr/include/GL/glx_mangle.h \
- usr/include/GL/osmesa.h \
- usr/include/GL/wglext.h
+ dri/usr/lib/*/libglapi.so
diff --git a/debian/rules b/debian/rules
index 0a1e823..3870802 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,9 +37,7 @@ endif
include debian/not-installed
# build the following configurations by default
-CONFIGS = swx11 \
- swx11-static \
- dri
+CONFIGS = dri
STAMP_DIR = debian/stamp
STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
@@ -134,33 +132,6 @@ confflags-dri = \
$(confflags_GLES) \
$(buildflags)
-confflags-swx11 = \
- --disable-dri \
- --disable-egl \
- --with-gallium-drivers= \
- --enable-xlib-glx \
- --disable-egl \
- --disable-shared-glapi \
- --disable-gles1 \
- --disable-gles2 \
- --disable-va \
- --disable-omx \
- $(buildflags)
-
-confflags-swx11-static = \
- --disable-dri \
- --disable-egl \
- --with-gallium-drivers= \
- --enable-xlib-glx \
- --enable-static \
- --disable-egl \
- --disable-shared-glapi \
- --disable-gles1 \
- --disable-gles2 \
- --disable-va \
- --disable-omx \
- $(buildflags)
-
configure: $(QUILT_STAMPFN) configure.ac
autoreconf -vfi
commit f3c2d9b9cf5662fb927595edfb07a6319ea28e73
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri Aug 21 13:35:55 2015 +0200
Drop libgl1-mesa-swx11-i686 package.
diff --git a/debian/changelog b/debian/changelog
index 06b516e..54f34d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mesa (11.0.0~git20150817-2) UNRELEASED; urgency=medium
* rules: Explicitly disable vaapi (Closes: #789100).
* control: Update upstream url.
* control: Update Vcs-* fields.
+ * Drop libgl1-mesa-swx11-i686 package.
[ Timo Aaltonen ]
* control: Delete commented out libgl1-mesa-glx-i686 from the file.
diff --git a/debian/control b/debian/control
index 571d020..54c8bd3 100644
--- a/debian/control
+++ b/debian/control
@@ -102,35 +102,6 @@ Description: free implementation of the OpenGL API -- debugging symbols
This package contains debugging symbols for the software rasterization GL
library.
-Package: libgl1-mesa-swx11-i686
-Section: libs
-Priority: extra
-Architecture: any-i386
-Depends:
- libgl1-mesa-swx11 (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: Mesa OpenGL runtime [i686 optimized]
- Mesa is a 3-D graphics library with an API which is very similar to
- that of OpenGL. To the extent that Mesa utilizes the OpenGL command
- syntax or state machine, it is being used with authorization from
- Silicon Graphics, Inc. However, the author makes no claim that Mesa
- is in any way a compatible replacement for OpenGL or associated with
- Silicon Graphics, Inc.
- .
- This library provides a pure software rasteriser; it does not provide
- a direct rendering-capable library, or one which uses GLX. For that,
- please see libgl1-mesa-glx.
- .
- On Linux, this library is also known as libGL or libGL.so.1.
- .
- This set of libraries is optimized for i686 machines and will only be used if
- you are running a 2.6 kernel on an i686 class CPU. This includes Pentium Pro,
- Pentium II/II/IV, Celeron CPU's and similar class CPU's (including clones
- such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla).
-
Package: libgl1-mesa-swx11-dev
Section: libdevel
Priority: extra
diff --git a/debian/libgl1-mesa-glx-i686.install.in b/debian/libgl1-mesa-glx-i686.install.in
deleted file mode 100644
index f43b6ad..0000000
--- a/debian/libgl1-mesa-glx-i686.install.in
+++ /dev/null
@@ -1 +0,0 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/i686/cmov/libGL.so.* usr/lib/${DEB_HOST_MULTIARCH}/i686/cmov
diff --git a/debian/libgl1-mesa-swx11-i686.install.in b/debian/libgl1-mesa-swx11-i686.install.in
deleted file mode 100644
index fc0fa69..0000000
--- a/debian/libgl1-mesa-swx11-i686.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/i686/cmov/libGL.so.*
diff --git a/debian/libgl1-mesa-swx11-i686.shlibs b/debian/libgl1-mesa-swx11-i686.shlibs
deleted file mode 100644
index b8e0fba..0000000
--- a/debian/libgl1-mesa-swx11-i686.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libGL 1 libgl1-mesa-glx | libgl1
diff --git a/debian/not-installed b/debian/not-installed
index b1355f4..a3ba40e 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -13,16 +13,3 @@ NOT_INSTALLED := \
usr/include/GL/glx_mangle.h \
usr/include/GL/osmesa.h \
usr/include/GL/wglext.h
-
-# Architecture-specific additional files:
-NOT_INSTALLED_i386 = \
- usr/lib/*/i686/cmov/libGL.so \
- usr/lib/*/i686/cmov/pkgconfig/gl.pc
-
-# Same for linux, kfreebsd, and hurd on i386:
-NOT_INSTALLED_kfreebsd-i386 = $(NOT_INSTALLED_i386)
-NOT_INSTALLED_hurd-i386 = $(NOT_INSTALLED_i386)
-
-# Detect the current architecture and add the files if any:
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-NOT_INSTALLED += $(NOT_INSTALLED_$(DEB_HOST_ARCH))
diff --git a/debian/rules b/debian/rules
index 8c5b43e..0a1e823 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,9 +32,6 @@ 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)
-
# keep a list of files we don't install (yet), but since it's a bit
# large, use an external file:
include debian/not-installed
@@ -44,10 +41,6 @@ CONFIGS = swx11 \
swx11-static \
dri
-ifeq ($(DEB_HOST_ARCH_CPU), i386)
- CONFIGS += swx11-i386-i686
-endif
-
STAMP_DIR = debian/stamp
STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
@@ -168,20 +161,6 @@ confflags-swx11-static = \
--disable-omx \
$(buildflags)
-confflags-swx11-i386-i686 = \
- --disable-dri \
- --disable-egl \
- --with-gallium-drivers= \
- --enable-xlib-glx \
- --disable-egl \
- --disable-shared-glapi \
- --disable-gles1 \
- --disable-gles2 \
- --disable-va \
- --disable-omx \
- --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \
- $(buildflags-i686)
-
configure: $(QUILT_STAMPFN) configure.ac
autoreconf -vfi
Reply to: