Fix merge conflict with rtmpdump.rb

packages/acpi.rb

+require 'package'
+
+class Acpi < Package
+  description 'Attempts to replicate the functionality of the \'old\' apm command on ACPI systems, including battery and thermal information.'
+  homepage 'https://sourceforge.net/projects/acpiclient/'
+  version '1.7'
+  #compatibility 'all'
+  source_url 'https://downloads.sourceforge.net/project/acpiclient/acpiclient/1.7/acpi-1.7.tar.gz'
+  source_sha256 'd7a504b61c716ae5b7e81a0c67a50a51f06c7326f197b66a4b823de076a35005'
+
+  binary_url ({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/acpi-1.7-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/acpi-1.7-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/acpi-1.7-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/acpi-1.7-chromeos-x86_64.tar.xz',
+  })
+  binary_sha256 ({
+    aarch64: '86f608f45ef9c7d423f26f4b1a268e7b995061e1ecb613bf3fbca2d9c7bf5665',
+     armv7l: '86f608f45ef9c7d423f26f4b1a268e7b995061e1ecb613bf3fbca2d9c7bf5665',
+       i686: 'bbb6d7c0db9e4777aaca3b38e08affc74f16af661274b2d962ef8189a5338d2f',
+     x86_64: 'db69280f951b024431221a7f28af55b9f103baa82a981619a3da01c161c2d485',
+  })
+
+  def self.build
+    system "./configure #{CREW_OPTIONS}"
+    system 'make'
+  end
+
+  def self.install
+    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
+  end
+end

packages/dosbox_x.rb

+require 'package'
+
+class Dosbox_x < Package
+  description 'An x86 emulator with DOS.'
+  homepage 'https://dosbox-x.com/'
+  version '0.83.1'
+  #compatibility 'all'
+  source_url 'https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v0.83.1.tar.gz'
+  source_sha256 '222c6c4e2ec15bfab0e327b9ba4af92a3fcdd0ff76f1917529a11503ab4a2833'
+
+  binary_url ({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/dosbox_x-0.83.1-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/dosbox_x-0.83.1-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/dosbox_x-0.83.1-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/dosbox_x-0.83.1-chromeos-x86_64.tar.xz',
+  })
+  binary_sha256 ({
+    aarch64: '839c4fef89a682fd9bc7bc761b42a112b7bf9e8ab6e33febe37ca3a80ef58aaa',
+     armv7l: '839c4fef89a682fd9bc7bc761b42a112b7bf9e8ab6e33febe37ca3a80ef58aaa',
+       i686: '27a8b791fa8079e871ac68d58ae41e925b568b604659d063b4d3c7b32d578305',
+     x86_64: '28d8a38df1329b5059e81f84a37eafc155bfff5445bf3ded2eed8bc92e8d25b6',
+  })
+
+  depends_on 'ffmpeg'
+  depends_on 'libglu'
+  depends_on 'libpng'
+  depends_on 'libsdl'
+
+  def self.patch
+    system 'filefix'
+    system "sed -i 's,--prefix=/usr,#{CREW_OPTIONS},' build"
+  end
+
+  def self.build
+    system './build'
+  end
+
+  def self.install
+    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
+  end
+
+  def self.postinstall
+    puts
+    puts "Type 'dosbox-x' to get started.".lightblue
+    puts
+  end
+end

packages/php5.rb

@@ -34,7 +34,7 @@ class Php5 < Package
 
   def self.preinstall
     phpver = `php -v 2> /dev/null | head -1 | cut -d' ' -f2`.chomp
-    abort "PHP version #{phpver} already installed.".lightgreen unless "#{phpver}" == ""
+    abort "PHP version #{phpver} already installed.".lightred unless "#{phpver}" == ""
   end
 
   def self.patch

packages/php70.rb

@@ -35,7 +35,7 @@ class Php70 < Package
 
   def self.preinstall
     phpver = `php -v 2> /dev/null | head -1 | cut -d' ' -f2`.chomp
