[proaudio] [2310] media-plugins/holap: remove -combine flag

[subversion@xxxxxxxxxxxxx]

Revision: 2310
Author:   gavlee
Date:     2012-11-15 15:42:08 +0100 (Thu, 15 Nov 2012)
Log Message:
-----------
media-plugins/holap: remove -combine flag

Modified Paths:
--------------
    trunk/overlays/proaudio/media-plugins/holap/ChangeLog
    trunk/overlays/proaudio/media-plugins/holap/Manifest

Added Paths:
-----------
    trunk/overlays/proaudio/media-plugins/holap/files/holap-2012.10.26/0004-remove-combine.patch

Modified: trunk/overlays/proaudio/media-plugins/holap/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-plugins/holap/ChangeLog	2012-11-14 20:12:35 UTC (rev 2309)
+++ trunk/overlays/proaudio/media-plugins/holap/ChangeLog	2012-11-15 14:42:08 UTC (rev 2310)
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Nov 2012; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
+  +files/holap-2012.10.26/0004-remove-combine.patch:
+  Remove combine flag to attempt fix build with 4.6.x. Thanks to Dominique
+  Michel for build log
+
   14 Nov 2012; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
   holap-2012.10.26.ebuild:
   move WANT_AUTOCONF above inherit, change 2.59 -> 2.5.

Modified: trunk/overlays/proaudio/media-plugins/holap/Manifest
===================================================================
--- trunk/overlays/proaudio/media-plugins/holap/Manifest	2012-11-14 20:12:35 UTC (rev 2309)
+++ trunk/overlays/proaudio/media-plugins/holap/Manifest	2012-11-15 14:42:08 UTC (rev 2310)
@@ -1,7 +1,8 @@
 AUX holap-2012.10.26/0001-remove-forced-flags.patch 5495 SHA256 5e962671186ce7a265559a988c745f7bee0eaa0770c7acfbb640032c8ff11ebb SHA512 db63d4d940157b45b2e0900a5910981f2e0cb9cd05a532be989b85bd27329372058a6e42b201d998f71397f22ceab699c274400682e8168f0cb7415c2597ba51 WHIRLPOOL da2d9925a2889a5aaedd6f18b9db58ad435179649d2733dee402dc3a3530cabc0178933409290dcf831946b2e3e7aa8d38bf2b4fc313110f77c7f136919c64aa
 AUX holap-2012.10.26/0002-workaround-sandbox-violation.patch 5318 SHA256 b6246183e4fe79bb1be744a5b99e2e3fd43b5cc74d3ea9cb67a0d2bc62e8e198 SHA512 7ee7af011cdd0dd49b8adea018eeb8f8ae1a6929eba060db372feb913d0c9afbe4ead11b4e4a5981e207fee1c0c4be437a492e4f8dd1fed10323e3de8ffd4d4f WHIRLPOOL 773c065d6ddcc1817a93260a25fdf81ae42eef7696b13625f2e56c857d833e19c03ad341ca6bb526895e1ff40e8ed2eb76c5c8d4fe4560df8f99269677ea3f15
 AUX holap-2012.10.26/0003-respect-ldflags.patch 4805 SHA256 08ba2c42262189539c01941e66e32118424db4d46dba909c6b54464f838d2b92 SHA512 50c219ed1406331b0ddaa92c2ed6c3f9d518d93b6e92674f494b1a41a63659893210d85683bb7d883903d5b00e16208add3fceb65f40e0fedced2538617895ea WHIRLPOOL 283f22adcdd2e6bc8eac0705296e7c357f9c69c697808e38a279946a1c4d14223e6f0c0862fd0852ddcf1fed4e1b871e72ac76d55bc32302d1bc2d001b3539e6
