- rel 4; fix ffmpeg 2.4 build

diff --git a/libdlna-ffmpeg.patch b/libdlna-ffmpeg.patch
new file mode 100644 (file)
index 0000000..59ffff4
--- /dev/null
+++ b/libdlna-ffmpeg.patch
@@ -0,0 +1,21 @@
+diff -urN libdlna-0.2.4.org/src/profiles.c libdlna-0.2.4/src/profiles.c
+--- libdlna-0.2.4.org/src/profiles.c   2012-02-26 20:34:00.000000000 +0100
++++ libdlna-0.2.4/src/profiles.c       2014-10-13 21:44:27.000000000 +0200
+@@ -287,7 +287,7 @@
+     return NULL;
+   }
+ 
+-  if (av_find_stream_info (ctx) < 0)
++  if (avformat_find_stream_info (ctx, NULL) < 0)
+   {
+     if (dlna->verbosity)
+       fprintf (stderr, "can't find stream info\n");
+@@ -334,7 +334,7 @@
+     p = p->next;
+   }
+ 
+-  av_close_input_file (ctx);
++  avformat_close_input (&ctx);
+   free (codecs);
+   return profile;
+ }

diff --git a/libdlna.spec b/libdlna.spec
index 88e6bb28a8d24256727ee890cb0ff1df38b0253c..457d41072f3a46c1482e0e36f5496590ae35dede 100644 (file)
--- a/libdlna.spec
+++ b/libdlna.spec
@@ -2,11 +2,12 @@ Summary:      DLNA library
 Summary(pl.UTF-8):     Biblioteka DLNA
 Name:          libdlna
 Version:       0.2.4
-Release:       3
+Release:       4
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libdlna.geexbox.org/releases/%{name}-%{version}.tar.bz2
 # Source0-md5: 64d7de57aff5a729f2434fc5e69b4ffc
+Patch0:                %{name}-ffmpeg.patch
 URL:           http://libdlna.geexbox.org/
 # libavformat, libavcodec
 BuildRequires: ffmpeg-devel
@@ -48,6 +49,7 @@ Statyczna biblioteka libdlna.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # not autoconf-generated
@@ -57,7 +59,7 @@ Statyczna biblioteka libdlna.
 
 %{__make} -j1 \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcflags} -Wall -fpic -Isrc"
+       CFLAGS="%{rpmcflags} %{rpmcppflags} -Wall -fpic -Isrc"
 
 %install
 rm -rf $RPM_BUILD_ROOT