Index: head/audio/Makefile =================================================================== --- head/audio/Makefile (revision 476238) +++ head/audio/Makefile (revision 476239) @@ -1,924 +1,925 @@ # $FreeBSD$ # COMMENT = Audio tools SUBDIR += GxSwitchlessWah-lv2 SUBDIR += HVSC-Update SUBDIR += Maaate SUBDIR += aacgain SUBDIR += aacplusenc SUBDIR += abcde SUBDIR += abcselect SUBDIR += abgate-lv2 SUBDIR += abraca SUBDIR += acoustid-fingerprinter SUBDIR += adplay SUBDIR += afsp SUBDIR += aften SUBDIR += alac SUBDIR += alienwah SUBDIR += alsa-lib SUBDIR += alsa-plugins SUBDIR += alsa-sndio SUBDIR += alsa-utils SUBDIR += alure SUBDIR += amarok-kde4 SUBDIR += amb-plugins SUBDIR += ample SUBDIR += amsynth SUBDIR += aqualung SUBDIR += ardour SUBDIR += ardour5 SUBDIR += ario SUBDIR += arss SUBDIR += artyfx-lv2 SUBDIR += ascd SUBDIR += asmix SUBDIR += asmixer SUBDIR += asterisk-espeak SUBDIR += asterisk-flite SUBDIR += asunder SUBDIR += atunes SUBDIR += aubio SUBDIR += aucatctl SUBDIR += audacity SUBDIR += audex SUBDIR += audiere SUBDIR += audiocd-kio SUBDIR += audiotag SUBDIR += aumix SUBDIR += autocd SUBDIR += autotalent SUBDIR += autozen SUBDIR += avldrums-lv2 SUBDIR += aylet SUBDIR += baresip SUBDIR += baudline SUBDIR += bcg729 SUBDIR += beatslash-lv2 SUBDIR += beep SUBDIR += beets SUBDIR += blop SUBDIR += blop-lv2 SUBDIR += boodler SUBDIR += bristol SUBDIR += bs2b-lv2 SUBDIR += calf-lv2 SUBDIR += cam SUBDIR += cantata SUBDIR += caps-lv2 SUBDIR += caps-plugins SUBDIR += carla SUBDIR += cava SUBDIR += ccaudio2 SUBDIR += cd-discid SUBDIR += cd2mp3 SUBDIR += cddb-bundle SUBDIR += cdparanoia SUBDIR += cdplay SUBDIR += celt SUBDIR += checkmate SUBDIR += chordpack SUBDIR += chromaprint SUBDIR += clementine-player SUBDIR += clunk SUBDIR += cmp3 SUBDIR += cmt SUBDIR += cmus SUBDIR += codec2 SUBDIR += cpige SUBDIR += cplay SUBDIR += cpp-xmms2 SUBDIR += creox SUBDIR += crip SUBDIR += csound6 SUBDIR += ctronome SUBDIR += cue2toc SUBDIR += cueplayer SUBDIR += cuetools SUBDIR += cutmp3 SUBDIR += dagrab SUBDIR += darkice SUBDIR += dcd SUBDIR += deadbeef SUBDIR += deadbeef-jack-plugin SUBDIR += deadbeef-mpris2-plugin SUBDIR += deadbeef-musical-spectrum-plugin SUBDIR += deadbeef-playback-status-plugin SUBDIR += deadbeef-quick-search-plugin SUBDIR += deadbeef-spectrogram-plugin SUBDIR += deadbeef-vu-meter-plugin SUBDIR += deadbeef-waveform-seekbar-plugin SUBDIR += decibel-audio-player SUBDIR += dekagen SUBDIR += denemo SUBDIR += dir2ogg SUBDIR += discid SUBDIR += dream SUBDIR += drumgizmo SUBDIR += drumpiler SUBDIR += drumstick SUBDIR += dsbmixer SUBDIR += dssi SUBDIR += dtmfdial SUBDIR += dumb SUBDIR += dumb-allegro SUBDIR += easytag SUBDIR += eawpats SUBDIR += eawplus SUBDIR += ecasound SUBDIR += emms SUBDIR += enscribe SUBDIR += epos-devel SUBDIR += eq10q-lv2 SUBDIR += esound SUBDIR += espeak SUBDIR += esperanza SUBDIR += etcd SUBDIR += eteroj-lv2 SUBDIR += etktab SUBDIR += exaile SUBDIR += exaile-devel SUBDIR += extace SUBDIR += ezstream SUBDIR += faac SUBDIR += faad SUBDIR += fabla2-lv2 SUBDIR += fapg SUBDIR += faust SUBDIR += faust-lv2 SUBDIR += faustlive SUBDIR += fcplay SUBDIR += fdk-aac SUBDIR += fdmf SUBDIR += festalon SUBDIR += festival SUBDIR += festival-freebsoft-utils SUBDIR += festlex-cmu SUBDIR += festlex-czech SUBDIR += festlex-oald SUBDIR += festlex-ogi SUBDIR += festlex-poslex SUBDIR += festvox-cmu_us_awb_arctic SUBDIR += festvox-cmu_us_bdl_arctic SUBDIR += festvox-cmu_us_clb_arctic SUBDIR += festvox-cmu_us_jmk_arctic SUBDIR += festvox-cmu_us_ksp_arctic SUBDIR += festvox-cmu_us_rms_arctic SUBDIR += festvox-cmu_us_slt_arctic SUBDIR += festvox-czech SUBDIR += festvox-don SUBDIR += festvox-el11 SUBDIR += festvox-kal16 SUBDIR += festvox-kal8 SUBDIR += festvox-ked16 SUBDIR += festvox-ked8 SUBDIR += festvox-rab16 SUBDIR += festvox-rab8 SUBDIR += festvox-russian SUBDIR += firefly SUBDIR += flac SUBDIR += flac123 SUBDIR += flacon SUBDIR += flake SUBDIR += flite SUBDIR += fluid-soundfont SUBDIR += fluidplug-lv2 SUBDIR += fluidsynth SUBDIR += fluidsynth-dssi SUBDIR += fmit SUBDIR += fomp-lv2 SUBDIR += foo-yc20 SUBDIR += forked-daapd SUBDIR += fpc-a52 SUBDIR += fpc-mad SUBDIR += fpc-modplug SUBDIR += fpc-oggvorbis SUBDIR += fpc-openal SUBDIR += fplib SUBDIR += freealut SUBDIR += freedesktop-sound-theme SUBDIR += freepats SUBDIR += funktrackergold SUBDIR += gbemol SUBDIR += gbsplay SUBDIR += gervill SUBDIR += ghostess SUBDIR += giada SUBDIR += gimmix SUBDIR += gkrellmms2 SUBDIR += gkrellmvolume2 SUBDIR += glurp SUBDIR += gmidimonitor SUBDIR += gmixer SUBDIR += gmpc SUBDIR += gmpc-alarm SUBDIR += gmpc-albumview SUBDIR += gmpc-discogs SUBDIR += gmpc-extraplaylist SUBDIR += gmpc-lastfm SUBDIR += gmpc-libnotify SUBDIR += gmpc-lyrics SUBDIR += gmpc-lyricsplugin SUBDIR += gmpc-lyricwiki SUBDIR += gmpc-magnatune SUBDIR += gmpc-mdcover SUBDIR += gmpc-mserver SUBDIR += gmpc-shout SUBDIR += gmpc-wikipedia SUBDIR += gmsynth-lv2 SUBDIR += gmtp SUBDIR += gmusicbrowser SUBDIR += gnaural SUBDIR += gnome-music SUBDIR += gnormalize SUBDIR += gnuitar SUBDIR += gnupod SUBDIR += gnuspeechsa SUBDIR += gnustep-cdplayer SUBDIR += goattracker SUBDIR += gogglesmm SUBDIR += goobox SUBDIR += gqmpeg SUBDIR += gqradio SUBDIR += gradio SUBDIR += gramofile SUBDIR += grip SUBDIR += gsm SUBDIR += gsound SUBDIR += gstreamer-plugins-a52dec SUBDIR += gstreamer-plugins-amrnb SUBDIR += gstreamer-plugins-amrwbdec SUBDIR += gstreamer-plugins-cdaudio SUBDIR += gstreamer-plugins-cdparanoia SUBDIR += gstreamer-plugins-esound SUBDIR += gstreamer-plugins-faac SUBDIR += gstreamer-plugins-faad SUBDIR += gstreamer-plugins-flac SUBDIR += gstreamer-plugins-flite SUBDIR += gstreamer-plugins-fluendo-mp3 SUBDIR += gstreamer-plugins-gme SUBDIR += gstreamer-plugins-gsm SUBDIR += gstreamer-plugins-jack SUBDIR += gstreamer-plugins-ladspa SUBDIR += gstreamer-plugins-lame SUBDIR += gstreamer-plugins-mad SUBDIR += gstreamer-plugins-mp3 SUBDIR += gstreamer-plugins-musepack SUBDIR += gstreamer-plugins-nas SUBDIR += gstreamer-plugins-ogg SUBDIR += gstreamer-plugins-opus SUBDIR += gstreamer-plugins-pulse SUBDIR += gstreamer-plugins-shout2 SUBDIR += gstreamer-plugins-sidplay SUBDIR += gstreamer-plugins-sndfile SUBDIR += gstreamer-plugins-sndio SUBDIR += gstreamer-plugins-soundtouch SUBDIR += gstreamer-plugins-spc SUBDIR += gstreamer-plugins-speex SUBDIR += gstreamer-plugins-taglib SUBDIR += gstreamer-plugins-twolame SUBDIR += gstreamer-plugins-vorbis SUBDIR += gstreamer-plugins-wavpack SUBDIR += gstreamer1-plugins-a52dec SUBDIR += gstreamer1-plugins-amrnb SUBDIR += gstreamer1-plugins-amrwbdec SUBDIR += gstreamer1-plugins-bs2b SUBDIR += gstreamer1-plugins-cdparanoia SUBDIR += gstreamer1-plugins-chromaprint SUBDIR += gstreamer1-plugins-faac SUBDIR += gstreamer1-plugins-faad SUBDIR += gstreamer1-plugins-flac SUBDIR += gstreamer1-plugins-flite SUBDIR += gstreamer1-plugins-gme SUBDIR += gstreamer1-plugins-gsm SUBDIR += gstreamer1-plugins-jack SUBDIR += gstreamer1-plugins-ladspa SUBDIR += gstreamer1-plugins-lame SUBDIR += gstreamer1-plugins-modplug SUBDIR += gstreamer1-plugins-mpg123 SUBDIR += gstreamer1-plugins-musepack SUBDIR += gstreamer1-plugins-ogg SUBDIR += gstreamer1-plugins-opus SUBDIR += gstreamer1-plugins-pulse SUBDIR += gstreamer1-plugins-shout2 SUBDIR += gstreamer1-plugins-sidplay SUBDIR += gstreamer1-plugins-sndfile SUBDIR += gstreamer1-plugins-sndio SUBDIR += gstreamer1-plugins-soundtouch SUBDIR += gstreamer1-plugins-spc SUBDIR += gstreamer1-plugins-speex SUBDIR += gstreamer1-plugins-taglib SUBDIR += gstreamer1-plugins-twolame SUBDIR += gstreamer1-plugins-vorbis SUBDIR += gstreamer1-plugins-wavpack SUBDIR += gtick SUBDIR += gtkguitune SUBDIR += gtkpod SUBDIR += gtmixer SUBDIR += guidolib SUBDIR += guitarix-lv2 SUBDIR += guspat SUBDIR += gvolwheel SUBDIR += gxmms2 SUBDIR += gxplugins-lv2 SUBDIR += harp SUBDIR += herrie SUBDIR += hexter SUBDIR += hs-ALUT SUBDIR += hs-OpenAL SUBDIR += hs-libmpd SUBDIR += hts_engine-API SUBDIR += hydrogen SUBDIR += icecast-kh SUBDIR += icecast2 SUBDIR += icegenerator SUBDIR += ices SUBDIR += id3ed SUBDIR += id3el SUBDIR += id3lib SUBDIR += id3mtag SUBDIR += id3ren SUBDIR += id3tool SUBDIR += id3v2 SUBDIR += idjc SUBDIR += ifp-line SUBDIR += infamous-plugins-lv2 SUBDIR += invada-studio-plugins-lv2 SUBDIR += ir-lv2 SUBDIR += jack SUBDIR += jack-keyboard SUBDIR += jack-rack SUBDIR += jack-smf-utils SUBDIR += jack_ghero SUBDIR += jack_mixer SUBDIR += jack_umidi SUBDIR += jalv SUBDIR += jalv-select SUBDIR += jamin SUBDIR += jid3lib SUBDIR += jmusic SUBDIR += jokosher SUBDIR += juk SUBDIR += juk-kde4 SUBDIR += juke SUBDIR += julius SUBDIR += kexis SUBDIR += kid3-kde4 + SUBDIR += kid3-kf5 SUBDIR += kid3-qt4 SUBDIR += kid3-qt5 SUBDIR += kio-audiocd-kde4 SUBDIR += kmix SUBDIR += kmix-kde4 SUBDIR += kscd-kde4 SUBDIR += ksmp3play SUBDIR += kstreamripper SUBDIR += kwave SUBDIR += ladspa SUBDIR += lame SUBDIR += lash SUBDIR += lastfm-desktop SUBDIR += liba52 SUBDIR += libaacplus SUBDIR += libadplug SUBDIR += libaiff SUBDIR += libamrnb SUBDIR += libamrwb SUBDIR += libao SUBDIR += libaudiofile SUBDIR += libbpm SUBDIR += libbs2b SUBDIR += libcanberra SUBDIR += libcanberra-gtk3 SUBDIR += libcdaudio SUBDIR += libcddb SUBDIR += libcddb-doc SUBDIR += libconvolve SUBDIR += libcoverart SUBDIR += libdiscid SUBDIR += libdssialsacompat SUBDIR += libebur128 SUBDIR += libechonest SUBDIR += libfilteraudio SUBDIR += libfishsound SUBDIR += libg722 SUBDIR += libgig SUBDIR += libgme SUBDIR += libgpod SUBDIR += libgpod-sharp SUBDIR += libgroove SUBDIR += libid3tag SUBDIR += libkcddb SUBDIR += libkcddb-kde4 SUBDIR += libkcompactdisc SUBDIR += libkcompactdisc-kde4 SUBDIR += liblastfm SUBDIR += liblastfm-qt5 SUBDIR += liblo SUBDIR += liblscp SUBDIR += libltc SUBDIR += libmad SUBDIR += libmatemixer SUBDIR += libmikmod SUBDIR += libmodplug SUBDIR += libmp3-archive-perl SUBDIR += libmp3splt SUBDIR += libmpd SUBDIR += libmpdclient SUBDIR += libmusicbrainz3 SUBDIR += libmusicbrainz5 SUBDIR += libmusicxml SUBDIR += libmysofa SUBDIR += libnjb SUBDIR += libnoise SUBDIR += libogg SUBDIR += liboggz SUBDIR += libopenspc SUBDIR += libsamplerate SUBDIR += libshairport SUBDIR += libshout SUBDIR += libsidplay SUBDIR += libsidplay2 SUBDIR += libsidplayfp SUBDIR += libsmf SUBDIR += libsndfile SUBDIR += libsonic SUBDIR += libsoxr SUBDIR += libtremor SUBDIR += libumidi SUBDIR += libvorbis SUBDIR += libworkman SUBDIR += libxmp SUBDIR += lilv SUBDIR += lingot SUBDIR += linux-c6-alsa-lib SUBDIR += linux-c6-alsa-plugins-oss SUBDIR += linux-c6-alsa-plugins-pulseaudio SUBDIR += linux-c6-alsa-utils SUBDIR += linux-c6-flac SUBDIR += linux-c6-libaudiofile SUBDIR += linux-c6-libogg SUBDIR += linux-c6-libsndfile SUBDIR += linux-c6-libvorbis SUBDIR += linux-c6-mikmod SUBDIR += linux-c6-nas-libs SUBDIR += linux-c6-openal-soft SUBDIR += linux-c6-pulseaudio-libs SUBDIR += linux-c6-pulseaudio-utils SUBDIR += linux-c6-sdl_mixer SUBDIR += linux-c7-alsa-lib SUBDIR += linux-c7-alsa-plugins-oss SUBDIR += linux-c7-alsa-plugins-pulseaudio SUBDIR += linux-c7-alsa-utils SUBDIR += linux-c7-audiofile SUBDIR += linux-c7-flac SUBDIR += linux-c7-libogg SUBDIR += linux-c7-libsndfile SUBDIR += linux-c7-libvorbis SUBDIR += linux-c7-openal-soft SUBDIR += linux-c7-pulseaudio-libs SUBDIR += linux-c7-pulseaudio-utils SUBDIR += linux-c7-sdl_mixer SUBDIR += linux-laudio SUBDIR += linux-skype_oss_wrapper SUBDIR += linuxsampler SUBDIR += listener SUBDIR += lmms SUBDIR += logitechmediaserver SUBDIR += logitechmediaserver-dynamicplaylist SUBDIR += logitechmediaserver-lazysearch SUBDIR += logitechmediaserver-sqlplaylist SUBDIR += logitechmediaserver-trackstat SUBDIR += lollypop SUBDIR += lpac SUBDIR += lua51-mpd SUBDIR += luppp SUBDIR += lv2 SUBDIR += lv2file SUBDIR += lvtk SUBDIR += lxmusic SUBDIR += mac SUBDIR += madfufw SUBDIR += madplay SUBDIR += malint SUBDIR += maplay SUBDIR += mate-media SUBDIR += mbox SUBDIR += mcplay SUBDIR += mctoolame-decoder SUBDIR += mctoolame-encoder SUBDIR += mda-lv2 SUBDIR += mhwaveedit SUBDIR += midi-matrix-lv2 SUBDIR += midipp SUBDIR += mikmod SUBDIR += milkytracker SUBDIR += minitunes SUBDIR += mixer.app SUBDIR += mixmos SUBDIR += mixxx SUBDIR += mixxx20 SUBDIR += mma SUBDIR += moc SUBDIR += modplugplay SUBDIR += moodbar SUBDIR += moony-lv2 SUBDIR += mous SUBDIR += mp-player SUBDIR += mp3-archive-tools SUBDIR += mp32ogg SUBDIR += mp3_check SUBDIR += mp3asm SUBDIR += mp3blaster SUBDIR += mp3burn SUBDIR += mp3c SUBDIR += mp3check SUBDIR += mp3ck SUBDIR += mp3gain SUBDIR += mp3guessenc SUBDIR += mp3info SUBDIR += mp3lint SUBDIR += mp3mover SUBDIR += mp3plot SUBDIR += mp3rename SUBDIR += mp3riot SUBDIR += mp3splt SUBDIR += mp3splt-gtk SUBDIR += mp3stat SUBDIR += mp3unicode SUBDIR += mp3val SUBDIR += mp3wrap SUBDIR += mpdas SUBDIR += mpdbrowser SUBDIR += mpdcon SUBDIR += mpdscribble SUBDIR += mpg123 SUBDIR += mpg123.el SUBDIR += mpg321 SUBDIR += mpiosh SUBDIR += mps SUBDIR += msbcg729 SUBDIR += msilbc SUBDIR += mumble SUBDIR += murmur SUBDIR += musepack SUBDIR += musescore SUBDIR += musicbox-tag-editor SUBDIR += musiccontrol SUBDIR += musicpc SUBDIR += musicpd SUBDIR += mythplugin-mythmusic SUBDIR += napster SUBDIR += nas SUBDIR += ncmpc SUBDIR += ncmpcpp SUBDIR += nekobee SUBDIR += noise-repellent-lv2 SUBDIR += normalize SUBDIR += nosefart SUBDIR += nspmod SUBDIR += nuvolaplayer SUBDIR += oaml SUBDIR += ocp SUBDIR += openal SUBDIR += openal-soft SUBDIR += opencore-amr SUBDIR += openspc SUBDIR += optimfrog SUBDIR += optimfrog-sse2 SUBDIR += opus SUBDIR += opus-tools SUBDIR += opusfile SUBDIR += orbit-lv2 SUBDIR += osalp SUBDIR += osd-lyrics SUBDIR += osdmixer SUBDIR += oss SUBDIR += p5-Audio SUBDIR += p5-Audio-CD SUBDIR += p5-Audio-Ecasound SUBDIR += p5-Audio-FLAC-Header SUBDIR += p5-Audio-MPD SUBDIR += p5-Audio-MPD-Common SUBDIR += p5-Audio-Mixer SUBDIR += p5-Audio-Musepack SUBDIR += p5-Audio-Scan SUBDIR += p5-Audio-Scrobbler SUBDIR += p5-Audio-WMA SUBDIR += p5-Audio-Wav SUBDIR += p5-CDDB SUBDIR += p5-CDDB-File SUBDIR += p5-CDDB_get SUBDIR += p5-Filesys-Virtual-DAAP SUBDIR += p5-MIDI SUBDIR += p5-MP3-Find SUBDIR += p5-MP3-ID3v1Tag SUBDIR += p5-MP3-Info SUBDIR += p5-MP3-Tag SUBDIR += p5-MP3-Tag-Utils SUBDIR += p5-MPEG-ID3v2Tag SUBDIR += p5-Music-Audioscrobbler-MPD SUBDIR += p5-Music-Audioscrobbler-Submit SUBDIR += p5-MusicBrainz-DiscID SUBDIR += p5-Net-DAAP-Client SUBDIR += p5-Net-DAAP-DMAP SUBDIR += p5-Net-FreeDB SUBDIR += p5-Net-LibLO SUBDIR += p5-Ogg-Vorbis-Header SUBDIR += p5-Ogg-Vorbis-Header-PurePerl SUBDIR += p5-Shout SUBDIR += p5-Test-Corpus-Audio-MPD SUBDIR += p5-libvorbis SUBDIR += p5-tagged SUBDIR += p5-xmms2 SUBDIR += pacpl SUBDIR += padthv1-lv2 SUBDIR += paman SUBDIR += paprefs SUBDIR += patchage SUBDIR += pavucontrol SUBDIR += pavumeter SUBDIR += pc-mixer SUBDIR += pd SUBDIR += pd-cyclone SUBDIR += pear-Text_Spell_Audio SUBDIR += penguinsap SUBDIR += pianobar SUBDIR += picard SUBDIR += picard-plugins SUBDIR += pithos SUBDIR += plasma5-plasma-pa SUBDIR += play SUBDIR += playgsf SUBDIR += playmidi SUBDIR += pm3umpdl SUBDIR += pms SUBDIR += pms-devel SUBDIR += pocketsphinx SUBDIR += polyphone SUBDIR += portaudio SUBDIR += praat SUBDIR += pragha SUBDIR += protracker SUBDIR += puddletag SUBDIR += pulseaudio SUBDIR += pulseaudio-module-sndio SUBDIR += py-SoundFile SUBDIR += py-al SUBDIR += py-ao SUBDIR += py-apetag SUBDIR += py-aubio SUBDIR += py-cddb SUBDIR += py-discid SUBDIR += py-discogs-client SUBDIR += py-eyed3 SUBDIR += py-fmoo-audiotools SUBDIR += py-gmusicapi SUBDIR += py-gmusicproxy SUBDIR += py-hsaudiotag SUBDIR += py-id3 SUBDIR += py-karaoke SUBDIR += py-mpd SUBDIR += py-mpd2 SUBDIR += py-musicbrainz2 SUBDIR += py-musicbrainzngs SUBDIR += py-mutagen SUBDIR += py-ogg SUBDIR += py-openal SUBDIR += py-opuslib SUBDIR += py-py-jack SUBDIR += py-pyacoustid SUBDIR += py-pyaudio SUBDIR += py-pylast SUBDIR += py-pyliblo SUBDIR += py-pymad SUBDIR += py-pysndfile SUBDIR += py-shout SUBDIR += py-soundcloud SUBDIR += py-sounddevice SUBDIR += py-soundscrape SUBDIR += py-speechrecognition SUBDIR += py-speex SUBDIR += py-tagpy SUBDIR += py-vorbis SUBDIR += py-wavio SUBDIR += py-xmms2 SUBDIR += pytone SUBDIR += qjackctl SUBDIR += qmidiarp SUBDIR += qmpdclient SUBDIR += qsampler SUBDIR += qsynth SUBDIR += quimup SUBDIR += raop_play SUBDIR += raul SUBDIR += rawrec SUBDIR += re SUBDIR += rebot3 SUBDIR += rem SUBDIR += resid SUBDIR += rexima SUBDIR += rezound SUBDIR += rhythmbox SUBDIR += rio500 SUBDIR += rioutil SUBDIR += ripit SUBDIR += ripperx SUBDIR += rkr-lv2 SUBDIR += rosegarden SUBDIR += rplay SUBDIR += rsynth SUBDIR += rtaudio SUBDIR += rtmidi SUBDIR += rubberband SUBDIR += ruby-smf SUBDIR += ruby-taglib SUBDIR += rubygem-librmpd SUBDIR += rubygem-ruby-mp3info SUBDIR += rubygem-ruby-ogginfo SUBDIR += rubygem-ruby-shout SUBDIR += s3mod SUBDIR += sayonara SUBDIR += sbagen SUBDIR += sc3-plugins SUBDIR += schismtracker SUBDIR += screcord-lv2 SUBDIR += scrobbler SUBDIR += sdl2_mixer SUBDIR += sdl_mixer SUBDIR += sdl_sound SUBDIR += sfront SUBDIR += shairplay SUBDIR += shairport-sync SUBDIR += sherlock-lv2 SUBDIR += shntool SUBDIR += shorten SUBDIR += shout SUBDIR += shout-idjc SUBDIR += shoutcast SUBDIR += sidplay SUBDIR += sidplay2 SUBDIR += sidplayer SUBDIR += simon SUBDIR += simplemod SUBDIR += siren SUBDIR += skype-call-recorder SUBDIR += slv2 SUBDIR += snack SUBDIR += snd SUBDIR += sndio SUBDIR += solfege SUBDIR += sonata SUBDIR += sonic-visualiser SUBDIR += sorcer-lv2 SUBDIR += sound-juicer SUBDIR += soundconverter SUBDIR += soundgrab SUBDIR += soundkonverter SUBDIR += soundtouch SUBDIR += soundtracker SUBDIR += sox SUBDIR += specimen SUBDIR += spectrogram SUBDIR += speex SUBDIR += speexdsp SUBDIR += spek SUBDIR += sphinx SUBDIR += sphinx3 SUBDIR += sphinxbase SUBDIR += spiralloops SUBDIR += spiralsynth SUBDIR += spiralsynthmodular SUBDIR += splay SUBDIR += splaytk SUBDIR += squash SUBDIR += sratom SUBDIR += stk SUBDIR += streamripper SUBDIR += streamtranscoder SUBDIR += stymulator SUBDIR += suil SUBDIR += supercollider SUBDIR += sweep SUBDIR += swh-lv2 SUBDIR += swhplugins SUBDIR += synthpod-lv2 SUBDIR += taglib SUBDIR += taglib-extras SUBDIR += taglib-sharp SUBDIR += taglookup SUBDIR += tagtool SUBDIR += tagutil SUBDIR += tap-plugins SUBDIR += tap-plugins-lv2 SUBDIR += tcd SUBDIR += teamspeak3-server SUBDIR += tempest_for_eliza SUBDIR += terminatorx SUBDIR += thunar-media-tags-plugin SUBDIR += timemachine SUBDIR += timidity SUBDIR += timidity++ SUBDIR += timidity++-emacs SUBDIR += timidity++-gtk SUBDIR += timidity++-motif SUBDIR += timidity++-slang SUBDIR += timidity++-tcltk SUBDIR += timidity++-xaw SUBDIR += timidity++-xskin SUBDIR += tkeca SUBDIR += toolame SUBDIR += tosha SUBDIR += triceratops-lv2 SUBDIR += trommler SUBDIR += tse3 SUBDIR += tta SUBDIR += tuneradio SUBDIR += tuxguitar SUBDIR += twolame SUBDIR += uade SUBDIR += umix SUBDIR += umodplayer SUBDIR += umurmur SUBDIR += vagalume SUBDIR += vamp-plugin-sdk SUBDIR += virtual_oss SUBDIR += virtual_oss_ctl SUBDIR += vitunes SUBDIR += vm-lv2 SUBDIR += vmpk SUBDIR += vo-aacenc SUBDIR += vo-amrwbenc SUBDIR += voipong SUBDIR += volumeicon SUBDIR += vorbis-tools SUBDIR += vorbisgain SUBDIR += vsound SUBDIR += waon SUBDIR += wav2cdr SUBDIR += wavbreaker SUBDIR += wavegain SUBDIR += waveplay SUBDIR += wavpack SUBDIR += wavplay SUBDIR += whysynth SUBDIR += wildmidi SUBDIR += wmalbum SUBDIR += wmix SUBDIR += wmmp SUBDIR += wmrecord SUBDIR += wmsmixer SUBDIR += workman SUBDIR += wxguitar SUBDIR += x42-plugins-lv2 SUBDIR += xanalyser SUBDIR += xcd SUBDIR += xcdplayer SUBDIR += xfce4-mixer SUBDIR += xfce4-mpc-plugin SUBDIR += xfce4-pulseaudio-plugin SUBDIR += xfmpc SUBDIR += xhippo SUBDIR += ximp3 SUBDIR += xmcd SUBDIR += xmix SUBDIR += xmixer SUBDIR += xmmix SUBDIR += xmms-ahx SUBDIR += xmms-curses SUBDIR += xmms-faad SUBDIR += xmms-festalon SUBDIR += xmms-flac SUBDIR += xmms-gbsplay SUBDIR += xmms-ladspa SUBDIR += xmms-mailnotify SUBDIR += xmms-nas SUBDIR += xmms-nsf SUBDIR += xmms-sapplug SUBDIR += xmms-scrobbler SUBDIR += xmms-sexypsf SUBDIR += xmms-shn SUBDIR += xmms-volnorm SUBDIR += xmms-wavpack SUBDIR += xmms-xf86audio SUBDIR += xmms-xymms SUBDIR += xmms2 SUBDIR += xmms2-scrobbler SUBDIR += xmmsctrl SUBDIR += xmp SUBDIR += xmradio SUBDIR += xoscope SUBDIR += xsynth-dssi SUBDIR += xvmixer SUBDIR += xwave SUBDIR += yell SUBDIR += ympd SUBDIR += yoshimi SUBDIR += zam-plugins-lv2 SUBDIR += zinf SUBDIR += zita-convolver SUBDIR += zita-resampler SUBDIR += zynaddsubfx .include Index: head/audio/kid3-kde4/Makefile =================================================================== --- head/audio/kid3-kde4/Makefile (revision 476238) +++ head/audio/kid3-kde4/Makefile (revision 476239) @@ -1,104 +1,144 @@ # $FreeBSD$ PORTNAME= kid3 -PORTVERSION= 3.5.1 -PORTREVISION?= 2 +PORTVERSION= 3.6.1 +PORTREVISION?= 0 CATEGORIES= audio kde MASTER_SITES= SF +PKGNAMESUFFIX= -${SLAVE} MAINTAINER= jhale@FreeBSD.org -COMMENT?= MP3/Ogg/FLAC tag editor for KDE +COMMENT= Audio file tag editor LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake:outsource kde:4 pkgconfig +BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl + +USES= cmake:outsource pkgconfig +USE_GNOME= libxslt:build USE_LDCONFIG= yes -CMAKE_ARGS= -DWITH_DOCBOOKDIR=${LOCALBASE}/share/xsl/docbook \ + +CMAKE_ARGS= -DWITH_DOCBOOKDIR="${LOCALBASE}/share/xsl/docbook" \ -DWITH_LIBDIR=lib \ -DWITH_MANDIR=man \ -DWITH_PLUGINSDIR=lib/kid3 \ - -DFFMPEG_ROOT=${LOCALBASE} \ - -DWITH_QML=OFF + -DFFMPEG_ROOT="${LOCALBASE}" \ + -DWITH_QML=OFF \ + -DWITH_APPS="${KID3_APPS:S/ /;/gW}" +PLIST_SUB+= SHLIB_VER=${PORTVERSION} -OPTIONS_DEFINE= CLI ACOUSTID FLAC MP3 MP4 VORBIS TAGLIB PHONON -OPTIONS_DEFAULT= CLI ACOUSTID FLAC MP3 MP4 VORBIS TAGLIB -OPTIONS_SUB= yes -NO_OPTIONS_SORT= yes - -.if defined(PKGNAMESUFFIX) -# Qt 4 and Qt 5 -BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl - +SLAVE?= kde4 +.if ${SLAVE} == qt4 || ${SLAVE} == qt5 +# Qt4 and Qt5 USES+= desktop-file-utils -USE_GNOME= libxslt:build -CMAKE_ARGS+= -DWITH_APPS="${KID3_CLI}QT" -PLIST_SUB+= QT="" KDE="@comment " -. if ${PKGNAMESUFFIX} == "-qt5" -# Qt 5 only -CONFLICTS_INSTALL= kid3-3.* kid3-qt4-3.* -USES+= qt:5 -USE_QT= core dbus gui multimedia network testlib xml widgets \ - buildtools_build linguisttools_build qmake_build -CMAKE_ARGS+= -DWITH_QT5=true -OPTIONS_EXCLUDE=PHONON -. elif ${PKGNAMESUFFIX} == "-qt4" -# Qt 4 only -CONFLICTS_INSTALL= kid3-3.* kid3-qt5-3.* -USES+= qt:4 -USE_QT= corelib dbus gui network xml \ - qmake_build moc_build rcc_build uic_build \ - linguisttools_build -. endif +PLIST_SUB+= KDE="@comment " KDE4="@comment " KF5="@comment " QT="" QT_SUFX="-qt" +KID3_APPS+= QT .else -# KDE 4 only -CONFLICTS_INSTALL= kid3-qt4-3.* kid3-qt5-3.* +# KDE4 and KF5 +PLIST_SUB+= KDE="" QT="@comment " QT_SUFX="" +KID3_APPS+= KDE +.endif + +.if ${SLAVE} == kde4 || ${SLAVE} == qt4 +# KDE4 and Qt4 USES+= qt:4 -USE_QT= corelib dbus gui network svg xml \ +USE_QT+= corelib dbus gui network xml \ qmake_build moc_build rcc_build uic_build \ linguisttools_build -USE_KDE= kdelibs automoc4 -CMAKE_ARGS+= -DWITH_APPS="${KID3_CLI}KDE" -PLIST_SUB+= QT="@comment " KDE="" -OPTIONS_SLAVE= PHONON +CMAKE_ON+= WITH_QT4 +.else +# KF5 and Qt5 +USES+= qt:5 +USE_QT+= core dbus gui multimedia network xml widgets \ + buildtools_build linguisttools_build qmake_build +CMAKE_ON+= WITH_QT5 +OPTIONS_EXCLUDE+= PHONON .endif -PLIST_SUB+= SHLIB_VER=${PORTVERSION} +.if ${SLAVE} == kde4 +# KDE4 only +USES+= kde:4 +USE_KDE+= kdelibs automoc4 +USE_QT+= svg +PLIST_SUB+= KDE4="" KF5="@comment " +OPTIONS_SLAVE+= PHONON +.elif ${SLAVE} == kf5 +# KF5 only +USES+= desktop-file-utils kde:5 +USE_KDE+= auth bookmarks codecs completion config configwidgets \ + coreaddons doctools_build ecm_build itemviews jobwidgets \ + kio service solid widgetsaddons xmlgui +USE_QT+= concurrent +PLIST_SUB+= KDE4="@comment " KF5="" +.endif +.for s in kde4 kf5 qt4 qt5 +. if ${SLAVE} != ${s} +CONFLICTS_INSTALL+= kid3-${s} +. endif +.endfor + +OPTIONS_DEFINE= CLI ACOUSTID FLAC MP3 MP4 VORBIS TAGLIB PHONON TEST +OPTIONS_DEFAULT= CLI ACOUSTID FLAC MP3 MP4 VORBIS TAGLIB +OPTIONS_SUB= yes +NO_OPTIONS_SORT= yes + ACOUSTID_LIB_DEPENDS= libchromaprint.so:audio/chromaprint \ libavcodec.so:multimedia/ffmpeg ACOUSTID_CMAKE_BOOL= WITH_CHROMAPRINT WITH_FFMPEG CLI_DESC= Build and install command line utility -CLI_USES= readline -CLI_VARS= KID3_CLI=CLI; +CLI_USES= python:3.4+,test readline +CLI_VARS= KID3_APPS+=CLI FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CMAKE_BOOL= WITH_FLAC MP3_LIB_DEPENDS= libid3.so:audio/id3lib MP3_CMAKE_BOOL= WITH_ID3LIB MP4_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2 MP4_CMAKE_BOOL= WITH_MP4V2 -PHONON_USES= qt:4 PHONON_USE= QT=phonon PHONON_CMAKE_BOOL= WITH_PHONON TAGLIB_DESC= Various audio formats support via Taglib TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib TAGLIB_CMAKE_BOOL= WITH_TAGLIB +TEST_USE= LOCALE=en_US.UTF-8 +.if ${SLAVE} == qt4 || ${SLAVE} == kde4 +TEST_USE+= QT=qtestlib_build +.else +TEST_USE+= QT=testlib_build +.endif +TEST_WRKSRC= ${BUILD_WRKSRC}/src/test +TEST_VARS= KID3_APPS+=TEST + VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg VORBIS_CMAKE_BOOL= WITH_VORBIS .include .if ${PORT_OPTIONS:MFLAC} || ${PORT_OPTIONS:MVORBIS} PLIST_SUB+= OGGFLAC="" .else PLIST_SUB+= OGGFLAC="@comment " .endif + +post-patch: + @${REINPLACE_CMD} -e 's|aiff|aif|g' ${WRKSRC}/src/test/test_cli_functions.py + +pre-test: + @${CP} ${WRKSRC}/src/test/*.py ${TEST_WRKSRC} + +do-test: + -@(cd ${TEST_WRKSRC}; ${SETENV} ${TEST_ENV} ./kid3-test) + +do-test-CLI-on: + -@(cd ${TEST_WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHON_CMD} test_cli_functions.py) .include Index: head/audio/kid3-kde4/distinfo =================================================================== --- head/audio/kid3-kde4/distinfo (revision 476238) +++ head/audio/kid3-kde4/distinfo (revision 476239) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517047885 -SHA256 (kid3-3.5.1.tar.gz) = 88c20826deb13f81bcdfa7033a4b9ff9ca8957112b2fa2ccc0a9a1076df73926 -SIZE (kid3-3.5.1.tar.gz) = 1414829 +TIMESTAMP = 1524559677 +SHA256 (kid3-3.6.1.tar.gz) = 4644b2955265920d78c0d689545603a59e5020e98319be74c5b141f5a46976ad +SIZE (kid3-3.6.1.tar.gz) = 1428799 Index: head/audio/kid3-kde4/files/patch-CMakeLists.txt =================================================================== --- head/audio/kid3-kde4/files/patch-CMakeLists.txt (nonexistent) +++ head/audio/kid3-kde4/files/patch-CMakeLists.txt (revision 476239) @@ -0,0 +1,30 @@ +Qt5Test is only needed for running the regression tests. + +--- CMakeLists.txt.orig 2018-04-25 11:23:10 UTC ++++ CMakeLists.txt +@@ -258,7 +258,9 @@ if (NOT WITH_QT4 AND NOT Qt4_FOUND AND NOT QT4_FOUND) + set(Qt5Xml_DIR "${_qt5Dir}/lib/cmake/Qt5Xml") + set(Qt5Multimedia_DIR "${_qt5Dir}/lib/cmake/Qt5Multimedia") + set(Qt5LinguistTools_DIR "${_qt5Dir}/lib/cmake/Qt5LinguistTools") +- set(Qt5Test_DIR "${_qt5Dir}/lib/cmake/Qt5Test") ++ if (BUILD_TEST_APP) ++ set(Qt5Test_DIR "${_qt5Dir}/lib/cmake/Qt5Test") ++ endif (BUILD_TEST_APP) + if (WITH_DBUS) + set(Qt5DBus_DIR "${_qt5Dir}/lib/cmake/Qt5DBus") + endif (WITH_DBUS) +@@ -299,9 +301,11 @@ if (NOT WITH_QT4 AND NOT Qt4_FOUND AND NOT QT4_FOUND) + endif (Qt5${_qt5Component}_FOUND) + endforeach () + find_package(Qt5LinguistTools) +- find_package(Qt5Test) +- set(QT_QTTEST_LIBRARY Qt5::Test) +- set(QT_QTTEST_INCLUDE_DIR ${Qt5Test_INCLUDE_DIRS}) ++ if (BUILD_TEST_APP) ++ find_package(Qt5Test) ++ set(QT_QTTEST_LIBRARY Qt5::Test) ++ set(QT_QTTEST_INCLUDE_DIR ${Qt5Test_INCLUDE_DIRS}) ++ endif (BUILD_TEST_APP) + if (Qt5DBus_FOUND) + set(HAVE_QTDBUS 1) + endif (Qt5DBus_FOUND) Property changes on: head/audio/kid3-kde4/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/kid3-kde4/files/patch-src_app_kde_kdemainwindow.cpp =================================================================== --- head/audio/kid3-kde4/files/patch-src_app_kde_kdemainwindow.cpp (nonexistent) +++ head/audio/kid3-kde4/files/patch-src_app_kde_kdemainwindow.cpp (revision 476239) @@ -0,0 +1,45 @@ +Squash startup warnings for KF5 app. + +Shortcut for action "open_directory" "O&pen Directory..." set with QAction::setShortcut()! Use KActionCollection::setDefaultShortcut(s) instead. +Shortcut for action "filelist_rename" "&Rename" set with QAction::setShortcut()! Use KActionCollection::setDefaultShortcut(s) instead. +Shortcut for action "filelist_delete" "&Move to Trash" set with QAction::setShortcut()! Use KActionCollection::setDefaultShortcut(s) instead. + +--- src/app/kde/kdemainwindow.cpp.orig 2018-03-18 20:56:24 UTC ++++ src/app/kde/kdemainwindow.cpp +@@ -162,7 +162,12 @@ void KdeMainWindow::initActions() + action = new KAction(KIcon(QLatin1String("document-open")), + tr("O&pen Directory..."), this); + action->setStatusTip(tr("Opens a directory")); ++#if QT_VERSION >= 0x050000 ++ collection->setDefaultShortcut(action, ++ QKeySequence(Qt::CTRL + Qt::Key_D)); ++#else + action->setShortcut(KShortcut(QLatin1String("Ctrl+D"))); ++#endif + collection->addAction(QLatin1String("open_directory"), action); + connect(action, SIGNAL(triggered()), impl(), SLOT(slotFileOpenDirectory())); + action = new KAction(KIcon(QLatin1String("document-import")), +@@ -359,13 +364,23 @@ void KdeMainWindow::initActions() + collection->addAction(QLatin1String("filelist_focus"), action); + connect(action, SIGNAL(triggered()), form(), SLOT(setFocusFileList())); + action = new KAction(tr("&Rename"), this); ++#if QT_VERSION >= 0x050000 ++ collection->setDefaultShortcut(action, ++ QKeySequence(Qt::Key_F2)); ++#else + action->setShortcut(QKeySequence(Qt::Key_F2)); ++#endif + action->setShortcutContext(Qt::WidgetShortcut); + connect(action, SIGNAL(triggered()), impl(), SLOT(renameFile())); + collection->addAction(QLatin1String("filelist_rename"), action); + form()->getFileList()->setRenameAction(action); + action = new KAction(tr("&Move to Trash"), this); ++#if QT_VERSION >= 0x050000 ++ collection->setDefaultShortcut(action, ++ QKeySequence::Delete); ++#else + action->setShortcut(QKeySequence::Delete); ++#endif + action->setShortcutContext(Qt::WidgetShortcut); + connect(action, SIGNAL(triggered()), impl(), SLOT(deleteFile())); + collection->addAction(QLatin1String("filelist_delete"), action); Property changes on: head/audio/kid3-kde4/files/patch-src_app_kde_kdemainwindow.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/kid3-kde4/files/patch-src_plugins_discogsimport_discogsimporter.cpp =================================================================== --- head/audio/kid3-kde4/files/patch-src_plugins_discogsimport_discogsimporter.cpp (nonexistent) +++ head/audio/kid3-kde4/files/patch-src_plugins_discogsimport_discogsimporter.cpp (revision 476239) @@ -0,0 +1,15 @@ +Fix import of track duration from Discogs. + +--- src/plugins/discogsimport/discogsimporter.cpp.orig 2018-04-18 18:01:00 UTC ++++ src/plugins/discogsimport/discogsimporter.cpp +@@ -526,8 +526,8 @@ void DiscogsImporter::parseAlbumResults(const QByteArr + QRegExp titleRe(QLatin1String( + "class=\"tracklist_track_title\"[^>]*>([^<]+)<")); + QRegExp durationRe(QLatin1String( +- "]*class=\"tracklist_track_duration\"[^>]*>(?:]*>)?" +- "(?:)?(\\d+):(\\d+)]*class=\"tracklist_track_duration\">" ++ "(?:]*>)(?:\\s+)(\\d+):(\\d+)([^<]+)$")); + QRegExp rowEndRe(QLatin1String("[\\s\\r\\n]*")); + ImportTrackDataVector::iterator it = trackDataVector.begin(); Property changes on: head/audio/kid3-kde4/files/patch-src_plugins_discogsimport_discogsimporter.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/kid3-kde4/files/patch-src_plugins_mp4v2metadata_m4afile.cpp =================================================================== --- head/audio/kid3-kde4/files/patch-src_plugins_mp4v2metadata_m4afile.cpp (nonexistent) +++ head/audio/kid3-kde4/files/patch-src_plugins_mp4v2metadata_m4afile.cpp (revision 476239) @@ -0,0 +1,53 @@ +cmID and xid atoms only supported in mp4v2 >= 2.0.0 + +--- src/plugins/mp4v2metadata/m4afile.cpp.orig 2018-04-18 18:01:00 UTC ++++ src/plugins/mp4v2metadata/m4afile.cpp +@@ -136,6 +136,8 @@ static const struct { + { "geID", Frame::FT_Other }, + { "purl", Frame::FT_Other }, + { "egid", Frame::FT_Other }, ++#endif ++#if MPEG4IP_MAJOR_MINOR_VERSION >= 0x0200 + { "cmID", Frame::FT_Other }, + { "xid ", Frame::FT_Other }, + #endif +@@ -346,8 +348,11 @@ static QByteArray getValueByteArray(const char* name, + #if MPEG4IP_MAJOR_MINOR_VERSION >= 0x0109 + } else if (std::strcmp(name, "tvsn") == 0 || std::strcmp(name, "tves") == 0 || + std::strcmp(name, "sfID") == 0 || std::strcmp(name, "cnID") == 0 || +- std::strcmp(name, "atID") == 0 || std::strcmp(name, "geID") == 0 || +- std::strcmp(name, "cmID") == 0) { ++ std::strcmp(name, "atID") == 0 || std::strcmp(name, "geID") == 0 ++#if MPEG4IP_MAJOR_MINOR_VERSION >= 0x0200 ++ || std::strcmp(name, "cmID") == 0 ++#endif ++ ) { + if (size >= 4) { + uint val = value[3] + (value[2] << 8) + + (value[1] << 16) + (value[0] << 24); +@@ -712,11 +717,13 @@ bool M4aFile::writeTags(bool force, bool* renamed, boo + } else if (name == QLatin1String("geID")) { + uint32_t val = str.toULong(); + MP4TagsSetGenreID(tags, &val); ++#if MPEG4IP_MAJOR_MINOR_VERSION >= 0x0200 + } else if (name == QLatin1String("cmID")) { + uint32_t val = str.toULong(); + MP4TagsSetComposerID(tags, &val); + } else if (name == QLatin1String("xid ")) { + MP4TagsSetXID(tags, str); ++#endif + } else { + MP4ItmfItem* item; + if (name.length() == 4 && +@@ -1306,7 +1313,10 @@ QStringList M4aFile::getFrameIds(Frame::TagNumber tagN + QLatin1String("plID") << QLatin1String("purd") << QLatin1String("rtng") << QLatin1String("sfID") << + QLatin1String("sosn") << QLatin1String("stik") << QLatin1String("tven") << + QLatin1String("tves") << QLatin1String("tvnn") << QLatin1String("tvsh") << QLatin1String("tvsn") << +- QLatin1String("purl") << QLatin1String("egid") << QLatin1String("cmID") << QLatin1String("xid "); ++ QLatin1String("purl") << QLatin1String("egid"); ++#endif ++#if MPEG4IP_MAJOR_MINOR_VERSION >= 0x0200 ++ lst << QLatin1String("cmID") << QLatin1String("xid "); + #endif + return lst; + } Property changes on: head/audio/kid3-kde4/files/patch-src_plugins_mp4v2metadata_m4afile.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/kid3-kde4/files/patch-src_test_testmusicbrainzreleaseimporter.cpp =================================================================== --- head/audio/kid3-kde4/files/patch-src_test_testmusicbrainzreleaseimporter.cpp (nonexistent) +++ head/audio/kid3-kde4/files/patch-src_test_testmusicbrainzreleaseimporter.cpp (revision 476239) @@ -0,0 +1,28 @@ +Fix test to reflect the current data in the MusicBrainz database. + +--- src/test/testmusicbrainzreleaseimporter.cpp.orig 2018-04-18 18:01:00 UTC ++++ src/test/testmusicbrainzreleaseimporter.cpp +@@ -38,7 +38,7 @@ void TestMusicBrainzReleaseImporter::testQueryAlbums() + { + queryAlbums(QLatin1String("Wizard"), QLatin1String("Odin")); + QStandardItemModel* albumModel = m_importer->getAlbumListModel(); +- QCOMPARE(albumModel->rowCount(), 3); ++ QCOMPARE(albumModel->rowCount(), 4); + AlbumListItem* item = static_cast(albumModel->item(0, 0)); + QVERIFY(item); + QVERIFY(item->type() == AlbumListItem::Type); +@@ -53,12 +53,12 @@ void TestMusicBrainzReleaseImporter::testQueryTracks() + + QStringList titles; + titles << QLatin1String("The Prophecy") << QLatin1String("Betrayer") << QLatin1String("Dead Hope") << QLatin1String("Dark God") +- << QLatin1String("Loki's Punishment") << QLatin1String("Beginning of the End") << QLatin1String("Thor's Hammer") ++ << QString::fromUtf8("Loki\u2019s Punishment") << QLatin1String("Beginning of the End") << QString::fromUtf8("Thor\u2019s Hammer") + << QLatin1String("Hall of Odin") << QLatin1String("The Powergod") << QLatin1String("March of the Einheriers") + << QLatin1String("End of All"); + QStringList lengths; + lengths << QLatin1String("5:19") << QLatin1String("4:53") << QLatin1String("6:02") << QLatin1String("5:42") << QLatin1String("5:08") << QLatin1String("4:01") << QLatin1String("5:01") +- << QLatin1String("5:06") << QLatin1String("5:21") << QLatin1String("5:40") << QLatin1String("3:53"); ++ << QLatin1String("5:06") << QLatin1String("5:21") << QLatin1String("5:40") << QLatin1String("3:55"); + QCOMPARE(m_trackDataModel->rowCount(), 11); + for (int row = 0; row < 11; ++row) { + QCOMPARE(m_trackDataModel->index(row, 0).data().toString(), lengths.at(row)); Property changes on: head/audio/kid3-kde4/files/patch-src_test_testmusicbrainzreleaseimporter.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/kid3-kde4/pkg-descr =================================================================== --- head/audio/kid3-kde4/pkg-descr (revision 476238) +++ head/audio/kid3-kde4/pkg-descr (revision 476239) @@ -1,4 +1,18 @@ -Kid3 is an application to edit the ID3v1 and ID3v2 tags in MP3 files in -an efficient way. Also tags in Ogg/Vorbis and FLAC files are supported. +Kid3 is an efficient audio file tag editor that allows you to easily +edit the tags of multiple different types of audio files without having +to type the same information repeatedly. -WWW: http://kid3.sourceforge.net + * Edit and convert ID3v1.1 tags and all ID3v2.3 and ID3v2.4 frames + * Edit tags in MP3, Ogg/Vorbis, DSF, FLAC, MPC, MP4/AAC, MP2, Opus, + Speex, TrueAudio, WavPack, WMA, WAV, AIFF files and tracker + modules (MOD, S3M, IT, XM) + * Edit tags of multiple files, e.g. the artist, album, year and genre of all + files of an album typically have the same values and can be set together + * Generate tags from filenames or the contents of tag fields + * Generate filenames and rename and create directories from tags + * Import from gnudb.org, TrackType.org, MusicBrainz, Discogs, and Amazon + * Export tags as CSV, HTML, playlists, Kover XML and other formats + * Edit synchronized lyrics and event timing codes, import/export LRC files + * Automate tasks using QML/JavaScript, D-Bus or the command-line interface + +WWW: https://kid3.sourceforge.io Index: head/audio/kid3-kde4/pkg-plist =================================================================== --- head/audio/kid3-kde4/pkg-plist (revision 476238) +++ head/audio/kid3-kde4/pkg-plist (revision 476239) @@ -1,66 +1,61 @@ -%%KDE%%bin/kid3 +bin/kid3%%QT_SUFX%% %%CLI%%bin/kid3-cli -%%QT%%bin/kid3-qt lib/libkid3-core.so lib/libkid3-core.so.%%SHLIB_VER%% lib/libkid3-gui.so lib/libkid3-gui.so.%%SHLIB_VER%% %%ACOUSTID%%lib/kid3/libacoustidimport.so lib/kid3/libamazonimport.so lib/kid3/libdiscogsimport.so lib/kid3/libfreedbimport.so %%MP3%%lib/kid3/libid3libmetadata.so %%MP4%%lib/kid3/libmp4v2metadata.so lib/kid3/libmusicbrainzimport.so %%OGGFLAC%%lib/kid3/liboggflacmetadata.so %%TAGLIB%%lib/kid3/libtaglibmetadata.so %%CLI%%man/de/man1/kid3-cli.1.gz %%QT%%man/de/man1/kid3-qt.1.gz man/de/man1/kid3.1.gz %%CLI%%man/man1/kid3-cli.1.gz %%QT%%man/man1/kid3-qt.1.gz man/man1/kid3.1.gz -%%KDE%%share/applications/kde4/kid3.desktop +%%KDE4%%share/applications/kde4/kid3.desktop +%%KF5%%share/applications/kid3.desktop %%QT%%share/applications/kid3-qt.desktop -%%KDE%%share/apps/kid3/kid3ui.rc +%%KDE4%%share/apps/kid3/kid3ui.rc %%KDE%%share/dbus-1/interfaces/net.sourceforge.Kid3.xml -%%KDE%%share/doc/HTML/de/kid3/common +%%KDE4%%share/doc/HTML/de/kid3/common %%KDE%%share/doc/HTML/de/kid3/index.cache.bz2 %%KDE%%share/doc/HTML/de/kid3/index.docbook -%%KDE%%share/doc/HTML/en/kid3/common +%%KDE4%%share/doc/HTML/en/kid3/common %%KDE%%share/doc/HTML/en/kid3/index.cache.bz2 %%KDE%%share/doc/HTML/en/kid3/index.docbook %%QT%%share/doc/kid3-qt/kid3_de.html %%QT%%share/doc/kid3-qt/kid3_en.html -%%QT%%share/icons/hicolor/128x128/apps/kid3-qt.png -%%KDE%%share/icons/hicolor/128x128/apps/kid3.png -%%QT%%share/icons/hicolor/16x16/apps/kid3-qt.png -%%KDE%%share/icons/hicolor/16x16/apps/kid3.png -%%QT%%share/icons/hicolor/32x32/apps/kid3-qt.png -%%KDE%%share/icons/hicolor/32x32/apps/kid3.png -%%QT%%share/icons/hicolor/48x48/apps/kid3-qt.png -%%KDE%%share/icons/hicolor/48x48/apps/kid3.png -%%QT%%share/icons/hicolor/64x64/apps/kid3-qt.png -%%KDE%%share/icons/hicolor/64x64/apps/kid3.png +share/icons/hicolor/128x128/apps/kid3%%QT_SUFX%%.png +share/icons/hicolor/16x16/apps/kid3%%QT_SUFX%%.png +share/icons/hicolor/32x32/apps/kid3%%QT_SUFX%%.png +share/icons/hicolor/48x48/apps/kid3%%QT_SUFX%%.png +share/icons/hicolor/64x64/apps/kid3%%QT_SUFX%%.png %%QT%%share/icons/hicolor/scalable/apps/kid3-qt.svg %%KDE%%share/icons/hicolor/scalable/apps/kid3.svgz +%%KF5%%share/kxmlgui5/kid3/kid3ui.rc %%DATADIR%%/translations/kid3_cs.qm %%DATADIR%%/translations/kid3_da.qm %%DATADIR%%/translations/kid3_de.qm %%DATADIR%%/translations/kid3_es.qm %%DATADIR%%/translations/kid3_et.qm %%DATADIR%%/translations/kid3_fi.qm %%DATADIR%%/translations/kid3_fr.qm %%DATADIR%%/translations/kid3_it.qm %%DATADIR%%/translations/kid3_nl.qm %%DATADIR%%/translations/kid3_pl.qm %%DATADIR%%/translations/kid3_ru.qm %%DATADIR%%/translations/kid3_sr.qm %%DATADIR%%/translations/kid3_sr@ijekavian.qm %%DATADIR%%/translations/kid3_sr@ijekavianlatin.qm %%DATADIR%%/translations/kid3_sr@latin.qm %%DATADIR%%/translations/kid3_tr.qm %%DATADIR%%/translations/kid3_zh_CN.qm %%DATADIR%%/translations/kid3_zh_TW.qm -%%QT%%share/metainfo/kid3-qt.appdata.xml -%%KDE%%share/metainfo/kid3.appdata.xml +share/metainfo/kid3%%QT_SUFX%%.appdata.xml Index: head/audio/kid3-kf5/Makefile =================================================================== --- head/audio/kid3-kf5/Makefile (nonexistent) +++ head/audio/kid3-kf5/Makefile (revision 476239) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +SLAVE= kf5 +MASTERDIR= ${.CURDIR}/../../audio/kid3-kde4 + +.include "${MASTERDIR}/Makefile" Property changes on: head/audio/kid3-kf5/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/kid3-qt4/Makefile =================================================================== --- head/audio/kid3-qt4/Makefile (revision 476238) +++ head/audio/kid3-qt4/Makefile (revision 476239) @@ -1,8 +1,6 @@ # $FreeBSD$ -PKGNAMESUFFIX= -qt4 +SLAVE= qt4 +MASTERDIR= ${.CURDIR}/../../audio/kid3-kde4 -COMMENT= Qt 4 based MP3/Ogg/FLAC tag editor - -MASTERDIR= ${.CURDIR}/../kid3-kde4 .include "${MASTERDIR}/Makefile" Index: head/audio/kid3-qt5/Makefile =================================================================== --- head/audio/kid3-qt5/Makefile (revision 476238) +++ head/audio/kid3-qt5/Makefile (revision 476239) @@ -1,8 +1,6 @@ # $FreeBSD$ -PKGNAMESUFFIX= -qt5 +SLAVE= qt5 +MASTERDIR= ${.CURDIR}/../../audio/kid3-kde4 -COMMENT= Qt 5 based MP3/Ogg/FLAC tag editor - -MASTERDIR= ${.CURDIR}/../kid3-kde4 .include "${MASTERDIR}/Makefile"