Attachment #38958 for bug #61524

View | Details | Raw Unified | Return to bug 61524
Collapse All | Expand All




#

PORTNAME=	sdl_image
PORTVERSION=	1.2.3
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	http://www.libsdl.org/projects/SDL_image/release/
DISTNAME=	SDL_image-${PORTVERSION}

		tiff.4:${PORTSDIR}/graphics/tiff

USE_SDL=	yes
USE_REINPLACE=	yes
USE_GMAKE=	yes
USE_LIBTOOL=	yes
LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm"
CONFIGURE_ARGS=	--enable-tif --enable-xcf
MAKE_ARGS=	LT_CURRENT=10 LT_REVISION=0 LT_AGE=0
INSTALLS_SHLIB=	yes

post-install:
	${INSTALL_PROGRAM} ${WRKSRC}/.libs/showimage ${PREFIX}/bin
		's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
			${WRKSRC}/libtool

.include <bsd.port.mk>

Line 1 Link Here

(-)graphics/sdl_image/distinfo (-1 / +1 lines)
1	MD5 (SDL_image-1.2.2.tar.gz) = d07cb8f3f0e8bbb645ef8369d96eb7db	1	MD5 (SDL_image-1.2.3.tar.gz) = d55826ffbd2bdc48b09cc64a9ed9e59e

Lines 1-11 Link Here

(-)graphics/sdl_image/files/patch-ac (-11 lines)
1	--- configure 2000/12/11 14:34:53 1.1
2	+++ configure 2000/12/11 14:35:05
3	@@ -581,7 +581,7 @@
4
5	# libtool versioning
6	LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION
7	-LT_CURRENT=`expr $MICRO_VERSION - $INTERFACE_AGE`
8	+LT_CURRENT=10
9	LT_REVISION=$INTERFACE_AGE
10	LT_AGE=`expr $BINARY_AGE - $INTERFACE_AGE`
11




--- IMG_xcf.c.orig	Mon Apr 29 03:01:48 2002
+++ IMG_xcf.c	Mon Apr 29 03:17:07 2002
@@ -166,6 +166,7 @@
 
   Uint32 offset_x;
   Uint32 offset_y;
+  int visible : 1;
 } xcf_layer;
 
 typedef struct {
@@ -179,6 +180,7 @@
   Uint32 color;
   Uint32 opacity;
   int selection : 1;
+  int visible : 1;
 } xcf_channel;
 
 typedef struct {
@@ -245,7 +247,9 @@
   prop->id = SDL_ReadBE32 (src);
   prop->length = SDL_ReadBE32 (src);
 
+#if 0
   printf ("%.8X: %s: %d\n", SDL_RWtell (src), prop->id < 25 ? prop_names [prop->id] : "unknown", prop->length);
+#endif
 
   switch (prop->id) {
   case PROP_COLORMAP:
@@ -265,6 +269,9 @@
   case PROP_COLOR:
     SDL_RWread (src, &prop->data, prop->length, 1);
     break;
+  case PROP_VISIBLE:
+    prop->data.visible = SDL_ReadBE32 (src);
+    break;
   default:
     //    SDL_RWread (src, &prop->data, prop->length, 1);
     SDL_RWseek (src, prop->length, SEEK_CUR);
@@ -332,6 +339,8 @@
     if (prop.id == PROP_OFFSETS) {
       l->offset_x = prop.data.offset.x;
       l->offset_y = prop.data.offset.y;
+    } else if (prop.id == PROP_VISIBLE) {
+      l->visible = prop.data.visible ? 1 : 0;
     }
   } while (prop.id != PROP_END);
 
@@ -371,6 +380,9 @@
     case PROP_SELECTION:
       l->selection = 1;
       break;
+    case PROP_VISIBLE:
+      l->visible = prop.data.visible ? 1 : 0;
+      break;
     default:
     }
   } while (prop.id != PROP_END);
@@ -724,9 +736,10 @@
     rd.y = layer->offset_y;
     rd.w = layer->width;
     rd.h = layer->height;
-    free_xcf_layer (layer);
 
-    SDL_BlitSurface (lays, &rs, surface, &rd);
+    if (layer->visible)
+      SDL_BlitSurface (lays, &rs, surface, &rd);
+    free_xcf_layer (layer);
   }
 
   SDL_FreeSurface (lays);
