- update name, comment

[packages/avidemux.git] / avidemux-autoconf.patch

diff --git a/avidemux-autoconf.patch b/avidemux-autoconf.patch
index e18bf12edeebb8c804a3a02361db4a7614fc9873..884516934817d5e7c5bcc8e42a88b3fa48f66093 100644 (file)
--- a/avidemux-autoconf.patch
+++ b/avidemux-autoconf.patch
@@ -1,7 +1,8 @@
---- avidemux-2.0.22/admin/detect-autoconf.sh-oryg      2004-01-30 20:29:34.000000000 +0100
-+++ avidemux-2.0.22/admin/detect-autoconf.sh   2004-03-06 23:56:20.897642888 +0100
-@@ -19,16 +19,16 @@
-     AUTOCONF="`$WHICH autoconf-2.53`"
+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
@@ -22,7 +23,7 @@
    elif test -x "`$WHICH autoheader-2.53`" ; then
      AUTOHEADER="`$WHICH autoheader-2.53`"
      AUTOM4TE="`$WHICH autom4te-2.53`"
-@@ -42,9 +42,9 @@
+@@ -47,9 +47,9 @@
  checkAutomakeAclocal ()
  {
    if test -z "$UNSERMAKE"; then
@@ -35,3 +36,32 @@
      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"
+     ;;