Wed Jul 11 00:01:34 UTC 2012

2 files changed, 58 insertions, 5 deletions

diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index d2a3c9ee6..dd36f4206 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70495 2012-05-09 17:17:28Z spupykin $
+# $Id: PKGBUILD 73526 2012-07-09 06:06:23Z spupykin $
 # 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=4
+pkgrel=5
 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' 'sqlite')
+depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg-compat' 'sqlite')
 conflicts=('minidlna-cvs')
 backup=('etc/minidlna.conf'
 	'etc/conf.d/minidlna')
@@ -20,14 +20,17 @@ changelog=changelog
 source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz
 	minidlna.rc
 	minidlna.conf
-	minidlna.service)
+	minidlna.service
+	ffmpeg-compat.patch)
 md5sums=('be9b4c91e3fcde592dc3f9828098ca0f'
          'c9863d5703e0a8469cc200f2739567e7'
          'af1b8c0fef9902f797b0324c255da5a1'
-         '1903ed9ceee43b8bb86146b9ad8eb50c')
+         '1903ed9ceee43b8bb86146b9ad8eb50c'
+         '310d66170f20d660e96f4c9709559ed1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 <$srcdir/ffmpeg-compat.patch
   sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh
   make
 }
diff --git a/community/minidlna/ffmpeg-compat.patch b/community/minidlna/ffmpeg-compat.patch
new file mode 100644
index 000000000..aa6f982e5
--- /dev/null
+++ b/community/minidlna/ffmpeg-compat.patch
@@ -0,0 +1,50 @@
+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)
+