]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/ffmpeg/ffmpeg/configure.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / ffmpeg / ffmpeg / configure.patch
1 --- ./configure~configure.patch 2004-07-06 03:36:16.000000000 +0930
2 +++ ./configure 2004-09-27 00:07:23.000000000 +0930
3 @@ -88,7 +88,7 @@
4  mandir=""
5  bindir=""
6  cross_prefix=""
7 -cc="gcc"
8 +cc="$CC"
9  ar="ar"
10  ranlib="ranlib"
11  make="make"
12 @@ -104,7 +104,7 @@
13      cpu="x86"
14    ;;
15    # armv4l is a subset of armv5tel
16 -  armv4l|armv5tel)
17 +  armv4l|armv5tel|arm|xscale)
18      cpu="armv4l"
19    ;;
20    alpha)
21 @@ -434,6 +434,37 @@
22    esac
23  done
24  
25 +case "$cpu" in
26 +  i386|i486|i586|i686|i86pc|BePC)
27 +    cpu="x86"
28 +  ;;
29 +  # armv4l is a subset of armv5tel
30 +  armv4l|armv5tel|arm|xscale)
31 +    cpu="armv4l"
32 +  ;;
33 +  alpha)
34 +    cpu="alpha"
35 +  ;;
36 +  "Power Macintosh"|ppc)
37 +    cpu="powerpc"
38 +  ;;
39 +  mips)
40 +    cpu="mips"
41 +  ;;
42 +  sun4u|sparc64)
43 +    cpu="sparc64"
44 +  ;;
45 +  sparc)
46 +    cpu="sparc"
47 +  ;;
48 +  sh4)
49 +    cpu="sh4"
50 +  ;;
51 +  *)
52 +    cpu="unknown"
53 +  ;;
54 +esac
55 +
56  if test "$gpl" != "yes"; then
57      if test "$pp" != "no" -o "$shared_pp" != "no"; then
58          echo "The Postprocessing code is under GPL and --enable-gpl is not specified"
59 @@ -662,7 +693,6 @@
60      bindir="$prefix"
61  fi
62  
63 -cc="${cross_prefix}${cc}"
64  ar="${cross_prefix}${ar}"
65  ranlib="${cross_prefix}${ranlib}"
66  strip="${cross_prefix}${strip}"
67 @@ -753,21 +783,6 @@
68  fi
69  
70  if test "$zlib" = "yes"; then
71 -# check for zlib - mmu_man
72 -cat > $TMPC << EOF
73 -#include <zlib.h>
74 -int main ( void ) {
75 -if (zlibVersion() != ZLIB_VERSION)
76 -   puts("zlib version differs !!!");
77 -   return 1;
78 -return 0;
79 -}
80 -EOF
81 -$cc $CFLAGS -o $TMPE $TMPC -lz 2> /dev/null || zlib="no"
82 -# $TMPE 2> /dev/null > /dev/null || zlib="no"
83 -# XXX: more tests needed - runtime test
84 -fi
85 -if test "$zlib" = "yes"; then
86  extralibs="$extralibs -lz"
87  fi