Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: libcamera-0.2, pipewire: update to 1.0.4
@ 2024-03-23 22:37 cinerea0
  2024-04-16 22:13 ` [PR PATCH] [Updated] " cinerea0
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: cinerea0 @ 2024-03-23 22:37 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages pipewire
https://github.com/void-linux/void-packages/pull/49489

New package: libcamera-0.2, pipewire: update to 1.0.4
#### Testing the changes
- I tested the changes in this PR: **YES**

---

A lot of the libspa-* packages provide functionality that should be included by default in the main pipewire package. We acknowledged this by making pipewire depend on some of these subpackages, even though they can't be built separately.
This PR re-absorbs the following libspa-* subpackages:

* libspa-alsa
* libspa-audioconvert
* libspa-audiomixer
* libspa-control
* libspa-v4l2
* libspa-videoconvert

I considered absorbing libspa-jack and libspa-vulkan as well. Neither have any external dependencies; I think they just define API functionality. Let me know what you think.



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

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

From dde1e2210610b2707212efa8c551bb71ef56f8f1 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 22 Mar 2024 21:28:43 -0400
Subject: [PATCH 1/2] New package: libcamera-0.2.0

---
 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 a60c03a1473078..c2cde5c4259817 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4302,3 +4302,5 @@ 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
 libscfg.so libscfg-0.1.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 92df382b87dc3695016be951ddd8fd23fd74e1a9 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 22 Mar 2024 21:38:32 -0400
Subject: [PATCH 2/2] pipewire: update to 1.0.4, absorb core subpackages

The following SPA plugins provide core functionality and should be
provided by the main package:
* libspa-alsa
* libspa-audioconvert
* libspa-audiomixer
* libspa-control
* libspa-v4l2
* libspa-videoconvert
---
 common/shlibs             | 12 ++++----
 srcpkgs/pipewire/template | 63 ++++++++++++++++++---------------------
 2 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c2cde5c4259817..e85fd4a3805f4d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3427,14 +3427,14 @@ libre.so.18 re-3.6.0_1
 libtpms.so.0 libtpms-0.9.0_1
 libswtpm_libtpms.so.0 libswtpm-0.6.1_1
 libspandsp.so.2 spandsp-0.0.6_1
-libspa-alsa.so libspa-alsa-0.3.6_1
-libspa-audioconvert.so libspa-audioconvert-0.3.6_1
-libspa-audiomixer.so libspa-audiomixer-0.3.6_1
+libspa-alsa.so pipewire-1.0.4_1
+libspa-audioconvert.so pipewire-1.0.4_1
+libspa-audiomixer.so pipewire-1.0.4_1
 libspa-bluez5.so libspa-bluetooth-0.3.6_1
-libspa-control.so libspa-control-0.3.6_1
+libspa-control.so pipewire-1.0.4_1
 libspa-jack.so libspa-jack-0.3.6_1
-libspa-v4l2.so libspa-v4l2-0.3.6_1
-libspa-videoconvert.so libspa-videoconvert-0.3.6_1
+libspa-v4l2.so pipewire-1.0.4_1
+libspa-videoconvert.so pipewire-1.0.4_1
 libspa-vulkan.so libspa-vulkan-0.3.6_1
 libshp.so.1 shapelib-1.4.1_1
 libantlr3c.so libantlr3c-3.4_1
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 4848292c1d8403..334e9bc50e66dd 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,14 +1,14 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=1.0.3
-revision=2
+version=1.0.4
+revision=1
 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
@@ -27,10 +27,8 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  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)"
-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"
+ $(vopt_if selinux libselinux-devel) libcamera-devel"
+depends="pulseaudio-utils virtual?pipewire-session-manager"
 checkdepends="pulseaudio-utils"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
@@ -38,7 +36,7 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=bddb29b9310c344ca069df410f6f02b7f3d8c518811c0505c7fe62d8428fd767
+checksum=ce00e0cee3eefaf8e92eecf5d28985f6dab43ccfe7e704d41b0cfda8376a187c
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
 
@@ -46,7 +44,8 @@ build_options="ffado sdl2 selinux"
 desc_option_ffado="Enable support for FireWire based audio devices"
 desc_option_selinux="Enable SELinux integration"
 
-replaces="libpulseaudio-pipewire>=0"
+replaces="libpulseaudio-pipewire>=0 libspa-alsa>=0 libspa-audioconvert>=0
+ libspa-audiomixer>=0 libspa-control>=0 libspa-v4l2>=0 libspa-videoconvert>=0"
 
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 	makedepends+=" ldacBT-devel"
@@ -85,38 +84,34 @@ pipewire-devel_package() {
 }
 
 libspa-alsa_package() {
-	short_desc+=" - alsa plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/alsa
-	}
+	build_style=meta
+	short_desc+=" - alsa plugins (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
 }
 
 libspa-audioconvert_package() {
-	short_desc+=" - audioconvert plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/audioconvert
-	}
+	build_style=meta
+	short_desc+=" - audioconvert plugins (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
 }
 
 libspa-audiomixer_package() {
-	short_desc+=" - audiomixer plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/audiomixer
-	}
+	build_style=meta
+	short_desc+=" - audiomixer plugins (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
 }
 
 libspa-bluetooth_package() {
-	short_desc+=" - bluetooth plugins"
+	short_desc+=" - bluetooth support"
 	pkg_install() {
 		vmove usr/lib/spa-0.2/bluez5
 	}
 }
 
 libspa-control_package() {
-	short_desc+=" - control plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/control
-	}
+	build_style=meta
+	short_desc+=" - control plugins (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
 }
 
 libspa-jack_package() {
@@ -127,23 +122,22 @@ libspa-jack_package() {
 }
 
 libspa-v4l2_package() {
-	short_desc+=" - v4l2 plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/v4l2
-	}
+	build_style=meta
+	short_desc+=" - v4l2 plugins (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
 }
 
 libspa-videoconvert_package() {
-	short_desc+=" - videoconvert plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/videoconvert
-	}
+	build_style=meta
+	short_desc+=" - videoconvert plugins (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
 }
 
 libspa-vulkan_package() {
 	short_desc+=" - vulkan plugins"
 	pkg_install() {
 		vmove usr/lib/spa-0.2/vulkan
+		vmove usr/share/pipewire/pipewire-vulkan.conf
 	}
 }
 
@@ -170,6 +164,7 @@ libjack-pipewire_package() {
 		vmove usr/lib/pipewire-0.3/jack
 		vmove usr/bin/pw-jack
 		vmove usr/share/man/man1/pw-jack.1
+		vmove usr/share/pipewire/jack.conf
 	}
 }
 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] New package: libcamera-0.2, pipewire: update to 1.0.4
  2024-03-23 22:37 [PR PATCH] New package: libcamera-0.2, pipewire: update to 1.0.4 cinerea0
@ 2024-04-16 22:13 ` cinerea0
  2024-04-21 20:39 ` [PR PATCH] [Updated] New package: libcamera-0.2, pipewire: update to 1.0.5 cinerea0
  2024-04-22 14:58 ` [PR PATCH] [Merged]: " cinerea0
  2 siblings, 0 replies; 4+ messages in thread
