SOURCES: alsa-tools-sh.patch - updated for 1.0.14
qboosh
qboosh at pld-linux.org
Tue Jun 12 19:41:52 CEST 2007
Author: qboosh Date: Tue Jun 12 17:41:52 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.0.14
---- Files affected:
SOURCES:
alsa-tools-sh.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/alsa-tools-sh.patch
diff -u SOURCES/alsa-tools-sh.patch:1.1 SOURCES/alsa-tools-sh.patch:1.2
--- SOURCES/alsa-tools-sh.patch:1.1 Thu Aug 24 00:22:43 2006
+++ SOURCES/alsa-tools-sh.patch Tue Jun 12 19:41:47 2007
@@ -1,6 +1,6 @@
---- alsa-tools-1.0.11.orig/qlo10k1/acinclude.m4 2005-05-17 18:12:50.000000000 +0200
-+++ alsa-tools-1.0.11/qlo10k1/acinclude.m4 2006-08-24 00:07:33.000000000 +0200
-@@ -86,30 +86,30 @@
+--- alsa-tools-1.0.14/qlo10k1/acinclude.m4.orig 2007-06-04 13:27:26.000000000 +0200
++++ alsa-tools-1.0.14/qlo10k1/acinclude.m4 2007-06-12 19:21:29.646711775 +0200
+@@ -87,15 +87,15 @@
;;
*)
@@ -13,27 +13,33 @@
fi
if test x$QT_IS_STATIC = xno ; then
- QT_IS_DYNAMIC=`ls $QTDIR/lib/*.so 2> /dev/null`
+- QT_IS_DYNAMIC64=`ls $QTDIR/lib64/*.so 2> /dev/null`
+ QT_IS_DYNAMIC=`ls $QTDIR/lib/libqt*.so 2> /dev/null`
- if test "x$QT_IS_DYNAMIC" = x; then
++ QT_IS_DYNAMIC64=`ls $QTDIR/lib64/libqt*.so 2> /dev/null`
+ if test "x$QT_IS_DYNAMIC" = x && test "x$QT_IS_DYNAMIC64" = x; then
AC_MSG_ERROR([*** Couldn't find any Qt libraries])
fi
+@@ -104,17 +104,17 @@
+ fi
fi
-- if test "x`ls $QTDIR/lib/libqt.{a,so} 2> /dev/null`" != x ; then
-+ if test "x`ls $QTDIR/lib/libqt.so 2> /dev/null`" != x ; then
- QT_LIB="-lqt"
- QT_IS_MT="no"
-- elif test "x`ls $QTDIR/lib/libqt-mt.{a,so} 2> /dev/null`" != x ; then
-+ elif test "x`ls $QTDIR/lib/libqt-mt.so 2> /dev/null`" != x ; then
+- if test "x`ls $QTDIR/$QT_LIB_DIR/libqt.{a,so} 2> /dev/null`" != x ; then
+- QT_LIB="-lqt"
+- QT_IS_MT="no"
+- elif test "x`ls $QTDIR/$QT_LIB_DIR/libqt-mt.{a,so} 2> /dev/null`" != x ; then
++ if test "x`ls $QTDIR/$QT_LIB_DIR/libqt-mt.so 2> /dev/null`" != x ; then
QT_LIB="-lqt-mt"
QT_IS_MT="yes"
-- elif test "x`ls $QTDIR/lib/libqte.{a,so} 2> /dev/null`" != x ; then
-+ elif test "x`ls $QTDIR/lib/libqte.so 2> /dev/null`" != x ; then
+- elif test "x`ls $QTDIR/$QT_LIB_DIR/libqte.{a,so} 2> /dev/null`" != x ; then
++ elif test "x`ls $QTDIR/$QT_LIB_DIR/libqt.so 2> /dev/null`" != x ; then
++ QT_LIB="-lqt"
++ QT_IS_MT="no"
++ elif test "x`ls $QTDIR/$QT_LIB_DIR/libqte.so 2> /dev/null`" != x ; then
QT_LIB="-lqte"
QT_IS_MT="no"
QT_IS_EMBEDDED="yes"
-- elif test "x`ls $QTDIR/lib/libqte-mt.{a,so} 2> /dev/null`" != x ; then
-+ elif test "x`ls $QTDIR/lib/libqte-mt.so 2> /dev/null`" != x ; then
+- elif test "x`ls $QTDIR/$QT_LIB_DIR/libqte-mt.{a,so} 2> /dev/null`" != x ; then
++ elif test "x`ls $QTDIR/$QT_LIB_DIR/libqte-mt.so 2> /dev/null`" != x ; then
QT_LIB="-lqte-mt"
QT_IS_MT="yes"
QT_IS_EMBEDDED="yes"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/alsa-tools-sh.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list