-
Notifications
You must be signed in to change notification settings - Fork 31
driver_init: load libva-x11.so for any ABI version #26
base: master
Are you sure you want to change the base?
Conversation
with libva > 2.0.0 hybrid driver can operate with it as well so make this load generic to libva installed version Signed-off-by: Daniel Charles <[email protected]>
@@ -30,7 +30,7 @@ | |||
#define _MEDIA__DRIVER_OUT_DRI_H | |||
#include <stdbool.h> | |||
#include "media_drv_defines.h" | |||
#define LIBVA_X11_NAME "libva-x11.so.1" | |||
#define LIBVA_X11_NAME "libva-x11.so" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This patch seems wrong. The SONAME in libva-2.0.0+ is libva-x11.so.2 and end-users system should not have the unversionned symlink
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, this IMHO does not belong here, but just in the implementation file.
There, it can be made dependent on if VA_CHECK_VERSION(1,0,0)
, so the file name matches the symbols
table.
@@ -30,7 +30,7 @@ | |||
#define _MEDIA__DRIVER_OUT_DRI_H | |||
#include <stdbool.h> | |||
#include "media_drv_defines.h" | |||
#define LIBVA_X11_NAME "libva-x11.so.1" | |||
#define LIBVA_X11_NAME "libva-x11.so" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, this IMHO does not belong here, but just in the implementation file.
There, it can be made dependent on if VA_CHECK_VERSION(1,0,0)
, so the file name matches the symbols
table.
@@ -105,13 +105,23 @@ media_output_dri_init (VADriverContextP ctx) | |||
struct dri_vtable *dri_vtable; | |||
|
|||
static const struct dso_symbol symbols[] = { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Other option is to have both versions, here (e.g. symbols[2][] = { { /* .so.1 stuff */ }, { /* .so.2 stuff */ } }
) and try both libraries in turn below (handle = dso_open(*.so.2); if (!handle) dso_open(*.so.1);
).
with libva > 2.0.0 hybrid driver can operate with it as well
so make this load generic to libva installed version
Signed-off-by: Daniel Charles [email protected]