Gitiles
Code Review Sign In
gerrit.openbmc.org / mdmillerii / openbmc / 4afada13c3138b8024653c2f3f5e48e9995a55d0 / . / meta-openembedded / meta-oe / recipes-multimedia / v4l2apps / v4l-utils / 0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch
blob: 8ac8fbe19efe35237985d76b964890690829d9c1 [file] [log] [blame]
Andrew Geissler9aee5002022-03-30 16:27:02 +0000[diff] [blame]1From 0d5c0e9a75eca43667b0e29155b635e50622b66a Mon Sep 17 00:00:00 2001
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 27 Feb 2015 21:55:36 +0000
4Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and
Andrew Geissler9aee5002022-03-30 16:27:02 +0000[diff] [blame]5
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]6 libv4l2subdev"
7
8This reverts commit 0911dce53b08b0df3066be2c75f67e8a314d8729.
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12Conflicts:
13 utils/media-ctl/Makefile.am
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]14
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]15---
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]16 utils/media-ctl/Makefile.am | 10 +++-------
17 1 file changed, 3 insertions(+), 7 deletions(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]18
19diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am
Andrew Geissler9aee5002022-03-30 16:27:02 +0000[diff] [blame]20index c48c8d6..e255e16 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]21--- a/utils/media-ctl/Makefile.am
22+++ b/utils/media-ctl/Makefile.am
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]23@@ -1,8 +1,7 @@
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]24-noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la
25-
26+lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la
27 libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h
28-libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS)
29-libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS)
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]30+libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS)
31+libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS)
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]32
33 media-bus-format-names.h: ../../include/linux/media-bus-format.h
Andrew Geissler9aee5002022-03-30 16:27:02 +0000[diff] [blame]34 $(AM_V_GEN) sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]35@@ -18,9 +17,6 @@ CLEANFILES = $(BUILT_SOURCES)
36 nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES)
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]37 libv4l2subdev_la_SOURCES = libv4l2subdev.c
38 libv4l2subdev_la_LIBADD = libmediactl.la
39-libv4l2subdev_la_CFLAGS = -static
40-libv4l2subdev_la_LDFLAGS = -static
41-
42 mediactl_includedir=$(includedir)/mediactl
43 noinst_HEADERS = mediactl.h v4l2subdev.h
44