Attachment #42571 for bug #66356

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




LIB_DEPENDS=	id3tag.2:${PORTSDIR}/audio/libid3tag
RUN_DEPENDS=	mp3gain:${PORTSDIR}/audio/mp3gain

.if defined(WITH_AAC)
BROKEN=		"need mpeg4ip-1.0 for AAC support."
#LIB_DEPENDS+=	mp4v2.1:${PORTSDIR}/multimedia/mpeg4ip
#.else
#pre-everything::
#	@${ECHO_MSG}
#	@${ECHO_MSG} "To enable AAC support define the WITH_AAC knob."
#	@${ECHO_MSG}
.endif

USE_REINPLACE=	yes
USE_X_PREFIX=	yes


USE_GNOME=	gtk20
GNU_CONFIGURE=	yes

.include <bsd.port.pre.mk>

.if exists(${LOCALBASE}/lib/libmp4v2.so)
.if exists(${LOCALBASE}/include/mpeg4ip_config.h)
WITH_AAC=	YES
.else
WITH_FAAD=	YES
.endif
.endif
.if defined(WITH_AAC) && defined(WITH_FAAD)
BROKEN=		"WITH_AAC and WITH_FAAD are exclusive."
.endif
.if defined(WITH_AAC)
LIB_DEPENDS+=	mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip
.endif
.if defined(WITH_FAAD)
LIB_DEPENDS+=	mp4v2.0:${PORTSDIR}/audio/faad
.endif

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

.if !defined(WITH_AAC) && !defined(WITH_FAAD)
pre-everything::
	@${ECHO_MSG}
	@${ECHO_MSG} "To enable AAC support with mpeg4ip define the WITH_AAC knob."
	@${ECHO_MSG} "To enable AAC support with faad2 define the WITH_FAAD knob."
	@${ECHO_MSG}
.endif

post-patch:
	@${CP} ${FILESDIR}/systems.h ${WRKSRC}/src

pre-configure:
# install locale correctly (share dir instead of lib dir)
	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|' \

	@${INSTALL_DATA} ${WRKSRC}/TODOandBUGS.txt ${DOCSDIR}
.endif

.include <bsd.port.post.mk>




--- configure.old	Mon Jan 19 13:54:37 2004
+++ configure	Tue Jan 20 00:27:43 2004
@@ -6409,7 +6409,6 @@
       conftest$ac_exeext conftest.$ac_ext
 if test "$ac_cv_search_MP4FileInfo" = no; then
   for ac_lib in "mp4v2" "mp4v2 -lstdc++" "mp4v2 -lz" "mp4v2 -lz -lstdc++"; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6468,16 +6467,7 @@
 fi
 echo "$as_me:$LINENO: result: $ac_cv_search_MP4FileInfo" >&5
 echo "${ECHO_T}$ac_cv_search_MP4FileInfo" >&6
-if test "$ac_cv_search_MP4FileInfo" != no; then
-  test "$ac_cv_search_MP4FileInfo" = "none required" || LIBS="$ac_cv_search_MP4FileInfo $LIBS"
-  have_mp4v2="yes -- will build with aac support"
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMP4V2 1
-_ACEOF
-
-else
   have_mp4v2="***no -- will build without aac support"
-fi
 
 
 




Index: src/mp4file.c
diff -u -p src/mp4file.c.orig src/mp4file.c
--- src/mp4file.c.orig	Sat Jan 17 18:37:49 2004
+++ src/mp4file.c	Fri May  7 15:20:24 2004
@@ -109,6 +109,10 @@
 
 #include "mp4.h"
 
+#ifndef UINT64_TO_DOUBLE
+#define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
+#endif
+
 Track *file_get_mp4_info (gchar *mp4FileName)
 {
     Track *track = NULL;
@@ -342,7 +346,7 @@ Track *file_get_mp4_info (gchar *name)
     return NULL;
 }
 

Line 0 Link Here

(-)files/systems.h (+7 lines)
	1	/* This file is included from faad2 version of mepg4ip.h. */
	2
	3	#include <sys/types.h>
	4	#include <stdlib.h>
	5	#include <string.h>
	6
	7	#define HAVE_RINT

Return to bug 66356

Lines 18-33 Link Here

