[133625] trunk/dports/audio/phonon

michaelld at macports.org michaelld at macports.org
Fri Mar 6 19:51:17 PST 2015


Revision: 133625
          https://trac.macports.org/changeset/133625
Author:   michaelld at macports.org
Date:     2015-03-06 19:51:16 -0800 (Fri, 06 Mar 2015)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/dports/audio/phonon/Portfile
    trunk/dports/audio/phonon/files/patch-CMakeLists.txt.diff

Added Paths:
-----------
    trunk/dports/audio/phonon/files/patch-cmake_FindPhononInternal.cmake.diff
    trunk/dports/audio/phonon/files/patch-cmake_PhononMacros.cmake.diff

Modified: trunk/dports/audio/phonon/Portfile
===================================================================
--- 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)
@@ -6,8 +6,7 @@
 PortGroup           cmake 1.0
 
 name                phonon
-version             4.7.2
-revision            1
+version             4.8.3
 categories          audio kde kde4
 license             {LGPL-2.1 LGPL-3}
 maintainers         michaelld openmaintainer
@@ -16,53 +15,94 @@
     framework for the application developer.
 platforms           darwin
 homepage            http://phonon.kde.org
-master_sites        kde:stable/${name}/${version}
+master_sites        kde:stable/${name}/${version}/src
 use_xz              yes
 distname            phonon-${version}
-checksums           rmd160 dbe65e52f827b56c0e0e61d9c51b4dce65a899de \
-                    sha256 819e9734d20e254b4599d8ab45f15a68d95444c4e2088c7eb5769b58976a11be
+checksums           rmd160 c035f253eda49635377122423bb72161f97f18d3 \
+                    sha256 a1149c961ca1570968d070bbd23671e614aa506f847ca93748960e309f85da16
 
 depends_build-append  port:automoc
 
-# fix the library compatibility version to be 4.4.0
-patchfiles          patch-CMakeLists.txt.diff
+# fix use of CMAKE_INSTALL_NAME to be an absolute path
 
+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
+
 post-patch {
     set rel_mp_qt_cmake_dir [strsed ${qt_cmake_module_dir} "g@${qt_dir}/@@"]
     reinplace "s|@MACPORTS_CMAKE_DIR@|${rel_mp_qt_cmake_dir}|" \
         ${worksrcpath}/CMakeLists.txt
 }
 
+# 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
+
 configure.args-append   \
     ${qt_cmake_defines} \
-    -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true
+    -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \
+    -DWITH_QZeitgeist=OFF
 
 configure.ldflags-append -F${qt_frameworks_dir}
 
 post-destroot {
+    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}
+    }
+}
 
-    # fix plugin name
+variant pulseaudio description "Build Phonon with additional support for PulseAudio" {
 
-    move ${destroot}${qt_plugins_dir}/designer/libphononwidgets.so \
-        ${destroot}${qt_plugins_dir}/designer/libphononwidgets.dylib
+    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
 
-    # link major library version name
+}
 
-    ln -s ${prefix}/lib/libphonon.dylib ${destroot}${prefix}/lib/libphonon.4.dylib
-    ln -s ${prefix}/lib/libphononexperimental.dylib ${destroot}${prefix}/lib/libphononexperimental.4.dylib
+if {![variant_isset pulseaudio]} {
+    configure.args-append \
+        -DWITH_PulseAudio=OFF \
+        -DPHONON_PULSESUPPORT=NO \
+        -DPULSEAUDIO_INCLUDE_DIR= \
+        -DPULSEAUDIO_LIBRARY= \
+        -DPULSEAUDIO_MAINLOOP_LIBRARY=
+}
 
-    # fix library and plugin self-names
+variant demos description "Build Phonon demos" {
+    configure.args-append -DPHONON_BUILD_DEMOS=ON
+}
 
-    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"
-
+if {![variant_isset demos]} {
+    configure.args-append -DPHONON_BUILD_DEMOS=OFF
 }
 
-livecheck.type		regex
-livecheck.url		http://www.gtlib.gatech.edu/pub/kde/stable/${name}/
-livecheck.regex		"\(\\d+(?:\\.\\d+)*)\/"
+livecheck.type   regex
+livecheck.url    http://www.gtlib.gatech.edu/pub/kde/stable/${name}/
+livecheck.regex  "\(\\d+(?:\\.\\d+)*)\/"

Modified: trunk/dports/audio/phonon/files/patch-CMakeLists.txt.diff
===================================================================
--- 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)
@@ -1,15 +1,6 @@
---- 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 @@
+--- 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 @@
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PHONON_LIB_SONAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
  endif(NOT WIN32)
  

Added: trunk/dports/audio/phonon/files/patch-cmake_FindPhononInternal.cmake.diff
===================================================================
--- 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)
@@ -0,0 +1,12 @@
+--- 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

Added: trunk/dports/audio/phonon/files/patch-cmake_PhononMacros.cmake.diff
===================================================================
--- 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)
@@ -0,0 +1,21 @@
+--- 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150306/7f1bbb07/attachment-0001.html>


More information about the macports-changes mailing list