January 2017 - crux-commits

ports/opt (3.2): postfix: tweak {pre, post}-install scripts
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 4a8e75d95e5b2c461cfbaece45cc62ac4eb5a414 Author: Thomas Penteker <tek(a)serverop.de> Date: Wed Jan 25 23:36:46 2017 +0100 postfix: tweak {pre,post}-install scripts diff --git a/postfix/post-install b/postfix/post-install index b388358..2ed3486 100755 --- a/postfix/post-install +++ b/postfix/post-install @@ -20,4 +20,7 @@ cd /usr/lib/postfix create-missing /usr/sbin/postalias /etc/postfix/aliases -/usr/sbin/postmap hash:/etc/postfix/{virtual,relocated,access,transport} + +for hashfile in virtual relocated access transport; do + /usr/sbin/postmap hash:/etc/postfix/"$hashfile" +done diff --git a/postfix/pre-install b/postfix/pre-install index b804819..201c602 100755 --- a/postfix/pre-install +++ b/postfix/pre-install @@ -1,3 +1,3 @@ #!/bin/sh -/usr/sbin/groupadd postdrop +getent group postdrop || /usr/sbin/groupadd postdrop

1 0

ports/opt (3.2): irssi: 0.8.20 -> 1.0.0
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 87af61cdf57dcad2287696d1284fdd3116f7af1c Author: Thomas Penteker <tek(a)serverop.de> Date: Wed Jan 25 23:22:03 2017 +0100 irssi: 0.8.20 -> 1.0.0 diff --git a/irssi/.md5sum b/irssi/.md5sum index fdcb78e..da569c0 100644 --- a/irssi/.md5sum +++ b/irssi/.md5sum @@ -1 +1 @@ -67d48c5feec2d3b949d088aa4abc3601 irssi-0.8.20.tar.xz +5365bb3825536bad789ac22a293ece4d irssi-1.0.0.tar.xz diff --git a/irssi/Pkgfile b/irssi/Pkgfile index 89de752..d818407 100644 --- a/irssi/Pkgfile +++ b/irssi/Pkgfile @@ -5,7 +5,7 @@ # Depends on: glib name=irssi -version=0.8.20 +version=1.0.0 release=1 source=(https://github.com/irssi-import/irssi/releases/download/$version/$n… @@ -14,7 +14,6 @@ build () { ./configure \ --prefix=/usr \ - --enable-ipv6 \ --with-proxy \ --with-perl-lib=site make

1 0

