Browse Source

updated 7 packages

alsa-plugins-1.2.12-1

jack-audio-connection-kit-1.9.22-1

lirc-0.10.2-1

libao-1.2.0-2

libasyncns-0.8-5

pulseaudio-17.0-1

vorbis-tools-1.4.2-2
Tomohiro "Tomo-p" KATO 9 months ago
parent
commit
362ba6bb71

+ 5 - 2
a/alsa-plugins/alsa-plugins-vl.spec

@@ -1,7 +1,7 @@
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 Name:           alsa-plugins
-Version:        1.2.2
-Release:        2%{?_dist_release}
+Version:        1.2.12
+Release:        1%{?_dist_release}
 Group:          system,multimedia
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -288,6 +288,9 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
 
 %changelog
+* Mon Jul 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.12-1
+- new upstream release.
+
 * Fri Mar 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.2-2
 - R:pulseaudio -> R:pulseaudio-daemon.
 - dropped ldconfig scriptlets.

+ 7 - 85
j/jack-audio-connection-kit/jack-audio-connection-kit-vl.spec

@@ -1,6 +1,6 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
-Version: 1.9.17
+Version: 1.9.22
 Release: 1%{?_dist_release}
 Group: multimedia,system
 Vendor: Project Vine
@@ -14,10 +14,8 @@ Source0: https://github.com/jackaudio/jack2/archive/refs/tags/v%{version}.tar.gz
 Source1: %{name}-README.Fedora
 Source2: %{name}-script.pa
 Source3: %{name}-limits.conf
-# Generate this file in the GIT repo by running ./svnversion_regenerate.sh svnversion.h
-Source4:       svnversion.h
-# Patch doxygen documentation
-Patch0:        %{name}-doxygen.patch
+# Build with Python >= 3.12
+Patch0:        jack2-py312.patch
 # Adjust default priority. RHBZ#795094
 Patch1:        jack-realtime-compat.patch
 
@@ -36,6 +34,7 @@ BuildRequires: readline-devel
 #BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
 #BuildRequires: libdb-devel
 #BuildRequires: libuuid-devel
+Obsoletes: %{name}-example-clients < 1.9.22
 
 %global groupname jackuser
 %global pagroup   pulse-rt
@@ -76,16 +75,6 @@ Requires: 	pkgconfig
 Development files for the Jack Audio Connection Kit.
 
 
-%package example-clients
-Summary: 	Example clients that use Jack 
-Summary(ja): 	%{name} を利用したサンプルプログラム
-Group: 		multimedia
-Requires: 	%{name} = %{version}-%{release}
-
-%description example-clients
-Small example clients that use the Jack Audio Connection Kit.
-
-
 %debug_package
 
 
@@ -94,7 +83,6 @@ Small example clients that use the Jack Audio Connection Kit.
 
 
 %build
-cp -p %{SOURCE4} .
 %set_build_flags
 export PREFIX=%{_prefix}
 # Parallel build disabled as it fails sometimes
@@ -129,9 +117,6 @@ install -p -m644 %{SOURCE1} README.Fedora
 # install pulseaudio script for jack (as documentation part)
 install -p -m644 %{SOURCE2} jack.pa
 