From: cinerea0 @ 2024-04-16 22:13 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages pipewire
https://github.com/void-linux/void-packages/pull/49489

New package: libcamera-0.2, pipewire: update to 1.0.4
#### Testing the changes
- I tested the changes in this PR: **YES**

---

A lot of the libspa-* packages provide functionality that should be included by default in the main pipewire package. We acknowledged this by making pipewire depend on some of these subpackages, even though they can't be built separately.
This PR re-absorbs the following libspa-* subpackages:

* libspa-alsa
* libspa-audioconvert
* libspa-audiomixer
* libspa-control
* libspa-v4l2
* libspa-videoconvert

I considered absorbing libspa-jack and libspa-vulkan as well. Neither have any external dependencies; I think they just define API functionality. Let me know what you think.



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

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

From 2d0e185c0dc21f36a765f74a400805fb2d71ea74 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 15 Apr 2024 21:17:19 -0400
Subject: [PATCH 1/2] New package: libcamera-0.2.0

---
 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 60179b1306b770..29c263d6d05e97 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4305,3 +4305,5 @@ force-stage.so.0.1 void-force-stage-0.1_1
 libliftoff.so.0 libliftoff-0.4.1_1
 libscfg.so libscfg-0.1.1_1
 libmsgraph-0.so.1 msgraph-0.2.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 235a17a45e2be8deef3965f4d737173899fbbf6c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 15 Apr 2024 21:17:40 -0400
Subject: [PATCH 2/2] pipewire: update to 1.0.5

