| Message ID | 2662af04-b171-4f5b-9010-2e9b1bad0431@kernel.crashing.org |
|---|---|
| State | New |
| Headers | show |
| Series | [master,scarthgap,meta-oe] v4l-utils: Install media ctrl header and library files | expand |
Hi Mark This patch does not apply cleanly on master or master-next, please rebase it on either of these branches and resend Thanks -Khem On Mon, Jun 24, 2024 at 8:28 AM Mark Hatle via lists.openembedded.org <mark.hatle=kernel.crashing.org@lists.openembedded.org> wrote: > > From: Neel Gandhi <neel.gandhi@amd.com> > > Commit 9389d63fdddcab400cb0b243b74d47bf665aba18 removed a previous patch > that caused the recipe to install the header and library files. Restore > this behavior to the new meson based build system. > > Signed-off-by: Neel Gandhi <neel.gandhi@amd.com> > Signed-off-by: Mark Hatle <mark.hatle@amd.com> > Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> > --- > > This is a resend, the first copy seems to have not been delivered to the list? > > We would like to get this applied to both master and scarthgap. Any questions > let me know. > > ...l-media-ctl-header-and-library-files.patch | 78 +++++++++++++++++++ > .../v4l2apps/v4l-utils_1.26.1.bb | 1 + > 2 files changed, 79 insertions(+) > create mode 100644 > meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch > > diff --git > a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch > b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch > new file mode 100644 > index 000000000..6c946d8c4 > --- /dev/null > +++ > b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch > @@ -0,0 +1,78 @@ > +From 3867fcfa4389c7fa271705f1fd1d4bfb74bc1bd1 Mon Sep 17 00:00:00 2001 > +From: Neel Gandhi <neel.gandhi@amd.com> > +Date: Wed, 5 Jun 2024 13:51:36 +0530 > +Subject: [PATCH] media-ctl: Install media-ctl header and library files > + > +Install mediactl and v4l2subdev header and library > +files, which may be required by 3rd party applications > +to populate and control v4l2subdev device node tree > + > +Install of these files was removed in upstream commit > +0911dce53b08b0df3066be2c75f67e8a314d8729. > + > +Upstream-Status: Denied > + > +v4l-utils maintainers do not promise a stable API for this library, and > +do not currently have the time to do so. So exporting the API in this > +way is fine, as long as we understand that it will change and users of > +the API will need to adapt over time. > + > +Signed-off-by: Neel Gandhi <neel.gandhi@amd.com> > +Signed-off-by: Mark Hatle <mark.hatle@amd.com> > +--- > + utils/media-ctl/meson.build | 28 +++++++++++++++++++++------- > + 1 file changed, 21 insertions(+), 7 deletions(-) > + > +diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build > +index 3a7b0c9a..40669b4c 100644 > +--- a/utils/media-ctl/meson.build > ++++ b/utils/media-ctl/meson.build > +@@ -3,14 +3,24 @@ libmediactl_sources = files( > + 'mediactl-priv.h', > + ) > + ++libmediactl_api = files( > ++ 'mediactl.h', > ++ 'v4l2subdev.h', > ++) > ++ > ++install_headers(libmediactl_api, subdir: 'mediactl') > ++ > + libmediactl_deps = [ > + dep_libudev, > + ] > + +-libmediactl = static_library('mediactl', > +- libmediactl_sources, > +- dependencies : libmediactl_deps, > +- include_directories : v4l2_utils_incdir) > ++libmediactl = library('mediactl', > ++ libmediactl_sources, > ++ soversion: '0', > ++ version: '0.0.0', > ++ install : true, > ++ dependencies : libmediactl_deps, > ++ include_directories : v4l2_utils_incdir) > + + dep_libmediactl = declare_dependency(link_with : libmediactl) > + +@@ -18,9 +28,13 @@ libv4l2subdev_sources = files('libv4l2subdev.c') > + libv4l2subdev_sources += media_bus_format_names_h > + libv4l2subdev_sources += media_bus_format_codes_h > + +-libv4l2subdev = static_library('v4l2subdev', > +- libv4l2subdev_sources, > +- include_directories : v4l2_utils_incdir) > ++libv4l2subdev = library('v4l2subdev', > ++ libv4l2subdev_sources, > ++ soversion: '0', > ++ version: '0.0.0', > ++ install : true, > ++ dependencies : dep_libmediactl, > ++ include_directories : v4l2_utils_incdir) > + + dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev) > + +-- +2.34.1 > + > diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb > b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb > index 52759ef18..eb38d9713 100644 > --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb > +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb > @@ -28,6 +28,7 @@ PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" > SRC_URI = "\ > git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \ > file://0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch \ > + file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch \ > " > SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1" > -- > 2.39.3 (Apple Git-146) > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#111001): https://lists.openembedded.org/g/openembedded-devel/message/111001 > Mute This Topic: https://lists.openembedded.org/mt/106851971/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
What kind of error are you getting? I just rebased and the system told me there were no differences. Did it get munged by my email sending? --Mark On 6/24/24 11:02 AM, Khem Raj wrote: > Hi Mark > > This patch does not apply cleanly on master or master-next, please > rebase it on either of these branches and resend > > Thanks > -Khem > > On Mon, Jun 24, 2024 at 8:28 AM Mark Hatle via lists.openembedded.org > <mark.hatle=kernel.crashing.org@lists.openembedded.org> wrote: >> >> From: Neel Gandhi <neel.gandhi@amd.com> >> >> Commit 9389d63fdddcab400cb0b243b74d47bf665aba18 removed a previous patch >> that caused the recipe to install the header and library files. Restore >> this behavior to the new meson based build system. >> >> Signed-off-by: Neel Gandhi <neel.gandhi@amd.com> >> Signed-off-by: Mark Hatle <mark.hatle@amd.com> >> Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> >> --- >> >> This is a resend, the first copy seems to have not been delivered to the list? >> >> We would like to get this applied to both master and scarthgap. Any questions >> let me know. >> >> ...l-media-ctl-header-and-library-files.patch | 78 +++++++++++++++++++ >> .../v4l2apps/v4l-utils_1.26.1.bb | 1 + >> 2 files changed, 79 insertions(+) >> create mode 100644 >> meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch >> >> diff --git >> a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch >> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch >> new file mode 100644 >> index 000000000..6c946d8c4 >> --- /dev/null >> +++ >> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch >> @@ -0,0 +1,78 @@ >> +From 3867fcfa4389c7fa271705f1fd1d4bfb74bc1bd1 Mon Sep 17 00:00:00 2001 >> +From: Neel Gandhi <neel.gandhi@amd.com> >> +Date: Wed, 5 Jun 2024 13:51:36 +0530 >> +Subject: [PATCH] media-ctl: Install media-ctl header and library files >> + >> +Install mediactl and v4l2subdev header and library >> +files, which may be required by 3rd party applications >> +to populate and control v4l2subdev device node tree >> + >> +Install of these files was removed in upstream commit >> +0911dce53b08b0df3066be2c75f67e8a314d8729. >> + >> +Upstream-Status: Denied >> + >> +v4l-utils maintainers do not promise a stable API for this library, and >> +do not currently have the time to do so. So exporting the API in this >> +way is fine, as long as we understand that it will change and users of >> +the API will need to adapt over time. >> + >> +Signed-off-by: Neel Gandhi <neel.gandhi@amd.com> >> +Signed-off-by: Mark Hatle <mark.hatle@amd.com> >> +--- >> + utils/media-ctl/meson.build | 28 +++++++++++++++++++++------- >> + 1 file changed, 21 insertions(+), 7 deletions(-) >> + >> +diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build >> +index 3a7b0c9a..40669b4c 100644 >> +--- a/utils/media-ctl/meson.build >> ++++ b/utils/media-ctl/meson.build >> +@@ -3,14 +3,24 @@ libmediactl_sources = files( >> + 'mediactl-priv.h', >> + ) >> + ++libmediactl_api = files( >> ++ 'mediactl.h', >> ++ 'v4l2subdev.h', >> ++) >> ++ >> ++install_headers(libmediactl_api, subdir: 'mediactl') >> ++ >> + libmediactl_deps = [ >> + dep_libudev, >> + ] >> + +-libmediactl = static_library('mediactl', >> +- libmediactl_sources, >> +- dependencies : libmediactl_deps, >> +- include_directories : v4l2_utils_incdir) >> ++libmediactl = library('mediactl', >> ++ libmediactl_sources, >> ++ soversion: '0', >> ++ version: '0.0.0', >> ++ install : true, >> ++ dependencies : libmediactl_deps, >> ++ include_directories : v4l2_utils_incdir) >> + + dep_libmediactl = declare_dependency(link_with : libmediactl) >> + +@@ -18,9 +28,13 @@ libv4l2subdev_sources = files('libv4l2subdev.c') >> + libv4l2subdev_sources += media_bus_format_names_h >> + libv4l2subdev_sources += media_bus_format_codes_h >> + +-libv4l2subdev = static_library('v4l2subdev', >> +- libv4l2subdev_sources, >> +- include_directories : v4l2_utils_incdir) >> ++libv4l2subdev = library('v4l2subdev', >> ++ libv4l2subdev_sources, >> ++ soversion: '0', >> ++ version: '0.0.0', >> ++ install : true, >> ++ dependencies : dep_libmediactl, >> ++ include_directories : v4l2_utils_incdir) >> + + dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev) >> + +-- +2.34.1 >> + >> diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb >> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb >> index 52759ef18..eb38d9713 100644 >> --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb >> +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb >> @@ -28,6 +28,7 @@ PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" >> SRC_URI = "\ >> git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \ >> file://0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch \ >> + file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch \ >> " >> SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1" >> -- >> 2.39.3 (Apple Git-146) >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#111001): https://lists.openembedded.org/g/openembedded-devel/message/111001 >> Mute This Topic: https://lists.openembedded.org/mt/106851971/1997914 >> Group Owner: openembedded-devel+owner@lists.openembedded.org >> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] >> -=-=-=-=-=-=-=-=-=-=-=- >>
No idea what is going with my email. But I pushed to a github repository: https://github.com/mhatle/meta-openembedded.git mgh/master The specific commit: https://github.com/mhatle/meta-openembedded/commit/2323c8ec565b895d6e634d43061039b4a0d41ff2 Thanks! Sorry for the extra work. --Mark On 6/24/24 11:21 AM, Mark Hatle wrote: > What kind of error are you getting? I just rebased and the system told me there > were no differences. Did it get munged by my email sending? > > --Mark > > On 6/24/24 11:02 AM, Khem Raj wrote: >> Hi Mark >> >> This patch does not apply cleanly on master or master-next, please >> rebase it on either of these branches and resend >> >> Thanks >> -Khem >> >> On Mon, Jun 24, 2024 at 8:28 AM Mark Hatle via lists.openembedded.org >> <mark.hatle=kernel.crashing.org@lists.openembedded.org> wrote: >>> >>> From: Neel Gandhi <neel.gandhi@amd.com> >>> >>> Commit 9389d63fdddcab400cb0b243b74d47bf665aba18 removed a previous patch >>> that caused the recipe to install the header and library files. Restore >>> this behavior to the new meson based build system. >>> >>> Signed-off-by: Neel Gandhi <neel.gandhi@amd.com> >>> Signed-off-by: Mark Hatle <mark.hatle@amd.com> >>> Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> >>> --- >>> >>> This is a resend, the first copy seems to have not been delivered to the list? >>> >>> We would like to get this applied to both master and scarthgap. Any questions >>> let me know. >>> >>> ...l-media-ctl-header-and-library-files.patch | 78 +++++++++++++++++++ >>> .../v4l2apps/v4l-utils_1.26.1.bb | 1 + >>> 2 files changed, 79 insertions(+) >>> create mode 100644 >>> meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch >>> >>> diff --git >>> a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch >>> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch >>> new file mode 100644 >>> index 000000000..6c946d8c4 >>> --- /dev/null >>> +++ >>> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch >>> @@ -0,0 +1,78 @@ >>> +From 3867fcfa4389c7fa271705f1fd1d4bfb74bc1bd1 Mon Sep 17 00:00:00 2001 >>> +From: Neel Gandhi <neel.gandhi@amd.com> >>> +Date: Wed, 5 Jun 2024 13:51:36 +0530 >>> +Subject: [PATCH] media-ctl: Install media-ctl header and library files >>> + >>> +Install mediactl and v4l2subdev header and library >>> +files, which may be required by 3rd party applications >>> +to populate and control v4l2subdev device node tree >>> + >>> +Install of these files was removed in upstream commit >>> +0911dce53b08b0df3066be2c75f67e8a314d8729. >>> + >>> +Upstream-Status: Denied >>> + >>> +v4l-utils maintainers do not promise a stable API for this library, and >>> +do not currently have the time to do so. So exporting the API in this >>> +way is fine, as long as we understand that it will change and users of >>> +the API will need to adapt over time. >>> + >>> +Signed-off-by: Neel Gandhi <neel.gandhi@amd.com> >>> +Signed-off-by: Mark Hatle <mark.hatle@amd.com> >>> +--- >>> + utils/media-ctl/meson.build | 28 +++++++++++++++++++++------- >>> + 1 file changed, 21 insertions(+), 7 deletions(-) >>> + >>> +diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build >>> +index 3a7b0c9a..40669b4c 100644 >>> +--- a/utils/media-ctl/meson.build >>> ++++ b/utils/media-ctl/meson.build >>> +@@ -3,14 +3,24 @@ libmediactl_sources = files( >>> + 'mediactl-priv.h', >>> + ) >>> + ++libmediactl_api = files( >>> ++ 'mediactl.h', >>> ++ 'v4l2subdev.h', >>> ++) >>> ++ >>> ++install_headers(libmediactl_api, subdir: 'mediactl') >>> ++ >>> + libmediactl_deps = [ >>> + dep_libudev, >>> + ] >>> + +-libmediactl = static_library('mediactl', >>> +- libmediactl_sources, >>> +- dependencies : libmediactl_deps, >>> +- include_directories : v4l2_utils_incdir) >>> ++libmediactl = library('mediactl', >>> ++ libmediactl_sources, >>> ++ soversion: '0', >>> ++ version: '0.0.0', >>> ++ install : true, >>> ++ dependencies : libmediactl_deps, >>> ++ include_directories : v4l2_utils_incdir) >>> + + dep_libmediactl = declare_dependency(link_with : libmediactl) >>> + +@@ -18,9 +28,13 @@ libv4l2subdev_sources = files('libv4l2subdev.c') >>> + libv4l2subdev_sources += media_bus_format_names_h >>> + libv4l2subdev_sources += media_bus_format_codes_h >>> + +-libv4l2subdev = static_library('v4l2subdev', >>> +- libv4l2subdev_sources, >>> +- include_directories : v4l2_utils_incdir) >>> ++libv4l2subdev = library('v4l2subdev', >>> ++ libv4l2subdev_sources, >>> ++ soversion: '0', >>> ++ version: '0.0.0', >>> ++ install : true, >>> ++ dependencies : dep_libmediactl, >>> ++ include_directories : v4l2_utils_incdir) >>> + + dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev) >>> + +-- +2.34.1 >>> + >>> diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb >>> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb >>> index 52759ef18..eb38d9713 100644 >>> --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb >>> +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb >>> @@ -28,6 +28,7 @@ PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" >>> SRC_URI = "\ >>> git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \ >>> file://0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch \ >>> + file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch \ >>> " >>> SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1" >>> -- >>> 2.39.3 (Apple Git-146) >>> >>> >>> >>> >>> >>> -=-=-=-=-=-=-=-=-=-=-=- >>> Links: You receive all messages sent to this group. >>> View/Reply Online (#111004): https://lists.openembedded.org/g/openembedded-devel/message/111004 >>> Mute This Topic: https://lists.openembedded.org/mt/106851971/3616948 >>> Group Owner: openembedded-devel+owner@lists.openembedded.org >>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [mark.hatle@kernel.crashing.org] >>> -=-=-=-=-=-=-=-=-=-=-=- >>>
thanks, pulled it from your GH PR On Mon, Jun 24, 2024 at 12:33 PM Mark Hatle <mark.hatle@kernel.crashing.org> wrote: > > No idea what is going with my email. But I pushed to a github repository: > > https://github.com/mhatle/meta-openembedded.git mgh/master > > The specific commit: > > https://github.com/mhatle/meta-openembedded/commit/2323c8ec565b895d6e634d43061039b4a0d41ff2 > > Thanks! Sorry for the extra work. > > --Mark > > On 6/24/24 11:21 AM, Mark Hatle wrote: > > What kind of error are you getting? I just rebased and the system told me there > > were no differences. Did it get munged by my email sending? > > > > --Mark > > > > On 6/24/24 11:02 AM, Khem Raj wrote: > >> Hi Mark > >> > >> This patch does not apply cleanly on master or master-next, please > >> rebase it on either of these branches and resend > >> > >> Thanks > >> -Khem > >> > >> On Mon, Jun 24, 2024 at 8:28 AM Mark Hatle via lists.openembedded.org > >> <mark.hatle=kernel.crashing.org@lists.openembedded.org> wrote: > >>> > >>> From: Neel Gandhi <neel.gandhi@amd.com> > >>> > >>> Commit 9389d63fdddcab400cb0b243b74d47bf665aba18 removed a previous patch > >>> that caused the recipe to install the header and library files. Restore > >>> this behavior to the new meson based build system. > >>> > >>> Signed-off-by: Neel Gandhi <neel.gandhi@amd.com> > >>> Signed-off-by: Mark Hatle <mark.hatle@amd.com> > >>> Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> > >>> --- > >>> > >>> This is a resend, the first copy seems to have not been delivered to the list? > >>> > >>> We would like to get this applied to both master and scarthgap. Any questions > >>> let me know. > >>> > >>> ...l-media-ctl-header-and-library-files.patch | 78 +++++++++++++++++++ > >>> .../v4l2apps/v4l-utils_1.26.1.bb | 1 + > >>> 2 files changed, 79 insertions(+) > >>> create mode 100644 > >>> meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch > >>> > >>> diff --git > >>> a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch > >>> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch > >>> new file mode 100644 > >>> index 000000000..6c946d8c4 > >>> --- /dev/null > >>> +++ > >>> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch > >>> @@ -0,0 +1,78 @@ > >>> +From 3867fcfa4389c7fa271705f1fd1d4bfb74bc1bd1 Mon Sep 17 00:00:00 2001 > >>> +From: Neel Gandhi <neel.gandhi@amd.com> > >>> +Date: Wed, 5 Jun 2024 13:51:36 +0530 > >>> +Subject: [PATCH] media-ctl: Install media-ctl header and library files > >>> + > >>> +Install mediactl and v4l2subdev header and library > >>> +files, which may be required by 3rd party applications > >>> +to populate and control v4l2subdev device node tree > >>> + > >>> +Install of these files was removed in upstream commit > >>> +0911dce53b08b0df3066be2c75f67e8a314d8729. > >>> + > >>> +Upstream-Status: Denied > >>> + > >>> +v4l-utils maintainers do not promise a stable API for this library, and > >>> +do not currently have the time to do so. So exporting the API in this > >>> +way is fine, as long as we understand that it will change and users of > >>> +the API will need to adapt over time. > >>> + > >>> +Signed-off-by: Neel Gandhi <neel.gandhi@amd.com> > >>> +Signed-off-by: Mark Hatle <mark.hatle@amd.com> > >>> +--- > >>> + utils/media-ctl/meson.build | 28 +++++++++++++++++++++------- > >>> + 1 file changed, 21 insertions(+), 7 deletions(-) > >>> + > >>> +diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build > >>> +index 3a7b0c9a..40669b4c 100644 > >>> +--- a/utils/media-ctl/meson.build > >>> ++++ b/utils/media-ctl/meson.build > >>> +@@ -3,14 +3,24 @@ libmediactl_sources = files( > >>> + 'mediactl-priv.h', > >>> + ) > >>> + ++libmediactl_api = files( > >>> ++ 'mediactl.h', > >>> ++ 'v4l2subdev.h', > >>> ++) > >>> ++ > >>> ++install_headers(libmediactl_api, subdir: 'mediactl') > >>> ++ > >>> + libmediactl_deps = [ > >>> + dep_libudev, > >>> + ] > >>> + +-libmediactl = static_library('mediactl', > >>> +- libmediactl_sources, > >>> +- dependencies : libmediactl_deps, > >>> +- include_directories : v4l2_utils_incdir) > >>> ++libmediactl = library('mediactl', > >>> ++ libmediactl_sources, > >>> ++ soversion: '0', > >>> ++ version: '0.0.0', > >>> ++ install : true, > >>> ++ dependencies : libmediactl_deps, > >>> ++ include_directories : v4l2_utils_incdir) > >>> + + dep_libmediactl = declare_dependency(link_with : libmediactl) > >>> + +@@ -18,9 +28,13 @@ libv4l2subdev_sources = files('libv4l2subdev.c') > >>> + libv4l2subdev_sources += media_bus_format_names_h > >>> + libv4l2subdev_sources += media_bus_format_codes_h > >>> + +-libv4l2subdev = static_library('v4l2subdev', > >>> +- libv4l2subdev_sources, > >>> +- include_directories : v4l2_utils_incdir) > >>> ++libv4l2subdev = library('v4l2subdev', > >>> ++ libv4l2subdev_sources, > >>> ++ soversion: '0', > >>> ++ version: '0.0.0', > >>> ++ install : true, > >>> ++ dependencies : dep_libmediactl, > >>> ++ include_directories : v4l2_utils_incdir) > >>> + + dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev) > >>> + +-- +2.34.1 > >>> + > >>> diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb > >>> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb > >>> index 52759ef18..eb38d9713 100644 > >>> --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb > >>> +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb > >>> @@ -28,6 +28,7 @@ PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" > >>> SRC_URI = "\ > >>> git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \ > >>> file://0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch \ > >>> + file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch \ > >>> " > >>> SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1" > >>> -- > >>> 2.39.3 (Apple Git-146) > >>> > >>> > >>> > >>> > >>> > >>> -=-=-=-=-=-=-=-=-=-=-=- > >>> Links: You receive all messages sent to this group. > >>> View/Reply Online (#111004): https://lists.openembedded.org/g/openembedded-devel/message/111004 > >>> Mute This Topic: https://lists.openembedded.org/mt/106851971/3616948 > >>> Group Owner: openembedded-devel+owner@lists.openembedded.org > >>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [mark.hatle@kernel.crashing.org] > >>> -=-=-=-=-=-=-=-=-=-=-=- > >>>
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch new file mode 100644 index 000000000..6c946d8c4 --- /dev/null diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb index 52759ef18..eb38d9713 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb @@ -28,6 +28,7 @@ PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" SRC_URI = "\ git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \ file://0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch \ + file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch \ " SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1" -- 2.39.3 (Apple Git-146)