Skip to content
Snippets Groups Projects
Commit 2cc09ccc authored by Philippe Gorley's avatar Philippe Gorley Committed by Philippe Gorley
Browse files

configure: remove accel build options


The --disable-[accel name] switches of the configure script are a
nightmare to maintain. They break with every bump of FFmpeg, and don't
work right half the time.

Keep only global switch --disable-accel.

Change-Id: I6b645f7102abb3903c27d7dac7d70f7f15a5e728
Reviewed-by: default avatarOlivier Soldano <olivier.soldano@savoirfairelinux.com>
parent 37507752
No related branches found
No related tags found
No related merge requests found
...@@ -453,9 +453,6 @@ AS_IF([test "x$enable_video" != "xno"], ...@@ -453,9 +453,6 @@ AS_IF([test "x$enable_video" != "xno"],
]); ]);
AC_ARG_ENABLE([accel], AS_HELP_STRING([--disable-accel], [Disable all hardware accelerations (enabled by default)])) AC_ARG_ENABLE([accel], AS_HELP_STRING([--disable-accel], [Disable all hardware accelerations (enabled by default)]))
AC_ARG_ENABLE([vdpau], AS_HELP_STRING([--disable-vdpau], [Disable VDPAU hardware acceleration (auto)]))
AC_ARG_ENABLE([vaapi], AS_HELP_STRING([--disable-vaapi], [Disable VAAPI hardware acceleration (auto)]))
AC_ARG_ENABLE([videotoolbox], AS_HELP_STRING([--disable-videotoolbox], [Disable VideoToolbox hardware acceleration (auto)]))
AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [
ring_accel="yes" ring_accel="yes"
AC_DEFINE([RING_ACCEL], [1], [Hardware acceleration is enabled in Ring]) AC_DEFINE([RING_ACCEL], [1], [Hardware acceleration is enabled in Ring])
...@@ -463,8 +460,6 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [ ...@@ -463,8 +460,6 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [
dnl ffmpeg's vaapi and vdpau implementations depend on x11 dnl ffmpeg's vaapi and vdpau implementations depend on x11
PKG_CHECK_MODULES([X11], [x11], [x11_available="yes"], [x11_available="no"]) PKG_CHECK_MODULES([X11], [x11], [x11_available="yes"], [x11_available="no"])
AS_IF([test "${x11_available}" = "yes"], [ AS_IF([test "${x11_available}" = "yes"], [
dnl vaapi for linux
AS_IF([test "x$enable_vaapi" != "xno"], [
PKG_CHECK_MODULES([LIBVA], [libva], [ PKG_CHECK_MODULES([LIBVA], [libva], [
PKG_CHECK_MODULES([LIBVA_DRM], [libva-drm], [ PKG_CHECK_MODULES([LIBVA_DRM], [libva-drm], [
AC_DEFINE([HAVE_VAAPI_ACCEL_DRM], [1], [Defined if vaapi via DRM is available]) AC_DEFINE([HAVE_VAAPI_ACCEL_DRM], [1], [Defined if vaapi via DRM is available])
...@@ -477,9 +472,6 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [ ...@@ -477,9 +472,6 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [
AC_DEFINE([RING_VAAPI], [1], [Defined if vaapi is available in Ring]) AC_DEFINE([RING_VAAPI], [1], [Defined if vaapi is available in Ring])
]) ])
], []) ], [])
])
dnl vdpau linux
AS_IF([test "x$enable_vdpau" != "xno"], [
PKG_CHECK_MODULES([VDPAU], [vdpau], [ PKG_CHECK_MODULES([VDPAU], [vdpau], [
AC_CHECK_HEADERS([libavcodec/vdpau.h], [ AC_CHECK_HEADERS([libavcodec/vdpau.h], [
ring_vdpau="yes" ring_vdpau="yes"
...@@ -488,9 +480,7 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [ ...@@ -488,9 +480,7 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [
], []) ], [])
]) ])
]) ])
])
AS_IF([test "${SYS}" = "darwin"], [ AS_IF([test "${SYS}" = "darwin"], [
AS_IF([test "x$enable_videotoolbox" != "xno"], [
AC_CHECK_HEADER([VideoToolbox/VideoToolbox.h], [ AC_CHECK_HEADER([VideoToolbox/VideoToolbox.h], [
AC_CHECK_HEADER([libavcodec/videotoolbox.h], [ AC_CHECK_HEADER([libavcodec/videotoolbox.h], [
ring_vt="yes" ring_vt="yes"
...@@ -499,7 +489,6 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [ ...@@ -499,7 +489,6 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [
]) ])
]) ])
]) ])
])
AM_CONDITIONAL([RING_ACCEL], [test "x${ring_accel}" = "xyes"]) AM_CONDITIONAL([RING_ACCEL], [test "x${ring_accel}" = "xyes"])
AM_CONDITIONAL([RING_VAAPI], [test "x${ring_vaapi}" = "xyes"]) AM_CONDITIONAL([RING_VAAPI], [test "x${ring_vaapi}" = "xyes"])
AM_CONDITIONAL([RING_VDPAU], [test "x${ring_vdpau}" = "xyes"]) AM_CONDITIONAL([RING_VDPAU], [test "x${ring_vdpau}" = "xyes"])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment