autotools: drop libdrm dependency (only libva-drm is used)
diff --git a/configure.ac b/configure.ac
index 31fe16b..9d60b88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,9 +43,6 @@
# libva-utils was created
m4_define([libva_api_min_version], [1.1.0])
-# libdrm minimun version requirement
-m4_define([libdrm_version], [2.4])
-
# Wayland minimum version number
m4_define([wayland_api_version], [1.0.0])
@@ -146,10 +143,7 @@
AM_CONDITIONAL(USE_SSP, test "$ssp_cc" = "yes")
# Check for DRM (mandatory)
-LIBDRM_VERSION=libdrm_version
-PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION])
PKG_CHECK_MODULES([LIBVA_DRM], [libva-drm])
-AC_SUBST(LIBDRM_VERSION)
# Check for libva (for dynamic linking)
LIBVA_API_MIN_VERSION=libva_api_min_version
diff --git a/decode/Android.mk b/decode/Android.mk
index 31c92c6..2760042 100644
--- a/decode/Android.mk
+++ b/decode/Android.mk
@@ -18,7 +18,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := mpeg2vldemo
-LOCAL_SHARED_LIBRARIES := libva libva-android libdl libdrm libcutils libutils libgui
+LOCAL_SHARED_LIBRARIES := libva libva-android libdl libcutils libutils libgui
include $(BUILD_EXECUTABLE)
@@ -41,6 +41,6 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := loadjpeg
-LOCAL_SHARED_LIBRARIES := libva libva-android libdl libdrm libcutils libutils libgui
+LOCAL_SHARED_LIBRARIES := libva libva-android libdl libcutils libutils libgui
include $(BUILD_EXECUTABLE)
diff --git a/encode/Android.mk b/encode/Android.mk
index 389dde6..dbfd748 100644
--- a/encode/Android.mk
+++ b/encode/Android.mk
@@ -18,7 +18,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := h264encode
-LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libgui libm
+LOCAL_SHARED_LIBRARIES := libva-android libva libdl libcutils libutils libgui libm
include $(BUILD_EXECUTABLE)
@@ -40,7 +40,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := avcenc
-LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libgui
+LOCAL_SHARED_LIBRARIES := libva-android libva libdl libcutils libutils libgui
include $(BUILD_EXECUTABLE)
@@ -62,7 +62,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := vp9enc
-LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libgui
+LOCAL_SHARED_LIBRARIES := libva-android libva libdl libcutils libutils libgui
include $(BUILD_EXECUTABLE)
@@ -84,7 +84,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := jpegenc
-LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libgui
+LOCAL_SHARED_LIBRARIES := libva-android libva libdl libcutils libutils libgui
include $(BUILD_EXECUTABLE)
@@ -106,7 +106,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := mpeg2vaenc
-LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libgui
+LOCAL_SHARED_LIBRARIES := libva-android libva libdl libcutils libutils libgui
include $(BUILD_EXECUTABLE)
@@ -128,6 +128,6 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := svctenc
-LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libgui
+LOCAL_SHARED_LIBRARIES := libva-android libva libdl libcutils libutils libgui
include $(BUILD_EXECUTABLE)
diff --git a/meson.build b/meson.build
index c218e8c..1adc12e 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,6 @@
if get_option('drm') != 'false'
require_drm = get_option('drm') == 'true'
drm_deps = [
- dependency('libdrm', version: '>= 2.4', required: require_drm),
dependency('libva-drm', required: require_drm),
]
use_drm = true
diff --git a/vainfo/Android.mk b/vainfo/Android.mk
index 8fb517d..55040c0 100644
--- a/vainfo/Android.mk
+++ b/vainfo/Android.mk
@@ -19,7 +19,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := vainfo
-LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libgui
+LOCAL_SHARED_LIBRARIES := libva-android libva libdl libcutils libutils libgui
include $(BUILD_EXECUTABLE)
diff --git a/videoprocess/Android.mk b/videoprocess/Android.mk
index fa06407..c4c2caa 100644
--- a/videoprocess/Android.mk
+++ b/videoprocess/Android.mk
@@ -18,6 +18,6 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := vavpp
-LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libgui libm
+LOCAL_SHARED_LIBRARIES := libva-android libva libdl libcutils libutils libgui libm
include $(BUILD_EXECUTABLE)
