From b8684da0a677c00eb9c9b8e08e1344a6a0d8727a Mon Sep 17 00:00:00 2001 From: tnut Date: Sat, 10 Jul 2010 20:07:57 +0200 Subject: Ajout de avidemux#2.5.3-1 --- extra/avidemux/.footprint | 212 ++++++++++++++++++++++++++++++++ extra/avidemux/.md5sum | 2 + extra/avidemux/2.5.3_field_asm_fix.diff | 135 ++++++++++++++++++++ extra/avidemux/Pkgfile | 41 ++++++ 4 files changed, 390 insertions(+) create mode 100644 extra/avidemux/.footprint create mode 100644 extra/avidemux/.md5sum create mode 100644 extra/avidemux/2.5.3_field_asm_fix.diff create mode 100644 extra/avidemux/Pkgfile (limited to 'extra') diff --git a/extra/avidemux/.footprint b/extra/avidemux/.footprint new file mode 100644 index 000000000..8c3402394 --- /dev/null +++ b/extra/avidemux/.footprint @@ -0,0 +1,212 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/avidemux2_cli +-rwxr-xr-x root/root usr/bin/avidemux2_gtk +-rwxr-xr-x root/root usr/bin/avidemux2_qt4 +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/ADM_plugins/ +drwxr-xr-x root/root usr/lib/ADM_plugins/audioDecoder/ +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioDecoder/libADM_ad_Mad.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioDecoder/libADM_ad_a52.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioDecoder/libADM_ad_faad.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioDecoder/libADM_ad_vorbis.so +drwxr-xr-x root/root usr/lib/ADM_plugins/audioDevices/ +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioDevices/libADM_av_alsa.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioDevices/libADM_av_esd.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioDevices/libADM_av_oss.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioDevices/libADM_av_sdl.so +drwxr-xr-x root/root usr/lib/ADM_plugins/audioEncoders/ +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioEncoders/libADM_ae_faac.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioEncoders/libADM_ae_lame.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioEncoders/libADM_ae_lav_ac3.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioEncoders/libADM_ae_lav_mp2.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioEncoders/libADM_ae_pcm.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioEncoders/libADM_ae_twolame.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/audioEncoders/libADM_ae_vorbis.so +drwxr-xr-x root/root usr/lib/ADM_plugins/videoEncoder/ +drwxr-xr-x root/root usr/lib/ADM_plugins/videoEncoder/avcodec/ +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/avcodec/Flv1Param.xsd +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/avcodec/H263Param.xsd +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/avcodec/MjpegParam.xsd +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/avcodec/Mpeg1Param.xsd +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/avcodec/Mpeg2Param.xsd +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/avcodec/Mpeg4aspParam.xsd +drwxr-xr-x root/root usr/lib/ADM_plugins/videoEncoder/avcodec/mpeg-1/ +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/avcodec/mpeg-1/Video CD.xml +drwxr-xr-x root/root usr/lib/ADM_plugins/videoEncoder/avcodec/mpeg-2/ +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/avcodec/mpeg-2/DVD.xml +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/avcodec/mpeg-2/Super Video CD.xml +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_avcodec.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_mpeg2enc.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so +drwxr-xr-x root/root usr/lib/ADM_plugins/videoEncoder/mpeg2enc/ +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/mpeg2enc/Mpeg1Param.xsd +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/mpeg2enc/Mpeg2Param.xsd +drwxr-xr-x root/root usr/lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-1/ +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-1/Video CD.xml +drwxr-xr-x root/root usr/lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-2/ +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-2/DVD.xml +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-2/Super Video CD.xml +drwxr-xr-x root/root usr/lib/ADM_plugins/videoEncoder/xvid/ +-rw-r--r-- root/root usr/lib/ADM_plugins/videoEncoder/xvid/XvidParam.xsd +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Gtk.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Qt.so +drwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/ +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_Crop_gtk.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_Deinterlace.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_Delta.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_Denoise.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_FluxSmooth.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_Hue_cli.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_Mosaic.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_Pulldown.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_Stabilize.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_Tisophote.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_Whirl.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_addborders.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_asharp_cli.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_asharp_gtk.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_asharp_qt4.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_avisynthResize_cli.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_avisynthResize_gtk.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_avisynthResize_qt4.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_blackenBorders.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_blendDgBob.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_blendRemoval.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_chromaShift_gtk.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_chromaShift_qt4.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_chromashift_cli.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_cnr2_cli.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_cnr2_gtk.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_cnr2_qt4.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_colorYUV_cli.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_colorYUV_gtk.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_colorYUV_qt4.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_contrast_cli.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_contrast_gtk.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_contrast_qt4.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_crop_cli.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_crop_qt4.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_curveEditor_qt4.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_decimate.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_denoise3d.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_denoise3dhq.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_dropOut.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_eq2_cli.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_eq2_gtk.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_eq2_qt4.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_equalizer_cli.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_equalizer_gtk.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_equalizer_qt4.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_fade.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutiongauss.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutionmean.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutionmedian.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutionsharpen.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_forcedPP.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_hue_gtk.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_hue_qt4.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_hzStackField.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_keepEvenField.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_keepOddField.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_kernelDeint.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_largemedian.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_lavDeinterlace.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_lumaonly.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_mSharpen.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_mSmooth.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_mcdeint.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_mergeField.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_cli.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_gtk.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_qt4.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_cli.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_gtk.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_qt4.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_palShift.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_resampleFps.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_reverse.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_rotate.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_separateField.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_smartPalShift.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_smartSwapField.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_soften.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_ssa.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_stackField.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_sub_cli.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_sub_gtk.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_sub_qt4.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_swapField.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_swapuv.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_tdeint.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_telecide.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_unstackField.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_vflip.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_vlad.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vf_yadif.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vidChromaU.so +-rwxr-xr-x root/root usr/lib/ADM_plugins/videoFilter/libADM_vidChromaV.so +-rw-r--r-- root/root usr/lib/libADM5avcodec.so.52 +-rw-r--r-- root/root usr/lib/libADM5avformat.so.52 +-rw-r--r-- root/root usr/lib/libADM5avutil.so.50 +-rw-r--r-- root/root usr/lib/libADM5postproc.so.51 +-rw-r--r-- root/root usr/lib/libADM5swscale.so.0 +-rwxr-xr-x root/root usr/lib/libADM_UICli.so +-rwxr-xr-x root/root usr/lib/libADM_UIGtk.so +-rwxr-xr-x root/root usr/lib/libADM_UIQT4.so +-rwxr-xr-x root/root usr/lib/libADM_core.so +-rwxr-xr-x root/root usr/lib/libADM_coreAudio.so +-rwxr-xr-x root/root usr/lib/libADM_coreImage.so +-rwxr-xr-x root/root usr/lib/libADM_coreUI.so +-rwxr-xr-x root/root usr/lib/libADM_render_cli.so +-rwxr-xr-x root/root usr/lib/libADM_render_gtk.so +-rwxr-xr-x root/root usr/lib/libADM_render_qt4.so +-rwxr-xr-x root/root usr/lib/libADM_smjs.so +lrwxrwxrwx root/root usr/lib/libADM_vidEnc_x264.so -> /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so +lrwxrwxrwx root/root usr/lib/libADM_vidEnc_xvid.so -> /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/ADM_scripts/ +drwxr-xr-x root/root usr/share/ADM_scripts/auto/ +drwxr-xr-x root/root usr/share/ADM_scripts/auto/Apple/ +-rw-r--r-- root/root usr/share/ADM_scripts/auto/Apple/Apple iPhone.js +-rw-r--r-- root/root usr/share/ADM_scripts/auto/Apple/Apple iPod 5.5G.js +-rw-r--r-- root/root usr/share/ADM_scripts/auto/Apple/Apple iPod.js +-rw-r--r-- root/root usr/share/ADM_scripts/auto/Microsoft Zune.js +drwxr-xr-x root/root usr/share/ADM_scripts/auto/Optical Disc/ +-rw-r--r-- root/root usr/share/ADM_scripts/auto/Optical Disc/DVD.js +-rw-r--r-- root/root usr/share/ADM_scripts/auto/Optical Disc/Super Video CD.js +-rw-r--r-- root/root usr/share/ADM_scripts/auto/Optical Disc/Video CD.js +-rw-r--r-- root/root usr/share/ADM_scripts/auto/Sony PlayStation Portable.js +drwxr-xr-x root/root usr/share/ADM_scripts/video/ +-rw-r--r-- root/root usr/share/ADM_scripts/video/autoWizard.js +-rw-r--r-- root/root usr/share/ADM_scripts/video/filter.js +-rw-r--r-- root/root usr/share/ADM_scripts/video/functions.js +drwxr-xr-x root/root usr/share/applications/ +-rw-r--r-- root/root usr/share/applications/avidemux.desktop +drwxr-xr-x root/root usr/share/avidemux/ +drwxr-xr-x root/root usr/share/avidemux/i18n/ +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_ca.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_cs.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_de.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_el.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_es.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_fr.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_it.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_ja.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_pl.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_pt_BR.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_ru.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_sr.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_sr@latin.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_tr.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/avidemux_zh_TW.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/qt_cs.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/qt_fr.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/qt_it.qm +-rw-r--r-- root/root usr/share/avidemux/i18n/qt_zh_TW.qm +drwxr-xr-x root/root usr/share/locale/ +drwxr-xr-x root/root usr/share/locale/fr/ +drwxr-xr-x root/root usr/share/locale/fr/LC_MESSAGES/ +-rw-r--r-- root/root usr/share/locale/fr/LC_MESSAGES/avidemux.mo +drwxr-xr-x root/root usr/share/pixmaps/ +-rw-r--r-- root/root usr/share/pixmaps/avidemux.png diff --git a/extra/avidemux/.md5sum b/extra/avidemux/.md5sum new file mode 100644 index 000000000..2d2799805 --- /dev/null +++ b/extra/avidemux/.md5sum @@ -0,0 +1,2 @@ +7eaae393f6c0890a68d382f32925e07d 2.5.3_field_asm_fix.diff +5a688029895b66b65ca86b7c85a03ee3 avidemux_2.5.3.tar.gz diff --git a/extra/avidemux/2.5.3_field_asm_fix.diff b/extra/avidemux/2.5.3_field_asm_fix.diff new file mode 100644 index 000000000..989559bf6 --- /dev/null +++ b/extra/avidemux/2.5.3_field_asm_fix.diff @@ -0,0 +1,135 @@ +diff --git a/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp b/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp +index 33b2a7f..99f0664 100644 +--- a/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp ++++ b/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp +@@ -30,19 +30,8 @@ Skip factor=2 + ***************************************************************************/ + + #include "ADM_default.h" +- +-//#include "ADM_editor/ADM_edit.hxx" + #include "ADM_videoFilter.h" + +-//#define MMX_TRACE +-#warning remove mmxmacro and debug asm +-//#define ASM_ILACING +- +- +-#include "ADM_mmxMacros.h" +- +- +- + + #define SKIP_FACTOR 2 // 2^SKIPFACTOR=SKIP_LINEAR+1 + #define SKIP_LINEAR 3 +@@ -62,7 +51,7 @@ Skip factor=2 + */ + + #if defined(ADM_CPU_X86) && defined(ASM_ILACING) +- ++#warning REWRITE IN PLAIN ASM + static uint32_t ADMVideo_interlaceCount_MMX( uint8_t *src ,uint32_t w, uint32_t h); + static uint8_t * FUNNY_MANGLE(_l_p) =NULL; + static uint8_t * FUNNY_MANGLE(_l_c) =NULL; +diff --git a/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp b/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp +index 61d11d4..479731c 100644 +--- a/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp ++++ b/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp +@@ -20,15 +20,13 @@ + ***************************************************************************/ + + #include "ADM_default.h" +- + #include "ADM_videoFilter.h" +- + #include"ADM_vidField.h" + + #ifdef ADM_CPU_X86 + // #define DEBUG_DEINT 1 + // #define MMX_TRACE 1 +- #include "ADM_mmxMacros.h" ++// #include "ADM_mmxMacros.h" + + void myDeintASM(void); + +@@ -36,25 +34,27 @@ + static uint8_t * FUNNY_MANGLE(_l_p) , * FUNNY_MANGLE(_l_c) ,* FUNNY_MANGLE(_l_n); + static uint8_t * FUNNY_MANGLE(_l_e) , * FUNNY_MANGLE(_l_e2); + #define EXPAND(x) (x)+((x)<<16)+((x)<<32) +((x)<<48) +-static mmx_t _mmTHRESH1; +-static mmx_t _mmTHRESH2; ++static uint64_t __attribute__((used)) __attribute__ ((__aligned__ (8))) FUNNY_MANGLE(_mmTHRESH1) ; ++static uint64_t __attribute__((used)) __attribute__ ((__aligned__ (8))) FUNNY_MANGLE(_mmTHRESH2) ; + +-#define COMPUTE_MMX \ +-punpcklbw_r2r(mm5,mm0); /*c expand 4 bytes -> 4 word */ \ +-punpcklbw_r2r(mm5,mm1); /*p*/ \ +-punpcklbw_r2r(mm5,mm2); /* n*/ \ +-movq_r2r(mm0,mm3); /* mm3 also c*/ \ +-psubw_r2r(mm1,mm0) ; /* mm0=mm0-mm1 = c-p*/ \ +-psubw_r2r(mm2,mm3) ; /* mm3=mm3-mm2 = c-n*/ \ +-psraw_i2r(1,mm0); /* to protect from overflow*/ \ +-psraw_i2r(1,mm3);\ +-pmullw_r2r(mm0,mm3); /* mm3=(c-p)*(c-n) / 4;*/ \ +-movq_r2r(mm3,mm0) ; /* mm0 also c-p*c-n */ \ +-pcmpgtw_r2r(mm4,mm3); /* keep only > size*/ \ +-pcmpgtw_r2r(mm6,mm0); /* keep only > size*/ \ +-packsswb_r2r(mm5,mm0); \ +-packsswb_r2r(mm5,mm3); + ++#define COMPUTE_MMX \ ++__asm__ __volatile__(\ ++"punpcklbw %%mm5,%%mm0\n\t" \ ++"punpcklbw %%mm5,%%mm1\n\t" \ ++"punpcklbw %%mm5,%%mm2\n\t" \ ++"movq %%mm0,%%mm3\n\t" \ ++"psubw %%mm1,%%mm0\n\t" \ ++"psubw %%mm2,%%mm3\n\t" \ ++"psraw $1,%%mm0\n\t" \ ++"psraw $1,%%mm3\n\t" \ ++"pmullw %%mm0,%%mm3\n\t" \ ++"movq %%mm3,%%mm0\n\t" \ ++"pcmpgtw %%mm4,%%mm3\n\t" \ ++"pcmpgtw %%mm6,%%mm0\n\t" \ ++"packsswb %%mm5,%%mm0\n\t" \ ++"packsswb %%mm5,%%mm3\n\t" \ ++::) + #endif + + void ADMVideoFields::hasMotion_C(uint8_t *p,uint8_t *c, +@@ -90,8 +90,8 @@ void ADMVideoFields::hasMotion_MMX(uint8_t *p,uint8_t *c, + { + + +- _mmTHRESH1.uq=EXPAND((uint64_t ) ((_param->motion_trigger*_param->motion_trigger)>>2) ); +- _mmTHRESH2.uq=EXPAND((uint64_t ) ((_param->blend_trigger*_param->blend_trigger)>>2) ); ++ _mmTHRESH1=EXPAND((uint64_t ) ((_param->motion_trigger*_param->motion_trigger)>>2) ); ++ _mmTHRESH2=EXPAND((uint64_t ) ((_param->blend_trigger*_param->blend_trigger)>>2) ); + + _l_h=_info.height-2; + _l_w=_info.width>>2; +@@ -102,10 +102,11 @@ void ADMVideoFields::hasMotion_MMX(uint8_t *p,uint8_t *c, + _l_e=e; + _l_e2=e2; + // printf("\n MMX \n"); +- +- pxor_r2r(mm5,mm5); +- movq_m2r(_mmTHRESH1,mm4); +- movq_m2r(_mmTHRESH2,mm6); ++ __asm__ __volatile__ ( ++ "pxor %%mm5,%%mm5\n\t" ++ "movq "Mangle(_mmTHRESH1)",%%mm4\n\t" ++ "movq "Mangle(_mmTHRESH2)",%%mm6\n\t" ++ ::); + myDeintASM(); + } + #if !defined(DEBUG_DEINT) +@@ -149,7 +150,7 @@ void myDeintASM(void) + : + : "eax", "ecx","edx","esi" + ); +- emms(); ++ __asm__ __volatile__ ("emms"); + + } + #else diff --git a/extra/avidemux/Pkgfile b/extra/avidemux/Pkgfile new file mode 100644 index 000000000..a52a0a7bc --- /dev/null +++ b/extra/avidemux/Pkgfile @@ -0,0 +1,41 @@ +# Description: Editeur Video +# URL: http://fixounet.free.fr/avidemux/ +# Maintainer: NuTyX core team +# Packager: lesibel at free dot fr +# Depends on: gtk, qt, faac, lame, libvorbis, xorg-libxv, libxml2, sdl, cmake, x264, xvid, avahi + +name=avidemux +version=2.5.3 +release=1 +source=(http://download.berlios.de/avidemux/avidemux_$version.tar.gz 2.5.3_field_asm_fix.diff) + +build() +{ + cd ${name}_${version} + patch -Np1 -i ../2.5.3_field_asm_fix.diff + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D NO_GTK=0 -D NO_QT4=0 .. + make + make DESTDIR=$PKG install + + mkdir -p lib + cd lib + find ../avidemux -name '*.so*' | xargs ln -sft . || return 1 + cd ../../plugins + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR=$SRC/avidemux_$version \ + -D AVIDEMUX_CORECONFIG_DIR=$SRC/avidemux_$version/build/config \ + -D AVIDEMUX_INSTALL_PREFIX=$SRC/avidemux_$version/build -D CMAKE_BUILD_TYPE=Release .. + make + make DESTDIR=$PKG install + + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so $PKG/usr/lib/libADM_vidEnc_xvid.so + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so $PKG/usr/lib/libADM_vidEnc_x264.so + + install -D -m644 ../../avidemux_icon.png $PKG/usr/share/pixmaps/avidemux.png + install -D -m644 ../../avidemux2.desktop $PKG/usr/share/applications/avidemux.desktop +# install -D -m644 ../../man/avidemux.1 $PKG/usr/share/man/man1/avidemux.1 + +} -- cgit v1.2.3-70-g09d2