avidemux: version bumped to 2.6.10.

gtk gui support is still broken.

video/avidemux/BUILD

@@ -1,21 +1,45 @@
+sedit 's|#include "ADM_files.h"|#include "ADM_files.h"\n#include "ADM_toolkitGtk.h"|'  avidemux/gtk/ADM_userInterfaces/ui_support.cpp
 
-  sedit "s:avidemux2_gtk:avidemux3_qt4:" $SOURCE_DIRECTORY/avidemux2.desktop &&
-  sedit "s:Icon=avidemux:Icon=avidemux_icon.png:" $SOURCE_DIRECTORY/avidemux2.desktop &&
-
-  sh bootStrap.bash &&
-  cd addons/fontGen &&
-  cmake . &&
-  make &&
-  cd ../tsscan &&
-  make &&
-  cd $SOURCE_DIRECTORY &&
-  prepare_install &&
-  cp -R install/usr/bin/* /usr/bin/ &&
-  cp -R install/usr/include/* /usr/include/ &&
-  cp -R install/usr/lib64/* /usr/lib/ &&
-  cp -R install/usr/share/* /usr/share/ &&
-  install addons/ad2_vcdimager/ad2_vcdimager /usr/bin/ &&
-  install addons/aviscan/aviscan /usr/bin/ &&
-  install addons/tsscan/tsscan /usr/bin/ &&
-  install $SOURCE_DIRECTORY/avidemux2.desktop /usr/share/applications/ &&
-  install $SOURCE_DIRECTORY/avidemux_icon.png /usr/share/icons/
+sedit "s:avidemux2_gtk:avidemux3_qt4:"          avidemux2.desktop &&
+sedit "s:Icon=avidemux:Icon=avidemux_icon.png:" avidemux2.desktop &&
+
+B_OPT=" --with-core --with-cli" &&
+
+#if in_depends $MODULE gtk+-3; then
+#  B_OPT+=" --with-gtk"
+#fi &&
+
+if in_depends $MODULE qt4; then
+  B_OPT+=" --with-qt4"
+fi &&
+
+if in_depends $MODULEs qt5; then
+  B_OPT+=" --enable-qt5"
+fi &&
+
+B_OPT+=" --with-plugins" &&
+
+echo "***> Build options: "$B_OPT &&
+
+sh bootStrap.bash $B_OPT &&
+
+cd addons/fontGen &&
+cmake . &&
+make &&
+
+cd ../tsscan &&
+make &&
+
+cd $SOURCE_DIRECTORY &&
+prepare_install &&
+
+cp -R install/usr/bin/* /usr/bin/ &&
+cp -R install/usr/include/* /usr/include/ &&
+cp -R install/usr/lib/* /usr/lib/ &&
+cp -R install/usr/share/* /usr/share/ &&
+
+install addons/ad2_vcdimager/ad2_vcdimager /usr/bin/ &&
+install addons/aviscan/aviscan /usr/bin/ &&
+install addons/tsscan/tsscan /usr/bin/ &&
+install $SOURCE_DIRECTORY/avidemux2.desktop /usr/share/applications/ &&
+install $SOURCE_DIRECTORY/avidemux_icon.png /usr/share/icons/

video/avidemux/DEPENDS

@@ -1,18 +1,38 @@
-depends  libxml2
-depends  cmake
+depends cmake
+depends alsa-lib
+depends libxml2
 
-optional_depends "gettext"   "-DGETTEXT=ON" "-DGETTEXT=OFF" "for gettext support"
-optional_depends "libmad"    "" "" "for Mpeg 1/2/3 audio support"
-optional_depends "nasm"      "" "" "for 5x faster VCD/SVCD/... on x86"
-optional_depends "a52dec"    "" "" "for AC3 support"
-optional_depends "lame"      "" "" "for MP3 support"
-optional_depends "libvorbis" "" "" "for Vorbis support"
-optional_depends "xvidcore"  "" "" "for XviD MPEG-4 support"
-optional_depends "libvpx"    "-DVPXDEC=ON" "-DVPXDEC=OFF" "for VP8 codec support"
-optional_depends "SDL"       "-DSDL=ON"    "-DSDL=OFF"    "for SDL support"
-optional_depends "qt4"       "-DQT4=ON"    "-DQT4=OFF"    "for Qt4 support"
+optional_depends gettext       "" "" "for gettext support"
+optional_depends SDL           "" "" "for SDL support"
+optional_depends qt4           "" "" "for Qt4 support"
+optional_depends qt5           "" "" "for Qt5 support"
+optional_depends yasm          "" "" "for yasm assembler support"
+optional_depends nasm          "" "" "for nasm assembler support"
+optional_depends libmad        "" "" "for Mpeg 1/2/3 audio support"
+optional_depends a52dec        "" "" "for AC3 support"
+optional_depends faac          "" "" "for AAC encoder support"
+optional_depends faad          "" "" "for AAC decoder support"
+optional_depends lame          "" "" "for MP3 support"
+optional_depends libvorbis     "" "" "for Vorbis support"
+optional_depends pulseaudio    "" "" "for pulse audio server support"
+optional_depends jack          "" "" "for jack audio server support"
+optional_depends libsamplerate "" "" "for sample rate audio converter support"
+optional_depends opencore-amr  "" "" "for AMR speech codec support"
+optional_depends libdca        "" "" "for DCA decoder support"
+optional_depends libvdpau      "" "" "for VDPAU support"
+optional_depends fribidi       "" "" "for video filter support"
+optional_depends fontconfig    "" "" "for fontconfig support"
+optional_depends freetype2     "" "" "for TTF fonts support"
+optional_depends libXv         "" "" "for Xorg video extensions support"
+optional_depends libva         "" "" "for Xorg video acceleration support"
+optional_depends mesa-lib      "" "" "for MESA GL support"
+optional_depends libvpx        "" "" "for VP8 codec support"
+optional_depends xvidcore      "" "" "for XviD MPEG-4 support"
+optional_depends sqlite        "" "" "for sqlite support"
+optional_depends x265          "" "" "for x265 support"
 
-optional_depends "x264-snapshot" "-DX264=ON" "-DX264=OFF" "for x264 support"
+optional_depends x264-snapshot      "" "" "for x264 support"
+optional_depends desktop-file-utils "" "" "for desktop file utils support"
 
-# Broken at this time
-#optional_depends "gtk+-2"    "-DGTK=ON"    "-DGTK=OFF"    "for gtk gui support"
+# Gtk support is still broken
+#optional_depends gtk+-3        "" "" "for gtk gui support"

video/avidemux/DETAILS

@@ -1,18 +1,19 @@
           MODULE=avidemux
-         VERSION=2.6.8
+         VERSION=2.6.10
           SOURCE=$MODULE\_$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/$MODULE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE\_$VERSION
-      SOURCE_VFY=sha1:50f3dfe270e6272fce46d725b198b9d0dd95664b
+      SOURCE_VFY=sha256:176c2482a0656f81e307f1505e6dfcdab086ee73e7de363617b884c5d7205aed
         WEB_SITE=http://fixounet.free.fr/avidemux
          ENTERED=20040922
-         UPDATED=20140719
+         UPDATED=20150611
            SHORT="A graphical tool to edit video"
-PSAFE=no
+           PSAFE=no
+
 cat << EOF
-Avidemux is a graphical tool to edit video. It can open AVI, openDML,
-MPEG, Nuppelvideo, and BMPs. Most common codecs are supported
-(M-JPEG, MPEG, DivX, Xvid, huffyuv, WMA, etc.) thanks to libavcodec
-and libmpeg2. Video can be edited, cut, appended, filtered (resize/
-crop/denoise), and re-encoded to either AVI (DivX/Xvid) or MPEG 1/2.
+Avidemux is a graphical tool to edit video. It can open AVI, openDML, MPEG,
+Nuppelvideo, and BMPs. Most common codecs are supported (M-JPEG, MPEG, DivX,
+Xvid, huffyuv, WMA, etc.) thanks to libavcodec and libmpeg2. Video can be
+edited, cut, appended, filtered (resize/ crop/denoise), and re-encoded to
+either AVI (DivX/Xvid) or MPEG 1/2.
 EOF