Remove libav and libfdkaac (licensing issues) (#3121)

Use ffmpeg instead (conflicting files anyway)

Update alsa_lib and alsa_plugins with more features,
including ffmpeg and Python support

Removes entry for libfdkaac in tools/packages.yaml,
no references wanted in project

packages/alsa_lib.rb

@@ -3,29 +3,29 @@ require 'package'
 class Alsa_lib < Package
   description 'The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI functionality to the Linux operating system.'
   homepage 'https://www.alsa-project.org/main/index.php/Main_Page'
-  version '1.1.7'
-  source_url 'ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.1.7.tar.bz2'
-  source_sha256 '9d6000b882a3b2df56300521225d69717be6741b71269e488bb20a20783bdc09'
+  version '1.1.8'
+  source_url 'ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.1.8.tar.bz2'
+  source_sha256 '3cdc3a93a6427a26d8efab4ada2152e64dd89140d981f6ffa003e85be707aedf'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/alsa_lib-1.1.7-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/alsa_lib-1.1.7-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/alsa_lib-1.1.7-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/alsa_lib-1.1.7-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: '4b382a9eaed1d08d1c7ba1906a4b155476c691c9ee1d8f9852af655a933b3c59',
-     armv7l: '4b382a9eaed1d08d1c7ba1906a4b155476c691c9ee1d8f9852af655a933b3c59',
-       i686: 'cb22d0641935cc10dcf4d01838e2eed3a8e8f690b1ccb0741da87336fa29a43b',
-     x86_64: '0e5b6e000aedc2ffc9264eb62bf0afb03e06a86a7803c6105489758b14e822f5',
   })
 
+  depends_on 'python3'
+
   def self.build
-    system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}"
-    system "make"
+    system './configure',
+           '--without-debug',
+           '--enable-mixer-pymods',
+           "--prefix=#{CREW_PREFIX}",
+           "--libdir=#{CREW_LIB_PREFIX}"
+           '--with-pythonlibs=-lpython3.7m'
+           "--with-pythonincludes=-I#{CREW_PREFIX}/include/python3.7m"
+    system 'make'
   end
 
   def self.install
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
   end
 end

packages/alsa_plugins.rb

@@ -3,35 +3,26 @@ require 'package'
 class Alsa_plugins < Package
   description 'alsa-plugins contains plugins for various ALSA needs (e.g. Jack).'
   homepage 'https://www.alsa-project.org/main/index.php/Main_Page'
-  version '1.1.7-2'
-  source_url 'ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.1.7.tar.bz2'
-  source_sha256 'a74b405ab6d9e346e6908a853d5e7631cc61038d9b265bc7f37fab16e827da47'
+  version '1.1.8'
+  source_url 'ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.1.8.tar.bz2'
+  source_sha256 '7f77df171685ccec918268477623a39db4d9f32d5dc5e76874ef2467a2405994'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/alsa_plugins-1.1.7-2-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/alsa_plugins-1.1.7-2-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/alsa_plugins-1.1.7-2-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/alsa_plugins-1.1.7-2-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: '9b287b4d7c2252ce45f7ac08fe8b123fd14c538c83f03fedf9a9af6cc3c14c49',
-     armv7l: '9b287b4d7c2252ce45f7ac08fe8b123fd14c538c83f03fedf9a9af6cc3c14c49',
-       i686: 'e8358822e27b9825cb8d115d197514ca4af5a97e4273b8266a0b9b64bbc2865a',
-     x86_64: 'b8356d2d759e7d5079e36840f200dfde01c786a53b6f7f7ab2355734afe7acaa',
   })
 
+  depends_on 'dbus'
+  depends_on 'ffmpeg'
+  depends_on 'speexdsp'
   depends_on 'alsa_lib'
-  depends_on 'libav'
   depends_on 'pulseaudio'
 
   def self.build
     system './configure',
            "--prefix=#{CREW_PREFIX}",
            "--libdir=#{CREW_LIB_PREFIX}",
-           '--disable-maintainer-mode'
-    system "for f in \$(find . -name Makefile); do
-            sed -i 's,/etc/alsa,#{CREW_PREFIX}/etc/alsa,g' \$f
-            sed -i 's,/usr/local,#{CREW_PREFIX},g' \$f; done"
+           "--with-alsalconfdir=#{CREW_PREFIX}/etc/alsa/conf.d"
     system 'make'
   end
 

