Fri Jan 30 21:17:01 2009 UTC ()
Fix x11 vs SDL PLIST issues. Some files were misallocated and some had a
bogus dependency on SDL because of a missing png buildlink include.


(sborrill)
diff -r1.15 -r1.16 pkgsrc/multimedia/vlc08/Makefile
diff -r1.10 -r1.11 pkgsrc/multimedia/vlc08/PLIST
cvs diff -r1.15 -r1.16 pkgsrc/multimedia/vlc08/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc08/Attic/Makefile 2009/01/30 13:35:26 1.15
+++ pkgsrc/multimedia/vlc08/Attic/Makefile 2009/01/30 21:17:01 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2009/01/30 13:35:26 sborrill Exp $ 1# $NetBSD: Makefile,v 1.16 2009/01/30 21:17:01 sborrill Exp $
2# 2#
3 3
4DISTNAME= vlc-${VLC_VER} 4DISTNAME= vlc-${VLC_VER}
5PKGNAME= vlc08-${VLC_VER} 5PKGNAME= vlc08-${VLC_VER}
6VLC_VER= 0.8.6i 6VLC_VER= 0.8.6i
7PKGREVISION= 1 7PKGREVISION= 1
8CATEGORIES= multimedia 8CATEGORIES= multimedia
9MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/ 9MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.videolan.org/ 13HOMEPAGE= http://www.videolan.org/
14COMMENT= VideoLAN Client 14COMMENT= VideoLAN Client
@@ -98,26 +98,27 @@ CONFIGURE_ARGS+= x_libraries=${PREFIX}/l @@ -98,26 +98,27 @@ CONFIGURE_ARGS+= x_libraries=${PREFIX}/l
98 98
99.include "../../audio/faad2/buildlink3.mk" 99.include "../../audio/faad2/buildlink3.mk"
100.include "../../audio/flac/buildlink3.mk" 100.include "../../audio/flac/buildlink3.mk"
101.include "../../audio/lame/buildlink3.mk" 101.include "../../audio/lame/buildlink3.mk"
102.include "../../audio/liba52/buildlink3.mk" 102.include "../../audio/liba52/buildlink3.mk"
103.include "../../audio/libcddb/buildlink3.mk" 103.include "../../audio/libcddb/buildlink3.mk"
104.include "../../audio/libid3tag/buildlink3.mk" 104.include "../../audio/libid3tag/buildlink3.mk"
105.include "../../audio/libmad/buildlink3.mk" 105.include "../../audio/libmad/buildlink3.mk"
106.include "../../audio/libvorbis/buildlink3.mk" 106.include "../../audio/libvorbis/buildlink3.mk"
107.include "../../converters/fribidi/buildlink3.mk" 107.include "../../converters/fribidi/buildlink3.mk"
108.include "../../devel/gettext-lib/buildlink3.mk" 108.include "../../devel/gettext-lib/buildlink3.mk"
109.include "../../devel/pcre/buildlink3.mk" 109.include "../../devel/pcre/buildlink3.mk"
110.include "../../devel/zlib/buildlink3.mk" 110.include "../../devel/zlib/buildlink3.mk"
 111.include "../../graphics/png/buildlink3.mk"