-    abort "PHP version #{phpver} already installed.".lightgreen unless "#{phpver}" == ""
+    abort "PHP version #{phpver} already installed.".lightred unless "#{phpver}" == ""
   end
 
   def self.patch

packages/php71.rb

@@ -35,7 +35,7 @@ class Php71 < Package
 
   def self.preinstall
     phpver = `php -v 2> /dev/null | head -1 | cut -d' ' -f2`.chomp
-    abort "PHP version #{phpver} already installed.".lightgreen unless "#{phpver}" == ""
+    abort "PHP version #{phpver} already installed.".lightred unless "#{phpver}" == ""
   end
 
   def self.patch

packages/php72.rb

@@ -35,7 +35,7 @@ class Php72 < Package
 
   def self.preinstall
     phpver = `php -v 2> /dev/null | head -1 | cut -d' ' -f2`.chomp
-    abort "PHP version #{phpver} already installed.".lightgreen unless "#{phpver}" == ""
+    abort "PHP version #{phpver} already installed.".lightred unless "#{phpver}" == ""
   end
 
   def self.patch

packages/php73.rb

@@ -35,7 +35,7 @@ class Php73 < Package
 
   def self.preinstall
     phpver = `php -v 2> /dev/null | head -1 | cut -d' ' -f2`.chomp
-    abort "PHP version #{phpver} already installed.".lightgreen unless "#{phpver}" == ""
+    abort "PHP version #{phpver} already installed.".lightred unless "#{phpver}" == ""
   end
 
   def self.patch

packages/php74.rb

@@ -40,7 +40,7 @@ class Php74 < Package
 
   def self.preinstall
     phpver = `php -v 2> /dev/null | head -1 | cut -d' ' -f2`.chomp
-    abort "PHP version #{phpver} already installed.".lightgreen unless "#{phpver}" == ""
+    abort "PHP version #{phpver} already installed.".lightred unless "#{phpver}" == ""
   end
 
   def self.patch

packages/rtmpdump.rb

@@ -3,22 +3,22 @@ require 'package'
 class Rtmpdump < Package
   description 'rtmpdump is a toolkit for RTMP streams.'
   homepage 'https://rtmpdump.mplayerhq.hu/'
-  version 'fa8646dae'
-  compatibility 'all'
-  source_url 'https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/fa8646daeb19dfd12c181f7d19de708d623704c0.tar.gz'
-  source_sha256 'dba4d4d2e1c7de6884b01d98194b83cab6784669089fa3c919152087a3a38fd2'
+  version 'c5f04a58'
+  #compatibility 'all'
+  source_url 'https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz'
+  source_sha256 'fd8c21263d93fbde8bee8aa6c5f6a657789674bb0f9e74f050651504d5f43b46'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/rtmpdump-fa8646dae-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/rtmpdump-fa8646dae-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/rtmpdump-fa8646dae-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/rtmpdump-fa8646dae-chromeos-x86_64.tar.xz',
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/rtmpdump-c5f04a58-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/rtmpdump-c5f04a58-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/rtmpdump-c5f04a58-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/rtmpdump-c5f04a58-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: '04a7e360b0290d82402addc6432d6b4d3c551aafb99ab3902bf30df6de2bdeae',
-     armv7l: '04a7e360b0290d82402addc6432d6b4d3c551aafb99ab3902bf30df6de2bdeae',
-       i686: '2298fa49696d409dbfe0bd159d4199b1219d2da4a1746fb5c1644f2f0a94a5d7',
-     x86_64: '163c47847d3cfcfe9178995c96511e7642991a1bb567f90d33f26e36e85d16e6',
+    aarch64: '31c1053a2ba5775de0ea099447af443bdcb8732a7851c581219c7bc9177cafe4',
+     armv7l: '31c1053a2ba5775de0ea099447af443bdcb8732a7851c581219c7bc9177cafe4',
+       i686: 'f21b4f9f4c3978db0bb4e0814993b7af076e04c6b86d6a3b5fa548f6fa0cf9e6',
+     x86_64: '74ec242f369bdf542f725a7675a11be49d8ee898f6f2b963b406b4004d45effe',
   })
 
   def self.build