-# For compatibility with jack1
-mv $RPM_BUILD_ROOT%{_bindir}/jack_rec $RPM_BUILD_ROOT%{_bindir}/jackrec
-
 # Fix permissions of the modules
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/jack/*.so $RPM_BUILD_ROOT%{_libdir}/libjack*.so.*.*.*
 
@@ -148,12 +133,10 @@ exit 0
 %doc jack.pa
 %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf
 %{_bindir}/jackd
-%{_bindir}/jackrec
 %{_libdir}/jack/
 %{_libdir}/libjack.so.*
 %{_libdir}/libjacknet.so.*
 %{_libdir}/libjackserver.so.*
-%{_mandir}/man1/jackrec.1*
 %{_mandir}/man1/jackd*.1*
 
 %files dbus
@@ -171,72 +154,11 @@ exit 0
 %{_libdir}/libjackserver.so
 %{_libdir}/pkgconfig/jack.pc
 
-%files example-clients
-%defattr(-,root,root)
-%{_bindir}/alsa_in
-%{_bindir}/alsa_out
-%{_bindir}/jack_alias
-%{_bindir}/jack_bufsize
-%{_bindir}/jack_connect
-%{_bindir}/jack_disconnect
-%{_bindir}/jack_cpu_load
-%{_bindir}/jack_evmon
-%{_bindir}/jack_freewheel
-# These are not ready yet
-#{_bindir}/jack_impulse_grabber
-%exclude %{_mandir}/man1/jack_impulse_grabber.1*
-%{_bindir}/jack_latent_client
-%{_bindir}/jack_load
-%{_bindir}/jack_unload
-%{_bindir}/jack_lsp
-%{_bindir}/jack_metro
-%{_bindir}/jack_midi_dump
-%{_bindir}/jack_midi_latency_test
-%{_bindir}/jack_midiseq
-%{_bindir}/jack_midisine
-%{_bindir}/jack_monitor_client
-%{_bindir}/jack_net_master
-%{_bindir}/jack_net_slave
-%{_bindir}/jack_netsource
-%{_bindir}/jack_property
-%{_bindir}/jack_samplerate
-%{_bindir}/jack_server_control
-%{_bindir}/jack_session_notify
-%{_bindir}/jack_showtime
-%{_bindir}/jack_simple_client
-%{_bindir}/jack_simple_session_client
-%{_bindir}/jack_thru
-%{_bindir}/jack_transport
-%{_bindir}/jack_wait
-%{_bindir}/jack_zombie
-%{_mandir}/man1/alsa_*.1*
-%{_mandir}/man1/jack_bufsize.1*
-%{_mandir}/man1/jack_connect.1*
-%{_mandir}/man1/jack_disconnect.1*
-%{_mandir}/man1/jack_freewheel*.1*
-%{_mandir}/man1/jack_load*.1*
-%{_mandir}/man1/jack_unload*.1*
-%{_mandir}/man1/jack_lsp.1*
-%{_mandir}/man1/jack_metro.1*
-%{_mandir}/man1/jack_monitor_client.1*
-%{_mandir}/man1/jack_netsource.1*
-%{_mandir}/man1/jack_property.1*
-%{_mandir}/man1/jack_samplerate.1*
-%{_mandir}/man1/jack_showtime.1*
-%{_mandir}/man1/jack_simple_client.1*
-%{_mandir}/man1/jack_transport.1*
-%{_mandir}/man1/jack_wait.1*
-
-# tests
-%{_bindir}/jack_cpu
-%{_bindir}/jack_iodelay
-%{_bindir}/jack_multiple_metro
-%{_bindir}/jack_simdtests
-%{_bindir}/jack_test
-%{_mandir}/man1/jack_iodelay.1*
-
 
 %changelog
+* Mon Jul 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.22-1
+- new upstream release.
+
 * Fri Mar 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.17-1
 - new upstream release.
 - dropped Patch0, 1, 2 and 4.

+ 11 - 98
l/lirc/lirc-vl.spec

@@ -9,7 +9,7 @@
 Summary:	The Linux Infrared Remote Control package.
 Summary(ja):	赤外線リモートコントロールパッケージ
 Name:		lirc
-Version:	0.10.1
+Version:	0.10.2
 Release:	1%{?_dist_release}%{?with_systemd:.systemd}
 Group:		system
 Vendor:		Project Vine
@@ -25,10 +25,10 @@ Source2:	lircd.logrotate
 Source3:	lirc.sysconfig
 Source4:	99-remote-control-lirc.rules
 
-Patch2:         0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch
-Patch6:         0006-python-pkg-Don-t-use-deprecated-time.clock-RHBZ-1718.patch
+Patch2:		0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch
 
 # Vine patch
+Patch1000:	lirc-fix-build.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	perl
@@ -47,9 +47,7 @@ BuildRequires:	systemd-devel
 %{?systemd_requires}
 %else
 Requires(post): /sbin/chkconfig
-Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
-Requires(postun): /sbin/ldconfig
 %endif
 
 %description
@@ -102,41 +100,8 @@ Note that lirc_gpio and lirc_parallel are in packages of their own.
 
 注記: lirc_gpio と lirc_parallel は別のパッケージになっています。
 
-## This package up (uni processor) kernel, but only smp kernel is supplied officially.
-## So we don't create this sub package.
-#%package -n dkms-%{name}-parallel
-#Summary:	Parallel port module for LIRC
-#Group:		System/Kernel and hardware
-#Requires:	dkms-%{name} = %version
-#Requires(post):	dkms
-#Requires(preun):dkms
-#
-#%description -n dkms-%{name}-parallel
-#This package provides the parallel port module for LIRC.
-#
-#This module requires a non-SMP kernel.
-#
-#%description -n dkms-%{name}-parallel -l ja
-#このパッケージにはパラレルポート接続の LIRC 用のカーネル
-#モジュールが含まれています。
-#
-#このモジュールは SMP カーネルでは使用できません。
-
-## Required header files (bttv.h ...) are not included in kernel-devel.
-## So we can't build this package (now?).
-#%package -n dkms-%{name}-gpio
-#Summary:	GPIO module for LIRC
-#Group:		System/Kernel and hardware
-#Requires:	dkms-%{name} = %version
-#Requires(post):	dkms
-#Requires(preun):dkms
-#
-#%description -n	dkms-%{name}-gpio
-#This package provides the GPIO module for LIRC.
-#
-#%description -n	dkms-%{name}-gpio -l ja
-#このパッケージには GPIO 接続の LIRC 用のカーネルモジュールが
-#含まれています。
+
+%debug_packate
 
 
 %prep
@@ -208,15 +173,6 @@ done
 
 cp -a drivers $RPM_BUILD_ROOT/usr/src/%{name}-%{version}-%{release}
 
-#for drivername in parallel gpio; do
-#install -d -m755 $RPM_BUILD_ROOT/usr/src/%{name}-$drivername-%{version}-%{release}/drivers
-#mv $RPM_BUILD_ROOT/usr/src/%{name}-%{version}-%{release}/drivers/lirc_$drivername \
-#	$RPM_BUILD_ROOT/usr/src/%{name}-$drivername-%{version}-%{release}/drivers/
-#cp -a drivers/*.h drivers/Makefile* drivers/lirc_dev \
-#	$RPM_BUILD_ROOT/usr/src/%{name}-$drivername-%{version}-%{release}/drivers/
-#
-#done
-
 # get modulelist
 pushd drivers
 drivers=$(echo lirc_* | sed "s/lirc_parallel //" | sed "s/lirc_gpio //")
@@ -245,22 +201,6 @@ for module in $drivers; do
 	i=$((i+1))
 done
 
-#for drivername in parallel gpio; do
-#cat > %{buildroot}/usr/src/%{name}-$drivername-%{version}-%{release}/dkms.conf <<EOF
-#PACKAGE_NAME="%{name}-$drivername"
-#PACKAGE_VERSION="%{version}-%{release}"
-#MAKE[0]="cd drivers/lirc_$drivername; make \
-#	KERNEL_LOCATION=\$kernel_source_dir AUTOMAKE=true AUTOCONF=true ACLOCAL=true"
-#CLEAN="cd drivers/lirc_$drivername; make \
-#	clean AUTOMAKE=true AUTOCONF=true ACLOCAL=true"
-#AUTOINSTALL=yes
-#BUILT_MODULE_NAME[0]="lirc_$drivername"
-#BUILT_MODULE_LOCATION[0]="drivers/lirc_$drivername"
-#DEST_MODULE_LOCATION[0]="/kernel/drivers/input/misc"
-#EOF
-#
-#done
-
 
 %pre
 getent group lirc >/dev/null || groupadd -r lirc
@@ -288,7 +228,6 @@ if [ $1 -ge 2 ] ; then
     mv %{_sysconfdir}/lircmd.conf %{_sysconfdir}/lirc/lircmd.conf
   fi
 fi
-/sbin/ldconfig
 
 %preun
 %if %{with systemd}
@@ -299,7 +238,6 @@ if [ $1 -eq 0 -o -x /bin/systemctl ] ; then
   /sbin/chkconfig --del lirc || :
 fi
 %endif
-/sbin/ldconfig
 
 %postun
 %if %{with systemd}
@@ -318,32 +256,12 @@ dkms install -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --force || :
 %preun -n dkms-%{name}
 dkms remove  -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --all || :
 
-#%post -n dkms-%{name}-parallel
-#dkms add     -m %{name}-parallel -v %{version}-%{release} --rpm_safe_upgrade &&
-#dkms build   -m %{name}-parallel -v %{version}-%{release} --rpm_safe_upgrade &&
-#dkms install -m %{name}-parallel -v %{version}-%{release} --rpm_safe_upgrade --force || :
-#
-#%preun -n dkms-%{name}-parallel
-#dkms remove  -m %{name}-parallel -v %{version}-%{release} --rpm_safe_upgrade --all || :
-
-#%post -n dkms-%{name}-gpio
-#dkms add     -m %{name}-gpio -v %{version}-%{release} --rpm_safe_upgrade &&
-#dkms build   -m %{name}-gpio -v %{version}-%{release} --rpm_safe_upgrade &&
-#dkms install -m %{name}-gpio -v %{version}-%{release} --rpm_safe_upgrade --force || :
-#
-#%preun -n dkms-%{name}-gpio
-#dkms remove  -m %{name}-gpio -v %{version}-%{release} --rpm_safe_upgrade --all || :
-
-
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
 
 %files
 %defattr(-, root, root)
 %license COPYING
-%doc ANNOUNCE AUTHORS ChangeLog NEWS README TODO
-%doc __docs/*
+%doc AUTHORS NEWS README
+%doc %{_docdir}/lirc/*
 #/etc/logrotate.d/lircd
 %dir %{_sysconfdir}/lirc
 %dir %{_sysconfdir}/lirc/lircd.conf.d
@@ -355,7 +273,6 @@ dkms remove  -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --all || :
 %{_libdir}/*.so.*
 %{_libdir}/lirc
 %{_datadir}/lirc/
-%{_docdir}/lirc
 %{_mandir}/man?/*
 %{_localstatedir}/lib/lirc
 %{_udevrulesdir}/*
@@ -380,16 +297,12 @@ dkms remove  -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --all || :
 %defattr(-,root,root)
 /usr/src/%{name}-%{version}-%{release}
 
-#%files -n dkms-%{name}-parallel
-#%defattr(-,root,root)
-#/usr/src/%{name}-parallel-%{version}-%{release}
-
-#%files -n dkms-%{name}-gpio
-#%defattr(-,root,root)
-#/usr/src/%{name}-gpio-%{version}-%{release}
-
 
 %changelog
+* Mon Jul 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.10.2-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.10.1-1
 - new upstream release.
 - added systemd support (disabled as default).

+ 26 - 18
lib/liba/libao/libao-vl.spec

@@ -1,14 +1,18 @@
 Name: libao
 Version: 1.2.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Summary: Cross Platform Audio Output Library.
 Summary(ja): クロスプラットフォームなオーディオ出力ライブラリ
+Group: system
 
-Group: System Environment/Libraries
 License: GPLv2
-URL: http://www.xiph.org/ao/
-
-Source: http://downloads.xiph.org/releases/ao/libao-%{version}.tar.gz
+URL: https://www.xiph.org/ao/
+Source: https://downloads.xiph.org/releases/ao/libao-%{version}.tar.gz
+Patch1: 0001-ao_pulse.c-fix-latency-calculation.patch
+# https://gitlab.xiph.org/xiph/libao/commit/d5221655dfd1a2156aa6be83b5aadea7c1e0f5bd.diff
+# CVE 2017-11548
+Patch2: d5221655dfd1a2156aa6be83b5aadea7c1e0f5bd.diff
+Patch3: libao-nanosleep.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: alsa-lib-devel
@@ -32,21 +36,27 @@ This package provides plug-ins for OSS, ESD, ALSA, PulseAudio and aRts.
 You will need to install the supporting libraries for any plug-ins you 
 want to use in order for them to work.
 
+
 %package devel
 Summary: Cross Platform Audio Output Library Development.
 Summary(ja): libao の開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 
 %description devel
 The libao-devel package contains the header files, static libraries and
 documentation needed to develop applications with libao.
 
+
+%debug_package
+
+
 %prep
-%setup -q
+%autosetup -p1
 perl -p -i -e "s/-O20/$RPM_OPT_FLAGS/" configure
 perl -p -i -e "s/-ffast-math//" configure
 
+
 %build
 %configure \
     --disable-broken-oss \
@@ -60,31 +70,25 @@ make %{?_smp_mflags}
 
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 rm -f doc/Makefile*
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/ao/plugins-4/lib*.la
 
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+rm -rf pkgdoc
+mv -f %{buildroot}%{_docdir}/%{name}-%{version} pkgdoc
 
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS CHANGES COPYING README
+%license COPYING
+%doc AUTHORS CHANGES README
 %{_libdir}/libao.so.*
 %{_libdir}/ao/*/*.so
 %{_mandir}/man5/*
 
 %files devel
-%defattr(-,root,root)
-%doc doc/*
+%doc pkgdoc/*
 %{_includedir}/ao
 %{_libdir}/libao.so
 #{_libdir}/ao/*/*.la