111.include "../../misc/libcdio/buildlink3.mk" 112.include "../../misc/libcdio/buildlink3.mk"
112.include "../../multimedia/ffmpeg/buildlink3.mk" 113.include "../../multimedia/ffmpeg/buildlink3.mk"
113.include "../../multimedia/libdvdplay/buildlink3.mk" 114.include "../../multimedia/libdvdplay/buildlink3.mk"
114.include "../../multimedia/libdvbpsi/buildlink3.mk" 115.include "../../multimedia/libdvbpsi/buildlink3.mk"
115.include "../../multimedia/libdvdnav/buildlink3.mk" 116.include "../../multimedia/libdvdnav/buildlink3.mk"
116.include "../../multimedia/libdvdread/buildlink3.mk" 117.include "../../multimedia/libdvdread/buildlink3.mk"
117.include "../../multimedia/libmatroska/buildlink3.mk" 118.include "../../multimedia/libmatroska/buildlink3.mk"
118.include "../../multimedia/libmpeg2/buildlink3.mk" 119.include "../../multimedia/libmpeg2/buildlink3.mk"
119.include "../../multimedia/libogg/buildlink3.mk" 120.include "../../multimedia/libogg/buildlink3.mk"
120.include "../../multimedia/x264-devel/buildlink3.mk" 121.include "../../multimedia/x264-devel/buildlink3.mk"
121.include "../../textproc/libxml2/buildlink3.mk" 122.include "../../textproc/libxml2/buildlink3.mk"
122 123
123.include "../../mk/oss.buildlink3.mk" 124.include "../../mk/oss.buildlink3.mk"
cvs diff -r1.10 -r1.11 pkgsrc/multimedia/vlc08/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/vlc08/Attic/PLIST 2009/01/30 13:35:26 1.10
+++ pkgsrc/multimedia/vlc08/Attic/PLIST 2009/01/30 21:17:01 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.10 2009/01/30 13:35:26 sborrill Exp $ 1@comment $NetBSD: PLIST,v 1.11 2009/01/30 21:17:01 sborrill Exp $
2${PLIST.skins}bin/svlc 2${PLIST.skins}bin/svlc
3bin/vlc 3bin/vlc
4bin/vlc-config 4bin/vlc-config
5${PLIST.wxwidgets}bin/wxvlc 5${PLIST.wxwidgets}bin/wxvlc
6include/vlc/aout.h 6include/vlc/aout.h
7include/vlc/decoder.h 7include/vlc/decoder.h
8include/vlc/input.h 8include/vlc/input.h
9include/vlc/intf.h 9include/vlc/intf.h
10include/vlc/libvlc.h 10include/vlc/libvlc.h
11include/vlc/mediacontrol.h 11include/vlc/mediacontrol.h
12include/vlc/mediacontrol_structures.h 12include/vlc/mediacontrol_structures.h
13include/vlc/sout.h 13include/vlc/sout.h
14include/vlc/vlc.h 14include/vlc/vlc.h
@@ -75,27 +75,27 @@ lib/vlc/codec/libadpcm_plugin.so @@ -75,27 +75,27 @@ lib/vlc/codec/libadpcm_plugin.so
75lib/vlc/codec/libaraw_plugin.so 75lib/vlc/codec/libaraw_plugin.so
76lib/vlc/codec/libcinepak_plugin.so 76lib/vlc/codec/libcinepak_plugin.so
77lib/vlc/codec/libcmml_plugin.so 77lib/vlc/codec/libcmml_plugin.so
78lib/vlc/codec/libcvdsub_plugin.so 78lib/vlc/codec/libcvdsub_plugin.so
79lib/vlc/codec/libdts_plugin.so 79lib/vlc/codec/libdts_plugin.so
80lib/vlc/codec/libdvbsub_plugin.so 80lib/vlc/codec/libdvbsub_plugin.so
81${PLIST.faad}lib/vlc/codec/libfaad_plugin.so 81${PLIST.faad}lib/vlc/codec/libfaad_plugin.so
82lib/vlc/codec/libfake_plugin.so 82lib/vlc/codec/libfake_plugin.so
83lib/vlc/codec/libffmpeg_plugin.so 83lib/vlc/codec/libffmpeg_plugin.so
84lib/vlc/codec/libflacdec_plugin.so 84lib/vlc/codec/libflacdec_plugin.so
85lib/vlc/codec/liblibmpeg2_plugin.so 85lib/vlc/codec/liblibmpeg2_plugin.so
86lib/vlc/codec/liblpcm_plugin.so 86lib/vlc/codec/liblpcm_plugin.so
87lib/vlc/codec/libmpeg_audio_plugin.so 87lib/vlc/codec/libmpeg_audio_plugin.so
88${PLIST.x11}lib/vlc/codec/libpng_plugin.so 88lib/vlc/codec/libpng_plugin.so
89lib/vlc/codec/librawvideo_plugin.so 89lib/vlc/codec/librawvideo_plugin.so
90${PLIST.sdl}lib/vlc/codec/libsdl_image_plugin.so 90${PLIST.sdl}lib/vlc/codec/libsdl_image_plugin.so
91lib/vlc/codec/libspudec_plugin.so 91lib/vlc/codec/libspudec_plugin.so
92lib/vlc/codec/libsubsdec_plugin.so 92lib/vlc/codec/libsubsdec_plugin.so
93lib/vlc/codec/libsvcdsub_plugin.so 93lib/vlc/codec/libsvcdsub_plugin.so
94lib/vlc/codec/libtelx_plugin.so 94lib/vlc/codec/libtelx_plugin.so
95lib/vlc/codec/libvorbis_plugin.so 95lib/vlc/codec/libvorbis_plugin.so
96lib/vlc/codec/libx264_plugin.so 96lib/vlc/codec/libx264_plugin.so
97lib/vlc/control/libgestures_plugin.so 97lib/vlc/control/libgestures_plugin.so
98lib/vlc/control/libhotkeys_plugin.so 98lib/vlc/control/libhotkeys_plugin.so
99lib/vlc/control/libhttp_plugin.so 99lib/vlc/control/libhttp_plugin.so
100lib/vlc/control/libnetsync_plugin.so 100lib/vlc/control/libnetsync_plugin.so
101lib/vlc/control/librc_plugin.so 101lib/vlc/control/librc_plugin.so
@@ -194,37 +194,37 @@ lib/vlc/video_chroma/libi422_yuy2_plugin @@ -194,37 +194,37 @@ lib/vlc/video_chroma/libi422_yuy2_plugin
194lib/vlc/video_filter/libadjust_plugin.so 194lib/vlc/video_filter/libadjust_plugin.so
195lib/vlc/video_filter/libblend_plugin.so 195lib/vlc/video_filter/libblend_plugin.so
196lib/vlc/video_filter/libclone_plugin.so 196lib/vlc/video_filter/libclone_plugin.so
197lib/vlc/video_filter/libcrop_plugin.so 197lib/vlc/video_filter/libcrop_plugin.so
198lib/vlc/video_filter/libdeinterlace_plugin.so 198lib/vlc/video_filter/libdeinterlace_plugin.so
199lib/vlc/video_filter/libdistort_plugin.so 199lib/vlc/video_filter/libdistort_plugin.so
200lib/vlc/video_filter/libinvert_plugin.so 200lib/vlc/video_filter/libinvert_plugin.so
201lib/vlc/video_filter/liblogo_plugin.so 201lib/vlc/video_filter/liblogo_plugin.so
202lib/vlc/video_filter/libmagnify_plugin.so 202lib/vlc/video_filter/libmagnify_plugin.so
203lib/vlc/video_filter/libmarq_plugin.so 203lib/vlc/video_filter/libmarq_plugin.so
204lib/vlc/video_filter/libmosaic_plugin.so 204lib/vlc/video_filter/libmosaic_plugin.so
205lib/vlc/video_filter/libmotionblur_plugin.so 205lib/vlc/video_filter/libmotionblur_plugin.so
206lib/vlc/video_filter/libmotiondetect_plugin.so 206lib/vlc/video_filter/libmotiondetect_plugin.so
207${PLIST.x11}lib/vlc/video_filter/libosdmenu_plugin.so 207lib/vlc/video_filter/libosdmenu_plugin.so
208lib/vlc/video_filter/librss_plugin.so 208lib/vlc/video_filter/librss_plugin.so
209lib/vlc/video_filter/librv32_plugin.so 209lib/vlc/video_filter/librv32_plugin.so
210lib/vlc/video_filter/libscale_plugin.so 210lib/vlc/video_filter/libscale_plugin.so
211lib/vlc/video_filter/libtime_plugin.so 211lib/vlc/video_filter/libtime_plugin.so
212lib/vlc/video_filter/libtransform_plugin.so 212lib/vlc/video_filter/libtransform_plugin.so
213lib/vlc/video_filter/libwall_plugin.so 213lib/vlc/video_filter/libwall_plugin.so
214${PLIST.fb}lib/vlc/video_output/libfb_plugin.so 214${PLIST.fb}lib/vlc/video_output/libfb_plugin.so
215${PLIST.x11}lib/vlc/video_output/libglx_plugin.so 215${PLIST.sdl}lib/vlc/video_output/libglx_plugin.so
216lib/vlc/video_output/libimage_plugin.so 216lib/vlc/video_output/libimage_plugin.so
217${PLIST.x11}lib/vlc/video_output/libopengl_plugin.so 217${PLIST.sdl}lib/vlc/video_output/libopengl_plugin.so
218${PLIST.sdl}lib/vlc/video_output/libvout_sdl_plugin.so 218${PLIST.sdl}lib/vlc/video_output/libvout_sdl_plugin.so
219${PLIST.x11}lib/vlc/video_output/libx11_plugin.so 219${PLIST.x11}lib/vlc/video_output/libx11_plugin.so
220${PLIST.x11}lib/vlc/video_output/libxvideo_plugin.so 220${PLIST.x11}lib/vlc/video_output/libxvideo_plugin.so
221lib/vlc/visualization/libvisual_plugin.so 221lib/vlc/visualization/libvisual_plugin.so
222man/man1/vlc-config.1 222man/man1/vlc-config.1
223man/man1/vlc.1 223man/man1/vlc.1
224share/applications/vlc.desktop 224share/applications/vlc.desktop
225share/doc/vlc/bugreport-howto.txt 225share/doc/vlc/bugreport-howto.txt
226share/doc/vlc/fortunes.txt 226share/doc/vlc/fortunes.txt
227share/doc/vlc/intf-cdda.txt 227share/doc/vlc/intf-cdda.txt
228share/doc/vlc/intf-vcd.txt 228share/doc/vlc/intf-vcd.txt
229share/locale/af/LC_MESSAGES/vlc.mo 229share/locale/af/LC_MESSAGES/vlc.mo
230share/locale/ar/LC_MESSAGES/vlc.mo 230share/locale/ar/LC_MESSAGES/vlc.mo