minidlna-ffmpeg10.patch

   1 diff -uNrp minidlna-1.0.25/genconfig.sh minidlna-1.0.25-/genconfig.sh
   2 --- minidlna-1.0.25/genconfig.sh        2012-01-20 16:34:13.000000000 -0800
   3 +++ minidlna-1.0.25-/genconfig.sh       2012-11-04 22:52:44.317032470 -0800
   4 @@ -161,6 +161,47 @@ echo "#define OS_VERSION           \"$OS_NAME/$OS
   5  echo "#define OS_URL                   \"${OS_URL}\"" >> ${CONFIGFILE}
   6  echo "" >> ${CONFIGFILE}
   7
   8 +if [ -e "/usr/include/libavutil/avutil.h" ]; then
   9 +       echo "#define HAVE_LIBAVUTIL_AVUTIL_H 1" >> ${CONFIGFILE}
  10 +elif [ -e "/usr/include/ffmpeg/avutil.h" ]; then
  11 +       echo "#define HAVE_FFMPEG_AVUTIL_H 1" >> ${CONFIGFILE}
  12 +elif [ -e "/usr/include/ffmpeg/libavutil/avutil.h" ]; then
  13 +       echo "#define HAVE_FFMPEG_LIBAVUTIL_AVUTIL_H 1" >> ${CONFIGFILE}
  14 +elif [ -e "/usr/include/libav/libavutil/avutil.h" ]; then
  15 +       echo "#define HAVE_LIBAV_LIBAVUTIL_AVUTIL_H 1" >> ${CONFIGFILE}
  16 +elif [ -e "/usr/include/libav/avutil.h" ]; then
  17 +       echo "#define HAVE_LIBAV_AVUTIL_H 1" >> ${CONFIGFILE}
  18 +elif [ -e "/usr/include/avutil.h" ]; then
  19 +       echo "#define HAVE_AVUTIL_H 1" >> ${CONFIGFILE}
  20 +fi
  21 +if [ -e "/usr/include/libavformat/avformat.h" ]; then
  22 +       echo "#define HAVE_LIBAVFORMAT_AVFORMAT_H 1" >> ${CONFIGFILE}
  23 +elif [ -e "/usr/include/ffmpeg/avformat.h" ]; then
  24 +       echo "#define HAVE_FFMPEG_AVFORMAT_H 1" >> ${CONFIGFILE}
  25 +elif [ -e "/usr/include/ffmpeg/libavformat/avformat.h" ]; then
  26 +       echo "#define HAVE_FFMPEG_LIBAVFORMAT_AVFORMAT_H 1" >> ${CONFIGFILE}
  27 +elif [ -e "/usr/include/libav/libavformat/avformat.h" ]; then
  28 +       echo "#define HAVE_LIBAV_LIBAVFORMAT_AVFORMAT_H 1" >> ${CONFIGFILE}
  29 +elif [ -e "/usr/include/libav/avformat.h" ]; then
  30 +       echo "#define HAVE_LIBAV_AVFORMAT_H 1" >> ${CONFIGFILE}
  31 +elif [ -e "/usr/include/avformat.h" ]; then
  32 +       echo "#define HAVE_AVFORMAT_H 1" >> ${CONFIGFILE}
  33 +fi
  34 +if [ -e "/usr/include/libavcodec/avcodec.h" ]; then
  35 +       echo "#define HAVE_LIBAVCODEC_AVCODEC_H 1" >> ${CONFIGFILE}
  36 +elif [ -e "/usr/include/ffmpeg/avcodec.h" ]; then
  37 +       echo "#define HAVE_FFMPEG_AVCODEC_H 1" >> ${CONFIGFILE}
  38 +elif [ -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ]; then
  39 +       echo "#define HAVE_FFMPEG_LIBAVCODEC_AVCODEC_H 1" >> ${CONFIGFILE}
  40 +elif [ -e "/usr/include/libav/libavcodec/avcodec" ]; then
  41 +       echo "#define HAVE_LIBAV_LIBAVCODEC_AVCODEC_H 1" >> ${CONFIGFILE}
  42 +elif [ -e "/usr/include/libav/avcodec.h" ]; then
  43 +       echo "#define HAVE_LIBAV_AVCODEC_H 1" >> ${CONFIGFILE}
  44 +elif [ -e "/usr/include/avcodec.h" ]; then
  45 +       echo "#define HAVE_AVCODEC_H 1" >> ${CONFIGFILE}
  46 +fi
  47 +echo >> ${CONFIGFILE}
  48 +
  49  echo "/* full path of the file database */" >> ${CONFIGFILE}
  50  echo "#define DEFAULT_DB_PATH          \"${DB_PATH}\"" >> ${CONFIGFILE}
  51  echo "" >> ${CONFIGFILE}
  52 diff -uNrp minidlna-1.0.25/libav.h minidlna-1.0.25-/libav.h
  53 --- minidlna-1.0.25/libav.h     1969-12-31 16:00:00.000000000 -0800
  54 +++ minidlna-1.0.25-/libav.h    2012-11-04 22:46:41.785045064 -0800
  55 @@ -0,0 +1,41 @@
  56 +#if HAVE_FFMPEG_LIBAVUTIL_AVUTIL_H
  57 +#include <ffmpeg/libavutil/avutil.h>
  58 +#elif HAVE_LIBAV_LIBAVUTIL_AVUTIL_H
  59 +#include <libav/libavutil/avutil.h>
  60 +#elif HAVE_LIBAVUTIL_AVUTIL_H
  61 +#include <libavutil/avutil.h>
  62 +#elif HAVE_FFMPEG_AVUTIL_H
  63 +#include <ffmpeg/avutil.h>
  64 +#elif HAVE_LIBAV_AVUTIL_H
  65 +#include <libav/avutil.h>
  66 +#elif HAVE_AVUTIL_H
  67 +#include <avutil.h>
  68 +#endif
  69 +
  70 +#if HAVE_FFMPEG_LIBAVCODEC_AVCODEC_H
  71 +#include <ffmpeg/libavcodec/avcodec.h>
  72 +#elif HAVE_LIBAV_LIBAVCODEC_AVCODEC_H
  73 +#include <libav/libavcodec/avcodec.h>
  74 +#elif HAVE_LIBAVCODEC_AVCODEC_H
  75 +#include <libavcodec/avcodec.h>
  76 +#elif HAVE_FFMPEG_AVCODEC_H
  77 +#include <ffmpeg/avcodec.h>
  78 +#elif HAVE_LIBAV_AVCODEC_H
  79 +#include <libav/avcodec.h>
  80 +#elif HAVE_AVCODEC_H
  81 +#include <avcodec.h>
  82 +#endif
  83 +
  84 +#if HAVE_FFMPEG_LIBAVFORMAT_AVFORMAT_H
  85 +#include <ffmpeg/libavformat/avformat.h>
  86 +#elif HAVE_LIBAV_LIBAVFORMAT_AVFORMAT_H
  87 +#include <libav/libavformat/avformat.h>
  88 +#elif HAVE_LIBAVFORMAT_AVFORMAT_H
  89 +#include <libavformat/avformat.h>
  90 +#elif HAVE_FFMPEG_AVFORMAT_H
  91 +#include <ffmpeg/avformat.h>
  92 +#elif HAVE_LIBAV_LIBAVFORMAT_H
  93 +#include <libav/avformat.h>
  94 +#elif HAVE_AVFORMAT_H
  95 +#include <avformat.h>
  96 +#endif
  97 diff -uNrp minidlna-1.0.25/Makefile minidlna-1.0.25-/Makefile
  98 --- minidlna-1.0.25/Makefile    2012-01-17 14:49:01.000000000 -0800
  99 +++ minidlna-1.0.25-/Makefile   2012-11-04 22:42:27.685054133 -0800
 100 @@ -12,10 +12,7 @@
 101  #
 102  #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
 103  #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
 104 -CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
 105 -        -I/usr/include/ffmpeg \
 106 -        -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
 107 -        -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
 108 +CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
 109  #STATIC_LINKING: CFLAGS += -DSTATIC
 110  #STATIC_LINKING: LDFLAGS = -static
 111  CC = gcc
 112 @@ -129,7 +126,5 @@ log.o: log.h
 113
 114  .c.o:
 115         @echo Compiling $*.c
 116 -       @$(CC) $(CFLAGS) -o $@ -c $< && exit 0;\
 117 -               echo "The following command failed:" 1>&2;\
 118 -               echo "$(CC) $(CFLAGS) -o $@ -c $<";\
 119 -               $(CC) $(CFLAGS) -o $@ -c $< &>/dev/null
 120 +       @$(CC) $(CFLAGS) -o $@ -c $< && exit 0; \
 121 +               echo "The following command failed:  $(CC) $(CFLAGS) -o $@ -c $<" && false
 122 diff -uNrp minidlna-1.0.25/metadata.c minidlna-1.0.25-/metadata.c
 123 --- minidlna-1.0.25/metadata.c  2012-06-29 14:11:29.000000000 -0700
 124 +++ minidlna-1.0.25-/metadata.c 2012-11-04 22:45:44.621047405 -0800
 125 @@ -15,6 +15,7 @@
 126   * You should have received a copy of the GNU General Public License
 127   * along with MiniDLNA. If not, see <http://www.gnu.org/licenses/>.
 128   */
 129 +#include "config.h"
 130  #include <stdio.h>
 131  #include <ctype.h>
 132  #include <string.h>
 133 @@ -30,9 +31,7 @@
 134  #include "image_utils.h"
 135  #include <jpeglib.h>
 136  #include <setjmp.h>
 137 -#include <avutil.h>
 138 -#include <avcodec.h>
 139 -#include <avformat.h>
 140 +#include "libav.h"
 141  #include "tagutils/tagutils.h"
 142
 143  #include "upnpglobalvars.h"
 144 diff -uNrp minidlna-1.0.25/tagutils/tagutils-plist.c minidlna-1.0.25-/tagutils/tagutils-plist.c
 145 --- minidlna-1.0.25/tagutils/tagutils-plist.c   2012-01-17 14:54:47.000000000 -0800
 146 +++ minidlna-1.0.25-/tagutils/tagutils-plist.c  2012-11-04 22:53:11.081032268 -0800
 147 @@ -27,7 +27,7 @@
 148  #include "misc.h"
 149  #include "tagutils.h"
 150  #include "textutils.h"
 151 -#include "log.h"
 152 +#include "../log.h"
 153
 154
 155  #define MAX_BUF 4096