diff -Nru v4l-utils-1.10.0+r3250/debian/bzr-builder.manifest v4l-utils-1.10.0+r3252/debian/bzr-builder.manifest --- v4l-utils-1.10.0+r3250/debian/bzr-builder.manifest 2016-12-06 16:18:54.000000000 +0000 +++ v4l-utils-1.10.0+r3252/debian/bzr-builder.manifest 2016-12-07 16:17:39.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version {debupstream}+r3250-71 -lp:libv4l revid:git-v1:80dbbf2058972628b3b366a20d12cf6bef273d76 +# bzr-builder format 0.3 deb-version {debupstream}+r3252-71 +lp:libv4l revid:git-v1:188e604d57bec065078ff772c802b93ddb6def4b nest packaging lp:~libv4l/+junk/packaging debian revid:gjasny@googlemail.com-20160320110140-z8p5e9zmhomgtciv diff -Nru v4l-utils-1.10.0+r3250/debian/changelog v4l-utils-1.10.0+r3252/debian/changelog --- v4l-utils-1.10.0+r3250/debian/changelog 2016-12-06 16:18:54.000000000 +0000 +++ v4l-utils-1.10.0+r3252/debian/changelog 2016-12-07 16:17:40.000000000 +0000 @@ -1,8 +1,8 @@ -v4l-utils (1.10.0+r3250-71~ubuntu15.10.1) wily; urgency=low +v4l-utils (1.10.0+r3252-71~ubuntu15.10.1) wily; urgency=low * Auto build. - -- Launchpad Package Builder Tue, 06 Dec 2016 16:18:54 +0000 + -- Launchpad Package Builder Wed, 07 Dec 2016 16:17:40 +0000 v4l-utils (1.10.0-2) unstable; urgency=low diff -Nru v4l-utils-1.10.0+r3250/.pc/.quilt_patches v4l-utils-1.10.0+r3252/.pc/.quilt_patches --- v4l-utils-1.10.0+r3250/.pc/.quilt_patches 2016-12-06 16:18:54.000000000 +0000 +++ v4l-utils-1.10.0+r3252/.pc/.quilt_patches 2016-12-07 16:17:40.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-1275199/chroot-autobuild/home/buildd/work/tree/v4l-utils-1.10.0+r3250/debian/patches +/home/buildd/build-RECIPEBRANCHBUILD-1275897/chroot-autobuild/home/buildd/work/tree/v4l-utils-1.10.0+r3252/debian/patches diff -Nru v4l-utils-1.10.0+r3250/.pc/.quilt_series v4l-utils-1.10.0+r3252/.pc/.quilt_series --- v4l-utils-1.10.0+r3250/.pc/.quilt_series 2016-12-06 16:18:54.000000000 +0000 +++ v4l-utils-1.10.0+r3252/.pc/.quilt_series 2016-12-07 16:17:40.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-1275199/chroot-autobuild/home/buildd/work/tree/v4l-utils-1.10.0+r3250/debian/patches/series +/home/buildd/build-RECIPEBRANCHBUILD-1275897/chroot-autobuild/home/buildd/work/tree/v4l-utils-1.10.0+r3252/debian/patches/series diff -Nru v4l-utils-1.10.0+r3250/utils/cec-compliance/cec-compliance.h v4l-utils-1.10.0+r3252/utils/cec-compliance/cec-compliance.h --- v4l-utils-1.10.0+r3250/utils/cec-compliance/cec-compliance.h 2016-12-06 16:18:53.000000000 +0000 +++ v4l-utils-1.10.0+r3252/utils/cec-compliance/cec-compliance.h 2016-12-07 16:17:38.000000000 +0000 @@ -287,6 +287,11 @@ (cec_has_specific(1 << la) && prim_type == CEC_OP_PRIM_DEVTYPE_TV); } +static inline bool is_playback_or_rec(unsigned la) +{ + return cec_has_playback(1 << la) || cec_has_record(1 << la); +} + static inline bool cec_msg_status_is_abort(const struct cec_msg *msg) { return msg->rx_status & CEC_RX_STATUS_FEATURE_ABORT; diff -Nru v4l-utils-1.10.0+r3250/utils/cec-compliance/cec-test-audio.cpp v4l-utils-1.10.0+r3252/utils/cec-compliance/cec-test-audio.cpp --- v4l-utils-1.10.0+r3250/utils/cec-compliance/cec-test-audio.cpp 2016-12-06 16:18:53.000000000 +0000 +++ v4l-utils-1.10.0+r3252/utils/cec-compliance/cec-test-audio.cpp 2016-12-07 16:17:38.000000000 +0000 @@ -215,7 +215,7 @@ } fail_on_test(unrecognized_op(&msg)); if (cec_msg_status_is_abort(&msg)) { - warn("Received Feature Abort for Terminate ARC (but the message was recognized)."); + warn("Received Feature Abort for Terminate ARC (but the message was recognized).\n"); if (refused(&msg)) return REFUSED; return PRESUMED_OK; @@ -290,7 +290,7 @@ } fail_on_test(unrecognized_op(&msg)); if (cec_msg_status_is_abort(&msg)) { - warn("Received Feature Abort for Request ARC Termination (but the message was recognized)."); + warn("Received Feature Abort for Request ARC Termination (but the message was recognized).\n"); if (refused(&msg)) return REFUSED; return PRESUMED_OK; diff -Nru v4l-utils-1.10.0+r3250/utils/cec-compliance/cec-test.cpp v4l-utils-1.10.0+r3252/utils/cec-compliance/cec-test.cpp --- v4l-utils-1.10.0+r3250/utils/cec-compliance/cec-test.cpp 2016-12-06 16:18:53.000000000 +0000 +++ v4l-utils-1.10.0+r3252/utils/cec-compliance/cec-test.cpp 2016-12-07 16:17:38.000000000 +0000 @@ -170,12 +170,12 @@ if (!(cec_has_playback(1 << la) || cec_has_record(1 << la) || cec_has_tuner(1 << la)) && node->remote[la].has_aud_rate) { - return fail("Only Playback, Recording or Tuner devices shall set the Set Audio Rate bit"); + return fail("Only Playback, Recording or Tuner devices shall set the Set Audio Rate bit\n"); } if (!(cec_has_playback(1 << la) || cec_has_record(1 << la)) && node->remote[la].has_deck_ctl) - return fail("Only Playback and Recording devices shall set the Supports Deck Control bit"); + return fail("Only Playback and Recording devices shall set the Supports Deck Control bit\n"); if (!cec_has_tv(1 << la) && node->remote[la].has_rec_tv) - return fail("Only TVs shall set the Record TV Screen bit"); + return fail("Only TVs shall set the Record TV Screen bit\n"); return 0; } @@ -572,7 +572,7 @@ if (cec_msg_status_is_abort(&msg)) return PRESUMED_OK; if (node->remote[la].cec_version >= CEC_OP_CEC_VERSION_2_0) - warn("The Device Menu Control feature is deprecated in CEC 2.0"); + warn("The Device Menu Control feature is deprecated in CEC 2.0\n"); return 0; } @@ -591,7 +591,7 @@ if (cec_msg_status_is_abort(&msg)) return PRESUMED_OK; if (node->remote[la].cec_version >= CEC_OP_CEC_VERSION_2_0) - warn("The Device Menu Control feature is deprecated in CEC 2.0"); + warn("The Device Menu Control feature is deprecated in CEC 2.0\n"); return 0; } @@ -617,10 +617,12 @@ cec_msg_give_deck_status(&msg, true, CEC_OP_STATUS_REQ_ONCE); fail_on_test(!transmit_timeout(node, &msg)); fail_on_test(timed_out(&msg)); - fail_on_test_v2(node->remote[la].cec_version, - node->remote[la].has_deck_ctl && cec_msg_status_is_abort(&msg)); - fail_on_test_v2(node->remote[la].cec_version, - !node->remote[la].has_deck_ctl && !unrecognized_op(&msg)); + if (is_playback_or_rec(la)) { + fail_on_test_v2(node->remote[la].cec_version, + node->remote[la].has_deck_ctl && cec_msg_status_is_abort(&msg)); + fail_on_test_v2(node->remote[la].cec_version, + !node->remote[la].has_deck_ctl && !unrecognized_op(&msg)); + } if (unrecognized_op(&msg)) return NOTSUPPORTED; if (refused(&msg)) @@ -655,10 +657,12 @@ cec_msg_init(&msg, me, la); cec_msg_deck_control(&msg, CEC_OP_DECK_CTL_MODE_STOP); fail_on_test(!transmit_timeout(node, &msg)); - fail_on_test_v2(node->remote[la].cec_version, - node->remote[la].has_deck_ctl && unrecognized_op(&msg)); - fail_on_test_v2(node->remote[la].cec_version, - !node->remote[la].has_deck_ctl && !unrecognized_op(&msg)); + if (is_playback_or_rec(la)) { + fail_on_test_v2(node->remote[la].cec_version, + node->remote[la].has_deck_ctl && unrecognized_op(&msg)); + fail_on_test_v2(node->remote[la].cec_version, + !node->remote[la].has_deck_ctl && !unrecognized_op(&msg)); + } if (unrecognized_op(&msg)) return NOTSUPPORTED; if (refused(&msg)) @@ -676,10 +680,12 @@ cec_msg_init(&msg, me, la); cec_msg_play(&msg, CEC_OP_PLAY_MODE_PLAY_STILL); fail_on_test(!transmit_timeout(node, &msg)); - fail_on_test_v2(node->remote[la].cec_version, - node->remote[la].has_deck_ctl && unrecognized_op(&msg)); - fail_on_test_v2(node->remote[la].cec_version, - !node->remote[la].has_deck_ctl && !unrecognized_op(&msg)); + if (is_playback_or_rec(la)) { + fail_on_test_v2(node->remote[la].cec_version, + node->remote[la].has_deck_ctl && unrecognized_op(&msg)); + fail_on_test_v2(node->remote[la].cec_version, + !node->remote[la].has_deck_ctl && !unrecognized_op(&msg)); + } if (unrecognized_op(&msg)) return NOTSUPPORTED; if (refused(&msg))