packages: libdlna/libdlna.spec, libdlna/libdlna-ffmpeg.patch (NEW) - rel 2; ...

[arekm]

Author: arekm                        Date: Thu Sep  1 12:12:04 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix build with latest ffmpeg

---- Files affected:
packages/libdlna:
   libdlna.spec (1.7 -> 1.8) , libdlna-ffmpeg.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libdlna/libdlna.spec
diff -u packages/libdlna/libdlna.spec:1.7 packages/libdlna/libdlna.spec:1.8
--- packages/libdlna/libdlna.spec:1.7	Mon Jul 12 17:40:15 2010
+++ packages/libdlna/libdlna.spec	Thu Sep  1 14:11:59 2011
@@ -3,12 +3,13 @@
 Summary(pl.UTF-8):	Biblioteka DLNA
 Name:		libdlna
 Version:	0.2.3
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Libraries
 Source0:	http://libdlna.geexbox.org/releases/%{name}-%{version}.tar.bz2
 # Source0-md5:	2c974f95b711e5fd07f78fc4ebfcca66
 Patch0:		%{name}-ffmpeg_paths.patch
+Patch1:		%{name}-ffmpeg.patch
 URL:		http://libdlna.geexbox.org
 BuildRequires:	ffmpeg-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -44,6 +45,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 ./configure \
@@ -87,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2011/09/01 12:11:59  arekm
+- rel 2; fix build with latest ffmpeg
+
 Revision 1.7  2010/07/12 15:40:15  glen
 - verbose files, unify configure
 - pass CC/CFLAGS in a way it actually is not overwritten by Makefile

================================================================
Index: packages/libdlna/libdlna-ffmpeg.patch
diff -u /dev/null packages/libdlna/libdlna-ffmpeg.patch:1.1
--- /dev/null	Thu Sep  1 14:12:04 2011
+++ packages/libdlna/libdlna-ffmpeg.patch	Thu Sep  1 14:11:59 2011
@@ -0,0 +1,18 @@
+--- libdlna-0.2.3/src/profiles.c~	2007-11-26 21:47:43.000000000 +0100
++++ libdlna-0.2.3/src/profiles.c	2011-09-01 14:10:36.187916662 +0200
+@@ -205,13 +205,13 @@
+   for (i = 0; i < ctx->nb_streams; i++)
+   {
+     if (audio_stream == -1 &&
+-        ctx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
++        ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+     {
+       audio_stream = i;
+       continue;
+     }
+     else if (video_stream == -1 &&
+-             ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO)
++             ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+     {
+       video_stream = i;
+       continue;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libdlna/libdlna.spec?r1=1.7&r2=1.8&f=u