Author: ranger
Date: Wed Aug 27 19:14:18 2008
New Revision: 1199
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1199&repname=user%3a+ranger>
Log:
more minor fixes for phonon
Modified:
trunk/experimental/common/main/finkinfo/libs/phonon.info
trunk/experimental/common/main/finkinfo/libs/phonon.patch
Modified: trunk/experimental/common/main/finkinfo/libs/phonon.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/phonon.info&rev=1199&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/phonon.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/phonon.info Wed Aug 27
19:14:18 2008
@@ -33,7 +33,7 @@
Source: mirror:kde:stable/phonon/%v/phonon-%v.tar.bz2
Source-MD5: de80b0f055886a6946acc7886713e23e
PatchFile: phonon.patch
-PatchFile-MD5: a052e6eeb2caf814a45e1d37d5fa55ed
+PatchFile-MD5: 76eb23ae978f0b0ae385fda569bf4acd
Source2: mirror:custom:qt/qt-copy-852788.tar.bz2
Source2-MD5: ca7f5f487582f851c90af13a176b23cf
Modified: trunk/experimental/common/main/finkinfo/libs/phonon.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/phonon.patch&rev=1199&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/phonon.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/phonon.patch Wed Aug 27
19:14:18 2008
@@ -1,16 +1,18 @@
diff -Nurd phonon-4.2.0/CMakeLists.txt phonon-4.2.0-patched/CMakeLists.txt
--- phonon-4.2.0/CMakeLists.txt 2008-07-22 12:32:00.000000000 -0400
-+++ phonon-4.2.0-patched/CMakeLists.txt 2008-08-27 12:12:41.000000000
-0400
-@@ -192,7 +192,7 @@
++++ phonon-4.2.0-patched/CMakeLists.txt 2008-08-27 13:13:43.000000000
-0400
+@@ -192,7 +192,9 @@
set(INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}
BUNDLE DESTINATION "${BUNDLE_INSTALL_DIR}" )
endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL "2.6")
- set(CMAKE_INSTALL_NAME_DIR ${LIB_DESTINATION})
+ set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib)
++ set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
"${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -flat_namespace -undefined
dynamic_lookup")
++ set(CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS
"${CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS} -flat_namespace -undefined
dynamic_lookup")
endif(APPLE)
if (CMAKE_SYSTEM_NAME MATCHES Linux)
-@@ -312,7 +312,7 @@
+@@ -312,7 +314,7 @@
add_subdirectory(phonon)
add_subdirectory(includes)
if (Q_WS_MAC)
@@ -42,7 +44,7 @@
${QT_QTOPENGL_LIBRARY}
diff -Nurd phonon-4.2.0/qt7/CMakeLists.txt
phonon-4.2.0-patched/qt7/CMakeLists.txt
--- phonon-4.2.0/qt7/CMakeLists.txt 2008-07-22 12:32:00.000000000 -0400
-+++ phonon-4.2.0-patched/qt7/CMakeLists.txt 2008-08-27 12:59:46.000000000
-0400
++++ phonon-4.2.0-patched/qt7/CMakeLists.txt 2008-08-27 13:13:05.000000000
-0400
@@ -14,6 +14,8 @@
project(phonon-qt7)
include(ConfigureChecks.cmake)
@@ -60,7 +62,7 @@
quicktimemetadata.cpp
audiomixer.cpp
audiodevice.cpp
-@@ -37,22 +40,27 @@
+@@ -37,15 +40,16 @@
videoframe.cpp
audiosplitter.cpp
mediaobjectaudionode.cpp
@@ -80,20 +82,8 @@
+ ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY}
+ ${PHONON_LIBS} objc
"-framework QuickTime"
-+ "-framework QTKit"
"-framework OpenGL"
-+ "-framework ApplicationServices"
"-framework AudioUnit"
- "-framework AudioToolbox"
-+ "-framework CoreFoundation"
-+ "-framework Foundation"
- "-framework CoreAudio"
- "-framework Quartz"
--# "-framework AGL"
-+ "-framework AGL"
- )
- install(TARGETS phonon_qt7 DESTINATION ${PLUGIN_INSTALL_DIR})
- #install(FILES qt7.desktop DESTINATION
${SERVICES_INSTALL_DIR}/phononbackends)
diff -Nurd phonon-4.2.0/qt7/ConfigureChecks.cmake
phonon-4.2.0-patched/qt7/ConfigureChecks.cmake
--- phonon-4.2.0/qt7/ConfigureChecks.cmake 2008-07-22 12:32:00.000000000
-0400
+++ phonon-4.2.0-patched/qt7/ConfigureChecks.cmake 2008-08-27
12:12:34.000000000 -0400
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
