Merge pull request #5406 from satmandu/rav1e2

Add proper i686 to rav1e & libavif

packages/libavif.rb

@@ -21,13 +21,13 @@ class Libavif < Package
   binary_sha256({
     aarch64: '1f61a3c2509df65e7206ddc4ac79c5e4328f5f369d59da384c3f76fef87aa287',
      armv7l: '1f61a3c2509df65e7206ddc4ac79c5e4328f5f369d59da384c3f76fef87aa287',
-       i686: 'd519816e462351cb38c44734dd9ce82fc8ed553614ca40a2683e88c710bd15fd',
+       i686: 'e89beabee4674e52e0abbc9db96462a6f2ccbd23db440ac054144c90101601f1',
      x86_64: '639ba89c4a63d68f714bcf1bb56314594bd5eb5e41ba764424a5e115c97ce6c7'
   })
 
   depends_on 'libaom'
   depends_on 'dav1d'
-  depends_on 'rav1e' unless ARCH == 'i686'
+  depends_on 'rav1e'
   depends_on 'svt_av1' if ARCH == 'x86_64'
   depends_on 'libpng'
   depends_on 'libjpeg'
@@ -37,7 +37,6 @@ class Libavif < Package
   depends_on 'gdk_pixbuf' => ':build'
 
   def self.build
-    ARCH == 'i686' ? (@rav1e = 'OFF') : (@rav1e = 'ON')
     ARCH == 'x86_64' ? (@svt = 'ON') : (@svt = 'OFF')
 
     Dir.mkdir 'builddir'
@@ -51,7 +50,7 @@ class Libavif < Package
         -DAVIF_BUILD_APPS=ON \
         -DAVIF_CODEC_AOM=ON \
         -DAVIF_CODEC_DAV1D=ON \
-        -DAVIF_CODEC_RAV1E=#{@rav1e} \
+        -DAVIF_CODEC_RAV1E=ON \
         -DAVIF_CODEC_SVT=#{@svt} \
         -DAVIF_BUILD_GDK_PIXBUF=ON \
         .."

packages/rav1e.rb

@@ -5,18 +5,20 @@ class Rav1e < Package
   homepage 'https://github.com/xiph/rav1e/'
   @_ver = '0.5.0-alpha'
   version @_ver
-  compatibility 'x86_64 aarch64 armv7l'
+  compatibility 'all'
   source_url "https://github.com/xiph/rav1e/archive/v#{@_ver}.tar.gz"
   source_sha256 'fd884fa387d01860eaf22a0a97353525221eb32bf6b9154bbfa21b6cce5988c8'
 
   binary_url({
     aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/rav1e-0.5.0-alpha-chromeos-armv7l.tar.xz',
      armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/rav1e-0.5.0-alpha-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/rav1e-0.5.0-alpha-chromeos-i686.tar.xz',
      x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/rav1e-0.5.0-alpha-chromeos-x86_64.tar.xz'
   })
   binary_sha256({
     aarch64: 'd02192b1152145b31bb1192d79ca40cb722d3c550b7471020e30bfac69448571',
      armv7l: 'd02192b1152145b31bb1192d79ca40cb722d3c550b7471020e30bfac69448571',
+       i686: 'f17b429706232d8cd66e9b3368afd7211966dc23b11f8d448dada93cca8460db',
      x86_64: '2c05f46c0361e5fc0b2e40fbd62561c0383eb2dd2b140a3d77a1fd3fc263a07f'
   })