Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory vz-cvs-3.sog:/tmp/cvs-serv5188/main/finkinfo/sound
Modified Files:
phonon-mac.info phonon-x11.info
Added Files:
phonon-backend-gstreamer.info phonon-backend-gstreamer.patch
phonon-backend-xine.info phonon-backend.info
Log Message:
phonon gstreamer and xine backends
Index: phonon-mac.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/phonon-mac.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- phonon-mac.info 18 May 2011 02:22:51 -0000 1.3
+++ phonon-mac.info 19 May 2011 01:58:51 -0000 1.4
@@ -1,7 +1,7 @@
Info3: <<
Package: phonon-mac
Version: 4.5.0
-Revision: 3
+Revision: 4
Description: Qt-based multimedia framework
Type: phonon (mac)
License: LGPL
@@ -17,6 +17,7 @@
qt4-base-%type_pkg[phonon] (>= 4.7.3-1)
<<
Replaces: qt4-%type_pkg[phonon] (<< 4.7.3-1)
+BuildDependsOnly: true
GCC: 4.0
Source: mirror:kde:stable/phonon/%v/src/phonon-%v.tar.bz2
--- NEW FILE: phonon-backend-gstreamer.patch ---
diff -Nurd phonon-backend-gstreamer-4.5.1/CMakeLists.txt
phonon-backend-gstreamer-4.5.1-new/CMakeLists.txt
--- phonon-backend-gstreamer-4.5.1/CMakeLists.txt 2011-05-04
00:34:52.000000000 -0400
+++ phonon-backend-gstreamer-4.5.1-new/CMakeLists.txt 2011-05-18
17:20:19.000000000 -0400
@@ -14,8 +14,6 @@
set(PHONON_GST_VERSION
"${PHONON_GST_MAJOR_VERSION}.${PHONON_GST_MINOR_VERSION}.${PHONON_GST_PATCH_VERSION}")
add_definitions(-DPHONON_GST_VERSION="${PHONON_GST_VERSION}")
-if (Q_WS_X11)
add_subdirectory(gstreamer)
-endif (Q_WS_X11)
macro_display_feature_log()
diff -Nurd phonon-backend-gstreamer-4.5.1/gstreamer/CMakeLists.txt
phonon-backend-gstreamer-4.5.1-new/gstreamer/CMakeLists.txt
--- phonon-backend-gstreamer-4.5.1/gstreamer/CMakeLists.txt 2011-05-04
00:34:52.000000000 -0400
+++ phonon-backend-gstreamer-4.5.1-new/gstreamer/CMakeLists.txt 2011-05-18
17:20:27.000000000 -0400
@@ -25,6 +25,7 @@
${GSTREAMER_PLUGIN_PBUTILS_INCLUDE_DIR}
${GLIB2_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIR}
+ ${OPENGL_INCLUDE_DIR}
${X11_X11_INCLUDE_PATH})
add_definitions(-DPHONON_BACKEND_VERSION_4_2)
if (PHONON_FOUND_EXPERIMENTAL)
@@ -67,13 +68,13 @@
list(APPEND phonon_gstreamer_SRCS glrenderer.cpp)
endif(OPENGL_FOUND)
- if(NOT WIN32)
+ if(Q_WS_X11)
set(phonon_gstreamer_SRCS
${phonon_gstreamer_SRCS}
x11renderer.cpp)
macro_optional_find_package(Alsa)
macro_ensure_version("0.10.22" ${GSTREAMER_VERSION}
GSTREAMER_HAS_NONBLOCKING_ALSASINK)
- endif(NOT WIN32)
+ endif(Q_WS_X11)
if(ALSA_FOUND AND NOT GSTREAMER_HAS_NONBLOCKING_ALSASINK)
add_definitions(-DUSE_ALSASINK2)
include_directories(${ALSA_INCLUDES})
diff -Nurd phonon-backend-gstreamer-4.5.1/gstreamer/devicemanager.cpp
phonon-backend-gstreamer-4.5.1-new/gstreamer/devicemanager.cpp
--- phonon-backend-gstreamer-4.5.1/gstreamer/devicemanager.cpp 2011-05-04
00:34:53.000000000 -0400
+++ phonon-backend-gstreamer-4.5.1-new/gstreamer/devicemanager.cpp
2011-05-18 17:20:19.000000000 -0400
@@ -311,7 +311,7 @@
if (m_videoSinkWidget == "software") {
return new WidgetRenderer(parent);
}
-#ifndef Q_WS_QWS
+#ifdef Q_WS_X11
else if (m_videoSinkWidget == "xwindow") {
return new X11Renderer(parent);
} else {
diff -Nurd phonon-backend-gstreamer-4.5.1/gstreamer/x11renderer.cpp
phonon-backend-gstreamer-4.5.1-new/gstreamer/x11renderer.cpp
--- phonon-backend-gstreamer-4.5.1/gstreamer/x11renderer.cpp 2011-05-04
00:34:55.000000000 -0400
+++ phonon-backend-gstreamer-4.5.1-new/gstreamer/x11renderer.cpp
2011-05-18 17:20:19.000000000 -0400
@@ -18,7 +18,7 @@
#include "videowidget.h"
#include "x11renderer.h"
-#ifndef Q_WS_QWS
+#ifdef Q_WS_X11
#include "backend.h"
#include "mediaobject.h"
@@ -199,4 +199,4 @@
QT_END_NAMESPACE
-#endif // Q_WS_QWS
+#endif // Q_WS_X11
diff -Nurd phonon-backend-gstreamer-4.5.1/gstreamer/x11renderer.h
phonon-backend-gstreamer-4.5.1-new/gstreamer/x11renderer.h
--- phonon-backend-gstreamer-4.5.1/gstreamer/x11renderer.h 2011-05-04
00:34:55.000000000 -0400
+++ phonon-backend-gstreamer-4.5.1-new/gstreamer/x11renderer.h 2011-05-18
17:20:19.000000000 -0400
@@ -22,7 +22,7 @@
QT_BEGIN_NAMESPACE
-#ifndef Q_WS_QWS
+#ifdef Q_WS_X11
class QString;
@@ -58,7 +58,7 @@
}
} //namespace Phonon::Gstreamer
-#endif // Q_WS_QWS
+#endif // Q_WS_X11
QT_END_NAMESPACE
--- NEW FILE: phonon-backend-xine.info ---
Info3: <<
Package: phonon-%type_pkg[phonon]-backend-xine
Version: 4.4.4
Revision: 1
Description: Phonon Xine backend (%type_pkg[phonon])
Type: phonon (mac x11)
License: LGPL
Maintainer: Benjamin Reed <pho...@fink.raccoonfink.com>
Depends: <<
libxine1-shlibs (>= 1.1.19-1),
phonon-mac-shlibs (>= 4.5.0-1),
qt4-base-mac-qtcore-shlibs (>= 4.7.3-1),
qt4-base-mac-qtdbus-shlibs (>= 4.7.3-1),
qt4-base-mac-qtgui-shlibs (>= 4.7.3-1)
<<
BuildDepends: <<
automoc-%type_pkg[phonon] (>= 0.9.89-0.999999.1),
cmake (>= 2.8.2-1),
fink (>= 0.30.0-1),
kde4-buildenv (>= 4.6.0-1),
libxine1 (>= 1.1.19-1),
system-openssl-dev,
phonon-%type_pkg[phonon] (>= 4.5.0-1),
qt4-base-%type_pkg[phonon] (>= 4.7.3-1)
<<
Replaces: qt4-%type_pkg[phonon] (<< 4.7.3-1)
GCC: 4.0
Source:
mirror:kde:stable/phonon/phonon-backend-xine/%v/src/phonon-backend-xine-%v.tar.bz2
Source-MD5: b127104e67538e573adeed3b2fb3bf55
UseMaxBuildJobs: true
CompileScript: <<
#!/bin/sh -ev
export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[phonon]"
# KDE4_INSTALL_PREFIX="%p/lib/qt4-%type_pkg[phonon]"
export PATH="%p/opt/kde4/%type_pkg[phonon]/bin:$PATH"
. %p/sbin/kde4-buildenv.sh
mkdir -p build
pushd build
cmake $KDE4_CMAKE_ARGS
-DPLUGIN_INSTALL_DIR="%p/lib/qt4-%type_pkg[phonon]" ..
make VERBOSE=1
popd
<<
InstallScript: <<
#!/bin/sh -ev
pushd build
make -j1 install/fast DESTDIR="%d"
popd
<<
DescDetail: <<
Phonon is the Qt 4 multimedia API, which provides a task-oriented
abstraction layer for capturing, mixing, processing, and playing
audio and video content.
This package provides a phonon backend implementation which uses
the Xine multimedia library.
<<
<<
--- NEW FILE: phonon-backend.info ---
Info4: <<
Package: phonon-%type_pkg[phonon]-backend
Version: 4.5.0
Revision: 1
Description: Wrapper package to choose a Phonon backend
Type: phonon (x11 mac)
License: BSD
Maintainer: Benjamin Reed <phonon-back...@fink.raccoonfink.com>
Depends: phonon-%type_pkg[phonon]-backend-gstreamer (>= 4.5.1-1) |
phonon-%type_pkg[phonon]-backend-xine (>= 4.4.4-1)
GCC: 4.0
CustomMirror: <<
Primary: http://www.finkproject.org/~ranger/distfiles
eur-NL: http://www.finkproject.org/~ranger/distfiles
nam-US: http://ranger.befunk.com/fink
<<
NoSourceDirectory: true
Source: mirror:custom:qt/README
Source-MD5: e39453c974609d19aa5cb625386faf3b
SourceRename: README.phonon-%type_pkg[phonon]-backend
UseMaxBuildJobs: true
CompileScript: echo "none needed"
InstallScript: <<
#!/bin/sh -ev
install -d -m 755 %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
<<
<<
--- NEW FILE: phonon-backend-gstreamer.info ---
Info3: <<
Package: phonon-%type_pkg[phonon]-backend-gstreamer
Version: 4.5.1
Revision: 1
Description: Phonon GStreamer backend (%type_pkg[phonon])
Type: phonon (mac x11)
License: LGPL
Maintainer: Benjamin Reed <pho...@fink.raccoonfink.com>
Depends: <<
glib2-shlibs (>= 2.22.0-1),
gst-plugins-base-0.10-shlibs (>= 0.10.34-1),
gstreamer-0.10-shlibs (>= 0.10.34-1),
phonon-mac-shlibs (>= 4.5.0-1),
qt4-base-mac-qtcore-shlibs (>= 4.7.3-1),
qt4-base-mac-qtgui-shlibs (>= 4.7.3-1),
qt4-base-mac-qtopengl-shlibs (>= 4.7.3-1)
<<
BuildDepends: <<
automoc-%type_pkg[phonon] (>= 0.9.89-0.999999.1),
cmake (>= 2.8.2-1),
fink (>= 0.30.0-1),
glib2-dev (>= 2.22.0-1),
gstreamer-0.10-dev (>= 0.10.34-1),
gst-plugins-base-0.10-dev (>= 0.10.34-1),
kde4-buildenv (>= 4.6.0-1),
libxml2 (>= 2.6.32-1),
system-openssl-dev,
phonon-%type_pkg[phonon] (>= 4.5.0-1),
qt4-base-%type_pkg[phonon] (>= 4.7.3-1)
<<
Replaces: qt4-%type_pkg[phonon] (<< 4.7.3-1)
GCC: 4.0
Source:
mirror:kde:stable/phonon/phonon-backend-gstreamer/%v/src/phonon-backend-gstreamer-%v.tar.bz2
Source-MD5: 021cf7740208e7212b7ce91adb6a349b
PatchFile: phonon-backend-gstreamer.patch
PatchFile-MD5: e5c0a53161b8c9a236a743d63f0a2077
UseMaxBuildJobs: true
CompileScript: <<
#!/bin/sh -ev
export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[phonon]"
# KDE4_INSTALL_PREFIX="%p/lib/qt4-%type_pkg[phonon]"
export PATH="%p/opt/kde4/%type_pkg[phonon]/bin:$PATH"
. %p/sbin/kde4-buildenv.sh
mkdir -p build
pushd build
cmake $KDE4_CMAKE_ARGS
-DPLUGIN_INSTALL_DIR="%p/lib/qt4-%type_pkg[phonon]" ..
make VERBOSE=1
popd
<<
InstallScript: <<
#!/bin/sh -ev
pushd build
make -j1 install/fast DESTDIR="%d"
popd
<<
DescDetail: <<
Phonon is the Qt 4 multimedia API, which provides a task-oriented
abstraction layer for capturing, mixing, processing, and playing
audio and video content.
This package provides a phonon backend implementation which uses
the GStreamer multimedia framework.
<<
<<
Index: phonon-x11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/phonon-x11.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- phonon-x11.info 18 May 2011 02:22:51 -0000 1.2
+++ phonon-x11.info 19 May 2011 01:58:51 -0000 1.3
@@ -1,7 +1,7 @@
Info3: <<
Package: phonon-x11
Version: 4.5.0
-Revision: 3
+Revision: 4
Description: Qt-based multimedia framework
Type: phonon (x11)
License: LGPL
@@ -17,6 +17,7 @@
qt4-base-%type_pkg[phonon] (>= 4.7.3-1)
<<
Replaces: qt4-%type_pkg[phonon] (<< 4.7.3-1)
+BuildDependsOnly: true
GCC: 4.0
Source: mirror:kde:stable/phonon/%v/src/phonon-%v.tar.bz2
------------------------------------------------------------------------------
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
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
