Hello community,
here is the log from the commit of package alsa-tools
checked in at Tue Jun 5 00:44:43 CEST 2007.
--------
--- alsa-tools/alsa-tools.changes 2007-03-14 16:48:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/alsa-tools/alsa-tools.changes 2007-06-04 15:33:34.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jun 4 15:32:53 CEST 2007 - tiwai@suse.de
+
+- updated to version 1.0.14:
+ * misc fixes for qlo10k1 for 64bit archs.
+
+-------------------------------------------------------------------
Old:
----
alsa-tools-1.0.14rc3.tar.bz2
New:
----
alsa-tools-1.0.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa-tools.spec ++++++
--- /var/tmp/diff_new_pack.l22576/_old 2007-06-05 00:44:15.000000000 +0200
+++ /var/tmp/diff_new_pack.l22576/_new 2007-06-05 00:44:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package alsa-tools (Version 1.0.13)
+# spec file for package alsa-tools (Version 1.0.14)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,11 +12,11 @@
Name: alsa-tools
BuildRequires: alsa-devel fltk-devel gcc-c++ gtk2-devel update-desktop-files
-%define package_version 1.0.14rc3
+%define package_version 1.0.14
URL: http://www.alsa-project.org/
Summary: Various ALSA Tools
-Version: 1.0.13
-Release: 35
+Version: 1.0.14
+Release: 1
License: GNU General Public License (GPL)
Group: Productivity/Multimedia/Sound/Utilities
Autoreqprov: on
@@ -62,7 +62,7 @@
Martin Langer
%prep
-%setup -a 2 -n %{name}-%{package_version}
+%setup -q -a 2 -n %{name}-%{package_version}
cp %{SOURCE1} .
%patch
# %patch1 -p1
@@ -169,6 +169,9 @@
%{_datadir}/pixmaps/*
%changelog
+* Mon Jun 04 2007 - tiwai@suse.de
+- updated to version 1.0.14:
+ * misc fixes for qlo10k1 for 64bit archs.
* Wed Mar 14 2007 - tiwai@suse.de
- update to version 1.0.14rc3:
* us428control bumped up to 0.4.6
++++++ alsa-tools-1.0.14rc3.tar.bz2 -> alsa-tools-1.0.14.tar.bz2 ++++++
++++ 121506 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-tools-1.0.14rc3/ac3dec/config.h.in new/alsa-tools-1.0.14/ac3dec/config.h.in
--- old/alsa-tools-1.0.14rc3/ac3dec/config.h.in 2007-02-26 10:24:25.000000000 +0100
+++ new/alsa-tools-1.0.14/ac3dec/config.h.in 2007-06-04 13:27:27.000000000 +0200
@@ -1,8 +1,35 @@
/* config.h.in. Generated from configure.in by autoheader. */
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
/* Define to 1 if you have the `asound' library (-lasound). */
#undef HAVE_LIBASOUND
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
/* Name of package */
#undef PACKAGE
@@ -21,6 +48,9 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Version number of package */
#undef VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-tools-1.0.14rc3/ld10k1/contrib/emu10k1MIDIEffects/Makefile new/alsa-tools-1.0.14/ld10k1/contrib/emu10k1MIDIEffects/Makefile
--- old/alsa-tools-1.0.14rc3/ld10k1/contrib/emu10k1MIDIEffects/Makefile 2007-02-26 10:36:14.000000000 +0100
+++ new/alsa-tools-1.0.14/ld10k1/contrib/emu10k1MIDIEffects/Makefile 2007-06-04 13:29:43.000000000 +0200
@@ -34,8 +34,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i686-suse-linux
-host_triplet = i686-suse-linux
+build_triplet = x86_64-suse-linux-gnu
+host_triplet = x86_64-suse-linux-gnu
subdir = contrib/emu10k1MIDIEffects
DIST_COMMON = $(dist_effects_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
@@ -86,10 +86,11 @@
ECHO_C =
ECHO_N = -n
ECHO_T =
-EGREP = grep -E
+EGREP = /usr/bin/grep -E
EXEEXT =
F77 =
FFLAGS =
+GREP = /usr/bin/grep
HAVE_AS10K1_FALSE = #
HAVE_AS10K1_TRUE =
INSTALL_DATA = ${INSTALL} -m 644
@@ -121,12 +122,9 @@
SHELL = /bin/sh
STRIP = strip
VERSION = 0.1.8p1
-ac_ct_AR = ar
ac_ct_CC = gcc
ac_ct_CXX = g++
ac_ct_F77 =
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
am__fastdepCC_FALSE = #
am__fastdepCC_TRUE =
am__fastdepCXX_FALSE = #
@@ -137,30 +135,37 @@
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = i686-suse-linux
+build = x86_64-suse-linux-gnu
build_alias =
-build_cpu = i686
-build_os = linux
+build_cpu = x86_64
+build_os = linux-gnu
build_vendor = suse
-datadir = ${prefix}/share
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE}
+dvidir = ${docdir}
effectsdir = $(pkgdatadir)/effects
exec_prefix = ${prefix}
-host = i686-suse-linux
+host = x86_64-suse-linux-gnu
host_alias =
-host_cpu = i686
-host_os = linux
+host_cpu = x86_64
+host_os = linux-gnu
host_vendor = suse
+htmldir = ${docdir}
includedir = ${prefix}/include
-infodir = ${prefix}/info
+infodir = ${datarootdir}/info
install_sh = /home/alsa/tmp/cvs/alsa-tools/ld10k1/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
+localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
-mandir = ${prefix}/man
+mandir = ${datarootdir}/man
mkdir_p = mkdir -p --
oldincludedir = /usr/include
+pdfdir = ${docdir}
prefix = /usr/local
program_transform_name = s,x,x,
+psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
sysconfdir = ${prefix}/etc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-tools-1.0.14rc3/qlo10k1/acinclude.m4 new/alsa-tools-1.0.14/qlo10k1/acinclude.m4
--- old/alsa-tools-1.0.14rc3/qlo10k1/acinclude.m4 2007-02-26 10:24:15.000000000 +0100
+++ new/alsa-tools-1.0.14/qlo10k1/acinclude.m4 2007-06-04 13:27:26.000000000 +0200
@@ -8,7 +8,7 @@
AC_ARG_WITH([qtdir], [ --with-qtdir=DIR Qt installation directory [default=$QTDIR]], QTDIR=$withval)
# Check that QTDIR is defined or that --with-qtdir given
if test x"$QTDIR" = x ; then
- QT_SEARCH="/usr/lib/qt31 /usr/local/qt31 /usr/lib/qt3 /usr/local/qt3 /usr/lib/qt2 /usr/local/qt2 /usr/lib/qt /usr/local/qt"
+ QT_SEARCH="/usr/lib64/qt31 /usr/local/lib64/qt31 /usr/lib64/qt3 /usr/local/qt64/qt3 /usr/lib/qt31 /usr/local/qt31 /usr/lib/qt3 /usr/local/qt3 /usr/lib/qt2 /usr/local/qt2 /usr/lib/qt /usr/local/qt"
for i in $QT_SEARCH; do
if test -f $i/include/qglobal.h -a x$QTDIR = x; then QTDIR=$i; fi
done
@@ -62,6 +62,7 @@
QT_CXXFLAGS="-I$QTDIR/include"
QT_IS_EMBEDDED="no"
+QT_LIB_DIR="lib"
# On unix, figure out if we're doing a static or dynamic link
case "${host}" in
*-cygwin)
@@ -94,22 +95,26 @@
fi
if test x$QT_IS_STATIC = xno ; then
QT_IS_DYNAMIC=`ls $QTDIR/lib/*.so 2> /dev/null`
- if test "x$QT_IS_DYNAMIC" = x; then
+ QT_IS_DYNAMIC64=`ls $QTDIR/lib64/*.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
+ if test "x$QT_IS_DYNAMIC64" != x; then
+ QT_LIB_DIR="lib64"
+ fi
fi
- if test "x`ls $QTDIR/lib/libqt.{a,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/lib/libqt-mt.{a,so} 2> /dev/null`" != x ; then
+ elif test "x`ls $QTDIR/$QT_LIB_DIR/libqt-mt.{a,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/$QT_LIB_DIR/libqte.{a,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/$QT_LIB_DIR/libqte-mt.{a,so} 2> /dev/null`" != x ; then
QT_LIB="-lqte-mt"
QT_IS_MT="yes"
QT_IS_EMBEDDED="yes"
@@ -195,7 +200,7 @@
QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT"
fi
-QT_LDADD="-L$QTDIR/lib $QT_LIBS"
+QT_LDADD="-L$QTDIR/$QT_LIB_DIR $QT_LIBS"
if test x$QT_IS_STATIC = xyes ; then
OLDLIBS="$LIBS"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org