Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-systemd

This commit is contained in:
Stephan Raue 2013-08-12 21:54:42 +02:00
commit 70fbe619f1
35 changed files with 3 additions and 848 deletions

View File

@ -35,10 +35,6 @@ PKG_LONGDESC="ALSA (Advanced Linux Sound Architecture) is the next generation Li
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS alsa-plugins"
fi
# package specific configure options
PKG_CONFIGURE_OPTS_TARGET="--with-plugindir=/usr/lib/alsa \
--disable-python \

View File

@ -1,11 +0,0 @@
# samplerate plugin configuration
# $Id: samplerate.conf,v 1.2 2008/03/09 15:50:49 lkundrak Exp $
pcm.my_rate {
type rate
slave.pcm "hw"
converter "samplerate"
hint {
description "External rate converter"
}
}

View File

@ -1,11 +0,0 @@
# samplerate plugin configuration
# $Id$
pcm.my_rate {
type rate
slave.pcm "hw"
converter "speexrate"
hint {
description "Rate Converter Plugin Using Speex Resampler"
}
}

View File

@ -1,10 +0,0 @@
# upmix plugin configuration
# $Id: upmix.conf,v 1.2 2008/03/09 15:50:49 lkundrak Exp $
pcm.upmix51 {
type upmix
slave.pcm "surround51"
hint {
description "Upmixer channel expander"
}
}

View File

@ -1,18 +0,0 @@
# vdownmix plugin configuration
# $Id$
pcm.!surround51 {
type vdownmix
slave.pcm "default"
hint {
description "Downmixer to stereo from surround51"
}
}
pcm.!surround40 {
type vdownmix
slave.pcm "default"
hint {
description "Downmixer to stereo from surround40"
}
}

View File

