ports/72205: [MAINTAINER] audio/faad2: Patch for new mpeg4ip [2 of 4]

[Michael Johnson]

>Number:         72205
>Category:       ports
>Synopsis:       [MAINTAINER] audio/faad2: Patch for new mpeg4ip [2 of 4]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 30 16:30:24 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Michael Johnson
>Release:        FreeBSD 5.3-BETA3 i386
>Organization:
>Environment:
System: FreeBSD blueheron.ahze.net 5.3-BETA3 FreeBSD 5.3-BETA3 #66: Tue Sep  7 12:56:04 EDT
>Description:
- make faad use libmp4v2 so mpeg4ip can use faad. 

(conflicts hell patch)

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- faad2-2.0_5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/faad/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile	29 Aug 2004 11:25:10 -0000	1.22
+++ Makefile	29 Sep 2004 16:17:17 -0000
@@ -7,15 +7,16 @@
 
 PORTNAME=	faad2
 PORTVERSION=	2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	faac
 
 MAINTAINER=	ahze at ahze.net
 COMMENT=	A LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder
 
-LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
+		sndfile.1:${PORTSDIR}/audio/libsndfile
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -28,9 +29,8 @@
 USE_GMAKE=	yes
 USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
-WANT_SDL=	yes
 
-CONFIGURE_ARGS=	--with-mp4v2 --with-drm
+CONFIGURE_ARGS=	--with-drm
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 
@@ -38,27 +38,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_MPEG4IP)
-PLIST_SUB+=	WITHOUT_MPEG4IP="" PLUGIN="@comment "
-.else
-LIB_DEPENDS+=	mp4.0:${PORTSDIR}/multimedia/mpeg4ip
-USE_SDL=	sdl
-PLIST_SUB+=	WITHOUT_MPEG4IP="@comment " PLUGIN=""
-.endif
-
-pre-everything::
-	@${ECHO_MSG} "===>"
-.if !defined(WITHOUT_MPEG4IP)
-	@${ECHO_MSG} "===> you can disable mpeg4ip support by"
-	@${ECHO_MSG} "===> defining WITHOUT_MPEG4IP"
-.else
-	@${ECHO_MSG} "===> WARNING: WITHOUT_MPEG4IP is defined"
-	@${ECHO_MSG} "===> Having WITHOUT_MPEG4IP defined conflicts"
-	@${ECHO_MSG} "===> with multimedia/mpeg4ip and you will not"
-	@${ECHO_MSG} "===> be able to install mpeg4ip after you install faad2"
-.endif
-	@${ECHO_MSG} "===>"
-
 pre-patch: build-depends
 
 post-patch:
@@ -68,11 +47,7 @@
 		${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake
 	@${REINPLACE_CMD} -e 's|$$lt_target|$$host|' \
 		${WRKSRC}/aclocal.m4
-.if !defined(WITHOUT_MPEG4IP)
-	@${REINPLACE_CMD} -e 's|<SDL|<SDL11|' \
-		${WRKSRC}/plugins/mpeg4ip/faad2.cpp
-.endif
-	@${ECHO_CMD} "SUBDIRS = libfaad common frontend plugins" > \
+	@${ECHO_CMD} "SUBDIRS = libfaad common frontend" > \
 		${WRKSRC}/Makefile.am
 .if ${OSVERSION} < 500000
 	@${REINPLACE_CMD} -e 's|stdint.h|sys/inttypes.h|' \
@@ -83,9 +58,5 @@
 		${XARGS} -n 5 -x \
 			${REINPLACE_CMD} -e \
 				's|-O2|${CFLAGS}|'
-post-install:
-.if defined(WITHOUT_MPEG4IP)
-	@${INSTALL_DATA} ${WRKSRC}/common/mp4v2/systems.h ${PREFIX}/include
-.endif
 
 .include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/audio/faad/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	24 May 2004 09:10:11 -0000	1.5
+++ pkg-plist	29 Sep 2004 04:08:30 -0000
@@ -7,12 +7,3 @@
 lib/libmp4ff.a
 lib/libmp4ff.so
 lib/libmp4ff.so.0
-%%PLUGIN%%lib/mp4player_plugin/faad2_plugin.a
-%%PLUGIN%%lib/mp4player_plugin/faad2_plugin.so
-%%PLUGIN%%lib/mp4player_plugin/faad2_plugin.so.0
-%%WITHOUT_MPEG4IP%%include/mp4.h
-%%WITHOUT_MPEG4IP%%include/mpeg4ip.h
-%%WITHOUT_MPEG4IP%%include/systems.h
-%%WITHOUT_MPEG4IP%%lib/libmp4v2.a
-%%WITHOUT_MPEG4IP%%lib/libmp4v2.so
-%%WITHOUT_MPEG4IP%%lib/libmp4v2.so.0
--- faad2-2.0_5.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: