summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-08-06 14:31:46 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-08-06 14:31:46 +0000
commit5f6444c14de52a65f7cd1c1c46f781e6e5c8b806 (patch)
treef003be209cc1a136923533ab8dfa9e9d2e43ab34 /dev-cpp
parentVersion bump. (diff)
downloadgentoo-2-5f6444c14de52a65f7cd1c1c46f781e6e5c8b806.tar.gz
gentoo-2-5f6444c14de52a65f7cd1c1c46f781e6e5c8b806.tar.bz2
gentoo-2-5f6444c14de52a65f7cd1c1c46f781e6e5c8b806.zip
Add patch to fix build with GCC 4.5 (bug #328539).
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/gstreamermm/ChangeLog6
-rw-r--r--dev-cpp/gstreamermm/files/gstreamermm-0.10.7.3+gcc-4.5.patch26
-rw-r--r--dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild8
3 files changed, 37 insertions, 3 deletions
diff --git a/dev-cpp/gstreamermm/ChangeLog b/dev-cpp/gstreamermm/ChangeLog
index b78546b12ada..f3de0b90bfcf 100644
--- a/dev-cpp/gstreamermm/ChangeLog
+++ b/dev-cpp/gstreamermm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-cpp/gstreamermm
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/ChangeLog,v 1.8 2010/08/01 10:59:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/ChangeLog,v 1.9 2010/08/06 14:31:45 flameeyes Exp $
+
+ 06 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ gstreamermm-0.10.7.3.ebuild, +files/gstreamermm-0.10.7.3+gcc-4.5.patch:
+ Add patch to fix build with GCC 4.5 (bug #328539).
01 Aug 2010; Christian Faulhammer <fauli@gentoo.org>
gstreamermm-0.10.7.3.ebuild:
diff --git a/dev-cpp/gstreamermm/files/gstreamermm-0.10.7.3+gcc-4.5.patch b/dev-cpp/gstreamermm/files/gstreamermm-0.10.7.3+gcc-4.5.patch
new file mode 100644
index 000000000000..e6a25918162a
--- /dev/null
+++ b/dev-cpp/gstreamermm/files/gstreamermm-0.10.7.3+gcc-4.5.patch
@@ -0,0 +1,26 @@
+Index: gstreamermm-0.10.7.3/gstreamer/gstreamermm/mixer.cc
+===================================================================
+--- gstreamermm-0.10.7.3.orig/gstreamer/gstreamermm/mixer.cc
++++ gstreamermm-0.10.7.3/gstreamer/gstreamermm/mixer.cc
+@@ -207,7 +207,7 @@ Glib::ArrayHandle<int> Mixer::get_volume
+ gst_mixer_get_volume(const_cast<GstMixer*>(gobj()),
+ const_cast<GstMixerTrack*>(Glib::unwrap(track)), volumes);
+
+- return Glib::ArrayHandle<int>::ArrayHandle(volumes, num_channels,
++ return Glib::ArrayHandle<int>(volumes, num_channels,
+ Glib::OWNERSHIP_DEEP);
+ }
+
+Index: gstreamermm-0.10.7.3/gstreamer/src/mixer.ccg
+===================================================================
+--- gstreamermm-0.10.7.3.orig/gstreamer/src/mixer.ccg
++++ gstreamermm-0.10.7.3/gstreamer/src/mixer.ccg
+@@ -201,7 +201,7 @@ Glib::ArrayHandle<int> Mixer::get_volume
+ gst_mixer_get_volume(const_cast<GstMixer*>(gobj()),
+ const_cast<GstMixerTrack*>(Glib::unwrap(track)), volumes);
+
+- return Glib::ArrayHandle<int>::ArrayHandle(volumes, num_channels,
++ return Glib::ArrayHandle<int>(volumes, num_channels,
+ Glib::OWNERSHIP_DEEP);
+ }
+
diff --git a/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild b/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild
index ba5d830c98b7..a187af9bfab6 100644
--- a/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild
+++ b/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild,v 1.3 2010/08/01 10:59:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.7.3.ebuild,v 1.4 2010/08/06 14:31:45 flameeyes Exp $
EAPI="2"
-inherit gnome2
+inherit gnome2 eutils
DESCRIPTION="C++ interface for GStreamer"
HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
@@ -26,6 +26,10 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-util/pkgconfig"
+src_prepare() {
+ epatch "${FILESDIR}/${P}+gcc-4.5.patch"
+}
+
src_test() {
# explicitly allow parallel make of tests: they are not built in
# src_compile() and indeed we'd slow down tremendously to run this