- updated to 2.6.4
authorJan Rękorajski <baggins@pld-linux.org>
Thu, 29 Aug 2013 10:57:32 +0000 (12:57 +0200)
committerJan Rękorajski <baggins@pld-linux.org>
Thu, 29 Aug 2013 10:57:32 +0000 (12:57 +0200)
12 files changed:
avidemux-autoconf.patch [deleted file]
avidemux-dts_internal.patch [deleted file]
avidemux-qt4.desktop
avidemux-sparc64.patch [deleted file]
avidemux-x264.patch [deleted file]
avidemux.desktop
avidemux.spec
build.patch [new file with mode: 0644]
gcc44.patch [deleted file]
mmx-asm.patch [deleted file]
no-qt-in-gtk.patch [new file with mode: 0644]
types.patch [deleted file]

diff --git a/avidemux-autoconf.patch b/avidemux-autoconf.patch
deleted file mode 100644 (file)
index 8845169..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -urN avidemux-2.1.2.org/admin/detect-autoconf.sh avidemux-2.1.2/admin/detect-autoconf.sh
---- avidemux-2.1.2.org/admin/detect-autoconf.sh        2005-07-02 14:41:15.000000000 +0200
-+++ avidemux-2.1.2/admin/detect-autoconf.sh    2007-01-04 17:16:16.539072500 +0100
-@@ -21,16 +21,16 @@
-     AUTOCONF="`$WHICH autoconf253`"
-   elif test -x "`$WHICH autoconf-2.52`" ; then
-     AUTOCONF="`$WHICH autoconf-2.52`"
--  elif test -x "`$WHICH autoconf2.50`" ; then
--    AUTOCONF="`$WHICH autoconf2.50`"
-+  elif test -x "`$WHICH autoconf`" ; then
-+    AUTOCONF="`$WHICH autoconf`"
-   fi
- }
- checkAutoheader()
- {
--  if test -x "`$WHICH autoheader-2.5x`" ; then
--    AUTOHEADER="`$WHICH autoheader-2.5x`"
--    AUTOM4TE="`$WHICH autom4te-2.5x`"
-+  if test -x "`$WHICH autoheader`" ; then
-+    AUTOHEADER="`$WHICH autoheader`"
-+    AUTOM4TE="`$WHICH autom4te`"
-   elif test -x "`$WHICH autoheader-2.53`" ; then
-     AUTOHEADER="`$WHICH autoheader-2.53`"
-     AUTOM4TE="`$WHICH autom4te-2.53`"
-@@ -47,9 +47,9 @@
- checkAutomakeAclocal ()
- {
-   if test -z "$UNSERMAKE"; then
--    if test -x "`$WHICH automake-1.8`" ; then
--      AUTOMAKE="`$WHICH automake-1.8`"
--      ACLOCAL="`$WHICH aclocal-1.8`"
-+    if test -x "`$WHICH automake`" ; then
-+      AUTOMAKE="`$WHICH automake`"
-+      ACLOCAL="`$WHICH aclocal`"
-     elif test -x "`$WHICH automake-1.7`" ; then
-       AUTOMAKE="`$WHICH automake-1.7`"
-       ACLOCAL="`$WHICH aclocal-1.7`"
---- avidemux_2.4.4/configure.in.in.orig        2009-02-06 20:07:37.000000000 +0100
-+++ avidemux_2.4.4/configure.in.in     2009-04-14 04:20:30.000000000 +0200
-@@ -37,6 +37,7 @@
- dnl Perform program name transformation
- AC_ARG_PROGRAM
-+AC_GNU_SOURCE
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(avidemux,"2.4.4")
- ADM_SUBVERSION="0"
-@@ -120,7 +121,7 @@
- dnl _________________ gettext _________________
--AM_GNU_GETTEXT([external])
-+AM_GNU_GETTEXT
- GETTEXT_PACKAGE=avidemux
- AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [gettext package name])
- ADM_LOCALEDIR=${datadir}/locale
-@@ -239,7 +240,8 @@
-   *)
-     AC_MSG_NOTICE(I'm assuming this is Linux)
-     AC_PATH_XTRA
--    QTLIBS="-Wl,-rpath,$QTEXTRALIB -L$QTEXTRALIB -lQtGui  -lQtCore $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS  -lpthread"
-+    QTLIBS=`$PKG_CONFIG QtGui --libs`
-+    QTLIBS="-Wl,-rpath,$QTEXTRALIB -L$QTEXTRALIB $X_EXTRA_LIBS $QTLIBS"
-     QTINC="-I$QTEXTRAINC -I$QTEXTRAINC/QtGui -I$QTEXTRAINC/QtCore -I$QTEXTRAINC/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -I$QTEXTRAINC"
-     QTBIN="$QTDIR/bin"
-     ;;
diff --git a/avidemux-dts_internal.patch b/avidemux-dts_internal.patch
deleted file mode 100644 (file)
index 3cabb16..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.in.in    2006-09-21 19:51:13.000000000 +0200
-+++ configure.in.in-new        2006-09-27 14:27:00.529197512 +0200
-@@ -585,15 +585,7 @@
-     AC_CHECK_HEADERS([dts.h], , have_libdca=no)
-     
-     if test "x$have_libdca" = "xyes"; then
--      AC_CHECK_HEADERS([dts_internal.h], , have_libdca=no)
--      
--      if test "x$have_libdca" = "xyes"; then
--              if test "x$use_late_binding" = "xno"; then
--                              AC_CHECK_LIB(dts, dts_init, , have_libdca=no)
--                      fi
--              else
--              AC_MSG_WARN(dts.h is there but I also need dts_internal.h to compile libdca/libdts. Please copy dts_internal.h where dts.h is)
--      fi
-+      AC_CHECK_LIB( dts, dts_init, , have_libdca=no )
-     fi
-     
-     if test "x$have_libdca" = "xyes"; then
index 39f5937..b592286 100644 (file)
@@ -3,7 +3,7 @@ Name=Avidemux Video Editor (Qt)
 GenericName=Video Editor
 Comment=Audio/video editing software - Qt interface
 Comment[pl]=Edytor audio/wideo - Qt
-Exec=avidemux2_qt4
+Exec=avidemux3_qt4
 MimeType=video/mpeg;video/quicktime;video/x-msvideo;video/x-anim;audio/x-mp3;audio/x-mp2;
 Icon=avidemux
 Terminal=false
diff --git a/avidemux-sparc64.patch b/avidemux-sparc64.patch
deleted file mode 100644 (file)
index 82e20bb..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
---- avidemux_2.4/configure.in.in.orig  2008-03-12 08:25:07.000000000 +0000
-+++ avidemux_2.4/configure.in.in       2008-03-12 08:30:16.000000000 +0000
-@@ -1165,7 +1165,7 @@
-               AC_DEFINE(HAVE_FAST_64BIT,1,"FFMPEG")
-               echo "IA64"
-               ;;
--      sparc|sparc64)
-+      sparc)
-               have_little_endian=no;
-               LMPG_OPT="";
-               AC_DEFINE(ADM_BIG_ENDIAN,1,[Big endian CPU - SPARC or PowerPC])
-@@ -1174,6 +1174,16 @@
-               AC_DEFINE(ENABLE_MMX,0,[post proc])
-               AC_DEFINE(HAVE_FAST_64BIT,1,"FFMPEG")
-               ;;              
-+      sparc64)
-+              have_little_endian=no;
-+              LMPG_OPT="";
-+              AC_DEFINE(ARCH_64_BITS,1,"SPARC64 assembly")
-+              AC_DEFINE(ADM_BIG_ENDIAN,1,[Big endian CPU - SPARC or PowerPC])
-+              AC_DEFINE(FPM_SPARC,1,[Mad ])
-+              AC_DEFINE(WORDS_BIGENDIAN,1,[Big endian CPU - SPARC or PowerPC])
-+              AC_DEFINE(ENABLE_MMX,0,[post proc])
-+              AC_DEFINE(HAVE_FAST_64BIT,1,"FFMPEG")
-+              ;;              
-       sun4u)
-               LDFLAGS="$LDFLAGS -lposix4";
-               have_little_endian=no;
diff --git a/avidemux-x264.patch b/avidemux-x264.patch
deleted file mode 100644 (file)
index 3a641dc..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp   2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp        2011-04-28 22:40:26.000000000 +0200
-@@ -488,8 +488,10 @@
-       printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
-       printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
-       printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
-       printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
-+#elif X264_BUILD > 114
-+      printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
- #endif
-       printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
- #if X264_BUILD > 88
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp       2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp    2011-04-28 22:43:36.000000000 +0200
-@@ -417,7 +417,7 @@
-       _param.b_cabac = cabac;
- }
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- unsigned int x264Options::getOpenGopMode(void)
- {
-       return _param.i_open_gop;
-@@ -428,6 +428,17 @@
-       if (openGopMode < 3)
-               _param.i_open_gop = openGopMode;
- }
-+#elif X264_BUILD > 114
-+unsigned int x264Options::getOpenGopMode(void)
-+{
-+        return _param.b_open_gop;
-+}
-+ 
-+void x264Options::setOpenGopMode(unsigned int openGopMode)
-+{
-+        if (openGopMode < 3)
-+                _param.b_open_gop = openGopMode;
-+}
- #endif
- unsigned int x264Options::getInterlaced(void)
index 5834da5..ecba06d 100644 (file)
@@ -3,7 +3,7 @@ Name=Avidemux Video Editor (GTK)
 GenericName=Video Editor
 Comment=Audio/video editing software - GTK interface
 Comment[pl]=Edytor audio/wideo - GTK
