Attachment #87684 for bug #124307

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




#

PORTNAME=	faad2
PORTVERSION=	2.6.1
PORTREVISION=	9
CATEGORIES=	audio
MASTER_SITES=	SF/faac
PKGNAMEPREFIX=	bmp-

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Beep Media Player (BMP) plugin for faad

LIB_DEPENDS=	faad.0:${PORTSDIR}/audio/faad \
LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
		faad.0:${PORTSDIR}/audio/faad \
		mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
		beep.2:${PORTSDIR}/multimedia/beep-media-player

WRKSRC=		${WRKDIR}/${PORTNAME}

USE_GNOME=	gnometarget gtk20
USE_GMAKE=	yes
USE_AUTOTOOLS=	automake:15 autoheader:261 autoconf:261 libtool:15
AUTOMAKE_ARGS=	--add-missing
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"

CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS=	--with-xmms --with-mp4v2
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_GTK" \
		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \

DESCR=		${PORTSDIR}/audio/faad/pkg-descr
PLIST_FILES=	lib/bmp/Input/libmp4.so
		lib/bmp/Input/libmp4.la \
		lib/bmp/Input/libmp4.so

BUILD_WRKSRC=	${WRKSRC}/plugins/xmms/src
INSTALL_WRKSRC=	${WRKSRC}/plugins/xmms/src

.include <bsd.port.pre.mk>

post-patch:
	@${REINPLACE_CMD} -e '/AC_CONFIG_FILES(plugins/d' ${WRKSRC}/configure.in
	@${REINPLACE_CMD} -e 's|"faad.h"|<faad.h>|g ; \
		 s|<xmms/|<bmp/|g' ${WRKSRC}/plugins/xmms/src/mp4_utils.c
	@${ECHO_CMD} "SUBDIRS = common" > ${WRKSRC}/Makefile.am

pre-configure:
	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
		&& ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --automake

post-build:
	cd ${WRKSRC}/plugins/xmms/src && ${CC} ${CFLAGS} -fPIC -shared \
		-DHAVE_BMP -I../../../common/mp4ff -I${LOCALBASE}/include \
		`pkg-config --cflags bmp` *.c -o libmp4.so \
		../../../common/mp4ff/.libs/libmp4ff.a \
		-L${LOCALBASE}/lib -lfaad \
		`pkg-config --libs bmp`

do-install:
	${INSTALL_DATA} ${WRKSRC}/plugins/xmms/src/libmp4.so \
		${PREFIX}/lib/bmp/Input

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)audio/bmp-faad/distinfo (-3 / +3 lines)
1	MD5 (faad2-2.0.tar.gz) = 1a6f79365f2934a4888b210ef47a3a07	1	MD5 (faad2-2.6.1.tar.gz) = 74e92df40c270f216a8305fc87603c8a
2	SHA256 (faad2-2.0.tar.gz) = a62a4622862252e53e0dd58c3b0307a138f5100304e07bf50c8aee31a68ab861	2	SHA256 (faad2-2.6.1.tar.gz) = 8ad2c2e0c09b787a943e2ef831c1c84534e3a8726cc1eb1abc4da9eb3038285c
3	SIZE (faad2-2.0.tar.gz) = 766660	3	SIZE (faad2-2.6.1.tar.gz) = 839410




--- configure.in.orig	Thu Sep  2 13:17:44 2004
+++ configure.in	Thu Sep  2 13:19:45 2004
@@ -88,10 +88,6 @@
 fi
 
 if test x$WITHXMMS = xyes; then
