- merged from DEVEL

Changed files:
    avidemux-autoconf.patch -> 1.4
    avidemux-dts_internal.patch -> 1.2

diff --git a/avidemux-autoconf.patch b/avidemux-autoconf.patch
index 98da5cf7a6fa3698c27c56cfe4cc6f980d71b398..0264fbca89087cb474ea6e9639c4e6567459b76f 100644 (file)
--- a/avidemux-autoconf.patch
+++ b/avidemux-autoconf.patch
@@ -40,7 +40,7 @@ diff -urN avidemux-2.1.2.org/admin/detect-autoconf.sh.orig avidemux-2.1.2/admin/
 diff -urN avidemux-2.1.2.org/configure.in avidemux-2.1.2/configure.in
 --- avidemux-2.1.2.org/configure.in.in 2006-03-01 22:33:35.000000000 +0100
 +++ avidemux-2.1.2/configure.in.in     2007-01-04 17:20:59.936783750 +0100
-@@ -37,9 +37,14 @@
+@@ -37,9 +37,15 @@
  
  dnl Perform program name transformation
  AC_ARG_PROGRAM
@@ -48,21 +48,14 @@ diff -urN avidemux-2.1.2.org/configure.in avidemux-2.1.2/configure.in
 +AC_GNU_SOURCE
 +
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(avidemux,2.1.2)
- 
+ AM_INIT_AUTOMAKE(avidemux,"2.3.0")
+ ADM_SUBVERSION="0"
++
 +AM_PROG_AS
 +
  dnl almost the same like KDE_SET_PEFIX but the path is /usr/local
  dnl
  unset CDPATH
-@@ -54,7 +59,6 @@
- dnl
- AM_CONFIG_HEADER(config.h)
- 
--
- dnl create only shared libtool-libraries
- AC_ENABLE_SHARED(no)
- 
 @@ -79,7 +83,7 @@
  
  CPPFLAGS="  $USER_INCLUDES  $CPPFLAGS"

diff --git a/avidemux-dts_internal.patch b/avidemux-dts_internal.patch
new file mode 100644 (file)
index 0000000..eaed28d
--- /dev/null
+++ b/avidemux-dts_internal.patch
@@ -0,0 +1,26 @@
+--- avidemux/ADM_audiocodec/ADM_dca.cpp        2006-08-15 13:45:12.000000000 +0200
++++ avidemux/ADM_audiocodec/ADM_dca.cpp-new    2006-09-27 14:25:20.680376840 +0200
+@@ -32,7 +32,6 @@
+ extern "C"
+ {
+ #include "dts.h"
+-#include "dts_internal.h"
+ 
+ }
+ #include "ADM_audio/ADM_dcainfo.h"
+--- configure.in.in    2006-09-21 19:51:13.000000000 +0200
++++ configure.in.in-new        2006-09-27 14:27:00.529197512 +0200
+@@ -585,12 +585,7 @@
+     have_libdca=yes
+     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
+-            AC_CHECK_LIB( dts, dts_init, , have_libdca=no )
+-      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
+             AC_DEFINE(USE_LIBDCA, 1, "[libDCA]")