diff mbox series

[meta-oe] v4l-utils: Install media ctrl pkgconfig files

Message ID 20240910125239.21286-1-tolvupostur@gmail.com
State Accepted
Headers show
Series [meta-oe] v4l-utils: Install media ctrl pkgconfig files | expand

Commit Message

Einar Gunnarsson Sept. 10, 2024, 12:52 p.m. UTC 
Commit 5f453c3401e20eb5489fac4d3b54a5bf96d019ab installs
libraries but without the pkgconfig files, making them harder to link
to. This adds pkgconfig files for these libraries

Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com>
---
 ...l-Install-media-ctl-pkg-config-files.patch | 49 +++++++++++++++++++
 .../v4l2apps/v4l-utils_1.26.1.bb              |  1 +
 2 files changed, 50 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch

Comments

Einar Gunnarsson Sept. 10, 2024, 12:55 p.m. UTC | #1 
Hi all

I'm not sure if this one should be a separate patch file or simply added
to
file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch

I was not able to use the libraries without the pkgconfig files, but this
makes CMake
integration easy.
Best regards
Einar Jon

On Tue, 10 Sept 2024 at 14:52, Einar Jon Gunnarsson <tolvupostur@gmail.com>
wrote:

> Commit 5f453c3401e20eb5489fac4d3b54a5bf96d019ab installs
> libraries but without the pkgconfig files, making them harder to link
> to. This adds pkgconfig files for these libraries
>
> Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com>
> ---
>  ...l-Install-media-ctl-pkg-config-files.patch | 49 +++++++++++++++++++
>  .../v4l2apps/v4l-utils_1.26.1.bb              |  1 +
>  2 files changed, 50 insertions(+)
>  create mode 100644
> meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
>
> diff --git
> a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
> new file mode 100644
> index 000000000..8a009ae80
> --- /dev/null
> +++
> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
> @@ -0,0 +1,49 @@
> +From a422ddf7f8805d34ff1fbb46d335993c9cd05ead Mon Sep 17 00:00:00 2001
> +From: Einar Jon Gunnarsson <tolvupostur@gmail.com>
> +Date: Fri, 10 May 2024 11:56:17 +0200
> +Subject: [PATCH] media-ctl: Install media-ctl pkg-config files
> +
> +libv4l2subdev/libmediactl can not be used in projects without the
> +pkg-config files. This adds them as well.
> +
> +Upstream-Status: Denied
> +
> +This is an add-on to the previous patch:
> +0001-media-ctl-Install-media-ctl-header-and-library-files.patch
> +so same restrictions apply.
> +
> +Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com>
> +---
> + utils/media-ctl/meson.build | 12 ++++++++++++
> + 1 file changed, 12 insertions(+)
> +
> +diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build
> +index 40669b4c..6feba1af 100644
> +--- a/utils/media-ctl/meson.build
> ++++ b/utils/media-ctl/meson.build
> +@@ -38,6 +38,12 @@ libv4l2subdev = library('v4l2subdev',
> +
> + dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev)
> +
> ++pkg.generate(
> ++      libv4l2subdev,
> ++      name : 'libv4l2subdev',
> ++      version : meson.project_version(),
> ++      description : 'v4l2 subdev library')
> ++
> + media_ctl_sources = files(
> +     'media-ctl.c',
> +     'options.c',
> +@@ -55,3 +61,9 @@ media_ctl = executable('media-ctl',
> +                        dependencies : media_ctl_deps,
> +                        install : true,
> +                        include_directories : v4l2_utils_incdir)
> ++
> ++pkg.generate(
> ++     libmediactl,
> ++     name : 'libmediactl',
> ++     version : meson.project_version(),
> ++     description : 'v4l2 mediactl library')
> +--
> +2.43.5
> +
> 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 eb38d9713..8ab96760a 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
> @@ -29,6 +29,7 @@ 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 \
> +    file://0002-media-ctl-Install-media-ctl-pkg-config-files.patch \
>  "
>
>  SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1"
> --
> 2.43.5
>
>
Khem Raj Sept. 10, 2024, 2:35 p.m. UTC | #2 
On Tue, Sep 10, 2024 at 6:47 AM Einar Gunnarsson via lists.openembedded.org
<tolvupostur=gmail.com@lists.openembedded.org> wrote:

> Hi all
>
> I'm not sure if this one should be a separate patch file or simply added
> to
> file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch
>

Perhaps it could be squashed into that but it worries me that it was denied
upstream. What was the reason ? Is there a better way to do this?
That upstream will prefer

>
> I was not able to use the libraries without the pkgconfig files, but this
> makes CMake
> integration easy.
> Best regards
> Einar Jon
>
> On Tue, 10 Sept 2024 at 14:52, Einar Jon Gunnarsson <tolvupostur@gmail.com>
> wrote:
>
>> Commit 5f453c3401e20eb5489fac4d3b54a5bf96d019ab installs
>> libraries but without the pkgconfig files, making them harder to link
>> to. This adds pkgconfig files for these libraries
>>
>> Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com>
>> ---
>>  ...l-Install-media-ctl-pkg-config-files.patch | 49 +++++++++++++++++++
>>  .../v4l2apps/v4l-utils_1.26.1.bb              |  1 +
>>  2 files changed, 50 insertions(+)
>>  create mode 100644
>> meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
>>
>> diff --git
>> a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
>> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
>> new file mode 100644
>> index 000000000..8a009ae80
>> --- /dev/null
>> +++
>> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
>> @@ -0,0 +1,49 @@
>> +From a422ddf7f8805d34ff1fbb46d335993c9cd05ead Mon Sep 17 00:00:00 2001
>> +From: Einar Jon Gunnarsson <tolvupostur@gmail.com>
>> +Date: Fri, 10 May 2024 11:56:17 +0200
>> +Subject: [PATCH] media-ctl: Install media-ctl pkg-config files
>> +
>> +libv4l2subdev/libmediactl can not be used in projects without the
>> +pkg-config files. This adds them as well.
>> +
>> +Upstream-Status: Denied
>> +
>> +This is an add-on to the previous patch:
>> +0001-media-ctl-Install-media-ctl-header-and-library-files.patch
>> +so same restrictions apply.
>> +
>> +Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com>
>> +---
>> + utils/media-ctl/meson.build | 12 ++++++++++++
>> + 1 file changed, 12 insertions(+)
>> +
>> +diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build
>> +index 40669b4c..6feba1af 100644
>> +--- a/utils/media-ctl/meson.build
>> ++++ b/utils/media-ctl/meson.build
>> +@@ -38,6 +38,12 @@ libv4l2subdev = library('v4l2subdev',
>> +
>> + dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev)
>> +
>> ++pkg.generate(
>> ++      libv4l2subdev,
>> ++      name : 'libv4l2subdev',
>> ++      version : meson.project_version(),
>> ++      description : 'v4l2 subdev library')
>> ++
>> + media_ctl_sources = files(
>> +     'media-ctl.c',
>> +     'options.c',
>> +@@ -55,3 +61,9 @@ media_ctl = executable('media-ctl',
>> +                        dependencies : media_ctl_deps,
>> +                        install : true,
>> +                        include_directories : v4l2_utils_incdir)
>> ++
>> ++pkg.generate(
>> ++     libmediactl,
>> ++     name : 'libmediactl',
>> ++     version : meson.project_version(),
>> ++     description : 'v4l2 mediactl library')
>> +--
>> +2.43.5
>> +
>> 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 eb38d9713..8ab96760a 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
>> @@ -29,6 +29,7 @@ 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 \
>> +    file://0002-media-ctl-Install-media-ctl-pkg-config-files.patch \
>>  "
>>
>>  SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1"
>> --
>> 2.43.5
>>
>>
>
> --
> Regards
> Einar Jón
> +31 610 957234
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#112231):
> https://lists.openembedded.org/g/openembedded-devel/message/112231
> Mute This Topic: https://lists.openembedded.org/mt/108374820/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Einar Gunnarsson Sept. 11, 2024, 6:24 a.m. UTC | #3 
Hello Khem



On Tue, 10 Sept 2024 at 16:35, Khem Raj <raj.khem@gmail.com> wrote:

>
>
> On Tue, Sep 10, 2024 at 6:47 AM Einar Gunnarsson via
> lists.openembedded.org <tolvupostur=gmail.com@lists.openembedded.org>
> wrote:
>
>> Hi all
>>
>> I'm not sure if this one should be a separate patch file or simply added
>> to
>> file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch
>>
>
> Perhaps it could be squashed into that but it worries me that it was
> denied upstream. What was the reason ? Is there a better way to do this?
> That upstream will prefer
>

As stated in the linked commit
"The libraries APIs are not deemed to be stable yet, don't install the
libraries."
https://github.com/gjasny/v4l-utils/commit/0911dce53b08b0df3066be2c75f67e8a314d8729

Since we're ignoring that and installing the libraries anyway, we might as
well do it properly.


>
>> I was not able to use the libraries without the pkgconfig files, but this
>> makes CMake
>> integration easy.
>> Best regards
>> Einar Jon
>>
>> On Tue, 10 Sept 2024 at 14:52, Einar Jon Gunnarsson <
>> tolvupostur@gmail.com> wrote:
>>
>>> Commit 5f453c3401e20eb5489fac4d3b54a5bf96d019ab installs
>>> libraries but without the pkgconfig files, making them harder to link
>>> to. This adds pkgconfig files for these libraries
>>>
>>> Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com>
>>> ---
>>>  ...l-Install-media-ctl-pkg-config-files.patch | 49 +++++++++++++++++++
>>>  .../v4l2apps/v4l-utils_1.26.1.bb              |  1 +
>>>  2 files changed, 50 insertions(+)
>>>  create mode 100644
>>> meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
>>>
>>> diff --git
>>> a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
>>> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
>>> new file mode 100644
>>> index 000000000..8a009ae80
>>> --- /dev/null
>>> +++
>>> b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
>>> @@ -0,0 +1,49 @@
>>> +From a422ddf7f8805d34ff1fbb46d335993c9cd05ead Mon Sep 17 00:00:00 2001
>>> +From: Einar Jon Gunnarsson <tolvupostur@gmail.com>
>>> +Date: Fri, 10 May 2024 11:56:17 +0200
>>> +Subject: [PATCH] media-ctl: Install media-ctl pkg-config files
>>> +
>>> +libv4l2subdev/libmediactl can not be used in projects without the
>>> +pkg-config files. This adds them as well.
>>> +
>>> +Upstream-Status: Denied
>>> +
>>> +This is an add-on to the previous patch:
>>> +0001-media-ctl-Install-media-ctl-header-and-library-files.patch
>>> +so same restrictions apply.
>>> +
>>> +Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com>
>>> +---
>>> + utils/media-ctl/meson.build | 12 ++++++++++++
>>> + 1 file changed, 12 insertions(+)
>>> +
>>> +diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build
>>> +index 40669b4c..6feba1af 100644
>>> +--- a/utils/media-ctl/meson.build
>>> ++++ b/utils/media-ctl/meson.build
>>> +@@ -38,6 +38,12 @@ libv4l2subdev = library('v4l2subdev',
>>> +
>>> + dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev)
>>> +
>>> ++pkg.generate(
>>> ++      libv4l2subdev,
>>> ++      name : 'libv4l2subdev',
>>> ++      version : meson.project_version(),
>>> ++      description : 'v4l2 subdev library')
>>> ++
>>> + media_ctl_sources = files(
>>> +     'media-ctl.c',
>>> +     'options.c',
>>> +@@ -55,3 +61,9 @@ media_ctl = executable('media-ctl',
>>> +                        dependencies : media_ctl_deps,
>>> +                        install : true,
>>> +                        include_directories : v4l2_utils_incdir)
>>> ++
>>> ++pkg.generate(
>>> ++     libmediactl,
>>> ++     name : 'libmediactl',
>>> ++     version : meson.project_version(),
>>> ++     description : 'v4l2 mediactl library')
>>> +--
>>> +2.43.5
>>> +
>>> 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 eb38d9713..8ab96760a 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
>>> @@ -29,6 +29,7 @@ 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 \
>>> +    file://0002-media-ctl-Install-media-ctl-pkg-config-files.patch \
>>>  "
>>>
>>>  SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1"
>>> --
>>> 2.43.5
>>>
>>>
>>
>> --
>> Regards
>> Einar Jón
>> +31 610 957234
>>
>> 
>>
>>
diff mbox series

Patch

diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
new file mode 100644
index 000000000..8a009ae80
--- /dev/null
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
@@ -0,0 +1,49 @@ 
+From a422ddf7f8805d34ff1fbb46d335993c9cd05ead Mon Sep 17 00:00:00 2001
+From: Einar Jon Gunnarsson <tolvupostur@gmail.com>
+Date: Fri, 10 May 2024 11:56:17 +0200
+Subject: [PATCH] media-ctl: Install media-ctl pkg-config files
+
+libv4l2subdev/libmediactl can not be used in projects without the
+pkg-config files. This adds them as well.
+
+Upstream-Status: Denied
+
+This is an add-on to the previous patch:
+0001-media-ctl-Install-media-ctl-header-and-library-files.patch
+so same restrictions apply.
+
+Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com>
+---
+ utils/media-ctl/meson.build | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build
+index 40669b4c..6feba1af 100644
+--- a/utils/media-ctl/meson.build
++++ b/utils/media-ctl/meson.build
+@@ -38,6 +38,12 @@ libv4l2subdev = library('v4l2subdev',
+ 
+ dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev)
+ 
++pkg.generate(
++      libv4l2subdev,
++      name : 'libv4l2subdev',
++      version : meson.project_version(),
++      description : 'v4l2 subdev library')
++
+ media_ctl_sources = files(
+     'media-ctl.c',
+     'options.c',
+@@ -55,3 +61,9 @@ media_ctl = executable('media-ctl',
+                        dependencies : media_ctl_deps,
+                        install : true,
+                        include_directories : v4l2_utils_incdir)
++
++pkg.generate(
++     libmediactl,
++     name : 'libmediactl',
++     version : meson.project_version(),
++     description : 'v4l2 mediactl library')
+-- 
+2.43.5
+
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 eb38d9713..8ab96760a 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
@@ -29,6 +29,7 @@  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 \
+    file://0002-media-ctl-Install-media-ctl-pkg-config-files.patch \
 "
 
 SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1"