Author: rathann Update of /cvs/free/rpms/libdlna/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv1273 Modified Files: libdlna-0.2.3-ffmpeg-header-move.patch libdlna.spec Log Message: * Sat Sep 27 2008 Dominik Mierzejewski <rpm(a)greysector.net&gt; 0.2.3-9 - use proper ffmpeg #include convention - use pkg-config to get ffmpeg include and libs paths libdlna-0.2.3-ffmpeg-header-move.patch: Index: libdlna-0.2.3-ffmpeg-header-move.patch =================================================================== RCS file: /cvs/free/rpms/libdlna/devel/libdlna-0.2.3-ffmpeg-header-move.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libdlna-0.2.3-ffmpeg-header-move.patch 27 Sep 2008 19:40:07 -0000 1.1 +++ libdlna-0.2.3-ffmpeg-header-move.patch 27 Sep 2008 20:41:17 -0000 1.2 @@ -1,65 +1,71 @@ -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 +diff -up libdlna-0.2.3/configure.ff libdlna-0.2.3/configure +--- libdlna-0.2.3/configure.ff 2008-09-27 22:29:07.000000000 +0200 ++++ libdlna-0.2.3/configure 2008-09-27 22:29:31.000000000 +0200 +@@ -607,12 +607,15 @@ fi + if [ -n "$ffmpegdir" ]; then + check_cflags -I$ffmpegdir + check_ldflags -L$ffmpegdir ++elif [ ! `pkg-config --exists libavcodec libavformat` ]; then ++ check_cflags `pkg-config --cflags libavcodec libavformat` ++ check_ldflags `pkg-config --libs-only-L libavcodec libavformat` 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 !" ++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 ffmpeg/libavcodec/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 -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 +diff -up libdlna-0.2.3/src/av_mpeg4_part10.c.ff libdlna-0.2.3/src/av_mpeg4_part10.c +--- libdlna-0.2.3/src/av_mpeg4_part10.c.ff 2007-11-26 21:47:43.000000000 +0100 ++++ libdlna-0.2.3/src/av_mpeg4_part10.c 2008-09-27 22:29:07.000000000 +0200 @@ -26,7 +26,7 @@ #include <sys/stat.h> #include <fcntl.h> -#include <ffmpeg/avcodec.h> -+#include <ffmpeg/libavcodec/avcodec.h> ++#include <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 +diff -up libdlna-0.2.3/src/av_mpeg4_part2.c.ff libdlna-0.2.3/src/av_mpeg4_part2.c +--- libdlna-0.2.3/src/av_mpeg4_part2.c.ff 2007-11-26 21:47:43.000000000 +0100 ++++ libdlna-0.2.3/src/av_mpeg4_part2.c 2008-09-27 22:29:07.000000000 +0200 @@ -26,7 +26,7 @@ #include <sys/stat.h> #include <fcntl.h> -#include <ffmpeg/avcodec.h> -+#include <ffmpeg/libavcodec/avcodec.h> ++#include <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 +diff -up libdlna-0.2.3/src/containers.c.ff libdlna-0.2.3/src/containers.c +--- libdlna-0.2.3/src/containers.c.ff 2007-11-26 21:47:43.000000000 +0100 ++++ libdlna-0.2.3/src/containers.c 2008-09-27 22:29:07.000000000 +0200 @@ -4,7 +4,7 @@ #include <sys/stat.h> #include <fcntl.h> -#include <ffmpeg/avformat.h> -+#include <ffmpeg/libavformat/avformat.h> ++#include <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 +diff -up libdlna-0.2.3/src/profiles.h.ff libdlna-0.2.3/src/profiles.h +--- libdlna-0.2.3/src/profiles.h.ff 2007-11-26 21:47:43.000000000 +0100 ++++ libdlna-0.2.3/src/profiles.h 2008-09-27 22:29:07.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 <libavcodec/avcodec.h> ++#include <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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libdlna.spec 27 Sep 2008 19:40:07 -0000 1.7 +++ libdlna.spec 27 Sep 2008 20:41:17 -0000 1.8 @@ -1,7 +1,7 @@ Version: 0.2.3 Summary: Open-source implementation of DLNA (Digital Living Network Alliance) standards Name: libdlna -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libdlna.geexbox.org/ @@ -32,7 +32,7 @@ %patch1 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/ffmpeg" +export CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --libdir=%{_libdir} --includedir=%{_includedir} --disable-static make @@ -59,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Sep 27 2008 Dominik Mierzejewski <rpm(a)greysector.net&gt; 0.2.3-9 +- use proper ffmpeg #include convention +- use pkg-config to get ffmpeg include and libs paths + * 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