diff options
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | 2018-05-31 18:51:54 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2018-06-29 12:20:37 +0800 |
| commit | 81af6318f83769472a444fe4eb08fa88cb4c927d (patch) | |
| tree | f15739065f4e0b8f1e0262f8bc5d33898182d6a9 | |
| parent | 586b4a09506b0cdf6672c35a40c975bcb0b67006 (diff) | |
| download | libva-intel-driver-81af6318f83769472a444fe4eb08fa88cb4c927d.tar.gz | |
android: get vaapi version from configure.ac
Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
| -rw-r--r-- | src/Android.mk | 15 | ||||
| -rw-r--r-- | src/config_android.h.in (renamed from src/config_android.h) | 22 |
2 files changed, 32 insertions, 5 deletions
diff --git a/src/Android.mk b/src/Android.mk index 88c8bce6..008d5b23 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -38,6 +38,21 @@ LOCAL_PROPRIETARY_MODULE := true intermediates := $(call local-generated-sources-dir) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) + +GEN := $(intermediates)/config_android.h +$(GEN): SCRIPT := $(LOCAL_PATH)/../build/gen_version.sh +$(GEN): PRIVATE_CUSTOM_TOOL = \ + eval $$(sed -n "/^m4_define.*\(intel_vaapi_driver_.*_version\).*\[\([0-9]*\)\].*/s//\1=\2;/p" $(word 2,$^)); \ + sed -e "s/\(define INTEL_DRIVER_MAJOR_VERSION\)\(.*\)/\1 $$intel_vaapi_driver_major_version/; \ + s/\(define INTEL_DRIVER_MINOR_VERSION\)\(.*\)/\1 $$intel_vaapi_driver_minor_version/; \ + s/\(define INTEL_DRIVER_MICRO_VERSION\)\(.*\)/\1 $$intel_vaapi_driver_micro_version/; \ + s/\(define INTEL_DRIVER_PRE_VERSION\)\(.*\)/\1 $$intel_vaapi_driver_pre_version/" \ + $< > $@ +$(GEN): $(intermediates)/%.h : $(LOCAL_PATH)/%.h.in $(LOCAL_PATH)/../configure.ac + $(transform-generated-source) +LOCAL_GENERATED_SOURCES := $(GEN) + GEN := $(intermediates)/intel_version.h $(GEN): $(LOCAL_PATH)/intel_version.h.in $(wildcard $(LOCAL_PATH)/../.git/logs/HEAD) @echo "Generating: $@ <= git"; mkdir -p $(@D) diff --git a/src/config_android.h b/src/config_android.h.in index 63fbb82d..77203942 100644 --- a/src/config_android.h +++ b/src/config_android.h.in @@ -66,17 +66,29 @@ /* Define to the full name of this package. */ #define PACKAGE_NAME "intel_driver" -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "intel_driver 1.0.16.pre1" - /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libva-driver-intel" /* Define to the home page for this package. */ #define PACKAGE_URL "" +#define VER_CAT_NX(A, B, C, D) A ## . ## B ## . ## C ## D +#define VER_CAT(A, B, C, D) VER_CAT_NX(A, B, C, D) +#define STRINGIZE_NX(A) #A +#define STRINGIZE(A) STRINGIZE_NX(A) +#if INTEL_DRIVER_PRE_VERSION > 0 +#define PRE_VER_CAT_NX(A) .pre ## A +#define PRE_VER_CAT(A) PRE_VER_CAT_NX(A) +#define INTEL_DRIVER_PRE_VER_SUFFIX PRE_VER_CAT(INTEL_DRIVER_PRE_VERSION) +#else +#define INTEL_DRIVER_PRE_VER_SUFFIX +#endif + /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.0.16.pre1" +#define PACKAGE_VERSION STRINGIZE(VER_CAT(INTEL_DRIVER_MAJOR_VERSION, INTEL_DRIVER_MINOR_VERSION, INTEL_DRIVER_MICRO_VERSION, INTEL_DRIVER_PRE_VER_SUFFIX)) + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -90,7 +102,7 @@ #define VA_DRIVER_INIT_FUNC VA_CAT(VA_MAJOR_VERSION, VA_MINOR_VERSION) /* Version number of package */ -#define VERSION "1.0.16.pre1" +#define VERSION PACKAGE_VERSION /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ |