summaryrefslogtreecommitdiff
path: root/audio
AgeCommit message (Collapse)AuthorFilesLines
2015-12-18Fix build problem on NetBSD 6.1_STABLE.taca2-1/+27
Avoid to multiple declaration by typedef.
2015-12-10Bump PKGREVISION. Remove rejected patch.ryoon3-20/+3
2015-12-09set LDFLAGS on SunOSwiedi1-2/+2
2015-12-06Explicitly restrict PHP_VERSIONS_ACCEPTED to 55 and 56 for packages whichtaca1-1/+2
use php-mysql package.
2015-12-06Remove patch that was integrated upstream.wiz1-16/+0
2015-12-06Update libopenmpt to 0.2.5787:wiz2-9/+10
* [Change] The Autotools build system does strict checking of all dependencies now. Instead of best effort auto-magic detection of all potentially optional dependencies, the default set of dependencies is now enforced unless each individual dependency gets explicitely disabled via --without-foo or --disable-foo ./configure switches. Run ./configure --help for the full list of options. * [Bug] Some MOD files were erroneously detected as 669 files. * [Bug] Some malformed AMF files could result in very long loading times. * [Bug] Fixed crashes in IMF and MT2 loaders. * [Bug] MTM files generated by UNMO3 were not loaded properly. * Improved MTM playback. * make CONFIG=haiku for Haiku has been added. * Language bindings for FreeBASIC have been added (see libopenmpt/bindings/).
2015-12-05Extend PYTHON_VERSIONS_INCOMPATIBLE to 35adam31-62/+62
2015-12-04Remove obsolete patch (after update to 1.0.26)wiz1-36/+0
2015-12-04Update libsndfile to 1.0.26:wiz5-67/+24
Version 1.0.26 (2015-11-22) * Fix for CVE-2014-9496, SD2 buffer read overflow. * Fix for CVE-2014-9756, file_io.c divide by zero. * Fix for CVE-2015-7805, AIIF heap write overflow. * Add support for ALAC encoder in a CAF container. * Add support for Cart chunks in WAV files. * Minor bug fixes and improvements.
2015-12-02Update libopus to 1.1.1:wiz3-44/+7
This Opus 1.1.1 release brings many optimizations to the encoder and decoder, including: * x86 SSE, SSE2 and SSE4.1 intrinsics optimizations with run-time CPU detection contributed by Cisco Systems, * MIPS intrinsics optimizations contributed by Imagination Technologies, * ARM Neon optimizations contributed by Linaro and ARM, * many architecture-independent optimizations and memory footprint reductions that should improve performance on all platforms, and * several minor bug fixes. The quality of the encoder should be mostly unchanged compared to version 1.1.
2015-11-27Add missing includes to bl3.mk.wiz1-1/+4
2015-11-25Remove mk/find-prefix.mk usage from the audio category.jperkin2-8/+5
The find-prefix infrastructure was required in a pkgviews world where packages installed from pkgsrc could have different installation prefixes, and this was a way for a dependency prefix to be determined. Now that pkgviews has been removed there is no longer any need for the overhead of this infrastructure. Instead we use BUILDLINK_PREFIX.pkg for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the dependency is coming from pkgsrc. Provides a reasonable performance win due to the reduction of `pkg_info -qp` calls, some of which were redundant anyway as they were duplicating the same information provided by BUILDLINK_PREFIX.pkg.
2015-11-24Changes 1.3.2:adam2-13/+11
* Bugfix: Fixed tags from filename dialog not opening on new installations
2015-11-23Update libshout to 2.4.1.wiz4-13/+14
Set LICENSE. Fix installed pkg-config file. Remove unnecessary includes from bl3.mk. Enable speex support. libshout 2.4.1 (20151120) * Fixed issue with missing file in distribution libshout 2.4.0 (20151111) * Audio only WebM support. * Protocol level meta data support improved. Some API calls got replaced and marked as obsolete. * Code hardened. * Fixed overlinking. * Removed Debian packaging. * TLS support (RFC2818 and RFC2817, mode can be autodetected). * Improved HTTP protocol: * Set Host:-header (vhosting), * Check for server capabilities. * Basic support for RoarAudio protocol.
2015-11-21Fix building with newer OS X API.adam2-1/+35
2015-11-20Don't link against libcompat, since ftime hasn't been used for a while.joerg4-2/+92
Fixes build of dynamic library. Bump revision.
2015-11-18Recursive revbump from multimedia/libvpxryoon15-27/+30
2015-11-18Update gstreamer1 and plugins to 1.6.1.wiz1-2/+1
GStreamer 1.6.1 Release Notes The GStreamer team is proud to announce the first bugfix release in the stable 1.6 release series of your favourite cross-platform multimedia framework! This release only contains bugfixes and it is safe to update from 1.6.0. For a full list of bugfixes see Bugzilla. See http://gstreamer.freedesktop.org/releases/1.6/ for the latest version of this document. Last updated: Friday 30 October 2015, 14:00 UTC (log) Major bugfixes Crashes in the gst-libav encoders were fixed More DASH-IF test streams are working now Live DASH, HLS and MS SmoothStreaming streams work more reliable and other fixes for the adaptive streaming protocols Reverse playback works with scaletempo to keep the audio pitch Correct stream-time is reported for negative applied_rate SRTP packet validation during decoding does not reject valid packets anymore Fixes for audioaggregator and aggregator to start producing output at the right time, and e.g. not outputting lots of silence in the beginning gst-libav's internal ffmpeg snapshot was updated to 2.8.1 cerbero has support for Mac OS X 10.11 (El Capitan) Various memory leaks were fixed, including major leaks in playbin, playsink and decodebin Various GObject-Introspection annotation fixes for bindings and many, many more GStreamer 1.6 Release Notes The GStreamer team is proud to announce a new major feature release in the stable 1.x API series of your favourite cross-platform multimedia framework! This release has been in the works for more than a year and is packed with new features, bug fixes and other improvements. See http://gstreamer.freedesktop.org/releases/1.6/ for the latest version of this document. Highlights Stereoscopic 3D and multiview video support Trick mode API for key-frame only fast-forward/fast-reverse playback etc. Improved DTS (decoding timestamp) vs. PTS (presentation timestamp) handling to account for negative DTS New GstVideoConverter API for more optimised and more correct conversion of raw video frames between all supported formats, with rescaling v4l2src now supports renegotiation v4l2transform can now do scaling V4L2 Element now report Colorimetry properly Easier chunked recording of MP4, Matroska, Ogg, MPEG-TS: new splitmuxsink and multifilesink improvements Content Protection signalling API and Common Encryption (CENC) support for DASH/MP4 Many adaptive streaming (DASH, HLS and MSS) improvements New PTP and NTP network client clocks and better remote clock tracking stability High-quality text subtitle overlay at display resolutions with glimagesink or gtkglsink RECORD support for the GStreamer RTSP Server Retransmissions (RTX) support in RTSP server and client RTSP seeking support in client and server has been fixed RTCP scheduling improvements and reduced size RTCP support MP4/MOV muxer acquired a new "robust" mode of operation which attempts to keep the output file in a valid state at all times Live mixing support in aggregator, audiomixer and compositor was improved a lot compositor now also supports rescaling of inputs streams on the fly New audiointerleave element with proper input synchronisation and live input support Blackmagic Design DeckLink capture and playback card support was rewritten from scratch; 2k/4k support; mode sensing KLV metadata support in RTP and MPEG-TS H.265 video encoder (x265), decoders (libav, libde265) and RTP payloader and depayloaders New DTLS plugin and SRTP/DTLS support OpenGL3 support, multiple contexts and context propagation, 3D video, transfer/conversion separation, subtitle blending New OpenGL-based QML video sink, Gtk GL video sink, CoreAnimation CAOpenGLLayerSink video sink gst-libav switched to ffmpeg as libav-provider, gains support for 3D/multiview video, trick modes, and the CAVS codec GstHarness API for unit tests gst-editing-services got a completely new ges-launch-1.0 interface, improved mixing support and integration into gst-validate gnonlin has been deprecated in favor of nle (Non Linear Engine) in gst-editing-services gst-validate has a new plugin system, an extensive default testsuite, support for concurrent test runs and valgrind support cerbero build tool for SDK binary packages gains new 'bundle-source' command Various improvements to the Android, iOS, OS X and Windows platform support Full log at http://gstreamer.freedesktop.org/releases/1.6/
2015-11-17Update taglib to 1.10:wiz3-9/+13
TagLib 1.10 (Nov 11, 2015) ========================== 1.10: * Added new options to the tagwriter example. * Fixed self-assignment operator in some types. * Fixed extraction of MP4 tag keys with an empty list. 1.10 BETA: * New API for the audio length in milliseconds. * Added support for ID3v2 ETCO and SYLT frames. * Added support for album artist in PropertyMap API of MP4 files. * Added support for embedded frames in ID3v2 CHAP and CTOC frames. * Added support for AIFF-C files. * Better handling of duplicate ID3v2 tags in MPEG files. * Allowed generating taglib.pc on Windows. * Added ZLIB_SOURCE build option. * Fixed backwards-incompatible change in TagLib::String when constructing UTF16 strings. * Fixed crash when parsing certain FLAC files. * Fixed crash when encoding empty strings. * Fixed saving of certain XM files on OS X. * Changed Xiph and APE generic getters to return space-concatenated values. * Fixed possible file corruptions when removing tags from WAV files. * Added support for MP4 files with 64-bit atoms in certain 64-bit environments. * Prevented ID3v2 padding from being too large. * Fixed crash when parsing corrupted APE files. * Fixed crash when parsing corrupted WAV files. * Fixed crash when parsing corrupted Ogg FLAC files. * Fixed crash when parsing corrupted MPEG files. * Fixed saving empty tags in WAV files. * Fixed crash when parsing corrupted Musepack files. * Fixed possible memory leaks when parsing AIFF and WAV files. * Fixed crash when parsing corrupted MP4 files. * Stopped writing empty ID3v2 frames. * Fixed possible file corruptions when saving WMA files. * Added TagLib::MP4::Tag::isEmpty(). * Added accessors to manipulate MP4 tags. * Fixed crash when parsing corrupted WavPack files. * Fixed seeking MPEG frames. * Fixed reading FLAC files with zero-sized padding blocks. * Added support for reading the encoder information of WMA files. * Added support for reading the codec of WAV files. * Added support for multi channel WavPack files. * Added support for reading the nominal bitrate of Ogg Speex files. * Added support for VBR headers in MPEG files. * Marked FLAC::File::streamInfoData() deprecated. It returns an empty ByteVector. * Marked FLAC::File::streamLength() deprecated. It returns zero. * Fixed possible file corruptions when adding an ID3v1 tag to FLAC files. * Many smaller bug fixes and performance improvements.
2015-11-09Avoid screwing with libc feature-hiding macros in ways that overtlydholland2-8/+12
break the build.
2015-11-09Remove second patch for same file. Hi, joerg of 2005.dholland1-13/+0
2015-11-07MacOS doesn't support this audio interface.dholland1-2/+2
2015-11-07MacOS doesn't have OSS; mask this plugin.dholland1-1/+4
2015-11-07Improve endian detection; should (with a bit of luck at least) fixdholland2-6/+21
build on MacOS, OpenBSD, and Bitrig. Note: There's enough stylized goop here that lots of packages will need to know about that we should consider creating a USE_FEATURES for sys/endian.h.
2015-11-06Update libopenmpt to 0.2.5705.wiz3-13/+27
libopenmpt 0.2-beta15 (2015-10-31) [Change] openmpt123: SDL2 is now supported and preferred to SDL1 if available. [Bug] Emscripten support for older emscripten versions broke in -beta14. These are now supported again when using make CONFIG=emscripten-old. [Bug] Fixed crashes in MED loader. Playback improvements and loader fixes for MOD, MT2 and MED.
2015-11-06Update musicpd to 0.19.11:wiz3-8/+24
ver 0.19.11 (2015/10/27) * tags - ape: fix buffer overflow * decoder - ffmpeg: fix crash due to wrong avio_alloc_context() call - gme: don't loop forever, fall back to GME's default play length * encoder - flac: fix crash with 32 bit playback * mixer - fix mixer lag after enabling/disabling output
2015-11-04Remove duplicate SHA512 digests that crept in.agc4-8/+4
2015-11-04Changes 3.1.1:adam3-13/+13
* Minor improvements.
2015-11-04Update to 1.31:wiz4-14/+31
1.31 - 2015.09.10 ----------------- * New padding control API for flac/id3/mp4/asf/ogg/aiff and everything based on it, except oggflac :bug:`229` * Mutagen will now reduce padding on save if there is lots of it. * delete() will remove padding in addition to tags. * ASF: * Padding support :bug:`201` * Don't report negative lengths for some broken files * New :class:`asf.ASFInfo`.codec_type/codec_name/codec_description * Implement ASF.delete() * OGG: Padding support for Opus/Vorbis/Theora/Speex * M4A: Implementation removed. Every operation will raise. Use mp4 instead. * Tools: Support Unicode output under Windows :bug:`232` 1.30 - 2015.08.22 ----------------- * FLAC: * Fix :meth:`flac.FLAC.save` in case the source contained a too large (invalid but recovered) image block :bug:`226` * MP3: * Improved length and bitrate accuracy: * Read lame "Info" tags for improved bitrate/length accuracy * Use bytes info of VBRI headers for improved bitrate accuracy * Subtract encoder delay/padding from length for improved length accuracy (especially for short tracks) * Fix rare false identification of Xing headers :bug:`182` * New :class:`mp3.MPEGInfo`.encoder_info attribute containing the encoder name and version :bug:`66` * New :class:`mp3.MPEGInfo`.bitrate_mode attribute exposing if the file is VBR, ABR or CBR :bug:`24` :bug:`66` * New :class:`mp3.MPEGInfo`.channels attribute providing the channel count * New :class:`mp3.MPEGInfo`.track_gain/track_peak/album_gain values exposing the replaygain info provided by the lame header :bug:`36` * ID3: * New :class:`id3.PictureType` enum for the picture type used in APIC frames :bug:`222` * MP4: * Fix MP4FreeForm.__eq__ and MP4Cover.__eq__ when comparing with bytes :bug:`218` * Don't raise on :meth:`FileType.save` if there are no tags. :bug:`227` * Minor fixes: :bug:`228` 1.29 - 2015.05.09 ----------------- * mid3v2: Fix an error under Python 3 with files without tags :bug:`219` * mid3v2: Various Windows+Python2+Unicode fixes :bug:`214` * Don't emit warnings during loading (ID3Warning) :bug:`223` * py.test support 1.28 - 2015.03.06 ----------------- * Various minor fixes to make mutagen behave the same under Python3 as under Python2. * Update gpl text :bug:`205` * Documentation: Add example for how to create a new flac.Picture :bug:`209` * ID3: * Various error handling fixes (:bug:`110`, :bug:`211`, ...) * Don't hide ID3 loading errors with ID3FileType. * In case a synch safe marked frame isn't sync safe, only warn :bug:`210` * Removed PEDANTIC mode * Tools: * Add signal handling :bug:`170` * mid3cp: Make it work under Windows. * mutagen-inspect: Make it work under Windows+Python3 :bug:`216` * Support unicode file paths under Windows+Python2 :bug:`214` * Support file paths with invalid encoding under Unix+Python3.
2015-11-03Add -std=c++11 now required by libsigc++.joerg4-4/+12
2015-11-03Add SHA512 digests for distfiles for audio categoryagc409-409/+902
Problems found with existing distfiles: /pub/pkgsrc/distfiles/amp-0.7.6.tgz /pub/pkgsrc/distfiles/freeswitch/freeswitch-sounds-music-32000-1.0.8.tar.gz /pub/pkgsrc/distfiles/freeswitch/freeswitch-sounds-music-48000-1.0.8.tar.gz /pub/pkgsrc/distfiles/freeswitch/freeswitch-sounds-en-us-callie-32000-1.0.22.tar.gz /pub/pkgsrc/distfiles/freeswitch/freeswitch-sounds-en-us-callie-48000-1.0.22.tar.gz /pub/pkgsrc/distfiles/freeswitch/freeswitch-sounds-fr-ca-june-32000-1.0.18.tar.gz /pub/pkgsrc/distfiles/freeswitch/freeswitch-sounds-fr-ca-june-48000-1.0.18.tar.gz /pub/pkgsrc/distfiles/freeswitch/freeswitch-sounds-ru-RU-elena-16000-1.0.12.tar.gz /pub/pkgsrc/distfiles/freeswitch/freeswitch-sounds-ru-RU-elena-32000-1.0.12.tar.gz /pub/pkgsrc/distfiles/freeswitch/freeswitch-sounds-ru-RU-elena-48000-1.0.12.tar.gz /pub/pkgsrc/distfiles/freeswitch/freeswitch-sounds-ru-RU-elena-8000-1.0.12.tar.gz /pub/pkgsrc/distfiles/freeswitch/freeswitch-sounds-fr-ca-june-32000-1.0.18.tar.gz /pub/pkgsrc/distfiles/freeswitch/freeswitch-sounds-fr-ca-june-48000-1.0.18.tar.gz /pub/pkgsrc/distfiles/freeswitch/freeswitch-sounds-ru-RU-elena-32000-1.0.13.tar.gz /pub/pkgsrc/distfiles/freeswitch/freeswitch-sounds-ru-RU-elena-48000-1.0.13.tar.gz /pub/pkgsrc/distfiles/kid3-3.3.0.tar.gz /pub/pkgsrc/distfiles/libdca-0.0.5.tar.bz2 /pub/pkgsrc/distfiles/mp3to.gz /pub/pkgsrc/distfiles/squeezeboxserver-7.5.1-noCPAN.tgz No changes made to these file. Otherwise, existing SHA1 digests verified and found to be the same on the machine holding the existing distfiles (morden). All existing SHA1 digests retained for now as an audit trail.
2015-11-02Pass --disable-smpegtest to configure. Test is known to sometimes hang.tnn1-1/+3
I've seen it happen on Darwin.
2015-11-02Update to 7.1ryoon2-6/+7
Changelog: Since we had a couple of annoying bugs in 7.0, we thought it'd be a good idea to do a 7.1 to address those. Changes at a glance: * Fix a crasher when using srbchannel * Fix a build system typo that caused symlinks to turn up in / * Make Xonar cards work better * Other minor bug fixes and improvements
2015-11-01Re-add patchesadam1-0/+152
2015-11-01Changes 3.3.0:adam3-23/+47
* New: + Make order of quick access frames configurable. + Support separators and submenus in user action context menu. + Restore defaults button in settings dialog. + CSV import from multiple directories. + Support for lyrics.wikia.com in embed lyrics script. + Support for chapter and table of contents audiobook frames. + Mac, Windows: Support for podcast frames. * Improved: + Display user friendly names for all supported frames. + Updated Czech translation. + Change file permissions in the case of modified file names. * Fixed: + Wrong and missing translations. + Removing ID3v1 genre with id3lib. + KDE 5: Name filters used in file dialogs, blocking file dialogs. + KDE 5: Invoking help in settings dialog. + KDE 4: Build with kdelibs-4.14.11. + Qt 5.5: Spurious popping up of download dialog. + Do not abort build if qmlplugindump cannot be started.
2015-10-27* Fix building on Darwin.adam5-13/+31
* Switch to FFmpeg-2.x, so we can get rid of FFmpeg-1 easier.
2015-10-18Changes 3.1:adam4-20/+25
Bug fixes and improvements.
2015-10-18Changes 4.75.2:adam4-16/+45
* fixed: corrupt mono or multichannel files created with assembly code (rare) * fixed: building on Clang systems like Darwin and FreeBSD (req. Clang 3.5+) * fixed: explicitly sign-extend audio data (< 4-byte) to avoid corrupt files * fixed: rare decoding errors due to integer overflow (ARM assembly code) * added: assembly optimizations for "extra" mode on mono or multichannel
2015-10-18Changes 1.22.4:adam2-6/+7
- Fix stupid regression introduced with a bugfix in 1.14.1 to make free format streams work again. It took 3 years for someone to notice. I added a regression test for that now!
2015-10-15Update to 2.7.1:wiz3-11/+12
abcde 2.7.1 * Rebuild of the abcde Makefile. Thanks to Reuben Thomas and Steve McIntyre as well as ReaperX7, bobzilla, 55020, GazL and dugan from the Slackware Forums. This closes Issue 4: http://abcde.einval.com/bugzilla/show_bug.cgi?id=4 * Fix incorrect use of 'break'. Thanks to Reuben Thomas for the bug report and fix which closes Issue 6: http://abcde.einval.com/bugzilla/show_bug.cgi?id=6 * Make older versions of id3 happy when 'Genre' field is empty. Thanks to Martin Husemann for the fix which closes Issue 8: http://abcde.einval.com/bugzilla/show_bug.cgi?id=8 * Add YEAR and GENRE variables to do_getalbumart(). Thanks to Johannes Gernemann for this patch which closes issue 9: http://abcde.einval.com/bugzilla/show_bug.cgi?id=9 * Support added for encoding to True Audio using tta while still supporting the older ttaenc. Tagging is with mid3v2. * Support added for encoding to MPEG-1 Audio Layer II (mp2) with either twolame or FFmpeg / avconv. Tagging with mid3v2. * Encoding to WavPack with FFmpeg. Some slight changes to WavPack syntax with backward compatibility built in for abcde 2.7. * Encoding to m4a container with FFmpeg or avconv. This allows for alac encoding with FFmpeg's reverse engineered alac encoder. * AAC encoding with fhgaacenc via Wine. Tagging is provided by AtomicParsley which has been added back to abcde :). This allows encoding with HE-AAC v2, unavailable with qaac. * Support added for AAC encoding with qaac via Wine. This also allows for Apple Lossless Audio Coding (alac) using either qaac or refalac. This closes Issue 142, thanks to Bernd Fischer-Krellenberg for the enhancement request. * Grab year information too when using musicbrainz. Thanks to Marco Hoppstaedter for the patch. Closes issue 10: http://abcde.einval.com/bugzilla/show_bug.cgi?id=10
2015-10-14Switch from x11/Xaw3d to newer x11/libXaw3d.wiz1-2/+2
Adapt some packages so they build with that. Bump their PKGREVISIONs.
2015-10-13depend on iconv (may fix bulk build failures on SmartOS)shattered1-2/+3
2015-10-13Update to 0.6.0. Changes:shattered2-6/+6
* This release contains a SECURITY FIX for a command injection vulnerability that was found and reported by Alexandre Rebert: The previous handling of metadata placeholders allowed for arbitrary shell commands to be trivially injected and executed as the ezstream user, via malicious media files. * This release requires users to ADJUST their CONFIGURATION: To protect against the injection vulnerability above, metadata is now properly quoted and escaped from the shell. This means that any extra quoting must be removed from configuration files. Remove all quoting from metadata placeholders in <encode/> and <decode/> commands, e.g. replace "@M@" with @M@, and "@T@" with @T@, etc. Without these changes, stream metadata will look both wrong and the injection vulnerability may be re-introduced.
2015-10-10Recursive revbump from textproc/icuryoon16-30/+32
2015-10-05Specify 'elf' output format for NASM on SunOS to get over undefined symbolsrichard1-2/+14
Configure would like an nm using easy to parse format -p on SunOS bump PKGREVISION
2015-09-30Update to 0.2.5602beta14.wiz3-7/+8
libopenmpt 0.2-beta14 (2015-09-13) [Change] The C++ API example now uses the PortAudio C++ bindings instead of the C API. [Change] Default compiler options for Emscripten have been changed to more closely match the Emscripten recommendations. [Bug] Client code compilation with C89 compilers was broken in beta13. [Bug] Testsuite failed on certain Emscripten/node.js combinations. [Bug] Fixed various crashes or hangs in DMF, OKT, PLM, IT and MPTM loaders. Implemented error handling in the libopenmpt API examples. Various playback improvements and fixes for OKT, IT and MOD.
2015-09-29also patch the portaudio sources to build only as a static library.mrg3-3/+21
bump pkg version. hopefully this now works properly. for me, my portaudio-devel package was sufficient to allow it to work and i didn't notice this problem.
2015-09-25Update to 7.0ryoon5-184/+202
Changelog: PulseAudio 7.0 Changes at a glance: * LFE channel synthesis with low-pass filtering * New libsoxr based resamplers * Socket activation support for TCP * The "srbchannel" IPC mechanism enabled by default * More flexible jack detection support when using UCM * Exiting due to SIGTERM isn't considered a failure * Better support for Creative SoundBlaster Omni Surround 5.1
2015-09-18patch several Makefile.am's t use noinst_LTLIBRARIES instead of lib_,mrg7-23/+72
so that we will only get static versions of them build. now we don't need to install the parts that shouldn't be and cause conflicts with other patches. now all we have to do is figure out all the things audacity 2.1.1 needs for the next update :-) ok wiz@
2015-09-18Switch audacity to wxGTK30. Bump PKGREVISION.wiz1-3/+3