diff options
Diffstat (limited to 'community/minidlna')
| -rw-r--r-- | community/minidlna/PKGBUILD | 4 | ||||
| -rw-r--r-- | community/minidlna/ffmpeg-compat.patch | 50 | ||||
| -rw-r--r-- | community/minidlna/ffmpeg_0.11.diff | 16 | ||||
| -rw-r--r-- | community/minidlna/minidlna.conf | 4 |
4 files changed, 2 insertions, 72 deletions
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index b72d9c712..67fb86bd4 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79502 2012-11-06 11:19:57Z spupykin $ +# $Id: PKGBUILD 84354 2013-02-16 22:50:32Z ioni $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -7,7 +7,7 @@ pkgname=minidlna pkgver=1.0.25 -pkgrel=4 +pkgrel=5 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/minidlna/" diff --git a/community/minidlna/ffmpeg-compat.patch b/community/minidlna/ffmpeg-compat.patch deleted file mode 100644 index aa6f982e5..000000000 --- a/community/minidlna/ffmpeg-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -wbBur minidlna-1.0.24/genconfig.sh minidlna-1.0.24.my/genconfig.sh ---- minidlna-1.0.24/genconfig.sh 2012-01-21 04:34:13.000000000 +0400 -+++ minidlna-1.0.24.my/genconfig.sh 2012-07-09 09:51:09.000000000 +0400 -@@ -47,15 +47,15 @@ - [ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING" - [ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING" - [ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING" --[ ! -e "/usr/include/ffmpeg/avutil.h" -a \ -+[ ! -e "/usr/include/ffmpeg-compat/avutil.h" -a \ - ! -e "/usr/include/libavutil/avutil.h" -a \ -- ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" --[ ! -e "/usr/include/ffmpeg/avformat.h" -a \ -+ ! -e "/usr/include/ffmpeg-compat/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" -+[ ! -e "/usr/include/ffmpeg-compat/avformat.h" -a \ - ! -e "/usr/include/libavformat/avformat.h" -a \ -- ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" --[ ! -e "/usr/include/ffmpeg/avcodec.h" -a \ -+ ! -e "/usr/include/ffmpeg-compat/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" -+[ ! -e "/usr/include/ffmpeg-compat/avcodec.h" -a \ - ! -e "/usr/include/libavcodec/avcodec.h" -a \ -- ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" -+ ! -e "/usr/include/ffmpeg-compat/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" - if [ -n "$MISSING" ]; then - echo -e "\nERROR! Cannot continue." - echo -e "The following required libraries are either missing, or are missing development headers:\n" -diff -wbBur minidlna-1.0.24/Makefile minidlna-1.0.24.my/Makefile ---- minidlna-1.0.24/Makefile 2012-01-18 02:49:01.000000000 +0400 -+++ minidlna-1.0.24.my/Makefile 2012-07-09 10:01:10.000000000 +0400 -@@ -13,9 +13,9 @@ - #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG - #CFLAGS = -Wall -g -Os -D_GNU_SOURCE - CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ -- -I/usr/include/ffmpeg \ -- -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \ -- -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat -+ -I/usr/include/ffmpeg-compat \ -+ -I/usr/include/ffmpeg-compat/libavutil -I/usr/include/ffmpeg-compat/libavcodec -I/usr/include/ffmpeg-compat/libavformat -+LDFLAGS+= -L/usr/lib/ffmpeg-compat -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat - #STATIC_LINKING: CFLAGS += -DSTATIC - #STATIC_LINKING: LDFLAGS = -static - CC = gcc -@@ -64,7 +64,7 @@ - $(INSTALL) -d $(ETCINSTALLDIR) - $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR) - --minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS) -+minidlna: $(BASEOBJS) $(LNXOBJS) - @echo Linking $@ - @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS) - diff --git a/community/minidlna/ffmpeg_0.11.diff b/community/minidlna/ffmpeg_0.11.diff deleted file mode 100644 index f43831add..000000000 --- a/community/minidlna/ffmpeg_0.11.diff +++ /dev/null @@ -1,16 +0,0 @@ -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 ) diff --git a/community/minidlna/minidlna.conf b/community/minidlna/minidlna.conf deleted file mode 100644 index 98be33c0d..000000000 --- a/community/minidlna/minidlna.conf +++ /dev/null @@ -1,4 +0,0 @@ -# systemd tmpfile settings for minidlna -# See tmpfiles.d(5) for details - -d /var/run/minidlna 0755 nobody nobody - |