Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory vz-cvs-3.sog:/tmp/cvs-serv32324/main/finkinfo/sound
Modified Files:
phonon-mac.info phonon-x11.info phonon.patch
Log Message:
fix some phonon installation/versioning issues
Index: phonon.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/phonon.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- phonon.patch 17 May 2011 15:00:27 -0000 1.1
+++ phonon.patch 23 May 2011 13:16:07 -0000 1.2
@@ -1,30 +1,29 @@
-Binary files phonon-4.5.0/.CMakeLists.txt.swp and
phonon-4.5.0-new/.CMakeLists.txt.swp differ
-diff --exclude=build -Nurd phonon-4.5.0/CMakeLists.txt
phonon-4.5.0-new/CMakeLists.txt
+diff -Nurd phonon-4.5.0/CMakeLists.txt phonon-4.5.0-new/CMakeLists.txt
--- phonon-4.5.0/CMakeLists.txt 2011-03-25 09:55:56.000000000 -0400
-+++ phonon-4.5.0-new/CMakeLists.txt 2011-05-09 23:42:17.000000000 -0400
++++ phonon-4.5.0-new/CMakeLists.txt 2011-05-23 09:06:19.000000000 -0400
@@ -32,8 +32,18 @@
set(PHONON_LIB_MAJOR_VERSION "4") # Only change on binary incompatible changes
set(PHONON_LIB_MINOR_VERSION "5") # Only change on binary compatible changes
with new interfaces
set(PHONON_LIB_PATCH_VERSION "0") # Bump whenever you feel like it :P
+
+if (APPLE AND PHONON_USE_FRAMEWORKS)
-+set(PHONON_LIB_VERSION "${PHONON_LIB_MAJOR_VERSION}")
++set(PHONON_LIB_VERSION
"${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}")
+set(PHONON_LIB_SOVERSION
"${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}")
+set(PC_LIBS "-F\${libdir} -Wl,-framework,phonon")
+set(PC_CFLAGS "-F\${libdir} -I\${includedir}")
+else (APPLE AND PHONON_USE_FRAMEWORKS)
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}")
++set(PHONON_LIB_SOVERSION
"${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}")
+set(PC_LIBS "-L\${libdir} -lphonon")
+set(PC_CFLAGS "-I\${includedir}")
+endif (APPLE AND PHONON_USE_FRAMEWORKS)
add_definitions(${QT_DEFINITIONS})
remove_definitions(-DQT3_SUPPORT_WARNINGS -DQT3_SUPPORT)
-diff --exclude=build -Nurd phonon-4.5.0/cmake/FindPhononInternal.cmake
phonon-4.5.0-new/cmake/FindPhononInternal.cmake
+diff -Nurd phonon-4.5.0/cmake/FindPhononInternal.cmake
phonon-4.5.0-new/cmake/FindPhononInternal.cmake
--- phonon-4.5.0/cmake/FindPhononInternal.cmake 2011-03-25
09:55:56.000000000 -0400
-+++ phonon-4.5.0-new/cmake/FindPhononInternal.cmake 2011-05-09
23:04:43.000000000 -0400
++++ phonon-4.5.0-new/cmake/FindPhononInternal.cmake 2011-05-23
08:24:17.000000000 -0400
@@ -217,6 +217,7 @@
# on the Mac support an extra install directory for application bundles
if(APPLE)
@@ -33,11 +32,9 @@
BUNDLE DESTINATION
"${BUNDLE_INSTALL_DIR}")
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")
-Binary files phonon-4.5.0/gcc-root/g++-4.2 and
phonon-4.5.0-new/gcc-root/g++-4.2 differ
-Binary files phonon-4.5.0/gcc-root/gcc-4.2 and
phonon-4.5.0-new/gcc-root/gcc-4.2 differ
-diff --exclude=build -Nurd phonon-4.5.0/includes/CMakeLists.txt
phonon-4.5.0-new/includes/CMakeLists.txt
+diff -Nurd phonon-4.5.0/includes/CMakeLists.txt
phonon-4.5.0-new/includes/CMakeLists.txt
--- phonon-4.5.0/includes/CMakeLists.txt 2011-03-25 09:55:56.000000000
-0400
-+++ phonon-4.5.0-new/includes/CMakeLists.txt 2011-05-09 23:29:38.000000000
-0400
++++ phonon-4.5.0-new/includes/CMakeLists.txt 2011-05-23 08:24:17.000000000
-0400
@@ -1,4 +1,4 @@
-install( FILES
+set(INCLUDES_HEADER_FILES
@@ -57,9 +54,9 @@
install( FILES
old/Phonon/AbstractAudioOutput
-diff --exclude=build -Nurd phonon-4.5.0/phonon/CMakeLists.txt
phonon-4.5.0-new/phonon/CMakeLists.txt
+diff -Nurd phonon-4.5.0/phonon/CMakeLists.txt
phonon-4.5.0-new/phonon/CMakeLists.txt
--- phonon-4.5.0/phonon/CMakeLists.txt 2011-03-25 09:55:56.000000000 -0400
-+++ phonon-4.5.0-new/phonon/CMakeLists.txt 2011-05-09 23:30:08.000000000
-0400
++++ phonon-4.5.0-new/phonon/CMakeLists.txt 2011-05-23 08:24:17.000000000
-0400
@@ -109,6 +109,10 @@
target_link_libraries(phonon m)
endif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
@@ -93,9 +90,9 @@
+ DESTINATION
${LIB_INSTALL_DIR}/phonon.framework/Versions/${PHONON_LIB_MAJOR_VERSION}/Headers
COMPONENT Devel)
install(FILES org.kde.Phonon.AudioOutput.xml DESTINATION
${DBUS_INTERFACES_INSTALL_DIR})
-diff --exclude=build -Nurd phonon-4.5.0/phonon/experimental/CMakeLists.txt
phonon-4.5.0-new/phonon/experimental/CMakeLists.txt
+diff -Nurd phonon-4.5.0/phonon/experimental/CMakeLists.txt
phonon-4.5.0-new/phonon/experimental/CMakeLists.txt
--- phonon-4.5.0/phonon/experimental/CMakeLists.txt 2011-03-25
09:55:56.000000000 -0400
-+++ phonon-4.5.0-new/phonon/experimental/CMakeLists.txt 2011-05-09
23:06:17.000000000 -0400
++++ phonon-4.5.0-new/phonon/experimental/CMakeLists.txt 2011-05-23
08:24:17.000000000 -0400
@@ -23,6 +23,10 @@
)
automoc4_add_library(phononexperimental SHARED ${phononexperimental_LIB_SRCS})
@@ -107,9 +104,9 @@
set_target_properties(phononexperimental PROPERTIES
VERSION ${PHONON_LIB_VERSION}
SOVERSION ${PHONON_LIB_SOVERSION}
-diff --exclude=build -Nurd
phonon-4.5.0/phonon/experimental/tests/CMakeLists.txt
phonon-4.5.0-new/phonon/experimental/tests/CMakeLists.txt
+diff -Nurd phonon-4.5.0/phonon/experimental/tests/CMakeLists.txt
phonon-4.5.0-new/phonon/experimental/tests/CMakeLists.txt
--- phonon-4.5.0/phonon/experimental/tests/CMakeLists.txt 2011-03-25
09:55:56.000000000 -0400
-+++ phonon-4.5.0-new/phonon/experimental/tests/CMakeLists.txt 2011-05-09
22:40:07.000000000 -0400
++++ phonon-4.5.0-new/phonon/experimental/tests/CMakeLists.txt 2011-05-23
08:24:17.000000000 -0400
@@ -28,22 +28,22 @@
MACRO(PHONON_EXECUTABLE_TESTS)
@@ -138,9 +135,9 @@
target_link_libraries(${_testname} ${PHONON_LIBS} phononexperimental
${QT_QTTEST_LIBRARY})
ENDFOREACH(_testname)
ENDMACRO(PHONON_EXECUTABLE_TESTS)
-diff --exclude=build -Nurd phonon-4.5.0/phonon.pc.cmake
phonon-4.5.0-new/phonon.pc.cmake
+diff -Nurd phonon-4.5.0/phonon.pc.cmake phonon-4.5.0-new/phonon.pc.cmake
--- phonon-4.5.0/phonon.pc.cmake 2011-03-25 09:55:56.000000000 -0400
-+++ phonon-4.5.0-new/phonon.pc.cmake 2011-05-09 23:14:26.000000000 -0400
++++ phonon-4.5.0-new/phonon.pc.cmake 2011-05-23 08:24:17.000000000 -0400
@@ -8,5 +8,7 @@
Description: Phonon library needed to build applications
Version:
@PHONON_LIB_MAJOR_VERSION@.@PHONON_LIB_MINOR_VERSION@.@PHONON_LIB_PATCH_VERSION@
Index: phonon-mac.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/phonon-mac.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- phonon-mac.info 19 May 2011 01:58:51 -0000 1.4
+++ phonon-mac.info 23 May 2011 13:16:07 -0000 1.5
@@ -1,7 +1,7 @@
Info3: <<
Package: phonon-mac
Version: 4.5.0
-Revision: 4
+Revision: 5
Description: Qt-based multimedia framework
Type: phonon (mac)
License: LGPL
@@ -23,7 +23,7 @@
Source: mirror:kde:stable/phonon/%v/src/phonon-%v.tar.bz2
Source-MD5: 32f8d388c18fde2e23dea7bb103f9713
PatchFile: phonon.patch
-PatchFile-MD5: 98b93bb7af46c8eac9340a7b64f5f40e
+PatchFile-MD5: f1dfbdbfa9d6c4816c23db7058d76ee7
UseMaxBuildJobs: true
CompileScript: <<
@@ -47,9 +47,30 @@
make -j1 install/fast DESTDIR="%d"
popd
+ install -d -m 755 %i/opt/kde4/%type_pkg[phonon]/share
+ mv %i/lib/qt4-%type_pkg[phonon]/share/phonon-buildsystem
%i/opt/kde4/%type_pkg[phonon]/share/
+
pushd %i/lib/qt4-%type_pkg[phonon]/lib/phonon.framework
+ mv Versions/4.5/* Versions/4/
+ rm -rf Versions/4.5
ln -sf Versions/4/Headers Headers
+ pushd Versions
+ ln -sf 4 4.5
+ popd
+ popd
+ pushd
%i/lib/qt4-%type_pkg[phonon]/lib/phononexperimental.framework/Versions
+ mkdir 4
+ mv 4.5/* 4/
+ rm -rf 4.5
+ ln -sf 4 4.5
popd
+ install_name_tool -id
%p/lib/qt4-%type_pkg[phonon]/lib/phonon.framework/Versions/4/phonon \
+
%i/lib/qt4-%type_pkg[phonon]/lib/phonon.framework/Versions/4.5/phonon
+ install_name_tool -id
%p/lib/qt4-%type_pkg[phonon]/lib/phononexperimental.framework/Versions/4/phononexperimental
\
+
%i/lib/qt4-%type_pkg[phonon]/lib/phononexperimental.framework/Versions/4.5/phononexperimental
+ install_name_tool -change
%p/lib/qt4-%type_pkg[phonon]/lib/phonon.framework/Versions/4.5/phonon \
+
%p/lib/qt4-%type_pkg[phonon]/lib/phonon.framework/Versions/4/phonon \
+
%i/lib/qt4-%type_pkg[phonon]/lib/phononexperimental.framework/Versions/4.5/phononexperimental
<<
SplitOff: <<
Package: %N-shlibs
@@ -63,24 +84,28 @@
Replaces: <<
qt4-%type_pkg[phonon]-designer-shlibs (<< 4.7.3-1),
qt4-%type_pkg[phonon]-gui-shlibs (<< 4.7.3-1),
- qt4-%type_pkg[phonon] (<< 4.7.3-1)
+ qt4-%type_pkg[phonon] (<< 4.7.3-1),
+ phonon-%type_pkg[phonon] (<< 4.5.0-5)
<<
Files: <<
lib/qt4-%type_pkg[phonon]/lib/phonon.framework/Resources
+
lib/qt4-%type_pkg[phonon]/lib/phonon.framework/Versions/4/Resources/Info.plist
lib/qt4-%type_pkg[phonon]/lib/phonon.framework/Versions/4/phonon
+ lib/qt4-%type_pkg[phonon]/lib/phonon.framework/Versions/4.5
lib/qt4-%type_pkg[phonon]/lib/phonon.framework/Versions/Current
lib/qt4-%type_pkg[phonon]/lib/phonon.framework/phonon
lib/qt4-%type_pkg[phonon]/lib/phononexperimental.framework/Resources
lib/qt4-%type_pkg[phonon]/lib/phononexperimental.framework/Versions/4/Resources/Info.plist
lib/qt4-%type_pkg[phonon]/lib/phononexperimental.framework/Versions/4/phononexperimental
+
lib/qt4-%type_pkg[phonon]/lib/phononexperimental.framework/Versions/4.5
lib/qt4-%type_pkg[phonon]/lib/phononexperimental.framework/Versions/Current
lib/qt4-%type_pkg[phonon]/lib/phononexperimental.framework/phononexperimental
lib/qt4-%type_pkg[phonon]/plugins/designer/*phonon*
lib/qt4-%type_pkg[phonon]/share/dbus-1/interfaces
<<
Shlibs: <<
-
%p/lib/qt4-%type_pkg[phonon]/lib/phonon.framework/Versions/4/phonon
4.5.0 %n (>= 4.5.0-1)
-
%p/lib/qt4-%type_pkg[phonon]/lib/phononexperimental.framework/Versions/4/phononexperimental
4.5.0 %n (>= 4.5.0-1)
+
%p/lib/qt4-%type_pkg[phonon]/lib/phonon.framework/Versions/4/phonon
4.5.0 %n (>= 4.5.0-5)
+
%p/lib/qt4-%type_pkg[phonon]/lib/phononexperimental.framework/Versions/4/phononexperimental
4.5.0 %n (>= 4.5.0-5)
<<
<<
Index: phonon-x11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/phonon-x11.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- phonon-x11.info 19 May 2011 01:58:51 -0000 1.3
+++ phonon-x11.info 23 May 2011 13:16:07 -0000 1.4
@@ -1,7 +1,7 @@
Info3: <<
Package: phonon-x11
Version: 4.5.0
-Revision: 4
+Revision: 5
Description: Qt-based multimedia framework
Type: phonon (x11)
License: LGPL
@@ -23,7 +23,7 @@
Source: mirror:kde:stable/phonon/%v/src/phonon-%v.tar.bz2
Source-MD5: 32f8d388c18fde2e23dea7bb103f9713
PatchFile: phonon.patch
-PatchFile-MD5: 98b93bb7af46c8eac9340a7b64f5f40e
+PatchFile-MD5: f1dfbdbfa9d6c4816c23db7058d76ee7
UseMaxBuildJobs: true
CompileScript: <<
@@ -46,6 +46,17 @@
pushd build
make -j1 install/fast DESTDIR="%d"
popd
+
+ install -d -m 755 %i/opt/kde4/%type_pkg[phonon]/share
+ mv %i/lib/qt4-%type_pkg[phonon]/share/phonon-buildsystem
%i/opt/kde4/%type_pkg[phonon]/share/
+
+ pushd %i/lib/qt4-%type_pkg[phonon]/lib
+ ln -s libphonon.4.5.dylib libphonon.4.dylib
+ ln -s libphononexperimental.4.5.dylib
libphononexperimental.4.dylib
+ install_name_tool -id
%p/lib/qt4-%type_pkg[phonon]/lib/libphonon.4.dylib libphonon.%v.dylib
+ install_name_tool -id
%p/lib/qt4-%type_pkg[phonon]/lib/libphononexperimental.4.dylib
libphononexperimental.%v.dylib
+ install_name_tool -change
%p/lib/qt4-%type_pkg[phonon]/lib/libphonon.4.5.dylib
%p/lib/qt4-%type_pkg[phonon]/lib/libphonon.4.dylib
libphononexperimental.%v.dylib
+ popd
<<
SplitOff: <<
Package: %N-shlibs
@@ -59,7 +70,8 @@
Replaces: <<
qt4-%type_pkg[phonon]-designer-shlibs (<< 4.7.3-1),
qt4-%type_pkg[phonon]-gui-shlibs (<< 4.7.3-1),
- qt4-%type_pkg[phonon] (<< 4.7.3-1)
+ qt4-%type_pkg[phonon] (<< 4.7.3-1),
+ phonon-%type_pkg[phonon] (<< 4.5.0-5)
<<
Files: <<
lib/qt4-%type_pkg[phonon]/lib/libphonon.4*.dylib
@@ -68,8 +80,8 @@
lib/qt4-%type_pkg[phonon]/share/dbus-1/interfaces
<<
Shlibs: <<
- %p/lib/qt4-%type_pkg[phonon]/lib/libphonon.4.dylib
4.0.0 %n (>= 4.5.0-1)
- %p/lib/qt4-%type_pkg[phonon]/lib/libphononexperimental.4.dylib
4.0.0 %n (>= 4.5.0-1)
+ %p/lib/qt4-%type_pkg[phonon]/lib/libphonon.4.dylib
4.5.0 %n (>= 4.5.0-5)
+ %p/lib/qt4-%type_pkg[phonon]/lib/libphononexperimental.4.dylib
4.5.0 %n (>= 4.5.0-5)
<<
<<
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
