Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +0,0 @@
|
||||
SOURCES/pipewire-0.2.7.tar.gz
|
||||
@ -1 +0,0 @@
|
||||
37f8801423a63303a76b8a416c90fba65d41e826 SOURCES/pipewire-0.2.7.tar.gz
|
||||
@ -1,25 +0,0 @@
|
||||
From 7a976c7ca8e893960889f75a9c0b526f46c960c3 Mon Sep 17 00:00:00 2001
|
||||
From: Wim Taymans <wtaymans@redhat.com>
|
||||
Date: Fri, 7 Feb 2020 17:14:50 +0100
|
||||
Subject: [PATCH] bluez5: declare factory as extern
|
||||
|
||||
---
|
||||
spa/plugins/bluez5/bluez5-monitor.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/spa/plugins/bluez5/bluez5-monitor.c b/spa/plugins/bluez5/bluez5-monitor.c
|
||||
index e82ac5a8..71517cc6 100644
|
||||
--- a/spa/plugins/bluez5/bluez5-monitor.c
|
||||
+++ b/spa/plugins/bluez5/bluez5-monitor.c
|
||||
@@ -75,7 +75,7 @@ struct spa_bt_monitor {
|
||||
struct spa_list transport_list;
|
||||
};
|
||||
|
||||
-struct spa_handle_factory spa_a2dp_sink_factory;
|
||||
+extern struct spa_handle_factory spa_a2dp_sink_factory;
|
||||
|
||||
static void fill_item(struct spa_bt_monitor *this, struct spa_bt_transport *transport,
|
||||
struct spa_pod **result, struct spa_pod_builder *builder)
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
From a62e41eae2e94868558f2621d3e90381fa646efa Mon Sep 17 00:00:00 2001
|
||||
From: Wim Taymans <wtaymans@redhat.com>
|
||||
Date: Fri, 7 Feb 2020 17:05:17 +0100
|
||||
Subject: [PATCH] build and link a2dp-codecs.c as well
|
||||
|
||||
---
|
||||
spa/plugins/bluez5/a2dp-codecs.h | 8 ++++----
|
||||
spa/plugins/bluez5/meson.build | 3 ++-
|
||||
2 files changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/spa/plugins/bluez5/a2dp-codecs.h b/spa/plugins/bluez5/a2dp-codecs.h
|
||||
index 9c061d6a..969cd141 100644
|
||||
--- a/spa/plugins/bluez5/a2dp-codecs.h
|
||||
+++ b/spa/plugins/bluez5/a2dp-codecs.h
|
||||
@@ -284,15 +284,15 @@ static inline int a2dp_sbc_get_frequency(a2dp_sbc_t *config)
|
||||
}
|
||||
}
|
||||
|
||||
-const a2dp_sbc_t bluez_a2dp_sbc;
|
||||
+extern const a2dp_sbc_t bluez_a2dp_sbc;
|
||||
#if ENABLE_MP3
|
||||
-const a2dp_mpeg_t bluez_a2dp_mpeg;
|
||||
+extern const a2dp_mpeg_t bluez_a2dp_mpeg;
|
||||
#endif
|
||||
#if ENABLE_AAC
|
||||
-const a2dp_aac_t bluez_a2dp_aac;
|
||||
+extern const a2dp_aac_t bluez_a2dp_aac;
|
||||
#endif
|
||||
#if ENABLE_APTX
|
||||
-const a2dp_aptx_t bluez_a2dp_aptx;
|
||||
+extern const a2dp_aptx_t bluez_a2dp_aptx;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
diff --git a/spa/plugins/bluez5/meson.build b/spa/plugins/bluez5/meson.build
|
||||
index 15890238..1eab8632 100644
|
||||
--- a/spa/plugins/bluez5/meson.build
|
||||
+++ b/spa/plugins/bluez5/meson.build
|
||||
@@ -1,7 +1,8 @@
|
||||
|
||||
bluez5_sources = ['plugin.c',
|
||||
'a2dp-sink.c',
|
||||
- 'bluez5-monitor.c']
|
||||
+ 'a2dp-codecs.c',
|
||||
+ 'bluez5-monitor.c']
|
||||
|
||||
bluez5lib = shared_library('spa-bluez5',
|
||||
bluez5_sources,
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@ -1,149 +0,0 @@
|
||||
%global apiversion 0.2
|
||||
%global spaversion 0.1
|
||||
|
||||
#global snap 20141103
|
||||
#global gitrel 327
|
||||
#global gitcommit aec811798cd883a454b9b5cd82c77831906bbd2d
|
||||
#global shortcommit %(c=%{gitcommit}; echo ${c:0:5})
|
||||
|
||||
# https://bugzilla.redhat.com/983606
|
||||
%global _hardened_build 1
|
||||
|
||||
# where/how to apply multilib hacks
|
||||
%global multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9 ppc64le
|
||||
|
||||
Name: pipewire0.2
|
||||
Summary: Media Sharing Server compat libraries
|
||||
Version: 0.2.7
|
||||
Release: 6%{?snap:.%{snap}git%{shortcommit}}%{?dist}
|
||||
License: LGPLv2+
|
||||
URL: https://pipewire.org/
|
||||
%if 0%{?gitrel}
|
||||
# git clone git://anongit.freedesktop.org/gstreamer/pipewire
|
||||
# cd pipewire; git reset --hard %{gitcommit}; ./autogen.sh; make; make distcheck
|
||||
Source0: pipewire-%{version}-%{gitrel}-g%{shortcommit}.tar.gz
|
||||
%else
|
||||
Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{version}/pipewire-%{version}.tar.gz
|
||||
%endif
|
||||
|
||||
## upstream patches
|
||||
Patch1: 0001-build-and-link-a2dp-codecs.c-as-well.patch
|
||||
Patch2: 0001-bluez5-declare-factory-as-extern.patch
|
||||
|
||||
## upstreamable patches
|
||||
|
||||
BuildRequires: meson >= 0.35.0
|
||||
BuildRequires: gcc
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(libudev)
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.32
|
||||
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.32
|
||||
BuildRequires: pkgconfig(gstreamer-1.0) >= 1.10.0
|
||||
BuildRequires: pkgconfig(gstreamer-base-1.0) >= 1.10.0
|
||||
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 1.10.0
|
||||
BuildRequires: pkgconfig(gstreamer-net-1.0) >= 1.10.0
|
||||
BuildRequires: pkgconfig(gstreamer-allocators-1.0) >= 1.10.0
|
||||
BuildRequires: systemd-devel >= 184
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: libv4l-devel
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: xmltoman
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: sbc-devel
|
||||
|
||||
Requires(pre): shadow-utils
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
Requires: systemd >= 184
|
||||
Requires: rtkit
|
||||
|
||||
# https://bugzilla.redhat.com/983606
|
||||
%global _hardened_build 1
|
||||
|
||||
## enable systemd activation
|
||||
%global systemd 1
|
||||
|
||||
%description
|
||||
PipeWire is a multimedia server for Linux and other Unix like operating
|
||||
systems.
|
||||
|
||||
%package libs
|
||||
Summary: Compatibility Libraries for PipeWire clients
|
||||
License: LGPLv2+
|
||||
|
||||
Provides: pipewire-libs%{?_isa} = %{version}
|
||||
Conflicts: pipewire-libs%{?_isa} <= %{version}
|
||||
|
||||
%description libs
|
||||
This package contains the runtime libraries for any application that wishes
|
||||
to interface with a PipeWire media server.
|
||||
|
||||
%package devel
|
||||
Summary: Compatibility Headers and libraries for PipeWire client development
|
||||
License: LGPLv2+
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
Headers and libraries for developing applications that can communicate with
|
||||
a PipeWire media server.
|
||||
|
||||
%prep
|
||||
%setup -q -T -b0 -n pipewire-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
|
||||
|
||||
%patch1 -p1 -b .0001
|
||||
%patch2 -p1 -b .0002
|
||||
|
||||
%build
|
||||
%meson -D docs=false -D man=false -D gstreamer=disabled -D systemd=false
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
rm -rf $RPM_BUILD_ROOT%{_bindir}/*
|
||||
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/*
|
||||
|
||||
%check
|
||||
%meson_test
|
||||
|
||||
%pre
|
||||
%ldconfig_scriptlets libs
|
||||
|
||||
%files libs
|
||||
%license LICENSE GPL LGPL
|
||||
%doc README
|
||||
%{_libdir}/libpipewire-%{apiversion}.so.*
|
||||
%{_libdir}/pipewire-%{apiversion}/
|
||||
%{_libdir}/spa/
|
||||
|
||||
%files devel
|
||||
%{_libdir}/libpipewire-%{apiversion}.so
|
||||
%{_includedir}/pipewire/
|
||||
%{_includedir}/spa/
|
||||
%{_libdir}/pkgconfig/libpipewire-%{apiversion}.pc
|
||||
%{_libdir}/pkgconfig/libspa-%{spaversion}.pc
|
||||
|
||||
%changelog
|
||||
* Thu Jun 18 2020 Wim Taymans <wtaymans@redhat.com> - 0.2.7-6
|
||||
- Fix Conflicts: line
|
||||
- Remove Recommends: line, it's wrong
|
||||
- Resolves: rhbz#1832347
|
||||
|
||||
* Fri Jun 05 2020 Wim Taymans <wtaymans@redhat.com> - 0.2.7-5
|
||||
- Fix Conflicts: line
|
||||
- Resolves: rhbz#1832347
|
||||
|
||||
* Fri Jun 05 2020 Wim Taymans <wtaymans@redhat.com> - 0.2.7-4
|
||||
- Add gating file
|
||||
- Resolves: rhbz#1832347
|
||||
|
||||
* Fri Jun 05 2020 Wim Taymans <wtaymans@redhat.com> - 0.2.7-3
|
||||
- Change source URL
|
||||
- Resolves: rhbz#1832347
|
||||
|
||||
* Fri Feb 07 2020 Wim Taymans <wtaymans@redhat.com> - 0.2.7-2
|
||||
- Add compat -devel package
|
||||
|
||||
* Wed Jan 29 2020 Wim Taymans <wtaymans@redhat.com> - 0.2.7-1
|
||||
- First version
|
||||
- Fix bluez5 plugins build
|
||||
1
dead.package.c9s
Normal file
1
dead.package.c9s
Normal file
@ -0,0 +1 @@
|
||||
pipewire0.2 package is retired for CS-271
|
||||
Loading…
Reference in New Issue
Block a user