diff options
author | wiz <wiz> | 2013-01-22 13:21:11 +0000 |
---|---|---|
committer | wiz <wiz> | 2013-01-22 13:21:11 +0000 |
commit | e71dc8ccf6e3e5fa9d2d2a3b8e165f73c31a2d9e (patch) | |
tree | 2bf08109f40ba30e929148feebc4d92985ee7186 | |
parent | c30eefcd85349c18f5900a006cb881af005ebc9e (diff) | |
download | pkgsrc-e71dc8ccf6e3e5fa9d2d2a3b8e165f73c31a2d9e.tar.gz |
Remove vlc10 -- doesn't build against any available ffmpeg in pkgsrc.
-rw-r--r-- | doc/CHANGES-2013 | 3 | ||||
-rw-r--r-- | multimedia/Makefile | 3 | ||||
-rw-r--r-- | multimedia/vlc10/DESCR | 10 | ||||
-rw-r--r-- | multimedia/vlc10/Makefile | 160 | ||||
-rw-r--r-- | multimedia/vlc10/PLIST | 528 | ||||
-rw-r--r-- | multimedia/vlc10/distinfo | 11 | ||||
-rw-r--r-- | multimedia/vlc10/options.mk | 130 | ||||
-rw-r--r-- | multimedia/vlc10/patches/patch-aa | 30 | ||||
-rw-r--r-- | multimedia/vlc10/patches/patch-ab | 24 | ||||
-rw-r--r-- | multimedia/vlc10/patches/patch-au | 16 | ||||
-rw-r--r-- | multimedia/vlc10/patches/patch-av | 22 | ||||
-rw-r--r-- | multimedia/vlc10/patches/patch-configure | 35 | ||||
-rw-r--r-- | multimedia/vlc10/patches/patch-v4l2 | 21 |
13 files changed, 3 insertions, 990 deletions
diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013 index fb8da614040..d927d52440e 100644 --- a/doc/CHANGES-2013 +++ b/doc/CHANGES-2013 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2013,v 1.271 2013/01/22 11:46:08 wiz Exp $ +$NetBSD: CHANGES-2013,v 1.272 2013/01/22 13:21:11 wiz Exp $ Changes to the packages collection and infrastructure in 2013: @@ -356,3 +356,4 @@ Changes to the packages collection and infrastructure in 2013: Updated audio/cd-discid to 1.3.1 [jperkin 2013-01-22] Removed multimedia/vls [wiz 2013-01-22] Added multimedia/libdvbpsi0 version 0.2.2 [wiz 2013-01-22] + Removed multimedia/vlc10 [wiz 2013-01-22] diff --git a/multimedia/Makefile b/multimedia/Makefile index 9fb1d187ff1..d5a307dc3b6 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.201 2013/01/22 11:45:56 wiz Exp $ +# $NetBSD: Makefile,v 1.202 2013/01/22 13:21:11 wiz Exp $ # COMMENT= Multimedia utilities @@ -167,7 +167,6 @@ SUBDIR+= tstools SUBDIR+= tvtime SUBDIR+= ushare SUBDIR+= vlc -SUBDIR+= vlc10 SUBDIR+= vlc2 SUBDIR+= win32-codecs SUBDIR+= x264-devel diff --git a/multimedia/vlc10/DESCR b/multimedia/vlc10/DESCR deleted file mode 100644 index 6ea7f1224c6..00000000000 --- a/multimedia/vlc10/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/vlc10/Makefile b/multimedia/vlc10/Makefile deleted file mode 100644 index 9925ce5e903..00000000000 --- a/multimedia/vlc10/Makefile +++ /dev/null @@ -1,160 +0,0 @@ -# $NetBSD: Makefile,v 1.29 2013/01/22 12:22:41 wiz Exp $ -# - -DISTNAME= vlc-${VLC_VERSION} -PKGREVISION= 29 -CATEGORIES= multimedia -MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ -EXTRACT_SUFX= .tar.bz2 - -VLC_VERSION= 1.0.6 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.videolan.org/ -COMMENT= VLC media player and streaming server -LICENSE= gnu-gpl-v2 - -CONFLICTS= vlc07-[0-9]* vlc08-[0-9]* - -USE_LIBTOOL= yes -USE_TOOLS+= gmake perl pkg-config \ - autoconf automake autoreconf -# for autopoint -BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools -USE_PKGLOCALEDIR= yes -GNU_CONFIGURE= yes -PTHREAD_OPTS+= require -USE_LANGUAGES= c99 c++ -PLIST_VARS+= x86simd altivec v4l2 vcd cdda - -.include "../../mk/bsd.prefs.mk" -.include "options.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-vcd -.else -PLIST.vcd= yes -# This may need a closer look. -PLIST.cdda= yes -.endif - -BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0 -BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 - -CONFIGURE_ARGS+= --disable-speex # needs unstable 1.1.x branch [1.2 in pkgsrc] -CONFIGURE_ARGS+= --disable-smb - -CONFIGURE_ARGS+= --enable-cddax \ - --enable-dvdread \ - --enable-flac \ - --enable-live555 \ - --enable-theora \ - --enable-lua=no - -# Build optimalized modules -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" -PLIST.x86simd= yes -CONFIGURE_ARGS+= --enable-mmx \ - --enable-sse -.endif -.if ${MACHINE_ARCH} == "powerpc" -PLIST.altivec= yes -CONFIGURE_ARGS+= --enable-altivec -.endif - -# Enable when cleanly builds -.if exists(/usr/include/linux/videodev2.h) # || exists(/usr/include/sys/videoio.h) -CONFIGURE_ARGS+= --enable-v4l2 -PLIST.v4l2= yes -.else -CONFIGURE_ARGS+= --disable-v4l2 -.endif - -INSTALLATION_DIRS+= 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 \ - ${PKGMANDIR}/man1 -pre-configure: - cd ${WRKSRC} && autoreconf -fi - -post-install: - ${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - -# Let's use dejavu-ttf as it has nice unicode support -# -ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf -DEFAULT_FONT?= ${PREFIX}/lib/X11/fonts/TTF/DejaVuSans.ttf -DEPENDS+= dejavu-ttf>=2.26:../../fonts/dejavu-ttf - -SUBST_CLASSES+= oss -SUBST_STAGE.oss= pre-configure -SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" -SUBST_FILES.oss+= modules/access/oss.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_FILES.oss+= po/*.po -SUBST_MESSAGE.oss= Fixing hardcoded audio device. - -SUBST_CLASSES+= fnt -SUBST_STAGE.fnt= pre-configure -SUBST_SED.fnt= -e "s,${ORIGFNT},${DEFAULT_FONT}," -SUBST_FILES.fnt= modules/misc/freetype.c -SUBST_MESSAGE.fnt= Fixing hardcoded paths. - -REPLACE_SH+= vlc-config.in.in - -# VLC embeds the build environment info to help debuging. -CHECK_WRKREF_SKIP= lib/libvlccore.a \ - lib/libvlccore.so* - -.include "../../audio/libmpcdec/buildlink3.mk" -.include "../../audio/flac/buildlink3.mk" -.include "../../audio/libmad/buildlink3.mk" -.include "../../audio/libvorbis/buildlink3.mk" -.include "../../audio/liba52/buildlink3.mk" -.include "../../audio/libcddb/buildlink3.mk" -.include "../../audio/libid3tag/buildlink3.mk" -.include "../../audio/libdca/buildlink3.mk" -.include "../../audio/taglib/buildlink3.mk" -.include "../../audio/libcddb/buildlink3.mk" -.include "../../misc/libcdio/buildlink3.mk" - -.include "../../mk/jpeg.buildlink3.mk" -.include "../../net/liblive/buildlink3.mk" -.include "../../converters/fribidi/buildlink3.mk" -.include "../../devel/libebml/buildlink3.mk" -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pcre/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../security/libgcrypt/buildlink3.mk" -.include "../../security/gnutls/buildlink3.mk" - -.include "../../multimedia/ffmpeg/buildlink3.mk" -.include "../../multimedia/libdvdplay/buildlink3.mk" -.include "../../multimedia/libdvbpsi0/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 "../../multimedia/libtheora/buildlink3.mk" -# needs x264_encoder_delayed_frames -BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20090920 -.include "../../multimedia/x264-devel/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/vlc10/PLIST b/multimedia/vlc10/PLIST deleted file mode 100644 index 60e794dacaf..00000000000 --- a/multimedia/vlc10/PLIST +++ /dev/null @@ -1,528 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/01/24 18:45:54 drochner Exp $ -${PLIST.altivec}lib/vlc/misc/libmemcpyaltivec_plugin.la -${PLIST.altivec}lib/vlc/video_chroma/libi420_yuy2_altivec_plugin.la -${PLIST.cdda}lib/vlc/access/libcdda_plugin.la -${PLIST.dbus}lib/vlc/control/libdbus_plugin.la -${PLIST.dbus}lib/vlc/misc/libinhibit_plugin.la -${PLIST.faad}lib/vlc/codec/libfaad_plugin.la -${PLIST.gnome}lib/vlc/access/libaccess_gnomevfs_plugin.la -${PLIST.gnome}lib/vlc/misc/libtelepathy_plugin.la -${PLIST.hal}lib/vlc/misc/libprobe_hal_plugin.la -${PLIST.hal}lib/vlc/services_discovery/libhal_plugin.la -${PLIST.pulseaudio}lib/vlc/audio_output/libpulse_plugin.la -${PLIST.sdl}lib/vlc/audio_output/libaout_sdl_plugin.la -${PLIST.sdl}lib/vlc/codec/libsdl_image_plugin.la -${PLIST.sdl}lib/vlc/video_output/libvout_sdl_plugin.la -${PLIST.skins}bin/svlc -${PLIST.skins}lib/vlc/gui/libskins2_plugin.la -${PLIST.skins}share/vlc/skins2/default.vlt -${PLIST.skins}share/vlc/skins2/fonts/FreeSans.ttf -${PLIST.skins}share/vlc/skins2/fonts/FreeSansBold.ttf -${PLIST.skins}share/vlc/skins2/skin.catalog -${PLIST.skins}share/vlc/skins2/skin.dtd -${PLIST.skins}share/vlc/skins2/winamp2.xml -${PLIST.v4l2}lib/vlc/access/libaccess_v4l2_plugin.la -${PLIST.vcd}lib/vlc/access/libvcd_plugin.la -${PLIST.x11}bin/qvlc -${PLIST.x11}lib/vlc/access/libx11_screen_plugin.la -${PLIST.x11}lib/vlc/codec/libpng_plugin.la -${PLIST.x11}lib/vlc/control/libglobalhotkeys_plugin.la -${PLIST.x11}lib/vlc/gui/libqt4_plugin.la -${PLIST.x11}lib/vlc/misc/libfreetype_plugin.la -${PLIST.x11}lib/vlc/misc/libosd_parser_plugin.la -${PLIST.x11}lib/vlc/video_filter/libosdmenu_plugin.la -${PLIST.x11}lib/vlc/video_filter/libpanoramix_plugin.la -${PLIST.x11}lib/vlc/video_output/libglx_plugin.la -${PLIST.x11}lib/vlc/video_output/libopengl_plugin.la -${PLIST.x11}lib/vlc/video_output/libsnapshot_plugin.la -${PLIST.x11}lib/vlc/video_output/libx11_plugin.la -${PLIST.x11}lib/vlc/video_output/libxvideo_plugin.la -${PLIST.x86simd}lib/vlc/misc/libmemcpy3dn_plugin.la -${PLIST.x86simd}lib/vlc/misc/libmemcpymmx_plugin.la -${PLIST.x86simd}lib/vlc/misc/libmemcpymmxext_plugin.la -${PLIST.x86simd}lib/vlc/video_chroma/libi420_rgb_mmx_plugin.la -${PLIST.x86simd}lib/vlc/video_chroma/libi420_rgb_sse2_plugin.la -${PLIST.x86simd}lib/vlc/video_chroma/libi420_ymga_mmx_plugin.la -${PLIST.x86simd}lib/vlc/video_chroma/libi420_yuy2_mmx_plugin.la -${PLIST.x86simd}lib/vlc/video_chroma/libi420_yuy2_sse2_plugin.la -${PLIST.x86simd}lib/vlc/video_chroma/libi422_yuy2_mmx_plugin.la -${PLIST.x86simd}lib/vlc/video_chroma/libi422_yuy2_sse2_plugin.la -bin/cvlc -bin/rvlc -bin/vlc -bin/vlc-wrapper -include/vlc/deprecated.h -include/vlc/libvlc.h -include/vlc/libvlc_events.h -include/vlc/libvlc_media.h -include/vlc/libvlc_media_discoverer.h -include/vlc/libvlc_media_library.h -include/vlc/libvlc_media_list.h -include/vlc/libvlc_media_list_player.h -include/vlc/libvlc_media_list_view.h -include/vlc/libvlc_media_player.h -include/vlc/libvlc_structures.h -include/vlc/libvlc_vlm.h -include/vlc/mediacontrol.h -include/vlc/mediacontrol_structures.h -include/vlc/plugins/vlc_access.h -include/vlc/plugins/vlc_acl.h -include/vlc/plugins/vlc_aout.h -include/vlc/plugins/vlc_arrays.h -include/vlc/plugins/vlc_avcodec.h -include/vlc/plugins/vlc_bits.h -include/vlc/plugins/vlc_block.h -include/vlc/plugins/vlc_block_helper.h -include/vlc/plugins/vlc_charset.h -include/vlc/plugins/vlc_codec.h -include/vlc/plugins/vlc_common.h -include/vlc/plugins/vlc_config.h -include/vlc/plugins/vlc_config_cat.h -include/vlc/plugins/vlc_configuration.h -include/vlc/plugins/vlc_demux.h -include/vlc/plugins/vlc_dialog.h -include/vlc/plugins/vlc_epg.h -include/vlc/plugins/vlc_es.h -include/vlc/plugins/vlc_es_out.h -include/vlc/plugins/vlc_events.h -include/vlc/plugins/vlc_filter.h -include/vlc/plugins/vlc_gcrypt.h -include/vlc/plugins/vlc_httpd.h -include/vlc/plugins/vlc_image.h -include/vlc/plugins/vlc_input.h -include/vlc/plugins/vlc_input_item.h -include/vlc/plugins/vlc_main.h -include/vlc/plugins/vlc_md5.h -include/vlc/plugins/vlc_messages.h -include/vlc/plugins/vlc_meta.h -include/vlc/plugins/vlc_modules.h -include/vlc/plugins/vlc_mtime.h -include/vlc/plugins/vlc_objects.h -include/vlc/plugins/vlc_playlist.h -include/vlc/plugins/vlc_plugin.h -include/vlc/plugins/vlc_rand.h -include/vlc/plugins/vlc_services_discovery.h -include/vlc/plugins/vlc_sout.h -include/vlc/plugins/vlc_stream.h -include/vlc/plugins/vlc_strings.h -include/vlc/plugins/vlc_threads.h -include/vlc/plugins/vlc_url.h -include/vlc/plugins/vlc_variables.h -include/vlc/plugins/vlc_vlm.h -include/vlc/plugins/vlc_vout.h -include/vlc/plugins/vlc_window.h -include/vlc/plugins/vlc_xml.h -include/vlc/vlc.h -lib/libvlc.la -lib/libvlccore.la -lib/pkgconfig/libvlc.pc -lib/pkgconfig/vlc-plugin.pc -lib/vlc/access/libaccess_bd_plugin.la -lib/vlc/access/libaccess_directory_plugin.la -lib/vlc/access/libaccess_fake_plugin.la -lib/vlc/access/libaccess_file_plugin.la -lib/vlc/access/libaccess_ftp_plugin.la -lib/vlc/access/libaccess_http_plugin.la -lib/vlc/access/libaccess_mmap_plugin.la -lib/vlc/access/libaccess_mms_plugin.la -lib/vlc/access/libaccess_oss_plugin.la -lib/vlc/access/libaccess_tcp_plugin.la -lib/vlc/access/libaccess_udp_plugin.la -lib/vlc/access/libcddax_plugin.la -lib/vlc/access/libdvdnav_plugin.la -lib/vlc/access/libdvdread_plugin.la -lib/vlc/access/librtp_plugin.la -lib/vlc/access/libzip_plugin.la -lib/vlc/access_output/libaccess_output_dummy_plugin.la -lib/vlc/access_output/libaccess_output_file_plugin.la -lib/vlc/access_output/libaccess_output_http_plugin.la -lib/vlc/access_output/libaccess_output_udp_plugin.la -lib/vlc/audio_filter/liba52tofloat32_plugin.la -lib/vlc/audio_filter/liba52tospdif_plugin.la -lib/vlc/audio_filter/libaudio_format_plugin.la -lib/vlc/audio_filter/libbandlimited_resampler_plugin.la -lib/vlc/audio_filter/libconverter_fixed_plugin.la -lib/vlc/audio_filter/libconverter_float_plugin.la -lib/vlc/audio_filter/libdolby_surround_decoder_plugin.la -lib/vlc/audio_filter/libdtstofloat32_plugin.la -lib/vlc/audio_filter/libdtstospdif_plugin.la -lib/vlc/audio_filter/libequalizer_plugin.la -lib/vlc/audio_filter/libheadphone_channel_mixer_plugin.la -lib/vlc/audio_filter/liblinear_resampler_plugin.la -lib/vlc/audio_filter/libmono_plugin.la -lib/vlc/audio_filter/libmpgatofixed32_plugin.la -lib/vlc/audio_filter/libnormvol_plugin.la -lib/vlc/audio_filter/libparam_eq_plugin.la -lib/vlc/audio_filter/libscaletempo_plugin.la -lib/vlc/audio_filter/libsimple_channel_mixer_plugin.la -lib/vlc/audio_filter/libspatializer_plugin.la -lib/vlc/audio_filter/libtrivial_channel_mixer_plugin.la -lib/vlc/audio_filter/libtrivial_resampler_plugin.la -lib/vlc/audio_filter/libugly_resampler_plugin.la -lib/vlc/audio_mixer/libfloat32_mixer_plugin.la -lib/vlc/audio_mixer/libspdif_mixer_plugin.la -lib/vlc/audio_mixer/libtrivial_mixer_plugin.la -lib/vlc/audio_output/libaout_file_plugin.la -lib/vlc/audio_output/liboss_plugin.la -lib/vlc/codec/liba52_plugin.la -lib/vlc/codec/libadpcm_plugin.la -lib/vlc/codec/libaes3_plugin.la -lib/vlc/codec/libaraw_plugin.la -lib/vlc/codec/libavcodec_plugin.la -lib/vlc/codec/libcc_plugin.la -lib/vlc/codec/libcdg_plugin.la -lib/vlc/codec/libcmml_plugin.la -lib/vlc/codec/libcvdsub_plugin.la -lib/vlc/codec/libdts_plugin.la -lib/vlc/codec/libdvbsub_plugin.la -lib/vlc/codec/libfake_plugin.la -lib/vlc/codec/libflac_plugin.la -lib/vlc/codec/libinvmem_plugin.la -lib/vlc/codec/liblibmpeg2_plugin.la -lib/vlc/codec/liblpcm_plugin.la -lib/vlc/codec/libmpeg_audio_plugin.la -lib/vlc/codec/librawvideo_plugin.la -lib/vlc/codec/libspudec_plugin.la -lib/vlc/codec/libsubsdec_plugin.la -lib/vlc/codec/libsubsusf_plugin.la -lib/vlc/codec/libsvcdsub_plugin.la -lib/vlc/codec/libt140_plugin.la -lib/vlc/codec/libtelx_plugin.la -lib/vlc/codec/libtheora_plugin.la -lib/vlc/codec/libvorbis_plugin.la -lib/vlc/codec/libx264_plugin.la -lib/vlc/control/libgestures_plugin.la -lib/vlc/control/libhotkeys_plugin.la -lib/vlc/control/libhttp_plugin.la -lib/vlc/control/libmotion_plugin.la -lib/vlc/control/librc_plugin.la -lib/vlc/control/libshowintf_plugin.la -lib/vlc/control/libsignals_plugin.la -lib/vlc/control/libtelnet_plugin.la -lib/vlc/demux/libaiff_plugin.la -lib/vlc/demux/libasf_plugin.la -lib/vlc/demux/libau_plugin.la -lib/vlc/demux/libavformat_plugin.la -lib/vlc/demux/libavi_plugin.la -lib/vlc/demux/libdemux_cdg_plugin.la -lib/vlc/demux/libdemuxdump_plugin.la -lib/vlc/demux/libdirac_plugin.la -lib/vlc/demux/libes_plugin.la -lib/vlc/demux/libflacsys_plugin.la -lib/vlc/demux/libh264_plugin.la -lib/vlc/demux/liblive555_plugin.la -lib/vlc/demux/libm4v_plugin.la -lib/vlc/demux/libmjpeg_plugin.la -lib/vlc/demux/libmkv_plugin.la -lib/vlc/demux/libmp4_plugin.la -lib/vlc/demux/libmpc_plugin.la -lib/vlc/demux/libmpgv_plugin.la -lib/vlc/demux/libnsc_plugin.la -lib/vlc/demux/libnsv_plugin.la -lib/vlc/demux/libnuv_plugin.la -lib/vlc/demux/libogg_plugin.la -lib/vlc/demux/libplaylist_plugin.la -lib/vlc/demux/libps_plugin.la -lib/vlc/demux/libpva_plugin.la -lib/vlc/demux/librawaud_plugin.la -lib/vlc/demux/librawdv_plugin.la -lib/vlc/demux/librawvid_plugin.la -lib/vlc/demux/libreal_plugin.la -lib/vlc/demux/libsmf_plugin.la -lib/vlc/demux/libsubtitle_plugin.la -lib/vlc/demux/libts_plugin.la -lib/vlc/demux/libtta_plugin.la -lib/vlc/demux/libty_plugin.la -lib/vlc/demux/libvc1_plugin.la -lib/vlc/demux/libvobsub_plugin.la -lib/vlc/demux/libvoc_plugin.la -lib/vlc/demux/libwav_plugin.la -lib/vlc/demux/libxa_plugin.la -lib/vlc/meta_engine/libfolder_plugin.la -lib/vlc/meta_engine/libtaglib_plugin.la -lib/vlc/misc/libaudioscrobbler_plugin.la -lib/vlc/misc/libdummy_plugin.la -lib/vlc/misc/libexport_plugin.la -lib/vlc/misc/libgnutls_plugin.la -lib/vlc/misc/liblogger_plugin.la -lib/vlc/misc/libmemcpy_plugin.la -lib/vlc/misc/libscreensaver_plugin.la -lib/vlc/misc/libstats_plugin.la -lib/vlc/misc/libvod_rtsp_plugin.la -lib/vlc/misc/libxml_plugin.la -lib/vlc/misc/libxtag_plugin.la -lib/vlc/mux/libmux_asf_plugin.la -lib/vlc/mux/libmux_avi_plugin.la -lib/vlc/mux/libmux_dummy_plugin.la -lib/vlc/mux/libmux_mp4_plugin.la -lib/vlc/mux/libmux_mpjpeg_plugin.la -lib/vlc/mux/libmux_ogg_plugin.la -lib/vlc/mux/libmux_ps_plugin.la -lib/vlc/mux/libmux_ts_plugin.la -lib/vlc/mux/libmux_wav_plugin.la -lib/vlc/packetizer/libpacketizer_copy_plugin.la -lib/vlc/packetizer/libpacketizer_dirac_plugin.la -lib/vlc/packetizer/libpacketizer_h264_plugin.la -lib/vlc/packetizer/libpacketizer_mlp_plugin.la -lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.la -lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.la -lib/vlc/packetizer/libpacketizer_mpegvideo_plugin.la -lib/vlc/packetizer/libpacketizer_vc1_plugin.la -lib/vlc/services_discovery/libpodcast_plugin.la -lib/vlc/services_discovery/libsap_plugin.la -lib/vlc/services_discovery/libshout_plugin.la -lib/vlc/stream_filter/libdecomp_plugin.la -lib/vlc/stream_filter/libstream_filter_rar_plugin.la -lib/vlc/stream_filter/libstream_filter_record_plugin.la -lib/vlc/stream_out/libstream_out_autodel_plugin.la -lib/vlc/stream_out/libstream_out_bridge_plugin.la -lib/vlc/stream_out/libstream_out_description_plugin.la -lib/vlc/stream_out/libstream_out_display_plugin.la -lib/vlc/stream_out/libstream_out_dummy_plugin.la -lib/vlc/stream_out/libstream_out_duplicate_plugin.la -lib/vlc/stream_out/libstream_out_es_plugin.la -lib/vlc/stream_out/libstream_out_gather_plugin.la -lib/vlc/stream_out/libstream_out_mosaic_bridge_plugin.la -lib/vlc/stream_out/libstream_out_raop_plugin.la -lib/vlc/stream_out/libstream_out_record_plugin.la -lib/vlc/stream_out/libstream_out_rtp_plugin.la -lib/vlc/stream_out/libstream_out_standard_plugin.la -lib/vlc/stream_out/libstream_out_transcode_plugin.la -lib/vlc/video_chroma/libgrey_yuv_plugin.la -lib/vlc/video_chroma/libi420_rgb_plugin.la -lib/vlc/video_chroma/libi420_ymga_plugin.la -lib/vlc/video_chroma/libi420_yuy2_plugin.la -lib/vlc/video_chroma/libi422_i420_plugin.la -lib/vlc/video_chroma/libi422_yuy2_plugin.la -lib/vlc/video_chroma/libyuy2_i420_plugin.la -lib/vlc/video_chroma/libyuy2_i422_plugin.la -lib/vlc/video_filter/libadjust_plugin.la -lib/vlc/video_filter/libalphamask_plugin.la -lib/vlc/video_filter/libblend_plugin.la -lib/vlc/video_filter/libblendbench_plugin.la -lib/vlc/video_filter/libbluescreen_plugin.la -lib/vlc/video_filter/libcanvas_plugin.la -lib/vlc/video_filter/libchain_plugin.la -lib/vlc/video_filter/libclone_plugin.la -lib/vlc/video_filter/libcolorthres_plugin.la -lib/vlc/video_filter/libcrop_plugin.la -lib/vlc/video_filter/libcroppadd_plugin.la -lib/vlc/video_filter/libdeinterlace_plugin.la -lib/vlc/video_filter/libdynamicoverlay_plugin.la -lib/vlc/video_filter/liberase_plugin.la -lib/vlc/video_filter/libextract_plugin.la -lib/vlc/video_filter/libgaussianblur_plugin.la -lib/vlc/video_filter/libgradient_plugin.la -lib/vlc/video_filter/libgrain_plugin.la -lib/vlc/video_filter/libinvert_plugin.la -lib/vlc/video_filter/liblogo_plugin.la -lib/vlc/video_filter/libmagnify_plugin.la -lib/vlc/video_filter/libmarq_plugin.la -lib/vlc/video_filter/libmosaic_plugin.la -lib/vlc/video_filter/libmotionblur_plugin.la -lib/vlc/video_filter/libmotiondetect_plugin.la -lib/vlc/video_filter/libnoise_plugin.la -lib/vlc/video_filter/libpostproc_plugin.la -lib/vlc/video_filter/libpsychedelic_plugin.la -lib/vlc/video_filter/libpuzzle_plugin.la -lib/vlc/video_filter/libremoteosd_plugin.la -lib/vlc/video_filter/libripple_plugin.la -lib/vlc/video_filter/librotate_plugin.la -lib/vlc/video_filter/librss_plugin.la -lib/vlc/video_filter/librv32_plugin.la -lib/vlc/video_filter/libscale_plugin.la -lib/vlc/video_filter/libscene_plugin.la -lib/vlc/video_filter/libsharpen_plugin.la -lib/vlc/video_filter/libswscale_plugin.la -lib/vlc/video_filter/libtransform_plugin.la -lib/vlc/video_filter/libwall_plugin.la -lib/vlc/video_filter/libwave_plugin.la -lib/vlc/video_filter/libyuvp_plugin.la -lib/vlc/video_output/libdrawable_plugin.la -lib/vlc/video_output/libvmem_plugin.la -lib/vlc/video_output/libyuv_plugin.la -lib/vlc/visualization/libvisual_plugin.la -man/man1/vlc-config.1 -man/man1/vlc-wrapper.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/bg/LC_MESSAGES/vlc.mo -share/locale/bn/LC_MESSAGES/vlc.mo -share/locale/ca/LC_MESSAGES/vlc.mo -share/locale/ckb/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/el/LC_MESSAGES/vlc.mo -share/locale/en_GB/LC_MESSAGES/vlc.mo -share/locale/es/LC_MESSAGES/vlc.mo -share/locale/et/LC_MESSAGES/vlc.mo -share/locale/eu/LC_MESSAGES/vlc.mo -share/locale/fa/LC_MESSAGES/vlc.mo -share/locale/fi/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/hr/LC_MESSAGES/vlc.mo -share/locale/hu/LC_MESSAGES/vlc.mo -share/locale/id/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/kk/LC_MESSAGES/vlc.mo -share/locale/km/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/mk/LC_MESSAGES/vlc.mo -share/locale/ml/LC_MESSAGES/vlc.mo -share/locale/mn/LC_MESSAGES/vlc.mo -share/locale/ms/LC_MESSAGES/vlc.mo -share/locale/my/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/ps/LC_MESSAGES/vlc.mo -share/locale/pt_BR/LC_MESSAGES/vlc.mo -share/locale/pt_PT/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/ta/LC_MESSAGES/vlc.mo -share/locale/tet/LC_MESSAGES/vlc.mo -share/locale/th/LC_MESSAGES/vlc.mo -share/locale/tl/LC_MESSAGES/vlc.mo -share/locale/tr/LC_MESSAGES/vlc.mo -share/locale/uk/LC_MESSAGES/vlc.mo -share/locale/vi/LC_MESSAGES/vlc.mo -share/locale/wa/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/flash.html -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/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/utils/audio-vlc-default.sh -share/vlc/utils/gnome-vlc-default.sh -share/vlc/utils/video-vlc-default.sh -share/vlc/vlc.ico -share/vlc/vlc128x128-christmas.png -share/vlc/vlc128x128.png -share/vlc/vlc16x16.png -share/vlc/vlc16x16.xpm -share/vlc/vlc32x32-christmas.xpm -share/vlc/vlc32x32.png -share/vlc/vlc32x32.xpm -share/vlc/vlc48x48-christmas.png -share/vlc/vlc48x48.png -@pkgdir share/vlc/osdmenu/dvd/volume -@pkgdir share/vlc/osdmenu/dvd/unselect -@pkgdir share/vlc/osdmenu/dvd/selection -@pkgdir share/vlc/osdmenu/dvd/selected -@pkgdir share/vlc/http/old/vlm -@pkgdir share/vlc/http/old/admin diff --git a/multimedia/vlc10/distinfo b/multimedia/vlc10/distinfo deleted file mode 100644 index d71d4278fc7..00000000000 --- a/multimedia/vlc10/distinfo +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: distinfo,v 1.3 2013/01/22 11:46:23 wiz Exp $ - -SHA1 (vlc-1.0.6.tar.bz2) = 834346a84a71d915440b7741e04b6e02de451786 -RMD160 (vlc-1.0.6.tar.bz2) = 2185eb418748f2aadfce5e61b7a9de66a62ef2d1 -Size (vlc-1.0.6.tar.bz2) = 22149704 bytes -SHA1 (patch-aa) = 7e3939a647f04661a2eba4fdbb720637dd267334 -SHA1 (patch-ab) = b17a4f0b5c9712d953ae45ff7d8c72ff8f323271 -SHA1 (patch-au) = 7318b1d40246d5540a67c22565ebd439d5fe069d -SHA1 (patch-av) = 2d876c99a4bfe2cd964a78fe19dd108d1cb5f550 -SHA1 (patch-configure) = 2741938a0cae8ebf8f805ebb6e932fbdaf47efb2 -SHA1 (patch-v4l2) = 578622c5233f7f5024ab5a3dca8719e1a258a407 diff --git a/multimedia/vlc10/options.mk b/multimedia/vlc10/options.mk deleted file mode 100644 index 30f30ca3495..00000000000 --- a/multimedia/vlc10/options.mk +++ /dev/null @@ -1,130 +0,0 @@ -# $NetBSD: options.mk,v 1.2 2012/07/13 14:22:58 wiz Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.vlc -PKG_SUPPORTED_OPTIONS= debug faad dbus hal skins sdl pulseaudio x11 gnome -PKG_SUGGESTED_OPTIONS= x11 pulseaudio - -.include "../../mk/bsd.options.mk" - -PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} - -## PulseAudio support - -.if !empty(PKG_OPTIONS:Mpulseaudio) -CONFIGURE_ARGS+= --enable-pulse -.include "../../audio/pulseaudio/buildlink3.mk" -PLIST.pulseaudio= yes -.else -CONFIGURE_ARGS+= --disable-pulse -.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 - -## gnome integration - -.if !empty(PKG_OPTIONS:Mgnome) -CONFIGURE_ARGS+= --enable-gnomevfs -.include "../../sysutils/gnome-vfs/buildlink3.mk" -PLIST.gnome= yes -.else -CONFIGURE_ARGS+= --disable-gnomevfs -.endif - -## DBUS message bus support -## also libnotify because it uses dbus -## so taking them apart would make no sense. - -.if !empty(PKG_OPTIONS:Mdbus) -CONFIGURE_ARGS+= --enable-dbus -.include "../../sysutils/dbus/buildlink3.mk" -CONFIGURE_ARGS+= --enable-notify -.include "../../sysutils/libnotify/buildlink3.mk" - -# telepathy needs dbus, but its also gnome-ish -.if !empty(PKG_OPTIONS:Mgnome) -.include "../../chat/libtelepathy/buildlink3.mk" -CONFIGURE_ARGS+= --enable-telepathy -.else -CONFIGURE_ARGS+= --disable-telepathy -.endif - -PLIST.dbus= yes - -## HAL support (requires dbus) -.if !empty(PKG_OPTIONS:Mhal) -CONFIGURE_ARGS+= --enable-hal -.include "../../sysutils/hal/buildlink3.mk" -PLIST.hal= yes -.else -CONFIGURE_ARGS+= --disable-hal -.endif -.else -CONFIGURE_ARGS+= --disable-dbus -CONFIGURE_ARGS+= --disable-hal -CONFIGURE_ARGS+= --disable-notify -.endif - -## DEBUG build or release build - -.if !empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --enable-debug -CONFIGURE_ARGS+= --disable-optimizations -.else -CONFIGURE_ARGS+= --enable-release -.endif - -## SKINS frontend - -.if !empty(PKG_OPTIONS:Mskins) -CONFIGURE_ARGS+= --enable-skins2 -PLIST.skins= yes -.else -CONFIGURE_ARGS+= --disable-skins2 -.endif - -## X11 dependency and QT4 frontend - -.if !empty(PKG_OPTIONS:Mx11) -DEPENDS+= dejavu-ttf>=2.0:../../fonts/dejavu-ttf -.include "../../graphics/freetype2/buildlink3.mk" -.include "../../x11/libXv/buildlink3.mk" -.include "../../x11/libXvMC/buildlink3.mk" -.include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/libXdamage/buildlink3.mk" -.include "../../x11/libXinerama/buildlink3.mk" -.include "../../x11/libXpm/buildlink3.mk" -.include "../../x11/libxcb/buildlink3.mk" -.include "../../x11/xcb-util036/buildlink3.mk" -.include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/glu/buildlink3.mk" -.include "../../x11/qt4-libs/buildlink3.mk" -CONFIGURE_ARGS+= --enable-qt4 \ - --enable-x11 \ - --enable-glx \ - --enable-snapshot -PLIST.x11= yes -.else -CONFIGURE_ARGS+= --disable-x11 \ - --disable-qt4 \ - --disable-glx \ - --disable-snapshot -.endif - -## FAAD support (faad is non-redistributable) - -.if !empty(PKG_OPTIONS:Mfaad) -CONFIGURE_ARGS+= --enable-faad -PLIST.faad= yes -.include "../../audio/faad2/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-faad -.endif diff --git a/multimedia/vlc10/patches/patch-aa b/multimedia/vlc10/patches/patch-aa deleted file mode 100644 index 6de4d3c0b53..00000000000 --- a/multimedia/vlc10/patches/patch-aa +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2011/01/24 18:45:54 drochner Exp $ - -http://trac.videolan.org/vlc/ticket/3762 - ---- modules/access/file.c.orig 2009-09-18 19:37:45 +0300 -+++ modules/access/file.c 2009-09-26 07:18:35 +0300 -@@ -50,6 +50,9 @@ - #if defined (__linux__) - # include <sys/vfs.h> - # include <linux/magic.h> -+#elif defined (HAVE_FSTATVFS) -+# include <sys/statvfs.h> -+# include <sys/mount.h> - #elif defined (HAVE_SYS_MOUNT_H) - # include <sys/param.h> - # include <sys/mount.h> -@@ -126,7 +129,12 @@ struct access_sys_t - - static bool IsRemote (int fd) - { --#ifdef HAVE_FSTATFS -+#if !defined(__linux__) && defined(HAVE_FSTATVFS) -+ struct statvfs s; -+ if (fstatvfs(fd, &s)) -+ return false; -+ return !(s.f_flag & MNT_LOCAL); -+#elif defined (HAVE_FSTATFS) - struct statfs stf; - - if (fstatfs (fd, &stf)) diff --git a/multimedia/vlc10/patches/patch-ab b/multimedia/vlc10/patches/patch-ab deleted file mode 100644 index 306f2b595e0..00000000000 --- a/multimedia/vlc10/patches/patch-ab +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2011/01/24 18:45:54 drochner Exp $ - -Fixed in git version ffa6a2fa83452afe6a6ec67c4a3e8a5f1a6aaeef. - ---- modules/codec/png.c.orig 2010-03-07 18:38:01.000000000 +0000 -+++ modules/codec/png.c -@@ -155,7 +155,7 @@ static picture_t *DecodeBlock( decoder_t - 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; - } -@@ -163,7 +163,7 @@ static picture_t *DecodeBlock( decoder_t - 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/vlc10/patches/patch-au b/multimedia/vlc10/patches/patch-au deleted file mode 100644 index 267c3f2171b..00000000000 --- a/multimedia/vlc10/patches/patch-au +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-au,v 1.1 2011/02/14 19:05:52 drochner Exp $ - -fix build with libmatroska-1.1 - ---- modules/demux/mkv/mkv.hpp.orig 2011-01-30 14:45:14.000000000 +0000 -+++ modules/demux/mkv/mkv.hpp -@@ -92,7 +92,8 @@ - #include "matroska/KaxSegment.h" - #include "matroska/KaxTag.h" - #include "matroska/KaxTags.h" --#include "matroska/KaxTagMulti.h" -+//missing in libmatroska-1.1 -+//#include "matroska/KaxTagMulti.h" - #include "matroska/KaxTracks.h" - #include "matroska/KaxTrackAudio.h" - #include "matroska/KaxTrackVideo.h" diff --git a/multimedia/vlc10/patches/patch-av b/multimedia/vlc10/patches/patch-av deleted file mode 100644 index 49d7a1ca3dd..00000000000 --- a/multimedia/vlc10/patches/patch-av +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-av,v 1.1 2011/02/14 19:05:52 drochner Exp $ - -fix build with libmatroska-1.1 - ---- modules/demux/mkv/matroska_segment.cpp.orig 2010-09-27 14:38:23.000000000 +0000 -+++ modules/demux/mkv/matroska_segment.cpp -@@ -220,6 +220,7 @@ void matroska_segment_c::LoadTags( KaxTa - } - ep->Up(); - } -+#if 0 //not valid anymore - else if( MKV_IS_ID( el, KaxTagGeneral ) ) - { - msg_Dbg( &sys.demuxer, "| + General" ); -@@ -288,6 +289,7 @@ void matroska_segment_c::LoadTags( KaxTa - { - msg_Dbg( &sys.demuxer, "| + Multi Title" ); - } -+#endif - else - { - msg_Dbg( &sys.demuxer, "| + LoadTag Unknown (%s)", typeid( *el ).name() ); diff --git a/multimedia/vlc10/patches/patch-configure b/multimedia/vlc10/patches/patch-configure deleted file mode 100644 index 3fbec0cd06a..00000000000 --- a/multimedia/vlc10/patches/patch-configure +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-configure,v 1.2 2013/01/22 11:46:24 wiz Exp $ - -First chunk: automake-1.13 compat. -Second chunk: http://trac.videolan.org/vlc/ticket/3762 -Third chunk: http://trac.videolan.org/vlc/ticket/3761 - ---- configure.ac.orig 2010-04-18 13:03:54.000000000 +0000 -+++ configure.ac -@@ -23,7 +23,7 @@ AC_CANONICAL_BUILD - AC_CANONICAL_HOST - - AM_INIT_AUTOMAKE(tar-ustar) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADER(config.h) - - dnl Too many people are not aware of maintainer mode: - dnl If you want to use it, you definitely know what you are doing, so -@@ -575,7 +575,7 @@ AC_CHECK_FUNCS(fdatasync,, - ]) - - dnl Check for non-standard system calls --AC_CHECK_FUNCS([vmsplice eventfd fstatfs]) -+AC_CHECK_FUNCS([vmsplice eventfd fstatvfs fstatfs]) - - AH_BOTTOM([#include <vlc_fixups.h>]) - -@@ -2525,7 +2525,7 @@ then - fi - - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}" -- AC_CHECK_HEADERS(linux/videodev2.h, [ -+ AC_CHECK_HEADERS(linux/videodev2.h sys/videoio.h, [ - VLC_ADD_PLUGIN([v4l2]) - ],[]) - CPPFLAGS="${CPPFLAGS_save}" diff --git a/multimedia/vlc10/patches/patch-v4l2 b/multimedia/vlc10/patches/patch-v4l2 deleted file mode 100644 index b818f4f161a..00000000000 --- a/multimedia/vlc10/patches/patch-v4l2 +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-v4l2,v 1.1.1.1 2011/01/24 18:45:54 drochner Exp $ - -http://trac.videolan.org/vlc/ticket/3761 - ---- modules/access/v4l2.c.orig 2009-05-22 01:06:04.000000000 +0200 -+++ modules/access/v4l2.c -@@ -48,7 +48,13 @@ - #include <sys/ioctl.h> - #include <sys/mman.h> - --#include <linux/videodev2.h> -+#if defined(HAVE_LINUX_VIDEODEV2_H) -+# include <linux/videodev2.h> -+#elif defined(HAVE_SYS_VIDEOIO_H) -+# include <sys/videoio.h> -+#else -+# error "No Video4Linux2 headers found." -+#endif - - #include <poll.h> - |