-Exec=avidemux2_gtk
+Exec=avidemux3_gtk
 MimeType=video/mpeg;video/quicktime;video/x-msvideo;video/x-anim;audio/x-mp3;audio/x-mp2;
 Icon=avidemux
 Terminal=false
index 350389d..16e8066 100644 (file)
 Summary:       A small audio/video editing software for Linux
 Summary(pl.UTF-8):     Mały edytor audio/wideo dla Linuksa
 Name:          avidemux
-Version:       2.5.5
-Release:       9
+Version:       2.6.4
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       http://downloads.sourceforge.net/avidemux/%{name}_%{version}.tar.gz
-# Source0-md5: 33bbe210c6826cea1987ed18a41d57a7
+# Source0-md5: adb9110ab230fe13a8e9799f547f2f57
 Source1:       %{name}.desktop
 Source2:       %{name}-qt4.desktop
-Patch0:                gcc44.patch
-Patch1:                types.patch
-Patch2:                mmx-asm.patch
-Patch3:                %{name}-x264.patch
-#Patch1:       %{name}-dts_internal.patch
-#Patch2:       %{name}-sparc64.patch
+Patch0:                build.patch
+Patch1:                no-qt-in-gtk.patch
 URL:           http://fixounet.free.fr/avidemux/
 %{?with_qt4:BuildRequires:     QtGui-devel >= %{qt4_version}}
 BuildRequires: SDL-devel
 #BuildRequires:        a52dec-libs-devel
 BuildRequires: alsa-lib-devel >= 1.0
