First cut on a pkg for the current release series (0.8.x) of vlc.

Built and tested on i386/-current so far.
This inherits some cruft from the 0.7 pkg (configure args, dependencies)
which should be revisited. I'm committing this early to allow people
to bring in fixes for other platforms.
(Generally I'm impressed about the quality. After the only locking bug
has been fixed of course;-)
This commit is contained in:
drochner 2006-05-04 19:19:59 +00:00
parent 70a5d48946
commit 80160985d8
8 changed files with 730 additions and 0 deletions

10
multimedia/vlc08/DESCR Normal file
View file

@ -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.

101
multimedia/vlc08/Makefile Normal file
View file

@ -0,0 +1,101 @@
# $NetBSD: Makefile,v 1.1.1.1 2006/05/04 19:19:59 drochner Exp $
#
DISTNAME= vlc-${VLC_VER}
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_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
PTHREAD_OPTS+= require
VLC_VER= 0.8.4a
.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
CONFIGURE_ARGS+= --enable-cddax
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"
.endif
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/admin
${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/dvd/selected
${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/dvd/volume
${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/dvd/unselect
${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/dvd/selection
${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"

317
multimedia/vlc08/PLIST Normal file
View file

@ -0,0 +1,317 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/04 19:20:00 drochner Exp $
bin/vlc
bin/vlc-config
bin/wxvlc
include/vlc/aout.h
include/vlc/control.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_fake_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
lib/vlc/access/libdvdnav_plugin.so
lib/vlc/access/libdvdread_plugin.so
lib/vlc/access/libscreen_plugin.so
lib/vlc/access_filter/libaccess_filter_record_plugin.so
lib/vlc/access_filter/libaccess_filter_timeshift_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/libaudio_format_plugin.so
lib/vlc/audio_filter/libbandlimited_resampler_plugin.so
lib/vlc/audio_filter/libdolby_surround_decoder_plugin.so
lib/vlc/audio_filter/libdtstospdif_plugin.so
lib/vlc/audio_filter/libequalizer_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/libnormvol_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/libsimple_channel_mixer_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/libfake_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/libpng_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/libnetsync_plugin.so
lib/vlc/control/librc_plugin.so
lib/vlc/control/libshowintf_plugin.so
lib/vlc/control/libtelnet_plugin.so
lib/vlc/demux/liba52sys_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/libdemuxdump_plugin.so
lib/vlc/demux/libdtssys_plugin.so
lib/vlc/demux/libflac_plugin.so
lib/vlc/demux/libh264_plugin.so
lib/vlc/demux/libid3tag_plugin.so
lib/vlc/demux/libm3u_plugin.so
lib/vlc/demux/libm4a_plugin.so
lib/vlc/demux/libm4v_plugin.so
lib/vlc/demux/libmjpeg_plugin.so
lib/vlc/demux/libmp4_plugin.so
lib/vlc/demux/libmpga_plugin.so
lib/vlc/demux/libmpgv_plugin.so
lib/vlc/demux/libnsc_plugin.so
lib/vlc/demux/libnsv_plugin.so
lib/vlc/demux/libnuv_plugin.so
lib/vlc/demux/libogg_plugin.so
lib/vlc/demux/libplaylist_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/libsubtitle_plugin.so
lib/vlc/demux/libts_plugin.so
lib/vlc/demux/libty_plugin.so
lib/vlc/demux/libvobsub_plugin.so
lib/vlc/demux/libvoc_plugin.so
lib/vlc/demux/libwav_plugin.so
lib/vlc/demux/libxa_plugin.so
lib/vlc/gui/libwxwidgets_plugin.so
lib/vlc/libffmpeg.a
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
lib/vlc/libmkv.a
lib/vlc/libmux_ts.a
lib/vlc/libstream_out_switcher.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/libscreensaver_plugin.so
lib/vlc/misc/libvod_rtsp_plugin.so
lib/vlc/misc/libxml_plugin.so
lib/vlc/misc/libxtag_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_mpjpeg_plugin.so
lib/vlc/mux/libmux_ogg_plugin.so
lib/vlc/mux/libmux_ps_plugin.so
lib/vlc/mux/libmux_wav_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/services_discovery/libsap_plugin.so
lib/vlc/services_discovery/libshout_plugin.so
lib/vlc/stream_out/libstream_out_bridge_plugin.so
lib/vlc/stream_out/libstream_out_description_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_mosaic_bridge_plugin.so
lib/vlc/stream_out/libstream_out_rtp_plugin.so
lib/vlc/stream_out/libstream_out_standard_plugin.so
lib/vlc/stream_out/libstream_out_transcode_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/libblend_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/libmarq_plugin.so
lib/vlc/video_filter/libmosaic_plugin.so
lib/vlc/video_filter/libmotionblur_plugin.so
lib/vlc/video_filter/libmotiondetect_plugin.so
lib/vlc/video_filter/libosdmenu_plugin.so
lib/vlc/video_filter/librss_plugin.so
lib/vlc/video_filter/librv32_plugin.so
lib/vlc/video_filter/libscale_plugin.so
lib/vlc/video_filter/libtime_plugin.so
lib/vlc/video_filter/libtransform_plugin.so
lib/vlc/video_filter/libwall_plugin.so
lib/vlc/video_output/libglx_plugin.so
lib/vlc/video_output/libimage_plugin.so
lib/vlc/video_output/libopengl_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/locale/ca/LC_MESSAGES/vlc.mo
share/locale/da/LC_MESSAGES/vlc.mo
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/gl/LC_MESSAGES/vlc.mo
share/locale/it/LC_MESSAGES/vlc.mo
share/locale/ja/LC_MESSAGES/vlc.mo
share/locale/ko/LC_MESSAGES/vlc.mo
share/locale/nl/LC_MESSAGES/vlc.mo
share/locale/pt_BR/LC_MESSAGES/vlc.mo
share/locale/ro/LC_MESSAGES/vlc.mo
share/locale/ru/LC_MESSAGES/vlc.mo
share/locale/sv/LC_MESSAGES/vlc.mo
share/locale/tr/LC_MESSAGES/vlc.mo
share/locale/zh_CN/LC_MESSAGES/vlc.mo
share/locale/zh_TW/LC_MESSAGES/vlc.mo
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/cone_minus.png
share/vlc/http/cone_plus.png
share/vlc/http/favicon.ico
share/vlc/http/index.html
share/vlc/http/info.html
share/vlc/http/style.css
share/vlc/http/webcam.html
share/vlc/osdmenu/default.cfg
share/vlc/osdmenu/dvd.cfg
share/vlc/osdmenu/dvd/selected/bw.png
share/vlc/osdmenu/dvd/selected/esc.png
share/vlc/osdmenu/dvd/selected/fw.png
share/vlc/osdmenu/dvd/selected/mute.png
share/vlc/osdmenu/dvd/selected/next.png
share/vlc/osdmenu/dvd/selected/pause.png
share/vlc/osdmenu/dvd/selected/play.png
share/vlc/osdmenu/dvd/selected/previous.png
share/vlc/osdmenu/dvd/selected/slow.png
share/vlc/osdmenu/dvd/selected/stop.png
share/vlc/osdmenu/dvd/selected/volume.png
share/vlc/osdmenu/dvd/selection/bw.png
share/vlc/osdmenu/dvd/selection/esc.png
share/vlc/osdmenu/dvd/selection/fw.png
share/vlc/osdmenu/dvd/selection/mute.png
share/vlc/osdmenu/dvd/selection/next.png
share/vlc/osdmenu/dvd/selection/pause.png
share/vlc/osdmenu/dvd/selection/play.png
share/vlc/osdmenu/dvd/selection/previous.png
share/vlc/osdmenu/dvd/selection/slow.png
share/vlc/osdmenu/dvd/selection/stop.png
share/vlc/osdmenu/dvd/unselect/barroff.png
share/vlc/osdmenu/dvd/volume/volume00.png
share/vlc/osdmenu/dvd/volume/volume01.png
share/vlc/osdmenu/dvd/volume/volume02.png
share/vlc/osdmenu/dvd/volume/volume03.png
share/vlc/osdmenu/dvd/volume/volume04.png
share/vlc/osdmenu/dvd/volume/volume05.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/vlc128x128.png
share/vlc/vlc16x16.png
share/vlc/vlc16x16.xpm
share/vlc/vlc32x32.png
share/vlc/vlc32x32.xpm
share/vlc/vlc48x48.ico
share/vlc/vlc48x48.png
@exec ${MKDIR} %D/share/vlc/skins/default
@dirrm share/vlc/skins/default
@dirrm share/vlc/skins
@dirrm share/vlc/osdmenu/dvd/volume
@dirrm share/vlc/osdmenu/dvd/unselect
@dirrm share/vlc/osdmenu/dvd/selection
@dirrm share/vlc/osdmenu/dvd/selected
@dirrm share/vlc/osdmenu/dvd
@dirrm share/vlc/osdmenu
@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/services_discovery
@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_filter
@dirrm lib/vlc/access
@dirrm lib/vlc
@dirrm include/vlc

View file

@ -0,0 +1,46 @@
# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/05/04 19:19:59 drochner 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_API_DEPENDS.vlc?= vlc>=0.7.1
BUILDLINK_ABI_DEPENDS.vlc?= vlc>=0.7.2nb11
BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc
.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/+$//}

View file

@ -0,0 +1,8 @@
$NetBSD: distinfo,v 1.1.1.1 2006/05/04 19:19:59 drochner Exp $
SHA1 (vlc-0.8.4a.tar.bz2) = 043462db25e6eeb7f648c600d2dbca1524056580
RMD160 (vlc-0.8.4a.tar.bz2) = 50ea307c1aa70d7189a8c7cd09bf5e1d60e4856b
Size (vlc-0.8.4a.tar.bz2) = 7191539 bytes
SHA1 (patch-ab) = 6d776a5c323bd840c3080d25bc7188dd04a9f340
SHA1 (patch-af) = 3e887918d6e70630282dcac7979f4a9f6673a6a5
SHA1 (patch-ag) = 4c1b802dc4df1c521398dc9b07794232bb5b21d9

View file

@ -0,0 +1,205 @@
$NetBSD: patch-ab,v 1.1.1.1 2006/05/04 19:20:00 drochner Exp $
--- modules/access/cdda/info.c.orig 2006-05-04 15:57:30.000000000 +0200
+++ modules/access/cdda/info.c
@@ -163,13 +163,13 @@ cddb_end: ;
} \
#define add_cddb_meta(FIELD, VLC_META) \
- add_meta_val(VLC_META, p_cdda->cddb.disc->FIELD);
+ add_meta_val(VLC_META, cddb_disc_get_##FIELD(p_cdda->cddb.disc));
#define add_cddb_meta_fmt(FIELD, FORMAT_SPEC, VLC_META) \
{ \
char psz_buf[100]; \
snprintf( psz_buf, sizeof(psz_buf)-1, FORMAT_SPEC, \
- p_cdda->cddb.disc->FIELD ); \
+ cddb_disc_get_##FIELD(p_cdda->cddb.disc) ); \
psz_buf[sizeof(psz_buf)-1] = '\0'; \
add_meta_val(VLC_META, psz_buf); \
}
@@ -195,13 +195,13 @@ cddb_end: ;
under category "Disc" if the string is not null or the null string.
*/
#define add_cddb_disc_info_str(TITLE, FIELD) \
- add_info_str("Disc", TITLE, p_cdda->cddb.disc->FIELD)
+ add_info_str("Disc", TITLE, cddb_disc_get_##FIELD(p_cdda->cddb.disc))
/* Adds a CDDB numeric-valued entry to the stream and media information
under category "Disc" if the string is not null or the null string.
*/
#define add_cddb_disc_info_val(TITLE, FMT, FIELD) \
- add_info_val("Disc", TITLE, FMT, p_cdda->cddb.disc->FIELD)
+ add_info_val("Disc", TITLE, FMT, cddb_disc_get_##FIELD(p_cdda->cddb.disc))
/* Adds a CD-Text string-valued entry to the stream and media information
under category "Disc" if the string is not null or the null string.
@@ -283,11 +283,11 @@ CDDAMetaInfo( access_t *p_access, track_
if( CDIO_INVALID_TRACK == i_track )
{
- psz_meta_title = p_cdda->cddb.disc->title;
- psz_meta_artist = p_cdda->cddb.disc->artist;
- if ( p_cdda->cddb.disc->genre && strlen(p_cdda->cddb.disc->genre) )
+ psz_meta_title = cddb_disc_get_title(p_cdda->cddb.disc);
+ psz_meta_artist = cddb_disc_get_artist(p_cdda->cddb.disc);
+ if ( cddb_disc_get_genre(p_cdda->cddb.disc) && strlen(cddb_disc_get_genre(p_cdda->cddb.disc)) )
add_cddb_meta(genre, VLC_META_GENRE);
- if ( 0 != p_cdda->cddb.disc->year )
+ if ( 0 != cddb_disc_get_year(p_cdda->cddb.disc) )
add_cddb_meta_fmt(year, "%d", VLC_META_DATE );
}
else
@@ -295,13 +295,13 @@ CDDAMetaInfo( access_t *p_access, track_
cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc, i_track-1);
if (t != NULL )
{
- if( t->title != NULL && ! p_cdda->b_nav_mode )
+ if( cddb_track_get_title(t) != NULL && ! p_cdda->b_nav_mode )
{
- add_meta_val( VLC_META_TITLE, t->title );
+ add_meta_val( VLC_META_TITLE, cddb_track_get_title(t) );
}
- if( t->artist != NULL )
+ if( cddb_track_get_artist(t) != NULL )
{
- add_meta_val( VLC_META_ARTIST, t->artist );
+ add_meta_val( VLC_META_ARTIST, cddb_track_get_artist(t) );
}
}
}
@@ -339,14 +339,14 @@ CDDAMetaInfo( access_t *p_access, track_
if (p_cdda->b_cddb_enabled && p_cdda->cddb.disc)
{
add_cddb_disc_info_str("Artist (CDDB)", artist);
- if ( CDDB_CAT_INVALID != p_cdda->cddb.disc->category )
+ if ( CDDB_CAT_INVALID != cddb_disc_get_category(p_cdda->cddb.disc) )
add_info_str("Disc", "Category (CDDB)",
- CDDB_CATEGORY[p_cdda->cddb.disc->category]);
+ CDDB_CATEGORY[cddb_disc_get_category(p_cdda->cddb.disc)]);
add_cddb_disc_info_val("Disc ID (CDDB)", "%x", discid);
add_cddb_disc_info_str("Extended Data (CDDB)", ext_data);
add_cddb_disc_info_str("Genre (CDDB)", genre);
add_cddb_disc_info_str("Title (CDDB)", title);
- if ( 0 != p_cdda->cddb.disc->year )
+ if ( 0 != cddb_disc_get_year(p_cdda->cddb.disc) )
add_cddb_disc_info_val("Year (CDDB)", "%d", year);
}
@@ -423,10 +423,10 @@ CDDAMetaInfo( access_t *p_access, track_
cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc, i);
if (t != NULL)
{
- add_info_str(psz_track, "Artist (CDDB)", t->artist);
- add_info_str(psz_track, "Title (CDDB)", t->title);
+ add_info_str(psz_track, "Artist (CDDB)", cddb_track_get_artist(t));
+ add_info_str(psz_track, "Title (CDDB)", cddb_track_get_title(t));
add_info_str(psz_track, "Extended Data (CDDB)",
- t->ext_data);
+ cddb_track_get_ext_data(t));
}
}
#endif /*HAVE_LIBCDDB*/
@@ -566,41 +566,41 @@ CDDAFormatStr( const access_t *p_access,
&& p_cdda->p_cdtext[0]->field[CDTEXT_PERFORMER])
psz = p_cdda->p_cdtext[0]->field[CDTEXT_PERFORMER];
if (want_cddb_info(p_cdda, psz))
- psz = p_cdda->cddb.disc->artist;
+ psz = cddb_disc_get_artist(p_cdda->cddb.disc);
goto format_str;
case 'A':
if (p_cdda->p_cdtext[0]
&& p_cdda->p_cdtext[0]->field[CDTEXT_TITLE])
psz = p_cdda->p_cdtext[0]->field[CDTEXT_TITLE];
if (want_cddb_info(p_cdda, psz))
- psz = p_cdda->cddb.disc->title;
+ psz = cddb_disc_get_title(p_cdda->cddb.disc);
goto format_str;
case 'C':
if (!p_cdda->b_cddb_enabled) goto not_special;
if (p_cdda->cddb.disc)
add_format_str_info(
- CDDB_CATEGORY[p_cdda->cddb.disc->category]);
+ CDDB_CATEGORY[cddb_disc_get_category(p_cdda->cddb.disc)]);
break;
case 'G':
if (p_cdda->p_cdtext[0]
&& p_cdda->p_cdtext[0]->field[CDTEXT_GENRE])
psz = p_cdda->p_cdtext[0]->field[CDTEXT_GENRE];
if (want_cddb_info(p_cdda, psz))
- psz = p_cdda->cddb.disc->genre;
+ psz = cddb_disc_get_genre(p_cdda->cddb.disc);
goto format_str;
case 'I':
if (p_cdda->p_cdtext[0]
&& p_cdda->p_cdtext[0]->field[CDTEXT_DISCID])
psz = p_cdda->p_cdtext[0]->field[CDTEXT_DISCID];
if (want_cddb_info(p_cdda, psz)) {
- add_format_num_info(p_cdda->cddb.disc->discid, "%x");
+ add_format_num_info(cddb_disc_get_discid(p_cdda->cddb.disc), "%x");
} else if (psz)
add_format_str_info(psz);
break;
case 'Y':
if (!p_cdda->b_cddb_enabled) goto not_special;
if (p_cdda->cddb.disc)
- 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 ( CDIO_INVALID_TRACK == i_track ) break;
@@ -608,8 +608,8 @@ CDDAFormatStr( const access_t *p_access,
{
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 {
add_format_str_info(psz_mrl);
}
@@ -631,8 +631,8 @@ CDDAFormatStr( const access_t *p_access,
{
cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
i_track-1);
- if (t != NULL && t->artist != NULL)
- psz = t->artist;
+ if (t != NULL && cddb_track_get_artist(t) != NULL)
+ psz = cddb_track_get_artist(t);
}
goto format_str;
case 'e':
@@ -644,8 +644,8 @@ CDDAFormatStr( const access_t *p_access,
{
cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
i_track-1);
- if (t != NULL && t->ext_data != NULL)
- psz = t->ext_data;
+ if (t != NULL && cddb_track_get_ext_data(t) != NULL)
+ psz = cddb_track_get_ext_data(t);
}
goto format_str;
break;
@@ -884,15 +884,15 @@ int CDDAAddMetaToItem( access_t *p_acces
if (t)
{
- if (t->artist)
+ if (cddb_track_get_artist(t))
add_playlist_track_info_str("Artist (CDDB)",
- t->artist);
- if (t->title)
+ cddb_track_get_artist(t));
+ if (cddb_track_get_title(t))
add_playlist_track_info_str("Title (CDDB)",
- t->title);
- if (t->ext_data)
+ cddb_track_get_title(t));
+ if (cddb_track_get_ext_data(t))
add_playlist_track_info_str("Extended information (CDDB)",
- t->ext_data);
+ cddb_track_get_ext_data(t));
}
}
#endif /*HAVE_LIBCDDB*/

View file

@ -0,0 +1,31 @@
$NetBSD: patch-af,v 1.1.1.1 2006/05/04 19:20:00 drochner Exp $
--- modules/gui/wxwidgets/open.cpp.orig 2006-05-04 16:27:15.000000000 +0200
+++ modules/gui/wxwidgets/open.cpp
@@ -1334,7 +1334,7 @@ static char * ProbeDVD(const wxChar *dev
{
char **ppsz_cd_drives;
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device);
- char *psz_device = const_cast<char *>(tmp_buf.data());
+ char *psz_device = const_cast<char *>(tmp_buf);
if( IsDVD(psz_device) )
{
@@ -1404,7 +1404,7 @@ static char * ProbeCDDA(const wxChar *de
{
char *ppsz_device[2];
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device);
- char *psz_device = const_cast<char *>(tmp_buf.data());
+ char *psz_device = const_cast<char *>(tmp_buf);
ppsz_device[0] = (device && *device) ? psz_device : NULL;
ppsz_device[1] = NULL;
return ProbeDevice(ppsz_device, CDIO_FS_AUDIO, false);
@@ -1417,7 +1417,7 @@ static char * ProbeVCD(const wxChar *dev
{
char *ppsz_device[2];
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device);
- char *psz_device = const_cast<char *>(tmp_buf.data());
+ char *psz_device = const_cast<char *>(tmp_buf);
ppsz_device[0] = (device && *device) ? psz_device : NULL;
ppsz_device[1] = NULL;
return ProbeDevice(ppsz_device,

View file

@ -0,0 +1,12 @@
$NetBSD: patch-ag,v 1.1.1.1 2006/05/04 19:20:00 drochner Exp $
--- ./modules/gui/wxwidgets/menus.cpp.orig 2006-05-04 14:22:54.000000000 +0200
+++ ./modules/gui/wxwidgets/menus.cpp
@@ -1013,7 +1013,6 @@ void MenuEvtHandler::OnMenuEvent( wxComm
p_menuitemext->i_object_id );
if( p_object == NULL ) return;
- wxMutexGuiLeave(); // We don't want deadlocks
var_Set( p_object, p_menuitemext->psz_var, p_menuitemext->val );
//wxMutexGuiEnter();