Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv32157
Modified Files:
libspeex1.info
Log Message:
unhide unversioned dylibs
Index: libspeex1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libspeex1.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libspeex1.info 3 Aug 2010 22:15:46 -0000 1.1
+++ libspeex1.info 13 Sep 2011 01:15:23 -0000 1.2
@@ -1,6 +1,6 @@
Package: libspeex1
Version: 1.2
-Revision: 0.0rc1.3
+Revision: 0.0rc1.4
###
Depends: %N-shlibs (= %v-%r), dpkg-base-files
BuildDepends: libogg (>= 1.1.3-1)
@@ -21,7 +21,16 @@
###
DocFiles: COPYING ChangeLog
###
-ConfigureParams: --enable-epic-48k --enable-ogg=yes --with-ogg-dir=%p
--with-pic --enable-shared --disable-static --libdir=%p/lib/%N/lib
--docdir=%p/share/doc/%N
+ConfigureParams: <<
+ --enable-epic-48k \
+ --enable-ogg=yes \
+ --with-ogg-dir=%p \
+ --with-pic \
+ --enable-shared \
+ --disable-static \
+ --libdir=%p/lib/%N/lib \
+ --docdir=%p/share/doc/%N
+<<
#--infodir=%p/lib/%N/share/info
#--datarootdir=%p/lib/%N/share
#--includedir=%p/lib/%N/include
@@ -29,10 +38,15 @@
#--bindir=%p/lib/%N/bin
###
InstallScript: <<
- /usr/bin/make -w install DESTDIR=%d
+ /usr/bin/make -j1 -w install DESTDIR=%d
/bin/mkdir -p %i/lib/pkgconfig
+ ### unhide the .pc files
/bin/ln -s %p/lib/%N/lib/pkgconfig/speex.pc %i/lib/pkgconfig/speex.pc
/bin/ln -s %p/lib/%N/lib/pkgconfig/speexdsp.pc
%i/lib/pkgconfig/speexdsp.pc
+ ### unhide the unversioned dylibs
+ /bin/ln -s %p/lib/%N/lib/libspeex.dylib %i/lib/libspeex.dylib
+ /bin/ln -s %p/lib/%N/lib/libspeexdsp.dylib %i/lib/libspeexdsp.dylib
+
<<
Splitoff: <<
Package: %N-shlibs
@@ -67,6 +81,8 @@
<<
DescPackaging: <<
Beginning with speex-1.2beta3, upstream offloaded all the non-codec components
(preprocessor, echo cancellation, jitter buffer) to libspeexdsp.1.dylib, but
did not bump the install_name for libspeex.1.dylib. Since this creates an ABI
conflict with the previous Fink speex3-1.1.6 package, the package for 1.2beta3+
was renamed libspeex1 and the libraries were moved to %p/lib/%N/lib to avoid
filename collisions. The headers, autotools, and pkgconfig files were kept in
the usual locations. Packages that BuildDepends on libspeex1 might need to add
-L%p/lib/libspeex1/lib to their linker command (via LDFLAGS or LIBS or similar
method).
+
+As of %r = 0.0rc1.4, both the unversioned dylib and the .pc files are placed
in the standard locations and should not need any special flags to find and
link to libspeex. Although the existing Conflicts/Replaces should prevent
mislinking, packages should explicitly BuildDepends against this version to
remove any chance of linking against speex3.
<<
###
License: LGPL
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the
BlackBerry® mobile platform with sessions, labs & more.
See new tools and technologies. Register for BlackBerry® DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