---
 common/shlibs             | 12 ++++----
 srcpkgs/pipewire/template | 63 ++++++++++++++++++---------------------
 2 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 29c263d6d05e97..b09b9323a9d1eb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3429,14 +3429,14 @@ libre.so.18 re-3.6.0_1
 libtpms.so.0 libtpms-0.9.0_1
 libswtpm_libtpms.so.0 libswtpm-0.6.1_1
 libspandsp.so.2 spandsp-0.0.6_1
-libspa-alsa.so libspa-alsa-0.3.6_1
-libspa-audioconvert.so libspa-audioconvert-0.3.6_1
-libspa-audiomixer.so libspa-audiomixer-0.3.6_1
+libspa-alsa.so pipewire-1.0.5_1
+libspa-audioconvert.so pipewire-1.0.5_1
+libspa-audiomixer.so pipewire-1.0.5_1
 libspa-bluez5.so libspa-bluetooth-0.3.6_1
-libspa-control.so libspa-control-0.3.6_1
+libspa-control.so pipewire-1.0.5_1
 libspa-jack.so libspa-jack-0.3.6_1
-libspa-v4l2.so libspa-v4l2-0.3.6_1
-libspa-videoconvert.so libspa-videoconvert-0.3.6_1
+libspa-v4l2.so pipewire-1.0.5_1
+libspa-videoconvert.so pipewire-1.0.5_1
 libspa-vulkan.so libspa-vulkan-0.3.6_1
 libshp.so.1 shapelib-1.4.1_1
 libantlr3c.so libantlr3c-3.4_1
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 4848292c1d8403..41c40da8cad8ad 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,14 +1,14 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=1.0.3
-revision=2
+version=1.0.5
+revision=1
 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
@@ -27,10 +27,8 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  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)"
-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"
+ $(vopt_if selinux libselinux-devel) libcamera-devel"
+depends="pulseaudio-utils virtual?pipewire-session-manager"
 checkdepends="pulseaudio-utils"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
@@ -38,7 +36,7 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=bddb29b9310c344ca069df410f6f02b7f3d8c518811c0505c7fe62d8428fd767
+checksum=c5a5de26d684a1a84060ad7b6131654fb2835e03fccad85059be92f8e3ffe993
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
 
@@ -46,7 +44,8 @@ build_options="ffado sdl2 selinux"
 desc_option_ffado="Enable support for FireWire based audio devices"
 desc_option_selinux="Enable SELinux integration"
 
-replaces="libpulseaudio-pipewire>=0"
+replaces="libpulseaudio-pipewire>=0 libspa-alsa>=0 libspa-audioconvert>=0
+ libspa-audiomixer>=0 libspa-control>=0 libspa-v4l2>=0 libspa-videoconvert>=0"
 
 if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 	makedepends+=" ldacBT-devel"
@@ -85,38 +84,34 @@ pipewire-devel_package() {
 }
 
 libspa-alsa_package() {
-	short_desc+=" - alsa plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/alsa
-	}
+	build_style=meta
+	short_desc+=" - alsa plugins (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
 }
 
 libspa-audioconvert_package() {
-	short_desc+=" - audioconvert plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/audioconvert
-	}
+	build_style=meta
+	short_desc+=" - audioconvert plugins (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
 }
 
 libspa-audiomixer_package() {
-	short_desc+=" - audiomixer plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/audiomixer
-	}
+	build_style=meta
+	short_desc+=" - audiomixer plugins (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
 }
 
 libspa-bluetooth_package() {
-	short_desc+=" - bluetooth plugins"
+	short_desc+=" - bluetooth support"
 	pkg_install() {
 		vmove usr/lib/spa-0.2/bluez5
 	}
 }
 
 libspa-control_package() {
-	short_desc+=" - control plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/control
-	}
+	build_style=meta
+	short_desc+=" - control plugins (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
 }
 
 libspa-jack_package() {
@@ -127,23 +122,22 @@ libspa-jack_package() {
 }
 
 libspa-v4l2_package() {
-	short_desc+=" - v4l2 plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/v4l2
-	}
+	build_style=meta
+	short_desc+=" - v4l2 plugins (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
 }
 
 libspa-videoconvert_package() {
-	short_desc+=" - videoconvert plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/videoconvert
-	}
+	build_style=meta
+	short_desc+=" - videoconvert plugins (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
 }
 
 libspa-vulkan_package() {
 	short_desc+=" - vulkan plugins"
 	pkg_install() {
 		vmove usr/lib/spa-0.2/vulkan
+		vmove usr/share/pipewire/pipewire-vulkan.conf
 	}
 }
 
