diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-03-01 22:25:07 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-03-03 08:36:00 +0100 |
commit | 6e3d209d1fa85184e7a6d33e0f00cf9d17a70b58 (patch) | |
tree | 4cc3580b067444257def4d25112210f93bf24a70 /meta-oe/recipes-multimedia/v4l2apps/v4l-utils | |
parent | 95b064c2bbea8899245da20ad02f75f8594b2e18 (diff) | |
download | meta-openembedded-contrib-6e3d209d1fa85184e7a6d33e0f00cf9d17a70b58.tar.gz |
v4l-utils: RPROVIDE media-ctl
media-ctl recipe was subsumed into v4l-utils
but there are apps which still have rdeps on media-ctl
Change-Id: I7c24fec3752e80f67730150504b7192ad4fea0c4
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-multimedia/v4l2apps/v4l-utils')
3 files changed, 68 insertions, 0 deletions
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch new file mode 100644 index 0000000000..4b3de3ccbc --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch @@ -0,0 +1,41 @@ +From 4ee15a8a69b84526ece1180a288a37db077bcd9b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 27 Feb 2015 21:55:36 +0000 +Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and + libv4l2subdev" + +This reverts commit 0911dce53b08b0df3066be2c75f67e8a314d8729. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Conflicts: + utils/media-ctl/Makefile.am +--- + utils/media-ctl/Makefile.am | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am +index a3931fb..fe1fea5 100644 +--- a/utils/media-ctl/Makefile.am ++++ b/utils/media-ctl/Makefile.am +@@ -1,14 +1,9 @@ +-noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la +- ++lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la + libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h +-libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) +-libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) +- ++libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS) ++libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) + libv4l2subdev_la_SOURCES = libv4l2subdev.c + libv4l2subdev_la_LIBADD = libmediactl.la +-libv4l2subdev_la_CFLAGS = -static +-libv4l2subdev_la_LDFLAGS = -static +- + mediactl_includedir=$(includedir)/mediactl + noinst_HEADERS = mediactl.h v4l2subdev.h + +-- +2.1.4 + diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch new file mode 100644 index 0000000000..c610e7e488 --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch @@ -0,0 +1,15 @@ +Index: v4l-utils-1.6.2/utils/media-ctl/Makefile.am +=================================================================== +--- v4l-utils-1.6.2.orig/utils/media-ctl/Makefile.am ++++ v4l-utils-1.6.2/utils/media-ctl/Makefile.am +@@ -4,8 +4,8 @@ libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS + libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) + libv4l2subdev_la_SOURCES = libv4l2subdev.c + libv4l2subdev_la_LIBADD = libmediactl.la +-mediactl_includedir=$(includedir)/mediactl +-noinst_HEADERS = mediactl.h v4l2subdev.h ++otherincludedir = $(includedir)/mediactl ++otherinclude_HEADERS = mediactl.h v4l2subdev.h + + pkgconfig_DATA = libmediactl.pc + bin_PROGRAMS = media-ctl diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch new file mode 100644 index 0000000000..34fb3cf238 --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch @@ -0,0 +1,12 @@ +Index: v4l-utils-1.6.2/utils/media-ctl/Makefile.am +=================================================================== +--- v4l-utils-1.6.2.orig/utils/media-ctl/Makefile.am ++++ v4l-utils-1.6.2/utils/media-ctl/Makefile.am +@@ -7,6 +7,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la + mediactl_includedir=$(includedir)/mediactl + noinst_HEADERS = mediactl.h v4l2subdev.h + ++pkgconfig_DATA = libmediactl.pc + bin_PROGRAMS = media-ctl + media_ctl_SOURCES = media-ctl.c options.c options.h tools.h + media_ctl_LDADD = libmediactl.la libv4l2subdev.la |