Wed Jun 19 13:31:03 2019 UTC ()
xine-lib: disable vaapi explicitly

should only effect linux, where this is currently failing in bulk builds
due to vaapi being unable to link


(nia)
diff -r1.152 -r1.153 pkgsrc/multimedia/xine-lib/Makefile
diff -r1.17 -r1.18 pkgsrc/multimedia/xine-lib/PLIST.Linux
cvs diff -r1.152 -r1.153 pkgsrc/multimedia/xine-lib/Makefile (switch to unified diff)

--- pkgsrc/multimedia/xine-lib/Makefile 2018/11/23 08:06:29 1.152
+++ pkgsrc/multimedia/xine-lib/Makefile 2019/06/19 13:31:02 1.153
@@ -1,86 +1,87 @@ @@ -1,86 +1,87 @@
1# $NetBSD: Makefile,v 1.152 2018/11/23 08:06:29 ryoon Exp $ 1# $NetBSD: Makefile,v 1.153 2019/06/19 13:31:02 nia Exp $
2 2
3PKGREVISION= 1 3PKGREVISION= 2
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6COMMENT= Multimedia player library 6COMMENT= Multimedia player library
7 7
8CONFLICTS+= xine-xcb-[0-9]* 8CONFLICTS+= xine-xcb-[0-9]*
9 9
10CONFIGURE_ARGS+= --disable-v4l 10CONFIGURE_ARGS+= --disable-v4l
11CONFIGURE_ARGS+= --disable-v4l2 11CONFIGURE_ARGS+= --disable-v4l2
12CONFIGURE_ARGS+= --disable-real-codecs 12CONFIGURE_ARGS+= --disable-real-codecs
13CONFIGURE_ARGS+= --disable-aalib 13CONFIGURE_ARGS+= --disable-aalib
14CONFIGURE_ARGS+= --disable-mlib 14CONFIGURE_ARGS+= --disable-mlib
 15CONFIGURE_ARGS+= --disable-vaapi