(-)Makefile (-11 / +31 lines)
18	LIB_DEPENDS= id3tag.2:${PORTSDIR}/audio/libid3tag	18	LIB_DEPENDS= id3tag.2:${PORTSDIR}/audio/libid3tag
19	RUN_DEPENDS= mp3gain:${PORTSDIR}/audio/mp3gain	19	RUN_DEPENDS= mp3gain:${PORTSDIR}/audio/mp3gain
20		20
21	.if defined(WITH_AAC)
22	BROKEN= "need mpeg4ip-1.0 for AAC support."
23	#LIB_DEPENDS+= mp4v2.1:${PORTSDIR}/multimedia/mpeg4ip
24	#.else
25	#pre-everything::
26	# @${ECHO_MSG}
27	# @${ECHO_MSG} "To enable AAC support define the WITH_AAC knob."
28	# @${ECHO_MSG}
29	.endif
30
31	USE_REINPLACE= yes	21	USE_REINPLACE= yes
32	USE_X_PREFIX= yes	22	USE_X_PREFIX= yes
33		23
Lines 35-43 Link Here
35	USE_GNOME= gtk20	25	USE_GNOME= gtk20
36	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
37		27
		28	.include <bsd.port.pre.mk>
		29
		30	.if exists(${LOCALBASE}/lib/libmp4v2.so)
		31	.if exists(${LOCALBASE}/include/mpeg4ip_config.h)
		32	WITH_AAC= YES
		33	.else
		34	WITH_FAAD= YES
		35	.endif
		36	.endif
		37	.if defined(WITH_AAC) && defined(WITH_FAAD)
		38	BROKEN= "WITH_AAC and WITH_FAAD are exclusive."
		39	.endif
		40	.if defined(WITH_AAC)
		41	LIB_DEPENDS+= mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip
		42	.endif
		43	.if defined(WITH_FAAD)
		44	LIB_DEPENDS+= mp4v2.0:${PORTSDIR}/audio/faad
		45	.endif
		46
38	CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"	47	CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
39	CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"	48	CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
40		49
		50	.if !defined(WITH_AAC) && !defined(WITH_FAAD)
		51	pre-everything::
		52	@${ECHO_MSG}
		53	@${ECHO_MSG} "To enable AAC support with mpeg4ip define the WITH_AAC knob."
		54	@${ECHO_MSG} "To enable AAC support with faad2 define the WITH_FAAD knob."
		55	@${ECHO_MSG}
		56	.endif
		57
		58	post-patch:
		59	@${CP} ${FILESDIR}/systems.h ${WRKSRC}/src
		60
41	pre-configure:	61	pre-configure:
42	# install locale correctly (share dir instead of lib dir)	62	# install locale correctly (share dir instead of lib dir)
43	@${REINPLACE_CMD} -e 's\|DATADIRNAME=lib\|DATADIRNAME=share\|' \	63	@${REINPLACE_CMD} -e 's\|DATADIRNAME=lib\|DATADIRNAME=share\|' \
Lines 53-56 Link Here
53	@${INSTALL_DATA} ${WRKSRC}/TODOandBUGS.txt ${DOCSDIR}	73	@${INSTALL_DATA} ${WRKSRC}/TODOandBUGS.txt ${DOCSDIR}
54	.endif	74	.endif
55		75
56	.include <bsd.port.mk>	76	.include <bsd.port.post.mk>

Lines 1-27 Link Here

(-)files/patch-configure (-27 lines)
1	--- configure.old Mon Jan 19 13:54:37 2004
2	+++ configure Tue Jan 20 00:27:43 2004
3	@@ -6409,7 +6409,6 @@
4	conftest$ac_exeext conftest.$ac_ext
5	if test "$ac_cv_search_MP4FileInfo" = no; then
6	for ac_lib in "mp4v2" "mp4v2 -lstdc++" "mp4v2 -lz" "mp4v2 -lz -lstdc++"; do
7	- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
8	cat >conftest.$ac_ext <<_ACEOF
9	/* confdefs.h. */
10	_ACEOF
11	@@ -6468,16 +6467,7 @@
12	fi
13	echo "$as_me:$LINENO: result: $ac_cv_search_MP4FileInfo" >&5
14	echo "${ECHO_T}$ac_cv_search_MP4FileInfo" >&6
15	-if test "$ac_cv_search_MP4FileInfo" != no; then
16	- test "$ac_cv_search_MP4FileInfo" = "none required" \|\| LIBS="$ac_cv_search_MP4FileInfo $LIBS"
17	- have_mp4v2="yes -- will build with aac support"
18	-cat >>confdefs.h <<_ACEOF
19	-#define HAVE_LIBMP4V2 1
20	-_ACEOF
21	-
22	-else
23	have_mp4v2="***no -- will build without aac support"
24	-fi
25
26
27

Lines 1-6 Link Here

(-)files/patch-src::mp4file.c (-3 / +16 lines)
1	--- src/mp4file.c.old Sat Jan 17 10:37:49 2004	1	Index: src/mp4file.c
2	+++ src/mp4file.c Tue Jan 20 21:33:20 2004	2	diff -u -p src/mp4file.c.orig src/mp4file.c
3	@@ -342,7 +342,7 @@	3	--- src/mp4file.c.orig Sat Jan 17 18:37:49 2004
		4	+++ src/mp4file.c Fri May 7 15:20:24 2004
		5	@@ -109,6 +109,10 @@
		6
		7	#include "mp4.h"
		8
		9	+#ifndef UINT64_TO_DOUBLE
		10	+#define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
		11	+#endif
		12	+
		13	Track file_get_mp4_info (gchar mp4FileName)
		14	{
		15	Track *track = NULL;
		16	@@ -342,7 +346,7 @@ Track file_get_mp4_info (gchar name)
4	return NULL;	17	return NULL;
5	}	18	}
6		19