From acc7c83c0bc0166f2706bac1b24c4c0cabaa0e09 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sun, 10 Aug 2008 23:06:06 +0000 Subject: [PATCH] Only add the ffmpeg CPPFLAGS if not building with gstreamer. --- graphics/swfdec/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile index 8a352dde5927..951697ec5497 100644 --- a/graphics/swfdec/Makefile +++ b/graphics/swfdec/Makefile @@ -20,12 +20,14 @@ LIB_DEPENDS= oil-0.3.0:${PORTSDIR}/devel/liboil \ USE_GNOME= gnomehack gtk20 USE_AUTOTOOLS= libtool:15:env automake:19:env autoconf:261 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg" \ +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="-Wl,-Bsymbolic -L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-audio=oss USE_LDCONFIG= yes INSTALLS_ICONS= yes +CPPFLAGS= -I${LOCALBASE}/include + OPTIONS= GSTREAMER "Support for decoding some codecs with GStreamer" off PLIST_SUB= VERSION=${PORTVERSION:R} @@ -38,6 +40,7 @@ USE_GSTREAMER= yes LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ mad.2:${PORTSDIR}/audio/libmad CONFIGURE_ARGS+= --disable-gstreamer --enable-ffmpeg --enable-mad +CPPFLAGS+= -I${LOCALBASE}/include/ffmpeg .endif post-patch: