From 35f35294cd5cc3ca32354b1de0e398ad73c70716 Mon Sep 17 00:00:00 2001 From: Zhang Date: Fri, 27 Jul 2007 11:19:35 -0600 Subject: more Mingw32 fixes --- docs/README.MINGW32 | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/README.MINGW32 b/docs/README.MINGW32 index 138dd43eac..9477b2bd31 100644 --- a/docs/README.MINGW32 +++ b/docs/README.MINGW32 @@ -91,9 +91,11 @@ Running the Build: -*******************This section is added by Heromyth***************************** -Updated on 2007-7-21, by Heromyth +******This section is added by Heromyth ************* +==================== +Updated on 2007-7-21 +==================== Notice: 1) The generated DLLs are *not* compatible with the ones built @@ -115,7 +117,7 @@ For example, run: , and delete all the lines where all the wgl*() functions are. Because they would be conflicted with the ones in \include\GL\mesa_wgl.h. -======= Conflicted Functions List ====== +>>>>>>>>>> Conflicted Functions List >>>>>>>>>> WINGDIAPI BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT); WINGDIAPI HGLRC WINAPI wglCreateContext(HDC); WINGDIAPI HGLRC WINAPI wglCreateLayerContext(HDC,int); @@ -134,6 +136,18 @@ WINGDIAPI BOOL WINAPI wglUseFontBitmapsA(HDC,DWORD,DWORD,DWORD); WINGDIAPI BOOL WINAPI wglUseFontBitmapsW(HDC,DWORD,DWORD,DWORD); WINGDIAPI BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT); WINGDIAPI BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT); -=================== +<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + +==================== +Updated on 2007-7-22 +==================== + I havn't thought that I would find a better way to solve my problems so soon. +I changed the method in which the import-libs and DLLs are made. After this update, +the DLLs of MESA are more optimized and more compatible. + It seems that there is no need to keep the building way of 'NO-STDCALL'.The +way of USING_STDCALL is so nice! The file \configs\config.mgw is +also not needed, and can be deleted safely! + + ********************************************************************************* \ No newline at end of file -- cgit v1.2.3 From 9ceff4ac4c1e0179ee5c0f5a1e5ffe8306068571 Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 5 Sep 2007 10:03:32 -0600 Subject: updated bug report guidelines --- docs/bugs.html | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'docs') diff --git a/docs/bugs.html b/docs/bugs.html index d255f4292c..4397339e96 100644 --- a/docs/bugs.html +++ b/docs/bugs.html @@ -9,9 +9,9 @@

Bug Database

-The Mesa bug database is now hosted on -freedesktop.org -instead of SourceForge. +The Mesa bug database is hosted on +freedesktop.org. +The old bug database on SourceForge is no longer used.

@@ -26,16 +26,20 @@ Please follow these bug reporting guidelines:

    -
  • Make sure you're using the most recent version of Mesa -
  • Make sure your bug isn't already reported -
  • Include as much information as possible in the report +
  • Check if a new version of Mesa is available which might have fixed +the problem. +
  • Check if your bug is already reported in the database. +
  • Monitor your bug report for requests for additional information, etc. +
  • If you're reporting a crash, try to use your debugger (gdb) to get a stack +trace. Also, recompile Mesa in debug mode to get more detailed information. +
  • Describe in detail how to reproduce the bug, especially with games +and applications that the Mesa developers might not be familiar with.
  • Provide a simple GLUT-based test program if possible -
  • Check back for follow-ups to the report

-Bug reports will automatically be forwarded to the Mesa developer's mailing -list. +Bug reports will automatically be forwarded by bugzilla to the Mesa +developer's mailing list.

-- cgit v1.2.3 From f5557c3a528fbad3750aaa18595dc3548b600609 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Wed, 12 Sep 2007 09:57:53 -0600 Subject: DESTDIR support. --- docs/install.html | 10 +++++++++- src/glu/Makefile | 4 ++-- src/glut/fbdev/Makefile | 8 ++++---- src/glut/glx/Makefile | 8 ++++---- src/glw/Makefile | 8 ++++---- src/mesa/Makefile | 14 +++++++------- src/mesa/drivers/dri/Makefile.template | 4 ++-- 7 files changed, 32 insertions(+), 24 deletions(-) (limited to 'docs') diff --git a/docs/install.html b/docs/install.html index 804dee59b5..0a36143069 100644 --- a/docs/install.html +++ b/docs/install.html @@ -287,7 +287,15 @@ already installed, you'll have to choose different directories, like To install Mesa's headers and libraries, run make install. But first, check the Mesa/configs/default file and examine the values of the INSTALL_DIR and DRI_DRIVER_INSTALL_DIR variables. -Change them if needed, then run make install +Change them if needed, then run make install. +

+ +

