commit alsa

30 Oct 2006

Hello community,

here is the log from the commit of package alsa
checked in at Mon Oct 30 17:52:33 CET 2006.

--------

--- alsa/alsa.changes	2006-10-26 15:08:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/alsa/alsa.changes	2006-10-30 17:12:11.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Oct 30 17:12:01 CET 2006 - schwab@suse.de
+
+- Revert part of last change.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ alsa.spec ++++++
--- /var/tmp/diff_new_pack.ZLkPts/_old	2006-10-30 17:51:05.000000000 +0100
+++ /var/tmp/diff_new_pack.ZLkPts/_new	2006-10-30 17:51:05.000000000 +0100
@@ -21,7 +21,7 @@
 Autoreqprov:    on
 Summary:        Advanced Linux Sound Architecture
 Version:        1.0.13
-Release:        14
+Release:        15
 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
@@ -123,15 +123,37 @@
 %ifarch mips
 ARCH_CFLAGS="-mips2"
 %endif
+#
+# now, build the static library at first.
+# due to gratuitous use of #ifdef PIC, 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" \
+./configure \
+  --libdir=%{_libdir} \
+  --mandir=%{_mandir} \
+  --datadir=%{_datadir} \
+  --enable-shared \
+  --disable-static \
+  --disable-aload \
+  --disable-alisp
+make %{?jobs:-j %jobs}
 #
 # run doxygen
 #
@@ -188,6 +210,10 @@
   install -m 755 -d $RPM_BUILD_ROOT$I
 done
 make -C alsa-lib*/. DESTDIR=$RPM_BUILD_ROOT install
+find $ALSA_ROOT%{_libdir} -name "*.a" -printf "%{_libdir}/%%P\n" |
+  while read L; do cp $ALSA_ROOT$L $RPM_BUILD_ROOT$L; done
+rm -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/smixer/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/smixer/*.la
 make -C alsa-utils*/. DESTDIR=$RPM_BUILD_ROOT install
 make -C alsa-oss*/. DESTDIR=$RPM_BUILD_ROOT install
 #
@@ -338,6 +364,8 @@
 %doc alsa-lib*/doc/doxygen/html/*
 
 %changelog -n alsa
+* Mon Oct 30 2006 - schwab@suse.de
+- Revert part of last change.
 * Thu Oct 26 2006 - schwab@suse.de
 - Work around misuse of libtool.
 - Fix LDFLAGS.
















++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠suse.de

tags

participants (1)