Author: jwrdegoede Update of /cvs/free/rpms/libdlna/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv28299 Modified Files: libdlna.spec Added Files: libdlna-0.2.3-ffmpeg-header-move.patch Log Message: * Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 0.2.3-8 - Fix build with even newer ffmpeg libdlna-0.2.3-ffmpeg-header-move.patch: --- NEW FILE libdlna-0.2.3-ffmpeg-header-move.patch --- diff -up libdlna-0.2.3/configure~ libdlna-0.2.3/configure --- libdlna-0.2.3/configure~ 2008-09-27 21:08:58.000000000 +0200 +++ libdlna-0.2.3/configure 2008-09-27 21:08:58.000000000 +0200 @@ -610,9 +610,9 @@ if [ -n "$ffmpegdir" ]; then fi echolog "Checking for libavformat ..." -check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !" +check_lib ffmpeg/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 ffmpeg/libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !" ################################################# # version diff -up libdlna-0.2.3/src/av_mpeg4_part10.c~ libdlna-0.2.3/src/av_mpeg4_part10.c --- libdlna-0.2.3/src/av_mpeg4_part10.c~ 2008-09-27 21:38:31.000000000 +0200 +++ libdlna-0.2.3/src/av_mpeg4_part10.c 2008-09-27 21:38:31.000000000 +0200 @@ -26,7 +26,7 @@ #include <sys/stat.h> #include <fcntl.h> -#include <ffmpeg/avcodec.h> +#include <ffmpeg/libavcodec/avcodec.h> #include "dlna_internals.h" #include "profiles.h" diff -up libdlna-0.2.3/src/av_mpeg4_part2.c~ libdlna-0.2.3/src/av_mpeg4_part2.c --- libdlna-0.2.3/src/av_mpeg4_part2.c~ 2008-09-27 21:38:17.000000000 +0200 +++ libdlna-0.2.3/src/av_mpeg4_part2.c 2008-09-27 21:38:17.000000000 +0200 @@ -26,7 +26,7 @@ #include <sys/stat.h> #include <fcntl.h> -#include <ffmpeg/avcodec.h> +#include <ffmpeg/libavcodec/avcodec.h> #include "dlna_internals.h" #include "profiles.h" diff -up libdlna-0.2.3/src/containers.c~ libdlna-0.2.3/src/containers.c --- libdlna-0.2.3/src/containers.c~ 2008-09-27 21:38:40.000000000 +0200 +++ libdlna-0.2.3/src/containers.c 2008-09-27 21:38:40.000000000 +0200 @@ -4,7 +4,7 @@ #include <sys/stat.h> #include <fcntl.h> -#include <ffmpeg/avformat.h> +#include <ffmpeg/libavformat/avformat.h> #include "containers.h" #include "profiles.h" diff -up libdlna-0.2.3/src/profiles.h~ libdlna-0.2.3/src/profiles.h --- libdlna-0.2.3/src/profiles.h~ 2008-09-27 21:38:42.000000000 +0200 +++ libdlna-0.2.3/src/profiles.h 2008-09-27 21:38:42.000000000 +0200 @@ -22,8 +22,8 @@ #ifndef _PROFILES_H_ #define _PROFILES_H_ -#include <ffmpeg/avcodec.h> -#include <ffmpeg/avformat.h> +#include <ffmpeg/libavcodec/avcodec.h> +#include <ffmpeg/libavformat/avformat.h> #include "dlna_internals.h" #include "containers.h" Index: libdlna.spec =================================================================== RCS file: /cvs/free/rpms/libdlna/devel/libdlna.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libdlna.spec 19 Aug 2008 09:57:47 -0000 1.6 +++ libdlna.spec 27 Sep 2008 19:40:07 -0000 1.7 @@ -1,12 +1,13 @@ Version: 0.2.3 Summary: Open-source implementation of DLNA (Digital Living Network Alliance) standards Name: libdlna -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libdlna.geexbox.org/ Source: http://libdlna.geexbox.org/releases/%{name}-%{version}.tar.bz2 Patch0: libdlna-pkgconfig.patch +Patch1: libdlna-0.2.3-ffmpeg-header-move.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ffmpeg-devel @@ -28,9 +29,10 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/ffmpeg" ./configure --prefix=%{_prefix} --libdir=%{_libdir} --includedir=%{_includedir} --disable-static make @@ -57,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 0.2.3-8 +- Fix build with even newer ffmpeg + * Tue Aug 19 2008 Eric Tanguy <eric.tanguy(a)univ-nantes.fr&gt; - 0.2.3-7 - Fix build with new ffmpeg