CVS commit: pkgsrc/multimedia/xine-lib

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Nov 16 12:15:28 UTC 2020

Modified Files:
        pkgsrc/multimedia/xine-lib: Makefile PLIST.Linux distinfo
Removed Files:
        pkgsrc/multimedia/xine-lib: PLIST.i386
        pkgsrc/multimedia/xine-lib/patches: patch-cb
            patch-src_libw32dll_wine_registry.c

Log Message:
xine-lib: Disable w32dll decoder plugin, it's i386-only and broken.

If you have an obscure multimedia file which needs a 32-bit binary
Windows codec to play you're probably better off converting it in
a VM these days.

While here, delint.


To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 pkgsrc/multimedia/xine-lib/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/multimedia/xine-lib/PLIST.Linux
cvs rdiff -u -r1.9 -r0 pkgsrc/multimedia/xine-lib/PLIST.i386
cvs rdiff -u -r1.112 -r1.113 pkgsrc/multimedia/xine-lib/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/multimedia/xine-lib/patches/patch-cb
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/multimedia/xine-lib/patches/patch-src_libw32dll_wine_registry.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/xine-lib/Makefile
diff -u pkgsrc/multimedia/xine-lib/Makefile:1.166 pkgsrc/multimedia/xine-lib/Makefile:1.167
--- pkgsrc/multimedia/xine-lib/Makefile:1.166   Thu Nov  5 09:08:50 2020
+++ pkgsrc/multimedia/xine-lib/Makefile Mon Nov 16 12:15:28 2020
@@ -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\"
 .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"

Index: pkgsrc/multimedia/xine-lib/PLIST.Linux
diff -u pkgsrc/multimedia/xine-lib/PLIST.Linux:1.20 pkgsrc/multimedia/xine-lib/PLIST.Linux:1.21
--- pkgsrc/multimedia/xine-lib/PLIST.Linux:1.20 Fri Apr 10 10:10:55 2020
+++ pkgsrc/multimedia/xine-lib/PLIST.Linux      Mon Nov 16 12:15:28 2020
@@ -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

Index: pkgsrc/multimedia/xine-lib/distinfo
diff -u pkgsrc/multimedia/xine-lib/distinfo:1.112 pkgsrc/multimedia/xine-lib/distinfo:1.113
--- pkgsrc/multimedia/xine-lib/distinfo:1.112   Sun Apr 12 11:09:05 2020
+++ pkgsrc/multimedia/xine-lib/distinfo Mon Nov 16 12:15:28 2020
@@ -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) = f5be
 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