Attachment #247695 for bug #276369

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




PORTNAME=	imlib2
DISTVERSION=	1.12.1
PORTREVISION=	1
PORTEPOCH=	2
CATEGORIES=	graphics enlightenment
MASTER_SITES=	SF/enlightenment/imlib2-src/${DISTVERSION}

MAINTAINER=	eduardo@FreeBSD.org
COMMENT=	Next generation graphics library for Enlightenment
WWW=		https://docs.enlightenment.org/api/imlib2/html/

LICENSE=	imlib2


LIB_DEPENDS=	libfreetype.so:print/freetype2

USES=		cpe libtool localbase:ldflags pathfix pkgconfig tar:xz
CPE_VENDOR=	enlightenment
USE_LDCONFIG=	yes
INSTALL_TARGET=	install-strip

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-static \
		--enable-visibility-hiding \
		--with-bzip2 \
		--with-zlib

INSTALL_TARGET=	install-strip
		--with-zlib --with-bzip2
CONFIGURE_ENV=	ac_cv_lib_dl_dlopen=no
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

CONFLICTS_INSTALL=	imlib2-webp

PLIST_SUB=	SHLIB_SHORT=${DISTVERSION:R:R} \
		SHLIB_VER=${DISTVERSION}

OPTIONS_DEFINE=		GIF ID3 JPEG PNG TIFF WEBP X11
OPTIONS_DEFAULT=	GIF ID3 JPEG PNG TIFF WEBP X11
OPTIONS_SUB=		yes

GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
GIF_CONFIGURE_WITH=	gif

JPEG_USES=		jpeg
JPEG_CONFIGURE_WITH=	jpeg

PNG_LIB_DEPENDS=	libpng16.so:graphics/png
PNG_CONFIGURE_WITH=	png

TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
TIFF_CONFIGURE_WITH=	tiff

WEBP_LIB_DEPENDS=	libwebpdemux.so:graphics/webp
WEBP_CONFIGURE_WITH=	webp

X11_USES=		xorg
X11_USE=		XORG=sm,x11,xcb,xext
X11_CONFIGURE_WITH=	x x-shm-fd

.include <bsd.port.options.mk>

# scaling: MMX asm scaling causes segv, disable for now
.if ${ARCH} == "i386" && !empty(MACHINE_CPU:Mmmx)
CONFIGURE_ARGS+=	--disable-mmx
.else
CONFIGURE_ARGS+=	--disable-mmx
.endif

Lines 1-3 Link Here

(-)b/graphics/imlib2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1596568156	1	TIMESTAMP = 1705226776
2	SHA256 (imlib2-1.7.0.tar.bz2) = 1976ca3db48cbae79cd0fc737dabe39cc81494fc2560e1d22821e7dc9c22b37d	2	SHA256 (imlib2-1.12.1.tar.xz) = 8c24d2d189c4d5ae602dbf2fc0fbb117aa923eab6c883041f0feeca4e8c6774e
3	SIZE (imlib2-1.7.0.tar.bz2) = 893015	3	SIZE (imlib2-1.12.1.tar.xz) = 831680




--- src/modules/loaders/loader_argb.c.orig	2020-08-08 14:27:16 UTC
+++ src/modules/loaders/loader_argb.c
@@ -7,6 +7,9 @@ load2(ImlibImage * im, int load_data)
    int                 w = 0, h = 0, alpha = 0;
    DATA32             *ptr;
    int                 y;
+#ifdef WORDS_BIGENDIAN
+   int                 l;
+#endif
 
    rc = LOAD_FAIL;
 




bin/imlib2-config
%%X11%%bin/imlib2_bumpmap
%%X11%%bin/imlib2_colorspace
bin/imlib2_conv

%%X11%%bin/imlib2_test
%%X11%%bin/imlib2_view
include/Imlib2.h
include/Imlib2_Loader.h
lib/imlib2/filters/bumpmap.so
lib/imlib2/filters/colormod.so
lib/imlib2/filters/testfilter.so
lib/imlib2/loaders/ani.so
lib/imlib2/loaders/argb.so
lib/imlib2/loaders/bmp.so
lib/imlib2/loaders/bz2.so

%%ID3%%lib/imlib2/loaders/id3.so
%%JPEG%%lib/imlib2/loaders/jpeg.so
lib/imlib2/loaders/lbm.so
lib/imlib2/loaders/lzma.so
%%PNG%%lib/imlib2/loaders/png.so
lib/imlib2/loaders/pnm.so
lib/imlib2/loaders/qoi.so
lib/imlib2/loaders/tga.so
%%TIFF%%lib/imlib2/loaders/tiff.so
%%WEBP%%lib/imlib2/loaders/webp.so
lib/imlib2/loaders/xbm.so
lib/imlib2/loaders/xpm.so
lib/imlib2/loaders/zlib.so
lib/libImlib2.so
lib/libImlib2.so.%%SHLIB_SHORT%%
lib/libImlib2.so.%%SHLIB_VER%%
libdata/pkgconfig/imlib2.pc
%%DATADIR%%/rgb.txt
%%DATADIR%%/data/fonts/cinema.ttf
%%DATADIR%%/data/fonts/grunge.ttf
%%DATADIR%%/data/fonts/morpheus.ttf

