Merge pull request #3773 from stefansaraev/pulse

drop pulse
This commit is contained in:
Stefan Saraev 2015-01-12 19:31:35 +02:00
commit 1d04dbe686
23 changed files with 2 additions and 652 deletions

View File

@ -343,7 +343,6 @@ show_config() {
config_message="$config_message\n $dashes$dashes"
config_message="$config_message\n - ALSA support:\t\t\t $ALSA_SUPPORT"
config_message="$config_message\n - Pulseaudio support:\t\t\t $PULSEAUDIO_SUPPORT"
config_message="$config_message\n - Bluetooth support:\t\t\t $BLUETOOTH_SUPPORT"
config_message="$config_message\n - Hardware Sensors support:\t\t $SENSOR_SUPPORT"
config_message="$config_message\n - LCD drivers:\t\t\t\t $LCD_DRIVER"

View File

@ -47,9 +47,6 @@
# does not work on RPi
KODI_VIS_FISHBMC="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install espeak support (yes / no)
ESPEAK_SUPPORT="yes"

View File

@ -1,44 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC 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 of the License, or
# (at your option) any later version.
#
# OpenELEC 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. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="libsamplerate"
PKG_VERSION="0.1.8"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.mega-nerd.com/SRC/"
PKG_URL="http://www.mega-nerd.com/SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="audio"
PKG_SHORTDESC="libsamplerate: A Sample Rate Converter library for audio"
PKG_LONGDESC="Libsamplerate is a Sample Rate Converter for audio. One example of where such a thing would be useful is converting audio from the CD sample rate of 44.1kHz to the 48kHz sample rate used by DAT players."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no" # ToDo
# package specific configure options
PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
--enable-static \
--datadir=/usr/share \
--disable-fftw \
--disable-sndfile"
post_makeinstall_target() {
rm -rf $INSTALL/usr/bin
}

View File

@ -1,50 +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="libsndfile"
PKG_VERSION="1.0.25"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"
PKG_SITE="http://www.mega-nerd.com/libsndfile/"
PKG_URL="http://www.mega-nerd.com/$PKG_NAME/files/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain alsa-lib flac libvorbis libogg"
PKG_PRIORITY="optional"
PKG_SECTION="audio"
PKG_SHORTDESC="libsndfile: A library for accessing various audio file formats"
PKG_LONGDESC="libsndfile is a C library for reading and writing sound files such as AIFF, AU, WAV, and others through one standard interface. It can currently read/write 8, 16, 24 and 32-bit PCM files as well as 32 and 64-bit floating point WAV files and a number of compressed formats. It compiles and runs on *nix, MacOS, and Win32."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
# package specific configure options
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
--disable-silent-rules \
--disable-sqlite \
--enable-alsa \
--enable-external-libs \
--disable-experimental \
--disable-test-coverage \
--enable-largefile \
--with-gnu-ld"
post_makeinstall_target() {
rm -rf $INSTALL/usr/bin
}

View File

@ -1,25 +0,0 @@
diff -Naur libsndfile-1.0.25-old/configure.ac libsndfile-1.0.25-new/configure.ac
--- libsndfile-1.0.25-old/configure.ac 2011-07-13 01:59:57.000000000 -0700
+++ libsndfile-1.0.25-new/configure.ac 2011-07-13 17:04:14.000000000 -0700
@@ -18,9 +18,6 @@
AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
AM_SILENT_RULES([yes])
-dnl Add parameters for aclocal
-AC_SUBST(ACLOCAL_AMFLAGS, "-I M4")
-
AC_LANG([C])
AC_PROG_CC
diff -Naur libsndfile-1.0.25-old/Makefile.am libsndfile-1.0.25-new/Makefile.am
--- libsndfile-1.0.25-old/Makefile.am 2011-07-07 02:47:24.000000000 -0700
+++ libsndfile-1.0.25-new/Makefile.am 2011-07-13 17:04:14.000000000 -0700
@@ -2,6 +2,8 @@
DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
+ACLOCAL_AMFLAGS = -I M4
+
if BUILD_OCTAVE_MOD
octave_dir = Octave
endif

View File

@ -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
}

