diff options
author | 2013-02-11 18:57:08 +0000 | |
---|---|---|
committer | 2013-02-16 05:54:59 +0100 | |
commit | cf56567570967dfc8730aec031a94e1e8668e2fe (patch) | |
tree | ad9fc445456e5f889a1a417c4d59027bb9deeb3b | |
parent | 0a5944c7521d929acc4fcf8d655dd77ff8ccf91c (diff) | |
download | meta-openembedded-contrib-cf56567570967dfc8730aec031a94e1e8668e2fe.tar.gz |
minidlna: Integrated version 1.0.25
Add two patches to fix build.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
3 files changed, 108 insertions, 0 deletions
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/fix-makefile.patch b/meta-oe/recipes-multimedia/minidlna/minidlna/fix-makefile.patch new file mode 100644 index 0000000000..96429fd6cc --- /dev/null +++ b/meta-oe/recipes-multimedia/minidlna/minidlna/fix-makefile.patch @@ -0,0 +1,41 @@ +Fix Makefile: +* don't overwrite CFLAGS but append to it +* use gcc as CC only if CC is not already defined +* use -I= to include paths +* fix compile of minidlna binary by removing ${LIBS} dependency + +Upstream-status: Pending +Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> + +Index: minidlna-1.0.25/Makefile +=================================================================== +--- minidlna-1.0.25.orig/Makefile 2012-01-18 00:49:01.000000000 +0200 ++++ minidlna-1.0.25/Makefile 2013-02-10 17:46:49.000000000 +0200 +@@ -12,13 +12,13 @@ + # + #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 ++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 + #STATIC_LINKING: CFLAGS += -DSTATIC + #STATIC_LINKING: LDFLAGS = -static +-CC = gcc ++CC ?= gcc + RM = rm -f + INSTALL = install + +@@ -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) + diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/search-for-headers-in-staging-dir.patch b/meta-oe/recipes-multimedia/minidlna/minidlna/search-for-headers-in-staging-dir.patch new file mode 100644 index 0000000000..573d88c812 --- /dev/null +++ b/meta-oe/recipes-multimedia/minidlna/minidlna/search-for-headers-in-staging-dir.patch @@ -0,0 +1,48 @@ +Search for headers in STAGING_DIR_GOST. + +Upstream-status: Pending +Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> + +Index: minidlna-1.0.25/genconfig.sh +=================================================================== +--- minidlna-1.0.25.orig/genconfig.sh 2012-01-21 02:34:13.000000000 +0200 ++++ minidlna-1.0.25/genconfig.sh 2013-02-10 17:12:06.000000000 +0200 +@@ -40,22 +40,22 @@ + + # Detect if there are missing headers + # NOTE: This check only works with a normal distro +-[ ! -e "/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING" +-[ ! -e "/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING" +-[ ! -e "/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING" +-[ ! -e "/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING" +-[ ! -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/libavutil/avutil.h" -a \ +- ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" +-[ ! -e "/usr/include/ffmpeg/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/libavcodec/avcodec.h" -a \ +- ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" ++[ ! -e "$STAGING_DIR_HOST/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING" ++[ ! -e "$STAGING_DIR_HOST/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING" ++[ ! -e "$STAGING_DIR_HOST/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING" ++[ ! -e "$STAGING_DIR_HOST/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING" ++[ ! -e "$STAGING_DIR_HOST/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING" ++[ ! -e "$STAGING_DIR_HOST/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING" ++[ ! -e "$STAGING_DIR_HOST/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING" ++[ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/avutil.h" -a \ ++ ! -e "$STAGING_DIR_HOST/usr/include/libavutil/avutil.h" -a \ ++ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" ++[ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/avformat.h" -a \ ++ ! -e "$STAGING_DIR_HOST/usr/include/libavformat/avformat.h" -a \ ++ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" ++[ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/avcodec.h" -a \ ++ ! -e "$STAGING_DIR_HOST/usr/include/libavcodec/avcodec.h" -a \ ++ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/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 --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.0.25.bb b/meta-oe/recipes-multimedia/minidlna/minidlna_1.0.25.bb new file mode 100644 index 0000000000..4c17737423 --- /dev/null +++ b/meta-oe/recipes-multimedia/minidlna/minidlna_1.0.25.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \ +being fully compliant with DLNA/UPnP-AV clients." +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENCE;md5=b1a795ac1a06805cf8fd74920bc46b5c" + +DEPENDS = "flac libav jpeg sqlite3 libexif libogg libid3tag" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}_${PV}_src.tar.gz \ + file://search-for-headers-in-staging-dir.patch \ + file://fix-makefile.patch \ + " + +SRC_URI[md5sum] = "d966256baf2f9b068b9de871ab5dade5" +SRC_URI[sha256sum] = "170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851" + +export STAGING_DIR_HOST + +inherit autotools + |