Attachment #85021 for bug #121100




#

PORTNAME=	easytag
PORTVERSION=	2.1.4
PORTREVISION=	2
CATEGORIES=	audio
MASTER_SITES=	SF
MASTER_SITE_SUBDIR=	${PORTNAME}
PKGNAMESUFFIX=	-devel

MAINTAINER=	novel@FreeBSD.org
COMMENT=	GTK2 Tag editor for MP3 and OGG files

LIB_DEPENDS=	id3tag:${PORTSDIR}/audio/libid3tag \
		vorbis:${PORTSDIR}/audio/libvorbis \
		FLAC:${PORTSDIR}/audio/flac \
		mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2

MAN1=		easytag.1
CONFLICTS=	easytag-[0-9]*

USE_BZIP2=	yes
USE_XLIB=	yes
USE_GETTEXT=	yes
USE_GNOME=	gnomehack gnomeprefix gtk20 desktopfileutils
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GTK" \
		LDFLAGS="-L${LOCALBASE}/lib"

OPTIONS=	FLAC "FLAC support" on
OPTIONS+=	MP3 "MP3 ID3V1 and ID3V24 support" on
OPTIONS+=	ID3V23 "MP3 ID3V23 support" off
OPTIONS+=	MPEG4IP "MP4 support" on
OPTIONS+=	SPEEX "SPEEX support" off
OPTIONS+=	VORBIS "VORBIS support" on
OPTIONS+=	WAVPACK "WAVPACK support" off

.include <bsd.port.pre.mk>

# XXX disable FLAC support until ancient version in ports is updated
#.if !defined(WITHOUT_FLAC)
#LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
#.else
CONFIGURE_ARGS+=--disable-flac
#.endif

.if !defined(WITHOUT_MP3)
LIB_DEPENDS+=	id3tag:${PORTSDIR}/audio/libid3tag
.else
CONFIGURE_ARGS+=--disable-mp3
.endif

.if defined(WITH_ID3V23)
LIB_DEPENDS+=	id3:${PORTSDIR}/audio/id3lib
.else
CONFIGURE_ARGS+=--disable-id3v23
.endif

.if !defined(WITHOUT_MPEG4IP)
LIB_DEPENDS+=	mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
.else
CONFIGURE_ARGS+=--disable-mp4
.endif

.if defined(WITH_SPEEX)
LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex
.else
CONFIGURE_ARGS+=--disable-speex
.endif

.if !defined(WITHOUT_VORBIS)
LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
.else
CONFIGURE_ARGS+=--disable-ogg
.endif

.if defined(WITH_WAVPACK)
LIB_DEPENDS+=	wavpack:${PORTSDIR}/audio/wavpack
.else
CONFIGURE_ARGS+=--disable-wavpack
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (easytag-2.1.2.tar.bz2) = 4b741e8ddf809d989a012d20a5a969aa	1	MD5 (easytag-2.1.4.tar.bz2) = 201bd38a73100e14fb6d81243a9c3a1b
2	SHA256 (easytag-2.1.2.tar.bz2) = 921d3a4011d91eedbe3b4c7a99d13dba8f1c79f13b9048154a30e86bdb7a43d1	2	SHA256 (easytag-2.1.4.tar.bz2) = 7a06b4f5e71d2df1434e99c5ad19027fddaaf30cf1e10457f2963948a1f18cc4
3	SIZE (easytag-2.1.2.tar.bz2) = 2954397	3	SIZE (easytag-2.1.4.tar.bz2) = 3242736

Lines 1-8 Link Here

(-)pkg-plist (-4 / +7 lines)
1	bin/easytag	1	bin/easytag
2	share/applications/easytag.desktop	2	share/applications/easytag.desktop
3	share/easytag/ChangeLog	3	%%DATADIR%%/ChangeLog
4	share/easytag/EasyTAG_logo.xpm	4	%%DATADIR%%/EasyTAG_logo.xpm
5	share/pixmaps/EasyTAG.xpm	5	share/pixmaps/EasyTAG_icon.xpm
6	share/locale/bg/LC_MESSAGES/easytag.mo	6	share/locale/bg/LC_MESSAGES/easytag.mo
7	share/locale/cs/LC_MESSAGES/easytag.mo	7	share/locale/cs/LC_MESSAGES/easytag.mo
8	share/locale/da/LC_MESSAGES/easytag.mo	8	share/locale/da/LC_MESSAGES/easytag.mo
Lines 19-28 Link Here
19	share/locale/pt_BR/LC_MESSAGES/easytag.mo	19	share/locale/pt_BR/LC_MESSAGES/easytag.mo
20	share/locale/ro/LC_MESSAGES/easytag.mo	20	share/locale/ro/LC_MESSAGES/easytag.mo
21	share/locale/ru/LC_MESSAGES/easytag.mo	21	share/locale/ru/LC_MESSAGES/easytag.mo
		22	share/locale/sr/LC_MESSAGES/easytag.mo
		23	share/locale/sr@Latn/LC_MESSAGES/easytag.mo
22	share/locale/sv/LC_MESSAGES/easytag.mo	24	share/locale/sv/LC_MESSAGES/easytag.mo
23	share/locale/uk/LC_MESSAGES/easytag.mo	25	share/locale/uk/LC_MESSAGES/easytag.mo
24	share/locale/zh_CN/LC_MESSAGES/easytag.mo	26	share/locale/zh_CN/LC_MESSAGES/easytag.mo
25	@dirrm share/easytag	27	share/locale/zh_TW/LC_MESSAGES/easytag.mo
		28	@dirrm %%DATADIR%%
26	@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true	29	@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true
27	@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true	30	@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true
28	@dirrmtry share/applications	31	@dirrmtry share/applications

Removed Link Here

(-)files/patch-src-mp4_tag.c (-11 lines)
1	--- src/mp4_tag.c.orig 2007-10-02 22:37:42.000000000 +0400
2	+++ src/mp4_tag.c 2007-10-02 22:39:54.000000000 +0400
3	@@ -185,7 +185,7 @@
4	* Picture *
5	***********/
6	// There is only one picture!
7	- if ( MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize ) )
8	+ if ( MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize, 0 ) )
9	{
10	Picture *pic = Picture_Allocate();
11	pic->size = coverSize;

Added Link Here

(-)files/patch-src__mp4_tag.c (+11 lines)
1	--- ./src/mp4_tag.c.orig 2008-02-26 01:23:44.000000000 +0300
2	+++ ./src/mp4_tag.c 2008-02-26 01:24:07.000000000 +0300
3	@@ -83,7 +83,7 @@
4	uint16_t track, track_total;
5	uint16_t disk, disktotal;
6	u_int8_t *coverArt;
7	- u_int32_t coverSize;
8	+ u_int32_t coverSize, i;
9	Picture *prev_pic = NULL;
10
11	if (!filename \|\| !FileTag)

Return to bug 121100

Lines 6-48 Link Here

(-)Makefile (-18 / +50 lines)
6	#	6	#
7		7
8	PORTNAME= easytag	8	PORTNAME= easytag
9	PORTVERSION= 2.1.2	9	PORTVERSION= 2.1.4
10	PORTREVISION= 2
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= SF
13	MASTER_SITE_SUBDIR= ${PORTNAME}
14	PKGNAMESUFFIX= -devel	12	PKGNAMESUFFIX= -devel
15		13
16	MAINTAINER= novel@FreeBSD.org	14	MAINTAINER= novel@FreeBSD.org
17	COMMENT= GTK2 Tag editor for MP3 and OGG files	15	COMMENT= GTK2 Tag editor for MP3 and OGG files
18		16
19	LIB_DEPENDS= id3tag:${PORTSDIR}/audio/libid3tag \
20	vorbis:${PORTSDIR}/audio/libvorbis \
21	FLAC:${PORTSDIR}/audio/flac \
22	mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
23
24	MAN1= easytag.1	17	MAN1= easytag.1
25	CONFLICTS= easytag-[0-9]*	18	CONFLICTS= easytag-[0-9]*
26		19
27	USE_BZIP2= yes	20	USE_BZIP2= yes
28	USE_XLIB= yes
29	USE_GETTEXT= yes	21	USE_GETTEXT= yes
30	USE_GNOME= gnomehack gnomeprefix gtk20 desktopfileutils	22	USE_GNOME= gnomehack gnomeprefix gtk20 desktopfileutils
31	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
32	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GTK" \	24	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GTK" \
33	LDFLAGS="-L${LOCALBASE}/lib"	25	LDFLAGS="-L${LOCALBASE}/lib"
34		26
35	.if defined(WITH_WAVPACK)	27	OPTIONS= FLAC "FLAC support" on
36	LIB_DEPENDS+= wavpack.1:${PORTSDIR}/audio/wavpack	28	OPTIONS+= MP3 "MP3 ID3V1 and ID3V24 support" on
37	CONFIGURE_ARGS+= --enable-wavpack	29	OPTIONS+= ID3V23 "MP3 ID3V23 support" off
		30	OPTIONS+= MPEG4IP "MP4 support" on
		31	OPTIONS+= SPEEX "SPEEX support" off
		32	OPTIONS+= VORBIS "VORBIS support" on
		33	OPTIONS+= WAVPACK "WAVPACK support" off
		34
		35	.include <bsd.port.pre.mk>
		36
		37	# XXX disable FLAC support until ancient version in ports is updated
		38	#.if !defined(WITHOUT_FLAC)
		39	#LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac
		40	#.else
		41	CONFIGURE_ARGS+=--disable-flac
		42	#.endif
		43
		44	.if !defined(WITHOUT_MP3)
		45	LIB_DEPENDS+= id3tag:${PORTSDIR}/audio/libid3tag
		46	.else
		47	CONFIGURE_ARGS+=--disable-mp3
		48	.endif
		49
		50	.if defined(WITH_ID3V23)
		51	LIB_DEPENDS+= id3:${PORTSDIR}/audio/id3lib
		52	.else
		53	CONFIGURE_ARGS+=--disable-id3v23
		54	.endif
		55
		56	.if !defined(WITHOUT_MPEG4IP)
		57	LIB_DEPENDS+= mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
		58	.else
		59	CONFIGURE_ARGS+=--disable-mp4
		60	.endif
		61
		62	.if defined(WITH_SPEEX)
		63	LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex
38	.else	64	.else
39	CONFIGURE_ARGS+= --disable-wavpack	65	CONFIGURE_ARGS+=--disable-speex
40	.endif	66	.endif
41		67
42	.if defined(WITHOUT_ID3V23)	68	.if !defined(WITHOUT_VORBIS)
43	CONFIGURE_ARGS+= --disable-id3v23	69	LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis
		70	.else
		71	CONFIGURE_ARGS+=--disable-ogg
		72	.endif
		73
		74	.if defined(WITH_WAVPACK)
		75	LIB_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack
44	.else	76	.else
45	LIB_DEPENDS+= id3:${PORTSDIR}/audio/id3lib	77	CONFIGURE_ARGS+=--disable-wavpack
46	.endif	78	.endif
47		79
48	.include <bsd.port.mk>	80	.include <bsd.port.post.mk>