From owner-svn-ports-all@FreeBSD.ORG Mon Oct 28 19:22:32 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D912BFBB; Mon, 28 Oct 2013 19:22:31 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B71FF275C; Mon, 28 Oct 2013 19:22:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9SJMVPK000782; Mon, 28 Oct 2013 19:22:31 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9SJMVMK000781; Mon, 28 Oct 2013 19:22:31 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310281922.r9SJMVMK000781@svn.freebsd.org> From: William Grzybowski Date: Mon, 28 Oct 2013 19:22:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331892 - head/multimedia/vlc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Oct 2013 19:22:32 -0000 Author: wg Date: Mon Oct 28 19:22:31 2013 New Revision: 331892 URL: http://svnweb.freebsd.org/changeset/ports/331892 Log: multimedia/vlc: fix SAMBA option - SAMBA option never worked before due to wrong feature name and lack of pkg config file - Remove deprecated options Reported by: Kevin Oberman Modified: head/multimedia/vlc/Makefile Modified: head/multimedia/vlc/Makefile ============================================================================== --- head/multimedia/vlc/Makefile Mon Oct 28 19:10:04 2013 (r331891) +++ head/multimedia/vlc/Makefile Mon Oct 28 19:22:31 2013 (r331892) @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.1.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -28,7 +28,7 @@ OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA OPUS PNG PULSEAUDIO QT4 REALAUDIO RUNROOT \ SAMBA SCHROED SDL SHOUTCAST SKINS STREAM SPEEX SQLITE SVG \ TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD VORBIS \ - X11 X264 XOSD ZVBI SERVER_ONLY DEBUG \ + X11 X264 ZVBI SERVER_ONLY DEBUG \ GME NO_DVD LIBBLURAY SAMPLERATE SIDPLAY OPTIONS_DEFAULT=A52 AVAHI DBUS DTS DVDREAD DVDNAV FAAD FLAC GNUTLS \ HTTPD LUA MAD MATROSKA MPEG2 OGG OPUS PNG QT4 REALAUDIO \ @@ -55,7 +55,6 @@ STREAM_DESC= stream output TAGLIB_DESC= ID3 tag and Ogg comment support V4L_DESC= Video4Linux video capture compatibility VCD_DESC= Video CD support -XOSD_DESC= X11 On Screen Display support ZVBI_DESC= VBI decoding support SERVER_ONLY_DESC= Only build server parts NO_DVD_DESC= disable DVD specific features @@ -185,7 +184,7 @@ PNG_CONFIGURE_ENABLE= png PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulse -REALAUDIO_CONFIGURE_ENABLE= real realrtsp +REALAUDIO_CONFIGURE_ENABLE= realrtsp RUNROOT_CONFIGURE_ENABLE= run-as-root @@ -193,7 +192,10 @@ SAMPLERATE_LIB_DEPENDS= libsamplerate.s SAMPLERATE_CONFIGURE_ENABLE= samplerate SAMBA_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient -SAMBA_CONFIGURE_ENABLE= smb +SAMBA_CONFIGURE_ENABLE= smbclient +# There is no libsmbclient.pc +SAMBA_CONFIGURE_ENV= SMBCLIENT_CFLAGS="-I${LOCALBASE}/include" \ + SMBCLIENT_LIBS="-lsmbclient" SCHROED_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger SCHROED_CONFIGURE_ENABLE= schroedinger @@ -238,9 +240,6 @@ VORBIS_CONFIGURE_ENABLE=vorbis X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/x264 X264_CONFIGURE_ENABLE= x264 -XOSD_LIB_DEPENDS= libxosd.so:${PORTSDIR}/misc/xosd -XOSD_CONFIGURE_ENABLE= xosd - ZVBI_LIB_DEPENDS= libzvbi.so:${PORTSDIR}/devel/libzvbi ZVBI_CONFIGURE_ENABLE= zvbi @@ -268,8 +267,6 @@ CONFIGURE_ARGS+= --enable-vlc \ --disable-alsa \ --disable-dc1394 \ --disable-directfb \ - --disable-dv \ - --disable-loader \ --disable-projectm \ --disable-telx \ --disable-tremor \