--- smage/trunk/extras/pulseaudio/pulseaudio-13.0-r1.smage2	2020/08/20 11:43:10	15347
+++ smage/trunk/extras/pulseaudio/pulseaudio-13.0-r1.smage2	2020/08/27 12:02:39	15356
@@ -9,7 +9,6 @@
 	pulseaudio
 	pulseaudio-dev
 	pulseaudio-alsa
-	pulseaudio-esound
 	pulseaudio-utils
 	pulseaudio-x11"
 
@@ -32,7 +31,6 @@
 
 COMMON_DEPEND=">= dev-db/tdb-1.4
 	>= sys-fs/libudev-242
-	>= media-libs/libsamplerate-0.1.9
 	>= sci-libs/fftw3-3.3
 	>= dev-libs/liborc-0.4.31
 	>= sys-libs/libltdl-2.4"
@@ -53,7 +51,6 @@
 	>= media-libs/libsndfile-dev-1.0.28
 	>= dev-db/tdb-dev-1.4
 	>= sys-fs/udev-dev-242
-	>= media-libs/libsamplerate-dev-0.1.9
 	>= sci-libs/fftw3-dev-3.3
 	>= media-libs/alsa-lib-dev-1.1"
 
@@ -69,7 +66,7 @@
 SRCFILE="${PNAME}-${PVER}.tar.xz"
 SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"
 
-sminclude mtools multilib mbuild cleanutils udev
+sminclude mtools multilib meson cleanutils udev
 msetfeature "!check"
 
 SRC_URI=(
@@ -112,13 +109,6 @@
 		${ALSA_DEPEND}"
 }
 