@@ -92,7 +96,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ao/plugins-4/lib*.la
 %{_datadir}/aclocal/ao.m4
 %exclude %{_libdir}/ckport/db/libao.ckport
 
+
 %changelog
+* Sat Jul 06 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.0-2
+- rebuilt with current environment.
+
 * Tue Mar 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.2.0-1
 - new upstream release
 - added Japanese summary

+ 4 - 1
lib/liba/libasyncns/libasyncns-vl.spec

@@ -5,7 +5,7 @@ Summary(ja): 非同期ネームサービスライブラリ
 
 Name: libasyncns
 Version: 0.8
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8-5
+- rebuilt with current environment.
+
 * Wed Nov 24 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8-4
 - rebuilt with current environment.
 - dropped ldconfig scriptlets.

+ 183 - 208
p/pulseaudio/pulseaudio-vl.spec

@@ -1,15 +1,15 @@
 %bcond_with systemd
 
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
-%define drvver 14.2
+%define drvver 17.0
 
 %define _unpackaged_files_terminate_build 1
 
 Name:		pulseaudio
 Summary: 	PulseAudio sound server
 Summary(ja): 	PulseAudio サウンドサーバ
-Version:	14.2
-Release:	2%{?_dist_release}%{?with_systemd:.systemd}
+Version:	17.0
+Release:	1%{?_dist_release}%{?with_systemd:.systemd}
 Group:		servers,multimedia
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -19,6 +19,7 @@ License:	GPLv2+
 URL:		https://www.freedesktop.org/wiki/Software/PulseAudio/
 Source0:	https://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz
 Source1:        default.pa-for-gdm
