[Libva] [libva-intel-driver PATCH] Fix the build on Android
Xiang, Haihao
haihao.xiang at intel.com
Thu Apr 30 00:55:40 PDT 2015
From: "Xiang, Haihao" <haihao.xiang at intel.com>
Signed-off-by: Xiang, Haihao <haihao.xiang at intel.com>
---
build/gen_version.sh | 65 +++++++++++++++++++++++++++++++++++++
src/Android.mk | 87 +++++++++++++++++++++++++++++++-------------------
2 files changed, 120 insertions(+), 32 deletions(-)
create mode 100644 build/gen_version.sh
diff --git a/build/gen_version.sh b/build/gen_version.sh
new file mode 100644
index 0000000..fe23539
--- /dev/null
+++ b/build/gen_version.sh
@@ -0,0 +1,65 @@
+# Copyright (c) 2015 Intel Corporation. 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.
+
+#!/bin/sh
+
+top_srcdir="$1"
+srcdir="$2"
+
+# git version
+VERSION_FILE=".VERSION"
+OLD_VERSION_FILE=$VERSION_FILE.old
+NEW_VERSION_FILE=$VERSION_FILE.new
+PKG_VERSION_FILE=$VERSION_FILE.pkg
+HAVE_GIT=0;
+
+check_git() {
+ git --version 2>&1 /dev/null
+ if [ $? -eq "0" ]; then
+ HAVE_GIT=1
+ else
+ HAVE_GIT=0;
+ fi
+}
+
+gen_version() {
+ echo $VERSION > $NEW_VERSION_FILE
+ if [ $HAVE_GIT -eq "1" ]; then
+ [ -d $top_srcdir/.git ] && \
+ (cd $top_srcdir && git describe --tags) > $NEW_VERSION_FILE || :
+ fi
+ [ -f $srcdir/$PKG_VERSION_FILE ] && \
+ cp -f $srcdir/$PKG_VERSION_FILE $NEW_VERSION_FILE || :
+}
+
+check_git;
+gen_version;
+
+OV=`[ -f $OLD_VERSION_FILE ] && cat $OLD_VERSION_FILE || :`;
+NV=`cat $NEW_VERSION_FILE`;
+if [ "$$OV" != "$$NV" -o ! -f intel_version.h ]; then
+ cp -f $NEW_VERSION_FILE $OLD_VERSION_FILE;
+ echo "Replace"
+ sed -e "s|\@INTEL_DRIVER_GIT_VERSION\@|$NV|" \
+ $srcdir/intel_version.h.in > $srcdir/intel_version.h;
+fi
+
diff --git a/src/Android.mk b/src/Android.mk
index e8f8696..ab06bb3 100755
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -27,38 +27,61 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
- gen6_mfc_common.c \
- gen6_mfc.c \
- gen6_mfd.c \
- gen6_vme.c \
- gen7_mfd.c \
- gen7_mfc.c \
- gen7_vme.c \
- gen75_mfc.c \
- gen75_mfd.c \
- gen75_vme.c \
- gen75_picture_process.c \
- gen75_vpp_vebox.c \
- gen75_vpp_gpe.c \
- i965_avc_bsd.c \
- i965_avc_hw_scoreboard.c\
- i965_avc_ildb.c \
- i965_decoder_utils.c \
- i965_drv_video.c \
- i965_encoder.c \
- i965_encoder_utils.c \
- i965_gpe_utils.c \
- i965_media.c \
- i965_media_h264.c \
- i965_media_mpeg2.c \
- i965_post_processing.c \
- i965_render.c \
- intel_media_common.c \
- intel_batchbuffer.c \
- intel_batchbuffer_dump.c\
- intel_driver.c \
- intel_memman.c \
- object_heap.c
+ dso_utils.c \
+ gen6_mfc.c \
+ gen6_mfc_common.c \
+ gen6_mfd.c \
+ gen6_vme.c \
+ gen7_vme.c \
+ gen7_mfc.c \
+ gen7_mfd.c \
+ gen75_mfd.c \
+ gen75_mfc.c \
+ gen8_mfc.c \
+ gen8_mfd.c \
+ gen8_vme.c \
+ gen9_vme.c \
+ gen9_mfc.c \
+ gen9_mfc_hevc.c \
+ gen9_mfd.c \
+ gen75_picture_process.c \
+ gen75_vme.c \
+ gen75_vpp_gpe.c \
+ gen75_vpp_vebox.c \
+ gen9_post_processing.c \
+ i965_avc_bsd.c \
+ i965_avc_hw_scoreboard.c\
+ i965_avc_ildb.c \
+ i965_decoder_utils.c \
+ i965_device_info.c \
+ i965_drv_video.c \
+ i965_encoder.c \
+ i965_encoder_utils.c \
+ i965_media.c \
+ i965_media_h264.c \
+ i965_media_mpeg2.c \
+ i965_gpe_utils.c \
+ i965_post_processing.c \
+ gen8_post_processing.c \
+ i965_render.c \
+ i965_vpp_avs.c \
+ gen8_render.c \
+ gen9_render.c \
+ intel_batchbuffer.c \
+ intel_batchbuffer_dump.c\
+ intel_driver.c \
+ intel_memman.c \
+ object_heap.c \
+ intel_media_common.c \
+ $(NULL)
+
+GEN := $(LOCAL_PATH)/intel_version.h
+$(GEN): SCRIPT := $(LOCAL_PATH)/../build/gen_version.sh
+$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN): PRIVATE_CUSTOM_TOOL = sh $(SCRIPT) $(PRIVATE_PATH)/.. $(PRIVATE_PATH) > $@
+$(GEN): $(LOCAL_PATH)/%.h : $(LOCAL_PATH)/%.h.in $(SCRIPT)
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
LOCAL_CFLAGS := -DLINUX -DANDROID -g -Wall -Wno-unused -fvisibility=hidden
--
1.7.9.5
More information about the Libva
mailing list