Commit graph

202 commits

Author SHA1 Message Date
drochner
4e6738a82b As suggested by Tom Spindler, remove the libdrm version requirement
from dri.mk where it is pulled in from bl3.mk. The minimum version
is only necessary if a new MesaLib is built, we don't need to force
users of older ones to update libdrm.
2009-08-08 15:03:18 +00:00
wiz
d0b1a76fe7 Fix symbol handling in glu. Patch from upstream via Jörn Clausen
in PR 41613.

Bump glu PKGREVISION.
2009-08-08 08:25:50 +00:00
drochner
bd8458bfad the dri module wants intel_bufmgr.h which we got with libdrm-2.4.9 2009-07-29 17:34:16 +00:00
hasso
f9627f96d1 Update to 7.4.4. Make software ratserizer actually work. Add one patch from
upstream repo to fix null pointer dereference.

Changes in 7.4.4:

* Fixed i965/i915 segfault in screen destruction (bug 22408)

Changes in 7.4.3:

* Fixed texture object reference counting bug (bug 21756)
* Allow depth/stencil textures to be attached to GL_STENCIL_ATTACHMENT
  point (SF bug 2793846)
* Added missing glGet case for GL_VERTEX_ARRAY_BINDING_APPLE
* Fixed some OSMesa build issues
* Fixed a vertex buffer object crash
* Fixed broken glTexImage3D() when image type = GL_BITMAP
* Fixed some GLSL preprocessor bugs
* Fixed framebuffer mem leak in i945/i965 DRI drivers
* Fixed texture coordinate repeat bug in swrast (bug 21872)
* Fixed incorrect viewport clamping (lower bound is zero, not one)
* GLX fix for glean's makeCurrent test case
2009-07-08 20:00:57 +00:00
hasso
a1685706ef Attempt to make it build cleanly and to solve PLIST problems without dri
option (default for most of platforms). Tested on DragonFly only. Bump
PKGREVISION.
2009-06-19 18:19:15 +00:00
joerg
7d3480dd87 Convert @exec/@unexec to @pkgdir or drop it. 2009-06-14 20:05:39 +00:00
joerg
3a5c19396a Remove @dirrm entries from PLISTs 2009-06-14 17:59:04 +00:00
tnn
3815b07b19 patch-cc: libtoolize src/mesa/drivers/x11/Makefile.
Should fix build with PKG_OPTION dri disabled. (PR pkg/41572)
2009-06-11 13:11:32 +00:00
wiz
e7e7492c9c Use correct macros for installation, from FUKAUMI Naoki in PR 41563.
While here, fix .pc files (were missing -Wl,-R).

Bump PKGREVISION.
2009-06-10 17:28:06 +00:00
hasso
0ca190aca6 Fix "freeze on exit" issue with many GL games. Bump PKGREVISION. 2009-06-10 10:47:22 +00:00
wiz
c383bea89e Update Mesa and friends to 7.4.2.
Update provided by Hasso Tepper on pkgsrc-users.

Changes:
7.4.2:
Bug fixes

   * Fixed segfault when rendering to front buffer with DRI 1.
   * Fixed swrast texture rectangle bug when wrap mode = GL_CLAMP_TO_BORDER and filter mode = GL_LINEAR. (bug
     21461)
   * Fixed texture object mem leak during context destruction.
   * Fixed a state validation bug in glCopyTex[Sub]Image()
   * Fixed some i965 GLSL bugs.
   * Fixed an R300 driver texture object bad memory reference.

7.4.1:
Bug fixes

   * Fixed a two-sided lighting bug in fixed-function-to-GPU code generation
   * Fixed some Darwin issues (Jeremy Huddleston)
   * Indexing the GLSL gl_EyePlane[] or gl_ObjectPlane[] arrays with a variable was broken, bug 20986
   * Fixed incorrect texture unit bias in TXB instruction
   * glTexParameter settings weren't always propogated to drivers
   * Assorted vertex/fragment program bug fixes
   * Fixed point rendering in software rasterizer
   * Fixed potential deadlock in object hash functions
   * Fix a couple bugs surrounding front-buffer rendering with DRI2, but this is not quite complete.
   * Fixed glPopAttrib() bug when restoring user clip planes

7.4:
New features

   * Added MESA_GLX_FORCE_DIRECT env var for Xlib/software driver
   * GLSL version 1.20 is returnd by the GL_SHADING_LANGUAGE_VERSION query

Bug fixes

   * glGetActiveUniform() returned wrong size for some array types
   * Fixed some error checking in glUniform()
   * Fixed a potential glTexImage('proxy target') segfault
   * Fixed bad reference counting for 1D/2D texture arrays
   * Fixed VBO + glPush/PopClientAttrib() bug #19835
   * Assorted i965 driver bug fixes
   * Fixed a Windows compilation failure in s_triangle.c
   * Fixed a GLSL array indexing bug
   * Fixes for building on Haiku

Changes

   * Updated GL/glxext.h to version 48
   * Assorted updates for building on Solaris

7.3:
New features

   * Support for GLSL 1.20
   * Intel DRI drivers now use GEM and DRI2

Bug fixes

   * Assorted GLSL bug fixes
   * Assorted i965 driver fixes
   * Fix for wglCreateLayerContext() in WGL/Windows driver
   * Build fixes for OpenBSD and gcc 2.95
   * GLSL preprocessor handles #pragma now
   * Fix incorrect transformation of GL_SPOT_DIRECTION
   * Fixed several bugs (#18367 and #19625) in glXMakeContextCurrent()
   * Assorted Windows build fixes

Changes

   * Deprecated the "XMesa" interface (include/GL/xmesa*.h files)
   * Deprecated the "FXMesa" interface (include/GL/fxmesa.h file)
   * Deprecated the "Allegro" interface (include/GL/amesa.h file)
   * Removed include/GL/uglmesa.h header
   * Removed include/GLView.h header for BeOS

7.2:
New features

   * i965 driver: added support for G41 chipset (Intel)

Bug fixes

   * Fixed display list bug involving primitives split across lists (bug 17564)
   * Fixed some issues with glBindAttribLocation()
   * Fixed crash in _tnl_InvalidateState() found with Amira (bug 15834)
   * Assorted bug fixes for Ming build
   * Fixed some vertex/pixel buffer object reference counting bugs
   * Fixed depth/stencil bug in i915/945 driver
   * Fixed some shader flow control bugs in i965 driver
   * Fixed a few tdfx driver bugs which prevented driver from working
   * Fixed multisample enable/disable bug

Changes

   * Updated SGI header files with new license terms.

7.1:
New features

   * autoconf-based configuration (and clean-up of Makefiles)
   * Assorted DRI driver enhancements
   * Reduced dependencies between X server and Mesa
   * GL_EXT_texture_from_pixmap extension for Xlib driver
   * Support for the GL shading language with i965 driver (implemented by Intel)
   * ATI R500 series support (Radeon X1300-X1950) in r300 DRI driver

Bug fixes

   * Numerous GLSL fixes
   * Fixed some error code/detection bugs in the GLSL-related API functions
   * Lots of DRI driver fixes.
2009-06-05 11:10:35 +00:00
joerg
2d1ba244e9 Simply and speed up buildlink3.mk files and processing.
This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.
2009-03-20 19:23:50 +00:00
bjs
741ff086bd Correct capitalization in FreeBSD case. 2009-02-28 01:22:07 +00:00
obache
0e5089350b Reset BUILTIN_PKG after inclution of pthread.builtin.mk.
workaround of PR 40254.
2009-02-03 08:35:13 +00:00
bjs
97e1fd19e4 Add the following patch from upstream as a new distribution
patch and bump MesaLib's PKGREVISION.  While here, make a few
small changes to appease pkglint.

commit 2b8d8989fb6f9c36baf166fc715182a1407ebadb
Author: Ian Romanick <ian.d.romanick@intel.com>
Date:   Sun Sep 28 20:31:46 2008 -0700

    Use 3Dnow! x86-64 routines only on processors that support 3Dnow!
    Added an x86-64 CPUID function and use it to detect 3Dnow!
    [...]
    This fixes long standing bug #8724.
2008-10-26 21:03:40 +00:00
bjs
6d84f393e9 Don't force using libm functions on Linux; most of the developers
use Linux, and they'd know better than I what's apporpriate.
2008-10-21 06:46:46 +00:00
bjs
9fc300342d Sync MesaLib with upstream mesa_7_0_branch. While here, patch
the r300 dri driver so that the __driConfigOptions symbol is visible.
This is necessary for xdriinfo and driconf to work.  Bump MesaLib's
PKGREVISION.
2008-10-21 06:25:26 +00:00
cube
403e256ff6 Merge cube-native-xorg, so that pkgsrc-current can be used with the native
X.Org found in NetBSD-current.

Thanks a lot to all who helped, especially Matthias Scheler who did
repeated tests on Mac OS X and older versions of NetBSD to make sure the
support for those platforms wouldn't be broken (or at least, not fatally,
as I would still expect a few hiccups here and there, because there is
only so much one can test in such limited time).