View File

@ -1,64 +0,0 @@
From david.henningsson@canonical.com Mon Oct 1 15:06:56 2012
Return-Path: <david.henningsson@canonical.com>
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 <diwic@mail.canonical.com>; 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 <david.henningsson@cleanmail.canonical.com>; 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 <david.henningsson@cleanmail.canonical.com>; 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 <david.henningsson@canonical.com>)
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 <david.henningsson@canonical.com>; 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 <david.henningsson@canonical.com>)
id 1TIhaB-0006f2-8F; Mon, 01 Oct 2012 15:06:55 +0000
From: David Henningsson <david.henningsson@canonical.com>
To: pulseaudio-discuss@lists.freedesktop.org
Cc: 1058200@bugs.launchpad.net,
David Henningsson <david.henningsson@canonical.com>
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 <david.henningsson@canonical.com>
---
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

View File

@ -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;

View File

@ -1,40 +0,0 @@
From 3e04d944626ba4caee8a4d74a683c6c967e935ca Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
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

View File

@ -1,24 +0,0 @@
From c9d7dcaa87f9ada49d75483a7c604dba27a0d71a Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
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

View File

@ -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;
}

View File

@ -1 +0,0 @@
export SDL_AUDIODRIVER=pulse

View File

@ -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

View File

@ -1,36 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC 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 of the License, or
# (at your option) any later version.
#
# OpenELEC 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. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="sbc"
PKG_VERSION="1.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.bluez.org/"
PKG_URL="http://www.kernel.org/pub/linux/bluetooth/sbc-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="network"
PKG_SHORTDESC="sbc: standalone SBC library"
PKG_LONGDESC="standalone SBC library"
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
--disable-tools --disable-tester"

View File

@ -1,47 +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="speex"
PKG_VERSION="1.2rc1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"
PKG_SITE="http://www.speex.org"
PKG_URL="http://downloads.xiph.org/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain libogg"
PKG_PRIORITY="optional"
PKG_SECTION="audio"
PKG_SHORTDESC="speex: A free Audio Codec optimized for speech"
PKG_LONGDESC="Speex is a patent-free compression format designed especially for speech. It is specialized for voice communications at low bit-rates in the 2-45 kbps range. Possible applications include Voice over IP (VoIP), Internet audio streaming, audio books, and archiving of speech data (e.g. voice mail)."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
# package specific configure options
PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static \
--with-ogg=$SYSROOT_PREFIX/usr \
--enable-fixed-point \
--disable-oggtest \
--disable-float-api \
--disable-vbr"
post_makeinstall_target() {
rm -rf $INSTALL/usr/bin
}

View File

@ -1,24 +0,0 @@
diff -Naur speex-1.2rc1/libspeex/Makefile.am speex-1.2rc1.patch/libspeex/Makefile.am
--- speex-1.2rc1/libspeex/Makefile.am 2008-06-04 09:31:35.000000000 +0200
+++ speex-1.2rc1.patch/libspeex/Makefile.am 2009-03-10 20:40:51.000000000 +0100
@@ -4,7 +4,7 @@
EXTRA_DIST=echo_diagnostic.m
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
lib_LTLIBRARIES = libspeex.la libspeexdsp.la
diff -Naur speex-1.2rc1/libspeex/Makefile.in speex-1.2rc1.patch/libspeex/Makefile.in
--- speex-1.2rc1/libspeex/Makefile.in 2008-07-21 04:17:19.000000000 +0200
+++ speex-1.2rc1.patch/libspeex/Makefile.in 2009-03-10 20:41:25.000000000 +0100
@@ -277,7 +277,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
EXTRA_DIST = echo_diagnostic.m
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
lib_LTLIBRARIES = libspeex.la libspeexdsp.la
# Sources for compilation in the library

View File

