Fix compilation on Darwin/Intel (bug #366931), remove non-effective, post configure, flag replacements.

Package-Manager: portage-2.2.01.19572-prefix/cvs/SunOS i386

3 files changed, 22 insertions, 26 deletions

diff --git a/media-libs/gst-plugins-base/ChangeLog b/media-libs/gst-plugins-base/ChangeLog
index 7ca7b9cd7944..1622c5754e49 100644
--- a/media-libs/gst-plugins-base/ChangeLog
+++ b/media-libs/gst-plugins-base/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/gst-plugins-base
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/ChangeLog,v 1.182 2011/10/15 18:12:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/ChangeLog,v 1.183 2011/11/20 19:19:08 grobian Exp $
+
+  20 Nov 2011; Fabian Groffen <grobian@gentoo.org>
+  gst-plugins-base-0.10.35.ebuild:
+  Fix compilation on Darwin/Intel (bug #366931), remove non-effective, post
+  configure, flag replacements.
 
   15 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org>
   gst-plugins-base-0.10.35.ebuild:
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index c6c567d53664..95ef9d490ebd 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,28 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gst-plugins-base-0.10.31-fix-tag-test-linking.patch 995 RMD160 5297f347af2ea316364029d87fdf0f57ef6ac8a7 SHA1 6f2dd634432dbaabef96f984ac3acbc6f8aaf8b2 SHA256 1cc80eabcf54420b12b3bc8d0eb74079b0cf4185043979f0f8f59bb18882c29f
 AUX gst-plugins-base-0.10.32-fix-tests-encodebin.patch 2386 RMD160 0fea24906edd4ba318b75e3fed894028e6641eed SHA1 4efa152a29d2fd7cad45fe5f0d79126f7e698bf1 SHA256 20b236c02c9ad2fe265506e47aebd2a732df742c55c84439ddeb103ce101f861
 DIST gst-plugins-base-0.10.32.tar.bz2 2720103 RMD160 b267e3138e40e3646efed0baa662d40775eca1ea SHA1 c1c149272b7ab6cbe5f648532f74525c6541eea5 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
 DIST gst-plugins-base-0.10.35.tar.bz2 2782902 RMD160 877e6b1c5439ef71262037b7a1aced07d37f4d49 SHA1 6d7dc463fed5dd43f79a53ad523fcbd6d0916303 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103
 EBUILD gst-plugins-base-0.10.32.ebuild 1722 RMD160 18b5ea54b4998ccea8eaed2e65c073f103ce5fa0 SHA1 a23934ffe33b2963339c9b8aad1c436feaf11de6 SHA256 582abab0e31fc4327cc2ec641eba9cc07819d18716bf2904a1000a852ed96b8f
-EBUILD gst-plugins-base-0.10.35.ebuild 1606 RMD160 c318c0c8c0f19c068e2c6a1407133cc202261aa3 SHA1 adf942b0a7c26193649df277af5d29d2d9d9ee6d SHA256 73960247bd3a7e7dbcfb74a1efb8750ed59b5c209d6056b1cf74b2a0d8362e4d
-MISC ChangeLog 26488 RMD160 8084618fc6d172f3a55d69e615988aa8111825f0 SHA1 a514717296594eebeee45fc1503221c696022ded SHA256 4fbb649417cb48318d814612e40e39b2c23239b8d8dbfd22f90f994f8f5dd740
+EBUILD gst-plugins-base-0.10.35.ebuild 1662 RMD160 99ffff486bfb3cce03b76640d6de859a850a19cf SHA1 8d83920ae33cd39f1808d824742282208e7686d4 SHA256 f9e0dc120c0a2a060bbb10fccb685f8e79d5a5f6c8f56b6c52716bf2827562c2
+MISC ChangeLog 26680 RMD160 ea66d16ca6e8142cafd2eefd4ac6cdaea20b7194 SHA1 c655c57a2b218214bce6ecd147a5cf34ee2ae9e3 SHA256 c5142da618d59899eadb6067aa6b204eedcbb2f50f947471c60bc891a9a1b7e5
 MISC metadata.xml 367 RMD160 414d9e853e2498b2f32a9b666bfaaba9ceb796c3 SHA1 8a5923839a5f261da244c64146bb7be10af7e787 SHA256 9d6d2f0475cebfa4ec7520e3e5f8dd8e825ddcfda317282174ec9528a9c169f3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (SunOS)
 
-iQIcBAEBCAAGBQJOmc0TAAoJEF0huFKJUZL5XRgP/23C29nYtlP9bmUtIWBu+Sia
-Zq80muxTYIr/BUVbB13CvmRoPVns9b6s+vJhQMkMCabc3RA8vNrCDryUhTSaHs84
-/oLx0VX643YpDzZ/YCS5UL0qXQlfu3I/JU+MninyflAV3sJgFGhGEaQigNhMBZen
-jlSnjJvKOj9VqILe9NPakQbudE3AQ3MrUC1b9Q89x+gi0Ernl7Znj3nkJc3ZoWzq
-v+iPCkkdjFCTZ6i/iWncD3wkWBs1zxlOqR7QNw686Kv1V+wU0RH4RBGgdvg6p1xh
-uP130PPjAUIZucxiQ46TsbWc2vrxfx2NHTPrLQNlr0jzRVP6pZ6fZLmvMM3doMYK
-oRCFWasAdg5/Ja2tJJoLO2khXx3G84ZAW9xtVc0wDczCpKwr7fAosxUHSPXwoq1J
-6MnGqWaBCnHPY804dNKeyPCnCgjcicGCguqK/tPk70bVKtouZpWeoP0mkMsTQ6SQ
-+ZvViNyOpSWPfvzbIWQtAQqNgIrMikKYCnhadWo6WdMIkQ4GqD6dofkbG9VWsCaI
-7EGo/BWOGWpYZeRMA5+FFjPeMimJ46fRz8ZvJv5H9lAm0jMlVCR2KO8026cTfv9F
-l4Z6yJqEkoUr83flWTjcXYQUIuxljBWj9Ibj32CM6omo/5QgbzfhRVgmJTMHdGgT
-cF1QgbKocgDlkH8kj8KQ
-=2M73
+iEYEARECAAYFAk7JUrIACgkQX3X2B8XHTommRQCeIUujgZHgC3cPMGktI6YyICz0
+HOkAnR4oZMrKbkUBNWKSKiXL6MZusF1s
+=jG63
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild
index e74a39094b15..94e7f2eb2b02 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild,v 1.11 2011/10/15 18:12:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild,v 1.12 2011/11/20 19:19:08 grobian Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
 # order is important, gnome2 after gst-plugins
-inherit gst-plugins-base gst-plugins10 gnome2 flag-o-matic eutils
+inherit gst-plugins-base gst-plugins10 gnome2 eutils
 # libtool
 
 DESCRIPTION="Basepack of plugins for gstreamer"
@@ -40,13 +40,14 @@ src_configure() {
 		$(use_enable orc) \
 		--disable-examples \
 		--disable-debug
-}
 
-src_compile() {
-	# gst doesnt handle opts well, last tested with 0.10.15
-	strip-flags
-	replace-flags "-O3" "-O2"
-	emake || die "emake failed."
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi  
 }
 
 src_install() {