Fix building with GCC 4.5 wrt #319375 by Kacper Kowalik.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 196 insertions, 3 deletions

diff --git a/dev-cpp/gstreamermm/ChangeLog b/dev-cpp/gstreamermm/ChangeLog
index 5aae8ac6b3ac..fddb6840aaf7 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.4 2010/04/18 22:09:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/ChangeLog,v 1.5 2010/05/14 17:54:28 ssuominen Exp $
+
+  14 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  gstreamermm-0.10.7.ebuild, +files/gstreamermm-0.10.7-gcc45.patch:
+  Fix building with GCC 4.5 wrt #319375 by Kacper Kowalik.
 
 *gstreamermm-0.10.7 (18 Apr 2010)
 
diff --git a/dev-cpp/gstreamermm/files/gstreamermm-0.10.7-gcc45.patch b/dev-cpp/gstreamermm/files/gstreamermm-0.10.7-gcc45.patch
new file mode 100644
index 000000000000..d38c59881d8d
--- /dev/null
+++ b/dev-cpp/gstreamermm/files/gstreamermm-0.10.7-gcc45.patch
@@ -0,0 +1,184 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=319375
+
+--- gstreamer/gstreamermm/bin.cc
++++ gstreamer/gstreamermm/bin.cc
+@@ -658,62 +658,62 @@
+ 
+ Gst::Iterator<Gst::Element> Bin::iterate_elements()
+ {
+-  return Gst::Iterator<Gst::Element>::Iterator(gst_bin_iterate_elements(gobj()));
++  return Gst::Iterator<Gst::Element>(gst_bin_iterate_elements(gobj()));
+ }
+ 
+ Gst::Iterator<const Gst::Element> Bin::iterate_elements() const
+ {
+-  return Gst::Iterator<const Gst::Element>::Iterator(gst_bin_iterate_elements(const_cast<GstBin*>(gobj())));
++  return Gst::Iterator<const Gst::Element>(gst_bin_iterate_elements(const_cast<GstBin*>(gobj())));
+ }
+ 
+ Gst::Iterator<Gst::Element> Bin::iterate_recurse()
+ {
+-  return Gst::Iterator<Gst::Element>::Iterator(gst_bin_iterate_recurse(gobj()));
++  return Gst::Iterator<Gst::Element>(gst_bin_iterate_recurse(gobj()));
+ }
+ 
+ Gst::Iterator<const Gst::Element> Bin::iterate_recurse() const
+ {
+-  return Gst::Iterator<const Gst::Element>::Iterator(gst_bin_iterate_recurse(const_cast<GstBin*>(gobj())));
++  return Gst::Iterator<const Gst::Element>(gst_bin_iterate_recurse(const_cast<GstBin*>(gobj())));
+ }
+ 
+ Gst::Iterator<Gst::Element> Bin::iterate_sorted()
+ {
+-  return Gst::Iterator<Gst::Element>::Iterator(gst_bin_iterate_sorted(gobj()));
++  return Gst::Iterator<Gst::Element>(gst_bin_iterate_sorted(gobj()));
+ }
+ 
+ Gst::Iterator<const Gst::Element> Bin::iterate_sorted() const
+ {
+-  return Gst::Iterator<const Gst::Element>::Iterator(gst_bin_iterate_sorted(const_cast<GstBin*>(gobj())));
++  return Gst::Iterator<const Gst::Element>(gst_bin_iterate_sorted(const_cast<GstBin*>(gobj())));
+ }
+ 
+ Gst::Iterator<Gst::Element> Bin::iterate_sources()
+ {
+-  return Gst::Iterator<Gst::Element>::Iterator(gst_bin_iterate_sources(gobj()));
++  return Gst::Iterator<Gst::Element>(gst_bin_iterate_sources(gobj()));
+ }
+ 
+ Gst::Iterator<const Gst::Element> Bin::iterate_sources() const
+ {
+-  return Gst::Iterator<const Gst::Element>::Iterator(gst_bin_iterate_sources(const_cast<GstBin*>(gobj())));
++  return Gst::Iterator<const Gst::Element>(gst_bin_iterate_sources(const_cast<GstBin*>(gobj())));
+ }
+ 
+ Gst::Iterator<Gst::Element> Bin::iterate_sinks()
+ {
+-  return Gst::Iterator<Gst::Element>::Iterator(gst_bin_iterate_sinks(gobj()));
++  return Gst::Iterator<Gst::Element>(gst_bin_iterate_sinks(gobj()));
+ }
+ 
+ Gst::Iterator<const Gst::Element> Bin::iterate_sinks() const
+ {
+-  return Gst::Iterator<const Gst::Element>::Iterator(gst_bin_iterate_sinks(const_cast<GstBin*>(gobj())));
++  return Gst::Iterator<const Gst::Element>(gst_bin_iterate_sinks(const_cast<GstBin*>(gobj())));
+ }
+ 
+ Gst::Iterator<Gst::Element> Bin::iterate_by_interface(GType iface)
+ {
+-  return Gst::Iterator<Gst::Element>::Iterator(gst_bin_iterate_all_by_interface(gobj(), iface));
++  return Gst::Iterator<Gst::Element>(gst_bin_iterate_all_by_interface(gobj(), iface));
+ }
+ 
+ Gst::Iterator<const Gst::Element> Bin::iterate_by_interface(GType iface) const
+ {
+-  return Gst::Iterator<const Gst::Element>::Iterator(gst_bin_iterate_all_by_interface(const_cast<GstBin*>(gobj()), iface));
++  return Gst::Iterator<const Gst::Element>(gst_bin_iterate_all_by_interface(const_cast<GstBin*>(gobj()), iface));
+ }
+ 
+ bool Bin::recalculate_latency()
+--- gstreamer/gstreamermm/format.cc
++++ gstreamer/gstreamermm/format.cc
+@@ -94,7 +94,7 @@
+ 
+ IteratorBasic<const FormatDefinition> iterate_format_definitions()
+ {
+-  return IteratorBasic<const FormatDefinition>::IteratorBasic(gst_format_iterate_definitions());
++  return IteratorBasic<const FormatDefinition>(gst_format_iterate_definitions());
+ }
+ 
+ } //namespace Gst
+--- gstreamer/gstreamermm/element.cc
++++ gstreamer/gstreamermm/element.cc
+@@ -1135,32 +1135,32 @@
+ 
+ Gst::Iterator<Gst::Pad> Element::iterate_pads()
+ {
+-  return Gst::Iterator<Gst::Pad>::Iterator(gst_element_iterate_pads(gobj()));
++  return Gst::Iterator<Gst::Pad>(gst_element_iterate_pads(gobj()));
+ }
+ 
+ Gst::Iterator<const Gst::Pad> Element::iterate_pads() const
+ {
+-  return Gst::Iterator<const Gst::Pad>::Iterator(gst_element_iterate_pads(const_cast<GstElement*>(gobj())));
++  return Gst::Iterator<const Gst::Pad>(gst_element_iterate_pads(const_cast<GstElement*>(gobj())));
+ }
+ 
+ Gst::Iterator<Gst::Pad> Element::iterate_sink_pads()
+ {
+-  return Gst::Iterator<Gst::Pad>::Iterator(gst_element_iterate_sink_pads(gobj()));
++  return Gst::Iterator<Gst::Pad>(gst_element_iterate_sink_pads(gobj()));
+ }
+ 
+ Gst::Iterator<const Gst::Pad> Element::iterate_sink_pads() const
+ {
+-  return Gst::Iterator<const Gst::Pad>::Iterator(gst_element_iterate_sink_pads(const_cast<GstElement*>(gobj())));
++  return Gst::Iterator<const Gst::Pad>(gst_element_iterate_sink_pads(const_cast<GstElement*>(gobj())));
+ }
+ 
+ Gst::Iterator<Gst::Pad> Element::iterate_src_pads()
+ {
+-  return Gst::Iterator<Gst::Pad>::Iterator(gst_element_iterate_src_pads(gobj()));
++  return Gst::Iterator<Gst::Pad>(gst_element_iterate_src_pads(gobj()));
+ }
+ 
+ Gst::Iterator<const Gst::Pad> Element::iterate_src_pads() const
+ {
+-  return Gst::Iterator<const Gst::Pad>::Iterator(gst_element_iterate_src_pads(const_cast<GstElement*>(gobj())));
++  return Gst::Iterator<const Gst::Pad>(gst_element_iterate_src_pads(const_cast<GstElement*>(gobj())));
+ }
+ 
+ void Element::unlink(const Glib::RefPtr<Gst::Element>& dest)
+--- gstreamer/gstreamermm/pad.cc
++++ gstreamer/gstreamermm/pad.cc
+@@ -857,22 +857,22 @@
+ 
+ Gst::Iterator<Gst::Pad> Pad::iterate_internal_links()
+ {
+-  return Gst::Iterator<Gst::Pad>::Iterator(gst_pad_iterate_internal_links(gobj()));
++  return Gst::Iterator<Gst::Pad>(gst_pad_iterate_internal_links(gobj()));
+ }
+ 
+ Gst::Iterator<const Gst::Pad> Pad::iterate_internal_links() const
+ {
+-  return Gst::Iterator<const Gst::Pad>::Iterator(gst_pad_iterate_internal_links(const_cast<GstPad*>(gobj())));
++  return Gst::Iterator<const Gst::Pad>(gst_pad_iterate_internal_links(const_cast<GstPad*>(gobj())));
+ }
+ 
+ Gst::Iterator<Gst::Pad> Pad::iterate_internal_links_default()
+ {
+-  return Gst::Iterator<Gst::Pad>::Iterator(gst_pad_iterate_internal_links_default(gobj()));
++  return Gst::Iterator<Gst::Pad>(gst_pad_iterate_internal_links_default(gobj()));
+ }
+ 
+ Gst::Iterator<const Gst::Pad> Pad::iterate_internal_links_default() const
+ {
+-  return Gst::Iterator<const Gst::Pad>::Iterator(gst_pad_iterate_internal_links_default(const_cast<GstPad*>(gobj())));
++  return Gst::Iterator<const Gst::Pad>(gst_pad_iterate_internal_links_default(const_cast<GstPad*>(gobj())));
+ }
+ 
+ Glib::ListHandle< Glib::RefPtr<Gst::Pad> > Pad::get_internal_links()
+--- gstreamer/gstreamermm/query.cc
++++ gstreamer/gstreamermm/query.cc
+@@ -810,7 +810,7 @@
+ 
+ Gst::IteratorBasic<const Gst::QueryTypeDefinition> Query::iterate_definitions()
+ {
+-  return Gst::IteratorBasic<const Gst::QueryTypeDefinition>::IteratorBasic(gst_query_type_iterate_definitions());
++  return Gst::IteratorBasic<const Gst::QueryTypeDefinition>(gst_query_type_iterate_definitions());
+ }
+ 
+ 
+--- gstreamer/gstreamermm/mixer.cc
++++ gstreamer/gstreamermm/mixer.cc
+@@ -207,7 +207,7 @@
+   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.ebuild b/dev-cpp/gstreamermm/gstreamermm-0.10.7.ebuild
index 25ba41d4b180..95c1a4a92feb 100644
--- a/dev-cpp/gstreamermm/gstreamermm-0.10.7.ebuild
+++ b/dev-cpp/gstreamermm/gstreamermm-0.10.7.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.ebuild,v 1.1 2010/04/18 22:09:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.7.ebuild,v 1.2 2010/05/14 17:54:28 ssuominen Exp $
 
 EAPI=2
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="C++ interface for GStreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
@@ -26,6 +26,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc45.patch
+	gnome2_src_prepare
+}
+
 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