From owner-svn-ports-all@FreeBSD.ORG  Mon Sep  3 20:32:27 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6A079106566C;
	Mon,  3 Sep 2012 20:32:27 +0000 (UTC) (envelope-from nox@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 550578FC15;
	Mon,  3 Sep 2012 20:32:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q83KWR7j039969;
	Mon, 3 Sep 2012 20:32:27 GMT (envelope-from nox@svn.freebsd.org)
Received: (from nox@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q83KWRU4039966;
	Mon, 3 Sep 2012 20:32:27 GMT (envelope-from nox@svn.freebsd.org)
Message-Id: <201209032032.q83KWRU4039966@svn.freebsd.org>
From: Juergen Lock <nox@FreeBSD.org>
Date: Mon, 3 Sep 2012 20:32:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303617 - head/multimedia/vlc
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Sep 2012 20:32:27 -0000

Author: nox
Date: Mon Sep  3 20:32:26 2012
New Revision: 303617
URL: http://svn.freebsd.org/changeset/ports/303617

Log:
  - Fix remaining i386 build failures by setting USE_GCC?= 4.6+ there, see:
  
  	http://trac.videolan.org/vlc/ticket/5979
  
  - Remove bogus patch reference to fix build with UPNP knob - there
    are still runtime crashes tho due to devel/upnp picking up the
    wrong uuid_create(), see my patch here:
  
  	http://docs.freebsd.org/cgi/mid.cgi?20120903194543.GA38349
  
  - Pet portlint.

Modified:
  head/multimedia/vlc/Makefile

Modified: head/multimedia/vlc/Makefile
==============================================================================
--- head/multimedia/vlc/Makefile	Mon Sep  3 19:46:41 2012	(r303616)
+++ head/multimedia/vlc/Makefile	Mon Sep  3 20:32:26 2012	(r303617)
@@ -13,7 +13,6 @@ CATEGORIES=	multimedia audio ipv6 net ww
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/p/-pre/}/ \
 		http://ftp.snt.utwente.nl/pub/software/videolan/${PORTNAME}/${DISTVERSION}/ \
 		ftp://ftp.crans.org/pub/videolan/${PORTNAME}/${DISTVERSION}/
-DISTNAME=	${PORTNAME}-${DISTVERSION:S/p/-pre/}
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Qt4 based multimedia player and streaming server
@@ -194,9 +193,8 @@ IGNORE=		base clang version too old, set
 CONFIGURE_ARGS+=--enable-altivec # VLC's config script doesn't know to do this
 .endif
 
-# sometimes(?) misdetected causing build failure
 .if ${ARCH} == "i386"
-CONFIGURE_ARGS+=--disable-sse --disable-mmx
+USE_GCC?=	4.6+ # sse/3dnow detection on i386 needs newer gcc
 .endif
 
 # End OS specific hacks
@@ -610,7 +608,6 @@ CONFIGURE_ARGS+=	--disable-twolame
 .if ${PORT_OPTIONS:MUPNP}
 LIB_DEPENDS+=	upnp:${PORTSDIR}/devel/upnp
 CONFIGURE_ARGS+=--enable-upnp
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-modules__services_discovery__upnp_intel.cpp
 .else
 CONFIGURE_ARGS+=--disable-upnp
 .endif