ports/contrib (3.2): lmms: updated to version 0.4.15, new dependencies: fftw xorg-libxft
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 3068876a5fbf93bc47e53854d4f8cc3c413cf0c6 Author: Matt Housh <jaeger(a)crux.ninja> Date: Wed Jan 25 15:46:35 2017 -0600 lmms: updated to version 0.4.15, new dependencies: fftw xorg-libxft diff --git a/lmms/.footprint b/lmms/.footprint index 4747023..13394fa 100644 --- a/lmms/.footprint +++ b/lmms/.footprint @@ -94,6 +94,7 @@ drwxr-xr-x root/root usr/include/lmms/ -rw-r--r-- root/root usr/include/lmms/TempoSyncKnobModel.h -rw-r--r-- root/root usr/include/lmms/ToolPlugin.h -rw-r--r-- root/root usr/include/lmms/ToolPluginView.h +-rw-r--r-- root/root usr/include/lmms/VST_sync_shm.h -rw-r--r-- root/root usr/include/lmms/about_dialog.h -rw-r--r-- root/root usr/include/lmms/aeffectx.h -rw-r--r-- root/root usr/include/lmms/atomic_int.h @@ -185,62 +186,148 @@ drwxr-xr-x root/root usr/include/lmms/ -rw-r--r-- root/root usr/include/lmms/update_event.h -rw-r--r-- root/root usr/include/lmms/visualization_widget.h -rw-r--r-- root/root usr/include/lmms/volume.h -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/lmms/ --rwxr-xr-x root/root usr/lib/lmms/RemoteVstPlugin --rwxr-xr-x root/root usr/lib/lmms/RemoteVstPlugin.exe.so -drwxr-xr-x root/root usr/lib/lmms/ladspa/ --rwxr-xr-x root/root usr/lib/lmms/ladspa/calf.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/caps.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/cmt.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/comb_1190.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/dc_remove_1207.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/dj_eq_1901.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/fast_lookahead_limiter_1913.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/flanger_1191.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/phasers_1217.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_autopan.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_chorusflanger.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_deesser.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_doubler.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_dynamics_m.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_dynamics_st.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_echo.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_eq.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_eqbw.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_limiter.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_pinknoise.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_pitch.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_reflector.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_reverb.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_rotspeak.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_sigmoid.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_tremolo.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_tubewarmth.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/tap_vibrato.so --rwxr-xr-x root/root usr/lib/lmms/ladspa/vynil_1905.so --rwxr-xr-x root/root usr/lib/lmms/libaudiofileprocessor.so --rwxr-xr-x root/root usr/lib/lmms/libbassbooster.so --rwxr-xr-x root/root usr/lib/lmms/libbitinvader.so --rwxr-xr-x root/root usr/lib/lmms/libflpimport.so --rwxr-xr-x root/root usr/lib/lmms/libkicker.so --rwxr-xr-x root/root usr/lib/lmms/libladspabrowser.so --rwxr-xr-x root/root usr/lib/lmms/libladspaeffect.so --rwxr-xr-x root/root usr/lib/lmms/liblb302.so --rwxr-xr-x root/root usr/lib/lmms/libmidiimport.so --rwxr-xr-x root/root usr/lib/lmms/liborganic.so --rwxr-xr-x root/root usr/lib/lmms/libpapu.so --rwxr-xr-x root/root usr/lib/lmms/libpatman.so --rwxr-xr-x root/root usr/lib/lmms/libpeakcontrollereffect.so --rwxr-xr-x root/root usr/lib/lmms/libsf2player.so --rwxr-xr-x root/root usr/lib/lmms/libsid.so --rwxr-xr-x root/root usr/lib/lmms/libstereoenhancer.so --rwxr-xr-x root/root usr/lib/lmms/libstereomatrix.so --rwxr-xr-x root/root usr/lib/lmms/libtripleoscillator.so --rwxr-xr-x root/root usr/lib/lmms/libvestige.so --rwxr-xr-x root/root usr/lib/lmms/libvibedstrings.so --rwxr-xr-x root/root usr/lib/lmms/libvstbase.so --rwxr-xr-x root/root usr/lib/lmms/libvsteffect.so +drwxr-xr-x root/root usr/lib64/ +drwxr-xr-x root/root usr/lib64/lmms/ +-rwxr-xr-x root/root usr/lib64/lmms/RemoteZynAddSubFx +drwxr-xr-x root/root usr/lib64/lmms/ladspa/ +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/alias_1407.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/allpass_1895.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/am_pitchshift_1433.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/amp_1181.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/bandpass_a_iir_1893.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/bandpass_iir_1892.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/bode_shifter_1431.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/bode_shifter_cv_1432.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/butterworth_1902.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/calf.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/caps.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/chebstortion_1430.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/cmt.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/comb_1190.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/comb_1887.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/comb_splitter_1411.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/const_1909.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/crossover_dist_1404.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/dc_remove_1207.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/decay_1886.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/decimator_1202.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/declip_1195.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/delay_1898.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/delayorama_1402.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/diode_1185.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/divider_1186.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/dj_eq_1901.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/dj_flanger_1438.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/dyson_compress_1403.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/fad_delay_1192.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/fast_lookahead_limiter_1913.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/flanger_1191.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/foldover_1213.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/foverdrive_1196.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/freq_tracker_1418.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/gate_1410.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/giant_flange_1437.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/gong_1424.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/gong_beater_1439.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/gsm_1215.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/gverb_1216.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/hard_limiter_1413.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/harmonic_gen_1220.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/hermes_filter_1200.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/highpass_iir_1890.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/hilbert_1440.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/imp_1199.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/impulse_1885.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/inv_1429.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/karaoke_1409.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/ladspa-util.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/latency_1914.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/lcr_delay_1436.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/lowpass_iir_1891.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/ls_filter_1908.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/matrix_ms_st_1421.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/matrix_spatialiser_1422.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/matrix_st_ms_1420.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/mbeq_1197.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/mod_delay_1419.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/multivoice_chorus_1201.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/notch_iir_1894.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/phasers_1217.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/pitch_scale_1193.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/pitch_scale_1194.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/plate_1423.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/pointer_cast_1910.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/rate_shifter_1417.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/retro_flange_1208.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/revdelay_1605.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/ringmod_1188.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/satan_maximiser_1408.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/sc1_1425.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/sc2_1426.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/sc3_1427.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/sc4_1882.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/sc4m_1916.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/se4_1883.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/shaper_1187.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/sifter_1210.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/sin_cos_1881.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/single_para_1203.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/sinus_wavewrapper_1198.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/smooth_decimate_1414.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/split_1406.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/step_muxer_1212.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/surround_encoder_1401.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/svf_1214.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_autopan.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_chorusflanger.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_deesser.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_doubler.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_dynamics_m.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_dynamics_st.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_echo.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_eq.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_eqbw.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_limiter.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_pinknoise.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_pitch.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_reflector.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_reverb.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_rotspeak.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_sigmoid.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_tremolo.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_tubewarmth.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tap_vibrato.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/tape_delay_1211.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/transient_1206.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/triple_para_1204.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/valve_1209.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/valve_rect_1405.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/vynil_1905.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/wave_terrain_1412.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/xfade_1915.so +-rwxr-xr-x root/root usr/lib64/lmms/ladspa/zm1_1428.so +-rwxr-xr-x root/root usr/lib64/lmms/libZynAddSubFxCore.so +-rwxr-xr-x root/root usr/lib64/lmms/libaudiofileprocessor.so +-rwxr-xr-x root/root usr/lib64/lmms/libbassbooster.so +-rwxr-xr-x root/root usr/lib64/lmms/libbitinvader.so +-rwxr-xr-x root/root usr/lib64/lmms/libflpimport.so +-rwxr-xr-x root/root usr/lib64/lmms/libhydrogenimport.so +-rwxr-xr-x root/root usr/lib64/lmms/libkicker.so +-rwxr-xr-x root/root usr/lib64/lmms/libladspabrowser.so +-rwxr-xr-x root/root usr/lib64/lmms/libladspaeffect.so +-rwxr-xr-x root/root usr/lib64/lmms/liblb302.so +-rwxr-xr-x root/root usr/lib64/lmms/libmidiimport.so +-rwxr-xr-x root/root usr/lib64/lmms/liborganic.so +-rwxr-xr-x root/root usr/lib64/lmms/libpapu.so +-rwxr-xr-x root/root usr/lib64/lmms/libpatman.so +-rwxr-xr-x root/root usr/lib64/lmms/libpeakcontrollereffect.so +-rwxr-xr-x root/root usr/lib64/lmms/libsid.so +-rwxr-xr-x root/root usr/lib64/lmms/libspectrumanalyzer.so +-rwxr-xr-x root/root usr/lib64/lmms/libstereoenhancer.so +-rwxr-xr-x root/root usr/lib64/lmms/libstereomatrix.so +-rwxr-xr-x root/root usr/lib64/lmms/libtripleoscillator.so +-rwxr-xr-x root/root usr/lib64/lmms/libvibedstrings.so +-rwxr-xr-x root/root usr/lib64/lmms/libzynaddsubfx.so drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -r--r--r-- root/root usr/man/man1/lmms.1.gz @@ -257,12 +344,13 @@ drwxr-xr-x root/root usr/share/lmms/locale/ -rw-r--r-- root/root usr/share/lmms/locale/de.qm -rw-r--r-- root/root usr/share/lmms/locale/en.qm -rw-r--r-- root/root usr/share/lmms/locale/es.qm +-rw-r--r-- root/root usr/share/lmms/locale/fa.qm -rw-r--r-- root/root usr/share/lmms/locale/fr.qm --rw-r--r-- root/root usr/share/lmms/locale/ir.qm -rw-r--r-- root/root usr/share/lmms/locale/it.qm -rw-r--r-- root/root usr/share/lmms/locale/ja.qm -rw-r--r-- root/root usr/share/lmms/locale/ko.qm -rw-r--r-- root/root usr/share/lmms/locale/nl.qm +-rw-r--r-- root/root usr/share/lmms/locale/pl.qm -rw-r--r-- root/root usr/share/lmms/locale/pt_br.qm -rw-r--r-- root/root usr/share/lmms/locale/ru.qm -rw-r--r-- root/root usr/share/lmms/locale/sv.qm @@ -813,45 +901,62 @@ drwxr-xr-x root/root usr/share/lmms/presets/ZynAddSubFX/SynthPiano/ -rw-r--r-- root/root usr/share/lmms/presets/ZynAddSubFX/SynthPiano/0070-Synth Piano 4.xiz -rw-r--r-- root/root usr/share/lmms/presets/ZynAddSubFX/SynthPiano/0071-Synth Piano 5.xiz drwxr-xr-x root/root usr/share/lmms/projects/ -drwxr-xr-x root/root usr/share/lmms/projects/cool_songs/ --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/BlueWolf-DreamTravel.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/Chris-HorizonRemix.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/Chris-RaveRiff.mmpz --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/Djeezus-BeatRolls.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/Djeezus-Oscilisous.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/Lokori-Systematic_Chaos.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/Malex-Horizon4.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/Marfil-MarfilDrum01.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/MysthR-Living.mmpz --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/OrtalDj-FirstProyect.mmpz --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/SharkyX-Experiments.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/Siegel-DreamWave.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/Siegel-SpeedTrack.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/Silva-ElvesCall.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/Skiessi-Onion.mmpz --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/Skiessi-TurningPoint.mmpz --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/StrictProduction-DearJonDoe.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/StrictProduction-Lamentelnes.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/StrictProduction-Underline.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/TobyDox-Confused.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/TobyDox-Psycho.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/TobyDox-TheFourthDimension.mmp --rw-r--r-- root/root usr/share/lmms/projects/cool_songs/j1m-DingDong.mmp -drwxr-xr-x root/root usr/share/lmms/projects/demos/ --rw-r--r-- root/root usr/share/lmms/projects/demos/TobyDox-Crystallo.mmp --rw-r--r-- root/root usr/share/lmms/projects/demos/Zvonsully-RaceTheZBeat.mmp --rw-r--r-- root/root usr/share/lmms/projects/demos/beat_collection.mmp --rw-r--r-- root/root usr/share/lmms/projects/demos/demo1.mmp --rw-r--r-- root/root usr/share/lmms/projects/demos/demo2.mmp --rw-r--r-- root/root usr/share/lmms/projects/demos/demo3.mmp --rw-r--r-- root/root usr/share/lmms/projects/demos/demo4.mmp --rw-r--r-- root/root usr/share/lmms/projects/demos/demo5.mmp --rw-r--r-- root/root usr/share/lmms/projects/demos/demo6.mmp --rw-r--r-- root/root usr/share/lmms/projects/demos/lb302quick.mmpz --rw-r--r-- root/root usr/share/lmms/projects/demos/loop_collection.mmp --rw-r--r-- root/root usr/share/lmms/projects/demos/newFangled.mmpz --rw-r--r-- root/root usr/share/lmms/projects/demos/some_basslines.mmp +drwxr-xr-x root/root usr/share/lmms/projects/CoolSongs/ +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Alf42red-Mauiwowi.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/CapDan-TwilightArea-OriginalByAlf42red.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/CapDan-ZeroSumGame-OriginalByZakarra.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Farbro-Tectonic.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Impulslogik-Zen.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Momo64-esp.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Namitryus-K-Project.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Oglsdl-Dr8v2.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Root84-Initialize.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Saber-FinalStep.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Settel-InnerRecreation.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Skiessi-Onion.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Skiessi-TurningPoint.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Socceroos-Progress.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/StrictProduction-DearJonDoe.mmp +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/TameAnderson-MakeMe.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Thaledric-Armageddon.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Zakarra-59_Degrees.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Zakarra-MainstreamMemory.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/CoolSongs/Zakarra-OneDay.mmpz +drwxr-xr-x root/root usr/share/lmms/projects/Covers/ +-rw-r--r-- root/root usr/share/lmms/projects/Covers/CapDan-Infinity2010.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Covers/Edo98-FinalCountdown.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Covers/MichaelKuhn-Mondscheinsonate.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Covers/Momo64-Jeeg.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Covers/Thaledric-AwayFromBoobaloo.mmpz +drwxr-xr-x root/root usr/share/lmms/projects/Demos/ +-rw-r--r-- root/root usr/share/lmms/projects/Demos/AngryLlama-NewFangled.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Demos/Ashore.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Demos/CapDan-ReggaeTry.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Demos/CapDan-ReggaetonTry.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Demos/DnB.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Demos/EsoXLB-CPU.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Demos/Oglsdl-PpTrip.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Demos/Skiessi-C64.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Demos/Thomasso-AxeFromThe80s.mmpz +drwxr-xr-x root/root usr/share/lmms/projects/OldStuff/ +-rw-r--r-- root/root usr/share/lmms/projects/OldStuff/BlueWolf-DreamTravel.mmp +-rw-r--r-- root/root usr/share/lmms/projects/OldStuff/Chris-HorizonRemix.mmp +-rw-r--r-- root/root usr/share/lmms/projects/OldStuff/Malex-Horizon4.mmp +-rw-r--r-- root/root usr/share/lmms/projects/OldStuff/MysthR-Living.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/OldStuff/Siegel-DreamWave.mmp +-rw-r--r-- root/root usr/share/lmms/projects/OldStuff/Siegel-SpeedTrack.mmp +-rw-r--r-- root/root usr/share/lmms/projects/OldStuff/Silva-ElvesCall.mmp +-rw-r--r-- root/root usr/share/lmms/projects/OldStuff/Skiessi-RandomProjectNumber14253.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/OldStuff/TobyDox-Confused.mmp +-rw-r--r-- root/root usr/share/lmms/projects/OldStuff/TobyDox-Psycho.mmp +drwxr-xr-x root/root usr/share/lmms/projects/Shorties/ +-rw-r--r-- root/root usr/share/lmms/projects/Shorties/Crunk(Demo).mmp +-rw-r--r-- root/root usr/share/lmms/projects/Shorties/Greshz-CoolSnip.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Shorties/Root84-TrancyLoop.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Shorties/Skiessi-222.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Shorties/Surrender-Main.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Shorties/sv-DnB-Startup.mmpz +-rw-r--r-- root/root usr/share/lmms/projects/Shorties/sv-Trance-Startup.mmpz drwxr-xr-x root/root usr/share/lmms/projects/tutorials/ -rw-r--r-- root/root usr/share/lmms/projects/tutorials/editing_note_volumes.mmp drwxr-xr-x root/root usr/share/lmms/samples/ @@ -1888,6 +1993,7 @@ drwxr-xr-x root/root usr/share/lmms/themes/default/ -rw-r--r-- root/root usr/share/lmms/themes/default/black_key.png -rw-r--r-- root/root usr/share/lmms/themes/default/black_key_pressed.png -rw-r--r-- root/root usr/share/lmms/themes/default/cancel.png +-rw-r--r-- root/root usr/share/lmms/themes/default/chord.png -rw-r--r-- root/root usr/share/lmms/themes/default/clock.png -rw-r--r-- root/root usr/share/lmms/themes/default/colorize.png -rw-r--r-- root/root usr/share/lmms/themes/default/combobox_arrow.png @@ -2018,6 +2124,7 @@ drwxr-xr-x root/root usr/share/lmms/themes/default/ -rw-r--r-- root/root usr/share/lmms/themes/default/sample_track.png -rw-r--r-- root/root usr/share/lmms/themes/default/saw_wave_active.png -rw-r--r-- root/root usr/share/lmms/themes/default/saw_wave_inactive.png +-rw-r--r-- root/root usr/share/lmms/themes/default/scale.png -rw-r--r-- root/root usr/share/lmms/themes/default/setup_audio.png -rw-r--r-- root/root usr/share/lmms/themes/default/setup_directories.png -rw-r--r-- root/root usr/share/lmms/themes/default/setup_general.png @@ -2036,6 +2143,14 @@ drwxr-xr-x root/root usr/share/lmms/themes/default/ -rw-r--r-- root/root usr/share/lmms/themes/default/step_btn_on_100.png -rw-r--r-- root/root usr/share/lmms/themes/default/step_btn_on_yellow.png -rw-r--r-- root/root usr/share/lmms/themes/default/step_btn_remove.png +-rw-r--r-- root/root usr/share/lmms/themes/default/stepper-down-press.png +-rw-r--r-- root/root usr/share/lmms/themes/default/stepper-down.png +-rw-r--r-- root/root usr/share/lmms/themes/default/stepper-left-press.png +-rw-r--r-- root/root usr/share/lmms/themes/default/stepper-left.png +-rw-r--r-- root/root usr/share/lmms/themes/default/stepper-right-press.png +-rw-r--r-- root/root usr/share/lmms/themes/default/stepper-right.png +-rw-r--r-- root/root usr/share/lmms/themes/default/stepper-up-press.png +-rw-r--r-- root/root usr/share/lmms/themes/default/stepper-up.png -rw-r--r-- root/root usr/share/lmms/themes/default/stop.png -rw-r--r-- root/root usr/share/lmms/themes/default/style.css -rw-r--r-- root/root usr/share/lmms/themes/default/tempo_sync.png diff --git a/lmms/.md5sum b/lmms/.md5sum index f9cfb44..a792697 100644 --- a/lmms/.md5sum +++ b/lmms/.md5sum @@ -1 +1 @@ -b72c3a87a43e7653bf83d13f35c5d963 lmms-0.4.11.tar.bz2 +f46d51d8d4d56f4335eb71c1e6bf5d98 lmms-0.4.15.tar.gz diff --git a/lmms/Pkgfile b/lmms/Pkgfile index 9654679..e24ee06 100644 --- a/lmms/Pkgfile +++ b/lmms/Pkgfile @@ -2,13 +2,13 @@ # URL: http://lmms.sourceforge.net/ # Maintainer: Jose V Beneyto, sepen at crux dot nu # Packager: Jose V Beneyto, sepen at crux dot nu -# Depends on: cmake qt4 jack-audio-connection-kit +# Depends on: cmake qt4 jack-audio-connection-kit fftw xorg-libxft # Nice to have: libsamplerate fluidsynth name=lmms -version=0.4.11 +version=0.4.15 release=1 -source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2) +source=(https://crux.nu/files/$name-$version.tar.gz) build() { export QTDIR=/usr/share/qt4

