diff options
| author | wiz <wiz> | 2017-04-17 08:48:00 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2017-04-17 08:48:00 +0000 |
| commit | b35c63c6c80b6e0bc805c07d043b7edf34d55be0 (patch) | |
| tree | 898acc654636028a846e7e8de33a7733acb44197 /multimedia | |
| parent | bf5436931332d4066126a2e589527973c1791ec6 (diff) | |
| download | pkgsrc-b35c63c6c80b6e0bc805c07d043b7edf34d55be0.tar.gz | |
Remove mpeg4ip, unused in pkgsrc, newer version in multimedia/libmp4v2.
Diffstat (limited to 'multimedia')
56 files changed, 3 insertions, 1200 deletions
diff --git a/multimedia/Makefile b/multimedia/Makefile index 08075d946a8..0b6964e54ec 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.257 2017/04/14 13:56:07 leot Exp $ +# $NetBSD: Makefile,v 1.258 2017/04/17 08:48:01 wiz Exp $ # COMMENT= Multimedia utilities @@ -153,7 +153,6 @@ SUBDIR+= mkvtoolnix-old SUBDIR+= mlt SUBDIR+= mp4v2 SUBDIR+= mpeg-lib -SUBDIR+= mpeg4ip SUBDIR+= mpeg_encode SUBDIR+= mpeg_play SUBDIR+= mplayer diff --git a/multimedia/libmp4v2/Makefile b/multimedia/libmp4v2/Makefile index 3386668a54e..c13760cfbd0 100644 --- a/multimedia/libmp4v2/Makefile +++ b/multimedia/libmp4v2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2017/04/17 08:40:56 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2017/04/17 08:48:01 wiz Exp $ DISTNAME= mpeg4ip-1.6.1 PKGNAME= libmp4v2-1.6.1 @@ -12,8 +12,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://mpeg4ip.sourceforge.net/ COMMENT= Library for reading and modifying mp4 files -CONFLICTS+= mpeg4ip<1.5.0.1 mp4v2-[0-9]* - USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile index dc1ab72c618..9acd47bf85d 100644 --- a/multimedia/mp4v2/Makefile +++ b/multimedia/mp4v2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2012/12/03 22:26:09 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2017/04/17 08:48:01 wiz Exp $ DISTNAME= mp4v2-2.0.0 CATEGORIES= multimedia @@ -10,8 +10,6 @@ HOMEPAGE= http://code.google.com/p/mp4v2/ COMMENT= Library for reading and modifying mp4 files LICENSE= mpl-1.1 -CONFLICTS+= mpeg4ip<1.5.0.1 libmp4v2-[0-9]* - USE_LANGUAGES= c c++ USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes diff --git a/multimedia/mpeg4ip/DESCR b/multimedia/mpeg4ip/DESCR deleted file mode 100644 index 0791046b3c2..00000000000 --- a/multimedia/mpeg4ip/DESCR +++ /dev/null @@ -1,8 +0,0 @@ -The MPEG4IP project provides a standards-based system for encoding, -streaming, and playing encoded audio, video and text. To achieve -this we've integrated a number of existing open source packages, -and created some original code to fill in the gaps. - -Please note this project is intended for developers who are interested -in standards based audio and video, and Internet streaming. It is -not intended for end-users. diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile deleted file mode 100644 index a4f72414ce0..00000000000 --- a/multimedia/mpeg4ip/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# $NetBSD: Makefile,v 1.21 2015/04/25 14:23:40 tnn Exp $ - -DISTNAME= mpeg4ip-1.5.0.1 -PKGREVISION= 2 -CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpeg4ip/} - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://mpeg4ip.sourceforge.net/ -COMMENT= Tools for streaming video and audio - -CONFLICTS+= faad2<2.0nb6 - -USE_LANGUAGES= c c++ -USE_PKGLOCALEDIR= yes -USE_LIBTOOL= yes -USE_TOOLS+= pkg-config autoconf -GNU_CONFIGURE= yes -CONFIGURE_SCRIPT= bootstrap -OVERRIDE_DIRDEPTH= 3 # */*/*/libtool - -.include "../../mk/bsd.prefs.mk" - -PLIST_VARS+= mpeg4ipSDL -.if ${OPSYS} != "Darwin" -PLIST.mpeg4ipSDL= yes -.endif - -.if ${MACHINE_ARCH} == "i386" -PKG_OPTIONS_VAR= PKG_OPTIONS.mpeg4ip -PKG_SUPPORTED_OPTIONS= mmx -.include "../../mk/bsd.options.mk" - -. if !empty(PKG_OPTIONS:Mmmx) -CONFIGURE_ARGS+= --enable-mmx -BUILD_DEPENDS+= nasm>=0.97.19:../../devel/nasm -. else -CONFIGURE_ARGS+= --disable-mmx -. endif -.endif - -.include "../../mk/compiler.mk" - -.if !empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang) -CFLAGS+= -fno-strict-aliasing -.endif - -pre-configure: - cd ${WRKSRC} && autoconf - -BUILDLINK_TRANSFORM+= rm:-Werror - -.include "../../devel/SDL/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/multimedia/mpeg4ip/PLIST b/multimedia/mpeg4ip/PLIST deleted file mode 100644 index 050e3ab0c9a..00000000000 --- a/multimedia/mpeg4ip/PLIST +++ /dev/null @@ -1,198 +0,0 @@ -@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:08:08 joerg Exp $ -bin/avi2raw -bin/avidump -bin/h264_parse -bin/lboxcrop -bin/mp4art -bin/mp4creator -bin/mp4dump -bin/mp4extract -bin/mp4info -bin/mp4player -bin/mp4tags -bin/mp4trackdump -bin/mp4videoinfo -bin/mpeg2video_parse -bin/mpeg4ip-config -bin/mpeg4vol -bin/mpeg_ps_extract -bin/mpeg_ps_info -bin/rgb2yuv -bin/sdl_pcm_play -bin/yuvdump -include/codec_plugin.h -include/h264_sdp.h -include/mp4.h -include/mp4av.h -include/mp4av_aac.h -include/mp4av_ac3.h -include/mp4av_adts.h -include/mp4av_amr.h -include/mp4av_audio.h -include/mp4av_h264.h -include/mp4av_hinters.h -include/mp4av_mp3.h -include/mp4av_mpeg3.h -include/mp4av_mpeg4.h -include/mpeg4_audio_config.h -include/mpeg4_sdp.h -include/mpeg4ip.h -include/mpeg4ip_bitstream.h -include/mpeg4ip_byteswap.h -include/mpeg4ip_config.h -include/mpeg4ip_config_set.h -include/mpeg4ip_getopt.h -include/mpeg4ip_version.h -include/rtp_plugin.h -include/sdp.h -include/sdp_error.h -include/text_plugin.h -lib/libh264util.la -lib/libhttp.la -lib/libismacryp.la -lib/libmp4.la -lib/libmp4av.la -lib/libmp4util.la -lib/libmp4v2.la -${PLIST.mpeg4ipSDL}lib/libmpeg4ipSDL.la -lib/libmpeg4ip_celp.la -lib/libmpeg4ip_celpbs.la -lib/libmpeg4ip_faad.la -lib/libmpeg4ip_fposrec.la -lib/libmpeg4ip_gnu.la -lib/libmpeg4ip_mpeg4_iso.la -lib/libmsg_queue.la -lib/libsdp.la -lib/libsrtpif.la -lib/mp4player_plugin/aac_plugin.la -lib/mp4player_plugin/celp_plugin.la -lib/mp4player_plugin/g711_audio_plugin.la -lib/mp4player_plugin/h261_plugin.la -lib/mp4player_plugin/h261_rtp_plugin.la -lib/mp4player_plugin/h264_rtp_plugin.la -lib/mp4player_plugin/href_rtp_plugin.la -lib/mp4player_plugin/href_text_plugin.la -lib/mp4player_plugin/isma_enc_rtp_plugin.la -lib/mp4player_plugin/isma_enc_video_rtp_plugin.la -lib/mp4player_plugin/isma_rtp_plugin.la -lib/mp4player_plugin/latm_rtp_plugin.la -lib/mp4player_plugin/mp3_plugin.la -lib/mp4player_plugin/mpeg4_iso_plugin.la -lib/mp4player_plugin/plaintext_text_plugin.la -lib/mp4player_plugin/raw_audio_plugin.la -lib/mp4player_plugin/raw_video_plugin.la -lib/mp4player_plugin/rfc2429_rtp_plugin.la -lib/mp4player_plugin/rfc3267_plugin.la -lib/mp4player_plugin/wav_plugin.la -man/man1/gmp4player.1 -man/man1/mp4creator.1 -man/man1/mp4encode.1 -man/man1/mp4live.1 -man/man3/MP4.3 -man/man3/MP4AddAudioTrack.3 -man/man3/MP4AddHintTrack.3 -man/man3/MP4AddODTrack.3 -man/man3/MP4AddRtpESConfigurationPacket.3 -man/man3/MP4AddRtpHint.3 -man/man3/MP4AddRtpImmediateData.3 -man/man3/MP4AddRtpPacket.3 -man/man3/MP4AddRtpSampleData.3 -man/man3/MP4AddRtpVideoHint.3 -man/man3/MP4AddSceneTrack.3 -man/man3/MP4AddSystemsTrack.3 -man/man3/MP4AddTrack.3 -man/man3/MP4AddTrackEdit.3 -man/man3/MP4AddVideoTrack.3 -man/man3/MP4AppendHintTrackSdp.3 -man/man3/MP4AppendSessionSdp.3 -man/man3/MP4BinaryToBase16.3 -man/man3/MP4BinaryToBase64.3 -man/man3/MP4CloneTrack.3 -man/man3/MP4Close.3 -man/man3/MP4ConvertFromMovieDuration.3 -man/man3/MP4ConvertFromTrackDuration.3 -man/man3/MP4ConvertFromTrackTimestamp.3 -man/man3/MP4ConvertToTrackDuration.3 -man/man3/MP4ConvertToTrackTimestamp.3 -man/man3/MP4CopySample.3 -man/man3/MP4CopyTrack.3 -man/man3/MP4Create.3 -man/man3/MP4DeleteTrack.3 -man/man3/MP4DeleteTrackEdit.3 -man/man3/MP4Dump.3 -man/man3/MP4FileInfo.3 -man/man3/MP4FindTrackId.3 -man/man3/MP4FindTrackIndex.3 -man/man3/MP4GetAudioProfileLevel.3 -man/man3/MP4GetDuration.3 -man/man3/MP4GetGraphicsProfileLevel.3 -man/man3/MP4GetHintTrackReferenceTrackId.3 -man/man3/MP4GetHintTrackRtpPayload.3 -man/man3/MP4GetHintTrackSdp.3 -man/man3/MP4GetNumberOfTracks.3 -man/man3/MP4GetODProfileLevel.3 -man/man3/MP4GetRtpHintNumberOfPackets.3 -man/man3/MP4GetRtpPacketBFrame.3 -man/man3/MP4GetRtpPacketTransmitOffset.3 -man/man3/MP4GetRtpTimestampStart.3 -man/man3/MP4GetSampleDuration.3 -man/man3/MP4GetSampleIdFromEditTime.3 -man/man3/MP4GetSampleIdFromTime.3 -man/man3/MP4GetSampleRenderingOffset.3 -man/man3/MP4GetSampleSize.3 -man/man3/MP4GetSampleSync.3 -man/man3/MP4GetSampleTime.3 -man/man3/MP4GetSceneProfileLevel.3 -man/man3/MP4GetSessionSdp.3 -man/man3/MP4GetTimeScale.3 -man/man3/MP4GetTrackAudioMpeg4Type.3 -man/man3/MP4GetTrackAudioType.3 -man/man3/MP4GetTrackBitRate.3 -man/man3/MP4GetTrackDuration.3 -man/man3/MP4GetTrackESConfiguration.3 -man/man3/MP4GetTrackEditDuration.3 -man/man3/MP4GetTrackEditDwell.3 -man/man3/MP4GetTrackEditMediaStart.3 -man/man3/MP4GetTrackEditStart.3 -man/man3/MP4GetTrackEditTotalDuration.3 -man/man3/MP4GetTrackFixedSampleDuration.3 -man/man3/MP4GetTrackMaxSampleSize.3 -man/man3/MP4GetTrackNumberOfEdits.3 -man/man3/MP4GetTrackNumberOfSamples.3 -man/man3/MP4GetTrackTimeScale.3 -man/man3/MP4GetTrackType.3 -man/man3/MP4GetTrackVideoFrameRate.3 -man/man3/MP4GetTrackVideoHeight.3 -man/man3/MP4GetTrackVideoType.3 -man/man3/MP4GetTrackVideoWidth.3 -man/man3/MP4GetVerbosity.3 -man/man3/MP4GetVideoProfileLevel.3 -man/man3/MP4Info.3 -man/man3/MP4MakeIsmaCompliant.3 -man/man3/MP4Modify.3 -man/man3/MP4Optimize.3 -man/man3/MP4Read.3 -man/man3/MP4ReadRtpHint.3 -man/man3/MP4ReadRtpPacket.3 -man/man3/MP4ReadSample.3 -man/man3/MP4ReadSampleFromEditTime.3 -man/man3/MP4ReadSampleFromTime.3 -man/man3/MP4SetAudioProfileLevel.3 -man/man3/MP4SetGraphicsProfileLevel.3 -man/man3/MP4SetHintTrackRtpPayload.3 -man/man3/MP4SetHintTrackSdp.3 -man/man3/MP4SetODProfileLevel.3 -man/man3/MP4SetRtpTimestampStart.3 -man/man3/MP4SetSampleRenderingOffset.3 -man/man3/MP4SetSceneProfileLevel.3 -man/man3/MP4SetSessionSdp.3 -man/man3/MP4SetTimeScale.3 -man/man3/MP4SetTrackESConfiguration.3 -man/man3/MP4SetTrackEditDuration.3 -man/man3/MP4SetTrackEditDwell.3 -man/man3/MP4SetTrackEditMediaStart.3 -man/man3/MP4SetTrackTimeScale.3 -man/man3/MP4SetVerbosity.3 -man/man3/MP4SetVideoProfileLevel.3 -man/man3/MP4WriteRtpHint.3 -man/man3/MP4WriteSample.3 diff --git a/multimedia/mpeg4ip/buildlink3.mk b/multimedia/mpeg4ip/buildlink3.mk deleted file mode 100644 index 2bd454e91c2..00000000000 --- a/multimedia/mpeg4ip/buildlink3.mk +++ /dev/null @@ -1,12 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:05 joerg Exp $ - -BUILDLINK_TREE+= mpeg4ip - -.if !defined(MPEG4IP_BUILDLINK3_MK) -MPEG4IP_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.mpeg4ip+= mpeg4ip>=1.4.1 -BUILDLINK_PKGSRCDIR.mpeg4ip?= ../../multimedia/mpeg4ip -.endif # MPEG4IP_BUILDLINK3_MK - -BUILDLINK_TREE+= -mpeg4ip diff --git a/multimedia/mpeg4ip/distinfo b/multimedia/mpeg4ip/distinfo deleted file mode 100644 index 4d883881ccf..00000000000 --- a/multimedia/mpeg4ip/distinfo +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: distinfo,v 1.19 2015/11/03 23:54:30 agc Exp $ - -SHA1 (mpeg4ip-1.5.0.1.tar.gz) = 1271de695ed65284d9c39aa91bf26c5494603fd3 -RMD160 (mpeg4ip-1.5.0.1.tar.gz) = fee5c21c17a470e6de349e07d233a1eb46b2064a -SHA512 (mpeg4ip-1.5.0.1.tar.gz) = a76823b80ae420e1903178a1e923783a13935554de83f4a6064897c4903eb8994e5b76862b1001ccfa9ba05e79879aa449d991dd11516e10f2b6c6fb4acb47ac -Size (mpeg4ip-1.5.0.1.tar.gz) = 4826180 bytes -SHA1 (patch-aa) = 5f494117fae307f4adc503fd880a762d82d771ff -SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9 -SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56 -SHA1 (patch-ae) = 779bf42b9df29a7deddca6db9b1b691e498fffe1 -SHA1 (patch-af) = a69e136fbe8db5ae844c90ae5e2f06e86bf2ed85 -SHA1 (patch-ag) = 76ec743b051ef39e4edb211a15a2accbf491d0b1 -SHA1 (patch-ah) = b5db1d879cf790c2b9c7e9132b14e1fc59e9cb4d -SHA1 (patch-ai) = 8815f81cc09bb36944bf33691aaf9060b545c76e -SHA1 (patch-aj) = f0aeab4c17bb8a737a9ae3d4385c9f2989540ea7 -SHA1 (patch-ak) = 8a89f6eb4860b12479a062303c15a4f09416c964 -SHA1 (patch-al) = 5966b9c64a7d305b3e3b70717036ccebb5c3bdcd -SHA1 (patch-am) = a0c9eb088b02d460925fb00e3f76b3fce186b187 -SHA1 (patch-common_video_iso-mpeg4_include_bitstrm_hpp) = 0706ccacbeefd9e416ad19e19a5db761166c3c18 -SHA1 (patch-common_video_iso-mpeg4_include_entropy_hpp) = b3fe3821186102a27ba70a6f7b2461909ecf7fb0 -SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__errenc_cpp) = cdc0eeeef9faf97aa8a9e29ed107b40dcf179efd -SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__gmc__enc__util_cpp) = 4452af67a3ac0352dcc78388b5f8cec7e17f1bbd -SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__mbenc_cpp) = c59fe6335a9e04539cedb1ef69844983065af39e -SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__mbinterlace_cpp) = 5fa1be1847fa776db1de70612757f362c6d7a4fd -SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__mcenc_cpp) = 5210bbf90a9a1b07b29e96a7f5e93d83b6a3b121 -SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__motest_cpp) = 62fd59b3e40524ba4ad90f0d1538d4a3c7df4421 -SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__mvenc_cpp) = 1702cf094a8eeab45a1ceeb397bd86dd9c52ad8f -SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__padenc_cpp) = d47e8385c531dbe213929f70a5ffd1cf22d7f026 -SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__sptenc_cpp) = c4041cd35081a8419c0b81bf108b6cff93397d0b -SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__tm5rc_cpp) = ce53fee8cb41f9bad6e1bccf514107a14336a585 -SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__vopmbenc_cpp) = 2d7ba52bbe723ab30d8d243ed65727b77b757126 -SHA1 (patch-common_video_iso-mpeg4_src_sys__error_cpp) = e418ad95f222478e08d4e14a922a45063bac55c8 -SHA1 (patch-common_video_iso-mpeg4_src_sys__mode_cpp) = 9e51f0cb3c81fa1dbdc3fa5e4a7802eb8e1ae256 -SHA1 (patch-common_video_iso-mpeg4_src_sys__rrv_cpp) = 3a4a6b4b7caa63ecde5030376a86db28e04e1701 -SHA1 (patch-common_video_iso-mpeg4_src_sys__tps__enhcbuf_cpp) = 3a400efaf50055cf8544a94d7b4fa05cb2d7ff58 -SHA1 (patch-common_video_iso-mpeg4_src_tools__entropy__bitstrm_cpp) = 27ccb1d800b35c6f641a794389e9a9c8f22500f1 -SHA1 (patch-common_video_iso-mpeg4_src_tools__entropy__huffman_cpp) = 2842a4c5c29be1d809c295d2484100706aeb1d9c -SHA1 (patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp) = c1345fadb405a203542bb72df4bd0b47ecdb6ddd -SHA1 (patch-common_video_iso-mpeg4_src_type__yuvac_cpp) = 5ff0d2a25b42832bd11a42043b264e36dff8f5ac -SHA1 (patch-common_video_iso-mpeg4_src_type__yuvai_cpp) = ee62e50f089d9a198ac40045960b1e8c195641d9 -SHA1 (patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp) = 8e9b3ce134ebad001d942152d2e4b88a88bb4144 -SHA1 (patch-configure.in) = 8fefa29c71a90ea4fb93ef782065b12644157e1d -SHA1 (patch-lib_mp4_ctts.c) = b07e3a2355a7b78bddd098cb92925d2267cf4c24 -SHA1 (patch-lib_mp4_hinthnti.c) = ce2a233dd4b99e15833dda952bcc071ba9069c77 -SHA1 (patch-lib_mp4_hintudta.c) = c1c18ad696c121051dce322f28b3e171b3e7157d -SHA1 (patch-lib_mp4_hnti.c) = 93f42f9255638a495dce1a383e7ad0b04df1a7d1 -SHA1 (patch-lib_mp4_moov.c) = 9cb7192f99276605f76eeb07c88a5148852ea949 -SHA1 (patch-lib_mp4_rtp.c) = 0b25827b1d6fb22ad8d0b04958270573cd434b22 -SHA1 (patch-lib_mp4_sdp.c) = bed041c627bb41ddafbc6e585b64bd50da1ec4ef -SHA1 (patch-lib_mp4_stbl.c) = 21570e63dcd2880ad58d2ee6703e20bf37fae346 -SHA1 (patch-lib_mp4_trak.c) = d968bc6b7897c8ac40098928916caca74dd4104a -SHA1 (patch-lib_mp4_tref.c) = 7e5903849477c53d7eee441374c40c1fed0325da -SHA1 (patch-lib_mp4_udta.c) = 52c628b368594a607c2ef201f42f3b968d6a5976 -SHA1 (patch-player_lib_audio_faad_all.h) = 8a5f4840b86c6ac90d65664476c94622ffa87b21 diff --git a/multimedia/mpeg4ip/patches/patch-aa b/multimedia/mpeg4ip/patches/patch-aa deleted file mode 100644 index 5dbcd735218..00000000000 --- a/multimedia/mpeg4ip/patches/patch-aa +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2009/08/11 13:11:23 drochner Exp $ - ---- bootstrap.orig 2005-08-12 19:17:17.000000000 +0200 -+++ bootstrap -@@ -34,7 +34,7 @@ if (test ! -f "$MPEG4IP_SRC/configure") - exit 1 - fi - --target_system=`uname -s` -+target_system=Linux - if sdl-config --version >/dev/null 2>/dev/null - then - echo "SDL appears to be installed" -@@ -48,7 +48,8 @@ allargs="$@" - # - # Test for faac and possible error - # --if test $target_system = "Linux"; then -+#if test $target_system = "Linux"; then -+if false; then - have_faac=no - if which faac >/dev/null 2>/dev/null; then - have_faac=yes -@@ -56,7 +57,7 @@ if test $target_system = "Linux"; then - - if test $have_faac = "yes"; then - # we have lame and faac - see if faac is built with mp4 support -- faac --help >&faac_help -+ faac --help >faac_help 2>&1 - sdf=`grep "MP4 support unavailable" faac_help` - rm -f faac_help - if test -z "$sdf"; then diff --git a/multimedia/mpeg4ip/patches/patch-ac b/multimedia/mpeg4ip/patches/patch-ac deleted file mode 100644 index c1aa52c3ee1..00000000000 --- a/multimedia/mpeg4ip/patches/patch-ac +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2006/04/28 10:02:41 joerg Exp $ - ---- include/mpeg4ip_byteswap.h.orig 2006-04-28 09:17:18.000000000 +0000 -+++ include/mpeg4ip_byteswap.h -@@ -50,6 +50,12 @@ - #define B2N_32(x) x = swap32(x) - #define B2N_64(x) x = swap64(x) - -+#elif defined(__DragonFly__) -+#include <sys/endian.h> -+#define B2N_16(x) x = be16toh(x) -+#define B2N_32(x) x = be32toh(x) -+#define B2N_64(x) x = be64toh(x) -+ - /* This is a slow but portable implementation, it has multiple evaluation - * problems so beware. - * FreeBSD and Solaris don't have <byteswap.h> or any other such diff --git a/multimedia/mpeg4ip/patches/patch-ad b/multimedia/mpeg4ip/patches/patch-ad deleted file mode 100644 index 444fb83e9a4..00000000000 --- a/multimedia/mpeg4ip/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2006/04/28 10:02:41 joerg Exp $ - ---- lib/SDLAudio/configure.orig 2006-04-28 09:21:28.000000000 +0000 -+++ lib/SDLAudio/configure -@@ -23435,7 +23435,7 @@ fi; - # causes Carbon.p complaints? - # pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" - ;; -- *-*-freebsd*) -+ *-*-freebsd* | *-*-dragonfly*) - pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" - pthread_lib="-pthread" - ;; -@@ -24553,7 +24553,7 @@ case "$target" in - # Set up files for the thread library - # Set up files for the timer library - ;; -- *-*-freebsd*) -+ *-*-freebsd* | *-*-dragonfly*) - ARCH=freebsd - - CheckDiskAudio diff --git a/multimedia/mpeg4ip/patches/patch-ae b/multimedia/mpeg4ip/patches/patch-ae deleted file mode 100644 index 73cdff6ac8d..00000000000 --- a/multimedia/mpeg4ip/patches/patch-ae +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2012/04/18 00:09:44 joerg Exp $ - ---- include/mpeg4ip.h.orig 2005-03-11 23:13:29.000000000 +0000 -+++ include/mpeg4ip.h -@@ -156,6 +156,9 @@ char *strcasestr(const char *haystack, c - #ifdef HAVE_FPOS_T___POS - #define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)((fpos).__pos) - #define VAR_TO_FPOS(fpos, var) (fpos).__pos = (var) -+#elif defined(HAVE_FPOS_T__POS) -+#define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)((fpos)._pos) -+#define VAR_TO_FPOS(fpos, var) (fpos)._pos = (var) - #else - #define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)(fpos) - #define VAR_TO_FPOS(fpos, var) (fpos) = (var) -@@ -233,7 +236,8 @@ char *strsep(char **strp, const char *de - - #define ADV_SPACE(a) {while (isspace(*(a)) && (*(a) != '\0'))(a)++;} - --#ifndef HAVE_GTK -+#ifndef __G_LIB_H__ -+/* #ifndef HAVE_GTK */ - typedef char gchar; - typedef unsigned char guchar; - diff --git a/multimedia/mpeg4ip/patches/patch-af b/multimedia/mpeg4ip/patches/patch-af deleted file mode 100644 index 68ebdfe3ebb..00000000000 --- a/multimedia/mpeg4ip/patches/patch-af +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-af,v 1.1 2006/06/16 07:19:39 rillig Exp $ - -gcc4 does not like "static" external function declarations. - ---- lib/SDLAudio/src/audio/sun/SDL_sunaudio.c.orig 2004-02-24 21:36:07.000000000 +0100 -+++ lib/SDLAudio/src/audio/sun/SDL_sunaudio.c 2006-06-16 09:16:42.000000000 +0200 -@@ -163,9 +163,11 @@ void DSP_WaitAudio(_THIS) - #endif - } - -+static Uint8 snd2au(int sample); -+ - void DSP_PlayAudio(_THIS) - { -- static Uint8 snd2au(int sample); -+ - /* Write the audio data */ - if ( ulaw_only ) { - /* Assuming that this->spec.freq >= 8000 Hz */ diff --git a/multimedia/mpeg4ip/patches/patch-ag b/multimedia/mpeg4ip/patches/patch-ag deleted file mode 100644 index 3c990c9f98a..00000000000 --- a/multimedia/mpeg4ip/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2006/07/22 19:27:42 xtraeme Exp $ - ---- common/video/iso-mpeg4/src/Makefile.in.orig 2006-07-22 21:14:45.000000000 +0200 -+++ common/video/iso-mpeg4/src/Makefile.in 2006-07-22 21:14:54.000000000 +0200 -@@ -255,7 +255,7 @@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ --AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@ -+AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@ - INCLUDES = -I$(srcdir)/../include - lib_LTLIBRARIES = libmpeg4ip_mpeg4_iso.la - mp4vdec_SOURCES = \ diff --git a/multimedia/mpeg4ip/patches/patch-ah b/multimedia/mpeg4ip/patches/patch-ah deleted file mode 100644 index 736cad0a9be..00000000000 --- a/multimedia/mpeg4ip/patches/patch-ah +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2006/10/25 23:18:19 dmcmahill Exp $ - -The MAX macro is not defined on all systems (e.g. solaris) - ---- lib/rtp/rtp.c.orig 2006-03-20 18:08:24.000000000 -0500 -+++ lib/rtp/rtp.c -@@ -61,6 +61,10 @@ - - #include "rtp.h" - -+#ifndef MAX -+#define MAX(a,b) ((a) > (b) ? (a) : (b)) -+#endif -+ - typedef struct { - uint32_t key; /* Original allocation number */ - uint32_t size; /* Size of allocation requested */ diff --git a/multimedia/mpeg4ip/patches/patch-ai b/multimedia/mpeg4ip/patches/patch-ai deleted file mode 100644 index 811e2db7e29..00000000000 --- a/multimedia/mpeg4ip/patches/patch-ai +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2007/01/05 19:35:46 rillig Exp $ - -Tags: for-upstream - ---- doc/mp4v2/Makefile.am.orig 2003-02-06 20:15:04.000000000 +0100 -+++ doc/mp4v2/Makefile.am 2007-01-05 18:20:54.000000000 +0100 -@@ -1,5 +1,4 @@ --this_FILES = \ -- api.mpt \ -+man_MANS = \ - MP4.3 \ - MP4AddAudioTrack.3 \ - MP4AddHintTrack.3 \ -@@ -109,7 +108,6 @@ this_FILES = \ - MP4WriteRtpHint.3 \ - MP4WriteSample.3 - -- --man_MANS = $(this_FILES) -- --EXTRA_DIST = $(this_FILES) -+EXTRA_DIST = \ -+ api.mpt \ -+ $(this_FILES) diff --git a/multimedia/mpeg4ip/patches/patch-aj b/multimedia/mpeg4ip/patches/patch-aj deleted file mode 100644 index 96262d41868..00000000000 --- a/multimedia/mpeg4ip/patches/patch-aj +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2007/01/05 19:35:46 rillig Exp $ - -Tags: not-for-upstream - ---- doc/mp4v2/Makefile.in.orig 2007-01-05 18:21:23.000000000 +0100 -+++ doc/mp4v2/Makefile.in 2007-01-05 18:21:29.000000000 +0100 -@@ -231,7 +231,6 @@ target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ - this_FILES = \ -- api.mpt \ - MP4.3 \ - MP4AddAudioTrack.3 \ - MP4AddHintTrack.3 \ diff --git a/multimedia/mpeg4ip/patches/patch-ak b/multimedia/mpeg4ip/patches/patch-ak deleted file mode 100644 index f5f9bdfed99..00000000000 --- a/multimedia/mpeg4ip/patches/patch-ak +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2008/11/21 21:09:57 chuck Exp $ - ---- player/lib/audio/portaudio/pa_host.h.orig 2004-04-01 18:54:23.000000000 -0500 -+++ player/lib/audio/portaudio/pa_host.h 2008-11-21 15:46:31.000000000 -0500 -@@ -48,18 +48,7 @@ - #define SUPPORT_AUDIO_CAPTURE (1)
- #endif
-
--#ifndef int32
-- typedef long int32;
--#endif
--#ifndef uint32
-- typedef unsigned long uint32;
--#endif
--#ifndef int16
-- typedef short int16;
--#endif
--#ifndef uint16
-- typedef unsigned short uint16;
--#endif
-+#include <inttypes.h>
-
- /* Used to convert between various sample formats. */
- typedef void (PortAudioConverter)(
-@@ -75,11 +64,11 @@ -
- typedef struct internalPortAudioStream
- {
-- uint32 past_Magic; /* ID for struct to catch bugs. */
-+ uint32_t past_Magic; /* ID for struct to catch bugs. */
-
- /* Begin user specified information. */
-- uint32 past_FramesPerUserBuffer;
-- uint32 past_NumUserBuffers;
-+ uint32_t past_FramesPerUserBuffer;
-+ uint32_t past_NumUserBuffers;
- double past_SampleRate; /* Closest supported sample rate. */
- int past_NumInputChannels;
- int past_NumOutputChannels;
-@@ -89,7 +78,7 @@ - PaSampleFormat past_OutputSampleFormat;
- PortAudioCallback *past_Callback;
- void *past_UserData;
-- uint32 past_Flags;
-+ uint32_t past_Flags;
- /* End user specified information. */
-
- void *past_DeviceData;
-@@ -102,11 +91,11 @@ - volatile int past_StopNow; /* Background should stop playing now. */
- /* These buffers are used when the native format does not match the user format. */
- void *past_InputBuffer;
-- uint32 past_InputBufferSize; /* Size in bytes of the input buffer. */
-+ uint32_t past_InputBufferSize; /* Size in bytes of the input buffer. */
- void *past_OutputBuffer;
-- uint32 past_OutputBufferSize;
-+ uint32_t past_OutputBufferSize;
- /* Measurements */
-- uint32 past_NumCallbacks;
-+ uint32_t past_NumCallbacks;
- PaTimestamp past_FrameCount; /* Frames output to buffer. */
- /* For measuring CPU utilization. */
- double past_AverageInsideCount;
diff --git a/multimedia/mpeg4ip/patches/patch-al b/multimedia/mpeg4ip/patches/patch-al deleted file mode 100644 index 89c9c82cc33..00000000000 --- a/multimedia/mpeg4ip/patches/patch-al +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-al,v 1.1 2010/01/01 18:23:48 joerg Exp $ - ---- player/src/Makefile.in.orig 2010-01-01 18:08:12.000000000 +0000 -+++ player/src/Makefile.in -@@ -540,6 +540,7 @@ mp4player_LDADD = \ - $(top_builddir)/lib/audio/libaudio.la \ - $(top_builddir)/lib/ismacryp/libismacryp.la \ - $(top_builddir)/lib/srtp/libsrtpif.la \ -+ $(top_builddir)/lib/sdp/libsdp.la \ - @SDL_LIBS@ @SRTPLIB@ - - gmp4player_LDFLAGS = $(SDL_AUDIO_FLAGS) diff --git a/multimedia/mpeg4ip/patches/patch-am b/multimedia/mpeg4ip/patches/patch-am deleted file mode 100644 index 58d3692746c..00000000000 --- a/multimedia/mpeg4ip/patches/patch-am +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-am,v 1.1 2010/12/13 21:32:14 chuck Exp $ - ---- common/video/iso-mpeg4/src/type_basic.cpp.orig 2010-12-13 15:34:35.000000000 -0500 -+++ common/video/iso-mpeg4/src/type_basic.cpp 2010-12-13 15:34:47.000000000 -0500 -@@ -317,13 +317,13 @@ - iHalfY = m_vctTrueHalfPel.y - iMVY * 2; - } - --Void CMotionVector::setToZero (Void) -+Void CMotionVector::setToZero () - { - memset (this, 0, sizeof (*this)); - } - - // RRV insertion --Void CMotionVector::scaleup (Void) -+Void CMotionVector::scaleup () - { - if(m_vctTrueHalfPel.x == 0){ - m_vctTrueHalfPel_x2.x = 0; diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_include_bitstrm_hpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_include_bitstrm_hpp deleted file mode 100644 index 1cbb0dbeb9c..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_include_bitstrm_hpp +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_include_bitstrm_hpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/include/bitstrm.hpp~ 2005-09-08 22:02:55.000000000 +0000 -+++ common/video/iso-mpeg4/include/bitstrm.hpp -@@ -45,8 +45,9 @@ Revision History: - #ifndef _BITSTREAM_HPP_ - #define _BITSTREAM_HPP_ - #include "inbits.h" --#include <istream.h> --#include <ostream.h> -+#include <istream> -+#include <ostream> -+using namespace std; - - class CIOBitStream - { diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_include_entropy_hpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_include_entropy_hpp deleted file mode 100644 index 10d3a2f8726..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_include_entropy_hpp +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_include_entropy_hpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/include/entropy.hpp~ 2005-06-17 20:07:56.000000000 +0000 -+++ common/video/iso-mpeg4/include/entropy.hpp -@@ -39,8 +39,9 @@ Revision History: - #ifndef __ENTROPY_HPP_ - #define __ENTROPY_HPP_ - --#include <istream.h> --#include <ostream.h> -+#include <istream> -+#include <ostream> -+using namespace std; - - class CInBitStream; - class COutBitStream; diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__errenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__errenc_cpp deleted file mode 100644 index 6255fcddcd6..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__errenc_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__errenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_encoder_errenc.cpp~ 2005-05-04 19:55:59.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_encoder_errenc.cpp -@@ -54,7 +54,7 @@ Revision History: - #include <stdio.h> - #include <math.h> - #include <stdlib.h> --#include <iostream.h> -+#include <iostream> - - #include "typeapi.h" - #include "codehead.h" diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__gmc__enc__util_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__gmc__enc__util_cpp deleted file mode 100644 index 4add6e1d0da..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__gmc__enc__util_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__gmc__enc__util_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp~ 2005-05-04 19:55:59.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp -@@ -46,7 +46,7 @@ Abstract: - #include <stdio.h> - #include <math.h> - #include <stdlib.h> --#include <iostream.h> -+#include <iostream> - #include <assert.h> - - #include "typeapi.h" diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mbenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mbenc_cpp deleted file mode 100644 index 08c3a14d5a4..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mbenc_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__mbenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_encoder_mbenc.cpp~ 2005-05-04 19:55:59.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_encoder_mbenc.cpp -@@ -75,7 +75,7 @@ - - #include <stdlib.h> - #include <math.h> --#include <iostream.h> -+#include <iostream> - #include "typeapi.h" - #include "codehead.h" - #include "mode.hpp" diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mbinterlace_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mbinterlace_cpp deleted file mode 100644 index ebbe8eb6bd4..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mbinterlace_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__mbinterlace_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_encoder_mbinterlace.cpp~ 2005-05-04 19:55:59.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_encoder_mbinterlace.cpp -@@ -60,7 +60,7 @@ - #include <stdio.h> - #include <math.h> - #include <stdlib.h> --#include <iostream.h> -+#include <iostream> - - #include "typeapi.h" - #include "codehead.h" diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mcenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mcenc_cpp deleted file mode 100644 index 56f131a7de9..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mcenc_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__mcenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_encoder_mcenc.cpp~ 2005-05-04 19:55:59.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_encoder_mcenc.cpp -@@ -53,7 +53,7 @@ Revision History: - #include <stdio.h> - #include <math.h> - #include <stdlib.h> --#include <iostream.h> -+#include <iostream> - - #include "typeapi.h" - #include "codehead.h" diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__motest_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__motest_cpp deleted file mode 100644 index c8d6ada1cca..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__motest_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__motest_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_encoder_motest.cpp~ 2005-05-04 19:55:59.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_encoder_motest.cpp -@@ -67,7 +67,7 @@ Revision History: - #include <stdio.h> - #include <math.h> - #include <stdlib.h> --#include <iostream.h> -+#include <iostream> - - #include "typeapi.h" - #include "codehead.h" diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mvenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mvenc_cpp deleted file mode 100644 index aaa0b362134..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mvenc_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__mvenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_encoder_mvenc.cpp~ 2005-05-04 19:55:59.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_encoder_mvenc.cpp -@@ -44,7 +44,7 @@ Revision History: - - **************************************************************************/ - #include <stdio.h> --#include <fstream.h> -+#include <fstream> - #include <math.h> - #include <stdlib.h> - diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__padenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__padenc_cpp deleted file mode 100644 index 1bfd8417bb4..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__padenc_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__padenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_encoder_padenc.cpp~ 2005-05-04 19:55:59.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_encoder_padenc.cpp -@@ -43,7 +43,7 @@ Revision History: - #include <stdio.h> - #include <math.h> - #include <stdlib.h> --#include <iostream.h> -+#include <iostream> - - #include "typeapi.h" - #include "codehead.h" diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__sptenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__sptenc_cpp deleted file mode 100644 index 1772a50f2f3..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__sptenc_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__sptenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_encoder_sptenc.cpp~ 2005-05-04 19:55:59.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_encoder_sptenc.cpp -@@ -40,7 +40,7 @@ Revision History: - *************************************************************************/ - - #include <stdio.h> --#include <iostream.h> -+#include <iostream> - #include <math.h> - #include <stdlib.h> - diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__tm5rc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__tm5rc_cpp deleted file mode 100644 index 25bfa2395c3..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__tm5rc_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__tm5rc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_encoder_tm5rc.cpp~ 2005-05-04 19:55:59.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_encoder_tm5rc.cpp -@@ -52,7 +52,7 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <iostream.h> -+#include <iostream> - #include <math.h> - #include "header.h" - #include "typeapi.h" diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__vopmbenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__vopmbenc_cpp deleted file mode 100644 index a753325ab81..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__vopmbenc_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__encoder__vopmbenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_encoder_vopmbenc.cpp~ 2005-05-04 19:55:59.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_encoder_vopmbenc.cpp -@@ -73,7 +73,7 @@ Revision History: - #include <stdio.h> - #include <math.h> - #include <stdlib.h> --#include <iostream.h> -+#include <iostream> - - #include "typeapi.h" - #include "codehead.h" diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__error_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__error_cpp deleted file mode 100644 index cf186cb4e3f..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__error_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__error_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_error.cpp~ 2005-05-04 19:55:59.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_error.cpp -@@ -35,7 +35,7 @@ This software module was originally deve - #include <stdio.h> - #include <math.h> - #include <stdlib.h> --#include <iostream.h> -+#include <iostream> - - #include "typeapi.h" - #include "codehead.h" diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__mode_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__mode_cpp deleted file mode 100644 index 95416dba018..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__mode_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__mode_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_mode.cpp~ 2005-05-04 19:56:00.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_mode.cpp -@@ -50,7 +50,7 @@ Revision History: - - - #include <string.h> --#include <iostream.h> -+#include <iostream> - #include <math.h> - #include "typeapi.h" - #include "mode.hpp" diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__rrv_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__rrv_cpp deleted file mode 100644 index 26cf6f58e53..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__rrv_cpp +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__rrv_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_rrv.cpp~ 2005-06-17 20:07:56.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_rrv.cpp -@@ -53,7 +53,6 @@ Revision History: - #include "global.hpp" - #include "mode.hpp" - #include "bitstrm.hpp" --class ofstream; - #include "sesenc.hpp" - #include "vopses.hpp" - #include "vopseenc.hpp" diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__tps__enhcbuf_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__tps__enhcbuf_cpp deleted file mode 100644 index 2f3ec42fb40..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__tps__enhcbuf_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_sys__tps__enhcbuf_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/sys_tps_enhcbuf.cpp~ 2005-05-04 19:56:00.000000000 +0000 -+++ common/video/iso-mpeg4/src/sys_tps_enhcbuf.cpp -@@ -36,7 +36,7 @@ Revision History: - *************************************************************************/ - - #include <stdio.h> --#include <fstream.h> -+#include <fstream> - #include <stdlib.h> - - #include "typeapi.h" diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__entropy__bitstrm_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__entropy__bitstrm_cpp deleted file mode 100644 index 156f8418dee..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__entropy__bitstrm_cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_tools__entropy__bitstrm_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/tools_entropy_bitstrm.cpp~ 2005-09-08 22:02:55.000000000 +0000 -+++ common/video/iso-mpeg4/src/tools_entropy_bitstrm.cpp -@@ -42,8 +42,8 @@ Revision History: - - *************************************************************************/ - --#include <fstream.h> --#include <iostream.h> -+#include <fstream> -+#include <iostream> - #include <stdio.h> - #include <stdlib.h> - #include "typeapi.h" diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__entropy__huffman_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__entropy__huffman_cpp deleted file mode 100644 index 0e54aa45ce9..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__entropy__huffman_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_tools__entropy__huffman_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/tools_entropy_huffman.cpp~ 2005-06-17 20:07:56.000000000 +0000 -+++ common/video/iso-mpeg4/src/tools_entropy_huffman.cpp -@@ -55,7 +55,7 @@ Revision History: - #include "bitstrm.hpp" - - #include "vlc.hpp" --#include <iostream.h> -+#include <iostream> - #ifdef __MFC_ - #ifdef _DEBUG - #undef THIS_FILE diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp deleted file mode 100644 index 939897f0596..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/tools_sadct_sadct.cpp~ 2005-05-04 19:56:00.000000000 +0000 -+++ common/video/iso-mpeg4/src/tools_sadct_sadct.cpp -@@ -37,7 +37,7 @@ Revision History: - #include "dct.hpp" - #include <math.h> - #if defined(__DEBUG_SADCT_) && !defined(NDEBUG) --#include <iostream.h> -+#include <iostream> - #endif - #ifdef __MFC_ - #ifdef _DEBUG diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_type__yuvac_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_type__yuvac_cpp deleted file mode 100644 index c6004733165..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_type__yuvac_cpp +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_type__yuvac_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/type_yuvac.cpp~ 2005-05-04 19:56:00.000000000 +0000 -+++ common/video/iso-mpeg4/src/type_yuvac.cpp -@@ -39,7 +39,7 @@ Revision History: - - *************************************************************************/ - --#include <iostream.h> -+#include <iostream> - #include "typeapi.h" - - #ifdef __MFC_ -@@ -540,7 +540,7 @@ const CU8Image* CVOPU8YUVBA::getPlaneA ( - const CU8Image* CVOPU8YUVBA::getPlane (PlaneType plnType) const - { - if (plnType==A_PLANE) { -- cerr << "For A-Planes please use CVOPIntYUVBA::getPlaneA()!\n"; -+ std::cerr << "For A-Planes please use CVOPIntYUVBA::getPlaneA()!\n"; - assert( plnType!=A_PLANE ); - } - diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_type__yuvai_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_type__yuvai_cpp deleted file mode 100644 index 11f242e438a..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_type__yuvai_cpp +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_type__yuvai_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/type_yuvai.cpp~ 2005-05-04 19:56:00.000000000 +0000 -+++ common/video/iso-mpeg4/src/type_yuvai.cpp -@@ -37,7 +37,7 @@ Revision History: - *************************************************************************/ - - #include "typeapi.h" --#include <iostream.h> -+#include <iostream> - - #ifdef __MFC_ - #ifdef _DEBUG -@@ -252,7 +252,7 @@ CVOPIntYUVBA::CVOPIntYUVBA (AlphaUsage f - const CIntImage* CVOPIntYUVBA::getPlane (PlaneType plnType) const - { - if (plnType==A_PLANE) { -- cerr << "For A-Planes please use CVOPIntYUVBA::getPlaneA()!\n"; -+ std::cerr << "For A-Planes please use CVOPIntYUVBA::getPlaneA()!\n"; - assert( plnType!=A_PLANE ); - } - -@@ -309,7 +309,7 @@ Void CVOPIntYUVBA::setPlaneA (const CInt - Void CVOPIntYUVBA::setPlane (const CIntImage* pii, PlaneType plnType, Bool bBUV) - { - if (plnType==A_PLANE) { -- cerr << "For A-Planes please use CVOPIntYUVBA::setPlaneA()!\n"; -+ std::cerr << "For A-Planes please use CVOPIntYUVBA::setPlaneA()!\n"; - assert( plnType!=A_PLANE ); - } - diff --git a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp b/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp deleted file mode 100644 index a289089c0b6..00000000000 --- a/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp,v 1.1 2011/12/22 14:44:42 dholland Exp $ - -Fix C++ headers. - ---- common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp~ 2005-05-04 19:56:00.000000000 +0000 -+++ common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp -@@ -57,7 +57,7 @@ - #include <math.h> - #include <assert.h> - // begin: added by Sharp (99/2/16) --#include <iostream.h> -+#include <iostream> - #include <sys/stat.h> - // end: added by Sharp (99/2/16) - diff --git a/multimedia/mpeg4ip/patches/patch-configure.in b/multimedia/mpeg4ip/patches/patch-configure.in deleted file mode 100644 index 7cba7ff15d9..00000000000 --- a/multimedia/mpeg4ip/patches/patch-configure.in +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-configure.in,v 1.1 2012/04/18 00:09:44 joerg Exp $ - -- Fix shell redirection to work with any Bourne shell -- Check for _pos in fpos_t as used by NetBSD -- nasm -r has been removed, use modern -v. - ---- configure.in.orig 2012-04-17 21:03:44.000000000 +0000 -+++ configure.in -@@ -7,7 +7,7 @@ if test x$did_bootstrap = xno; then - AC_MSG_ERROR([Please run bootstrap first]) - exit -1 - fi --rm -f config.h >&/dev/null -+rm -f config.h 2> /dev/null - touch config.h - dnl Detect the canonical host and target build environment - AC_CANONICAL_HOST -@@ -278,6 +278,7 @@ AC_CHECK_TYPES([struct ip_mreq_source], - [#include <netinet/in.h>]) - - AC_CHECK_MEMBERS(fpos_t.__pos,,, [#include <stdio.h>]) -+AC_CHECK_MEMBERS(fpos_t._pos,,, [#include <stdio.h>]) - - dnl borrowed from ac-archive.sourceforge.net - dnl @author Guido Draheim <guidod@gmx.de> -@@ -682,7 +683,7 @@ if test x$enable_mmx = xyes; then - - if test x$USENASM = xtrue; then - AC_MSG_CHECKING(nasm version...) -- BILLSNASM_arg=`nasm -r | tr '.' ' '` -+ BILLSNASM_arg=`nasm -v | tr '.' ' '` - BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg` - if test x$BILLSNASM_ret = x"yes"; then - USENASM=true diff --git a/multimedia/mpeg4ip/patches/patch-lib_mp4_ctts.c b/multimedia/mpeg4ip/patches/patch-lib_mp4_ctts.c deleted file mode 100644 index 53d37e7fde3..00000000000 --- a/multimedia/mpeg4ip/patches/patch-lib_mp4_ctts.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lib_mp4_ctts.c,v 1.1 2012/12/20 21:44:51 joerg Exp $ - ---- lib/mp4/ctts.c.orig 2012-12-20 16:51:30.000000000 +0000 -+++ lib/mp4/ctts.c -@@ -88,7 +88,7 @@ int quicktime_read_ctts(quicktime_t *fil - } - } - --int quicktime_write_ctts(quicktime_t *file, quicktime_ctts_t *ctts) -+void quicktime_write_ctts(quicktime_t *file, quicktime_ctts_t *ctts) - { - int i; - quicktime_atom_t atom; diff --git a/multimedia/mpeg4ip/patches/patch-lib_mp4_hinthnti.c b/multimedia/mpeg4ip/patches/patch-lib_mp4_hinthnti.c deleted file mode 100644 index a550264b883..00000000000 --- a/multimedia/mpeg4ip/patches/patch-lib_mp4_hinthnti.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lib_mp4_hinthnti.c,v 1.1 2012/12/20 21:44:51 joerg Exp $ - ---- lib/mp4/hinthnti.c.orig 2012-12-20 16:54:04.000000000 +0000 -+++ lib/mp4/hinthnti.c -@@ -53,7 +53,9 @@ int quicktime_read_hint_hnti(quicktime_t - } while (quicktime_position(file) < parent_atom->end); - } - --int quicktime_write_hint_hnti(quicktime_t *file, quicktime_hint_hnti_t *hnti) -+void quicktime_write_sdp(quicktime_t *file, quicktime_sdp_t *sdp); -+ -+void quicktime_write_hint_hnti(quicktime_t *file, quicktime_hint_hnti_t *hnti) - { - quicktime_atom_t atom; - diff --git a/multimedia/mpeg4ip/patches/patch-lib_mp4_hintudta.c b/multimedia/mpeg4ip/patches/patch-lib_mp4_hintudta.c deleted file mode 100644 index bf2747e379d..00000000000 --- a/multimedia/mpeg4ip/patches/patch-lib_mp4_hintudta.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lib_mp4_hintudta.c,v 1.1 2012/12/20 21:44:51 joerg Exp $ - ---- lib/mp4/hintudta.c.orig 2012-12-20 16:52:58.000000000 +0000 -+++ lib/mp4/hintudta.c -@@ -66,7 +66,9 @@ int quicktime_read_hint_udta(quicktime_t - } while (quicktime_position(file) < parent_atom->end); - } - --int quicktime_write_hint_udta(quicktime_t *file, quicktime_hint_udta_t *hint_udta) -+void quicktime_write_hint_hnti(quicktime_t *file, quicktime_hint_hnti_t *hnti); -+ -+void quicktime_write_hint_udta(quicktime_t *file, quicktime_hint_udta_t *hint_udta) - { - quicktime_atom_t atom; - diff --git a/multimedia/mpeg4ip/patches/patch-lib_mp4_hnti.c b/multimedia/mpeg4ip/patches/patch-lib_mp4_hnti.c deleted file mode 100644 index 1319aa7bb80..00000000000 --- a/multimedia/mpeg4ip/patches/patch-lib_mp4_hnti.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lib_mp4_hnti.c,v 1.1 2012/12/20 21:44:51 joerg Exp $ - ---- lib/mp4/hnti.c.orig 2012-12-20 16:53:34.000000000 +0000 -+++ lib/mp4/hnti.c -@@ -53,7 +53,9 @@ int quicktime_read_hnti(quicktime_t *fil - } while (quicktime_position(file) < parent_atom->end); - } - --int quicktime_write_hnti(quicktime_t *file, quicktime_hnti_t *hnti) -+void quicktime_write_rtp(quicktime_t *file, quicktime_rtp_t *rtp); -+ -+void quicktime_write_hnti(quicktime_t *file, quicktime_hnti_t *hnti) - { - quicktime_atom_t atom; - diff --git a/multimedia/mpeg4ip/patches/patch-lib_mp4_moov.c b/multimedia/mpeg4ip/patches/patch-lib_mp4_moov.c deleted file mode 100644 index 920cb1073f5..00000000000 --- a/multimedia/mpeg4ip/patches/patch-lib_mp4_moov.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lib_mp4_moov.c,v 1.1 2012/12/20 21:44:51 joerg Exp $ - ---- lib/mp4/moov.c.orig 2012-12-20 16:56:39.000000000 +0000 -+++ lib/mp4/moov.c -@@ -91,6 +91,8 @@ int quicktime_read_moov(quicktime_t *fil - return 0; - } - -+void quicktime_write_udta(quicktime_t *file, quicktime_udta_t *udta); -+ - int quicktime_write_moov(quicktime_t *file, quicktime_moov_t *moov) - { - quicktime_atom_t atom; diff --git a/multimedia/mpeg4ip/patches/patch-lib_mp4_rtp.c b/multimedia/mpeg4ip/patches/patch-lib_mp4_rtp.c deleted file mode 100644 index a9b4236f416..00000000000 --- a/multimedia/mpeg4ip/patches/patch-lib_mp4_rtp.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lib_mp4_rtp.c,v 1.1 2012/12/20 21:44:51 joerg Exp $ - ---- lib/mp4/rtp.c.orig 2012-12-20 16:55:05.000000000 +0000 -+++ lib/mp4/rtp.c -@@ -70,7 +70,7 @@ int quicktime_read_rtp(quicktime_t *file - rtp->string[rtpLen] = '\0'; - } - --int quicktime_write_rtp(quicktime_t *file, quicktime_rtp_t *rtp) -+void quicktime_write_rtp(quicktime_t *file, quicktime_rtp_t *rtp) - { - int i; - quicktime_atom_t atom; diff --git a/multimedia/mpeg4ip/patches/patch-lib_mp4_sdp.c b/multimedia/mpeg4ip/patches/patch-lib_mp4_sdp.c deleted file mode 100644 index 2b7b6a16c1a..00000000000 --- a/multimedia/mpeg4ip/patches/patch-lib_mp4_sdp.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lib_mp4_sdp.c,v 1.1 2012/12/20 21:44:51 joerg Exp $ - ---- lib/mp4/sdp.c.orig 2012-12-20 16:55:33.000000000 +0000 -+++ lib/mp4/sdp.c -@@ -69,7 +69,7 @@ int quicktime_read_sdp(quicktime_t *file - sdp->string[sdpLen] = '\0'; - } - --int quicktime_write_sdp(quicktime_t *file, quicktime_sdp_t *sdp) -+void quicktime_write_sdp(quicktime_t *file, quicktime_sdp_t *sdp) - { - int i; - quicktime_atom_t atom; diff --git a/multimedia/mpeg4ip/patches/patch-lib_mp4_stbl.c b/multimedia/mpeg4ip/patches/patch-lib_mp4_stbl.c deleted file mode 100644 index 7610d555250..00000000000 --- a/multimedia/mpeg4ip/patches/patch-lib_mp4_stbl.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lib_mp4_stbl.c,v 1.1 2012/12/20 21:44:51 joerg Exp $ - ---- lib/mp4/stbl.c.orig 2012-12-20 16:52:08.000000000 +0000 -+++ lib/mp4/stbl.c -@@ -130,6 +130,8 @@ int quicktime_read_stbl(quicktime_t *fil - return 0; - } - -+void quicktime_write_ctts(quicktime_t *file, quicktime_ctts_t *ctts); -+ - int quicktime_write_stbl(quicktime_t *file, quicktime_minf_t *minf, quicktime_stbl_t *stbl) - { - quicktime_atom_t atom; diff --git a/multimedia/mpeg4ip/patches/patch-lib_mp4_trak.c b/multimedia/mpeg4ip/patches/patch-lib_mp4_trak.c deleted file mode 100644 index 1165a761019..00000000000 --- a/multimedia/mpeg4ip/patches/patch-lib_mp4_trak.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-lib_mp4_trak.c,v 1.1 2012/12/20 21:44:51 joerg Exp $ - ---- lib/mp4/trak.c.orig 2012-12-20 16:53:00.000000000 +0000 -+++ lib/mp4/trak.c -@@ -178,6 +178,9 @@ int quicktime_read_trak(quicktime_t *fil - return 0; - } - -+void quicktime_write_hint_udta(quicktime_t *file, quicktime_hint_udta_t *hint_udta); -+void quicktime_write_tref(quicktime_t *file, quicktime_tref_t *tref); -+ - int quicktime_write_trak(quicktime_t *file, quicktime_trak_t *trak, long moov_time_scale) - { - long duration; diff --git a/multimedia/mpeg4ip/patches/patch-lib_mp4_tref.c b/multimedia/mpeg4ip/patches/patch-lib_mp4_tref.c deleted file mode 100644 index cf66df8665b..00000000000 --- a/multimedia/mpeg4ip/patches/patch-lib_mp4_tref.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lib_mp4_tref.c,v 1.1 2012/12/20 21:44:51 joerg Exp $ - ---- lib/mp4/tref.c.orig 2012-12-20 16:56:13.000000000 +0000 -+++ lib/mp4/tref.c -@@ -58,7 +58,7 @@ int quicktime_read_tref(quicktime_t *fil - } while (quicktime_position(file) < parent_atom->end); - } - --int quicktime_write_tref(quicktime_t *file, quicktime_tref_t *tref) -+void quicktime_write_tref(quicktime_t *file, quicktime_tref_t *tref) - { - quicktime_atom_t atom; - diff --git a/multimedia/mpeg4ip/patches/patch-lib_mp4_udta.c b/multimedia/mpeg4ip/patches/patch-lib_mp4_udta.c deleted file mode 100644 index dce8f77d5f2..00000000000 --- a/multimedia/mpeg4ip/patches/patch-lib_mp4_udta.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lib_mp4_udta.c,v 1.1 2012/12/20 21:44:51 joerg Exp $ - ---- lib/mp4/udta.c.orig 2012-12-20 16:53:36.000000000 +0000 -+++ lib/mp4/udta.c -@@ -88,7 +88,9 @@ int quicktime_read_udta(quicktime_t *fil - return result; - } - --int quicktime_write_udta(quicktime_t *file, quicktime_udta_t *udta) -+void quicktime_write_hnti(quicktime_t *file, quicktime_hnti_t *hnti); -+ -+void quicktime_write_udta(quicktime_t *file, quicktime_udta_t *udta) - { - quicktime_atom_t atom, subatom; - diff --git a/multimedia/mpeg4ip/patches/patch-player_lib_audio_faad_all.h b/multimedia/mpeg4ip/patches/patch-player_lib_audio_faad_all.h deleted file mode 100644 index e15f89d927a..00000000000 --- a/multimedia/mpeg4ip/patches/patch-player_lib_audio_faad_all.h +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-player_lib_audio_faad_all.h,v 1.1 2012/04/18 00:09:44 joerg Exp $ - -config.c needs two scratch channels. - ---- player/lib/audio/faad/all.h.orig 2012-04-17 21:37:48.000000000 +0000 -+++ player/lib/audio/faad/all.h -@@ -59,7 +59,7 @@ enum - BChans = 15, /* back channels: left surround, right surround */ - BCenter = 1, /* 1 if decoder has back center channel */ - LChans = 1, /* LFE channels */ -- XChans = 1, /* scratch space for parsing unused channels */ -+ XChans = 2, /* scratch space for parsing unused channels */ - #else - FChans = 3, /* front channels: left, center, right */ - FCenter = 0, /* 1 if decoder has front center channel */ -@@ -67,7 +67,7 @@ enum - BChans = 1, /* back channels: left surround, right surround */ - BCenter = 0, /* 1 if decoder has back center channel */ - LChans = 1, /* LFE channels */ -- XChans = 1, /* scratch space for parsing unused channels */ -+ XChans = 2, /* scratch space for parsing unused channels */ - #endif - - Chans = FChans + SChans + BChans + LChans + XChans |