From: Vasilis Tsiligiannis Date: Thu, 7 Apr 2011 23:23:32 +0000 (+0000) Subject: [packages] minidlna: Version bump Minidlna 1.0.19 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=a8305899c69169690b265d9d63f9addfb3f68a04 [packages] minidlna: Version bump Minidlna 1.0.19 Version bump minidlna to 1.0.19. I didn't find an official changelog. Reading a diff looks like a change in license from GPL v2 or later to strict GPL v2, as well as bug fixes and translation updates. It's streaming as expected. Two patches were rebased. Signed-off-by: Ian Leonard SVN-Revision: 26526 --- diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile index e28f431d6a..124ee21d34 100644 --- a/multimedia/minidlna/Makefile +++ b/multimedia/minidlna/Makefile @@ -8,13 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=minidlna -PKG_VERSION:=1.0.18 -PKG_RELEASE:=2 +PKG_VERSION:=1.0.19 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz PKG_SOURCE_URL:=@SF/minidlna -PKG_MD5SUM:=8681b100242f0a2fef93cab7cdef061e -PKG_BUILD_DIR:=$(BUILD_DIR)/minidlna +PKG_MD5SUM:=8bb5f2c0abc009e16039d7deecf09cf6 PKG_BUILD_PARALLEL:=0 diff --git a/multimedia/minidlna/patches/001-genconfig-checks.patch b/multimedia/minidlna/patches/001-genconfig-checks.patch index 58233eaca8..e69de29bb2 100644 --- a/multimedia/minidlna/patches/001-genconfig-checks.patch +++ b/multimedia/minidlna/patches/001-genconfig-checks.patch @@ -1,41 +0,0 @@ ---- a/genconfig.sh -+++ b/genconfig.sh -@@ -24,22 +24,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/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING" -+[ ! -e "$STAGING_DIR/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING" -+[ ! -e "$STAGING_DIR/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING" -+[ ! -e "$STAGING_DIR/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING" -+[ ! -e "$STAGING_DIR/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING" -+[ ! -e "$STAGING_DIR/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING" -+[ ! -e "$STAGING_DIR/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING" -+[ ! -e "$STAGING_DIR/usr/include/ffmpeg/avutil.h" -a \ -+ ! -e "$STAGING_DIR/usr/include/libavutil/avutil.h" -a \ -+ ! -e "$STAGING_DIR/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" -+[ ! -e "$STAGING_DIR/usr/include/ffmpeg/avformat.h" -a \ -+ ! -e "$STAGING_DIR/usr/include/libavformat/avformat.h" -a \ -+ ! -e "$STAGING_DIR/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" -+[ ! -e "$STAGING_DIR/usr/include/ffmpeg/avcodec.h" -a \ -+ ! -e "$STAGING_DIR/usr/include/libavcodec/avcodec.h" -a \ -+ ! -e "$STAGING_DIR/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/multimedia/minidlna/patches/002-makefile-tweaks.patch b/multimedia/minidlna/patches/002-makefile-tweaks.patch index f357c2d43b..e69de29bb2 100644 --- a/multimedia/minidlna/patches/002-makefile-tweaks.patch +++ b/multimedia/minidlna/patches/002-makefile-tweaks.patch @@ -1,45 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -13,9 +13,21 @@ - #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$(STAGING_DIR)/usr/include \ -+ -I$(STAGING_DIR)/usr/include/FLAC \ -+ -I$(STAGING_DIR)/usr/include/libavcodec \ -+ -I$(STAGING_DIR)/usr/include/libavformat \ -+ -I$(STAGING_DIR)/usr/include/libavutil \ -+ -I$(STAGING_DIR)/usr/include/libexif \ -+ -I$(STAGING_DIR)/usr/include/uuid \ -+ -I$(STAGING_DIR)/usr/include/vorbis \ -+ -I$(ICONV_PREFIX)/include \ -+ -I$(INTL_PREFIX)/include -+LDFLAGS = -L$(STAGING_DIR)/usr/lib \ -+ -L$(ICONV_PREFIX)/lib \ -+ -L$(INTL_PREFIX)/lib \ -+ -Wl,-rpath=$(STAGING_DIR)/usr/lib \ -+ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - #STATIC_LINKING: LDFLAGS = -static - CC = gcc - RM = rm -f -@@ -36,7 +48,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdes - - ALLOBJS = $(BASEOBJS) $(LNXOBJS) - --LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lid3tag -lFLAC -lvorbis -+LIBS = -liconv -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lid3tag -lFLAC -lvorbis -luuid - #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg -lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm - - TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o -@@ -58,7 +70,7 @@ install: minidlna - $(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/multimedia/minidlna/patches/010-genconfig-checks.patch b/multimedia/minidlna/patches/010-genconfig-checks.patch new file mode 100644 index 0000000000..b3dd305566 --- /dev/null +++ b/multimedia/minidlna/patches/010-genconfig-checks.patch @@ -0,0 +1,41 @@ +--- a/genconfig.sh ++++ b/genconfig.sh +@@ -41,22 +41,22 @@ ${RM} ${CONFIGFILE} + + # 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}/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/ffmpeg/avutil.h" -a \ ++ ! -e "${STAGING_DIR}/usr/include/libavutil/avutil.h" -a \ ++ ! -e "${STAGING_DIR}/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/ffmpeg/avformat.h" -a \ ++ ! -e "${STAGING_DIR}/usr/include/libavformat/avformat.h" -a \ ++ ! -e "${STAGING_DIR}/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/ffmpeg/avcodec.h" -a \ ++ ! -e "${STAGING_DIR}/usr/include/libavcodec/avcodec.h" -a \ ++ ! -e "${STAGING_DIR}/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/multimedia/minidlna/patches/020-makefile-tweaks.patch b/multimedia/minidlna/patches/020-makefile-tweaks.patch new file mode 100644 index 0000000000..18d901cf79 --- /dev/null +++ b/multimedia/minidlna/patches/020-makefile-tweaks.patch @@ -0,0 +1,46 @@ +--- a/Makefile ++++ b/Makefile +@@ -13,9 +13,22 @@ + #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$(STAGING_DIR)/usr/include \ ++ -I$(STAGING_DIR)/usr/include/FLAC \ ++ -I$(STAGING_DIR)/usr/include/libavcodec \ ++ -I$(STAGING_DIR)/usr/include/libavformat \ ++ -I$(STAGING_DIR)/usr/include/libavutil \ ++ -I$(STAGING_DIR)/usr/include/libexif \ ++ -I$(STAGING_DIR)/usr/include/uuid \ ++ -I$(STAGING_DIR)/usr/include/vorbis \ ++ -I$(ICONV_PREFIX)/include \ ++ -I$(INTL_PREFIX)/include ++LDFLAGS = -L$(STAGING_DIR)/usr/lib \ ++ -L$(ICONV_PREFIX)/lib \ ++ -L$(INTL_PREFIX)/include \ ++ -Wl,-rpath=$(STAGING_DIR)/usr/lib \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ + #STATIC_LINKING: CFLAGS += -DSTATIC + #STATIC_LINKING: LDFLAGS = -static + CC = gcc +@@ -37,7 +50,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdes + + ALLOBJS = $(BASEOBJS) $(LNXOBJS) + +-LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis ++LIBS = -liconv -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis -luuid + #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg -lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm + + TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o +@@ -62,7 +75,7 @@ install: minidlna + $(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) +