+
 Patch0:         pulseaudio-13.0-elogind.patch
 
 # revert upstream commit to rely solely on autospawn for autostart, instead
@@ -30,29 +31,40 @@ Patch201:	pulseaudio-autostart.patch
 # disable autospawn
 Patch206:	pulseaudio-11.1-autospawn_disable.patch
 
+# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/812
+Patch1:		0001-tests-Don-t-run-volume-tests-with-impossible-alignme.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: libsamplerate-devel, libsndfile-devel
-BuildRequires: liboil-devel, m4, libcap-devel, 
+BuildRequires: meson
+BuildRequires: m4
 BuildRequires: libtool-ltdl-devel >= 2.2.6
+BuildRequires: intltool
 BuildRequires: pkgconfig
-BuildRequires: alsa-lib-devel, glib2-devel, avahi-devel, GConf2-devel
-BuildRequires: lirc-devel, doxygen, jack-audio-connection-kit-devel
-BuildRequires: polkit-devel
-BuildRequires: dbus-devel
+BuildRequires: doxygen
+BuildRequires: xmltoman
+BuildRequires: libsndfile-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: glib2-devel
+BuildRequires: gtk3-devel
+BuildRequires: avahi-devel
+BuildRequires: libatomic_ops-static, libatomic_ops-devel
 BuildRequires: bluez-libs-devel >= 4.101-2
 BuildRequires: sbc-devel
-BuildRequires: libXt-devel, libXtst-devel, xorg-x11-proto-devel
-BuildRequires: speexdsp-devel
-BuildRequires: openssl-devel
-BuildRequires: gdbm-devel
-BuildRequires: gtk2-devel
-BuildRequires: json-c-devel >= 0.11
+BuildRequires: libXt-devel
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: libXtst-devel
 BuildRequires: xcb-util-devel
+BuildRequires: openssl-devel
+BuildRequires: orc-devel
 BuildRequires: libtdb-devel
+BuildRequires: speexdsp-devel
 BuildRequires: libasyncns-devel
-BuildRequires: orc-devel
-BuildRequires: libuuid-devel
-BuildRequires: libtool
+BuildRequires: libsamplerate-devel
+BuildRequires: dbus-devel
+BuildRequires: libcap-devel
+BuildRequires: fftw3-devel
+BuildRequires: lirc-devel
+BuildRequires: jack-audio-connection-kit-devel
 %if %{with systemd}
 BuildRequires: systemd-devel
 %{?systemd_requires}
@@ -66,25 +78,16 @@ Requires:      %{name}-core-libs = %{version}-%{release}
 Provides:       pulseaudio-daemon
 Conflicts:      pulseaudio-daemon
 
+# Packages removed in 15.0
+Obsoletes:      pulseaudio-esound-compat < 15.0
+Obsoletes:      pulseaudio-module-gconf < 15.0
+
 %description
 PulseAudio is a sound server for Linux and other Unix like operating 
 systems. It is intended to be an improved drop-in replacement for the 
 Enlightened Sound Daemon (ESOUND).
 
 
-%package esound-compat
-Summary:	PulseAudio EsounD daemon compatibility script
-Summary(ja):	PulseAudio EsounD デーモン互換スクリプト
-Group:		servers,multimedia
-Requires:	%{name} = %{version}-%{release}
-Provides:	esound
-Obsoletes:      esound
-
-%description esound-compat
-A compatibility script that allows applications to call /usr/bin/esd
-and start PulseAudio with EsounD protocol modules.
-
-
 %package module-lirc
 Summary:	LIRC support for the PulseAudio sound server
 Summary(ja):	PulseAudio サウンドサーバ用 LIRC サポート
@@ -139,16 +142,6 @@ Requires:	%{name} = %{version}-%{release}
 JACK sink and source modules for the PulseAudio sound server.
 
 
-%package module-gconf
-Summary:	GConf support for the PulseAudio sound server
-Summary(ja):	PulseAudio サウンドサーバ用 GConf サポート
-Group:		servers,multimedia
-Requires:	%{name} = %{version}-%{release}
-
-%description module-gconf
-GConf configuration backend for the PulseAudio sound server.
-
-
 %package module-gsettings
 Summary:	Gsettings support for the PulseAudio sound server
 Summary(ja):	PulseAudio サウンドサーバ用 gsetting サポート
@@ -243,7 +236,7 @@ This package contains GDM integration hooks for the PulseAudio sound server.
 Summary:	Libraries for PulseAudio clients
 Summary(ja):	PulseAudio クライアントライブラリ
 License:	LGPLv2+
-Group:		system
+Group:		system,lagacy
 Provides:	compat32-%{name}-libs-zeroconf = %{version}
 Obsoletes:	compat32-%{name}-libs-zeroconf < 1.0
 
@@ -256,7 +249,7 @@ to interface with a PulseAudio sound server.
 Summary:        Core libraries for the PulseAudio sound server.
 Summary(ja):    PulseAudio サウンドサーバコアライブラリ
 License:	LGPLv2+
-Group:		system
+Group:		system,lagacy
 
 %description -n compat32-%{name}-core-libs
 This package contains runtime libraries that are used internally in the
@@ -267,7 +260,7 @@ PulseAudio sound server.
 Summary:	GLIB 2.x bindings for PulseAudio clients
 Summary(ja):	PulseAudio クライアント用 GLIB 2.x バインディング
 License:	LGPLv2+
-Group:		system
+Group:		system,lagacy
 
 %description -n compat32-%{name}-libs-glib2
 This package contains bindings to integrate the PulseAudio client library with
@@ -278,7 +271,7 @@ a GLIB 2.x based application.
 Summary:	Headers and libraries for PulseAudio client development
 Summary(ja):	PulseAudio クライアント開発用ヘッダおよびライブラリ
 License:	LGPLv2+
-Group:		programming
+Group:		programming,lagacy
 Requires:	compat32-%{name}-libs = %{version}-%{release}
 Requires:	compat32-%{name}-libs-glib2 = %{version}-%{release}
 Requires:	%{name}-libs-devel = %{version}-%{release}
