Mon Feb 24 05:31:54 2014 UTC ()
force external flac given non-deterministic autodetection causing PLIST problems


(richard)
diff -r1.120 -r1.121 pkgsrc/multimedia/xine-lib/Makefile
diff -r1.36 -r1.37 pkgsrc/multimedia/xine-lib/PLIST.common
cvs diff -r1.120 -r1.121 pkgsrc/multimedia/xine-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/Makefile 2014/02/12 23:18:18 1.120
+++ pkgsrc/multimedia/xine-lib/Makefile 2014/02/24 05:31:54 1.121
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.120 2014/02/12 23:18:18 tron Exp $ 1# $NetBSD: Makefile,v 1.121 2014/02/24 05:31:54 richard Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGREVISION= 1 5PKGREVISION= 2
6 6
7COMMENT= Multimedia player library 7COMMENT= Multimedia player library
8 8
9CONFLICTS+= xine-xcb-[0-9]* 9CONFLICTS+= xine-xcb-[0-9]*
10 10
11CONFIGURE_ARGS+= --disable-v4l 11CONFIGURE_ARGS+= --disable-v4l
12CONFIGURE_ARGS+= --disable-v4l2 12CONFIGURE_ARGS+= --disable-v4l2
13CONFIGURE_ARGS+= --disable-real-codecs 13CONFIGURE_ARGS+= --disable-real-codecs
14CONFIGURE_ARGS+= --disable-aalib 14CONFIGURE_ARGS+= --disable-aalib
15CONFIGURE_ARGS+= --disable-mlib 15CONFIGURE_ARGS+= --disable-mlib
16 16
17BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 17BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
18 18
@@ -35,27 +35,28 @@ SUBST_MESSAGE.w32path= Fixing win32 dll  @@ -35,27 +35,28 @@ SUBST_MESSAGE.w32path= Fixing win32 dll
35BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.75 35BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.75
36 36
37.if ${OPSYS} == "SunOS" 37.if ${OPSYS} == "SunOS"
38PLIST_VARS+= oss 38PLIST_VARS+= oss
39.if ${OS_VERSION} == "5.11" 39.if ${OS_VERSION} == "5.11"
40PLIST.oss= yes 40PLIST.oss= yes
41.endif 41.endif
42.endif 42.endif
43 43
44CPPFLAGS.SunOS+= -D__u32=uint32_t -DHAVE_SYSI86 44CPPFLAGS.SunOS+= -D__u32=uint32_t -DHAVE_SYSI86
45LDFLAGS.SunOS+= -lresolv 45LDFLAGS.SunOS+= -lresolv
46 46
47# flac is supported internally; don't know what the plugin is good for 47# flac is supported internally; don't know what the plugin is good for
48#.include "../../audio/flac/buildlink3.mk" 48# but until autodetection is turned off, force external flac for now.
 49.include "../../audio/flac/buildlink3.mk"
49.include "../../audio/libvorbis/buildlink3.mk" 50.include "../../audio/libvorbis/buildlink3.mk"
50.include "../../audio/speex/buildlink3.mk" 51.include "../../audio/speex/buildlink3.mk"
51.include "../../devel/gettext-lib/buildlink3.mk" 52.include "../../devel/gettext-lib/buildlink3.mk"
52# these could be options or (better) extra plugin packages 53# these could be options or (better) extra plugin packages
53#.include "../../devel/SDL/buildlink3.mk" 54#.include "../../devel/SDL/buildlink3.mk"
54#.include "../../graphics/ImageMagick/buildlink3.mk" 55#.include "../../graphics/ImageMagick/buildlink3.mk"
55#.include "../../graphics/Mesa/buildlink3.mk" 56#.include "../../graphics/Mesa/buildlink3.mk"
56CONFIGURE_ARGS+= --disable-opengl 57CONFIGURE_ARGS+= --disable-opengl
57#.include "../../graphics/aalib/buildlink3.mk" 58#.include "../../graphics/aalib/buildlink3.mk"
58.include "../../graphics/mng/buildlink3.mk" 59.include "../../graphics/mng/buildlink3.mk"
59.include "../../graphics/png/buildlink3.mk" 60.include "../../graphics/png/buildlink3.mk"
60.include "../../misc/libcdio/buildlink3.mk" 61.include "../../misc/libcdio/buildlink3.mk"
61.include "../../multimedia/libtheora/buildlink3.mk" 62.include "../../multimedia/libtheora/buildlink3.mk"
cvs diff -r1.36 -r1.37 pkgsrc/multimedia/xine-lib/PLIST.common (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/PLIST.common 2013/12/04 12:38:35 1.36
+++ pkgsrc/multimedia/xine-lib/PLIST.common 2014/02/24 05:31:54 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.common,v 1.36 2013/12/04 12:38:35 drochner Exp $ 1@comment $NetBSD: PLIST.common,v 1.37 2014/02/24 05:31:54 richard Exp $
2bin/xine-config 2bin/xine-config
3bin/xine-list-1.2 3bin/xine-list-1.2
4include/xine.h 4include/xine.h
5include/xine/alphablend.h 5include/xine/alphablend.h
6include/xine/array.h 6include/xine/array.h
7include/xine/attributes.h 7include/xine/attributes.h
8include/xine/audio_decoder.h 8include/xine/audio_decoder.h
9include/xine/audio_out.h 9include/xine/audio_out.h
10include/xine/broadcaster.h 10include/xine/broadcaster.h
11include/xine/buffer.h 11include/xine/buffer.h
12include/xine/compat.h 12include/xine/compat.h
13include/xine/configfile.h 13include/xine/configfile.h
14include/xine/demux.h 14include/xine/demux.h
@@ -140,26 +140,28 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xin @@ -140,26 +140,28 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xin
140lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_qt.so 140lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_qt.so
141lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_rawdv.a 141lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_rawdv.a
142lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_rawdv.so 142lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_rawdv.so
143lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_real.a 143lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_real.a
144lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_real.so 144lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_real.so
145lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_slave.a 145lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_slave.a
146lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_slave.so 146lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_slave.so
147lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_vc1_es.a 147lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_vc1_es.a
148lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_vc1_es.so 148lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_vc1_es.so
149lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv4mpeg2.a 149lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv4mpeg2.a
150lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv4mpeg2.so 150lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv4mpeg2.so
151lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv_frames.a 151lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv_frames.a
152lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv_frames.so 152lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_dmx_yuv_frames.so
 153lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_flac.a
 154lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_flac.so
153lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_cdda.a 155lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_cdda.a
154lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_cdda.so 156lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_cdda.so
155lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvd.a 157lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvd.a
156lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvd.so 158lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_dvd.so
157lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_file.a 159lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_file.a
158lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_file.so 160lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_file.so
159lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_http.a 161lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_http.a
160lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_http.so 162lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_http.so
161lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_mms.a 163lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_mms.a
162lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_mms.so 164lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_mms.so
163lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_net.a 165lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_net.a
164lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_net.so 166lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_net.so
165lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_pnm.a 167lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_inp_pnm.a