packages/ffmpeg.rb

@@ -3,81 +3,74 @@ require 'package'
 class Ffmpeg < Package
   description 'A complete, cross-platform solution to record, convert and stream audio and video.'
   homepage 'https://ffmpeg.org/'
-  version '4.1'
+  version '4.1-1'
   source_url 'https://ffmpeg.org/releases/ffmpeg-4.1.tar.xz'
   source_sha256 'a38ec4d026efb58506a99ad5cd23d5a9793b4bf415f2c4c2e9c1bb444acd1994'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/ffmpeg-4.1-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/ffmpeg-4.1-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/ffmpeg-4.1-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/ffmpeg-4.1-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: 'd480cd8f729607f54029425d63adde1c67b83fb14fe815887354aa9077bb48d3',
-     armv7l: 'd480cd8f729607f54029425d63adde1c67b83fb14fe815887354aa9077bb48d3',
-       i686: '1b22147d3cc89bcd4fae816495f38a74556f5b45aaaf107ca77e09d56980ceda',
-     x86_64: '84dd40e9f141b6fe15915e0e3ff9a42450281d82d69b11da2d86a403fc27ce48',
   })
 
-  depends_on 'gnutls'
-  depends_on 'libass'
-  depends_on 'libfdkaac'
-  depends_on 'libfrei0r'
-  depends_on 'libmp3lame'
   depends_on 'libopencoreamr'
-  depends_on 'libopus'
-  depends_on 'libsoxr'
-  depends_on 'libtheora'
   depends_on 'libvoamrwbenc'
+  depends_on 'libmp3lame'
+  depends_on 'libfrei0r'
+  depends_on 'libtheora'
   depends_on 'libvorbis'
+  depends_on 'xorg_lib'
+  depends_on 'openjpeg'
+  depends_on 'rtmpdump'
+  depends_on 'libvdpau'
+  depends_on 'vidstab'
+  depends_on 'libopus'
+  depends_on 'libsoxr'
   depends_on 'libwebp'
   depends_on 'libx264'
   depends_on 'libx265'
   depends_on 'libxvid'
-  depends_on 'openjpeg'
-  depends_on 'rtmpdump'
+  depends_on 'libdrm'
+  depends_on 'gnutls'
+  depends_on 'libass'
+  depends_on 'libva'
   depends_on 'speex'
-  depends_on 'vidstab'
+  depends_on 'nasm' => :build
 
   def self.build
-    system "TMPDIR=#{CREW_BREW_DIR} ./configure \
-             --prefix=#{CREW_PREFIX} \
-             --libdir=#{CREW_LIB_PREFIX} \
-             --arch=#{ARCH} \
-             --enable-gpl \
-             --enable-nonfree \
-             --enable-version3 \
-             --enable-shared \
-             --disable-debug \
-             --disable-ffplay \
-             --disable-indev=sndio \
-             --disable-outdev=sndio \
-             --enable-fontconfig \
-             --enable-frei0r \
-             --enable-gnutls \
-             --enable-gray \
-             --enable-libass \
-             --enable-libfdk-aac \
-             --enable-libfontconfig \
-             --enable-libfreetype \
-             --enable-libfribidi \
-             --enable-libmp3lame \
-             --enable-libopencore-amrnb \
-             --enable-libopencore-amrwb \
-             --enable-libopenjpeg \
-             --enable-libopus \
-             --enable-librtmp \
-             --enable-libsoxr \
-             --enable-libspeex \
-             --enable-libtheora \
-             --enable-libvidstab \
-             --enable-libvo-amrwbenc \
-             --enable-libvorbis \
-             --enable-libwebp \
-             --enable-libx264 \
-             --enable-libx265 \
-             --enable-libxvid"
+    system 'env',
+           "TMPDIR=#{CREW_BREW_DIR}",
+           './configure',
+           "--libdir=#{CREW_LIB_PREFIX}",
+           '--enable-libopencore-amrnb',
+           '--enable-libopencore-amrwb',
+           "--prefix=#{CREW_PREFIX}",
+           '--enable-libvo-amrwbenc',
+           '--enable-libfontconfig',
+           '--enable-libopenjpeg',
+           '--enable-libfreetype',
+           '--enable-libvidstab',
+           '--enable-libfribidi',
+           '--enable-libmp3lame',
+           '--enable-fontconfig',
+           '--enable-libtheora',
+           '--enable-libvorbis',
+           '--enable-version3',
+           '--enable-libspeex',
+           '--enable-libopus',
+           '--enable-librtmp',
+           '--enable-libsoxr',
+           '--enable-libwebp',
+           '--enable-libx264',
+           '--enable-libx265',
+           '--enable-libxvid',
+           '--enable-shared',
+           '--disable-debug',
+           '--enable-frei0r',
+           '--enable-gnutls',
+           '--enable-libass',
+           "--arch=#{ARCH}',
+           '--enable-gray',
+           '--enable-gpl'
   end
 
   def self.install

