Mesa (master): Squashed commit of the following:

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Jul 14 10:05:42 PDT 2011


Module: Mesa
Branch: master
Commit: 9a7f84d6b28e180ef79349b36de9a5d58a1e2dc9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a7f84d6b28e180ef79349b36de9a5d58a1e2dc9

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Jul 14 17:28:52 2011 +0100

Squashed commit of the following:

commit 1856230d9fa61710cce3e152b8d88b1269611a73
Author: José Fonseca <jose.r.fonseca at gmail.com>
Date:   Tue Jul 12 23:41:27 2011 +0100

    make: Use better var names on packaging.

commit d1ae72d0bd14e820ecfe9f8f27b316f9566ceb0c
Author: José Fonseca <jose.r.fonseca at gmail.com>
Date:   Tue Jul 12 23:38:21 2011 +0100

    make: Apply several of Dan Nicholson's suggestions.

commit f27cf8743ac9cbf4c0ad66aff0cd3f97efde97e4
Author: José Fonseca <jose.r.fonseca at gmail.com>
Date:   Sat Jul 9 14:18:20 2011 +0100

    make: Put back the tar.bz2 creation rule.

    Removed by accident.

commit 34983337f9d7db984e9f0117808274106d262110
Author: José Fonseca <jose.r.fonseca at gmail.com>
Date:   Sat Jul 9 11:59:29 2011 +0100

    make: Determine tarballs contents via git ls-files.

    The wildcards were a mess:
    - lots of files for non Linux platforms missing
    - several files listed and archived twice

    Using git-ls-files ensures things are not loss when making the tarballs.

commit 34a28ccbf459ed5710aafba5e7149e8291cb808c
Author: José Fonseca <jose.r.fonseca at gmail.com>
Date:   Sat Jul 9 11:07:14 2011 +0100

    glut: Remove GLUT source.

    Most distros ship freeglut, and most people don't care one vs the other,
    and it hasn't been really maintained.

    So it is better to have Mesa GLUT be revisioned and built separately
    from Mesa.

commit 5c26a2c3c0c7e95ef853e19d12d75c4f80137e7d
Author: José Fonseca <jose.r.fonseca at gmail.com>
Date:   Sat Jul 9 10:31:02 2011 +0100

    Ignore the tarballs.

commit 26edecac589819f0d0efe2165ab748dbc4e53394
Author: José Fonseca <jose.r.fonseca at gmail.com>
Date:   Sat Jul 9 10:30:24 2011 +0100

    make: Create the Mesa-xxx-devel symlink automatically.

    Also actually remote the intermediate uncompressed tarballs.

