From 23becccac85550fbbef3b14cceba307e0ab22e94 Mon Sep 17 00:00:00 2001
From: Gerben Jan Dijkman <gjdijkman@outlook.com>
Date: Tue, 1 Feb 2022 15:38:12 +0100
Subject: [PATCH] Added extra

---
 .../u-boot-pinephone-pro/files/boot.txt       | 37 ----------
 .../files/ppp-uboot-flash                     | 60 ----------------
 .../files/ppp-uboot-mkscr                     | 68 -------------------
 .../u-boot-pinephone-pro-2022.01.ebuild       | 21 +-----
 .../alsa-ucm-pinephone-1.2.6.3.ebuild         |  1 -
 .../ffmpeg-chromium-bin-97.0.4692.71.ebuild   |  2 +-
 .../ffmpeg-extra-chromium-bin/Manifest        |  1 +
 ...peg-extra-chromium-bin-97.0.4692.71.ebuild | 29 ++++++++
 .../chromium-bin-97.0.4692.71.ebuild          |  3 +-
 9 files changed, 35 insertions(+), 187 deletions(-)
 delete mode 100644 dev-embedded/u-boot-pinephone-pro/files/boot.txt
 delete mode 100644 dev-embedded/u-boot-pinephone-pro/files/ppp-uboot-flash
 delete mode 100644 dev-embedded/u-boot-pinephone-pro/files/ppp-uboot-mkscr
 create mode 100644 media-video/ffmpeg-extra-chromium-bin/Manifest
 create mode 100644 media-video/ffmpeg-extra-chromium-bin/ffmpeg-extra-chromium-bin-97.0.4692.71.ebuild

