[SCM] brutefir/master: Refresh patches.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue Oct 15 13:31:41 UTC 2013


The following commit has been merged in the master branch:
commit 57f49ca2f743cbe5c434f776bb652f8a2e0298e8
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Oct 15 14:07:42 2013 +0100

    Refresh patches.

diff --git a/debian/patches/10-makefile.patch b/debian/patches/10-makefile.patch
index 56a87f8..47a3b4d 100644
--- a/debian/patches/10-makefile.patch
+++ b/debian/patches/10-makefile.patch
@@ -23,16 +23,16 @@ Description:
  ifdef FFTW_PATH
  LIBPATHS	+= -L$(FFTW_PATH)/lib
  INCLUDE		+= -I$(FFTW_PATH)/include
-@@ -63,7 +63,7 @@ UNAME_P         = $(shell uname -p)
+@@ -62,7 +62,7 @@ UNAME_P         = $(shell uname -p)
  UNAME_M         = $(shell uname -m)
  
  # Linux
 -ifeq ($(UNAME),Linux)
 +ifneq (,findstring($(UNAME),Linux GNU/kFreeBSD GNU))
- ifeq ($(UNAME_M),i386)
- BRUTEFIR_OBJS	+= $(BRUTEFIR_IA32_OBJS)
- endif
-@@ -75,8 +75,10 @@ BRUTEFIR_OBJS	+= $(BRUTEFIR_IA32_OBJS)
+ ifeq ($(UNAME_M),i586)
+ BRUTEFIR_OBJS	+= $(BRUTEFIR_SSE_OBJS)
+ CC_FLAGS	+= -msse
+@@ -77,8 +77,10 @@ CC_FLAGS	+= -msse
  endif
  BRUTEFIR_LIBS	+= -ldl
  LDMULTIPLEDEFS	= -Xlinker --allow-multiple-definition
diff --git a/debian/patches/11-sparc_v8.patch b/debian/patches/11-sparc_v8.patch
index c7213c9..25b6674 100644
--- a/debian/patches/11-sparc_v8.patch
+++ b/debian/patches/11-sparc_v8.patch
@@ -5,9 +5,9 @@ From: root at june.voxel.net
 
 --- brutefir.orig/Makefile
 +++ brutefir/Makefile
-@@ -73,6 +73,9 @@ endif
- ifeq ($(UNAME_M),i686)
- BRUTEFIR_OBJS	+= $(BRUTEFIR_IA32_OBJS)
+@@ -75,6 +75,9 @@ ifeq ($(UNAME_M),x86_64)
+ BRUTEFIR_OBJS	+= $(BRUTEFIR_SSE_OBJS)
+ CC_FLAGS	+= -msse
  endif
 +ifneq (,$(findstring sparc,$(UNAME_M)))
 +CC_FLAGS += -Wa,-xarch=v8plus

-- 
brutefir packaging



More information about the pkg-multimedia-commits mailing list