mirror of
https://git.freebsd.org/ports.git
synced 2025-06-29 16:40:31 -04:00
f8285fcd88
- fix build with ffmpeg
- add --headless option to run xbmc w/o gui [2]
PR: 175933 [1]
PR: 174996 [2]
Submitted by: Leo Schmitt <neomorphs@gmail.com> [1] (original patch)
Mickael Maillot <mickael.maillot@gmail.com> (maintainer, final patch)
Alexander Yerenkow <yerenkow@gmail.com> [2]
62 lines
3 KiB
Text
62 lines
3 KiB
Text
--- configure.in.orig 2012-10-01 01:08:50.000000000 +0200
|
|
+++ configure.in 2012-10-03 12:17:13.000000000 +0200
|
|
@@ -726,9 +726,9 @@
|
|
# platform specific flags
|
|
if echo "$ARCH" | grep -q "freebsd" ; then
|
|
LOCALBASE="${LOCALBASE:-/usr/local}"
|
|
- CFLAGS="$CFLAGS -I$LOCALBASE/include"
|
|
- CXXFLAGS="$CXXFLAGS -I$LOCALBASE/include"
|
|
- CPPFLAGS="$CPPFLAGS -I$LOCALBASE/include"
|
|
+ CFLAGS="$CFLAGS -idirafter$LOCALBASE/include"
|
|
+ CXXFLAGS="$CXXFLAGS -idirafter$LOCALBASE/include"
|
|
+ CPPFLAGS="$CPPFLAGS -idirafter$LOCALBASE/include"
|
|
LDFLAGS="$LDFLAGS -L$LOCALBASE/lib"
|
|
FFMPEG_EXTRACFLAGS="-I$LOCALBASE/include"
|
|
fi
|
|
@@ -816,6 +816,7 @@
|
|
|
|
# Check inotify availability
|
|
AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)
|
|
+AC_CHECK_LIB([inotify], [main],,)
|
|
|
|
# Checks for boost headers using CXX instead of CC
|
|
AC_LANG_PUSH([C++])
|
|
@@ -1491,15 +1492,15 @@
|
|
|
|
# External FFmpeg
|
|
if test "$use_external_ffmpeg" = "yes"; then
|
|
- FFMPEG_LIBNAMES="libavcodec libavfilter libavformat libavutil libpostproc libswscale"
|
|
+ FFMPEG_LIBNAMES="libavcodec$FFMPEG_SUFFIX libavfilter$FFMPEG_SUFFIX libavformat$FFMPEG_SUFFIX libavutil$FFMPEG_SUFFIX libpostproc$FFMPEG_SUFFIX libswscale$FFMPEG_SUFFIX"
|
|
|
|
# libavcore is optional
|
|
- PKG_CHECK_EXISTS([libavcore], FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libavcore")
|
|
+ PKG_CHECK_EXISTS([libavcore$FFMPEG_SUFFIX], FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libavcore$FFMPEG_SUFFIX")
|
|
|
|
# one of libswresample or libavresample is needed
|
|
- PKG_CHECK_EXISTS([libswresample], FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libswresample",
|
|
- [PKG_CHECK_EXISTS([libavresample],
|
|
- FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libavresample",
|
|
+ PKG_CHECK_EXISTS([libswresample$FFMPEG_SUFFIX], FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libswresample$FFMPEG_SUFFIX",
|
|
+ [PKG_CHECK_EXISTS([libavresample$FFMPEG_SUFFIX],
|
|
+ FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libavresample$FFMPEG_SUFFIX",
|
|
AC_MSG_ERROR([You need either libswresample
|
|
or libavresample.]))])
|
|
|
|
@@ -1509,7 +1510,7 @@
|
|
|
|
# Determine whether AVPacket and relevant functions are defined in libavformat
|
|
# or libavcodec
|
|
- AC_CHECK_LIB([avcodec], [av_free_packet],
|
|
+ AC_CHECK_LIB(["avcodec$FFMPEG_SUFFIX"], [av_free_packet],
|
|
[AC_MSG_NOTICE(== AVPacket and relevant functions defined in libavcodec. ==)],
|
|
[AC_MSG_NOTICE(== AVPacket and relevant functions defined in libavformat. ==)
|
|
AC_DEFINE([AVPACKET_IN_AVFORMAT], [1], [Whether AVPacket is in libavformat.])])
|
|
@@ -1558,7 +1559,7 @@
|
|
AC_DEFINE([USE_EXTERNAL_FFMPEG], [1], [Whether to use external FFmpeg libraries.])
|
|
|
|
# Disable vdpau support if external libavcodec doesn't have it
|
|
- AC_CHECK_LIB([avcodec], [ff_vdpau_vc1_decode_picture],,
|
|
+ AC_CHECK_LIB(["avcodec$FFMPEG_SUFFIX"], [ff_vdpau_vc1_decode_picture],,
|
|
[if test "x$use_vdpau" = "xyes"; then
|
|
AC_MSG_ERROR($ffmpeg_vdpau_not_supported)
|
|
else
|