@@ -294,69 +287,62 @@ a PulseAudio sound server.
 
 %prep
 %setup -q -T -b0
+%patch1 -p1 -b .volume_test
 %patch201 -p1 -b .autostart
-%if %{with systemd}
 %patch206 -p1 -b .autospawn_disable
-%else
-%patch0 -p1 -b .elogind
-%endif
 
 
 %build
-./bootstrap.sh
-%configure \
-  --disable-static \
-  --disable-rpath \
-  --with-system-user=pulse \
-  --with-system-group=pulse \
-  --with-access-group=pulse-access \
-  --disable-oss-output \
-  --without-fftw \
+%meson \
+  -D system_user=pulse \
+  -D system_group=pulse \
+  -D access_group=pulse-access \
+  -D oss-output=enabled \
+  -D jack=enabled \
+  -D lirc=enabled \
+  -D tcpwrap=disabled \
+  -D bluez5=enabled \
+  -D gstreamer=disabled \
+  -D bluez5-gstreamer=disabled \
+  -D gsettings=enabled \
+  -D valgrind=disabled \
+  -D gtk=disabled \
+  -D soxr=disabled \
+  -D webrtc-aec=disabled \
 %if %{with systemd}
-  --enable-systemd-daemon \
-  --enable-systemd-login \
-  --enable-systemd-journal \
+  -D systemd=enabled \
+  -D elogind=disabled \
 %else
-  --disable-systemd-daemon \
-  --disable-systemd-login \
-  --disable-systemd-journal \
-  --enable-elogind \
+  -D systemd=disabled \
+  -D elogind=enabled \
 %endif
-  --enable-gconf \
-  --enable-gsettings \
-  --enable-bluez5 \
-  --disable-tcpwrap
+  -D consolekit=disabled \
+  -D tests=false
 
-make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
-make doxygen
+%meson_build
+%meson_build doxygen
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-
-find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
+%meson_install
 
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/pulseaudio
-ln -s esdcompat $RPM_BUILD_ROOT%{_bindir}/esd
-# preserve time stamps, for multilib's sake
-touch -r src/daemon/daemon.conf.in $RPM_BUILD_ROOT%{_sysconfdir}/pulse/daemon.conf
-touch -r src/daemon/default.pa.in $RPM_BUILD_ROOT%{_sysconfdir}/pulse/default.pa
-touch -r man/pulseaudio.1.xml.in $RPM_BUILD_ROOT%{_mandir}/man1/pulseaudio.1
-touch -r man/default.pa.5.xml.in $RPM_BUILD_ROOT%{_mandir}/man5/default.pa.5
-touch -r man/pulse-client.conf.5.xml.in $RPM_BUILD_ROOT%{_mandir}/man5/pulse-client.conf.5
-touch -r man/pulse-daemon.conf.5.xml.in $RPM_BUILD_ROOT%{_mandir}/man5/pulse-daemon.conf.5
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/pulse
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse
-cp $RPM_SOURCE_DIR/default.pa-for-gdm $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse/default.pa
+# upstream should use udev.pc
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d
+mv -fv $RPM_BUILD_ROOT/lib/udev/rules.d/90-pulseaudio.rules $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d
 
-# (cg) We require systemd now, so no point in using CK
-rm -f %{buildroot}%{_libdir}/pulse-%{drvver}/modules/module-console-kit.so
+install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse/default.pa
 
