June 2012 - macports-changes - lists.macosforge.org

[93820] trunk/dports/multimedia/MPlayer/Portfile
by jmr＠macports.org 01 Jun '12

01 Jun '12

Revision: 93820 https://trac.macports.org/changeset/93820 Author: jmr(a)macports.org Date: 2012-05-31 19:56:22 -0700 (Thu, 31 May 2012) Log Message: ----------- MPlayer: add gtk2 dep for x11 variant (#31490) Modified Paths: -------------- trunk/dports/multimedia/MPlayer/Portfile Modified: trunk/dports/multimedia/MPlayer/Portfile =================================================================== --- trunk/dports/multimedia/MPlayer/Portfile 2012-06-01 02:37:47 UTC (rev 93819) +++ trunk/dports/multimedia/MPlayer/Portfile 2012-06-01 02:56:22 UTC (rev 93820) @@ -239,7 +239,7 @@ variant x11 { depends_lib-append \ - port:xorg-libXinerama \ + port:gtk2 \ port:xorg-libXv \ port:xorg-libXxf86vm

1 0

[93819] trunk/dports/devel/thrift/Portfile
by jmr＠macports.org 01 Jun '12

01 Jun '12

Revision: 93819 https://trac.macports.org/changeset/93819 Author: jmr(a)macports.org Date: 2012-05-31 19:37:47 -0700 (Thu, 31 May 2012) Log Message: ----------- thrift: add missing dependencies to haskell variant (#31477) Modified Paths: -------------- trunk/dports/devel/thrift/Portfile Modified: trunk/dports/devel/thrift/Portfile =================================================================== --- trunk/dports/devel/thrift/Portfile 2012-06-01 01:50:19 UTC (rev 93818) +++ trunk/dports/devel/thrift/Portfile 2012-06-01 02:37:47 UTC (rev 93819) @@ -73,7 +73,9 @@ variant haskell description "enable the Haskell library" { configure.args-delete --with-haskell=no configure.args-append --with-haskell=yes - depends_lib-append port:ghc + depends_lib-append port:ghc \ + port:hs-http \ + port:hs-binary } variant perl description "enable the Perl library" { configure.env-append PERL_PREFIX=${prefix}

1 0

[93818] branches/mld-qt-481/dports/audio/phonon/Portfile
by michaelld＠macports.org 01 Jun '12

01 Jun '12

Revision: 93818 https://trac.macports.org/changeset/93818 Author: michaelld(a)macports.org Date: 2012-05-31 18:50:19 -0700 (Thu, 31 May 2012) Log Message: ----------- phonon in qt4-mac branch : fix typo Modified Paths: -------------- branches/mld-qt-481/dports/audio/phonon/Portfile Modified: branches/mld-qt-481/dports/audio/phonon/Portfile =================================================================== --- branches/mld-qt-481/dports/audio/phonon/Portfile 2012-06-01 01:46:10 UTC (rev 93817) +++ branches/mld-qt-481/dports/audio/phonon/Portfile 2012-06-01 01:50:19 UTC (rev 93818) @@ -23,7 +23,7 @@ depends_build-append port:automoc -# fix the library compatibility version to the 4.4.0 +# fix the library compatibility version to be 4.4.0 patchfiles patch-CMakeLists.txt.diff configure.args-append \

1 0

[93817] branches/mld-qt-481/dports/audio/phonon
by michaelld＠macports.org 01 Jun '12

01 Jun '12

