From c8c589d91aaf0456690c4e9b041573b378e9713f Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Mon, 10 May 2021 11:02:16 +0200 Subject: [PATCH] libyuv: enable MJPEG support issue #4158 --- repos/libports/lib/mk/libyuv.inc | 4 ++-- repos/ports/recipes/pkg/vbox5-nova-capture/archives | 1 + repos/ports/recipes/pkg/vbox5-nova-capture/runtime | 1 + repos/ports/recipes/pkg/vbox5-nova-sculpt/archives | 1 + repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime | 1 + repos/ports/recipes/pkg/vbox5/archives | 1 + repos/ports/recipes/pkg/vbox5/runtime | 1 + repos/ports/recipes/pkg/vbox6/archives | 1 + repos/ports/recipes/pkg/vbox6/runtime | 1 + repos/ports/recipes/src/vbox5-nova/used_apis | 1 + repos/ports/recipes/src/vbox5/used_apis | 1 + repos/ports/recipes/src/vbox6/used_apis | 1 + repos/ports/run/vbox5_genode_usb_hid.run | 3 ++- repos/ports/run/vbox5_genode_usb_hid_raw.run | 3 ++- repos/ports/run/virtualbox.run | 3 ++- repos/ports/run/virtualbox_auto.inc | 3 ++- 16 files changed, 21 insertions(+), 6 deletions(-) diff --git a/repos/libports/lib/mk/libyuv.inc b/repos/libports/lib/mk/libyuv.inc index 0f807a0ebc..74a33b8b20 100644 --- a/repos/libports/lib/mk/libyuv.inc +++ b/repos/libports/lib/mk/libyuv.inc @@ -1,12 +1,12 @@ YUV_DIR = $(call select_from_ports,libyuv)/libyuv -LIBS = libc +LIBS = libc stdcxx jpeg INC_DIR += $(YUV_DIR)/include SRC_CC = $(notdir $(wildcard $(YUV_DIR)/source/*.cc)) CC_CXX_WARN_STRICT = -Wextra -Werror -CC_OPT += -Wno-unused-parameter +CC_OPT += -Wno-unused-parameter -DHAVE_JPEG vpath %.cc $(YUV_DIR)/source diff --git a/repos/ports/recipes/pkg/vbox5-nova-capture/archives b/repos/ports/recipes/pkg/vbox5-nova-capture/archives index 9e565f4c16..361fa39667 100644 --- a/repos/ports/recipes/pkg/vbox5-nova-capture/archives +++ b/repos/ports/recipes/pkg/vbox5-nova-capture/archives @@ -7,3 +7,4 @@ _/src/zlib _/src/libiconv _/src/stdcxx _/src/vfs +_/src/jpeg diff --git a/repos/ports/recipes/pkg/vbox5-nova-capture/runtime b/repos/ports/recipes/pkg/vbox5-nova-capture/runtime index 2f3e4a0712..3ccf39c2dd 100644 --- a/repos/ports/recipes/pkg/vbox5-nova-capture/runtime +++ b/repos/ports/recipes/pkg/vbox5-nova-capture/runtime @@ -29,6 +29,7 @@ + diff --git a/repos/ports/recipes/pkg/vbox5-nova-sculpt/archives b/repos/ports/recipes/pkg/vbox5-nova-sculpt/archives index dbc6d69126..d061f4b182 100755 --- a/repos/ports/recipes/pkg/vbox5-nova-sculpt/archives +++ b/repos/ports/recipes/pkg/vbox5-nova-sculpt/archives @@ -8,3 +8,4 @@ _/src/zlib _/src/libiconv _/src/stdcxx _/src/vfs +_/src/jpeg diff --git a/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime b/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime index 6dec30c4c0..675f344348 100755 --- a/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime +++ b/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime @@ -28,6 +28,7 @@ + diff --git a/repos/ports/recipes/pkg/vbox5/archives b/repos/ports/recipes/pkg/vbox5/archives index d7bb04def5..5dcdbb7638 100755 --- a/repos/ports/recipes/pkg/vbox5/archives +++ b/repos/ports/recipes/pkg/vbox5/archives @@ -6,3 +6,4 @@ _/src/zlib _/src/libiconv _/src/stdcxx _/src/vfs +_/src/jpeg diff --git a/repos/ports/recipes/pkg/vbox5/runtime b/repos/ports/recipes/pkg/vbox5/runtime index 5b8f2a88ce..a34f086501 100755 --- a/repos/ports/recipes/pkg/vbox5/runtime +++ b/repos/ports/recipes/pkg/vbox5/runtime @@ -83,6 +83,7 @@ + diff --git a/repos/ports/recipes/pkg/vbox6/archives b/repos/ports/recipes/pkg/vbox6/archives index d31ffb89be..cf9feb6eb4 100755 --- a/repos/ports/recipes/pkg/vbox6/archives +++ b/repos/ports/recipes/pkg/vbox6/archives @@ -7,3 +7,4 @@ _/src/vbox6 _/src/vfs _/src/vfs_pipe _/src/zlib +_/src/jpeg diff --git a/repos/ports/recipes/pkg/vbox6/runtime b/repos/ports/recipes/pkg/vbox6/runtime index 591c6e22b4..768727b24c 100755 --- a/repos/ports/recipes/pkg/vbox6/runtime +++ b/repos/ports/recipes/pkg/vbox6/runtime @@ -87,6 +87,7 @@ + diff --git a/repos/ports/recipes/src/vbox5-nova/used_apis b/repos/ports/recipes/src/vbox5-nova/used_apis index ccc97b5d19..aa55202949 100644 --- a/repos/ports/recipes/src/vbox5-nova/used_apis +++ b/repos/ports/recipes/src/vbox5-nova/used_apis @@ -19,3 +19,4 @@ usb_session vfs nitpicker_gfx blit +jpeg diff --git a/repos/ports/recipes/src/vbox5/used_apis b/repos/ports/recipes/src/vbox5/used_apis index 7a32f33f7a..94b1922a2a 100644 --- a/repos/ports/recipes/src/vbox5/used_apis +++ b/repos/ports/recipes/src/vbox5/used_apis @@ -19,3 +19,4 @@ vfs vm_session nitpicker_gfx blit +jpeg diff --git a/repos/ports/recipes/src/vbox6/used_apis b/repos/ports/recipes/src/vbox6/used_apis index de40389dd7..987f085144 100644 --- a/repos/ports/recipes/src/vbox6/used_apis +++ b/repos/ports/recipes/src/vbox6/used_apis @@ -15,3 +15,4 @@ timer_session usb_session vfs vm_session +jpeg diff --git a/repos/ports/run/vbox5_genode_usb_hid.run b/repos/ports/run/vbox5_genode_usb_hid.run index c21341c737..6e067d3f5a 100644 --- a/repos/ports/run/vbox5_genode_usb_hid.run +++ b/repos/ports/run/vbox5_genode_usb_hid.run @@ -39,7 +39,8 @@ create_boot_directory import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/init \ [depot_user]/src/nitpicker \ - [depot_user]/src/vfs_pipe + [depot_user]/src/vfs_pipe \ + [depot_user]/src/jpeg set config { diff --git a/repos/ports/run/vbox5_genode_usb_hid_raw.run b/repos/ports/run/vbox5_genode_usb_hid_raw.run index 1a20df020f..03f10c756c 100644 --- a/repos/ports/run/vbox5_genode_usb_hid_raw.run +++ b/repos/ports/run/vbox5_genode_usb_hid_raw.run @@ -39,7 +39,8 @@ create_boot_directory import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/init \ [depot_user]/src/nitpicker \ - [depot_user]/src/vfs_pipe + [depot_user]/src/vfs_pipe \ + [depot_user]/src/jpeg set config { diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index bc04c5c1a4..f6898f29dd 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -27,7 +27,8 @@ create_boot_directory import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/init \ [depot_user]/src/nitpicker \ - [depot_user]/src/vfs_pipe + [depot_user]/src/vfs_pipe \ + [depot_user]/src/jpeg source ${genode_dir}/repos/base/run/platform_drv.inc # override defaults of platform_drv.inc diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index fbc8fe5ec1..3de6ef4c9a 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -24,7 +24,8 @@ create_boot_directory import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/init \ [depot_user]/src/nitpicker \ - [depot_user]/src/vfs_pipe + [depot_user]/src/vfs_pipe \ + [depot_user]/src/jpeg if {$use_vms > 1} { import_from_depot [depot_user]/pkg/themed_wm