jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2735 from CvH/9.0-pulseaudio-fix

Browse Source 
pulseaudio: remove fix and cleanup
This commit is contained in:
Matthias Reichl 2018-06-04 20:49:26 +02:00 committed by GitHub
commit 5f6e74c5d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/audio/pulseaudio/package.mk
View File

@ -1,19 +1,20 @@
################################################################################ ################################################################################
# This file is part of OpenELEC - http://www.openelec.tv # This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016-present Team LibreELEC
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# #
# OpenELEC is free software: you can redistribute it and/or modify # LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or # the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# OpenELEC is distributed in the hope that it will be useful, # LibreELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>. # along with LibreELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################ ################################################################################
PKG_NAME="pulseaudio" PKG_NAME="pulseaudio"
@ -23,38 +24,36 @@ PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://pulseaudio.org/" PKG_SITE="http://pulseaudio.org/"
PKG_URL="http://www.freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_URL="http://www.freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain libtool alsa-lib libsndfile soxr dbus systemd openssl libcap" PKG_DEPENDS_TARGET="toolchain alsa-lib dbus libcap libsndfile libtool openssl soxr systemd"
PKG_SECTION="audio" PKG_SECTION="audio"
PKG_SHORTDESC="pulseaudio: Yet another sound server for Unix" PKG_LONGDESC="PulseAudio is a sound system for POSIX OSes, meaning that it is a proxy for your sound applications."
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."
if [ "$BLUETOOTH_SUPPORT" = "yes" ]; then if [ "$BLUETOOTH_SUPPORT" = "yes" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET sbc" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET sbc"
PULSEAUDIO_BLUETOOTH="--enable-bluez5" PKG_PULSEAUDIO_BLUETOOTH="--enable-bluez5"
else else
PULSEAUDIO_BLUETOOTH="--disable-bluez5" PKG_PULSEAUDIO_BLUETOOTH="--disable-bluez5"
fi fi
if [ "$AVAHI_DAEMON" = "yes" ]; then if [ "$AVAHI_DAEMON" = "yes" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi"
PULSEAUDIO_AVAHI="--enable-avahi" PKG_PULSEAUDIO_AVAHI="--enable-avahi"
else else
PULSEAUDIO_AVAHI="--disable-avahi" PKG_PULSEAUDIO_AVAHI="--disable-avahi"
fi fi
# PulseAudio fails to build on aarch64 when NEON is enabled, so don't enable NEON for aarch64 until upstream supports it # PulseAudio fails to build on aarch64 when NEON is enabled, so don't enable NEON for aarch64 until upstream supports it
if [ "$TARGET_ARCH" = "arm" ] && target_has_feature neon; then if [ "$TARGET_ARCH" = "arm" ] && target_has_feature neon; then
PULSEAUDIO_NEON="--enable-neon-opt" PKG_PULSEAUDIO_NEON="--enable-neon-opt"
else else
PULSEAUDIO_NEON="--disable-neon-opt" PKG_PULSEAUDIO_NEON="--disable-neon-opt"
fi fi
# package specific configure options
PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \ PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
--disable-nls \ --disable-nls \
--enable-largefile \ --enable-largefile \
--disable-rpath \ --disable-rpath \
$PULSEAUDIO_NEON \ $PKG_PULSEAUDIO_NEON \
--disable-x11 \ --disable-x11 \
--disable-tests \ --disable-tests \
--disable-samplerate \ --disable-samplerate \
@ -68,14 +67,14 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
--enable-glib2 \ --enable-glib2 \
--disable-gtk3 \ --disable-gtk3 \
--disable-gconf \ --disable-gconf \
$PULSEAUDIO_AVAHI \ $PKG_PULSEAUDIO_AVAHI \
--disable-jack \ --disable-jack \
--disable-asyncns \ --disable-asyncns \
--disable-tcpwrap \ --disable-tcpwrap \
--disable-lirc \ --disable-lirc \
--enable-dbus \ --enable-dbus \
--disable-bluez4 \ --disable-bluez4 \
$PULSEAUDIO_BLUETOOTH \ $PKG_PULSEAUDIO_BLUETOOTH \
--disable-bluez5-ofono-headset \ --disable-bluez5-ofono-headset \
--disable-bluez5-native-headset \ --disable-bluez5-native-headset \
--enable-udev \ --enable-udev \
@ -99,7 +98,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
pre_configure_target() pre_configure_target()
{ {
LDFLAGS="$LDFLAGS -lavutil"
sed -e 's|; remixing-use-all-sink-channels = yes|; remixing-use-all-sink-channels = no|' \ sed -e 's|; remixing-use-all-sink-channels = yes|; remixing-use-all-sink-channels = no|' \
-i $PKG_BUILD/src/daemon/daemon.conf.in -i $PKG_BUILD/src/daemon/daemon.conf.in
} }