1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
|
$NetBSD: patch-aa,v 1.30 2012/11/29 17:27:17 drochner Exp $
o Handle properly sh3 ports on NetBSD.
o Fix CPU family detection on NetBSD with /proc mounted with "-o linux"
(please see also kern/25076).
o Fix a bug which broke the detection of a lot of X11 libraries.
o Add necessary libs for aalib support even if the aa option is turned on with
--enable-aa.
o Add support for dvb capture on NetBSD.
--- configure.orig 2012-05-22 18:01:51.000000000 +0000
+++ configure
@@ -1520,7 +1520,8 @@ if test -z "$_target" ; then
sun4*|sparc*) host_arch=sparc ;;
parisc*|hppa*|9000*) host_arch=hppa ;;
arm*|zaurus|cats) host_arch=arm ;;
- sh3|sh4|sh4a) host_arch=sh ;;
+ sh3*) host_arch=sh ;;
+ sh4|sh4a) host_arch=sh4 ;;
s390) host_arch=s390 ;;
s390x) host_arch=s390x ;;
*mips*) host_arch=mips ;;
@@ -1674,7 +1675,7 @@ else
cc_name=$cc_name_tmp
echocheck "$_cc version"
cc_vendor=gnu
- cc_version=$($_cc -dumpversion 2>&1)
+ cc_version=$( ( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1 )
case $cc_version in
2.96*)
cc_fail=yes
@@ -1798,7 +1799,7 @@ if x86 ; then
# gather more CPU information
pname=$($_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1)
pvendor=$($_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
- pfamily=$($_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
+ pfamily=$($_cpuinfo | grep -i 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
pmodel=$($_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
pstepping=$($_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
@@ -2274,7 +2275,12 @@ case "$host_arch" in
test $_fast_clz = "auto" && _fast_clz=yes
;;
- sh|sh4)
+ sh)
+ arch='sh'
+ iproc='sh'
+ ;;
+
+ sh4)
arch='sh4'
iproc='sh4'
;;
@@ -2591,7 +2597,7 @@ fi # if darwin && test "$cc_vendor" = "g
# Checking for CFLAGS
_install_strip="-s"
if test "$_profile" != "" || test "$_debug" != "" ; then
- CFLAGS="-O2 $_march $_mcpu $_pipe $_debug $_profile"
+ CFLAGS="$CFLAGS $_debug $_profile"
WARNFLAGS="-W -Wall"
_install_strip=
elif test -z "$CFLAGS" ; then
@@ -4288,7 +4294,11 @@ if test "$_x11" = auto && test "$_x11_he
-L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
-L/usr/lib ; do
if netbsd; then
- ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
+ if test -n "$I" ; then
+ ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
+ else
+ ld_tmp="-lXext -lX11 $ld_pthread"
+ fi
else
ld_tmp="$I -lXext -lX11 $ld_pthread"
fi
@@ -4669,6 +4679,8 @@ if test "$_aa" = yes ; then
def_aa='#define CONFIG_AA 1'
if cygwin ; then
libs_mplayer="$libs_mplayer $(aalib-config --libs | cut -d " " -f 2,5,6)"
+ else
+ libs_mplayer="$libs_mplayer $(aalib-config --libs)"
fi
vomodules="aa $vomodules"
else
@@ -4756,7 +4768,6 @@ EOF
extra_cflags="$extra_cflags $inc_tmp" && break
done
fi
-echores "$_dvb"
if test "$_dvb" = yes ; then
_dvbin=yes
inputmodules="dvb $inputmodules"
@@ -4765,14 +4776,29 @@ if test "$_dvb" = yes ; then
aomodules="mpegpes(dvb) $aomodules"
vomodules="mpegpes(dvb) $vomodules"
else
- _dvbin=no
- noinputmodules="dvb $noinputmodules"
- def_dvb='#undef CONFIG_DVB'
- def_dvbin='#undef CONFIG_DVBIN '
- aomodules="mpegpes(file) $aomodules"
- vomodules="mpegpes(file) $vomodules"
+ cat >$TMPC <<EOF
+#include <dev/dtv/dtvio.h>
+int main(void) {return 0;}
+EOF
+ cc_check && _dvb=yes
+ if test "$_dvb" = yes ; then
+ _dvbin=yes
+ inputmodules="dvb $inputmodules"
+ def_dvb='#undef CONFIG_DVB'
+ def_dvbin='#define CONFIG_DVBIN 1'
+ aomodules="mpegpes(file) $aomodules"
+ vomodules="mpegpes(file) $vomodules"
+ else
+ _dvbin=no
+ noinputmodules="dvb $noinputmodules"
+ def_dvb='#undef CONFIG_DVB'
+ def_dvbin='#undef CONFIG_DVBIN '
+ aomodules="mpegpes(file) $aomodules"
+ vomodules="mpegpes(file) $vomodules"
+ fi
fi
+echores "$_dvb"
if darwin; then
|
