Merge branch 'stable'

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Conflicts:
	src/lensfun.mk
This commit is contained in:
Timothy Gu 2014-04-19 19:39:08 -07:00
commit 0f2849ed8b
2 changed files with 6 additions and 6 deletions

View File

@ -1475,7 +1475,7 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
</tr>
<tr>
<td class="package">lensfun</td>
<td class="website"><a href="http://lensfun.berlios.de/">lensfun</a></td>
<td class="website"><a href="http://lensfun.sourceforge.net/">lensfun</a></td>
</tr>
<tr>
<td class="package">levmar</td>

View File

@ -7,14 +7,14 @@ $(PKG)_VERSION := 0.2.8
$(PKG)_CHECKSUM := 0e85eb7692620668d27e2303687492ad68c90eb4
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://download.berlios.de/lensfun/$($(PKG)_FILE)
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/lensfun/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc libpng glib libgnurx
define $(PKG)_UPDATE
$(WGET) -q -O- "http://developer.berlios.de/project/showfiles.php?group_id=9034" | \
grep -i 'lensfun.*tar' | \
$(SED) -n 's,.*lensfun-\([0-9][^>]*\)\.tar.*,\1,p' | \
head -1
$(WGET) -q -O- 'http://sourceforge.net/projects/lensfun/files/' | \
$(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
sort -V | \
tail -1
endef
define $(PKG)_BUILD