@ -1,56 +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="alsa-plugins"
PKG_VERSION="1.0.27"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.alsa-project.org/"
PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="speex"
PKG_BUILD_DEPENDS_TARGET="toolchain speex libsamplerate"
PKG_PRIORITY="optional"
PKG_SECTION="audio"
PKG_SHORTDESC="alsa-plugins: Advanced Linux Sound Architecture Plugins"
PKG_LONGDESC="ALSA (Advanced Linux Sound Architecture) is the next generation Linux Sound API. It provides much finer (->better) access to the sound hardware, has a unbeatable mixer API and supports stuff like multi channel hardware, digital outs and ins, uninterleaved sound data access, and an oss emulation layer (for the old applications). It is the prefered API for professional sound apps under Linux."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
# package specific configure options
PKG_CONFIGURE_OPTS_TARGET="--with-plugindir=/usr/lib/alsa \
--disable-jack \
--enable-samplerate \
--disable-avcodec \
--with-speex=lib"
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS pulseaudio"
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET pulseaudio"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-pulseaudio"
else
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-pulseaudio"
fi
post_makeinstall_target() {
mkdir -p $INSTALL/usr/share/alsa/pcm
cp -R $PKG_DIR/config/*.conf $INSTALL/usr/share/alsa/pcm
}

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="alsa-lib flac libvorbis libogg"
PKG_BUILD_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="--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,13 +0,0 @@
#
# Place your global alsa-lib configuration here...
#
@hooks [
{
func load
files [
"/etc/alsa/pulse-default.conf"
]
errors false
}
]

View File

@ -1,154 +0,0 @@
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio 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 Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
# This startup script is used only if PulseAudio is started per-user
# (i.e. not in system mode)
.nofail
### Load something into the sample cache
#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-access /usr/share/sounds/generic.wav
.fail
### Automatically restore the volume of streams and devices
load-module module-device-restore
load-module module-stream-restore
load-module module-card-restore
### Automatically augment property information from .desktop files
### stored in /usr/share/application
load-module module-augment-properties
### Load audio drivers statically
### (it's probably better to not load these drivers manually, but instead
### use module-udev-detect -- see below -- for doing this automatically)
#load-module module-alsa-sink device=hw:1,7
#load-module module-alsa-sink
#load-module module-alsa-source device=hw:1,0
#load-module module-alsa-source device=hw:1,7
#load-module module-null-sink
#load-module module-pipe-sink
### Automatically load driver modules depending on the hardware available
.ifexists module-udev-detect.so
load-module module-udev-detect
.else
### Use the static hardware detection module (for systems that lack udev/hal support)
load-module module-detect
.endif
### Automatically connect sink and source if JACK server is present
.ifexists module-jackdbus-detect.so
load-module module-jackdbus-detect
.endif
### Load several protocols
.ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
.endif
load-module module-native-protocol-unix
### Network access (may be configured with paprefs, so leave this commented
### here if you plan to use paprefs)
#load-module module-esound-protocol-tcp
#load-module module-native-protocol-tcp
#load-module module-zeroconf-publish
### Load the RTP receiver module (also configured via paprefs, see above)
#load-module module-rtp-recv
### Load the RTP sender module (also configured via paprefs, see above)
#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
#load-module module-rtp-send source=rtp.monitor
### Load additional modules from GConf settings. This can be configured with the paprefs tool.
### Please keep in mind that the modules configured by paprefs might conflict with manually
### loaded modules.
.ifexists module-gconf.so
.nofail
load-module module-gconf
.fail
.endif
### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore
### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams
### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink
### Honour intended role device property
load-module module-intended-roles
### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle
### If autoexit on idle is enabled we want to make sure we only quit
### when no local session needs us anymore.
.ifexists module-console-kit.so
load-module module-console-kit
.endif
### Enable positioned event sounds
load-module module-position-event-sounds
### Cork music streams when a phone stream is active
load-module module-cork-music-on-phone
### Modules to allow autoloading of filters (such as echo cancellation)
### on demand. module-filter-heuristics tries to determine what filters
### make sense, and module-filter-apply does the heavy-lifting of
### loading modules and rerouting streams.
load-module module-filter-heuristics
load-module module-filter-apply
### Load DBus protocol
.ifexists module-dbus-protocol.so
load-module module-dbus-protocol
.endif
# X11 modules should not be started from default.pa so that one daemon
# can be shared by multiple sessions.
### Load X11 bell module
#load-module module-x11-bell sample=bell-windowing-system
### Register ourselves in the X11 session manager
load-module module-x11-xsmp
### Publish connection data in the X11 root window
.ifexists module-x11-publish.so
.nofail
load-module module-x11-publish
.fail
.endif
### Make some devices default
#set-default-sink output
#set-default-source input

View File

@ -1,35 +0,0 @@
# PulseAudio plugin configuration
# $Id$
# Let's create a virtual device "pulse" for mixer and PCM
pcm.pulse {
type pulse
hint {
description "PulseAudio Sound Server"
}
}
ctl.pulse {
type pulse
hint {
description "PulseAudio Sound Server"
}
}
# Let's make it the default!
pcm.!default {
type pulse
hint {
description "Default"
}
}
ctl.!default {
type pulse
hint {
description "Default"
}
}

View File

@ -1,62 +0,0 @@
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio 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 Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
# This startup script is used only if PulseAudio is started in system
# mode.
### Automatically load driver modules depending on the hardware available
.ifexists module-udev-detect.so
load-module module-udev-detect
.else
### Use the static hardware detection module (for systems that lack udev/hal support)
load-module module-detect
.endif
### Load several protocols
.ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
.endif
load-module module-native-protocol-unix
### Automatically restore the volume of streams and devices
load-module module-stream-restore
load-module module-device-restore
### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore
.ifexists module-dbus-protocol.so
### If you want to allow TCP connections, set access to "remote" or "local,remote".
load-module module-dbus-protocol access=local
.endif
### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams
### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink
### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle
### Enable positioned event sounds
load-module module-position-event-sounds

View File

@ -1,30 +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
################################################################################
# start PulseAudio daemon
#
# runlevels: openelec, textmode
progress "starting PulseAudio daemon"
pulseaudio --system --daemonize \
--log-target=file:/var/log/pulseaudio.log \
--log-level=debug >/dev/null 2>&1
export SDL_AUDIODRIVER=pulse

View File

@ -1,109 +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="2.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://pulseaudio.org/"
PKG_URL="http://freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl"
PKG_BUILD_DEPENDS_TARGET="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl 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"
# package specific configure options
PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
--disable-nls \
--enable-largefile \
--disable-rpath \
--disable-x11 \
--enable-samplerate \
--disable-oss-output \
--disable-oss-wrapper \
--disable-coreaudio-output \
--enable-alsa \
--disable-esound \
--disable-solaris \
--disable-waveout \
--disable-glib2 \
--disable-gtk2 \
--disable-gconf \
--disable-jack \
--disable-asyncns \
--disable-tcpwrap \
--disable-lirc \
--enable-dbus \
--disable-hal \
--disable-bluez \
--enable-udev \
--disable-hal-compat \
--enable-ipv6 \
--enable-openssl \
--disable-orc \
--disable-manpages \
--disable-per-user-esound-socket \
--disable-legacy-runtime-dir \
--disable-legacy-database-entry-format \
--with-system-user=root \
--with-system-group=root \
--with-access-group=root \
--with-module-dir=/usr/lib/pulse"
if [ "$AVAHI_DAEMON" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS avahi"
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET avahi"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-avahi"
else
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-avahi"
fi
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
mkdir -p $INSTALL/etc
cp $PKG_DIR/config/asound.conf $INSTALL/etc
mkdir -p $INSTALL/etc/alsa
cp $PKG_DIR/config/pulse-default.conf $INSTALL/etc/alsa
rm -rf $INSTALL/usr/bin/esdcompat
rm -rf $INSTALL/usr/lib/cmake
rm -rf $INSTALL/usr/share/vala
}

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="libogg"
PKG_BUILD_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="--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 @@
#!/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
################################################################################
. config/options $1
cd $PKG_BUILD
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--exec-prefix=/usr \
--sysconfdir=/etc \
--datadir=/usr/share \
--enable-shared \
--disable-static \
make
$MAKEINSTALL

View File

@ -1,27 +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
################################################################################
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/.libs/libjson*.so* $INSTALL/usr/lib

View File

@ -1,36 +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="json-c"
PKG_VERSION="0.9"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="MIT"
PKG_SITE="http://oss.metaparadigm.com/json-c/"
PKG_URL="http://oss.metaparadigm.com/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="devel"
PKG_SHORTDESC="json-c: A JSON implementation in 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"

View File

@ -1,12 +0,0 @@
diff -Naur json-c-0.9/configure.in json-c-0.9.patch/configure.in
--- json-c-0.9/configure.in 2009-01-06 23:55:33.000000000 +0100
+++ json-c-0.9.patch/configure.in 2013-02-01 16:45:09.890830041 +0100
@@ -10,7 +10,7 @@
# Checks for libraries.
# Checks for header files.
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_HEADER_STDC
AC_CHECK_HEADERS(fcntl.h limits.h strings.h syslog.h unistd.h [sys/param.h] stdarg.h)

View File

@ -104,15 +104,6 @@ else
XBMC_ALSA="--disable-alsa"
fi
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
# for PulseAudio support
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET pulseaudio"
PKG_DEPENDS="$PKG_DEPENDS pulseaudio"
XBMC_PULSEAUDIO="--enable-pulse"
else
XBMC_PULSEAUDIO="--disable-pulse"
fi
if [ "$CEC_SUPPORT" = yes ]; then
# for CEC support
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libcec"
@ -384,7 +375,7 @@ PKG_CONFIGURE_OPTS_TARGET="gl_cv_func_gettimeofday_clobber=no \
$XBMC_XORG \
--disable-ccache \
$XBMC_ALSA \
$XBMC_PULSEAUDIO \
--disable-pulse \
--enable-rtmp \
$XBMC_SAMBA \
$XBMC_NFS \

View File

@ -40,12 +40,6 @@ else
SDL_OPENGL="--disable-video-opengl"
fi
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
SDL_PULSEAUDIO="--enable-pulseaudio --enable-pulseaudio-shared"
else
SDL_PULSEAUDIO="--disable-pulseaudio --disable-pulseaudio-shared"
fi
cd $PKG_BUILD
rm -f acinclude/alsa.m4
@ -82,7 +76,8 @@ mkdir -p .build-target && cd .build-target
--disable-esd \
--disable-esdtest \
--disable-esd-shared \
$SDL_PULSEAUDIO \
--disable-pulseaudio \
--disable-pulseaudio-shared \
--disable-arts \
--disable-arts-shared \
--disable-nas \

View File

@ -45,7 +45,3 @@ if [ "$OPENGL" = "Mesa" ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS Mesa glu"
fi
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS pulseaudio"
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS pulseaudio"
fi

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="no"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -138,9 +138,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"