Attachment #84260 for bug #120225

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




# $FreeBSD: ports/audio/amarok/Makefile,v 1.77 2008/01/06 22:51:37 danfe Exp $

PORTNAME=	amarok
PORTVERSION=	1.4.8
PORTREVISION=	1
CATEGORIES=	audio kde
MASTER_SITES=	${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src

USE_KDEBASE_VER=3
USE_GMAKE=	yes
USE_AUTOTOOLS=	libtool:15
USE_GETTEXT=	yes
USE_SDL=	sdl
USE_RUBY=	yes
USE_LDCONFIG=	yes
INSTALLS_ICONS=	yes

OPTIONS=	GPOD "iPod support" on \
		NJB "Creative Nomad and Dell support" on \


.if defined(DEBUG)
CONFIGURE_ARGS+=--enable-debug=full
STRIP=		# none
.endif

pre-extract:	check-options-version

Lines 1-3 Link Here

(-)amarok/distinfo (-3 / +3 lines)
1	MD5 (amarok-1.4.7.tar.bz2) = f1299e142da8a69bc3cff5d585e38d43	1	MD5 (amarok-1.4.8.tar.bz2) = 7f65c4a8f3f0ff9042a5b5dd21b36cc8
2	SHA256 (amarok-1.4.7.tar.bz2) = 7ef2691d0cda238696e021421052a04b3cfb068ea0d9854e0c617b33216340f8	2	SHA256 (amarok-1.4.8.tar.bz2) = 12877e60dc5a362e37dc4c775cc809ce8e5a15c13211902f6a821f238a45aae5
3	SIZE (amarok-1.4.7.tar.bz2) = 12723499	3	SIZE (amarok-1.4.8.tar.bz2) = 12699378




--- amarok/src/metadata/mp4/mp4file.cpp.orig	Mon Dec 17 16:53:19 2007
+++ amarok/src/metadata/mp4/mp4file.cpp	Thu Jan 31 23:14:42 2008

--- amarok/src/metadata/mp4/mp4file.cpp.orig
+++ amarok/src/metadata/mp4/mp4file.cpp
@@ -27,9 +27,8 @@
 
 #include "mp4tag.h"

 
 #define MP4V2_HAS_WRITE_BUG 1
 
@@ -157,6 +156,7 @@
     }
 #endif
 
     MP4Close(handle);
-    {
-        fprintf(stderr, "close failed\n");
-    }
+    MP4Close(handle);
+    handle=NULL;
 
     mp4file = MP4Read(name());

Return to bug 120225

Lines 5-12 Link Here

(-)amarok/Makefile (-3 / +4 lines)
5	# $FreeBSD: ports/audio/amarok/Makefile,v 1.77 2008/01/06 22:51:37 danfe Exp $	5	# $FreeBSD: ports/audio/amarok/Makefile,v 1.77 2008/01/06 22:51:37 danfe Exp $
6		6
7	PORTNAME= amarok	7	PORTNAME= amarok
8	PORTVERSION= 1.4.7	8	PORTVERSION= 1.4.8
9	PORTREVISION= 1
10	CATEGORIES= audio kde	9	CATEGORIES= audio kde
11	MASTER_SITES= ${MASTER_SITE_KDE}	10	MASTER_SITES= ${MASTER_SITE_KDE}
12	MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src	11	MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
Lines 25-33 Link Here
25	USE_KDEBASE_VER=3	24	USE_KDEBASE_VER=3
26	USE_GMAKE= yes	25	USE_GMAKE= yes
27	USE_AUTOTOOLS= libtool:15	26	USE_AUTOTOOLS= libtool:15
		27	USE_GETTEXT= yes
28	USE_SDL= sdl	28	USE_SDL= sdl
29	USE_RUBY= yes	29	USE_RUBY= yes
30	USE_LDCONFIG= yes	30	USE_LDCONFIG= yes
		31	INSTALLS_ICONS= yes
31		32
32	OPTIONS= GPOD "iPod support" on \	33	OPTIONS= GPOD "iPod support" on \
33	NJB "Creative Nomad and Dell support" on \	34	NJB "Creative Nomad and Dell support" on \
Lines 94-100 Link Here
94		95
95	.if defined(DEBUG)	96	.if defined(DEBUG)
96	CONFIGURE_ARGS+=--enable-debug=full	97	CONFIGURE_ARGS+=--enable-debug=full
97	STRIP= # none	98	STRIP= # none
98	.endif	99	.endif
99		100
100	pre-extract: check-options-version	101	pre-extract: check-options-version

Lines 1-8 Link Here

(-)amarok/files/patch-amarok_src_metadata_mp4_mp4file.cpp (-12 / +4 lines)
1		1	--- amarok/src/metadata/mp4/mp4file.cpp.orig Mon Dec 17 16:53:19 2007
2	$FreeBSD: ports/audio/amarok/files/patch-amarok_src_metadata_mp4_mp4file.cpp,v 1.2 2007/10/14 18:58:37 mich Exp $	2	+++ amarok/src/metadata/mp4/mp4file.cpp Thu Jan 31 23:14:42 2008
3
4	--- amarok/src/metadata/mp4/mp4file.cpp.orig
5	+++ amarok/src/metadata/mp4/mp4file.cpp
6	@@ -27,9 +27,8 @@	3	@@ -27,9 +27,8 @@
7		4
8	#include "mp4tag.h"	5	#include "mp4tag.h"
Lines 14-28 Link Here
14		11
15	#define MP4V2_HAS_WRITE_BUG 1	12	#define MP4V2_HAS_WRITE_BUG 1
16		13
17	@@ -156,10 +155,8 @@	14	@@ -157,6 +156,7 @@
18	}
19	#endif	15	#endif
20		16
21	- if(!MP4Close(handle))	17	MP4Close(handle);
22	- {
23	- fprintf(stderr, "close failed\n");
24	- }
25	+ MP4Close(handle);
26	+ handle=NULL;	18	+ handle=NULL;
27		19
28	mp4file = MP4Read(name());	20	mp4file = MP4Read(name());