diff -wbBur minidlna-1.0.24/genconfig.sh minidlna-1.0.24.my/genconfig.sh --- minidlna-1.0.24/genconfig.sh 2012-01-21 04:34:13.000000000 +0400 +++ minidlna-1.0.24.my/genconfig.sh 2012-07-09 09:51:09.000000000 +0400 @@ -47,15 +47,15 @@ [ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING" [ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING" [ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING" -[ ! -e "/usr/include/ffmpeg/avutil.h" -a \ +[ ! -e "/usr/include/ffmpeg-compat/avutil.h" -a \ ! -e "/usr/include/libavutil/avutil.h" -a \ - ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" -[ ! -e "/usr/include/ffmpeg/avformat.h" -a \ + ! -e "/usr/include/ffmpeg-compat/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" +[ ! -e "/usr/include/ffmpeg-compat/avformat.h" -a \ ! -e "/usr/include/libavformat/avformat.h" -a \ - ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" -[ ! -e "/usr/include/ffmpeg/avcodec.h" -a \ + ! -e "/usr/include/ffmpeg-compat/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" +[ ! -e "/usr/include/ffmpeg-compat/avcodec.h" -a \ ! -e "/usr/include/libavcodec/avcodec.h" -a \ - ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" + ! -e "/usr/include/ffmpeg-compat/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" if [ -n "$MISSING" ]; then echo -e "\nERROR! Cannot continue." echo -e "The following required libraries are either missing, or are missing development headers:\n" diff -wbBur minidlna-1.0.24/Makefile minidlna-1.0.24.my/Makefile --- minidlna-1.0.24/Makefile 2012-01-18 02:49:01.000000000 +0400 +++ minidlna-1.0.24.my/Makefile 2012-07-09 10:01:10.000000000 +0400 @@ -13,9 +13,9 @@ #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG #CFLAGS = -Wall -g -Os -D_GNU_SOURCE CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ - -I/usr/include/ffmpeg \ - -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \ - -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat + -I/usr/include/ffmpeg-compat \ + -I/usr/include/ffmpeg-compat/libavutil -I/usr/include/ffmpeg-compat/libavcodec -I/usr/include/ffmpeg-compat/libavformat +LDFLAGS+= -L/usr/lib/ffmpeg-compat -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat #STATIC_LINKING: CFLAGS += -DSTATIC #STATIC_LINKING: LDFLAGS = -static CC = gcc @@ -64,7 +64,7 @@ $(INSTALL) -d $(ETCINSTALLDIR) $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR) -minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS) +minidlna: $(BASEOBJS) $(LNXOBJS) @echo Linking $@ @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)