Added libva-utils build (Intel-Media-SDK#125)

onabiull · Mar 7, 2019 · 64a85d7 · 64a85d7
1 parent 643a889
commit 64a85d7
Showing 1 changed file with 28 additions and 4 deletions.
diff --git a/conf_libva.py b/conf_libva.py
@@ -23,27 +23,33 @@
 
 
 LIBVA_REPO_NAME = 'libva'
-PRODUCT_CONFIGS_REPO_NAME = 'product-configs'
+LIBVA_UTILS_REPO_NAME = 'libva-utils'
+
 # TODO: get LibVA version from manifest
+# Libva-utils version maps libva version
 LIBVA_VERSION = '2.4.0'
+PRODUCT_CONFIGS_REPO_NAME = 'product-configs'
 
 PRODUCT = LIBVA_REPO_NAME
 
 # Repos_to_extract
 # TODO: get branch, commit_id from Manifest
 PRODUCT_REPOS = [
     {'name': LIBVA_REPO_NAME},
+    {'name': LIBVA_UTILS_REPO_NAME},
     {'name': PRODUCT_CONFIGS_REPO_NAME}
+
 ]
 
+LIBVA_UTILS_BUILD_DIR = options["BUILD_DIR"] / LIBVA_UTILS_REPO_NAME
+
 ENABLE_DEVTOOLSET = 'source /opt/rh/devtoolset-6/enable'
 # Workaround to run fpm tool on CentOS 6.9
 ENABLE_RUBY24 = 'source /opt/rh/rh-ruby24/enable'
 GCC_LATEST = '8.2.0'
 CLANG_VERSION = '6.0'
 options["STRIP_BINARIES"] = True
 
-
 # Create dir for Fake pkgconfig
 options["LIBVA_PKG_DIR"] = options["BUILD_DIR"] / "libva_pkgconfig"
 
@@ -59,6 +65,8 @@
 }
 
 LIBVA_REPO_DIR = options.get('REPOS_DIR') / LIBVA_REPO_NAME
+LIBVA_UTILS_REPO_DIR = options.get('REPOS_DIR') / LIBVA_UTILS_REPO_NAME
+
 
 #TODO: add more smart logic or warnings?! (potential danger zone)
 def get_building_cmd(command, gcc_latest, enable_devtoolset):
@@ -88,6 +96,21 @@ def get_building_cmd(command, gcc_latest, enable_devtoolset):
        work_dir=options['BUILD_DIR'],
        cmd=get_building_cmd(f'make DESTDIR={options["INSTALL_DIR"]} install', GCC_LATEST, ENABLE_DEVTOOLSET))
 
+# Build libva-utils
+action('libva-utils: autogen.sh',
+       work_dir=LIBVA_UTILS_BUILD_DIR,
+       cmd=get_building_cmd(f'{LIBVA_UTILS_REPO_DIR}/autogen.sh', GCC_LATEST, ENABLE_DEVTOOLSET))
+
+action('libva-utils: make',
+       work_dir=LIBVA_UTILS_BUILD_DIR,
+       cmd=get_building_cmd(f'make -j`nproc`', GCC_LATEST, ENABLE_DEVTOOLSET))
+
+action('libva-utils: make install',
+       stage=stage.INSTALL,
+       work_dir=LIBVA_UTILS_BUILD_DIR,
+       cmd=get_building_cmd(f'make DESTDIR={options["INSTALL_DIR"]} install', GCC_LATEST, ENABLE_DEVTOOLSET))
+
+
 # Create fake LibVA pkgconfigs to build MediaSDK from custom location
 pkgconfig_pattern = {'^prefix=.+': f'prefix={options["INSTALL_DIR"] / LIBVA_DEB_PREFIX.relative_to(LIBVA_DEB_PREFIX.root)}'}
 
@@ -116,6 +139,7 @@ def get_building_cmd(command, gcc_latest, enable_devtoolset):
 LIBVA_PACK_DIRS = [
     f'{pack_dir}/lib/={lib_install_to}/',
     f'{pack_dir}/include/={include_install_to}/include',
+    f'{pack_dir}/bin/={include_install_to}/bin',
 ]
 
 action('LibVA: create deb pkg',
@@ -141,6 +165,7 @@ def get_building_cmd(command, gcc_latest, enable_devtoolset):
 LIBVA_PACK_DIRS = [
     f'{pack_dir}/lib/={lib_install_to}/',
     f'{pack_dir}/include/={include_install_to}/include',
+    f'{pack_dir}/bin/={include_install_to}/bin',
 ]
 
 action('LibVA: create rpm pkg',
@@ -149,13 +174,12 @@ def get_building_cmd(command, gcc_latest, enable_devtoolset):
        cmd=get_packing_cmd('rpm', LIBVA_PACK_DIRS, ENABLE_RUBY24, LIBVA_VERSION, LIBVA_REPO_NAME))
 
 
-
 INSTALL_PKG_DATA_TO_ARCHIVE.extend([
     {
         'from_path': options['INSTALL_DIR'],
         'relative': [
             {
-                'path': 'usr'
+                'path': 'usr',
             }
         ]
     },