Pulseaudio: update to 16.1

Signed-off-by: Johnny Vogels <35307256+jmv2009@users.noreply.github.com>
This commit is contained in:
Johnny Vogels 2023-10-25 20:02:35 +02:00 committed by Rosen Penev
parent e8914a2a57
commit aafc57c1de
4 changed files with 22 additions and 38 deletions

View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=pulseaudio
PKG_VERSION:=14.2
PKG_RELEASE:=10
PKG_VERSION:=16.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://freedesktop.org/software/pulseaudio/releases
PKG_HASH:=75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1
PKG_HASH:=8eef32ce91d47979f95fd9a935e738cd7eb7463430dabc72863251751e504ae4
PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
PKG_LICENSE:=LGPL-2.1-or-later
@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/meson.mk
define Package/pulseaudio-daemon/Default
SECTION:=sound
CATEGORY:=Sound
DEPENDS:=+libsndfile +libltdl +libpthread +librt +alsa-lib \
DEPENDS:=+libsndfile +libltdl +alsa-lib \
+libopenssl +libcap $(ICONV_DEPENDS) $(INTL_DEPENDS)
TITLE:=Network sound server
URL:=https://www.freedesktop.org/wiki/Software/PulseAudio/
@ -45,7 +45,7 @@ endef
define Package/pulseaudio-daemon-avahi
$(call Package/pulseaudio-daemon/Default)
DEPENDS+=+dbus +libavahi-client +sbc
DEPENDS+=+dbus +libavahi-client +sbc +bluez-daemon
TITLE+= (avahi/bluez)
VARIANT:=avahi
endef
@ -121,19 +121,20 @@ MESON_ARGS += \
-Dudev=disabled \
-Dx11=disabled \
-Dadrian-aec=true \
-Dwebrtc-aec=disabled
-Dwebrtc-aec=disabled \
-Ddoxygen=false
ifeq ($(BUILD_VARIANT),avahi)
MESON_ARGS += \
-Davahi=enabled \
-Dbluez5=true \
-Dbluez5=enabled \
-Ddbus=enabled
endif
ifeq ($(BUILD_VARIANT),noavahi)
MESON_ARGS += \
-Davahi=disabled \
-Dbluez5=false \
-Dbluez5=disabled \
-Ddbus=disabled
endif
@ -183,8 +184,8 @@ define Package/pulseaudio-daemon/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pulseaudio/* $(1)/usr/lib/pulseaudio/
$(INSTALL_DIR) $(1)/usr/lib/pulse-$(PKG_VERSION)/modules
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/lib*.so $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/module*.so $(1)/usr/lib/pulse-$(PKG_VERSION)/modules/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pulseaudio/modules/lib*.so $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pulseaudio/modules/module*.so $(1)/usr/lib/pulseaudio/modules/
endef
define Package/pulseaudio-daemon-avahi/install

View File

@ -1,18 +0,0 @@
--- a/meson.build
+++ b/meson.build
@@ -390,12 +390,11 @@ if dl_dep.found()
endif
have_iconv = false
-if cc.has_function('iconv_open')
+iconv_dep = cc.find_library('iconv', required : false)
+have_iconv = iconv_dep.found()
+if not have_iconv and cc.has_function('iconv_open')
iconv_dep = dependency('', required : false)
have_iconv = true
-else
- iconv_dep = cc.find_library('iconv', required : false)
- have_iconv = iconv_dep.found()
endif
if have_iconv
cdata.set('HAVE_ICONV', 1)

View File

@ -0,0 +1,11 @@
--- a/meson.build
+++ b/meson.build
@@ -681,7 +681,7 @@ if get_option('daemon')
cdata.set('HAVE_ALSA_UCM', 1)
endif
- gio_dep = dependency('gio-2.0', version : '>= 2.26.0')
+ gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : false)
if get_option('gsettings').enabled()
assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)')
cdata.set('HAVE_GSETTINGS', 1)

View File

@ -1,10 +0,0 @@
--- a/meson.build
+++ b/meson.build
@@ -698,7 +698,6 @@ check_dep = dependency('check', version
# Subdirs
-subdir('doxygen')
subdir('po')
if get_option('man')
subdir('man')