summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authormartti <martti@pkgsrc.org>2006-09-26 07:19:41 +0000
committermartti <martti@pkgsrc.org>2006-09-26 07:19:41 +0000
commit14d9e83c311c5e00ed7a73b90f948275bce8cf81 (patch)
treefacc14b258908974a55ef7a9ce9111803c9e6b4a /multimedia
parent0ee9b1f597a4af0e8f91eab1c23101deae3d5066 (diff)
downloadpkgsrc-14d9e83c311c5e00ed7a73b90f948275bce8cf81.tar.gz
Moved from pkgsrc/multimedia/vlc
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/vlc07/DESCR10
-rw-r--r--multimedia/vlc07/MESSAGE.NetBSD9
-rw-r--r--multimedia/vlc07/Makefile103
-rw-r--r--multimedia/vlc07/PLIST.Linux-i3862
-rw-r--r--multimedia/vlc07/PLIST.common275
-rw-r--r--multimedia/vlc07/PLIST.common_end26
-rw-r--r--multimedia/vlc07/PLIST.i3868
-rw-r--r--multimedia/vlc07/PLIST.powerpc3
-rw-r--r--multimedia/vlc07/buildlink3.mk47
-rw-r--r--multimedia/vlc07/distinfo10
-rw-r--r--multimedia/vlc07/hacks.mk8
-rw-r--r--multimedia/vlc07/patches/patch-aa16
-rw-r--r--multimedia/vlc07/patches/patch-ab202
-rw-r--r--multimedia/vlc07/patches/patch-ac22
-rw-r--r--multimedia/vlc07/patches/patch-ad22
-rw-r--r--multimedia/vlc07/patches/patch-ae13
16 files changed, 776 insertions, 0 deletions
diff --git a/multimedia/vlc07/DESCR b/multimedia/vlc07/DESCR
new file mode 100644
index 00000000000..6ea7f1224c6
--- /dev/null
+++ b/multimedia/vlc07/DESCR
@@ -0,0 +1,10 @@
+VideoLAN is a project of French students from the Ecole Centrale Paris
+and developers from all over the world. Its main goals is MPEG streaming
+on a network, but it also features a standalone multimedia player. The
+VideoLAN Server can stream video read from a hard disk, a DVD player,
+a satellite card or an MPEG 2 compression card, and unicast or multicast
+it on a network. The VideoLAN Client can read the stream from the network
+and display it. It can also be used to display video read locally on
+the computer : DVDs, VCDs, MPEG and DivX files and from a satellite
+card. It is multi-plaform : Linux, Windows, Mac OS X, BeOS, BSD, Solaris,
+QNX, iPaq... The VideoLAN Client and Server now have a full IPv6 support.
diff --git a/multimedia/vlc07/MESSAGE.NetBSD b/multimedia/vlc07/MESSAGE.NetBSD
new file mode 100644
index 00000000000..919f400d489
--- /dev/null
+++ b/multimedia/vlc07/MESSAGE.NetBSD
@@ -0,0 +1,9 @@
+===========================================================================
+$NetBSD: MESSAGE.NetBSD,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+
+You may need to increase the maximum number of shared memory pages
+(SHMMAXPGS) in your kernel to run ${PKGNAME}. One possible setting is:
+
+ options SHMMAXPGS=32768
+
+===========================================================================
diff --git a/multimedia/vlc07/Makefile b/multimedia/vlc07/Makefile
new file mode 100644
index 00000000000..f2877042aa8
--- /dev/null
+++ b/multimedia/vlc07/Makefile
@@ -0,0 +1,103 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+#
+
+DISTNAME= vlc-${VLC_VER}
+PKGREVISION= 15
+CATEGORIES= multimedia
+MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://www.videolan.org/
+COMMENT= VideoLAN Client
+
+USE_LANGUAGES= c c++
+USE_TOOLS+= gmake pkg-config
+USE_PKGLOCALEDIR= yes
+GNU_CONFIGURE= yes
+PTHREAD_OPTS+= require
+
+VLC_VER= 0.7.2
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+CONFIGURE_ARGS+= --disable-vcd
+.endif
+BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
+BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=0.4.8nb1 # Postprocess fix
+
+CONFIGURE_ARGS+= --disable-skins2
+CONFIGURE_ARGS+= --disable-speex # needs unstable 1.1.x branch
+
+CONFIGURE_ARGS+= --enable-dvb
+CONFIGURE_ARGS+= --enable-flac
+CONFIGURE_ARGS+= --disable-gtk
+CONFIGURE_ARGS+= --with-ffmpeg-tree=${BUILDLINK_PREFIX.ffmpeg}/lib
+
+BUILD_DEFS+= WITH_DVDCSS
+
+.if defined(WITH_DVDCSS) && !empty(WITH_DVDCSS:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+= --with-dvdcss=${BUILDLINK_PREFIX.libdvdcss}
+.include "../../multimedia/libdvdcss/buildlink3.mk"
+PLIST_SUBST+= DVDCSS=
+.else
+CONFIGURE_ARGS+= --disable-dvd
+PLIST_SUBST+= DVDCSS="@comment "
+.endif
+
+pre-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/admin
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/skins/default
+ ${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${PREFIX}/man/man1
+ ${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${PREFIX}/man/man1
+
+ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
+DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
+
+SUBST_CLASSES+= oss fnt libav
+SUBST_STAGE.oss= post-patch
+SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
+SUBST_FILES.oss+= modules/access/v4l/v4l.c
+SUBST_FILES.oss+= modules/audio_output/oss.c
+SUBST_FILES.oss+= modules/gui/pda/pda_interface.c
+SUBST_FILES.oss+= modules/gui/pda/pda.glade
+SUBST_MESSAGE.oss= Fixing hardcoded audio device.
+SUBST_STAGE.fnt= post-patch
+SUBST_SED.fnt= -e "s,${ORIGFNT},${DEFAULT_FONT},"
+SUBST_FILES.fnt= modules/misc/freetype.c
+SUBST_MESSAGE.fnt= Fixing hardcoded paths.
+SUBST_STAGE.libav= post-patch
+SUBST_FILES.libav= configure
+SUBST_SED.libav= -e "s,libavcodec/libavcodec.a,libavcodec.a,g"
+
+BUILDLINK_TRANSFORM.ffmpeg+= -e "s,include/ffmpeg,include/,g"
+
+.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/lame/buildlink3.mk"
+.include "../../audio/liba52/buildlink3.mk"
+.include "../../audio/libcddb/buildlink3.mk"
+.include "../../audio/libid3tag/buildlink3.mk"
+.include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../converters/fribidi/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../misc/libcdio/buildlink3.mk"
+.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/libdvdplay/buildlink3.mk"
+.include "../../multimedia/libdvdnav/buildlink3.mk"
+.include "../../multimedia/libdvbpsi/buildlink3.mk"
+.include "../../multimedia/libdvdread/buildlink3.mk"
+.include "../../multimedia/libmatroska/buildlink3.mk"
+.include "../../multimedia/libmpeg2/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../net/openslp/buildlink3.mk"
+.include "../../sysutils/vcdimager-devel/buildlink3.mk"
+.include "../../x11/wxGTK/buildlink3.mk"
+
+.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/vlc07/PLIST.Linux-i386 b/multimedia/vlc07/PLIST.Linux-i386
new file mode 100644
index 00000000000..8c124bc5e84
--- /dev/null
+++ b/multimedia/vlc07/PLIST.Linux-i386
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Linux-i386,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+lib/vlc/video_output/libfb_plugin.so
diff --git a/multimedia/vlc07/PLIST.common b/multimedia/vlc07/PLIST.common
new file mode 100644
index 00000000000..5c2fd3108d5
--- /dev/null
+++ b/multimedia/vlc07/PLIST.common
@@ -0,0 +1,275 @@
+@comment $NetBSD: PLIST.common,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+bin/vlc
+bin/vlc-config
+bin/wxvlc
+include/vlc/aout.h
+include/vlc/decoder.h
+include/vlc/input.h
+include/vlc/intf.h
+include/vlc/sout.h
+include/vlc/vlc.h
+include/vlc/vout.h
+lib/libvlc.a
+lib/vlc/access/libaccess_directory_plugin.so
+lib/vlc/access/libaccess_file_plugin.so
+lib/vlc/access/libaccess_ftp_plugin.so
+lib/vlc/access/libaccess_http_plugin.so
+lib/vlc/access/libaccess_mms_plugin.so
+lib/vlc/access/libaccess_tcp_plugin.so
+lib/vlc/access/libaccess_udp_plugin.so
+lib/vlc/access/libcddax_plugin.so
+${DVDCSS}lib/vlc/access/libdvd_plugin.so
+lib/vlc/access/libdvdplay_plugin.so
+lib/vlc/access/libdvdread_plugin.so
+lib/vlc/access/libslp_plugin.so
+lib/vlc/access/libvcdx_plugin.so
+lib/vlc/access_output/libaccess_output_dummy_plugin.so
+lib/vlc/access_output/libaccess_output_file_plugin.so
+lib/vlc/access_output/libaccess_output_http_plugin.so
+lib/vlc/access_output/libaccess_output_udp_plugin.so
+lib/vlc/audio_filter/liba52tofloat32_plugin.so
+lib/vlc/audio_filter/liba52tospdif_plugin.so
+lib/vlc/audio_filter/libbandlimited_resampler_plugin.so
+lib/vlc/audio_filter/libdtstospdif_plugin.so
+lib/vlc/audio_filter/libfixed32tofloat32_plugin.so
+lib/vlc/audio_filter/libfixed32tos16_plugin.so
+lib/vlc/audio_filter/libfloat32tos16_plugin.so
+lib/vlc/audio_filter/libfloat32tos8_plugin.so
+lib/vlc/audio_filter/libfloat32tou16_plugin.so
+lib/vlc/audio_filter/libfloat32tou8_plugin.so
+lib/vlc/audio_filter/libheadphone_channel_mixer_plugin.so
+lib/vlc/audio_filter/liblinear_resampler_plugin.so
+lib/vlc/audio_filter/libmpgatofixed32_plugin.so
+lib/vlc/audio_filter/libs16tofixed32_plugin.so
+lib/vlc/audio_filter/libs16tofloat32_plugin.so
+lib/vlc/audio_filter/libs16tofloat32swab_plugin.so
+lib/vlc/audio_filter/libs8tofloat32_plugin.so
+lib/vlc/audio_filter/libtrivial_channel_mixer_plugin.so
+lib/vlc/audio_filter/libtrivial_resampler_plugin.so
+lib/vlc/audio_filter/libu8tofixed32_plugin.so
+lib/vlc/audio_filter/libu8tofloat32_plugin.so
+lib/vlc/audio_filter/libugly_resampler_plugin.so
+lib/vlc/audio_mixer/libfloat32_mixer_plugin.so
+lib/vlc/audio_mixer/libspdif_mixer_plugin.so
+lib/vlc/audio_mixer/libtrivial_mixer_plugin.so
+lib/vlc/audio_output/libaout_file_plugin.so
+lib/vlc/audio_output/libaout_sdl_plugin.so
+lib/vlc/audio_output/liboss_plugin.so
+lib/vlc/codec/liba52_plugin.so
+lib/vlc/codec/libadpcm_plugin.so
+lib/vlc/codec/libaraw_plugin.so
+lib/vlc/codec/libcinepak_plugin.so
+lib/vlc/codec/libcmml_plugin.so
+lib/vlc/codec/libcvdsub_plugin.so
+lib/vlc/codec/libdts_plugin.so
+lib/vlc/codec/libdvbsub_plugin.so
+lib/vlc/codec/libflacdec_plugin.so
+lib/vlc/codec/liblibmpeg2_plugin.so
+lib/vlc/codec/liblpcm_plugin.so
+lib/vlc/codec/libmpeg_audio_plugin.so
+lib/vlc/codec/librawvideo_plugin.so
+lib/vlc/codec/libspudec_plugin.so
+lib/vlc/codec/libsubsdec_plugin.so
+lib/vlc/codec/libsvcdsub_plugin.so
+lib/vlc/codec/libvorbis_plugin.so
+lib/vlc/control/libgestures_plugin.so
+lib/vlc/control/libhotkeys_plugin.so
+lib/vlc/control/libhttp_plugin.so
+lib/vlc/control/librc_plugin.so
+lib/vlc/control/libtelnet_plugin.so
+lib/vlc/demux/liba52sys_plugin.so
+lib/vlc/demux/libaac_plugin.so
+lib/vlc/demux/libaiff_plugin.so
+lib/vlc/demux/libasf_plugin.so
+lib/vlc/demux/libau_plugin.so
+lib/vlc/demux/libavi_plugin.so
+lib/vlc/demux/libdvdnav_plugin.so
+lib/vlc/demux/libdemux2_plugin.so
+lib/vlc/demux/libdemuxdump_plugin.so
+lib/vlc/demux/libdemuxsub_plugin.so
+lib/vlc/demux/libdtssys_plugin.so
+lib/vlc/demux/libflac_plugin.so
+lib/vlc/demux/libh264_plugin.so
+lib/vlc/demux/libid3_plugin.so
+lib/vlc/demux/libid3tag_plugin.so
+lib/vlc/demux/libm3u_plugin.so
+lib/vlc/demux/libm4v_plugin.so
+lib/vlc/demux/libmp4_plugin.so
+lib/vlc/demux/libmpeg_system_plugin.so
+lib/vlc/demux/libmpga_plugin.so
+lib/vlc/demux/libmpgv_plugin.so
+lib/vlc/demux/libnsv_plugin.so
+lib/vlc/demux/libogg_plugin.so
+lib/vlc/demux/libplaylist_plugin.so
+lib/vlc/demux/libps2_plugin.so
+lib/vlc/demux/libps_plugin.so
+lib/vlc/demux/libpva_plugin.so
+lib/vlc/demux/librawdv_plugin.so
+lib/vlc/demux/libreal_plugin.so
+lib/vlc/demux/libsgimb_plugin.so
+lib/vlc/demux/libts2_plugin.so
+lib/vlc/demux/libts_dvbpsi_plugin.so
+lib/vlc/demux/libts_plugin.so
+lib/vlc/demux/libwav_plugin.so
+lib/vlc/gui/libwxwindows_plugin.so
+lib/vlc/libffmpeg.a
+lib/vlc/libmkv.a
+lib/vlc/libstream_out_transcode.a
+lib/vlc/misc/libdummy_plugin.so
+lib/vlc/misc/libexport_plugin.so
+lib/vlc/misc/libfreetype_plugin.so
+lib/vlc/misc/libipv4_plugin.so
+lib/vlc/misc/libipv6_plugin.so
+lib/vlc/misc/liblogger_plugin.so
+lib/vlc/misc/libmemcpy_plugin.so
+lib/vlc/misc/libsap_plugin.so
+lib/vlc/misc/libscreensaver_plugin.so
+lib/vlc/mux/libmux_asf_plugin.so
+lib/vlc/mux/libmux_avi_plugin.so
+lib/vlc/mux/libmux_dummy_plugin.so
+lib/vlc/mux/libmux_mp4_plugin.so
+lib/vlc/mux/libmux_ogg_plugin.so
+lib/vlc/mux/libmux_ps_plugin.so
+lib/vlc/mux/libmux_ts_dvbpsi_plugin.so
+lib/vlc/mux/libmux_ts_plugin.so
+lib/vlc/packetizer/libpacketizer_copy_plugin.so
+lib/vlc/packetizer/libpacketizer_h264_plugin.so
+lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.so
+lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.so
+lib/vlc/packetizer/libpacketizer_mpegvideo_plugin.so
+lib/vlc/stream_out/libstream_out_display_plugin.so
+lib/vlc/stream_out/libstream_out_dummy_plugin.so
+lib/vlc/stream_out/libstream_out_duplicate_plugin.so
+lib/vlc/stream_out/libstream_out_es_plugin.so
+lib/vlc/stream_out/libstream_out_gather_plugin.so
+lib/vlc/stream_out/libstream_out_rtp_plugin.so
+lib/vlc/stream_out/libstream_out_standard_plugin.so
+lib/vlc/video_chroma/libi420_rgb_plugin.so
+lib/vlc/video_chroma/libi420_ymga_plugin.so
+lib/vlc/video_chroma/libi420_yuy2_plugin.so
+lib/vlc/video_chroma/libi422_yuy2_plugin.so
+lib/vlc/video_filter/libadjust_plugin.so
+lib/vlc/video_filter/libclone_plugin.so
+lib/vlc/video_filter/libcrop_plugin.so
+lib/vlc/video_filter/libdeinterlace_plugin.so
+lib/vlc/video_filter/libdistort_plugin.so
+lib/vlc/video_filter/libinvert_plugin.so
+lib/vlc/video_filter/liblogo_plugin.so
+lib/vlc/video_filter/libmotionblur_plugin.so
+lib/vlc/video_filter/libtransform_plugin.so
+lib/vlc/video_filter/libwall_plugin.so
+lib/vlc/video_output/libvout_sdl_plugin.so
+lib/vlc/video_output/libx11_plugin.so
+lib/vlc/video_output/libxvideo_plugin.so
+lib/vlc/visualization/libvisual_plugin.so
+man/man1/vlc-config.1
+man/man1/vlc.1
+share/doc/vlc/bugreport-howto.txt
+share/doc/vlc/fortunes.txt
+share/doc/vlc/intf-cdda.txt
+share/doc/vlc/intf-vcd.txt
+share/doc/vlc/vlc-howto.sgml
+share/doc/vlc/web-streaming.html
+share/locale/de/LC_MESSAGES/vlc.mo
+share/locale/en_GB/LC_MESSAGES/vlc.mo
+share/locale/es/LC_MESSAGES/vlc.mo
+share/locale/fr/LC_MESSAGES/vlc.mo
+share/locale/hu/LC_MESSAGES/vlc.mo
+share/locale/it/LC_MESSAGES/vlc.mo
+share/locale/ja/LC_MESSAGES/vlc.mo
+share/locale/nl/LC_MESSAGES/vlc.mo
+share/locale/no/LC_MESSAGES/vlc.mo
+share/locale/pl/LC_MESSAGES/vlc.mo
+share/locale/pt_BR/LC_MESSAGES/vlc.mo
+share/locale/ru/LC_MESSAGES/vlc.mo
+share/locale/sv/LC_MESSAGES/vlc.mo
+share/vlc/familiar-forwardb16x16.xpm
+share/vlc/familiar-openb16x16.xpm
+share/vlc/familiar-pauseb16x16.xpm
+share/vlc/familiar-playb16x16.xpm
+share/vlc/familiar-playlistb16x16.xpm
+share/vlc/familiar-preferencesb16x16.xpm
+share/vlc/familiar-rewindb16x16.xpm
+share/vlc/familiar-stopb16x16.xpm
+share/vlc/gnome-vlc16x16.png
+share/vlc/gnome-vlc32x32.png
+share/vlc/gnome-vlc32x32.xpm
+share/vlc/gnome-vlc48x48.png
+share/vlc/gvlc16x16.png
+share/vlc/gvlc32x32.png
+share/vlc/gvlc32x32.xpm
+share/vlc/gvlc48x48.ico
+share/vlc/gvlc48x48.png
+share/vlc/http/admin/.access
+share/vlc/http/admin/browse.html
+share/vlc/http/admin/dboxfiles.html
+share/vlc/http/admin/index.html
+share/vlc/http/index.html
+share/vlc/http/info.html
+share/vlc/http/style.css
+share/vlc/kvlc16x16.png
+share/vlc/kvlc32x32.png
+share/vlc/kvlc32x32.xpm
+share/vlc/kvlc48x48.png
+share/vlc/pda-forwardb16x16.xpm
+share/vlc/pda-openb16x16.xpm
+share/vlc/pda-pauseb16x16.xpm
+share/vlc/pda-playb16x16.xpm
+share/vlc/pda-playlistb16x16.xpm
+share/vlc/pda-preferencesb16x16.xpm
+share/vlc/pda-rewindb16x16.xpm
+share/vlc/pda-stopb16x16.xpm
+share/vlc/qvlc16x16.png
+share/vlc/qvlc32x32.png
+share/vlc/qvlc32x32.xpm
+share/vlc/qvlc48x48.png
+share/vlc/skins/default/add1.bmp
+share/vlc/skins/default/add2.bmp
+share/vlc/skins/default/add3.bmp
+share/vlc/skins/default/body.bmp
+share/vlc/skins/default/del1.bmp
+share/vlc/skins/default/del2.bmp
+share/vlc/skins/default/del3.bmp
+share/vlc/skins/default/next1.bmp
+share/vlc/skins/default/next2.bmp
+share/vlc/skins/default/next3.bmp
+share/vlc/skins/default/next4.bmp
+share/vlc/skins/default/open1.bmp
+share/vlc/skins/default/open2.bmp
+share/vlc/skins/default/open3.bmp
+share/vlc/skins/default/pause1.bmp
+share/vlc/skins/default/pause2.bmp
+share/vlc/skins/default/pause3.bmp
+share/vlc/skins/default/pause4.bmp
+share/vlc/skins/default/play1.bmp
+share/vlc/skins/default/play2.bmp
+share/vlc/skins/default/play3.bmp
+share/vlc/skins/default/play4.bmp
+share/vlc/skins/default/playlist1.bmp
+share/vlc/skins/default/playlist2.bmp
+share/vlc/skins/default/playlist3.bmp
+share/vlc/skins/default/playlist_body.bmp
+share/vlc/skins/default/prefs1.bmp
+share/vlc/skins/default/prefs2.bmp
+share/vlc/skins/default/prefs3.bmp
+share/vlc/skins/default/prev1.bmp
+share/vlc/skins/default/prev2.bmp
+share/vlc/skins/default/prev3.bmp
+share/vlc/skins/default/prev4.bmp
+share/vlc/skins/default/quit1.bmp
+share/vlc/skins/default/quit2.bmp
+share/vlc/skins/default/quit3.bmp
+share/vlc/skins/default/slider1.bmp
+share/vlc/skins/default/slider2.bmp
+share/vlc/skins/default/stop1.bmp
+share/vlc/skins/default/stop2.bmp
+share/vlc/skins/default/stop3.bmp
+share/vlc/skins/default/stop4.bmp
+share/vlc/skins/default/theme.xml
+share/vlc/ui.rc
+share/vlc/vlc16x16.png
+share/vlc/vlc16x16.xpm
+share/vlc/vlc32x32.png
+share/vlc/vlc32x32.xpm
+share/vlc/vlc48x48.ico
+share/vlc/vlc48x48.png
diff --git a/multimedia/vlc07/PLIST.common_end b/multimedia/vlc07/PLIST.common_end
new file mode 100644
index 00000000000..92fab6f861d
--- /dev/null
+++ b/multimedia/vlc07/PLIST.common_end
@@ -0,0 +1,26 @@
+@comment $NetBSD: PLIST.common_end,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+@dirrm share/vlc/skins/default
+@dirrm share/vlc/skins
+@dirrm share/vlc/http/admin
+@dirrm share/vlc/http
+@dirrm share/vlc
+@dirrm share/doc/vlc
+@dirrm lib/vlc/visualization
+@dirrm lib/vlc/video_output
+@dirrm lib/vlc/video_filter
+@dirrm lib/vlc/video_chroma
+@dirrm lib/vlc/stream_out
+@dirrm lib/vlc/packetizer
+@dirrm lib/vlc/mux
+@dirrm lib/vlc/misc
+@dirrm lib/vlc/gui
+@dirrm lib/vlc/demux
+@dirrm lib/vlc/control
+@dirrm lib/vlc/codec
+@dirrm lib/vlc/audio_output
+@dirrm lib/vlc/audio_mixer
+@dirrm lib/vlc/audio_filter
+@dirrm lib/vlc/access_output
+@dirrm lib/vlc/access
+@dirrm lib/vlc
+@dirrm include/vlc
diff --git a/multimedia/vlc07/PLIST.i386 b/multimedia/vlc07/PLIST.i386
new file mode 100644
index 00000000000..eef4aa64c06
--- /dev/null
+++ b/multimedia/vlc07/PLIST.i386
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST.i386,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+lib/vlc/libi420_rgb_mmx.a
+lib/vlc/libi420_ymga_mmx.a
+lib/vlc/libi420_yuy2_mmx.a
+lib/vlc/libi422_yuy2_mmx.a
+lib/vlc/libmemcpy3dn.a
+lib/vlc/libmemcpymmx.a
+lib/vlc/libmemcpymmxext.a
diff --git a/multimedia/vlc07/PLIST.powerpc b/multimedia/vlc07/PLIST.powerpc
new file mode 100644
index 00000000000..a46216983f0
--- /dev/null
+++ b/multimedia/vlc07/PLIST.powerpc
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.powerpc,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+lib/vlc/libi420_yuy2_altivec.a
+lib/vlc/libmemcpyaltivec.a
diff --git a/multimedia/vlc07/buildlink3.mk b/multimedia/vlc07/buildlink3.mk
new file mode 100644
index 00000000000..aba835f860d
--- /dev/null
+++ b/multimedia/vlc07/buildlink3.mk
@@ -0,0 +1,47 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+#
+# This Makefile fragment is included by packages that use vlc.
+#
+# This file was created automatically using createbuildlink-3.0.
+#
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+VLC_BUILDLINK3_MK:= ${VLC_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= vlc
+.endif
+
+.if !empty(VLC_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+= vlc
+BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}vlc
+BUILDLINK_API_DEPENDS.vlc?= vlc>=0.7.1
+BUILDLINK_ABI_DEPENDS.vlc?= vlc>=0.7.2nb15
+BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc07
+.endif # VLC_BUILDLINK3_MK
+
+.include "../../multimedia/libdvdcss/buildlink3.mk"
+.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/lame/buildlink3.mk"
+.include "../../audio/liba52/buildlink3.mk"
+.include "../../audio/libcddb/buildlink3.mk"
+.include "../../audio/libid3tag/buildlink3.mk"
+.include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../converters/fribidi/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../misc/libcdio/buildlink3.mk"
+.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/libdvdplay/buildlink3.mk"
+.include "../../multimedia/libdvbpsi/buildlink3.mk"
+.include "../../multimedia/libdvdread/buildlink3.mk"
+.include "../../multimedia/libmatroska/buildlink3.mk"
+.include "../../multimedia/libmpeg2/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../net/openslp/buildlink3.mk"
+.include "../../sysutils/vcdimager-devel/buildlink3.mk"
+.include "../../x11/wxGTK/buildlink3.mk"
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/vlc07/distinfo b/multimedia/vlc07/distinfo
new file mode 100644
index 00000000000..9dcd1cc8b04
--- /dev/null
+++ b/multimedia/vlc07/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+
+SHA1 (vlc-0.7.2.tar.bz2) = 938eaea128af02451fcbf0305c84ce290c9d8c21
+RMD160 (vlc-0.7.2.tar.bz2) = 05e35e0b9080581cfbc730212fc756cb46bd3257
+Size (vlc-0.7.2.tar.bz2) = 4516835 bytes
+SHA1 (patch-aa) = 03e66c696c8d1491a91b17a1321144a844b94cf1
+SHA1 (patch-ab) = 5f1cb287981d79533aedeb176c0219a815b8bf52
+SHA1 (patch-ac) = aec258582e1d18ccb1efc3ce74e9f949046d61b1
+SHA1 (patch-ad) = e12945776db476e48ce005b6d68f9931ddcbe020
+SHA1 (patch-ae) = 1dcc0466a362fcdf51fbce8869cd1a48d35d3909
diff --git a/multimedia/vlc07/hacks.mk b/multimedia/vlc07/hacks.mk
new file mode 100644
index 00000000000..908837066d5
--- /dev/null
+++ b/multimedia/vlc07/hacks.mk
@@ -0,0 +1,8 @@
+# $NetBSD: hacks.mk,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+
+# the autoconf test for the Darwin linker wrongly succeeds when using
+# icc/Linux because icc ignores unknown flags. override this brain
+# damage.
+.if ${OPSYS} != "Darwin"
+CONFIGURE_ENV+= ac_cv_ld_darwin=no
+.endif
diff --git a/multimedia/vlc07/patches/patch-aa b/multimedia/vlc07/patches/patch-aa
new file mode 100644
index 00000000000..4a56643cd53
--- /dev/null
+++ b/multimedia/vlc07/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+
+--- modules/misc/network/ipv4.c.orig 2004-05-16 17:44:52.000000000 +0000
++++ modules/misc/network/ipv4.c
+@@ -406,7 +406,11 @@ static int OpenUDP( vlc_object_t * p_thi
+ if( IN_MULTICAST( ntohl(inet_addr(psz_server_addr) ) ) )
+ {
+ /* set the time-to-live */
++#ifdef __NetBSD__
++ unsigned char ttl = p_socket->i_ttl;
++#else
+ int ttl = p_socket->i_ttl;
++#endif
+ if( ttl < 1 )
+ {
+ ttl = config_GetInt( p_this, "ttl" );
diff --git a/multimedia/vlc07/patches/patch-ab b/multimedia/vlc07/patches/patch-ab
new file mode 100644
index 00000000000..f404e7d313f
--- /dev/null
+++ b/multimedia/vlc07/patches/patch-ab
@@ -0,0 +1,202 @@
+$NetBSD: patch-ab,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+
+--- modules/access/cdda/access.c.orig 2005-11-11 20:18:27.000000000 +0100
++++ modules/access/cdda/access.c
+@@ -360,36 +360,36 @@ static void InformationCreate( input_thr
+ if (p_cdda->i_cddb_enabled) {
+
+ dbg_print( INPUT_DBG_META, "field %s: %s\n", "Title",
+- p_cdda->cddb.disc->title );
++ cddb_disc_get_title(p_cdda->cddb.disc) );
+ input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Title"),
+- "%s", p_cdda->cddb.disc->title );
++ "%s", cddb_disc_get_title(p_cdda->cddb.disc));
+
+ dbg_print( INPUT_DBG_META, "field %s: %s\n", "Artist",
+- p_cdda->cddb.disc->artist );
++ cddb_disc_get_artist(p_cdda->cddb.disc));
+ input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Artist"),
+- "%s", p_cdda->cddb.disc->artist );
++ "%s", cddb_disc_get_artist(p_cdda->cddb.disc));
+
+ dbg_print( INPUT_DBG_META, "field %s: %s\n", "Genre",
+- p_cdda->cddb.disc->genre );
++ cddb_disc_get_genre(p_cdda->cddb.disc));
+ input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Genre"),
+- "%s", p_cdda->cddb.disc->genre );
++ "%s", cddb_disc_get_genre(p_cdda->cddb.disc));
+
+ dbg_print( INPUT_DBG_META, "field %s: %s\n", "Extended Data",
+- p_cdda->cddb.disc->ext_data );
++ cddb_disc_get_ext_data(p_cdda->cddb.disc));
+ input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Extended Data"),
+- "%s", p_cdda->cddb.disc->ext_data );
++ "%s", cddb_disc_get_ext_data(p_cdda->cddb.disc));
+
+- if (p_cdda->cddb.disc->year != 0)
++ if (cddb_disc_get_year(p_cdda->cddb.disc))
+ input_Control( p_input, INPUT_ADD_INFO, _("General"),
+- _("Year"), "%d", p_cdda->cddb.disc->year );
+- if ( p_cdda->cddb.disc->discid )
++ _("Year"), "%d", cddb_disc_get_year(p_cdda->cddb.disc));
++ if ( cddb_disc_get_discid(p_cdda->cddb.disc))
+ input_Control( p_input, INPUT_ADD_INFO, _("General"),
+- _("CDDB Disc ID"), "%x", p_cdda->cddb.disc->discid );
++ _("CDDB Disc ID"), "%x", cddb_disc_get_discid(p_cdda->cddb.disc));
+
+- if ( p_cdda->cddb.disc->category != CDDB_CAT_INVALID )
++ if ( cddb_disc_get_category(p_cdda->cddb.disc) != CDDB_CAT_INVALID )
+ input_Control( p_input, INPUT_ADD_INFO, _("General"),
+ _("CDDB Disc Category"), "%s",
+- CDDB_CATEGORY[p_cdda->cddb.disc->category] );
++ CDDB_CATEGORY[cddb_disc_get_category(p_cdda->cddb.disc)] );
+ }
+
+ #endif /*HAVE_LIBCDDB*/
+@@ -420,17 +420,17 @@ static void InformationCreate( input_thr
+ cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
+ i_track);
+ if (t != NULL) {
+- if ( t->artist != NULL && strlen(t->artist) ) {
++ if ( cddb_track_get_artist(t) != NULL && strlen(cddb_track_get_artist(t)) ) {
+ input_Control( p_input, INPUT_ADD_INFO, track_str,
+- _("Artist"), "%s", t->artist );
++ _("Artist"), "%s", cddb_track_get_artist(t));
+ }
+- if ( t->title != NULL && strlen(t->title) ) {
++ if ( cddb_track_get_title(t) != NULL && strlen(cddb_track_get_title(t)) ) {
+ input_Control( p_input, INPUT_ADD_INFO, track_str,
+- _("Title"), "%s", t->title );
++ _("Title"), "%s", cddb_track_get_title(t));
+ }
+- if ( t->ext_data != NULL && strlen(t->ext_data) ) {
++ if ( cddb_track_get_ext_data(t) != NULL && cddb_track_get_ext_data(t) ) {
+ input_Control( p_input, INPUT_ADD_INFO, track_str,
+- _("Extended Data"), "%s", t->ext_data );
++ _("Extended Data"), "%s", cddb_track_get_ext_data(t));
+ }
+ }
+ }
+@@ -505,13 +505,13 @@ GetCDDBInfo( const input_thread_t *p_inp
+
+ for(i = 1; i <= p_cdda->i_nb_tracks; i++) {
+ cddb_track_t *t = cddb_track_new();
+- t->frame_offset = cdio_get_track_lba(cdio, i);
++ cddb_track_set_frame_offset(t, cdio_get_track_lba(cdio, i));
+ cddb_disc_add_track(p_cdda->cddb.disc, t);
+ }
+
+- p_cdda->cddb.disc->length =
++ cddb_disc_set_length(p_cdda->cddb.disc,
+ cdio_get_track_lba(cdio, CDIO_CDROM_LEADOUT_TRACK)
+- / CDIO_CD_FRAMES_PER_SEC;
++ / CDIO_CD_FRAMES_PER_SEC);
+
+ if (!cddb_disc_calc_discid(p_cdda->cddb.disc)) {
+ msg_Err( p_input, "CDDB disc calc failed" );
+@@ -618,50 +618,50 @@ CDDAFormatStr(const input_thread_t *p_in
+ #ifdef HAVE_LIBCDDB
+ case 'a':
+ if (!p_cdda->i_cddb_enabled) goto not_special;
+- add_format_str_info(p_cdda->cddb.disc->artist);
++ add_format_str_info(cddb_disc_get_artist(p_cdda->cddb.disc));
+ break;
+ case 'A':
+ if (!p_cdda->i_cddb_enabled) goto not_special;
+- add_format_str_info(p_cdda->cddb.disc->title);
++ add_format_str_info(cddb_disc_get_title(p_cdda->cddb.disc));
+ break;
+ case 'C':
+ if (!p_cdda->i_cddb_enabled) goto not_special;
+- add_format_str_info(CDDB_CATEGORY[p_cdda->cddb.disc->category]);
++ add_format_str_info(CDDB_CATEGORY[cddb_disc_get_category(p_cdda->cddb.disc)]);
+ break;
+ case 'G':
+ if (!p_cdda->i_cddb_enabled) goto not_special;
+- add_format_str_info(p_cdda->cddb.disc->genre);
++ add_format_str_info(cddb_disc_get_genre(p_cdda->cddb.disc));
+ break;
+ case 'I':
+ if (!p_cdda->i_cddb_enabled) goto not_special;
+- add_format_num_info(p_cdda->cddb.disc->discid, "%x");
++ add_format_num_info(cddb_disc_get_discid(p_cdda->cddb.disc), "%x");
+ break;
+ case 'Y':
+ if (!p_cdda->i_cddb_enabled) goto not_special;
+- add_format_num_info(p_cdda->cddb.disc->year, "%5d");
++ add_format_num_info(cddb_disc_get_year(p_cdda->cddb.disc), "%5d");
+ break;
+ case 't':
+ if (p_cdda->i_cddb_enabled) {
+ cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
+ i_track-1);
+- if (t != NULL && t->title != NULL)
+- add_format_str_info(t->title);
++ if (t != NULL && cddb_track_get_title(t) != NULL)
++ add_format_str_info(cddb_track_get_title(t));
+ } else goto not_special;
+ break;
+ case 'p':
+ if (p_cdda->i_cddb_enabled) {
+ cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
+ i_track-1);
+- if (t != NULL && t->artist != NULL)
+- add_format_str_info(t->artist);
++ if (t != NULL && cddb_track_get_artist(t) != NULL)
++ add_format_str_info(cddb_track_get_artist(t));
+ } else goto not_special;
+ break;
+ case 'e':
+ if (p_cdda->i_cddb_enabled) {
+ cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
+ i_track-1);
+- if (t != NULL && t->ext_data != NULL)
+- add_format_str_info(t->ext_data);
++ if (t != NULL && cddb_track_get_ext_data(t) != NULL)
++ add_format_str_info(cddb_track_get_ext_data(t));
+ } else goto not_special;
+ break;
+ #endif
+@@ -762,31 +762,31 @@ CDDACreatePlayListItem(const input_threa
+ const char *psz_general_cat = _("General");
+
+ playlist_ItemAddInfo( p_item, psz_general_cat, _("Album"),
+- "%s", p_cdda->cddb.disc->title);
++ "%s", cddb_disc_get_title(p_cdda->cddb.disc));
+ playlist_ItemAddInfo( p_item, psz_general_cat, _("Disc Artist(s)"),
+- "%s", p_cdda->cddb.disc->artist);
++ "%s", cddb_disc_get_artist(p_cdda->cddb.disc));
+ playlist_ItemAddInfo( p_item, psz_general_cat,
+ _("CDDB Disc Category"),
+- "%s", CDDB_CATEGORY[p_cdda->cddb.disc->category]);
++ "%s", CDDB_CATEGORY[cddb_disc_get_category(p_cdda->cddb.disc)]);
+ playlist_ItemAddInfo( p_item, psz_general_cat, _("Genre"),
+- "%s", p_cdda->cddb.disc->genre);
+- if ( p_cdda->cddb.disc->discid ) {
++ "%s", cddb_disc_get_genre(p_cdda->cddb.disc));
++ if ( cddb_disc_get_discid(p_cdda->cddb.disc) ) {
+ playlist_ItemAddInfo( p_item, psz_general_cat, _("CDDB Disc ID"),
+- "%x", p_cdda->cddb.disc->discid );
++ "%x", cddb_disc_get_discid(p_cdda->cddb.disc));
+ }
+- if (p_cdda->cddb.disc->year != 0) {
++ if (cddb_disc_get_year(p_cdda->cddb.disc) != 0) {
+ playlist_ItemAddInfo( p_item, psz_general_cat,
+- _("Year"), "%5d", p_cdda->cddb.disc->year );
++ _("Year"), "%5d", cddb_disc_get_year(p_cdda->cddb.disc) );
+ }
+
+ if (p_cdda->i_cddb_enabled) {
+ cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
+ i_track-1);
+- if (t != NULL && t->artist != NULL) {
++ if (t != NULL && cddb_track_get_artist(t) != NULL) {
+ playlist_ItemAddInfo( p_item, psz_general_cat,
+- _("Track Artist"), "%s", t->artist );
++ _("Track Artist"), "%s", cddb_track_get_artist(t));
+ playlist_ItemAddInfo( p_item , psz_general_cat,
+- _("Track Title"), "%s", t->title );
++ _("Track Title"), "%s", cddb_track_get_title(t));
+ }
+ }
+
diff --git a/multimedia/vlc07/patches/patch-ac b/multimedia/vlc07/patches/patch-ac
new file mode 100644
index 00000000000..945152d33d2
--- /dev/null
+++ b/multimedia/vlc07/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+
+--- modules/gui/wxwindows/open.cpp.orig 2004-05-21 11:24:58.000000000 +0000
++++ modules/gui/wxwindows/open.cpp
+@@ -382,7 +382,7 @@ OpenDialog::OpenDialog( intf_thread_t *_
+ wxU(_("Open:")) );
+ mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
+ wxPoint(20,25), wxSize(120, -1),
+- 0, NULL );
++ 0, (const wxString*)NULL );
+ mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
+ "the full MRL you want to open.\n""Alternatively, the field will be "
+ "filled automatically when you use the controls below.")) );
+@@ -563,7 +563,7 @@ wxPanel *OpenDialog::FilePanel( wxWindow
+ wxBoxSizer *file_sizer = new wxBoxSizer( wxHORIZONTAL );
+
+ file_combo = new wxComboBox( panel, FileName_Event, wxT(""),
+- wxPoint(20,25), wxSize(200, -1), 0, NULL );
++ wxPoint(20,25), wxSize(200, -1), 0, (const wxString*)NULL );
+ wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
+ wxU(_("Browse...")) );
+ file_sizer->Add( file_combo, 1, wxALL, 5 );
diff --git a/multimedia/vlc07/patches/patch-ad b/multimedia/vlc07/patches/patch-ad
new file mode 100644
index 00000000000..72f3f189f82
--- /dev/null
+++ b/multimedia/vlc07/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+
+--- modules/gui/wxwindows/streamout.cpp.orig 2004-05-16 11:42:29.000000000 +0000
++++ modules/gui/wxwindows/streamout.cpp
+@@ -166,7 +166,7 @@ SoutDialog::SoutDialog( intf_thread_t *_
+ wxStaticText *mrl_label = new wxStaticText( panel, -1,
+ wxU(_("Destination Target:")));
+ mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
+- wxPoint(20,25), wxSize(120, -1), 0, NULL );
++ wxPoint(20,25), wxSize(120, -1), 0, (const wxString*)NULL );
+ mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
+ "the full MRL you want to open.\n""Alternatively, the field will be "
+ "filled automatically when you use the controls below")) );
+@@ -447,7 +447,7 @@ wxPanel *SoutDialog::AccessPanel( wxWind
+ subpanel_sizer = new wxFlexGridSizer( 3, 2, 20 );
+ label = new wxStaticText( access_subpanels[1], -1, wxU(_("Filename")) );
+ file_combo = new wxComboBox( access_subpanels[1], FileName_Event, wxT(""),
+- wxPoint(20,25), wxSize(200, -1), 0, NULL );
++ wxPoint(20,25), wxSize(200, -1), 0, (const wxString*)NULL );
+ wxButton *browse_button = new wxButton( access_subpanels[1],
+ FileBrowse_Event, wxU(_("Browse...")) );
+ subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
diff --git a/multimedia/vlc07/patches/patch-ae b/multimedia/vlc07/patches/patch-ae
new file mode 100644
index 00000000000..751bd0bc8ce
--- /dev/null
+++ b/multimedia/vlc07/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $
+
+--- modules/gui/wxwindows/subtitles.cpp.orig 2004-03-05 19:25:18.000000000 +0000
++++ modules/gui/wxwindows/subtitles.cpp
+@@ -85,7 +85,7 @@ SubsFileDialog::SubsFileDialog( intf_thr
+ char *psz_subsfile = config_GetPsz( p_intf, "sub-file" );
+ if( !psz_subsfile ) psz_subsfile = strdup("");
+ file_combo = new wxComboBox( panel, -1, wxL2U(psz_subsfile),
+- wxPoint(20,25), wxSize(300, -1), 0, NULL );
++ wxPoint(20,25), wxSize(300, -1), 0, (const wxString *)NULL );
+ if( psz_subsfile ) free( psz_subsfile );
+ wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
+ wxU(_("Browse...")) );