diff options
| author | Armin Kuster <akuster808@gmail.com> | 2018-04-07 17:12:42 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:41 -0700 |
| commit | fc6530b935a9f697e1f44e4abf55c6825e877690 (patch) | |
| tree | 14566ac087b6b4b1d1dde80dc3d06795cbf0d84e /meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch | |
| parent | a7318f33e876d94e81d11f03ca030f10440d18d3 (diff) | |
| download | meta-openembedded-fc6530b935a9f697e1f44e4abf55c6825e877690.tar.gz | |
v4l-utils: refresh patches
WARNING:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
checking file utils/cec-compliance/Makefile.am
checking file utils/cec-ctl/Makefile.am
Hunk #1 succeeded at 6 (offset -1 lines).
checking file utils/cec-follower/Makefile.am
Hunk #1 succeeded at 7 with fuzz 1.
checking file utils/qv4l2/Makefile.am
checking file utils/v4l2-compliance/Makefile.am
checking file utils/v4l2-ctl/Makefile.am
and more
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch')
| -rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch index 34fb3cf238..9fcf61165b 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch | |||
| @@ -1,8 +1,16 @@ | |||
| 1 | Index: v4l-utils-1.6.2/utils/media-ctl/Makefile.am | 1 | From 480c04ac6a9d11bfef9d4aca073052fdcee4fdea Mon Sep 17 00:00:00 2001 |
| 2 | =================================================================== | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | --- v4l-utils-1.6.2.orig/utils/media-ctl/Makefile.am | 3 | Date: Sun, 1 Mar 2015 22:25:07 +0000 |
| 4 | +++ v4l-utils-1.6.2/utils/media-ctl/Makefile.am | 4 | |
| 5 | @@ -7,6 +7,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la | 5 | --- |
| 6 | utils/media-ctl/Makefile.am | 1 + | ||
| 7 | 1 file changed, 1 insertion(+) | ||
| 8 | |||
| 9 | diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am | ||
| 10 | index d11fa2e..7c520a2 100644 | ||
| 11 | --- a/utils/media-ctl/Makefile.am | ||
| 12 | +++ b/utils/media-ctl/Makefile.am | ||
| 13 | @@ -20,6 +20,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la | ||
| 6 | mediactl_includedir=$(includedir)/mediactl | 14 | mediactl_includedir=$(includedir)/mediactl |
| 7 | noinst_HEADERS = mediactl.h v4l2subdev.h | 15 | noinst_HEADERS = mediactl.h v4l2subdev.h |
| 8 | 16 | ||