[122949] trunk/dports/audio/phonon
michaelld at macports.org
michaelld at macports.org
Sat Aug 2 13:49:01 PDT 2014
Revision: 122949
https://trac.macports.org/changeset/122949
Author: michaelld at macports.org
Date: 2014-08-02 13:49:01 -0700 (Sat, 02 Aug 2014)
Log Message:
-----------
phonon: fix cmake config files install location in the build rather than post-destroot so that internally-generated files work correctly with the proper path. Addresses ticket #44351.
Modified Paths:
--------------
trunk/dports/audio/phonon/Portfile
trunk/dports/audio/phonon/files/patch-CMakeLists.txt.diff
Modified: trunk/dports/audio/phonon/Portfile
===================================================================
--- trunk/dports/audio/phonon/Portfile 2014-08-02 20:43:03 UTC (rev 122948)
+++ trunk/dports/audio/phonon/Portfile 2014-08-02 20:49:01 UTC (rev 122949)
@@ -7,6 +7,7 @@
name phonon
version 4.7.2
+revision 1
categories audio kde kde4
license {LGPL-2.1 LGPL-3}
maintainers michaelld openmaintainer
@@ -26,6 +27,12 @@
# fix the library compatibility version to be 4.4.0
patchfiles 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
+}
+
configure.args-append \
${qt_cmake_defines} \
-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=true
@@ -54,12 +61,6 @@
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"
- # move odd cmake directory into the cmake module's directory
-
- xinstall -m 755 -d ${destroot}${qt_cmake_module_dir}
- move ${destroot}${prefix}/lib/cmake/phonon \
- ${destroot}${qt_cmake_module_dir}
-
}
livecheck.type regex
Modified: trunk/dports/audio/phonon/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/audio/phonon/files/patch-CMakeLists.txt.diff 2014-08-02 20:43:03 UTC (rev 122948)
+++ trunk/dports/audio/phonon/files/patch-CMakeLists.txt.diff 2014-08-02 20:49:01 UTC (rev 122949)
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig 2014-03-19 15:38:21.000000000 -0400
-+++ CMakeLists.txt 2014-03-19 15:39:44.000000000 -0400
+--- 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
@@ -9,3 +9,12 @@
set(PHONON_LIB_SONAME phonon)
set(PHONON_LIB_SONAME_CAMEL Phonon)
+@@ -228,7 +228,7 @@
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PHONON_LIB_SONAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+ endif(NOT WIN32)
+
+-set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/${PHONON_LIB_SONAME} )
++set(CMAKECONFIG_INSTALL_DIR @MACPORTS_CMAKE_DIR@/${PHONON_LIB_SONAME} )
+
+ # figure out the relative path from the installed Config.cmake file to the install prefix (which may be at
+ # runtime different from the chosen CMAKE_INSTALL_PREFIX if under Windows the package was installed anywhere)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140802/cd693cc8/attachment.html>
More information about the macports-changes
mailing list