diff options
| author | ahze <ahze@FreeBSD.org> | 2005-05-11 08:31:13 +0800 |
|---|---|---|
| committer | ahze <ahze@FreeBSD.org> | 2005-05-11 08:31:13 +0800 |
| commit | b0dd13fec32ff95dca0871c7cfe23b8eb6f62548 (patch) | |
| tree | 48bd9d3b5423d9787dd583116dd7315845a1c460 /multimedia/vlc | |
| parent | 433de9b18aa7d945e0bd8d72a8785384b9e98528 (diff) | |
| download | freebsd-ports-gnome-b0dd13fec32ff95dca0871c7cfe23b8eb6f62548.tar.gz freebsd-ports-gnome-b0dd13fec32ff95dca0871c7cfe23b8eb6f62548.tar.zst freebsd-ports-gnome-b0dd13fec32ff95dca0871c7cfe23b8eb6f62548.zip | |
- Remove need for audio/speex-devel, since audio/speex as of version 1.0.5
supports 1.1 (speex-devel) API. speex or speex-devel can be used.
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/Makefile | 13 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-configure | 27 |
2 files changed, 25 insertions, 15 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 48651ca27829..cacdbf388c01 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -295,12 +295,8 @@ WITH_LIBTHEORA= yes .endif .if exists(${LOCALBASE}/lib/libspeex.a) && !defined(WITHOUT_SPEEX) -.if exists(${LOCALBASE}/include/speex.h) -WITHOUT_SPEEX= yes -.else WITH_SPEEX= yes .endif -.endif .if exists(${LOCALBASE}/lib/libgnutls.a) && !defined(WITHOUT_SSL) WITH_SSL= yes @@ -575,7 +571,7 @@ CONFIGURE_ARGS+=--disable-slp .endif .if defined(WITH_SPEEX) && !defined(WITHOUT_SPEEX) -LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex-devel +LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex CONFIGURE_ARGS+=--enable-speex CPPFLAGS+=-I${LOCALBASE}/include/speex .else @@ -646,13 +642,6 @@ pre-everything:: @${ECHO_MSG} "Take a careful look at the beginning of the Makefile in order" @${ECHO_MSG} "to learn how to tune VLC towards you personal preferences!" @${ECHO_MSG} "For example, make WITH_MOZILLA_PLUGIN=firefox" -.if defined(WITH_SPEEX) && exists(${LOCALBASE}/include/speex.h) - @${ECHO_MSG} "" - @${ECHO_MSG} "**** WARNING ****" - @${ECHO_MSG} "Speex 1.0 was detected, if you want Speex support" - @${ECHO_MSG} "Please upgrade speex to audio/speex-devel (1.1.x)" - @${ECHO_MSG} "" -.endif post-patch: # Subtitle default font diff --git a/multimedia/vlc/files/patch-configure b/multimedia/vlc/files/patch-configure index fd460cf24eb6..b41443af43f4 100644 --- a/multimedia/vlc/files/patch-configure +++ b/multimedia/vlc/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Wed Nov 3 08:47:13 2004 -+++ configure Wed Nov 3 08:50:12 2004 -@@ -4967,7 +4967,6 @@ +--- configure.orig Sun Nov 14 12:45:51 2004 ++++ configure Tue May 10 20:27:55 2005 +@@ -4969,7 +4969,6 @@ ;; bsdi*) SYS=bsdi @@ -8,3 +8,24 @@ for element in dvd dvdcss vcd cdda vcdx cddax; do eval "LDFLAGS_${element}="'"'"-ldvd "'$'"{LDFLAGS_${element}} "'"' +@@ -27489,8 +27488,8 @@ + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + +- echo "$as_me:$LINENO: checking for libspeex version > 1.1.0" >&5 +-echo $ECHO_N "checking for libspeex version > 1.1.0... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for libspeex version > 1.0.5" >&5 ++echo $ECHO_N "checking for libspeex version > 1.0.5... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27498,9 +27497,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <speex.h> +- #ifdef SPEEX_SET_SUBMODE_ENCODING + yes +- #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then |