diff -Nru v4l-utils-1.27.0-202401170932/.pc/.quilt_patches v4l-utils-1.27.0-202401181219/.pc/.quilt_patches --- v4l-utils-1.27.0-202401170932/.pc/.quilt_patches 2024-01-17 20:02:25.000000000 +0000 +++ v4l-utils-1.27.0-202401181219/.pc/.quilt_patches 2024-01-18 20:02:54.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-3667619/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches +/home/buildd/build-RECIPEBRANCHBUILD-3668091/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches diff -Nru v4l-utils-1.27.0-202401170932/.pc/.quilt_series v4l-utils-1.27.0-202401181219/.pc/.quilt_series --- v4l-utils-1.27.0-202401170932/.pc/.quilt_series 2024-01-17 20:02:25.000000000 +0000 +++ v4l-utils-1.27.0-202401181219/.pc/.quilt_series 2024-01-18 20:02:54.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-3667619/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series +/home/buildd/build-RECIPEBRANCHBUILD-3668091/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series diff -Nru v4l-utils-1.27.0-202401170932/contrib/test/meson.build v4l-utils-1.27.0-202401181219/contrib/test/meson.build --- v4l-utils-1.27.0-202401170932/contrib/test/meson.build 2024-01-17 20:02:24.000000000 +0000 +++ v4l-utils-1.27.0-202401181219/contrib/test/meson.build 2024-01-18 20:02:50.000000000 +0000 @@ -107,6 +107,7 @@ ) v4l2gl_deps = [ + dep_argp, dep_gl, dep_glu, dep_libv4l2, diff -Nru v4l-utils-1.27.0-202401170932/debian/changelog v4l-utils-1.27.0-202401181219/debian/changelog --- v4l-utils-1.27.0-202401170932/debian/changelog 2024-01-17 20:02:25.000000000 +0000 +++ v4l-utils-1.27.0-202401181219/debian/changelog 2024-01-18 20:02:54.000000000 +0000 @@ -1,8 +1,8 @@ -v4l-utils (1.27.0-202401170932-202311302111~ubuntu23.04.1) lunar; urgency=low +v4l-utils (1.27.0-202401181219-202311302111~ubuntu23.04.1) lunar; urgency=low * Auto build. - -- Launchpad Package Builder Wed, 17 Jan 2024 20:02:25 +0000 + -- Launchpad Package Builder Thu, 18 Jan 2024 20:02:54 +0000 v4l-utils (1.27.0-1) experimental; urgency=medium diff -Nru v4l-utils-1.27.0-202401170932/debian/git-build-recipe.manifest v4l-utils-1.27.0-202401181219/debian/git-build-recipe.manifest --- v4l-utils-1.27.0-202401170932/debian/git-build-recipe.manifest 2024-01-17 20:02:25.000000000 +0000 +++ v4l-utils-1.27.0-202401181219/debian/git-build-recipe.manifest 2024-01-18 20:02:54.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version {debupstream}-202401170932-202311302111 -lp:~libv4l/libv4l/+git/v4l-utils git-commit:2d0a47ad3e7db6e3ecd053dbcee772299eeb82ed +# git-build-recipe format 0.4 deb-version {debupstream}-202401181219-202311302111 +lp:~libv4l/libv4l/+git/v4l-utils git-commit:d700deb143685b8217aa8a6eeeba3b090d4287fc nest packaging lp:~libv4l/+git/v4l-utils-packaging debian git-commit:9dcdeb277cf4c3a0749c4d8083f8891b284530fa diff -Nru v4l-utils-1.27.0-202401170932/utils/media-ctl/media-ctl.c v4l-utils-1.27.0-202401181219/utils/media-ctl/media-ctl.c --- v4l-utils-1.27.0-202401170932/utils/media-ctl/media-ctl.c 2024-01-17 20:02:24.000000000 +0000 +++ v4l-utils-1.27.0-202401181219/utils/media-ctl/media-ctl.c 2024-01-18 20:02:50.000000000 +0000 @@ -751,20 +751,20 @@ } } - if (media_opts.formats) { - ret = v4l2_subdev_parse_setup_formats(media, - media_opts.formats); + if (media_opts.routes) { + ret = v4l2_subdev_parse_setup_routes(media, media_opts.routes); if (ret) { - printf("Unable to setup formats: %s (%d)\n", + printf("Unable to setup routes: %s (%d)\n", strerror(-ret), -ret); goto out; } } - if (media_opts.routes) { - ret = v4l2_subdev_parse_setup_routes(media, media_opts.routes); + if (media_opts.formats) { + ret = v4l2_subdev_parse_setup_formats(media, + media_opts.formats); if (ret) { - printf("Unable to setup routes: %s (%d)\n", + printf("Unable to setup formats: %s (%d)\n", strerror(-ret), -ret); goto out; } diff -Nru v4l-utils-1.27.0-202401170932/utils/v4l2-ctl/v4l2-ctl-subdev.cpp v4l-utils-1.27.0-202401181219/utils/v4l2-ctl/v4l2-ctl-subdev.cpp --- v4l-utils-1.27.0-202401170932/utils/v4l2-ctl/v4l2-ctl-subdev.cpp 2024-01-17 20:02:24.000000000 +0000 +++ v4l-utils-1.27.0-202401181219/utils/v4l2-ctl/v4l2-ctl-subdev.cpp 2024-01-18 20:02:50.000000000 +0000 @@ -96,7 +96,8 @@ " --set-subdev-fps pad=,stream=,fps= (for testing only, otherwise use media-ctl)\n" " set the frame rate [VIDIOC_SUBDEV_S_FRAME_INTERVAL]\n" " --get-routing Print the route topology\n" - " --set-routing \n" + " --set-routing (for testing only, otherwise use media-ctl)\n" + " --try-routing \n" " Comma-separated list of route descriptors to setup\n" "\n" "Routes are defined as\n" @@ -458,14 +459,16 @@ } } break; - case OptSetRouting: { + case OptSetRouting: + case OptTryRouting: { struct v4l2_subdev_route *r; char *end, *ref, *tok; unsigned int flags; memset(&routing, 0, sizeof(routing)); memset(routes, 0, sizeof(routes[0]) * NUM_ROUTES_MAX); - routing.which = V4L2_SUBDEV_FORMAT_ACTIVE; + routing.which = ch == OptSetRouting ? V4L2_SUBDEV_FORMAT_ACTIVE : + V4L2_SUBDEV_FORMAT_TRY; routing.num_routes = 0; routing.routes = (__u64)routes; @@ -683,7 +686,7 @@ fival.interval.denominator, fival.interval.numerator); } } - if (options[OptSetRouting]) { + if (options[OptSetRouting] || options[OptTryRouting]) { if (!_fd.has_streams()) { printf("Streams API not supported.\n"); return; diff -Nru v4l-utils-1.27.0-202401170932/utils/v4l2-ctl/v4l2-ctl.cpp v4l-utils-1.27.0-202401181219/utils/v4l2-ctl/v4l2-ctl.cpp --- v4l-utils-1.27.0-202401170932/utils/v4l2-ctl/v4l2-ctl.cpp 2024-01-17 20:02:24.000000000 +0000 +++ v4l-utils-1.27.0-202401181219/utils/v4l2-ctl/v4l2-ctl.cpp 2024-01-18 20:02:50.000000000 +0000 @@ -66,6 +66,7 @@ {"try-fmt-video-out", required_argument, nullptr, OptTryVideoOutFormat}, {"get-routing", no_argument, 0, OptGetRouting}, {"set-routing", required_argument, 0, OptSetRouting}, + {"try-routing", required_argument, 0, OptTryRouting}, {"help", no_argument, nullptr, OptHelp}, {"help-tuner", no_argument, nullptr, OptHelpTuner}, {"help-io", no_argument, nullptr, OptHelpIO}, diff -Nru v4l-utils-1.27.0-202401170932/utils/v4l2-ctl/v4l2-ctl.h v4l-utils-1.27.0-202401181219/utils/v4l2-ctl/v4l2-ctl.h --- v4l-utils-1.27.0-202401170932/utils/v4l2-ctl/v4l2-ctl.h 2024-01-17 20:02:24.000000000 +0000 +++ v4l-utils-1.27.0-202401181219/utils/v4l2-ctl/v4l2-ctl.h 2024-01-18 20:02:50.000000000 +0000 @@ -194,6 +194,7 @@ OptFixEdidChecksums, OptGetRouting, OptSetRouting, + OptTryRouting, OptFreqSeek, OptEncoderCmd, OptTryEncoderCmd,