15 16
16SUBST_CLASSES+= oss 17SUBST_CLASSES+= oss
17SUBST_STAGE.oss= pre-configure 18SUBST_STAGE.oss= pre-configure
18SUBST_FILES.oss= src/audio_out/audio_oss_out.c 19SUBST_FILES.oss= src/audio_out/audio_oss_out.c
19SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" 20SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
20.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 21.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
21SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g" 22SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g"
22.endif 23.endif
23SUBST_MESSAGE.oss= Fixing hardcoded audio device. 24SUBST_MESSAGE.oss= Fixing hardcoded audio device.
24 25
25SUBST_CLASSES+= w32path 26SUBST_CLASSES+= w32path
26SUBST_STAGE.w32path= pre-configure 27SUBST_STAGE.w32path= pre-configure
27SUBST_FILES.w32path= src/libw32dll/common.c 28SUBST_FILES.w32path= src/libw32dll/common.c
28SUBST_SED.w32path= -e "s,@W32PATH@,${PREFIX}/lib/win32," 29SUBST_SED.w32path= -e "s,@W32PATH@,${PREFIX}/lib/win32,"
29SUBST_MESSAGE.w32path= Fixing win32 dll path. 30SUBST_MESSAGE.w32path= Fixing win32 dll path.
30 31
31# Needed to fix build problems under, at least, NetBSD/amd64. 32# Needed to fix build problems under, at least, NetBSD/amd64.
32BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.75 33BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.75
33 34
34.if ${OPSYS} == "FreeBSD" 35.if ${OPSYS} == "FreeBSD"
35PLIST_VARS+= vidix 36PLIST_VARS+= vidix
36.if ${MACHINE_ARCH} == "i386" 37.if ${MACHINE_ARCH} == "i386"
37PLIST.vidix= yes 38PLIST.vidix= yes
38.endif 39.endif
39.endif 40.endif
40 41
41PLIST_VARS+= qtw32 42PLIST_VARS+= qtw32
42.if empty(MACHINE_PLATFORM:MDarwin-*-i386) 43.if empty(MACHINE_PLATFORM:MDarwin-*-i386)
43PLIST.qtw32= yes 44PLIST.qtw32= yes
44.endif 45.endif
45 46
46.if ${OPSYS} == "SunOS" 47.if ${OPSYS} == "SunOS"
47PLIST_VARS+= oss 48PLIST_VARS+= oss
48.if ${OS_VERSION} == "5.11" 49.if ${OS_VERSION} == "5.11"
49PLIST.oss= yes 50PLIST.oss= yes
50.endif 51.endif
51.endif 52.endif
52 53
53CPPFLAGS.SunOS+= -D__u32=uint32_t -DHAVE_SYSI86 -DHAVE_MMX_FALSE 54CPPFLAGS.SunOS+= -D__u32=uint32_t -DHAVE_SYSI86 -DHAVE_MMX_FALSE
54LDFLAGS.SunOS+= -lresolv 55LDFLAGS.SunOS+= -lresolv
55 56
56.include "options.mk" 57.include "options.mk"
57 58
58# flac is supported internally; don't know what the plugin is good for 59# flac is supported internally; don't know what the plugin is good for
59# but until autodetection is turned off, force external flac for now. 60# but until autodetection is turned off, force external flac for now.
60.include "../../audio/flac/buildlink3.mk" 61.include "../../audio/flac/buildlink3.mk"
61.include "../../audio/faad2/buildlink3.mk" 62.include "../../audio/faad2/buildlink3.mk"
62.include "../../audio/liba52/buildlink3.mk" 63.include "../../audio/liba52/buildlink3.mk"
63.include "../../audio/libmad/buildlink3.mk" 64.include "../../audio/libmad/buildlink3.mk"
64#.include "../../audio/libmpcdec/buildlink3.mk" 65#.include "../../audio/libmpcdec/buildlink3.mk"
65.include "../../audio/libvorbis/buildlink3.mk" 66.include "../../audio/libvorbis/buildlink3.mk"
66.include "../../audio/speex/buildlink3.mk" 67.include "../../audio/speex/buildlink3.mk"
67.include "../../devel/gettext-lib/buildlink3.mk" 68.include "../../devel/gettext-lib/buildlink3.mk"
68# these could be options or (better) extra plugin packages 69# these could be options or (better) extra plugin packages
69#.include "../../devel/SDL/buildlink3.mk" 70#.include "../../devel/SDL/buildlink3.mk"
70#.include "../../graphics/ImageMagick/buildlink3.mk" 71#.include "../../graphics/ImageMagick/buildlink3.mk"
71#.include "../../graphics/Mesa/buildlink3.mk" 72#.include "../../graphics/Mesa/buildlink3.mk"
72CONFIGURE_ARGS+= --disable-opengl 73CONFIGURE_ARGS+= --disable-opengl
73#.include "../../graphics/aalib/buildlink3.mk" 74#.include "../../graphics/aalib/buildlink3.mk"
74.include "../../graphics/mng/buildlink3.mk" 75.include "../../graphics/mng/buildlink3.mk"
75.include "../../graphics/png/buildlink3.mk" 76.include "../../graphics/png/buildlink3.mk"
76.include "../../misc/libcdio/buildlink3.mk" 77.include "../../misc/libcdio/buildlink3.mk"
77CONFIGURE_ARGS+= --with-external-dvdnav 78CONFIGURE_ARGS+= --with-external-dvdnav
78.include "../../multimedia/libdvdnav/buildlink3.mk" 79.include "../../multimedia/libdvdnav/buildlink3.mk"
79.include "../../multimedia/libtheora/buildlink3.mk" 80.include "../../multimedia/libtheora/buildlink3.mk"
80.include "../../sysutils/vcdimager/buildlink3.mk" 81.include "../../sysutils/vcdimager/buildlink3.mk"
81.include "../../x11/libXext/buildlink3.mk" 82.include "../../x11/libXext/buildlink3.mk"
82.include "../../x11/libXt/buildlink3.mk" 83.include "../../x11/libXt/buildlink3.mk"
83.include "../../x11/libX11/buildlink3.mk" 84.include "../../x11/libX11/buildlink3.mk"
84.include "../../x11/libXinerama/buildlink3.mk" 85.include "../../x11/libXinerama/buildlink3.mk"
85.include "../../x11/libxcb/buildlink3.mk" 86.include "../../x11/libxcb/buildlink3.mk"
86.include "../../mk/bsd.pkg.mk" 87.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/multimedia/xine-lib/PLIST.Linux (switch to unified diff)

--- pkgsrc/multimedia/xine-lib/PLIST.Linux 2018/11/13 11:10:41 1.17
+++ pkgsrc/multimedia/xine-lib/PLIST.Linux 2019/06/19 13:31:02 1.18
@@ -1,23 +1,21 @@ @@ -1,23 +1,21 @@
1@comment $NetBSD: PLIST.Linux,v 1.17 2018/11/13 11:10:41 markd Exp $ 1@comment $NetBSD: PLIST.Linux,v 1.18 2019/06/19 13:31:02 nia Exp $
2lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_oss.a 2lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_oss.a
3lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_oss.so 3lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_oss.so
4lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_spu.a 4lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_spu.a
5lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_spu.so 5lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_spu.so
6lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_video.a 6lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_video.a
7lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_video.so 7lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dxr3_video.so
8lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_vdpau.a 8lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_vdpau.a
9lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_vdpau.so 9lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_vdpau.so
10lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_flac.a 10lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_flac.a
11lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_flac.so 11lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_flac.so
12lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvb.a 12lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvb.a
13lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvb.so 13lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvb.so
14lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcdo.a 14lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcdo.a
15lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcdo.so 15lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_vcdo.so
16lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_dxr3.a 16lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_dxr3.a
17lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_dxr3.so 17lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_dxr3.so
18lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_fb.a 18lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_fb.a
19lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_fb.so 19lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_fb.so
20lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vaapi.a 
21lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vaapi.so 
22lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vdpau.a 20lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vdpau.a
23lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vdpau.so 21lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_vdpau.so