diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile index 9d8d8efb..1688f7c3 100644 --- a/sound/pulseaudio/Makefile +++ b/sound/pulseaudio/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2011-2016 OpenWrt.org +# Copyright (C) 2011-2018 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,24 +8,23 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pulseaudio -PKG_VERSION:=11.1 -PKG_RELEASE:=2 +PKG_VERSION:=12.2 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://freedesktop.org/software/pulseaudio/releases/ -PKG_HASH:=f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e -PKG_LICENSE:=LGPL-2.1+ -PKG_LICENSE_FILES:=GPL LICENSE +PKG_HASH:=809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055 -PKG_BUILD_DEPENDS:=intltool/host +PKG_LICENSE:=LGPL-2.1-or-later +PKG_LICENSE_FILES:=GPL LICENSE +PKG_CPE_ID:=cpe:/a:pulseaudio:pulseaudio PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 +PKG_BUILD_DEPENDS:=intltool/host glib2/host PKG_USE_MIPS16:=0 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_INSTALL = 1 - include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -49,7 +48,6 @@ endef define Package/pulseaudio-daemon-avahi $(call Package/pulseaudio/Default) DEPENDS+=+dbus +libavahi-client +sbc -# DEPENDS+=+avahi-daemon TITLE+= (avahi/bluez) VARIANT:=avahi endef @@ -119,11 +117,11 @@ CONFIGURE_ARGS += \ --disable-jack \ --disable-asyncns \ --disable-lirc \ + --disable-tests \ --disable-udev \ --without-fftw \ --without-soxr \ --without-speex -# --disable-bluez ifeq ($(BUILD_VARIANT),avahi) CONFIGURE_ARGS += \ @@ -140,9 +138,6 @@ endif CONFIGURE_VARS += \ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" -#SUPP_LIBS:=-L$(INTL_PREFIX)/lib -L$(ICONV_PREFIX)/lib -TARGET_CFLAGS += -std=gnu99 - define Build/InstallDev $(INSTALL_DIR) \ $(1)/usr/lib/pkgconfig \ diff --git a/sound/pulseaudio/patches/010-also-include.patch b/sound/pulseaudio/patches/010-also-include.patch new file mode 100644 index 00000000..aec5b17a --- /dev/null +++ b/sound/pulseaudio/patches/010-also-include.patch @@ -0,0 +1,130 @@ +From 993d3fd89e5611997f1e165bf03edefb0204b0a4 Mon Sep 17 00:00:00 2001 +From: Olaf Hering +Date: Wed, 27 Mar 2019 09:35:05 +0100 +Subject: [PATCH] alsa: Use correct header path + +Consumers are expected to use instead of +. + +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 +--- + 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 +-#include ++#include + #include + + #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 . + ***/ + +-#include ++#include + + #include + #include +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 + #include + +-#include ++#include + + #ifdef HAVE_VALGRIND_MEMCHECK_H + #include +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 + #include + +-#include ++#include + + #include + #include +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 + #include + #include +-#include ++#include + + #ifdef HAVE_VALGRIND_MEMCHECK_H + #include +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 +-#include ++#include + + #include + #include +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 . + ***/ + +-#include ++#include + + #include + #include +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 + +-#include ++#include + + #ifdef HAVE_VALGRIND_MEMCHECK_H + #include +-- +2.22.0 +