aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-12-29 09:46:42 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-12-29 09:46:42 +0000
commit08114e959a98c150888b90cc03eeb17898a6137f (patch)
treebc3801452a10426350f58ef17b6e250ebccdfbe5 /testing
parentc98d2c856a45c968ed7cb60ef354b4913bc12565 (diff)
downloadaports-08114e959a98c150888b90cc03eeb17898a6137f.tar.bz2
aports-08114e959a98c150888b90cc03eeb17898a6137f.tar.xz
main/audacious*: moved frrom testing
Diffstat (limited to 'testing')
-rw-r--r--testing/audacious-plugins/APKBUILD88
-rw-r--r--testing/audacious-plugins/alsa-period-wait.patch66
-rw-r--r--testing/audacious-plugins/ffaudio-linker-fix.patch19
-rw-r--r--testing/audacious/APKBUILD56
-rw-r--r--testing/audacious/uclibc-execinfo.patch23
5 files changed, 0 insertions, 252 deletions
diff --git a/testing/audacious-plugins/APKBUILD b/testing/audacious-plugins/APKBUILD
deleted file mode 100644
index d29f690623..0000000000
--- a/testing/audacious-plugins/APKBUILD
+++ /dev/null
@@ -1,88 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=audacious-plugins
-pkgver=2.4.2
-pkgrel=7
-pkgdesc="playlist-oriented media player with multiple interfaces (plugins)"
-url="http://audacious-media-player.org/"
-arch="all"
-license="ISC"
-depends=audacious
-_want_ffmpeg="ffmpeg-dev"
-makedepends="libmowgli-dev
- libmcs-dev
- libguess-dev
- gtk+-dev
- dbus-glib-dev
- audacious-dev
- libxml2-dev
-
- libcdio-dev
- libcddb-dev
-
- libxcomposite-dev
- libsamplerate-dev
- libcue-dev
- libmms-dev
- libsndfile-dev
-
- libogg-dev
- libvorbis-dev
-
- $_want_ffmpeg
-
- alsa-lib-dev
- faad2-dev
- neon-dev
- curl-dev
- wavpack-dev
- lame-dev
- flac-dev
-
- autoconf"
-install=
-subpackages=
-source="http://distfiles.atheme.org/$pkgname-$pkgver.tgz
- alsa-period-wait.patch
- ffaudio-linker-fix.patch"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
- cd "$_builddir"
-
- for i in $source; do
- case $i in
- *.patch)
- msg "Applying $i..."
- patch -s -p1 -N -i "$srcdir"/$i || return 1
- ;;
- esac
- done
-
- msg "Rebuilding configure..."
- autoconf
-
- # workaround bug in busybox
- sed -e "/touch/s/0001010000/200001010000/g" \
- -i configure
-}
-
-build() {
- cd "$_builddir"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --enable-chardet
- make || return 1
-}
-
-package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install
-}
-
-md5sums="c33d0ea67e8fb8d6ed3891d464d5009b audacious-plugins-2.4.2.tgz
-d52abb4b11b1b29ef1f75a2e5b03d3e6 alsa-period-wait.patch
-ce7f401fce3904e81ac8c190c92fb641 ffaudio-linker-fix.patch"
diff --git a/testing/audacious-plugins/alsa-period-wait.patch b/testing/audacious-plugins/alsa-period-wait.patch
deleted file mode 100644
index 68527d9a83..0000000000
--- a/testing/audacious-plugins/alsa-period-wait.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-# HG changeset patch
-# User John Lindgren <john.lindgren@tds.net>
-# Date 1292029591 18000
-# Node ID 21ec3fe20e6fdffb5758aa847310944021dda67d
-# Parent eb47af70d029335ac12b4eb7e02d5664069439fa
-alsa: Make delay time for poll() workaround depend on period size.
-alsa: Fix thread logic.
-
-diff -r eb47af70d029 -r 21ec3fe20e6f src/alsa/alsa.c
---- a/src/alsa/alsa.c Fri Dec 10 11:47:49 2010 -0500
-+++ b/src/alsa/alsa.c Fri Dec 10 20:06:31 2010 -0500
-@@ -79,6 +79,7 @@
-
- static void * alsa_buffer;
- static int alsa_buffer_length, alsa_buffer_data_start, alsa_buffer_data_length;
-+static int alsa_period; /* milliseconds */
-
- static int64_t alsa_written; /* frames */
- static char alsa_prebuffer, alsa_paused;
-@@ -195,6 +196,9 @@
- continue;
- }
-
-+ if (! snd_pcm_bytes_to_frames (alsa_handle, alsa_buffer_data_length))
-+ continue;
-+
- WAIT:
- pthread_mutex_unlock (& alsa_mutex);
-
-@@ -215,7 +219,8 @@
-
- if (workaround && slept)
- {
-- const struct timespec delay = {.tv_sec = 00, .tv_nsec = 100000000};
-+ const struct timespec delay = {.tv_sec = 0, .tv_nsec = 600000 *
-+ alsa_period};
- nanosleep (& delay, NULL);
- }
- else
-@@ -380,14 +385,14 @@
- direction = 0;
- CHECK_NOISY (snd_pcm_hw_params_set_period_time_near, alsa_handle, params,
- & useconds, & direction);
-- int period = useconds / 1000;
-+ alsa_period = useconds / 1000;
-
- CHECK_NOISY (snd_pcm_hw_params, alsa_handle, params);
-
- int soft_buffer = MAX (aud_cfg->output_buffer_size / 2,
- aud_cfg->output_buffer_size - hard_buffer);
- AUDDBG ("Buffer: hardware %d ms, software %d ms, period %d ms.\n",
-- hard_buffer, soft_buffer, period);
-+ hard_buffer, soft_buffer, alsa_period);
-
- alsa_buffer_length = snd_pcm_frames_to_bytes (alsa_handle, (int64_t)
- soft_buffer * rate / 1000);
-@@ -468,6 +473,9 @@
- alsa_buffer_data_length += length;
- alsa_written += snd_pcm_bytes_to_frames (alsa_handle, length);
-
-+ if (! alsa_paused)
-+ pthread_cond_broadcast (& alsa_cond);
-+
- pthread_mutex_unlock (& alsa_mutex);
- }
-
diff --git a/testing/audacious-plugins/ffaudio-linker-fix.patch b/testing/audacious-plugins/ffaudio-linker-fix.patch
deleted file mode 100644
index 06f670c1d0..0000000000
--- a/testing/audacious-plugins/ffaudio-linker-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User William Pitcock <nenolod@atheme.org>
-# Date 1293589809 21600
-# Node ID c770e450d8d504772b4144ca489f0025d4b61501
-# Parent 531718a9e02f0568e5e774d9c05ae764f1a49197
-ffaudio: Fix linking order when linked on non-GNU operating systems.
-
-diff -r 531718a9e02f -r c770e450d8d5 configure.ac
---- a/configure.ac Tue Dec 28 17:43:07 2010 -0500
-+++ b/configure.ac Tue Dec 28 20:30:09 2010 -0600
-@@ -843,7 +843,7 @@
- )
-
- if test "x$enable_ffaudio" = "xyes"; then
-- PKG_CHECK_MODULES(FFMPEG, [libavformat >= 52.31.0 libavcodec >= 52.20.0 libavutil >= 49.15.0],
-+ PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 52.20.0 libavutil >= 49.15.0 libavformat >= 52.31.0],
- [have_ffaudio="yes"], [have_ffaudio="no"])
- fi
-
diff --git a/testing/audacious/APKBUILD b/testing/audacious/APKBUILD
deleted file mode 100644
index b92bc582aa..0000000000
--- a/testing/audacious/APKBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=audacious
-pkgver=2.4.2
-pkgrel=0
-pkgdesc="playlist-oriented media player with multiple interfaces"
-url="http://audacious-media-player.org/"
-arch="all"
-license="ISC"
-depends=
-makedepends="libmowgli-dev libmcs-dev libguess-dev gtk+-dev dbus-glib-dev libxml2-dev"
-install=
-subpackages="$pkgname-dev"
-source="http://distfiles.atheme.org/$pkgname-$pkgver.tgz
- uclibc-execinfo.patch"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
- cd "$_builddir"
-
- for i in $source; do
- case $i in
- *.patch)
- msg "Applying $i..."
- patch -s -p1 -N -i "$srcdir"/$i || return 1
- ;;
- esac
- done
-
- # workaround bug in busybox
- sed -e "/touch/s/0001010000/200001010000/g" \
- -i configure
-}
-
-build() {
- cd "$_builddir"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --enable-chardet
- make || return 1
-}
-
-package() {
- cd "$_builddir"
-
- # bleah...
- mkdir $pkgdir/usr/bin
-
- make DESTDIR="$pkgdir" install
-}
-
-md5sums="bffdee15653595a7e9126246dee444e5 audacious-2.4.2.tgz
-b200db2ce2f3949deb4fdfa98f0b193d uclibc-execinfo.patch"
diff --git a/testing/audacious/uclibc-execinfo.patch b/testing/audacious/uclibc-execinfo.patch
deleted file mode 100644
index 803f273ef8..0000000000
--- a/testing/audacious/uclibc-execinfo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- audacious-2.4.2.orig/src/libaudcore/audstrings.c
-+++ audacious-2.4.2/src/libaudcore/audstrings.c
-@@ -230,9 +230,8 @@
- return dirname;
- }
-
--#if defined(__GLIBC__) && (__GLIBC__ >= 2)
--#define HAVE_EXECINFO 1
--#include <execinfo.h>
-+#ifdef HAVE_EXECINFO_H
-+# include <execinfo.h>
- #endif
-
- /**
-@@ -258,7 +257,7 @@
-
- /* already UTF-8? */
- if (!g_utf8_validate(str, -1, NULL)) {
--#ifdef HAVE_EXECINFO
-+#ifdef HAVE_EXECINFO_H
- gint i, nsymbols;
- const gint nsymmax = 50;
- void *addrbuf[nsymmax];