cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update xmedcon to 0.12.0

Browse Source 
- bump SHARED_LIBS
- update WANTLIB and patches
- regen PLIST
- remove PFRAG.shared
This commit is contained in:
benoit 2013-03-14 10:04:25 +00:00
parent 4d14866c02
commit ed5eff20d3
5 changed files with 15 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
graphics/xmedcon/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.25 2013/03/11 11:10:56 espie Exp $
# $OpenBSD: Makefile,v 1.26 2013/03/14 10:04:25 benoit Exp $
COMMENT = medical image conversion
DISTNAME = xmedcon-0.10.7
REVISION = 2
SHARED_LIBS = mdc 2.1 # .2.1
DISTNAME = xmedcon-0.12.0
SHARED_LIBS = mdc 2.2 # .2.1
CATEGORIES = graphics
HOMEPAGE = http://xmedcon.sourceforge.net
@ -14,12 +13,13 @@ MAINTAINER = Benoit Lecocq <benoit@openbsd.org>
# GPLv2 - LGPLv2.1
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes harfbuzz
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 stdc++
WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 ffi
WANTLIB += png pthread-stubs xcb z gthread-2.0 pthread xcb-render
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 GL Xxf86vm drm xcb-shm
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 xcb-shm
WANTLIB += icudata icule icuuc graphite2
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=xmedcon/}

7
graphics/xmedcon/distinfo
View File

@ -1,5 +1,2 @@
MD5 (xmedcon-0.10.7.tar.gz) = F2uCOzFiYe16Rwiid8xl8w==
RMD160 (xmedcon-0.10.7.tar.gz) = pd7vMRkDqPGayCehLByS2h/+66g=
SHA1 (xmedcon-0.10.7.tar.gz) = MWB3eZGnhWj4d1S8dW06aP2aFa4=
SHA256 (xmedcon-0.10.7.tar.gz) = S+d08/bJM0zAsAsxKUAUijbibHheDw0GIXlyObdfezw=
SIZE (xmedcon-0.10.7.tar.gz) = 953464
SHA256 (xmedcon-0.12.0.tar.gz) = iUA433sZ/RscoY05D7ocsdMtNNB+RQNkpZhX1h9EWp8=
SIZE (xmedcon-0.12.0.tar.gz) = 975506

55
graphics/xmedcon/patches/patch-source_m-png_c
View File

@ -1,58 +1,11 @@
$OpenBSD: patch-source_m-png_c,v 1.1 2011/07/08 20:38:01 naddy Exp $
Fix build with png-1.5.
--- source/m-png.c.orig Tue Jul 5 17:14:51 2011
+++ source/m-png.c Tue Jul 5 17:19:24 2011
@@ -65,7 +65,7 @@ static void MdcPngErr(png_structp png_ptr, png_const_c
--- source/m-png.c.orig Tue Dec 27 01:46:06 2011
+++ source/m-png.c Fri Jan 18 09:39:09 2013
@@ -65,7 +65,7 @@
if (!png_ptr) return;
- longjmp(png_ptr->jmpbuf, 1);
- longjmp(png_jmpbuf(png_ptr), 1);
+ png_longjmp(png_ptr, 1);
}
static void MdcPngWarn(png_structp png_ptr, png_const_charp warning_msg)
@@ -95,11 +95,12 @@ char *MdcReadPNG(FILEINFO *fi)
{
png_structp png_ptr;
png_infop info_ptr;
+ png_textp text_ptr;
png_uint_32 width, height, rowbytes;
png_colorp palette;
png_bytepp row_pointers;
Uint32 i, commentsize;
- int bit_depth, color_type, transform, num_palette;
+ int bit_depth, color_type, transform, num_palette, num_text;
Uint8 *imgRGB, *pbuf;
IMG_DATA *id;
@@ -161,21 +162,21 @@ char *MdcReadPNG(FILEINFO *fi)
}
/* get comment */
- if(info_ptr->num_text > 0) {
+ if(png_get_text(png_ptr, info_ptr, &text_ptr, &num_text) > 0) {
commentsize = 1;
- for(i = 0; i < info_ptr->num_text; i++)
- commentsize += strlen(info_ptr->text[i].key) + 1 +
- info_ptr->text[i].text_length + 2;
+ for(i = 0; i < num_text; i++)
+ commentsize += strlen(text_ptr[i].key) + 1 +
+ text_ptr[i].text_length + 2;
if ((fi->comment = malloc(commentsize)) == NULL) {
MdcPngWarn(png_ptr,"PNG Can't malloc comment string");
}else{
fi->comment[0] = '\0';
- for (i = 0; i < info_ptr->num_text; i++) {
- strcat(fi->comment, info_ptr->text[i].key);
+ for (i = 0; i < num_text; i++) {
+ strcat(fi->comment, text_ptr[i].key);
strcat(fi->comment, "::");
- strcat(fi->comment, info_ptr->text[i].text);
+ strcat(fi->comment, text_ptr[i].text);
strcat(fi->comment, "\n");
}
}

2
graphics/xmedcon/pkg/PFRAG.shared
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/26 20:10:50 steven Exp $
@lib lib/libmdc.so.${LIBmdc_VERSION}

4
graphics/xmedcon/pkg/PLIST
View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2009/03/13 17:58:47 jasper Exp $
%%SHARED%%
@comment $OpenBSD: PLIST,v 1.5 2013/03/14 10:04:29 benoit Exp $
@bin bin/medcon
@bin bin/xmedcon
bin/xmedcon-config
@ -41,6 +40,7 @@ include/m-xtract.h
include/medcon.h
lib/libmdc.a
lib/libmdc.la
@lib lib/libmdc.so.${LIBmdc_VERSION}
@man man/man1/medcon.1
@man man/man1/xmedcon-config.1
@man man/man1/xmedcon.1