From d3d19895639775cece24bbe595f55dcf0b3a9bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Thu, 2 May 2024 00:28:12 +0200 Subject: [PATCH] device-samsung-j7y17lte: remove pipewire-media-session file and replaces (MR 5091) pipewire-media-session was dropped in alpine in 4dc6a181bf590339f29a279fb7c4b9ae3c26c5fa, more than one year ago, so this should be safe While at it, also drop pipewire dependency, that is now a dependency of postmarketos-base-ui --- .../testing/device-samsung-j7y17lte/APKBUILD | 7 +- ...pipewire-media-session.d-alsa-monitor.conf | 126 ------------------ 2 files changed, 1 insertion(+), 132 deletions(-) delete mode 100644 device/testing/device-samsung-j7y17lte/usr-share-pipewire-media-session.d-alsa-monitor.conf diff --git a/device/testing/device-samsung-j7y17lte/APKBUILD b/device/testing/device-samsung-j7y17lte/APKBUILD index 99f302d64..47e39da7b 100644 --- a/device/testing/device-samsung-j7y17lte/APKBUILD +++ b/device/testing/device-samsung-j7y17lte/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Eray Tutmaz pkgname=device-samsung-j7y17lte pkgdesc="Samsung Galaxy J7 2017" -pkgver=1 +pkgver=2 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -17,11 +17,9 @@ depends=" postmarketos-base-downstream linux-samsung-j7y17lte msm-fb-refresher - pipewire pipewire-pulse " replaces=" - pipewire-media-session udev-init-scripts-openrc " makedepends="devicepkg-dev" @@ -36,7 +34,6 @@ source=" usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf - usr-share-pipewire-media-session.d-alsa-monitor.conf " # pulseaudio does not seem to work on this device. Will use pipewire-pulse instead. @@ -56,7 +53,6 @@ package() { install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/HiFi.conf install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/Universal7870-I.conf install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/VoiceCall.conf - install -Dm644 usr-share-pipewire-media-session.d-alsa-monitor.conf "$pkgdir"/usr/share/pipewire/media-session.d/alsa-monitor.conf } sha512sums=" @@ -69,5 +65,4 @@ abe1c4a2f59fe862cebef75c54b8806bd86ce06aeb15d8c0699ab1338c9d575cb72a4d5b099f9427 cdee42ea2766397dfa0a93fd9041489328b087a594e0fa8252bf36a8e44f7fca1f1b084b453b50205d434ea8eed248259e03f397ea41ba9d24110deefbc250f6 usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf 5f460a5951a8255b2456babc72ad38470888e2ba02ab4545d05a7f91d85fcaf99123776416967d4a111c70610a5e2cd9ba66e4bdbb8be25342f82f822deab51d usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf 482e881e9a5e3a6130bdb0a04143e21d4accb3e00ff2d11755f79cea5ef0ee7d6dc4e9877caf0460c9b812c32e51689aa5efec9c905c6fd77793d614a687b1e2 usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf -2976dbbd02f514c3b7dfba8da63bb54678eb019bc236927a3caa4f70fc38101ce7fab78d1ced823bff5110adcf34e710a3eba75b7ec9ce98f7fce3918426d91c usr-share-pipewire-media-session.d-alsa-monitor.conf " diff --git a/device/testing/device-samsung-j7y17lte/usr-share-pipewire-media-session.d-alsa-monitor.conf b/device/testing/device-samsung-j7y17lte/usr-share-pipewire-media-session.d-alsa-monitor.conf deleted file mode 100644 index 847e81a16..000000000 --- a/device/testing/device-samsung-j7y17lte/usr-share-pipewire-media-session.d-alsa-monitor.conf +++ /dev/null @@ -1,126 +0,0 @@ -# ALSA monitor config file for PipeWire version 0.4.1 # -# -# Copy and edit this file in /etc/pipewire/media-session.d/ -# for system-wide changes or in -# ~/.config/pipewire/media-session.d/ for local changes. - -properties = { - # Create a JACK device. This is not enabled by default because - # it requires that the PipeWire JACK replacement libraries are - # not used by the session manager, in order to be able to - # connect to the real JACK server. - #alsa.jack-device = false - - # Reserve devices. - #alsa.reserve = true -} - -rules = [ - # An array of matches/actions to evaluate. - { - # Rules for matching a device or node. Each dictionary in this array - # specifies the property to match as key and a string or regex match - # as value. A successful match requires all dictionary keys (i.e. - # properties) to match. - # - # Actions are are executed for the object if at least one successful - # match exists. - # - # Regular expressions are prefixed with the ~ (tilde) character, - # otherwise a standard string comparison is used. - # The special value "null" matches against empty properties. - matches = [ - { - # This matches all cards. These are regular expressions - # so "." matches one character and ".*" matches many. - device.name = "~alsa_card.*" - } - ] - actions = { - # Actions can update properties on the matched object. - update-props = { - # Use ALSA-Card-Profile devices. They use UCM or - # the profile configuration to configure the device - # and mixer settings. - api.alsa.use-acp = true - - # Use UCM instead of profile when available. Can be - # disabled to skip trying to use the UCM profile. - #api.alsa.use-ucm = true - - # Don't use the hardware mixer for volume control. It - # will only use software volume. The mixer is still used - # to mute unused paths based on the selected port. - api.alsa.soft-mixer = true - - # Ignore decibel settings of the driver. Can be used to - # work around buggy drivers that report wrong values. - #api.alsa.ignore-dB = false - - # The profile set to use for the device. Usually this is - # "default.conf" but can be changed with a udev rule - # or here. - #device.profile-set = "profileset-name.conf" - - # The default active profile. Is by default set to "Off". - #device.profile = "default profile name" - - # Automatically select the best profile. This is the - # highest priority available profile. This is disabled - # here and instead implemented in the session manager - # where it can save and load previous preferences. - api.acp.auto-profile = false - - # Automatically switch to the highest priority available - # port. This is disabled here and implemented in the - # session manager instead. - api.acp.auto-port = false - - # Other properties can be set here. - #device.nick = "My Device" - } - } - } - { - matches = [ - { - # Matches all sources. These are regular expressions - # so "." matches one character and ".*" matches many. - node.name = "~alsa_input.*" - } - { - # Matches all sinks. - node.name = "~alsa_output.*" - } - ] - actions = { - update-props = { - #node.nick = "My Node" - #node.nick = null - #priority.driver = 100 - #priority.session = 100 - node.pause-on-idle = false - #resample.quality = 4 - #channelmix.normalize = false - #channelmix.mix-lfe = false - #audio.channels = 2 - #audio.format = "S16LE" - #audio.rate = 44100 - #audio.position = "FL,FR" - #session.suspend-timeout-seconds = 0 # 0 disables suspend - #monitor.channel-volumes = false - - #latency.internal.rate = 0 # internal latency in samples - #latency.internal.ns = 0 # internal latency in nanoseconds - - #api.alsa.period-size = 1024 - api.alsa.headroom = 1024 - #api.alsa.start-delay = 0 - #api.alsa.disable-mmap = false - #api.alsa.disable-batch = false - #api.alsa.use-chmap = false - #iec958.codecs = [ PCM DTS AC3 MPEG MPEG2-AAC EAC3 TrueHD DTS-HD ] - } - } - } -]