[SCM] ambdec/master: Remove -march=native flag to fix FTBFS, closes: #609621
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Jan 11 00:41:23 UTC 2011
The following commit has been merged in the master branch:
commit a607924bd9a1f604a383dd72d1caca94e38c5d41
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Jan 11 01:40:43 2011 +0100
Remove -march=native flag to fix FTBFS, closes: #609621
diff --git a/debian/patches/01-destdir.patch b/debian/patches/01-destdir.patch
index 994131d..d09c00e 100644
--- a/debian/patches/01-destdir.patch
+++ b/debian/patches/01-destdir.patch
@@ -2,14 +2,15 @@ Author: Alessio Treglia <quadrispro at ubuntu.com>
Description: Declare DESTDIR var to allow setting a custom path, set PREFIX
to /usr.
Add -pthread flag to fix FTBFS in Ubuntu Natty.
+ Remove -march=native flag, fixes FTBFS.
Forwarded: no
---
- source/Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ source/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
--- ambdec.orig/source/Makefile
+++ ambdec/source/Makefile
-@@ -19,7 +19,7 @@
+@@ -19,14 +19,13 @@
# ----------------------------------------------------------------------------
@@ -18,7 +19,14 @@ Forwarded: no
SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
LIBDIR = lib$(SUFFIX)
SHARED = $(PREFIX)/share
-@@ -38,7 +38,7 @@ AMBDEC_O = ambdec.o styles.o mainwin.o t
+ VERSION = 0.4.4
+ DISTDIR = ambdec-$(VERSION)
+ CPPFLAGS += -O2 -ffast-math -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
+-CPPFLAGS += -march=native
+
+
+ all: ambdec ambdec_cli
+@@ -38,7 +37,7 @@ AMBDEC_O = ambdec.o styles.o mainwin.o t
ambdec: CPPFLAGS += -I/usr/X11R6/include `freetype-config --cflags`
ambdec: LDLIBS += -lclxclient -lclthreads -ljack -lpng -lXft -lX11 -lrt
@@ -27,7 +35,7 @@ Forwarded: no
ambdec: $(AMBDEC_O)
g++ $(LDFLAGS) -o $@ $(AMBDEC_O) $(LDLIBS)
-@@ -50,6 +50,7 @@ $(AMBDEC_O):
+@@ -50,6 +49,7 @@ $(AMBDEC_O):
AMBDEC_CLI_O = ambdec_cli.o jclient.o nffilt.o xover2.o decoder.o adconf.o
ambdec_cli: LDLIBS += -lclthreads -ljack -lrt
--
ambdec packaging
More information about the pkg-multimedia-commits
mailing list