Commit 1a99bb6e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: clean some patches.

parent 93d71d38
......@@ -664,12 +664,6 @@ DISTCLEAN_PKG += libmad-$(LIBMAD_VERSION).tar.gz
# ogg
# ***************************************************************************
#ogg:
# @echo "*** Please type \"anoncvs\" here : ***"
# cvs -d $(OGG_CVSROOT) login
# cvs -d $(OGG_CVSROOT) co ogg
# (cd $@; ./autogen.sh)
libogg-$(OGG_VERSION).tar.gz:
$(WGET) $(OGG_URL)
......@@ -875,13 +869,6 @@ DISTCLEAN_PKG += speex-$(SPEEX_VERSION).tar.gz
# faad2
# ***************************************************************************
#faad2:
# @echo "*** Please type return here : ***"
# cvs -d $(FAAD2_CVSROOT) login
# cvs -d $(FAAD2_CVSROOT) co faad2
# (cd $@; patch -p1 < ../Patches/faad2.patch)
# (cd $@; sh ./bootstrap)
faad2-$(FAAD2_VERSION).tar.gz:
$(WGET) $(FAAD2_URL)
......
diff -ru a/configure.in b/configure.in
--- a/configure.in Wed Nov 22 23:42:56 2006
+++ b/configure.in Wed Nov 22 23:30:04 2006
@@ -76,6 +76,8 @@
fi
])
+dnl check for lrintf()
+AC_SEARCH_LIBS(lrintf,m,[AC_DEFINE([HAVE_LRINTF], [1], [Define if lrintf exists])], [])
MY_CHECK_TYPEDEF_FROM_INCLUDE([float32_t temp],
[#include <sys/types.h>,
diff -ru a/libfaad/bits.h b/libfaad/bits.h
--- a/libfaad/bits.h Wed Nov 22 23:43:10 2006
+++ b/libfaad/bits.h Wed Nov 22 23:44:20 2006
@@ -58,7 +58,7 @@
#if defined (_WIN32) && !defined(_WIN32_WCE) && !defined(__MINGW32__)
#define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax
-#elif defined(LINUX) || defined(DJGPP) || defined(__MINGW32__)
+#elif defined(LINUX) || defined(DJGPP) || (defined(__MINGW32__) && !defined(__MINGWCE__))
#define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) )
#else
#define BSWAP(a) \
diff -ru a/libfaad/common.h b/libfaad/common.h
--- a/libfaad/common.h Wed Nov 22 23:43:04 2006
+++ b/libfaad/common.h Wed Nov 22 23:45:04 2006
@@ -147,7 +147,7 @@
/* END COMPILE TIME DEFINITIONS */
-#if defined(_WIN32) && !defined(__MINGW32__)
+#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__MINGWCE__)
#include <stdlib.h>
@@ -288,8 +288,11 @@
*y2 = MUL_F(x2, c1) - MUL_F(x1, c2);
}
-
- #if defined(_WIN32) && !defined(__MINGW32__)
+#ifndef HAVE_LRINTF
+ #if defined(__MINGWCE__)
+ #elif defined(__MINGW32__) || defined(__APPLE__)
+ #define HAS_LRINTF
+ #elif defined(_WIN32)
#define HAS_LRINTF
static INLINE int lrintf(float f)
{
@@ -315,7 +318,7 @@
return i;
}
#endif
-
+#endif
#ifdef __ICL /* only Intel C compiler has fmath ??? */
--- ../libogg-1.1.3/configure.in 2005-11-28 05:26:07.000000000 +0100
+++ configure.in 2006-07-11 19:52:15.000000000 +0200
@@ -45,27 +45,27 @@
case $host in
*-*-linux*)
DEBUG="-g -Wall -fsigned-char"
- CFLAGS="-O20 -ffast-math -fsigned-char"
+ EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char"
PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char"
;;
sparc-sun-*)
DEBUG="-g -Wall -fsigned-char -mv8"
- CFLAGS="-O20 -ffast-math -fsigned-char -mv8"
+ EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char -mv8"
PROFILE="-pg -g -O20 -fsigned-char -mv8"
;;
*-*-darwin*)
DEBUG="-fno-common -g -Wall -fsigned-char"
- CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math"
+ EXTRA_CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math"
PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math"
;;
*)
DEBUG="-g -Wall -fsigned-char"
- CFLAGS="-O20 -fsigned-char"
+ EXTRA_CFLAGS="-O20 -fsigned-char"
PROFILE="-O20 -g -pg -fsigned-char"
;;
esac
fi
-CFLAGS="$CFLAGS $cflags_save"
+CFLAGS="$EXTRA_CFLAGS $cflags_save"
DEBUG="$DEBUG $cflags_save"
PROFILE="$PROFILE $cflags_save"
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment