This commit was manufactured by cvs2git to create branch 'AVIDEMUX_2_5_2'.

Sprout from master 2011-03-29 07:10:50 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- release 8'
Delete:
    avidemux-autoconf.patch
    avidemux-dts_internal.patch
    avidemux-sparc64.patch

diff --git a/avidemux-autoconf.patch b/avidemux-autoconf.patch
deleted file mode 100644 (file)
index 8845169..0000000
--- a/avidemux-autoconf.patch
+++ /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
--- a/avidemux-dts_internal.patch
+++ /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

diff --git a/avidemux-sparc64.patch b/avidemux-sparc64.patch
deleted file mode 100644 (file)
index 82e20bb..0000000
--- a/avidemux-sparc64.patch
+++ /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;