Skip to content

Commit 21ad34b

Browse files
committed
Add --firewire-sdk configuration switch to configure
The configure script only looked into /Developer to find the mac FireWire SDK. Unfortunately the FireWire SDK available on Apple developer site is for i386 and ppc archicture only. As such compilation in 64 bits would fail on mac The --firewire-sdk allows to point to an alternative SDK, one that would be 64 bits compatible (as new mac build script allow)
1 parent 3196c2c commit 21ad34b

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

mythtv/configure

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ Advanced options (experts only):
110110
'libcec/cec.h', not the directory
111111
with 'cec.h' [$libcec_path_default]
112112
--disable-firewire disable support for FireWire cable boxes
113+
--firewire-sdk specify location for mac FireWire SDK [mac only]
113114
--disable-iptv disable support for recording RTSP/UDP/RTP streams
114115
--disable-hdhomerun disable support for HDHomeRun boxes
115116
--disable-ceton disable support for Ceton cards
@@ -1449,6 +1450,7 @@ PATHS_LIST='
14491450
shlibdir
14501451
x11_path
14511452
libxml2_path
1453+
firewiresdk_path
14521454
'
14531455

14541456
CMDLINE_SET="
@@ -2027,6 +2029,7 @@ dvb_path_default="${sysroot}/usr/include"
20272029
x11_path_default="${sysroot}/usr/X11R6/include"
20282030
libcec_path_default="${sysroot}/usr/include"
20292031
libxml2_path_default="${sysroot}/usr/include/libxml2"
2032+
firewiresdk_path_default=""
20302033

20312034
# configurable options
20322035
enable avcodec
@@ -2273,6 +2276,9 @@ for opt do
22732276
;;
22742277
--help|-h) show_help
22752278
;;
2279+
--firewire-sdk=*) firewiresdk_path="${optval}"
2280+
;;
2281+
22762282
*)
22772283
optname="${opt%%=*}"
22782284
optname="${optname#--}"
@@ -4111,16 +4117,20 @@ if enabled firewire; then
41114117
check_libx fwlibs libavc1394/avc1394.h avc1394_transaction_block2 -lavc1394 && check_libx fwlibs libiec61883/iec61883.h iec61883_cmp_reconnect -liec61883 || disable firewire
41124118

41134119
if test $target_os = darwin; then
4114-
# This should pick the newest. e.g. FireWireSDK21 instead of 20
4115-
# Unfortunately, the location keeps changing:
4116-
#/Developer/FireWireSDK20/Examples/AVCVideoServices/Framework
4117-
#/Developer/FireWireSDK21/Examples/Framework
4118-
mac_avc=`find /Developer/FireWireSDK* -name Framework 2> /dev/null \
4119-
| tail -n 1`
4120+
if [ -n "$firewiresdk_path" ] ; then
4121+
mac_avc="$firewiresdk_path"
4122+
else
4123+
# This should pick the newest. e.g. FireWireSDK21 instead of 20
4124+
# Unfortunately, the location keeps changing:
4125+
#/Developer/FireWireSDK20/Examples/AVCVideoServices/Framework
4126+
#/Developer/FireWireSDK21/Examples/Framework
4127+
mac_avc=`find /Developer/FireWireSDK* -name Framework 2> /dev/null \
4128+
| tail -n 1`
4129+
fi
41204130
if test -d "$mac_avc" ; then
41214131
firewire="yes"
41224132
else
4123-
echo Firewire being disabled. /Developer/FireWireSDK* missing
4133+
echo Firewire being disabled. FireWire SDK missing
41244134
fi
41254135
fi
41264136
fi

0 commit comments

Comments
 (0)