Author: sls Date: Sat Jan 6 20:41:24 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SOURCES:
avidemux-dts_internal.patch (1.1 -> 1.2) (NEW), avidemux-autoconf.patch
(1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/avidemux-dts_internal.patch
diff -u /dev/null SOURCES/avidemux-dts_internal.patch:1.2
--- /dev/null Sat Jan 6 21:41:24 2007
+++ SOURCES/avidemux-dts_internal.patch Sat Jan 6 21:41:19 2007
@@ -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]")
================================================================
Index: SOURCES/avidemux-autoconf.patch
diff -u SOURCES/avidemux-autoconf.patch:1.3 SOURCES/avidemux-autoconf.patch:1.4
--- SOURCES/avidemux-autoconf.patch:1.3 Thu Jan 4 17:31:08 2007
+++ SOURCES/avidemux-autoconf.patch Sat Jan 6 21:41:19 2007
@@ -40,7 +40,7 @@
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 @@
+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"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/avidemux-autoconf.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
