Received: by mail.netbsd.org (Postfix, from userid 605) id CED6D84D47; Thu, 2 Apr 2020 17:46:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5625D84D3E for ; Thu, 2 Apr 2020 17:46:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id RvC_P5NO1tSX for ; Thu, 2 Apr 2020 17:46:40 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B7DD684D3A for ; Thu, 2 Apr 2020 17:46:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B2109FB27; Thu, 2 Apr 2020 17:46:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158584960057700" MIME-Version: 1.0 Date: Thu, 2 Apr 2020 17:46:40 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/multimedia/xine-lib To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200402174640.B2109FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158584960057700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu Apr 2 17:46:40 UTC 2020 Modified Files: pkgsrc/multimedia/xine-lib: Makefile PLIST.common options.mk Log Message: xine-lib: Disable broken X video outputs Bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.158 -r1.159 pkgsrc/multimedia/xine-lib/Makefile cvs rdiff -u -r1.41 -r1.42 pkgsrc/multimedia/xine-lib/PLIST.common cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/xine-lib/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158584960057700 Content-Disposition: inline Content-Length: 3729 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/xine-lib/Makefile diff -u pkgsrc/multimedia/xine-lib/Makefile:1.158 pkgsrc/multimedia/xine-lib/Makefile:1.159 --- pkgsrc/multimedia/xine-lib/Makefile:1.158 Thu Apr 2 15:52:46 2020 +++ pkgsrc/multimedia/xine-lib/Makefile Thu Apr 2 17:46:40 2020 @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.158 2020/04/02 15:52:46 nia Exp $ +# $NetBSD: Makefile,v 1.159 2020/04/02 17:46:40 nia Exp $ + +PKGREVISION= 1 .include "Makefile.common" @@ -13,6 +15,7 @@ CONFIGURE_ARGS+= --disable-real-codecs CONFIGURE_ARGS+= --disable-mlib CONFIGURE_ARGS+= --disable-vaapi CONFIGURE_ARGS+= --disable-vidix +CONFIGURE_ARGS+= --disable-xvmc CONFIGURE_ARGS+= --with-a52dec=internal CONFIGURE_ARGS+= --without-dav1d @@ -51,6 +54,11 @@ PLIST.oss= yes CPPFLAGS.SunOS+= -D__u32=uint32_t -DHAVE_SYSI86 -DHAVE_MMX_FALSE LDFLAGS.SunOS+= -lresolv +# xv video output seems to be broken. Make sure another gets used instead. +post-install: + ${RM} -f ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbxv.* + ${RM} -f ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xv.* + .include "options.mk" .include "../../audio/flac/buildlink3.mk" .include "../../audio/faad2/buildlink3.mk" Index: pkgsrc/multimedia/xine-lib/PLIST.common diff -u pkgsrc/multimedia/xine-lib/PLIST.common:1.41 pkgsrc/multimedia/xine-lib/PLIST.common:1.42 --- pkgsrc/multimedia/xine-lib/PLIST.common:1.41 Thu Apr 2 15:52:46 2020 +++ pkgsrc/multimedia/xine-lib/PLIST.common Thu Apr 2 17:46:40 2020 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.41 2020/04/02 15:52:46 nia Exp $ +@comment $NetBSD: PLIST.common,v 1.42 2020/04/02 17:46:40 nia Exp $ bin/xine-config bin/xine-list-1.2 include/xine.h @@ -168,16 +168,8 @@ ${PLIST.sdl}lib/xine/plugins/${XINE_MOD_ ${PLIST.sdl}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_sdl.so ${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbshm.a ${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbshm.so -${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbxv.a -${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbxv.so ${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xshm.a ${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xshm.so -${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xv.a -${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xv.so -${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xvmc.a -${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xvmc.so -${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xxmc.a -${PLIST.x11}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xxmc.so lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_xiph.a lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_xiph.so man/man1/xine-config.1 Index: pkgsrc/multimedia/xine-lib/options.mk diff -u pkgsrc/multimedia/xine-lib/options.mk:1.3 pkgsrc/multimedia/xine-lib/options.mk:1.4 --- pkgsrc/multimedia/xine-lib/options.mk:1.3 Thu Apr 2 15:52:46 2020 +++ pkgsrc/multimedia/xine-lib/options.mk Thu Apr 2 17:46:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2020/04/02 15:52:46 nia Exp $ +# $NetBSD: options.mk,v 1.4 2020/04/02 17:46:40 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xine-lib @@ -77,10 +77,8 @@ CONFIGURE_ARGS+= --with-x .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/libXv/buildlink3.mk" -.include "../../x11/libXvMC/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" .else -CONFIGURE_ARGS+= --disable-xvmc CONFIGURE_ARGS+= --without-x CONFIGURE_ARGS+= --without-xcb .endif --_----------=_158584960057700--