[patch] transcode-0.6.14-r2-lqt-quicktime.patch

transcode-0.6.14-r2-lqt-quicktime.patch (text/plain), 8.93 KB, created by dswhite42 on 2005-05-30 12:29:16 UTC

diff -urN transcode-0.6.14.orig/configure transcode-0.6.14/configure
--- transcode-0.6.14.orig/configure	2004-11-15 23:46:34.000000000 -0500
+++ transcode-0.6.14/configure	2005-05-30 14:59:41.000000000 -0400
@@ -33443,7 +33443,7 @@
   LIBQUICKTIME_EXTRA_CFLAGS="$LIBQUICKTIME_EXTRA_CFLAGS $xi"
   LIBQUICKTIME_EXTRA_CFLAGS=`echo $LIBQUICKTIME_EXTRA_CFLAGS | sed -e 's/  */ /g'`
 
-  if test x"quicktime/lqt.h" != x"" ; then
+  if test x"lqt/lqt.h" != x"" ; then
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -33453,8 +33453,8 @@
     save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $libquicktime_ii"
     if test "${ac_cv_header_quicktime_lqt_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for quicktime/lqt.h" >&5
-echo $ECHO_N "checking for quicktime/lqt.h... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking for lqt/lqt.h" >&5
+echo $ECHO_N "checking for lqt/lqt.h... $ECHO_C" >&6
 if test "${ac_cv_header_quicktime_lqt_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
@@ -33462,8 +33462,8 @@
 echo "${ECHO_T}$ac_cv_header_quicktime_lqt_h" >&6
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking quicktime/lqt.h usability" >&5
-echo $ECHO_N "checking quicktime/lqt.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking lqt/lqt.h usability" >&5
+echo $ECHO_N "checking lqt/lqt.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -33471,7 +33471,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <quicktime/lqt.h>
+#include <lqt/lqt.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -33507,15 +33507,15 @@
 echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-echo "$as_me:$LINENO: checking quicktime/lqt.h presence" >&5
-echo $ECHO_N "checking quicktime/lqt.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking lqt/lqt.h presence" >&5
+echo $ECHO_N "checking lqt/lqt.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <quicktime/lqt.h>
+#include <lqt/lqt.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -33549,25 +33549,25 @@
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: quicktime/lqt.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: quicktime/lqt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: quicktime/lqt.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: quicktime/lqt.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: lqt/lqt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: lqt/lqt.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: quicktime/lqt.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: quicktime/lqt.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: quicktime/lqt.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: quicktime/lqt.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: quicktime/lqt.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: quicktime/lqt.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: quicktime/lqt.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: quicktime/lqt.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: quicktime/lqt.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: quicktime/lqt.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: quicktime/lqt.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: quicktime/lqt.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: lqt/lqt.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: lqt/lqt.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: lqt/lqt.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: lqt/lqt.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: lqt/lqt.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: lqt/lqt.h: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
 ## ------------------------------------ ##
@@ -33578,8 +33578,8 @@
       sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for quicktime/lqt.h" >&5
-echo $ECHO_N "checking for quicktime/lqt.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for lqt/lqt.h" >&5
+echo $ECHO_N "checking for lqt/lqt.h... $ECHO_C" >&6
 if test "${ac_cv_header_quicktime_lqt_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -33592,8 +33592,8 @@
 if test $ac_cv_header_quicktime_lqt_h = yes; then
   LIBQUICKTIME_CFLAGS="$libquicktime_ii"
 else
-  { { echo "$as_me:$LINENO: error: libquicktime requested, but cannot compile quicktime/lqt.h" >&5
-echo "$as_me: error: libquicktime requested, but cannot compile quicktime/lqt.h" >&2;}
+  { { echo "$as_me:$LINENO: error: libquicktime requested, but cannot compile lqt/lqt.h" >&5
+echo "$as_me: error: libquicktime requested, but cannot compile lqt/lqt.h" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
diff -urN transcode-0.6.14.orig/configure.in transcode-0.6.14/configure.in
--- transcode-0.6.14.orig/configure.in	2005-05-30 14:54:22.000000000 -0400
+++ transcode-0.6.14/configure.in	2005-05-30 14:59:43.000000000 -0400
@@ -955,7 +955,7 @@
 dnl
 LIBQUICKTIME_EXTRA_LIBS="$LIBQUICKTIME_EXTRA_LIBS -lpng -lz $PTHREAD_LIBS -lm $LIBDV_LIBS"
 TC_PATH_PKG(libquicktime, no, LIBQUICKTIME, libquicktime, lqt-config,
-  [C], [quicktime/lqt.h], quicktime, quicktime_open)
+  [C], [lqt/lqt.h], quicktime, quicktime_open)
 if test x"$have_libquicktime" = x"yes" ; then
   AC_DEFINE([HAVE_LIBQUICKTIME], 1, [have libquicktime support])
   AC_CHECK_LIB(quicktime, lqt_encode_video,
diff -urN transcode-0.6.14.orig/export/export_mov.c transcode-0.6.14/export/export_mov.c
--- transcode-0.6.14.orig/export/export_mov.c	2005-05-30 14:54:22.000000000 -0400
+++ transcode-0.6.14/export/export_mov.c	2005-05-30 14:59:49.000000000 -0400
@@ -50,9 +50,9 @@
 #define MOD_PRE mov
 #include "export_def.h"
 
-#include <quicktime/quicktime.h>
-#include <quicktime/colormodels.h>
-#include <quicktime/lqt.h>
+#include <lqt/quicktime.h>
+#include <lqt/colormodels.h>
+#include <lqt/lqt.h>
 
 #define QT_LIST_AUDIO "audio codec"
 #define QT_LIST_VIDEO "video codec"
diff -urN transcode-0.6.14.orig/import/decode_mov.c transcode-0.6.14/import/decode_mov.c
--- transcode-0.6.14.orig/import/decode_mov.c	2005-05-30 14:54:22.000000000 -0400
+++ transcode-0.6.14/import/decode_mov.c	2005-05-30 15:00:00.000000000 -0400
@@ -31,7 +31,7 @@
 #include "config.h"
 
 #ifdef HAVE_LIBQUICKTIME
-#include <quicktime/quicktime.h>
+#include <lqt/quicktime.h>
 #endif
 
 #include "transcode.h"
diff -urN transcode-0.6.14.orig/import/import_mov.c transcode-0.6.14/import/import_mov.c
--- transcode-0.6.14.orig/import/import_mov.c	2005-05-30 14:54:22.000000000 -0400
+++ transcode-0.6.14/import/import_mov.c	2005-05-30 14:59:54.000000000 -0400
@@ -26,9 +26,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <quicktime/quicktime.h>
-#include <quicktime/colormodels.h>
-#include <quicktime/lqt.h>
+#include <lqt/quicktime.h>
+#include <lqt/colormodels.h>
+#include <lqt/lqt.h>
 #include "transcode.h"
 #include "magic.h"
 
diff -urN transcode-0.6.14.orig/import/probe_mov.c transcode-0.6.14/import/probe_mov.c
--- transcode-0.6.14.orig/import/probe_mov.c	2004-11-02 22:45:43.000000000 -0500
+++ transcode-0.6.14/import/probe_mov.c	2005-05-30 14:59:58.000000000 -0400
@@ -28,7 +28,7 @@
 
 extern int binary_dump;
 
-#include <quicktime/quicktime.h>
+#include <lqt/quicktime.h>
 
 void probe_mov(info_t *ipipe)
 {