epm play opera: rewrite, fix other systems install

play.d/opera.sh

@@ -19,27 +19,16 @@ SUPPORTEDARCHES="x86_64"
 
 arch="amd64"
 
-epm play chromium-codecs-ffmpeg-extra || fatal
-
-# Stable branch here for deb too
-if [ "$BRANCH" = "stable" ] ; then
-
-URL="https://ftp.opera.com/pub/opera/desktop/"
-PKGBASEURL="$(epm tool eget --list --latest $URL/*)"linux
-
-if ! check_url_is_accessible $PKGBASEURL ; then
-    PKGBASEURL="$(epm tool eget --list --second-latest $URL/*)"linux
-    check_url_is_accessible $PKGBASEURL || fatal "Can't find Opera package for Linux at $URL"
+# will use libffmpeg.so (via config added in repack)
+epm install --skip-installed ffmpeg-plugin-browser || epm install --skip-installed chromium-codecs-ffmpeg-extra || epm play chromium-codecs-ffmpeg-extra
+
+if [ "$(epm print info -p)" = "rpm" ] ; then
+    # they put all branch here (rpm only): https://rpm.opera.com/rpm/
+    [ "$(epm print info -s)" = "alt" ] && repack='--repack' || repack=''
+    PKGURL="https://rpm.opera.com/rpm/opera_$BRANCH-*-linux-release-x64-signed.rpm"
+    epm install $repack $PKGURL
+    exit
 fi
 
-PKGURL="$(epm tool eget --list --latest $PKGBASEURL "$(epm print constructname $PKGNAME "*" $arch deb)")" || fatal #"
-epm install "$PKGURL" || fatal
-exit
-
-else
-
-# they put all branch here (rpm only): https://rpm.opera.com/rpm/
-[ "$(epm print info -s)" = "alt" ] && repack='--repack' || repack=''
-epm install $repack https://rpm.opera.com/rpm/opera_$BRANCH-*-linux-release-x64-signed.rpm
-
-fi
+PKGURL="https://deb.opera.com/opera-developer/pool/non-free/o/opera-$BRANCH/$(epm print constructname $PKGNAME "*" $arch deb)"
+epm install "$PKGURL"

repack.d/opera-stable.sh

@@ -32,16 +32,24 @@ remove_file $PRODUCTDIR/opera_autoupdate.version
 remove_file $PRODUCTDIR/opera_autoupdate
 remove_file $PRODUCTDIR/setup_repo.sh
 
+#if epm installed ffmpeg-plugin-browser ; then
+#    libffmpeg="$(epm -ql ffmpeg-plugin-browser | grep libfmpeg.so)" || fatal
+#fi
+# test with https://archive.org/details/H265_Test
 cat <<EOF >$BUILDROOT$PRODUCTDIR/resources/ffmpeg_preload_config.json
 [
-  "/opt/chromium-browser/libffmpeg.so"
+  "/usr/lib64/ffmpeg-plugin-browser/libffmpeg.so",
+  "/opt/chromium-browser/libffmpeg.so",
+  "../../../../chromium-ffmpeg/libffmpeg.so",
+  "/usr/lib/chromium-browser/libffmpeg.so",
+  "/usr/lib/chromium-browser/libs/libffmpeg.so"
 ]
 EOF
 
 # alternative way
-mkdir -p $BUILDROOT$PRODUCTDIR/lib_extra/
-ln -s /opt/chromium-browser/libffmpeg.so $BUILDROOT$PRODUCTDIR/lib_extra/libffmpeg.so
-pack_file $PRODUCTDIR/lib_extra/libffmpeg.so
+#mkdir -p $BUILDROOT$PRODUCTDIR/lib_extra/
+#ln -s /opt/chromium-browser/libffmpeg.so $BUILDROOT$PRODUCTDIR/lib_extra/libffmpeg.so
+#pack_file $PRODUCTDIR/lib_extra/libffmpeg.so
 
 #rm -fv $BUILDROOT/usr/bin/$PRODUCTCUR
 add_bin_commands
@@ -55,7 +63,7 @@ for i in $BUILDROOT$PRODUCTDIR/$PRODUCTCUR ; do
     a= patchelf --set-rpath "$PRODUCTDIR/lib_extra:$PRODUCTDIR" $i
 done
 
-subst '1iRequires: chromium-codecs-ffmpeg-extra >= 103' $SPEC
+#subst '1iRequires: chromium-codecs-ffmpeg-extra >= 103' $SPEC
 
 install_deps