On the infrastructure side, this branch brings pkgconfig-builtin.mk, in
order to write very easily new builtin.mk files.  It can actually handle
more than just pkgconfig files, but it will provide a version if it finds
such a file.  x11.builtin.mk has also been made more useful and now all
existing (and future!) native-X11-related builtin.mk files should include
it.
2008-10-05 21:36:32 +00:00
bjs
4a50c11a27 Add Makefile.version and glx-config.mk so that x11/modular-xorg-server
can share this information in lieu of us duplicating it by hand.
2008-09-18 21:10:28 +00:00
wiz
760c7e2437 Reorder two unexec lines so they make more sense.
PKGREVISION++
2008-09-06 13:00:31 +00:00
dsainty
21df75edc2 Set DIST_SUBDIR=Mesa-7.0.4.1 (via MESA_PKGVERSION).
This allows people that already have the older custom Mesa-7.0.4 tarballs
to correctly upgrade Mesa to the standard distributions without having to
know to delete the old sources or get confused by the mismatching distinfo
checkhashes.

Update the paths in the related distinfos for the change.
2008-08-23 02:51:19 +00:00
dsainty
c69af5ba97 Bump PKGREVISION to reflect that MesaLib-7.0.4.1 and the current
package are built from different sources, with the current package
being the official 7.0.4 release.

Updates between the two versions' change logs are:

- This is a bug-fix release.
- Including the latest glext.h and glxext.h header files from Khronos
2008-08-23 01:27:10 +00:00
tnn
12ac34cfdd fix botched checksums.
I have verified through http://mesa3d.sourceforge.net/relnotes-7.0.4.html
that these sums are correct for the Mesa 7.0.4 release.

XXX should PKGREVISION be bumped?
I don't understand how the MESA_PKGVERSION stuff works or why we even have
it.
2008-08-21 18:40:59 +00:00
bjs
005289556f #define bswap_32 bswap32 for NetBSD in the mach64 driver; also, for the
sis driver, use either NetBSD's atomic ops if we have them, else
check for gcc's __sync_synchronize.  I suppose the right thing to do is
split the dri drivers out of this package, but hopefully this will
resolve [pkg/39359].  No revision bump, as I just updated the package
a few hours ago.
2008-08-17 09:41:35 +00:00
bjs
1e8d8ffb8f Update to Mesa-7.0.4 proper, which takes us to pkgsrc version
7.0.4.1.  Many of our patches are now upstream; there have also been
a significant amount of bug fixes even since our last interim update
from the 7.0 branch.

-------------------------------------------------------------------------
*** Mesa 7.0.4 is a stable release with bug fixes since version 7.0.3 ***
-------------------------------------------------------------------------
Bug fixes

     * define #extension GL_ARB_texture_rectangle in shading language
     * fixed WIN32 compile problem in libGLU
     * Fixed a per-vertex glMaterial bug which could cause bad lighting
     * Fixed potential crash in AA/smoothed triangle rendering when using a
       fragment shader
     * Fixed glDrawElement + VBO segfault (bug 16156)
     * Fixed GLSL linker bug causing generic vertex attributes to get
       aliased
     * Fixed stack overflow when using glPixelZoom on Windows
     * Fixed broken all(bvec2) GLSL function, added misc missing bvec
       constructors
     * ARB program "state.clip[n].plane" didn't parse correctly
     * Fixed broken glGetUniformiv() (bug 13774)