+BuildRequires: bash
 %{?with_arts:BuildRequires:    artsc-devel}
 BuildRequires: cmake >= 2.6.2
 %{?with_esd:BuildRequires:     esound-devel}
@@ -107,81 +104,36 @@ Qt4 UI for Avidemux
 find '(' -name '*.js' -o -name '*.cpp' -o -name '*.h' -o -name '*.cmake' -o -name '*.txt' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 echo 'pt_BR' >> po/LINGUAS
 
 # libdir fix
-%{__sed} -i -e's,"lib","%{_lib}",' avidemux/main.cpp avidemux/ADM_core/src/ADM_fileio.cpp
+%{__sed} -i -e's,"lib","%{_lib}",' avidemux/common/main.cpp avidemux_core/ADM_core/src/ADM_fileio.cpp
 
 %build
-TOP=$PWD
-
-# main
-install -d build/%{_lib} plugins/build
-cd build
-
-export QTDIR=%{_libdir}/qt4
-%cmake \
-       -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
-       %{!?with_gtk:-DGTK=0} \
-       %{!?with_qt4:-DQT4=0} \
-       ..
-
-%{__make}
-
-# plugin build expects libraries to be already installed; we fake a prefix
-# in build/ by symlinking all libraries to build/lib/
-cd %{_lib}
-find ../avidemux -name '*.so*' | xargs ln -sft .
-cd ../..
-
-# plugins
-cd plugins/build
-%cmake \
-       -DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:Release} \
-       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-       -DAVIDEMUX_INSTALL_PREFIX=$TOP/build \
-       -DAVIDEMUX_SOURCE_DIR=$TOP/ \
-       -DAVIDEMUX_CORECONFIG_DIR=$TOP/build/config \
-       %{!?with_arts:-DARTS=0} \
-       %{!?with_esd:-DESD=0} \
-       %{!?with_amr:-DOPENCORE_AMRNB=0 -DOPENCORE_AMRWB=0} \
-       %{!?with_gtk:-DGTK=0} \
-       %{!?with_qt4:-DQT4=0} \
-%if "%{_lib}" == "lib64"
-       -DLIB_SUFFIX=64 \
-%endif
-       ..
-
-%{__make}
+bash ./bootStrap.bash \
+       --with-core \
+       --with-cli \
+       --with-gtk \
+       --with-qt4 \
+       --with-plugins
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_bindir},%{_mandir}/man1}
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-%{__make} -C build install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-%{__make} -C plugins/build install \
-       DESTDIR=$RPM_BUILD_ROOT
+cp -a install/* $RPM_BUILD_ROOT
 
 chmod +x $RPM_BUILD_ROOT%{_libdir}/lib*.so*
 
-mv $RPM_BUILD_ROOT%{_bindir}/avidemux2{_cli,}
+mv $RPM_BUILD_ROOT%{_bindir}/avidemux3{_cli,}
 cp -a man/avidemux.1 $RPM_BUILD_ROOT%{_mandir}/man1
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-gtk.desktop
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-qt4.desktop
 cp -a avidemux_icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
-# make install doesn't install these
-install -p plugins/build/ADM_videoEncoder/common/pluginOptions/libADM_vidEnc_pluginOptions.so $RPM_BUILD_ROOT%{_libdir}
-install -p plugins/build/ADM_videoEncoder/common/xvidRateCtl/libADM_xvidRateCtl.so $RPM_BUILD_ROOT%{_libdir}
-install -p plugins/build/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc/libmpeg2enc.so $RPM_BUILD_ROOT%{_libdir}
-
-%find_lang %{name}
+#find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -192,235 +144,251 @@ rm -rf $RPM_BUILD_ROOT
 %post ui-qt4
 %update_desktop_database
 
-%files -f %{name}.lang
+#files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
 %doc AUTHORS
-%attr(755,root,root) %{_bindir}/avidemux2
-%attr(755,root,root) %{_libdir}/libADM5avcodec.so.52
-%attr(755,root,root) %{_libdir}/libADM5avformat.so.52
-%attr(755,root,root) %{_libdir}/libADM5avutil.so.50
-%attr(755,root,root) %{_libdir}/libADM5postproc.so.51
-%attr(755,root,root) %{_libdir}/libADM5swscale.so.0
-%attr(755,root,root) %{_libdir}/libADM_UICli.so
-%attr(755,root,root) %{_libdir}/libADM_core.so
-%attr(755,root,root) %{_libdir}/libADM_coreAudio.so
-%attr(755,root,root) %{_libdir}/libADM_coreImage.so
-%attr(755,root,root) %{_libdir}/libADM_coreUI.so
-%attr(755,root,root) %{_libdir}/libADM_render_cli.so
-%attr(755,root,root) %{_libdir}/libADM_smjs.so
-%attr(755,root,root) %{_libdir}/libADM_vidEnc_pluginOptions.so
-%attr(755,root,root) %{_libdir}/libADM_xvidRateCtl.so
-%attr(755,root,root) %{_libdir}/libmpeg2enc.so
-
-%dir %{_libdir}/ADM_plugins
-%dir %{_libdir}/ADM_plugins/audioDecoder
-%dir %{_libdir}/ADM_plugins/audioDevices
-%dir %{_libdir}/ADM_plugins/audioEncoders
-%dir %{_libdir}/ADM_plugins/videoEncoder
-%dir %{_libdir}/ADM_plugins/videoEncoder/avcodec
-%dir %{_libdir}/ADM_plugins/videoEncoder/avcodec/mpeg-1
-%dir %{_libdir}/ADM_plugins/videoEncoder/avcodec/mpeg-2
-%dir %{_libdir}/ADM_plugins/videoEncoder/mpeg2enc
-%dir %{_libdir}/ADM_plugins/videoEncoder/mpeg2enc/mpeg-1
-%dir %{_libdir}/ADM_plugins/videoEncoder/mpeg2enc/mpeg-2
-%dir %{_libdir}/ADM_plugins/videoEncoder/x264
-%dir %{_libdir}/ADM_plugins/videoEncoder/xvid
-%dir %{_libdir}/ADM_plugins/videoFilter
-
-%{_libdir}/ADM_plugins/videoEncoder/avcodec/Flv1Param.xsd
-%{_libdir}/ADM_plugins/videoEncoder/avcodec/H263Param.xsd
-%{_libdir}/ADM_plugins/videoEncoder/avcodec/MjpegParam.xsd
-%{_libdir}/ADM_plugins/videoEncoder/avcodec/Mpeg1Param.xsd
-%{_libdir}/ADM_plugins/videoEncoder/avcodec/Mpeg2Param.xsd
-%{_libdir}/ADM_plugins/videoEncoder/avcodec/Mpeg4aspParam.xsd
-%{_libdir}/ADM_plugins/videoEncoder/avcodec/mpeg-1/Video*CD.xml
-%{_libdir}/ADM_plugins/videoEncoder/avcodec/mpeg-2/DVD.xml
-%{_libdir}/ADM_plugins/videoEncoder/avcodec/mpeg-2/Super*Video*CD.xml
-%{_libdir}/ADM_plugins/videoEncoder/mpeg2enc/Mpeg1Param.xsd
-%{_libdir}/ADM_plugins/videoEncoder/mpeg2enc/Mpeg2Param.xsd
-%{_libdir}/ADM_plugins/videoEncoder/mpeg2enc/mpeg-1/Video*CD.xml
-%{_libdir}/ADM_plugins/videoEncoder/mpeg2enc/mpeg-2/DVD.xml
-%{_libdir}/ADM_plugins/videoEncoder/mpeg2enc/mpeg-2/Super*Video*CD.xml
-%{_libdir}/ADM_plugins/videoEncoder/x264/Apple*.xml
-%{_libdir}/ADM_plugins/videoEncoder/x264/Microsoft*.xml
-%{_libdir}/ADM_plugins/videoEncoder/x264/Sony*.xml
-%{_libdir}/ADM_plugins/videoEncoder/x264/x264Param.xsd
-%{_libdir}/ADM_plugins/videoEncoder/xvid/XvidParam.xsd
-
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_Mad.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_a52.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_faad.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_vorbis.so
+%attr(755,root,root) %{_bindir}/avidemux3
+%attr(755,root,root) %{_bindir}/avidemux3_jobs
+%attr(755,root,root) %{_libdir}/libADM6avcodec.so.54
+%attr(755,root,root) %{_libdir}/libADM6avformat.so.54
+%attr(755,root,root) %{_libdir}/libADM6avutil.so.52
+%attr(755,root,root) %{_libdir}/libADM6postproc.so.52
+%attr(755,root,root) %{_libdir}/libADM6swscale.so.2
+%attr(755,root,root) %{_libdir}/libADM_UI_Cli6.so
+%attr(755,root,root) %{_libdir}/libADM_core6.so
+%attr(755,root,root) %{_libdir}/libADM_coreAudio6.so
+%attr(755,root,root) %{_libdir}/libADM_coreImage6.so
+%attr(755,root,root) %{_libdir}/libADM_coreUI6.so
+%attr(755,root,root) %{_libdir}/libADM_render6_cli.so
+%attr(755,root,root) %{_libdir}/libADM_audioParser6.so
+%attr(755,root,root) %{_libdir}/libADM_coreAudioDevice6.so
+%attr(755,root,root) %{_libdir}/libADM_coreAudioEncoder6.so
+%attr(755,root,root) %{_libdir}/libADM_coreAudioFilterAPI6.so
+%attr(755,root,root) %{_libdir}/libADM_coreDemuxer6.so
+%attr(755,root,root) %{_libdir}/libADM_coreDemuxerMpeg6.so
+%attr(755,root,root) %{_libdir}/libADM_coreImageLoader6.so
+%attr(755,root,root) %{_libdir}/libADM_coreJobs.so
+%attr(755,root,root) %{_libdir}/libADM_coreMuxer6.so
+%attr(755,root,root) %{_libdir}/libADM_coreScript.so
+%attr(755,root,root) %{_libdir}/libADM_coreSocket6.so
+%attr(755,root,root) %{_libdir}/libADM_coreSqlLight3.so
+%attr(755,root,root) %{_libdir}/libADM_coreUtils6.so
+%attr(755,root,root) %{_libdir}/libADM_coreVDPAU6.so
+%attr(755,root,root) %{_libdir}/libADM_coreVideoCodec6.so
+%attr(755,root,root) %{_libdir}/libADM_coreVideoEncoder6.so
+%attr(755,root,root) %{_libdir}/libADM_coreVideoFilter6.so
+
+%dir %{_libdir}/ADM_plugins6
+%dir %{_libdir}/ADM_plugins6/audioDecoder
+%dir %{_libdir}/ADM_plugins6/audioDevices
+%dir %{_libdir}/ADM_plugins6/audioEncoders
+%dir %{_libdir}/ADM_plugins6/videoDecoders
+%dir %{_libdir}/ADM_plugins6/videoEncoders
+%dir %{_libdir}/ADM_plugins6/videoFilters
+%dir %{_libdir}/ADM_plugins6/autoScripts
+%dir %{_libdir}/ADM_plugins6/autoScripts/lib
+%dir %{_libdir}/ADM_plugins6/demuxers
+%dir %{_libdir}/ADM_plugins6/muxers
+%dir %{_libdir}/ADM_plugins6/pluginSettings
+%dir %{_libdir}/ADM_plugins6/pluginSettings/x264
+%dir %{_libdir}/ADM_plugins6/pluginSettings/x264/1
+%dir %{_libdir}/ADM_plugins6/scriptEngines
+
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_Mad.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_a52.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_faad.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_vorbis.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_dca.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_ima_adpcm.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_lav.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_ms_adpcm.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_ulaw.so
 %if %{with amr}
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_opencore_amrnb.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_opencore_amrwb.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrnb.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrwb.so
 %endif
 
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_alsa.so
-%{?with_arts:%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_arts.so}
-%{?with_esd:%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_esd.so}
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_jack.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_oss.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_pulseAudioSimple.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_sdl.so
-
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_faac.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_lame.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_lav_ac3.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_lav_mp2.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_pcm.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_twolame.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_vorbis.so
-
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/libADM_vidEnc_avcodec.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/libADM_vidEnc_mpeg2enc.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so
-
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_addborders.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_asharp_cli.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_avisynthResize_cli.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_avsfilter.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_blackenBorders.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_blendDgBob.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_blendRemoval.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_chromashift_cli.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_cnr2_cli.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_colorYUV_cli.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_contrast_cli.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_crop_cli.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_decimate.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Deinterlace.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Delta.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_denoise3dhq.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_denoise3d.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Denoise.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_dropOut.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_eq2_cli.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_equalizer_cli.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_fade.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_fastconvolutiongauss.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_fastconvolutionmean.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_fastconvolutionmedian.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_fastconvolutionsharpen.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_FluxSmooth.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_forcedPP.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Hue_cli.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_hzStackField.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_keepEvenField.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_keepOddField.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_kernelDeint.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_largemedian.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_lavDeinterlace.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_logo.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_lumaonly.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mcdeint.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mergeField.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Mosaic.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mpdelogo_cli.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mplayerResize_cli.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mSharpen.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mSmooth.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_palShift.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Pulldown.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_resampleFps.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_reverse.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_rotate.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_separateField.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_smartPalShift.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_smartSwapField.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_soften.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_ssa.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Stabilize.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_stackField.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_sub_cli.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_swapField.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_swapuv.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_tdeint.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_telecide.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Tisophote.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_unstackField.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_vflip.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_vlad.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Whirl.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_yadif.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vidChromaU.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vidChromaV.so
-
-%dir %{_datadir}/ADM_addons
-%dir %{_datadir}/ADM_addons/avsfilter
-%{_datadir}/ADM_addons/avsfilter/avsload.exe
-%{_datadir}/ADM_addons/avsfilter/pipe_source.dll
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDevices/libADM_av_alsaDMix.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDevices/libADM_av_alsaDefault.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDevices/libADM_av_alsaHw.so
+%{?with_arts:%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDevices/libADM_av_arts.so}
+%{?with_esd:%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDevices/libADM_av_esd.so}
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDevices/libADM_av_jack.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDevices/libADM_av_oss.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDevices/libADM_av_pulseAudioSimple.so
+#%attr(755,root,root) %{_libdir}/ADM_plugins6/audioDevices/libADM_av_sdl.so
+
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_faac.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_lame.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_lav_ac3.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_lav_mp2.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_pcm.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_twolame.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_vorbis.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_lav_aac.so
+
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_vpx.so
+
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffFlv1.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg2.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_huff.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_null.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_png.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
+
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_addBorders.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_blackenBorders.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_DgBob.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_chromaShiftCli.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_contrastCli.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_decimate.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_denoise3dhq.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_denoise3d.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_eq2Cli.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_fadeToBlack.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_gauss.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mean.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_median.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_sharpen.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_FluxSmooth.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_HueCli.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_hzstackField.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_kernelDeint.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_largeMedian.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_lavDeint.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_logo.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_lumaOnly.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mergeField.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mpdelogoCli.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_resampleFps.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_rotate.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_separateField.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ssa.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_stackField.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swapUV.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_telecide.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_unstackField.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vflip.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_yadif.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_hf_hflip.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_CropCli.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_changeFps.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_dummy.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_glBenchmark.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_glResize.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_msharpen.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_printInfo.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_removePlane.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_rotateGlFrag2.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_sampleGlFrag2.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_sampleGlVertex.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_cli.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
+
+%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/720p.py
+%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/PSP.py
+%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/check24fps.py
+%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/dvd.py
+%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/lib/ADM_image.py
+%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/lib/ADM_imageInfo.py
+%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/svcd.py
+%attr(755,root,root) %{_libdir}/ADM_plugins6/autoScripts/vcd.py
+%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_asf.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_avsproxy.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_flv.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_matroska.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_mp4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_mxf.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_opendml.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_pic.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_ps.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/demuxers/libADM_dm_ts.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_Mkv.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_avi.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_dummy.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_ffPS.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_ffTS.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_flv.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_mp4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_mp4v2.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/muxers/libADM_mx_raw.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/pluginSettings/x264/1/PSP.json
+%attr(755,root,root) %{_libdir}/ADM_plugins6/pluginSettings/x264/1/iPhone.json
+%attr(755,root,root) %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_spiderMonkey.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
+
+%dir %{_datadir}/ADM6_addons
+%dir %{_datadir}/ADM6_addons/avsfilter
+%{_datadir}/ADM6_addons/avsfilter/avsload.exe
+%{_datadir}/ADM6_addons/avsfilter/pipe_source.dll
 
 %{_mandir}/man1/avidemux.1*
 %{_pixmapsdir}/*.png
 
-%{_datadir}/ADM_scripts
-
 %dir %{_datadir}/%{name}
 
 %if %{with gtk}
 %files ui-gtk
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/avidemux2_gtk
+%attr(755,root,root) %{_bindir}/avidemux3_gtk
 %{_desktopdir}/%{name}-gtk.desktop
-%attr(755,root,root) %{_libdir}/libADM_UIGtk.so
-%attr(755,root,root) %{_libdir}/libADM_render_gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/x264/libADM_vidEnc_x264_Gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_asharp_gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_avisynthResize_gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_chromaShift_gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_cnr2_gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_colorYUV_gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_contrast_gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Crop_gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_eq2_gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_equalizer_gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_hue_gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mpdelogo_gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mplayerResize_gtk.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_sub_gtk.so
+%attr(755,root,root) %{_libdir}/libADM_UIGtk6.so
+%attr(755,root,root) %{_libdir}/libADM_render6_gtk.so
+%attr(755,root,root) %{_libdir}/libADM_toolkitGtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_asharpGtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_chromaShiftGtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_contrastGtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_cropGtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_eq2Gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_HueGtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_gtk.so
+%{_libdir}/ADM_glade
 %endif
 
 %if %{with qt4}
 %files ui-qt4
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/avidemux2_qt4
+%attr(755,root,root) %{_bindir}/avidemux3_qt4
 %{_desktopdir}/%{name}-qt4.desktop
-%attr(755,root,root) %{_libdir}/libADM_UIQT4.so
-%attr(755,root,root) %{_libdir}/libADM_render_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/x264/libADM_vidEnc_x264_Qt.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Qt.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_asharp_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_avisynthResize_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_chromaShift_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_cnr2_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_colorYUV_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_contrast_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_crop_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_curveEditor_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_eq2_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_equalizer_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_hue_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mpdelogo_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mplayerResize_qt4.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_sub_qt4.so
-
-%dir %{_datadir}/%{name}/i18n
-%lang(ca) %{_datadir}/%{name}/i18n/*_ca.qm
-%lang(cs) %{_datadir}/%{name}/i18n/*_cs.qm
-%lang(de) %{_datadir}/%{name}/i18n/*_de.qm
-%lang(el) %{_datadir}/%{name}/i18n/*_el.qm
-%lang(es) %{_datadir}/%{name}/i18n/*_es.qm
-%lang(fr) %{_datadir}/%{name}/i18n/*_fr.qm
-%lang(it) %{_datadir}/%{name}/i18n/*_it.qm
-%lang(ja) %{_datadir}/%{name}/i18n/*_ja.qm
-%lang(pl) %{_datadir}/%{name}/i18n/*_pl.qm
-%lang(pt_BR) %{_datadir}/%{name}/i18n/*_pt_BR.qm
-%lang(ru) %{_datadir}/%{name}/i18n/*_ru.qm
-%lang(sr) %{_datadir}/%{name}/i18n/*_sr.qm
-%lang(sr@latin) %{_datadir}/%{name}/i18n/*_sr@latin.qm
-%lang(tr) %{_datadir}/%{name}/i18n/*_tr.qm
-%lang(zh_TW) %{_datadir}/%{name}/i18n/*_zh_TW.qm
+%attr(755,root,root) %{_libdir}/libADM_UIQT46.so
+%attr(755,root,root) %{_libdir}/libADM_render6_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x264_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_asharpQt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_chromaShiftQt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_contrastQt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_cropQt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_eq2Qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_HueQt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mpdelogoQt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_qt.so
+
+%{_datadir}/%{name}6/help
+
+%dir %{_datadir}/%{name}6/i18n
+%lang(ca) %{_datadir}/%{name}6/i18n/*_ca.qm
+%lang(cs) %{_datadir}/%{name}6/i18n/*_cs.qm
+%lang(de) %{_datadir}/%{name}6/i18n/*_de.qm
+%lang(el) %{_datadir}/%{name}6/i18n/*_el.qm
+%{_datadir}/%{name}6/i18n/*_en.qm
+%lang(es) %{_datadir}/%{name}6/i18n/*_es.qm
+%lang(eu) %{_datadir}/%{name}6/i18n/*_eu.qm
+%lang(fr) %{_datadir}/%{name}6/i18n/*_fr.qm
+%lang(it) %{_datadir}/%{name}6/i18n/*_it.qm
+%lang(ja) %{_datadir}/%{name}6/i18n/*_ja.qm
+%lang(pl) %{_datadir}/%{name}6/i18n/*_pl.qm
+%lang(pt_BR) %{_datadir}/%{name}6/i18n/*_pt_BR.qm
+%lang(ru) %{_datadir}/%{name}6/i18n/*_ru.qm
+%lang(sr) %{_datadir}/%{name}6/i18n/*_sr.qm
+%lang(sr@latin) %{_datadir}/%{name}6/i18n/*_sr@latin.qm
+%lang(tr) %{_datadir}/%{name}6/i18n/*_tr.qm
+%lang(zh_TW) %{_datadir}/%{name}6/i18n/*_zh_TW.qm
 %endif
diff --git a/build.patch b/build.patch
new file mode 100644 (file)
index 0000000..d6d94bf
--- /dev/null
@@ -0,0 +1,11 @@
+--- avidemux_2.6.4/bootStrap.bash~     2013-05-09 13:10:35.000000000 +0200
++++ avidemux_2.6.4/bootStrap.bash      2013-08-29 11:56:46.570506339 +0200
+@@ -34,7 +34,7 @@
+         mkdir $BUILDDIR || fail mkdir
+         cd $BUILDDIR 
+         cmake $PKG $FAKEROOT -DCMAKE_EDIT_COMMAND=vim -DAVIDEMUX_SOURCE_DIR=$TOP -DCMAKE_INSTALL_PREFIX=/usr $EXTRA $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
+-        make  $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR"
++        make  $PARAL || fail "make, result in /tmp/log$BUILDDIR"
+       if  [ "x$PKG" != "x" ] ; then
+           $FAKEROOT_COMMAND make package DESTDIR=$FAKEROOT_DIR/tmp || fail package
+       fi
diff --git a/gcc44.patch b/gcc44.patch
deleted file mode 100644 (file)
index 47fc6bf..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
---- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.cpp~       2009-12-16 13:05:49.000000000 +0200
-+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.cpp        2009-12-16 13:05:51.050534943 +0200
-@@ -17,6 +17,7 @@
- #include "Q_license.h"
- #include "ADM_toolkitQt.h"
-+#include <stdint.h>
- Ui_licenseWindow::Ui_licenseWindow(QWidget *parent) : QDialog(parent)
- {
---- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.cpp~  2009-12-16 12:45:16.000000000 +0200
-+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.cpp   2009-12-16 13:07:30.231566738 +0200
-@@ -6,6 +6,7 @@
- #include "Q_jobs.h"
- #include "DIA_coreToolkit.h"
- #include "ADM_toolkitQt.h"
-+#include <stdio.h>
- static void updateStatus(void);
- extern bool parseECMAScript(const char *name);
---- avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_coreToolkit.h~      2009-12-16 12:45:15.000000000 +0200
-+++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_coreToolkit.h       2009-12-16 13:09:16.437182359 +0200
-@@ -19,6 +19,8 @@
- #ifndef ADM_COREUI_TOOLKIT__
- #define ADM_COREUI_TOOLKIT__
-+#include <stdint.h>
-+
- typedef enum 
- {
-         ADM_LOG_NONE=0,
---- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h~  2009-12-16 12:45:16.000000000 +0200
-+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h   2009-12-16 13:30:37.550386331 +0200
-@@ -1,6 +1,8 @@
- #ifndef ADM_Q_SLIDER_H
- #define ADM_Q_SLIDER_H
-+#include <stdint.h>
-+
- class ADM_QSlider : public QSlider
- {
- protected:
diff --git a/mmx-asm.patch b/mmx-asm.patch
deleted file mode 100644 (file)
index 0aa51a5..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
---- avidemux_2.5.2-asm/avidemux/ADM_coreImage/include/ADM_mmxMacros.h.orig     2010-05-22 10:32:09.000000000 +0200
-+++ avidemux_2.5.2-asm/avidemux/ADM_coreImage/include/ADM_mmxMacros.h  2010-05-22 11:22:19.788749922 +0200
-@@ -353,11 +353,11 @@
- #define       mmx_m2r(op, mem, reg) \
-       __asm__ __volatile__ (#op " %0, %%" #reg \
-                             : /* nothing */ \
--                            : "X" (mem))
-+                            : "ym" (mem))
- #define       mmx_r2m(op, reg, mem) \
-       __asm__ __volatile__ (#op " %%" #reg ", %0" \
--                            : "=X" (mem) \
-+                            : "=ym" (mem) \
-                             : /* nothing */ )
- #define       mmx_r2r(op, regs, regd) \
-@@ -367,8 +367,8 @@
-       __asm__ __volatile__ ("movq %0, %%mm0\n\t" \
-                             #op " %1, %%mm0\n\t" \
-                             "movq %%mm0, %0" \
--                            : "=X" (memd) \
--                            : "X" (mems))
-+                            : "=ym" (memd) \
-+                            : "ym" (mems))
- #endif
-@@ -383,8 +383,8 @@
- #define       movq(vars, vard) \
-       __asm__ __volatile__ ("movq %1, %%mm0\n\t" \
-                             "movq %%mm0, %0" \
--                            : "=X" (vard) \
--                            : "X" (vars))
-+                            : "=ym" (vard) \
-+                            : "ym" (vars))
- /*    1x32 MOVe Doubleword
-@@ -398,8 +398,8 @@
- #define       movd(vars, vard) \
-       __asm__ __volatile__ ("movd %1, %%mm0\n\t" \
-                             "movd %%mm0, %0" \
--                            : "=X" (vard) \
--                            : "X" (vars))
-+                            : "=ym" (vard) \
-+                            : "ym" (vars))
- /*    2x32, 4x16, and 8x8 Parallel ADDs
diff --git a/no-qt-in-gtk.patch b/no-qt-in-gtk.patch
new file mode 100644 (file)
index 0000000..f676ea5
--- /dev/null
@@ -0,0 +1,11 @@
+--- avidemux_2.6.4/avidemux/gtk/ADM_userInterfaces/ui_support.cpp~     2013-08-29 11:43:01.874486807 +0200
++++ avidemux_2.6.4/avidemux/gtk/ADM_userInterfaces/ui_support.cpp      2013-08-29 12:02:27.797682441 +0200
+@@ -51,7 +51,7 @@
+ const char* getNativeRendererDesc(void)
+ {
+-      return QT_TR_NOOP("GTK+");
++      return "GTK+";
+ }
+ void getMainWindowHandles(long int *handle,long int *nativeHandle)
diff --git a/types.patch b/types.patch
deleted file mode 100644 (file)
index 5b8b72c..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.h~    2008-10-01 03:03:46.000000000 +0300
-+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.h     2009-07-08 01:35:24.005463685 +0300
-@@ -3,6 +3,7 @@
- #include "ui_jobs.h"
- #include "ADM_misc.h"
-+#include <stdint.h>
- typedef enum
- {
---- avidemux_2.5.0/avidemux/ADM_core/include/ADM_misc.h~       2008-06-24 22:46:05.000000000 +0300
-+++ avidemux_2.5.0/avidemux/ADM_core/include/ADM_misc.h        2009-07-08 01:36:44.405472138 +0300
-@@ -10,6 +10,7 @@
- #define ADM_MISC_H
- #include "ADM_coreConfig.h"
-+#include <stdint.h>
- typedef struct 
This page took 0.122342 seconds and 4 git commands to generate.