mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-24 02:31:03 +00:00
resindvd: require libdvdnav >= 4.1.2 for dvdnav_get_current_time()
Fixes #577864.
This commit is contained in:
parent
bbba3aa121
commit
e55f069fe6
2 changed files with 5 additions and 19 deletions
12
configure.ac
12
configure.ac
|
@ -709,17 +709,15 @@ AG_GST_CHECK_FEATURE(DVDNAV, [dvdnav library], resindvd, [
|
||||||
DVDNAV_MAJOR=`echo $DVDNAV_VERSION | cut -d. -f1 | sed s/[a-zA-Z\-].*//g`
|
DVDNAV_MAJOR=`echo $DVDNAV_VERSION | cut -d. -f1 | sed s/[a-zA-Z\-].*//g`
|
||||||
DVDNAV_MINOR=`echo $DVDNAV_VERSION | cut -d. -f2 | sed s/[a-zA-Z\-].*//g`
|
DVDNAV_MINOR=`echo $DVDNAV_VERSION | cut -d. -f2 | sed s/[a-zA-Z\-].*//g`
|
||||||
DVDNAV_MICRO=`echo $DVDNAV_VERSION | cut -d. -f3 | sed s/[a-zA-Z\-].*//g`
|
DVDNAV_MICRO=`echo $DVDNAV_VERSION | cut -d. -f3 | sed s/[a-zA-Z\-].*//g`
|
||||||
if [[ "$DVDNAV_MAJOR" -eq "0" ]] && \
|
if [[ "$DVDNAV_MAJOR" -eq "4" ]] && \
|
||||||
[[ "$DVDNAV_MINOR" -lt "1" ]]; then
|
[[ "$DVDNAV_MINOR" -lt "1" ]]; then
|
||||||
AC_MSG_WARN([libdvdnav >= 0.1.7 is required, you have $DVDNAV_VERSION])
|
AC_MSG_WARN([libdvdnav >= 4.1.2 is required, you have $DVDNAV_VERSION])
|
||||||
HAVE_DVDNAV="no"
|
HAVE_DVDNAV="no"
|
||||||
elif [[ "$DVDNAV_MAJOR" -eq "0" ]] && \
|
elif [[ "$DVDNAV_MAJOR" -eq "4" ]] && \
|
||||||
[[ "$DVDNAV_MINOR" -eq "1" ]] && \
|
[[ "$DVDNAV_MINOR" -eq "1" ]] && \
|
||||||
[[ "$DVDNAV_MICRO" -lt "7" ]]; then
|
[[ "$DVDNAV_MICRO" -lt "2" ]]; then
|
||||||
AC_MSG_WARN([libdvdnav >= 0.1.7 is required, you have $DVDNAV_VERSION])
|
AC_MSG_WARN([libdvdnav >= 4.1.2 is required, you have $DVDNAV_VERSION])
|
||||||
HAVE_DVDNAV="no"
|
HAVE_DVDNAV="no"
|
||||||
elif [[ "$DVDNAV_MAJOR" -eq "0" ]]; then
|
|
||||||
AC_DEFINE(DVDNAV_OLD, 1, [Define if an old libdvdnav is used])
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
AS_SCRUB_INCLUDE(DVDNAV_CFLAGS)
|
AS_SCRUB_INCLUDE(DVDNAV_CFLAGS)
|
||||||
|
|
|
@ -25,22 +25,10 @@
|
||||||
|
|
||||||
#include "_stdint.h"
|
#include "_stdint.h"
|
||||||
|
|
||||||
#ifndef DVDNAV_OLD
|
|
||||||
|
|
||||||
#include <dvdnav/dvdnav.h>
|
#include <dvdnav/dvdnav.h>
|
||||||
#include <dvdread/ifo_read.h>
|
#include <dvdread/ifo_read.h>
|
||||||
#include <dvdread/nav_read.h>
|
#include <dvdread/nav_read.h>
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
#include <dvdnav/dvd_reader.h>
|
|
||||||
#include <dvdnav/ifo_read.h>
|
|
||||||
|
|
||||||
#include <dvdnav/dvdnav.h>
|
|
||||||
#include <dvdnav/nav_read.h>
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
#define RESIN_TYPE_DVDSRC (rsn_dvdsrc_get_type())
|
#define RESIN_TYPE_DVDSRC (rsn_dvdsrc_get_type())
|
||||||
|
|
Loading…
Reference in a new issue