Julien Cristau
6c0fba2480
Prepare changelog for upload.
2007-04-20 05:58:00 +02:00
Julien Cristau
f4cc159f53
Revert " * Split out libGLw libs and headers from libgl1-mesa-swx11 and ship both"
...
This reverts commit 856ae782c7
.
Conflicts:
debian/changelog
2007-04-20 05:55:04 +02:00
Julien Cristau
04c002abc2
Revert "Fix conflicts for libGLw packages."
...
This reverts commit 048144074b
.
2007-04-20 05:53:59 +02:00
Julien Cristau
78fd17907e
Merge branch 'debian-experimental' into debian-unstable
2007-04-20 05:52:20 +02:00
Julien Cristau
47edc83080
Merge branch 'debian-experimental' into debian-unstable
...
Conflicts:
configs/debian-osmesa16
configs/debian-osmesa16-static
configs/debian-osmesa32
configs/debian-osmesa32-static
debian/changelog
debian/compat
debian/control
debian/copyright
debian/libgl1-mesa-dev.install
debian/libgl1-mesa-swx11-dev.install
debian/libgl1-mesa-swx11.shlibs
debian/libglu1-mesa-dev.install
debian/mesa-common-dev.docs
debian/mesa-common-dev.install
debian/rules
src/mesa/x86-64/matypes.h
src/mesa/x86/matypes.h
2007-04-20 05:44:24 +02:00
Julien Cristau
33e34f5bf4
Merge tag 'mesa_6_5_1' into debian-unstable
...
Conflicts:
progs/util/README
progs/util/glstate.c
progs/util/glstate.h
progs/util/sampleMakefile
src/glu/sgi/libnurbs/interface/bezierEval.h
src/glu/sgi/libnurbs/interface/bezierPatch.cc
src/glu/sgi/libnurbs/interface/bezierPatch.h
src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc
src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
src/glu/sgi/libnurbs/interface/glcurveval.cc
src/glu/sgi/libnurbs/interface/glimports.h
src/glu/sgi/libnurbs/interface/glinterface.cc
src/glu/sgi/libnurbs/interface/glrenderer.h
src/glu/sgi/libnurbs/interface/incurveeval.cc
src/glu/sgi/libnurbs/interface/insurfeval.cc
src/glu/sgi/libnurbs/interface/mystdio.h
src/glu/sgi/libnurbs/interface/mystdlib.h
src/glu/sgi/libnurbs/internals/arc.h
src/glu/sgi/libnurbs/internals/arcsorter.cc
src/glu/sgi/libnurbs/internals/arcsorter.h
src/glu/sgi/libnurbs/internals/arctess.h
src/glu/sgi/libnurbs/internals/backend.cc
src/glu/sgi/libnurbs/internals/backend.h
src/glu/sgi/libnurbs/internals/basiccrveval.h
src/glu/sgi/libnurbs/internals/basicsurfeval.h
src/glu/sgi/libnurbs/internals/bezierarc.h
src/glu/sgi/libnurbs/internals/bin.cc
src/glu/sgi/libnurbs/internals/bin.h
src/glu/sgi/libnurbs/internals/bufpool.cc
src/glu/sgi/libnurbs/internals/bufpool.h
src/glu/sgi/libnurbs/internals/cachingeval.cc
src/glu/sgi/libnurbs/internals/cachingeval.h
src/glu/sgi/libnurbs/internals/ccw.cc
src/glu/sgi/libnurbs/internals/coveandtiler.h
src/glu/sgi/libnurbs/internals/curve.cc
src/glu/sgi/libnurbs/internals/curve.h
src/glu/sgi/libnurbs/internals/curvelist.cc
src/glu/sgi/libnurbs/internals/curvelist.h
src/glu/sgi/libnurbs/internals/curvesub.cc
src/glu/sgi/libnurbs/internals/dataTransform.cc
src/glu/sgi/libnurbs/internals/dataTransform.h
src/glu/sgi/libnurbs/internals/defines.h
src/glu/sgi/libnurbs/internals/displaylist.cc
src/glu/sgi/libnurbs/internals/displaylist.h
src/glu/sgi/libnurbs/internals/displaymode.h
src/glu/sgi/libnurbs/internals/flist.cc
src/glu/sgi/libnurbs/internals/flist.h
src/glu/sgi/libnurbs/internals/flistsorter.cc
src/glu/sgi/libnurbs/internals/flistsorter.h
src/glu/sgi/libnurbs/internals/gridline.h
src/glu/sgi/libnurbs/internals/gridtrimvertex.h
src/glu/sgi/libnurbs/internals/gridvertex.h
src/glu/sgi/libnurbs/internals/hull.cc
src/glu/sgi/libnurbs/internals/hull.h
src/glu/sgi/libnurbs/internals/intersect.cc
src/glu/sgi/libnurbs/internals/jarcloc.h
src/glu/sgi/libnurbs/internals/knotvector.h
src/glu/sgi/libnurbs/internals/mapdesc.cc
src/glu/sgi/libnurbs/internals/mapdesc.h
src/glu/sgi/libnurbs/internals/mapdescv.cc
src/glu/sgi/libnurbs/internals/maplist.cc
src/glu/sgi/libnurbs/internals/maplist.h
src/glu/sgi/libnurbs/internals/mesher.cc
src/glu/sgi/libnurbs/internals/mesher.h
src/glu/sgi/libnurbs/internals/monoTriangulationBackend.cc
src/glu/sgi/libnurbs/internals/monotonizer.cc
src/glu/sgi/libnurbs/internals/monotonizer.h
src/glu/sgi/libnurbs/internals/myassert.h
src/glu/sgi/libnurbs/internals/mycode.cc
src/glu/sgi/libnurbs/internals/mystring.h
src/glu/sgi/libnurbs/internals/nurbsconsts.h
src/glu/sgi/libnurbs/internals/nurbstess.cc
src/glu/sgi/libnurbs/internals/patch.cc
src/glu/sgi/libnurbs/internals/patch.h
src/glu/sgi/libnurbs/internals/patchlist.cc
src/glu/sgi/libnurbs/internals/patchlist.h
src/glu/sgi/libnurbs/internals/pwlarc.h
src/glu/sgi/libnurbs/internals/quilt.cc
src/glu/sgi/libnurbs/internals/quilt.h
src/glu/sgi/libnurbs/internals/reader.cc
src/glu/sgi/libnurbs/internals/reader.h
src/glu/sgi/libnurbs/internals/renderhints.cc
src/glu/sgi/libnurbs/internals/renderhints.h
src/glu/sgi/libnurbs/internals/simplemath.h
src/glu/sgi/libnurbs/internals/slicer.cc
src/glu/sgi/libnurbs/internals/slicer.h
src/glu/sgi/libnurbs/internals/sorter.cc
src/glu/sgi/libnurbs/internals/sorter.h
src/glu/sgi/libnurbs/internals/splitarcs.cc
src/glu/sgi/libnurbs/internals/subdivider.h
src/glu/sgi/libnurbs/internals/tobezier.cc
src/glu/sgi/libnurbs/internals/trimline.cc
src/glu/sgi/libnurbs/internals/trimline.h
src/glu/sgi/libnurbs/internals/trimregion.cc
src/glu/sgi/libnurbs/internals/trimregion.h
src/glu/sgi/libnurbs/internals/trimvertex.h
src/glu/sgi/libnurbs/internals/trimvertpool.cc
src/glu/sgi/libnurbs/internals/trimvertpool.h
src/glu/sgi/libnurbs/internals/types.h
src/glu/sgi/libnurbs/internals/uarray.cc
src/glu/sgi/libnurbs/internals/uarray.h
src/glu/sgi/libnurbs/internals/varray.cc
src/glu/sgi/libnurbs/internals/varray.h
src/glu/sgi/libnurbs/nurbtess/definitions.h
src/glu/sgi/libnurbs/nurbtess/directedLine.h
src/glu/sgi/libnurbs/nurbtess/glimports.h
src/glu/sgi/libnurbs/nurbtess/gridWrap.cc
src/glu/sgi/libnurbs/nurbtess/gridWrap.h
src/glu/sgi/libnurbs/nurbtess/monoChain.cc
src/glu/sgi/libnurbs/nurbtess/monoChain.h
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h
src/glu/sgi/libnurbs/nurbtess/mystdio.h
src/glu/sgi/libnurbs/nurbtess/mystdlib.h
src/glu/sgi/libnurbs/nurbtess/partitionX.cc
src/glu/sgi/libnurbs/nurbtess/partitionX.h
src/glu/sgi/libnurbs/nurbtess/partitionY.cc
src/glu/sgi/libnurbs/nurbtess/partitionY.h
src/glu/sgi/libnurbs/nurbtess/polyDBG.h
src/glu/sgi/libnurbs/nurbtess/polyUtil.cc
src/glu/sgi/libnurbs/nurbtess/polyUtil.h
src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc
src/glu/sgi/libnurbs/nurbtess/primitiveStream.h
src/glu/sgi/libnurbs/nurbtess/quicksort.cc
src/glu/sgi/libnurbs/nurbtess/quicksort.h
src/glu/sgi/libnurbs/nurbtess/rectBlock.cc
src/glu/sgi/libnurbs/nurbtess/rectBlock.h
src/glu/sgi/libnurbs/nurbtess/sampleComp.cc
src/glu/sgi/libnurbs/nurbtess/sampleComp.h
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h
src/glu/sgi/libnurbs/nurbtess/sampledLine.cc
src/glu/sgi/libnurbs/nurbtess/sampledLine.h
src/glu/sgi/libnurbs/nurbtess/searchTree.cc
src/glu/sgi/libnurbs/nurbtess/searchTree.h
src/glu/sgi/libnurbs/nurbtess/zlassert.h
src/glu/sgi/libtess/README
src/glu/sgi/libtess/alg-outline
src/glu/sgi/libtess/dict-list.h
src/glu/sgi/libtess/dict.c
src/glu/sgi/libtess/dict.h
src/glu/sgi/libtess/geom.c
src/glu/sgi/libtess/memalloc.c
src/glu/sgi/libtess/memalloc.h
src/glu/sgi/libtess/mesh.c
src/glu/sgi/libtess/mesh.h
src/glu/sgi/libtess/normal.h
src/glu/sgi/libtess/priorityq-heap.c
src/glu/sgi/libtess/priorityq-heap.h
src/glu/sgi/libtess/priorityq-sort.h
src/glu/sgi/libtess/priorityq.c
src/glu/sgi/libtess/priorityq.h
src/glu/sgi/libtess/render.c
src/glu/sgi/libtess/render.h
src/glu/sgi/libtess/sweep.h
src/glu/sgi/libtess/tess.h
src/glu/sgi/libtess/tessmono.c
src/glu/sgi/libtess/tessmono.h
src/glu/sgi/libutil/error.c
src/glu/sgi/libutil/glue.c
src/glu/sgi/libutil/gluint.h
src/glu/sgi/libutil/project.c
src/glu/sgi/libutil/registry.c
src/glx/x11/glxext.c
src/mesa/main/imports.h
src/mesa/tnl/t_vb_cliptmp.h
2007-04-20 05:37:11 +02:00
Brice Goglin
3832ecadae
Add 06_fix_texture_data_corruption.patch ( closes : #412346 )
2007-04-08 18:52:31 +02:00
Brice Goglin
285ed128ab
Add a .shlibs file for libglw1-mesa.
2007-04-01 00:44:29 +02:00
Brice Goglin
048144074b
Fix conflicts for libGLw packages.
...
libglw1-mesa does not have to conflict with earlier libgl1-mesa-swx11
(libGLw was only shipped as development libs/headers within swx11-dev).
libglw1-mesa-dev needs to conflicts with libglw-dev.
2007-04-01 00:43:20 +02:00
Brice Goglin
856ae782c7
* Split out libGLw libs and headers from libgl1-mesa-swx11 and ship both
...
static and shared libraries, creating libglw1-mesa and libglw1-mesa-dev
(closes : #374904 ).
2007-03-31 03:28:32 +02:00
Julien Cristau
12e3f97541
Fix explanation about libglide3 in libgl1-mesa-dri's description.
...
Thanks to Michel Dänzer for his help.
2007-03-30 17:20:02 +02:00
Julien Cristau
30f6fe0710
Have libgl1-mesa-dri suggest libglide3.
...
Add explanation for this in the package description. Closes : #387339 .
2007-03-30 14:10:24 +02:00
Cyril Brulebois
0aa8f1df3c
* Non-maintainer upload.
...
* Backport a fix from mesa 6.5.2 to mesa 6.5.1 which:
- fixes braces around the ASSERT macro;
- fixes a clipping problem, which leads to systematic segfaults of the
X server (Closes : #405803 ).
2007-02-23 00:48:40 +01:00
Julien Cristau
6da1323437
* Non-maintainer upload.
...
* Build with -fno-strict-aliasing to fix misbuild of i965_dri.so
(closes : #394311 ). Thanks to Michel Dänzer for the fix, and to Ryan
Richter for the report and testing.
2007-01-03 16:59:06 +01:00
Julien Cristau
1dd29785cf
Import changes from the mesa 6.5.1-0.4 NMU.
2007-01-03 13:43:46 +01:00
Julien Cristau
5681987ee4
Import changes from the mesa 6.5.1-0.3 NMU.
2007-01-03 13:41:57 +01:00
David Nusinow
75733e4237
Commit diff of 6.5.1-0.2 so we've got a record of it here.
2006-10-14 22:42:57 +00:00
David Nusinow
bc8084da74
Fix goofed patch from before
2006-09-26 01:36:37 +00:00
David Nusinow
5eed400862
Prepare changelog for release
2006-09-26 01:21:59 +00:00
David Nusinow
a37a0959ac
* Add patch from Cyril Brulebois to allow package to build on HURD, which
...
lacks DRI and directfb. This includes not using lib-directfb in the
build-depends for hurd-i386. It also creates a new debian config,
debian-indirect, which is used when building for HURD. This config is
invoked in the debian-dri config on hurd-i386. Thanks to Cyril Brulebois
for the patch, Michael Banck, Michel Dänzer, and Samuel Thibault for
input on an appropriate fix. (closes : #358065 )
2006-09-26 00:46:14 +00:00
David Nusinow
53845c52e5
* Re-add s390 and m68k to the USE_IEEE test in src/mesa/main/imports.h. This
...
package seriously needs to store patches somewhere that are easy to find
and re-apply.
2006-09-26 00:32:06 +00:00
David Nusinow
d429f0b14f
* Make sure that libGl looks for the dri drivers in the proper location. Do
...
this by setting the appropriate variables in the debian config
2006-09-25 02:57:24 +00:00
David Nusinow
02339187ad
* Stuff not in the upstream tarballs
...
* Bump libdrm-dev build-dep to >= 2.0.2
* Add libdrm cflags to the debian-dri config. This allows the build system
to find drm.h
2006-09-24 22:55:41 +00:00
David Nusinow
827f778525
* Stuff not in the upstream tarballs
...
+ os2 glut stuff
+ docs/gears.png
2006-09-24 21:54:25 +00:00
David Nusinow
d3fc85eea9
Remove os2 glut stuff. It's not in the tarballs
2006-09-24 21:50:01 +00:00
David Nusinow
9a62963129
Add glut
2006-09-24 21:40:02 +00:00
David Nusinow
a0b2543ba1
Add mesa demos
2006-09-24 21:29:21 +00:00
David Nusinow
387acaac69
* New upstream version
2006-09-24 21:21:15 +00:00
David Nusinow
952b775dbe
Rename mesa dir
2006-09-24 21:18:17 +00:00
David Nusinow
eadb76b3f8
Bump to latest mesa in Debian
2006-09-24 21:11:46 +00:00
Steve Langasek
b3f7313ae4
Nuke the directory for an obsolete version of mesa -- no reason to merge
...
it anywhere, it's already superseded
2006-09-18 23:49:49 +00:00
David Nusinow
0c97d48027
* Install the glx sources with the rest in the sources package. This will
...
allow building of Xgl
2006-04-08 18:28:29 +00:00
David Nusinow
c4a678de9e
Update source package install file, change version number to match reality, and note NMU in changelog
2006-04-07 06:36:53 +00:00
David Nusinow
2c834f4d29
* Don't build now non-existant i830 driver in debian dri configs. Fixes
...
FTBFS.
2006-04-07 03:11:47 +00:00
David Nusinow
b93d290c9f
* Remove set_buffer function from idirectfbgl_mesa.c in directfb driver.
...
Also remove the line that sets SetBuffer to it. Fixes FTBFS.
2006-04-07 02:22:22 +00:00
David Nusinow
32266bb21a
* Re-Add s390 and m68k to the USE_IEEE test in src/mesa/main/imports.h.
...
I need to submit this upstream.
2006-04-07 01:50:23 +00:00
David Nusinow
cab39103b7
* Increment libdrm-dev build-dep to 2.0.1
2006-04-07 00:38:00 +00:00
David Nusinow
5c56a80ac9
Copy over Debian packaging from 6.4.1
2006-04-07 00:35:30 +00:00
David Nusinow
d0bac31721
Copy vendor drop of Mesa 6.5 over to working branch
2006-04-07 00:30:49 +00:00
David Nusinow
9258e54cfa
Move incorrect vendor drop of Mesa 6.5
2006-04-07 00:29:08 +00:00
David Nusinow
ccb68495e0
Vendor drop of Mesa 6.5
2006-04-07 00:24:21 +00:00
David Nusinow
db4236fe0b
* Add versioned conflict between libgl1-mesa-dri and xlibmesa-dri so that
...
the xlibmesa-dri transitional upgrade package works
2006-03-07 02:48:44 +00:00
David Nusinow
a4e43427f8
* Move compatibility packages to the xorg source package. The versioning on
...
these packages will be too low without an epoch and they definitely fit
with the xorg package anyway.
2006-02-24 05:43:01 +00:00
David Nusinow
829190abdd
* Provide compatibility packages for the Xorg 6.9 mesa packages. This
...
package will be the only source of mesa packages in Debian for the
present, and these packages will provide for smooth upgrades and
compatibility.
2006-02-22 03:22:26 +00:00
David Nusinow
99688cd051
Add m68k to previous fix to fix its FTBFS also
2006-02-11 23:00:27 +00:00
David Nusinow
1ba0a92702
* Add s390 to the USE_IEEE test in src/mesa/main/imports.h.
...
(closes : #349437 )
2006-02-09 01:24:52 +00:00
David Nusinow
065d5a8d17
* Remove makedepend from build-depends. Now we'll just build-dep on xutils
...
to get the app, which will translate over to our own xorg 7.0 plans.
2006-02-01 00:22:24 +00:00
David Nusinow
3b53c0ac19
* Re-add dh_installdirs call to binary-indep target so that we get
...
arch-specific dirs for the mesa-swx11-source package
2006-01-30 04:02:11 +00:00
David Nusinow
ed56fe4e82
* mesa-swrast-src.install stop looking for the swx11 dir and look for swrast
2006-01-22 19:50:19 +00:00
David Nusinow
1fbbe807ed
Make libglu1-mesa default to depending on libgl1-mesa-glx. Thanks Michel Dänzer for catching this one.
2006-01-22 00:07:07 +00:00
David Nusinow
c3dccfa05b
Use appropriate version number for an NMU. Thanks Julien for catching this one
2006-01-21 23:40:34 +00:00
David Nusinow
7703d9293f
Incorporate other NMU for xlibs-dev transition
2006-01-21 23:32:52 +00:00
David Nusinow
bcf560e4b8
* Change libgl1-mesa to be named libgl1-mesa-glx
2006-01-19 23:45:36 +00:00
David Nusinow
9d944b501a
* Change libgl1-mesa-swrast to be named libgl1-mesa-swx11
2006-01-16 22:19:03 +00:00
David Nusinow
cf013a5384
Add more closers
2006-01-11 04:10:39 +00:00
David Nusinow
2f367491c4
Add closer
2006-01-11 04:00:15 +00:00
David Nusinow
e7d93b62ec
* Change libgl1-mesa-swrast Depends on libx11-6-dev to libx11-dev.
...
(closes : #347205 )
* Add closer for packaging new upstream
2006-01-11 03:48:31 +00:00
David Nusinow
a5b309c0c9
Document that we'll be NMU'ing this for modular work
2006-01-06 03:09:12 +00:00
David Nusinow
df46b96ab0
Re-add mesa-6.4.1 which was accidentally deleted
2006-01-03 05:15:27 +00:00
David Nusinow
bda1e332ce
Update libs to 7.0 release with packaging
2005-12-30 20:12:45 +00:00
David Nusinow
53b2ad5fd0
Rename mesa lib dir to appropriate version
2005-12-16 04:04:38 +00:00
David Nusinow
b44d9c657d
Changelog version bump
2005-12-16 04:03:27 +00:00
David Nusinow
92ef7527d1
* New upstream version (6.4.1)
...
* Merge changes from Ubuntu version 6.4.1-0ubuntu1
+ Add new files required by xorg-server GL build to mesa-swrast-source.
2005-12-14 01:43:13 +00:00
David Nusinow
c37d6b4ca8
Commit Mesa 6.4 sources and packaging
2005-11-09 02:46:07 +00:00