1 0

ports/contrib (3.2): docker: updated to version 1.13.0
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 85cb714334788c363c093c86fd56d69d8dac380d Author: Matt Housh <jaeger(a)crux.ninja> Date: Wed Jan 25 13:20:10 2017 -0600 docker: updated to version 1.13.0 diff --git a/docker/.footprint b/docker/.footprint index 67e40b6..26e87f5 100644 --- a/docker/.footprint +++ b/docker/.footprint @@ -13,7 +13,6 @@ drwxr-xr-x root/root usr/bin/ lrwxrwxrwx root/root usr/bin/docker-containerd -> containerd lrwxrwxrwx root/root usr/bin/docker-containerd-ctr -> ctr lrwxrwxrwx root/root usr/bin/docker-containerd-shim -> containerd-shim --rwxr-xr-x root/root usr/bin/docker-proxy lrwxrwxrwx root/root usr/bin/docker-runc -> runc -rwxr-xr-x root/root usr/bin/dockerd drwxr-xr-x root/root usr/share/ diff --git a/docker/.md5sum b/docker/.md5sum index f997a45..4787bad 100644 --- a/docker/.md5sum +++ b/docker/.md5sum @@ -1,4 +1,4 @@ -2db317ab9811641449784fe0fb29d74f docker-1.12.6.tar.gz -e191cd2164f177d4ba850fc6b8580e24 docker-man-pages-1.12.6.tar.xz +23d3875ac67d5b67dd1918c45ba98537 docker-1.13.0.tar.gz +718efdb82ac15865f3e9291f86198117 docker-man-pages-1.13.0.tar.xz 639d3af72199001bb612e545335a67a3 docker.conf -493cf8e992ad384bc53ba682f88dc654 docker.rc +d83f39cc5876fed6daecfbd28cfed4c1 docker.rc diff --git a/docker/Pkgfile b/docker/Pkgfile index e170d99..7f16d14 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -4,7 +4,7 @@ # Depends on: containerd runc btrfs-progs cgroupfs-mount name=docker -version=1.12.6 +version=1.13.0 release=1 source=(http://jaeger.morpheus.net/linux/crux/files/$name-$version.tar.gz \ http://jaeger.morpheus.net/linux/crux/files/$name-man-pages-$version.tar.xz \ @@ -12,7 +12,7 @@ source=(http://jaeger.morpheus.net/linux/crux/files/$name-$version.tar.gz \ build() { export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT=6b644ec + export DOCKER_GITCOMMIT=49bf474 cd $name-$version hack/make.sh dynbinary @@ -20,8 +20,6 @@ build() { $PKG/usr/bin/$name install -D -m 0755 bundles/$version/dynbinary-daemon/dockerd-$version \ $PKG/usr/bin/dockerd - install -D -m 0755 bundles/$version/dynbinary-daemon/$name-proxy-$version \ - $PKG/usr/bin/$name-proxy for M in 1 5 8; do install -d -m 0755 $PKG/usr/share/man/man${M} diff --git a/docker/docker.rc b/docker/docker.rc index 774ab70..ccb56bd 100755 --- a/docker/docker.rc +++ b/docker/docker.rc @@ -4,7 +4,7 @@ # SSD=/sbin/start-stop-daemon -PROG=/usr/bin/docker +PROG=/usr/bin/dockerd PID=/var/run/docker.pid CONF=/etc/docker.conf LOG=/var/log/docker.log @@ -27,7 +27,7 @@ case $1 in /usr/bin/cgroupfs-mount - $SSD --start --pidfile $PID --background --exec $PROG -- daemon $OPTS >> $LOG 2>&1 + $SSD --start --pidfile $PID --background --exec $PROG -- $OPTS >> $LOG 2>&1 ;; stop) $SSD --stop --retry 10 --pidfile $PID

1 0

ports/contrib (3.3): Merge branch '3.2' into 3.3
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit abedefb5895a83b8fc0a13f74c971c58876fa2b6 Merge: e295059 a7bf536 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Wed Jan 25 14:27:11 2017 +0100 Merge branch '3.2' into 3.3

1 0

