[PR PATCH] Pipewire+libcamera

[PR PATCH] Pipewire+libcamera

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]

There is a new pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages pipewire+libcamera
https://github.com/void-linux/void-packages/pull/48908

Pipewire+libcamera
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Based on the [previous attempt](https://github.com/void-linux/void-packages/pull/41263) to package libcamera.

@cinerea0 

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48908.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire+libcamera-48908.patch --]
[-- Type: text/x-diff, Size: 3954 bytes --]

From fcd69afe9a374df24e07b446d9c6e7e8f9f3b908 Mon Sep 17 00:00:00 2001
From: Damiano Ognissanti <ognissanti@hotmail.se>
Date: Sat, 24 Dec 2022 10:32:02 +0100
Subject: [PATCH 1/2] New package: libcamera-0.0.5

Co-authored-by: Michal Vasilek <michal@vasilek.cz>

New package: libcamera-0.0.5

Add arguments for building on musl
---
 common/shlibs              |  2 ++
 srcpkgs/libcamera-devel    |  1 +
 srcpkgs/libcamera/template | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/libcamera-devel
 create mode 100644 srcpkgs/libcamera/template

diff --git a/common/shlibs b/common/shlibs
index cde1106f7dbeff..86cb7bd420310a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4284,3 +4284,5 @@ libunicode_ucd.so.0.4 libunicode-0.4.0_1
 libunicode_loader.so.0.4 libunicode-0.4.0_1
 force-stage.so.0.1 void-force-stage-0.1_1
 libliftoff.so.0 libliftoff-0.4.1_1