-  AC_CHECK_PROGS(XMMS_CONFIG, xmms-config,"not_found")
-  if test "$XMMS_CONFIG" = "not_found"; then
-    AC_MSG_ERROR("*** xmms-config not found - xmms plugin can't be build")
-  fi
   AC_CHECK_HEADER(pthread.h,,
            AC_MSG_ERROR(*** pthread headers support not installed or not found))
   AC_CHECK_HEADER(id3.h,,




--- plugins/xmms/src/Makefile.am.orig	Fri Feb  6 11:05:07 2004
+++ plugins/xmms/src/Makefile.am	Thu Nov 11 18:56:18 2004
@@ -1,13 +1,10 @@
-libdir = `$(XMMS_CONFIG) --input-plugin-dir`
+libdir = `pkg-config --variable=input_plugin_dir bmp`
 lib_LTLIBRARIES = libmp4.la
 
-libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cflags` -Wall \
-       `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \
+libmp4_la_CFLAGS = `pkg-config gtk+-2.0 --cflags` -Wall \
+       `pkg-config bmp --cflags` \
        -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
 
-libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
-       $(top_builddir)/common/mp4v2/libmp4v2.la
-
-libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \
-       `$(GTK_CONFIG) --libs` -lpthread -lstdc++
+libmp4_la_LDFLAGS = -module -avoid-version `pkg-config bmp --libs` \
+       `pkg-config gtk+-2.0 --libs` -lstdc++ -lfaad -lmp4v2
 libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c




--- plugins/xmms/src/mp4_utils.c.orig	Thu Dec  4 03:37:56 2003
+++ plugins/xmms/src/mp4_utils.c	Sun Sep 18 00:00:40 2005
@@ -54,7 +54,7 @@
     const char *trackType = MP4GetTrackType(file, trackID);
     if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
       int j=0;
-      u_int8_t audiotype = MP4GetTrackAudioType(file, trackID);
+      u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(file, trackID);
       while(mp4AudioTypes[j]){ // what kind of audio is ?
 	if(mp4AudioTypes[j] == audiotype){
 	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){//MPEG4 audio ok
@@ -126,7 +126,7 @@
     printf("Track %d, %s", trackID, trackType);
     if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
       int j=0;
-      u_int8_t audiotype = MP4GetTrackAudioType(mp4file, trackID);
+      u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(mp4file, trackID);
       while(mp4AudioTypes[j]){ // what kind of audio is ?
 	if(mp4AudioTypes[j] == audiotype){
 	  if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){

Return to bug 124307

Lines 6-13 Link Here

(-)audio/bmp-faad/Makefile (-35 / +28 lines)
6	#	6	#
7		7
8	PORTNAME= faad2	8	PORTNAME= faad2
9	PORTVERSION= 2.0	9	PORTVERSION= 2.6.1
10	PORTREVISION= 9
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= SF/faac	11	MASTER_SITES= SF/faac
13	PKGNAMEPREFIX= bmp-	12	PKGNAMEPREFIX= bmp-
Lines 15-63 Link Here
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT= Beep Media Player (BMP) plugin for faad	15	COMMENT= Beep Media Player (BMP) plugin for faad
17		16
18	PATCH_DEPENDS= ${AUTOMAKE_DEPENDS} ${AUTOCONF_DEPENDS} ${LIBTOOL_DEPENDS}	17	LIB_DEPENDS= faad.0:${PORTSDIR}/audio/faad \
19	LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
20	faad.0:${PORTSDIR}/audio/faad \
21	mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
22	beep.2:${PORTSDIR}/multimedia/beep-media-player	18	beep.2:${PORTSDIR}/multimedia/beep-media-player
23		19
24	WRKSRC= ${WRKDIR}/${PORTNAME}	20	WRKSRC= ${WRKDIR}/${PORTNAME}
25		21
		22	USE_GNOME= gnometarget gtk20
		23	USE_GMAKE= yes
26	USE_AUTOTOOLS= automake:15 autoheader:261 autoconf:261 libtool:15	24	USE_AUTOTOOLS= automake:15 autoheader:261 autoconf:261 libtool:15
27	AUTOMAKE_ARGS= --add-missing	25	AUTOMAKE_ARGS= --add-missing
28	USE_GMAKE= yes	26	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
29	USE_GNOME= gtk20	27	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
30
31	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
32	CONFIGURE_ARGS= --with-xmms --with-mp4v2
33	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_GTK" \
34	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
35		28
36	DESCR= ${PORTSDIR}/audio/faad/pkg-descr	29	DESCR= ${PORTSDIR}/audio/faad/pkg-descr
37	PLIST_FILES= lib/bmp/Input/libmp4.a \	30	PLIST_FILES= lib/bmp/Input/libmp4.so
38	lib/bmp/Input/libmp4.la \
39	lib/bmp/Input/libmp4.so
40
41	BUILD_WRKSRC= ${WRKSRC}/plugins/xmms/src
42	INSTALL_WRKSRC= ${WRKSRC}/plugins/xmms/src
43		31
44	.include <bsd.port.pre.mk>	32	.include <bsd.port.pre.mk>
45		33
46	post-patch:	34	post-patch:
47	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|' ${WRKSRC}/plugins/xmms/src/Makefile.am	35	@${REINPLACE_CMD} -e '/AC_CONFIG_FILES(plugins/d' ${WRKSRC}/configure.in
48	@${REINPLACE_CMD} -e 's\|"faad.h"\|<faad.h>\|; s\|"mp4.h"\|<mp4.h>\|' \	36	@${REINPLACE_CMD} -e 's\|"faad.h"\|<faad.h>\|g ; \
49	${WRKSRC}/plugins/xmms/src/libmp4.c	37	s\|<xmms/\|<bmp/\|g' ${WRKSRC}/plugins/xmms/src/mp4_utils.c
50	# make sure everything is prepared prior to configure stage	38	@${ECHO_CMD} "SUBDIRS = common" > ${WRKSRC}/Makefile.am
51	# pre-configure will not work since AUTO tools happen in-between	39
52	@cd ${WRKSRC}; ${ACLOCAL} -I ${ACLOCAL_DIR} -I .; \	40	pre-configure:
53	${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake	41	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
54	@${REINPLACE_CMD} -e 's\|$$lt_target\|$$host\|' \	42	&& ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --automake
55	-e '/^_LT_AC_SHELL_INIT/d' ${WRKSRC}/aclocal.m4	43
56	# CFLAGS safeness	44	post-build:
57	@${FIND} ${WRKSRC} -type f -name Makefile.am \| \	45	cd ${WRKSRC}/plugins/xmms/src && ${CC} ${CFLAGS} -fPIC -shared \
58	${XARGS} -n 5 -x \	46	-DHAVE_BMP -I../../../common/mp4ff -I${LOCALBASE}/include \
59	${REINPLACE_CMD} -e \	47	`pkg-config --cflags bmp` *.c -o libmp4.so \
60	's\|-O2\|${CFLAGS}\|'	48	../../../common/mp4ff/.libs/libmp4ff.a \
61	@${REINPLACE_CMD} -e 's\|<xmms\|<bmp\|' ${WRKSRC}/plugins/xmms/src/libmp4.c	49	-L${LOCALBASE}/lib -lfaad \
		50	`pkg-config --libs bmp`
		51
		52	do-install:
		53	${INSTALL_DATA} ${WRKSRC}/plugins/xmms/src/libmp4.so \
		54	${PREFIX}/lib/bmp/Input
62		55
63	.include <bsd.port.post.mk>	56	.include <bsd.port.post.mk>

Lines 1-13 Link Here

(-)audio/bmp-faad/files/patch-configure (-13 lines)
1	--- configure.in.orig Thu Sep 2 13:17:44 2004
2	+++ configure.in Thu Sep 2 13:19:45 2004
3	@@ -88,10 +88,6 @@
4	fi
5
6	if test x$WITHXMMS = xyes; then
7	- AC_CHECK_PROGS(XMMS_CONFIG, xmms-config,"not_found")
8	- if test "$XMMS_CONFIG" = "not_found"; then
9	- AC_MSG_ERROR("*** xmms-config not found - xmms plugin can't be build")
10	- fi
11	AC_CHECK_HEADER(pthread.h,,
12	AC_MSG_ERROR(*** pthread headers support not installed or not found))
13	AC_CHECK_HEADER(id3.h,,

Lines 1-21 Link Here

(-)audio/bmp-faad/files/patch-xmms-Makefile.am (-21 lines)
1	--- plugins/xmms/src/Makefile.am.orig Fri Feb 6 11:05:07 2004
2	+++ plugins/xmms/src/Makefile.am Thu Nov 11 18:56:18 2004
3	@@ -1,13 +1,10 @@
4	-libdir = `$(XMMS_CONFIG) --input-plugin-dir`
5	+libdir = `pkg-config --variable=input_plugin_dir bmp`
6	lib_LTLIBRARIES = libmp4.la
7
8	-libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cflags` -Wall \
9	- `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \
10	+libmp4_la_CFLAGS = `pkg-config gtk+-2.0 --cflags` -Wall \
11	+ `pkg-config bmp --cflags` \
12	-I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
13
14	-libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
15	- $(top_builddir)/common/mp4v2/libmp4v2.la
16	-
17	-libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \
18	- `$(GTK_CONFIG) --libs` -lpthread -lstdc++
19	+libmp4_la_LDFLAGS = -module -avoid-version `pkg-config bmp --libs` \
20	+ `pkg-config gtk+-2.0 --libs` -lstdc++ -lfaad -lmp4v2
21	libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c

Lines 1-20 Link Here

(-)audio/bmp-faad/files/patch-xmms-mp4_utils.c (-20 lines)
1	--- plugins/xmms/src/mp4_utils.c.orig Thu Dec 4 03:37:56 2003
2	+++ plugins/xmms/src/mp4_utils.c Sun Sep 18 00:00:40 2005
3	@@ -54,7 +54,7 @@
4	const char *trackType = MP4GetTrackType(file, trackID);
5	if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
6	int j=0;
7	- u_int8_t audiotype = MP4GetTrackAudioType(file, trackID);
8	+ u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(file, trackID);
9	while(mp4AudioTypes[j]){ // what kind of audio is ?
10	if(mp4AudioTypes[j] == audiotype){
11	if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){//MPEG4 audio ok
12	@@ -126,7 +126,7 @@
13	printf("Track %d, %s", trackID, trackType);
14	if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track !
15	int j=0;
16	- u_int8_t audiotype = MP4GetTrackAudioType(mp4file, trackID);
17	+ u_int8_t audiotype = MP4GetTrackEsdsObjectTypeId(mp4file, trackID);
18	while(mp4AudioTypes[j]){ // what kind of audio is ?
19	if(mp4AudioTypes[j] == audiotype){
20	if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){