@@ -170,6 +164,7 @@ libjack-pipewire_package() {
 		vmove usr/lib/pipewire-0.3/jack
 		vmove usr/bin/pw-jack
 		vmove usr/share/man/man1/pw-jack.1
+		vmove usr/share/pipewire/jack.conf
 	}
 }
 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] New package: libcamera-0.2, pipewire: update to 1.0.5
  2024-03-23 22:37 [PR PATCH] New package: libcamera-0.2, pipewire: update to 1.0.4 cinerea0
  2024-04-16 22:13 ` [PR PATCH] [Updated] " cinerea0
@ 2024-04-21 20:39 ` cinerea0
  2024-04-22 14:58 ` [PR PATCH] [Merged]: " cinerea0
  2 siblings, 0 replies; 4+ messages in thread
From: cinerea0 @ 2024-04-21 20:39 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages pipewire
https://github.com/void-linux/void-packages/pull/49489

New package: libcamera-0.2, pipewire: update to 1.0.5
#### Testing the changes
- I tested the changes in this PR: **YES**

---

A lot of the libspa-* packages provide functionality that should be included by default in the main pipewire package. We acknowledged this by making pipewire depend on some of these subpackages, even though they can't be built separately.
This PR re-absorbs the following libspa-* subpackages:

* libspa-alsa
* libspa-audioconvert
* libspa-audiomixer
* libspa-control
* libspa-v4l2
* libspa-videoconvert

I considered absorbing libspa-jack and libspa-vulkan as well. Neither have any external dependencies; I think they just define API functionality. Let me know what you think.



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

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

From f656f13d4b0022d7ab51ff7367cf33198261e1b8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 15 Apr 2024 21:17:19 -0400
Subject: [PATCH 1/2] New package: libcamera-0.2.0

---
 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 61a28fdc5b7436..9df69605150b67 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4303,3 +4303,5 @@ libliftoff.so.0 libliftoff-0.4.1_1
 libscfg.so libscfg-0.1.1_1
 libmsgraph-0.so.1 msgraph-0.2.1_1
 libgtk-session-lock.so.0 gtk-session-lock-0.2.0_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 f7b8ecc191f9dfa7c67eb703b052d0944d6547d2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 21 Apr 2024 16:38:35 -0400
Subject: [PATCH 2/2] pipewire: update to 1.0.5

---
 srcpkgs/pipewire/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 4848292c1d8403..45fb07c8e99b9a 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,14 +1,14 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=1.0.3
-revision=2
+version=1.0.5
+revision=1
 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
@@ -27,7 +27,7 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  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)"
+ $(vopt_if selinux libselinux-devel) libcamera-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"
@@ -38,7 +38,7 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=bddb29b9310c344ca069df410f6f02b7f3d8c518811c0505c7fe62d8428fd767
+checksum=c5a5de26d684a1a84060ad7b6131654fb2835e03fccad85059be92f8e3ffe993
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: New package: libcamera-0.2, pipewire: update to 1.0.5
  2024-03-23 22:37 [PR PATCH] New package: libcamera-0.2, pipewire: update to 1.0.4 cinerea0
  2024-04-16 22:13 ` [PR PATCH] [Updated] " cinerea0
  2024-04-21 20:39 ` [PR PATCH] [Updated] New package: libcamera-0.2, pipewire: update to 1.0.5 cinerea0
@ 2024-04-22 14:58 ` cinerea0
  2 siblings, 0 replies; 4+ messages in thread
From: cinerea0 @ 2024-04-22 14:58 UTC (permalink / raw)
  To: ml

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

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

New package: libcamera-0.2, pipewire: update to 1.0.5
https://github.com/void-linux/void-packages/pull/49489

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

---

I decided to split off the redesign of the subpackages into its own RFC so as not to hold up this update any more.



^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-22 14:58 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-23 22:37 [PR PATCH] New package: libcamera-0.2, pipewire: update to 1.0.4 cinerea0
2024-04-16 22:13 ` [PR PATCH] [Updated] " cinerea0
2024-04-21 20:39 ` [PR PATCH] [Updated] New package: libcamera-0.2, pipewire: update to 1.0.5 cinerea0
2024-04-22 14:58 ` [PR PATCH] [Merged]: " cinerea0

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).