[SCM] libav/experimental: disable bktr if required headers not found, enable by default
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:56:12 UTC 2013
The following commit has been merged in the experimental branch:
commit 3eac5c63090854cef8ade1f0e801cd6c3f2a90b0
Author: Måns Rullgård <mans at mansr.com>
Date: Sat Feb 10 22:44:20 2007 +0000
disable bktr if required headers not found, enable by default
Originally committed as revision 7913 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/configure b/configure
index 3b8a175..1070cbf 100755
--- a/configure
+++ b/configure
@@ -692,7 +692,7 @@ wince="no"
# non-library system interfaces
audio_beos="no"
audio_oss="yes"
-bktr="no"
+bktr="yes"
dv1394="yes"
video4linux2="yes"
video4linux="yes"
@@ -815,13 +815,11 @@ case $targetos in
add_extralibs "-lsocket -lnsl"
;;
NetBSD)
- bktr="yes"
dv1394="no"
make="gmake"
add_extralibs "-lossaudio"
;;
OpenBSD)
- bktr="yes"
dv1394="no"
need_memalign="no"
make="gmake"
@@ -834,19 +832,16 @@ case $targetos in
add_extralibs "-lossaudio"
;;
FreeBSD)
- bktr="yes"
dv1394="no"
make="gmake"
need_memalign="no"
add_cflags "-pthread"
;;
GNU/kFreeBSD)
- bktr="yes"
dv1394="no"
add_cflags "-pthread"
;;
BSD/OS)
- bktr="yes"
dv1394="no"
extralibs="-lpoll -lgnugetopt -lm"
make="gmake"
@@ -1746,16 +1741,14 @@ enabled video4linux2 && check_header linux/videodev2.h || disable video4linux2
# check for ioctl_meteor.h, ioctl_bt848.h and alternatives
if enabled bktr; then
- check_header dev/bktr/ioctl_meteor.h
- check_header dev/bktr/ioctl_bt848.h
-
- check_header machine/ioctl_meteor.h
- check_header machine/ioctl_bt848.h
-
- check_header dev/video/meteor/ioctl_meteor.h
- check_header dev/video/bktr/ioctl_bt848.h
-
- check_header dev/ic/bt8xx.h
+ { check_header dev/bktr/ioctl_meteor.h &&
+ check_header dev/bktr/ioctl_bt848.h; } ||
+ { check_header machine/ioctl_meteor.h &&
+ check_header machine/ioctl_bt848.h; } ||
+ { check_header dev/video/meteor/ioctl_meteor.h &&
+ check_header dev/video/bktr/ioctl_bt848.h; } ||
+ check_header dev/ic/bt8xx.h ||
+ disable bktr
fi
enabled audio_oss &&
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list