@@ -756,7 +769,7 @@
     }
     for (i = 0; i < chnls; i++) {
       //      printf ("CNLBLT %i\n", i);
-      if (!channel [i]->selection) {
+      if (!channel [i]->selection && channel [i]->visible) {
 	create_channel_surface (chs, head->image_type, channel [i]->color, channel [i]->opacity);
 	SDL_BlitSurface (chs, NULL, surface, NULL);
       }

Return to bug 61524

Lines 6-13 Link Here

(-)graphics/sdl_image/Makefile (-7 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= sdl_image	8	PORTNAME= sdl_image
9	PORTVERSION= 1.2.2	9	PORTVERSION= 1.2.3
10	PORTREVISION= 1
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/	11	MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/
13	DISTNAME= SDL_image-${PORTVERSION}	12	DISTNAME= SDL_image-${PORTVERSION}
Lines 20-37 Link Here
20	tiff.4:${PORTSDIR}/graphics/tiff	19	tiff.4:${PORTSDIR}/graphics/tiff
21		20
22	USE_SDL= yes	21	USE_SDL= yes
23	USE_REINPLACE= yes
24	USE_GMAKE= yes	22	USE_GMAKE= yes
25	USE_LIBTOOL= yes	23	USE_LIBTOOL= yes
26	LIBTOOLFLAGS= --disable-ltlibs --release-ignore	24	LIBTOOLFLAGS= --disable-ltlibs --release-ignore
27	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \	25	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
28	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm"	26	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm"
29	CONFIGURE_ARGS= --enable-tif --enable-xcf	27	CONFIGURE_ARGS= --enable-tif --enable-xcf
		28	MAKE_ARGS= LT_CURRENT=10 LT_REVISION=0 LT_AGE=0
30	INSTALLS_SHLIB= yes	29	INSTALLS_SHLIB= yes
31		30
32	post-configure:	31	post-install:
33	@${REINPLACE_CMD} -e \	32	${INSTALL_PROGRAM} ${WRKSRC}/.libs/showimage ${PREFIX}/bin
34	's\|^deplibs_check_method=.*\|deplibs_check_method=pass_all\|' \
35	${WRKSRC}/libtool
36		33
37	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Lines 1-79 Link Here

(-)graphics/sdl_image/files/patch-ad (-79 lines)
1	--- IMG_xcf.c.orig Mon Apr 29 03:01:48 2002
2	+++ IMG_xcf.c Mon Apr 29 03:17:07 2002
3	@@ -166,6 +166,7 @@
4
5	Uint32 offset_x;
6	Uint32 offset_y;
7	+ int visible : 1;
8	} xcf_layer;
9
10	typedef struct {
11	@@ -179,6 +180,7 @@
12	Uint32 color;
13	Uint32 opacity;
14	int selection : 1;
15	+ int visible : 1;
16	} xcf_channel;
17
18	typedef struct {
19	@@ -245,7 +247,9 @@
20	prop->id = SDL_ReadBE32 (src);
21	prop->length = SDL_ReadBE32 (src);
22
23	+#if 0
24	printf ("%.8X: %s: %d\n", SDL_RWtell (src), prop->id < 25 ? prop_names [prop->id] : "unknown", prop->length);
25	+#endif
26
27	switch (prop->id) {
28	case PROP_COLORMAP:
29	@@ -265,6 +269,9 @@
30	case PROP_COLOR:
31	SDL_RWread (src, &prop->data, prop->length, 1);
32	break;
33	+ case PROP_VISIBLE:
34	+ prop->data.visible = SDL_ReadBE32 (src);
35	+ break;
36	default:
37	// SDL_RWread (src, &prop->data, prop->length, 1);
38	SDL_RWseek (src, prop->length, SEEK_CUR);
39	@@ -332,6 +339,8 @@
40	if (prop.id == PROP_OFFSETS) {
41	l->offset_x = prop.data.offset.x;
42	l->offset_y = prop.data.offset.y;
43	+ } else if (prop.id == PROP_VISIBLE) {
44	+ l->visible = prop.data.visible ? 1 : 0;
45	}
46	} while (prop.id != PROP_END);
47
48	@@ -371,6 +380,9 @@
49	case PROP_SELECTION:
50	l->selection = 1;
51	break;
52	+ case PROP_VISIBLE:
53	+ l->visible = prop.data.visible ? 1 : 0;
54	+ break;
55	default:
56	}
57	} while (prop.id != PROP_END);
58	@@ -724,9 +736,10 @@
59	rd.y = layer->offset_y;
60	rd.w = layer->width;
61	rd.h = layer->height;
62	- free_xcf_layer (layer);
63
64	- SDL_BlitSurface (lays, &rs, surface, &rd);
65	+ if (layer->visible)
66	+ SDL_BlitSurface (lays, &rs, surface, &rd);
67	+ free_xcf_layer (layer);
68	}
69
70	SDL_FreeSurface (lays);
71	@@ -756,7 +769,7 @@
72	}
73	for (i = 0; i < chnls; i++) {
74	// printf ("CNLBLT %i\n", i);
75	- if (!channel [i]->selection) {
76	+ if (!channel [i]->selection && channel [i]->visible) {
77	create_channel_surface (chs, head->image_type, channel [i]->color, channel [i]->opacity);
78	SDL_BlitSurface (chs, NULL, surface, NULL);
79	}