From 0ae9f05f60879ca72a68ae27a0b09e40ec0bd664 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 23 May 2017 21:07:58 +0200 Subject: [PATCH] jasper: bump version. --- ...per-2.0.12.recipe => jasper-2.0.13.recipe} | 6 +-- .../jasper/patches/jasper-2.0.12.patchset | 47 ------------------- 2 files changed, 3 insertions(+), 50 deletions(-) rename media-libs/jasper/{jasper-2.0.12.recipe => jasper-2.0.13.recipe} (92%) delete mode 100644 media-libs/jasper/patches/jasper-2.0.12.patchset diff --git a/media-libs/jasper/jasper-2.0.12.recipe b/media-libs/jasper/jasper-2.0.13.recipe similarity index 92% rename from media-libs/jasper/jasper-2.0.12.recipe rename to media-libs/jasper/jasper-2.0.13.recipe index 6049348a9..89f9d7e57 100644 --- a/media-libs/jasper/jasper-2.0.12.recipe +++ b/media-libs/jasper/jasper-2.0.13.recipe @@ -9,9 +9,9 @@ HOMEPAGE="http://www.ece.uvic.ca/~frodo/jasper/" COPYRIGHT="1999-2007 Michael D. Adams" LICENSE="JasPer v2" REVISION="1" -SOURCE_URI="http://www.ece.uvic.ca/~frodo/jasper/software/jasper-$portVersion.tar.gz" -CHECKSUM_SHA256="5b24faf5ed38670d6286e45ab7516b26458d05e7929b435afe569176765f4dda" -PATCHES="jasper-$portVersion.patchset" +SOURCE_URI="https://github.com/mdadams/jasper/archive/version-$portVersion.tar.gz" +CHECKSUM_SHA256="b50413b41bfc82ae419298b41eadcde1aa31f362fb9dc2ac089e5cbc19f60c24" +SOURCE_DIR="jasper-version-$portVersion" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" diff --git a/media-libs/jasper/patches/jasper-2.0.12.patchset b/media-libs/jasper/patches/jasper-2.0.12.patchset deleted file mode 100644 index 5aad48c63..000000000 --- a/media-libs/jasper/patches/jasper-2.0.12.patchset +++ /dev/null @@ -1,47 +0,0 @@ -From 2493e73668f732b954211e3e419cf89c0b6df06d Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 18 May 2017 20:41:06 +0200 -Subject: gcc2 build - - -diff --git a/src/libjasper/base/jas_stream.c b/src/libjasper/base/jas_stream.c -index 327ee57..007b068 100644 ---- a/src/libjasper/base/jas_stream.c -+++ b/src/libjasper/base/jas_stream.c -@@ -1171,11 +1171,11 @@ long jas_stream_length(jas_stream_t *stream) - static int mem_read(jas_stream_obj_t *obj, char *buf, int cnt) - { - ssize_t n; -+ jas_stream_memobj_t *m = (jas_stream_memobj_t *)obj; - assert(cnt >= 0); - assert(buf); - - JAS_DBGLOG(100, ("mem_read(%p, %p, %d)\n", obj, buf, cnt)); -- jas_stream_memobj_t *m = (jas_stream_memobj_t *)obj; - n = m->len_ - m->pos_; - cnt = JAS_MIN(n, cnt); - memcpy(buf, &m->buf_[m->pos_], cnt); -@@ -1294,8 +1294,8 @@ static long mem_seek(jas_stream_obj_t *obj, long offset, int origin) - - static int mem_close(jas_stream_obj_t *obj) - { -- JAS_DBGLOG(100, ("mem_close(%p)\n", obj)); - jas_stream_memobj_t *m = (jas_stream_memobj_t *)obj; -+ JAS_DBGLOG(100, ("mem_close(%p)\n", obj)); - JAS_DBGLOG(100, ("mem_close myalloc=%d\n", m->myalloc_)); - if (m->myalloc_ && m->buf_) { - JAS_DBGLOG(100, ("mem_close freeing buffer %p\n", m->buf_)); -@@ -1337,9 +1337,9 @@ static long file_seek(jas_stream_obj_t *obj, long offset, int origin) - static int file_close(jas_stream_obj_t *obj) - { - jas_stream_fileobj_t *fileobj; -+ int ret; - JAS_DBGLOG(100, ("file_close(%p)\n", obj)); - fileobj = JAS_CAST(jas_stream_fileobj_t *, obj); -- int ret; - ret = close(fileobj->fd); - if (fileobj->flags & JAS_STREAM_FILEOBJ_DELONCLOSE) { - unlink(fileobj->pathname); --- -2.12.2 -