[SCM] ambdec/master: updated 01-destdir.patch

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c44b96703baa23ac8fcfe8bea34a994271087748
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Sep 11 21:53:16 2011 +0200

    updated 01-destdir.patch

diff --git a/debian/patches/01-destdir.patch b/debian/patches/01-destdir.patch
index d09c00e..83090bd 100644
--- a/debian/patches/01-destdir.patch
+++ b/debian/patches/01-destdir.patch
@@ -4,13 +4,12 @@ Description: Declare DESTDIR var to allow setting a custom path, set PREFIX
  Add -pthread flag to fix FTBFS in Ubuntu Natty.
  Remove -march=native flag, fixes FTBFS.
 Forwarded: no
----
- source/Makefile |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
 
---- ambdec.orig/source/Makefile
-+++ ambdec/source/Makefile
-@@ -19,14 +19,13 @@
+Index: ambdec/source/Makefile
+===================================================================
+--- ambdec.orig/source/Makefile	2011-09-11 21:40:48.572730993 +0200
++++ ambdec/source/Makefile	2011-09-11 21:43:05.600491364 +0200
+@@ -19,13 +19,13 @@
  # ----------------------------------------------------------------------------
  
  
@@ -18,15 +17,15 @@ Forwarded: no
 +PREFIX = /usr
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
  LIBDIR = lib$(SUFFIX)
- SHARED = $(PREFIX)/share
- VERSION = 0.4.4
- DISTDIR = ambdec-$(VERSION)
+ SHARED = $(PREFIX)/share/ambdec
+ VERSION = 0.5.1
  CPPFLAGS += -O2 -ffast-math -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
 -CPPFLAGS += -march=native
++#CPPFLAGS += -march=native
  
  
  all:	ambdec ambdec_cli
-@@ -38,7 +37,7 @@ AMBDEC_O = ambdec.o styles.o mainwin.o t
+@@ -37,7 +37,7 @@
  
  ambdec:	CPPFLAGS += -I/usr/X11R6/include `freetype-config --cflags`
  ambdec:	LDLIBS += -lclxclient -lclthreads -ljack -lpng -lXft -lX11 -lrt
@@ -35,8 +34,8 @@ Forwarded: no
  ambdec:	$(AMBDEC_O)
  	g++ $(LDFLAGS) -o $@ $(AMBDEC_O) $(LDLIBS)
  
-@@ -50,6 +49,7 @@ $(AMBDEC_O):
- AMBDEC_CLI_O = ambdec_cli.o jclient.o nffilt.o xover2.o decoder.o adconf.o
+@@ -49,6 +49,7 @@
+ AMBDEC_CLI_O = ambdec_cli.o jclient.o nffilt.o xover2.o decoder.o adconf.o sstring.o
  
  ambdec_cli:	LDLIBS += -lclthreads -ljack -lrt
 +ambdec_cli:	LDFLAGS += -pthread

-- 
ambdec packaging