Attachment #94892 for bug #133131

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




#

PORTNAME=	mp3splt
PORTVERSION=	2.2.3
PORTREVISION=	3
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}-${PORTVERSION}-src

MAINTAINER=	citrin@citrin.ru
COMMENT=	Utility to split mp3 and ogg files (via CUE sheets)

LIB_DEPENDS=	mp3splt:${PORTSDIR}/audio/libmp3splt

USE_AUTOTOOLS=	libltdl

LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad

.include <bsd.port.pre.mk>
LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis \
		ogg.5:${PORTSDIR}/audio/libogg
.else
CONFIGURE_ARGS+=--disable-ogg
.endif

GNU_CONFIGURE=	yes
CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

MAN1=		mp3splt.1
PLIST_FILES=	bin/mp3splt bin/oggsplt

post-install:
	@${LN} -fsv ${PREFIX}/bin/mp3splt ${PREFIX}/bin/oggsplt

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)/home/citrin/work/mp3splt/distinfo (-3 / +3 lines)
1	MD5 (mp3splt-2.1c-src.tar.gz) = b355835e4d57b8b921a14a6485244c87	1	MD5 (mp3splt-2.2.3.tar.gz) = aa67e24931c62d2f09be13303fbf410e
2	SHA256 (mp3splt-2.1c-src.tar.gz) = 6f325194345b64ef132defa9ab821352ddae197459357560b2cc1a459c22a9ec	2	SHA256 (mp3splt-2.2.3.tar.gz) = aae0abb51f537224135204de2dea516a2293a9385f58c7167c483df28a717b04
3	SIZE (mp3splt-2.1c-src.tar.gz) = 131810	3	SIZE (mp3splt-2.2.3.tar.gz) = 135298




--- mp3splt.c.orig	2008-06-25 00:19:32.000000000 -0400
+++ mp3splt.c	2008-06-25 00:20:37.000000000 -0400
@@ -114,6 +114,13 @@
 		if (state->mstate) {
 			fclose(state->mstate->file_input);
 			mp3_state_free(state->mstate);
+			  /*
+			   * Explicitly setting mstate to NULL
+			   * prevents encoding misdetection (resulting
+			   * in a crash) if an mp3 file is followed by
+			   * a vorbis file.
+			   */
+			state->mstate = NULL;
 		}
 #ifndef NO_OGG
 		else if (state->ostate) { // If file has been opened with ov_open we should close it using ov_clear()

Lines 1-11 Link Here

(-)/home/citrin/work/mp3splt/files/patch-splt.h (-11 lines)
1	--- splt.h.orig Fri Dec 15 19:27:18 2006
2	+++ splt.h Fri Dec 15 19:27:40 2006
3	@@ -93,7 +93,7 @@
4
5	char zero_pad_float (float f, char out);
6
7	-int parse_outformat(char *s, char format[][], int cddboption);
8	+int parse_outformat(char *s, char format[OUTNUM][MAXOLEN], int cddboption);
9
10	unsigned char cleanstring (unsigned char s);
11

Return to bug 133131

Lines 6-41 Link Here

(-)/home/citrin/work/mp3splt/Makefile (-17 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= mp3splt	8	PORTNAME= mp3splt
9	PORTVERSION= 2.1c	9	PORTVERSION= 2.2.3
10	PORTREVISION= 3
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
14	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
15		13
16	MAINTAINER= fk@fabiankeil.de	14	MAINTAINER= citrin@citrin.ru
17	COMMENT= Utility to split mp3 and ogg files (via CUE sheets)	15	COMMENT= Utility to split mp3 and ogg files (via CUE sheets)
18		16
19	OPTIONS= VORBIS "Ogg Vorbis support" On	17	LIB_DEPENDS= mp3splt:${PORTSDIR}/audio/libmp3splt
20		18
21	.include <bsd.port.pre.mk>	19	USE_AUTOTOOLS= libltdl
22
23	LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad
24		20
25	.if !defined(WITHOUT_VORBIS)	21	.include <bsd.port.pre.mk>
26	LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis \
27	ogg.5:${PORTSDIR}/audio/libogg
28	.else
29	CONFIGURE_ARGS+=--disable-ogg
30	.endif
31		22
32	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
33	CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \	24	CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
34	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"	25	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
35
36	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
37		26
38	MAN1= mp3splt.1	27	MAN1= mp3splt.1
39	PLIST_FILES= bin/mp3splt bin/oggsplt	28	PLIST_FILES= bin/mp3splt bin/oggsplt
40		29
		30	post-install:
		31	@${LN} -fsv ${PREFIX}/bin/mp3splt ${PREFIX}/bin/oggsplt
		32
41	.include <bsd.port.post.mk>	33	.include <bsd.port.post.mk>

Lines 1-16 Link Here

(-)/home/citrin/work/mp3splt/files/patch-mp3splt.c (-16 lines)
1	--- mp3splt.c.orig 2008-06-25 00:19:32.000000000 -0400
2	+++ mp3splt.c 2008-06-25 00:20:37.000000000 -0400
3	@@ -114,6 +114,13 @@
4	if (state->mstate) {
5	fclose(state->mstate->file_input);
6	mp3_state_free(state->mstate);
7	+ /*
8	+ * Explicitly setting mstate to NULL
9	+ * prevents encoding misdetection (resulting
10	+ * in a crash) if an mp3 file is followed by
11	+ * a vorbis file.
12	+ */
13	+ state->mstate = NULL;
14	}
15	#ifndef NO_OGG
16	else if (state->ostate) { // If file has been opened with ov_open we should close it using ov_clear()