packages/libav.rb

-require 'package'
-
-class Libav < Package
-  description 'Libav provides cross-platform tools and libraries to convert, manipulate and stream a wide range of multimedia formats and protocols.'
-  homepage 'https://www.libav.org/'
-  version '12.3-1'
-  source_url 'https://libav.org/releases/libav-12.3.tar.xz'
-  source_sha256 '6893cdbd7bc4b62f5d8fd6593c8e0a62babb53e323fbc7124db3658d04ab443b'
-
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libav-12.3-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libav-12.3-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/libav-12.3-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libav-12.3-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    aarch64: '31dda6c353eab2c8a9671fc1b22634f4dcc7fe8717fdbe9ec4581909f890fe1f',
-     armv7l: '31dda6c353eab2c8a9671fc1b22634f4dcc7fe8717fdbe9ec4581909f890fe1f',
-       i686: '23af5d635117763e3a73c952277bb92f80f968605419fdc0e7d5fee6bfe91f52',
-     x86_64: '96dd6d0c2b586c24c886896e98c7e4c13d7422655fc796b3beb7b5131f8d5a8b',
-  })
-
-  depends_on 'nasm'
-
-  def self.build
-    system "TMPDIR=#{CREW_PREFIX}/tmp \
-           ./configure \
-           --prefix=#{CREW_PREFIX} \
-           --libdir=#{CREW_LIB_PREFIX} \
-           --shlibdir=#{CREW_LIB_PREFIX} \
-           --disable-static \
-           --enable-shared"
-    system 'make'
-  end
-
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
-  end
-end

packages/libfdkaac.rb

-require 'package'
-
-class Libfdkaac < Package
-  description 'A standalone library of the Fraunhofer FDK AAC code from Android.'
-  homepage 'https://github.com/mstorsjo/fdk-aac/'
-  version '0.1.6'
-  source_url 'https://github.com/mstorsjo/fdk-aac/archive/v0.1.6.tar.gz'
-  source_sha256 'adbcd793e406e1b88b3c1c41382d49f8c27371485b823c0fdab69c9124fd2ce3'
-
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libfdkaac-0.1.6-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libfdkaac-0.1.6-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/libfdkaac-0.1.6-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libfdkaac-0.1.6-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    aarch64: 'c75efa60c7bc827c5d14705ae4c16d22e880b748663320259118327d185b3732',
-     armv7l: 'c75efa60c7bc827c5d14705ae4c16d22e880b748663320259118327d185b3732',
-       i686: '646ee23c1ee24c7d7db11233c967c3bae3b0edef29bdb1d741fb4bcb5f563931',
-     x86_64: '6647c1bd76d4ae09c998816512be25d7b3669c1a99fb2959246102a46917ca07',
-  })
-
-  def self.build
-    system "./autogen.sh"
-    system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}"
-    system "make"
-  end
-
-  def self.install
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
-  end
-end

tools/packages.yaml

@@ -1734,11 +1734,6 @@ url: http://www.exiv2.org/builds/
 activity: none
 ---
 kind: url
-name: libfdkaac
-url: https://github.com/mstorsjo/fdk-aac/releases
-activity: low
----
-kind: url
 name: libffi
 url: http://sourceware.org/pub/libffi
 activity: none