epm play yandex-browser: update codecs using vendor script (eterbug #18556) (#478)

pack.d/yandex-browser-beta-codecs-ffmpeg-extra.sh

-yandex-browser-stable-codecs-ffmpeg-extra.sh
\ No newline at end of file

pack.d/yandex-browser-beta-codecs-ffmpeg-extra.sh

+#!/bin/sh -x
+
+TAR="$1"
+RETURNTARNAME="$2"
+VERSION="$3"
+FFMPEG_PATH="$5"
+
+. $(dirname $0)/common.sh
+
+YANDEX_PATH="opt/yandex/browser-beta"
+
+epm assure unsquashfs squashfs-tools || fatal
+a= unsquashfs $TAR || fatal
+
+[ -n "$FFMPEG_PATH" ] || fatal "Missing FFMPEG_PATH"
+chmod 0644 "squashfs-root/$FFMPEG_PATH"
+mkdir -p "$YANDEX_PATH"
+cp "squashfs-root/$FFMPEG_PATH" "$YANDEX_PATH/"
+
+PKGNAME=$PRODUCT-$VERSION.tar
+
+erc a $PKGNAME opt
+
+return_tar $PKGNAME

pack.d/yandex-browser-stable-codecs-ffmpeg-extra.sh

 #!/bin/sh -x
 
-UPDATEFFMPEG="$1"
+TAR="$1"
 RETURNTARNAME="$2"
+VERSION="$3"
+FFMPEG_PATH="$5"
 
 . $(dirname $0)/common.sh
 
-[ -x "$UPDATEFFMPEG" ] || fatal "$UPDATEFFMPEG is missed"
-
-CURDIR=$(pwd)
-PRODUCTDIR="$(dirname "$UPDATEFFMPEG")"
-BASEPKGNAME=yandex-browser-stable
-
-if echo "$PRODUCT" | grep -q "yandex-browser-beta" ; then
-    BASEPKGNAME=yandex-browser-beta
-elif echo "$PRODUCT" | grep -q "yandex-browser-corporate" ; then
-    BASEPKGNAME=yandex-browser-corporate
-fi
-
-# used in update-ffmpeg
-epm install --skip-installed jq tar binutils || exit
-
-# install ffmpeg extra codecs
-pack_ffmpeg() {
-  SOURCE="usr/lib/chromium-browser/libffmpeg.so"
-  DEST="$PRODUCTDIR"
-  mkdir -p .$DEST
-  cp $SOURCE .$DEST
-  CNAME="$CURDIR/$(echo "$(basename $SUITABLE_URLS)" | sed -e "s|chromium|$BASEPKGNAME|" -e "s|-[0-9]*ubuntu.*|-1.tar|")" #"
-  a='' tar cf $CNAME .$(dirname $DEST)
-  return_tar $CNAME
-  # exit from update-ffmpeg script here
-  exit
-}
-
-URL="https://browser-resources.s3.yandex.net/linux/codecs.json"
-
-# download ffmpeg with upstream script update-ffmpeg but with our pack_ffmpeg function
-SC=tmp_updateffmpeg
-sed -e 's|install_ffmpeg &&|pack_ffmpeg \&\&|' \
-    -e 's|wget -q-O|epm tool eget -q -O|' \
-    -e 's|wget -O|epm tool eget -O |' \
-    -e "s|CODECS_JSON_URL='https://browser-resources.s3.yandex.net/linux/codecs.json'|CODECS_JSON_URL='$URL'|" < $UPDATEFFMPEG > $SC
-. $SC
+YANDEX_PATH="opt/yandex/browser"
 
+epm assure unsquashfs squashfs-tools || fatal
+a= unsquashfs $TAR || fatal
+
+[ -n "$FFMPEG_PATH" ] || fatal "Missing FFMPEG_PATH"
+chmod 0644 "squashfs-root/$FFMPEG_PATH"
+mkdir -p "$YANDEX_PATH"
+cp "squashfs-root/$FFMPEG_PATH" "$YANDEX_PATH/"
+
+PKGNAME=$PRODUCT-$VERSION.tar
+
+erc a $PKGNAME opt
+
+return_tar $PKGNAME

play.d/yandex-browser-beta-codecs-ffmpeg-extra.sh

+yandex-browser-stable-codecs-ffmpeg-extra.sh
\ No newline at end of file

play.d/yandex-browser-corporate-codecs-ffmpeg-extra.sh

+yandex-browser-stable-codecs-ffmpeg-extra.sh
\ No newline at end of file

play.d/yandex-browser-stable-codecs-ffmpeg-extra.sh

+#!/bin/sh
+
+PKGNAME="$(basename $0 .sh)"
+SUPPORTEDARCHES="x86_64"
+DESCRIPTION=''
+URL="https://browser-resources.s3.yandex.net/linux/codecs_snap.json"
+
+. $(dirname $0)/common.sh
+
+CODECS_JSON="https://browser-resources.s3.yandex.net/linux/codecs_snap.json"
+JSON=$(curl -s "$CODECS_JSON")
+VERSION=$(echo "$JSON" | grep -o '"[0-9]\+":' | tr -d '"' | tr -d ':' | tail -n1)
+FFMPEG_PATH=$(echo "$JSON" | awk -v rev="$VERSION" '
+    $0 ~ "\""rev"\"" {found=1; next}
+    found && /"path"/ {gsub(/.*: *"|",?$/, ""); print; exit}
+')
+PKGURL=$(echo "$JSON" | awk -v rev="$VERSION" '
+    $0 ~ "\""rev"\"" {found=1; next}
+    found && /"url"/ {gsub(/.*: *"|",?$/, ""); print; exit}
+')
+
+install_pack_pkgurl "$VERSION" "$FFMPEG_PATH"

play.d/yandex-browser.sh

@@ -32,12 +32,4 @@ fi
 
 install_pkgurl
 
-# TODO: use needed version
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install ffmpeg-plugin-browser
-    exit
-else
-    epm play nwjs-ffmpeg-prebuilt=0.87.0
-    exit
-fi
-
+epm play $PKGNAME-codecs-ffmpeg-extra

repack.d/yandex-browser-beta.sh

@@ -33,3 +33,4 @@ add_chromium_deps
 fix_desktop_file /usr/bin/$PRODUCTCUR
 
 chmod a-x .$PRODUCTDIR/update-ffmpeg
+chmod a-x .$PRODUCTDIR/update_codecs

repack.d/yandex-browser-corporate.sh

@@ -33,3 +33,4 @@ add_chromium_deps
 fix_desktop_file /usr/bin/$PRODUCTCUR
 
 chmod a-x .$PRODUCTDIR/update-ffmpeg
+chmod a-x .$PRODUCTDIR/update_codecs

repack.d/yandex-browser-stable.sh

@@ -33,3 +33,4 @@ add_chromium_deps
 fix_desktop_file /usr/bin/$PRODUCTCUR
 
 chmod a-x .$PRODUCTDIR/update-ffmpeg
+chmod a-x .$PRODUCTDIR/update_codecs