diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2005-01-22 00:18:25 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2005-01-22 00:18:25 +0000 |
| commit | 17f5cfcdaca4b8111d93dc5e84fc1510302d89f0 (patch) | |
| tree | 9d965788190fd6bb92becafb659fa5ffb8937669 | |
| parent | Use GCC 3.4 if built with WITH_MOZILLA_PLUGIN=mozilla-devel on 4.x (diff) | |
Disable lame support unless WITH_LAME is defined since lame can not be packaged.
Notes
Notes:
svn path=/head/; revision=127063
| -rw-r--r-- | multimedia/vlc-devel/Makefile | 8 | ||||
| -rw-r--r-- | multimedia/vlc/Makefile | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index da4307be9447..b3c11f73f4d2 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -51,7 +51,7 @@ # WITHOUT_FLAC=yes # Flac Support # -# WITHOUT_LAME=yes +# WITH_LAME=yes # Mp3 encoder Support # # WITHOUT_LIBA52=yes @@ -281,6 +281,10 @@ WITH_FRIBIDI= yes WITH_GGI= yes .endif +.if exists(${LOCALBASE}/lib/libmp3lame.a) && !defined(WITHOUT_LAME) +WITH_LAME= yes +.endif + .if exists(${LOCALBASE}/lib/libtheora.so.1) && !defined(WITHOUT_LIBTHEORA) WITH_LIBTHEORA= yes .endif @@ -481,7 +485,7 @@ CONFIGURE_ARGS+=--enable-ggi CONFIGURE_ARGS+=--disable-ggi .endif -.if !defined(WITHOUT_LAME) +.if defined(WITH_LAME) && !defined(WITHOUT_LAME) LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame CONFIGURE_ARGS+=--enable-mp3lame .else diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index da4307be9447..b3c11f73f4d2 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -51,7 +51,7 @@ # WITHOUT_FLAC=yes # Flac Support # -# WITHOUT_LAME=yes +# WITH_LAME=yes # Mp3 encoder Support # # WITHOUT_LIBA52=yes @@ -281,6 +281,10 @@ WITH_FRIBIDI= yes WITH_GGI= yes .endif +.if exists(${LOCALBASE}/lib/libmp3lame.a) && !defined(WITHOUT_LAME) +WITH_LAME= yes +.endif + .if exists(${LOCALBASE}/lib/libtheora.so.1) && !defined(WITHOUT_LIBTHEORA) WITH_LIBTHEORA= yes .endif @@ -481,7 +485,7 @@ CONFIGURE_ARGS+=--enable-ggi CONFIGURE_ARGS+=--disable-ggi .endif -.if !defined(WITHOUT_LAME) +.if defined(WITH_LAME) && !defined(WITHOUT_LAME) LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame CONFIGURE_ARGS+=--enable-mp3lame .else |