debian/changelog | 14 +++++++++----- debian/control | 20 +++++++++----------- debian/egl.pc | 12 ++++++++++++ debian/glesv1_cm.pc | 12 ++++++++++++ debian/glesv2.pc | 12 ++++++++++++ debian/libegl1-mesa-dev.install | 1 + debian/libgl1-mesa-dri-experimental.install | 1 + debian/libgl1-mesa-dri-gallium.install | 1 - debian/libgles1-mesa-dev.install | 1 + debian/libgles2-mesa-dev.install | 1 + debian/libopenvg1-mesa-dev.install | 1 + debian/rules | 23 +++++++++++++++-------- debian/vg.pc | 12 ++++++++++++ 13 files changed, 86 insertions(+), 25 deletions(-)
New commits: commit 80fd9d485741b9aa9deb7b6c62bd1531b780d6fd Author: Christopher James Halse Rogers <[email protected]> Date: Thu Jun 10 21:58:36 2010 +1000 Fix libgl1-mesa-dri-experimental's dbg package naming diff --git a/debian/control b/debian/control index f313725..87cf02f 100644 --- a/debian/control +++ b/debian/control @@ -434,18 +434,15 @@ Description: A free implementation of the OpenGL API -- Extra DRI modules in this package may provide more features than the drivers in the libgl1-mesa-dri at the cost of less stability. . - This package currently cotains drivers for Nvidia, ATi, - and some Intel cards. - . For a complete description of Mesa, please look at the libgl1-mesa-swx11 package. -Package: libgl1-mesa-dri-gallium-dbg +Package: libgl1-mesa-dri-experimental-dbg Section: debug Priority: extra Architecture: linux-any -Depends: libgl1-mesa-dri-gallium (= ${binary:Version}), ${misc:Depends} -Description: Debugging symbols for the Mesa Gallium DRI modules +Depends: libgl1-mesa-dri-experimental (= ${binary:Version}), ${misc:Depends} +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 modules from the libgl1-mesa-dri package to accelerate drawing. diff --git a/debian/rules b/debian/rules index 35ed85b..eb78231 100755 --- a/debian/rules +++ b/debian/rules @@ -284,7 +284,7 @@ binary-arch: install dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg ifeq ($(HAVE_GALLIUM_DRI_DRIVERS), yes) - dh_strip -plibgl1-mesa-dri-gallium --dbg-package=libgl1-mesa-dri-gallium-dbg + dh_strip -plibgl1-mesa-dri-experimental --dbg-package=libgl1-mesa-dri-experimental-dbg endif dh_strip -plibopenvg1-mesa --dbg-package=libopenvg1-mesa-dbg dh_strip -plibegl1-mesa --dbg-package=libegl1-mesa-dbg commit 07694d5c046aefeaa2af4354d8a89c43d912d449 Author: Christopher James Halse Rogers <[email protected]> Date: Thu Jun 10 21:49:32 2010 +1000 Only build Intel gallium drivers on i386 and x86-64 diff --git a/debian/rules b/debian/rules index c649523..35ed85b 100755 --- a/debian/rules +++ b/debian/rules @@ -70,9 +70,8 @@ else DIRECT_RENDERING = --enable-driglx-direct ifeq ($(DEB_HOST_ARCH_OS), linux) -# Gallium drivers require libdrm-{intel,nouveau,radeon}, only available on Linux - GALLIUM_DRIVERS += --enable-gallium-nouveau --enable-gallium-radeon \ - --enable-gallium-intel +# Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux + GALLIUM_DRIVERS += --enable-gallium-nouveau --enable-gallium-radeon HAVE_GALLIUM_DRI_DRIVERS = yes # Although the KMS egl drivers will probably build on kfreebsd & hurd # only linux actually has KMS drivers implemented at this point. @@ -81,12 +80,15 @@ else ifeq ($(DEB_HOST_ARCH), lpia) DRI_DRIVERS += i915 i965 + GALLIUM_DRIVERS += --enable-gallium-intel else ifneq ($(DEB_HOST_ARCH), s390) DRI_DRIVERS += mach64 mga r128 r200 r300 r600 radeon savage tdfx ifeq ($(DEB_HOST_ARCH_CPU), i386) DRI_DRIVERS += i810 i915 i965 sis unichrome + GALLIUM_DRIVERS += --enable-gallium-intel else ifeq ($(DEB_HOST_ARCH_CPU), amd64) DRI_DRIVERS += i915 i965 sis unichrome + GALLIUM_DRIVERS += --enable-gallium-intel endif endif endif @@ -271,8 +273,8 @@ binary-arch: install build/dri/glx/gallium/r300_dri.so # Intel i965 Gallium appears to do nothing more than generate GPU # lockups. Kill it with fire. i915 is apparently useful. - rm build/dri/glx/gallium/i965_dri.so - rm debian/tmp/usr/lib/glx/egl/egl_*_i965.so + -rm build/dri/glx/gallium/i965_dri.so + -rm debian/tmp/usr/lib/glx/egl/egl_*_i965.so dh_install -s --list-missing dh_installman -s commit 41a730e6ea0c118d4bfde7c9d21128ca02bc36f3 Author: Christopher James Halse Rogers <[email protected]> Date: Thu Jun 10 21:41:33 2010 +1000 Nouveau gallium is the only experimental driver we want installed at the moment. List it explicitly in .install. Radeon gallium can't coexist with classic mesa, and we're likely to just switch to it wholesale for 7.9. The nouveau classic driver for nv04-nv20 doesn't build against our libdrm diff --git a/debian/libgl1-mesa-dri-experimental.install b/debian/libgl1-mesa-dri-experimental.install index e801791..f3a0b80 100644 --- a/debian/libgl1-mesa-dri-experimental.install +++ b/debian/libgl1-mesa-dri-experimental.install @@ -1 +1 @@ -build/dri/glx/gallium/*.so usr/lib/dri +build/dri/glx/gallium/nouveau_dri.so usr/lib/dri commit c123f6d97a53fa2aafb3cd8da5735d4a6e655656 Author: Christopher James Halse Rogers <[email protected]> Date: Thu Jun 10 21:11:18 2010 +1000 Bump build-dep on dpkg-dev to match the use of regex in sybmols files diff --git a/debian/changelog b/debian/changelog index 03715c8..0e82425 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,8 +51,9 @@ mesa (7.8.1-2) UNRELEASED; urgency=low - Add new packages. - Add new build-depends on libx11-xcb-dev, libxcb-dri2-0-dev, libxcb-xfixes0-dev and python-libxml2 for gallium. + - Bump build-depends on dpkg-dev for regex in symbols files. - -- Christopher James Halse Rogers <[email protected]> Wed, 26 May 2010 17:55:34 +1000 + -- Christopher James Halse Rogers <[email protected]> Thu, 10 Jun 2010 21:10:22 +1000 mesa (7.8.1-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 3d82e5d..f313725 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.8.4 Build-Depends: debhelper (>= 7.2.7), quilt (>= 0.40), pkg-config, libdrm-dev (>= 2.4.19) [!hurd-i386], libx11-dev, xutils-dev, x11proto-gl-dev (>= 1.4.11), libxxf86vm-dev, - libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.13.19), libxfixes-dev, + libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.15.6), libxfixes-dev, libxdamage-dev, libxext-dev, autoconf, automake, x11proto-dri2-dev (>= 2.1), linux-libc-dev (>= 2.6.31) [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386], libx11-xcb-dev, libxcb-dri2-0-dev, libxcb-xfixes0-dev, python-libxml2, commit 1338358a49fef18f9225a13f61747967c078ea7c Author: Christopher James Halse Rogers <[email protected]> Date: Wed Jun 2 19:56:37 2010 +1000 Add Intel i915 gallium drivers. diff --git a/debian/rules b/debian/rules index aa5add0..c649523 100755 --- a/debian/rules +++ b/debian/rules @@ -70,9 +70,9 @@ else DIRECT_RENDERING = --enable-driglx-direct ifeq ($(DEB_HOST_ARCH_OS), linux) -# Nouveau and Radeon require libdrm-nouveau and libdrm-radeon -# which are only available on linux. - GALLIUM_DRIVERS += --enable-gallium-nouveau --enable-gallium-radeon +# Gallium drivers require libdrm-{intel,nouveau,radeon}, only available on Linux + GALLIUM_DRIVERS += --enable-gallium-nouveau --enable-gallium-radeon \ + --enable-gallium-intel HAVE_GALLIUM_DRI_DRIVERS = yes # Although the KMS egl drivers will probably build on kfreebsd & hurd # only linux actually has KMS drivers implemented at this point. @@ -269,6 +269,10 @@ binary-arch: install # fails to support r600. mv build/dri/glx/gallium/radeong_dri.so \ build/dri/glx/gallium/r300_dri.so + # Intel i965 Gallium appears to do nothing more than generate GPU + # lockups. Kill it with fire. i915 is apparently useful. + rm build/dri/glx/gallium/i965_dri.so + rm debian/tmp/usr/lib/glx/egl/egl_*_i965.so dh_install -s --list-missing dh_installman -s commit 5c53f88699c730d4b828e01d0671111f70671841 Author: Christopher James Halse Rogers <[email protected]> Date: Wed Jun 2 15:30:50 2010 +1000 Rename libgl1-mesa-dri-gallium to libgl1-mesa-dri-experimental. This better describes the purpose, and makes it more reasonable to include the classic mesa driver for nouveau in there, too. diff --git a/debian/changelog b/debian/changelog index 6f696d2..03715c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,7 +41,7 @@ mesa (7.8.1-2) UNRELEASED; urgency=low * debian/glesv2.pc: - Pull pkg-config files from master and install them in the respective -dev packages. - * debian/libgl1-mesa-dri-gallium.install: + * debian/libgl1-mesa-dri-experimental.install: * debian/libgl1-mesa-dri.install: - “make install” puts classic and gallium drivers in the same path, but builds gallium drivers in the gallium/ subdirectory. Copy the drivers diff --git a/debian/control b/debian/control index 569cbbb..3d82e5d 100644 --- a/debian/control +++ b/debian/control @@ -420,24 +420,25 @@ Description: Debugging symbols for the Mesa DRI modules . This package contains debugging symbols for the DRI modules. -Package: libgl1-mesa-dri-gallium +Package: libgl1-mesa-dri-experimental Section: libs Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: A free implementation of the OpenGL API -- Gallium DRI modules +Description: A 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 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 based upon Gallium. + modules for accelerating direct and indirect rendering. The drivers + in this package may provide more features than the drivers in the + libgl1-mesa-dri at the cost of less stability. + . + This package currently cotains drivers for Nvidia, ATi, + and some Intel cards. . For a complete description of Mesa, please look at the libgl1-mesa-swx11 package. - . - This set of libraries is optional and contains highly experimental DRI - drivers based on Gallium for radeon, intel, and nvidia GPU's. If it is - installed they will be used by default until this package is removed. Package: libgl1-mesa-dri-gallium-dbg Section: debug diff --git a/debian/libgl1-mesa-dri-experimental.install b/debian/libgl1-mesa-dri-experimental.install new file mode 100644 index 0000000..e801791 --- /dev/null +++ b/debian/libgl1-mesa-dri-experimental.install @@ -0,0 +1 @@ +build/dri/glx/gallium/*.so usr/lib/dri diff --git a/debian/libgl1-mesa-dri-gallium.install b/debian/libgl1-mesa-dri-gallium.install deleted file mode 100644 index e801791..0000000 --- a/debian/libgl1-mesa-dri-gallium.install +++ /dev/null @@ -1 +0,0 @@ -build/dri/glx/gallium/*.so usr/lib/dri commit b0ea8bf2a5112ed727463370c147aa2f91cac31e Author: Christopher James Halse Rogers <[email protected]> Date: Tue Jun 1 19:05:59 2010 +1000 Update debian/changelog for dropping /usr/lib/dri-gallium diff --git a/debian/changelog b/debian/changelog index 889a20b..6f696d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,9 +15,6 @@ mesa (7.8.1-2) UNRELEASED; urgency=low - Enable egl for dri build. - Build nouveau, radeon & swrast gallium drivers - Build OpenVG, OpenGL|ES, dri, glx & egl state trackers - - Add /usr/lib/dri-gallium to driver search path to allow classic and - gallium drivers to co-exist peacefully. Install gallium drivers to - /usr/lib/dri-gallium. * debian/libegl1-mesa-dev.install: * debian/libegl1-mesa.install: * debian/libegl1-mesa.symbols: commit f1cf090f714620bf658c10c6588b1ca68732edd5 Author: Christopher James Halse Rogers <[email protected]> Date: Tue Jun 1 19:01:03 2010 +1000 Drop searchpath-based gallium coexistance. Although libgl is quite happy to load the gallium drivers from /usr/lib/dri-gallium, X itself doesn't respect --dri-drivers-path, so AIGLX reverts to swrast. Where there's both a classic and a gallium driver, development is likely to move entirely to the gallium driver in the relatively near future, so having classic & gallium drivers co-existing will be a short-term problem only. diff --git a/debian/libgl1-mesa-dri-gallium.install b/debian/libgl1-mesa-dri-gallium.install index 07937bb..e801791 100644 --- a/debian/libgl1-mesa-dri-gallium.install +++ b/debian/libgl1-mesa-dri-gallium.install @@ -1 +1 @@ -build/dri/glx/gallium/*.so usr/lib/dri-gallium/ +build/dri/glx/gallium/*.so usr/lib/dri diff --git a/debian/rules b/debian/rules index e658e77..aa5add0 100755 --- a/debian/rules +++ b/debian/rules @@ -192,11 +192,6 @@ confflags-swx11+glu-i386-i686 = \ --libdir=/usr/lib/i686/cmov \ CFLAGS="$(CFLAGS) -march=i686" -# Add /usr/lib/dri-gallium to the front of the search paths so that users can -# opt-in to installing gallium drivers there and have them override the classic -# drivers. -confflags-dri += --with-dri-searchpath=/usr/lib/dri-gallium:/usr/lib/dri - configure: $(QUILT_STAMPFN) configure.ac autoreconf -vfi commit 78e28df182379e7326ca71e8c3bfb74a00c85ad8 Author: Christopher James Halse Rogers <[email protected]> Date: Tue Jun 1 18:22:25 2010 +1000 Install radeong_dri as r300_dri. The DDX only looks for r{600,300,200}_dri.so, so the DRI module needs to be called one of these. The gallium driver only supports r300-r500, so call it r300_dri.so diff --git a/debian/rules b/debian/rules index c432c66..e658e77 100755 --- a/debian/rules +++ b/debian/rules @@ -269,6 +269,12 @@ binary-arch: install # Remove the whole tree to avoid false-positives in --list-missing, and # install the right files manually. rm -r debian/tmp/usr/lib/dri + # Radeon searches for r{200,300,600}_dri only, but the gallium driver + # is (at the moment) radeong_dri. Rename it to r300_dri, as it + # fails to support r600. + mv build/dri/glx/gallium/radeong_dri.so \ + build/dri/glx/gallium/r300_dri.so + dh_install -s --list-missing dh_installman -s dh_lintian -s commit fdf0edf342d3b2aed64f3c40e06358f1b30789e7 Author: Christopher James Halse Rogers <[email protected]> Date: Tue Jun 1 12:50:14 2010 +1000 Add changelog entry for pkg-config files diff --git a/debian/changelog b/debian/changelog index 91d8a3f..889a20b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,12 @@ mesa (7.8.1-2) UNRELEASED; urgency=low - New gallium EGL drivers package. * debian/libegl1-mesa-drivers-kms.install: - New gallium EGL kms driver package. + * debian/egl.pc: + * debian/vg.pc: + * debian/glesv1_cm.pc: + * debian/glesv2.pc: + - Pull pkg-config files from master and install them in the respective + -dev packages. * debian/libgl1-mesa-dri-gallium.install: * debian/libgl1-mesa-dri.install: - “make install” puts classic and gallium drivers in the same path, but commit 4fb488aaf742798f4b39ec14a5a6b53fbf9940a6 Author: Christopher James Halse Rogers <[email protected]> Date: Tue Jun 1 11:41:20 2010 +1000 Add EGL, GL|ES, and OpenVG pkg-config files taken from master diff --git a/debian/egl.pc b/debian/egl.pc new file mode 100644 index 0000000..84127b8 --- /dev/null +++ b/debian/egl.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: egl +Description: Mesa EGL library +Requires.private: libdrm >= 2.4.15 dri2proto >= 2.1 glproto >= 1.4.11 x11 xext xxf86vm xdamage xfixes +Version: 7.8.1 +Libs: -L${libdir} -lEGL +Libs.private: -lm -lpthread -ldl +Cflags: -I${includedir} diff --git a/debian/glesv1_cm.pc b/debian/glesv1_cm.pc new file mode 100644 index 0000000..1f418d3 --- /dev/null +++ b/debian/glesv1_cm.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: glesv1_cm +Description: Mesa OpenGL ES 1.1 CM library +Requires.private: +Version: 7.8.1 +Libs: -L${libdir} -lGLESv1_CM +Libs.private: -lm -lpthread -ldl +Cflags: -I${includedir} diff --git a/debian/glesv2.pc b/debian/glesv2.pc new file mode 100644 index 0000000..f4e7530 --- /dev/null +++ b/debian/glesv2.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: glesv2 +Description: Mesa OpenGL ES 2.0 library +Requires.private: +Version: 7.8.1 +Libs: -L${libdir} -lGLESv2 +Libs.private: -lm -lpthread -ldl +Cflags: -I${includedir} diff --git a/debian/libegl1-mesa-dev.install b/debian/libegl1-mesa-dev.install index ed3f23e..c0d9879 100644 --- a/debian/libegl1-mesa-dev.install +++ b/debian/libegl1-mesa-dev.install @@ -1,3 +1,4 @@ usr/lib/glx/libEGL.so usr/lib usr/include/EGL usr/include/KHR +debian/egl.pc usr/lib/pkgconfig diff --git a/debian/libgles1-mesa-dev.install b/debian/libgles1-mesa-dev.install index a01782a..346781d 100644 --- a/debian/libgles1-mesa-dev.install +++ b/debian/libgles1-mesa-dev.install @@ -1,2 +1,3 @@ usr/glx/libGLESv1_CM.so usr/lib usr/include/GLES +debian/glesv1_cm.pc usr/lib/pkgconfig diff --git a/debian/libgles2-mesa-dev.install b/debian/libgles2-mesa-dev.install index a775ee7..d2d4a33 100644 --- a/debian/libgles2-mesa-dev.install +++ b/debian/libgles2-mesa-dev.install @@ -1,2 +1,3 @@ usr/glx/libGLESv2.so usr/lib usr/include/GLES2 +debian/glesv2.pc usr/lib/pkgconfig diff --git a/debian/libopenvg1-mesa-dev.install b/debian/libopenvg1-mesa-dev.install index ea1636d..d144af0 100644 --- a/debian/libopenvg1-mesa-dev.install +++ b/debian/libopenvg1-mesa-dev.install @@ -1,2 +1,3 @@ usr/glx/libOpenVG.so usr/lib usr/include/VG +debian/vg.pc usr/lib/pkgconfig diff --git a/debian/vg.pc b/debian/vg.pc new file mode 100644 index 0000000..6125efe --- /dev/null +++ b/debian/vg.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: vg +Description: Mesa OpenVG 1.0 library +Requires.private: +Version: 7.8.1 +Libs: -L${libdir} -lOpenVG +Libs.private: +Cflags: -I${includedir} -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