+The variable +DESTDIR may also be used to install the contents to a temporary +staging directory. +This can be useful for package management. +For example: make install DESTDIR=/somepath/

diff --git a/src/glu/Makefile b/src/glu/Makefile index 5ddc50946a..b8c55db6d0 100644 --- a/src/glu/Makefile +++ b/src/glu/Makefile @@ -14,8 +14,8 @@ default: $(TOP)/configs/current done install: - $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) - $(INSTALL) $(TOP)/$(LIB_DIR)/libGLU.* $(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) $(TOP)/$(LIB_DIR)/libGLU.* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) clean: @for dir in $(SUBDIRS) ; do \ diff --git a/src/glut/fbdev/Makefile b/src/glut/fbdev/Makefile index 254ff8c098..d84d52ec48 100644 --- a/src/glut/fbdev/Makefile +++ b/src/glut/fbdev/Makefile @@ -69,10 +69,10 @@ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) $(MKLIB_OPTIONS) $(OBJECTS) install: - $(INSTALL) -d $(INSTALL_DIR)/include/GL - $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) - $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(INSTALL_DIR)/include/GL - $(INSTALL) $(TOP)/$(LIB_DIR)/libglut* $(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(DESTDIR)$(INSTALL_DIR)/include/GL + $(INSTALL) $(TOP)/$(LIB_DIR)/libglut* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) # Run 'make -f Makefile.solo dep' to update the dependencies if you change # what's included by any source file. diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile index 7e1d56b327..b236c6fad3 100644 --- a/src/glut/glx/Makefile +++ b/src/glut/glx/Makefile @@ -97,10 +97,10 @@ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) install: - $(INSTALL) -d $(INSTALL_DIR)/include/GL - $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) - $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(INSTALL_DIR)/include/GL - $(INSTALL) $(TOP)/$(LIB_DIR)/libglut* $(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(DESTDIR)$(INSTALL_DIR)/include/GL + $(INSTALL) $(TOP)/$(LIB_DIR)/libglut* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) clean: diff --git a/src/glw/Makefile b/src/glw/Makefile index 5228cbbb72..778ffb0218 100644 --- a/src/glw/Makefile +++ b/src/glw/Makefile @@ -26,10 +26,10 @@ OBJECTS = $(GLW_SOURCES:.c=.o) default: $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME) install: - $(INSTALL) -d $(INSTALL_DIR)/include/GL - $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) - $(INSTALL) -m 644 *.h $(INSTALL_DIR)/include/GL - $(INSTALL) $(TOP)/$(LIB_DIR)/libGLw.* $(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_DIR)/include/GL + $(INSTALL) $(TOP)/$(LIB_DIR)/libGLw.* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) clean: -rm depend depend.bak diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 6943219036..a50e826701 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -149,22 +149,22 @@ subdirs: install: default - $(INSTALL) -d $(INSTALL_DIR)/include/GL - $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR) - $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) + $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(DESTDIR)$(INSTALL_DIR)/include/GL @if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \ - $(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(INSTALL_DIR)/$(LIB_DIR); \ + $(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \ fi @if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \ - $(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* $(INSTALL_DIR)/$(LIB_DIR); \ + $(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \ fi @if [ "${DRIVER_DIRS}" = "dri" ] ; then \ cd drivers/dri ; $(MAKE) install ; \ fi ## NOT INSTALLED YET: -## $(INSTALL) -d $(INSTALL_DIR)/include/GLES -## $(INSTALL) -m 644 include/GLES/*.h $(INSTALL_DIR)/include/GLES +## $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GLES +## $(INSTALL) -m 644 include/GLES/*.h $(DESTDIR)$(INSTALL_DIR)/include/GLES # Emacs tags diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index adf30ef41e..3576d0bac8 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -95,8 +95,8 @@ clean: install: $(LIBNAME) - $(INSTALL) -d $(DRI_DRIVER_INSTALL_DIR) - $(INSTALL) -m 755 $(LIBNAME) $(DRI_DRIVER_INSTALL_DIR) + $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR) + $(INSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR) include depend -- cgit v1.2.3 From 5bba58ca2215a3c3827e4bbb280eab7ceaa913e9 Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 12 Sep 2007 10:11:49 -0600 Subject: updated with pkg-config info --- docs/install.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'docs') diff --git a/docs/install.html b/docs/install.html index 0a36143069..041e27b833 100644 --- a/docs/install.html +++ b/docs/install.html @@ -306,6 +306,26 @@ This is a handy way to compare multiple OpenGL implementations.

+

1.5 pkg-config support

+ +

+Running make install will install package configuration files +for the pkg-config utility. +

+ +

+When compiling your OpenGL application you can use pkg-config to determine +the proper compiler and linker flags. +

+ +

+For example, compiling and linking a GLUT application can be done with: +

+
+   gcc `pkg-config --cflags --libs glut` mydemo.c -o mydemo
+
+ +

2. Windows Compilation and Installation

-- cgit v1.2.3 From d3c77cebff75aea4fe4ce3352fa6ba8fb9c0e09e Mon Sep 17 00:00:00 2001 From: Brian Date: Thu, 13 Sep 2007 14:44:27 -0600 Subject: updated vrml link --- docs/modelers.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/modelers.html b/docs/modelers.html index b93f4d8b76..aae9686959 100644 --- a/docs/modelers.html +++ b/docs/modelers.html @@ -28,7 +28,7 @@
  • Innovation3D - 3D modeling program
  • KWRL - VRML browser -
  • LibVRML97/Lookat +
  • LibVRML97/Lookat - VRML viewer
  • Maverik - VR graphics and interaction system -- cgit v1.2.3 From f2d9a07efe0d6967b0b4583e18db3ac571a3dd33 Mon Sep 17 00:00:00 2001 From: Brian Date: Thu, 27 Sep 2007 10:35:37 -0600 Subject: for Miniglx, use git sources --- docs/fbdev-dri.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs') diff --git a/docs/fbdev-dri.html b/docs/fbdev-dri.html index c7f59bb0c2..0d9e52cee4 100644 --- a/docs/fbdev-dri.html +++ b/docs/fbdev-dri.html @@ -28,6 +28,12 @@ Xlib interfaces allowing some degree of application portability between the X and X-less environments.

    +

    +Some of the files needed for building this configuration are not included +in the normal Mesa releases so you'll need to get the latest sources +sources from the git repository. +

    +

    2. Compilation

    -- cgit v1.2.3 From e776e7a95a4fc4fac95048665ab4c981e153b7fb Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 28 Sep 2007 18:39:41 -0600 Subject: update the DRM/DRI instructions --- docs/install.html | 53 +++++++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 36 deletions(-) (limited to 'docs') diff --git a/docs/install.html b/docs/install.html index 041e27b833..4cd0d4c9dc 100644 --- a/docs/install.html +++ b/docs/install.html @@ -57,50 +57,31 @@ the DRI hardware drivers.

  • -DRM kernel modules and header files from the -DRI project. +For Mesa 7.0.2 +DRM version 2.3 is required.

    -

    -If you don't already have the DRM file, you can get the sources from -CVS by doing: -

    -cvs -z3 -d:pserver:anonymous@anoncvs.freedesktop.org:/cvs/dri co drm
-
    -

    -See the -DRI Building Instructions for the steps to build the DRM modules. Mesa -6.5 requires at least libdrm 2.0.1 or greater. -

    -

    -You can verify that the DRM files have been properly installed by -running pkg-config --modversion libdrm - -

    • - -
  • -Recent /usr/include/GL/glxproto.h file. -

    You'll need this if you get any errors about _GLXvop_BindTexImageEXT -being undefined. +To check if you already have it, run: +
    +pkg-config --modversion libdrm

    -Download/install the -glproto -module from X.org git, or grab the -glxproto.h file and put it in the -Mesa/include/GL/ directory. +You can download and install a +tarball release or get the code from git with: +
    +git clone git://anongit.freedesktop.org/git/mesa/drm +
    +Then revert to the drm-2.3.0 tag with: +
    +git-reset --hard drm-2.3.0

    -
    • -
  • DRI-enabled X server. -

    Visit -XFree86 -or +

  • +Relatively recent -X.org -for more information. -

    +X.org release. +Mesa depends on a number of X header and library files.
    • -- cgit v1.2.3 From de1d725f442caa4d8ecbac3256b5a33d1f4a1257 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 1 Oct 2007 17:55:33 -0600 Subject: updated glext.h license info (Khronos), plus other clean-ups --- docs/license.html | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'docs') diff --git a/docs/license.html b/docs/license.html index 944a5ddf00..44b980d93d 100644 --- a/docs/license.html +++ b/docs/license.html @@ -86,29 +86,32 @@ and their respective licenses.

    Mesa Component Licenses

    -Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
+Component         Location               License
+------------------------------------------------------------------
+Main Mesa code    src/mesa/              Mesa (MIT)
 
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
+Device drivers    src/mesa/drivers/*     MIT, generally
 
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
+Ext headers       include/GL/glext.h     Khronos
                   include/GL/glxext.h
 
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
+GLUT              src/glut/              Mark Kilgard's copyright
 
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
+SGI GLU library   src/glu/sgi/           SGI Free B
 
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
+demo programs     progs/demos/           see source files
 
-demo programs     progs/demos/           various             see source files
+X demos           progs/xdemos/          see source files
 
-X demos           progs/xdemos/          Brian Paul          see source files
+SGI demos         progs/samples/         SGI license
 
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
+RedBook demos     progs/redbook/         SGI license
    +

    +In general, consult the source files for license terms. +

    + + -- cgit v1.2.3