@ -1,12 +0,0 @@
diff -Naur speex-1.2rc1/Makefile.in speex-1.2rc1a/Makefile.in
--- speex-1.2rc1/Makefile.in 2008-07-21 04:17:19.000000000 +0200
+++ speex-1.2rc1a/Makefile.in 2010-05-18 14:31:25.229200674 +0200
@@ -213,7 +213,7 @@
EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP
#Fools KDevelop into including all files
-SUBDIRS = libspeex include @src@ doc win32 symbian ti
+SUBDIRS = libspeex include doc win32 symbian ti
DIST_SUBDIRS = libspeex include src doc win32 symbian ti
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive

View File

@ -1,12 +0,0 @@
diff -Naur speex-1.2rc1/configure.ac speex-1.2rc1.patch/configure.ac
--- speex-1.2rc1/configure.ac 2008-07-21 04:17:08.000000000 +0200
+++ speex-1.2rc1.patch/configure.ac 2013-02-01 16:50:06.747570221 +0100
@@ -2,7 +2,7 @@
AC_INIT(libspeex/speex.c)
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
SPEEX_MAJOR_VERSION=1
SPEEX_MINOR_VERSION=1

View File

@ -1,39 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
#      Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv)
#
# OpenELEC 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 of the License, or
# (at your option) any later version.
#
# OpenELEC 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. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="json-c"
PKG_VERSION="0645020"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/json-c/json-c/wiki"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="accessibility"
PKG_SHORTDESC="json-c"
PKG_LONGDESC="JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects"
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_realloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes \
--enable-static --disable-shared \
--disable-oldname-compat"

View File

@ -84,14 +84,6 @@ else
KODI_ALSA="--disable-alsa"
fi
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
# for PulseAudio support
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio"
KODI_PULSEAUDIO="--enable-pulse"
else
KODI_PULSEAUDIO="--disable-pulse"
fi
if [ "$ESPEAK_SUPPORT" = yes ]; then
# for espeak support
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET espeak"
@ -328,7 +320,7 @@ PKG_CONFIGURE_OPTS_TARGET="gl_cv_func_gettimeofday_clobber=no \
$KODI_XORG \
--disable-ccache \
$KODI_ALSA \
$KODI_PULSEAUDIO \
--disable-pulse \
--enable-rtmp \
$KODI_SAMBA \
$KODI_NFS \

View File

@ -190,14 +190,6 @@ else
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-opengl"
fi
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-pulseaudio --enable-pulseaudio-shared"
else
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-pulseaudio --disable-pulseaudio-shared"
fi
pre_configure_host() {
( cd $ROOT/$PKG_BUILD
# Skip autoheader because there is a problem with AC_DEFINE's in the configure.in in SDL 1.2.14.

View File

@ -55,6 +55,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static \
--with-alsa-prefix=$SYSROOT_PREFIX/usr/lib \
--with-alsa-inc-prefix=$SYSROOT_PREFIX/usr/include \
--disable-esd --disable-esdtest --disable-esd-shared \
--disable-pulseaudio --disable-pulseaudio-shared \
--disable-arts --disable-arts-shared \
--disable-nas --enable-nas-shared \
--disable-sndio --enable-sndio-shared \
@ -102,14 +103,6 @@ else
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-opengl --disable-video-opengles"
fi
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-pulseaudio --enable-pulseaudio-shared"
else
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-pulseaudio --disable-pulseaudio-shared"
fi
pre_make_target() {
# dont build parallel
MAKEFLAGS=-j1

View File

@ -1,43 +0,0 @@
#!/bin/sh
################################################################################
# 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
################################################################################
echo "getting sources..."
if [ ! -d json-c.git ]; then
git clone https://github.com/json-c/json-c.git json-c.git
fi
cd json-c.git
git pull
GIT_REV=`git log -n1 --format=%h`
cd ..
echo "copying sources..."
rm -rf json-c-$GIT_REV
cp -R json-c.git json-c-$GIT_REV
echo "cleaning sources..."
rm -rf json-c-$GIT_REV/.git
echo "packing sources..."
tar cvJf json-c-$GIT_REV.tar.xz json-c-$GIT_REV
echo "remove temporary sourcedir..."
rm -rf json-c-$GIT_REV