adding shared lib generation, thanks to loki_val and solar

Package-Manager: portage-2.1.6.7/cvs/Linux ppc

4 files changed, 66 insertions, 9 deletions

diff --git a/net-libs/libsrtp/ChangeLog b/net-libs/libsrtp/ChangeLog
index dcf984c9982a..4e91a0fc15bc 100644
--- a/net-libs/libsrtp/ChangeLog
+++ b/net-libs/libsrtp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libsrtp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsrtp/ChangeLog,v 1.1 2009/04/14 00:45:27 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsrtp/ChangeLog,v 1.2 2009/04/15 04:17:53 volkmar Exp $
+
+*libsrtp-1.4.4-r1 (15 Apr 2009)
+
+  15 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
+  +files/libsrtp-1.4.4-shared.patch, -libsrtp-1.4.4.ebuild,
+  +libsrtp-1.4.4-r1.ebuild:
+	Adding shared lib generation with loki_val patch. Thanks also to solar.
 
 *libsrtp-1.4.4 (14 Apr 2009)
 
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 0733febdb0ad..0332b43f0b4c 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -1,4 +1,5 @@
+AUX libsrtp-1.4.4-shared.patch 1432 RMD160 ffd6084ea90a6cb2859c624fc865e789ae7b9f81 SHA1 2eabbcd1f8c6e0016f894a354573a0a9961945f3 SHA256 b37b37c556cd6c845a07a1e99edae17cb1446ead45a770041f427191e84bf06e
 DIST srtp-1.4.4.tgz 502890 RMD160 64e58a3fc2cc30a8d7cba6b6ce59f807649d9dee SHA1 299c6cfe0c9d6f1804bc5921cfbdb6a6bc76a521 SHA256 d9c2cbb1c95172ed2dc963eff0d6ce1072326dc81cb1dd38414e9f0e430af314
-EBUILD libsrtp-1.4.4.ebuild 2101 RMD160 efe638ef48a22930b41a3c3aaa707c073824bad6 SHA1 67c5d9d9e888eeb010f79f93cbfc7fda1506c175 SHA256 7cdfba68a71c9a1dff5a6dbe5a20646529a8151085301b468c13f4daf59c8335
-MISC ChangeLog 361 RMD160 48ec40bec08fcb74369072e4fb944ba3547397cc SHA1 c7612a24023f90dd8655d3528f976afe3978d3a6 SHA256 707859fcbb03f94514564c0eaf0b6b2b790662026e8eb892ab871349d363d995
+EBUILD libsrtp-1.4.4-r1.ebuild 2083 RMD160 b477f176ecd58885336e6b1b51ea3e5aa38b401c SHA1 de3741ec3117bcc4c44eaa93226372a7e4b8c9a0 SHA256 ada15cbda7a88b44b8448cd681c906523e2f812e5fcb5d769a26cc85ea5b87af
+MISC ChangeLog 607 RMD160 05646364f0e6640d7a8c415c25441d36d5663012 SHA1 cb0631a36c1ca990fc53f681dd716ad9019649cc SHA256 4e834c81565d6818c6c46683ba720ae5127637dfebd15317312a86a383f13497
 MISC metadata.xml 483 RMD160 2e42e3ccdac1471979c18aa23b210155662e64a3 SHA1 a5906db3f6fed58e700dc97050bcb7414b3a3794 SHA256 9271df20003022af2b404286566232b77d6d0fe3eb8f3a95a7a8274e51f4c9dc
diff --git a/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch b/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
new file mode 100644
index 000000000000..604ea5d12bf6
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
@@ -0,0 +1,46 @@
+diff -NrU5 srtp.orig/Makefile.in srtp/Makefile.in
+--- srtp.orig/Makefile.in	2009-04-15 01:46:57.000000000 +0200
++++ srtp/Makefile.in	2009-04-15 02:07:43.000000000 +0200
+@@ -65,11 +65,11 @@
+ 
+ 
+ # implicit rules for object files and test apps
+ 
+ %.o: %.c
+-	$(COMPILE) -c $< -o $@
++	$(COMPILE) -fPIC -c $< -o $@
+ 
+ %$(EXE): %.c
+ 	$(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
+ 
+ 
+@@ -103,10 +103,13 @@
+ 
+ libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi)
+ 	ar cr libsrtp.a $^
+ 	$(RANLIB) libsrtp.a
+ 
++libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi)
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,libsrtp.so.1 -o libsrtp.so.1.0  $^
++
+ # libcryptomath.a contains general-purpose routines that are used to
+ # generate tables and verify cryptoalgorithm implementations - this
+ # library is not meant to be included in production code
+ 
+ cryptomath = crypto/math/math.o crypto/math/gf2_8.o 
+@@ -195,10 +198,15 @@
+ 	$(INSTALL) -d $(DESTDIR)$(includedir)/srtp
+ 	$(INSTALL) -d $(DESTDIR)$(libdir)
+ 	cp include/*.h $(DESTDIR)$(includedir)/srtp  
+ 	cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp
+ 	if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
++	if [ -f libsrtp.so.1.0 ]; then \
++		cp libsrtp.so.1.0 $(DESTDIR)$(libdir)/; \
++		ln -s libsrtp.so.1.0 $(DESTDIR)$(libdir)/libsrtp.so.1; \
++		ln -s libsrtp.so.1.0 $(DESTDIR)$(libdir)/libsrtp.so; \
++	fi
+ 
+ uninstall:
+ 	rm -rf $(DESTDIR)$(includedir)/srtp
+ 	rm -rf $(DESTDIR)$(libdir)/libsrtp.a
+ 
\ No newline at end of file
diff --git a/net-libs/libsrtp/libsrtp-1.4.4.ebuild b/net-libs/libsrtp/libsrtp-1.4.4-r1.ebuild
index 58382a2e820c..5452e5534b2e 100644
--- a/net-libs/libsrtp/libsrtp-1.4.4.ebuild
+++ b/net-libs/libsrtp/libsrtp-1.4.4-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsrtp/libsrtp-1.4.4.ebuild,v 1.1 2009/04/14 00:45:27 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsrtp/libsrtp-1.4.4-r1.ebuild,v 1.1 2009/04/15 04:17:53 volkmar Exp $
 
 EAPI="2"
 
+inherit eutils
+
 MY_PN="srtp"
 MY_P="${MY_PN}-${PV}"
 
@@ -16,12 +18,13 @@ SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE="aesicm console debug doc syslog"
 
-# NOTES:
-# kernel_linux USE flag has been disabled because compilation fails with
-# only generating a static lib, no dynamic lib
-
 S=${WORKDIR}/${MY_PN}
 
+src_prepare() {
+	# generate a shared lib
+	epatch "${FILESDIR}"/${P}-shared.patch
+}
+
 src_configure() {
 	# stdout: default error output for messages in debug
 	# kernel-linux: breaks the build
@@ -38,7 +41,7 @@ src_configure() {
 
 src_compile() {
 	# target all is building test
-	emake ${PN}.a || die "emake failed"
+	emake ${PN}.a ${PN}.so || die "emake failed"
 }
 
 src_test() {