summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-06-19 19:56:35 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2016-06-19 19:56:51 +0200
commit54d78b84a65f380b4530d5d7720d7e66bb1a4111 (patch)
tree892ef8e01e7b77b3bb1bdea6eb2bb8ae152506c7
parent858ab548876e3924a2f9563f9f7140d6357302df (diff)
pulseaudio: update to 8.0
-rw-r--r--package/pulseaudio/Makefile22
-rw-r--r--package/pulseaudio/patches/patch-Makefile_am11
-rw-r--r--package/pulseaudio/patches/patch-configure_ac37
-rw-r--r--package/pulseaudio/patches/patch-src_pulsecore_core-util_c13
-rw-r--r--package/pulseaudio/patches/patch-src_pulsecore_sample-util_h18
5 files changed, 13 insertions, 88 deletions
diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile
index ad72ddb02..575858a61 100644
--- a/package/pulseaudio/Makefile
+++ b/package/pulseaudio/Makefile
@@ -4,15 +4,15 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= pulseaudio
-PKG_VERSION:= 7.1
-PKG_RELEASE:= 2
-PKG_HASH:= e667514a28328f92aceea754a224a0150dddfe7e9a71b4c6d31489220153b9d9
+PKG_VERSION:= 8.0
+PKG_RELEASE:= 1
+PKG_HASH:= 690eefe28633466cfd1ab9d85ebfa9376f6b622deec6bfee5091ac9737cd1989
PKG_DESCR:= sound system
PKG_SECTION:= mm/audio
PKG_DEPENDS:= libltdl json-c libsndfile libspeex libncurses
PKG_DEPENDS+= libflac libvorbis libogg libuuid libsndfile
-PKG_DEPENDS+= alsa-lib libsamplerate
-PKG_BUILDDEP:= libtool json-c libsndfile speex libsamplerate
+PKG_DEPENDS+= alsa-lib
+PKG_BUILDDEP:= libtool json-c libsndfile speex
PKG_BUILDDEP+= flac libvorbis libogg util-linux ncurses alsa-lib
PKG_NEEDS:= threads rt
PKG_URL:= http://www.freedesktop.org/wiki/Software/PulseAudio/
@@ -24,11 +24,15 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,PULSEAUDIO,pulseaudio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE
-# use libtool from host directory
-AUTOTOOL_STYLE:= autoreconf
+
+ifeq ($(ADK_TARGET_ARCH_ARM_WITH_NEON),y)
+CONFIGURE_ARGS+= --enable-neon-opt
+else
+CONFIGURE_ARGS+= --disable-neon-opt
+endif
+
CONFIGURE_ARGS+= --disable-manpages \
--disable-tests \
- --disable-neon-opt \
--disable-x11 \
--disable-avahi \
--disable-lirc \
@@ -44,9 +48,9 @@ CONFIGURE_ARGS+= --disable-manpages \
--disable-rpath \
--disable-dbus \
--disable-hal-compat \
+ --disable-samplerate \
--without-caps \
--with-database=simple \
- --enable-samplerate \
--enable-alsa \
--with-speex \
--with-access-group=audio
diff --git a/package/pulseaudio/patches/patch-Makefile_am b/package/pulseaudio/patches/patch-Makefile_am
deleted file mode 100644
index b1411d1b9..000000000
--- a/package/pulseaudio/patches/patch-Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- pulseaudio-6.0.orig/Makefile.am 2015-02-12 15:10:35.000000000 +0100
-+++ pulseaudio-6.0/Makefile.am 2015-06-04 12:12:26.000000000 +0200
-@@ -37,7 +37,7 @@ EXTRA_DIST = \
- src/daemon/.gitignore \
- src/pulse/.gitignore
-
--SUBDIRS = src doxygen man po
-+SUBDIRS = src
-
- MAINTAINERCLEANFILES =
- noinst_DATA =
diff --git a/package/pulseaudio/patches/patch-configure_ac b/package/pulseaudio/patches/patch-configure_ac
deleted file mode 100644
index 5c26f33f7..000000000
--- a/package/pulseaudio/patches/patch-configure_ac
+++ /dev/null
@@ -1,37 +0,0 @@
---- pulseaudio-7.1.orig/configure.ac 2015-10-30 13:22:13.000000000 +0100
-+++ pulseaudio-7.1/configure.ac 2015-11-01 18:51:35.000000000 +0100
-@@ -99,25 +99,8 @@ PKG_PROG_PKG_CONFIG
-
- # gettext
-
--if test "x$enable_nls" != "xno"; then
--IT_PROG_INTLTOOL([0.35.0])
--
--AM_GNU_GETTEXT_VERSION([0.18.1])
--AM_GNU_GETTEXT([external])
--
--GETTEXT_PACKAGE=pulseaudio
--AC_SUBST([GETTEXT_PACKAGE])
--AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
--
--pulselocaledir='${prefix}/${DATADIRNAME}/locale'
--AX_DEFINE_DIR(PULSE_LOCALEDIR, pulselocaledir, [Gettext locale dir])
--else
--# workaround till an intltool m4 bug is fixed upstream
--# (https://bugs.launchpad.net/intltool/+bug/904647)
- USE_NLS=no
- AC_SUBST(USE_NLS)
--fi
--
-
- #### Determine host OS ####
-
-@@ -407,7 +390,7 @@ AC_HEADER_STDC
- # POSIX
- AC_CHECK_HEADERS_ONCE([arpa/inet.h glob.h grp.h netdb.h netinet/in.h \
- netinet/in_systm.h netinet/tcp.h poll.h pwd.h sched.h \
-- sys/mman.h sys/select.h sys/socket.h sys/wait.h \
-+ sys/mman.h sys/select.h sys/socket.h sys/wait.h sys/user.h xlocale.h \
- sys/uio.h syslog.h sys/dl.h dlfcn.h linux/sockios.h])
- AC_CHECK_HEADERS([netinet/ip.h], [], [],
- [#include <sys/types.h>
diff --git a/package/pulseaudio/patches/patch-src_pulsecore_core-util_c b/package/pulseaudio/patches/patch-src_pulsecore_core-util_c
deleted file mode 100644
index a270fca9f..000000000
--- a/package/pulseaudio/patches/patch-src_pulsecore_core-util_c
+++ /dev/null
@@ -1,13 +0,0 @@
---- pulseaudio-7.1.orig/src/pulsecore/core-util.c 2015-10-30 13:14:56.000000000 +0100
-+++ pulseaudio-7.1/src/pulsecore/core-util.c 2015-11-01 18:52:47.000000000 +0100
-@@ -54,7 +54,9 @@
-
- #ifdef HAVE_STRTOD_L
- #include <locale.h>
--#include <xlocale.h>
-+# ifdef HAVE_XLOCALE_H
-+# include <xlocale.h>
-+# endif
- #endif
-
- #ifdef HAVE_SCHED_H
diff --git a/package/pulseaudio/patches/patch-src_pulsecore_sample-util_h b/package/pulseaudio/patches/patch-src_pulsecore_sample-util_h
deleted file mode 100644
index a88e81653..000000000
--- a/package/pulseaudio/patches/patch-src_pulsecore_sample-util_h
+++ /dev/null
@@ -1,18 +0,0 @@
---- pulseaudio-7.1.orig/src/pulsecore/sample-util.h 2015-09-10 06:51:41.000000000 +0200
-+++ pulseaudio-7.1/src/pulsecore/sample-util.h 2015-11-04 14:44:43.000000000 +0100
-@@ -24,6 +24,15 @@
- #include <inttypes.h>
- #include <limits.h>
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#ifdef HAVE_SYS_USER_H
-+#include <sys/types.h>
-+#include <sys/user.h> /* required by _WORDIZE with musl */
-+#endif
-+
- #include <pulse/gccmacro.h>
- #include <pulse/sample.h>
- #include <pulse/volume.h>