diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-09-30 13:13:57 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-09-30 13:13:57 +0000 |
| commit | f147041f69f70583b3d81a7fd5fa5b00c85d9d16 (patch) | |
| tree | 80053a22ddc80f732d9fa0f1b8f9faab4628d49c /media-libs/phonon-qt7 | |
| parent | Disable tracker support for version to stabilize as it's not ready yet. Drop ... (diff) | |
| download | gentoo-2-f147041f69f70583b3d81a7fd5fa5b00c85d9d16.tar.gz gentoo-2-f147041f69f70583b3d81a7fd5fa5b00c85d9d16.tar.bz2 gentoo-2-f147041f69f70583b3d81a7fd5fa5b00c85d9d16.zip | |
Fix compilation on OSX Lion
(Portage version: 2.2.01.21165-prefix/cvs/Darwin i386)
Diffstat (limited to 'media-libs/phonon-qt7')
| -rw-r--r-- | media-libs/phonon-qt7/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/phonon-qt7/files/phonon-qt7-0_pre20110424-darwin11.patch | 29 | ||||
| -rw-r--r-- | media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild | 3 |
3 files changed, 37 insertions, 2 deletions
diff --git a/media-libs/phonon-qt7/ChangeLog b/media-libs/phonon-qt7/ChangeLog index ee0741097966..f935b209fd30 100644 --- a/media-libs/phonon-qt7/ChangeLog +++ b/media-libs/phonon-qt7/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/phonon-qt7 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-qt7/ChangeLog,v 1.5 2012/09/30 12:27:49 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-qt7/ChangeLog,v 1.6 2012/09/30 13:13:57 grobian Exp $ + + 30 Sep 2012; Fabian Groffen <grobian@gentoo.org> + +files/phonon-qt7-0_pre20110424-darwin11.patch, + phonon-qt7-0_pre20110424.ebuild: + Fix compilation on OSX Lion 30 Sep 2012; Fabian Groffen <grobian@gentoo.org> phonon-qt7-0_pre20110424.ebuild: diff --git a/media-libs/phonon-qt7/files/phonon-qt7-0_pre20110424-darwin11.patch b/media-libs/phonon-qt7/files/phonon-qt7-0_pre20110424-darwin11.patch new file mode 100644 index 000000000000..6d1a5626a207 --- /dev/null +++ b/media-libs/phonon-qt7/files/phonon-qt7-0_pre20110424-darwin11.patch @@ -0,0 +1,29 @@ +disable AUGraphAddNode, it needs an AudioComponent iso Component +need a definition for gnuOrtho2D + +--- phonon-qt7/qt7/audionode.mm ++++ phonon-qt7/qt7/audionode.mm +@@ -69,9 +69,9 @@ + + OSStatus err = noErr; + #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +- if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5) +- err = AUGraphAddNode(m_audioGraph->audioGraphRef(), &description, &m_auNode); +- else ++// if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5) ++// err = AUGraphAddNode(m_audioGraph->audioGraphRef(), &description, &m_auNode); ++// else + #endif + err = AUGraphNewNode(m_audioGraph->audioGraphRef(), &description, 0, 0, &m_auNode); + +--- phonon-qt7/qt7/videowidget.mm ++++ phonon-qt7/qt7/videowidget.mm +@@ -35,6 +35,8 @@ + #import <AppKit/NSImage.h> + #import <QTKit/QTMovieView.h> + ++#import <OpenGL/glu.h> ++ + ///////////////////////////////////////////////////////////////////////////////////////// + + #ifdef QT_MAC_USE_COCOA // Rendering to a QTMovieView can only be done in Cocoa diff --git a/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild b/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild index d48a2f53b11f..c9251c206bc5 100644 --- a/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild +++ b/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild,v 1.5 2012/09/30 12:27:49 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild,v 1.6 2012/09/30 13:13:57 grobian Exp $ EAPI=4 @@ -31,6 +31,7 @@ S="${WORKDIR}/${PN}" PATCHES=( "${FILESDIR}/${PN}-noshow.patch" "${FILESDIR}"/${P}-QWidget-cast-dynamic.patch + "${FILESDIR}"/${P}-darwin11.patch ) src_prepare() { |