Changeset 132829


Ignore:
Timestamp:
Feb 11, 2015, 10:04:22 AM (6 years ago)
Author:
jeremyhu@…
Message:

mesa: Bump to 10.4.4 and move libGLU to a separate port

This also removes support for the +iglx variant and moves libOSMesa to a new variant (+osmesa).

Location:
trunk/dports/x11
Files:
7 added
13 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/x11/mesa/Portfile

    r121269 r132829  
    66name                mesa
    77epoch               1
    8 version             8.0.5
    9 revision            3
     8version             10.4.4
    109categories          x11 graphics
    1110maintainers         jeremyhu openmaintainer
     
    2019platforms           macosx darwin
    2120use_bzip2           yes
    22 master_sites        ftp://ftp.freedesktop.org/pub/mesa/older-versions/8.x/${version}/ \
    23                     ftp://ftp.freedesktop.org/pub/mesa/${version}/
    24 checksums           sha1    c30ef84363dc9ace0504bd5bcae14cfc718f1d62 \
    25                     rmd160  c4b2547a95950ea07708251a5f260888267d5cd0 \
    26                     sha256  511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e
    27 
    28 depends_build       bin:makedepend:makedepend \
    29                     bin:tclsh8.5:tcl
     21master_sites        ftp://ftp.freedesktop.org/pub/mesa/${version}/
     22checksums           sha1    4d5b2cc992a21cdef07da5ccd7a705039df6f094 \
     23                    rmd160  3a6ebe589d73d10f0127f70684d744a434c5156c \
     24                    sha256  f18a967e9c4d80e054b2fdff8c130ce6e6d1f8eecfc42c9f354f8628d8b4df1c
    3025
    3126depends_lib         port:xorg-glproto \
     
    3530                    port:xorg-libXmu
    3631
     32patch.pre_args      -p1
    3733patchfiles \
    38     patch-src-mapi-vgapi-Makefile.diff \
    39     0003-mesa-fix-per-level-max-texture-size-error-checking.patch \
    40     0008-glsl-initialise-const-force-glsl-extension-warning-i.patch \
    41     0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch \
    42     0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch \
    43     0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch \
    44     0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch \
    45     1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch \
    46     1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch \
    47     1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
    48 patch.pre_args -p1
     34    0001-darwin-build-fix.patch \
     35    0002-darwin-build-fix.patch \
     36    5001-swrast-Build-fix-for-darwin.patch \
     37    5002-darwin-Suppress-type-conversion-warnings-for-GLhandl.patch \
     38    5003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
    4939
    50 use_configure  no
    51 use_parallel_build yes
     40use_autoreconf      yes
     41autoreconf.args     -fvi
    5242
    53 build.target darwin
    54 build.args-append INSTALL_DIR=${prefix}
    55 destroot.args-append INSTALL_DIR=${prefix}
    56 
    57 variant universal {}
    58 build.args-append RC_CFLAGS="[get_canonical_archflags]"
     43configure.args \
     44    --disable-silent-rules \
     45    --disable-egl \
     46    --disable-osmesa \
     47    --disable-openvg \
     48    --with-gallium-drivers=
    5949
    6050if { ![file exists /usr/include/Xplugin.h] } {
     
    6353}
    6454
    65 set cxx_stdlibflags {}
    66 if {[string match *clang* ${configure.cxx}]} {
    67     set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    68 }
    69 
    7055configure.cppflags-delete -I${prefix}/include
    71 
    72 post-extract {
    73     if {! [file exists "${worksrcpath}/configs/current"]} {
    74         ln -s darwin ${worksrcpath}/configs/current
    75     }
    76 }
    77 
    78 post-patch {
    79     # Ensure correct compilers are used in mklib.
    80     reinplace "s:LINK=\"g++\":LINK=\"${configure.cxx} ${cxx_stdlibflags}\":"  ${worksrcpath}/bin/mklib
    81     reinplace "s:LINK=\"cc\":LINK=\"${configure.cc}\":"    ${worksrcpath}/bin/mklib
    82 }
    8356
    8457pre-configure {
     
    9063}
    9164
    92 pre-build {
    93     build.args-append \
    94         CC="${configure.cc} ${configure.cppflags}" \
    95         CXX="${configure.cxx} ${configure.cppflags} ${cxx_stdlibflags}"
    96 }
    97 
    98 variant iglx description {Install a libGL that uses your X11 server's indirect GLX path for rendering (the default is off which allows libGL to accelerate rendering using OpenGL.framework)} {
    99     patchfiles-append iglx.patch
    100 }
    101 
    10265variant python26 conflicts python27 description {Use python 2.6} {
    10366    depends_build-append \
    10467        port:py26-libxml2
    105     build.args-append \
     68    configure.env-append \
    10669        PYTHON2="${prefix}/bin/python2.6"
    10770}
     
    11073    depends_build-append \
    11174        port:py27-libxml2
    112     build.args-append \
     75    configure.env-append \
    11376        PYTHON2="${prefix}/bin/python2.7"
    11477}
    11578
    11679if {![variant_isset python26] && ![variant_isset python27]} {
    117     default_variants +python27
     80    default_variants-append +python27
    11881}
    11982
    120 platform darwin 8 {
    121     patchfiles-append tiger-exports.patch
     83variant osmesa description {enable OSMesa library} {
     84    configure.args-delete --disable-osmesa
     85    configure.args-append --enable-osmesa
     86}
     87default_variants-append +osmesa
    12288
    123     # https://trac.macports.org/ticket/24345
    124     # https://trac.macports.org/ticket/24393
    125     # https://trac.macports.org/ticket/29860
    126     if {${build_arch} eq "ppc"} {
    127         patchfiles-append patch-src-mesa-Makefile.diff
    128         post-patch {
    129             reinplace "/SRC_DIRS/ s/gallium//" ${worksrcpath}/configs/darwin
    130         }
    131     }
    132    
    133     post-patch {
    134         # These are being comented out to find out if they're still broken
    135         # 6/6/2011
    136         #reinplace "/SRC_DIRS/ s/mesa//" ${worksrcpath}/configs/darwin
    137 
    138         # libOSMesa fails on Tiger, too...
    139         #reinplace "/DRIVER_DIRS/ s/osmesa//" ${worksrcpath}/configs/darwin
    140 
    141         # http://trac.macports.org/ticket/24366
    142         reinplace "s:-fno-strict-aliasing:-fno-strict-aliasing -fno-common:g" ${worksrcpath}/configs/darwin
    143     }
    144 }
     89#variant openvg description {enable support for OpenVG API} {
     90#    configure.args-delete --disable-egl --disable-openvg
     91#    configure.args-append --enable-egl --enable-openvg
     92#}
     93#default_variants-append +openvg
    14594
    14695livecheck.type  regex
Note: See TracChangeset for help on using the changeset viewer.