Skip to content

Commit

Permalink
Add Android.bp for libva 2.22
Browse files Browse the repository at this point in the history
Changes include:
- Replace Android.mk with Android.bp for libva 2.22
- Symbolic link to LICENSE
- Add pre-generated va/va_version.h and remove it from .gitignore

Signed-off-by: Jeevaka Prabu Badrappan <[email protected]>
  • Loading branch information
JeevakaPrabu committed Sep 25, 2024
1 parent 0115352 commit c2fc072
Show file tree
Hide file tree
Showing 5 changed files with 202 additions and 5 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ ltmain.sh
/m4
missing
stamp-h1
/va/va_version.h
/va/wayland/wayland-drm-client-protocol.*
/doc/Doxyfile
/doc/html-out
114 changes: 114 additions & 0 deletions Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
package {
default_applicable_licenses: ["external_intel_libva_license"],
}

license {
name: "external_intel_libva_license",
visibility: [":__subpackages__"],
license_text: [
"LICENSE",
],
}

cc_library_shared {
name: "libva",
srcs: [
"va/va.c",
"va/va_trace.c",
"va/va_str.c",
"va/drm/va_drm.c",
"va/drm/va_drm_auth.c",
"va/drm/va_drm_utils.c",
],
cflags: [
"-Wno-sign-compare",
"-Wno-missing-field-initializers",
"-Wno-unused-parameter",
"-DLOG_TAG=\"libva\"",
"-DSYSCONFDIR=\"/vendor/etc\"",
],
multilib: {
lib32: {
cflags: [
"-DVA_DRIVERS_PATH=\"/vendor/lib/dri\"",
],
},
lib64: {
cflags: [
"-DVA_DRIVERS_PATH=\"/vendor/lib64/dri\"",
],
},
},
local_include_dirs: [
"va",
],
shared_libs: [
"libdl",
"libdrm",
"libcutils",
"liblog",
],
header_libs: [
"libutils_headers",
],
vendor: true,
enabled: false,
arch: {
x86_64: {
enabled: true,
},
},
}

cc_library_headers {
name: "libva_headers",
vendor: true,
export_include_dirs: [
".",
"va",
"va/drm"
],
enabled: false,
arch: {
x86_64: {
enabled: true,
},
},
}

cc_library_shared {
name: "libva-android",
srcs: [
"va/android/va_android.cpp",
"va/drm/va_drm_utils.c",
],
cflags: [
"-Wno-sign-compare",
"-Wno-missing-field-initializers",
"-Wno-unused-parameter",
"-DLOG_TAG=\"libva-android\"",
],
local_include_dirs: [
"va",
"va/drm",
],
shared_libs: [
"libva",
"libdrm",
"liblog",
],
static_libs: [
"libarect",
],
header_libs: [
"libnativebase_headers",
"libutils_headers",
],
vendor: true,
enabled: false,
arch: {
x86_64: {
enabled: true,
},
},
}
4 changes: 0 additions & 4 deletions Android.mk

This file was deleted.

1 change: 1 addition & 0 deletions LICENSE
87 changes: 87 additions & 0 deletions va/va_version.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/*
* Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#ifndef VA_VERSION_H
#define VA_VERSION_H

/**
* VA_MAJOR_VERSION:
*
* The major version of VA-API (1, if %VA_VERSION is 1.2.3)
*/
#define VA_MAJOR_VERSION 1

/**
* VA_MINOR_VERSION:
*
* The minor version of VA-API (2, if %VA_VERSION is 1.2.3)
*/
#define VA_MINOR_VERSION 23

/**
* VA_MICRO_VERSION:
*
* The micro version of VA-API (3, if %VA_VERSION is 1.2.3)
*/
#define VA_MICRO_VERSION 0

/**
* VA_VERSION:
*
* The full version of VA-API, like 1.2.3
*/
#define VA_VERSION 1.23.0

/**
* VA_VERSION_S:
*
* The full version of VA-API, in string form (suited for string
* concatenation)
*/
#define VA_VERSION_S "1.23.0"

/**
* VA_VERSION_HEX:
*
* Numerically encoded version of VA-API, like 0x010203
*/
#define VA_VERSION_HEX ((VA_MAJOR_VERSION << 24) | \
(VA_MINOR_VERSION << 16) | \
(VA_MICRO_VERSION << 8))

/**
* VA_CHECK_VERSION:
* @major: major version, like 1 in 1.2.3
* @minor: minor version, like 2 in 1.2.3
* @micro: micro version, like 3 in 1.2.3
*
* Evaluates to %TRUE if the version of VA-API is greater than
* @major, @minor and @micro
*/
#define VA_CHECK_VERSION(major,minor,micro) \
(VA_MAJOR_VERSION > (major) || \
(VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION > (minor)) || \
(VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION == (minor) && VA_MICRO_VERSION >= (micro)))

#endif /* VA_VERSION_H */

0 comments on commit c2fc072

Please sign in to comment.