diff options
| -rw-r--r-- | testing/deadbeef/APKBUILD | 21 | ||||
| -rw-r--r-- | testing/deadbeef/ffmpeg-avmedia_type.patch | 31 |
2 files changed, 44 insertions, 8 deletions
diff --git a/testing/deadbeef/APKBUILD b/testing/deadbeef/APKBUILD index e14167f165..623a01cb01 100644 --- a/testing/deadbeef/APKBUILD +++ b/testing/deadbeef/APKBUILD @@ -1,21 +1,24 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=deadbeef -pkgver=0.5.0_rc1 +pkgver=0.5.1 +_ver=${pkgver/_rc/-rc} pkgrel=0 pkgdesc="fairly capable playlist-oriented audio player" url="http://deadbeef.sourceforge.net/" arch="all" license="GPL" depends= -depends_dev="gtk+-dev libmad-dev alsa-lib-dev ffmpeg-dev libsamplerate-dev gettext-dev libiconv-dev" +depends_dev="gtk+-dev libmad-dev alsa-lib-dev ffmpeg-dev libsamplerate-dev + gettext-dev libiconv-dev" makedepends="$depends_dev intltool" install="" -subpackages="$pkgname-dev" -source="http://downloads.sourceforge.net/project/$pkgname/$pkgname-0.5.0-rc1.tar.bz2 - deadbeef-junklib.patch" +subpackages="$pkgname-dev $pkgname-lang" +source="http://downloads.sourceforge.net/project/$pkgname/$pkgname-$_ver.tar.bz2 + deadbeef-junklib.patch + ffmpeg-avmedia_type.patch" -_builddir="${srcdir}/${pkgname}-0.5.0-rc1" +_builddir="${srcdir}/${pkgname}-$_ver" prepare() { local i cd "$_builddir" @@ -38,7 +41,9 @@ build() { package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 + rm "$pkgdir"/usr/lib/deadbeef/*.la } -md5sums="ec8100402338d075ff39e714e99e5543 deadbeef-0.5.0-rc1.tar.bz2 -8bf4eb1c52f251da7c7a78b2bb021359 deadbeef-junklib.patch" +md5sums="be8359d1bd9cf7679cf2ca748996e726 deadbeef-0.5.1.tar.bz2 +8bf4eb1c52f251da7c7a78b2bb021359 deadbeef-junklib.patch +fec3680b1e06702265313d6ef13c025e ffmpeg-avmedia_type.patch" diff --git a/testing/deadbeef/ffmpeg-avmedia_type.patch b/testing/deadbeef/ffmpeg-avmedia_type.patch new file mode 100644 index 0000000000..111df4efc0 --- /dev/null +++ b/testing/deadbeef/ffmpeg-avmedia_type.patch @@ -0,0 +1,31 @@ +diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c +index cd7edf4..36b6d4b 100644 +--- a/plugins/ffmpeg/ffmpeg.c ++++ b/plugins/ffmpeg/ffmpeg.c +@@ -140,7 +140,7 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) { + for (i = 0; i < info->fctx->nb_streams; i++) + { + info->ctx = info->fctx->streams[i]->codec; +- if (info->ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (info->ctx->codec_type == AVMEDIA_TYPE_AUDIO) + { + info->codec = avcodec_find_decoder (info->ctx->codec_id); + if (info->codec != NULL) { +@@ -490,7 +490,7 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) { + for (i = 0; i < fctx->nb_streams; i++) + { + ctx = fctx->streams[i]->codec; +- if (ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (ctx->codec_type == AVMEDIA_TYPE_AUDIO) + { + codec = avcodec_find_decoder(ctx->codec_id); + if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams +@@ -745,7 +745,7 @@ ffmpeg_read_metadata (DB_playItem_t *it) { + for (i = 0; i < fctx->nb_streams; i++) + { + ctx = fctx->streams[i]->codec; +- if (ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (ctx->codec_type == AVMEDIA_TYPE_AUDIO) + { + codec = avcodec_find_decoder(ctx->codec_id); + if (codec != NULL) |