+AUX holap-2012.10.26/0004-remove-combine.patch 1131 SHA256 602186fc7471e0d7c9c97a06699f840e69d2121d44761c49e1cb396bdb526982 SHA512 1bc785c8b9f68e9b27031e3f6a6f2008913e0e43c8dfc873b32f10483e22dd66d01436f88ee502809a38b930036289564b2b7dcf6e885d945024b8c6f07f54e2 WHIRLPOOL 1cbb18a885a02ae756e075f2bc35604ef0a811f83f5dd6bcbbfd120ee34b835b7cad56f7b43e90b9817c797166709ca68ffc5e570907bb218f36ff2113b42a18
 DIST holap-2012.10.26.tar.xz 302488 SHA256 d5772b07310dc427b296db84d188ed5c768bd22302930bd2e83b6f956d15e4f7 SHA512 c1c43201e4ab70d490663e3c49dc324ecae8de7dcdc40d71c0d2e089fba79bac4934d3431fbe21ebfa91db22ee7603cfabe4047096a6926540eb5c35d35690ab WHIRLPOOL d2d9be845003c676c3b0aacc5ce18b970a1a36654bd932e8c52913806874ae6e996889de11cf70d28661d80c687f9f813ac054276a3efa4a8fefa59d492c9eca
 EBUILD holap-2012.10.26.ebuild 1764 SHA256 dde34cba4b23d05c6919d36788e4389eb88979795c2f0163c751091fc13591f4 SHA512 398ee7ac68caf45bc44d6d6e50e8d60c3643a36bf86e118b664007d7b1554967e46ca0dd748f1b0aaf55a614788747e840acc3e3037a6b180602215fe3e853f6 WHIRLPOOL d3dc4e863852a0150280fe60b06982c744c2743e31d0982e9a140c268bfef0ddefe2542cbd4edbaec69ddde0363e8d50d731b5ad51f012ead7dff8eab7a9bf64
-MISC ChangeLog 992 SHA256 af92255d17868c955df0cf555d157d0a7beb62dd9c9fede08078b3551164dc38 SHA512 a04bb2ee43e3a2671681f13dda2c8d9964f54284b1e45c484d12e4042afe45396519d98e6be1ebbe051161e00f4bfafc78c372f701a4a4af92e1771e9fd3d027 WHIRLPOOL aa4f93da247738647271864cdb35aa19a8d7d28aea48dcbaa98a5582d0a14b3dd7199ea667967dea8bee5c17043a0fb67126af0738a1900ce4b307f85eccb819
+MISC ChangeLog 1209 SHA256 f3b188e96e8d8980b5f93976e58a7fae0bf2a65b648d205f69abb3387bef7822 SHA512 90592d96462c8dff6ae6118a88d0b4080b48112ef85d81cf18f97ba394117e57850500786728a850285f9e2d950327a2d7c398e8573b22423d22f272895e3fde WHIRLPOOL 5f0409bed28b3b9679179b41bf64b314bab25def4293d9076c14a7af142dd45c57cea7fe54b11dca8a3b9ef4b82dc5791c0b53f174706e99233ce3d5082920a2
 MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f

Added: trunk/overlays/proaudio/media-plugins/holap/files/holap-2012.10.26/0004-remove-combine.patch
===================================================================
--- trunk/overlays/proaudio/media-plugins/holap/files/holap-2012.10.26/0004-remove-combine.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-plugins/holap/files/holap-2012.10.26/0004-remove-combine.patch	2012-11-15 14:42:08 UTC (rev 2310)
@@ -0,0 +1,39 @@
+From 8ba5245560334dcff2a5b7283816f3ce4fa32c09 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <gavinlee303@xxxxxxxxxxxxxx>
+Date: Thu, 15 Nov 2012 14:17:38 +0000
+Subject: [PATCH 4/4] remove combine
+
+---
+ goomf/configure.in        |    2 +-
+ horgand-dssi/configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/goomf/configure.in b/goomf/configure.in
+index 79c082b..aa2f78f 100644
+--- a/goomf/configure.in
++++ b/goomf/configure.in
+@@ -57,7 +57,7 @@ SSE="-msse -mfpmath=sse"
+ fi
+ 
+ 
+-CFLAGS="-c  $SSE -ffast-math  -Wall -combine -ffunction-sections  $MODULE_CFLAGS"
++CFLAGS="-c  $SSE -ffast-math  -Wall -ffunction-sections  $MODULE_CFLAGS"
+ LDFLAGS="$LDFLAGS $MODULE_LIBS" 
+ 
+ 
+diff --git a/horgand-dssi/configure.in b/horgand-dssi/configure.in
+index e7de3bf..5553fd3 100644
+--- a/horgand-dssi/configure.in
++++ b/horgand-dssi/configure.in
+@@ -54,7 +54,7 @@ else
+ SSE="-msse -mfpmath=sse"
+ fi
+ 
+-CFLAGS=" $SSE -ffast-math  -Wall  -combine -ffunction-sections  $MODULE_CFLAGS"
++CFLAGS=" $SSE -ffast-math  -Wall -ffunction-sections  $MODULE_CFLAGS"
+ LDFLAGS="$LDFLAGS $MODULE_LIBS" 
+ 
+ 
+-- 
+1.7.8.6
+