+## unpackaged files
+# extraneous libtool crud
+rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -fv $RPM_BUILD_ROOT%{_libdir}/pulseaudio/lib*.la
+rm -fv $RPM_BUILD_ROOT%{_libdir}/pulseaudio/modules/*.la
+# PA_MODULE_DEPRECATED("Please use module-udev-detect instead of module-detect!");
+rm -fv $RPM_BUILD_ROOT%{_libdir}/pulseaudio/modules/module-detect.so
+rm -fv $RPM_BUILD_ROOT%{_libdir}/pulseaudio/modules/liboss-util.so
+rm -fv $RPM_BUILD_ROOT%{_libdir}/pulseaudio/modules/module-oss.so
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%find_lang %{name}
 
 
 %pre
@@ -367,8 +353,8 @@ groupadd -r pulse-rt &>/dev/null || :
 groupadd -r pulse-access &>/dev/null || :
 
 %post
-/sbin/ldconfig
 %if %{with systemd}
+systemctl --no-reload preset --global pulseaudio.socket >/dev/null 2>&1 || :
 #systemd_user_post pulseaudio.service
 %systemd_user_post pulseaudio.socket
 %endif
@@ -380,7 +366,6 @@ groupadd -r pulse-access &>/dev/null || :
 %endif
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ]; then
     userdel pulse &>/dev/null || :
     groupdel pulse &>/dev/null || :
@@ -397,89 +382,83 @@ fi
 %config(noreplace) %{_sysconfdir}/pulse/daemon.conf
 %config(noreplace) %{_sysconfdir}/pulse/default.pa
 %config(noreplace) %{_sysconfdir}/pulse/system.pa
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf
+%{_datadir}/dbus-1/system.d/pulseaudio-system.conf
 %{_datadir}/zsh/site-functions/_pulseaudio
 %attr(4755,root,root) %{_bindir}/pulseaudio
-%dir %{_libdir}/pulse-%{drvver}/
-%dir %{_libdir}/pulse-%{drvver}/modules/
-%{_libdir}/pulse-%{drvver}/modules/libalsa-util.so
-%{_libdir}/pulse-%{drvver}/modules/libcli.so
-#%{_libdir}/pulse-%{drvver}/modules/liboss-util.so
-%{_libdir}/pulse-%{drvver}/modules/libprotocol-cli.so
-%{_libdir}/pulse-%{drvver}/modules/libprotocol-esound.so
-%{_libdir}/pulse-%{drvver}/modules/libprotocol-http.so
-%{_libdir}/pulse-%{drvver}/modules/libprotocol-native.so
-%{_libdir}/pulse-%{drvver}/modules/libprotocol-simple.so
-%{_libdir}/pulse-%{drvver}/modules/librtp.so
-%{_libdir}/pulse-%{drvver}/modules/module-allow-passthrough.so
-%{_libdir}/pulse-%{drvver}/modules/module-always-source.so
-%{_libdir}/pulse-%{drvver}/modules/module-alsa-sink.so
-%{_libdir}/pulse-%{drvver}/modules/module-alsa-source.so
-%{_libdir}/pulse-%{drvver}/modules/module-alsa-card.so
-%{_libdir}/pulse-%{drvver}/modules/module-always-sink.so
-%{_libdir}/pulse-%{drvver}/modules/module-augment-properties.so
-%{_libdir}/pulse-%{drvver}/modules/module-card-restore.so
-%{_libdir}/pulse-%{drvver}/modules/module-cli-protocol-tcp.so
-%{_libdir}/pulse-%{drvver}/modules/module-cli-protocol-unix.so
-%{_libdir}/pulse-%{drvver}/modules/module-cli.so
-%{_libdir}/pulse-%{drvver}/modules/module-combine.so
-%{_libdir}/pulse-%{drvver}/modules/module-combine-sink.so
-%{_libdir}/pulse-%{drvver}/modules/module-systemd-login.so
-%{_libdir}/pulse-%{drvver}/modules/module-dbus-protocol.so
-%{_libdir}/pulse-%{drvver}/modules/module-default-device-restore.so
-%{_libdir}/pulse-%{drvver}/modules/module-device-manager.so
-%{_libdir}/pulse-%{drvver}/modules/module-device-restore.so
-%{_libdir}/pulse-%{drvver}/modules/module-filter-apply.so
-%{_libdir}/pulse-%{drvver}/modules/module-filter-heuristics.so
-%{_libdir}/pulse-%{drvver}/modules/module-loopback.so
-%{_libdir}/pulse-%{drvver}/modules/module-detect.so
-%{_libdir}/pulse-%{drvver}/modules/module-echo-cancel.so
-%{_libdir}/pulse-%{drvver}/modules/module-esound-compat-spawnfd.so
-%{_libdir}/pulse-%{drvver}/modules/module-esound-compat-spawnpid.so
-%{_libdir}/pulse-%{drvver}/modules/module-esound-protocol-tcp.so
-%{_libdir}/pulse-%{drvver}/modules/module-esound-protocol-unix.so
-%{_libdir}/pulse-%{drvver}/modules/module-esound-sink.so
-%{_libdir}/pulse-%{drvver}/modules/module-udev-detect.so
-%{_libdir}/pulse-%{drvver}/modules/module-hal-detect.so
-%{_libdir}/pulse-%{drvver}/modules/module-http-protocol-tcp.so
-%{_libdir}/pulse-%{drvver}/modules/module-http-protocol-unix.so
-%{_libdir}/pulse-%{drvver}/modules/module-intended-roles.so
-%{_libdir}/pulse-%{drvver}/modules/module-ladspa-sink.so
-%{_libdir}/pulse-%{drvver}/modules/module-match.so
-%{_libdir}/pulse-%{drvver}/modules/module-mmkbd-evdev.so
-%{_libdir}/pulse-%{drvver}/modules/module-native-protocol-fd.so
-%{_libdir}/pulse-%{drvver}/modules/module-native-protocol-tcp.so
-%{_libdir}/pulse-%{drvver}/modules/module-native-protocol-unix.so
-%{_libdir}/pulse-%{drvver}/modules/module-null-sink.so
-%{_libdir}/pulse-%{drvver}/modules/module-null-source.so
-#%{_libdir}/pulse-%{drvver}/modules/module-oss.so
-%{_libdir}/pulse-%{drvver}/modules/module-pipe-sink.so
-%{_libdir}/pulse-%{drvver}/modules/module-pipe-source.so
-%{_libdir}/pulse-%{drvver}/modules/module-position-event-sounds.so
-%{_libdir}/pulse-%{drvver}/modules/module-remap-sink.so
-%{_libdir}/pulse-%{drvver}/modules/module-remap-source.so
-%{_libdir}/pulse-%{drvver}/modules/module-rescue-streams.so
-%{_libdir}/pulse-%{drvver}/modules/module-role-cork.so
-%{_libdir}/pulse-%{drvver}/modules/module-role-ducking.so
-%{_libdir}/pulse-%{drvver}/modules/module-rtp-recv.so
-%{_libdir}/pulse-%{drvver}/modules/module-rtp-send.so
-%{_libdir}/pulse-%{drvver}/modules/module-rygel-media-server.so
-%{_libdir}/pulse-%{drvver}/modules/module-simple-protocol-tcp.so
-%{_libdir}/pulse-%{drvver}/modules/module-simple-protocol-unix.so
-%{_libdir}/pulse-%{drvver}/modules/module-sine.so
-%{_libdir}/pulse-%{drvver}/modules/module-sine-source.so
-%{_libdir}/pulse-%{drvver}/modules/module-stream-restore.so
-%{_libdir}/pulse-%{drvver}/modules/module-suspend-on-idle.so
-%{_libdir}/pulse-%{drvver}/modules/module-switch-on-connect.so
-%{_libdir}/pulse-%{drvver}/modules/module-switch-on-port-available.so
-%{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink-new.so
-%{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink.so
-%{_libdir}/pulse-%{drvver}/modules/module-tunnel-source-new.so
-%{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.so
-%{_libdir}/pulse-%{drvver}/modules/module-virtual-sink.so
-%{_libdir}/pulse-%{drvver}/modules/module-virtual-source.so
-%{_libdir}/pulse-%{drvver}/modules/module-virtual-surround-sink.so
-%{_libdir}/pulse-%{drvver}/modules/module-volume-restore.so
+%dir %{_libdir}/pulseaudio/
+%dir %{_libdir}/pulseaudio/modules/
+%{_libdir}/pulseaudio/modules/libalsa-util.so
+%{_libdir}/pulseaudio/modules/libcli.so
+#%{_libdir}/pulseaudio/modules/liboss-util.so
+%{_libdir}/pulseaudio/modules/libprotocol-cli.so
+%{_libdir}/pulseaudio/modules/libprotocol-http.so
+%{_libdir}/pulseaudio/modules/libprotocol-native.so
+%{_libdir}/pulseaudio/modules/libprotocol-simple.so
+%{_libdir}/pulseaudio/modules/librtp.so
+%{_libdir}/pulseaudio/modules/module-allow-passthrough.so
+%{_libdir}/pulseaudio/modules/module-always-source.so
+%{_libdir}/pulseaudio/modules/module-alsa-sink.so
+%{_libdir}/pulseaudio/modules/module-alsa-source.so
+%{_libdir}/pulseaudio/modules/module-alsa-card.so
+%{_libdir}/pulseaudio/modules/module-always-sink.so
+%{_libdir}/pulseaudio/modules/module-augment-properties.so
+%{_libdir}/pulseaudio/modules/module-card-restore.so
+%{_libdir}/pulseaudio/modules/module-cli-protocol-tcp.so
+%{_libdir}/pulseaudio/modules/module-cli-protocol-unix.so
+%{_libdir}/pulseaudio/modules/module-cli.so
+%{_libdir}/pulseaudio/modules/module-combine.so
+%{_libdir}/pulseaudio/modules/module-combine-sink.so
+%{_libdir}/pulseaudio/modules/module-systemd-login.so
+%{_libdir}/pulseaudio/modules/module-dbus-protocol.so
+%{_libdir}/pulseaudio/modules/module-default-device-restore.so
+%{_libdir}/pulseaudio/modules/module-device-manager.so
+%{_libdir}/pulseaudio/modules/module-device-restore.so
+%{_libdir}/pulseaudio/modules/module-equalizer-sink.so
+%{_libdir}/pulseaudio/modules/module-filter-apply.so
+%{_libdir}/pulseaudio/modules/module-filter-heuristics.so
+%{_libdir}/pulseaudio/modules/module-loopback.so
+%{_libdir}/pulseaudio/modules/module-echo-cancel.so
+%{_libdir}/pulseaudio/modules/module-udev-detect.so
+%{_libdir}/pulseaudio/modules/module-hal-detect.so
+%{_libdir}/pulseaudio/modules/module-http-protocol-tcp.so
+%{_libdir}/pulseaudio/modules/module-http-protocol-unix.so
+%{_libdir}/pulseaudio/modules/module-intended-roles.so
+%{_libdir}/pulseaudio/modules/module-ladspa-sink.so
+%{_libdir}/pulseaudio/modules/module-match.so
+%{_libdir}/pulseaudio/modules/module-mmkbd-evdev.so
+%{_libdir}/pulseaudio/modules/module-native-protocol-fd.so
+%{_libdir}/pulseaudio/modules/module-native-protocol-tcp.so
+%{_libdir}/pulseaudio/modules/module-native-protocol-unix.so
+%{_libdir}/pulseaudio/modules/module-null-sink.so
+%{_libdir}/pulseaudio/modules/module-null-source.so
+#%{_libdir}/pulseaudio/modules/module-oss.so
+%{_libdir}/pulseaudio/modules/module-pipe-sink.so
+%{_libdir}/pulseaudio/modules/module-pipe-source.so
+%{_libdir}/pulseaudio/modules/module-position-event-sounds.so
+%{_libdir}/pulseaudio/modules/module-remap-sink.so
+%{_libdir}/pulseaudio/modules/module-remap-source.so
+%{_libdir}/pulseaudio/modules/module-rescue-streams.so
+%{_libdir}/pulseaudio/modules/module-role-cork.so
+%{_libdir}/pulseaudio/modules/module-role-ducking.so
+%{_libdir}/pulseaudio/modules/module-rtp-recv.so
+%{_libdir}/pulseaudio/modules/module-rtp-send.so
+%{_libdir}/pulseaudio/modules/module-rygel-media-server.so
+%{_libdir}/pulseaudio/modules/module-simple-protocol-tcp.so
+%{_libdir}/pulseaudio/modules/module-simple-protocol-unix.so
+%{_libdir}/pulseaudio/modules/module-sine.so
+%{_libdir}/pulseaudio/modules/module-sine-source.so
+%{_libdir}/pulseaudio/modules/module-stream-restore.so
+%{_libdir}/pulseaudio/modules/module-suspend-on-idle.so
+%{_libdir}/pulseaudio/modules/module-switch-on-connect.so
+%{_libdir}/pulseaudio/modules/module-switch-on-port-available.so
+%{_libdir}/pulseaudio/modules/module-tunnel-sink-new.so
+%{_libdir}/pulseaudio/modules/module-tunnel-sink.so
+%{_libdir}/pulseaudio/modules/module-tunnel-source-new.so
+%{_libdir}/pulseaudio/modules/module-tunnel-source.so
+%{_libdir}/pulseaudio/modules/module-virtual-sink.so
+%{_libdir}/pulseaudio/modules/module-virtual-source.so
+%{_libdir}/pulseaudio/modules/module-virtual-surround-sink.so
+%{_libdir}/pulseaudio/modules/module-volume-restore.so
 %{_datadir}/bash-completion/completions/*
 %{_datadir}/pulseaudio/alsa-mixer/paths/*
 %{_datadir}/pulseaudio/alsa-mixer/profile-sets/*
@@ -493,66 +472,58 @@ fi
 %{_mandir}/man5/pulse-daemon.conf.5.gz
 #%{_mandir}/man1/start-pulseaudio-kde.1.gz
 %{_mandir}/man1/start-pulseaudio-x11.1.gz
-/lib/udev/rules.d/90-pulseaudio.rules
+/usr/lib/udev/rules.d/90-pulseaudio.rules
 %dir %{_libexecdir}/pulse
-%attr(0700, pulse, pulse) %dir %{_localstatedir}/lib/pulse
 %if %{with systemd}
 %{_userunitdir}/pulseaudio.service
 %{_userunitdir}/pulseaudio.socket
 %endif
 
-%files esound-compat
-%defattr(-,root,root)
-%{_bindir}/esdcompat
-%{_bindir}/esd
-%{_mandir}/man1/esdcompat.1.gz
-
 %files module-lirc
 %defattr(-,root,root)
-%{_libdir}/pulse-%{drvver}/modules/module-lirc.so
+%{_libdir}/pulseaudio/modules/module-lirc.so
 
 %files module-x11
 %defattr(-,root,root)
 %config %{_sysconfdir}/xdg/autostart/pulseaudio.desktop
+%config(noreplace) %{_sysconfdir}/xdg/Xwayland-session.d/00-pulseaudio-x11
+%if %{with systemd}
+%{_userunitdir}/pulseaudio-x11.service
+%endif
 #%config %{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop
 %{_bindir}/start-pulseaudio-x11
 #%{_bindir}/start-pulseaudio-kde
-%{_libdir}/pulse-%{drvver}/modules/module-x11-bell.so
-%{_libdir}/pulse-%{drvver}/modules/module-x11-publish.so
-%{_libdir}/pulse-%{drvver}/modules/module-x11-xsmp.so
-%{_libdir}/pulse-%{drvver}/modules/module-x11-cork-request.so
+%{_libdir}/pulseaudio/modules/module-x11-bell.so
+%{_libdir}/pulseaudio/modules/module-x11-publish.so
+%{_libdir}/pulseaudio/modules/module-x11-xsmp.so
+%{_libdir}/pulseaudio/modules/module-x11-cork-request.so
 
 %files module-zeroconf
 %defattr(-,root,root)
-%{_libdir}/pulse-%{drvver}/modules/libavahi-wrap.so
-%{_libdir}/pulse-%{drvver}/modules/module-zeroconf-publish.so
-%{_libdir}/pulse-%{drvver}/modules/module-zeroconf-discover.so
-%{_libdir}/pulse-%{drvver}/modules/libraop.so
-%{_libdir}/pulse-%{drvver}/modules/module-raop-discover.so
-%{_libdir}/pulse-%{drvver}/modules/module-raop-sink.so
+%{_libdir}/pulseaudio/modules/libavahi-wrap.so
+%{_libdir}/pulseaudio/modules/module-zeroconf-publish.so
+%{_libdir}/pulseaudio/modules/module-zeroconf-discover.so
+%{_libdir}/pulseaudio/modules/libraop.so
+%{_libdir}/pulseaudio/modules/module-raop-discover.so
+%{_libdir}/pulseaudio/modules/module-raop-sink.so
 
 %files module-jack
 %defattr(-,root,root)
-%{_libdir}/pulse-%{drvver}/modules/module-jack-sink.so
-%{_libdir}/pulse-%{drvver}/modules/module-jack-source.so
-%{_libdir}/pulse-%{drvver}/modules/module-jackdbus-detect.so
+%{_libdir}/pulseaudio/modules/module-jack-sink.so
+%{_libdir}/pulseaudio/modules/module-jack-source.so
+%{_libdir}/pulseaudio/modules/module-jackdbus-detect.so
 
 %files module-bluetooth
 %defattr(-,root,root)
-%{_libdir}/pulse-%{drvver}/modules/libbluez*-util.so
-%{_libdir}/pulse-%{drvver}/modules/module-bluez*-device.so
-%{_libdir}/pulse-%{drvver}/modules/module-bluez*-discover.so
-%{_libdir}/pulse-%{drvver}/modules/module-bluetooth-discover.so
-%{_libdir}/pulse-%{drvver}/modules/module-bluetooth-policy.so
-
-%files module-gconf
-%defattr(-,root,root)
-%{_libdir}/pulse-%{drvver}/modules/module-gconf.so
-%{_libexecdir}/pulse/gconf-helper
+%{_libdir}/pulseaudio/modules/libbluez*-util.so
+%{_libdir}/pulseaudio/modules/module-bluez*-device.so
+%{_libdir}/pulseaudio/modules/module-bluez*-discover.so
+%{_libdir}/pulseaudio/modules/module-bluetooth-discover.so
+%{_libdir}/pulseaudio/modules/module-bluetooth-policy.so
 
 %files module-gsettings
 %defattr(-,root,root)
-%{_libdir}/pulse-%{drvver}/modules/module-gsettings.so
+%{_libdir}/pulseaudio/modules/module-gsettings.so
 %{_libexecdir}/pulse/gsettings-helper
 %{_datadir}/GConf/gsettings/pulseaudio.convert
 %{_datadir}/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml
@@ -605,6 +576,7 @@ fi
 %{_bindir}/pax11publish
 %{_bindir}/padsp
 %{_bindir}/pasuspender
+%{_bindir}/qpaeq
 %{_libdir}/%{name}/libpulsedsp.so
 %{_mandir}/man1/pacat.1.gz
 %{_mandir}/man1/pacmd.1.gz
@@ -644,6 +616,9 @@ fi
 
 
 %changelog
+* Mon Jul 08 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 17.0-1
+- updated to 17.0.
+
 * Fri Mar 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 14.2-2
 - added virtual provides to switch to pipewire.
 - dropped ldconfig scriptlets.

+ 10 - 7
v/vorbis-tools/vorbis-tools-vl.spec

@@ -5,19 +5,22 @@ Summary:	Several Ogg Vorbis Tools
 Summary(ja):	各種 Ogg Vorvis 用ツール
 Name:		vorbis-tools
 Version:	1.4.2
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Group:		multimedia
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
 License:	GPLv2
 URL:		https://www.xiph.org/
-Source0:	http://downloads.xiph.org/releases/vorbis/vorbis-tools-%{version}.tar.gz
+Source0:	https://downloads.xiph.org/releases/vorbis/vorbis-tools-%{version}.tar.gz
 Source1:	vorbis-tools-ogg123rc
 
 # http://lists.xiph.org/pipermail/vorbis-dev/2021-January/020538.html
 # http://lists.xiph.org/pipermail/vorbis-dev/2013-May/020336.html
 Patch1:		vorbis-tools-1.4.2-man-page.patch
+Patch2:		vorbis-tools-c99.patch
+# fix out-of-bounds read in oggenc (CVE-2023-43361)
+Patch3:		vorbis-tools-1.4.2-CVE-2023-43361.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	libvorbis-devel >= 1.0
@@ -78,15 +81,12 @@ export CFLAGS="$RPM_OPT_FLAGS -Wno-error=format-security"
 %makeinstall
 %find_lang %{name}
 
-%__install -D -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/ogg123rc
-
+rm -f %{buildroot}%{_docdir}/vorbis-tools-%{version}/ogg123rc-example
 
-%clean 
-[ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot}
+%__install -D -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/ogg123rc
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
 %license COPYING
 %doc AUTHORS README ogg123/ogg123rc-example
 %config %{_sysconfdir}/ogg123rc
@@ -95,6 +95,9 @@ export CFLAGS="$RPM_OPT_FLAGS -Wno-error=format-security"
 
 
 %changelog
+* Sat Jul 06 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.2-2
+- imported Patch2 and 3 from rawhide.
+
 * Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.2-1
 - dropped all patches.
 - imported Patch1 from rawhide.