diff --git a/packages/audio/pulseaudio/package.mk b/packages/audio/pulseaudio/package.mk deleted file mode 100644 index aa68c7180f..0000000000 --- a/packages/audio/pulseaudio/package.mk +++ /dev/null @@ -1,119 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="pulseaudio" -PKG_VERSION="5.0" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://pulseaudio.org/" -PKG_URL="http://www.freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd libressl libcap" -PKG_PRIORITY="optional" -PKG_SECTION="audio" -PKG_SHORTDESC="pulseaudio: Yet another sound server for Unix" -PKG_LONGDESC="PulseAudio is a sound server for Linux and other Unix-like operating systems. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (esound or esd). In addition to the features esound provides, PulseAudio has an extensible plugin architecture, support for more than one sink per source, better low-latency behavior, the ability to be embedded into other software, a completely asynchronous C API, a simple command line interface for reconfiguring the daemon while running, flexible and implicit sample type conversion and resampling, and a "Zero-Copy" architecture." - -PKG_IS_ADDON="no" -PKG_AUTORECONF="yes" - -if [ "$BLUETOOTH_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET sbc" - PULSEAUDIO_BLUETOOTH="--enable-bluez5" -else - PULSEAUDIO_BLUETOOTH="--disable-bluez5" -fi - -# package specific configure options -PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \ - --disable-nls \ - --enable-largefile \ - --disable-rpath \ - --disable-x11 \ - --disable-tests \ - --enable-samplerate \ - --disable-oss-output \ - --disable-oss-wrapper \ - --disable-coreaudio-output \ - --enable-alsa \ - --disable-esound \ - --disable-solaris \ - --disable-waveout \ - --disable-glib2 \ - --disable-gtk3 \ - --disable-gconf \ - --disable-avahi \ - --disable-jack \ - --disable-asyncns \ - --disable-tcpwrap \ - --disable-lirc \ - --enable-dbus \ - --disable-bluez4 \ - $PULSEAUDIO_BLUETOOTH \ - --enable-udev \ - --disable-hal-compat \ - --enable-ipv6 \ - --enable-openssl \ - --disable-xen \ - --disable-orc \ - --disable-manpages \ - --disable-per-user-esound-socket \ - --disable-default-build-tests \ - --disable-legacy-database-entry-format \ - --with-system-user=root \ - --with-system-group=root \ - --with-access-group=root \ - --without-caps \ - --without-fftw \ - --with-speex \ - --with-module-dir=/usr/lib/pulse" - -pre_build_target() { -# broken autoreconf - ( cd $PKG_BUILD - intltoolize --force - ) -} - -pre_configure_target() { - # pulseaudio fails to build with LTO support - strip_lto -} - -pre_make_target() { - MAKEFLAGS=-j1 -} - -post_makeinstall_target() { -# add_user pulse x 499 498 "PulseAudio System Daemon" "/var/run/pulse" "/bin/sh" -# add_group pulse 498 -# add_group pulse-access 497 - - sed -e 's%user="pulse"%user="root"%g' -i $INSTALL/etc/dbus-1/system.d/pulseaudio-system.conf - - rm -rf $INSTALL/usr/bin/esdcompat - rm -rf $INSTALL/usr/lib/cmake - rm -rf $INSTALL/usr/share/vala - rm -rf $INSTALL/etc/bash_completion.d -} - -post_install() { - enable_service pulseaudio.service -} diff --git a/packages/audio/pulseaudio/patches/pulseaudio-0020-stream-Return-error-in-case-a-client-peeks-to-early.patch b/packages/audio/pulseaudio/patches/pulseaudio-0020-stream-Return-error-in-case-a-client-peeks-to-early.patch deleted file mode 100644 index 2f6d7e0caa..0000000000 --- a/packages/audio/pulseaudio/patches/pulseaudio-0020-stream-Return-error-in-case-a-client-peeks-to-early.patch +++ /dev/null @@ -1,64 +0,0 @@ -From david.henningsson@canonical.com Mon Oct 1 15:06:56 2012 -Return-Path: -X-Original-To: diwic@mail.canonical.com -Delivered-To: diwic@mail.canonical.com -Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) - by grenadilla.canonical.com (Postfix) with ESMTP id A48961472160 - for ; Mon, 1 Oct 2012 15:06:56 +0000 (UTC) -Received: from cluster-e.mailcontrol.com (cluster-e.mailcontrol.com [85.115.58.190]) - by fiordland.canonical.com (Postfix) with ESMTP id 5DC1EA18423 - for ; Mon, 1 Oct 2012 15:06:56 +0000 (UTC) -Received: from arctowski.canonical.com (arctowski.canonical.com [91.189.94.158]) - by rly62e.srv.mailcontrol.com (MailControl) with ESMTP id q91F6t9E016745 - for ; Mon, 1 Oct 2012 16:06:55 +0100 -Received: from fiordland.canonical.com ([91.189.94.145]) - by arctowski.canonical.com with esmtp (Exim 4.71) - (envelope-from ) - id 1TIhaB-0002MW-HX - for david.henningsson@cleanmail.canonical.com; Mon, 01 Oct 2012 15:06:55 +0000 -Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) - by fiordland.canonical.com (Postfix) with ESMTP id 8706DA18423 - for ; Mon, 1 Oct 2012 15:06:55 +0000 (UTC) -Received: from hd9483857.selulk5.dyn.perspektivbredband.net ([217.72.56.87] helo=localhost.localdomain) - by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) - (Exim 4.71) - (envelope-from ) - id 1TIhaB-0006f2-8F; Mon, 01 Oct 2012 15:06:55 +0000 -From: David Henningsson -To: pulseaudio-discuss@lists.freedesktop.org -Cc: 1058200@bugs.launchpad.net, - David Henningsson -Subject: [PATCH] stream: Return error in case a client peeks to early -Date: Mon, 1 Oct 2012 17:06:55 +0200 -Message-Id: <1349104015-5924-1-git-send-email-david.henningsson@canonical.com> -X-Mailer: git-send-email 1.7.9.5 -X-Mailcontrol-Inbound: uq3drnD2P+ps5SfEb0fvr78+NoP1DHBZwGqKpaXB2eTgNv8D6KLIxb8+NoP1DHBZ8VSaBg0k0xw= -X-Spam-Score: -0.4 -X-Scanned-By: MailControl 9446.0 (www.mailcontrol.com) on 10.69.0.172 - -If there is no silence memblock and no data, pa_memblockq_peek can -return NULL. In this case, do not crash on an assertion in -pa_memblock_acquire, but instead return a proper error to the client. - -BugLink: http://bugs.launchpad.net/bugs/1058200 -Signed-off-by: David Henningsson ---- - src/pulse/stream.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/pulse/stream.c b/src/pulse/stream.c -index 2b6d306..9bb0995 100644 ---- a/src/pulse/stream.c -+++ b/src/pulse/stream.c -@@ -1598,6 +1598,8 @@ int pa_stream_peek(pa_stream *s, const void **data, size_t *length) { - return 0; - } - -+ PA_CHECK_VALIDITY(s->context, s->peek_memchunk.memblock != NULL, PA_ERR_NODATA); -+ - s->peek_data = pa_memblock_acquire(s->peek_memchunk.memblock); - } - --- -1.7.9.5 - diff --git a/packages/audio/pulseaudio/patches/pulseaudio-0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch b/packages/audio/pulseaudio/patches/pulseaudio-0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch deleted file mode 100644 index c4439fa4b0..0000000000 --- a/packages/audio/pulseaudio/patches/pulseaudio-0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Avoid abort when poll descriptor is 0 (LP: #1092377) - -Index: pulseaudio/src/modules/alsa/alsa-mixer.c -=================================================================== ---- pulseaudio.orig/src/modules/alsa/alsa-mixer.c 2012-12-20 00:37:53.862456000 -0200 -+++ pulseaudio/src/modules/alsa/alsa-mixer.c 2012-12-20 00:39:58.631080479 -0200 -@@ -160,6 +160,9 @@ - if (n < 0) { - pa_log("snd_mixer_poll_descriptors_count() failed: %s", pa_alsa_strerror(n)); - return; -+ } else if (n == 0) { -+ pa_log("snd_mixer_poll_descriptors_count() equal 0"); -+ return; - } - num_fds = (unsigned) n; - diff --git a/packages/audio/pulseaudio/patches/pulseaudio-0203-card-Add-hook-before-profile-changes.patch b/packages/audio/pulseaudio/patches/pulseaudio-0203-card-Add-hook-before-profile-changes.patch deleted file mode 100644 index 3f6ba0d419..0000000000 --- a/packages/audio/pulseaudio/patches/pulseaudio-0203-card-Add-hook-before-profile-changes.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3e04d944626ba4caee8a4d74a683c6c967e935ca Mon Sep 17 00:00:00 2001 -From: David Henningsson -Date: Tue, 13 Aug 2013 12:43:29 +0200 -Subject: [PATCH 203/204] card: Add hook before profile changes - -This is useful to modules that want to do things just before a -profile becomes inactive. ---- - src/pulsecore/card.c | 2 ++ - src/pulsecore/core.h | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c -index 7cf45df..b58dfa7 100644 ---- a/src/pulsecore/card.c -+++ b/src/pulsecore/card.c -@@ -272,6 +272,8 @@ int pa_card_set_profile(pa_card *c, const char *name, pa_bool_t save) { - return 0; - } - -+ pa_hook_fire(&c->core->hooks[PA_CORE_HOOK_CARD_PROFILE_CHANGING], profile); -+ - if ((r = c->set_profile(c, profile)) < 0) - return r; - -diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h -index a8cff5c..904b610 100644 ---- a/src/pulsecore/core.h -+++ b/src/pulsecore/core.h -@@ -115,6 +115,7 @@ typedef enum pa_core_hook { - PA_CORE_HOOK_CARD_PUT, - PA_CORE_HOOK_CARD_UNLINK, - PA_CORE_HOOK_CARD_PROFILE_CHANGED, -+ PA_CORE_HOOK_CARD_PROFILE_CHANGING, - PA_CORE_HOOK_CARD_PROFILE_ADDED, - PA_CORE_HOOK_CARD_PROFILE_AVAILABLE_CHANGED, - PA_CORE_HOOK_PORT_AVAILABLE_CHANGED, --- -1.7.9.5 - diff --git a/packages/audio/pulseaudio/patches/pulseaudio-0900.01-never-append-dirty-to-server-module-version.patch b/packages/audio/pulseaudio/patches/pulseaudio-0900.01-never-append-dirty-to-server-module-version.patch deleted file mode 100644 index 8bea8d95fb..0000000000 --- a/packages/audio/pulseaudio/patches/pulseaudio-0900.01-never-append-dirty-to-server-module-version.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c9d7dcaa87f9ada49d75483a7c604dba27a0d71a Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Tue, 7 Jan 2014 13:22:48 +0200 -Subject: [PATCH] never append -dirty to server/module version - ---- - git-version-gen | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/git-version-gen b/git-version-gen -index 9d65b80..fcf11fd 100755 ---- a/git-version-gen -+++ b/git-version-gen -@@ -152,6 +152,7 @@ v=`echo "$v" |sed 's/^v//'` - git status > /dev/null 2>&1 - - dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= -+dirty= - case "$dirty" in - '') ;; - *) # Append the suffix only if there isn't one already. --- -1.7.2.5 - diff --git a/packages/audio/pulseaudio/patches/pulseaudio-0900.02-check_uid.patch b/packages/audio/pulseaudio/patches/pulseaudio-0900.02-check_uid.patch deleted file mode 100644 index a54ede3b8a..0000000000 --- a/packages/audio/pulseaudio/patches/pulseaudio-0900.02-check_uid.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- pulseaudio-4.0.orig/src/pulsecore/core-util.c 2014-01-12 23:31:26.281525000 -0800 -+++ pulseaudio-4.0/src/pulsecore/core-util.c 2014-01-12 23:32:32.977118803 -0800 -@@ -1524,10 +1524,6 @@ - if (stat(p, &st) < 0) - return -errno; - --#ifdef HAVE_GETUID -- if (st.st_uid != getuid()) -- return -EACCES; --#endif - - return 0; - } \ No newline at end of file diff --git a/packages/audio/pulseaudio/profile.d/04-pulseaudio.conf b/packages/audio/pulseaudio/profile.d/04-pulseaudio.conf deleted file mode 100644 index 0c72f573cb..0000000000 --- a/packages/audio/pulseaudio/profile.d/04-pulseaudio.conf +++ /dev/null @@ -1 +0,0 @@ -export SDL_AUDIODRIVER=pulse diff --git a/packages/audio/pulseaudio/system.d/pulseaudio.service b/packages/audio/pulseaudio/system.d/pulseaudio.service deleted file mode 100644 index 7ff77d3d25..0000000000 --- a/packages/audio/pulseaudio/system.d/pulseaudio.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=PulseAudio Sound System -After=syslog.target local-fs.target - -[Service] -Type=forking -ExecStart=/usr/bin/pulseaudio --start --daemonize --log-level=0 -TimeoutStopSec=5 -Restart=always -RestartSec=2 -StartLimitInterval=0 - -[Install] -WantedBy=multi-user.target