[72571] trunk/dports/aqua/qt4-mac
michaelld at macports.org
michaelld at macports.org
Thu Oct 21 05:13:22 PDT 2010
Revision: 72571
http://trac.macports.org/changeset/72571
Author: michaelld at macports.org
Date: 2010-10-21 05:13:18 -0700 (Thu, 21 Oct 2010)
Log Message:
-----------
qt4-mac:
* Addresses tickets #26646 and #26768.
* Update Qt to 4.7.0.
* Split "find -E" into 2 finds.
* Rework setting of ARCHs, MACOSX_DEPLOYMENT_TARGER, SDK, and others.
* Move Qt into ${prefix}.
* Add qt4 portgroup to handle common qt4 parameters.
* remove need for qt4_select; select 'none' when activating this port.
* do not install Phonon; leave that to the Phonon port, since it is
more up-to-date than that provided here. Allows for KDE ports to be
upgraded to the 4.5 series individually.
* remove qaudio patches, since they were incorporated into the release.
* do not install as framework, only as separate libraries / headers;
'archcheck' can now be performed on Qt's libraries.
* add in archcheck to all dependencies.
* add postgresql variants for versions 83, 84 (default), 90, and 91.
* build optimized qmake if building for the native arch (and not
otherwise).
* add in a stup variants for +x11 and +quartz; will fill in details
later.
* Fix import and plugin library ID (self name).
* various small tweaks
Modified Paths:
--------------
trunk/dports/aqua/qt4-mac/Portfile
Added Paths:
-----------
trunk/dports/aqua/qt4-mac/files/MacroPushRequiredVars.cmake
trunk/dports/aqua/qt4-mac/files/patch-configure-arch.diff
trunk/dports/aqua/qt4-mac/files/patch-macosx-deployment-target.diff
Removed Paths:
-------------
trunk/dports/aqua/qt4-mac/files/patch-qaudio-format-converters.diff
trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-conversion.diff
trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-readyread.diff
trunk/dports/aqua/qt4-mac/files/patch-qaudiooutput-period-size.diff
trunk/dports/aqua/qt4-mac/files/qt4-mac
Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile 2010-10-21 08:48:09 UTC (rev 72570)
+++ trunk/dports/aqua/qt4-mac/Portfile 2010-10-21 12:13:18 UTC (rev 72571)
@@ -2,89 +2,99 @@
# $Id$
PortSystem 1.0
-PortGroup select 1.0
+PortGroup archcheck 1.0
-set select_group qt4
-set select_branch mac
-set select_port ${select_group}_select
-set select_name ${select_group}-${select_branch}
+# use the qt4 group, except for the depends_lib
+# since we're building qt4 here.
+PortGroup qt4 1.0
+depends_lib-delete bin:qmake:qt4-mac
-name ${select_name}
-version 4.6.3
-revision 6
+name qt4-mac
+conflicts qt4-mac-devel
+version 4.7.0
categories aqua
platforms macosx
maintainers michaelld
homepage http://qt.nokia.com/
-description Qt Tool Kit (Native Aqua Version)
-long_description \
- Qt is a cross-platform application and UI framework for writing \
- cross-platform GUI applications. This port is for Qt version 4 \
- using the native Aqua UI. For X11 UI versions, see qt3-x11 or \
- qt4-x11\[-devel\].
+description Qt Tool Kit
+long_description Qt Tool Kit: A cross-platform framework \
+ (headers, data, and libraries) for writing \
+ cross-platform GUI-based applications.
master_sites trolltech
distname qt-everywhere-opensource-src-${version}
-checksums md5 5c69f16d452b0bb3d44bc3c10556c072 \
- sha1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 \
- rmd160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff
+checksums md5 3a2f25b9b115037277f4fb759194a7a5 \
+ sha1 a5796c8f468c8f59249e5c696f913864c979f411 \
+ rmd160 3e9c0f0d9843b5c03ad4bd6193aff98531ee0746
-depends_build port:pkgconfig
+depends_lib-append port:zlib port:dbus port:openssl port:sqlite3 \
+ port:tiff port:libpng port:libmng port:jpeg
-depends_lib port:zlib port:dbus port:openssl port:sqlite3 \
- port:tiff port:libpng port:libmng port:jpeg \
- port:${select_port}
+archcheck.files lib/libz.dylib lib/libdbus-1.dylib \
+ lib/libssl.dylib lib/libsqlite3.dylib \
+ lib/libtiff.dylib lib/libpng.dylib \
+ lib/libmng.dylib lib/libjpeg.dylib
# (1) Test for Precompiled-headers support requires a C++ compiler,
# but configure calls it, by default, with a C compiler.
-# (rest) Correct QAudioInput and QAudioOutput in QtMultimedia, which
-# will be part of a newer 4.6.X series.
-patchfiles patch-precomp.test.diff \
- patch-qaudio-format-converters.diff \
- patch-qaudioinput-conversion.diff \
- patch-qaudioinput-readyread.diff \
- patch-qaudiooutput-period-size.diff
+patchfiles-append patch-precomp.test.diff
+# (2) Tweak various scripts to allow easy replacement of
+# MACOSX_DEPLOYMENT_TARGET: build for just the user's current OS.
+patchfiles-append patch-macosx-deployment-target.diff
+
+# (3) Tweak the configure script to allow easy replacement of arch
+# type(s). The location of this patch is dependent on patch (2), but
+# 'patch' should be able to figure it out.
+patchfiles-append patch-configure-arch.diff
+
post-patch {
- # correct phonon version info.
- # (1) retrieve the correct info (minor, patch)
- set phonon_major_version \
- [exec grep "set\[^\\$\]*PHONON_LIB_MAJOR_VERSION" \
- ${worksrcpath}/src/3rdparty/phonon/CMakeLists.txt | \
- grep set | tr -dc '\[0-9\]']
- set phonon_minor_version \
- [exec grep "set\[^\\$\]*PHONON_LIB_MINOR_VERSION" \
- ${worksrcpath}/src/3rdparty/phonon/CMakeLists.txt | \
- grep set | tr -dc '\[0-9\]']
- set phonon_patch_version \
- [exec grep "set\[^\\$\]*PHONON_LIB_PATCH_VERSION" \
- ${worksrcpath}/src/3rdparty/phonon/CMakeLists.txt | \
- grep set | tr -dc '\[0-9\]']
+ # set ARCHES in configure (per the second patchfile),
+ # for building QMake.
+ set ARCHES ""
+ if {[variant_exists universal] && [variant_isset universal]} {
+ # build for universal, as defined by the local user
+ # first "-arch" is already in place; just 'join' the rest
+ set ARCHES [join ${universal_archs} " -arch "]
+ } else {
+ # build arch & OS-version specific
+ set ARCHES ${build_arch}
+ }
+ reinplace "s|@ARCHES@|${ARCHES}|g" ${worksrcpath}/configure
- # (2) correct that which Qt uses
- # (a) in src/phonon/phonon.pro
- # (there has GOT to be a better way :)
- reinplace "/PHONON_MINOR_VERSION =/s@\\(\[^0-9\]*\\)\[0-9\]*\\(\[^0-9\]*\\)@\\1${phonon_minor_version}\\2@" \
- ${worksrcpath}/src/phonon/phonon.pro
- reinplace "/PHONON_PATCH_VERSION =/s@\\(\[^0-9\]*\\)\[0-9\]*\\(\[^0-9\]*\\)@\\1${phonon_patch_version}\\2@" \
- ${worksrcpath}/src/phonon/phonon.pro
+ # set MACOSX_DEPLOYMENT_TARGET version in various places. These
+ # were all patched in (2) above, and can be easily changed or
+ # overridden by the user in a project-local qmake .pro script.
+ set minor [expr [lindex [split ${os.version} "."] 0] - 4]
+ set MACOSX_DEPLOYMENT_TARGET "10.${minor}"
+ foreach fixfile {configure mkspecs/common/mac-g++.conf \
+ mkspecs/common/mac.conf qmake/qmake.pri \
+ src/tools/bootstrap/bootstrap.pro } {
+ reinplace "s|@MACOSX_DEPLOYMENT_TARGET@|${MACOSX_DEPLOYMENT_TARGET}|g" \
+ ${worksrcpath}/${fixfile}
+ }
- # (b) in src/3rdparty/phonon/phonon/phononnamespace.h
- # use the .h.in file & sed replace variables
- system "sed -e 's/@PHONON_LIB_MAJOR_VERSION@/${phonon_major_version}/g' \
--e 's/@PHONON_LIB_MINOR_VERSION@/${phonon_minor_version}/g' \
--e 's/@PHONON_LIB_PATCH_VERSION@/${phonon_patch_version}/g' \
-< ${worksrcpath}/src/3rdparty/phonon/phonon/phononnamespace.h.in \
-> ${worksrcpath}/src/3rdparty/phonon/phonon/phononnamespace.h"
+ # Ensure that correct C/C++ compilers are used.
+ reinplace "s| g++\$| ${configure.cxx}|" \
+ ${worksrcpath}/mkspecs/common/g++.conf
+ reinplace "s| gcc\$| ${configure.cc}|" \
+ ${worksrcpath}/mkspecs/common/g++.conf
+ reinplace "s| g++\$| ${configure.cxx}|" \
+ ${worksrcpath}/mkspecs/macx-g++/qmake.conf
+ reinplace "s| gcc\$| ${configure.cc}|" \
+ ${worksrcpath}/mkspecs/macx-g++/qmake.conf
}
# The build process uses -fconstant-cfstrings.
# configure.compiler should therefore not be one of the MacPorts compilers.
# --prefix is not recognized.
-configure.pre_args-delete --prefix=${prefix}
+configure.pre_args-delete --prefix=${prefix}
+# --disable-dependency-tracking is not recognized.
+configure.universal_args-delete --disable-dependency-tracking
+
################################################################################
# We do not want flags of any kind -- QT is smart enough to set up its own. #
################################################################################
@@ -105,9 +115,6 @@
configure.ld_archflags
}
-set dirname ${name}
-set qt_dir ${prefix}/libexec/${dirname}
-
# use compiler.cpath and compiler.library_path, as per
# http://trac.macports.org/ticket/25321 for all -I and -L entries,
# so-as to avoid conflicts with already-installed headers and
@@ -131,6 +138,15 @@
# which it is not able to find in ${prefix}.
#
# -openssl-linked ensures that the MacPorts openssl is used.
+#
+# -no-framework ensures that this port is installed as separate
+# libraries and headers, with guaranteed locations and names that
+# can be used for archcheck.
+#
+# -no-phonon ensures that Qt does not install the 3rd-parth Phonon
+# port or its backend to QuickTime 7; Phonon is now installed via
+# the 'phonon' port, which is more up to date than that provided
+# by Qt.
configure.args \
-v \
@@ -138,20 +154,24 @@
-confirm-license \
-opensource \
-prefix ${qt_dir} \
- -docdir ${qt_dir}/share/doc/${dirname} \
- -examplesdir ${qt_dir}/share/${dirname}/examples \
- -demosdir ${qt_dir}/share/${dirname}/demos \
- -cocoa \
+ -docdir ${qt_docs_dir} \
+ -plugindir ${qt_plugins_dir} \
+ -importdir ${qt_imports_dir} \
+ -datadir ${qt_data_dir} \
+ -translationdir ${qt_translations_dir} \
+ -sysconfdir ${qt_sysconf_dir} \
+ -examplesdir ${qt_examples_dir} \
+ -demosdir ${qt_demos_dir} \
-system-sqlite \
-openssl-linked \
-dbus-linked \
- -pch \
-fast \
-nomake demos \
-nomake examples \
-optimized-qmake \
- -framework \
- -arch \"${build_arch}\"
+ -no-framework \
+ -no-phonon \
+ -no-phonon-backend
# Stop configure script from searching for SQL Drivers
# not available from MacPorts.
@@ -173,15 +193,78 @@
compiler.library_path [join ${library_path} :]
}
+platform darwin 8 {
+ # build as Carbon only, not cocoa.
+ configure.args-append -carbon
+ post-configure {
+ fs-traverse item ${worksrcpath} {
+ if {"Makefile" == [file tail ${item}]} {
+ reinplace "s|-framework QtHelp|-framework QtHelp -lQtCLucene|" ${item}
+ }
+ }
+ }
+}
+
+# make sure the universal variant exists
+variant universal {}
+
+platform darwin {
+ set ARCHES ""
+ set SDK ""
+ if {[variant_exists universal] && [variant_isset universal]} {
+ # build for universal, as defined by the local user
+ set ARCHES ${universal_archs}
+ if {[info exists universal_sysroot]} {
+ set SDK ${universal_sysroot}
+ }
+ } else {
+ # build arch specific
+ set ARCHES ${build_arch}
+ }
+ configure.args-append -arch \"${ARCHES}\"
+
+ # cannot use pre-compiled headers when compiling with more than 1
+ # arch type (typically +universal) or for X11
+ if {[llength ${ARCHES}] != 1 || [variant_isset x11]} {
+ configure.args-append -no-pch
+ } else {
+ configure.args-append -pch
+ }
+
+ # check to see if not compiling for the native machine hardware
+ # (e.g., compiling for just i386 but CPU is x86_64); optimization
+ # of QMake does not work in this circumstance.
+ if {[lsearch -exact ${ARCHES} [exec uname -m]] == -1} {
+ # yes: disable optimizing qmake
+ configure.args-delete -optimized-qmake
+ }
+
+ # find a way to specify the SDK to use
+ if {${SDK} == ""} {
+ # else use the one for this OS version, if installed
+ set minor [expr [lindex [split ${os.version} "."] 0] - 4]
+ set sdk_version "10.${minor}"
+ set SDK ${developer_dir}/SDKs/MacOSX${sdk_version}.sdk
+ }
+ if {[file exists ${SDK}]} {
+ configure.args-append -sdk ${SDK}
+ } else {
+ ui_msg \
+"No SDK found in ${developer_dir}/SDKs for ${sdk_version} ; \
+configure will probably fail. \n \
+Please install Apple's Developer Tools again."
+ }
+}
+
# Remove any '-I' string from the C*FLAGS for SQLITE and DBUS, so that
# what remains are just non-I flags; these paths are in compiler.cpath .
# The includes for all the other variants are not used by
# 'configure', and are already included in the compiler.cpath .
post-configure {
- # SQLITE first
+ # SQLITE
reinplace "/CFLAGS_SQLITE/s at -I${prefix}/\[^ \]*include\[^ \]*@@g" \
${worksrcpath}/.qmake.cache
- # DBUS last
+ # DBUS
reinplace "/CFLAGS_DBUS/s at -I${prefix}/\[^ \]*include\[^ \]*@@g" \
${worksrcpath}/.qmake.cache
# during the 'build' stage, 'make' will rebuild the Makefiles that
@@ -194,8 +277,76 @@
compiler.library_path [join ${library_path} :]
}
+build.target first
+
+post-destroot {
+ set destroot_qt ${destroot}${qt_dir}
+
+ # Fix .pc and .prl files by changing ${worksrcpath}\${prefix} to
+ # ${qt_dir}\${prefix} ("\" means 'take away'). Cannot use
+ # "find -E" since it is not necessarily portable.
+ regsub ${prefix} ${worksrcpath} "" from_dir
+ regsub ${prefix} ${qt_dir} "" to_dir
+ foreach fixfile [exec find ${destroot_qt} -name "*.pc"] {
+ reinplace "s|${from_dir}|${to_dir}|g" ${fixfile}
+ }
+ foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
+ reinplace "s|${from_dir}|${to_dir}|g" ${fixfile}
+ }
+
+ # Install documentation.
+ xinstall -m 755 -d ${worksrcpath}/${qt_docs_dir}
+ xinstall -m 644 -W ${worksrcpath} \
+ INSTALL LGPL_EXCEPTION.txt LICENSE.FDL \
+ LICENSE.GPL3 LICENSE.LGPL README \
+ ${destroot}${qt_docs_dir}
+
+ # Fix includes: Remove include/Qt.
+ # It should never be used in Qt4 or newer.
+ # It is there for legacy purposes: it's how
+ # Qt3's headers were installed.
+ if {[file exists ${destroot_qt}/include/Qt]} {
+ delete ${destroot_qt}/include/Qt
+ }
+
+ # Install cmake files (taken from port 'kdelibs4'). To use this
+ # file, include '-DCMAKE_MODULE_PATH=...' in configure.args during
+ # the initial 'configure' stage (which uses CMake), to the full
+ # path of where the CMake files are installed.
+ xinstall -m 755 -d ${destroot}${qt_cmake_module_dir}
+ xinstall -m 644 -W ${filespath} \
+ FindQt4.cmake Qt4ConfigDependentSettings.cmake \
+ Qt4Macros.cmake MacroPushRequiredVars.cmake \
+ ${destroot}${qt_cmake_module_dir}
+
+ # install qt_menu.nib, used by any applications making use of Qt's
+ # application class.
+ xinstall -m 755 -d ${destroot_qt}/lib/Resources
+ copy ${worksrcpath}/src/gui/mac/qt_menu.nib \
+ ${destroot_qt}/lib/Resources
+
+ # Fix import and plugin library ID (self name)
+ foreach fixfile [exec find ${destroot_qt}/share/${qt_name} \
+ -name "*.dylib" -type f | \
+ sed -e "s@${destroot}@@g" ] {
+ system "install_name_tool -id ${fixfile} ${destroot}${fixfile}"
+ }
+}
+
+pre-activate {
+ # make sure 'none' is selected by qt4_select, so that there is no
+ # conflict between it and this port.
+ if {[file exists ${prefix}/bin/qt4_select]} {
+ if {[exec ${prefix}/bin/qt4_select -s] != "none"} {
+ ui_msg "Disabling 'qt4_select' selection."
+ system "exec ${prefix}/bin/qt4_select none"
+ }
+ }
+}
+
variant mysql description {Enable MySQL SQL Driver} {
depends_lib-append path:lib/mysql5:mysql5
+ archcheck.files-append lib/mysql5/mysql/libmysqlclient.dylib
lunshift header_path ${prefix}/include/mysql5/mysql
lunshift library_path ${prefix}/lib/mysql5/mysql
configure.args-delete -no-sql-mysql
@@ -204,20 +355,46 @@
variant odbc description {Enable iODBC SQL Driver} {
depends_lib-append port:libiodbc
+ archcheck.files-append lib/libiodbc.dylib
configure.args-delete -no-sql-odbc
configure.args-append -plugin-sql-odbc
}
-variant psql description {Enable PostgreSQL SQL Driver} {
- depends_lib-append port:postgresql83
- lunshift header_path ${prefix}/include/postgresql83
- lunshift library_path ${prefix}/lib/postgresql83
+variant psql83 conflicts psql84 psql90 psql91 \
+description {Enable Postgre SQL Driver version 8.3} {}
+
+variant psql84 conflicts psql83 psql90 psql91 \
+description {Enable Postgre SQL Driver version 8.4} {}
+
+variant psql90 conflicts psql83 psql84 psql91 \
+description {Enable Postgre SQL Driver version 9.0} {}
+
+variant psql91 conflicts psql83 psql84 psql90 \
+description {Enable Postgre SQL Driver version 9.1} {}
+
+set psql_version ""
+if {[variant_isset psql83]} {
+ set psql_version "83"
+} elseif {[variant_isset psql84]} {
+ set psql_version "84"
+} elseif {[variant_isset psql90]} {
+ set psql_version "90"
+} elseif {[variant_isset psql91]} {
+ set psql_version "91"
+}
+
+if {${psql_version} != ""} {
+ depends_lib-append port:postgresql${psql_version}
+ archcheck.files-append lib/postgresql${psql_version}/libpgtypes.dylib
+ lunshift header_path ${prefix}/include/postgresql${psql_version}
+ lunshift library_path ${prefix}/lib/postgresql${psql_version}
configure.args-delete -no-sql-psql
configure.args-append -plugin-sql-psql
}
variant sqlite2 description {Enable SQLite version 2 SQL Driver} {
depends_lib-append port:sqlite2
+ archcheck.files-append lib/libsqlite.dylib
configure.args-delete -no-sql-sqlite2
configure.args-append -plugin-sql-sqlite2
}
@@ -240,187 +417,29 @@
configure.args-append -debug-and-release
}
-variant no_framework description \
-{Build as libraries, not as framework} {
- configure.args-delete -framework
- configure.args-append -no-framework
-}
+variant quartz conflicts x11 \
+description {Build for Native OSX Quartz GUI, not X11 (default)} {}
-variant universal {
- configure.universal_args-delete --disable-dependency-tracking
- configure.args-delete -arch \"${build_arch}\"
- configure.args-append -arch \"${universal_archs}\"
- if {[info exists universal_sysroot]} {
- configure.args-append -sdk ${universal_sysroot}
- }
-}
+variant x11 conflicts quartz \
+description {Build for X11 GUI, not Native OSX Quartz} {}
-# use the 10.4 SDK (the default) for 10.4 only.
-# and, build as Carbon by disabling Cocoa.
-platform darwin 8 {
- configure.args-delete -cocoa
- post-configure {
- fs-traverse item ${worksrcpath} {
- if {"Makefile" == [file tail ${item}]} {
- reinplace "s|-framework QtHelp|-framework QtHelp -lQtCLucene|" ${item}
- }
- }
- }
+# if neither +x11 or +quartz were specified, default to the latter
+if {![variant_isset quartz] && ![variant_isset x11]} {
+ default_variants +quartz
}
-# use the 10.5 SDK for 10.5,
-# but only if not (doing universal and the universal sysroot is set)
-platform darwin 9 {
- if {![variant_isset universal] || ![info exists universal_sysroot]} {
- if {[file exists ${developer_dir}/SDKs/MacOSX10.5.sdk]} {
- configure.args-append -sdk ${developer_dir}/SDKs/MacOSX10.5.sdk
- } else {
- ui_msg "No SDK found in ${developer_dir}/SDKs for 10.5 ; \
-configure will probably fail. \n \
-Please install Apple's Developer Tools again."
- }
- }
+# check to see if user specified just "-quartz", which can't work.
+if {![variant_isset quartz] && ![variant_isset x11]} {
+ return -code error \
+"\n\nThe variant -quartz will not work alone.
+Please select one of +quartz or +x11 as a variant.\n"
}
-platform darwin 10 {
- # disable optimizing qmake, since the resulting executable doesn't
- # seem to function correctly on 10.6 only (both i386 and x86_64).
- configure.args-delete -optimized-qmake
-
- # use the 10.6 SDK for 10.6, but only if not (doing universal and
- # the universal sysroot is set)
- if {![variant_isset universal] || ![info exists universal_sysroot]} {
- if {[file exists ${developer_dir}/SDKs/MacOSX10.6.sdk]} {
- configure.args-append -sdk ${developer_dir}/SDKs/MacOSX10.6.sdk
- } else {
- ui_msg "No SDK found in ${developer_dir}/SDKs for 10.6 ; \
-configure will probably fail. \n \
-Please install Apple's Developer Tools again."
- }
- }
+if {[variant_isset x11]} {
+ return -code error "\n\nVariant +x11 is not yet functional; \
+please use +quartz for now.\n"
}
-build.target first
-use_parallel_build yes
-
-destroot.destdir INSTALL_ROOT="${destroot}"
-
-post-patch {
- # Ensure that correct compilers are used.
- reinplace "s| g++\$| ${configure.cxx}|" ${worksrcpath}/mkspecs/common/g++.conf
- reinplace "s| gcc\$| ${configure.cc}|" ${worksrcpath}/mkspecs/common/g++.conf
- reinplace "s| g++\$| ${configure.cxx}|" ${worksrcpath}/mkspecs/macx-g++/qmake.conf
- reinplace "s| gcc\$| ${configure.cc}|" ${worksrcpath}/mkspecs/macx-g++/qmake.conf
-}
-
-post-destroot {
- set destroot_qt ${destroot}${qt_dir}
-
- # Fix .pc and .prl files by changing ${worksrcpath}/lib to ${qt_dir}/lib
- foreach fixfile [exec find -E ${destroot_qt} \
- -regex "\[^ \]*\\.\(pc|prl\)"] {
- reinplace "s|${worksrcpath}/lib|${qt_dir}/lib|g" ${fixfile}
- }
-
- # Install documentation.
- foreach doc { INSTALL LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL README } {
- xinstall -c -m 644 ${worksrcpath}/${doc} \
- ${destroot_qt}/share/doc/${name}
- }
-
- # Fix includes
- # (1) Remove include/Qt ; it should never be used in Qt 4 or newer
- # it is there for legacy purposes (for Qt 3 compatibility)
- if {[file exists ${destroot_qt}/include/Qt]} {
- delete ${destroot_qt}/include/Qt
- }
-
- # (2) If using the framework install: remove from
- # ${qt_dir}/include/FOO, for each FOO in the frameworks, and link
- # into the headers provided by the FOO framework
- if {![variant_isset no_framework]} {
- # retrieve list of all installed frameworks
- foreach framework [exec ls ${destroot_qt}/lib | \
- grep framework | \
- sed -e "s@\\.framework.*@@"] {
- # remove the include directory, if it exists
- if {[file exists ${destroot_qt}/include/${framework}] } {
- delete ${destroot_qt}/include/${framework}
- }
- # link in the framework's Headers
- ln -s ${qt_dir}/lib/${framework}.framework/Headers \
- ${destroot_qt}/include/${framework}
- }
- }
-
- # install the select file
- xinstall -m 755 -d ${destroot}${prefix}/etc/select/${select_group}
- xinstall -c -m 644 ${filespath}/${select_name} \
- ${destroot}${prefix}/etc/select/${select_group}/${select_name}
-
- # install cmake files (taken from port 'kdelibs4'). To use this
- # file, include '-DCMAKE_MODULE_PATH=...' in configure.args during
- # the initial 'configure' stage (which uses CMake), to the full
- # path of where the CMake files are installed.
- xinstall -m 755 -d ${destroot_qt}/share/cmake/modules
- foreach file { FindQt4.cmake Qt4ConfigDependentSettings.cmake \
- Qt4Macros.cmake } {
- xinstall -c -m 644 ${filespath}/${file} \
- ${destroot_qt}/share/cmake/modules
- }
-
- # then, reinplace the select file as necessary for variants; put
- # these here instead of in the variants because I don't know which
- # are executed first (this post-destroot or a variant's) & the
- # select file needs to be in place first.
- if {![variant_isset debug]} {
- # remove select entries for debug
- reinplace "/debug/ c\\\n-\n" \
- ${destroot}${prefix}/etc/select/${select_group}/${select_name}
- }
- if {![variant_isset demos]} {
- # remove select entries for demos
- reinplace "/demo/ c\\\n-\n" \
- ${destroot}${prefix}/etc/select/${select_group}/${select_name}
-
- # special case: if no examples and no demos,
- if {![variant_isset examples]} {
- # the directory "share/${name}" will be empty. keep it
- # around since other ports might install into it.
- destroot.keepdirs ${destroot_qt}/share/${name}
- }
- }
-}
-
-post-activate {
- # If this is the first qt4-* installed, select it.
- set current_select [exec ${prefix}/bin/${select_port} -s]
- if {${current_select} == "none"} {
- system "${prefix}/bin/${select_port} ${select_name}"
- } else {
- if {${current_select} != ${select_name}} {
- # Print out the 'select' info.
- ui_msg "\
-Port ${current_select} is already selected.\n \
-To fully complete this installation and make ${name} the default,\n \
-please run:\n \
-\tsudo ${select_port} ${select_name}"
- }
- }
-}
-
-pre-deactivate {
- # If this is qt4-* is selected, select 'none' & tell the user
- set current_select [exec ${prefix}/bin/${select_port} -s]
- if {${current_select} == ${select_name} } {
- system "${prefix}/bin/${select_port} none"
- ui_msg "\
-Port '${current_select}' was selected; 'none' is now selected.\n \
-To select another port for group '${select_group}', \
-please run '${select_port}'."
- }
-}
-
livecheck.type regex
livecheck.url http://get.qt.nokia.com/qt/source/
livecheck.regex "qt-everywhere-opensource-src-(\[0-9a-z.-\]+)${extract.suffix}"
Added: trunk/dports/aqua/qt4-mac/files/MacroPushRequiredVars.cmake
===================================================================
--- trunk/dports/aqua/qt4-mac/files/MacroPushRequiredVars.cmake (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/MacroPushRequiredVars.cmake 2010-10-21 12:13:18 UTC (rev 72571)
@@ -0,0 +1,47 @@
+# this module defines two macros:
+# MACRO_PUSH_REQUIRED_VARS()
+# and
+# MACRO_POP_REQUIRED_VARS()
+# use these if you call cmake macros which use
+# any of the CMAKE_REQUIRED_XXX variables
+#
+# Usage:
+# MACRO_PUSH_REQUIRED_VARS()
+# SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -DSOME_MORE_DEF)
+# CHECK_FUNCTION_EXISTS(...)
+# MACRO_POP_REQUIRED_VARS()
+
+# Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+MACRO(MACRO_PUSH_REQUIRED_VARS)
+
+ IF(NOT DEFINED _PUSH_REQUIRED_VARS_COUNTER)
+ SET(_PUSH_REQUIRED_VARS_COUNTER 0)
+ ENDIF(NOT DEFINED _PUSH_REQUIRED_VARS_COUNTER)
+
+ MATH(EXPR _PUSH_REQUIRED_VARS_COUNTER "${_PUSH_REQUIRED_VARS_COUNTER}+1")
+
+ SET(_CMAKE_REQUIRED_INCLUDES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} ${CMAKE_REQUIRED_INCLUDES})
+ SET(_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} ${CMAKE_REQUIRED_DEFINITIONS})
+ SET(_CMAKE_REQUIRED_LIBRARIES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} ${CMAKE_REQUIRED_LIBRARIES})
+ SET(_CMAKE_REQUIRED_FLAGS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} ${CMAKE_REQUIRED_FLAGS})
+ENDMACRO(MACRO_PUSH_REQUIRED_VARS)
+
+MACRO(MACRO_POP_REQUIRED_VARS)
+
+# don't pop more than we pushed
+ IF("${_PUSH_REQUIRED_VARS_COUNTER}" GREATER "0")
+
+ SET(CMAKE_REQUIRED_INCLUDES ${_CMAKE_REQUIRED_INCLUDES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}})
+ SET(CMAKE_REQUIRED_DEFINITIONS ${_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}})
+ SET(CMAKE_REQUIRED_LIBRARIES ${_CMAKE_REQUIRED_LIBRARIES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}})
+ SET(CMAKE_REQUIRED_FLAGS ${_CMAKE_REQUIRED_FLAGS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}})
+
+ MATH(EXPR _PUSH_REQUIRED_VARS_COUNTER "${_PUSH_REQUIRED_VARS_COUNTER}-1")
+ ENDIF("${_PUSH_REQUIRED_VARS_COUNTER}" GREATER "0")
+
+ENDMACRO(MACRO_POP_REQUIRED_VARS)
+
Added: trunk/dports/aqua/qt4-mac/files/patch-configure-arch.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-configure-arch.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-configure-arch.diff 2010-10-21 12:13:18 UTC (rev 72571)
@@ -0,0 +1,28 @@
+--- configure_orig 2010-10-13 21:13:01.000000000 -0400
++++ configure 2010-10-13 21:15:36.000000000 -0400
+@@ -4567,20 +4567,11 @@
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
+ EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
+ EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
+- if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then # matches both x86 and x86_64
+- X86_CFLAGS="-arch i386"
+- X86_LFLAGS="-arch i386"
+- EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS"
+- EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS"
+- EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
+- fi
+- if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then # matches both ppc and ppc64
+- PPC_CFLAGS="-arch ppc"
+- PPC_LFLAGS="-arch ppc"
+- EXTRA_CFLAGS="$PPC_CFLAGS $EXTRA_CFLAGS"
+- EXTRA_CXXFLAGS="$PPC_CFLAGS $EXTRA_CXXFLAGS"
+- EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS"
+- fi
++ X86_CFLAGS="-arch @ARCHES@"
++ X86_LFLAGS="-arch @ARCHES@"
++ EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS"
++ EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS"
++ EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
+ if [ '!' -z "$CFG_SDK" ]; then
+ echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
+ echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
Added: trunk/dports/aqua/qt4-mac/files/patch-macosx-deployment-target.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-macosx-deployment-target.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-macosx-deployment-target.diff 2010-10-21 12:13:18 UTC (rev 72571)
@@ -0,0 +1,146 @@
+--- configure_orig 2010-10-13 09:42:43.000000000 -0400
++++ configure 2010-10-12 09:44:40.000000000 -0400
+@@ -4559,7 +4559,7 @@
+ done
+ fi
+ if [ "$PLATFORM_MAC" = "yes" ]; then
+- echo "export MACOSX_DEPLOYMENT_TARGET = 10.4" >> "$mkfile"
++ echo "export MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@" >> "$mkfile"
+ echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
+ echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
+ EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
+@@ -6402,16 +6402,7 @@
+
+ # set the global Mac deployment target. This is overridden on an arch-by-arch basis
+ # in some cases, see code further down
+-case "$PLATFORM,$CFG_MAC_COCOA" in
+- macx*,yes)
+- # Cocoa
+- QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
+- ;;
+- macx*,no)
+- # gcc, Carbon
+- QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
+- ;;
+-esac
++QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET @MACOSX_DEPLOYMENT_TARGET@
+
+ # disable Qt 3 support on VxWorks and Symbian
+ case "$XPLATFORM" in
+@@ -7084,28 +7075,28 @@
+ # env. variable.
+ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
+ if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
+- QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.4"
++ QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
+ fi
+ if echo "$CFG_MAC_ARCHS" | grep '\<ppc\>' > /dev/null 2>&1; then
+- QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.4"
++ QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
+ fi
+ if echo "$CFG_MAC_ARCHS" | grep '\<x86_64\>' > /dev/null 2>&1; then
+- QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5"
++ QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
+ fi
+ if echo "$CFG_MAC_ARCHS" | grep '\<ppc64\>' > /dev/null 2>&1; then
+- QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5"
++ QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
+ fi
+ fi
+
+--- mkspecs/common/mac-g++.conf_orig 2010-10-13 09:42:49.000000000 -0400
++++ mkspecs/common/mac-g++.conf 2010-10-12 09:39:33.000000000 -0400
+@@ -18,10 +18,10 @@
+ QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+ QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
+
+-QMAKE_CFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5
+-QMAKE_OBJECTIVE_CFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5
+-QMAKE_CFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5
+-QMAKE_OBJECTIVE_CFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5
++QMAKE_CFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
++QMAKE_OBJECTIVE_CFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
++QMAKE_CFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
++QMAKE_OBJECTIVE_CFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
+ QMAKE_CFLAGS_PPC += -arch ppc
+ QMAKE_OBJECTIVE_CFLAGS_PPC += -arch ppc
+ QMAKE_CFLAGS_X86 += -arch i386
+@@ -38,8 +38,8 @@
+ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
+ QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
+ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+-QMAKE_CXXFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5
+-QMAKE_CXXFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5
++QMAKE_CXXFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
++QMAKE_CXXFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
+ QMAKE_CXXFLAGS_PPC += -arch ppc
+ QMAKE_CXXFLAGS_X86 += -arch i386
+ QMAKE_CXXFLAGS_DWARF2 += $$QMAKE_CFLAGS_DWARF2
+@@ -59,8 +59,8 @@
+ QMAKE_LFLAGS_THREAD +=
+ QMAKE_LFLAGS_INCREMENTAL+= -undefined suppress -flat_namespace
+ QMAKE_LFLAGS_SONAME += -install_name$${LITERAL_WHITESPACE}
+-QMAKE_LFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5
+-QMAKE_LFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5
++QMAKE_LFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
++QMAKE_LFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
+ QMAKE_LFLAGS_PPC += -arch ppc
+ QMAKE_LFLAGS_X86 += -arch i386
+ QMAKE_LFLAGS_VERSION += -current_version$${LITERAL_WHITESPACE}
+--- mkspecs/common/mac.conf_orig 2010-10-13 09:42:49.000000000 -0400
++++ mkspecs/common/mac.conf 2010-10-12 09:38:52.000000000 -0400
+@@ -38,7 +38,7 @@
+ QMAKE_DEL_DIR = rmdir
+ QMAKE_CHK_DIR_EXISTS = test -d
+ QMAKE_MKDIR = mkdir -p
+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 # overridden to 10.5 for Cocoa on the compiler command line
++QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
+
+
+ include(unix.conf)
+--- qmake/qmake.pri_orig 2010-10-13 09:42:50.000000000 -0400
++++ qmake/qmake.pri 2010-10-13 10:04:18.000000000 -0400
+@@ -128,7 +128,7 @@
+ SOURCES += qfsfileengine_unix.cpp qfsfileengine_iterator_unix.cpp
+ mac {
+ SOURCES += qcore_mac.cpp qsettings_mac.cpp
+- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
++ QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
+ LIBS += -framework ApplicationServices
+ }
+ } else:win32 {
+--- src/tools/bootstrap/bootstrap.pro_orig 2010-10-13 09:42:57.000000000 -0400
++++ src/tools/bootstrap/bootstrap.pro 2010-10-13 10:04:19.000000000 -0400
+@@ -90,7 +90,7 @@
+ ../../corelib/io/qfsfileengine_iterator_win.cpp
+
+ macx: {
+- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
++ QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
+ SOURCES += ../../corelib/kernel/qcore_mac.cpp
+ LIBS += -framework CoreServices
+ }
Deleted: trunk/dports/aqua/qt4-mac/files/patch-qaudio-format-converters.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-qaudio-format-converters.diff 2010-10-21 08:48:09 UTC (rev 72570)
+++ trunk/dports/aqua/qt4-mac/files/patch-qaudio-format-converters.diff 2010-10-21 12:13:18 UTC (rev 72571)
@@ -1,39 +0,0 @@
-From b82ed43086aebb4698a8a52965eeb17349ef1d04 Mon Sep 17 00:00:00 2001
-From: Justin McPherson <justin.mcpherson at nokia.com>
-Date: Mon, 21 Jun 2010 15:11:59 +1000
-Subject: [PATCH] Audio(osx); Fix audio format converters.
-
-Reviewed-by:Dmytro Poplavskiy
----
- src/multimedia/audio/qaudio_mac.cpp | 9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/multimedia/audio/qaudio_mac.cpp b/src/multimedia/audio/qaudio_mac.cpp
-index 14fee8b..4e17b52 100644
---- src/multimedia/audio/qaudio_mac.cpp
-+++ src/multimedia/audio/qaudio_mac.cpp
-@@ -68,11 +68,11 @@ QAudioFormat toQAudioFormat(AudioStreamBasicDescription const& sf)
- audioFormat.setChannels(sf.mChannelsPerFrame);
- audioFormat.setSampleSize(sf.mBitsPerChannel);
- audioFormat.setCodec(QString::fromLatin1("audio/pcm"));
-- audioFormat.setByteOrder(sf.mFormatFlags & kLinearPCMFormatFlagIsBigEndian != 0 ? QAudioFormat::BigEndian : QAudioFormat::LittleEndian);
-+ audioFormat.setByteOrder((sf.mFormatFlags & kAudioFormatFlagIsBigEndian) != 0 ? QAudioFormat::BigEndian : QAudioFormat::LittleEndian);
- QAudioFormat::SampleType type = QAudioFormat::UnSignedInt;
-- if ((sf.mFormatFlags & kLinearPCMFormatFlagIsSignedInteger) != 0)
-+ if ((sf.mFormatFlags & kAudioFormatFlagIsSignedInteger) != 0)
- type = QAudioFormat::SignedInt;
-- else if ((sf.mFormatFlags & kLinearPCMFormatFlagIsFloat) != 0)
-+ else if ((sf.mFormatFlags & kAudioFormatFlagIsFloat) != 0)
- type = QAudioFormat::Float;
- audioFormat.setSampleType(type);
-
-@@ -99,6 +99,9 @@ AudioStreamBasicDescription toAudioStreamBasicDescription(QAudioFormat const& au
- case QAudioFormat::Unknown: default: break;
- }
-
-+ if (audioFormat.byteOrder() == QAudioFormat::BigEndian)
-+ sf.mFormatFlags |= kAudioFormatFlagIsBigEndian;
-+
- return sf;
- }
-
Deleted: trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-conversion.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-conversion.diff 2010-10-21 08:48:09 UTC (rev 72570)
+++ trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-conversion.diff 2010-10-21 12:13:18 UTC (rev 72571)
@@ -1,86 +0,0 @@
-From 66d02e4bde0a628978436217032abe555ed77fad Mon Sep 17 00:00:00 2001
-From: Justin McPherson <justin.mcpherson at nokia.com>
-Date: Mon, 21 Jun 2010 15:18:32 +1000
-Subject: [PATCH] Audio(osx); refactor input period conversion
-
-Reviewed-by:Dmytro Poplavskiy
----
- src/multimedia/audio/qaudioinput_mac_p.cpp | 51 ++++++++++++++-------------
- 1 files changed, 26 insertions(+), 25 deletions(-)
-
-diff --git a/src/multimedia/audio/qaudioinput_mac_p.cpp b/src/multimedia/audio/qaudioinput_mac_p.cpp
-index b99fe11..5897e75 100644
---- src/multimedia/audio/qaudioinput_mac_p.cpp
-+++ src/multimedia/audio/qaudioinput_mac_p.cpp
-@@ -210,6 +210,11 @@ public:
- return true;
- }
-
-+ bool empty() const
-+ {
-+ return position == totalPackets;
-+ }
-+
- private:
- UInt32 totalPackets;
- UInt32 position;
-@@ -275,36 +280,32 @@ public:
- if (m_audioConverter != 0) {
- QAudioPacketFeeder feeder(m_inputBufferList);
-
-- bool wecan = true;
- int copied = 0;
--
- const int available = m_buffer->free();
-
-- while (err == noErr && wecan) {
-+ while (err == noErr && !feeder.empty()) {
- QAudioRingBuffer::Region region = m_buffer->acquireWriteRegion(available);
-
-- if (region.second > 0) {
-- AudioBufferList output;
-- output.mNumberBuffers = 1;
-- output.mBuffers[0].mNumberChannels = 1;
-- output.mBuffers[0].mDataByteSize = region.second;
-- output.mBuffers[0].mData = region.first;
--
-- UInt32 packetSize = region.second / m_outputFormat.mBytesPerPacket;
-- err = AudioConverterFillComplexBuffer(m_audioConverter,
-- converterCallback,
-- &feeder,
-- &packetSize,
-- &output,
-- 0);
--
-- region.second = output.mBuffers[0].mDataByteSize;
-- copied += region.second;
-+ if (region.second == 0)
-+ break;
-+
-+ AudioBufferList output;
-+ output.mNumberBuffers = 1;
-+ output.mBuffers[0].mNumberChannels = 1;
-+ output.mBuffers[0].mDataByteSize = region.second;
-+ output.mBuffers[0].mData = region.first;
-+
-+ UInt32 packetSize = region.second / m_outputFormat.mBytesPerPacket;
-+ err = AudioConverterFillComplexBuffer(m_audioConverter,
-+ converterCallback,
-+ &feeder,
-+ &packetSize,
-+ &output,
-+ 0);
-+ region.second = output.mBuffers[0].mDataByteSize;
-+ copied += region.second;
-
-- m_buffer->releaseWriteRegion(region);
-- }
-- else
-- wecan = false;
-+ m_buffer->releaseWriteRegion(region);
- }
-
- framesRendered += copied / m_outputFormat.mBytesPerFrame;
---
-1.6.1
-
Deleted: trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-readyread.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-readyread.diff 2010-10-21 08:48:09 UTC (rev 72570)
+++ trunk/dports/aqua/qt4-mac/files/patch-qaudioinput-readyread.diff 2010-10-21 12:13:18 UTC (rev 72571)
@@ -1,33 +0,0 @@
-From 4f79cbb2b7923ff7f7cbc77dc6820d12f594311d Mon Sep 17 00:00:00 2001
-From: Justin McPherson <justin.mcpherson at nokia.com>
-Date: Wed, 16 Jun 2010 16:44:18 +1000
-Subject: [PATCH] Audio (osx); In pull mode emit readyRead() for each period received.
-
-Task-number: QTBUG-10009
-Reviewed-by:Dmytro Poplavskiy
----
- src/multimedia/audio/qaudioinput_mac_p.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/multimedia/audio/qaudioinput_mac_p.cpp b/src/multimedia/audio/qaudioinput_mac_p.cpp
-index cb65f6e..b99fe11 100644
---- src/multimedia/audio/qaudioinput_mac_p.cpp
-+++ src/multimedia/audio/qaudioinput_mac_p.cpp
-@@ -259,7 +259,7 @@ public:
- UInt32 inBusNumber,
- UInt32 inNumberFrames)
- {
-- const bool wasEmpty = m_buffer->used() == 0;
-+ const bool pullMode = m_device == 0;
-
- OSStatus err;
- qint64 framesRendered = 0;
-@@ -330,7 +330,7 @@ public:
- framesRendered = copied / m_outputFormat.mBytesPerFrame;
- }
-
-- if (wasEmpty && framesRendered > 0)
-+ if (pullMode && framesRendered > 0)
- emit readyRead();
-
- return framesRendered;
Deleted: trunk/dports/aqua/qt4-mac/files/patch-qaudiooutput-period-size.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-qaudiooutput-period-size.diff 2010-10-21 08:48:09 UTC (rev 72570)
+++ trunk/dports/aqua/qt4-mac/files/patch-qaudiooutput-period-size.diff 2010-10-21 12:13:18 UTC (rev 72571)
@@ -1,44 +0,0 @@
-From 76c256bdabcc207a6ed70d5b5b62698495548a25 Mon Sep 17 00:00:00 2001
-From: Justin McPherson <justin.mcpherson at nokia.com>
-Date: Tue, 22 Jun 2010 12:01:51 +1000
-Subject: [PATCH] Audio(osx); Fix period size calculation.
-
-Task-number: QTBUG-8878
-Reviewed-by:Dmytro Poplavskiy
----
- src/multimedia/audio/qaudiooutput_mac_p.cpp | 15 ++-------------
- 1 files changed, 2 insertions(+), 13 deletions(-)
-
-diff --git a/src/multimedia/audio/qaudiooutput_mac_p.cpp b/src/multimedia/audio/qaudiooutput_mac_p.cpp
-index 9689101..cc52d90 100644
---- src/multimedia/audio/qaudiooutput_mac_p.cpp
-+++ src/multimedia/audio/qaudiooutput_mac_p.cpp
-@@ -358,17 +358,7 @@ bool QAudioOutputPrivate::open()
- // Set stream format
- streamFormat = toAudioStreamBasicDescription(audioFormat);
-
-- UInt32 size = sizeof(deviceFormat);
-- if (AudioUnitGetProperty(audioUnit,
-- kAudioUnitProperty_StreamFormat,
-- kAudioUnitScope_Input,
-- 0,
-- &deviceFormat,
-- &size) != noErr) {
-- qWarning() << "QAudioOutput: Unable to retrieve device format";
-- return false;
-- }
--
-+ UInt32 size = sizeof(streamFormat);
- if (AudioUnitSetProperty(audioUnit,
- kAudioUnitProperty_StreamFormat,
- kAudioUnitScope_Input,
-@@ -392,8 +382,7 @@ bool QAudioOutputPrivate::open()
- return false;
- }
-
-- periodSizeBytes = (numberOfFrames * streamFormat.mSampleRate / deviceFormat.mSampleRate) *
-- streamFormat.mBytesPerFrame;
-+ periodSizeBytes = numberOfFrames * streamFormat.mBytesPerFrame;
- if (internalBufferSize < periodSizeBytes * 2)
- internalBufferSize = periodSizeBytes * 2;
- else
Deleted: trunk/dports/aqua/qt4-mac/files/qt4-mac
===================================================================
--- trunk/dports/aqua/qt4-mac/files/qt4-mac 2010-10-21 08:48:09 UTC (rev 72570)
+++ trunk/dports/aqua/qt4-mac/files/qt4-mac 2010-10-21 12:13:18 UTC (rev 72571)
@@ -1,124 +0,0 @@
-libexec/qt4-mac/bin/Assistant.app
-libexec/qt4-mac/bin/Assistant_adp.app
-libexec/qt4-mac/bin/Designer.app
-libexec/qt4-mac/bin/Linguist.app
--
-libexec/qt4-mac/bin/pixeltool.app
-libexec/qt4-mac/bin/qdbusviewer.app
-libexec/qt4-mac/bin/qhelpconverter.app
-libexec/qt4-mac/bin/qtdemo.app
-libexec/qt4-mac/bin/qttracereplay.app
-libexec/qt4-mac/lib/Qt3Support.framework
-libexec/qt4-mac/lib/QtAssistant.framework
-libexec/qt4-mac/lib/QtCore.framework
-libexec/qt4-mac/lib/QtDBus.framework
--
-libexec/qt4-mac/lib/QtDesigner.framework
-libexec/qt4-mac/lib/QtDesignerComponents.framework
-libexec/qt4-mac/lib/QtGui.framework
-libexec/qt4-mac/lib/QtHelp.framework
--
-libexec/qt4-mac/lib/QtMultimedia.framework
-libexec/qt4-mac/lib/QtNetwork.framework
-libexec/qt4-mac/lib/QtOpenGL.framework
-libexec/qt4-mac/lib/QtScript.framework
-libexec/qt4-mac/lib/QtScriptTools.framework
-libexec/qt4-mac/lib/QtSql.framework
-libexec/qt4-mac/lib/QtSvg.framework
-libexec/qt4-mac/lib/QtTest.framework
-libexec/qt4-mac/lib/QtWebKit.framework
-libexec/qt4-mac/lib/QtXml.framework
-libexec/qt4-mac/lib/QtXmlPatterns.framework
-libexec/qt4-mac/lib/phonon.framework
-libexec/qt4-mac/bin/Assistant.app/Contents/MacOS/Assistant
-libexec/qt4-mac/bin/Assistant.app
-libexec/qt4-mac/bin/Assistant_adp.app/Contents/MacOS/Assistant_adp
-libexec/qt4-mac/bin/Assistant_adp.app
-libexec/qt4-mac/bin/Designer.app/Contents/MacOS/Designer
-libexec/qt4-mac/bin/Designer.app
-libexec/qt4-mac/bin/Linguist.app/Contents/MacOS/Linguist
-libexec/qt4-mac/bin/Linguist.app
--
--
-libexec/qt4-mac/bin/pixeltool.app/Contents/MacOS/pixeltool
-libexec/qt4-mac/bin/pixeltool.app
-libexec/qt4-mac/bin/qdbusviewer.app/Contents/MacOS/qdbusviewer
-libexec/qt4-mac/bin/qdbusviewer.app
-libexec/qt4-mac/bin/qhelpconverter.app/Contents/MacOS/qhelpconverter
-libexec/qt4-mac/bin/qhelpconverter.app
-libexec/qt4-mac/bin/qtdemo.app/Contents/MacOS/qtdemo
-libexec/qt4-mac/bin/qtdemo.app
-libexec/qt4-mac/bin/qttracereplay.app/Contents/MacOS/qttracereplay
-libexec/qt4-mac/bin/qttracereplay.app
-libexec/qt4-mac/bin/lconvert
-libexec/qt4-mac/bin/lrelease
-libexec/qt4-mac/bin/lupdate
-libexec/qt4-mac/bin/macdeployqt
-libexec/qt4-mac/bin/moc
-libexec/qt4-mac/bin/qcollectiongenerator
-libexec/qt4-mac/bin/qdbus
-libexec/qt4-mac/bin/qdbuscpp2xml
-libexec/qt4-mac/bin/qdbusxml2cpp
-libexec/qt4-mac/bin/qdoc3
-libexec/qt4-mac/bin/qhelpgenerator
-libexec/qt4-mac/bin/qmake
-libexec/qt4-mac/bin/qt3to4
--
-libexec/qt4-mac/bin/rcc
-libexec/qt4-mac/bin/uic
-libexec/qt4-mac/bin/uic3
-libexec/qt4-mac/bin/xmlpatterns
-libexec/qt4-mac/bin/xmlpatternsvalidator
-libexec/qt4-mac/lib/pkgconfig/Qt3Support.pc
-libexec/qt4-mac/lib/pkgconfig/Qt3Support_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtAssistant.pc
-libexec/qt4-mac/lib/pkgconfig/QtAssistant_debug.pc
--
--
-libexec/qt4-mac/lib/pkgconfig/QtCLucene.pc
-libexec/qt4-mac/lib/pkgconfig/QtCLucene_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtCore.pc
-libexec/qt4-mac/lib/pkgconfig/QtCore_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtDBus.pc
-libexec/qt4-mac/lib/pkgconfig/QtDBus_debug.pc
--
--
-libexec/qt4-mac/lib/pkgconfig/QtDesigner.pc
-libexec/qt4-mac/lib/pkgconfig/QtDesigner_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtDesignerComponents.pc
-libexec/qt4-mac/lib/pkgconfig/QtDesignerComponents_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtGui.pc
-libexec/qt4-mac/lib/pkgconfig/QtGui_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtHelp.pc
-libexec/qt4-mac/lib/pkgconfig/QtHelp_debug.pc
--
--
-libexec/qt4-mac/lib/pkgconfig/QtMultimedia.pc
-libexec/qt4-mac/lib/pkgconfig/QtMultimedia_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtNetwork.pc
-libexec/qt4-mac/lib/pkgconfig/QtNetwork_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtOpenGL.pc
-libexec/qt4-mac/lib/pkgconfig/QtOpenGL_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtScript.pc
-libexec/qt4-mac/lib/pkgconfig/QtScript_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtScriptTools.pc
-libexec/qt4-mac/lib/pkgconfig/QtScriptTools_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtSql.pc
-libexec/qt4-mac/lib/pkgconfig/QtSql_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtSvg.pc
-libexec/qt4-mac/lib/pkgconfig/QtSvg_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtTest.pc
-libexec/qt4-mac/lib/pkgconfig/QtTest_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtUiTools.pc
-libexec/qt4-mac/lib/pkgconfig/QtUiTools_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtWebKit.pc
-libexec/qt4-mac/lib/pkgconfig/QtWebKit_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtXml.pc
-libexec/qt4-mac/lib/pkgconfig/QtXml_debug.pc
-libexec/qt4-mac/lib/pkgconfig/QtXmlPatterns.pc
-libexec/qt4-mac/lib/pkgconfig/QtXmlPatterns_debug.pc
-libexec/qt4-mac/lib/pkgconfig/phonon.pc
-libexec/qt4-mac/lib/pkgconfig/phonon_debug.pc
-libexec/qt4-mac/share/doc/qt4-mac
-libexec/qt4-mac/share/qt4-mac
-libexec/qt4-mac
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101021/11f5317e/attachment-0001.html>
More information about the macports-changes
mailing list