<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[133625] trunk/dports/audio/phonon</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/133625">133625</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-03-06 19:51:16 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>phonon:
+ update to 4.8.3;
+ use patches to address library install names and suffix;
+ add variants for pulseaudio and demos;
+ do VPATH build;
+ fix master_sites;
+ whitespace;
+ partially addresses ticket #46552.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaudiophononPortfile">trunk/dports/audio/phonon/Portfile</a></li>
<li><a href="#trunkdportsaudiophononfilespatchCMakeListstxtdiff">trunk/dports/audio/phonon/files/patch-CMakeLists.txt.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaudiophononfilespatchcmake_FindPhononInternalcmakediff">trunk/dports/audio/phonon/files/patch-cmake_FindPhononInternal.cmake.diff</a></li>
<li><a href="#trunkdportsaudiophononfilespatchcmake_PhononMacroscmakediff">trunk/dports/audio/phonon/files/patch-cmake_PhononMacros.cmake.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaudiophononPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/audio/phonon/Portfile (133624 => 133625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/phonon/Portfile 2015-03-07 02:36:06 UTC (rev 133624)
+++ trunk/dports/audio/phonon/Portfile 2015-03-07 03:51:16 UTC (rev 133625)
</span><span class="lines">@@ -6,8 +6,7 @@
</span><span class="cx"> PortGroup cmake 1.0
</span><span class="cx">
</span><span class="cx"> name phonon
</span><del>-version 4.7.2
-revision 1
</del><ins>+version 4.8.3
</ins><span class="cx"> categories audio kde kde4
</span><span class="cx"> license {LGPL-2.1 LGPL-3}
</span><span class="cx"> maintainers michaelld openmaintainer
</span><span class="lines">@@ -16,53 +15,94 @@
</span><span class="cx"> framework for the application developer.
</span><span class="cx"> platforms darwin
</span><span class="cx"> homepage http://phonon.kde.org
</span><del>-master_sites kde:stable/${name}/${version}
</del><ins>+master_sites kde:stable/${name}/${version}/src
</ins><span class="cx"> use_xz yes
</span><span class="cx"> distname phonon-${version}
</span><del>-checksums rmd160 dbe65e52f827b56c0e0e61d9c51b4dce65a899de \
- sha256 819e9734d20e254b4599d8ab45f15a68d95444c4e2088c7eb5769b58976a11be
</del><ins>+checksums rmd160 c035f253eda49635377122423bb72161f97f18d3 \
+ sha256 a1149c961ca1570968d070bbd23671e614aa506f847ca93748960e309f85da16
</ins><span class="cx">
</span><span class="cx"> depends_build-append port:automoc
</span><span class="cx">
</span><del>-# fix the library compatibility version to be 4.4.0
-patchfiles patch-CMakeLists.txt.diff
</del><ins>+# fix use of CMAKE_INSTALL_NAME to be an absolute path
</ins><span class="cx">
</span><ins>+patchfiles-append patch-cmake_FindPhononInternal.cmake.diff
+
+# fix MODULE names to end in .dylib instead of .so
+
+patchfiles-append patch-cmake_PhononMacros.cmake.diff
+
+# fix install location of cmake module files;
+# patch here and post-patch reinplace
+
+patchfiles-append patch-CMakeLists.txt.diff
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> set rel_mp_qt_cmake_dir [strsed ${qt_cmake_module_dir} "g@${qt_dir}/@@"]
</span><span class="cx"> reinplace "s|@MACPORTS_CMAKE_DIR@|${rel_mp_qt_cmake_dir}|" \
</span><span class="cx"> ${worksrcpath}/CMakeLists.txt
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# do VPATH build
+
+set vpath ${workpath}/build
+pre-configure { file mkdir ${vpath} }
+configure.dir ${vpath}
+build.dir ${vpath}
+
+# set last configure argument to the reletive path
+# to the top-level cmake source
+
+configure.post_args ../${worksrcdir}
+
+# standard args
+
</ins><span class="cx"> configure.args-append \
</span><span class="cx"> ${qt_cmake_defines} \
</span><del>- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true
</del><ins>+ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \
+ -DWITH_QZeitgeist=OFF
</ins><span class="cx">
</span><span class="cx"> configure.ldflags-append -F${qt_frameworks_dir}
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><ins>+ if {[variant_isset demos]} {
+ set demos_dest_dir ${destroot}${prefix}/share/examples/phonon
+ xinstall -m 775 -d ${demos_dest_dir}
+ copy ${workpath}/build/demos/simpleplayer/simpleplayer ${demos_dest_dir}
+ copy ${workpath}/build/demos/metadatareader/metadatareader ${demos_dest_dir}
+ copy ${workpath}/build/demos/phota/phota ${demos_dest_dir}
+ copy ${workpath}/build/demos/simplecapture/simplecapture ${demos_dest_dir}
+ }
+}
</ins><span class="cx">
</span><del>- # fix plugin name
</del><ins>+variant pulseaudio description "Build Phonon with additional support for PulseAudio" {
</ins><span class="cx">
</span><del>- move ${destroot}${qt_plugins_dir}/designer/libphononwidgets.so \
- ${destroot}${qt_plugins_dir}/designer/libphononwidgets.dylib
</del><ins>+ depends_lib-append port:pulseaudio
+ configure.args-append \
+ -DWITH_PulseAudio=ON \
+ -DPHONON_PULSESUPPORT=YES \
+ -DPULSEAUDIO_INCLUDE_DIR=${prefix}/include \
+ -DPULSEAUDIO_LIBRARY=${prefix}/lib/libpulse.dylib \
+ -DPULSEAUDIO_MAINLOOP_LIBRARY=${prefix}/lib/libpulse-mainloop-glib.dylib
</ins><span class="cx">
</span><del>- # link major library version name
</del><ins>+}
</ins><span class="cx">
</span><del>- ln -s ${prefix}/lib/libphonon.dylib ${destroot}${prefix}/lib/libphonon.4.dylib
- ln -s ${prefix}/lib/libphononexperimental.dylib ${destroot}${prefix}/lib/libphononexperimental.4.dylib
</del><ins>+if {![variant_isset pulseaudio]} {
+ configure.args-append \
+ -DWITH_PulseAudio=OFF \
+ -DPHONON_PULSESUPPORT=NO \
+ -DPULSEAUDIO_INCLUDE_DIR= \
+ -DPULSEAUDIO_LIBRARY= \
+ -DPULSEAUDIO_MAINLOOP_LIBRARY=
+}
</ins><span class="cx">
</span><del>- # fix library and plugin self-names
</del><ins>+variant demos description "Build Phonon demos" {
+ configure.args-append -DPHONON_BUILD_DEMOS=ON
+}
</ins><span class="cx">
</span><del>- system "install_name_tool -id ${prefix}/lib/libphonon.4.dylib ${destroot}${prefix}/lib/libphonon.dylib"
- system "install_name_tool -id ${prefix}/lib/libphononexperimental.4.dylib ${destroot}${prefix}/lib/libphononexperimental.dylib"
-
- # fix use of libphonon
-
- system "install_name_tool -change lib/libphonon.4.4.0.dylib ${prefix}/lib/libphonon.4.dylib ${destroot}${prefix}/lib/libphononexperimental.dylib"
- system "install_name_tool -change lib/libphonon.4.4.0.dylib ${prefix}/lib/libphonon.4.dylib ${destroot}${prefix}/share/qt4/plugins/designer/libphononwidgets.dylib"
-
</del><ins>+if {![variant_isset demos]} {
+ configure.args-append -DPHONON_BUILD_DEMOS=OFF
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url http://www.gtlib.gatech.edu/pub/kde/stable/${name}/
-livecheck.regex "\(\\d+(?:\\.\\d+)*)\/"
</del><ins>+livecheck.type regex
+livecheck.url http://www.gtlib.gatech.edu/pub/kde/stable/${name}/
+livecheck.regex "\(\\d+(?:\\.\\d+)*)\/"
</ins></span></pre></div>
<a id="trunkdportsaudiophononfilespatchCMakeListstxtdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/audio/phonon/files/patch-CMakeLists.txt.diff (133624 => 133625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/phonon/files/patch-CMakeLists.txt.diff 2015-03-07 02:36:06 UTC (rev 133624)
+++ trunk/dports/audio/phonon/files/patch-CMakeLists.txt.diff 2015-03-07 03:51:16 UTC (rev 133625)
</span><span class="lines">@@ -1,15 +1,6 @@
</span><del>---- CMakeLists.txt.orig 2014-08-02 16:15:47.000000000 -0400
-+++ CMakeLists.txt 2014-08-02 16:16:01.000000000 -0400
-@@ -23,7 +23,7 @@
- set(PHONON_LIB_MINOR_VERSION "7") # Only change on binary compatible changes with new interfaces
- set(PHONON_LIB_PATCH_VERSION "2") # 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")
- set(PHONON_LIB_SONAME phonon)
- set(PHONON_LIB_SONAME_CAMEL Phonon)
-
-@@ -228,7 +228,7 @@
</del><ins>+--- CMakeLists.txt.orig 2015-03-06 19:31:55.000000000 -0500
++++ CMakeLists.txt 2015-03-06 19:32:24.000000000 -0500
+@@ -230,7 +230,7 @@
</ins><span class="cx"> install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PHONON_LIB_SONAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
</span><span class="cx"> endif(NOT WIN32)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsaudiophononfilespatchcmake_FindPhononInternalcmakediff"></a>
<div class="addfile"><h4>Added: trunk/dports/audio/phonon/files/patch-cmake_FindPhononInternal.cmake.diff (0 => 133625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/phonon/files/patch-cmake_FindPhononInternal.cmake.diff (rev 0)
+++ trunk/dports/audio/phonon/files/patch-cmake_FindPhononInternal.cmake.diff 2015-03-07 03:51:16 UTC (rev 133625)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+--- cmake/FindPhononInternal.cmake.orig 2015-03-06 22:10:22.000000000 -0500
++++ cmake/FindPhononInternal.cmake 2015-03-06 22:11:10.000000000 -0500
+@@ -206,6 +206,9 @@
+ set(CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS "${CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS} -flat_namespace -undefined dynamic_lookup")
+
+ set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
++ if (NOT IS_ABSOLUTE "${CMAKE_INSTALL_NAME_DIR}")
++ set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
++ endif()
+ endif(APPLE)
+
+ # RPATH Handling
</ins></span></pre></div>
<a id="trunkdportsaudiophononfilespatchcmake_PhononMacroscmakediff"></a>
<div class="addfile"><h4>Added: trunk/dports/audio/phonon/files/patch-cmake_PhononMacros.cmake.diff (0 => 133625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/phonon/files/patch-cmake_PhononMacros.cmake.diff (rev 0)
+++ trunk/dports/audio/phonon/files/patch-cmake_PhononMacros.cmake.diff 2015-03-07 03:51:16 UTC (rev 133625)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+--- cmake/PhononMacros.cmake.orig 2015-03-06 22:35:36.000000000 -0500
++++ cmake/PhononMacros.cmake 2015-03-06 22:35:40.000000000 -0500
+@@ -25,12 +25,18 @@
+ macro(phonon_add_declarative_plugin _target)
+ set(_srcs ${ARGN})
+ automoc4_add_library(${_target} MODULE ${_global_add_executable_param} ${_srcs})
++ if(APPLE)
++ set_target_properties(${_target} PROPERTIES SUFFIX ".dylib")
++ endif(APPLE)
+ endmacro(phonon_add_declarative_plugin _target)
+
+ macro(phonon_add_designer_plugin _target _qrc_file)
+ set(_srcs ${ARGN})
+ qt5_add_resources(_srcs ${_qrc_file})
+ automoc4_add_library(${_target} MODULE ${_global_add_executable_param} ${_srcs})
++ if(APPLE)
++ set_target_properties(${_target} PROPERTIES SUFFIX ".dylib")
++ endif(APPLE)
+ endmacro(phonon_add_designer_plugin)
+
+ macro (PHONON_UPDATE_ICONCACHE)
</ins></span></pre>
</div>
</div>
</body>
</html>