Return to bug 276369

Lines 1-12 Link Here

(-)b/graphics/imlib2/Makefile (-19 / +21 lines)
1	PORTNAME= imlib2	1	PORTNAME= imlib2
2	PORTVERSION= 1.7.0	2	DISTVERSION= 1.12.1
3	PORTREVISION= 1
4	PORTEPOCH= 2	3	PORTEPOCH= 2
5	CATEGORIES= graphics enlightenment	4	CATEGORIES= graphics enlightenment
6	MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION}	5	MASTER_SITES= SF/enlightenment/imlib2-src/${DISTVERSION}
7		6
8	MAINTAINER= ports@FreeBSD.org	7	MAINTAINER= eduardo@FreeBSD.org
9	COMMENT= The next generation graphics library for Enlightenment	8	COMMENT= Next generation graphics library for Enlightenment
10	WWW= https://docs.enlightenment.org/api/imlib2/html/	9	WWW= https://docs.enlightenment.org/api/imlib2/html/
11		10
12	LICENSE= imlib2	11	LICENSE= imlib2
Lines 16-39 LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept Link Here
16		15
17	LIB_DEPENDS= libfreetype.so:print/freetype2	16	LIB_DEPENDS= libfreetype.so:print/freetype2
18		17
19	USES= cpe libtool pathfix pkgconfig tar:bzip2	18	USES= cpe libtool localbase:ldflags pathfix pkgconfig tar:xz
20	GNU_CONFIGURE= yes	19	CPE_VENDOR= enlightenment
21	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
22	INSTALL_TARGET= install-strip
23		21
24	CPE_VENDOR= enlightenment	22	GNU_CONFIGURE= yes
		23	CONFIGURE_ARGS= --disable-static \
		24	--enable-visibility-hiding \
		25	--with-bzip2 \
		26	--with-zlib
25		27
26	CONFIGURE_ARGS= --enable-visibility-hiding --disable-static \	28	INSTALL_TARGET= install-strip
27	--with-zlib --with-bzip2
28	CONFIGURE_ENV= ac_cv_lib_dl_dlopen=no
29	CPPFLAGS+= -I${LOCALBASE}/include
30	LDFLAGS+= -L${LOCALBASE}/lib
31		29
32	CONFLICTS_INSTALL= imlib2-webp	30	CONFLICTS_INSTALL= imlib2-webp
33		31
		32	PLIST_SUB= SHLIB_SHORT=${DISTVERSION:R:R} \
		33	SHLIB_VER=${DISTVERSION}
		34
34	OPTIONS_DEFINE= GIF ID3 JPEG PNG TIFF WEBP X11	35	OPTIONS_DEFINE= GIF ID3 JPEG PNG TIFF WEBP X11
35	OPTIONS_DEFAULT= GIF ID3 JPEG PNG TIFF WEBP X11	36	OPTIONS_DEFAULT= GIF ID3 JPEG PNG TIFF WEBP X11
36	OPTIONS_SUB= yes	37	OPTIONS_SUB= yes
37		38
38	GIF_LIB_DEPENDS= libgif.so:graphics/giflib	39	GIF_LIB_DEPENDS= libgif.so:graphics/giflib
39	GIF_CONFIGURE_WITH= gif	40	GIF_CONFIGURE_WITH= gif
Lines 44-66 ID3_CONFIGURE_WITH= id3 Link Here
44	JPEG_USES= jpeg	45	JPEG_USES= jpeg
45	JPEG_CONFIGURE_WITH= jpeg	46	JPEG_CONFIGURE_WITH= jpeg
46		47
47	PNG_LIB_DEPENDS= libpng.so:graphics/png	48	PNG_LIB_DEPENDS= libpng16.so:graphics/png
48	PNG_CONFIGURE_WITH= png	49	PNG_CONFIGURE_WITH= png
49		50
50	TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff	51	TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
51	TIFF_CONFIGURE_WITH= tiff	52	TIFF_CONFIGURE_WITH= tiff
52		53
53	WEBP_LIB_DEPENDS= libwebp.so:graphics/webp	54	WEBP_LIB_DEPENDS= libwebpdemux.so:graphics/webp
54	WEBP_CONFIGURE_WITH= webp	55	WEBP_CONFIGURE_WITH= webp
55		56
56	X11_USES= xorg	57	X11_USES= xorg
57	X11_USE= XORG=x11,sm,xcb,xext	58	X11_USE= XORG=sm,x11,xcb,xext
58	X11_CONFIGURE_WITH= x x-shm-fd	59	X11_CONFIGURE_WITH= x x-shm-fd
59		60
60	.include <bsd.port.options.mk>	61	.include <bsd.port.options.mk>
61		62
		63	# scaling: MMX asm scaling causes segv, disable for now