+libcamera.so.0.2 libcamera-0.2.0_1
+libcamera-base.so.0.2 libcamera-0.2.0_1
diff --git a/srcpkgs/libcamera-devel b/srcpkgs/libcamera-devel
new file mode 120000
index 00000000000000..40d2c1b040e650
--- /dev/null
+++ b/srcpkgs/libcamera-devel
@@ -0,0 +1 @@
+libcamera
\ No newline at end of file
diff --git a/srcpkgs/libcamera/template b/srcpkgs/libcamera/template
new file mode 100644
index 00000000000000..d552afde852a55
--- /dev/null
+++ b/srcpkgs/libcamera/template
@@ -0,0 +1,24 @@
+# Template file for 'libcamera'
+pkgname=libcamera
+version=0.2.0
+revision=1
+build_style=meson
+configure_args="-Dgstreamer=enabled -Dwerror=false -Dv4l2=true"
+hostmakedepends="pkg-config python3-yaml python3-ply python3-Jinja2"
+makedepends="openssl-devel libevent-devel gst-plugins-base1-devel gstreamer1-devel libyaml-devel"
+short_desc="Complex camera support library for Linux, Android, and ChromeOS"
+maintainer="Damiano Ognissanti <ognissanti@hotmail.se>"
+license="LGPL-2.1-or-later, GPL-2.0-or-later"
+homepage="https://libcamera.org/"
+distfiles="https://github.com/libcamera-org/libcamera/archive/refs/tags/v${version}.tar.gz"
+checksum=7192ab939c98d9766877f65fb66de32f274e28994e249f5bee91957559d2e436
+
+libcamera-devel_package() {
+	depends="libcamera-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 89d3ff9a3ef0fc1d20127c35d396fda4c33335c4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 24 Feb 2024 10:45:02 +0200
Subject: [PATCH 2/2] pipewire: rebuild with libcamera support.

---
 srcpkgs/pipewire/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index d23956e13e3a78..49e9d97d20bde8 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,14 +1,14 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=1.0.3
-revision=1
+revision=2
 build_style=meson
 configure_args="
  --auto-features=enabled
  -Db_ndebug=false
  -Ddocs=enabled
  -Dman=enabled
- -Dlibcamera=disabled
+ -Dlibcamera=enabled
  -Droc=disabled
  $(vopt_feature sdl2 sdl2)
  -Dsystemd=disabled
@@ -26,8 +26,8 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel Vulkan-Headers
  vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
  readline-devel openssl-devel lilv-devel libcanberra-devel dbus-devel
- libmysofa-devel opus-devel $(vopt_if ffado libffado-devel) liblc3-devel
- $(vopt_if selinux libselinux-devel)"
+ libmysofa-devel opus-devel libcamera-devel $(vopt_if ffado libffado-devel)
+ liblc3-devel $(vopt_if selinux libselinux-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
  libspa-v4l2>=${version}_${revision} pulseaudio-utils virtual?pipewire-session-manager"

Re: [PR REVIEW] Pipewire+libcamera

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/48908#discussion_r1518657524

Comment:
Just delete the line altogether, the option is auto and will pick up the dependency when present.

Re: [PR REVIEW] Pipewire+libcamera

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 222 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/48908#discussion_r1518657231

Comment:
@damianoognissanti, are you still interested in maintaining this package?

Re: [PR REVIEW] Pipewire+libcamera

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/48908#discussion_r1518657701

Comment:
Please add libcamera to the end of the dependency list.

Re: [PR REVIEW] Pipewire+libcamera

[damianoognissanti]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

New review comment by damianoognissanti on void-packages repository

https://github.com/void-linux/void-packages/pull/48908#discussion_r1519292704

Comment:
I'm not sure exactly how this works. I added a pull request and updated this for some time, but it never made it into the repo. My pull request was also automatically closed in august 2023, so I didn't try to update it any more (on github). Am I supposed to continue to update the template and hope that it will be added, or what is the correct way forward?

Re: [PR REVIEW] Pipewire+libcamera

[damianoognissanti]

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

New review comment by damianoognissanti on void-packages repository

https://github.com/void-linux/void-packages/pull/48908#discussion_r1519292704

Comment:
@cinerea0 I'm not sure exactly how this works. I added a pull request and updated this for some time, but it never made it into the repo. My pull request was also automatically closed in august 2023, so I didn't try to update it any more (on github). Am I supposed to continue to update the template and hope that it will be added, or what is the correct way forward?

Re: [PR REVIEW] Pipewire+libcamera

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 266 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/48908#discussion_r1519799482

Comment:
It was not accepted back then, but it may be accepted now. In the event it is, you would be listed as the maintainer.

Re: [PR REVIEW] Pipewire+libcamera

[damianoognissanti]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New review comment by damianoognissanti on void-packages repository

https://github.com/void-linux/void-packages/pull/48908#discussion_r1521235500

Comment:
@cinerea0 sure, I can be a maintainer for libcamera 

Re: [PR REVIEW] Pipewire+libcamera

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/48908#discussion_r1521250262

Comment:
Explicit instead of auto has the advantage that the build will fail if the dep can't be found for any reason.

Re: [PR REVIEW] Pipewire+libcamera

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/48908#discussion_r1521479437

Comment:
Fair enough, for something like this it should probably stay.

Re: Pipewire+libcamera

[damianoognissanti]

[-- Attachment #1: Type: text/plain, Size: 1708 bytes --]

New comment by damianoognissanti on void-packages repository

https://github.com/void-linux/void-packages/pull/48908#issuecomment-1991749927

Comment:
Btw. Is there anything I need to do now before the pull request to help?


________________________________
From: cinerea0 ***@***.***>
Sent: Monday, March 11, 2024 3:17:44 PM
To: void-linux/void-packages ***@***.***>
Cc: damianoognissanti ***@***.***>; Mention ***@***.***>
Subject: Re: [void-linux/void-packages] Pipewire+libcamera (PR #48908)


@cinerea0 commented on this pull request.

________________________________

In srcpkgs/libcamera/template<https://github.com/void-linux/void-packages/pull/48908#discussion_r1519799482>:

> @@ -0,0 +1,24 @@
+# Template file for 'libcamera'
+pkgname=libcamera
+version=0.2.0
+revision=1
+build_style=meson
+configure_args="-Dgstreamer=enabled -Dwerror=false -Dv4l2=true"
+hostmakedepends="pkg-config python3-yaml python3-ply python3-Jinja2"
+makedepends="openssl-devel libevent-devel gst-plugins-base1-devel gstreamer1-devel libyaml-devel"
+short_desc="Complex camera support library for Linux, Android, and ChromeOS"
+maintainer="Damiano Ognissanti ***@***.***>"


It was not accepted back then, but it may be accepted now. In the event it is, you would be listed as the maintainer.

—
Reply to this email directly, view it on GitHub<https://github.com/void-linux/void-packages/pull/48908#discussion_r1519799482>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AXJWAI5DG4K4S5SXG6JVT2LYXW4IRAVCNFSM6AAAAABDX3CWI6VHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMYTSMRXHE3DEMRTG4>.
You are receiving this because you were mentioned.Message ID: ***@***.***>

Re: Pipewire+libcamera

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/48908#issuecomment-1991757412

Comment:
No, at this point it's up to @mobinmob to address the comment about dependency order and resolve merge conflicts.

Re: [PR PATCH] [Closed]: Pipewire+libcamera

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1190 bytes --]

There's a closed pull request on the void-packages repository

Pipewire+libcamera
https://github.com/void-linux/void-packages/pull/48908

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Based on the [previous attempt](https://github.com/void-linux/void-packages/pull/41263) to package libcamera.

@cinerea0 

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->