diff --git a/common/shlibs b/common/shlibs index 6eb81887ec..36119c7685 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3153,7 +3153,6 @@ libarcan_tui.so.0.11 arcan-0.5.4.3_1 libldm.so.1 linux-driver-management-1.0.1_1 liblwipv6.so.2 lwipv6-1.5a_1 libpipewire-0.2.so.1 libpipewire-0.2.2_1 -libspa-lib.so.1 libspa-lib-0.2.2_1 libvolk.so.1.4 volk-1.4_1 libgnuradio-runtime-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 libgnuradio-pmt-3.7.13.4.so.0.0.0 gnuradio-3.7.13.4_1 diff --git a/srcpkgs/libspa-lib b/srcpkgs/libspa-lib deleted file mode 120000 index c9c97cf670..0000000000 --- a/srcpkgs/libspa-lib +++ /dev/null @@ -1 +0,0 @@ -pipewire \ No newline at end of file diff --git a/srcpkgs/libspa-lib-devel b/srcpkgs/libspa-lib-devel deleted file mode 120000 index c9c97cf670..0000000000 --- a/srcpkgs/libspa-lib-devel +++ /dev/null @@ -1 +0,0 @@ -pipewire \ No newline at end of file diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 4c76a6abeb..407f36d52e 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,19 +1,25 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.2.2 +version=0.2.3 revision=1 build_style=meson -configure_args="-Denable_man=true -Denable_gstreamer=true -Denable_docs=true" +configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false" hostmakedepends="doxygen graphviz pkg-config xmltoman" makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel - sbc-devel v4l-utils-devel" + sbc-devel v4l-utils-devel libva-devel" short_desc="Server and user space API to deal with multimedia pipelines" maintainer="maxice8 " license="LGPL-2.1-or-later" homepage="https://pipewire.org/" changelog="https://raw.githubusercontent.com/PipeWire/pipewire/master/NEWS" distfiles="https://github.com/PipeWire/pipewire/archive/${version}.tar.gz" -checksum=b39773deb79badf951c136505c708d2177b3a4106ecb63e4c063584d5c26d5d7 +checksum=ffff3f4305791d19239cdba938b3432292802f8fe6f426577e159e11c68d95cb + +post_install() { + # Quick hack to get manapge to correct spot + vmkdir usr/share/man/man5 + mv ${DESTDIR}/usr/share/man/man1/pipewire.conf.5 ${DESTDIR}/usr/share/man/man5 +} libpipewire_package() { short_desc+=" - pipewire library" @@ -24,28 +30,13 @@ libpipewire_package() { pipewire-devel_package() { depends="libpipewire-${version}_${revision}" - short_desc+=" - pipewire development files" + short_desc+=" - pipewire and libspa development files" pkg_install() { vmove usr/include/pipewire - vmove usr/lib/pkgconfig/libpipewire-0.2.pc - vmove usr/lib/libpipewire-0.2.so - } -} - -libspa-lib_package() { - short_desc+=" - spa-lib library" - pkg_install() { - vmove "usr/lib/libspa-lib.so.*" - } -} - -libspa-lib-devel_package() { - depends="libspa-lib-${version}_${revision}" - short_desc+=" - spa-lib development files" - pkg_install() { vmove usr/include/spa - vmove usr/lib/libspa-lib.so - vmove usr/lib/pkgconfig/libspa-0.2.pc + vmove usr/lib/pkgconfig/libpipewire-0.2.pc + vmove usr/lib/pkgconfig/libspa-0.1.pc + vmove usr/lib/libpipewire-0.2.so } }