diff options
author | wiz <wiz@pkgsrc.org> | 2013-01-22 09:53:46 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2013-01-22 09:53:46 +0000 |
commit | a75bd05251e4402dbdce1c8e8eb74cb499eb9a27 (patch) | |
tree | 57b5a190c5eb28d3173ccc81a19210a284f41822 /multimedia | |
parent | de86f80d99908564a29c050218e0570f81ab3bb0 (diff) | |
download | pkgsrc-a75bd05251e4402dbdce1c8e8eb74cb499eb9a27.tar.gz |
Remove vlc08, hasn't been buildable for ages.
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/Makefile | 3 | ||||
-rw-r--r-- | multimedia/vlc08/DESCR | 10 | ||||
-rw-r--r-- | multimedia/vlc08/Makefile | 126 | ||||
-rw-r--r-- | multimedia/vlc08/PLIST | 428 | ||||
-rw-r--r-- | multimedia/vlc08/distinfo | 13 | ||||
-rw-r--r-- | multimedia/vlc08/options.mk | 82 | ||||
-rw-r--r-- | multimedia/vlc08/patches/patch-aa | 13 | ||||
-rw-r--r-- | multimedia/vlc08/patches/patch-ab | 11 | ||||
-rw-r--r-- | multimedia/vlc08/patches/patch-mkv.cpp | 87 | ||||
-rw-r--r-- | multimedia/vlc08/patches/patch-mmstu.c | 83 | ||||
-rw-r--r-- | multimedia/vlc08/patches/patch-mmstu.h | 31 | ||||
-rw-r--r-- | multimedia/vlc08/patches/patch-png.c | 22 | ||||
-rw-r--r-- | multimedia/vlc08/patches/patch-tta.c | 145 | ||||
-rw-r--r-- | multimedia/vlc08/patches/patch-x264.c | 56 |
14 files changed, 1 insertions, 1109 deletions
diff --git a/multimedia/Makefile b/multimedia/Makefile index 36f1e6a97e6..ed33138e39b 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.198 2012/12/17 00:55:31 khorben Exp $ +# $NetBSD: Makefile,v 1.199 2013/01/22 09:53:46 wiz Exp $ # COMMENT= Multimedia utilities @@ -166,7 +166,6 @@ SUBDIR+= tstools SUBDIR+= tvtime SUBDIR+= ushare SUBDIR+= vlc -SUBDIR+= vlc08 SUBDIR+= vlc10 SUBDIR+= vlc2 SUBDIR+= vls diff --git a/multimedia/vlc08/DESCR b/multimedia/vlc08/DESCR deleted file mode 100644 index 6ea7f1224c6..00000000000 --- a/multimedia/vlc08/DESCR +++ /dev/null @@ -1,10 +0,0 @@ -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/vlc08/Makefile b/multimedia/vlc08/Makefile deleted file mode 100644 index fc65342567e..00000000000 --- a/multimedia/vlc08/Makefile +++ /dev/null @@ -1,126 +0,0 @@ -# $NetBSD: Makefile,v 1.48 2012/10/24 15:48:33 joerg Exp $ -# - -DISTNAME= vlc-${VLC_VER} -PKGNAME= vlc08-${VLC_VER} -VLC_VER= 0.8.6i -PKGREVISION= 30 -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 - -# Purposely not setting PREV_PKGPATH -SUPERSEDES= vlc-0.8.* - -CONFLICTS= vlc-[0-9]* vlc07-[0-9]* - -USE_LIBTOOL= yes -USE_TOOLS+= gmake perl pkg-config -USE_PKGLOCALEDIR= yes -GNU_CONFIGURE= yes -PTHREAD_OPTS+= require -USE_LANGUAGES= c c++ - -.include "../../mk/bsd.prefs.mk" -.include "options.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-vcd -.endif - -BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0 -BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 -BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.81 - -CONFIGURE_ARGS+= --disable-speex # needs unstable 1.1.x branch -CONFIGURE_ARGS+= --disable-gtk -CONFIGURE_ARGS+= --enable-release -CONFIGURE_ARGS+= --disable-gnomevfs -CONFIGURE_ARGS+= --disable-gnutls -CONFIGURE_ARGS+= --with-ffmpeg-zlib -CONFIGURE_ARGS+= --disable-smb -CONFIGURE_ARGS+= --disable-mpc -CONFIGURE_ARGS+= --disable-dts -CONFIGURE_ARGS+= --enable-cddax -CONFIGURE_ARGS+= --enable-dvdread -CONFIGURE_ARGS+= --enable-flac - -INSTALLATION_DIRS+= ${PKGMANDIR}/man1 share/vlc/http/dialogs \ - share/vlc/http/images share/vlc/http/js \ - share/vlc/http/old share/vlc/http/old/admin \ - share/vlc/http/old/vlm share/vlc/http/requests \ - share/vlc/osdmenu/default share/vlc/osdmenu/default/selected \ - share/vlc/osdmenu/default/selection share/vlc/osdmenu/default/volume \ - share/vlc/osdmenu/dvd/selected share/vlc/osdmenu/dvd/volume \ - share/vlc/osdmenu/dvd/unselect share/vlc/osdmenu/dvd/selection \ - share/vlc/skins2 share/vlc/skins2/fonts - -pre-install: - ${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - -ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf -DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf - -SUBST_CLASSES+= oss -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_CLASSES+= fnt -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. - -PLIST_VARS+= cdda vcd fb -.if ${OPSYS} != "NetBSD" -PLIST.cdda= yes -PLIST.vcd= yes -.endif -.if ${OPSYS} == "Linux" && exists(/usr/include/linux/fb.h) -CONFIGURE_ARGS+= --enable-fb -PLIST.fb= yes -.else -CONFIGURE_ARGS+= --disable-fb -.endif - -.if ${X11_TYPE} == "modular" -CONFIGURE_ARGS+= x_libraries=${PREFIX}/lib -.endif - -.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/gettext-lib/buildlink3.mk" -.include "../../devel/pcre/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../misc/libcdio/buildlink3.mk" -.include "../../multimedia/ffmpeg/buildlink3.mk" -.include "../../multimedia/libdvdplay/buildlink3.mk" -.include "../../multimedia/libdvbpsi/buildlink3.mk" -.include "../../multimedia/libdvdnav/buildlink3.mk" -.include "../../multimedia/libdvdread/buildlink3.mk" -.include "../../multimedia/libmatroska/buildlink3.mk" -.include "../../multimedia/libmpeg2/buildlink3.mk" -.include "../../multimedia/libogg/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../sysutils/desktop-file-utils/desktopdb.mk" - -.include "../../mk/oss.buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/multimedia/vlc08/PLIST b/multimedia/vlc08/PLIST deleted file mode 100644 index 9d8f64bd803..00000000000 --- a/multimedia/vlc08/PLIST +++ /dev/null @@ -1,428 +0,0 @@ -@comment $NetBSD: PLIST,v 1.14 2011/12/06 22:01:06 sborrill Exp $ -${PLIST.skins}bin/svlc -bin/vlc -bin/vlc-config -${PLIST.wxwidgets}bin/wxvlc -include/vlc/aout.h -include/vlc/decoder.h -include/vlc/input.h -include/vlc/intf.h -include/vlc/libvlc.h -include/vlc/mediacontrol.h -include/vlc/mediacontrol_structures.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 -${PLIST.cdda}lib/vlc/access/libcdda_plugin.so -lib/vlc/access/libcddax_plugin.so -lib/vlc/access/libdvdnav_plugin.so -lib/vlc/access/libdvdread_plugin.so -${PLIST.x11}lib/vlc/access/libscreen_plugin.so -${PLIST.vcd}lib/vlc/access/libvcd_plugin.so -lib/vlc/access_filter/libaccess_filter_dump_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/libparam_eq_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 -${PLIST.sdl}lib/vlc/audio_output/libaout_sdl_plugin.so -${PLIST.arts}lib/vlc/audio_output/libarts_plugin.so -${PLIST.esound}lib/vlc/audio_output/libesd_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 -${PLIST.faad}lib/vlc/codec/libfaad_plugin.so -lib/vlc/codec/libfake_plugin.so -lib/vlc/codec/libffmpeg_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 -${PLIST.sdl}lib/vlc/codec/libsdl_image_plugin.so -lib/vlc/codec/libspudec_plugin.so -lib/vlc/codec/libsubsdec_plugin.so -lib/vlc/codec/libsvcdsub_plugin.so -lib/vlc/codec/libtelx_plugin.so -lib/vlc/codec/libvorbis_plugin.so -${PLIST.x264}lib/vlc/codec/libx264_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/libmkv_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/libtta_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 -${PLIST.skins}lib/vlc/gui/libskins2_plugin.so -${PLIST.wxwidgets}lib/vlc/gui/libwxwidgets_plugin.so -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/libmux_ts.a -lib/vlc/misc/libdummy_plugin.so -lib/vlc/misc/libexport_plugin.so -${PLIST.x11}lib/vlc/misc/libfreetype_plugin.so -lib/vlc/misc/libgrowl_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/libpodcast_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_switcher_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/libmagnify_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 -${PLIST.fb}lib/vlc/video_output/libfb_plugin.so -${PLIST.sdl}lib/vlc/video_output/libglx_plugin.so -lib/vlc/video_output/libimage_plugin.so -${PLIST.sdl}lib/vlc/video_output/libopengl_plugin.so -${PLIST.sdl}lib/vlc/video_output/libvout_sdl_plugin.so -${PLIST.x11}lib/vlc/video_output/libx11_plugin.so -${PLIST.x11}lib/vlc/video_output/libxvideo_plugin.so -lib/vlc/visualization/libvisual_plugin.so -man/man1/vlc-config.1 -man/man1/vlc.1 -share/applications/vlc.desktop -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/af/LC_MESSAGES/vlc.mo -share/locale/ar/LC_MESSAGES/vlc.mo -share/locale/ca/LC_MESSAGES/vlc.mo -share/locale/co/LC_MESSAGES/vlc.mo -share/locale/cs/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/eu/LC_MESSAGES/vlc.mo -share/locale/fa/LC_MESSAGES/vlc.mo -share/locale/fr/LC_MESSAGES/vlc.mo -share/locale/fur/LC_MESSAGES/vlc.mo -share/locale/gl/LC_MESSAGES/vlc.mo -share/locale/he/LC_MESSAGES/vlc.mo -share/locale/hi/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/ka/LC_MESSAGES/vlc.mo -share/locale/ko/LC_MESSAGES/vlc.mo -share/locale/lt/LC_MESSAGES/vlc.mo -share/locale/lv/LC_MESSAGES/vlc.mo -share/locale/ms/LC_MESSAGES/vlc.mo -share/locale/nb/LC_MESSAGES/vlc.mo -share/locale/ne/LC_MESSAGES/vlc.mo -share/locale/nl/LC_MESSAGES/vlc.mo -share/locale/nn/LC_MESSAGES/vlc.mo -share/locale/oc/LC_MESSAGES/vlc.mo -share/locale/pa/LC_MESSAGES/vlc.mo -share/locale/pl/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/sk/LC_MESSAGES/vlc.mo -share/locale/sl/LC_MESSAGES/vlc.mo -share/locale/sq/LC_MESSAGES/vlc.mo -share/locale/sr/LC_MESSAGES/vlc.mo -share/locale/sv/LC_MESSAGES/vlc.mo -share/locale/th/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/.hosts -share/vlc/http/dialogs/.hosts -share/vlc/http/dialogs/browse -share/vlc/http/dialogs/footer -share/vlc/http/dialogs/input -share/vlc/http/dialogs/main -share/vlc/http/dialogs/mosaic -share/vlc/http/dialogs/playlist -share/vlc/http/dialogs/sout -share/vlc/http/dialogs/vlm -share/vlc/http/favicon.ico -share/vlc/http/iehacks.css -share/vlc/http/images/delete.png -share/vlc/http/images/delete_small.png -share/vlc/http/images/eject.png -share/vlc/http/images/empty.png -share/vlc/http/images/fullscreen.png -share/vlc/http/images/help.png -share/vlc/http/images/info.png -share/vlc/http/images/loop.png -share/vlc/http/images/minus.png -share/vlc/http/images/next.png -share/vlc/http/images/pause.png -share/vlc/http/images/play.png -share/vlc/http/images/playlist.png -share/vlc/http/images/playlist_small.png -share/vlc/http/images/plus.png -share/vlc/http/images/prev.png -share/vlc/http/images/refresh.png -share/vlc/http/images/repeat.png -share/vlc/http/images/sd.png -share/vlc/http/images/shuffle.png -share/vlc/http/images/slider_bar.png -share/vlc/http/images/slider_left.png -share/vlc/http/images/slider_point.png -share/vlc/http/images/slider_right.png -share/vlc/http/images/slow.png -share/vlc/http/images/snapshot.png -share/vlc/http/images/sort.png -share/vlc/http/images/sout.png -share/vlc/http/images/speaker.png -share/vlc/http/images/speaker_mute.png -share/vlc/http/images/stop.png -share/vlc/http/images/vlc16x16.png -share/vlc/http/images/volume_down.png -share/vlc/http/images/volume_up.png -share/vlc/http/images/white.png -share/vlc/http/images/white_cross_small.png -share/vlc/http/index.html -share/vlc/http/js/functions.js -share/vlc/http/js/mosaic.js -share/vlc/http/js/vlm.js -share/vlc/http/mosaic.html -share/vlc/http/old/.hosts -share/vlc/http/old/admin/.access -share/vlc/http/old/admin/browse.html -share/vlc/http/old/admin/dboxfiles.html -share/vlc/http/old/admin/index.html -share/vlc/http/old/cone_minus.png -share/vlc/http/old/cone_plus.png -share/vlc/http/old/index.html -share/vlc/http/old/info.html -share/vlc/http/old/style.css -share/vlc/http/old/vlm/edit.html -share/vlc/http/old/vlm/index.html -share/vlc/http/old/vlm/new.html -share/vlc/http/old/vlm/show.html -share/vlc/http/old/webcam.html -share/vlc/http/requests/browse.xml -share/vlc/http/requests/playlist.xml -share/vlc/http/requests/readme -share/vlc/http/requests/status.xml -share/vlc/http/requests/vlm.xml -share/vlc/http/requests/vlm_cmd.xml -share/vlc/http/style.css -share/vlc/http/vlm.html -share/vlc/http/vlm_export.html -share/vlc/osdmenu/default.cfg -share/vlc/osdmenu/default/selected/bw.png -share/vlc/osdmenu/default/selected/esc.png -share/vlc/osdmenu/default/selected/fw.png -share/vlc/osdmenu/default/selected/next.png -share/vlc/osdmenu/default/selected/play_pause.png -share/vlc/osdmenu/default/selected/previous.png -share/vlc/osdmenu/default/selected/stop.png -share/vlc/osdmenu/default/selected/volume.png -share/vlc/osdmenu/default/selection/bw.png -share/vlc/osdmenu/default/selection/esc.png -share/vlc/osdmenu/default/selection/fw.png -share/vlc/osdmenu/default/selection/next.png -share/vlc/osdmenu/default/selection/play_pause.png -share/vlc/osdmenu/default/selection/previous.png -share/vlc/osdmenu/default/selection/stop.png -share/vlc/osdmenu/default/selection/volume.png -share/vlc/osdmenu/default/unselected.png -share/vlc/osdmenu/default/volume/volume_00.png -share/vlc/osdmenu/default/volume/volume_01.png -share/vlc/osdmenu/default/volume/volume_02.png -share/vlc/osdmenu/default/volume/volume_03.png -share/vlc/osdmenu/default/volume/volume_04.png -share/vlc/osdmenu/default/volume/volume_05.png -share/vlc/osdmenu/default/volume/volume_06.png -share/vlc/osdmenu/default/volume/volume_07.png -share/vlc/osdmenu/default/volume/volume_08.png -share/vlc/osdmenu/default/volume/volume_09.png -share/vlc/osdmenu/default/volume/volume_10.png -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/skins2/default.vlt -share/vlc/skins2/fonts/FreeSans.ttf -share/vlc/skins2/fonts/FreeSansBold.ttf -share/vlc/skins2/skin.catalog -share/vlc/skins2/skin.dtd -share/vlc/skins2/winamp2.xml -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 diff --git a/multimedia/vlc08/distinfo b/multimedia/vlc08/distinfo deleted file mode 100644 index 16f2366d2d0..00000000000 --- a/multimedia/vlc08/distinfo +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: distinfo,v 1.10 2011/12/06 22:02:24 sborrill Exp $ - -SHA1 (vlc-0.8.6i.tar.bz2) = 4c6f45dffe3a8309ce201897040dc1f82b9cde99 -RMD160 (vlc-0.8.6i.tar.bz2) = a5da4e1e0980594c678c04016491c8a373df4017 -Size (vlc-0.8.6i.tar.bz2) = 11786172 bytes -SHA1 (patch-aa) = 497a83bb0f1e2c095a81aa84115e66b56dd47e2c -SHA1 (patch-ab) = df3a58d361ad0767dab78f7fae7891aee6143c6c -SHA1 (patch-mkv.cpp) = 1fdc4dbfbc2e5c12c0c61d725d5b7baca1e4b107 -SHA1 (patch-mmstu.c) = ef4bed6fb5871790bb9198dad4961384f3e38d16 -SHA1 (patch-mmstu.h) = a11be24360948bcd8ca32bd7d01020e34c0801ad -SHA1 (patch-png.c) = 8273fe59e44974bc5217d9d93bc634dae586d5e3 -SHA1 (patch-tta.c) = 923852b9aedeb75eed052e532ce5ddf50ab19951 -SHA1 (patch-x264.c) = 083ab4eeb48e01216cc0c4d62006a50bcd3ae421 diff --git a/multimedia/vlc08/options.mk b/multimedia/vlc08/options.mk deleted file mode 100644 index 13933fc61e7..00000000000 --- a/multimedia/vlc08/options.mk +++ /dev/null @@ -1,82 +0,0 @@ -# $NetBSD: options.mk,v 1.5 2011/12/06 22:01:06 sborrill Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.vlc -PKG_SUPPORTED_OPTIONS= skins wxwidgets faad arts esound sdl x11 x264 -PKG_SUGGESTED_OPTIONS= wxwidgets faad x11 sdl x264 - -.include "../../mk/bsd.options.mk" - -PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} - -.if !empty(PKG_OPTIONS:Mskins) && !empty(PKG_OPTIONS:Mx11) -CONFIGURE_ARGS+= --enable-skins2 -PLIST.skins= yes -.else -CONFIGURE_ARGS+= --disable-skins2 -.endif - -.if !empty(PKG_OPTIONS:Mwxwidgets) && !empty(PKG_OPTIONS:Mx11) -.include "../../x11/wxGTK26/buildlink3.mk" -CONFIGURE_ARGS+= --enable-wxwidgets -PLIST.wxwidgets= yes -.else -CONFIGURE_ARGS+= --disable-wxwidgets -.endif - -.if !empty(PKG_OPTIONS:Mfaad) -CONFIGURE_ARGS+= --enable-faad -PLIST.faad= yes -.include "../../audio/faad2/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-faad -.endif - -.if !empty(PKG_OPTIONS:Marts) -CONFIGURE_ARGS+= --enable-arts -PLIST.arts= yes -.include "../../audio/arts/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-arts -.endif - -.if !empty(PKG_OPTIONS:Mx264) -CONFIGURE_ARGS+= --enable-x264 -PLIST.x264= yes -.include "../../multimedia/x264-devel/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-x264 -.endif - -.if !empty(PKG_OPTIONS:Mesound) -CONFIGURE_ARGS+= --enable-esd -PLIST.esound= yes -.include "../../audio/esound/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-esd -.endif - -## SDL backend support - -.if !empty(PKG_OPTIONS:Msdl) -.include "../../devel/SDL/buildlink3.mk" -.include "../../graphics/SDL_image/buildlink3.mk" -PLIST.sdl= yes -.else -CONFIGURE_ARGS+= --disable-sdl -CONFIGURE_ARGS+= --disable-sdl-image -.endif - -.if !empty(PKG_OPTIONS:Mx11) -.include "../../graphics/freetype2/buildlink3.mk" -.include "../../x11/libXv/buildlink3.mk" -.include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/libXdamage/buildlink3.mk" -.include "../../x11/libdrm/buildlink3.mk" -CONFIGURE_ARGS+= --enable-x11 -CONFIGURE_ARGS+= --enable-freetype -PLIST.x11= yes -.else -CONFIGURE_ARGS+= --disable-x11 -CONFIGURE_ARGS+= --disable-freetype -.endif - diff --git a/multimedia/vlc08/patches/patch-aa b/multimedia/vlc08/patches/patch-aa deleted file mode 100644 index 71473c91bbd..00000000000 --- a/multimedia/vlc08/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2008/09/08 18:42:21 ahoka Exp $ - ---- configure.orig 2007-11-27 20:22:58.000000000 +0100 -+++ configure -@@ -64116,7 +64116,7 @@ fi - - if test "${enable_java_bindings}" = "yes" - then -- if test "x${JAVA_HOME}" == "x"; then -+ if test "x${JAVA_HOME}" = "x"; then - { { echo "$as_me:$LINENO: error: Please set the JAVA_HOME variable to your JDK environment" >&5 - echo "$as_me: error: Please set the JAVA_HOME variable to your JDK environment" >&2;} - { (exit 1); exit 1; }; } diff --git a/multimedia/vlc08/patches/patch-ab b/multimedia/vlc08/patches/patch-ab deleted file mode 100644 index ece5ad1f77f..00000000000 --- a/multimedia/vlc08/patches/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/access/rtsp/real.c.orig 2009-08-09 15:28:43.000000000 +0300 -+++ modules/access/rtsp/real.c 2009-08-09 15:29:26.000000000 +0300 -@@ -598,6 +598,8 @@ int real_get_rdt_chunk(rtsp_client_t *rt - - int n; - rmff_dump_pheader(ph, *buffer); -+ if (ph->length < 12) -+ return 0; - n=rtsp_read_data(rtsp_session, *buffer + 12, ph->length - 12); - return (n <= 0) ? 0 : n+12; - } diff --git a/multimedia/vlc08/patches/patch-mkv.cpp b/multimedia/vlc08/patches/patch-mkv.cpp deleted file mode 100644 index a498ada2c26..00000000000 --- a/multimedia/vlc08/patches/patch-mkv.cpp +++ /dev/null @@ -1,87 +0,0 @@ -$NetBSD: patch-mkv.cpp,v 1.1 2011/12/06 22:02:24 sborrill Exp $ - ---- modules/demux/mkv.cpp.orig 2011-12-06 21:42:19.000000000 +0000 -+++ modules/demux/mkv.cpp 2011-12-06 21:43:41.000000000 +0000 -@@ -75,7 +75,6 @@ - #include "matroska/KaxSegment.h" - #include "matroska/KaxTag.h" - #include "matroska/KaxTags.h" --#include "matroska/KaxTagMulti.h" - #include "matroska/KaxTracks.h" - #include "matroska/KaxTrackAudio.h" - #include "matroska/KaxTrackVideo.h" -@@ -3871,74 +3870,6 @@ - } - ep->Up(); - } -- else if( MKV_IS_ID( el, KaxTagGeneral ) ) -- { -- msg_Dbg( &sys.demuxer, "| + General" ); -- ep->Down(); -- while( ( el = ep->Get() ) != NULL ) -- { -- msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); -- } -- ep->Up(); -- } -- else if( MKV_IS_ID( el, KaxTagGenres ) ) -- { -- msg_Dbg( &sys.demuxer, "| + Genres" ); -- ep->Down(); -- while( ( el = ep->Get() ) != NULL ) -- { -- msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); -- } -- ep->Up(); -- } -- else if( MKV_IS_ID( el, KaxTagAudioSpecific ) ) -- { -- msg_Dbg( &sys.demuxer, "| + Audio Specific" ); -- ep->Down(); -- while( ( el = ep->Get() ) != NULL ) -- { -- msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); -- } -- ep->Up(); -- } -- else if( MKV_IS_ID( el, KaxTagImageSpecific ) ) -- { -- msg_Dbg( &sys.demuxer, "| + Images Specific" ); -- ep->Down(); -- while( ( el = ep->Get() ) != NULL ) -- { -- msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); -- } -- ep->Up(); -- } -- else if( MKV_IS_ID( el, KaxTagMultiComment ) ) -- { -- msg_Dbg( &sys.demuxer, "| + Multi Comment" ); -- } -- else if( MKV_IS_ID( el, KaxTagMultiCommercial ) ) -- { -- msg_Dbg( &sys.demuxer, "| + Multi Commercial" ); -- } -- else if( MKV_IS_ID( el, KaxTagMultiDate ) ) -- { -- msg_Dbg( &sys.demuxer, "| + Multi Date" ); -- } -- else if( MKV_IS_ID( el, KaxTagMultiEntity ) ) -- { -- msg_Dbg( &sys.demuxer, "| + Multi Entity" ); -- } -- else if( MKV_IS_ID( el, KaxTagMultiIdentifier ) ) -- { -- msg_Dbg( &sys.demuxer, "| + Multi Identifier" ); -- } -- else if( MKV_IS_ID( el, KaxTagMultiLegal ) ) -- { -- msg_Dbg( &sys.demuxer, "| + Multi Legal" ); -- } -- else if( MKV_IS_ID( el, KaxTagMultiTitle ) ) -- { -- msg_Dbg( &sys.demuxer, "| + Multi Title" ); -- } - else - { - msg_Dbg( &sys.demuxer, "| + Unknown (%s)", typeid( *el ).name() ); diff --git a/multimedia/vlc08/patches/patch-mmstu.c b/multimedia/vlc08/patches/patch-mmstu.c deleted file mode 100644 index 2a9f0cd88e4..00000000000 --- a/multimedia/vlc08/patches/patch-mmstu.c +++ /dev/null @@ -1,83 +0,0 @@ -$NetBSD: patch-mmstu.c,v 1.1 2008/09/12 14:47:39 sborrill Exp $ - -Fix for: -* A signedness error leading to a stack-based buffer overflow in the -mms_ReceiveCommand() function in modules/access/mms/mmstu.c -(CVE-2008-3794). - ---- modules/access/mms/mmstu.c.orig 2008-07-08 21:59:23.000000000 +0100 -+++ modules/access/mms/mmstu.c 2008-09-12 11:16:01.000000000 +0100 -@@ -28,6 +28,7 @@ - #include <stdlib.h> - #include <vlc/vlc.h> - #include <string.h> -+#include <inttypes.h> - #include <vlc/input.h> - #include <errno.h> - -@@ -695,7 +696,7 @@ - GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE + 60 ); - - msg_Dbg( p_access, -- "answer 0x06 flags:0x%8.8x media_length:%us packet_length:%lu packet_count:%u max_bit_rate:%d header_size:%d", -+ "answer 0x06 flags:0x%8.8"PRIx32" media_length:%"PRIu32"s packet_length:%zu packet_count:%"PRIu32" max_bit_rate:%d header_size:%zu", - p_sys->i_flags_broadcast, - p_sys->i_media_length, - p_sys->i_packet_length, -@@ -749,12 +750,12 @@ - if( p_sys->i_header >= p_sys->i_header_size ) - { - msg_Dbg( p_access, -- "header complete(%d)", -+ "header complete(%zu)", - p_sys->i_header ); - break; - } - msg_Dbg( p_access, -- "header incomplete (%d/%d), reading more", -+ "header incomplete (%zu/%zu), reading more", - p_sys->i_header, - p_sys->i_header_size ); - } -@@ -1128,7 +1129,7 @@ - - static int mms_ParseCommand( access_t *p_access, - uint8_t *p_data, -- int i_data, -+ size_t i_data, - int *pi_used ) - { - #define GET32( i_pos ) \ -@@ -1137,7 +1138,7 @@ - ( p_sys->p_cmd[i_pos + 3] << 24 ) ) - - access_sys_t *p_sys = p_access->p_sys; -- int i_length; -+ uint32_t i_length; - uint32_t i_id; - - if( p_sys->p_cmd ) -@@ -1159,10 +1160,10 @@ - i_id = GetDWLE( p_data + 4 ); - i_length = GetDWLE( p_data + 8 ) + 16; - -- if( i_id != 0xb00bface ) -+ if( i_id != 0xb00bface || i_length < 16 ) - { - msg_Err( p_access, -- "incorrect command header (0x%x)", i_id ); -+ "incorrect command header (0x%"PRIx32")", i_id ); - p_sys->i_command = 0; - return -1; - } -@@ -1170,8 +1171,8 @@ - if( i_length > p_sys->i_cmd ) - { - msg_Warn( p_access, -- "truncated command (missing %d bytes)", -- i_length - i_data ); -+ "truncated command (missing %zu bytes)", -+ (size_t)i_length - i_data ); - p_sys->i_command = 0; - return -1; - } diff --git a/multimedia/vlc08/patches/patch-mmstu.h b/multimedia/vlc08/patches/patch-mmstu.h deleted file mode 100644 index aa4d8ae9ed5..00000000000 --- a/multimedia/vlc08/patches/patch-mmstu.h +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-mmstu.h,v 1.1 2008/09/12 14:47:39 sborrill Exp $ - -Fix for: -* A signedness error leading to a stack-based buffer overflow in the -mms_ReceiveCommand() function in modules/access/mms/mmstu.c -(CVE-2008-3794). - ---- modules/access/mms/mmstu.h.orig 2008-07-08 21:59:23.000000000 +0100 -+++ modules/access/mms/mmstu.h 2008-09-12 11:16:06.000000000 +0100 -@@ -62,10 +62,10 @@ - int i_packet_seq_num; - - uint8_t *p_cmd; /* latest command read */ -- int i_cmd; /* allocated at the begining */ -+ size_t i_cmd; /* allocated at the begining */ - - uint8_t *p_header; /* allocated by mms_ReadPacket */ -- int i_header; -+ size_t i_header; - - uint8_t *p_media; /* allocated by mms_ReadPacket */ - size_t i_media; -@@ -86,7 +86,7 @@ - size_t i_packet_length; - uint32_t i_packet_count; - int i_max_bit_rate; -- int i_header_size; -+ size_t i_header_size; - - /* */ - vlc_bool_t b_seekable; diff --git a/multimedia/vlc08/patches/patch-png.c b/multimedia/vlc08/patches/patch-png.c deleted file mode 100644 index 6fa80c4a5f3..00000000000 --- a/multimedia/vlc08/patches/patch-png.c +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-png.c,v 1.1 2011/12/06 22:02:24 sborrill Exp $ - ---- modules/codec/png.c.orig 2011-12-06 21:04:12.000000000 +0000 -+++ modules/codec/png.c 2011-12-06 21:04:39.000000000 +0000 -@@ -147,7 +147,7 @@ - p_info = png_create_info_struct( p_png ); - if( p_info == NULL ) - { -- png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL ); -+ png_destroy_read_struct( &p_png, NULL, NULL ); - block_Release( p_block ); *pp_block = NULL; - return NULL; - } -@@ -155,7 +155,7 @@ - p_end_info = png_create_info_struct( p_png ); - if( p_end_info == NULL ) - { -- png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL ); -+ png_destroy_read_struct( &p_png, &p_info, NULL ); - block_Release( p_block ); *pp_block = NULL; - return NULL; - } diff --git a/multimedia/vlc08/patches/patch-tta.c b/multimedia/vlc08/patches/patch-tta.c deleted file mode 100644 index 1923c02eb86..00000000000 --- a/multimedia/vlc08/patches/patch-tta.c +++ /dev/null @@ -1,145 +0,0 @@ -$NetBSD: patch-tta.c,v 1.1 2008/09/12 14:47:39 sborrill Exp $ - -Fix for: -* An integer overflow leading to a heap-based buffer overflow in the -Open() function in modules/demux/tta.c (CVE-2008-3732). - ---- modules/demux/tta.c.orig 2008-07-08 21:59:23.000000000 +0100 -+++ modules/demux/tta.c 2008-09-12 11:16:11.000000000 +0100 -@@ -60,10 +60,10 @@ - es_out_id_t *p_es; - - /* */ -- int i_totalframes; -- int i_currentframe; -+ uint32_t i_totalframes; -+ uint32_t i_currentframe; - uint32_t *pi_seektable; -- int i_datalength; -+ uint32_t i_datalength; - int i_framelength; - - /* */ -@@ -81,10 +81,11 @@ - es_format_t fmt; - uint8_t *p_peek; - uint8_t p_header[22]; -- uint8_t *p_seektable; -- int i_seektable_size = 0, i; -+ uint8_t *p_fullheader; -+ int i_seektable_size = 0; - //char psz_info[4096]; - //module_t *p_id3; -+ uint32_t i; - - if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) - return VLC_EGENERIC; -@@ -94,7 +95,7 @@ - if( !p_demux->b_force ) return VLC_EGENERIC; - - /* User forced */ -- msg_Err( p_demux, "this doesn't look like a flac stream, " -+ msg_Err( p_demux, "this doesn't look like a true-audio stream, " - "continuing anyway" ); - } - -@@ -106,11 +107,22 @@ - p_demux->pf_control = Control; - p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); - -+ if( !p_sys ) -+ return VLC_ENOMEM; -+ -+ p_sys->pi_seektable = NULL; -+ - /* Read the metadata */ - es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'T', 'T', 'A', '1' ) ); - fmt.audio.i_channels = GetWLE( &p_header[6] ); - fmt.audio.i_bitspersample = GetWLE( &p_header[8] ); - fmt.audio.i_rate = GetDWLE( &p_header[10] ); -+ if( fmt.audio.i_rate == 0 || /* Avoid divide by 0 */ -+ fmt.audio.i_rate > ( 1 << 20 ) /* Avoid i_framelength overflow */ ) -+ { -+ msg_Warn( p_demux, "Wrong sample rate" ); -+ goto error; -+ } - - p_sys->i_datalength = GetDWLE( &p_header[14] ); - p_sys->i_framelength = TTA_FRAMETIME * fmt.audio.i_rate; -@@ -118,25 +130,36 @@ - p_sys->i_totalframes = p_sys->i_datalength / p_sys->i_framelength + - ((p_sys->i_datalength % p_sys->i_framelength) ? 1 : 0); - p_sys->i_currentframe = 0; -+ if( p_sys->i_totalframes > (1 << 29)) -+ goto error; - - i_seektable_size = sizeof(uint32_t)*p_sys->i_totalframes; -- p_seektable = (uint8_t *)malloc( i_seektable_size ); -- stream_Read( p_demux->s, p_seektable, i_seektable_size ); -- p_sys->pi_seektable = (uint32_t *)malloc(i_seektable_size); - -+ /* Store the header and Seektable for avcodec */ -+ fmt.i_extra = 22 + i_seektable_size + 4; -+ fmt.p_extra = p_fullheader = malloc( fmt.i_extra ); -+ if( !p_fullheader ) -+ goto error; -+ -+ memcpy( p_fullheader, p_header, 22 ); -+ p_fullheader += 22; -+ if( stream_Read( p_demux->s, p_fullheader, i_seektable_size ) -+ != i_seektable_size ) -+ goto error; -+ -+ p_sys->pi_seektable = calloc( p_sys->i_totalframes, sizeof(uint32_t) ); -+ if( !p_sys->pi_seektable ) -+ goto error; - for( i = 0; i < p_sys->i_totalframes; i++ ) -- p_sys->pi_seektable[i] = GetDWLE( &p_seektable[i*4] ); -- -- stream_Read( p_demux->s, NULL, 4 ); /* CRC */ -+ { -+ p_sys->pi_seektable[i] = GetDWLE( p_fullheader ); -+ p_fullheader += 4; -+ } - -- /* Store the header and Seektable for avcodec */ -- fmt.i_extra = 22 + (p_sys->i_totalframes * 4) + 4; -- fmt.p_extra = malloc( fmt.i_extra ); -- memcpy( fmt.p_extra, p_header, 22 ); -- memcpy( fmt.p_extra+22, p_seektable, fmt.i_extra -22 ); -+ stream_Read( p_demux->s, p_fullheader, 4 ); /* CRC */ -+ p_fullheader += 4; - - p_sys->p_es = es_out_Add( p_demux->out, &fmt ); -- free( p_seektable ); - p_sys->i_start = stream_Tell( p_demux->s ); - - #if 0 -@@ -152,6 +175,10 @@ - p_sys->p_meta = vlc_meta_New(); - #endif - return VLC_SUCCESS; -+error: -+ es_format_Clean( &fmt ); -+ Close( p_this ); -+ return VLC_EGENERIC; - } - - /***************************************************************************** -@@ -162,6 +189,7 @@ - demux_t *p_demux = (demux_t*)p_this; - demux_sys_t *p_sys = p_demux->p_sys; - -+ free( p_sys->pi_seektable ); - free( p_sys ); - } - -@@ -221,7 +249,7 @@ - if( i64 > 0 ) - { - int64_t tmp = 0; -- int i; -+ uint32_t i; - for( i=0; i < p_sys->i_totalframes && tmp+p_sys->pi_seektable[i] < i64; i++) - { - tmp += p_sys->pi_seektable[i]; diff --git a/multimedia/vlc08/patches/patch-x264.c b/multimedia/vlc08/patches/patch-x264.c deleted file mode 100644 index c71957b9723..00000000000 --- a/multimedia/vlc08/patches/patch-x264.c +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-x264.c,v 1.2 2009/07/02 10:15:47 sborrill Exp $ - -Fix build with version of x264-devel currently in pkgsrc - ---- modules/codec/x264.c.orig 2008-07-08 21:59:23.000000000 +0100 -+++ modules/codec/x264.c 2009-07-02 10:49:13.000000000 +0100 -@@ -29,6 +29,7 @@ - #include <vlc/sout.h> - #include <vlc/decoder.h> - -+#include <inttypes.h> - #include <x264.h> - - #define SOUT_CFG_PREFIX "sout-x264-" -@@ -889,8 +890,10 @@ - #endif - - #if X264_BUILD >= 0x0013 -+#if X264_BUILD < 65 - var_Get( p_enc, SOUT_CFG_PREFIX "b-adapt", &val ); - p_sys->param.b_bframe_adaptive = val.b_bool; -+#endif - - var_Get( p_enc, SOUT_CFG_PREFIX "b-bias", &val ); - if( val.i_int >= -100 && val.i_int <= 100 ) -@@ -930,7 +933,7 @@ - p_sys->param.analyse.i_trellis = val.i_int; - #endif - --#if X264_BUILD >= 41 -+#if X264_BUILD >= 41 && X264_BUILD < 65 - var_Get( p_enc, SOUT_CFG_PREFIX "b-rdo", &val ); - p_sys->param.analyse.b_bframe_rdo = val.b_bool; - #endif -@@ -940,7 +943,7 @@ - p_sys->param.analyse.b_fast_pskip = val.b_bool; - #endif - --#if X264_BUILD >= 43 -+#if X264_BUILD >= 43 && X264_BUILD < 65 - var_Get( p_enc, SOUT_CFG_PREFIX "bime", &val ); - p_sys->param.analyse.b_bidir_me = val.b_bool; - #endif -@@ -965,10 +968,12 @@ - if( val.i_int >= 0 && val.i_int <= 32 ) - p_sys->param.analyse.i_luma_deadzone[1] = val.i_int; - -+#if X264_BUILD < 65 - var_Get( p_enc, SOUT_CFG_PREFIX "direct-8x8", &val ); - if( val.i_int >= -1 && val.i_int <= 1 ) - p_sys->param.analyse.i_direct_8x8_inference = val.i_int; - #endif -+#endif - - var_Get( p_enc, SOUT_CFG_PREFIX "asm", &val ); - if( !val.b_bool ) p_sys->param.cpu = 0; |