[SCM] mplayer packaging branch, master, updated. debian/1.0.rc2+svn20090303-2-9-g8185fa4

[mennucc1 at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8185fa4bd5937b46fa83d43f4c068402b167bcc7
Author: A Mennucc <mennucc1 at debian.org>
Date:   Sun Mar 22 10:16:34 2009 +0100

    updated changelog
    disabled powerpc hack for gcc bug 475153

diff --git a/debian/changelog b/debian/changelog
index bac4ed7..e686696 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mplayer (1.0~rc2+svn20090303-4) unstable; urgency=low
+
+  * try another fix for bug 520113
+  * disable specific patch for powerpc, that was reducing optimization to -O
+    to avoid gcc bug 475153
+
+ -- A Mennucc1 <mennucc1 at debian.org>  Sun, 22 Mar 2009 10:11:36 +0100
+
 mplayer (1.0~rc2+svn20090303-3) unstable; urgency=low
 
   * try a fix for bug 520113
diff --git a/debian/rules b/debian/rules
index 802b095..e822372 100755
--- a/debian/rules
+++ b/debian/rules
@@ -165,11 +165,6 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	mv config.mak  config.mak~~
 	sed '/FLAGS/s/ -O[0-9] /  /' config.mak~~ > config.mak
 endif
-	#workaround for gcc bug 475153 (hopefully)
-ifeq (powerpc,$(DEB_HOST_ARCH_CPU))
-	mv config.mak  config.mak~~
-	sed '/FLAGS/s/ -O[0-9] / -O /' config.mak~~ > config.mak
-endif
 	#workaround for bug 520113 (hopefully)
 ifeq (mips,$(DEB_HOST_ARCH_CPU))
 	mv config.mak  config.mak~~

-- 
mplayer packaging