From nobody@FreeBSD.org  Thu May 28 06:05:45 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0F464106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 28 May 2009 06:05:45 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id F14EC8FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 28 May 2009 06:05:44 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n4S65icE048328
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 28 May 2009 06:05:44 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n4S65ila048327;
	Thu, 28 May 2009 06:05:44 GMT
	(envelope-from nobody)
Message-Id: <200905280605.n4S65ila048327@www.freebsd.org>
Date: Thu, 28 May 2009 06:05:44 GMT
From: Nick Triantos <nick-freebsd@triantos.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Port multimedia/vlc fails to compile when WITHOUT_X11=1 due to dependency on glx
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: jsa@wickedmachine.net

>Number:         135018
>Category:       ports
>Synopsis:       Port multimedia/vlc fails to compile when WITHOUT_X11=1 due to dependency on glx
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    thierry
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 28 06:10:01 UTC 2009
>Closed-Date:    Mon Nov 02 22:56:52 UTC 2009
>Last-Modified:  Mon Nov  2 23:00:18 UTC 2009
>Originator:     Nick Triantos
>Release:        7.2-RELEASE
>Organization:
>Environment:
FreeBSD bsd.triantos.com 7.2-RELEASE FreeBSD 7.2-RELEASE #15: Mon May  4 13:41:52 PDT 2009     nickXXXbsd.triantos.com:/usr/obj/usr/src/sys/BSD-TRIANTOS  i386
>Description:
When compiling VLC with WITHOUT_X11=1, the port will fail to compile due to dependency on libglx.  Specifically, the source's configure script will fail.
>How-To-Repeat:
cd /usr/ports/multimedia/vlc
make WITHOUT_LIBNOTIFY=1 WITHOUT_HAL=1 WITHOUT_OPENGL=1 WITHOUT_X11=1 WITHOUT_V4L=1 package
>Fix:
In Makefile, disable glx if X11 is also disabled.

.if defined(WITHOUT_X11)
CONFIGURE_ARGS+=--disable-x11 \
        --disable-glx
.else
USE_XORG=   xpm
CONFIGURE_ARGS+=--enable-x11 \
        --enable-glx
.endif


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu May 28 06:10:11 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135018 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: jsa@wickedmachine.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/135018: Port multimedia/vlc fails to compile when WITHOUT_X11=1 due to dependency on glx
Date: Thu, 28 May 2009 06:10:09 UT

 Maintainer of multimedia/vlc,
 
 Please note that PR ports/135018 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/135018
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: "Joseph S. Atkinson" <jsa.bsd@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/135018: Port multimedia/vlc fails to compile when WITHOUT_X11=1
 due to dependency on glx
Date: Mon, 01 Jun 2009 22:35:57 -0400

 Quick not to acknowledge this. I will not have time to look at this 
 until the weekend (June 4th at earliest). Sorry.
 
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Fri Jul 17 01:43:59 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135018 

From: Christopher Key <cjk32@cam.ac.uk>
To: bug-followup@FreeBSD.org, nick-freebsd@triantos.com
Cc:  
Subject: Re: ports/135018: Port multimedia/vlc fails to compile when WITHOUT_X11=1
 due to dependency on glx
Date: Thu, 13 Aug 2009 21:50:46 +0100

 This is a multi-part message in MIME format.
 --------------050902070005010105030200
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 I've found that I need to disable quite a bit more (patch attached) to
 get vlc to compile on a headless system.  I've disabled installing
 content from libdata if WITHOUT_X11 is set, but I don't think this is
 right.  Instead, it should probably depend upon one or more of the
 options that WITHOUT_X11 also turns off, but I don't have any easy way
 to ascertain what.
 
 --------------050902070005010105030200
 Content-Type: text/plain;
  name="multimedia-vlc-without-x11-3.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="multimedia-vlc-without-x11-3.patch"
 
 diff -ur /usr/ports/multimedia/vlc/Makefile ./multimedia/vlc/Makefile
 --- /usr/ports/multimedia/vlc/Makefile	2009-08-02 03:16:58.000000000 +0100
 +++ ./multimedia/vlc/Makefile	2009-08-03 11:26:45.000000000 +0100
 @@ -10,7 +10,7 @@
  
  PORTNAME=	vlc
  DISTVERSION=	1.0.0
 -PORTREVISION=	1
 +PORTREVISION=	2
  PORTEPOCH=	3
  CATEGORIES=	multimedia audio ipv6 net www
  MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
 @@ -20,8 +20,6 @@
  MAINTAINER=	jsa@wickedmachine.net
  COMMENT=	Multimedia streaming server and player for various audio/video formats
  
 -BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat \
 -		${LOCALBASE}/include/X11/xpm.h:${PORTSDIR}/x11/libXpm
  LIB_DEPENDS=	tar.0:${PORTSDIR}/devel/libtar \
  		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
  RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
 @@ -66,9 +64,13 @@
  
  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
  USE_ICONV=	yes
  USE_PERL5_BUILD=yes
  
 @@ -88,7 +90,8 @@
  			--enable-postproc \
  			--without-dv-raw1394 \
  			--disable-dv \
 -			--disable-galaktos
 +			--disable-galaktos \
 +			--disable-glx
  
  MAN1=		vlc.1 \
  		vlc-config.1 \
 @@ -106,7 +109,7 @@
  BROKEN=	Does not compile with perl ${PERL_VERSION}
  .endif
  
 -.if !defined(WITHOUT_QT4)
 +.if !defined(WITHOUT_QT4) && !defined(WITHOUT_X11)
  USE_QT_VER+=	4
  QT_COMPONENTS+=	gui corelib moc_build rcc_build uic_build
  CONFIGURE_ARGS+=--enable-qt4
 @@ -163,7 +166,7 @@
  DEFAULT_DVD_DEVICE=/dev/acd0
  .endif
  
 -.if !defined(WITHOUT_GNOMEVFS)
 +.if !defined(WITHOUT_GNOMEVFS) && !defined(WITHOUT_X11)
  USE_GNOME+=	gnomevfs2
  CONFIGURE_ARGS+=	--enable-gnomevfs
  .else
 @@ -176,14 +179,14 @@
  DEFAULT_CDROM_DEVICE=/dev/acd0
  .endif
  
 -.if !defined(WITHOUT_LIBNOTIFY)
 +.if !defined(WITHOUT_LIBNOTIFY) && !defined(WITHOUT_X11)
  LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
  CONFIGURE_ARGS+=--enable-notify
  .else
  CONFIGURE_ARGS+=--disable-notify
  .endif
  
 -.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) && !defined(WITHOUT_QT4)
 +.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) && !defined(WITHOUT_QT4) && !defined(WITHOUT_X11)
  CONFIGURE_ARGS+=--enable-skins2
  .else
  CONFIGURE_ARGS+=--disable-skins2
 @@ -231,14 +234,14 @@
  CONFIGURE_ARGS+=--disable-zvbi
  .endif
  
 -.if !defined(WITHOUT_HAL)
 +.if !defined(WITHOUT_HAL) && !defined(WITHOUT_X11)
  LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
  CONFIGURE_ARGS+=--enable-hal
  .else
  CONFIGURE_ARGS+=--disable-hal
  .endif
  
 -.if (defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS)
 +.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
 @@ -296,7 +299,7 @@
  CONFIGURE_ARGS+=--disable-dvdread
  .endif
  
 -.if (defined(WITH_ESOUND) || ${HAVE_GNOME:Mesound}!="") && !defined(WITHOUT_ESOUND)
 +.if (defined(WITH_ESOUND) || defined(HAVE_GNOME) && ${HAVE_GNOME:Mesound}!="") && !defined(WITHOUT_ESOUND) && !defined(WITHOUT_X11)
  USE_GNOME+=	esound
  CONFIGURE_ARGS+=--enable-esd
  .else
 @@ -502,7 +505,7 @@
  CONFIGURE_ARGS+=--disable-smb
  .endif
  
 -.if !defined(WITHOUT_SDL)
 +.if !defined(WITHOUT_SDL) && !defined(WITHOUT_X11)
  USE_SDL=	image
  CONFIGURE_ARGS+=--enable-sdl
  .else
 @@ -532,7 +535,7 @@
  CONFIGURE_ARGS+=--disable-sout
  .endif
  
 -.if (defined(WITH_SVG) || ${HAVE_GNOME:Mlibrsvg2}!="") && !defined(WITHOUT_SVG)
 +.if (defined(WITH_SVG) || defined(HAVE_GNOME) && ${HAVE_GNOME:Mlibrsvg2}!="") && !defined(WITHOUT_SVG) && !defined(WITHOUT_X11)
  USE_GNOME+=	librsvg2
  CONFIGURE_ARGS+=--enable-svg
  .else
 @@ -587,6 +590,7 @@
  .if defined(WITHOUT_V4L)
  CONFIGURE_ARGS+=--disable-v4l
  .else
 +BUILD_DEPENDS+=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
  CONFIGURE_ARGS+=--enable-v4l
  .endif
  
 @@ -594,6 +598,7 @@
  CONFIGURE_ARGS+=--disable-x11
  .else
  USE_XORG=	xpm
 +BUILD_DEPENDS+=	${LOCALBASE}/include/X11/xpm.h:${PORTSDIR}/x11/libXpm
  CONFIGURE_ARGS+=--enable-x11
  .endif
  
 diff -ur /usr/ports/multimedia/vlc/Makefile.inc ./multimedia/vlc/Makefile.inc
 --- /usr/ports/multimedia/vlc/Makefile.inc	2009-07-10 03:14:40.000000000 +0100
 +++ ./multimedia/vlc/Makefile.inc	2009-08-13 21:32:33.000000000 +0100
 @@ -257,10 +257,12 @@
  		${SED} -e 's|^|lib/|' >> ${PLIST} \
  		&& ${FIND} -d * -type d | \
  		${SED} -e 's|^|@dirrm lib/|' >> ${PLIST}
 +.if !defined(WITHOUT_X11)
  	cd ${FAKEDIR}/libdata && ${FIND} -s * -type f -o -type l| \
  		${SED} -e 's|^|libdata/|' >> ${PLIST} \
  		&& ${FIND} -d * -type d | \
  		${SED} -e 's|^|@dirrmtry libdata/|' >> ${PLIST}
 +.endif
  .for dir in vlc
  	cd ${FAKEDIR}/share/${dir} && ${FIND} -s * -type f -o -type l | \
  		${SED} -e 's|^|share/${dir}/|' >> ${PLIST} \
 @@ -297,8 +299,10 @@
  		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include
  	cd ${FAKEDIR}/lib && ${FIND} . | \
  		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib
 +.if !defined(WITHOUT_X11)
  	cd ${FAKEDIR}/libdata && ${FIND} . | \
  		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/libdata
 +.endif
  	cd ${FAKEDIR}/share && ${FIND} . | \
  		${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share
  .if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
 diff -ur /usr/ports/multimedia/vlc/files/patch-v4l ./multimedia/vlc/files/patch-v4l
 --- /usr/ports/multimedia/vlc/files/patch-v4l	2009-07-10 03:14:40.000000000 +0100
 +++ ./multimedia/vlc/files/patch-v4l	2009-07-28 15:56:33.000000000 +0100
 @@ -73,14 +73,3 @@
       p_sys->i_video_pts = p_block->i_pts = p_block->i_dts = mdate();
   
       return p_block;
 ---- configure.orig	Mon Jun 12 10:44:45 2006
 -+++ configure	Mon Jun 12 10:46:11 2006
 -@@ -39400,7 +39400,7 @@
 -   enableval="$enable_v4l"
 - fi
 -
 --if test "${enable_v4l}" = "yes"
 -+if true
 - then
 - 
 - # Check whether --with-v4l or --without-v4l was given.
 
 --------------050902070005010105030200--

From: Christopher Key <cjk32@cam.ac.uk>
To: bug-followup@FreeBSD.org, nick-freebsd@triantos.com
Cc:  
Subject: Re: ports/135018: Port multimedia/vlc fails to compile when WITHOUT_X11=1
 due to dependency on glx
Date: Mon, 14 Sep 2009 17:30:31 +0100

 This is a multi-part message in MIME format.
 --------------060704040306000101040801
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Updated patch against the latest vlc port.
 
 --------------060704040306000101040801
 Content-Type: text/plain;
  name="multimedia-vlc-without-x11-4.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="multimedia-vlc-without-x11-4.patch"
 
 diff -ur /usr/ports/multimedia/vlc/Makefile ./multimedia/vlc/Makefile
 --- /usr/ports/multimedia/vlc/Makefile	2009-09-12 03:13:43.000000000 +0100
 +++ ./multimedia/vlc/Makefile	2009-09-14 17:23:29.000000000 +0100
 @@ -10,7 +10,7 @@
  
  PORTNAME=	vlc
  DISTVERSION=	1.0.1
 -PORTREVISION=	1
 +PORTREVISION=	2
  PORTEPOCH=	3
  CATEGORIES=	multimedia audio ipv6 net www
  MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
 @@ -20,8 +20,6 @@
  MAINTAINER=	jsa@wickedmachine.net
  COMMENT=	Multimedia streaming server and player for various audio/video formats
  
 -BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat \
 -		${LOCALBASE}/include/X11/xpm.h:${PORTSDIR}/x11/libXpm
  LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
  RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
  
 @@ -65,9 +63,13 @@
  
  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
  USE_ICONV=	yes
  USE_PERL5_BUILD=yes
  
 @@ -87,7 +89,8 @@
  			--enable-postproc \
  			--without-dv-raw1394 \
  			--disable-dv \
 -			--disable-galaktos
 +			--disable-galaktos \
 +			--disable-glx
  
  MAN1=		vlc.1 \
  		vlc-config.1 \
 @@ -105,7 +108,7 @@
  BROKEN=	Does not compile with perl ${PERL_VERSION}
  .endif
  
 -.if !defined(WITHOUT_QT4)
 +.if !defined(WITHOUT_QT4) && !defined(WITHOUT_X11)
  USE_QT_VER+=	4
  QT_COMPONENTS+=	gui corelib moc_build rcc_build uic_build
  CONFIGURE_ARGS+=--enable-qt4
 @@ -162,7 +165,7 @@
  DEFAULT_DVD_DEVICE=/dev/acd0
  .endif
  
 -.if !defined(WITHOUT_GNOMEVFS)
 +.if !defined(WITHOUT_GNOMEVFS) && !defined(WITHOUT_X11)
  USE_GNOME+=	gnomevfs2
  CONFIGURE_ARGS+=	--enable-gnomevfs
  .else
 @@ -175,14 +178,14 @@
  DEFAULT_CDROM_DEVICE=/dev/acd0
  .endif
  
 -.if !defined(WITHOUT_LIBNOTIFY)
 +.if !defined(WITHOUT_LIBNOTIFY) && !defined(WITHOUT_X11)
  LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
  CONFIGURE_ARGS+=--enable-notify
  .else
  CONFIGURE_ARGS+=--disable-notify
  .endif
  
 -.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) && !defined(WITHOUT_QT4)
 +.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) && !defined(WITHOUT_QT4) && !defined(WITHOUT_X11)
  LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
  CONFIGURE_ARGS+=--enable-skins2 --enable-libtar
  .else
 @@ -231,14 +234,14 @@
  CONFIGURE_ARGS+=--disable-zvbi
  .endif
  
 -.if !defined(WITHOUT_HAL)
 +.if !defined(WITHOUT_HAL) && !defined(WITHOUT_X11)
  LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
  CONFIGURE_ARGS+=--enable-hal
  .else
  CONFIGURE_ARGS+=--disable-hal
  .endif
  
 -.if (defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS)
 +.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
 @@ -296,7 +299,7 @@
  CONFIGURE_ARGS+=--disable-dvdread
  .endif
  
 -.if (defined(WITH_ESOUND) || ${HAVE_GNOME:Mesound}!="") && !defined(WITHOUT_ESOUND)
 +.if (defined(WITH_ESOUND) || defined(HAVE_GNOME) && ${HAVE_GNOME:Mesound}!="") && !defined(WITHOUT_ESOUND) && !defined(WITHOUT_X11)
  USE_GNOME+=	esound
  CONFIGURE_ARGS+=--enable-esd
  .else
 @@ -502,7 +505,7 @@
  CONFIGURE_ARGS+=--disable-smb
  .endif
  
 -.if !defined(WITHOUT_SDL)
 +.if !defined(WITHOUT_SDL) && !defined(WITHOUT_X11)
  USE_SDL=	image
  CONFIGURE_ARGS+=--enable-sdl
  .else
 @@ -532,7 +535,7 @@
  CONFIGURE_ARGS+=--disable-sout
  .endif
  
 -.if (defined(WITH_SVG) || ${HAVE_GNOME:Mlibrsvg2}!="") && !defined(WITHOUT_SVG)
 +.if (defined(WITH_SVG) || defined(HAVE_GNOME) && ${HAVE_GNOME:Mlibrsvg2}!="") && !defined(WITHOUT_SVG) && !defined(WITHOUT_X11)
  USE_GNOME+=	librsvg2
  CONFIGURE_ARGS+=--enable-svg
  .else
 @@ -587,6 +590,7 @@
  .if defined(WITHOUT_V4L)
  CONFIGURE_ARGS+=--disable-v4l
  .else
 +BUILD_DEPENDS+=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
  CONFIGURE_ARGS+=--enable-v4l
  .endif
  
 @@ -594,6 +598,7 @@
  CONFIGURE_ARGS+=--disable-x11
  .else
  USE_XORG=	xpm
 +BUILD_DEPENDS+=	${LOCALBASE}/include/X11/xpm.h:${PORTSDIR}/x11/libXpm
  CONFIGURE_ARGS+=--enable-x11
  .endif
  
 diff -ur /usr/ports/multimedia/vlc/Makefile.inc ./multimedia/vlc/Makefile.inc
 --- /usr/ports/multimedia/vlc/Makefile.inc	2009-07-10 03:14:40.000000000 +0100
 +++ ./multimedia/vlc/Makefile.inc	2009-08-13 21:32:33.000000000 +0100
 @@ -257,10 +257,12 @@
  		${SED} -e 's|^|lib/|' >> ${PLIST} \
  		&& ${FIND} -d * -type d | \
  		${SED} -e 's|^|@dirrm lib/|' >> ${PLIST}
 +.if !defined(WITHOUT_X11)
  	cd ${FAKEDIR}/libdata && ${FIND} -s * -type f -o -type l| \
  		${SED} -e 's|^|libdata/|' >> ${PLIST} \
  		&& ${FIND} -d * -type d | \
  		${SED} -e 's|^|@dirrmtry libdata/|' >> ${PLIST}
 +.endif
  .for dir in vlc
  	cd ${FAKEDIR}/share/${dir} && ${FIND} -s * -type f -o -type l | \
  		${SED} -e 's|^|share/${dir}/|' >> ${PLIST} \
 @@ -297,8 +299,10 @@
  		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include
  	cd ${FAKEDIR}/lib && ${FIND} . | \
  		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib
 +.if !defined(WITHOUT_X11)
  	cd ${FAKEDIR}/libdata && ${FIND} . | \
  		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/libdata
 +.endif
  	cd ${FAKEDIR}/share && ${FIND} . | \
  		${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share
  .if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
 diff -ur /usr/ports/multimedia/vlc/files/patch-v4l ./multimedia/vlc/files/patch-v4l
 --- /usr/ports/multimedia/vlc/files/patch-v4l	2009-07-10 03:14:40.000000000 +0100
 +++ ./multimedia/vlc/files/patch-v4l	2009-09-14 17:21:14.000000000 +0100
 @@ -73,14 +73,3 @@
       p_sys->i_video_pts = p_block->i_pts = p_block->i_dts = mdate();
   
       return p_block;
 ---- configure.orig	Mon Jun 12 10:44:45 2006
 -+++ configure	Mon Jun 12 10:46:11 2006
 -@@ -39400,7 +39400,7 @@
 -   enableval="$enable_v4l"
 - fi
 -
 --if test "${enable_v4l}" = "yes"
 -+if true
 - then
 - 
 - # Check whether --with-v4l or --without-v4l was given.
 
 --------------060704040306000101040801--

From: "Joseph S. Atkinson" <jsa.bsd@gmail.com>
To: bug-followup@FreeBSD.org, nick-freebsd@triantos.com
Cc:  
Subject: Re: ports/135018: Port multimedia/vlc fails to compile when WITHOUT_X11=1
 due to dependency on glx
Date: Sun, 11 Oct 2009 13:31:29 +0000

 Close.
 
 Incorporated into ports/139114 which I am approving.
State-Changed-From-To: feedback->closed 
State-Changed-By: thierry 
State-Changed-When: Lun 2 nov 2009 22:54:29 UTC 
State-Changed-Why:  

Approved by maintainer, and tested in my tinderbox. 

Committed with PR ports/139114: thanks for your patch! 



Responsible-Changed-From-To: pgollucci->thierry 
Responsible-Changed-By: thierry 
Responsible-Changed-When: Lun 2 nov 2009 22:54:29 UTC 
Responsible-Changed-Why:  

Closed on pgollucci's behalf, due to ApacheCon US 2009. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=135018 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/135018: commit references a PR
Date: Mon,  2 Nov 2009 22:51:42 +0000 (UTC)

 thierry     2009-11-02 22:51:27 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/vlc       Makefile Makefile.inc distinfo 
     multimedia/vlc/files patch-v4l 
   Added files:
     multimedia/vlc/files patch-configure-dvbpsi 
   Removed files:
     multimedia/vlc/files patch-modules__access__file.c 
   Log:
   Upgrade to 1.0.2 and fix a security issue: see
   <http://www.videolan.org/security/sa0901.html>.
   
   Also include fixes from PR ports/135018 to fix build when WITHOUT_X11 is
   defined.
   
   PR:             ports/139114 (1) ports/135018 (2)
   Submitted by:   Christopher Key <cjk32 (at) cam.ac.uk> (1) Nick Triantos <nick-freebsd (at) triantos.com> (2)
   Approved by:    Joseph S. Atkinson <jsa.bsd (at) gmail.com> (maintainer)
   Security:       VideoLAN-SA-0901 (CVE Pending)
   
   Revision  Changes    Path
   1.197     +18 -14    ports/multimedia/vlc/Makefile
   1.24      +6 -2      ports/multimedia/vlc/Makefile.inc
   1.32      +3 -3      ports/multimedia/vlc/distinfo
   1.1       +20 -0     ports/multimedia/vlc/files/patch-configure-dvbpsi (new)
   1.2       +0 -10     ports/multimedia/vlc/files/patch-modules__access__file.c (dead)
   1.4       +0 -11     ports/multimedia/vlc/files/patch-v4l
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
