1 diff -ruN libdlna-0.2.3.orig/configure libdlna-0.2.3/configure
2 --- libdlna-0.2.3.orig/configure 2007-11-26 21:47:43.000000000 +0100
3 +++ libdlna-0.2.3/configure 2008-04-19 21:59:15.000000000 +0200
5 check_cmd $cc $LDFLAGS "$@" -o $TMPE $TMPO $extralibs
9 + log check_host_cc "$@"
12 + check_cmd $host_cc $host_cflags "$@" -c -o $TMPO $TMPC
16 + log check_host_ld "$@"
17 + check_host_cc || return
18 + check_cmd $host_cc $host_cflags $host_ldflags "$@" -o $TMPE $TMPO
22 check_ld "$@" && { enabled cross_compile || $TMPE >>$logfile 2>&1; }
34 [ -n "$MAKE" ] && make="$MAKE"
36 +[ -n "$HOST_CC" ] && host_cc="$HOST_CC"
37 +[ -n "$HOST_CFLAGS" ] && host_cflags="$HOST_CFLAGS"
38 +[ -n "$HOST_LDFLAGS" ] && host_ldflags="$HOST_LDFLAGS"
39 +host_cflags="-Isrc $host_cflags"
41 #################################################
43 #################################################
47 echolog "Checking for libavformat ..."
48 -check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
49 +check_lib libavformat/avformat.h av_register_all -lavformat -lavcodec -lavutil || die "Error, can't find libavformat !"
50 echolog "Checking for libavcodec ..."
51 -check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
52 +check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
54 #################################################
56 #################################################
70 #################################################
71 diff -ruN libdlna-0.2.3.orig/src/av_mpeg4_part10.c libdlna-0.2.3/src/av_mpeg4_part10.c
72 --- libdlna-0.2.3.orig/src/av_mpeg4_part10.c 2007-11-26 21:47:43.000000000 +0100
73 +++ libdlna-0.2.3/src/av_mpeg4_part10.c 2008-04-19 21:48:45.000000000 +0200
78 -#include <ffmpeg/avcodec.h>
79 +#include <libavcodec/avcodec.h>
81 #include "dlna_internals.h"
83 diff -ruN libdlna-0.2.3.orig/src/av_mpeg4_part2.c libdlna-0.2.3/src/av_mpeg4_part2.c
84 --- libdlna-0.2.3.orig/src/av_mpeg4_part2.c 2007-11-26 21:47:43.000000000 +0100
85 +++ libdlna-0.2.3/src/av_mpeg4_part2.c 2008-04-19 21:48:45.000000000 +0200
90 -#include <ffmpeg/avcodec.h>
91 +#include <libavcodec/avcodec.h>
93 #include "dlna_internals.h"
95 diff -ruN libdlna-0.2.3.orig/src/containers.c libdlna-0.2.3/src/containers.c
96 --- libdlna-0.2.3.orig/src/containers.c 2007-11-26 21:47:43.000000000 +0100
97 +++ libdlna-0.2.3/src/containers.c 2008-04-19 21:48:45.000000000 +0200
102 -#include <ffmpeg/avformat.h>
103 +#include <libavformat/avformat.h>
105 #include "containers.h"
106 #include "profiles.h"
107 diff -ruN libdlna-0.2.3.orig/src/profiles.h libdlna-0.2.3/src/profiles.h
108 --- libdlna-0.2.3.orig/src/profiles.h 2007-11-26 21:47:43.000000000 +0100
109 +++ libdlna-0.2.3/src/profiles.h 2008-04-19 21:48:45.000000000 +0200
114 -#include <ffmpeg/avcodec.h>
115 -#include <ffmpeg/avformat.h>
116 +#include <libavcodec/avcodec.h>
117 +#include <libavformat/avformat.h>
119 #include "dlna_internals.h"
120 #include "containers.h"