ports/72675: [MAINTAINER] multimedia/vlc: use gcc3.4, xvid, autodetct esound, gnome, gtk

[Michael Johnson]

>Number:         72675
>Category:       ports
>Synopsis:       [MAINTAINER] multimedia/vlc: use gcc3.4, xvid, autodetct esound, gnome, gtk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 14 08:40:28 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Michael Johnson
>Release:        FreeBSD 5.3-BETA6 i386
>Organization:
>Environment:
System: FreeBSD blueheron.ahze.net 5.3-BETA6 FreeBSD 5.3-BETA6 #67: Fri Oct  1 15:03:41 EDT
>Description:
- Use gcc 3.4 (update from 3.3, only affects 4.x users)
- Use xvid default, xvid is becoming very popular.
   WITHOUT_XVID still works also.
- Always autodetect esound since this can be changed at runtime         
- Always autodetect gnome for gnome interface
- Make gtk interface optional but still default interface 


Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- vlc-0.7.2_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/vlc/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- Makefile	14 Oct 2004 04:06:58 -0000	1.62
+++ Makefile	14 Oct 2004 08:27:30 -0000
@@ -6,29 +6,58 @@
 #
 # Options to define Features:
 # WITH_AUTODETECT=yes
+#
 # WITH_GNOME=yes
+#  Gnome Interface
+#
+# WITHOUT_GTKVLC=yes
+#  Gtk12 Interface (Default interface)
+#
 # WITH_ESOUND=yes
+#
 # WITH_AALIB=yes
+#
 # WITH_CDDB=yes
+#
 # WITH_DTS=yes
+#
 # WITH_FRIBIDI=yes
+#
 # WITH_GGI=yes
+#
 # WITH_LIBDVBPSI=yes
+#
 # WITH_LIBID3TAG=yes
+#
 # WITH_LIBMATROSKA=yes
+#
 # WITH_LIBMPEG2=yes
+#
 # WITH_LIBTHEORA=yes
+#
 # WITH_LIVEMEDIA=yes
-# WITH_NCURSES=yes (ncurses interface)
+#
+# WITH_NCURSES=yes
+#  Ncurses interface
+#
 # WITH_SPEEX=yes
+#
 # WITH_SVGALIB=yes
+#
 # WITH_XOSD=yes
-# WITH_XVID=yes
+#
+# WITHOUT_XVID=yes
+#
 # WITH_WXWINDOWS=yes
+#  WxWindows Interface
+#
 # WITH_OPTIMIZED_CFLAGS=yes
+#
 # WITH_DVD_DEVICE=/dev/somedevice (5.x: default is acd0, 4:x default is acd0c)
 # WITH_CDROM_DEVICE=/dev/somedevice
+#
 # WITHOUT_NLS=yes
+#
 # WITHOUT_LIBID3TAG=yes
 
 PORTNAME=	vlc
@@ -92,11 +121,9 @@
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-USE_GCC=	3.3
+USE_GCC=	3.4
 .endif
 
-.if defined(WITH_AUTODETECT) && !defined(BATCH)
-
 .if ${HAVE_GNOME:Mgnomelibs}!="" && !defined(WITHOUT_GNOME)
 WITH_GNOME=	yes
 .endif
@@ -105,6 +132,8 @@
 WITH_ESOUND=	yes
 .endif
 
+.if defined(WITH_AUTODETECT) && !defined(BATCH)
+
 .if exists(${LOCALBASE}/lib/libaa.so.1) && !defined(WITHOUT_AALIB)
 WITH_AALIB=	yes
 .endif
@@ -153,10 +182,6 @@
 WITH_XOSD=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libxvidcore.so.4) && !defined(WITHOUT_XVID)
-WITH_XVID=	yes
-.endif
-
 .endif
 
 .if defined(WITH_MATROSKA)
@@ -194,8 +219,14 @@
 PLIST_FILES+=	bin/gnome-vlc \
 		lib/vlc/gui/libgnome_plugin.so \
 		lib/vlc/misc/libgnome_main_plugin.so
+.endif
+
+.if !defined(WITHOUT_GTKVLC)
+PLIST_FILES+=	bin/gvlc \
+		lib/vlc/gui/libgtk_plugin.so \
+		lib/vlc/misc/libgtk_main_plugin.so
 .else
-CONFIGURE_ARGS+=--enable-gtk
+CONFIGURE_ARGS+=--disable-gtk
 .endif
 
 .if defined(WITH_WXWINDOWS) && !defined(WITHOUT_WXWINDOWS)
@@ -322,7 +353,7 @@
 CONFIGURE_ARGS+=--disable-xosd
 .endif
 
-.if defined(WITH_XVID) && !defined(WITHOUT_XVID)
+.if !defined(WITHOUT_XVID)
 LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
 CONFIGURE_ARGS+=--enable-xvideo
 PLIST_FILES+=	lib/vlc/video_output/libxvideo_plugin.so
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/multimedia/vlc/pkg-plist,v
retrieving revision 1.18
diff -u -r1.18 pkg-plist
--- pkg-plist	21 Sep 2004 19:42:02 -0000	1.18
+++ pkg-plist	14 Oct 2004 08:16:03 -0000
@@ -1,4 +1,3 @@
-bin/gvlc
 bin/vlc
 bin/vlc-config
 include/vlc/aout.h
@@ -103,13 +102,11 @@
 lib/vlc/demux/libsgimb_plugin.so
 lib/vlc/demux/libts_plugin.so
 lib/vlc/demux/libwav_plugin.so
-lib/vlc/gui/libgtk_plugin.so
 lib/vlc/libffmpeg.a
 lib/vlc/libstream_out_transcode.a
 lib/vlc/misc/libdummy_plugin.so
 lib/vlc/misc/libexport_plugin.so
 lib/vlc/misc/libfreetype_plugin.so
-lib/vlc/misc/libgtk_main_plugin.so
 lib/vlc/misc/libipv4_plugin.so
 lib/vlc/misc/libipv6_plugin.so
 lib/vlc/misc/liblogger_plugin.so
--- vlc-0.7.2_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: