ports/71041: [MAINTAINER] audio/faad2: [Fix SDL support with WITHOUT_MPEG4IP]

[Michael Johnson]

>Number:         71041
>Category:       ports
>Synopsis:       [MAINTAINER] audio/faad2: [Fix SDL support with WITHOUT_MPEG4IP]
>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:   Fri Aug 27 18:00:47 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Michael Johnson
>Release:        FreeBSD 5.3-BETA1 i386
>Organization:
>Environment:
System: FreeBSD gentoo.ahze.net 5.3-BETA1 FreeBSD 5.3-BETA1 #64: Thu Aug 26 13:59:58 EDT 2004
>Description:
- Only use sdl support if WITHOUT_MPEG4IP is not defined 
   pointed out by ingmar.gebert at stud.uni-rostock.de

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

--- faad2-2.0_4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /usr/opt/cvs/freebsd-src/ports/audio/faad/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	9 Jul 2004 17:41:51 -0000	1.21
+++ Makefile	27 Aug 2004 17:46:12 -0000
@@ -28,7 +28,7 @@
 USE_GMAKE=	yes
 USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
-USE_SDL=	yes
+WANT_SDL=	yes
 
 CONFIGURE_ARGS=	--with-mp4v2 --with-drm
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -42,6 +42,7 @@
 PLIST_SUB+=	WITHOUT_MPEG4IP="" PLUGIN="@comment "
 .else
 LIB_DEPENDS+=	mp4.0:${PORTSDIR}/multimedia/mpeg4ip
+USE_SDL=	sdl
 PLIST_SUB+=	WITHOUT_MPEG4IP="@comment " PLUGIN=""
 .endif
 
@@ -67,8 +68,10 @@
 		${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" > \
 		${WRKSRC}/Makefile.am
 .if ${OSVERSION} < 500000
--- faad2-2.0_4.patch ends here ---

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