[Pkg-voip-commits] r3791 - in spandsp/trunk/debian: . patches

Sat Jul 21 13:41:35 UTC 2007

Author: kilian
Date: 2007-07-21 13:41:35 +0000 (Sat, 21 Jul 2007)
New Revision: 3791

Added:
   spandsp/trunk/debian/patches/lib64.dpatch
Removed:
   spandsp/trunk/debian/patches/01_amd64.dpatch
   spandsp/trunk/debian/patches/nonmmx.dpatch
Modified:
   spandsp/trunk/debian/changelog
   spandsp/trunk/debian/patches/00list
   spandsp/trunk/debian/rules
Log:
Fix compilation on amd64. 
Fix rebuilding due to bad clean target.
Remove unused patches.


Modified: spandsp/trunk/debian/changelog
===================================================================

--- spandsp/trunk/debian/changelog	2007-07-21 10:59:54 UTC (rev 3790)
+++ spandsp/trunk/debian/changelog	2007-07-21 13:41:35 UTC (rev 3791)
@@ -1,3 +1,10 @@
+spandsp (0.0.4~pre3-2) UNRELEASED; urgency=low
+
+  * NOT YET RELEASED
+  * Fix compilation on amd64
+
+ -- Kilian Krause <kilian at debian.org>  Sat, 21 Jul 2007 15:32:00 +0200
+
 spandsp (0.0.4~pre3-1) unstable; urgency=low
 
   [ Santiago Ruano Rincón ]

Modified: spandsp/trunk/debian/patches/00list
===================================================================
--- spandsp/trunk/debian/patches/00list	2007-07-21 10:59:54 UTC (rev 3790)
+++ spandsp/trunk/debian/patches/00list	2007-07-21 13:41:35 UTC (rev 3791)
@@ -0,0 +1 @@
+lib64

Deleted: spandsp/trunk/debian/patches/01_amd64.dpatch
===================================================================

Added: spandsp/trunk/debian/patches/lib64.dpatch
===================================================================
--- spandsp/trunk/debian/patches/lib64.dpatch	                        (rev 0)
+++ spandsp/trunk/debian/patches/lib64.dpatch	2007-07-21 13:41:35 UTC (rev 3791)
@@ -0,0 +1,78 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## lib64.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad spandsp-0.0.4~pre3~/configure spandsp-0.0.4~pre3/configure
+--- spandsp-0.0.4~pre3~/configure	2007-06-08 17:27:31.000000000 +0200
++++ spandsp-0.0.4~pre3/configure	2007-07-21 15:23:29.000000000 +0200
+@@ -27254,36 +27254,6 @@
+ done
+ 
+ 
+-if test "${build}" == "${host}"
+-then
+-    case "${host}" in
+-    x86_64-*)
+-        as_ac_File=`echo "ac_cv_file_${prefix}/lib64" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for ${prefix}/lib64" >&5
+-echo $ECHO_N "checking for ${prefix}/lib64... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_File+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+-   { (exit 1); exit 1; }; }
+-if test -r "${prefix}/lib64"; then
+-  eval "$as_ac_File=yes"
+-else
+-  eval "$as_ac_File=no"
+-fi
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+-if test `eval echo '${'$as_ac_File'}'` = yes; then
+-  libdir='$(exec_prefix)/lib64'
+-fi
+-
+-        ;;
+-    esac
+-fi
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+diff -urNad spandsp-0.0.4~pre3~/configure.ac spandsp-0.0.4~pre3/configure.ac
+--- spandsp-0.0.4~pre3~/configure.ac	2007-05-12 14:25:37.000000000 +0200
++++ spandsp-0.0.4~pre3/configure.ac	2007-07-21 15:23:57.000000000 +0200
+@@ -219,27 +219,8 @@
+ AC_CHECK_HEADERS([FL/Fl_Audio_Meter.H], [], [], [],[[#include <FL/Fl.H>
+ ]])
+ 
+-if test "${build}" == "${host}"
+-then
+-    case "${host}" in
+-    x86_64-*)
+-        AC_CHECK_FILE([${prefix}/lib64], libdir='$(exec_prefix)/lib64')
+-        ;;
+-    esac
+-fi
+-
+ AC_LANG([C])
+ 
+-if test "${build}" == "${host}"
+-then
+-    case "${host}" in
+-    x86_64-*)
+-        # X86_64 Linux machines may have both 64 bit and 32 bit libraries. We need to choose the right set
+-        AC_CHECK_FILE([/usr/X11R6/lib64], [TESTLIBS="$TESTLIBS -L/usr/X11R6/lib64"], AC_CHECK_FILE([/usr/X11R6/lib], [TESTLIBS="$TESTLIBS -L/usr/X11R6/lib"]))
+-        ;;
+-    esac
+-fi
+-
+ # Checks for libraries.
+ AC_CHECK_LIB([Xft], [XftFontOpen], TESTLIBS="$TESTLIBS -lXft",, $TESTLIBS)
+ AC_CHECK_LIB([Xext], [XextCreateExtension], TESTLIBS="$TESTLIBS -lXext",, $TESTLIBS)


Property changes on: spandsp/trunk/debian/patches/lib64.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: spandsp/trunk/debian/patches/nonmmx.dpatch
===================================================================
--- spandsp/trunk/debian/patches/nonmmx.dpatch	2007-07-21 10:59:54 UTC (rev 3790)
+++ spandsp/trunk/debian/patches/nonmmx.dpatch	2007-07-21 13:41:35 UTC (rev 3791)
@@ -1,43 +0,0 @@
-#! /bin/sh -e
-## nonmmx.dpatch by Kilian Krause <kk at verfaction.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixed compilation on all non-i386
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
---- spandsp-0.0.2.orig/src/spandsp/mmx.h
-+++ spandsp-0.0.2/src/spandsp/mmx.h
-@@ -21,6 +21,8 @@
- #if !defined(_MMX_H_)
- #define _MMX_H_
- 
-+#if defined(USE_MMX) || defined(USE_SSE)
-+
- /*
-     The type of an value that fits in an MMX register
-     (note that long long constant values MUST be suffixed
-@@ -571,4 +573,6 @@
- #endif
- 
- #endif
-+
-+#endif
- /*- End of file ------------------------------------------------------------*/

Modified: spandsp/trunk/debian/rules
===================================================================
--- spandsp/trunk/debian/rules	2007-07-21 10:59:54 UTC (rev 3790)
+++ spandsp/trunk/debian/rules	2007-07-21 13:41:35 UTC (rev 3791)
@@ -58,6 +58,9 @@
 
 	-$(RM) -f config.sub
 	-$(RM) -f config.guess
+	-$(RM) -f config.h.in
+	-$(RM) -f doc/api/html/*.gif
+	-$(RM) -f doc/api/html/*.png
 
 	dh_clean 
 


