[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib xine-lib: Disable broken X video o...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/67a18f884ade
branches:  trunk
changeset: 426559:67a18f884ade
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Apr 02 17:46:40 2020 +0000

description:
xine-lib: Disable broken X video outputs

Bump PKGREVISION

diffstat:

 multimedia/xine-lib/Makefile     |  10 +++++++++-
 multimedia/xine-lib/PLIST.common |  10 +---------
 multimedia/xine-lib/options.mk   |   4 +---
 3 files changed, 11 insertions(+), 13 deletions(-)

diffs (77 lines):

diff -r cd411653a224 -r 67a18f884ade multimedia/xine-lib/Makefile
--- a/multimedia/xine-lib/Makefile      Thu Apr 02 16:50:23 2020 +0000
+++ b/multimedia/xine-lib/Makefile      Thu Apr 02 17:46:40 2020 +0000
@@ -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-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 @@
 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"
diff -r cd411653a224 -r 67a18f884ade multimedia/xine-lib/PLIST.common
--- a/multimedia/xine-lib/PLIST.common  Thu Apr 02 16:50:23 2020 +0000
+++ b/multimedia/xine-lib/PLIST.common  Thu Apr 02 17:46:40 2020 +0000
@@ -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_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
diff -r cd411653a224 -r 67a18f884ade multimedia/xine-lib/options.mk
--- a/multimedia/xine-lib/options.mk    Thu Apr 02 16:50:23 2020 +0000
+++ b/multimedia/xine-lib/options.mk    Thu Apr 02 17:46:40 2020 +0000
@@ -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 @@
 .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