minidlna: fix build failure
authorGustavo Zacarias <gustavo@zacarias.com.ar>
Tue, 8 Oct 2013 02:18:20 +0000 (23:18 -0300)
committerPeter Korsgaard <peter@korsgaard.com>
Tue, 8 Oct 2013 15:05:12 +0000 (17:05 +0200)
With the 1.0.26 version bump a new routine was added to find newer
versions of ffmpeg and/or libav on different include paths.
Unfortunately this uses absolute pathnames hence when there's no
matching ffmpeg/libav headers on the host it fails to build. Fixes:
http://autobuild.buildroot.net/results/20a/20a1b3a9f040d2207b6c533a158e9747054ddd2d/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/minidlna/minidlna.mk

index 4df6ff01925478c9cb9281df67bbcde81f0d718e..c99ade28e244d95d3d6e239bba3dc45d354b3a12 100644 (file)
@@ -35,10 +35,15 @@ endif
 
 MINIDLNA_MAKE_OPTS += LIBS='$(MINIDLNA_COMMON_LIBS)'
 
+# genconfig.sh uses absolute paths to find libav, so help it out
 define MINIDLNA_BUILD_CMDS
        PREFIX=$(STAGING_DIR)/usr \
                $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(MINIDLNA_CFLAGS)" -C $(@D) depend
+       $(SED) '/HAVE_LIBAV/d' $(@D)/config.h
+       echo "#define HAVE_LIBAVUTIL_AVUTIL_H 1" >>$(@D)/config.h
+       echo "#define HAVE_LIBAVFORMAT_AVFORMAT_H 1" >>$(@D)/config.h
+       echo "#define HAVE_LIBAVCODEC_AVCODEC_H 1" >>$(@D)/config.h
        $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(MINIDLNA_CFLAGS)" $(MINIDLNA_MAKE_OPTS) -C $(@D) all
 endef