diff --git a/dev-embedded/u-boot-pinephone-pro/files/boot.txt b/dev-embedded/u-boot-pinephone-pro/files/boot.txt
deleted file mode 100644
index d6ec5af..0000000
--- a/dev-embedded/u-boot-pinephone-pro/files/boot.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# /boot/boot.txt
-# After modifying, run "ppp-uboot-mkscr" to re-generate the U-Boot boot script.
-#
-
-#
-# This is the description of the GPIO lines used in this boot script:
-#
-# GPIO #105 is GPIO3_B1, or RK3399 ball C27, which controls the vibrator motor
-# GPIO #154 is GPIO4_D2, or RK3399 ball AH3, which controls the red part of the multicolor LED
-# GPIO #157 is GPIO4_D5, or RK3399 ball AJ3, which controls the green part of the multicolor LED
-# GPIO #158 is GPIO4_D6, or RK3399 ball AG4, which controls the blue part of the multicolor LED
-#
-
-gpio set 105
-gpio set 154
-
-# Set root partition to the second partition of boot device
-part uuid ${devtype} ${devnum}:1 uuid_boot
-part uuid ${devtype} ${devnum}:2 uuid_root
-
-setenv bootargs loglevel=4 console=tty0 console=${console} earlycon=uart8250,mmio32,0xff1a0000 consoleblank=0 boot=PARTUUID=${uuid_boot} root=PARTUUID=${uuid_root} rw rootwait quiet audit=0
-
-if load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} /Image; then
-  gpio clear 105
-  if load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} /dtbs/${fdtfile}; then
-    if load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} /initramfs-linux.img; then
-      gpio set 157
-      booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r};
-    else
-      gpio set 158
-      booti ${kernel_addr_r} - ${fdt_addr_r};
-    fi;
-  fi;
-fi
-
-# EOF
diff --git a/dev-embedded/u-boot-pinephone-pro/files/ppp-uboot-flash b/dev-embedded/u-boot-pinephone-pro/files/ppp-uboot-flash
deleted file mode 100644
index 023abae..0000000
--- a/dev-embedded/u-boot-pinephone-pro/files/ppp-uboot-flash
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-#
-# /usr/bin/ppp-uboot-flash
-# Utility that flashes selected U-Boot image to the boot device.
-#
-
-# Check that we're running as root
-if [[ ${EUID} != 0 ]]; then
-  echo "Flashing U-Boot image not possible, please execute this utility as root."
-  exit 1
-fi
-
-# Get the device that the root resides on, and remove "/dev/" from the device name
-ROOT_DEV=`findmnt / -o source -n | cut -d "[" -f 1 | cut -d "/" -f 3`
-
-# Get the full real name of the root device, which is usually "/dev/mmcblk0"
-ROOT_DEV_NAME="/dev/"`echo /sys/block/*/${ROOT_DEV} | cut -d "/" -f 4`
-
-# Verify that the determined root device is available, just in case
-if [[ ! -r ${ROOT_DEV_NAME} ]]; then
-  echo "Flashing U-Boot not possible, device ${ROOT_DEV_NAME} not found.  No changes made to U-Boot."
-  exit 1
-fi
-
-# Get the U-Boot component names and check that they exist
-IDBLOADER_IMG="/boot/idbloader.img"
-U_BOOT_ITB="/boot/u-boot.itb"
-for COMPONENT in ${IDBLOADER_IMG} ${U_BOOT_ITB}; do
-  if [[ ! -r ${COMPONENT} ]]; then
-    echo "Flashing U-Boot not possible, file ${COMPONENT} not found.  No changes made to U-Boot."
-    exit 1
-  fi
-done
-
-# Flash the first of the selected U-Boot components to the determined root device
-echo -n "Flashing U-Boot components..."
-dd if=${IDBLOADER_IMG} of=${ROOT_DEV_NAME} seek=64 conv=notrunc,fsync > /dev/null 2>&1
-STATUS_IMG=$?
-STATUS_ITB=0
-
-# Now flash the second U-Boot component, but only if the first one flashed successfully
-if [[ ${STATUS_IMG} = 0 ]]; then
-  dd if=${U_BOOT_ITB} of=${ROOT_DEV_NAME} seek=16384 conv=notrunc,fsync > /dev/null 2>&1
-  STATUS_ITB=$?
-fi
-
-# At the end, display the final status message of the U-Boot flashing
-if [[ ${STATUS_IMG} = 0 && ${STATUS_ITB} = 0 ]]; then
-  echo " done."
-  echo "Required U-Boot components flashed to ${ROOT_DEV_NAME} successfully."
-  echo "Please reboot your phone for the changes to take effect."
-else
-  echo " failed."
-  echo "Flashing U-Boot components to ${ROOT_DEV_NAME} failed due to unknown reason."
-  echo "Please try flashing the U-Boot again, or your phone may no longer boot properly."
-  exit 1
-fi
-
-# EOF
diff --git a/dev-embedded/u-boot-pinephone-pro/files/ppp-uboot-mkscr b/dev-embedded/u-boot-pinephone-pro/files/ppp-uboot-mkscr
deleted file mode 100644
index cd58572..0000000
--- a/dev-embedded/u-boot-pinephone-pro/files/ppp-uboot-mkscr
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-#
-# /usr/bin/ppp-uboot-mkscr
-# Utility that generates the U-Boot boot script.
-#
-
-# Source and destination file paths
-BOOT_TXT="/boot/boot.txt"
-BOOT_SCR="/boot/boot.scr"
-
-# Boot script description
-IMAGE_DESC="U-Boot boot script"
-
-# Determine the performed action
-if [[ ! -r ${BOOT_SCR} ]]; then
-  ACTION="Generating"
-else
-  ACTION="Re-generating"
-fi
-
-# Check that we're running as root
-if [[ ${EUID} != 0 ]]; then
-  echo "${ACTION} ${IMAGE_DESC} not possible, please execute this utility as root."
-  exit 1
-fi
-
-# Make sure that the required utility is available
-if [[ ! -x /usr/bin/mkimage ]]; then
-  echo "${ACTION} ${IMAGE_DESC} not possible, mkimage utility not found."
-  echo "Please install the uboot-tools package, by running the following command:"
-  echo "  emerge dev-embedded/uboot-pinephone-pro"
-  exit 1
-fi
-
-# Check that the source file exists
-if [[ ! -r ${BOOT_TXT} ]]; then
-  echo "${ACTION} ${IMAGE_DESC} not possible, file ${BOOT_TXT} not found."
-  echo "Please reinstall the uboot-pinephone package, by running the following command:"
-  echo "  emerge dev-embedded/uboot-pinephone-pro"
-  exit 1
-fi
-
-# Is this a quiet execution?
-VERBOSE=true
-while getopts "q" SWITCH; do
-  if [[ ${SWITCH} = "q" ]]; then
-    VERBOSE=false
-  fi
-done
-
-# Generate the U-Boot boot script
-echo -n "${ACTION} ${IMAGE_DESC} ${BOOT_SCR}..."
-if [[ ${VERBOSE} = true ]]; then
-  echo
-  mkimage -A arm -O linux -T script -C none -n "${IMAGE_DESC}" -d ${BOOT_TXT} ${BOOT_SCR}
-else
-  mkimage -A arm -O linux -T script -C none -n "${IMAGE_DESC}" -d ${BOOT_TXT} ${BOOT_SCR} > /dev/null 2>&1
-  if [[ $? = 0 ]]; then
-    echo " done."
-  else
-    echo " failed."
-    echo "${ACTION} ${IMAGE_DESC} from ${BOOT_TXT} failed due to unknown reason."
-    echo "Please try generating the boot script again, or your phone may no longer boot properly."
-  fi
-fi
-
-# EOF
diff --git a/dev-embedded/u-boot-pinephone-pro/u-boot-pinephone-pro-2022.01.ebuild b/dev-embedded/u-boot-pinephone-pro/u-boot-pinephone-pro-2022.01.ebuild
index 7e0df66..1c5e2a8 100644
--- a/dev-embedded/u-boot-pinephone-pro/u-boot-pinephone-pro-2022.01.ebuild
+++ b/dev-embedded/u-boot-pinephone-pro/u-boot-pinephone-pro-2022.01.ebuild
@@ -80,13 +80,6 @@ src_compile() {
 	emake "${myemakeargs[@]}" pinephone-pro-rk3399_defconfig
 	
 	echo 'CONFIG_IDENT_STRING=" Gentoo Linux"' >> .config
-	echo 'CONFIG_BOOTDELAY=0' >> .config
-	echo 'CONFIG_USB_EHCI_HCD=n' >> .config
-	echo 'CONFIG_USB_EHCI_GENERIC=n' >> .config
-	echo 'CONFIG_USB_XHCI_HCD=n' >> .config
-	echo 'CONFIG_USB_XHCI_DWC3=n' >> .config
-	echo 'CONFIG_USB_DWC3=n' >> .config
-	echo 'CONFIG_USB_DWC3_GENERIC=n' >> .config
 	
 	emake "${myemakeargs[@]}" EXTRAVERSION=-${PKGREL}
 	
@@ -106,15 +99,6 @@ src_install() {
 
 	insinto /boot/
 	doins ${S}/idbloader.img
-	
-	insinto /boot/
-	doins ${FILESDIR}/boot.txt	
-	
-	insinto /usr/bin/
-	doins ${FILESDIR}/ppp-uboot-flash	
-	
-	insinto /usr/bin/
-	doins ${FILESDIR}/ppp-uboot-mkscr	
 		
 	cd tools || die
 
@@ -135,10 +119,9 @@ src_install() {
 pkg_postinst() {
 	einfo "This U-Boot is only to be used for the PinePhone Pro."
 	einfo "After compiling a new Gentoo kernel, copy the resulting Image from /usr/src/linux/arch/arm64/boot/Image to the boot partition (replacing the existing Image)."	
-  	einfo "Update /boot/boot.txt to your wishes and then run ppp-uboot-mkscr to create the config."
   	einfo "New version of U-Boot firmware can be flashed to your microSD card or eMMc module."
-  	einfo "You can do that by running ppp-uboot-flash or by running:"
+  	einfo "You can do that by running:"
   	einfo "# dd if=/boot/idbloader.img of=/dev/mmcblkX seek=64 conv=notrunc,fsync"
 	einfo "# dd if=/boot/u-boot.itb of=/dev/mmcblkX seek=16384 conv=notrunc,fsync"
-	einfo "# Due to the Boot Priority for the PPP it is HIGHLY recommended to not but U-Boot on the eMMc because there is no easy way to recover is something went wrong."
+	einfo "Due to the Boot Priority for the PPP it is HIGHLY recommended to not put U-Boot on the eMMc because there is no easy way to recover is something went wrong."
 }
diff --git a/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild b/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild
index 20bb473..726f148 100644
--- a/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild
+++ b/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild
@@ -18,7 +18,6 @@ RDEPEND="
 	>=media-libs/alsa-lib-1.2.6
 	>=media-plugins/alsa-plugins-1.2.6
 	>=media-libs/alsa-ucm-conf-1.2.6
-	>=media-video/pipewire-0.3.42
 	"
 
 DEPEND="${RDEPEND}"
diff --git a/media-video/ffmpeg-chromium-bin/ffmpeg-chromium-bin-97.0.4692.71.ebuild b/media-video/ffmpeg-chromium-bin/ffmpeg-chromium-bin-97.0.4692.71.ebuild
index a89e953..a612983 100644
--- a/media-video/ffmpeg-chromium-bin/ffmpeg-chromium-bin-97.0.4692.71.ebuild
+++ b/media-video/ffmpeg-chromium-bin/ffmpeg-chromium-bin-97.0.4692.71.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2021 Gentoo Authors
+# Copyright 2011-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/media-video/ffmpeg-extra-chromium-bin/Manifest b/media-video/ffmpeg-extra-chromium-bin/Manifest
new file mode 100644
index 0000000..fc3fd7b
--- /dev/null
+++ b/media-video/ffmpeg-extra-chromium-bin/Manifest
@@ -0,0 +1 @@
+DIST chromium-codecs-ffmpeg_97.0.4692.71-0ubuntu0.18.04.1_arm64.deb 726936 BLAKE2B 527a8dc31ab10278eb822664a10946a51a20e85455f46130b0b9e7d68a91a7c982207a9b016998359cb96e30738c49cb63e5fb04e3795643a23aa14b1e02966b SHA512 349b0483f432130ba6b4529d5482ffc5dc05c812a01d40d9aa2017901c6c53ff1c5fc53d2ad258e1f952889a02176c85f7714519182b05e6edb44dce6a8c00c1
diff --git a/media-video/ffmpeg-extra-chromium-bin/ffmpeg-extra-chromium-bin-97.0.4692.71.ebuild b/media-video/ffmpeg-extra-chromium-bin/ffmpeg-extra-chromium-bin-97.0.4692.71.ebuild
new file mode 100644
index 0000000..d7aa1d0
--- /dev/null
+++ b/media-video/ffmpeg-extra-chromium-bin/ffmpeg-extra-chromium-bin-97.0.4692.71.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+KEYWORDS="~arm64"
+
+MY_P="hromium-codecs-ffmpeg-extra_${PV}-0"
+
+SRC_URI="http://ports.ubuntu.com/pool/universe/c/chromium-browser/${MY_P}ubuntu0.18.04.1_arm64.deb"
+
+SLOT="0"
+IUSE="selinux"
+RESTRICT="bindist mirror strip"
+
+RDEPEND=""
+S=${WORKDIR}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+}
diff --git a/www-client/chromium-bin/chromium-bin-97.0.4692.71.ebuild b/www-client/chromium-bin/chromium-bin-97.0.4692.71.ebuild
index 73de695..9fa5707 100644
--- a/www-client/chromium-bin/chromium-bin-97.0.4692.71.ebuild
+++ b/www-client/chromium-bin/chromium-bin-97.0.4692.71.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2021 Gentoo Authors
+# Copyright 2011-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -50,6 +50,7 @@ RDEPEND="
 	x11-libs/pango
 	x11-misc/xdg-utils
 	=media-video/ffmpeg-chromium-bin-${PV}
+	=media-video/ffmpeg-extra-chromium-bin-${PV}
 "
 
 QA_PREBUILT="*"