11dd592222
Re-import ffmpeg 0.10 branch. Upcomming gstreamer1-1.0.3 will use this. This package can co-exist with ffmpeg 1.0.
67 lines
2.3 KiB
Text
67 lines
2.3 KiB
Text
$NetBSD: patch-configure,v 1.3 2012/11/28 15:50:03 ryoon Exp $
|
|
|
|
--- configure.orig 2012-06-09 20:09:44.000000000 +0000
|
|
+++ configure
|
|
@@ -2604,6 +2604,11 @@ case $target_os in
|
|
;;
|
|
netbsd)
|
|
disable symver
|
|
+ # NetBSD/macppc *really* needs PIC enabled. ffmpeg has repeatedly
|
|
+ # broken time and time again because PIC support has been removed
|
|
+ # from architectures that need it. So, if you touch this, please
|
|
+ # be careful and make sure that your changes work.
|
|
+ test "${subarch}" != "x86_32" && enable pic
|
|
oss_indev_extralibs="-lossaudio"
|
|
oss_outdev_extralibs="-lossaudio"
|
|
;;
|
|
@@ -2835,10 +2840,13 @@ check_cc <<EOF && enable attribute_may_a
|
|
union { int x; } __attribute__((may_alias)) x;
|
|
EOF
|
|
|
|
-check_cc <<EOF || die "endian test failed"
|
|
-unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
|
|
+check_exec <<EOF || enable bigendian
|
|
+int main()
|
|
+{
|
|
+ long one = 1;
|
|
+ return !(*((char *)(&one)));
|
|
+}
|
|
EOF
|
|
-od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
|
|
|
|
if enabled alpha; then
|
|
|
|
@@ -3195,7 +3203,7 @@ else
|
|
fi
|
|
enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
|
|
|
|
-texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
|
|
+which texi2html > /dev/null 2>&1 && enable texi2html || disable texi2html
|
|
makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo
|
|
|
|
check_header linux/fb.h
|
|
@@ -3291,6 +3299,7 @@ check_ldflags -Wl,--warn-common
|
|
check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil
|
|
test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
|
|
|
|
+if false; then
|
|
echo "X{};" > $TMPV
|
|
if test_ldflags -Wl,--version-script,$TMPV; then
|
|
append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
|
|
@@ -3303,6 +3312,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
|
|
void ff_foo(void) {}
|
|
EOF
|
|
fi
|
|
+fi
|
|
|
|
if [ -n "$optflags" ]; then
|
|
add_cflags $optflags
|
|
@@ -3726,7 +3736,7 @@ Version: $version
|
|
Requires: $(enabled shared || echo $requires)
|
|
Requires.private: $(enabled shared && echo $requires)
|
|
Conflicts:
|
|
-Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
|
|
+Libs: -L\${libdir} -Wl,-R\${libdir} -l${shortname} $(enabled shared || echo $libs)
|
|
Libs.private: $(enabled shared && echo $libs)
|
|
Cflags: -I\${includedir}
|
|
EOF
|