mesa: Changes to 'debian-experimental'
Rebased ref, commits from common ancestor:
commit 26c9ec36998b439897511eb17a992cbc0cfd4c92
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 23 16:03:19 2016 +0200
rules: Migrate to dh.
diff --git a/debian/changelog b/debian/changelog
index 9691f66..c03a20c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mesa (11.2.0~rc1-1) UNRELEASED; urgency=medium
* rules, *.install.in, not-installed: Drop dri/-build prefix, we build
everything in one pass nowadays.
* control: Bump libdrm-dev build-dep to 2.4.67 for freedreno.
+ * rules: Migrate to dh.
-- Timo Aaltonen <tjaalton@debian.org> Tue, 23 Feb 2016 09:48:38 +0200
diff --git a/debian/rules b/debian/rules
index 0a6b62d..71c09c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -107,15 +107,15 @@ else
else
DRI_DRIVERS += swrast
endif
-
confflags_DIRECT_RENDERING = --enable-driglx-direct
confflags_GALLIUM += --enable-vdpau
endif
+
confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
confflags_GLES = --enable-gles1 --enable-gles2
confflags_GALLIUM += --with-gallium-drivers="$(GALLIUM_DRIVERS)"
-confflags = \
+confflags += \
--enable-dri \
--with-dri-drivers="$(DRI_DRIVERS)" \
--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
@@ -134,56 +134,8 @@ confflags = \
$(confflags_GLES) \
$(buildflags)
-configure: $(QUILT_STAMPFN) configure.ac
- autoreconf -vfi
-
-# list the configurations that will built
-configs:
- @echo Building the following configurations: $(CONFIGS)
-
-$(STAMP_DIR)/stamp:
- dh_testdir
- mkdir -p $(STAMP_DIR)
- >$@
-
-$(QUILT_STAMPFN): $(STAMP_DIR)/stamp
-
-build: build-stamp
-
-build-stamp: $(BUILD_STAMPS)
- >$@
-
-$(STAMP)-build: configure
- dh_testdir
-
- mkdir -p $(DEB_BUILD_DIR)/$*
-
- cd $(DEB_BUILD_DIR)/$* && \
- ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --sysconfdir=/etc \
- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
- --localstatedir=/var --disable-silent-rules \
- $(confflags) $(confflags-$*)
- cd $(DEB_BUILD_DIR)/$* && $(MAKE)
- >$@
-
-install: build
- # Add here commands to install the package into debian/tmp
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- $(MAKE) -C $(DEB_BUILD_DIR) DESTDIR=$(CURDIR)/debian/tmp install
- for file in debian/*.in; \
- do \
- sed -e"s,\$${DEB_HOST_MULTIARCH},$(DEB_HOST_MULTIARCH),g" \
- $${file} > $${file%%.in}; \
- done
-
-clean: unpatch
- dh_testdir
+override_dh_clean:
rm -rf .pc
-
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
@@ -193,7 +145,6 @@ clean: unpatch
rm -rf $$(find -name Makefile.in)
rm -rf aclocal.m4 bin/missing bin/depcomp install-sh bin/ltmain.sh
rm -f bin/ar-lib bin/compile bin/ylwrap bin/install-sh
- rm -rf $(STAMP_DIR)
for file in debian/*.in; do rm -f $${file%%.in}; done
rm -f src/glsl/builtins/tools/texture_builtins.pyc
rm -f src/mapi/glapi/gen/*.pyc
@@ -203,20 +154,26 @@ clean: unpatch
dh_clean
-# Build architecture-independent files here.
-binary-indep: install
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --disable-silent-rules \
+ $(confflags)
+
+override_dh_auto_install:
+ dh_auto_install
+ for file in debian/*.in; \
+ do \
+ sed -e"s,\$${DEB_HOST_MULTIARCH},$(DEB_HOST_MULTIARCH),g" \
+ $${file} > $${file%%.in}; \
+ done
allpkg = $(shell dh_listpackages -s)
-# Build architecture-dependent files here.
-binary-arch: install
- dh_testdir
- dh_testroot
+override_dh_installchangelogs:
dh_installchangelogs -s
dh_installchangelogs -pmesa-common-dev
- dh_installdocs -s
- dh_installexamples -s
+override_dh_install:
# Also get rid of other files which aren't installed. Do not
# use -f to ensure we notice disappearing files:
set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done
@@ -238,27 +195,21 @@ binary-arch: install
endif
dh_install -s --fail-missing
- dh_installman -s
- dh_lintian -s
- dh_link -s
+
# Install bug control and script:
set -e; for p in $(allpkg); do \
install -d debian/$$p/usr/share/bug/$$p && \
install -m 644 debian/local/control debian/$$p/usr/share/bug/$$p && \
install -m 755 debian/local/script debian/$$p/usr/share/bug/$$p; \
done
- dh_strip
- dh_compress -s
- dh_fixperms -s
- dh_makeshlibs -s -- -c4
- dh_installdeb -s
- dh_shlibdeps -s
- dh_gencontrol -s
- dh_md5sums -s
+
+override_dh_builddeb:
dh_builddeb -s -- -Zxz
-binary: binary-indep binary-arch
-.PHONY: configs build clean binary-indep binary-arch binary install
+%:
+ dh $@ --with quilt,autoreconf \
+ --parallel \
+ --builddirectory=build/
# For maintainer use only, generate a tarball:
gentarball: SOURCE=mesa
commit 72dfece24e4564fe742bf7fa2e0d4f863b9745b3
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 23 11:52:58 2016 +0200
control: Bump libdrm-dev build-dep to 2.4.67 for freedreno.
diff --git a/debian/changelog b/debian/changelog
index 499a16b..9691f66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mesa (11.2.0~rc1-1) UNRELEASED; urgency=medium
* rules,control: Drop -dbg packages, we have -dbgsym now.
* rules, *.install.in, not-installed: Drop dri/-build prefix, we build
everything in one pass nowadays.
+ * control: Bump libdrm-dev build-dep to 2.4.67 for freedreno.
-- Timo Aaltonen <tjaalton@debian.org> Tue, 23 Feb 2016 09:48:38 +0200
diff --git a/debian/control b/debian/control
index 5623580..b098b95 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
debhelper (>= 9),
quilt (>= 0.40),
pkg-config,
- libdrm-dev (>= 2.4.65) [!hurd-any],
+ libdrm-dev (>= 2.4.67) [!hurd-any],
libx11-dev,
x11proto-gl-dev (>= 1.4.14),
libxxf86vm-dev,
commit a7888db1f2b3f3ac5fe0167c21f5a24c037b6eb4
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 23 11:08:39 2016 +0200
rules, *.install.in, not-installed: Drop dri/-build prefix, we build everything in one pass nowadays.
diff --git a/debian/changelog b/debian/changelog
index 35e24fb..499a16b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mesa (11.2.0~rc1-1) UNRELEASED; urgency=medium
* Drop upstreamed patches.
* libgl1-mesa-glx.symbols: Remove dropped symbols.
* rules,control: Drop -dbg packages, we have -dbgsym now.
+ * rules, *.install.in, not-installed: Drop dri/-build prefix, we build
+ everything in one pass nowadays.
-- Timo Aaltonen <tjaalton@debian.org> Tue, 23 Feb 2016 09:48:38 +0200
diff --git a/debian/libegl1-mesa-dev.install.in b/debian/libegl1-mesa-dev.install.in
index 51abf94..46c4b30 100644
--- a/debian/libegl1-mesa-dev.install.in
+++ b/debian/libegl1-mesa-dev.install.in
@@ -1,5 +1,5 @@
# This file gets tweaked in an os-specific fashion (see libegl1-mesa-dev.install.linux.in)
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.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
+usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so
+usr/include/EGL
+usr/include/KHR
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/egl.pc
diff --git a/debian/libegl1-mesa-dev.install.linux.in b/debian/libegl1-mesa-dev.install.linux.in
index 5ccc738..da59843 100644
--- a/debian/libegl1-mesa-dev.install.linux.in
+++ b/debian/libegl1-mesa-dev.install.linux.in
@@ -1,9 +1,9 @@
# OS-independent part (from libegl1-mesa-dev.install.in):
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.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
+usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so
+usr/include/EGL
+usr/include/KHR
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/egl.pc
# Wayland support, only on Linux:
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/wayland-egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/wayland-egl.pc
diff --git a/debian/libegl1-mesa.install.in b/debian/libegl1-mesa.install.in
index 57d1a21..685a0fc 100644
--- a/debian/libegl1-mesa.install.in
+++ b/debian/libegl1-mesa.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1* usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1*
diff --git a/debian/libgbm-dev.install.in b/debian/libgbm-dev.install.in
index 6f9e50a..ff5554f 100644
--- a/debian/libgbm-dev.install.in
+++ b/debian/libgbm-dev.install.in
@@ -1,3 +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
+usr/lib/${DEB_HOST_MULTIARCH}/libgbm.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gbm.pc
+usr/include/gbm.h
diff --git a/debian/libgbm1.install.in b/debian/libgbm1.install.in
index 44a4050..21647b3 100644
--- a/debian/libgbm1.install.in
+++ b/debian/libgbm1.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libgbm.so.1* usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/libgbm.so.1*
diff --git a/debian/libgl1-mesa-dev.install.in b/debian/libgl1-mesa-dev.install.in
index 1eebcc9..d915191 100644
--- a/debian/libgl1-mesa-dev.install.in
+++ b/debian/libgl1-mesa-dev.install.in
@@ -1,2 +1,2 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGL.so usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+usr/lib/${DEB_HOST_MULTIARCH}/libGL.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc
diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in
index 1d835ea..88e155a 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1 +1 @@
-dri/etc/drirc etc
+etc/drirc
diff --git a/debian/libgl1-mesa-glx.install.in b/debian/libgl1-mesa-glx.install.in
index f5ffd7a..d333e7b 100644
--- a/debian/libgl1-mesa-glx.install.in
+++ b/debian/libgl1-mesa-glx.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGL.so.* usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/libGL.so.*
diff --git a/debian/libglapi-mesa.install.in b/debian/libglapi-mesa.install.in
index e910c12..4b4c352 100644
--- a/debian/libglapi-mesa.install.in
+++ b/debian/libglapi-mesa.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so.0* usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so.0*
diff --git a/debian/libgles1-mesa-dev.install.in b/debian/libgles1-mesa-dev.install.in
index 0485b23..045c99d 100644
--- a/debian/libgles1-mesa-dev.install.in
+++ b/debian/libgles1-mesa-dev.install.in
@@ -1,3 +1,3 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv1_CM.so usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/include/GLES usr/include
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glesv1_cm.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+usr/lib/${DEB_HOST_MULTIARCH}/libGLESv1_CM.so
+usr/include/GLES
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glesv1_cm.pc
diff --git a/debian/libgles1-mesa.install.in b/debian/libgles1-mesa.install.in
index 143abd2..d38774b 100644
--- a/debian/libgles1-mesa.install.in
+++ b/debian/libgles1-mesa.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv1_CM.so.1* usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/libGLESv1_CM.so.1*
diff --git a/debian/libgles2-mesa-dev.install.in b/debian/libgles2-mesa-dev.install.in
index 21e269c..acb5b84 100644
--- a/debian/libgles2-mesa-dev.install.in
+++ b/debian/libgles2-mesa-dev.install.in
@@ -1,4 +1,4 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/include/GLES2 usr/include
-dri/usr/include/GLES3 usr/include
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glesv2.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so
+usr/include/GLES2
+usr/include/GLES3
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glesv2.pc
diff --git a/debian/libgles2-mesa.install.in b/debian/libgles2-mesa.install.in
index 5867818..0d23b83 100644
--- a/debian/libgles2-mesa.install.in
+++ b/debian/libgles2-mesa.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so.2* usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so.2*
diff --git a/debian/libosmesa6-dev.install.in b/debian/libosmesa6-dev.install.in
index 9796d26..bd7a488 100644
--- a/debian/libosmesa6-dev.install.in
+++ b/debian/libosmesa6-dev.install.in
@@ -1,3 +1,3 @@
-dri/usr/include/GL/osmesa.h usr/include/GL
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/osmesa.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+usr/include/GL/osmesa.h
+usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/osmesa.pc
diff --git a/debian/libosmesa6.install.in b/debian/libosmesa6.install.in
index e34327e..1ada4d5 100644
--- a/debian/libosmesa6.install.in
+++ b/debian/libosmesa6.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.* usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.*
diff --git a/debian/libwayland-egl1-mesa.install.in b/debian/libwayland-egl1-mesa.install.in
index 9adea44..e8a0f81 100644
--- a/debian/libwayland-egl1-mesa.install.in
+++ b/debian/libwayland-egl1-mesa.install.in
@@ -1,3 +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}
+usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1
+usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0.0
diff --git a/debian/libxatracker-dev.install.in b/debian/libxatracker-dev.install.in
index ff99489..cc6933c 100644
--- a/debian/libxatracker-dev.install.in
+++ b/debian/libxatracker-dev.install.in
@@ -1,5 +1,5 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libxatracker.so usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/xatracker.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
-dri/usr/include/xa_composite.h usr/include
-dri/usr/include/xa_context.h usr/include
-dri/usr/include/xa_tracker.h usr/include
+usr/lib/${DEB_HOST_MULTIARCH}/libxatracker.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/xatracker.pc
+usr/include/xa_composite.h
+usr/include/xa_context.h
+usr/include/xa_tracker.h
diff --git a/debian/libxatracker2.install.in b/debian/libxatracker2.install.in
index 469e7b0..883239a 100644
--- a/debian/libxatracker2.install.in
+++ b/debian/libxatracker2.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libxatracker.so.2* usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/libxatracker.so.2*
diff --git a/debian/mesa-common-dev.install.in b/debian/mesa-common-dev.install.in
index 51a4399b..93617ee 100644
--- a/debian/mesa-common-dev.install.in
+++ b/debian/mesa-common-dev.install.in
@@ -1,9 +1,9 @@
-dri/usr/include/GL/gl.h usr/include/GL
-dri/usr/include/GL/glcorearb.h usr/include/GL
-dri/usr/include/GL/glext.h usr/include/GL
-dri/usr/include/GL/gl_mangle.h usr/include/GL
-dri/usr/include/GL/glx.h usr/include/GL
-dri/usr/include/GL/glxext.h usr/include/GL
-dri/usr/include/GL/glx_mangle.h usr/include/GL
-dri/usr/include/GL/internal/dri_interface.h usr/include/GL/internal
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/dri.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/include/GL/gl.h
+usr/include/GL/glcorearb.h
+usr/include/GL/glext.h
+usr/include/GL/gl_mangle.h
+usr/include/GL/glx.h
+usr/include/GL/glxext.h
+usr/include/GL/glx_mangle.h
+usr/include/GL/internal/dri_interface.h
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/dri.pc
diff --git a/debian/mesa-opencl-icd.install.in b/debian/mesa-opencl-icd.install.in
index f8e8aef..278bd50 100644
--- a/debian/mesa-opencl-icd.install.in
+++ b/debian/mesa-opencl-icd.install.in
@@ -1,3 +1,3 @@
-dri/etc/OpenCL/vendors/mesa.icd etc/OpenCL/vendors
-dri/usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe/*.so usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libMesaOpenCL* usr/lib/${DEB_HOST_MULTIARCH}
+etc/OpenCL/vendors/mesa.icd
+usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe/*.so
+usr/lib/${DEB_HOST_MULTIARCH}/libMesaOpenCL*
diff --git a/debian/not-installed b/debian/not-installed
index 98e23cd..365fcd0 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -2,5 +2,5 @@
# Common list:
NOT_INSTALLED := \
- dri/usr/include/GL/wglext.h \
- dri/usr/lib/*/libglapi.so
+ usr/include/GL/wglext.h \
+ usr/lib/*/libglapi.so
diff --git a/debian/rules b/debian/rules
index 2c90bf9..0a6b62d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,12 +36,9 @@ endif
# large, use an external file:
include debian/not-installed
-# build the following configurations by default
-CONFIGS = dri
-
STAMP_DIR = debian/stamp
STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
-BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
+BUILD_STAMPS = $(STAMP)-build
QUILT_STAMPFN = $(STAMP_DIR)/patch
include /usr/share/quilt/quilt.make
@@ -118,7 +115,7 @@ confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
confflags_GLES = --enable-gles1 --enable-gles2
confflags_GALLIUM += --with-gallium-drivers="$(GALLIUM_DRIVERS)"
-confflags-dri = \
+confflags = \
--enable-dri \
--with-dri-drivers="$(DRI_DRIVERS)" \
--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
@@ -156,13 +153,13 @@ build: build-stamp
build-stamp: $(BUILD_STAMPS)
>$@
-$(STAMP)-build-%: configure
+$(STAMP)-build: configure
dh_testdir
mkdir -p $(DEB_BUILD_DIR)/$*
cd $(DEB_BUILD_DIR)/$* && \
- ../../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --sysconfdir=/etc \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--localstatedir=/var --disable-silent-rules \
@@ -176,10 +173,7 @@ install: build
dh_testroot
dh_prep
dh_installdirs
- set -e; for config in $(filter-out dri, $(CONFIGS)); do \
- $(MAKE) -C $(DEB_BUILD_DIR)/$$config DESTDIR=$(CURDIR)/debian/tmp install; \
- done
- $(MAKE) -C $(DEB_BUILD_DIR)/dri DESTDIR=$(CURDIR)/debian/tmp/dri install
+ $(MAKE) -C $(DEB_BUILD_DIR) DESTDIR=$(CURDIR)/debian/tmp install
for file in debian/*.in; \
do \
sed -e"s,\$${DEB_HOST_MULTIARCH},$(DEB_HOST_MULTIARCH),g" \
@@ -233,13 +227,13 @@ binary-arch: install
# Copy the hardlinked *_dri.so correctly.
install -m755 -d debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/
- mv debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so \
+ mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so \
debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/
ifneq ($(DEB_HOST_ARCH_OS), hurd)
# Copy the hardlinked vdpau drivers correctly.
install -m755 -d debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
- mv debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/libvdpau*.so* \
+ mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/libvdpau*.so* \
debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
endif
commit 8634e9c4418d46bbf9ad18fa3a1e14b12a97cb50
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 23 10:29:15 2016 +0200
rules,control: Drop -dbg packages, we have -dbgsym now.
diff --git a/debian/changelog b/debian/changelog
index 2a7517b..35e24fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-mesa (11.2~rc1-1) UNRELEASED; urgency=medium
+mesa (11.2.0~rc1-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* Drop upstreamed patches.
* libgl1-mesa-glx.symbols: Remove dropped symbols.
+ * rules,control: Drop -dbg packages, we have -dbgsym now.
-- Timo Aaltonen <tjaalton@debian.org> Tue, 23 Feb 2016 09:48:38 +0200
diff --git a/debian/control b/debian/control
index ace8ee5..5623580 100644
--- a/debian/control
+++ b/debian/control
@@ -62,23 +62,6 @@ Description: X acceleration library -- runtime
.
XA is intended to be used by the vmware driver for virtualized X acceleration.
-Package: libxatracker2-dbg
-Section: debug
-Priority: extra
-Architecture: linux-any
-Depends:
- libxatracker2 (= ${binary:Version}),
- ${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: X acceleration library -- debugging symbols
- This package contains the XA (X acceleration) library. It is used exclusively
- by the X server to do render, copy and video acceleration.
- .
- XA is intended to be used by the vmware driver for virtualized X acceleration.
- .
- This package contains the debugging symbols for the xatracker library.
-
Package: libxatracker-dev
Section: libdevel
Architecture: linux-any
@@ -110,23 +93,6 @@ Description: generic buffer management API -- runtime
.
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
@@ -164,21 +130,6 @@ Description: free implementation of the EGL API -- runtime
This package contains modules to interface with the existing system GLX or
DRI2 drivers to provide OpenGL via EGL.
-Package: libegl1-mesa-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libegl1-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.
- .
- This package contains the debugging symbols for the EGL library.
-
Package: libegl1-mesa-dev
Section: libdevel
Architecture: any
@@ -237,18 +188,6 @@ Multi-Arch: same
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
-Priority: extra
-Architecture: linux-any
-Depends:
- libwayland-egl1-mesa (= ${binary:Version}),
- ${misc:Depends},
-Multi-Arch: same
-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: libgles1-mesa
Section: libs
Architecture: any
@@ -269,24 +208,6 @@ Description: free implementation of the OpenGL|ES 1.x API -- runtime
.
OpenGL|ES 1.x provides an API for fixed-function hardware.
-Package: libgles1-mesa-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libgles1-mesa (= ${binary:Version}),
- ${misc:Depends},
-Multi-Arch: same
-Description: free implementation of the OpenGL|ES 1.x API -- debugging symbols
- OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
- embedded systems - including consoles, phones, appliances and vehicles.
- It contains a subset of OpenGL plus a number of extensions for the
- special needs of embedded systems.
- .
- OpenGL|ES 1.x provides an API for fixed-function hardware.
- .
- This package contains the debugging symbols for the libGLESv1_CM library.
-
Package: libgles1-mesa-dev
Section: libdevel
Architecture: any
@@ -327,25 +248,6 @@ Description: free implementation of the OpenGL|ES 2.x API -- runtime
OpenGL|ES 2.x provides an API for programmable hardware including vertex
and fragment shaders.
-Package: libgles2-mesa-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libgles2-mesa (= ${binary:Version}),
- ${misc:Depends},
-Multi-Arch: same
-Description: free implementation of the OpenGL|ES 2.x API -- debugging symbols
- OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
- embedded systems - including consoles, phones, appliances and vehicles.
- It contains a subset of OpenGL plus a number of extensions for the
- special needs of embedded systems.
- .
- OpenGL|ES 2.x provides an API for programmable hardware including vertex
- and fragment shaders.
- .
- This package contains the debugging symbols for the libGLESv2 library.
-
Package: libgles2-mesa-dev
Section: libdevel
Architecture: any
@@ -379,21 +281,6 @@ Description: free implementation of the GL API -- shared library
functions. It is intended to be mainly used by both the libgles1-mesa
and libgles2-mesa packages.
-Package: libglapi-mesa-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libglapi-mesa (= ${binary:Version}),
- ${misc:Depends},
-Multi-Arch: same
-Description: free implementation of the GL API -- debugging symbols
- The Mesa GL API module is responsible for dispatching all the gl*
- functions. It is intended to be mainly used by both the libgles1-mesa
- and libgles2-mesa packages.
- .
- This package contains debugging symbols for the GL API library.
-
Package: libgl1-mesa-glx
Section: libs
Architecture: any
@@ -426,28 +313,6 @@ Description: free implementation of the OpenGL API -- GLX runtime
This package does not include the modules themselves: these can be found
in the libgl1-mesa-dri package.
-Package: libgl1-mesa-glx-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libgl1-mesa-glx (= ${binary:Version}),
- ${misc:Depends},
-Multi-Arch: same
-Description: Debugging symbols for the Mesa GLX runtime
- 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-glx package.
- .
- This package contains debugging symbols for the GL library with GLX and DRI
- capabilities.
-
Package: libgl1-mesa-dri
Section: libs
Architecture: any
@@ -470,27 +335,6 @@ Description: free implementation of the OpenGL API -- DRI modules
For a complete description of Mesa, please look at the
libgl1-mesa-glx package.
-Package: libgl1-mesa-dri-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libgl1-mesa-dri (= ${binary:Version}),
- ${misc:Depends},
-Multi-Arch: same
-Description: Debugging symbols for the Mesa DRI modules
- 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 OpenGL library itself, only the DRI
- modules for accelerating direct rendering.
- .
- For a complete description of Mesa, please look at the
- libgl1-mesa-glx package.
- .
- This package contains debugging symbols for the DRI modules.
-
Package: libgl1-mesa-dev
Section: libdevel
Architecture: any
@@ -595,22 +439,6 @@ Description: Mesa VDPAU video acceleration drivers
.
This package enables support for VDPAU for some gallium drivers.
-Package: mesa-vdpau-drivers-dbg
-Section: debug
-Priority: extra
-Architecture: linux-any kfreebsd-any
-Depends:
- mesa-vdpau-drivers (= ${binary:Version}),
- ${misc:Depends},
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Description: Debugging symbols for the Mesa VDPAU video acceleration drivers
- These libraries provide the Video Decode and Presentation API for Unix.
- They provide accelerated video playback (incl. H.264) and video
- post-processing for the supported graphics cards.
- .
- This package contains the debugging symbols for the VDPAU drivers.
-
Package: mesa-opencl-icd
Section: libs
Architecture: amd64 i386 armhf
@@ -633,20 +461,4 @@ Description: free implementation of the OpenCL API -- ICD runtime
provides a standardized interface for computational analysis on graphical
processing units.
-Package: mesa-opencl-icd-dbg
-Section: debug
-Priority: extra
-Architecture: amd64 i386 armhf
-Depends:
- mesa-opencl-icd (= ${binary:Version}),
- ${misc:Depends},
-Multi-Arch: same
-Description: free implementation of the OpenCL API -- debugging symbols
- This package contains the mesa implementation of the OpenCL (Open Compute
- Language) library, which is intended for use with an ICD loader. OpenCL
- provides a standardized interface for computational analysis on graphical
- processing units.
- .
- This package contains the debugging symbols for the mesa OpenCL ICD library.
-
# vim: tw=0
diff --git a/debian/rules b/debian/rules
index 29eaed8..2c90bf9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -213,10 +213,6 @@ clean: unpatch
binary-indep: install
allpkg = $(shell dh_listpackages -s)
-dbgpkg = $(filter %-dbg, $(allpkg))
-otherpkg = $(filter-out %-dbg, $(allpkg))
-havedbgpkg = $(patsubst %-dbg,%,$(dbgpkg))
-nodbgpkg = $(filter-out $(havedbgpkg),$(otherpkg))
# Build architecture-dependent files here.
binary-arch: install
@@ -257,12 +253,7 @@ binary-arch: install
install -m 644 debian/local/control debian/$$p/usr/share/bug/$$p && \
install -m 755 debian/local/script debian/$$p/usr/share/bug/$$p; \
done
- set -e; for p in $(havedbgpkg); do \
- dh_strip -p$${p} --dbg-package=$${p}-dbg; \
- done
- # dh_strip -s --remaining-packages doesn't work with resumed
- # builds (see changelog for mesa 7.10-1):
- dh_strip $(foreach p,$(nodbgpkg),-p$(p))
+ dh_strip
dh_compress -s
dh_fixperms -s
dh_makeshlibs -s -- -c4
commit 6b537a7fcb1ab47727c3fa096e604d2a21cea454
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 23 09:59:49 2016 +0200
libgl1-mesa-glx.symbols: Remove dropped symbols.
diff --git a/debian/changelog b/debian/changelog
index 2459a77..2a7517b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (11.2~rc1-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* Drop upstreamed patches.
+ * libgl1-mesa-glx.symbols: Remove dropped symbols.
-- Timo Aaltonen <tjaalton@debian.org> Tue, 23 Feb 2016 09:48:38 +0200
diff --git a/debian/libgl1-mesa-glx.symbols b/debian/libgl1-mesa-glx.symbols
index 8b80b6c..b2118e9 100644
--- a/debian/libgl1-mesa-glx.symbols
+++ b/debian/libgl1-mesa-glx.symbols
@@ -309,9 +309,7 @@ libGL.so.1 libgl1-mesa-glx | libgl1
glFramebufferTexture3D@Base 0
glFramebufferTexture3DEXT@Base 0
glFramebufferTexture@Base 0
- glFramebufferTextureARB@Base 0
glFramebufferTextureLayer@Base 0
- glFramebufferTextureLayerARB@Base 0
glFramebufferTextureLayerEXT@Base 0
glFrontFace@Base 0
glFrustum@Base 0
@@ -753,7 +751,6 @@ libGL.so.1 libgl1-mesa-glx | libgl1
glProgramLocalParameter4fARB@Base 0
glProgramLocalParameter4fvARB@Base 0
glProgramParameteri@Base 0
- glProgramParameteriARB@Base 0
glProgramStringARB@Base 0
glProvokingVertex@Base 0
glProvokingVertexEXT@Base 0
commit 634520bc28994a877265fd230911a73fd59fcebc
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 23 09:58:27 2016 +0200
Drop upstreamed patches.
diff --git a/debian/changelog b/debian/changelog
index b1aead3..2459a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mesa (11.2~rc1-1) UNRELEASED; urgency=medium
* New upstream release candidate.
+ * Drop upstreamed patches.
-- Timo Aaltonen <tjaalton@debian.org> Tue, 23 Feb 2016 09:48:38 +0200
diff --git a/debian/patches/docs-Replace-sourceforge-logo-with-a-text-link.patch b/debian/patches/docs-Replace-sourceforge-logo-with-a-text-link.patch
deleted file mode 100644
index 9078eaf..0000000
--- a/debian/patches/docs-Replace-sourceforge-logo-with-a-text-link.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 65ba65b73e4758fc16e79b1d135b51f7f34bbb0a Mon Sep 17 00:00:00 2001
-From: Andreas Boll <andreas.boll.dev@gmail.com>
-Date: Thu, 26 Nov 2015 20:06:07 +0100
-Subject: [PATCH] docs: Replace sourceforge logo with a text link
-
-Fixes the following Lintian (Debian package checker) error:
-
-privacy-breach-logo
-
- usr/share/doc/mesa-common-dev/contents.html
- (http://sourceforge.net/sflogo.php?group_id=3&type=1)
- usr/share/doc/mesa-common-dev/thanks.html
- (http://sourceforge.net/sflogo.php?group_id=3&type=1)
-
-The extended description of this tag is:
-
- This package creates a potential privacy breach by fetching a logo
-at runtime.
-
- Before using a local copy you should check that the logo is suitable
-for main. You can get help with determining this by posting a link to
-the logo and a copy of, or a link to, the logo copyright and license
-information to the debian-legal mailing list.
-
- Please replace any scripts, images, or other remote resources with
-non-remote resources. It is preferable to replace them with text and
-links but local copies of the remote resources are also acceptable as
-long as they don't also make calls to remote services. Please ensure
-that the remote resources are suitable for Debian main before making
-local copies of them.
-
- Severity: serious, Certainty: possible
-
- Check: files, Type: binary, udeb
-
-Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
----
- docs/contents.html | 3 +--
- docs/thanks.html | 4 +---
- 2 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/docs/contents.html b/docs/contents.html
-index 6612cbe..5e0f514 100644
---- a/docs/contents.html
-+++ b/docs/contents.html
-@@ -96,8 +96,7 @@
- <br>
- <blockquote>
- <a href="http://sourceforge.net";
--target="_parent"><img src="http://sourceforge.net/sflogo.php?group_id=3&type=1";
--width="88" height="31" align="bottom" alt="Sourceforge.net" border="0"></a>
-+target="_parent">sourceforge.net</a>
- </blockquote>
-
- </body>
-diff --git a/docs/thanks.html b/docs/thanks.html
-index 29a41e4..685cb31 100644
---- a/docs/thanks.html
-+++ b/docs/thanks.html
-@@ -42,9 +42,7 @@ Tungsten Graphics, Inc. have supported the ongoing development of Mesa.
- <li>The
- <a href="http://www.mesa3d.org";>Mesa</a>
- website is hosted by
--<a href="http://sourceforge.net";>
--<img src="http://sourceforge.net/sflogo.php?group_id=3&type=1";
--width="88" height="31" align="bottom" alt="Sourceforge.net" border="0"></a>
-+<a href="http://sourceforge.net";>sourceforge.net</a>.
- <br>
- <br>
-
---
-2.1.4
-
diff --git a/debian/patches/glapi-Build-glapi_gentable.c-only-on-Darwin.patch b/debian/patches/glapi-Build-glapi_gentable.c-only-on-Darwin.patch
deleted file mode 100644
index 13c78cb..0000000
--- a/debian/patches/glapi-Build-glapi_gentable.c-only-on-Darwin.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From d1b35fae4b9acfc9a700f59047d9c4142648d93b Mon Sep 17 00:00:00 2001
-From: Andreas Boll <andreas.boll.dev@gmail.com>
-Date: Wed, 9 Dec 2015 13:41:22 +0100
-Subject: [PATCH] glapi: Build glapi_gentable.c only on Darwin
-
-Removes the public symbol _glapi_create_table_from_handle from
-libGL.so.1 on all platforms except Darwin.
-
-Since the symbol is not used on other platforms it makes sense to
-build glapi_gentable.c only on Darwin.
-
-A little bit of history:
-
-_glapi_create_table_from_handle was introduced in
Reply to: