From owner-svn-ports-head@FreeBSD.ORG Sat Nov 23 19:20:56 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTPS id B3A6C862; Sat, 23 Nov 2013 19:20:56 +0000 (UTC) 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 88DBA26B3; Sat, 23 Nov 2013 19:20:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rANJKuhI030477; Sat, 23 Nov 2013 19:20:56 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rANJKuON030472; Sat, 23 Nov 2013 19:20:56 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201311231920.rANJKuON030472@svn.freebsd.org> From: Juergen Lock Date: Sat, 23 Nov 2013 19:20:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334694 - in head/multimedia/libxine: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Nov 2013 19:20:56 -0000 Author: nox Date: Sat Nov 23 19:20:55 2013 New Revision: 334694 URL: http://svnweb.freebsd.org/changeset/ports/334694 Log: - Fix LIBBLURAY and VAAPI knobs so they actually do something. - No PORTREVISION bump as these are non-default options. - Remove unused patchfiles. Deleted: head/multimedia/libxine/files/extrapatch-vdpau-configure.ac head/multimedia/libxine/files/extrapatch-vdpau-src-vdr-input_vdr.c head/multimedia/libxine/files/extrapatch-vdpau-src-video_out-video_out_vdpau.c head/multimedia/libxine/files/ffmpeg-vaapi_xine-lib-1.2.2-defaultoff.diff Modified: head/multimedia/libxine/Makefile head/multimedia/libxine/pkg-plist Modified: head/multimedia/libxine/Makefile ============================================================================== --- head/multimedia/libxine/Makefile Sat Nov 23 18:41:39 2013 (r334693) +++ head/multimedia/libxine/Makefile Sat Nov 23 19:20:55 2013 (r334694) @@ -191,14 +191,18 @@ CONFIGURE_ARGS+= --without-wavpack .if ${PORT_OPTIONS:MVAAPI} LIB_DEPENDS+= libva.so:${PORTSDIR}/multimedia/libva +PLIST_SUB+= VAAPI="" +CONFIGURE_ARGS+= --enable-vaapi +.else +PLIST_SUB+= VAAPI="@comment " .endif .if ${PORT_OPTIONS:MLIBBLURAY} -CONFIGURE_OPTS+= --enable-bluray +CONFIGURE_ARGS+= --enable-bluray LIB_DEPENDS+= libbluray.so:${PORTSDIR}/multimedia/libbluray PLIST_SUB+= LIBBLURAY="" .else -CONFIGURE_OPTS+= --disable-bluray +CONFIGURE_ARGS+= --disable-bluray PLIST_SUB+= LIBBLURAY="@comment " .endif @@ -217,7 +221,8 @@ CONFIGURE_ARGS+= --disable-vidix post-patch: .if ${PORT_OPTIONS:MVAAPI} - #@${PATCH} ${PATCH_DIST_ARGS} <${FILESDIR}/ffmpeg-vaapi_xine-lib-1.2.2-defaultoff.diff + @${REINPLACE_CMD} -e 's|-ldl||' \ + ${WRKSRC}/src/video_out/Makefile.in .endif .for f in libtool ltmain.sh @${REINPLACE_CMD} -e \ Modified: head/multimedia/libxine/pkg-plist ============================================================================== --- head/multimedia/libxine/pkg-plist Sat Nov 23 18:41:39 2013 (r334693) +++ head/multimedia/libxine/pkg-plist Sat Nov 23 19:20:55 2013 (r334694) @@ -181,6 +181,7 @@ share/xine-lib/fonts/serif-64.xinefont.g %%PLUGINSDIR%%/xineplug_vo_out_xcbxv.so %%PLUGINSDIR%%/xineplug_vo_out_xshm.so %%PLUGINSDIR%%/xineplug_vo_out_xv.so +%%VAAPI%%%%PLUGINSDIR%%/xineplug_vo_out_vaapi.so %%WITH_XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xvmc.so %%WITH_XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xxmc.so %%WITH_WAVPACK%%%%PLUGINSDIR%%/xineplug_wavpack.so