Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions base/comps/pipewire/pipewire.comp.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
[components.pipewire]
# Release: %{baserelease}%{?snapdate:.%{snapdate}git%{shortcommit}}%{?dist}
release = { calculation = "manual" }

[[components.pipewire.overlays]]
type = "spec-search-replace"
description = "Increment baserelease for opus removal rebuild"
regex = '%global baserelease 1'
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given this is a manual release bump method, rather than hardcode the baserelease number which will stop matching if upstream Fedora bumps baserelease, use something like this - a13a100 - to create azl_release to track the number of times we add our Azure Linux adjustments, and then use the RPM arithmetic operation to incorporate %[%{baserelease}+%{azl_release}] into the spec's Release macro

replacement = '%global baserelease 2'

[[components.pipewire.overlays]]
type = "spec-search-replace"
description = "Disable opus codec support — opus requires CELA review per Microsoft codec guidance"
section = "%build"
regex = '%meson \\'
replacement = '''%meson \
-D opus=disabled -D bluez5-codec-opus=disabled \'''
2 changes: 1 addition & 1 deletion locks/pipewire.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = 'f930436e78f3c6c32901254baf4979bab7c2710a'
upstream-commit = 'f930436e78f3c6c32901254baf4979bab7c2710a'
input-fingerprint = 'sha256:35ebde9ddb1311d5dee54fa1d4a3c89c88e7ef7176e332a0b48062867151957f'
input-fingerprint = 'sha256:9783bf53c6e0951010db1eccbcd12182778fa0e2915fbe07bf3eec856622604d'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
3 changes: 2 additions & 1 deletion specs/p/pipewire/pipewire.spec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
%global ms_version 0.4.2

# For rpmdev-bumpspec and releng automation
%global baserelease 1
%global baserelease 2

#global snapdate 20210107
#global gitcommit b17db2cebc1a5ab2c01851d29c05f79cd2f262bb
Expand Down Expand Up @@ -448,6 +448,7 @@ cp %{SOURCE1} subprojects/packagefiles/

%build
%meson \
-D opus=disabled -D bluez5-codec-opus=disabled \
-D docs=enabled -D man=enabled -D gstreamer=enabled -D systemd=enabled \
-D sdl2=disabled \
-D audiotestsrc=disabled -D videotestsrc=disabled \
Expand Down
Loading