diff options
| author | W. Michael Petullo <mike@flyn.org> | 2014-08-05 17:47:34 -0400 |
|---|---|---|
| committer | W. Michael Petullo <mike@flyn.org> | 2014-08-05 17:47:34 -0400 |
| commit | 6c9015eb5dd61740dd3c4bd09ed9ef5ba8fcfd3a (patch) | |
| tree | 466b9259ed72dc1f197fe0c5e0ceff38b684cd63 /multimedia | |
| parent | 26ef97123cca2441eb7f483a746b5ada226ac630 (diff) | |
| parent | f2b27cdef25ec82ff70188ed9e8c542b7e44bc87 (diff) | |
Merge remote-tracking branch 'openwrt/master' into gstreamer1
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/minidlna/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/minidlna/patches/030-upnphttp-fixPhilips.patch | 12 | ||||
| -rw-r--r-- | multimedia/mjpg-streamer/Makefile | 2 |
3 files changed, 17 insertions, 1 deletions
diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile index 3812af485..a4ab71d54 100644 --- a/multimedia/minidlna/Makefile +++ b/multimedia/minidlna/Makefile @@ -14,7 +14,11 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/minidlna PKG_MD5SUM:=879027192c89e5376cdd2ae2d1aa33b4 + PKG_MAINTAINER:=Knyazkov Dmitry <medavedik@gmail.com> + +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILE:=COPYING PKG_BUILD_PARALLEL:=0 PKG_BUILD_DEPENDS:=util-linux diff --git a/multimedia/minidlna/patches/030-upnphttp-fixPhilips.patch b/multimedia/minidlna/patches/030-upnphttp-fixPhilips.patch new file mode 100644 index 000000000..8829bdc64 --- /dev/null +++ b/multimedia/minidlna/patches/030-upnphttp-fixPhilips.patch @@ -0,0 +1,12 @@ +--- a/upnphttp.c ++++ b/upnphttp.c +@@ -1259,7 +1259,7 @@ + int try_sendfile = 1; + #endif + +- while( offset < end_offset ) ++ while( offset <= end_offset ) + { + #if HAVE_SENDFILE + if( try_sendfile ) + diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile index 36d1786e8..925d82fe4 100644 --- a/multimedia/mjpg-streamer/Makefile +++ b/multimedia/mjpg-streamer/Makefile @@ -13,7 +13,7 @@ PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com> -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).1.tar.bz2 PKG_SOURCE_URL:=https://svn.code.sf.net/p/mjpg-streamer/code/mjpg-streamer-experimental PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_REV) |