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
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
|
--- configure.orig 2023-02-20 22:41:00 UTC
+++ configure
@@ -666,7 +666,7 @@ armthumb=auto
_iwmmxt=auto
_mtrr=auto
_altivec=auto
-_install=install
+_install=@${BSD_INSTALL_PROGRAM}
_ranlib=ranlib
_windres=windres
_cc=cc
@@ -1019,7 +1019,7 @@ for ac_option do
ld_static=''
;;
--enable-profile)
- _profile='-p'
+ _profile='-pg'
;;
--disable-profile)
_profile=
@@ -1491,7 +1491,6 @@ for ac_option do
*)
echo "Unknown parameter: $ac_option"
- exit 1
;;
esac
@@ -1529,40 +1528,6 @@ rm -f "$TMPLOG"
echo configuration: $configuration > "$TMPLOG"
echo >> "$TMPLOG"
-
-# local FFmpeg checkout handling
-if test -e ffmpeg/.svn ; then
- echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
- exit 1
-fi
-
-FFBRANCH=master
-test -e FFBRANCH && FFBRANCH=$(cat FFBRANCH)
-
-if test -e ffmpeg/mp_auto_pull ; then
- echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
- (cd ffmpeg && git checkout $FFBRANCH)
- if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
- echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
- exit 1
- fi
-fi
-
-if test "$ffmpeg_a" != "no" && ! test -e ffmpeg ; then
- echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort"
- read tmp
- if ! git clone -b $FFBRANCH --depth 1 git://source.ffmpeg.org/ffmpeg.git ffmpeg ; then
- rm -rf ffmpeg
- echo "Failed to get a FFmpeg checkout"
- echo "Please try again or put FFmpeg source code copy into ffmpeg/ manually."
- echo "Nightly snapshot: http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2"
- echo "To use a github mirror via http (e.g. because a firewall blocks git):"
- echo "git clone --depth 1 https://github.com/FFmpeg/FFmpeg ffmpeg; touch ffmpeg/mp_auto_pull"
- exit 1
- fi
- touch ffmpeg/mp_auto_pull
-fi
-
list_subparts() {
test ! -e ffmpeg/libav${3} && return 1
pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
@@ -1844,7 +1809,7 @@ if test -z "$_target" ; then
case "$1" in
x86_64|amd64|x64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
ia64) host_arch=ia64 ;;
- macppc|ppc*|Power*) host_arch=ppc ;;
+ macppc|powerpc|ppc*|Power*) host_arch=ppc ;;
alpha) host_arch=alpha ;;
sun4*|sparc*) host_arch=sparc ;;
parisc*|hppa*|9000*) host_arch=hppa ;;
@@ -1970,7 +1935,11 @@ echocheck "working compiler"
cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
echo "yes"
-cflag_check "-lm" && libm="-lm"
+if test -z "$_profile" ; then
+ cflag_check "-lm" && libm="-lm"
+else
+ cflag_check "-lm_p" && libm="-lm_p"
+fi
if test -z "$_target" ; then
cat > $TMPC << EOF
@@ -3100,7 +3069,7 @@ if x86_32 ; then
_pref_as_version='2.16.92'
echo 'pabsd %xmm0, %xmm1' >> $TMPS
fi
- $_as -c $TMPS -o $TMPEXE > /dev/null 2>&1 || as_verc_fail=yes
+ $_as $TMPS -o $TMPEXE > /dev/null 2>&1 || as_verc_fail=yes
if test "$as_verc_fail" != yes ; then
echores "ok"
@@ -3367,6 +3336,13 @@ if arm ; then
fi
echores "$setend"
+ echocheck "ARM setend"
+ if test $setend = "auto" ; then
+ setend=no
+ inline_asm_check '"setend be"' && setend=yes
+ fi
+ echores "$setend"
+
echocheck "softfloat ABI"
softfloat=yes
cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no
@@ -4277,7 +4253,7 @@ echocheck "pthread"
if linux ; then
THREAD_CFLAGS=-D_REENTRANT
elif freebsd || netbsd || openbsd || bsdos ; then
- THREAD_CFLAGS=-D_THREAD_SAFE
+ THREAD_CFLAGS=
fi
if test "$_pthreads" = auto ; then
cat > $TMPC << EOF
@@ -4287,7 +4263,7 @@ int main(void) { pthread_t tid; return pthread_create(
EOF
_pthreads=no
if ! hpux ; then
- for ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
+ for ld_tmp in "-lpthread" "-pthread" ; do
# for crosscompilation, we cannot execute the program, be happy if we can link statically
cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
done
@@ -4430,7 +4406,7 @@ int main(void) {
}
EOF
_iconv=no
- for ld_tmp in "" "-liconv" "-liconv $ld_dl" ; do
+ for ld_tmp in "" "-L$_prefix/lib -liconv" "-L%%LOCALBASE%%/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
ld_iconv="$ld_tmp" && _iconv=yes && break
done
@@ -4460,7 +4436,8 @@ if test "$_termcap" = auto ; then
_termcap=no
for ld_tmp in "-lncurses" "-ltinfo" "-ltermcap"; do
statement_check term.h 'tgetent(0, 0)' $ld_tmp &&
- extra_ldflags="$extra_ldflags $ld_tmp" &&
+ # Nudge the linker into finding ffmpeg4 symbols first
+ extra_ldflags="-L%%LOCALBASE%%/ffmpeg4/lib $extra_ldflags $ld_tmp" &&
ld_termcap="$ld_tmp" && _termcap=yes && break
done
fi
@@ -5876,15 +5853,6 @@ EOF
break
fi
done
- if test "$_x11" = yes && cc_check -DGL_EGL_X11 -lEGL ; then
- _gl=yes
- _gl_egl_x11=yes
- libs_mplayer="$libs_mplayer -lEGL $ld_dl"
- elif cc_check -DGL_EGL_ANDROID -lEGL ; then
- _gl=yes
- _gl_egl_android=yes
- libs_mplayer="$libs_mplayer -lEGL $ld_dl"
- fi
if win32 && cc_check -DGL_WIN32 -lopengl32 ; then
_gl=yes
_gl_win32=yes
@@ -6419,7 +6387,7 @@ elif darwin ; then
elif dragonfly ; then
default_cdrom_device="/dev/cd0"
elif freebsd ; then
- default_cdrom_device="/dev/acd0"
+ default_cdrom_device="/dev/cdrom"
elif openbsd ; then
default_cdrom_device="/dev/rcd0c"
elif sunos ; then
@@ -6432,7 +6400,7 @@ else
default_cdrom_device="/dev/cdrom"
fi
-if win32 || os2 || dragonfly || freebsd || openbsd || sunos || amigaos ; then
+if win32 || os2 || dragonfly || openbsd || sunos || amigaos ; then
default_dvd_device=$default_cdrom_device
elif darwin ; then
default_dvd_device="/dev/rdiskN"
@@ -6959,7 +6927,7 @@ echores "$_speex"
echocheck "libgsm"
if test "$_libgsm" = auto ; then
_libgsm=no
- statement_check gsm/gsm.h 'gsm_create()' -lgsm && _libgsm=yes
+ statement_check gsm.h 'gsm_create()' -lgsm && _libgsm=yes
fi
if test "$_libgsm" = yes ; then
def_libgsm='#define CONFIG_LIBGSM 1'
@@ -7391,6 +7359,16 @@ if test "$_librtmp" = yes && test "$networking" = yes;
nolibrtmp=no
def_librtmp='#define CONFIG_LIBRTMP 1'
inputmodules="librtmp $inputmodules"
+
+ if $_pkg_config --exists librtmp; then
+ _inc_tmp=$($_pkg_config --cflags librtmp)
+ _ld_tmp=$($_pkg_config --libs librtmp)
+ else
+ _inc_tmp="-I${LOCALBASE}/include"
+ _ld_tmp="-L${LOCALBASE}/lib -lrtmp -lz -lssl -lcrypto"
+ fi
+ extra_ldflags="$extra_ldflags $_ld_tmp"
+ extra_cflags="$extra_cflags $_inc_tmp"
else
nolibrtmp=yes
_librtmp=no
@@ -7808,7 +7786,7 @@ echores "$_mp3lame"
echocheck "mencoder"
if test "$_mencoder" = no ; then
# mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
- libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER SNOW_ENCODER"
+ libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER"
fi
echores "$_mencoder"
@@ -8414,7 +8392,7 @@ libs_mplayer=$ld_tmp
#############################################################################
-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
+CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=c++98"
|