62	.if ${ARCH} == "i386" && !empty(MACHINE_CPU:Mmmx)	64	.if ${ARCH} == "i386" && !empty(MACHINE_CPU:Mmmx)
63	CONFIGURE_ARGS+= --enable-mmx	65	CONFIGURE_ARGS+= --disable-mmx
64	.else	66	.else
65	CONFIGURE_ARGS+= --disable-mmx	67	CONFIGURE_ARGS+= --disable-mmx
66	.endif	68	.endif

Removed Link Here

(-)a/graphics/imlib2/files/patch-src_modules_loaders_loader__argb.c (-12 lines)
1	--- src/modules/loaders/loader_argb.c.orig 2020-08-08 14:27:16 UTC
2	+++ src/modules/loaders/loader_argb.c
3	@@ -7,6 +7,9 @@ load2(ImlibImage * im, int load_data)
4	int w = 0, h = 0, alpha = 0;
5	DATA32 *ptr;
6	int y;
7	+#ifdef WORDS_BIGENDIAN
8	+ int l;
9	+#endif
10
11	rc = LOAD_FAIL;
12

Lines 1-4 Link Here

(-)b/graphics/imlib2/pkg-plist (-3 / +8 lines)
1	bin/imlib2-config
2	%%X11%%bin/imlib2_bumpmap	1	%%X11%%bin/imlib2_bumpmap
3	%%X11%%bin/imlib2_colorspace	2	%%X11%%bin/imlib2_colorspace
4	bin/imlib2_conv	3	bin/imlib2_conv
Lines 9-17 bin/imlib2_load Link Here
9	%%X11%%bin/imlib2_test	8	%%X11%%bin/imlib2_test
10	%%X11%%bin/imlib2_view	9	%%X11%%bin/imlib2_view
11	include/Imlib2.h	10	include/Imlib2.h
		11	include/Imlib2_Loader.h
12	lib/imlib2/filters/bumpmap.so	12	lib/imlib2/filters/bumpmap.so
13	lib/imlib2/filters/colormod.so	13	lib/imlib2/filters/colormod.so
14	lib/imlib2/filters/testfilter.so	14	lib/imlib2/filters/testfilter.so
		15	lib/imlib2/loaders/ani.so
15	lib/imlib2/loaders/argb.so	16	lib/imlib2/loaders/argb.so
16	lib/imlib2/loaders/bmp.so	17	lib/imlib2/loaders/bmp.so
17	lib/imlib2/loaders/bz2.so	18	lib/imlib2/loaders/bz2.so
Lines 21-37 lib/imlib2/loaders/ico.so Link Here
21	%%ID3%%lib/imlib2/loaders/id3.so	22	%%ID3%%lib/imlib2/loaders/id3.so
22	%%JPEG%%lib/imlib2/loaders/jpeg.so	23	%%JPEG%%lib/imlib2/loaders/jpeg.so
23	lib/imlib2/loaders/lbm.so	24	lib/imlib2/loaders/lbm.so
		25	lib/imlib2/loaders/lzma.so
24	%%PNG%%lib/imlib2/loaders/png.so	26	%%PNG%%lib/imlib2/loaders/png.so
25	lib/imlib2/loaders/pnm.so	27	lib/imlib2/loaders/pnm.so
		28	lib/imlib2/loaders/qoi.so
26	lib/imlib2/loaders/tga.so	29	lib/imlib2/loaders/tga.so
27	%%TIFF%%lib/imlib2/loaders/tiff.so	30	%%TIFF%%lib/imlib2/loaders/tiff.so
28	%%WEBP%%lib/imlib2/loaders/webp.so	31	%%WEBP%%lib/imlib2/loaders/webp.so
		32	lib/imlib2/loaders/xbm.so
29	lib/imlib2/loaders/xpm.so	33	lib/imlib2/loaders/xpm.so
30	lib/imlib2/loaders/zlib.so	34	lib/imlib2/loaders/zlib.so
31	lib/libImlib2.so	35	lib/libImlib2.so
32	lib/libImlib2.so.1	36	lib/libImlib2.so.%%SHLIB_SHORT%%
33	lib/libImlib2.so.1.7.0	37	lib/libImlib2.so.%%SHLIB_VER%%
34	libdata/pkgconfig/imlib2.pc	38	libdata/pkgconfig/imlib2.pc
		39	%%DATADIR%%/rgb.txt
35	%%DATADIR%%/data/fonts/cinema.ttf	40	%%DATADIR%%/data/fonts/cinema.ttf
36	%%DATADIR%%/data/fonts/grunge.ttf	41	%%DATADIR%%/data/fonts/grunge.ttf
37	%%DATADIR%%/data/fonts/morpheus.ttf	42	%%DATADIR%%/data/fonts/morpheus.ttf