-split_info_pulseaudio-esound()
-{
-	DESCRIPTION="PulseAudio EsounD daemon compatibility script."
-	DEPEND="== media-sound/libpulse-${PVER}
-		== media-sound/pulseaudio-${PVER}"
-}
-
 split_info_pulseaudio-x11()
 {
 	DESCRIPTION="X11 support for the PulseAudio sound server."
@@ -144,55 +134,43 @@
 	munpack ${SRCFILE} || die
 
 	# fix /var/run -> /run
-	all-abis "sed -i 's:^\(PA_SYSTEM_RUNTIME_PATH=\).*:\1\"/run/pulse\":' configure.ac || die"
-
-	# configure rebuild taken from bootstrap.sh
-	all-abis "autopoint --force"
-	AUTOPOINT='intltoolize --automake --copy' mautoreconf || die
+	all-abis "sed -i \"s:\(.*PA_SYSTEM_RUNTIME_PATH.*\)localstatedir,\(.*\):\1\'/\',\2:\" meson.build || die"
 }
 
 src_compile()
 {
-	mconfigure \
-		--libexecdir=/usr/'$(mlibdir)'/pulse-${PVER} \
+	meson_setup_builddir || die
+
+	meson_configure \
 		--localstatedir=/var \
-		--with-udev-rules-dir=$(mget-udev-rules-dir) \
-		--with-database=tdb \
-		--with-caps \
-		--disable-per-user-esound-socket \
-		--disable-solaris \
-		--disable-hal \
-		--disable-rpath \
-		--enable-largefile \
-		--enable-glib2 \
-		--enable-udev \
-		--enable-dbus \
-		--enable-alsa \
-		--enable-samplerate \
-		--enable-ipv6 \
-		--disable-avahi \
-		--disable-tcpwrap \
-		--enable-x11 \
-		--disable-openssl \
-		--disable-bluez5 \
-		--disable-bluez4 \
-		--enable-systemd \
-		--disable-asyncns \
-		--disable-oss-output \
-		--disable-lirc \
-		--disable-jack \
-		--disable-gconf \
-		--disable-default-build-tests \
+		$(meson_opt udevrulesdir $(mget-udev-rules-dir)) \
+		$(meson_opt pulsedsp-location '/usr/\$LIB/pulseaudio' ) \
+		$(meson_opt database tdb) \
+		$(meson_enable udev) \
+		$(meson_enable dbus) \
+		$(meson_enable alsa) \
+		$(meson_disable samplerate) \
+		$(meson_bool_false hal-compat) \
+		$(meson_bool_false ipv6) \
+		$(meson_disable avahi) \
+		$(meson_enable x11) \
+		$(meson_disable openssl) \
+		$(meson_bool_false bluez5) \
+		$(meson_bool_false bluez5-native-headset) \
+		$(meson_bool_false bluez5-ofono-headset) \
+		$(meson_enable systemd) \
+		$(meson_disable asyncns) \
+		$(meson_disable lirc) \
+		$(meson_disable jack) \
+		$(meson_bool_false tests) \
 		|| die
- 
-	mmake || die
+
+		mninja || die
 }
 
 src_install_libpulse()
 {
-	local major_pver="$(echo ${PVER} | cut -d. -f1-2)"
-
-	mmake -j1 DESTDIR=${BINDIR} install || die
+	DESTDIR=${BINDIR} mninja install || die
 	zapmost ${BINDIR} \
 		etc/pulse/client.conf \
 		usr/$(mlibdir)/*.so.* usr/$(mlibdir)/pulseaudio \
@@ -202,9 +180,7 @@
 
 src_install_libpulse-dev()
 {
-	local major_pver="$(echo ${PVER} | cut -d. -f1-2)"
-
-	mmake -j1 DESTDIR=${BINDIR} install || die
+	DESTDIR=${BINDIR} mninja install || die
 	zapmost ${BINDIR} \
 		usr/include \
 		usr/$(mlibdir)/*.so usr/$(mlibdir)/*.la usr/$(mlibdir)/cmake usr/$(mlibdir)/pkgconfig \
@@ -218,7 +194,7 @@
 {
 	local major_pver="$(echo ${PVER} | cut -d. -f1-2)"
 
-	mmake -j1 DESTDIR=${BINDIR} install || die
+	DESTDIR=${BINDIR} mninja install || die
 
 	# make avahi support optional
 	sed -i '/load-module\ module-zeroconf-publish/s:^#::' ${BINDIR}/etc/pulse/default.pa || die
@@ -239,12 +215,10 @@
 
 	# remove modules which are in other packages
 	mdelete /usr/$(mlibdir)/pulse-${major_pver}/modules/\*alsa\* || die
-	mdelete /usr/$(mlibdir)/pulse-${major_pver}/modules/\*esound\* || die
 	mdelete /usr/$(mlibdir)/pulse-${major_pver}/modules/\*x11\* || die
 	if [[ $(mlibdir) != lib ]]
 	then
 		mdelete /usr/lib/pulse-${major_pver}/modules/\*alsa\* || die
-		mdelete /usr/lib/pulse-${major_pver}/modules/\*esound\* || die
 		mdelete /usr/lib/pulse-${major_pver}/modules/\*x11\* || die
 	fi
 
@@ -255,9 +229,7 @@
 
 src_install_pulseaudio-dev()
 {
-	local major_pver="$(echo ${PVER} | cut -d. -f1-2)"
-
-	mmake -j1 DESTDIR=${BINDIR} install || die
+	DESTDIR=${BINDIR} mninja install || die
 
 	zapmost ${BINDIR} \
 		usr/share/locale \
@@ -271,7 +243,7 @@
 {
 	local major_pver="$(echo ${PVER} | cut -d. -f1-2)"
 
-	mmake -j1 DESTDIR=${BINDIR} install || die
+	DESTDIR=${BINDIR} mninja install || die
 
 	zapmost ${BINDIR} \
 		usr/$(mlibdir)/pulse-${major_pver}/modules/*alsa* \
@@ -280,25 +252,11 @@
 		|| die
 }
 
-src_install_pulseaudio-esound()
-{
-	local major_pver="$(echo ${PVER} | cut -d. -f1-2)"
-
-	mmake -j1 DESTDIR=${BINDIR} install || die
-
-	zapmost ${BINDIR} \
-		usr/bin/esdcompat \
-		usr/$(mlibdir)/pulse-${major_pver}/modules/*esound* \
-		$([[ $(mlibdir) != lib ]] && echo "usr/lib/pulse-${major_pver}/modules/*esound*") \
-		usr/share/man/man1/esdcompat.1 \
-		|| die
-}
-
 src_install_pulseaudio-x11()
 {
 	local major_pver="$(echo ${PVER} | cut -d. -f1-2)"
 
-	mmake -j1 DESTDIR=${BINDIR} install || die
+	DESTDIR=${BINDIR} mninja install || die
 
 	zapmost ${BINDIR} \
 		etc/xdg \
@@ -311,7 +269,7 @@
 
 src_install_pulseaudio-utils()
 {
-	mmake -j1 DESTDIR=${BINDIR} install || die
+	DESTDIR=${BINDIR} mninja install || die
 
 	zapmost ${BINDIR} \
 		usr/bin/pa* \