---

 .gitignore                         |    5 +
 Makefile                           |  363 +----
 configs/aix                        |    2 -
 configs/aix-64                     |    2 -
 configs/aix-64-static              |    1 -
 configs/aix-gcc                    |    1 -
 configs/aix-static                 |    1 -
 configs/autoconf.in                |    9 -
 configs/beos                       |    3 +-
 configs/darwin                     |    5 +-
 configs/default                    |   11 +-
 configs/freebsd                    |    1 -
 configs/freebsd-dri                |    3 +-
 configs/hpux10-gcc                 |    1 -
 configs/hpux10-static              |    2 -
 configs/hpux11-32                  |    2 -
 configs/hpux11-32-static           |    1 -
 configs/hpux11-32-static-nothreads |    1 -
 configs/hpux11-64                  |    2 -
 configs/hpux11-64-static           |    1 -
 configs/hpux11-ia64                |    2 -
 configs/hpux11-ia64-static         |    1 -
 configs/irix6-64-static            |    1 -
 configs/irix6-n32-static           |    3 +-
 configs/irix6-o32-static           |    3 +-
 configs/linux                      |    1 -
 configs/linux-alpha                |    2 -
 configs/linux-alpha-static         |    3 -
 configs/linux-cell                 |    2 +-
 configs/linux-dri                  |    1 -
 configs/linux-dri-xcb              |    2 +-
 configs/linux-fbdev                |    2 -
 configs/linux-ia64-icc             |    2 -
 configs/linux-ia64-icc-static      |    3 -
 configs/linux-icc                  |    2 -
 configs/linux-icc-static           |    3 -
 configs/linux-indirect             |    2 +-
 configs/linux-osmesa-static        |    2 -
 configs/linux-ppc-static           |    1 -
 configs/linux-static               |    2 -
 configs/linux-x86-64-static        |    2 -
 configs/linux-x86-static           |    2 -
 configs/netbsd                     |    1 -
 configs/openbsd                    |    1 -
 configs/osf1                       |    1 -
 configs/osf1-static                |    1 -
 configs/solaris-x86                |    3 +-
 configs/solaris-x86-gcc            |    2 -
 configs/solaris-x86-gcc-static     |    3 -
 configs/sunos4-gcc                 |    1 -
 configs/sunos4-static              |    2 -
 configs/sunos5                     |    2 -
 configs/sunos5-gcc                 |    2 -
 configs/sunos5-smp                 |    2 -
 configs/sunos5-v8                  |    2 -
 configs/sunos5-v8-static           |    1 -
 configs/sunos5-v9                  |    2 -
 configs/sunos5-v9-cc-g++           |    2 -
 configs/sunos5-v9-static           |    1 -
 configs/ultrix-gcc                 |    2 -
 configure.ac                       |   60 -
 docs/autoconf.html                 |    8 -
 docs/devinfo.html                  |    6 -
 docs/download.html                 |    5 +-
 docs/faq.html                      |    6 +-
 docs/license.html                  |    8 +-
 docs/sourcetree.html               |    1 -
 include/GL/glut.h                  |  665 --------
 include/GL/glutf90.h               |   81 -
 src/SConscript                     |    1 -
 src/glut/beos/Makefile             |   99 --
 src/glut/beos/beos_x11.cpp         |  180 ---
 src/glut/beos/beos_x11.h           |   33 -
 src/glut/beos/glutBlocker.cpp      |   69 -
 src/glut/beos/glutBlocker.h        |   47 -
 src/glut/beos/glutCallback.cpp     |  171 --
 src/glut/beos/glutColor.cpp        |   32 -
 src/glut/beos/glutCursor.cpp       |   90 --
 src/glut/beos/glutCursors.h        | 3083 ------------------------------------
 src/glut/beos/glutDstr.cpp         |   83 -
 src/glut/beos/glutEvent.cpp        |  695 --------
 src/glut/beos/glutGet.cpp          |  211 ---
 src/glut/beos/glutInit.cpp         |  263 ---
 src/glut/beos/glutMenu.cpp         |  326 ----
 src/glut/beos/glutMenu.h           |   84 -
 src/glut/beos/glutOverlay.cpp      |   47 -
 src/glut/beos/glutState.h          |   71 -
 src/glut/beos/glutWindow.cpp       |  633 --------
 src/glut/beos/glutWindow.h         |  119 --
 src/glut/beos/glut_8x13.c          | 2073 ------------------------
 src/glut/beos/glut_9x15.c          | 2075 ------------------------
 src/glut/beos/glut_bitmap.c        |   57 -
 src/glut/beos/glut_bwidth.c        |   58 -
 src/glut/beos/glut_ext.c           |  201 ---
 src/glut/beos/glut_hel10.c         | 1778 ---------------------
 src/glut/beos/glut_hel12.c         | 1788 ---------------------
 src/glut/beos/glut_hel18.c         | 1897 ----------------------
 src/glut/beos/glut_mroman.c        | 2451 ----------------------------
 src/glut/beos/glut_roman.c         | 2451 ----------------------------
 src/glut/beos/glut_shapes.c        |  596 -------
 src/glut/beos/glut_stroke.c        |   42 -
 src/glut/beos/glut_swidth.c        |   58 -
 src/glut/beos/glut_teapot.c        |  210 ---
 src/glut/beos/glut_tr10.c          | 1777 ---------------------
 src/glut/beos/glut_tr24.c          | 2060 ------------------------
 src/glut/beos/glut_util.c          |   81 -
 src/glut/beos/glut_vidresize.c     |  230 ---
 src/glut/beos/glutbitmap.h         |   30 -
 src/glut/beos/glutint.h            |  814 ----------
 src/glut/beos/glutstroke.h         |   42 -
 src/glut/glx/Makefile              |  140 --
 src/glut/glx/Makefile.cygnus       |  110 --
 src/glut/glx/Makefile.mgw          |  191 ---
 src/glut/glx/Makefile.sgi          |  189 ---
 src/glut/glx/Makefile.win          |   99 --
 src/glut/glx/SConscript            |  111 --
 src/glut/glx/capturexfont.c        |  357 -----
 src/glut/glx/fxglut.def            |  103 --
 src/glut/glx/glut.def              |  125 --
 src/glut/glx/glut.pc.in            |   13 -
 src/glut/glx/glut_8x13.c           | 2074 ------------------------
 src/glut/glx/glut_9x15.c           | 2076 ------------------------
 src/glut/glx/glut_bitmap.c         |   57 -
 src/glut/glx/glut_bwidth.c         |   58 -
 src/glut/glx/glut_cindex.c         |  252 ---
 src/glut/glx/glut_cmap.c           |  422 -----
 src/glut/glx/glut_cursor.c         |  201 ---
 src/glut/glx/glut_dials.c          |   26 -
 src/glut/glx/glut_dstr.c           | 1626 -------------------
 src/glut/glx/glut_event.c          | 1391 ----------------
 src/glut/glx/glut_ext.c            |  201 ---
 src/glut/glx/glut_fcb.c            |  164 --
 src/glut/glx/glut_fullscrn.c       |   55 -
 src/glut/glx/glut_gamemode.c       |  677 --------
 src/glut/glx/glut_get.c            |  220 ---
 src/glut/glx/glut_glxext.c         |  255 ---
 src/glut/glx/glut_hel10.c          | 1779 ---------------------
 src/glut/glx/glut_hel12.c          | 1789 ---------------------
 src/glut/glx/glut_hel18.c          | 1898 ----------------------
 src/glut/glx/glut_init.c           |  393 -----
 src/glut/glx/glut_input.c          |  644 --------
 src/glut/glx/glut_joy.c            |   85 -
 src/glut/glx/glut_key.c            |   29 -
 src/glut/glx/glut_keyctrl.c        |   29 -
 src/glut/glx/glut_keyup.c          |   29 -
 src/glut/glx/glut_menu.c           | 1023 ------------
 src/glut/glx/glut_menu2.c          |  188 ---
 src/glut/glx/glut_mesa.c           |   57 -
 src/glut/glx/glut_modifier.c       |   31 -
 src/glut/glx/glut_mroman.c         | 2454 ----------------------------
 src/glut/glx/glut_overlay.c        |  608 -------
 src/glut/glx/glut_ppm.c            |   80 -
 src/glut/glx/glut_roman.c          | 2454 ----------------------------
 src/glut/glx/glut_shapes.c         |  596 -------
 src/glut/glx/glut_space.c          |   35 -
 src/glut/glx/glut_stroke.c         |   42 -
 src/glut/glx/glut_swap.c           |   71 -
 src/glut/glx/glut_swidth.c         |   58 -
 src/glut/glx/glut_tablet.c         |   33 -
 src/glut/glx/glut_teapot.c         |  210 ---
 src/glut/glx/glut_tr10.c           | 1778 ---------------------
 src/glut/glx/glut_tr24.c           | 2061 ------------------------
 src/glut/glx/glut_util.c           |   86 -
 src/glut/glx/glut_vidresize.c      |  231 ---
 src/glut/glx/glut_warp.c           |   23 -
 src/glut/glx/glut_win.c            | 1035 ------------
 src/glut/glx/glut_winmisc.c        |  124 --
 src/glut/glx/glutbitmap.h          |   32 -
 src/glut/glx/glutint.h             |  798 ----------
 src/glut/glx/glutstroke.h          |   46 -
 src/glut/glx/glutwin32.h           |   97 --
 src/glut/glx/layerutil.c           |  203 ---
 src/glut/glx/layerutil.h           |   59 -
 src/glut/glx/stroke.h              |  133 --
 src/glut/glx/win32_glx.c           |  256 ---
 src/glut/glx/win32_glx.h           |   58 -
 src/glut/glx/win32_menu.c          |  529 ------
 src/glut/glx/win32_util.c          |  121 --
 src/glut/glx/win32_winproc.c       |  792 ---------
 src/glut/glx/win32_x11.c           |  399 -----
 src/glut/glx/win32_x11.h           |  324 ----
 181 files changed, 74 insertions(+), 63357 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=9a7f84d6b28e180ef79349b36de9a5d58a1e2dc9


More information about the mesa-commit mailing list