diff options
Diffstat (limited to 'package/pulseaudio')
| -rw-r--r-- | package/pulseaudio/Makefile | 49 | ||||
| -rw-r--r-- | package/pulseaudio/patches/patch-Makefile_am | 11 | ||||
| -rw-r--r-- | package/pulseaudio/patches/patch-configure_ac | 55 |
3 files changed, 14 insertions, 101 deletions
diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile index 68030d227..f0ff6e102 100644 --- a/package/pulseaudio/Makefile +++ b/package/pulseaudio/Makefile @@ -4,16 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pulseaudio -PKG_VERSION:= 10.0 +PKG_VERSION:= 15.0 PKG_RELEASE:= 1 -PKG_HASH:= a3186824de9f0d2095ded5d0d0db0405dc73133983c2fbb37291547e37462f57 +PKG_HASH:= a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0 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 -PKG_BUILDDEP:= libtool json-c libsndfile speex +PKG_DEPENDS+= alsa-lib libICE libSM libxtst glib +PKG_BUILDDEP:= libtool json-c libsndfile speex check meson-host PKG_BUILDDEP+= flac libvorbis libogg util-linux ncurses alsa-lib +PKG_BUILDDEP+= libICE libSM libXtst glib PKG_NEEDS:= threads PKG_URL:= http://www.freedesktop.org/wiki/Software/PulseAudio/ PKG_SITES:= http://freedesktop.org/software/pulseaudio/releases/ @@ -23,40 +24,18 @@ 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 +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -# use libtool from host directory -AUTOTOOL_STYLE:= autoreconf +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson -ifeq ($(ADK_TARGET_ARCH_ARM_WITH_NEON),y) -CONFIGURE_ARGS+= --enable-neon-opt -else -CONFIGURE_ARGS+= --disable-neon-opt -endif +TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE -CONFIGURE_ARGS+= --disable-manpages \ - --disable-tests \ - --disable-x11 \ - --disable-avahi \ - --disable-lirc \ - --disable-openssl \ - --disable-orc \ - --disable-tcpwrap \ - --disable-oss-output \ - --disable-oss-wrapper \ - --disable-esound \ - --disable-jack \ - --disable-gconf \ - --disable-udev \ - --disable-rpath \ - --disable-dbus \ - --disable-hal-compat \ - --disable-samplerate \ - --without-caps \ - --with-database=simple \ - --enable-alsa \ - --with-speex \ - --with-access-group=audio +MESON_FLAGS+= -Ddatabase=simple \ + -Ddoxygen=false \ + -Dgcov=false \ + -Dtests=false pulseaudio-install: $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/pulse diff --git a/package/pulseaudio/patches/patch-Makefile_am b/package/pulseaudio/patches/patch-Makefile_am deleted file mode 100644 index 11132dad5..000000000 --- a/package/pulseaudio/patches/patch-Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- pulseaudio-10.0.orig/Makefile.am 2017-01-18 04:45:11.000000000 +0100 -+++ pulseaudio-10.0/Makefile.am 2017-06-06 19:51:59.372820444 +0200 -@@ -42,7 +42,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 2ba044a9b..000000000 --- a/package/pulseaudio/patches/patch-configure_ac +++ /dev/null @@ -1,55 +0,0 @@ ---- pulseaudio-10.0.orig/configure.ac 2017-01-13 04:02:18.000000000 +0100 -+++ pulseaudio-10.0/configure.ac 2017-06-06 20:05:26.400612037 +0200 -@@ -97,24 +97,8 @@ AS_IF([test "x$M4" = "xno"], AC_MSG_ERRO - - 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]) --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 #### - -@@ -1486,27 +1470,10 @@ AM_CONDITIONAL([FORCE_PREOPEN], [test "x - AC_CONFIG_FILES([ - Makefile - src/Makefile --man/Makefile - libpulse.pc - libpulse-simple.pc - libpulse-mainloop-glib.pc --doxygen/Makefile --doxygen/doxygen.conf - src/pulse/version.h --po/Makefile.in --man/pulseaudio.1.xml --man/esdcompat.1.xml --man/pax11publish.1.xml --man/pacat.1.xml --man/pacmd.1.xml --man/pactl.1.xml --man/pasuspender.1.xml --man/padsp.1.xml --man/pulse-daemon.conf.5.xml --man/pulse-client.conf.5.xml --man/default.pa.5.xml --man/pulse-cli-syntax.5.xml --man/start-pulseaudio-x11.1.xml - ]) - - AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat]) |