summaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
* mesa: fix html in shortlog_mesa.sh scriptAndreas Boll2012-06-141-4/+4
| | | | Signed-off-by: Brian Paul <brianp@vmware.com>
* mesa: added Ian's shortlog_mesa.sh script in bin/Brian Paul2012-06-141-0/+23
|
* automake: Add AM_PROG_AR before LT_INIT to silence a lot of warnings.Kenneth Graunke2012-06-111-0/+1
| | | | | | | The warnings appear to occur with newer automake (probably 1.12). Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
* automake: Move top-level makefile to automake.Eric Anholt2012-06-111-20/+0
| | | | | | | | | This is part of a series to fix our build issues in the automake case by hooking up the automatic Makefile regeneration support. The extract_git_sha1 is moved into src/mesa/Makefile so that we get correct dependency generation. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
* mesa: Move the version information right into configure.ac.Eric Anholt2012-06-111-17/+0
| | | | | | Nothing else called version.mk. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
* Add bin/compile to .gitignorePaul Berry2012-05-081-0/+1
| | | | Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
* bin/mklib: remove '-m32' for arm linuxHan Shen(沈涵)2012-04-231-2/+6
| | | | | | | | -m32 is not a valid option for ARM. NOTE: This is a candidate for the 8.0 branch. Signed-off-by: Brian Paul <brianp@vmware.com>
* Remove autoreconf generated filesMatt Turner2012-01-304-3241/+3
| | | | | Acked-by: Eric Anholt <eric@anholt.net> Signed-off-by: Matt Turner <mattst88@gmail.com>
* autoconf: use AC_PROG_YACC/LEXMatt Turner2012-01-301-0/+1
| | | | | | | | | | | Needed for automake. Using AC_PROG_PATH(bison/flex) causes automake to fail to build .y and .l files. It is up to the builder to use bison/flex instead of yacc/lex. Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Eric Anholt <eric@anholt.net> Signed-off-by: Matt Turner <mattst88@gmail.com>
* Add .gitignore files to exclude unit test build artifacts from gitPaul Berry2012-01-051-0/+2
| | | | | | | | | | | | | | | | | | | | With the addition of unit tests in commit 3ef3ba4d2eee36f64062a21ce030c3f4d8c4cac4, several additional build artifacts are created: bin/depcomp bin/missing tests/Makefile tests/Makefile.in tests/glx/Makefile tests/glx/Makefile.in tests/glx/.deps/ tests/glx/.gitignore This patch adds all of these files to .gitignore. Acked-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
* mklib: tab cleanup, no functional changeAlexander von Gluck2011-12-271-1/+1
| | | | | Reviewed-by: Brian Paul <brianp@vmare.com> Signed-off-by: Brian Paul <brianp@vmware.com>
* mklib: Add Haiku build supportAlexander von Gluck2011-12-261-0/+37
| | | | Signed-off-by: Brian Paul <brianp@vmware.com>
* mklib: fix static lib building by filtering out -L, -l optionsWayne E. Robertz2011-11-101-1/+1
| | | | Signed-off-by: Brian Paul <brianp@vmware.com>
* mesa: Remove support for BeOSIan Romanick2011-08-261-16/+0
| | | | | | | | | | Acked-by: Kristian Høgsberg <krh@bitplanet.net> Acked-by: Marek Olšák <maraeo@gmail.com> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com> Acked-by: Jakob Bornecrantz <jakob@vmware.com> Acked-by: Dave Airlie <airlied@redhat.com> Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com> Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
* darwin: mklib: Make the real file match the idJeremy Huddleston2011-06-081-8/+3
| | | | | | | This makes mesa more consistent with glibtool and XCode where the generated file matches the dylib id rather using an extra symlink Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
* mesa: don't call git if it's not git repositoryMarcin Slusarz2011-05-051-0/+4
| | | | | Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
* mesa: don't touch git_sha1.h if sha1 didn't changeMarcin Slusarz2011-05-051-2/+8
| | | | | Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
* mesa: Include GIT SHA1 in GL version stringIan Romanick2011-04-051-0/+10
| | | | | | Reviewed-by: Corbin Simpson <MostAwesomeDude@gmail.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
* mesa: fix build for NetBSDPierre Allegraud2011-01-061-15/+1
| | | | | | | | See http://bugs.freedesktop.org/show_bug.cgi?id=32859 NOTE: This is a candidate for the 7.9 and 7.10 branches. Signed-off-by: Brian Paul <brianp@vmware.com>
* Cygwin: Adjust mklib so -linker and -cplusplus options are processed more ↵Jon TURNEY2010-09-011-6/+10
| | | | | | | | | | like they are for linux It looks like we were ignoring -linker when -noprefix wasn't present, and when -noprefix was present, -linker was mandatory and -cplusplus ignored. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Brian Paul <brianp@vmware.com>
* Cygwin: Teach mklib/minstall to properly install libraries on cygwinJon TURNEY2010-09-012-1/+25
| | | | | | | | | | | | | | | | Teach mklib/minstall more about cygwin so libraries are properly installed Have mklib install the .dll into the lib/ staging directory as well Have minstall install the .dll into PREFIX/bin at the same time as installing the .dll.a link library into PREFIX/lib mklib uses a '-' rather than a '.' as the separator before the version number in library names on cygwin. Change the install globs so they match library names like that. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Brian Paul <brianp@vmware.com>
* Cygwin: Change mklib not to report the full archname on cygwinJon TURNEY2010-09-011-2/+2
| | | | | | | | | Change mklib not to report the full archname when building a library for cygwin (which is something like 'CYGWIN_NT-5.1' or 'CYGWIN_NT-6.1-WOW64' and kind of confusing), but just 'CYGWIN'. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Brian Paul <brianp@vmware.com>
* Cygwin: Have mklib exit with error code if link failsJon TURNEY2010-09-011-7/+2
| | | | | Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Brian Paul <brianp@vmware.com>
* mklib: Fix amd64 builds on Solaris when using Sun compilersAlan Coopersmith2010-03-121-4/+7
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
* bin: Remove raw2png.py.José Fonseca2010-03-011-366/+0
| | | | Outdated, broken, and unused.
* Fixed mklib to properly merge static libraries on darwin.Alex Weiss2010-02-281-2/+10
| | | | Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
* bin/mklib: Clear CDPATH to avoid damaging expand_archive outputKeith Packard2010-02-221-0/+4
| | | | | | | | | | | The bash 'cd' command tends to emit random stuff to stdout when the CDPATH variable is set, so clear it to keep extra filenames from being emitted from the expand_archive function, which would otherwise cause mklib to fail. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Brian Paul <brianp@vmware.com>
* Cygwin build fix: Fix linkageJon TURNEY2010-02-201-1/+8
| | | | | | | | | | | | Fix the way we make static convenience libraries, such as libmesa.a, to be the same as linux etc. Putting archives inside archives doesn't make the objects inside the archive linkable, so use expand_archives() to get all the objects inside an archive out again before linking. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Brian Paul <brianp@vmware.com>
* Revert "Make mklib propogate all errors"Dan Nicholson2010-02-181-8/+0
| | | | | | | | This reverts commit d6f55492af3cb82b0113fe6beac0f3494b6e2956. It's both not portable and not safe to trap & exit on ERR. This will need to use a more invasive approach that tests return code only for selected, important commands.
* mklib: remove unused -contents_of_archives(), add commentsBrian Paul2010-02-181-21/+4
|
* Make mklib propogate all errorsJon TURNEY2010-02-181-0/+6
| | | | | Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Brian Paul <brianp@vmware.com>
* mklib: Teach mklib to fail build if link fails on cygwinBrian Paul2010-02-181-0/+5
| | | | | | | Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 551c96979e643b409535afe868c42cac0d2285ad)
* mklib: Fix static library generation/installation on SolarisAlan Coopersmith2010-01-191-1/+1
| | | | | | | | Change ar flag from -v (-verbose) to -c (silence console output) so that it stops causing make_ar_static_lib() to return a bunch of output other than the resulting library file. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
* mklib: Extract archives into temporary directoriesDan Nicholson2010-01-081-5/+17
| | | | | | | | | | | | | | | | When static libraries are created from other archives, objects are extracted and then deleted when the static library is done. This can race when there are multiple static libraries being created from the same archives as with libmesa.a and libmesagallium.a. Should fix this issue with parallel jobs: make[5]: *** No rule to make target > `../../../../../../src/mesa/libmesagallium.a', needed by > `radeon_dri.so'. Stop Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Reported-and-Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
* mklib: use a wrapper for arBrian Paul2009-12-301-50/+48
|
* mklib: put usage info into usage() functionBrian Paul2009-12-241-27/+33
|
* mklib: expand .a into .o files on FreeBSD, put common code into subroutinesBrian Paul2009-12-241-25/+64
|
* darwin: mklib: Use lipo rather than file to figure out architectures of ↵Jeremy Huddleston2009-12-201-16/+4
| | | | object files
* util: Remove homegrown Windows KM profiler.José Fonseca2009-11-041-309/+0
| | | | | It's not sampling based so its results are biased towards functions called many times.
* mklib: Ensure target directory exists for libraryDan Nicholson2009-08-041-0/+1
| | | | | | | | Instead of relying on the Makefile to always generate $(TOP)/$(LIB_DIR), just have mklib handle creating the directory. This should fix any races when using parallel make. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
* Cygwin build fixesJon TURNEY2009-06-081-3/+16
| | | | | | | Fix mklib to deal with NOPREFIX and use --enable-auto-image-base for cygwin Teach configure.ac some basic facts about cygwin Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
* minstall: Don't copy over an identical fileCarl Worth2009-05-211-2/+5
| | | | | | | The rationale here is to avoid updating a timestamp for a file that hasn't changed. Needless updates of the timestamp can ripple into other projects, (xserver, etc.), useless recompiling due to a 'make install' in mesa that didn't actually change anything.
* mklib: replace if/expr with caseTormod Volden2009-04-301-12/+15
| | | | Saves forking an expr for every object.
* mesa: Prepend "-Wl," to linking optionsTormod Volden2009-04-301-0/+17
| | | | | Let mklib ignore -Wl options inside the object list when building static libraries
* mklib improvements for SolarisAlan Coopersmith2009-03-251-1/+27
| | | | | | | | | Move flags for linking standard C/C++ libraries from configure.ac to mklib Use -norunpath flag when linking with Sun C++ compiler Convert mklib -exports list into a linker mapfile Set FINAL_LIBS correctly when -noprefix is used Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
* autoconf: Update config.guess and config.sub from upstreamDan Nicholson2009-03-032-34/+132
| | | | | Grabbed the latest copies from the GNU config repo at http://git.savannah.gnu.org/cgit/config.git .
* Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-10-101-1/+23
|\ | | | | | | | | | | | | Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms
| * mesa: fix static library constructionBrian Paul2008-10-061-1/+23
| | | | | | | | If the .a is made of other .a files, extract the objects from the later.
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-112-0/+675
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
| * raw2png: Fix channel order in a8b8g8r8/x8b8g8r8 formats.José Fonseca2008-08-071-3/+11
| |