Created
August 17, 2011 14:25
-
-
Save anisse/1151619 to your computer and use it in GitHub Desktop.
Mesa 7.11 squeeze backport
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From d4d70b3eb3779255836695afa5cedf49d21b1c48 Mon Sep 17 00:00:00 2001 | |
| From: Anisse Astier <anisse@astier.eu> | |
| Date: Wed, 17 Aug 2011 11:35:19 +0200 | |
| Subject: [PATCH 1/8] Rebuild for squeeze-backports | |
| --- | |
| debian/changelog | 6 ++++++ | |
| 1 file changed, 6 insertions(+) | |
| diff --git a/debian/changelog b/debian/changelog | |
| index 3a0904b..61a53d3 100644 | |
| --- a/debian/changelog | |
| +++ b/debian/changelog | |
| @@ -1,3 +1,9 @@ | |
| +mesa (7.11.2~bpo-1+1) UNRELEASED; urgency=low | |
| + | |
| + * Rebuild for squeeze-backports | |
| + | |
| + -- Anisse Astier <anisse@astier.eu> Fri, 30 Mar 2012 12:08:10 +0200 | |
| + | |
| mesa (7.11.2-1) unstable; urgency=low | |
| * New upstream release: | |
| -- | |
| 1.7.9.4 | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From 2e4a94d4a287418dc51e1acbb327f54a61e2d599 Mon Sep 17 00:00:00 2001 | |
| From: Anisse Astier <anisse@astier.eu> | |
| Date: Wed, 17 Aug 2011 11:35:45 +0200 | |
| Subject: [PATCH 2/8] Drop multi-arch support | |
| --- | |
| debian/changelog | 6 ++++++ | |
| debian/control | 38 +------------------------------------- | |
| debian/not-installed | 24 ++++++++++++------------ | |
| debian/rules | 12 ++++++------ | |
| 4 files changed, 25 insertions(+), 55 deletions(-) | |
| diff --git a/debian/changelog b/debian/changelog | |
| index 61a53d3..4a839e6 100644 | |
| --- a/debian/changelog | |
| +++ b/debian/changelog | |
| @@ -1,6 +1,12 @@ | |
| mesa (7.11.2~bpo-1+1) UNRELEASED; urgency=low | |
| * Rebuild for squeeze-backports | |
| + * Drop multiarch support: | |
| + - Remove DEB_HOST_MULTIARCH from debian/rules. | |
| + - Keep the .install.in → .install generation (to ease further | |
| + updates), making it just delete “/$(DEB_HOST_MULTIARCH)”. | |
| + - Remove Multi-Arch and Pre-Depends fields. | |
| + - Revert debhelper version bump accordingly. | |
| -- Anisse Astier <anisse@astier.eu> Fri, 30 Mar 2012 12:08:10 +0200 | |
| diff --git a/debian/control b/debian/control | |
| index f58696c..7aaff94 100644 | |
| --- a/debian/control | |
| +++ b/debian/control | |
| @@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org> | |
| Uploaders: Cyril Brulebois <kibi@debian.org> | |
| Standards-Version: 3.8.4 | |
| Build-Depends: | |
| - debhelper (>= 8.1.3), | |
| + debhelper (>= 7.2.7), | |
| quilt (>= 0.40), | |
| pkg-config, | |
| libdrm-dev (>= 2.4.24) [!hurd-any], | |
| @@ -47,8 +47,6 @@ 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 | |
| @@ -73,7 +71,6 @@ 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 | |
| @@ -99,8 +96,6 @@ 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 | |
| @@ -198,8 +193,6 @@ Recommends: libegl1-mesa-drivers | |
| Provides: libegl1-x11 | |
| Conflicts: libegl1-x11 | |
| Replaces: libegl1-x11 | |
| -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 | |
| @@ -216,7 +209,6 @@ Architecture: linux-any kfreebsd-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 | |
| @@ -255,8 +247,6 @@ Depends: | |
| ${misc:Depends}, | |
| libegl1-mesa (= ${binary:Version}), | |
| libglapi-mesa (= ${binary:Version}), | |
| -Pre-Depends: ${misc:Pre-Depends} | |
| -Multi-Arch: same | |
| Description: free implementation of the EGL API -- hardware drivers | |
| This package contains the EGL native platform graphics interface library. | |
| EGL provides a platform-agnostic mechanism for creating rendering surfaces | |
| @@ -272,7 +262,6 @@ Architecture: linux-any kfreebsd-any | |
| Depends: | |
| libegl1-mesa-drivers (= ${binary:Version}), | |
| ${misc:Depends}, | |
| -Multi-Arch: same | |
| Description: free implementation of the EGL API -- driver debugging symbols | |
| This package contains the EGL native platform graphics interface library. | |
| EGL provides a platform-agnostic mechanism for creating rendering surfaces | |
| @@ -290,8 +279,6 @@ Depends: | |
| Provides: libopenvg1 | |
| Conflicts: libopenvg1 | |
| Replaces: libopenvg1 | |
| -Pre-Depends: ${misc:Pre-Depends} | |
| -Multi-Arch: same | |
| Description: free implementation of the OpenVG API -- runtime | |
| This package contains the mesa implementation of the OpenVG 2D acceleration | |
| library. OpenVG provides a device independent and vendor-neutral interface | |
| @@ -306,7 +293,6 @@ Architecture: linux-any kfreebsd-any | |
| Depends: | |
| libopenvg1-mesa (= ${binary:Version}), | |
| ${misc:Depends}, | |
| -Multi-Arch: same | |
| Description: free implementation of the OpenVG API -- debugging symbols | |
| This package contains the mesa implementation of the OpenVG 2D acceleration | |
| library. OpenVG provides a device independent and vendor-neutral interface | |
| @@ -343,8 +329,6 @@ Depends: | |
| Provides: libgles1 | |
| Conflicts: libgles1 | |
| Replaces: libgles1 | |
| -Pre-Depends: ${misc:Pre-Depends} | |
| -Multi-Arch: same | |
| Description: free implementation of the OpenGL|ES 1.x API -- runtime | |
| OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on | |
| embedded systems - including consoles, phones, appliances and vehicles. | |
| @@ -360,7 +344,6 @@ Architecture: linux-any kfreebsd-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. | |
| @@ -399,8 +382,6 @@ Depends: | |
| Provides: libgles2 | |
| Conflicts: libgles2 | |
| Replaces: libgles2 | |
| -Pre-Depends: ${misc:Pre-Depends} | |
| -Multi-Arch: same | |
| Description: free implementation of the OpenGL|ES 2.x API -- runtime | |
| OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on | |
| embedded systems - including consoles, phones, appliances and vehicles. | |
| @@ -417,7 +398,6 @@ Architecture: linux-any kfreebsd-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. | |
| @@ -454,8 +434,6 @@ Architecture: any | |
| Depends: | |
| ${shlibs:Depends}, | |
| ${misc:Depends}, | |
| -Pre-Depends: ${misc:Pre-Depends} | |
| -Multi-Arch: same | |
| Description: free implementation of the GL API -- shared library | |
| 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 | |
| @@ -468,7 +446,6 @@ 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 | |
| @@ -490,8 +467,6 @@ Provides: libgl1 | |
| Breaks: | |
| libgl1-nvidia-alternatives (<= 275.09.07-1), | |
| fglrx-glx (<< 1:11-6-1), | |
| -Pre-Depends: ${misc:Pre-Depends} | |
| -Multi-Arch: same | |
| Description: free implementation of the OpenGL API -- 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 | |
| @@ -510,7 +485,6 @@ 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 | |
| @@ -562,7 +536,6 @@ Breaks: | |
| libgl1-mesa-glx (<< 7.10.2-4), | |
| libgl1-mesa-glx-no-multiarch, | |
| libgl1-mesa-dri-experimental (<< 7.11.1), | |
| -Multi-Arch: same | |
| Description: free implementation of the OpenGL API -- 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 | |
| @@ -584,7 +557,6 @@ Depends: | |
| libgl1-mesa-dri (= ${binary:Version}), | |
| ${misc:Depends}, | |
| Replaces: libgl1-mesa-dri-experimental-dbg (<< 7.11.1) | |
| -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 | |
| @@ -610,7 +582,6 @@ Breaks: | |
| xserver-xorg-core-no-multiarch, | |
| libgl1-mesa-glx (<< 7.11.1), | |
| libgl1-mesa-glx-no-multiarch, | |
| -Multi-Arch: same | |
| Description: free implementation of the OpenGL API -- Extra 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 | |
| @@ -631,7 +602,6 @@ Architecture: linux-any | |
| Depends: | |
| libgl1-mesa-dri-experimental (= ${binary:Version}), | |
| ${misc:Depends}, | |
| -Multi-Arch: same | |
| Description: Debugging symbols for the experimental 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 | |
| @@ -686,8 +656,6 @@ Depends: | |
| ${shlibs:Depends}, | |
| ${misc:Depends}, | |
| Replaces: libgl1-mesa-swx11 (<< 6.5.2) | |
| -Pre-Depends: ${misc:Pre-Depends} | |
| -Multi-Arch: same | |
| Description: Mesa Off-screen rendering extension | |
| OSmesa is a Mesa extension that allows programs to render to an | |
| off-screen buffer using the OpenGL API without having to create a | |
| @@ -721,8 +689,6 @@ Depends: | |
| Provides: libglu1 | |
| Conflicts: mesag3 (<< 5.0.0-1), xlibmesa3, libglu1 | |
| Replaces: libglu1 | |
| -Pre-Depends: ${misc:Pre-Depends} | |
| -Multi-Arch: same | |
| Description: Mesa OpenGL utility library (GLU) | |
| GLU offers simple interfaces for building mipmaps; checking for the | |
| presence of extensions in the OpenGL (or other libraries which follow | |
| @@ -760,8 +726,6 @@ Depends: | |
| ${shlibs:Depends}, | |
| ${misc:Depends}, | |
| Provides: libglw1 | |
| -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 | |
| diff --git a/debian/not-installed b/debian/not-installed | |
| index 44b5821..ff00cc3 100644 | |
| --- a/debian/not-installed | |
| +++ b/debian/not-installed | |
| @@ -10,8 +10,8 @@ NOT_INSTALLED := \ | |
| dri/usr/include/GL/vms_x_fix.h \ | |
| dri/usr/include/GL/wglext.h \ | |
| dri/usr/include/GL/wmesa.h \ | |
| - dri/usr/lib/*/libGL.so \ | |
| - dri/usr/lib/*/pkgconfig/gl.pc \ | |
| + dri/usr/lib/libGL.so \ | |
| + dri/usr/lib/pkgconfig/gl.pc \ | |
| usr/include/GL/glext.h \ | |
| usr/include/GL/glfbdev.h \ | |
| usr/include/GL/gl.h \ | |
| @@ -28,16 +28,16 @@ NOT_INSTALLED := \ | |
| # Architecture-specific additional files: | |
| NOT_INSTALLED_i386 = \ | |
| - usr/lib/*/i686/cmov/libGL.so \ | |
| - usr/lib/*/i686/cmov/libGLU.so \ | |
| - usr/lib/*/i686/cmov/libGLU.so.1 \ | |
| - usr/lib/*/i686/cmov/libGLU.so.1.* \ | |
| - usr/lib/*/i686/cmov/libGLw.so \ | |
| - usr/lib/*/i686/cmov/libGLw.so.1 \ | |
| - usr/lib/*/i686/cmov/libGLw.so.1.* \ | |
| - usr/lib/*/i686/cmov/pkgconfig/glw.pc \ | |
| - usr/lib/*/i686/cmov/pkgconfig/glu.pc \ | |
| - usr/lib/*/i686/cmov/pkgconfig/gl.pc | |
| + usr/lib/i686/cmov/libGL.so \ | |
| + usr/lib/i686/cmov/libGLU.so \ | |
| + usr/lib/i686/cmov/libGLU.so.1 \ | |
| + usr/lib/i686/cmov/libGLU.so.1.* \ | |
| + usr/lib/i686/cmov/libGLw.so \ | |
| + usr/lib/i686/cmov/libGLw.so.1 \ | |
| + usr/lib/i686/cmov/libGLw.so.1.* \ | |
| + usr/lib/i686/cmov/pkgconfig/glw.pc \ | |
| + usr/lib/i686/cmov/pkgconfig/glu.pc \ | |
| + usr/lib/i686/cmov/pkgconfig/gl.pc | |
| # Same for linux, kfreebsd, and hurd on i386: | |
| NOT_INSTALLED_kfreebsd-i386 = $(NOT_INSTALLED_i386) | |
| diff --git a/debian/rules b/debian/rules | |
| index 639167e..ec1e9b8 100755 | |
| --- a/debian/rules | |
| +++ b/debian/rules | |
| @@ -110,8 +110,8 @@ endif | |
| confflags-dri = \ | |
| --with-driver=dri \ | |
| --with-dri-drivers="$(DRI_DRIVERS)" \ | |
| - --with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \ | |
| - --with-dri-searchpath='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \ | |
| + --with-dri-driverdir=/usr/lib/dri \ | |
| + --with-dri-searchpath='/usr/lib/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \ | |
| --enable-glx-tls \ | |
| --enable-shared-glapi \ | |
| --enable-texture-float \ | |
| @@ -196,7 +196,7 @@ confflags-swx11+glu-i386-i686 = \ | |
| --disable-glut \ | |
| --disable-egl \ | |
| --enable-motif \ | |
| - --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \ | |
| + --libdir=/usr/lib/i686/cmov \ | |
| CFLAGS="$(CFLAGS) -march=i686" \ | |
| CXXFLAGS="$(CXXFLAGS) -march=i686" | |
| @@ -246,7 +246,7 @@ install: build | |
| $(MAKE) -C $(DEB_BUILD_DIR)/dri DESTDIR=$(CURDIR)/debian/tmp/dri install | |
| for file in debian/*.in; \ | |
| do \ | |
| - sed -e"s,\$${DEB_HOST_MULTIARCH},$(DEB_HOST_MULTIARCH),g" \ | |
| + sed -e"s,\$${DEB_HOST_MULTIARCH},,g" \ | |
| $${file} > $${file%%.in}; \ | |
| done | |
| @@ -288,11 +288,11 @@ binary-arch: install | |
| # Classic DRI and Gallium DRI are mixed up together here | |
| # Remove the whole tree to avoid false-positives in --list-missing, and | |
| # install the right files manually. | |
| - rm -r debian/tmp/dri/usr/lib/$(DEB_HOST_MULTIARCH)/dri | |
| + rm -r debian/tmp/dri/usr/lib/dri | |
| # Move nouveau_vieux alongside nouveau to install in dri-experimental package | |
| ifneq (,$(filter nouveau,$(DRI_DRIVERS))) | |
| - mv build/dri/$(DEB_HOST_MULTIARCH)/nouveau_vieux_dri.so build/dri/$(DEB_HOST_MULTIARCH)/gallium/ | |
| + mv build/dri/nouveau_vieux_dri.so build/dri/gallium/ | |
| endif | |
| # Also get rid of other files which aren't installed. Do not | |
| -- | |
| 1.7.9.4 | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From c54701549f2f78ba0197a57dd243ec1a5e00f653 Mon Sep 17 00:00:00 2001 | |
| From: Cyril Brulebois <kibi@debian.org> | |
| Date: Sun, 10 Jul 2011 01:16:58 +0200 | |
| Subject: [PATCH 3/8] Support upgrades from squeeze and to wheezy. | |
| --- | |
| debian/changelog | 4 ++++ | |
| debian/control | 18 +++--------------- | |
| 2 files changed, 7 insertions(+), 15 deletions(-) | |
| diff --git a/debian/changelog b/debian/changelog | |
| index 4a839e6..3984743 100644 | |
| --- a/debian/changelog | |
| +++ b/debian/changelog | |
| @@ -7,6 +7,10 @@ mesa (7.11.2~bpo-1+1) UNRELEASED; urgency=low | |
| updates), making it just delete “/$(DEB_HOST_MULTIARCH)”. | |
| - Remove Multi-Arch and Pre-Depends fields. | |
| - Revert debhelper version bump accordingly. | |
| + * Support upgrades from squeeze and to wheezy: | |
| + - Remove all Breaks, only needed when multiarch support got added. | |
| + - Add Provides: libgl1-mesa-*-no-multiarch to handle upgrades to | |
| + wheezy (which has multiarch support). | |
| -- Anisse Astier <anisse@astier.eu> Fri, 30 Mar 2012 12:08:10 +0200 | |
| diff --git a/debian/control b/debian/control | |
| index 7aaff94..ae0d12f 100644 | |
| --- a/debian/control | |
| +++ b/debian/control | |
| @@ -463,10 +463,7 @@ Depends: | |
| Recommends: libgl1-mesa-dri (>= 7.2) | |
| Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0) | |
| Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0) | |
| -Provides: libgl1 | |
| -Breaks: | |
| - libgl1-nvidia-alternatives (<= 275.09.07-1), | |
| - fglrx-glx (<< 1:11-6-1), | |
| +Provides: libgl1, libgl1-mesa-glx-no-multiarch | |
| Description: free implementation of the OpenGL API -- 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 | |
| @@ -530,12 +527,7 @@ Depends: | |
| Suggests: libglide3 | |
| Conflicts: xlibmesa-dri (<< 1:7.0.0) | |
| Replaces: xlibmesa-dri (<< 1:7.0.0), libgl1-mesa-dri-experimental (<< 7.11.1) | |
| -Breaks: | |
| - xserver-xorg-core (<< 2:1.10.2-2), | |
| - xserver-xorg-core-no-multiarch, | |
| - libgl1-mesa-glx (<< 7.10.2-4), | |
| - libgl1-mesa-glx-no-multiarch, | |
| - libgl1-mesa-dri-experimental (<< 7.11.1), | |
| +Provides: libgl1-mesa-dri-no-multiarch | |
| Description: free implementation of the OpenGL API -- 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 | |
| @@ -577,11 +569,7 @@ Depends: | |
| ${shlibs:Depends}, | |
| libgl1-mesa-dri (>= 7.11.1) [linux-any], | |
| ${misc:Depends}, | |
| -Breaks: | |
| - xserver-xorg-core (<< 2:1.10.2-2), | |
| - xserver-xorg-core-no-multiarch, | |
| - libgl1-mesa-glx (<< 7.11.1), | |
| - libgl1-mesa-glx-no-multiarch, | |
| +Provides: libgl1-mesa-dri-no-multiarch | |
| Description: free implementation of the OpenGL API -- Extra 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 | |
| -- | |
| 1.7.9.4 | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From faafd9d2a242ebff4d9183bdc3c474cc980fbba8 Mon Sep 17 00:00:00 2001 | |
| From: Cyril Brulebois <kibi@debian.org> | |
| Date: Sun, 10 Jul 2011 01:17:22 +0200 | |
| Subject: [PATCH 4/8] =?UTF-8?q?Fix=20path=20for=20those=20special=20DRI=20fi?= | |
| =?UTF-8?q?les=E2=80=A6?= | |
| MIME-Version: 1.0 | |
| Content-Type: text/plain; charset=UTF-8 | |
| Content-Transfer-Encoding: 8bit | |
| --- | |
| debian/changelog | 2 ++ | |
| debian/libgl1-mesa-dri-experimental.install.in | 3 ++- | |
| debian/libgl1-mesa-dri.install.in | 2 +- | |
| debian/libgl1-mesa-dri.install.linux.in | 8 ++++---- | |
| debian/rules | 2 +- | |
| 5 files changed, 10 insertions(+), 7 deletions(-) | |
| diff --git a/debian/changelog b/debian/changelog | |
| index 3984743..59ad939 100644 | |
| --- a/debian/changelog | |
| +++ b/debian/changelog | |
| @@ -5,6 +5,8 @@ mesa (7.11.2~bpo-1+1) UNRELEASED; urgency=low | |
| - Remove DEB_HOST_MULTIARCH from debian/rules. | |
| - Keep the .install.in → .install generation (to ease further | |
| updates), making it just delete “/$(DEB_HOST_MULTIARCH)”. | |
| + - Replace DEB_HOST_MULTIARCH with lib for the DRI-related entries, | |
| + those are special… (debian/libgl1-mesa-dri.install*.in) | |
| - Remove Multi-Arch and Pre-Depends fields. | |
| - Revert debhelper version bump accordingly. | |
| * Support upgrades from squeeze and to wheezy: | |
| diff --git a/debian/libgl1-mesa-dri-experimental.install.in b/debian/libgl1-mesa-dri-experimental.install.in | |
| index e36377f..e0a676f 100644 | |
| --- a/debian/libgl1-mesa-dri-experimental.install.in | |
| +++ b/debian/libgl1-mesa-dri-experimental.install.in | |
| @@ -1 +1,2 @@ | |
| -build/dri/${DEB_HOST_MULTIARCH}/gallium/swrastg_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| +build/dri/gallium/swrastg_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| + | |
| diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in | |
| index 4a66df4..55b9ab3 100644 | |
| --- a/debian/libgl1-mesa-dri.install.in | |
| +++ b/debian/libgl1-mesa-dri.install.in | |
| @@ -1,2 +1,2 @@ | |
| # If this part gets modified, make sure to update .install.$os as well: | |
| -build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| +build/dri/lib/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| diff --git a/debian/libgl1-mesa-dri.install.linux.in b/debian/libgl1-mesa-dri.install.linux.in | |
| index 702d4c3..6b7fa05 100644 | |
| --- a/debian/libgl1-mesa-dri.install.linux.in | |
| +++ b/debian/libgl1-mesa-dri.install.linux.in | |
| @@ -1,7 +1,7 @@ | |
| # Keep this part in sync with libgl1-mesa-dri.install: | |
| -build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| +build/dri/lib/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| # This part is Linux-specific: | |
| -build/dri/${DEB_HOST_MULTIARCH}/gallium/r600_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| -build/dri/${DEB_HOST_MULTIARCH}/gallium/nouveau_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| -build/dri/${DEB_HOST_MULTIARCH}/gallium/nouveau_vieux_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| +build/dri/gallium/r600_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| +build/dri/gallium/nouveau_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| +build/dri/gallium/nouveau_vieux_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| diff --git a/debian/rules b/debian/rules | |
| index ec1e9b8..5e78ef2 100755 | |
| --- a/debian/rules | |
| +++ b/debian/rules | |
| @@ -292,7 +292,7 @@ binary-arch: install | |
| # Move nouveau_vieux alongside nouveau to install in dri-experimental package | |
| ifneq (,$(filter nouveau,$(DRI_DRIVERS))) | |
| - mv build/dri/nouveau_vieux_dri.so build/dri/gallium/ | |
| + mv build/dri/lib/nouveau_vieux_dri.so build/dri/lib/gallium/ | |
| endif | |
| # Also get rid of other files which aren't installed. Do not | |
| -- | |
| 1.7.9.4 | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From a0f3f4e7d32905ed5f29a62b6aab90f9c21e9478 Mon Sep 17 00:00:00 2001 | |
| From: Anisse Astier <anisse@astier.eu> | |
| Date: Wed, 17 Aug 2011 11:53:21 +0200 | |
| Subject: [PATCH 5/8] Revert "Merge branch 'wayland-support' into | |
| debian-experimental" | |
| This reverts commit 8f26717d8cf92f6285e0723b56be7faa02003b84, reversing | |
| changes made to a73cb252bf9bebc193300145400053052e65c592. | |
| --- | |
| debian/changelog | 5 ----- | |
| debian/control | 1 - | |
| debian/libegl1-mesa-dev.install.in | 2 -- | |
| debian/libegl1-mesa-drivers.install.in | 2 -- | |
| debian/libegl1-mesa.symbols | 1 - | |
| 5 files changed, 11 deletions(-) | |
| diff --git a/debian/changelog b/debian/changelog | |
| index 59ad939..443ad2a 100644 | |
| --- a/debian/changelog | |
| +++ b/debian/changelog | |
| @@ -169,11 +169,6 @@ mesa (7.11~0-1) experimental; urgency=low | |
| platforms accordingly. Disable it explicitly on other platforms. | |
| * Stop building i915g at all, it's apparently never going to be a | |
| suitable replacement for i915c. | |
| - * Add libwayland-dev build-dep. | |
| - * Add wayland to EGL_DISPLAYS on Linux. | |
| - * Ship wayland-egl.pc and libwayland-egl.so in libegl1-mesa-dev; and ship | |
| - libwayland-egl.so.1* in libegl1-mesa-drivers. | |
| - * Update libegl1-mesa.symbols with new wl_drm_interface symbol. | |
| -- Cyril Brulebois <kibi@debian.org> Sun, 19 Jun 2011 19:01:52 +0200 | |
| diff --git a/debian/control b/debian/control | |
| index ae0d12f..b749713 100644 | |
| --- a/debian/control | |
| +++ b/debian/control | |
| @@ -31,7 +31,6 @@ Build-Depends: | |
| flex, | |
| bison, | |
| llvm-2.9-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386], | |
| -# 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 3f3094f..2b04928 100644 | |
| --- a/debian/libegl1-mesa-dev.install.in | |
| +++ b/debian/libegl1-mesa-dev.install.in | |
| @@ -1,6 +1,4 @@ | |
| 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/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 | |
| diff --git a/debian/libegl1-mesa-drivers.install.in b/debian/libegl1-mesa-drivers.install.in | |
| index c226c5e..c26fc67 100644 | |
| --- a/debian/libegl1-mesa-drivers.install.in | |
| +++ b/debian/libegl1-mesa-drivers.install.in | |
| @@ -1,3 +1 @@ | |
| dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.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} | |
| diff --git a/debian/libegl1-mesa.symbols b/debian/libegl1-mesa.symbols | |
| index c229766..7e61524 100644 | |
| --- a/debian/libegl1-mesa.symbols | |
| +++ b/debian/libegl1-mesa.symbols | |
| @@ -62,4 +62,3 @@ 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 | |
| -- | |
| 1.7.9.4 | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From 51d7a3b963209332d42c45b52b0e29dd84311f52 Mon Sep 17 00:00:00 2001 | |
| From: Anisse Astier <anisse@astier.eu> | |
| Date: Wed, 17 Aug 2011 15:47:30 +0200 | |
| Subject: [PATCH 6/8] Used LLVM 2.7 instead of 2.9 | |
| --- | |
| debian/control | 2 +- | |
| debian/patches/13-llvm-config-pick-a-version.diff | 2 +- | |
| 2 files changed, 2 insertions(+), 2 deletions(-) | |
| diff --git a/debian/control b/debian/control | |
| index b749713..dd807cb 100644 | |
| --- a/debian/control | |
| +++ b/debian/control | |
| @@ -30,7 +30,7 @@ Build-Depends: | |
| libudev-dev [linux-any], | |
| flex, | |
| bison, | |
| - llvm-2.9-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386], | |
| + llvm-2.7-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386], | |
| 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/patches/13-llvm-config-pick-a-version.diff b/debian/patches/13-llvm-config-pick-a-version.diff | |
| index 0007d48..0a55fbb 100644 | |
| --- a/debian/patches/13-llvm-config-pick-a-version.diff | |
| +++ b/debian/patches/13-llvm-config-pick-a-version.diff | |
| @@ -10,7 +10,7 @@ Index: mesa/configure.ac | |
| fi | |
| if test "x$enable_gallium_llvm" = xyes; then | |
| - AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no]) | |
| -+ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-2.9], [no]) | |
| ++ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-2.7], [no]) | |
| if test "x$LLVM_CONFIG" != xno; then | |
| LLVM_VERSION=`$LLVM_CONFIG --version` | |
| -- | |
| 1.7.9.4 | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From c44f5a0904dc807c3e0108605e89d21b2d11f9d8 Mon Sep 17 00:00:00 2001 | |
| From: Anisse Astier <anisse@astier.eu> | |
| Date: Mon, 2 Apr 2012 10:37:23 +0200 | |
| Subject: [PATCH 7/8] Build paths have changed, change install procedure to | |
| take that in account | |
| --- | |
| debian/libgl1-mesa-dri-experimental.install.in | 2 +- | |
| debian/libgl1-mesa-dri.install.linux.in | 6 +++--- | |
| debian/rules | 2 +- | |
| 3 files changed, 5 insertions(+), 5 deletions(-) | |
| diff --git a/debian/libgl1-mesa-dri-experimental.install.in b/debian/libgl1-mesa-dri-experimental.install.in | |
| index e0a676f..04b7b4e 100644 | |
| --- a/debian/libgl1-mesa-dri-experimental.install.in | |
| +++ b/debian/libgl1-mesa-dri-experimental.install.in | |
| @@ -1,2 +1,2 @@ | |
| -build/dri/gallium/swrastg_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| +build/dri/lib/gallium/swrastg_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| diff --git a/debian/libgl1-mesa-dri.install.linux.in b/debian/libgl1-mesa-dri.install.linux.in | |
| index 6b7fa05..528a884 100644 | |
| --- a/debian/libgl1-mesa-dri.install.linux.in | |
| +++ b/debian/libgl1-mesa-dri.install.linux.in | |
| @@ -2,6 +2,6 @@ | |
| build/dri/lib/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| # This part is Linux-specific: | |
| -build/dri/gallium/r600_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| -build/dri/gallium/nouveau_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| -build/dri/gallium/nouveau_vieux_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| +build/dri/lib/gallium/r600_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| +build/dri/lib/gallium/nouveau_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| +build/dri/lib/gallium/nouveau_vieux_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| diff --git a/debian/rules b/debian/rules | |
| index 5e78ef2..0622ee3 100755 | |
| --- a/debian/rules | |
| +++ b/debian/rules | |
| @@ -305,7 +305,7 @@ endif | |
| dh_install -s --fail-missing | |
| ifneq (,$(filter r300,$(GALLIUM_DRIVERS))) | |
| - dh_install -plibgl1-mesa-dri build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| + dh_install -plibgl1-mesa-dri build/dri/$(DEB_HOST_MULTIARCH)/lib/gallium/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri | |
| endif | |
| dh_installman -s | |
| dh_lintian -s | |
| -- | |
| 1.7.9.4 | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From 0691e69e4746f10988b3cad5fc106bdd5299c3ea Mon Sep 17 00:00:00 2001 | |
| From: Anisse Astier <anisse@astier.eu> | |
| Date: Mon, 2 Apr 2012 10:54:32 +0200 | |
| Subject: [PATCH 8/8] Remove debhelper xz compression, we prefer to use | |
| default(gzip) | |
| --- | |
| debian/rules | 2 +- | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | |
| diff --git a/debian/rules b/debian/rules | |
| index 0622ee3..8ab542a 100755 | |
| --- a/debian/rules | |
| +++ b/debian/rules | |
| @@ -334,7 +334,7 @@ endif | |
| dh_shlibdeps -s | |
| dh_gencontrol -s | |
| dh_md5sums -s | |
| - dh_builddeb $(foreach pkg,$(dbgpkg),-p$(pkg)) -- -Zxz | |
| + dh_builddeb $(foreach pkg,$(dbgpkg),-p$(pkg)) -- | |
| dh_builddeb $(foreach pkg,$(otherpkg),-p$(pkg)) | |
| binary: binary-indep binary-arch | |
| -- | |
| 1.7.9.4 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment