[SCM] qtractor packaging branch, master, updated. debian/0.4.4-2-6-g6592c7e

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Wed Jan 20 10:24:23 UTC 2010


The following commit has been merged in the master branch:
commit 4e8466a8d74a439930b8456433c6e8d91bd0b9ae
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Wed Jan 20 10:18:49 2010 +0000

    Patch configure, not configure.ac

diff --git a/debian/patches/04-nonx86_ftbfs.patch b/debian/patches/04-nonx86_ftbfs.patch
index 3f6c6d2..50771e2 100644
--- a/debian/patches/04-nonx86_ftbfs.patch
+++ b/debian/patches/04-nonx86_ftbfs.patch
@@ -2,12 +2,9 @@ Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
 Description: Restore old C*FLAGS values if SSE test fails.
 Bug: http://bugs.debian.org/565860
 ---
- configure.ac |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- qtractor.orig/configure.ac
-+++ qtractor/configure.ac
-@@ -274,6 +274,8 @@ fi
+--- configure	2010-01-16 20:38:40.000000000 +0100
++++ configure.new	2010-01-20 11:11:09.000000000 +0100
+@@ -4321,6 +4321,8 @@
  # Check for SSE optimization.
  if test "x$ac_sse" = "xyes"; then
     ac_sse_cflags="-msse -mfpmath=sse -ffast-math"
@@ -15,12 +12,12 @@ Bug: http://bugs.debian.org/565860
 +   CPPFLAGS_OLD="$CPPFLAGS"
     CFLAGS="$ac_sse_cflags $CFLAGS"
     CPPFLAGS="$ac_sse_cflags $CPPFLAGS"
-    AC_CACHE_CHECK([for SSE optimization],
-@@ -294,6 +296,9 @@ if test "x$ac_sse" = "xyes"; then
+    { $as_echo "$as_me:$LINENO: checking for SSE optimization" >&5
+@@ -4400,6 +4402,9 @@
     ac_sse=$ac_cv_sse
     if test "x$ac_sse" = "xyes"; then
        ac_cflags="$ac_sse_cflags $ac_cflags"
-+  else
++   else
 +      CFLAGS="$CFLAGS_OLD"
 +      CPPFLAGS="$CPPFLAGS_OLD"
     fi

-- 
qtractor packaging



More information about the pkg-multimedia-commits mailing list