diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 46 | ||||
| -rw-r--r-- | intel-media-stack-bin-fix-install.patch | 66 |
3 files changed, 88 insertions, 36 deletions
@@ -1,6 +1,6 @@ pkgbase = intel-media-stack-bin pkgdesc = Tools and libraries for developing media solutions on Intel products. Includes MediaSDK, Media Driver, libva and libva-utils. - pkgver = 2018.3.1 + pkgver = 2018.4.1 pkgrel = 1 url = https://github.com/Intel-Media-SDK/MediaSDK/ install = intel-media-stack-bin.install @@ -23,17 +23,19 @@ pkgbase = intel-media-stack-bin provides = libva provides = libva-utils conflicts = intel-media-sdk - noextract = intel-media-stack-bin-2018.3.1.tar.gz + noextract = intel-media-stack-bin-2018.4.1.tar.gz options = !strip options = !emptydirs backup = etc/profile.d/intel-mediasdk-devel.sh backup = etc/profile.d/intel-mediasdk-devel.csh backup = etc/profile.d/intel-mediasdk.sh backup = etc/profile.d/intel-mediasdk.csh - source = intel-media-stack-bin-2018.3.1.tar.gz::https://github.com/Intel-Media-SDK/MediaSDK/releases/download/intel-mediasdk-18.3.1/MediaStack.tar.gz - source = https://raw.githubusercontent.com/Intel-Media-SDK/MediaSDK/intel-mediasdk-18.3.1/LICENSE - sha256sums = 5f09a92be728f3ec9236621a63286fef762973dc99abfd1ce767452c8d9d0035 + source = intel-media-stack-bin-2018.4.1.tar.gz::https://github.com/Intel-Media-SDK/MediaSDK/releases/download/intel-mediasdk-18.4.1/MediaStack.tar.gz + source = https://raw.githubusercontent.com/Intel-Media-SDK/MediaSDK/intel-mediasdk-18.4.1/LICENSE + source = intel-media-stack-bin-fix-install.patch + sha256sums = f053e19fc39d08c35705fadfb90098b2c50b6ac0f37bf89dc18099deb86f93b9 sha256sums = dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 + sha256sums = 2e432be94fb765fad3ea03a65377cbdd57074eb358815f8eb2354635b2f4746d pkgname = intel-media-stack-bin @@ -1,7 +1,7 @@ # Maintainer: Daniel Bermond < gmail-com: danielbermond > pkgname=intel-media-stack-bin -pkgver=2018.3.1 +pkgver=2018.4.1 _srcver="${pkgver:2}" pkgrel=1 pkgdesc='Tools and libraries for developing media solutions on Intel products. Includes MediaSDK, Media Driver, libva and libva-utils.' @@ -20,10 +20,12 @@ backup=('etc/profile.d/intel-mediasdk-devel.sh' options=('!strip' '!emptydirs') install="${pkgname}.install" source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/Intel-Media-SDK/MediaSDK/releases/download/intel-mediasdk-${_srcver}/MediaStack.tar.gz" - "https://raw.githubusercontent.com/Intel-Media-SDK/MediaSDK/intel-mediasdk-${_srcver}/LICENSE") + "https://raw.githubusercontent.com/Intel-Media-SDK/MediaSDK/intel-mediasdk-${_srcver}/LICENSE" + 'intel-media-stack-bin-fix-install.patch') noextract=("${pkgname}-${pkgver}.tar.gz") -sha256sums=('5f09a92be728f3ec9236621a63286fef762973dc99abfd1ce767452c8d9d0035' - 'dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6') +sha256sums=('f053e19fc39d08c35705fadfb90098b2c50b6ac0f37bf89dc18099deb86f93b9' + 'dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6' + '2e432be94fb765fad3ea03a65377cbdd57074eb358815f8eb2354635b2f4746d') prepare() { mkdir -p "${pkgname}-${pkgver}" @@ -31,12 +33,7 @@ prepare() { printf '%s\n' " -> Extracting ${pkgname}-${pkgver}.tar.gz with bsdtar..." bsdtar -xf "${srcdir}/${pkgname}-${pkgver}.tar.gz" -s'|[^/]*/||' - sed -i "s|/\\$|${pkgdir}/\\$|g" install_media.sh - sed -i "s|/etc|${pkgdir}/etc|g" install_media.sh - sed -i '/ldconfig/s/^/#/g' install_media.sh - - sed -i 's/[[:space:]]Please[[:space:]]reboot[[:space:]]to[[:space:]]make[[:space:]]it[[:space:]]effective\.//' install_media.sh - sed -i 's/[[:space:]]Please[[:space:]]Reboot\.//' install_media.sh + patch -Np1 -i "${srcdir}/intel-media-stack-bin-fix-install.patch" } package() { @@ -44,24 +41,14 @@ package() { local _command local _file - local _header mkdir -p "$pkgdir"/{etc/{ld.so.conf.d,profile.d},usr/lib} ./install_media.sh - - # headers (add 'mfx' folder for ffmpeg compatibility) - mkdir -p "${pkgdir}/opt/intel/mediasdk/include/mfx" - cd "${pkgdir}/opt/intel/mediasdk/include" - for _header in *.h - do - cd mfx - ln -sf ../"$_header" "$_header" - cd .. - done + echo "here1" # add bin folder to PATH - for _file in "${pkgdir}/etc/profile.d/"intel-mediasdk.{,c}sh + while read -rd '' _file do if printf '%s' "$_file" | grep -q '\.csh$' then @@ -73,19 +60,16 @@ package() { printf '\n' >> "$_file" printf '%s\n' '# add bin folder to PATH' >> "$_file" printf '%s\n' "${_command} PATH=\${PATH:+\${PATH}:}/opt/intel/mediasdk/bin" >> "$_file" - done - - # move tools to bin folder - mv "$pkgdir"/opt/intel/mediasdk/share/mfx/samples/_bin/x64/{asg-hevc,hevc_fei_extractor} "${pkgdir}/opt/intel/mediasdk/bin" + done < <(find "${pkgdir}/etc/profile.d" -maxdepth 1 -mindepth 1 -type f -name 'intel-mediasdk.*sh' -print0) # add symlink for libcttmetrics.so (required by 'metrics_monitor' sample) - ln -s ../share/mfx/samples/_bin/x64/libcttmetrics.so "${pkgdir}/opt/intel/mediasdk/lib64/libcttmetrics.so" + ln -s ../share/mfx/samples/_bin/libcttmetrics.so "${pkgdir}/opt/intel/mediasdk/lib64/libcttmetrics.so" # fix broken symlinks for plugins - rm "${pkgdir}/opt/intel/mediasdk/lib64/mfx" - rm "${pkgdir}/opt/intel/mediasdk/plugins/plugins.cfg" - ln -s ../plugins "${pkgdir}/opt/intel/mediasdk/lib64/mfx" - ln -s ../share/mfx/plugins.cfg "${pkgdir}/opt/intel/mediasdk/plugins/plugins.cfg" + rm -r "${pkgdir}/opt/intel/mediasdk/plugins" + rm "${pkgdir}/opt/intel/mediasdk/lib64/mfx/plugins.cfg" + ln -s lib64/mfx "${pkgdir}/opt/intel/mediasdk/plugins" + ln -s ../../share/mfx/plugins.cfg "${pkgdir}/opt/intel/mediasdk/lib64/mfx/plugins.cfg" # do not force the use of 'iHD' libva driver by default (let user choose) local _info='# uncomment the LIBVA lines bellow to use the Intel Media Driver (iHD) for VAAPI' diff --git a/intel-media-stack-bin-fix-install.patch b/intel-media-stack-bin-fix-install.patch new file mode 100644 index 000000000000..c902fbfba374 --- /dev/null +++ b/intel-media-stack-bin-fix-install.patch @@ -0,0 +1,66 @@ +diff -Naurp a/install_media.sh b/install_media.sh +--- a/install_media.sh 2018-04-05 20:29:26.000000000 +0000 ++++ b/install_media.sh 2019-03-05 13:49:34.000000000 +0000 +@@ -87,10 +87,10 @@ fi + + # Install MSDK + if [ -d $MEDIASDK_DIR ]; then +- try_command rm -fr /$MEDIASDK_DIR +- try_command mkdir -p /$MEDIASDK_DIR +- try_command cp -dfr $MEDIASDK_DIR/* /$MEDIASDK_DIR +- echo -e $ECHO_PREFIX_INFO "MediaSDK installed successfully in /$MEDIASDK_DIR!" ++ try_command rm -fr /storage/linux/abs/intel-media-stack-bin/pkg/intel-media-stack-bin/$MEDIASDK_DIR ++ try_command mkdir -p /storage/linux/abs/intel-media-stack-bin/pkg/intel-media-stack-bin/$MEDIASDK_DIR ++ try_command cp -dfr $MEDIASDK_DIR/* /storage/linux/abs/intel-media-stack-bin/pkg/intel-media-stack-bin/$MEDIASDK_DIR ++ echo -e $ECHO_PREFIX_INFO "MediaSDK installed successfully in /storage/linux/abs/intel-media-stack-bin/pkg/intel-media-stack-bin/$MEDIASDK_DIR!" + else + echo -e $ECHO_PREFIX_ERROR "MediaSDK missed in this package!" + fi +@@ -98,33 +98,33 @@ fi + # Install MDF Runtime + MDF_DIR=opt/intel/common/mdf + if [ -d $MDF_DIR ]; then +- try_command rm -fr /$MDF_DIR +- try_command mkdir -p /$MDF_DIR +- try_command cp -dfr $MDF_DIR/* /$MDF_DIR +- echo -e $ECHO_PREFIX_INFO "MDF Runtime installed successfully in /$MDF_DIR!" ++ try_command rm -fr /storage/linux/abs/intel-media-stack-bin/pkg/intel-media-stack-bin/$MDF_DIR ++ try_command mkdir -p /storage/linux/abs/intel-media-stack-bin/pkg/intel-media-stack-bin/$MDF_DIR ++ try_command cp -dfr $MDF_DIR/* /storage/linux/abs/intel-media-stack-bin/pkg/intel-media-stack-bin/$MDF_DIR ++ echo -e $ECHO_PREFIX_INFO "MDF Runtime installed successfully in /storage/linux/abs/intel-media-stack-bin/pkg/intel-media-stack-bin/$MDF_DIR!" + else + echo -e $ECHO_PREFIX_ERROR "MDF Runtime missed in this package!" + fi + + echo -e $ECHO_PREFIX_INFO "Installing Config files..." + if [ -f etc/profile.d/intel-mediasdk.sh ]; then +- try_command cp -f etc/profile.d/intel-mediasdk.* /etc/profile.d/ +- echo -e $ECHO_PREFIX_INFO "The LIBVA_DRIVERS_PATH/LIBVA_DRIVER_NAME will be exported through /etc/profile.d/intel-mediasdk.(c)sh for intel media solution. Please reboot to make it effective." ++ try_command cp -f etc/profile.d/intel-mediasdk.* /storage/linux/abs/intel-media-stack-bin/pkg/intel-media-stack-bin/etc/profile.d/ ++ echo -e $ECHO_PREFIX_INFO "The LIBVA_DRIVERS_PATH/LIBVA_DRIVER_NAME will be exported through /storage/linux/abs/intel-media-stack-bin/pkg/intel-media-stack-bin/etc/profile.d/intel-mediasdk.(c)sh for intel media solution." + fi + if [ -f etc/profile.d/intel-mediasdk-devel.sh ]; then +- try_command cp -f etc/profile.d/intel-mediasdk-devel.* /etc/profile.d/ ++ try_command cp -f etc/profile.d/intel-mediasdk-devel.* /storage/linux/abs/intel-media-stack-bin/pkg/intel-media-stack-bin/etc/profile.d/ + fi + + # !!! IMPORTANT !!! + # keep below as the final step for UMD installation to avoid +-# 'ldconfig' ++## 'ldconfig' + # missing anything + if [ -d etc/ld.so.conf.d ]; then +- try_command mkdir -p /etc/ld.so.conf.d +- try_command cp -dfr etc/ld.so.conf.d/* /etc/ld.so.conf.d/ +- echo -e $ECHO_PREFIX_INFO "Calling ldconfig after all user-space drivers and config files are in place..." +- try_command ldconfig +- echo -e $ECHO_PREFIX_INFO "Calling to ldconfig is done." ++ try_command mkdir -p /storage/linux/abs/intel-media-stack-bin/pkg/intel-media-stack-bin/etc/ld.so.conf.d ++ try_command cp -dfr etc/ld.so.conf.d/* /storage/linux/abs/intel-media-stack-bin/pkg/intel-media-stack-bin/etc/ld.so.conf.d/ ++# echo -e $ECHO_PREFIX_INFO "Calling ldconfig after all user-space drivers and config files are in place..." ++# try_command ldconfig ++# echo -e $ECHO_PREFIX_INFO "Calling to ldconfig is done." + fi + +-echo -e $ECHO_PREFIX_INFO "Package installation Done. Please Reboot." ++echo -e $ECHO_PREFIX_INFO "Package installation Done." |