Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11877 from neheb/pulse

Browse source 
pulseaudio: update to 13.0
This commit is contained in:
tripolar 2020-04-18 13:17:19 +02:00 committed by GitHub
commit e0970c50c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
sound/pulseaudio/Makefile
View file

@ -8,34 +8,33 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=pulseaudio PKG_NAME:=pulseaudio
PKG_VERSION:=12.2 PKG_VERSION:=13.0
PKG_RELEASE:=4 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://freedesktop.org/software/pulseaudio/releases/ PKG_SOURCE_URL:=https://freedesktop.org/software/pulseaudio/releases
PKG_HASH:=809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055 PKG_HASH:=961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057
PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=GPL LICENSE PKG_LICENSE_FILES:=GPL LICENSE
PKG_CPE_ID:=cpe:/a:pulseaudio:pulseaudio PKG_CPE_ID:=cpe:/a:pulseaudio:pulseaudio
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=intltool/host glib2/host
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
define Package/pulseaudio/Default define Package/pulseaudio/Default
SECTION:=sound SECTION:=sound
CATEGORY:=Sound CATEGORY:=Sound
DEPENDS:=+libsndfile +libltdl +libpthread +librt +alsa-lib \ DEPENDS:=+libsndfile +libltdl +libpthread +librt +alsa-lib \
+libopenssl +libwrap +libcap $(ICONV_DEPENDS) $(INTL_DEPENDS) +libopenssl +libcap $(ICONV_DEPENDS) $(INTL_DEPENDS)
TITLE:=Network sound server TITLE:=Network sound server
MAINTAINER:=Peter Wagner <tripolar@gmx.at> URL:=https://www.pulseaudio.org
URL:=http://www.pulseaudio.org
PROVIDES:=pulseaudio PROVIDES:=pulseaudio
USERID:=pulse=51:pulse=51 USERID:=pulse=51:pulse=51
endef endef
@ -96,47 +95,54 @@ define Package/pulseaudio-profiles
URL:=http://www.pulseaudio.org URL:=http://www.pulseaudio.org
endef endef
CONFIGURE_ARGS += \ MESON_ARGS += \
$(if $(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),--enable-neon-opt,--disable-neon-opt) \ -Dgcov=false \
--with-system-user=pulse \ -Dman=false \
--with-system-group=pulse \ -Dtests=false \
--with-access-group=audio \ -Dsystem_user=pulse \
--with-database=simple \ -Dsystem_group=pulse \
--enable-alsa \ -Daccess_group=audio \
--disable-hal \ -Ddatabase=simple \
--disable-gconf \ -Dlegacy-database-entry-format=false \
--disable-nls \ -Drunning-from-build-tree=false \
--disable-manpages \ -Datomic-arm-linux-helpers=false \
--enable-oss-output \ -Dalsa=enabled \
--disable-oss-wrapper \ -Dasyncns=disabled \
--disable-samplerate \ -Dbluez5=false \
--disable-per-user-esound-socket \ -Dbluez5-native-headset=false \
--disable-solaris \ -Dbluez5-ofono-headset=false \
--disable-gtk2 \ -Dfftw=disabled \
--disable-glib2 \ -Dglib=disabled \
--disable-jack \ -Dgsettings=disabled \
--disable-asyncns \ -Dgtk=disabled \
--disable-lirc \ -Dhal-compat=false \
--disable-tests \ -Dipv6=true \
--disable-udev \ -Djack=disabled \
--without-fftw \ -Dlirc=disabled \
--without-soxr \ -Dopenssl=enabled \
--without-speex -Dorc=disabled \
-Dsamplerate=disabled \
-Dsoxr=disabled \
-Dspeex=disabled \
-Dsystemd=disabled \
-Dudev=disabled \
-Dx11=disabled \
-Dadrian-aec=true \
-Dwebrtc-aec=disabled
ifeq ($(BUILD_VARIANT),avahi) ifeq ($(BUILD_VARIANT),avahi)
CONFIGURE_ARGS += \ MESON_ARGS += \
--enable-avahi \ -Davahi=enabled \
--enable-dbus -Ddbus=enabled
endif endif
ifeq ($(BUILD_VARIANT),noavahi) ifeq ($(BUILD_VARIANT),noavahi)
CONFIGURE_ARGS += \ MESON_ARGS += \
--disable-avahi \ -Davahi=disabled \
--disable-dbus -Ddbus=disabled
endif endif
CONFIGURE_VARS += \ TARGET_LDFLAGS += -liconv
PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) \ $(INSTALL_DIR) \

130
sound/pulseaudio/patches/010-also-include.patch
View file

@ -1,130 +0,0 @@
From 993d3fd89e5611997f1e165bf03edefb0204b0a4 Mon Sep 17 00:00:00 2001
From: Olaf Hering <olaf@aepfle.de>
Date: Wed, 27 Mar 2019 09:35:05 +0100
Subject: [PATCH] alsa: Use correct header path
Consumers are expected to use <alsa/asoundlib.h> instead of
<asoundlib.h>.
This is in preparation of an change to pkgconfig(alsa) to
not pollute CFLAGS with -I/usr/include/alsa anymore.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
src/modules/alsa/alsa-mixer.c | 2 +-
src/modules/alsa/alsa-mixer.h | 2 +-
src/modules/alsa/alsa-sink.c | 2 +-
src/modules/alsa/alsa-source.c | 2 +-
src/modules/alsa/alsa-ucm.c | 2 +-
src/modules/alsa/alsa-util.c | 2 +-
src/modules/alsa/alsa-util.h | 2 +-
src/modules/alsa/module-alsa-source.c | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 5cb99c8fd..cd99a75f8 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -23,7 +23,7 @@
#endif
#include <sys/types.h>
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#include <math.h>
#ifdef HAVE_VALGRIND_MEMCHECK_H
diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h
index 3ea4d7329..65b071165 100644
--- a/src/modules/alsa/alsa-mixer.h
+++ b/src/modules/alsa/alsa-mixer.h
@@ -21,7 +21,7 @@
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
***/
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#include <pulse/sample.h>
#include <pulse/mainloop-api.h>
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 28143402a..4b46708ce 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -25,7 +25,7 @@
#include <signal.h>
#include <stdio.h>
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#ifdef HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h>
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 8129220b0..c8bf649e1 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -25,7 +25,7 @@
#include <signal.h>
#include <stdio.h>
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#include <pulse/rtclock.h>
#include <pulse/timeval.h>
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
index 341c8012e..0a40ca8fe 100644
--- a/src/modules/alsa/alsa-ucm.c
+++ b/src/modules/alsa/alsa-ucm.c
@@ -27,7 +27,7 @@
#include <ctype.h>
#include <sys/types.h>
#include <limits.h>
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#ifdef HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h>
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index e8d712e72..bd0a47e50 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -23,7 +23,7 @@
#endif
#include <sys/types.h>
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#include <pulse/sample.h>
#include <pulse/xmalloc.h>
diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
index 6b27339ec..4ceaa06ee 100644
--- a/src/modules/alsa/alsa-util.h
+++ b/src/modules/alsa/alsa-util.h
@@ -21,7 +21,7 @@
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
***/
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#include <pulse/sample.h>
#include <pulse/channelmap.h>
diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c
index af6800dd2..747ba9342 100644
--- a/src/modules/alsa/module-alsa-source.c
+++ b/src/modules/alsa/module-alsa-source.c
@@ -24,7 +24,7 @@
#include <stdio.h>
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#ifdef HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h>
--
2.22.0