aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorJeremy Messenger <mezz@FreeBSD.org>2006-08-20 05:30:55 +0000
committerJeremy Messenger <mezz@FreeBSD.org>2006-08-20 05:30:55 +0000
commitb2cb19cdbdf4f3ea3deec10af66c01a46d4f14e9 (patch)
treea672ad2d209e43f0963b94f5f424442c198c0610 /multimedia
parentadd5a3398c5c2e094ead4455b6f3b2bc7bde355e (diff)
downloadports-b2cb19cdbdf4f3ea3deec10af66c01a46d4f14e9.tar.gz
ports-b2cb19cdbdf4f3ea3deec10af66c01a46d4f14e9.zip
Notes
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/vlc/Makefile16
-rw-r--r--multimedia/vlc/files/patch-modules_control_corba_corba.c12
2 files changed, 20 insertions, 8 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index c18257d619f4..9cf00079a03d 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -10,7 +10,7 @@
PORTNAME= vlc
DISTVERSION= 0.8.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
@@ -40,7 +40,7 @@ USE_PERL5_BUILD=yes
FAKEDIR= ${WRKDIR}/fake
PLIST= ${WRKDIR}/plist
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
@@ -69,11 +69,11 @@ CPPFLAGS+= -I${X11BASE}/include/wx-2.6/
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-BROKEN= does not build on FreeBSD 4.x
+BROKEN= Does not build on FreeBSD 4.x
.endif
.if ${PERL_LEVEL} < 500800
-BROKEN= does not compile with perl ${PERL_VERSION}
+BROKEN= Does not compile with perl ${PERL_VERSION}
.endif
.if exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) || !exists(${LOCALBASE}/lib/libavformat.a)
@@ -378,7 +378,7 @@ CONFIGURE_ARGS+= --enable-real \
.if (defined(WITH_SHOUT) || exists(${LOCALBASE}/lib/libshout.a)) && !defined(WITHOUT_SHOUT)
LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2
-CONFIGURE_AGRS+= --enable-shout
+CONFIGURE_ARGS+= --enable-shout
.endif
.if (defined(WITH_THEORA) || exists(${LOCALBASE}/lib/libtheora.a)) && !defined(WITHOUT_THEORA)
@@ -425,7 +425,7 @@ CONFIGURE_ARGS+=--disable-galaktos
.endif
.if !defined(WITHOUT_SAMBA)
-LIB_DEPEND+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient
CONFIGURE_ARGS+=--enable-smb
.else
CONFIGURE_ARGS+=--disable-smb
@@ -471,7 +471,7 @@ CONFIGURE_ARGS+=--disable-sout
USE_GNOME+= librsvg2
CONFIGURE_ARGS+=--enable-svg
.else
-CONFIGURE_AGRS+=--disable-svg
+CONFIGURE_ARGS+=--disable-svg
.endif
.if (defined(WITH_SVGALIB) || exists(${LOCALBASE}/lib/lib/vga.a)) && !defined(WITHOUT_SVGALIB)
@@ -509,7 +509,7 @@ CONFIGURE_ARGS+=--disable-xosd
.endif
.if defined(DEBUG)
-CONFIGURE_AGRS+=--enable-debug
+CONFIGURE_ARGS+=--enable-debug
.else
CONFIGURE_ARGS+=--enable-release
.endif
diff --git a/multimedia/vlc/files/patch-modules_control_corba_corba.c b/multimedia/vlc/files/patch-modules_control_corba_corba.c
new file mode 100644
index 000000000000..040a156cae8b
--- /dev/null
+++ b/multimedia/vlc/files/patch-modules_control_corba_corba.c
@@ -0,0 +1,12 @@
+--- modules/control/corba/corba.c.orig Sun Aug 20 00:16:21 2006
++++ modules/control/corba/corba.c Sun Aug 20 00:17:24 2006
+@@ -28,8 +28,8 @@
+ #include "MediaControl.h"
+ #include "orbit/poa/portableserver-poa-type.h"
+
+-#include <vlc/control.h>
+ #include <vlc/vlc.h>
++#include <vlc/mediacontrol.h>
+ #include <vlc/intf.h>
+ #include <vlc/vout.h>
+ #include <vlc/aout.h>