[packages/libdlna] - updated to 0.2.4 - removed obsolete ffmpeg patches

[baggins]

commit 3ae59888839e4fbb32bace0b8612abef821f387f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Nov 8 13:35:44 2012 +0100

    - updated to 0.2.4
    - removed obsolete ffmpeg patches

 libdlna-ffmpeg.patch       | 18 -------------
 libdlna-ffmpeg_paths.patch | 65 ----------------------------------------------
 libdlna.spec               | 10 +++----
 3 files changed, 3 insertions(+), 90 deletions(-)
---
diff --git a/libdlna.spec b/libdlna.spec
index c8d2d7d..201dadd 100644
--- a/libdlna.spec
+++ b/libdlna.spec
@@ -1,14 +1,12 @@
 Summary:	DLNA library
 Summary(pl.UTF-8):	Biblioteka DLNA
 Name:		libdlna
-Version:	0.2.3
-Release:	2
+Version:	0.2.4
+Release:	1
 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
+# Source0-md5:	64d7de57aff5a729f2434fc5e69b4ffc
 URL:		http://libdlna.geexbox.org
 BuildRequires:	ffmpeg-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,8 +41,6 @@ Statyczna biblioteka libdlna.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 ./configure \
diff --git a/libdlna-ffmpeg.patch b/libdlna-ffmpeg.patch
deleted file mode 100644
index 6433285..0000000
--- a/libdlna-ffmpeg.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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;
diff --git a/libdlna-ffmpeg_paths.patch b/libdlna-ffmpeg_paths.patch
deleted file mode 100644
index af14204..0000000
--- a/libdlna-ffmpeg_paths.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -urN libdlna-0.2.3.orig/configure libdlna-0.2.3/configure
---- libdlna-0.2.3.orig/configure	2007-11-26 21:47:43.000000000 +0100
-+++ libdlna-0.2.3/configure	2008-12-18 14:00:26.000000000 +0100
-@@ -610,9 +610,9 @@
- fi
- 
- echolog "Checking for libavformat ..."
--check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
-+check_lib libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
- echolog "Checking for libavcodec ..."
--check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
-+check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
- 
- #################################################
- #   version
-diff -urN libdlna-0.2.3.orig/src/av_mpeg4_part10.c libdlna-0.2.3/src/av_mpeg4_part10.c
---- libdlna-0.2.3.orig/src/av_mpeg4_part10.c	2007-11-26 21:47:43.000000000 +0100
-+++ libdlna-0.2.3/src/av_mpeg4_part10.c	2008-12-18 13:59:10.000000000 +0100
-@@ -26,7 +26,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- 
- #include "dlna_internals.h"
- #include "profiles.h"
-diff -urN libdlna-0.2.3.orig/src/av_mpeg4_part2.c libdlna-0.2.3/src/av_mpeg4_part2.c
---- libdlna-0.2.3.orig/src/av_mpeg4_part2.c	2007-11-26 21:47:43.000000000 +0100
-+++ libdlna-0.2.3/src/av_mpeg4_part2.c	2008-12-18 13:59:10.000000000 +0100
-@@ -26,7 +26,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- 
- #include "dlna_internals.h"
- #include "profiles.h"
-diff -urN libdlna-0.2.3.orig/src/containers.c libdlna-0.2.3/src/containers.c
---- libdlna-0.2.3.orig/src/containers.c	2007-11-26 21:47:43.000000000 +0100
-+++ libdlna-0.2.3/src/containers.c	2008-12-18 13:59:10.000000000 +0100
-@@ -4,7 +4,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
- 
- #include "containers.h"
- #include "profiles.h"
-diff -urN libdlna-0.2.3.orig/src/profiles.h libdlna-0.2.3/src/profiles.h
---- libdlna-0.2.3.orig/src/profiles.h	2007-11-26 21:47:43.000000000 +0100
-+++ libdlna-0.2.3/src/profiles.h	2008-12-18 13:59:10.000000000 +0100
-@@ -22,8 +22,8 @@
- #ifndef _PROFILES_H_
- #define _PROFILES_H_
- 
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
- 
- #include "dlna_internals.h"
- #include "containers.h"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libdlna.git/commitdiff/3ae59888839e4fbb32bace0b8612abef821f387f