ports/contrib (3.3): nginx: updated to version 1.11.9
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit a7bf5363f04f73fabd32969b79a0f0924dae81af Author: Matt Housh <jaeger(a)crux.ninja> Date: Tue Jan 24 15:08:49 2017 -0600 nginx: updated to version 1.11.9 diff --git a/nginx/.md5sum b/nginx/.md5sum index 497e8a9..2e3c8ea 100644 --- a/nginx/.md5sum +++ b/nginx/.md5sum @@ -1,3 +1,3 @@ -8f68f49b6db510e567bba9e0c271a3ac nginx-1.11.8.tar.gz +7aeca793819c2b8df134c0b1cfe98361 nginx-1.11.9.tar.gz 93b358681200fe294581cb559d529aee nginx.conf 06712aa2b72397850b0725f2e9d20627 nginx.rc diff --git a/nginx/Pkgfile b/nginx/Pkgfile index 362b76e..63c8b4e 100644 --- a/nginx/Pkgfile +++ b/nginx/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcre zlib openssl name=nginx -version=1.11.8 +version=1.11.9 release=1 source=(http://nginx.org/download/$name-$version.tar.gz \ $name.conf $name.rc)

1 0

ports/contrib (3.3): wxgtk: dependency change: gst-plugins-base-compat -> gst-plugins-base
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 3f67537febddc9c03a600b471cf8c01daa34533e Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Mon Jan 23 23:35:20 2017 +1100 wxgtk: dependency change: gst-plugins-base-compat -> gst-plugins-base diff --git a/wxgtk/.md5sum b/wxgtk/.md5sum index 062927a..322ea1c 100644 --- a/wxgtk/.md5sum +++ b/wxgtk/.md5sum @@ -1 +1,4 @@ +c617a7151d5b518f6216b3bcd84f5082 gst1.0.patch +e71ac89e0ed2562d821cfbf1263ce4cb make-abicheck-non-fatal.patch ba4cd1f3853d0cd49134c5ae028ad080 wxWidgets-3.0.2.tar.bz2 +f624f8a0c1163a1376d43f5b57c5f39a wxgtk-gcc6.patch diff --git a/wxgtk/Pkgfile b/wxgtk/Pkgfile index 1da67f3..eb8097c 100644 --- a/wxgtk/Pkgfile +++ b/wxgtk/Pkgfile @@ -2,16 +2,30 @@ # URL: http://www.wxwidgets.org/ # Maintainer: Danny Rawlins, crux at romster dot me # Packager: Antti Nykanen, aon at iki dot fi -# Depends on: gtk glu gst-plugins-base-compat +# Depends on: gtk glu gst-plugins-base name=wxgtk version=3.0.2 -release=1 -source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-$version.tar.bz2) +release=2 +source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-$version.tar.bz2 + make-abicheck-non-fatal.patch + wxgtk-gcc6.patch + gst1.0.patch) build() { cd wxWidgets-$version + # C++ ABI check is too strict and breaks with GCC 5.1 + # https://bugzilla.redhat.com/show_bug.cgi?id=1200611 + patch -p1 -i $SRC/make-abicheck-non-fatal.patch + + # Fix build with GCC 6 + patch -p1 -i $SRC/wxgtk-gcc6.patch + + # Gstreamer 0.10 -> 1.0 patch + patch -p1 -i $SRC/gst1.0.patch + + ./autogen.sh ./configure \ --prefix=/usr \ --libdir=/usr/lib \ diff --git a/wxgtk/gst1.0.patch b/wxgtk/gst1.0.patch new file mode 100644 index 0000000..63f793a --- /dev/null +++ b/wxgtk/gst1.0.patch @@ -0,0 +1,886 @@ +Index: wxwidgets3.0-3.0.2+dfsg/configure.in +=================================================================== +--- wxwidgets3.0-3.0.2+dfsg.orig/configure.in ++++ wxwidgets3.0-3.0.2+dfsg/configure.in +@@ -7543,43 +7543,22 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$ + wxUSE_GSTREAMER="no" + + dnl ------------------------------------------------------------------- +- dnl Test for at least 0.8 gstreamer module from pkg-config +- dnl Even totem doesn't accept 0.9 evidently. +- dnl +- dnl So, we first check to see if 0.10 if available - if not we +- dnl try the older 0.8 version ++ dnl Test for at least gstreamer 1.0 module from pkg-config + dnl ------------------------------------------------------------------- +- GST_VERSION_MAJOR=0 +- GST_VERSION_MINOR=10 ++ GST_VERSION_MAJOR=1 ++ GST_VERSION_MINOR=0 + GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR + +- if test "$wxUSE_GSTREAMER8" = "no"; then +- PKG_CHECK_MODULES(GST, +- [gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION], +- [ +- wxUSE_GSTREAMER="yes" +- GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_VERSION" +- ], +- [ +- AC_MSG_WARN([GStreamer 0.10 not available, falling back to 0.8]) +- GST_VERSION_MINOR=8 +- ] +- ) +- else +- dnl check only for 0.8 +- GST_VERSION_MINOR=8 +- fi +- +- if test $GST_VERSION_MINOR = "8"; then +- GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR +- PKG_CHECK_MODULES(GST, +- [gstreamer-$GST_VERSION gstreamer-interfaces-$GST_VERSION gstreamer-gconf-$GST_VERSION], +- wxUSE_GSTREAMER="yes", +- [ +- AC_MSG_WARN([GStreamer 0.8/0.10 not available.]) +- ]) +- fi +- ++ PKG_CHECK_MODULES(GST, ++ [gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION], ++ [ ++ wxUSE_GSTREAMER="yes" ++ GST_LIBS="$GST_LIBS -lgstvideo-$GST_VERSION" ++ ], ++ [ ++ AC_MSG_WARN([GStreamer 1.0 not available]) ++ ] ++ ) + + if test "$wxUSE_GSTREAMER" = "yes"; then + CPPFLAGS="$GST_CFLAGS $CPPFLAGS" +Index: wxwidgets3.0-3.0.2+dfsg/src/unix/mediactrl.cpp +=================================================================== +--- wxwidgets3.0-3.0.2+dfsg.orig/src/unix/mediactrl.cpp ++++ wxwidgets3.0-3.0.2+dfsg/src/unix/mediactrl.cpp +@@ -19,13 +19,7 @@ + + #include <gst/gst.h> // main gstreamer header + +-// xoverlay/video stuff, gst-gconf for 0.8 +-#if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10 +-# include <gst/interfaces/xoverlay.h> +-#else +-# include <gst/xoverlay/xoverlay.h> +-# include <gst/gconf/gconf.h> // gstreamer glib configuration +-#endif ++#include <gst/video/videooverlay.h> + + #ifndef WX_PRECOMP + #include "wx/log.h" // wxLogDebug/wxLogSysError/wxLogTrace +@@ -48,11 +42,11 @@ + //----------------------------------------------------------------------------- + + /* +- This is the GStreamer backend for unix. Currently we require 0.8 or +- 0.10. Here we use the "playbin" GstElement for ease of use. ++ This is the GStreamer backend for unix. Currently we require 1.0. ++ Here we use the "playbin" GstElement for ease of use. + +- Note that now we compare state change functions to GST_STATE_FAILURE +- now rather than GST_STATE_SUCCESS as newer gstreamer versions return ++ Note that now we compare state change functions to GST_STATE_CHANGE_FAILURE ++ now rather than GST_STATE_CHANGE_SUCCESS as newer gstreamer versions return + non-success values for returns that are otherwise successful but not + immediate. + +@@ -60,11 +54,8 @@ + moment but with a tad bit of work it could theorectically work in + straight wxX11 et al. + +- One last note is that resuming from pausing/seeking can result +- in erratic video playback (GStreamer-based bug, happens in totem as well) +- - this is better in 0.10, however. One thing that might make it worse +- here is that we don't preserve the aspect ratio of the video and stretch +- it to the whole window. ++ One last note is that we don't preserve the aspect ratio of the video and ++ stretch it to the whole window. + + Note that there are some things used here that could be undocumented - + for reference see the media player Kiss and Totem as well as some +@@ -72,12 +63,10 @@ + that attempted thread-safety... + + Then there is the issue of m_asynclock. This serves several purposes: +- 1) It prevents the C callbacks from sending wx state change events +- so that we don't get duplicate ones in 0.8 +- 2) It makes the sync and async handlers in 0.10 not drop any ++ 1) It makes the sync and async handlers not drop any + messages so that while we are polling it we get the messages in + SyncStateChange instead of the queue. +- 3) Keeps the pausing in Stop() synchronous ++ 2) Keeps the pausing in Stop() synchronous + + RN: Note that I've tried to follow the wxGTK conventions here as close + as possible. In the implementation the C Callbacks come first, then +@@ -90,43 +79,9 @@ + //============================================================================= + + //----------------------------------------------------------------------------- +-// GStreamer (most version compatibility) macros ++// GStreamer macros + //----------------------------------------------------------------------------- + +-// In 0.9 there was a HUGE change to GstQuery and the +-// gst_element_query function changed dramatically and split off +-// into two separate ones +-#if GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR <= 8 +-# define wxGst_element_query_duration(e, f, p) \ +- gst_element_query(e, GST_QUERY_TOTAL, f, p) +-# define wxGst_element_query_position(e, f, p) \ +- gst_element_query(e, GST_QUERY_POSITION, f, p) +-#elif GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR == 9 +-// However, the actual 0.9 version has a slightly different definition +-// and instead of gst_element_query_duration it has two parameters to +-// gst_element_query_position instead +-# define wxGst_element_query_duration(e, f, p) \ +- gst_element_query_position(e, f, 0, p) +-# define wxGst_element_query_position(e, f, p) \ +- gst_element_query_position(e, f, p, 0) +-#else +-# define wxGst_element_query_duration \ +- gst_element_query_duration +-# define wxGst_element_query_position \ +- gst_element_query_position +-#endif +- +-// Other 0.10 macros +-#if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10 +-# define GST_STATE_FAILURE GST_STATE_CHANGE_FAILURE +-# define GST_STATE_SUCCESS GST_STATE_CHANGE_SUCCESS +-# define GstElementState GstState +-# define gst_gconf_get_default_video_sink() \ +- gst_element_factory_make ("gconfvideosink", "video-sink"); +-# define gst_gconf_get_default_audio_sink() \ +- gst_element_factory_make ("gconfaudiosink", "audio-sink"); +-#endif +- + // Max wait time for element state waiting - GST_CLOCK_TIME_NONE for inf + #define wxGSTREAMER_TIMEOUT (100 * GST_MSECOND) // Max 100 milliseconds + +@@ -189,11 +144,11 @@ public: + bool CheckForErrors(); + bool DoLoad(const wxString& locstring); + wxMediaCtrl* GetControl() { return m_ctrl; } // for C Callbacks +- void HandleStateChange(GstElementState oldstate, GstElementState newstate); ++ void HandleStateChange(GstState oldstate, GstState newstate); + bool QueryVideoSizeFromElement(GstElement* element); + bool QueryVideoSizeFromPad(GstPad* caps); +- void SetupXOverlay(); +- bool SyncStateChange(GstElement* element, GstElementState state, ++ void SetupVideoOverlay(); ++ bool SyncStateChange(GstElement* element, GstState state, + gint64 llTimeout = wxGSTREAMER_TIMEOUT); + bool TryAudioSink(GstElement* audiosink); + bool TryVideoSink(GstElement* videosink); +@@ -203,7 +158,7 @@ public: + double m_dRate; // Current playback rate - + // see GetPlaybackRate for notes + wxLongLong m_llPausedPos; // Paused position - see Pause() +- GstXOverlay* m_xoverlay; // X Overlay that contains the GST video ++ GstVideoOverlay* m_videooverlay; // Video Overlay that contains the GST video + wxMutex m_asynclock; // See "discussion of internals" + class wxGStreamerMediaEventHandler* m_eventHandler; // see below + +@@ -284,7 +239,7 @@ expose_event(GtkWidget* widget, GdkEvent + { + // I've seen this recommended somewhere... + // TODO: Is this needed? Maybe it is just cruft... +- // gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(be->m_xoverlay), ++ // gst_video_overlay_set_window_handle( GST_VIDEO_OVERLAY(be->m_videooverlay), + // GDK_WINDOW_XWINDOW( window ) ); + + // If we have actual video..... +@@ -294,7 +249,7 @@ expose_event(GtkWidget* widget, GdkEvent + // GST Doesn't redraw automatically while paused + // Plus, the video sometimes doesn't redraw when it looses focus + // or is painted over so we just tell it to redraw... +- gst_x_overlay_expose(be->m_xoverlay); ++ gst_video_overlay_expose(be->m_videooverlay); + } + else + { +@@ -334,7 +289,7 @@ static gint gtk_window_realize_callback( + GdkWindow* window = gtk_widget_get_window(widget); + wxASSERT(window); + +- gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(be->m_xoverlay), ++ gst_video_overlay_set_window_handle( GST_VIDEO_OVERLAY(be->m_videooverlay), + GDK_WINDOW_XID(window) + ); + GtkWidget* w = be->GetControl()->m_wxwindow; +@@ -349,30 +304,6 @@ static gint gtk_window_realize_callback( + #endif // wxGTK + + //----------------------------------------------------------------------------- +-// "state-change" from m_playbin/GST_MESSAGE_STATE_CHANGE +-// +-// Called by gstreamer when the state changes - here we +-// send the appropriate corresponding wx event. +-// +-// 0.8 only as HandleStateChange does this in both versions +-//----------------------------------------------------------------------------- +-#if GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR < 10 +-extern "C" { +-static void gst_state_change_callback(GstElement *play, +- GstElementState oldstate, +- GstElementState newstate, +- wxGStreamerMediaBackend* be) +-{ +- if(be->m_asynclock.TryLock() == wxMUTEX_NO_ERROR) +- { +- be->HandleStateChange(oldstate, newstate); +- be->m_asynclock.Unlock(); +- } +-} +-} +-#endif // <0.10 +- +-//----------------------------------------------------------------------------- + // "eos" from m_playbin/GST_MESSAGE_EOS + // + // Called by gstreamer when the media is done playing ("end of stream") +@@ -425,69 +356,17 @@ static void gst_notify_caps_callback(Gst + } + + //----------------------------------------------------------------------------- +-// "notify::stream-info" from m_playbin +-// +-// Run through the stuff in "stream-info" of m_playbin for a valid +-// video pad, and then attempt to query the video size from it - if not +-// set up an event to do so when ready. +-// +-// Currently unused - now we just query it directly using +-// QueryVideoSizeFromElement. +-// +-// (Undocumented?) +-//----------------------------------------------------------------------------- +-#if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10 +-extern "C" { +-static void gst_notify_stream_info_callback(GstElement* WXUNUSED(element), +- GParamSpec* WXUNUSED(pspec), +- wxGStreamerMediaBackend* be) +-{ +- wxLogTrace(wxTRACE_GStreamer, wxT("gst_notify_stream_info_callback")); +- be->QueryVideoSizeFromElement(be->m_playbin); +-} +-} +-#endif +- +-//----------------------------------------------------------------------------- +-// "desired-size-changed" from m_xoverlay +-// +-// 0.8-specific this provides us with the video size when it changes - +-// even though we get the caps as well this seems to come before the +-// caps notification does... +-// +-// Note it will return 16,16 for an early-bird value or for audio +-//----------------------------------------------------------------------------- +-#if GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR < 10 +-extern "C" { +-static void gst_desired_size_changed_callback(GstElement * play, +- guint width, guint height, +- wxGStreamerMediaBackend* be) +-{ +- if(!(width == 16 && height == 16)) +- { +- be->m_videoSize.x = width; +- be->m_videoSize.y = height; +- } +- else +- be->QueryVideoSizeFromElement(be->m_playbin); +-} +-} +-#endif +- +-//----------------------------------------------------------------------------- + // gst_bus_async_callback [static] + // gst_bus_sync_callback [static] + // +-// Called by m_playbin for notifications such as end-of-stream in 0.10 - +-// in previous versions g_signal notifications were used. Because everything ++// Called by m_playbin for notifications such as end-of-stream. Because everything + // in centered in one switch statement though it reminds one of old WinAPI + // stuff. + // + // gst_bus_sync_callback is that sync version that is called on the main GUI + // thread before the async version that we use to set the xwindow id of the +-// XOverlay (NB: This isn't currently used - see CreateControl()). ++// VideoOverlay (NB: This isn't currently used - see CreateControl()). + //----------------------------------------------------------------------------- +-#if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10 + extern "C" { + static gboolean gst_bus_async_callback(GstBus* WXUNUSED(bus), + GstMessage* message, +@@ -537,8 +416,7 @@ static GstBusSyncReply gst_bus_sync_call + { + // Pass a non-xwindowid-setting event on to the async handler where it + // belongs +- if (GST_MESSAGE_TYPE (message) != GST_MESSAGE_ELEMENT || +- !gst_structure_has_name (message->structure, "prepare-xwindow-id")) ++ if (!gst_is_video_overlay_prepare_window_handle_message (message)) + { + // + // NB: Unfortunately, the async callback can be quite +@@ -552,12 +430,11 @@ static GstBusSyncReply gst_bus_sync_call + return GST_BUS_DROP; + } + +- wxLogTrace(wxTRACE_GStreamer, wxT("Got prepare-xwindow-id")); +- be->SetupXOverlay(); ++ wxLogTrace(wxTRACE_GStreamer, wxT("Got prepare-window-handle")); ++ be->SetupVideoOverlay(); + return GST_BUS_DROP; // We handled this message - drop from the queue + } + } +-#endif + + //----------------------------------------------------------------------------- + // +@@ -569,11 +446,11 @@ static GstBusSyncReply gst_bus_sync_call + // wxGStreamerMediaBackend::HandleStateChange + // + // Handles a state change event from our C Callback for "state-change" or +-// the async queue in 0.10. (Mostly this is here to avoid locking the ++// the async queue . (Mostly this is here to avoid locking the + // the mutex twice...) + //----------------------------------------------------------------------------- +-void wxGStreamerMediaBackend::HandleStateChange(GstElementState oldstate, +- GstElementState newstate) ++void wxGStreamerMediaBackend::HandleStateChange(GstState oldstate, ++ GstState newstate) + { + switch(newstate) + { +@@ -604,83 +481,13 @@ void wxGStreamerMediaBackend::HandleStat + } + + //----------------------------------------------------------------------------- +-// wxGStreamerMediaBackend::QueryVideoSizeFromElement +-// +-// Run through the stuff in "stream-info" of element for a valid +-// video pad, and then attempt to query the video size from it - if not +-// set up an event to do so when ready. Return true +-// if we got a valid video pad. +-//----------------------------------------------------------------------------- +-bool wxGStreamerMediaBackend::QueryVideoSizeFromElement(GstElement* element) +-{ +- const GList *list = NULL; +- g_object_get (G_OBJECT (element), "stream-info", &list, NULL); +- +- for ( ; list != NULL; list = list->next) +- { +- GObject *info = (GObject *) list->data; +- gint type; +- GParamSpec *pspec; +- GEnumValue *val; +- GstPad *pad = NULL; +- +- g_object_get (info, "type", &type, NULL); +- pspec = g_object_class_find_property ( +- G_OBJECT_GET_CLASS (info), "type"); +- val = g_enum_get_value (G_PARAM_SPEC_ENUM (pspec)->enum_class, type); +- +- if (!strncasecmp(val->value_name, "video", 5) || +- !strncmp(val->value_name, "GST_STREAM_TYPE_VIDEO", 21)) +- { +- // Newer gstreamer 0.8+ plugins are SUPPOSED to have "object"... +- // but a lot of old plugins still use "pad" :) +- pspec = g_object_class_find_property ( +- G_OBJECT_GET_CLASS (info), "object"); +- +- if (!pspec) +- g_object_get (info, "pad", &pad, NULL); +- else +- g_object_get (info, "object", &pad, NULL); +- +-#if GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR <= 8 +- // Killed in 0.9, presumely because events and such +- // should be pushed on pads regardless of whether they +- // are currently linked +- pad = (GstPad *) GST_PAD_REALIZE (pad); +- wxASSERT(pad); +-#endif +- +- if(!QueryVideoSizeFromPad(pad)) +- { +- // wait for those caps to get ready +- g_signal_connect( +- pad, +- "notify::caps", +- G_CALLBACK(gst_notify_caps_callback), +- this); +- } +- break; +- }// end if video +- }// end searching through info list +- +- // no video (or extremely delayed stream-info) +- if(list == NULL) +- { +- m_videoSize = wxSize(0,0); +- return false; +- } +- +- return true; +-} +- +-//----------------------------------------------------------------------------- + // wxGStreamerMediaBackend::QueryVideoSizeFromPad + // + // Gets the size of our video (in wxSize) from a GstPad + //----------------------------------------------------------------------------- + bool wxGStreamerMediaBackend::QueryVideoSizeFromPad(GstPad* pad) + { +- const GstCaps* caps = GST_PAD_CAPS(pad); ++ GstCaps* caps = gst_pad_get_current_caps(pad); + if ( caps ) + { + const GstStructure *s = gst_caps_get_structure (caps, 0); +@@ -706,23 +513,26 @@ bool wxGStreamerMediaBackend::QueryVideo + m_videoSize.y = (int) ((float) den * m_videoSize.y / num); + } + +- wxLogTrace(wxTRACE_GStreamer, wxT("Adjusted video size: [%i,%i]"), +- m_videoSize.x, m_videoSize.y); ++ wxLogTrace(wxTRACE_GStreamer, wxT("Adjusted video size: [%i,%i]"), ++ m_videoSize.x, m_videoSize.y); ++ ++ gst_caps_unref (caps); + return true; + } // end if caps + ++ m_videoSize = wxSize(0,0); + return false; // not ready/massive failure + } + + //----------------------------------------------------------------------------- +-// wxGStreamerMediaBackend::SetupXOverlay ++// wxGStreamerMediaBackend::SetupVideoOverlay + // +-// Attempts to set the XWindow id of our GstXOverlay to tell it which ++// Attempts to set the XWindow id of our GstVideoOverlay to tell it which + // window to play video in. + //----------------------------------------------------------------------------- +-void wxGStreamerMediaBackend::SetupXOverlay() ++void wxGStreamerMediaBackend::SetupVideoOverlay() + { +- // Use the xoverlay extension to tell gstreamer to play in our window ++ // Use the videooverlay extension to tell gstreamer to play in our window + #ifdef __WXGTK__ + if (!gtk_widget_get_realized(m_ctrl->m_wxwindow)) + { +@@ -739,7 +549,7 @@ void wxGStreamerMediaBackend::SetupXOver + GdkWindow* window = gtk_widget_get_window(m_ctrl->m_wxwindow); + wxASSERT(window); + #endif +- gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(m_xoverlay), ++ gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(m_videooverlay), + #ifdef __WXGTK__ + GDK_WINDOW_XID(window) + #else +@@ -769,9 +579,8 @@ void wxGStreamerMediaBackend::SetupXOver + // + // PRECONDITION: Assumes m_asynclock is Lock()ed + //----------------------------------------------------------------------------- +-#if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10 + bool wxGStreamerMediaBackend::SyncStateChange(GstElement* element, +- GstElementState desiredstate, ++ GstState desiredstate, + gint64 llTimeout) + { + GstBus* bus = gst_element_get_bus(element); +@@ -844,23 +653,6 @@ bool wxGStreamerMediaBackend::SyncStateC + + return bSuccess; + } +-#else // 0.8 implementation +-bool wxGStreamerMediaBackend::SyncStateChange(GstElement* element, +- GstElementState desiredstate, +- gint64 llTimeout) +-{ +- gint64 llTimeWaited = 0; +- while(GST_STATE(element) != desiredstate) +- { +- if(llTimeWaited >= llTimeout) +- break; +- llTimeWaited += 10*GST_MSECOND; +- wxMilliSleep(10); +- } +- +- return llTimeWaited != llTimeout; +-} +-#endif + + //----------------------------------------------------------------------------- + // wxGStreamerMediaBackend::TryAudioSink +@@ -884,25 +676,25 @@ bool wxGStreamerMediaBackend::TryAudioSi + + bool wxGStreamerMediaBackend::TryVideoSink(GstElement* videosink) + { +- // Check if the video sink either is an xoverlay or might contain one... +- if( !GST_IS_BIN(videosink) && !GST_IS_X_OVERLAY(videosink) ) ++ // Check if the video sink either is an videooverlay or might contain one... ++ if( !GST_IS_BIN(videosink) && !GST_IS_VIDEO_OVERLAY(videosink) ) + { + if(G_IS_OBJECT(videosink)) + g_object_unref(videosink); + return false; + } + +- // Make our video sink and make sure it supports the x overlay interface +- // the x overlay enables us to put the video in our control window ++ // Make our video sink and make sure it supports the video overlay interface ++ // the video overlay enables us to put the video in our control window + // (i.e. we NEED it!) - also connect to the natural video size change event + if( GST_IS_BIN(videosink) ) +- m_xoverlay = (GstXOverlay*) ++ m_videooverlay = (GstVideoOverlay*) + gst_bin_get_by_interface (GST_BIN (videosink), +- GST_TYPE_X_OVERLAY); ++ GST_TYPE_VIDEO_OVERLAY); + else +- m_xoverlay = (GstXOverlay*) videosink; ++ m_videooverlay = (GstVideoOverlay*) videosink; + +- if ( !GST_IS_X_OVERLAY(m_xoverlay) ) ++ if ( !GST_IS_VIDEO_OVERLAY(m_videooverlay) ) + { + g_object_unref(videosink); + return false; +@@ -1046,11 +838,7 @@ bool wxGStreamerMediaBackend::CreateCont + //Really init gstreamer + gboolean bInited; + GError* error = NULL; +-#if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10 + bInited = gst_init_check(&argcGST, &argvGST, &error); +-#else +- bInited = gst_init_check(&argcGST, &argvGST); +-#endif + + // Cleanup arguments for unicode case + #if wxUSE_UNICODE +@@ -1117,78 +905,52 @@ bool wxGStreamerMediaBackend::CreateCont + return false; + } + +-#if GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR < 10 +- // Connect the glib events/callbacks we want to our playbin +- g_signal_connect(m_playbin, "eos", +- G_CALLBACK(gst_finish_callback), this); +- g_signal_connect(m_playbin, "error", +- G_CALLBACK(gst_error_callback), this); +- g_signal_connect(m_playbin, "state-change", +- G_CALLBACK(gst_state_change_callback), this); +-#else +- // GStreamer 0.10+ uses GstBus for this now, connect to the sync +- // handler as well so we can set the X window id of our xoverlay ++ // GStreamer uses GstBus for this now, connect to the sync ++ // handler as well so we can set the video window id of our videooverlay + gst_bus_add_watch (gst_element_get_bus(m_playbin), + (GstBusFunc) gst_bus_async_callback, this); + gst_bus_set_sync_handler(gst_element_get_bus(m_playbin), +- (GstBusSyncHandler) gst_bus_sync_callback, this); +- g_signal_connect(m_playbin, "notify::stream-info", +- G_CALLBACK(gst_notify_stream_info_callback), this); +-#endif ++ (GstBusSyncHandler) gst_bus_sync_callback, this, NULL); + + // Get the audio sink +- GstElement* audiosink = gst_gconf_get_default_audio_sink(); ++ // Use autodetection, then alsa, then oss as a stopgap ++ GstElement* audiosink = gst_element_factory_make ("autoaudiosink", "audio-sink"); + if( !TryAudioSink(audiosink) ) + { +- // fallback to autodetection, then alsa, then oss as a stopgap +- audiosink = gst_element_factory_make ("autoaudiosink", "audio-sink"); ++ audiosink = gst_element_factory_make ("alsasink", "alsa-output"); + if( !TryAudioSink(audiosink) ) + { +- audiosink = gst_element_factory_make ("alsasink", "alsa-output"); ++ audiosink = gst_element_factory_make ("osssink", "play_audio"); + if( !TryAudioSink(audiosink) ) + { +- audiosink = gst_element_factory_make ("osssink", "play_audio"); +- if( !TryAudioSink(audiosink) ) +- { +- wxLogSysError(wxT("Could not find a valid audiosink")); +- return false; +- } ++ wxLogSysError(wxT("Could not find a valid audiosink")); ++ return false; + } + } + } + + // Setup video sink - first try gconf, then auto, then xvimage and + // then finally plain ximage +- GstElement* videosink = gst_gconf_get_default_video_sink(); ++ GstElement* videosink = gst_element_factory_make ("autovideosink", "video-sink"); + if( !TryVideoSink(videosink) ) + { +- videosink = gst_element_factory_make ("autovideosink", "video-sink"); ++ videosink = gst_element_factory_make ("xvimagesink", "video-sink"); + if( !TryVideoSink(videosink) ) + { +- videosink = gst_element_factory_make ("xvimagesink", "video-sink"); ++ // finally, do a final fallback to ximagesink ++ videosink = ++ gst_element_factory_make ("ximagesink", "video-sink"); + if( !TryVideoSink(videosink) ) + { +- // finally, do a final fallback to ximagesink +- videosink = +- gst_element_factory_make ("ximagesink", "video-sink"); +- if( !TryVideoSink(videosink) ) +- { +- g_object_unref(audiosink); +- wxLogSysError(wxT("Could not find a suitable video sink")); +- return false; +- } ++ g_object_unref(audiosink); ++ wxLogSysError(wxT("Could not find a suitable video sink")); ++ return false; + } + } + } + +-#if GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR < 10 +- // Not on 0.10... called when video size changes +- g_signal_connect(m_xoverlay, "desired-size-changed", +- G_CALLBACK(gst_desired_size_changed_callback), this); +-#endif +- // Tell GStreamer which window to draw to in 0.8 - 0.10 +- // sometimes needs this too... +- SetupXOverlay(); ++ // Tell GStreamer which window to draw to ++ SetupVideoOverlay(); + + // Now that we know (or, rather think) our video and audio sink + // are valid set our playbin to use them +@@ -1197,6 +959,10 @@ bool wxGStreamerMediaBackend::CreateCont + "audio-sink", audiosink, + NULL); + ++ GstPad *video_sinkpad = gst_element_get_static_pad (videosink, "sink"); ++ g_signal_connect (video_sinkpad, "notify::caps", G_CALLBACK (gst_notify_caps_callback), this); ++ gst_object_unref (video_sinkpad); ++ + m_eventHandler = new wxGStreamerMediaEventHandler(this); + return true; + } +@@ -1213,26 +979,10 @@ bool wxGStreamerMediaBackend::Load(const + + //----------------------------------------------------------------------------- + // wxGStreamerMediaBackend::Load (URI version) +-// +-// In the case of a file URI passes it unencoded - +-// also, as of 0.10.3 and earlier GstURI (the uri parser for gstreamer) +-// is sort of broken and only accepts uris with at least two slashes +-// after the scheme (i.e. file: == not ok, file:// == ok) + //----------------------------------------------------------------------------- + bool wxGStreamerMediaBackend::Load(const wxURI& location) + { +- if(location.GetScheme().CmpNoCase(wxT("file")) == 0) +- { +- wxString uristring = location.BuildUnescapedURI(); +- +- //Workaround GstURI leading "//" problem and make sure it leads +- //with that +- return DoLoad(wxString(wxT("file://")) + +- uristring.Right(uristring.length() - 5) +- ); +- } +- else +- return DoLoad(location.BuildURI()); ++ return DoLoad(location.BuildURI()); + } + + //----------------------------------------------------------------------------- +@@ -1258,7 +1008,7 @@ bool wxGStreamerMediaBackend::DoLoad(con + + // Set playbin to ready to stop the current media... + if( gst_element_set_state (m_playbin, +- GST_STATE_READY) == GST_STATE_FAILURE || ++ GST_STATE_READY) == GST_STATE_CHANGE_FAILURE || + !SyncStateChange(m_playbin, GST_STATE_READY)) + { + CheckForErrors(); +@@ -1281,7 +1031,7 @@ bool wxGStreamerMediaBackend::DoLoad(con + // Try to pause media as gstreamer won't let us query attributes + // such as video size unless it is paused or playing + if( gst_element_set_state (m_playbin, +- GST_STATE_PAUSED) == GST_STATE_FAILURE || ++ GST_STATE_PAUSED) == GST_STATE_CHANGE_FAILURE || + !SyncStateChange(m_playbin, GST_STATE_PAUSED)) + { + CheckForErrors(); +@@ -1307,12 +1057,11 @@ bool wxGStreamerMediaBackend::DoLoad(con + // + // Sets the stream to a playing state + // +-// THREAD-UNSAFE in 0.8, maybe in 0.10 as well + //----------------------------------------------------------------------------- + bool wxGStreamerMediaBackend::Play() + { + if (gst_element_set_state (m_playbin, +- GST_STATE_PLAYING) == GST_STATE_FAILURE) ++ GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) + { + CheckForErrors(); + return false; +@@ -1326,13 +1075,12 @@ bool wxGStreamerMediaBackend::Play() + // + // Marks where we paused and pauses the stream + // +-// THREAD-UNSAFE in 0.8, maybe in 0.10 as well + //----------------------------------------------------------------------------- + bool wxGStreamerMediaBackend::Pause() + { + m_llPausedPos = wxGStreamerMediaBackend::GetPosition(); + if (gst_element_set_state (m_playbin, +- GST_STATE_PAUSED) == GST_STATE_FAILURE) ++ GST_STATE_PAUSED) == GST_STATE_CHANGE_FAILURE) + { + CheckForErrors(); + return false; +@@ -1353,7 +1101,7 @@ bool wxGStreamerMediaBackend::Stop() + { // begin state lock + wxMutexLocker lock(m_asynclock); + if(gst_element_set_state (m_playbin, +- GST_STATE_PAUSED) == GST_STATE_FAILURE || ++ GST_STATE_PAUSED) == GST_STATE_CHANGE_FAILURE || + !SyncStateChange(m_playbin, GST_STATE_PAUSED)) + { + CheckForErrors(); +@@ -1417,10 +1165,8 @@ wxLongLong wxGStreamerMediaBackend::GetP + else + { + gint64 pos; +- GstFormat fmtTime = GST_FORMAT_TIME; + +- if (!wxGst_element_query_position(m_playbin, &fmtTime, &pos) || +- fmtTime != GST_FORMAT_TIME || pos == -1) ++ if (!gst_element_query_position(m_playbin, GST_FORMAT_TIME, &pos) || pos == -1) + return 0; + return pos / GST_MSECOND ; + } +@@ -1438,44 +1184,21 @@ wxLongLong wxGStreamerMediaBackend::GetP + // This is also an exceedingly ugly function due to the three implementations + // (or, rather two plus one implementation without a seek function). + // +-// This is asynchronous and thread-safe on both 0.8 and 0.10. +-// + // NB: This fires both a stop and play event if the media was previously + // playing... which in some ways makes sense. And yes, this makes the video + // go all haywire at times - a gstreamer bug... + //----------------------------------------------------------------------------- + bool wxGStreamerMediaBackend::SetPosition(wxLongLong where) + { +-#if GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR == 8 \ +- && GST_VERSION_MICRO == 0 +- // 0.8.0 has no gst_element_seek according to official docs!!! +- wxLogSysError(wxT("GStreamer 0.8.0 does not have gst_element_seek") +- wxT(" according to official docs")); +- return false; +-#else // != 0.8.0 +- +-# if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10 +- gst_element_seek (m_playbin, m_dRate, GST_FORMAT_TIME, ++ if ( gst_element_seek (m_playbin, m_dRate, GST_FORMAT_TIME, + (GstSeekFlags)(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT), + GST_SEEK_TYPE_SET, where.GetValue() * GST_MSECOND, +- GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE ); +-# else +- // NB: Some gstreamer versions return false basically all the time +- // here - even totem doesn't bother to check the return value here +- // so I guess we'll just assume it worked - +- // TODO: maybe check the gst error callback??? +- gst_element_seek (m_playbin, (GstSeekType) (GST_SEEK_METHOD_SET | +- GST_FORMAT_TIME | GST_SEEK_FLAG_FLUSH), +- where.GetValue() * GST_MSECOND ); +- +-# endif // GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10 +- ++ GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE ) ) + { + m_llPausedPos = where; + return true; + } +- return true; +-#endif //== 0.8.0 ++ return false; + } + + //----------------------------------------------------------------------------- +@@ -1487,10 +1210,8 @@ bool wxGStreamerMediaBackend::SetPositio + wxLongLong wxGStreamerMediaBackend::GetDuration() + { + gint64 length; +- GstFormat fmtTime = GST_FORMAT_TIME; + +- if(!wxGst_element_query_duration(m_playbin, &fmtTime, &length) || +- fmtTime != GST_FORMAT_TIME || length == -1) ++ if(!gst_element_query_duration(m_playbin, GST_FORMAT_TIME, &length) || length == -1) + return 0; + return length / GST_MSECOND ; + } +@@ -1512,7 +1233,7 @@ void wxGStreamerMediaBackend::Move(int W + // wxGStreamerMediaBackend::GetVideoSize + // + // Returns our cached video size from Load/gst_notify_caps_callback +-// gst_x_overlay_get_desired_size also does this in 0.8... ++// gst_video_overlay_get_desired_size also does this in 0.8... + //----------------------------------------------------------------------------- + wxSize wxGStreamerMediaBackend::GetVideoSize() const + { +@@ -1539,9 +1260,8 @@ wxSize wxGStreamerMediaBackend::GetVideo + //TODO: forcing frame/samplerates, see audioscale and videorate. Audioscale is + //TODO: part of playbin. + // +-// In 0.10 GStreamer has new gst_element_seek API that might +-// support this - and I've got an attempt to do so but it is untested +-// but it would appear to work... ++// In has new gst_element_seek API that supports this - and I've got an attempt ++// to do so but it is untested but it would appear to work... + //----------------------------------------------------------------------------- + double wxGStreamerMediaBackend::GetPlaybackRate() + { +@@ -1552,7 +1272,6 @@ double wxGStreamerMediaBackend::GetPlayb + + bool wxGStreamerMediaBackend::SetPlaybackRate(double dRate) + { +-#if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10 + #if 0 // not tested enough + if( gst_element_seek (m_playbin, dRate, GST_FORMAT_TIME, + (GstSeekFlags)(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT), +@@ -1565,7 +1284,6 @@ bool wxGStreamerMediaBackend::SetPlaybac + #else + wxUnusedVar(dRate); + #endif +-#endif + + // failure + return false; +@@ -1593,10 +1311,8 @@ wxLongLong wxGStreamerMediaBackend::GetD + wxLongLong wxGStreamerMediaBackend::GetDownloadTotal() + { + gint64 length; +- GstFormat fmtBytes = GST_FORMAT_BYTES; + +- if (!wxGst_element_query_duration(m_playbin, &fmtBytes, &length) || +- fmtBytes != GST_FORMAT_BYTES || length == -1) ++ if (!gst_element_query_duration(m_playbin, GST_FORMAT_BYTES, &length) || length == -1) + return 0; + return length; + } diff --git a/wxgtk/make-abicheck-non-fatal.patch b/wxgtk/make-abicheck-non-fatal.patch new file mode 100644 index 0000000..97055ba --- /dev/null +++ b/wxgtk/make-abicheck-non-fatal.patch @@ -0,0 +1,15 @@ +diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp +--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100 ++++ wxGTK-2.8.12/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100 +@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con + msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), + lib.c_str(), progName.c_str(), prog.c_str()); + +- wxLogFatalError(msg.c_str()); +- +- // normally wxLogFatalError doesn't return +- return false; ++ wxLogWarning(msg.c_str()); + } + #undef wxCMP + diff --git a/wxgtk/wxgtk-freeze.patch b/wxgtk/wxgtk-freeze.patch deleted file mode 100644 index 33ca568..0000000 --- a/wxgtk/wxgtk-freeze.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- wxWidgets/branches/WX_3_0_BRANCH/src/generic/listctrl.cpp 2013/12/02 12:56:44 75325 -+++ wxWidgets/branches/WX_3_0_BRANCH/src/generic/listctrl.cpp 2014/07/03 14:16:37 76808 -@@ -1420,6 +1420,13 @@ - - void wxListTextCtrlWrapper::EndEdit(EndReason reason) - { -+ if( m_aboutToFinish ) -+ { -+ // We already called Finish which cannot be called -+ // more than once. -+ return; -+ } -+ - m_aboutToFinish = true; - - switch ( reason ) -@@ -1525,6 +1532,7 @@ - { - if ( !m_aboutToFinish ) - { -+ m_aboutToFinish = true; - if ( !AcceptChanges() ) - m_owner->OnRenameCancelled( m_itemEdited ); - ---- wxWidgets/branches/WX_3_0_BRANCH/src/generic/treectlg.cpp 2014/03/07 13:16:15 76093 -+++ wxWidgets/branches/WX_3_0_BRANCH/src/generic/treectlg.cpp 2014/07/03 14:16:37 76808 -@@ -458,6 +458,13 @@ - - void wxTreeTextCtrl::EndEdit(bool discardChanges) - { -+ if ( m_aboutToFinish ) -+ { -+ // We already called Finish which cannot be called -+ // more than once. -+ return; -+ } -+ - m_aboutToFinish = true; - - if ( discardChanges ) -@@ -555,6 +562,7 @@ - { - if ( !m_aboutToFinish ) - { -+ m_aboutToFinish = true; - if ( !AcceptChanges() ) - m_owner->OnRenameCancelled( m_itemEdited ); - diff --git a/wxgtk/wxgtk-gcc6.patch b/wxgtk/wxgtk-gcc6.patch new file mode 100644 index 0000000..119175c --- /dev/null +++ b/wxgtk/wxgtk-gcc6.patch @@ -0,0 +1,39 @@ +From 73e9e18ea09ffffcaac50237def0d9728a213c02 Mon Sep 17 00:00:00 2001 +From: Scott Talbert <swt(a)techie.net> +Date: Sat, 20 Feb 2016 00:08:14 -0500 +Subject: [PATCH] Fix STC compilation with GCC6 + +Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems +with ambiguous overloads. + +Closes #17147. + +Closes https://github.com/wxWidgets/wxWidgets/pull/222 +--- + src/stc/scintilla/src/Editor.cxx | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx +index cd72953..2081df2 100644 +--- a/src/stc/scintilla/src/Editor.cxx ++++ b/src/stc/scintilla/src/Editor.cxx +@@ -11,6 +11,7 @@ + #include <ctype.h> + #include <assert.h> + ++#include <cmath> + #include <string> + #include <vector> + #include <map> +@@ -5841,9 +5842,9 @@ void Editor::GoToLine(int lineNo) { + } + + static bool Close(Point pt1, Point pt2) { +- if (abs(pt1.x - pt2.x) > 3) ++ if (std::abs(pt1.x - pt2.x) > 3) + return false; +- if (abs(pt1.y - pt2.y) > 3) ++ if (std::abs(pt1.y - pt2.y) > 3) + return false; + return true; + }

1 0

ports/contrib (3.3): smplayer: 16.11.0 -> 17.1.0
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit 5ecb6f0a23575f3cdb99e5a7b1a862fdf594e60d Author: Alan Mizrahi <alan+crux(a)mizrahi.com.ve> Date: Mon Jan 23 16:16:16 2017 +0900 smplayer: 16.11.0 -> 17.1.0 diff --git a/smplayer/.md5sum b/smplayer/.md5sum index 6f668ee..152228b 100644 --- a/smplayer/.md5sum +++ b/smplayer/.md5sum @@ -1 +1 @@ -e9aa4237033e0dd0da3adf8df0bb4d51 smplayer-16.11.0.tar.bz2 +aa28e0ec45bc184e4304700313a8f6e9 smplayer-17.1.0.tar.bz2 diff --git a/smplayer/Pkgfile b/smplayer/Pkgfile index af3a775..c9b45d5 100644 --- a/smplayer/Pkgfile +++ b/smplayer/Pkgfile @@ -5,7 +5,7 @@ # Optional: kdelibs name=smplayer -version=16.11.0 +version=17.1.0 release=1 source=(http://prdownloads.sf.net/$name/$name-$version.tar.bz2)

1 0

ports/contrib (3.3): xerces-c: updated to version 3.1.4
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit fc76cf616631155f7263195dd367dc81ff5b2876 Author: Matt Housh <jaeger(a)crux.ninja> Date: Wed Jan 18 18:19:24 2017 -0600 xerces-c: updated to version 3.1.4 diff --git a/xerces-c/.md5sum b/xerces-c/.md5sum index 8ab5ebd..0e7b645 100644 --- a/xerces-c/.md5sum +++ b/xerces-c/.md5sum @@ -1 +1 @@ -70320ab0e3269e47d978a6ca0c0e1e2d xerces-c-3.1.3.tar.gz +21bb097b711a513275379b59757cba4c xerces-c-3.1.4.tar.gz diff --git a/xerces-c/Pkgfile b/xerces-c/Pkgfile index 3da8331..413c390 100644 --- a/xerces-c/Pkgfile +++ b/xerces-c/Pkgfile @@ -5,7 +5,7 @@ # Depends on: curl name=xerces-c -version=3.1.3 +version=3.1.4 release=1 source=(http://www.apache.org/dist/xerces/c/${version%%.*}/sources/$name-$v…

1 0

ports/contrib (3.3): updated signatures
by crux＠crux.nu 25 Jan '17

25 Jan '17

commit c5297587853469d38ccba89ac5d52638acf160a9 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Wed Jan 25 14:27:54 2017 +0100 updated signatures diff --git a/nginx/.signature b/nginx/.signature index ed36676..c367bc2 100644 --- a/nginx/.signature +++ b/nginx/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF303L4Y4TmZHs7SV9UzAyY6X0o6GUYl/DtZ1djkyo6+f/LVtsa4SKTSeifx0FEMKMve732gaAVhp+uWFEPRPQwwY= -SHA256 (Pkgfile) = 6b433d39b52a5be36f03f84bc19720efcf97e6a0d8ec0e94fc9e91223a919dfc +RWSagIOpLGJF3xCE7Ilp49xloNcIMJvO9Hk/RODrYkQKYvZ4dHnL+gr1lpsb9mQqUsEqekGX5YB3KlHnkgQqZC5ha/2isfL54w4= +SHA256 (Pkgfile) = ea7fe480dafe40c0008e115b836df835be5954500953904a8ae2a654af04393d SHA256 (.footprint) = 9263dad4ce3a2766b5f9bec00a3a58ac86445f370ba1bb3d5716e6b9dc74ddae -SHA256 (nginx-1.11.8.tar.gz) = 53aef3715d79015314c2dcb18f2b185a0c64368cc01b30bdf0737a215f666b34 +SHA256 (nginx-1.11.9.tar.gz) = dc22b71f16b551705930544dc042f1ad1af2f9715f565187ec22c7a4b2625748 SHA256 (nginx.conf) = 0f9b54e790951f1a09580bbf29ede26c4cc277e535d4df937fc659979a2fb35b SHA256 (nginx.rc) = f90c90af425199ff3b56a65100448c014d1cd0a39e4737e2a8bcf869dd8dfb65 diff --git a/smplayer/.signature b/smplayer/.signature index 25ecb66..b8ff44f 100644 --- a/smplayer/.signature +++ b/smplayer/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/fl5FntIeoDgP/+XZYOuwRP+OEjP645KsD3BC8OQawTdqzYvSGy6mmdUbdO1F0yxwWcDpW0WnjbUoMYmZZRGA8= -SHA256 (Pkgfile) = ea5da6f29821a10959fd4587059d819c45864641546c4d25fb060071c784b259 +RWSagIOpLGJF3+/MYwVidWCGWZzYUtTuroG6NGj1A4wyFxICDR2G7V/LhIhKy2bt8xo8qVmWGjlW23KbJNjYyXn4YMT4whcN3AE= +SHA256 (Pkgfile) = 7080789f87f7ecb7b3242ba640e78e74a3131c8670db5ff220a98f69338a282b SHA256 (.footprint) = 84032d43de4f34ac36892d87cd92a6c193f81364425e7287121750277e71a6c2 -SHA256 (smplayer-16.11.0.tar.bz2) = e53a5d8b4d66fb0b7eb73053ef0bfdd2d942b79a16f8cc8d3d0b0771c7c80b5a +SHA256 (smplayer-17.1.0.tar.bz2) = 40375920e6939275b7afc03d8338eb21ef1bcf007ff7df0dc46fb8fe0049fc71 diff --git a/wxgtk/.signature b/wxgtk/.signature index 49bb55c..fa13c19 100644 --- a/wxgtk/.signature +++ b/wxgtk/.signature @@ -1,5 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33UdlZGrw1ZUxQAYITGWa9Z/WfPhYFuSTnEgkf+4H/SR5HjXHJZuDoMiJpgYUz0+VaHpjfgSmtssLAjrtgirAA4= -SHA256 (Pkgfile) = c52524ff82e663569ce232e1c6e339d533708f14fb8f7e2f3c026b75eff259e0 +RWSagIOpLGJF36esFV35hbsZIlhGdp5MwpjUj0VizyBcnSIwa4WxuJ2oZovdtKNh/+qUMLCNNwB0mKjl7GrU+lcIiB0Cfu62EQo= +SHA256 (Pkgfile) = 16c6b45b091a630ba3ba71ed3ba01dbc2f4b443905be2ef0c4b42ddc452d6504 SHA256 (.footprint) = b045dc434bc60d445f4b60f6356861902556762a6d8da4e762a94c08af1935bf SHA256 (wxWidgets-3.0.2.tar.bz2) = 346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d +SHA256 (make-abicheck-non-fatal.patch) = 46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453 +SHA256 (wxgtk-gcc6.patch) = 6e659eb4f1cfbfe31e0da0c8719e496e16efa5be36265388a639964e4b39cf78 +SHA256 (gst1.0.patch) = b85e5d5fdcd2b4774825d2855272c77e0c54024d7c687d4740c91bb24d246d8d

1 0