diff options
| author | root <root@rshg054.dnsready.net> | 2012-07-12 00:04:35 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-07-12 00:04:35 +0000 |
| commit | 00d32b0938eebfa45f0543cae655abf5233eb99c (patch) | |
| tree | 7528e734c1f6f955da0baca5909906e797562c09 /community/minidlna | |
| parent | b44e3e7f16abe5e4cb428571db65d300b7cc44be (diff) | |
Thu Jul 12 00:04:34 UTC 2012
Diffstat (limited to 'community/minidlna')
| -rw-r--r-- | community/minidlna/PKGBUILD | 12 | ||||
| -rw-r--r-- | community/minidlna/ffmpeg_0.11.diff | 16 |
2 files changed, 22 insertions, 6 deletions
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index dd36f4206..7bc761974 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73526 2012-07-09 06:06:23Z spupykin $ +# $Id: PKGBUILD 73571 2012-07-10 08:51:06Z stativ $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -7,12 +7,12 @@ pkgname=minidlna pkgver=1.0.24 -pkgrel=5 +pkgrel=6 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/minidlna/" license=('GPL') -depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg-compat' 'sqlite') +depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg' 'sqlite') conflicts=('minidlna-cvs') backup=('etc/minidlna.conf' 'etc/conf.d/minidlna') @@ -21,16 +21,16 @@ source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz minidlna.rc minidlna.conf minidlna.service - ffmpeg-compat.patch) + ffmpeg_0.11.diff) md5sums=('be9b4c91e3fcde592dc3f9828098ca0f' 'c9863d5703e0a8469cc200f2739567e7' 'af1b8c0fef9902f797b0324c255da5a1' '1903ed9ceee43b8bb86146b9ad8eb50c' - '310d66170f20d660e96f4c9709559ed1') + '1346e1d3d7d71db70ac46dcad96391b1') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 <$srcdir/ffmpeg-compat.patch + patch -Np1 <$srcdir/ffmpeg_0.11.diff || true sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh make } diff --git a/community/minidlna/ffmpeg_0.11.diff b/community/minidlna/ffmpeg_0.11.diff new file mode 100644 index 000000000..f43831add --- /dev/null +++ b/community/minidlna/ffmpeg_0.11.diff @@ -0,0 +1,16 @@ +diff -rup minidlna-1.0.24/metadata.c minidlna-1.0.24.new/metadata.c +--- minidlna-1.0.24/metadata.c 2012-02-14 19:44:56.000000000 +0100 ++++ minidlna-1.0.24.new/metadata.c 2012-07-10 10:28:01.373163002 +0200 +@@ -1514,10 +1548,10 @@ GetVideoMetadata(const char * path, char + { + if( ctx->metadata ) + { +- AVMetadataTag *tag = NULL; ++ AVDictionaryEntry *tag = NULL; + + //DEBUG DPRINTF(E_DEBUG, L_METADATA, "Metadata:\n"); +- while( (tag = av_metadata_get(ctx->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX)) ) ++ while( (tag = av_dict_get(ctx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX)) ) + { + //DEBUG DPRINTF(E_DEBUG, L_METADATA, " %-16s: %s\n", tag->key, tag->value); + if( strcmp(tag->key, "title") == 0 ) |