Skip to content

Commit a61a679

Browse files
committed
fix compiling issue;sound issue;widevine support;enterprise enrollment support
1 parent ec62122 commit a61a679

35 files changed

+6795
-13
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
options snd_bcm2835 force_bulk enable_headphones enable_hdmi
1+
options snd_bcm2835 enable_headphones enable_hdmi

baseboard-rpi3/media-libs/mesa/mesa-19.2.0_rc4.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
1010
EGIT_BRANCH="19.2"
1111
EGIT_COMMIT="71fafc13b9491f4ccc75fa821008fb863ffdb033"
1212

13-
inherit base multilib flag-o-matic meson toolchain-funcs git-r3
13+
inherit base multilib flag-o-matic meson toolchain-funcs git-2
1414

1515
FOLDER="${PV/_rc*/}"
1616
[[ ${PV/_rc*/} == ${PV} ]] || FOLDER+="/RC"

baseboard-rpi3/media-sound/adhd/adhd-9999.ebuild

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ src_install() {
187187
# Install asound.conf for CRAS alsa plugin
188188
insinto /etc
189189
doins "${FILESDIR}"/asound.conf
190+
insinto /etc/init
191+
doins ${FILESDIR}/cras_monitor.conf
190192
}
191193

192194
pkg_preinst() {

baseboard-rpi3/media-sound/adhd/files/fix_brcm_snd_issue.patch

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ index 0acf7ef3..070dd007 100644
1212
clock_gettime(CLOCK_MONOTONIC_RAW, &last_wake);
1313
ATLOG(atlog, AUDIO_THREAD_WAKE, rc, 0, 0);
1414
diff --git a/cras/src/tools/cras_monitor/cras_monitor.c b/cras/src/tools/cras_monitor/cras_monitor.c
15-
index d021669a..bd63cab4 100644
15+
index d021669a..0b2808f9 100644
1616
--- a/cras/src/tools/cras_monitor/cras_monitor.c
1717
+++ b/cras/src/tools/cras_monitor/cras_monitor.c
1818
@@ -166,12 +166,20 @@ static void input_node_gain_changed(void *context, cras_node_id_t node_id,
@@ -36,3 +36,11 @@ index d021669a..bd63cab4 100644
3636
}
3737

3838
static void server_connection_callback(struct cras_client *client,
39+
@@ -308,6 +316,7 @@ int main(int argc, char **argv)
40+
rc = read(STDIN_FILENO, &c, 1);
41+
if (rc < 0 || c == 'q')
42+
return 0;
43+
+ sleep(1);
44+
}
45+
46+
destroy_exit:
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
chromeos-base/vpd::chromiumos
22
media-sound/adhd::chromiumos
3+
media-libs/minigbm::chromiumos

baseboard-rpi3/scripts/board_specific_setup.sh

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,9 @@ install_raspberrypi_bootloader() {
2626
local efi_size=$(( efi_size_sectors * 512 ))
2727
local mount_opts=loop,offset=${efi_offset},sizelimit=${efi_size}
2828
local efi_dir=$(mktemp -d)
29-
local arch=$2
30-
local kernel_img=""
31-
local target_img=""
32-
if [ "${arch}" == "arm" ]; then
33-
kernel_img=$(ls "${ROOT}/boot/zImage-"*)
34-
target_img="${efi_dir}/kernel7.img"
35-
else
29+
local kernel_img=$(ls "${ROOT}/boot/zImage-"*)
30+
local target_img="${efi_dir}/kernel7.img"
31+
if [ -z "$kernel_img" ]; then
3632
kernel_img=$(ls "${ROOT}/boot/Image"*)
3733
target_img="${efi_dir}/kernel8.img"
3834
fi
@@ -46,8 +42,7 @@ install_raspberrypi_bootloader() {
4642
}
4743

4844
board_setup() {
49-
info "install kernel and loader for ${CHROMEOS_KERNEL_ARCH}"
50-
install_raspberrypi_bootloader "$1" $CHROMEOS_KERNEL_ARCH
45+
install_raspberrypi_bootloader "$1"
5146
install_hybrid_mbr "$1"
5247
}
5348

0 commit comments

Comments
 (0)