Changeset 100203 for trunk/dports/aqua


Ignore:
Timestamp:
Dec 3, 2012, 5:58:28 PM (7 years ago)
Author:
michaelld@…
Message:

qt4-mac :

  • remove building of the remaining sqlite plugin; it will be moved to a plugin port.
  • add variant supporting OpenVG.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/qt4-mac/Portfile

    r100149 r100203  
    1313conflicts           qt3 qt3-mac qt4-mac-devel
    1414version             4.8.4
     15revision            1
    1516categories          aqua
    1617platforms           macosx
     
    3334
    3435depends_lib-append  port:zlib path:bin/dbus-daemon:dbus \
    35                     port:openssl port:sqlite3 port:tiff \
     36                    port:openssl port:tiff \
    3637                    port:libpng port:libmng port:jpeg
    3738
     
    388389set library_path [ list ${prefix}/lib ]
    389390
    390 # -system-sqlite ensures the use SQLite provided by MacPorts instead of Qt.
    391 #
    392391# -dbus-linked prevends qt4 from trying to dynamically load libdbus-1,
    393392#     which it is not able to find in ${prefix}.
     
    423422    -examplesdir     ${qt_examples_dir}                   \
    424423    -demosdir        ${qt_demos_dir}                      \
    425     -system-sqlite                                        \
    426424    -openssl-linked                                       \
    427425    -dbus-linked                                          \
     
    439437}
    440438
    441 # By default, disable most SQL Drivers.
    442 # There must be at least one enabled (http://trac.macports.org/ticket/15627).
    443 # SQLite is chosen to be always enabled because a copy of it is distributed
    444 #    with Qt, so it is reasonable for the user to expect it.
    445 foreach driver {mysql odbc psql sqlite2} {
     439# Disable all remaining SQL Drivers.  These are available via the
     440# ports qt4-mac-*-plugin.
     441
     442foreach driver {mysql odbc psql sqlite sqlite2} {
    446443    configure.args-append -no-sql-${driver}
    447444}
     
    461458
    462459        configure.ldflags-append -lcrypto -ldbus-1 -ljpeg -llcms \
    463             -lsqlite3 -lssl -lz
     460            -lssl -lz
    464461
    465462    } elseif {${MINOR} == "5" &&
     
    968965}
    969966
    970 variant sqlite2 description {SQLite version 2 SQL Plugin Legacy Compatibility Variant} {
    971     ui_error "${name} variant +sqlite2 has been replaced by the port 'qt4-mac-sqlite2-plugin'.  Please install ${name} without +sqlite2, then install this new SQLite version 2 Qt plugin port."
    972     return -code error "Variant disabled"
    973 }
    974 
    975967variant raster description {Use raster graphics system by default} {
    976968    configure.args-append -graphicssystem raster
     
    995987} else {
    996988    configure.args-append -release -no-declarative-debug
     989}
     990
     991variant openvg description {Build with support for OpenVG} {
     992
     993    depends_lib-append port:mesa
     994
     995    post-patch {
     996
     997        # fix variable name in 'configure' for OpenVG
     998
     999        reinplace "s@CONFIG_ARG@QMAKE_OPENVG_ARG@g" \
     1000            ${worksrcpath}/configure
     1001
     1002        # allow us to set the QMAKE_SWITCHES
     1003
     1004        reinplace "s@QMAKE_SWITCHES=@@g" \
     1005            ${worksrcpath}/configure
     1006
     1007    }
     1008
     1009    pre-configure {
     1010
     1011        # set OpenVG arg, for both testing and building
     1012
     1013        configure.env-append \
     1014            QMAKE_OPENVG_ARG=-lOpenVG \
     1015            QMAKE_SWITCHES=\"QMAKE_LIBS_OPENVG=-lOpenVG\"
     1016    }
    9971017}
    9981018
Note: See TracChangeset for help on using the changeset viewer.