rpms/minidlna/F-18 minidlna-1.0.25-ffmpeg10.patch, NONE, 1.1 minidlna.service, 1.1, 1.2 minidlna.spec, 1.6, 1.7

[Andrea Musuruane]

Author: musuruan

Update of /cvs/free/rpms/minidlna/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28519

Modified Files:
	minidlna.service minidlna.spec 
Added Files:
	minidlna-1.0.25-ffmpeg10.patch 
Log Message:
* Sat Nov 03 2012 Andrea Musuruane <musuruan at gmail.com> 1.0.25-2
- Fixed FTBFS caused by ffmpeg 1.0
- Updated minidlna.service I forgot to commit (BZ #2294)


minidlna-1.0.25-ffmpeg10.patch:
 Makefile                  |   12 ++++++++----
 metadata.c                |    6 +++---
 tagutils/tagutils-plist.c |    2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

--- NEW FILE minidlna-1.0.25-ffmpeg10.patch ---
The new ffmpeg-1.0 comes with the headers libavutil/time.h and 
libavutil/log.h.  These overrule /usr/include/time.h and 
minidlna-1.0.25/log.h due to the priority of '-I' set in the
Makefile

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

Here below is a patch removing the need for these search
directories.  Backward compatibility could be guaranteed via
'-I/usr/include/ffmpeg'.

diff -u -p -r minidlna-1.0.25/Makefile minidlna-1.0.25-new/Makefile
--- minidlna-1.0.25/Makefile	2012-01-17 23:49:01.000000000 +0100
+++ minidlna-1.0.25-new/Makefile	2012-10-25 01:53:04.000000000 +0200
@@ -12,10 +12,14 @@
 #
 #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
+CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/ffmpeg
+#	 -I/usr/include/libavcodec
+#	 -I/usr/include/libavformat
+# overrules /usr/include/time.h
+#	 -I/usr/include/libavutil 
+# nonexistant
+#	 -I/usr/include/ffmpeg \
+#	 -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
 #STATIC_LINKING: CFLAGS += -DSTATIC
 #STATIC_LINKING: LDFLAGS = -static
 CC = gcc
diff -u -p -r minidlna-1.0.25/metadata.c minidlna-1.0.25-new/metadata.c
--- minidlna-1.0.25/metadata.c	2012-06-29 23:11:29.000000000 +0200
+++ minidlna-1.0.25-new/metadata.c	2012-10-25 01:53:37.000000000 +0200
@@ -30,9 +30,9 @@
 #include "image_utils.h"
 #include <jpeglib.h>
 #include <setjmp.h>
-#include <avutil.h>
-#include <avcodec.h>
-#include <avformat.h>
+#include <libavutil/avutil.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 #include "tagutils/tagutils.h"
 
 #include "upnpglobalvars.h"
diff -u -p -r minidlna-1.0.25/tagutils/tagutils-plist.c minidlna-1.0.25-new/tagutils/tagutils-plist.c
--- minidlna-1.0.25/tagutils/tagutils-plist.c	2012-01-17 23:54:47.000000000 +0100
+++ minidlna-1.0.25-new/tagutils/tagutils-plist.c	2012-10-25 01:49:33.000000000 +0200
@@ -27,7 +27,7 @@
 #include "misc.h"
 #include "tagutils.h"
 #include "textutils.h"
-#include "log.h"
+#include "../log.h"
 
 
 #define MAX_BUF 4096


Index: minidlna.service
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-18/minidlna.service,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- minidlna.service	22 Jan 2012 13:21:32 -0000	1.1
+++ minidlna.service	3 Nov 2012 19:51:04 -0000	1.2
@@ -3,9 +3,11 @@
 After=syslog.target local-fs.target network.target
 
 [Service]
+User=minidlna
+Group=minidlna
 Type=forking
-PIDFile=/var/run/minidlna.pid
-ExecStart=/usr/sbin/minidlna -f /etc/minidlna.conf
+PIDFile=/var/run/minidlna/minidlna.pid
+ExecStart=/usr/sbin/minidlna -f /etc/minidlna.conf -P /var/run/minidlna/minidlna.pid
 
 [Install]
 WantedBy=multi-user.target


Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-18/minidlna.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- minidlna.spec	14 Jul 2012 11:52:08 -0000	1.6
+++ minidlna.spec	3 Nov 2012 19:51:04 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           minidlna
 Version:        1.0.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lightweight DLNA/UPnP-AV server targeted at embedded systems
 
 Group:          System Environment/Daemons
@@ -13,6 +13,9 @@
 Source2:        %{name}-1.0.24-debian-manpages.tar.gz
 # tmpfiles.d configuration for the /var/run directory
 Source3:        %{name}-tmpfiles.conf 
+# Fix FTBFS for ffmpeg-1.0
+# http://inmmc.org/ftp/soft/minidlna.diff
+Patch0:         %{name}-1.0.25-ffmpeg10.patch
 
 BuildRequires:  libuuid-devel
 BuildRequires:  ffmpeg-devel
@@ -42,6 +45,7 @@
 %prep
 %setup -q
 %setup -D -T -q -a 2
+%patch0 -p1
 
 # Honor RPM_OPT_FLAGS
 sed -i 's/CFLAGS = -Wall -g -O3/CFLAGS +=/' Makefile
@@ -152,6 +156,10 @@
 
 
 %changelog
+* Sat Nov 03 2012 Andrea Musuruane <musuruan at gmail.com> 1.0.25-2
+- Fixed FTBFS caused by ffmpeg 1.0
+- Updated minidlna.service I forgot to commit (BZ #2294)
+
 * Sat Jul 14 2012 Andrea Musuruane <musuruan at gmail.com> 1.0.25-1
 - Updated to upstream 1.0.25