Revision: 93817 https://trac.macports.org/changeset/93817 Author: michaelld(a)macports.org Date: 2012-05-31 18:46:10 -0700 (Thu, 31 May 2012) Log Message: ----------- phonon in qt4-mac branch : fix phonon library compatibility version to match that of prior installed phonon version (4.4.0) Modified Paths: -------------- branches/mld-qt-481/dports/audio/phonon/Portfile Added Paths: ----------- branches/mld-qt-481/dports/audio/phonon/files/patch-CMakeLists.txt.diff Modified: branches/mld-qt-481/dports/audio/phonon/Portfile =================================================================== --- branches/mld-qt-481/dports/audio/phonon/Portfile 2012-06-01 01:24:51 UTC (rev 93816) +++ branches/mld-qt-481/dports/audio/phonon/Portfile 2012-06-01 01:46:10 UTC (rev 93817) @@ -9,7 +9,7 @@ version 4.6.0 categories audio kde kde4 license {LGPL-2.1 LGPL-3} -maintainers michaelld nomaintainer +maintainers michaelld openmaintainer description Cross Platform Multimedia API used by KDE4 long_description Cross Platform Multimedia API used by KDE4 platforms darwin @@ -23,6 +23,9 @@ depends_build-append port:automoc +# fix the library compatibility version to the 4.4.0 +patchfiles patch-CMakeLists.txt.diff + configure.args-append \ ${qt_cmake_defines} \ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true Added: branches/mld-qt-481/dports/audio/phonon/files/patch-CMakeLists.txt.diff =================================================================== --- branches/mld-qt-481/dports/audio/phonon/files/patch-CMakeLists.txt.diff (rev 0) +++ branches/mld-qt-481/dports/audio/phonon/files/patch-CMakeLists.txt.diff 2012-06-01 01:46:10 UTC (rev 93817) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2012-05-31 21:31:49.000000000 -0400 ++++ CMakeLists.txt 2012-05-31 21:31:52.000000000 -0400 +@@ -38,7 +38,7 @@ + set(PHONON_LIB_MINOR_VERSION "6") # Only change on binary compatible changes with new interfaces + set(PHONON_LIB_PATCH_VERSION "0") # Bump whenever you feel like it :P + set(PHONON_LIB_VERSION "${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}") +-set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION}) ++set(PHONON_LIB_SOVERSION "${PHONON_LIB_MAJOR_VERSION}.4.0") + + add_definitions(${QT_DEFINITIONS}) + remove_definitions(-DQT3_SUPPORT_WARNINGS -DQT3_SUPPORT)

1 0

[93816] trunk/base/src/macports1.0/macports.tcl
by cal＠macports.org 01 Jun '12

01 Jun '12

Revision: 93816 https://trac.macports.org/changeset/93816 Author: cal(a)macports.org Date: 2012-05-31 18:24:51 -0700 (Thu, 31 May 2012) Log Message: ----------- rev-upgrade: Change wording on error message to match dyld's, print formatted compatibility_version numbers rather than raw numbers. Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2012-06-01 01:22:05 UTC (rev 93815) +++ trunk/base/src/macports1.0/macports.tcl 2012-06-01 01:24:51 UTC (rev 93816) @@ -4312,7 +4312,7 @@ if {[macports::ui_isset ports_verbose]} { ui_msg "" } - ui_info "Incompatible library version of file [$loadcommand cget -mlt_install_name]: Expected [$loadcommand cget -mlt_comp_version], but got [$libarchitecture cget -mat_comp_version]" + ui_info "Incompatible library version: $bpath requires version [machista::format_dylib_version [$loadcommand cget -mlt_comp_version]] or later, but $filepath provides version [machista::format_dylib_version [$libarchitecture cget -mat_comp_version]]" ui_debug "Marking $bpath as broken" lappend broken_files $bpath }

1 0

[93815] trunk/base/src/cregistry/util.c
by cal＠macports.org 01 Jun '12

01 Jun '12

Revision: 93815 https://trac.macports.org/changeset/93815 Author: cal(a)macports.org Date: 2012-05-31 18:22:05 -0700 (Thu, 31 May 2012) Log Message: ----------- document undocumented parameter in registry/util.c Modified Paths: -------------- trunk/base/src/cregistry/util.c Modified: trunk/base/src/cregistry/util.c =================================================================== --- trunk/base/src/cregistry/util.c 2012-05-31 20:42:51 UTC (rev 93814) +++ trunk/base/src/cregistry/util.c 2012-06-01 01:22:05 UTC (rev 93815) @@ -123,6 +123,7 @@ * @param [in] query_len length of the query (or -1 for automatic) * @param [out] objects the objects selected * @param [in] fn a function to convert sqlite3_stmts to the desired type + * @param [inout] data data passed along to the cast function * @param [in] del a function to delete the desired type of object * @param [out] errPtr on error, a description of the error that occurred * @return the number of objects if success; negative if failure

1 0