From 083d74d1201b1dbf69c47d7dde8a03bc25204a62 Mon Sep 17 00:00:00 2001
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Sat, 19 Dec 2009 22:08:17 +0000
Subject: ../vlc.log

---
 multimedia/vlc/Makefile     | 50 +++++++++++++++++++--------------------------
 multimedia/vlc/Makefile.inc |  6 ------
 2 files changed, 21 insertions(+), 35 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 5d443708494b..3342b46d2535 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -24,13 +24,12 @@ RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-
 
 OPTIONS=	A52 "a52 audio support, many DVDs use this" On \
 		AALIB "Aalib Console Graphics Support" Off \
-		ARTS "Enable arts sound support" Off \
 		AVAHI "Avahi (Rendezvous/Bonjour (R) ) networking" On \
 		CACA "Libcaca Console Graphics Support" Off \
 		DBUS "Enable D-Bus control support" On \
 		DEBUG "Enable debuging support" Off \
+		DIRAC "Enable Dirac support" Off \
 		DTS "DTS decoder support, many DVDs use this" On \
-		ESOUND "Esound Support" Off \
 		FAAC "Faac audio encoder (mp4/aac) support" Off \
 		FAAD "Faad audio decoder (mp4/aac) support" On \
 		FLAC "Flac audio codec support" On \
@@ -62,17 +61,6 @@ OPTIONS=	A52 "a52 audio support, many DVDs use this" On \
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-.if !defined(WITHOUT_X11)
-WANT_GNOME=	yes
-USE_GNOME=	gnomehack gnometarget libxml2
-.endif
-.if !defined(WITHOUT_SDL) && !defined(WITHOUT_X11)
-WANT_SDL=	yes
-.endif
-.if !defined(WITHOUT_QT4) && !defined(WITHOUT_X11)
-USE_QT_VER+=	4
-QT_COMPONENTS+=	gui corelib moc_build rcc_build uic_build
-.endif
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 
@@ -99,8 +87,27 @@ MAN1=		vlc.1 \
 		vlc-config.1 \
 		vlc-wrapper.1
 
+.include <bsd.port.options.mk>
+
+.if !defined(WITHOUT_X11)
+WANT_GNOME=	yes
+USE_GNOME=	gnomehack gnometarget libxml2
+.endif
+.if !defined(WITHOUT_SDL) && !defined(WITHOUT_X11)
+WANT_SDL=	yes
+.endif
+.if !defined(WITHOUT_QT4) && !defined(WITHOUT_X11)
+USE_QT_VER=	4
+QT_COMPONENTS=	gui corelib moc_build rcc_build uic_build
+.endif
+
 .include <bsd.port.pre.mk>
 
+.if (${OSVERSION} < 700042) && defined(WITH_QT4)
+IGNORE=	does not build on FreeBSD 6.x with Qt4.x, set this OPTION to off or define\
+	WITHOUT_QT4 to build CLI only version
+.endif
+
 .if (${OSVERSION} < 701000)
 CFLAGS+=	-DHAVE_SYS_MOUNT_H
 .endif
@@ -242,13 +249,6 @@ CONFIGURE_ARGS+=--enable-hal
 CONFIGURE_ARGS+=--disable-hal
 .endif
 
-.if (defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS) && !defined(WITHOUT_X11)
-LIB_DEPENDS+=	 artsc.0:${PORTSDIR}/audio/arts
-CONFIGURE_ARGS+=	--enable-arts
-.else
-CONFIGURE_ARGS+=	--disable-arts
-.endif
-
 .if !defined(WITHOUT_AVAHI)
 LIB_DEPENDS+=	avahi-common.3:${PORTSDIR}/net/avahi-app
 CONFIGURE_ARGS+=	--enable-bonjour
@@ -300,13 +300,6 @@ CONFIGURE_ARGS+=--enable-dvdread
 CONFIGURE_ARGS+=--disable-dvdread
 .endif
 
-.if (defined(WITH_ESOUND) || defined(HAVE_GNOME) && ${HAVE_GNOME:Mesound}!="") && !defined(WITHOUT_ESOUND) && !defined(WITHOUT_X11)
-USE_GNOME+=	esound
-CONFIGURE_ARGS+=--enable-esd
-.else
-CONFIGURE_ARGS+=--disable-esd
-.endif
-
 .if defined(WITH_FAAC) && !defined(WITHOUT_FAAC)
 CONFIGURE_ARGS+=--with-ffmpeg-faac
 LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
@@ -341,8 +334,7 @@ CONFIGURE_ARGS+=--disable-aa
 .endif
 
 .if (defined(WITH_DIRAC) || exists(${LOCALBASE}/lib/libdirac_decoder.a)) && !defined(WITHOUT_DIRAC)
-BROKEN=		doesn't build with dirac
-LIB_DEPENDS+=	dirac_encoder.0:${PORTSDIR}/multimedia/dirac
+LIB_DEPENDS+=	dirac_decoder.1:${PORTSDIR}/multimedia/dirac
 CONFIGURE_ARGS+=--enable-dirac
 CPPFLAGS+=	-I${LOCALBASE}/include/dirac
 .else
diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc
index f3e89135ca30..79f39eb3862e 100644
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@@ -20,16 +20,10 @@
 #
 # Audio Knobs:
 #
-# WITH_ARTS=yes
-#  Arts Support
-#
 # WITHOUT_DTS=yes
 #  DTS decoder Support
 #  useful for many dvds
 #
-# WITH_ESOUND=yes
-#  Esound Support
-#
 # WITH_FAAC=yes
 #  Faac audio encoder (mp4/aac) Support
 #  ** Only enable this if you compiled multimedia/ffmpeg with WITH_FAAC knob **
-- 
cgit v1.2.3