Hello community, here is the log from the commit of package alsa checked in at Thu Oct 26 20:15:28 CEST 2006. -------- --- alsa/alsa.changes 2006-10-05 16:39:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/alsa/alsa.changes 2006-10-26 15:08:57.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 26 14:08:39 CEST 2006 - schwab@suse.de + +- Work around misuse of libtool. +- Fix LDFLAGS. + +------------------------------------------------------------------- Old: ---- fix-libtool.sh New: ---- alsa-lib-am.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.gDFaex/_old 2006-10-26 20:15:23.000000000 +0200 +++ /var/tmp/diff_new_pack.gDFaex/_new 2006-10-26 20:15:23.000000000 +0200 @@ -13,7 +13,7 @@ Name: alsa BuildRequires: doxygen %define package_version 1.0.13 -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/Libraries Provides: alsa-lib alsa-utils alsa-conf Requires: dialog pciutils @@ -21,7 +21,7 @@ Autoreqprov: on Summary: Advanced Linux Sound Architecture Version: 1.0.13 -Release: 7 +Release: 14 Source1: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source2: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2 # Source5: ftp://ftp.alsa-project.org/pub/oss/alsa-oss-%{package_version}.tar.bz2 @@ -29,7 +29,6 @@ Source6: udev-soundfont Source7: load-soundfont Source8: 40-alsa.rules -Source10: fix-libtool.sh Source11: alsasound Source12: sysconfig.sound Source13: joystick @@ -41,6 +40,7 @@ Source30: all_notes_off Source31: all_notes_off.bin Source32: all_notes_off.mid +Patch1: alsa-lib-am.diff # Patch1: alsa-lib-hg-fixes.diff # Patch2: alsa-utils-hg-fixes.diff # Patch3: alsa-oss-hg-fixes.diff @@ -64,7 +64,7 @@ %package devel Summary: Include Files and Libraries mandatory for Development. Group: Development/Libraries/C and C++ -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Requires: glibc-devel %{name} Obsoletes: alsadev Provides: alsadev alsa-lib-devel @@ -82,7 +82,7 @@ %package docs Summary: Additional Package Documentation. Group: Documentation/Other -License: GPL +License: GNU General Public License (GPL) - all versions %description docs This package contains optional documentation provided in addition to @@ -96,9 +96,9 @@ %prep %setup -c -n alsa -T -a 1 -a 2 -a 5 -# cd alsa-lib*/. -# %patch1 -p1 -# cd .. +cd alsa-lib*/. +%patch1 -p1 +cd .. # cd alsa-utils*/. # %patch2 -p1 # cd .. @@ -109,61 +109,29 @@ %build ALSA_ROOT=`pwd` -ALSA_ROOT_INC=$ALSA_ROOT%{_includedir} -ALSA_ROOT_LIB=$ALSA_ROOT%{_libdir} -ALSA_ROOT_ACLOCAL=$ALSA_ROOT%{_datadir}/aclocal +ALSA_ROOT_INC=$ALSA_ROOT/alsa-lib-%{package_version}/include +ALSA_ROOT_LIB=$ALSA_ROOT/alsa-lib-%{package_version}/src/.libs +ALSA_ROOT_ACLOCAL=$ALSA_ROOT/alsa-lib-%{package_version}/utils # # build alsa-lib # cd alsa-lib*/. -libtoolize --force --copy --automake -aclocal -rm -f acconfig.h -autoheader -automake --foreign --copy --add-missing -autoconf +autoreconf -fi # # needed an extra option for MIPS # %ifarch mips ARCH_CFLAGS="-mips2" %endif -# -# now, build the static library at first. -# due to a bug of libtool, we cannot build shared and static libraries -# at the same time... -# CFLAGS="$RPM_OPT_FLAGS $ARCH_CFLAGS" \ ./configure \ --libdir=%{_libdir} \ --mandir=%{_mandir} \ --datadir=%{_datadir} \ - --disable-shared \ --enable-static \ --disable-aload \ --disable-alisp make %{?jobs:-j %jobs} -# install it to save -make DESTDIR=$ALSA_ROOT install -# -# ok, then clean up and rebuild the shared library -# -make clean -CFLAGS="$RPM_OPT_FLAGS $ARCH_CFLAGS" \ -ACLOCAL=aclocal \ -./configure \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --datadir=%{_datadir} \ - --enable-shared \ - --disable-static \ - --disable-aload \ - --disable-alisp -make %{?jobs:-j %jobs} -# install it, too - will be used for compiling alsa-utils & co. -make DESTDIR=$ALSA_ROOT install -rm -f $ALSA_ROOT%{_libdir}/alsa-lib/smixer/*.la -rm -f $ALSA_ROOT%{_libdir}/alsa-lib/smixer/*.a # # run doxygen # @@ -173,12 +141,7 @@ # build alsa-utils # cd alsa-utils*/. -gettextize --force --copy --no-changelog -aclocal -I $ALSA_ROOT_ACLOCAL -rm -f acconfig.h -autoheader -automake --foreign --add-missing -autoconf +ACLOCAL="aclocal -I $ALSA_ROOT_ACLOCAL" autoreconf -fi CFLAGS="$RPM_OPT_FLAGS" ./configure \ --prefix=%{_prefix} \ --with-alsa-prefix=$ALSA_ROOT_LIB \ @@ -193,11 +156,8 @@ # build alsa-oss # cd alsa-oss*/. -libtoolize --force --copy --automake -aclocal -I $ALSA_ROOT_ACLOCAL -automake --foreign --add-missing -autoconf -export LD_LIBRARY_PATH=$ALSA_ROOT%{_libdir} +ACLOCAL="aclocal -I $ALSA_ROOT_ACLOCAL" autoreconf -fi +export LD_LIBRARY_PATH=$ALSA_ROOT_LIB CFLAGS="$RPM_OPT_FLAGS" ./configure \ --prefix=%{_prefix} \ --with-alsa-inc-prefix=$ALSA_ROOT_INC \ @@ -205,13 +165,13 @@ --libdir=%{_libdir} \ --mandir=%{_mandir} \ --datadir=%{_datadir} -sh %{SOURCE10} make %{?jobs:-j %jobs} -sh %{SOURCE10} cd .. %install ALSA_ROOT=`pwd` +ALSA_ROOT_LIB=$ALSA_ROOT/alsa-lib-%{package_version}/src/.libs +export LD_LIBRARY_PATH=$ALSA_ROOT_LIB # Create directories: # (/usr/lib for fixed all_notes_off data, %_libdir for libs) for I in %{_bindir} \ @@ -227,9 +187,7 @@ do install -m 755 -d $RPM_BUILD_ROOT$I done -# copy pre-installed libraries to the build-root -cp -af $ALSA_ROOT%{_prefix} $RPM_BUILD_ROOT -## make -C alsa-lib*/. DESTDIR=$RPM_BUILD_ROOT install +make -C alsa-lib*/. DESTDIR=$RPM_BUILD_ROOT install make -C alsa-utils*/. DESTDIR=$RPM_BUILD_ROOT install make -C alsa-oss*/. DESTDIR=$RPM_BUILD_ROOT install # @@ -301,10 +259,9 @@ %ifnarch sparc sparc64 %{rename_sysconfig_variable START_ALSA_SEQ LOAD_SEQUENCER} # fixed obsolete (wrong) variable. -if [ -f etc/sysconfig/sound ]; then - if grep -q LOAD_ALSA_SEQ etc/sysconfig/sound; then - sed -e s/LOAD_ALSA_SEQ/LOAD_SEQUENCER/g < etc/sysconfig/sound > etc/sysconfig/sound.new - mv -f etc/sysconfig/sound.new etc/sysconfig/sound +if [ -f /etc/sysconfig/sound ]; then + if grep -q LOAD_ALSA_SEQ /etc/sysconfig/sound; then + sed -i -e s/LOAD_ALSA_SEQ/LOAD_SEQUENCER/g /etc/sysconfig/sound fi fi %{fillup_and_insserv -nsy sound alsasound START_ALSA} @@ -314,11 +271,11 @@ :; else # check whether the obsolete /etc/asound.conf exists. - if [ -f etc/asound.conf ]; then - if grep -q '^soundcard(".\+") {' etc/asound.conf; then + if [ -f /etc/asound.conf ]; then + if grep -q '^soundcard(".\+") {' /etc/asound.conf; then echo "The obsolete /etc/asound.conf is found." echo "Renaming it to /etc/asound.conf.saved..." - mv -f etc/asound.conf etc/asound.conf.saved + mv -f /etc/asound.conf /etc/asound.conf.saved fi fi fi @@ -381,6 +338,9 @@ %doc alsa-lib*/doc/doxygen/html/* %changelog -n alsa +* Thu Oct 26 2006 - schwab@suse.de +- Work around misuse of libtool. +- Fix LDFLAGS. * Thu Oct 05 2006 - tiwai@suse.de - updated to ALSA 1.0.13-final: * all patches have been merged @@ -498,7 +458,7 @@ - fix bugs in drain with PCM rate plugin (taken from upstream). * Fri Mar 03 2006 - tiwai@suse.de - Fix from upstream: fix the return value to -ENODEV from --ENOTTY in alsa-lib functions when the device is + -ENOTTY in alsa-lib functions when the device is disconnected. * Thu Mar 02 2006 - tiwai@suse.de - fix segfault with PCM rate plugin (ALSA bug#1878) @@ -557,9 +517,9 @@ - removed RPM_BUILD_ROOT cleanup from %%install * Thu Oct 27 2005 - tiwai@suse.de - Update to CVS 2005.10.27. -- fixed PCM mmap mode with plugins. -- optimize / improve aoss wrapper. -- improve aplay/arecord option parsing. + - fixed PCM mmap mode with plugins. + - optimize / improve aoss wrapper. + - improve aplay/arecord option parsing. - Fix alsasound init script. * Wed Oct 12 2005 - tiwai@suse.de - updated to version 1.0.10rc2. @@ -568,9 +528,9 @@ - Mute volume at shutdown (#117277) * Wed Sep 14 2005 - tiwai@suse.de - Fix bugs of dmix on big-endian architectures (#117048) -- Fix the argument of semctl() with union. -- Fix the mixing code, accepts both endians. -- Fix alsa-lib configurations. + - Fix the argument of semctl() with union. + - Fix the mixing code, accepts both endians. + - Fix alsa-lib configurations. - Fix hwcfg file name generated by alsaconf (#117046). * Mon Sep 12 2005 - tiwai@suse.de - Fix the error with chown() in direct plugins when the user @@ -673,9 +633,9 @@ - updated alsasound.usermap. * Fri Feb 18 2005 - tiwai@suse.de - CVS patch 20050218: -- fix speaker-tools -- fix the weight of Side mixer elements -- use softvol as default for VIA823/8237 + - fix speaker-tools + - fix the weight of Side mixer elements + - use softvol as default for VIA823/8237 - fixed resmgr support (a typo in configure options). * Wed Feb 16 2005 - tiwai@suse.de - fixed amidi command options. @@ -683,27 +643,27 @@ - fixed the path of resmgr. * Mon Feb 14 2005 - tiwai@suse.de - CVS patch 20050214: -- disable access to /dev/aload* -- external filter-plugin SDK -- dl-object cache + - disable access to /dev/aload* + - external filter-plugin SDK + - dl-object cache - Initialize hardware via hotplug/udev alsactl, etc are called in dev.d/* scripts * Fri Feb 11 2005 - tiwai@suse.de - CVS patch 20050211: -- fixed resmgr support, enable it as default -- external PCM I/O plugin support + - fixed resmgr support, enable it as default + - external PCM I/O plugin support * Fri Feb 04 2005 - tiwai@suse.de - CVS patch 20050204: -- fixed segfaults with mixer event handling. + - fixed segfaults with mixer event handling. * Wed Feb 02 2005 - tiwai@suse.de - CVS patch 20050202: -- fixed function-in-function -- fixed exit code of alsa-utils programs + - fixed function-in-function + - fixed exit code of alsa-utils programs * Thu Jan 27 2005 - tiwai@suse.de - CVS patch 20050127: -- dmix and dsnoop for default PCMs on many chips -- pcm link fix -- resmgr support (not enabled yet, waiting for fix in udev) + - dmix and dsnoop for default PCMs on many chips + - pcm link fix + - resmgr support (not enabled yet, waiting for fix in udev) * Tue Jan 18 2005 - tiwai@suse.de - include fixes for alsa-lib and alsa-utils from CVS. * Thu Jan 13 2005 - tiwai@suse.de ++++++ alsa-lib-am.diff ++++++ --- alsa-lib-1.0.13/src/Makefile.am +++ alsa-lib-1.0.13/src/Makefile.am @@ -43,8 +43,7 @@ SUBDIRS += compat conf libasound_la_LIBADD += compat/libcompat.la -lm -ldl -lpthread -libasound_la_LDFLAGS = -version-info $(COMPATNUM) -AM_LDFLAGS = $(VSYMS) +libasound_la_LDFLAGS = $(VSYMS) -version-info $(COMPATNUM) control/libcontrol.la: $(MAKE) -C control libcontrol.la ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠suse.de