diff options
| author | wiz <wiz@pkgsrc.org> | 2004-07-17 19:06:36 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2004-07-17 19:06:36 +0000 |
| commit | a5ad5935d816bbe63bd06e15f10b7e0c940a83c3 (patch) | |
| tree | 6af3716cc622cc163415f16fa71ad3b6f7167b00 | |
| parent | 0b7bd434ee413d3c307beb42c7ba9e3400225bfc (diff) | |
| download | pkgsrc-a5ad5935d816bbe63bd06e15f10b7e0c940a83c3.tar.gz | |
Update to 1.0pre5:
DOCS
* small additions, corrections, updates all over the place
* audio output driver section added to the man page
* several bug fixes and improvements in the MEncoder documentation
* DVD ripping guide extended and improved
* AUTHORS file massively extended
* German man page partially updated
* Hungarian XML documentation translation started
Ports
* encrypted DVD playback on Windows fixed (again)
* Cygwin and MinGW now accept the same -dvd-device syntax
* LIVE.COM now works under MinGW
* foundations for MinGW crosscompilation
* disabled SSE on MinGW as it caused crashes
* AC3 passthrough for ao_win32
* improved vo_quartz (YUV, multiple screens support)
* vo_quartz made default on Mac OS X
* ao_macosx fixed and made default again on Mac OS X
* RealVideo binary codecs support on Mac OS X (still buggy)
* bigendian fixes in vf.c, vo_tga
* OpenBSD portability fixes
* OpenBSD/VAX support
* AMD64 support
Drivers
* support for more Radeons (9800 XT among them) in VIDIX
* Radeon related bug fixes in VIDIX
* vo_gl2 now supports GUI, fix for flickering borders in fullscreen
* support 24 and 32 bit PCM files, bigendian fixes
* ao_sdl now converts unsupported formats instead of quitting
* ENCA support
* merged ao_alsa9 and ao_alsa1x drivers into ao_alsa
* NeoMagic TV-out support through VESA
* JACK audio output driver
* vo_sdl fixes (wrong flags and screensaver disabling)
* vo_directx fixes
Decoders
* MSZH/ZLIB, FLI, QTRLE, RoQ video and RoQ audio support moved to FFmpeg
* FFmpeg Cinepak and CYUV decoders preferred
* audio format 0xff support (is AAC)
* "raw" audio in MOV supported
* Indeo audio (iac25) support via binary codec
* upgrade libfaad2 to the FAAD 2.0 release
* MPEG2 chroma422/444 support
* Winnov WINX and WNV1 support via binary codec
Demuxers
* Ogg subtitle handling and other bug fixes
* Matroska improvements
* support seeking in Real files without -idx
* support seeking in Real files without index with -forceidx
Streaming
* ASF, MMST streaming fixes
* URL escaping fixed
* NSA (Nullsoft audio) streaming support
* embedded RAM playlist support
* multibyte URL support
* rtp:// now supported even with LIVE.COM compiled in
* miscellaneous bug fixes
Filters
* vf_softskip: frame skipping filter for MEncoder
* vf_harddup: frame duplication filter for MEncoder
* vf_pullup minor fixes and improvements
* AltiVec-optimized YUV to RGB converter
* vf_spp memory corruption fix on reallocation
FFmpeg/libavcodec
* MPEG2 encoding with 8, 9, 10, 11 bit intra DC precision
* DC clipping fix, intra_dc_precision > 0 support
* Cinepak fixes and palette support
* support skipping of MB rows during decoding
* Vorbis in NUT fixed
* NUT updated to latest specification
* segfault and artifact fixes in SVQ3 decoder
* motion estimation code: overflow and chroma fixes
* change qscale -> lambda for the motion estimation
* noise preserving sum of squares comparison function in ME code
* fixed memory overwrite in truemotion decoder
* clip input motion vectors, better error tolerance on bad vectors
* FLAC decoder cleanup (partial demuxer/decoder separation)
* memalign hack for SSE/SSE2 on that alternative OS :)
* lots of AltiVec optimizations
* qscale + qprd fix
* QTrle4 support
* H.261 decoder
* coefficient saturation fix in H.263
* H.263 MCBPC fix
* per line lowpass filter in MMX and faster C lowpass filter
* SVQ1 encoder
* as usual, lots of bug fixes and optimizations
Others
* fullscreen fixes for many window managers
* fix crash on original Pentiums and older
* dvd://start-end support
* netstream (mpst://) support fixed
* support comments in plaintext playlists
* loader/ dependency removed
* keepaspect option extended to all video output drivers
* WMA to Ogg conversion and simple subtitle editing script added to TOOLS
* support for more lame options
* new set of GUI icons
* memory conserving implementation of GUI potmeters
* X11 code reindented
* further gcc 3.4 support fixes
* mixer API written for changing volume through libaf
* -rtc-device option for specifying the RTC device
* desktop/menu icon added
* miscellaneous bug fixes and cleanups
* multi-threaded encoding with lavc
* fixed a bug with Real files introduced in pre4
* -use-stdin renamed to -noconsolecontrols
21 files changed, 152 insertions, 780 deletions
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile index 8bd851bcbcb..a4b4bbb2ac9 100644 --- a/multimedia/gmplayer/Makefile +++ b/multimedia/gmplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/07/03 11:00:00 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2004/07/17 19:06:36 wiz Exp $ # # NOTE: if you are updating both mplayer and gmplayer, you must ensure @@ -9,7 +9,6 @@ # PKGNAME= gmplayer-${MPLAYER_PKG_VERSION} -PKGREVISION= 3 SKIN_SITES= http://www.mplayerhq.hu/MPlayer/Skin/ \ ftp://ftp.mplayerhq.hu/MPlayer/Skin/ \ diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo index 109829879d4..b16cf1be2fb 100644 --- a/multimedia/gmplayer/distinfo +++ b/multimedia/gmplayer/distinfo @@ -1,58 +1,46 @@ -$NetBSD: distinfo,v 1.10 2004/07/03 11:00:00 wiz Exp $ +$NetBSD: distinfo,v 1.11 2004/07/17 19:06:36 wiz Exp $ -SHA1 (mplayer-1.0rc4/MPlayer-1.0pre4.tar.bz2) = 1e9f181589d6bf36e4c59ad013f8b5976447e702 -Size (mplayer-1.0rc4/MPlayer-1.0pre4.tar.bz2) = 4913390 bytes -SHA1 (mplayer-1.0rc4/default-1.8.tar.bz2) = c9cc56111b2de6295c032a2804fe16d24bbeb7bf -Size (mplayer-1.0rc4/default-1.8.tar.bz2) = 173481 bytes -SHA1 (mplayer-1.0rc4/AlienMind-1.2.tar.bz2) = a7796cf0827ceda4579edb918b864d783a879979 -Size (mplayer-1.0rc4/AlienMind-1.2.tar.bz2) = 131315 bytes -SHA1 (mplayer-1.0rc4/BlueHeart-1.5.tar.bz2) = 3a32cc553c8abab8ef4129e00fa61215c37288e5 -Size (mplayer-1.0rc4/BlueHeart-1.5.tar.bz2) = 281091 bytes -SHA1 (mplayer-1.0rc4/CornerMP-1.2.tar.bz2) = 630be3fa9aadff36c129b86980ba213638647abb -Size (mplayer-1.0rc4/CornerMP-1.2.tar.bz2) = 232734 bytes -SHA1 (mplayer-1.0rc4/CornerMP-aqua-1.4.tar.bz2) = 02c88db7b9ffbafcc04eeebcbfdc6a2993e688d0 -Size (mplayer-1.0rc4/CornerMP-aqua-1.4.tar.bz2) = 243204 bytes -SHA1 (mplayer-1.0rc4/Cyrus-1.2.tar.bz2) = 420b079f9480fcba1da6085754ff9ea1f60401f2 -Size (mplayer-1.0rc4/Cyrus-1.2.tar.bz2) = 228490 bytes -SHA1 (mplayer-1.0rc4/MidnightLove-1.6.tar.bz2) = 79c70c79e3916cf6f8d40d7e46aebe669e84b27e -Size (mplayer-1.0rc4/MidnightLove-1.6.tar.bz2) = 539649 bytes -SHA1 (mplayer-1.0rc4/WindowsMediaPlayer6-2.0.tar.bz2) = d52e3e6559ed811e9b3d9e797762c9793e1c0b5b -Size (mplayer-1.0rc4/WindowsMediaPlayer6-2.0.tar.bz2) = 39105 bytes -SHA1 (mplayer-1.0rc4/avifile-1.6.tar.bz2) = d3b66f779abe2c70f9cb0db2d9ffe4b4591db215 -Size (mplayer-1.0rc4/avifile-1.6.tar.bz2) = 42446 bytes -SHA1 (mplayer-1.0rc4/gnome-1.1.tar.bz2) = b27618f2ec2f8bf83929b6e30c4fe1fab59595fd -Size (mplayer-1.0rc4/gnome-1.1.tar.bz2) = 368720 bytes -SHA1 (mplayer-1.0rc4/hayraphon-1.0.tar.bz2) = 793febace6325776d9795ef81566f378edcb4541 -Size (mplayer-1.0rc4/hayraphon-1.0.tar.bz2) = 77628 bytes -SHA1 (mplayer-1.0rc4/hwswskin-1.1.tar.bz2) = e877c3594234e53b1bc7bd45c8e64c7c0682313a -Size (mplayer-1.0rc4/hwswskin-1.1.tar.bz2) = 20375 bytes -SHA1 (mplayer-1.0rc4/mentalic-1.2.tar.bz2) = 560c6b5bc08a981a1a335b8106701fa07af51524 -Size (mplayer-1.0rc4/mentalic-1.2.tar.bz2) = 166617 bytes -SHA1 (mplayer-1.0rc4/neutron-1.5.tar.bz2) = 78f332ea926e476c90f690b2d3c925aadfc8baff -Size (mplayer-1.0rc4/neutron-1.5.tar.bz2) = 369313 bytes -SHA1 (mplayer-1.0rc4/phony-1.1.tar.bz2) = efb5cb181c1a8a9062a269f435f38a04fd0cc8d7 -Size (mplayer-1.0rc4/phony-1.1.tar.bz2) = 386409 bytes -SHA1 (mplayer-1.0rc4/plastic-1.2.tar.bz2) = 3c448bed53b2bdedfdf6bbfabd91c3bd95c63119 -Size (mplayer-1.0rc4/plastic-1.2.tar.bz2) = 454151 bytes -SHA1 (mplayer-1.0rc4/proton-1.2.tar.bz2) = 2f59c1458de1c3379b03c1618b54b18778db1997 -Size (mplayer-1.0rc4/proton-1.2.tar.bz2) = 322654 bytes -SHA1 (mplayer-1.0rc4/slim-1.2.tar.bz2) = 91af8682bf5ffea4d184a839bd762ad377b5f0c3 -Size (mplayer-1.0rc4/slim-1.2.tar.bz2) = 399000 bytes -SHA1 (mplayer-1.0rc4/xanim-1.6.tar.bz2) = ea147768cba50e62646216217028a9dac8b8e653 -Size (mplayer-1.0rc4/xanim-1.6.tar.bz2) = 94567 bytes -SHA1 (mplayer-1.0rc4/xine-lcd-1.2.tar.bz2) = b882ec3e0aceeffb22c425cfd7322bf0f7aaf269 -Size (mplayer-1.0rc4/xine-lcd-1.2.tar.bz2) = 172340 bytes -SHA1 (patch-aa) = 12c75630628dec1893ea06e0a623cd25c143cf1d -SHA1 (patch-ad) = e01b08da4c46c57a50b5306353391b8f9ba7bf6e -SHA1 (patch-ba) = 944cf2d3c99fe0af53bc71c47d5a48aff2bb4671 -SHA1 (patch-bb) = 395045e7e10c2154dce06eebcc04283f6aeac552 -SHA1 (patch-bc) = 900672b8f7c9aa3a66a56c3439607e8eeefedcba -SHA1 (patch-bd) = 0687b9907e7fab7ffbb90a855088031e84123f76 -SHA1 (patch-be) = 159bef14dd6419445c5c530e8d402eb83543f774 -SHA1 (patch-bf) = 5ce3344b3384aa8caa9848e361902ebb0de148da -SHA1 (patch-bg) = 297539d5d53721fdef12ee8ace7be8e50ee7ab50 -SHA1 (patch-bh) = fb757d74e9896fb29c55b87d586e801c7667b8a8 -SHA1 (patch-bi) = ce208ec7d6245a4e5609d61a5d877be0efb67102 -SHA1 (patch-bj) = 5f40f145303434c0869aea061f3e15d555a3b711 -SHA1 (patch-bk) = 31ddf8e0cee55bfac0b34859ef09f660a0404903 -SHA1 (patch-bl) = e778c11a4655127263d1d3ecc573e62167f98557 +SHA1 (mplayer-1.0rc5/MPlayer-1.0pre5.tar.bz2) = cf64892871b8673e452b5d390be25144d85fe307 +Size (mplayer-1.0rc5/MPlayer-1.0pre5.tar.bz2) = 5072836 bytes +SHA1 (mplayer-1.0rc5/default-1.8.tar.bz2) = c9cc56111b2de6295c032a2804fe16d24bbeb7bf +Size (mplayer-1.0rc5/default-1.8.tar.bz2) = 173481 bytes +SHA1 (mplayer-1.0rc5/AlienMind-1.2.tar.bz2) = a7796cf0827ceda4579edb918b864d783a879979 +Size (mplayer-1.0rc5/AlienMind-1.2.tar.bz2) = 131315 bytes +SHA1 (mplayer-1.0rc5/BlueHeart-1.5.tar.bz2) = 3a32cc553c8abab8ef4129e00fa61215c37288e5 +Size (mplayer-1.0rc5/BlueHeart-1.5.tar.bz2) = 281091 bytes +SHA1 (mplayer-1.0rc5/CornerMP-1.2.tar.bz2) = 630be3fa9aadff36c129b86980ba213638647abb +Size (mplayer-1.0rc5/CornerMP-1.2.tar.bz2) = 232734 bytes +SHA1 (mplayer-1.0rc5/CornerMP-aqua-1.4.tar.bz2) = 02c88db7b9ffbafcc04eeebcbfdc6a2993e688d0 +Size (mplayer-1.0rc5/CornerMP-aqua-1.4.tar.bz2) = 243204 bytes +SHA1 (mplayer-1.0rc5/Cyrus-1.2.tar.bz2) = 420b079f9480fcba1da6085754ff9ea1f60401f2 +Size (mplayer-1.0rc5/Cyrus-1.2.tar.bz2) = 228490 bytes +SHA1 (mplayer-1.0rc5/MidnightLove-1.6.tar.bz2) = 79c70c79e3916cf6f8d40d7e46aebe669e84b27e +Size (mplayer-1.0rc5/MidnightLove-1.6.tar.bz2) = 539649 bytes +SHA1 (mplayer-1.0rc5/WindowsMediaPlayer6-2.0.tar.bz2) = d52e3e6559ed811e9b3d9e797762c9793e1c0b5b +Size (mplayer-1.0rc5/WindowsMediaPlayer6-2.0.tar.bz2) = 39105 bytes +SHA1 (mplayer-1.0rc5/avifile-1.6.tar.bz2) = d3b66f779abe2c70f9cb0db2d9ffe4b4591db215 +Size (mplayer-1.0rc5/avifile-1.6.tar.bz2) = 42446 bytes +SHA1 (mplayer-1.0rc5/gnome-1.1.tar.bz2) = b27618f2ec2f8bf83929b6e30c4fe1fab59595fd +Size (mplayer-1.0rc5/gnome-1.1.tar.bz2) = 368720 bytes +SHA1 (mplayer-1.0rc5/hayraphon-1.0.tar.bz2) = 793febace6325776d9795ef81566f378edcb4541 +Size (mplayer-1.0rc5/hayraphon-1.0.tar.bz2) = 77628 bytes +SHA1 (mplayer-1.0rc5/hwswskin-1.1.tar.bz2) = e877c3594234e53b1bc7bd45c8e64c7c0682313a +Size (mplayer-1.0rc5/hwswskin-1.1.tar.bz2) = 20375 bytes +SHA1 (mplayer-1.0rc5/mentalic-1.2.tar.bz2) = 560c6b5bc08a981a1a335b8106701fa07af51524 +Size (mplayer-1.0rc5/mentalic-1.2.tar.bz2) = 166617 bytes +SHA1 (mplayer-1.0rc5/neutron-1.5.tar.bz2) = 78f332ea926e476c90f690b2d3c925aadfc8baff +Size (mplayer-1.0rc5/neutron-1.5.tar.bz2) = 369313 bytes +SHA1 (mplayer-1.0rc5/phony-1.1.tar.bz2) = efb5cb181c1a8a9062a269f435f38a04fd0cc8d7 +Size (mplayer-1.0rc5/phony-1.1.tar.bz2) = 386409 bytes +SHA1 (mplayer-1.0rc5/plastic-1.2.tar.bz2) = 3c448bed53b2bdedfdf6bbfabd91c3bd95c63119 +Size (mplayer-1.0rc5/plastic-1.2.tar.bz2) = 454151 bytes +SHA1 (mplayer-1.0rc5/proton-1.2.tar.bz2) = 2f59c1458de1c3379b03c1618b54b18778db1997 +Size (mplayer-1.0rc5/proton-1.2.tar.bz2) = 322654 bytes +SHA1 (mplayer-1.0rc5/slim-1.2.tar.bz2) = 91af8682bf5ffea4d184a839bd762ad377b5f0c3 +Size (mplayer-1.0rc5/slim-1.2.tar.bz2) = 399000 bytes +SHA1 (mplayer-1.0rc5/xanim-1.6.tar.bz2) = ea147768cba50e62646216217028a9dac8b8e653 +Size (mplayer-1.0rc5/xanim-1.6.tar.bz2) = 94567 bytes +SHA1 (mplayer-1.0rc5/xine-lcd-1.2.tar.bz2) = b882ec3e0aceeffb22c425cfd7322bf0f7aaf269 +Size (mplayer-1.0rc5/xine-lcd-1.2.tar.bz2) = 172340 bytes +SHA1 (patch-aa) = 1dfc5284ec0f67d8adfe860010a39d273b3fa74c +SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 73407069639..bfbc5430c35 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2004/06/26 18:49:09 grant Exp $ +# $NetBSD: Makefile,v 1.11 2004/07/17 19:06:36 wiz Exp $ # PKGNAME= mencoder-${MPLAYER_PKG_VERSION} -PKGREVISION= 1 COMMENT= Simple movie encoder for MPlayer-playable movies diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common index 9eaebad614b..9c7ccf49d04 100644 --- a/multimedia/mplayer-share/Makefile.common +++ b/multimedia/mplayer-share/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.14 2004/07/16 14:40:22 grant Exp $ +# $NetBSD: Makefile.common,v 1.15 2004/07/17 19:06:36 wiz Exp $ # -MPLAYER_DIST_VERSION= 1.0pre4 +MPLAYER_DIST_VERSION= 1.0pre5 # This variable is used in all packages which depend on this package -MPLAYER_PKG_VERSION= 1.0rc4 +MPLAYER_PKG_VERSION= 1.0rc5 DISTNAME= MPlayer-${MPLAYER_DIST_VERSION} CATEGORIES?= multimedia diff --git a/multimedia/mplayer-share/PLIST b/multimedia/mplayer-share/PLIST index 70cd6b16472..19d577d5d75 100644 --- a/multimedia/mplayer-share/PLIST +++ b/multimedia/mplayer-share/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2004/04/28 15:54:46 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/07/17 19:06:36 wiz Exp $ man/man1/mplayer.1 share/mplayer/DOCS/HTML/en/amiga.html share/mplayer/DOCS/HTML/en/aspect.html @@ -29,7 +29,7 @@ share/mplayer/DOCS/HTML/en/gcc-296.html share/mplayer/DOCS/HTML/en/gui.html share/mplayer/DOCS/HTML/en/history.html share/mplayer/DOCS/HTML/en/howtoread.html -share/mplayer/DOCS/HTML/en/hpux.html +share/mplayer/DOCS/HTML/en/hp-ux.html share/mplayer/DOCS/HTML/en/index.html share/mplayer/DOCS/HTML/en/install.html share/mplayer/DOCS/HTML/en/intro.html @@ -38,13 +38,13 @@ share/mplayer/DOCS/HTML/en/joe-barr.html share/mplayer/DOCS/HTML/en/linux.html share/mplayer/DOCS/HTML/en/macos.html share/mplayer/DOCS/HTML/en/mailinglists.html -share/mplayer/DOCS/HTML/en/menc-feat-divx4.html share/mplayer/DOCS/HTML/en/menc-feat-dvd-mpeg4.html share/mplayer/DOCS/HTML/en/menc-feat-enc-images.html share/mplayer/DOCS/HTML/en/menc-feat-enc-libavcodec.html share/mplayer/DOCS/HTML/en/menc-feat-extractsub.html share/mplayer/DOCS/HTML/en/menc-feat-fix-avi.html share/mplayer/DOCS/HTML/en/menc-feat-mpeg.html +share/mplayer/DOCS/HTML/en/menc-feat-mpeg4.html share/mplayer/DOCS/HTML/en/menc-feat-rescale.html share/mplayer/DOCS/HTML/en/menc-feat-streamcopy.html share/mplayer/DOCS/HTML/en/menc-feat-telecine.html @@ -207,6 +207,75 @@ share/mplayer/DOCS/HTML/fr/usage.html share/mplayer/DOCS/HTML/fr/users-vs-dev.html share/mplayer/DOCS/HTML/fr/vcd.html share/mplayer/DOCS/HTML/fr/windows.html +share/mplayer/DOCS/HTML/hu/amiga.html +share/mplayer/DOCS/HTML/hu/aspect.html +share/mplayer/DOCS/HTML/hu/bsd.html +share/mplayer/DOCS/HTML/hu/bugreports.html +share/mplayer/DOCS/HTML/hu/bugreports_advusers.html +share/mplayer/DOCS/HTML/hu/bugreports_fix.html +share/mplayer/DOCS/HTML/hu/bugreports_report.html +share/mplayer/DOCS/HTML/hu/bugreports_what.html +share/mplayer/DOCS/HTML/hu/bugreports_where.html +share/mplayer/DOCS/HTML/hu/bugs-audio.html +share/mplayer/DOCS/HTML/hu/bugs-special.html +share/mplayer/DOCS/HTML/hu/bugs.html +share/mplayer/DOCS/HTML/hu/cd-dvd.html +share/mplayer/DOCS/HTML/hu/codecs.html +share/mplayer/DOCS/HTML/hu/commandline.html +share/mplayer/DOCS/HTML/hu/control.html +share/mplayer/DOCS/HTML/hu/custommatrices.html +share/mplayer/DOCS/HTML/hu/default.css +share/mplayer/DOCS/HTML/hu/devices.html +share/mplayer/DOCS/HTML/hu/drives.html +share/mplayer/DOCS/HTML/hu/dvd.html +share/mplayer/DOCS/HTML/hu/edl.html +share/mplayer/DOCS/HTML/hu/faq.html +share/mplayer/DOCS/HTML/hu/features.html +share/mplayer/DOCS/HTML/hu/formats.html +share/mplayer/DOCS/HTML/hu/gcc-296.html +share/mplayer/DOCS/HTML/hu/gui.html +share/mplayer/DOCS/HTML/hu/history.html +share/mplayer/DOCS/HTML/hu/howtoread.html +share/mplayer/DOCS/HTML/hu/hpux.html +share/mplayer/DOCS/HTML/hu/index.html +share/mplayer/DOCS/HTML/hu/install.html +share/mplayer/DOCS/HTML/hu/intro.html +share/mplayer/DOCS/HTML/hu/irix.html +share/mplayer/DOCS/HTML/hu/joe-barr.html +share/mplayer/DOCS/HTML/hu/linux.html +share/mplayer/DOCS/HTML/hu/macos.html +share/mplayer/DOCS/HTML/hu/mailinglists.html +share/mplayer/DOCS/HTML/hu/menc-feat-dvd-mpeg4.html +share/mplayer/DOCS/HTML/hu/menc-feat-enc-images.html +share/mplayer/DOCS/HTML/hu/menc-feat-enc-libavcodec.html +share/mplayer/DOCS/HTML/hu/menc-feat-extractsub.html +share/mplayer/DOCS/HTML/hu/menc-feat-fix-avi.html +share/mplayer/DOCS/HTML/hu/menc-feat-mpeg.html +share/mplayer/DOCS/HTML/hu/menc-feat-mpeg4.html +share/mplayer/DOCS/HTML/hu/menc-feat-rescale.html +share/mplayer/DOCS/HTML/hu/menc-feat-streamcopy.html +share/mplayer/DOCS/HTML/hu/menc-feat-telecine.html +share/mplayer/DOCS/HTML/hu/mencoder.html +share/mplayer/DOCS/HTML/hu/mplayer-binary.html +share/mplayer/DOCS/HTML/hu/mpst.html +share/mplayer/DOCS/HTML/hu/nvidia-opinions.html +share/mplayer/DOCS/HTML/hu/patches.html +share/mplayer/DOCS/HTML/hu/ports.html +share/mplayer/DOCS/HTML/hu/qnx.html +share/mplayer/DOCS/HTML/hu/rtc.html +share/mplayer/DOCS/HTML/hu/skin-file.html +share/mplayer/DOCS/HTML/hu/skin-fonts.html +share/mplayer/DOCS/HTML/hu/skin-gui.html +share/mplayer/DOCS/HTML/hu/skin-overview.html +share/mplayer/DOCS/HTML/hu/skin.html +share/mplayer/DOCS/HTML/hu/solaris.html +share/mplayer/DOCS/HTML/hu/streaming.html +share/mplayer/DOCS/HTML/hu/subosd.html +share/mplayer/DOCS/HTML/hu/tv-input.html +share/mplayer/DOCS/HTML/hu/usage.html +share/mplayer/DOCS/HTML/hu/users-vs-dev.html +share/mplayer/DOCS/HTML/hu/vcd.html +share/mplayer/DOCS/HTML/hu/windows.html share/mplayer/DOCS/HTML/pl/amiga.html share/mplayer/DOCS/HTML/pl/aspect.html share/mplayer/DOCS/HTML/pl/bsd.html @@ -236,7 +305,7 @@ share/mplayer/DOCS/HTML/pl/gcc-296.html share/mplayer/DOCS/HTML/pl/gui.html share/mplayer/DOCS/HTML/pl/history.html share/mplayer/DOCS/HTML/pl/howtoread.html -share/mplayer/DOCS/HTML/pl/hpux.html +share/mplayer/DOCS/HTML/pl/hp-ux.html share/mplayer/DOCS/HTML/pl/index.html share/mplayer/DOCS/HTML/pl/install.html share/mplayer/DOCS/HTML/pl/intro.html @@ -312,13 +381,13 @@ share/mplayer/DOCS/HTML/ru/joe-barr.html share/mplayer/DOCS/HTML/ru/linux.html share/mplayer/DOCS/HTML/ru/macos.html share/mplayer/DOCS/HTML/ru/mailinglists.html -share/mplayer/DOCS/HTML/ru/menc-feat-divx4.html share/mplayer/DOCS/HTML/ru/menc-feat-dvd-mpeg4.html share/mplayer/DOCS/HTML/ru/menc-feat-enc-images.html share/mplayer/DOCS/HTML/ru/menc-feat-enc-libavcodec.html share/mplayer/DOCS/HTML/ru/menc-feat-extractsub.html share/mplayer/DOCS/HTML/ru/menc-feat-fix-avi.html share/mplayer/DOCS/HTML/ru/menc-feat-mpeg.html +share/mplayer/DOCS/HTML/ru/menc-feat-mpeg4.html share/mplayer/DOCS/HTML/ru/menc-feat-rescale.html share/mplayer/DOCS/HTML/ru/menc-feat-streamcopy.html share/mplayer/DOCS/HTML/ru/menc-feat-telecine.html @@ -356,17 +425,6 @@ share/mplayer/DOCS/de/sound.html share/mplayer/DOCS/de/users_against_developers.html share/mplayer/DOCS/de/video.html share/mplayer/DOCS/default.css -share/mplayer/DOCS/hu/bugreports.html -share/mplayer/DOCS/hu/cd-dvd.html -share/mplayer/DOCS/hu/codecs.html -share/mplayer/DOCS/hu/documentation.html -share/mplayer/DOCS/hu/encoding.html -share/mplayer/DOCS/hu/example.conf -share/mplayer/DOCS/hu/faq.html -share/mplayer/DOCS/hu/formats.html -share/mplayer/DOCS/hu/skin.html -share/mplayer/DOCS/hu/sound.html -share/mplayer/DOCS/hu/video.html share/mplayer/DOCS/it/bugreports.html share/mplayer/DOCS/it/cd-dvd.html share/mplayer/DOCS/it/codecs.html @@ -525,10 +583,10 @@ share/mplayer/input.conf @dirrm share/mplayer/DOCS/man/de @dirrm share/mplayer/DOCS/man @dirrm share/mplayer/DOCS/it -@dirrm share/mplayer/DOCS/hu @dirrm share/mplayer/DOCS/de @dirrm share/mplayer/DOCS/HTML/ru @dirrm share/mplayer/DOCS/HTML/pl +@dirrm share/mplayer/DOCS/HTML/hu @dirrm share/mplayer/DOCS/HTML/fr @dirrm share/mplayer/DOCS/HTML/es @dirrm share/mplayer/DOCS/HTML/en diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index 9d0edfcc0ca..52505ee292a 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,24 +1,12 @@ -$NetBSD: distinfo,v 1.9 2004/07/02 17:07:21 drochner Exp $ +$NetBSD: distinfo,v 1.10 2004/07/17 19:06:36 wiz Exp $ -SHA1 (mplayer-1.0rc4/MPlayer-1.0pre4.tar.bz2) = 1e9f181589d6bf36e4c59ad013f8b5976447e702 -Size (mplayer-1.0rc4/MPlayer-1.0pre4.tar.bz2) = 4913390 bytes -SHA1 (mplayer-1.0rc4/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212 -Size (mplayer-1.0rc4/font-arial-iso-8859-1.tar.bz2) = 234242 bytes -SHA1 (mplayer-1.0rc4/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 -Size (mplayer-1.0rc4/font-arial-iso-8859-2.tar.bz2) = 222208 bytes -SHA1 (mplayer-1.0rc4/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 -Size (mplayer-1.0rc4/font-arial-cp1250.tar.bz2) = 249705 bytes -SHA1 (patch-aa) = 12c75630628dec1893ea06e0a623cd25c143cf1d -SHA1 (patch-ad) = e01b08da4c46c57a50b5306353391b8f9ba7bf6e -SHA1 (patch-ba) = 944cf2d3c99fe0af53bc71c47d5a48aff2bb4671 -SHA1 (patch-bb) = 395045e7e10c2154dce06eebcc04283f6aeac552 -SHA1 (patch-bc) = 900672b8f7c9aa3a66a56c3439607e8eeefedcba -SHA1 (patch-bd) = 0687b9907e7fab7ffbb90a855088031e84123f76 -SHA1 (patch-be) = 159bef14dd6419445c5c530e8d402eb83543f774 -SHA1 (patch-bf) = 5ce3344b3384aa8caa9848e361902ebb0de148da -SHA1 (patch-bg) = 297539d5d53721fdef12ee8ace7be8e50ee7ab50 -SHA1 (patch-bh) = fb757d74e9896fb29c55b87d586e801c7667b8a8 -SHA1 (patch-bi) = ce208ec7d6245a4e5609d61a5d877be0efb67102 -SHA1 (patch-bj) = 5f40f145303434c0869aea061f3e15d555a3b711 -SHA1 (patch-bk) = 31ddf8e0cee55bfac0b34859ef09f660a0404903 -SHA1 (patch-bl) = e778c11a4655127263d1d3ecc573e62167f98557 +SHA1 (mplayer-1.0rc5/MPlayer-1.0pre5.tar.bz2) = cf64892871b8673e452b5d390be25144d85fe307 +Size (mplayer-1.0rc5/MPlayer-1.0pre5.tar.bz2) = 5072836 bytes +SHA1 (mplayer-1.0rc5/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212 +Size (mplayer-1.0rc5/font-arial-iso-8859-1.tar.bz2) = 234242 bytes +SHA1 (mplayer-1.0rc5/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 +Size (mplayer-1.0rc5/font-arial-iso-8859-2.tar.bz2) = 222208 bytes +SHA1 (mplayer-1.0rc5/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 +Size (mplayer-1.0rc5/font-arial-cp1250.tar.bz2) = 249705 bytes +SHA1 (patch-aa) = 1dfc5284ec0f67d8adfe860010a39d273b3fa74c +SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa index 4ded14b0c86..7c17c616b14 100644 --- a/multimedia/mplayer-share/patches/patch-aa +++ b/multimedia/mplayer-share/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2004/07/02 17:07:21 drochner Exp $ +$NetBSD: patch-aa,v 1.7 2004/07/17 19:06:36 wiz Exp $ ---- configure.orig 2004-07-02 18:36:10.000000000 +0200 +--- configure.orig 2004-07-15 00:04:42.000000000 +0200 +++ configure -@@ -375,8 +375,8 @@ for ac_option do +@@ -380,8 +380,8 @@ for ac_option do _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` ;; --with-extralibdir=*) @@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.6 2004/07/02 17:07:21 drochner Exp $ ;; --enable-runtime-cpudetection) _runtime_cpudetection=yes -@@ -507,7 +507,7 @@ if test "$_skip_cc_check" != yes ; then +@@ -514,7 +514,7 @@ if test "$_skip_cc_check" != yes ; then for _cc in "$_cc" gcc gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do echocheck "$_cc version" cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1` @@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.6 2004/07/02 17:07:21 drochner Exp $ if test "$?" -gt 0; then cc_version="not found" fi -@@ -618,7 +618,7 @@ case "$host_arch" in +@@ -625,7 +625,7 @@ case "$host_arch" in pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1` pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1` @@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.6 2004/07/02 17:07:21 drochner Exp $ pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1` pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1` -@@ -827,7 +827,7 @@ EOF +@@ -842,7 +842,7 @@ EOF _optimizing='' ;; @@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.6 2004/07/02 17:07:21 drochner Exp $ _def_arch='#define ARCH_X86_64 1' _target_arch='TARGET_ARCH_X86_64 = yes' iproc='x86_64' -@@ -1587,7 +1587,8 @@ for ac_option do +@@ -1618,7 +1618,8 @@ for ac_option do _inc_x11=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` ;; --with-x11libdir=*) @@ -50,42 +50,7 @@ $NetBSD: patch-aa,v 1.6 2004/07/02 17:07:21 drochner Exp $ ;; --with-dxr2incdir=*) _inc_dxr2=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` -@@ -2649,6 +2650,34 @@ else - fi - echores "$_strsep" - -+echocheck "strlcpy()" -+cat > $TMPC << EOF -+#include <string.h> -+int main (void) { char *s = "Hello, world!", t[20]; (void) strlcpy(t, s, sizeof( t )); return 0; } -+EOF -+_strlcpy=no -+cc_check && _strlcpy=yes -+if test "$_strlcpy" = yes ; then -+ _def_strlcpy='#define HAVE_STRLCPY 1' -+else -+ _def_strlcpy='#undef HAVE_STRLCPY' -+fi -+echores "$_strlcpy" -+ -+echocheck "strlcat()" -+cat > $TMPC << EOF -+#include <string.h> -+int main (void) { char *s = "Hello, world!", t[20]; (void) strlcat(t, s, sizeof( t )); return 0; } -+EOF -+_strlcat=no -+cc_check && _strlcat=yes -+if test "$_strlcat" = yes ; then -+ _def_strlcat='#define HAVE_STRLCAT 1' -+else -+ _def_strlcat='#undef HAVE_STRLCAT' -+fi -+echores "$_strlcat" -+ - echocheck "fseeko()" - cat > $TMPC << EOF - #include <stdio.h> -@@ -4653,11 +4682,11 @@ if test "$_matroska_external" != no ; th +@@ -4865,11 +4894,11 @@ if test "$_matroska_external" != no ; th int main(void) { return 0; } EOF @@ -99,22 +64,3 @@ $NetBSD: patch-aa,v 1.6 2004/07/02 17:07:21 drochner Exp $ if test "$_matroska_external" = no ; then _inc_extra=$_saved_inc_extra fi -@@ -6272,6 +6301,18 @@ $_def_scandir - /* Define this if your system has strsep */ - $_def_strsep - -+/* Define this if your system has strlcpy */ -+$_def_strlcpy -+#ifndef HAVE_STRLCPY -+unsigned int strlcpy (char *dest, char *src, unsigned int size); -+#endif -+ -+/* Define this if your system has strlcat */ -+$_def_strlcat -+#ifndef HAVE_STRLCAT -+unsigned int strlcat (char *dest, char *src, unsigned int size); -+#endif -+ - /* Define this if your system has fseeko */ - $_def_fseeko - #ifndef HAVE_FSEEKO diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad index d5acc54f3a8..2d158c0252b 100644 --- a/multimedia/mplayer-share/patches/patch-ad +++ b/multimedia/mplayer-share/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.2 2004/04/28 15:54:46 wiz Exp $ +$NetBSD: patch-ad,v 1.3 2004/07/17 19:06:36 wiz Exp $ ---- mp_msg.c.orig Fri Sep 12 17:46:16 2003 +--- mp_msg.c.orig 2003-09-12 17:46:16.000000000 +0200 +++ mp_msg.c @@ -34,6 +34,7 @@ void mp_msg_init(){ #ifdef MP_DEBUG @@ -10,14 +10,16 @@ $NetBSD: patch-ad,v 1.2 2004/04/28 15:54:46 wiz Exp $ fprintf(stdout, "Original dirname: %s\n", bindtextdomain(textdomain(NULL),NULL)); #endif setlocale(LC_ALL, ""); /* set from the environment variables */ -@@ -41,7 +42,10 @@ void mp_msg_init(){ +@@ -41,9 +42,12 @@ void mp_msg_init(){ textdomain("mplayer"); #ifdef MP_DEBUG fprintf(stdout, "Current domain: %s\n", textdomain(NULL)); +#if 0 fprintf(stdout, "Current dirname: %s\n\n", bindtextdomain(textdomain(NULL),NULL)); -+#endif -+#endif #endif #endif ++#endif ++#endif mp_msg_set_level(MSGL_STATUS); + } + diff --git a/multimedia/mplayer-share/patches/patch-ba b/multimedia/mplayer-share/patches/patch-ba deleted file mode 100644 index f134f68b097..00000000000 --- a/multimedia/mplayer-share/patches/patch-ba +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2004/07/02 17:07:21 drochner Exp $ - ---- Gui/interface.c.orig 2004-03-25 22:49:47.000000000 +0100 -+++ Gui/interface.c -@@ -54,8 +54,12 @@ char * gstrcat( char ** dest,char * src - if ( *dest ) - { - tmp=malloc( strlen( *dest ) + strlen( src ) + 1 ); -- strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest ); -- } -+ -+ if ( tmp ) /* TODO: advanced error handling */ -+ { -+ strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest ); -+ } -+ } - else - { tmp=malloc( strlen( src ) + 1 ); strcpy( tmp,src ); } - *dest=tmp; diff --git a/multimedia/mplayer-share/patches/patch-bb b/multimedia/mplayer-share/patches/patch-bb deleted file mode 100644 index bbe0b4bb9ff..00000000000 --- a/multimedia/mplayer-share/patches/patch-bb +++ /dev/null @@ -1,181 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2004/07/02 17:07:21 drochner Exp $ - ---- Gui/mplayer/common.c.orig 2003-03-20 13:42:09.000000000 +0100 -+++ Gui/mplayer/common.c -@@ -32,35 +32,39 @@ - - extern unsigned int GetTimerMS( void ); - --inline void TranslateFilename( int c,char * tmp ) -+inline void TranslateFilename( int c,char * tmp,size_t tmplen ) - { - int i; -+ char * p; -+ - switch ( guiIntfStruct.StreamType ) - { - case STREAMTYPE_STREAM: -- strcpy( tmp,guiIntfStruct.Filename ); -+ strlcpy(tmp, guiIntfStruct.Filename, tmplen); - break; - case STREAMTYPE_FILE: - if ( ( guiIntfStruct.Filename )&&( guiIntfStruct.Filename[0] ) ) - { -- if ( strrchr( guiIntfStruct.Filename,'/' ) ) strcpy( tmp,strrchr( guiIntfStruct.Filename,'/' ) + 1 ); -- else strcpy( tmp,guiIntfStruct.Filename ); -+ if ( p = strrchr(guiIntfStruct.Filename, '/') ) -+ strlcpy(tmp, p + 1, tmplen); -+ else -+ strlcpy(tmp, guiIntfStruct.Filename, tmplen); - if ( tmp[strlen( tmp ) - 4] == '.' ) tmp[strlen( tmp ) - 4]=0; - if ( tmp[strlen( tmp ) - 5] == '.' ) tmp[strlen( tmp ) - 5]=0; -- } else strcpy( tmp,MSGTR_NoFileLoaded ); -+ } else strlcpy( tmp,MSGTR_NoFileLoaded,tmplen ); - break; - #ifdef USE_DVDREAD - case STREAMTYPE_DVD: -- if ( guiIntfStruct.DVD.current_chapter ) sprintf( tmp,MSGTR_Chapter,guiIntfStruct.DVD.current_chapter ); -- else strcat( tmp,MSGTR_NoChapter ); -+ if ( guiIntfStruct.DVD.current_chapter ) snprintf(tmp,tmplen,MSGTR_Chapter,guiIntfStruct.DVD.current_chapter ); -+ else strlcat( tmp,MSGTR_NoChapter,tmplen ); - break; - #endif - #ifdef HAVE_VCD - case STREAMTYPE_VCD: -- sprintf( tmp,MSGTR_VCDTrack,guiIntfStruct.Track ); -+ snprintf( tmp,tmplen,MSGTR_VCDTrack,guiIntfStruct.Track ); - break; - #endif -- default: strcpy( tmp,MSGTR_NoMediaOpened ); -+ default: strlcpy( tmp,MSGTR_NoMediaOpened,tmplen ); - } - if ( c ) - { -@@ -74,75 +78,94 @@ inline void TranslateFilename( int c,cha - } - } - -+/* Unsafe! Pass only null-terminated strings as (char *)str. */ - char * Translate( char * str ) - { - static char trbuf[512]; - char tmp[512]; - int i,c; - int t; -+ int strsize = 0; - memset( trbuf,0,512 ); - memset( tmp,0,128 ); -- for ( c=0,i=0;i < (int)strlen( str );i++ ) -+ strsize = strlen(str); -+ for ( c=0,i=0;i < strsize;i++ ) - { - if ( str[i] != '$' ) { trbuf[c++]=str[i]; trbuf[c]=0; } - else - { - switch ( str[++i] ) - { -- case 't': sprintf( tmp,"%02d",guiIntfStruct.Track ); strcat( trbuf,tmp ); break; -- case 'o': TranslateFilename( 0,tmp ); strcat( trbuf,tmp ); break; -- case 'f': TranslateFilename( 1,tmp ); strcat( trbuf,tmp ); break; -- case 'F': TranslateFilename( 2,tmp ); strcat( trbuf,tmp ); break; -+ case 't': snprintf( tmp,sizeof( tmp ),"%02d",guiIntfStruct.Track ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case 'o': TranslateFilename( 0,tmp,sizeof( tmp ) ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case 'f': TranslateFilename( 1,tmp,sizeof( tmp ) ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case 'F': TranslateFilename( 2,tmp,sizeof( tmp ) ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; - case '6': t=guiIntfStruct.LengthInSec; goto calclengthhhmmss; - case '1': t=guiIntfStruct.TimeSec; - calclengthhhmmss: -- sprintf( tmp,"%02d:%02d:%02d",t/3600,t/60%60,t%60 ); strcat( trbuf,tmp ); -+ snprintf( tmp,sizeof( tmp ),"%02d:%02d:%02d",t/3600,t/60%60,t%60 ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); - break; - case '7': t=guiIntfStruct.LengthInSec; goto calclengthmmmmss; - case '2': t=guiIntfStruct.TimeSec; - calclengthmmmmss: -- sprintf( tmp,"%04d:%02d",t/60,t%60 ); strcat( trbuf,tmp ); -+ snprintf( tmp,sizeof( tmp ),"%04d:%02d",t/60,t%60 ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); - break; -- case '3': sprintf( tmp,"%02d",guiIntfStruct.TimeSec / 3600 ); strcat( trbuf,tmp ); break; -- case '4': sprintf( tmp,"%02d",( ( guiIntfStruct.TimeSec / 60 ) % 60 ) ); strcat( trbuf,tmp ); break; -- case '5': sprintf( tmp,"%02d",guiIntfStruct.TimeSec % 60 ); strcat( trbuf,tmp ); break; -- case '8': sprintf( tmp,"%01d:%02d:%02d",guiIntfStruct.TimeSec / 3600,( guiIntfStruct.TimeSec / 60 ) % 60,guiIntfStruct.TimeSec % 60 ); strcat( trbuf,tmp ); break; -- case 'v': sprintf( tmp,"%3.2f%%",guiIntfStruct.Volume ); strcat( trbuf,tmp ); break; -- case 'V': sprintf( tmp,"%3.1f",guiIntfStruct.Volume ); strcat( trbuf,tmp ); break; -- case 'b': sprintf( tmp,"%3.2f%%",guiIntfStruct.Balance ); strcat( trbuf,tmp ); break; -- case 'B': sprintf( tmp,"%3.1f",guiIntfStruct.Balance ); strcat( trbuf,tmp ); break; -- case 'd': sprintf( tmp,"%d",guiIntfStruct.FrameDrop ); strcat( trbuf,tmp ); break; -- case 'x': sprintf( tmp,"%d",guiIntfStruct.MovieWidth ); strcat( trbuf,tmp ); break; -- case 'y': sprintf( tmp,"%d",guiIntfStruct.MovieHeight ); strcat( trbuf,tmp ); break; -- case 'C': sprintf( tmp,"%s", guiIntfStruct.sh_video? ((sh_video_t *)guiIntfStruct.sh_video)->codec->name : ""); -- strcat( trbuf,tmp ); break; -- case 's': if ( guiIntfStruct.Playing == 0 ) strcat( trbuf,"s" ); break; -- case 'l': if ( guiIntfStruct.Playing == 1 ) strcat( trbuf,"p" ); break; -- case 'e': if ( guiIntfStruct.Playing == 2 ) strcat( trbuf,"e" ); break; -+ case '3': snprintf( tmp,sizeof( tmp ),"%02d",guiIntfStruct.TimeSec / 3600 ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case '4': snprintf( tmp,sizeof( tmp ),"%02d",( ( guiIntfStruct.TimeSec / 60 ) % 60 ) ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case '5': snprintf( tmp,sizeof( tmp ),"%02d",guiIntfStruct.TimeSec % 60 ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case '8': snprintf( tmp,sizeof( tmp ),"%01d:%02d:%02d",guiIntfStruct.TimeSec / 3600,( guiIntfStruct.TimeSec / 60 ) % 60,guiIntfStruct.TimeSec % 60 ); strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case 'v': snprintf( tmp,sizeof( tmp ),"%3.2f%%",guiIntfStruct.Volume ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case 'V': snprintf( tmp,sizeof( tmp ),"%3.1f",guiIntfStruct.Volume ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case 'b': snprintf( tmp,sizeof( tmp ),"%3.2f%%",guiIntfStruct.Balance ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case 'B': snprintf( tmp,sizeof( tmp ),"%3.1f",guiIntfStruct.Balance ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case 'd': snprintf( tmp,sizeof( tmp ),"%d",guiIntfStruct.FrameDrop ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case 'x': snprintf( tmp,sizeof( tmp ),"%d",guiIntfStruct.MovieWidth ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case 'y': snprintf( tmp,sizeof( tmp ),"%d",guiIntfStruct.MovieHeight ); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case 'C': snprintf( tmp,sizeof( tmp ),"%s", guiIntfStruct.sh_video? ((sh_video_t *)guiIntfStruct.sh_video)->codec->name : ""); -+ strlcat( trbuf,tmp,sizeof( trbuf ) ); break; -+ case 's': if ( guiIntfStruct.Playing == 0 ) strlcat( trbuf,"s",sizeof( trbuf ) ); break; -+ case 'l': if ( guiIntfStruct.Playing == 1 ) strlcat( trbuf,"p",sizeof( trbuf ) ); break; -+ case 'e': if ( guiIntfStruct.Playing == 2 ) strlcat( trbuf,"e",sizeof( trbuf ) ); break; - case 'a': -- if ( muted ) { strcat( trbuf,"n" ); break; } -+ if ( muted ) { strlcat( trbuf,"n",sizeof( trbuf ) ); break; } - switch ( guiIntfStruct.AudioType ) - { -- case 0: strcat( trbuf,"n" ); break; -- case 1: strcat( trbuf,"m" ); break; -- case 2: strcat( trbuf,"t" ); break; -+ case 0: strlcat( trbuf,"n",sizeof( trbuf ) ); break; -+ case 1: strlcat( trbuf,"m",sizeof( trbuf ) ); break; -+ case 2: strlcat( trbuf,"t",sizeof( trbuf ) ); break; - } - break; - case 'T': - switch ( guiIntfStruct.StreamType ) - { -- case STREAMTYPE_FILE: strcat( trbuf,"f" ); break; -+ case STREAMTYPE_FILE: strlcat( trbuf,"f",sizeof( trbuf ) ); break; - #ifdef HAVE_VCD -- case STREAMTYPE_VCD: strcat( trbuf,"v" ); break; -+ case STREAMTYPE_VCD: strlcat( trbuf,"v",sizeof( trbuf ) ); break; - #endif -- case STREAMTYPE_STREAM: strcat( trbuf,"u" ); break; -+ case STREAMTYPE_STREAM: strlcat( trbuf,"u",sizeof( trbuf ) ); break; - #ifdef USE_DVDREAD -- case STREAMTYPE_DVD: strcat( trbuf,"d" ); break; -+ case STREAMTYPE_DVD: strlcat( trbuf,"d",sizeof( trbuf ) ); break; - #endif -- default: strcat( trbuf," " ); break; -+ default: strlcat( trbuf," ",sizeof( trbuf ) ); break; - } - break; -- case '$': strcat( trbuf,"$" ); break; -+ case '$': strlcat( trbuf,"$",sizeof( trbuf ) ); break; - default: continue; - } - c=strlen( trbuf ); diff --git a/multimedia/mplayer-share/patches/patch-bc b/multimedia/mplayer-share/patches/patch-bc deleted file mode 100644 index 84d1b74abf0..00000000000 --- a/multimedia/mplayer-share/patches/patch-bc +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2004/07/02 17:07:21 drochner Exp $ - ---- Gui/skin/font.c.orig 2003-03-20 13:42:15.000000000 +0100 -+++ Gui/skin/font.c -@@ -27,7 +27,7 @@ int fntAddNewFont( char * name ) - - if ( ( Fonts[id]=calloc( 1,sizeof( bmpFont ) ) ) == NULL ) return -1; - -- strcpy( Fonts[id]->name,name ); -+ strlcpy( Fonts[id]->name,name,128 ); // FIXME: as defined in font.h - for ( i=0;i<256;i++ ) - Fonts[id]->Fnt[i].x=Fonts[id]->Fnt[i].y=Fonts[id]->Fnt[i].sx=Fonts[id]->Fnt[i].sy=-1; - -@@ -60,7 +60,8 @@ int fntRead( char * path,char * fname ) - - if ( id < 0 ) return id; - -- strcpy( tmp,path ); strcat( tmp,fname ); strcat( tmp,".fnt" ); -+ strlcpy( tmp,path,sizeof( tmp ) ); -+ strlcat( tmp,fname,sizeof( tmp ) ); strlcat( tmp,".fnt",sizeof( tmp ) ); - if ( ( f=fopen( tmp,"rt" ) ) == NULL ) - { free( Fonts[id] ); return -3; } - -@@ -93,7 +94,7 @@ int fntRead( char * path,char * fname ) - { - if ( !strcmp( command,"image" ) ) - { -- strcpy( tmp,path ); strcat( tmp,param ); -+ strlcpy( tmp,path,sizeof( tmp ) ); strlcat( tmp,param,sizeof( tmp ) ); - mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[font] font imagefile: %s\n",tmp ); - if ( skinBPRead( tmp,&Fonts[id]->Bitmap ) ) return -4; - } diff --git a/multimedia/mplayer-share/patches/patch-bd b/multimedia/mplayer-share/patches/patch-bd deleted file mode 100644 index e91cdad984e..00000000000 --- a/multimedia/mplayer-share/patches/patch-bd +++ /dev/null @@ -1,107 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2004/07/02 17:07:21 drochner Exp $ - ---- Gui/skin/skin.c.orig 2003-06-03 19:36:25.000000000 +0200 -+++ Gui/skin/skin.c -@@ -116,7 +116,7 @@ int cmd_window( char * in ) - { - CHECKDEFLIST( "window" ); - -- strcpy( window_name,strlower( in ) ); -+ strlcpy( window_name,strlower( in ),sizeof( window_name ) ); - if ( !strncmp( in,"main",4 ) ) { currSection=&skinAppMPlayer->main; currSubItem=&skinAppMPlayer->NumberOfItems; currSubItems=skinAppMPlayer->Items; } - else if ( !strncmp( in,"sub",3 ) ) currSection=&skinAppMPlayer->sub; - else if ( !strncmp( in,"playbar",7 ) ) { currSection=&skinAppMPlayer->bar; currSubItem=&skinAppMPlayer->NumberOfBarItems; currSubItems=skinAppMPlayer->barItems; } -@@ -147,7 +147,7 @@ int cmd_base( char * in ) - defList->main.x=x; - defList->main.y=y; - defList->main.type=itBase; -- strcpy( tmp,path ); strcat( tmp,fname ); -+ strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, fname, sizeof( tmp )); - if ( skinBPRead( tmp,&defList->main.Bitmap ) ) return 1; - defList->main.width=defList->main.Bitmap.Width; - defList->main.height=defList->main.Bitmap.Height; -@@ -162,7 +162,7 @@ int cmd_base( char * in ) - if ( !strcmp( window_name,"sub" ) ) - { - defList->sub.type=itBase; -- strcpy( tmp,path ); strcat( tmp,fname ); -+ strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, fname, sizeof( tmp )); - if ( skinBPRead( tmp,&defList->sub.Bitmap ) ) return 1; - defList->sub.x=x; - defList->sub.y=y; -@@ -179,7 +179,7 @@ int cmd_base( char * in ) - { - defList->menuIsPresent=1; - defList->menuBase.type=itBase; -- strcpy( tmp,path ); strcat( tmp,fname ); -+ strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, fname, sizeof( tmp )); - if ( skinBPRead( tmp,&defList->menuBase.Bitmap ) ) return 1; - defList->menuBase.width=defList->menuBase.Bitmap.Width; - defList->menuBase.height=defList->menuBase.Bitmap.Height; -@@ -197,7 +197,7 @@ int cmd_base( char * in ) - defList->bar.x=x; - defList->bar.y=y; - defList->bar.type=itBase; -- strcpy( tmp,path ); strcat( tmp,fname ); -+ strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, fname, sizeof( tmp )); - if ( skinBPRead( tmp,&defList->bar.Bitmap ) ) return 1; - defList->bar.width=defList->bar.Bitmap.Width; - defList->bar.height=defList->bar.Bitmap.Height; -@@ -268,7 +268,7 @@ int cmd_button( char * in ) - currSubItems[ *currSubItem ].Bitmap.Image=NULL; - if ( strcmp( fname,"NULL" ) ) - { -- strcpy( tmp,path ); strcat( tmp,fname ); -+ strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, fname, sizeof( tmp )); - if ( skinBPRead( tmp,&currSubItems[ *currSubItem ].Bitmap ) ) return 1; - } - -@@ -289,7 +289,7 @@ int cmd_selected( char * in ) - - cutItem( in,fname,',',0 ); - defList->menuSelected.type=itBase; -- strcpy( tmp,path ); strcat( tmp,fname ); -+ strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, fname, sizeof( tmp )); - mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"\n[skin] selected: %s\n",fname ); - if ( skinBPRead( tmp,&defList->menuSelected.Bitmap ) ) return 1; - defList->menuSelected.width=defList->menuSelected.Bitmap.Width; -@@ -381,14 +381,14 @@ int cmd_hpotmeter( char * in ) - item->Bitmap.Image=NULL; - if ( strcmp( phfname,"NULL" ) ) - { -- strcpy( tmp,path ); strcat( tmp,phfname ); -+ strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, phfname, sizeof( tmp )); - if ( skinBPRead( tmp,&item->Bitmap ) ) return 1; - } - - item->Mask.Image=NULL; - if ( strcmp( pfname,"NULL" ) ) - { -- strcpy( tmp,path ); strcat( tmp,pfname ); -+ strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, pfname, sizeof( tmp )); - if ( skinBPRead( tmp,&item->Mask ) ) return 1; - } - return 0; -@@ -445,7 +445,7 @@ int cmd_potmeter( char * in ) - item->Bitmap.Image=NULL; - if ( strcmp( phfname,"NULL" ) ) - { -- strcpy( tmp,path ); strcat( tmp,phfname ); -+ strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, phfname, sizeof( tmp )); - if ( skinBPRead( tmp,&item->Bitmap ) ) return 1; - } - return 0; -@@ -655,7 +655,12 @@ char * trim( char * in ) - FILE * skinFile; - - void setname( char * item1, char * item2 ) --{ strcpy( fn,item1 ); strcat( fn,"/" ); strcat( fn,item2 ); strcpy( path,fn ); strcat( path,"/" ); strcat( fn,"/skin" ); } -+{ -+ strlcpy(fn, item1, sizeof( fn )); -+ strlcat(fn, "/", sizeof( fn )); strlcat(fn, item2, sizeof( fn )); -+ strlcpy(path, fn, sizeof( path )); strlcat(path, "/", sizeof( path )); -+ strlcat(fn, "/skin", sizeof( fn )); -+} - - int skinRead( char * dname ) - { diff --git a/multimedia/mplayer-share/patches/patch-be b/multimedia/mplayer-share/patches/patch-be deleted file mode 100644 index f6ae78d6e59..00000000000 --- a/multimedia/mplayer-share/patches/patch-be +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-be,v 1.1 2004/07/02 17:07:21 drochner Exp $ - ---- libmenu/menu_console.c.orig 2003-09-13 20:02:20.000000000 +0200 -+++ libmenu/menu_console.c -@@ -150,8 +150,10 @@ static void add_string(struct menu_priv_ - return; - } - priv->lines[ll] = realloc(priv->lines[ll],strlen(priv->lines[ll]) + strlen(l) + 1); -- strcat(priv->lines[ll],l); -- -+ if ( priv->lines[ll] != NULL ) -+ { -+ strcat(priv->lines[ll],l); -+ } - } - - static void draw(menu_t* menu, mp_image_t* mpi) { diff --git a/multimedia/mplayer-share/patches/patch-bf b/multimedia/mplayer-share/patches/patch-bf deleted file mode 100644 index 03cfab5daf6..00000000000 --- a/multimedia/mplayer-share/patches/patch-bf +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-bf,v 1.1 2004/07/02 17:07:21 drochner Exp $ - ---- libmpdemux/cue_read.c.orig 2003-10-04 19:29:00.000000000 +0200 -+++ libmpdemux/cue_read.c -@@ -135,6 +135,10 @@ int cue_getTrackinfo(char *Line, tTrack - - - -+/* FIXME: the string operations ( strcpy,strcat ) below depend -+ * on the arrays to have the same size, thus we need to make -+ * sure the sizes are in sync. -+ */ - int cue_find_bin (char *firstline) { - int i,j; - char s[256]; -@@ -178,7 +182,7 @@ int cue_find_bin (char *firstline) { - bin_filename); - - /* now try to find it with the path of the cue file */ -- sprintf(s,"%s/%s",bincue_path, bin_filename); -+ snprintf(s,sizeof( s ),"%s/%s",bincue_path,bin_filename); - fd_bin = open (s, O_RDONLY); - if (fd_bin == -1) - { -@@ -195,7 +199,7 @@ int cue_find_bin (char *firstline) { - "[bincue] bin filename tested: %s\n", s); - - /* ok try it with path */ -- sprintf(t,"%s/%s",bincue_path, s); -+ snprintf(t, sizeof( t ), "%s/%s", bincue_path, s); - fd_bin = open (t, O_RDONLY); - if (fd_bin == -1) - { -@@ -211,7 +215,7 @@ int cue_find_bin (char *firstline) { - mp_msg(MSGT_OPEN,MSGL_STATUS, - "[bincue] bin filename tested: %s \n", s); - /* ok try it with path */ -- sprintf(t,"%s/%s",bincue_path, s); -+ snprintf(t, sizeof( t ), "%s/%s", bincue_path, s); - fd_bin = open (t, O_RDONLY); - if (fd_bin == -1) - { -@@ -299,15 +303,16 @@ int cue_read_cue (char *in_cue_filename) - strcpy(t, "/"); - } - printf ("dirname: %s\n", t); -- strcpy(bincue_path,t); -+ strlcpy(bincue_path,t,sizeof( bincue_path )); - - - /* no path at all? */ - if (strcmp(bincue_path, ".") == 0) { - printf ("bincue_path: %s\n", bincue_path); -- strcpy(cue_filename,in_cue_filename); -+ strlcpy(cue_filename,in_cue_filename,sizeof( cue_filename )); - } else { -- strcpy(cue_filename,in_cue_filename + strlen(bincue_path) + 1); -+ strlcpy(cue_filename,in_cue_filename + strlen(bincue_path) + 1, -+ sizeof( cue_filename )); - } - - diff --git a/multimedia/mplayer-share/patches/patch-bg b/multimedia/mplayer-share/patches/patch-bg deleted file mode 100644 index 29d5dd317f4..00000000000 --- a/multimedia/mplayer-share/patches/patch-bg +++ /dev/null @@ -1,71 +0,0 @@ -$NetBSD: patch-bg,v 1.1 2004/07/02 17:07:21 drochner Exp $ - ---- libvo/vo_dxr3.c.orig 2003-11-30 17:36:10.000000000 +0100 -+++ libvo/vo_dxr3.c -@@ -175,12 +175,14 @@ int dxr3_overlay = 0; - int dxr3_device_num = 0; - int dxr3_norm = 0; - -+#define MAX_STR_SIZE 80 /* length for the static strings */ -+ - /* File descriptors */ - static int fd_control = -1; - static int fd_video = -1; - static int fd_spu = -1; --static char fdv_name[80]; --static char fds_name[80]; -+static char fdv_name[MAX_STR_SIZE]; -+static char fds_name[MAX_STR_SIZE]; - - #ifdef SPU_SUPPORT - /* on screen display/subpics */ -@@ -865,7 +867,7 @@ static void check_events(void) - - static uint32_t preinit(const char *arg) - { -- char devname[80]; -+ char devname[MAX_STR_SIZE]; - int fdflags = O_WRONLY; - - /* Parse commandline */ -@@ -1136,13 +1138,13 @@ static int overlay_read_state(overlay_t - int j; - - if(!p) { -- strcpy(fname,getenv("HOME")); -- strcat(fname,"/.overlay"); -+ strlcpy(fname, getenv("HOME"), sizeof( fname )); -+ strlcat(fname,"/.overlay", sizeof( fname )); - } else -- strcpy(fname,p); -+ strlcpy(fname, p, sizeof( fname )); - - sprintf(tmp,"/res_%dx%dx%d",o->xres,o->yres,o->depth); -- strcat(fname,tmp); -+ strlcat(fname, tmp, sizeof( fname )); - - if(!(fp=fopen(fname,"r"))) - return -1; -@@ -1199,10 +1201,10 @@ static int overlay_write_state(overlay_t - int i,j; - - if(!p) { -- strcpy(fname,getenv("HOME")); -- strcat(fname,"/.overlay"); -+ strlcpy(fname, getenv("HOME"), sizeof( fname )); -+ strlcat(fname,"/.overlay", sizeof( fname )); - } else -- strcpy(fname,p); -+ strlcpy(fname, p, sizeof( fname )); - - if(access(fname, W_OK|X_OK|R_OK)) { - if(mkdir(fname,0766)) -@@ -1210,7 +1212,7 @@ static int overlay_write_state(overlay_t - } - - sprintf(tmp,"/res_%dx%dx%d",o->xres,o->yres,o->depth); -- strcat(fname,tmp); -+ strlcat(fname, tmp, sizeof( fname )); - - if(!(fp=fopen(fname,"w"))) - return -1; diff --git a/multimedia/mplayer-share/patches/patch-bh b/multimedia/mplayer-share/patches/patch-bh deleted file mode 100644 index 1516c5ca1a7..00000000000 --- a/multimedia/mplayer-share/patches/patch-bh +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bh,v 1.1 2004/07/02 17:07:21 drochner Exp $ - ---- osdep/Makefile.orig 2004-03-26 16:21:44.000000000 +0100 -+++ osdep/Makefile -@@ -3,7 +3,8 @@ include ../config.mak - - LIBNAME = libosdep.a - --SRCS= shmem.c strsep.c vsscanf.c scandir.c gettimeofday.c fseeko.c # timer.c -+SRCS= shmem.c strsep.c strl.c vsscanf.c scandir.c gettimeofday.c fseeko.c \ -+ # timer.c - - ifeq ($(TARGET_ARCH_X86),yes) - ifeq ($(TARGET_OS),Linux) diff --git a/multimedia/mplayer-share/patches/patch-bi b/multimedia/mplayer-share/patches/patch-bi deleted file mode 100644 index cd525fd152b..00000000000 --- a/multimedia/mplayer-share/patches/patch-bi +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-bi,v 1.1 2004/07/02 17:07:21 drochner Exp $ - ---- osdep/strl.c.orig 2004-07-02 18:19:09.000000000 +0200 -+++ osdep/strl.c -@@ -0,0 +1,47 @@ -+/* strl(cat|cpy) implementation for systems that do not have it in libc */ -+/* strl.c - strlcpy/strlcat implementation -+ * Time-stamp: <2004-03-14 njk> -+ * (C) 2003-2004 Nicholas J. Kain <njk@aerifal.cx> -+ */ -+ -+#include "../config.h" -+ -+#ifndef HAVE_STRLCPY -+unsigned int strlcpy (char *dest, char *src, unsigned int size) -+{ -+ register unsigned int i; -+ -+ for (i=0; size > 0 && src[i] != '\0'; ++i, size--) -+ dest[i] = src[i]; -+ -+ dest[i] = '\0'; -+ -+ return i; -+} -+#endif -+ -+#ifndef HAVE_STRLCAT -+unsigned int strlcat (char *dest, char *src, unsigned int size) -+{ -+#if 0 -+ register unsigned int i, j; -+ -+ for(i=0; size > 0 && dest[i] != '\0'; size--, i++); -+ for(j=0; size > 0 && src[j] != '\0'; size--, i++, j++) -+ dest[i] = src[j]; -+ -+ dest[i] = '\0'; -+ return i; -+#else -+ register char *d = dest, *s = src; -+ -+ for (; size > 0 && *d != '\0'; size--, d++); -+ for (; size > 0 && *s != '\0'; size--, d++, s++) -+ *d = *s; -+ -+ *d = '\0'; -+ return (d - dest) + (s - src); -+#endif -+} -+#endif -+ diff --git a/multimedia/mplayer-share/patches/patch-bj b/multimedia/mplayer-share/patches/patch-bj deleted file mode 100644 index cad3b77d899..00000000000 --- a/multimedia/mplayer-share/patches/patch-bj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bj,v 1.1 2004/07/02 17:07:21 drochner Exp $ - ---- playtree.c.orig 2003-07-08 12:45:05.000000000 +0200 -+++ playtree.c -@@ -936,7 +936,7 @@ void pt_add_file(play_tree_t** ppt, char - - void pt_add_gui_file(play_tree_t** ppt, char* path, char* file) - { -- char* wholename = malloc(strlen(path)+strlen(file)+3); -+ char* wholename = malloc(strlen(path)+strlen(file)+2); - - if (wholename) - { diff --git a/multimedia/mplayer-share/patches/patch-bk b/multimedia/mplayer-share/patches/patch-bk deleted file mode 100644 index 59ec4e14986..00000000000 --- a/multimedia/mplayer-share/patches/patch-bk +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bk,v 1.1 2004/07/02 17:07:21 drochner Exp $ - ---- subreader.c.orig 2004-04-06 13:52:31.000000000 +0200 -+++ subreader.c -@@ -1109,7 +1109,7 @@ subtitle* subcp_recode1 (subtitle *sub) - while (l){ - char *ip = icbuffer; - char *op = sub->text[--l]; -- strcpy(ip, op); -+ strlcpy(ip, op, ICBUFFSIZE); - ileft = strlen(ip); - oleft = ICBUFFSIZE - 1; - diff --git a/multimedia/mplayer-share/patches/patch-bl b/multimedia/mplayer-share/patches/patch-bl deleted file mode 100644 index 8094d6c4dc9..00000000000 --- a/multimedia/mplayer-share/patches/patch-bl +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-bl,v 1.1 2004/07/02 17:07:21 drochner Exp $ - ---- vidix/vidixlib.c.orig 2003-10-02 17:33:12.000000000 +0200 -+++ vidix/vidixlib.c -@@ -122,8 +122,8 @@ static int vdl_probe_driver(VDL_HANDLE s - unsigned (*_ver)(void); - int (*_probe)(int,int); - int (*_cap)(vidix_capability_t*); -- strcpy(drv_name,path); -- strcat(drv_name,name); -+ strlcpy(drv_name,path, sizeof( drv_name )); -+ strlcat(drv_name,name, sizeof( drv_name )); - if(verbose) printf("vidixlib: PROBING: %s\n",drv_name); - if(!(t_vdl(stream)->handle = dlopen(drv_name,RTLD_LAZY|RTLD_GLOBAL))) - { -@@ -194,8 +194,8 @@ VDL_HANDLE vdlOpen(const char *path,cons - unsigned (*ver)(void); - int (*probe)(int,int); - unsigned version = 0; -- strcpy(drv_name,path); -- strcat(drv_name,name); -+ strlcpy(drv_name,path, sizeof( drv_name )); -+ strlcat(drv_name,name, sizeof( drv_name )); - if(!(t_vdl(stream)->handle = dlopen(drv_name,RTLD_NOW|RTLD_GLOBAL))) - { - if (verbose) diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 47011283ffd..87c1581c9f9 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2004/06/26 18:37:06 grant Exp $ +# $NetBSD: Makefile,v 1.9 2004/07/17 19:06:36 wiz Exp $ PKGNAME= mplayer-${MPLAYER_PKG_VERSION} -PKGREVISION= 1 COMMENT= Software-only MPEG-1/2/4 video decoder |