Changes

     * Added support for DragonFly OS
     * Added a build config for FreeBSD static libs (Anatolij Shkodin)
     * Enabled GL_EXT_multi_draw_arrays extension in R200/R300 drivers
     * Enabled GL_ARB_point_sprite extension in I965 driver
     * Enabled GL_EXT_texture_sRGB extension in I965 driver
     * Added support for GL shading language in I965 driver

Driver Status

 Driver                  Status
 ----------------------  ----------------------
 DRI drivers             varies with the driver
 XMesa/GLX (on Xlib)     implements OpenGL 2.1
 OSMesa (off-screen)     implements OpenGL 2.1
 Windows/Win32           implements OpenGL 2.1
 Glide (3dfx Voodoo1/2)  implements OpenGL 1.3
 SVGA                    unsupported
 Wind River UGL          unsupported
 DJGPP                   unsupported
 GGI                     unsupported
 BeOS                    unsupported
 Allegro                 unsupported
 D3D                     unsupported
2008-08-17 08:25:50 +00:00
dsainty
530d49cf8f Don't pull in pthread.buildlink3.mk on NetBSD, since we have determined that
we'll be using either libc stubs or devel/pthread-stublib, depending on age.
Tested on NetBSD 4.99.

No PKGREVISION bump, there should be no functional change.

Suggested by bjs@
2008-08-06 02:33:22 +00:00
dsainty
fc9e05c6f4 Use new-fangled :Q technology instead of yesteryear's quote characters.
Use the PTHREAD_XXX variables to set up the linking, otherwise libGL.so isn't
linked with libpthread.so under Linux, and so things that link with libGL.so
but don't themselves use threads are likely to not link themselves, failing to
resolve pthread_getspecific, pthread_once, pthread_key_create and
pthread_setspecific.

There should be no change on NetBSD platforms, but there is change on other
platforms, notably Linux.  Bump PKGREVISION to communicate that.

Should fix PR36207, does fix Linux build of glx-utils, and allows mission
critical software like "bzflag" to build under Linux.
2008-07-30 00:27:55 +00:00
tnn
688361827d Since PKG_SUPPORTED_OPTIONS is conditionally added to, initialise it
to empty first. Should fix PR pkg/39246.
2008-07-29 13:56:15 +00:00
bjs
7f57b393dc Change options.mk to build plain 'pkgsrc' target for libOSMesa.
The assembler dispatch code is only for indirect or direct
rendering, anyway--I apologize for not noticing this sooner.

This should fix the recent non-dri build problems people were having.

Thanks to Matthias Scheler and others for reporting this problem to me.

NOTE: Direct/indirect rendering support is still default for i386
and amd64 on NetBSD 4+, but only if you're using modular Xorg.
2008-07-28 02:12:57 +00:00
bjs
03aa255c8f Update to Mesa-7.0.4 (the head of the 7.0 branch in GIT). Basically,
lots of bug fixes; the intent of my update was mostly to fix
problems with i915 and r300 dri drivers and to provide the best environment
possible for the xorg server update to the 1.4 branch.

Morever, many of our patches from pkgsrc, i.e. those removed in this commit,
are now included upstream.

Additionally, MesaDemos now builds.

NOTES:

 - MesaLib now requires xf86driproto 2.0.4, as earlier versions install
   dri_interface.h, which is not correct.

 - glu now exports its symbols via libtool's -export-symfile.
   The symfile is generated pre-build--see glu/Makefile.

 - glxinfo/glxgears do not seem to need to be linked to libpthread, and this
   seems to cause problems on NetBSD with the new drm code.  If I am wrong
   about this, please let me know.  The only program that seems to need
   libpthread is glthreads in MesaDemos.
2008-07-27 00:03:42 +00:00
bjs
b94a743641 Update TODO, removing items that are no longer of concern. 2008-07-18 01:54:23 +00:00
abs
c0c1e29b9a Remove ${PLIST.dri}lib/dri/i915tex_dri.la from PLIST 2008-07-16 21:38:25 +00:00
bjs
7ffc5e2de0 libdrm-2.3.1 does not include the TTM interface, which will cause the
build of the i915tex driver to break (this driver was never supported
on any OS aside from linux, anyway).

