From 25a4101e32e38bdfe5c14d78c780de0997987db3 Mon Sep 17 00:00:00 2001 From: Stacy Harper Date: Sat, 30 Apr 2022 16:18:32 +0200 Subject: [PATCH] main/sxmo-common: upgrade to 1.9.0 (MR 3101) [ci:skip-build] already built successfully in CI --- main/sxmo-common/APKBUILD | 27 +-- main/sxmo-common/pipewire-alsa.conf | 1 - main/sxmo-common/pipewire.conf | 248 ---------------------- main/sxmo-common/sxmo-common.post-install | 1 - 4 files changed, 11 insertions(+), 266 deletions(-) delete mode 100644 main/sxmo-common/pipewire-alsa.conf delete mode 100644 main/sxmo-common/pipewire.conf diff --git a/main/sxmo-common/APKBUILD b/main/sxmo-common/APKBUILD index 07323ab5a..15fef8b3e 100644 --- a/main/sxmo-common/APKBUILD +++ b/main/sxmo-common/APKBUILD @@ -1,8 +1,8 @@ # Reference: https://postmarketos.org/uipkg # Maintainer: Miles Alan pkgname=sxmo-common -pkgver=1.8.2 -pkgrel=3 +pkgver=1.9.0 +pkgrel=0 pkgdesc="Simple Mobile: Core package to build custom SXMO desktop environments" url="http://sr.ht/~mil/Sxmo" arch="noarch !armhf" @@ -10,6 +10,7 @@ license="MIT" depends=" adwaita-icon-theme alsa-utils + callaudiod codemadness-frontends dnsmasq dunstify @@ -20,6 +21,7 @@ depends=" geoclue inotify-tools light + linux-tools-iio lisgd mediainfo mmsd-tng @@ -31,13 +33,17 @@ depends=" ncurses networkmanager networkmanager-cli - networkmanager-tui networkmanager-openrc + networkmanager-tui pamixer + pipewire + pipewire-pulse pn polkit polkit-openrc postmarketos-base-ui + pulseaudio-utils + superd sxmo-utils sxmo-utils-openrc terminus-font @@ -47,16 +53,15 @@ depends=" v4l-utils vim vvmd - yt-dlp + wireplumber xdg-user-dirs + yt-dlp " install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" subpackages="$pkgname-qt_tweaks $pkgname-bluetooth" source=" sxmo-qt-mobile-controls.sh postmarketos.conf - pipewire.conf - pipewire-alsa.conf " options="!check" # has no tests @@ -80,9 +85,6 @@ bluetooth() { dbus-x11 bluez bluez-openrc - pipewire - wireplumber - pipewire-pulse pipewire-spa-bluez " replaces="bluez" # Autoenable controllers @@ -90,11 +92,6 @@ bluetooth() { install -Dm644 "$srcdir"/postmarketos.conf \ "$subpkgdir"/etc/bluetooth/main.conf mkdir -p "$subpkgdir"/etc/modules-load.d - install -Dm644 "$srcdir"/pipewire-alsa.conf \ - "$subpkgdir"/etc/modules-load.d/pipewire-alsa.conf - mkdir -p "$subpkgdir"/etc/pipewire - install -Dm644 "$srcdir"/pipewire.conf \ - "$subpkgdir"/etc/pipewire/pipewire.conf install="$subpkgname.post-install $subpkgname.pre-deinstall" provides="postmarketos-ui-sxmo-bluetooth=$pkgver-r$pkgrel" } @@ -103,6 +100,4 @@ bluetooth() { sha512sums=" bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1 sxmo-qt-mobile-controls.sh cc4e4404b135ce484e0976b243973e39f1137aa9dd5e9297f767b2ea65b719ca82e84cc66cb093950ce330dbf786981ced2e5b0d16350deb5706a08ffccb4606 postmarketos.conf -ce1fd5011d83a99f981b43e9cba98c7f2daaa2bdfbe19f4512fbb5ea331610dddf29ffb272ebdbe31c5f9d9c68dd5d5494c17fb769e69e2d9cf325c4493b9fa9 pipewire.conf -1cd9ff64ef0b53281cc73bb64539a2222b38ce92566154587229b78e39e8b2825b0590714c451c6e65cd5a5a31e3272ab38f8fba31afff6e64e7dcff902abfc1 pipewire-alsa.conf " diff --git a/main/sxmo-common/pipewire-alsa.conf b/main/sxmo-common/pipewire-alsa.conf deleted file mode 100644 index 6c85fde3a..000000000 --- a/main/sxmo-common/pipewire-alsa.conf +++ /dev/null @@ -1 +0,0 @@ -snd_seq diff --git a/main/sxmo-common/pipewire.conf b/main/sxmo-common/pipewire.conf deleted file mode 100644 index 5d6700441..000000000 --- a/main/sxmo-common/pipewire.conf +++ /dev/null @@ -1,248 +0,0 @@ -# Daemon config file for PipeWire version "0.3.40" # -# -# Copy and edit this file in /etc/pipewire for system-wide changes -# or in ~/.config/pipewire for local changes. - -context.properties = { - ## Configure properties in the system. - #library.name.system = support/libspa-support - #context.data-loop.library.name.system = support/libspa-support - #support.dbus = true - #link.max-buffers = 64 - link.max-buffers = 16 # version < 3 clients can't handle more - #mem.warn-mlock = false - #mem.allow-mlock = true - #mem.mlock-all = false - #clock.power-of-two-quantum = true - #log.level = 2 - #cpu.zero.denormals = true - - core.daemon = true # listening for socket connections - core.name = pipewire-0 # core name and socket name - - ## Properties for the DSP configuration. - #default.clock.rate = 48000 - #default.clock.allowed-rates = [ 48000 ] - #default.clock.quantum = 1024 - #default.clock.min-quantum = 32 - #default.clock.max-quantum = 8192 - #default.video.width = 640 - #default.video.height = 480 - #default.video.rate.num = 25 - #default.video.rate.denom = 1 - # - # These overrides are only applied when running in a vm. - vm.overrides = { - default.clock.min-quantum = 1024 - } -} - -context.spa-libs = { - # = - # - # Used to find spa factory names. It maps an spa factory name - # regular expression to a library name that should contain - # that factory. - # - audio.convert.* = audioconvert/libspa-audioconvert - api.alsa.* = alsa/libspa-alsa - api.v4l2.* = v4l2/libspa-v4l2 - api.libcamera.* = libcamera/libspa-libcamera - api.bluez5.* = bluez5/libspa-bluez5 - api.vulkan.* = vulkan/libspa-vulkan - api.jack.* = jack/libspa-jack - support.* = support/libspa-support - #videotestsrc = videotestsrc/libspa-videotestsrc - #audiotestsrc = audiotestsrc/libspa-audiotestsrc -} - -context.modules = [ - #{ name = - # [ args = { = ... } ] - # [ flags = [ [ ifexists ] [ nofail ] ] - #} - # - # Loads a module with the given parameters. - # If ifexists is given, the module is ignored when it is not found. - # If nofail is given, module initialization failures are ignored. - # - - # Uses RTKit to boost the data thread priority. - { name = libpipewire-module-rtkit - args = { - #nice.level = -11 - #rt.prio = 88 - #rt.time.soft = 2000000 - #rt.time.hard = 2000000 - } - flags = [ ifexists nofail ] - } - - # Set thread priorities without using RTKit. - #{ name = libpipewire-module-rt - # args = { - # nice.level = -11 - # rt.prio = 88 - # rt.time.soft = 2000000 - # rt.time.hard = 2000000 - # } - # flags = [ ifexists nofail ] - #} - - # The native communication protocol. - { name = libpipewire-module-protocol-native } - - # The profile module. Allows application to access profiler - # and performance data. It provides an interface that is used - # by pw-top and pw-profiler. - { name = libpipewire-module-profiler } - - # Allows applications to create metadata objects. It creates - # a factory for Metadata objects. - { name = libpipewire-module-metadata } - - # Creates a factory for making devices that run in the - # context of the PipeWire server. - { name = libpipewire-module-spa-device-factory } - - # Creates a factory for making nodes that run in the - # context of the PipeWire server. - { name = libpipewire-module-spa-node-factory } - - # Allows creating nodes that run in the context of the - # client. Is used by all clients that want to provide - # data to PipeWire. - { name = libpipewire-module-client-node } - - # Allows creating devices that run in the context of the - # client. Is used by the session manager. - { name = libpipewire-module-client-device } - - # The portal module monitors the PID of the portal process - # and tags connections with the same PID as portal - # connections. - { name = libpipewire-module-portal - flags = [ ifexists nofail ] - } - - # The access module can perform access checks and block - # new clients. - { name = libpipewire-module-access - args = { - # access.allowed to list an array of paths of allowed - # apps. - #access.allowed = [ - # /usr/bin/pipewire-media-session - #] - - # An array of rejected paths. - #access.rejected = [ ] - - # An array of paths with restricted access. - #access.restricted = [ ] - - # Anything not in the above lists gets assigned the - # access.force permission. - #access.force = flatpak - } - } - - # Makes a factory for wrapping nodes in an adapter with a - # converter and resampler. - { name = libpipewire-module-adapter } - - # Makes a factory for creating links between ports. - { name = libpipewire-module-link-factory } - - # Provides factories to make session manager objects. - { name = libpipewire-module-session-manager } -] - -context.objects = [ - #{ factory = - # [ args = { = ... } ] - # [ flags = [ [ nofail ] ] - #} - # - # Creates an object from a PipeWire factory with the given parameters. - # If nofail is given, errors are ignored (and no object is created). - # - #{ factory = spa-node-factory args = { factory.name = videotestsrc node.name = videotestsrc Spa:Pod:Object:Param:Props:patternType = 1 } } - #{ factory = spa-device-factory args = { factory.name = api.jack.device foo=bar } flags = [ nofail ] } - #{ factory = spa-device-factory args = { factory.name = api.alsa.enum.udev } } - #{ factory = spa-node-factory args = { factory.name = api.alsa.seq.bridge node.name = Internal-MIDI-Bridge } } - #{ factory = adapter args = { factory.name = audiotestsrc node.name = my-test } } - #{ factory = spa-node-factory args = { factory.name = api.vulkan.compute.source node.name = my-compute-source } } - - # A default dummy driver. This handles nodes marked with the "node.always-driver" - # property when no other driver is currently active. JACK clients need this. - { factory = spa-node-factory - args = { - factory.name = support.node.driver - node.name = Dummy-Driver - node.group = pipewire.dummy - priority.driver = 20000 - } - } - { factory = spa-node-factory - args = { - factory.name = support.node.driver - node.name = Freewheel-Driver - priority.driver = 19000 - node.group = pipewire.freewheel - node.freewheel = true - } - } - # This creates a new Source node. It will have input ports - # that you can link, to provide audio for this source. - #{ factory = adapter - # args = { - # factory.name = support.null-audio-sink - # node.name = "my-mic" - # node.description = "Microphone" - # media.class = "Audio/Source/Virtual" - # audio.position = "FL,FR" - # } - #} - - # This creates a single PCM source device for the given - # alsa device path hw:0. You can change source to sink - # to make a sink in the same way. - #{ factory = adapter - # args = { - # factory.name = api.alsa.pcm.source - # node.name = "alsa-source" - # node.description = "PCM Source" - # media.class = "Audio/Source" - # api.alsa.path = "hw:0" - # api.alsa.period-size = 1024 - # api.alsa.headroom = 0 - # api.alsa.disable-mmap = false - # api.alsa.disable-batch = false - # audio.format = "S16LE" - # audio.rate = 48000 - # audio.channels = 2 - # audio.position = "FL,FR" - # } - #} -] - -context.exec = [ - #{ path = [ args = "" ] } - # - # Execute the given program with arguments. - # - # You can optionally start the session manager here, - # but it is better to start it as a systemd service. - # Run the session manager with -h for options. - # - #{ path = "/usr/bin/pipewire-media-session" args = "" } - # - # You can optionally start the pulseaudio-server here as well - # but it is better to start it as a systemd service. - # It can be interesting to start another daemon here that listens - # on another address with the -a option (eg. -a tcp:4713). - # - { path = "/usr/bin/pipewire" args = "-c pipewire-pulse.conf" } - { path = "wireplumber" args = "" } -] diff --git a/main/sxmo-common/sxmo-common.post-install b/main/sxmo-common/sxmo-common.post-install index 3bdd49dfe..813423d63 100644 --- a/main/sxmo-common/sxmo-common.post-install +++ b/main/sxmo-common/sxmo-common.post-install @@ -1,6 +1,5 @@ #!/bin/sh -rc-update del xdm default # TODO remove when tinydm is on stable rc-update add sxmo-setpermissions default rc-update add modemmanager default rc-update add tinydm default