device-samsung-a6lte: 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 the dep on pipewire, since it's taken care by pmos-base-ui now
This commit is contained in:
Pablo Correa Gómez
Clayton Craft
parent
53a861f670
commit
387db85874
2 changed files with 2 additions and 132 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
# Reference: <https://postmarketos.org/devicepkg>
|
# Reference: <https://postmarketos.org/devicepkg>
|
||||||
pkgname=device-samsung-a6lte
|
pkgname=device-samsung-a6lte
|
||||||
pkgdesc="Samsung Galaxy A6 2018"
|
pkgdesc="Samsung Galaxy A6 2018"
|
||||||
pkgver=1
|
pkgver=2
|
||||||
pkgrel=0
|
pkgrel=0
|
||||||
url="https://postmarketos.org"
|
url="https://postmarketos.org"
|
||||||
license="MIT"
|
license="MIT"
|
||||||
|
|
@ -16,7 +16,6 @@ depends="
|
||||||
"
|
"
|
||||||
replaces="
|
replaces="
|
||||||
lightdm
|
lightdm
|
||||||
pipewire-media-session
|
|
||||||
"
|
"
|
||||||
makedepends="devicepkg-dev"
|
makedepends="devicepkg-dev"
|
||||||
install="$pkgname.post-install"
|
install="$pkgname.post-install"
|
||||||
|
|
@ -34,7 +33,6 @@ source="
|
||||||
usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf
|
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-Universal7870-I.conf
|
||||||
usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf
|
usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf
|
||||||
usr-share-pipewire-media-session.d-alsa-monitor.conf
|
|
||||||
usr-share-wireplumber-wireplumber.conf.d-headroom.conf
|
usr-share-wireplumber-wireplumber.conf.d-headroom.conf
|
||||||
"
|
"
|
||||||
subpackages="
|
subpackages="
|
||||||
|
|
@ -61,13 +59,12 @@ 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-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-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-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
|
|
||||||
install -Dm644 usr-share-wireplumber-wireplumber.conf.d-headroom.conf "$pkgdir"/usr/share/wireplumber/wireplumber.conf.d/headroom.conf
|
install -Dm644 usr-share-wireplumber-wireplumber.conf.d-headroom.conf "$pkgdir"/usr/share/wireplumber/wireplumber.conf.d/headroom.conf
|
||||||
}
|
}
|
||||||
|
|
||||||
kernel_downstream() {
|
kernel_downstream() {
|
||||||
pkgdesc="Working: display, touchscreen, wifi, bluetooth, audio, cellular"
|
pkgdesc="Working: display, touchscreen, wifi, bluetooth, audio, cellular"
|
||||||
depends="linux-samsung-a6lte msm-fb-refresher pipewire pipewire-pulse"
|
depends="linux-samsung-a6lte msm-fb-refresher pipewire-pulse"
|
||||||
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
|
devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -112,6 +109,5 @@ abe1c4a2f59fe862cebef75c54b8806bd86ce06aeb15d8c0699ab1338c9d575cb72a4d5b099f9427
|
||||||
2169590d10d6123575d43e8ff7dc0d2ba824f8266d9fa75a5b59a4cc5753e47e327368b777082930d6b7a7aed6f57fa6ac2c5a2e816e1e12cd1032a8bb1822b5 usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf
|
2169590d10d6123575d43e8ff7dc0d2ba824f8266d9fa75a5b59a4cc5753e47e327368b777082930d6b7a7aed6f57fa6ac2c5a2e816e1e12cd1032a8bb1822b5 usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf
|
||||||
dc528deb556906adfb89b02b6faa04a8b21358706bb60e2fa51c8a3c909b680fcc02fa425b0cb5d6273595f27dfc9b640e1a8d455657fd6b47652af9e8ec295a usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf
|
dc528deb556906adfb89b02b6faa04a8b21358706bb60e2fa51c8a3c909b680fcc02fa425b0cb5d6273595f27dfc9b640e1a8d455657fd6b47652af9e8ec295a usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf
|
||||||
3e74de3504f134a2726ee87740c5803bbd578352674d1d7de8b9460e57553100e9c4d322143ee83d3d584884c52eef47762bed41814ff1fca8cd9c4552f39b73 usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf
|
3e74de3504f134a2726ee87740c5803bbd578352674d1d7de8b9460e57553100e9c4d322143ee83d3d584884c52eef47762bed41814ff1fca8cd9c4552f39b73 usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf
|
||||||
5e87452f4cd70bbbcfb3e69bae73f2690ba328e7ccde55c47482e8fb1583d807de5bd3d328b1fe6a8733b4de78b2ed0c6ae8cdb60f6bf51ed4362c2174671b3e usr-share-pipewire-media-session.d-alsa-monitor.conf
|
|
||||||
be561f0573c73bdcf37fbd8e4659e92577a0818aafb75d73e7cbf1dd8980f29313170703074ee0cc9cc5b5a07cd7ac8ced07dfdc77b0b31a0cd34d66ae0473a4 usr-share-wireplumber-wireplumber.conf.d-headroom.conf
|
be561f0573c73bdcf37fbd8e4659e92577a0818aafb75d73e7cbf1dd8980f29313170703074ee0cc9cc5b5a07cd7ac8ced07dfdc77b0b31a0cd34d66ae0473a4 usr-share-wireplumber-wireplumber.conf.d-headroom.conf
|
||||||
"
|
"
|
||||||
|
|
|
||||||
|
|
@ -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 = 5 # 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 ]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
Loading…
Reference in a new issue