Bump PKGREVISION.
2008-07-16 06:34:00 +00:00
tnn
352c284e0c graphics/MesaLib/hacks.mk: revert to rev 1.8
graphics/MesaLib/patches/patch-aw: export glXGetProcAddressARB
graphics/MesaLib/Makefile: bump PKGREVISION
graphics/glu/Makefile: bump PKGREVISION

Please help out by giving this change as extensive testing as
possible before 2008Q2 is branched.
2008-06-27 13:24:39 +00:00
bjs
8dcaee3ae4 This is supposed to have a CONFIG_NAME of pkgsrc-x86_64, not pkgsrc-dri-x86_64. 2008-06-26 04:50:05 +00:00
tron
52d986d7b1 Backout last change. It's insufficient as already pointed out by
Tobias Nygren and breaks the build of the "gle" package on
XFree86 systems again.
2008-06-25 11:21:20 +00:00
bjs
9b1548322b We want to use -fvisibility=hidden _unless_ we're building graphics/glut,
not the other way around.

 - This is the way that mesa expects things to be.
 - Not doing this for MesaLib (at least for dri on NetBSD/amd64) will result
   in reloc-related errors at link-time.

Building on NetBSD/amd64 was broken without this.
2008-06-24 18:55:44 +00:00
tron
514851e49c Fix broken hack which instead of removing the "-fvisibility=hidden"
compiler flag actually added it. This causes all the link failures
in packages using the "glut" library (e.g. "gle"). Bump package
revision because of this fix.

Error analysis provided by Raymond Meyer on "pkgsrc-users" mailing list.
2008-06-05 13:03:41 +00:00
tron
b01f784023 Don't offer "dri" as an option on systems which use XFree86 because it
breaks the build. This fixes PR pkg/38676 by Roland Sieker.
2008-06-03 11:06:17 +00:00
dsainty
dfbc21eebe Add Linux to DRI platforms. Add a patch to fix compilation under Linux. Bump PKGREVISION. 2008-06-03 06:59:12 +00:00
tnn
5a0e9d43c6 disable asm targets for Darwin too, breaks build for unknown reasons.
Reported by Mark E. Perkins on pkgsrc-users@
2008-05-31 20:43:29 +00:00
tnn
8f17865fa8 PR pkg/38795: Hasso Tepper: Add dri option to MesaLib for DragonFly 2008-05-30 14:25:30 +00:00
bjs
aebf38f9e7 Fix embarassing lack of '3' in a conditional. 2008-05-28 02:31:56 +00:00
bjs
4107484e70 Add comment about not using -ffast-math pending further testing.
It seems to cause instability, at least for me on NetBSD/amd64 (4.99.63).
2008-05-21 05:58:52 +00:00
bjs
df120c9621 Add new round of distribution patches (update code to head of Mesa_7_0_branch).
While here, ensure that all instances of pthread_getspecific are
replaced with __libc_thr_getspecific on NetBSD (fixes linking issues
with compiz, at least).
2008-05-21 04:11:37 +00:00
tron
19d5aa04ee Use the proper way to pass the necessary arguments for the Mac OS X Leopard
link bug workaround to the linker.
2008-05-15 19:46:47 +00:00
bjs
0973595ce2 Remove second -o argument in libOSMesa link command (which was obviously
my mistake).  Set MAKE_JOBS_SAFE=no when building libOSMesa because
it breaks the build.  Non-dri builds should work now.
2008-05-01 15:37:13 +00:00
bjs
a43bdcc500 Remove IGNORE_CCACHE, this was just me debugging. Thanks to wiz@. 2008-04-30 16:40:08 +00:00
bjs
46bc472b00 Mesa 2008-04-30 07:00:14 +00:00
tnn
d3e1a14433 The "pkgsrc-i386" target doesn't seem to work on SunOS, so for now fall back
to the "pkgsrc" target which is intended to be portable.
2008-04-27 09:43:12 +00:00