6 files changed, 4 insertions, 60 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index faf1196cb9a..cadf072bf68 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.166 2020/11/05 09:08:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.167 2020/11/16 12:15:28 nia Exp $
 
 PKGREVISION=	7
 
@@ -15,6 +15,7 @@ CONFIGURE_ARGS+=	--disable-real-codecs
 CONFIGURE_ARGS+=	--disable-mlib
 CONFIGURE_ARGS+=	--disable-vaapi
 CONFIGURE_ARGS+=	--disable-vidix
+CONFIGURE_ARGS+=	--disable-w32dll
 CONFIGURE_ARGS+=	--disable-xvmc
 
 CONFIGURE_ARGS+=	--without-dav1d
@@ -29,20 +30,6 @@ SUBST_SED.oss+=		-e "s,\"dsp\",\"audio\",g"
 .endif
 SUBST_MESSAGE.oss=	Fixing hardcoded audio device.
 
-SUBST_CLASSES+=		w32path
-SUBST_STAGE.w32path=	pre-configure
-SUBST_FILES.w32path=	src/libw32dll/common.c
-SUBST_SED.w32path=	-e "s,@W32PATH@,${PREFIX}/lib/win32,"
-SUBST_MESSAGE.w32path=	Fixing win32 dll path.
-
-# Needed to fix build problems under, at least, NetBSD/amd64.
-BUILDLINK_API_DEPENDS.libcdio+=	libcdio>=0.75
-
-PLIST_VARS+=	qtw32
-.if empty(MACHINE_PLATFORM:MDarwin-*-i386)
-PLIST.qtw32=	yes
-.endif
-
 .if ${OPSYS} == "SunOS"
 PLIST_VARS+=	oss
 .  if ${OS_VERSION} == "5.11"
diff --git a/multimedia/xine-lib/PLIST.Linux b/multimedia/xine-lib/PLIST.Linux
index 41c7948da70..b8bf4391d46 100644
--- a/multimedia/xine-lib/PLIST.Linux
+++ b/multimedia/xine-lib/PLIST.Linux
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST.Linux,v 1.20 2020/04/10 10:10:55 nia Exp $
+@comment $NetBSD: PLIST.Linux,v 1.21 2020/11/16 12:15:28 nia Exp $
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_oss.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_oss.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_vdpau.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_vdpau.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dxr3.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dxr3.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_flac.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_flac.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvb.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvb.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcdo.a
diff --git a/multimedia/xine-lib/PLIST.i386 b/multimedia/xine-lib/PLIST.i386
deleted file mode 100644
index 6468d226f0b..00000000000
--- a/multimedia/xine-lib/PLIST.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.i386,v 1.9 2014/06/30 13:41:00 jperkin Exp $
-${PLIST.qtw32}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_qt.a
-${PLIST.qtw32}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_qt.so
-${PLIST.qtw32}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_w32dll.a
-${PLIST.qtw32}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_w32dll.so
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 4f186a9fd7a..e67c1f83144 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.112 2020/04/12 11:09:05 nia Exp $
+$NetBSD: distinfo,v 1.113 2020/11/16 12:15:28 nia Exp $
 
 SHA1 (xine-lib-1.2.10.tar.xz) = 66fe7a7d372f74967df46834167f85f5c2d43ae7
 RMD160 (xine-lib-1.2.10.tar.xz) = 1dba24e9e6c4f21e766d9b696dd02f4e645f4c8c
 SHA512 (xine-lib-1.2.10.tar.xz) = 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f
 Size (xine-lib-1.2.10.tar.xz) = 5226116 bytes
 SHA1 (patch-ag) = ef924c08b4d1d0dbc48f619d69b608c9d0def9fe
-SHA1 (patch-cb) = 708ee946dd1708a40baef5ac193a46dc22bff8b5
 SHA1 (patch-contrib_libxdg-basedir_basedir.c) = 8dd88fd712853e58363148023be6ef0906486206
 SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
 SHA1 (patch-include_xine_attributes.h) = e7cb5f50d95a2523e2de83250fe11a12f0126a7f
@@ -28,6 +27,5 @@ SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d
 SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d
 SHA1 (patch-src_input_input__cdda.c) = 7dddab513b42ff334319da6fbd858f036d6665cd
 SHA1 (patch-src_input_input__http.c) = 80de20be0f99efa5cb67230c900acbf6e4ee9e7c
-SHA1 (patch-src_libw32dll_wine_registry.c) = a36b4155a1d0d43ae698641178ef4afc97e7e70a
 SHA1 (patch-src_video__out_Makefile.am) = 623e41b3f142426c5128c6c61c6ebefee170734e
 SHA1 (patch-src_video__out_macosx_Makefile.am) = 8350a75e3a4c0b2f684e07dcc18259fcc5b28115
diff --git a/multimedia/xine-lib/patches/patch-cb b/multimedia/xine-lib/patches/patch-cb
deleted file mode 100644
index e6263410dd3..00000000000
--- a/multimedia/xine-lib/patches/patch-cb
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cb,v 1.5 2014/05/18 15:38:18 wiz Exp $
-
-Adapt path to win32 codecs for pkgsrc.
-
---- src/libw32dll/common.c.orig	2014-03-11 13:28:30.000000000 +0000
-+++ src/libw32dll/common.c
-@@ -6,10 +6,7 @@ static const char *get_win32_codecs_path
-   DIR                *dir;
-   const char         *path, *cfgpath;
-   const char * const listpath[] = { "",
--                                     "/usr/lib/codecs",
--                                     "/usr/local/lib/codecs",
--                                     "/usr/lib/win32",
--                                     "/usr/local/lib/win32",
-+				     "@W32PATH@",
-                                      NULL };
-   int                 i = 0;
- 
diff --git a/multimedia/xine-lib/patches/patch-src_libw32dll_wine_registry.c b/multimedia/xine-lib/patches/patch-src_libw32dll_wine_registry.c
deleted file mode 100644
index 3fed052488f..00000000000
--- a/multimedia/xine-lib/patches/patch-src_libw32dll_wine_registry.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_libw32dll_wine_registry.c,v 1.4 2017/08/02 03:41:35 maya Exp $
-
-everyone can have sys/stat.h
-
---- src/libw32dll/wine/registry.c.orig	2014-05-29 11:11:59.000000000 +0000
-+++ src/libw32dll/wine/registry.c
-@@ -22,9 +22,7 @@
- #include <basedir.h>
- #endif
- 
--#ifdef __DragonFly__
- #include <sys/stat.h>
--#endif
- 
- //#undef TRACE
- //#define TRACE printf