Build objects twice, once -fPIC for shared and once for static.

Package-Manager: portage-2.1.4_rc9

5 files changed, 224 insertions, 5 deletions

diff --git a/media-sound/gsm/ChangeLog b/media-sound/gsm/ChangeLog
index 19dd1e538c92..349932cd1599 100644
--- a/media-sound/gsm/ChangeLog
+++ b/media-sound/gsm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/gsm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/ChangeLog,v 1.22 2007/11/25 16:13:26 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/ChangeLog,v 1.23 2007/12/15 17:02:41 drac Exp $
+
+*gsm-1.0.12-r1 (15 Dec 2007)
+
+  15 Dec 2007; Samuli Suominen <drac@gentoo.org>
+  +files/gsm-1.0.12-shared.patch, +gsm-1.0.12-r1.ebuild:
+  Build objects twice, once -fPIC for shared and once for static.
 
   25 Nov 2007; Brent Baude <ranger@gentoo.org> gsm-1.0.12.ebuild:
   Marking gsm-1.0.12 ppc for bug 199475
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index 621eb1f33bcb..a940f8d8b615 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -6,15 +6,23 @@ AUX gsm-1.0.12-memcpy.patch 301 RMD160 21c1e4c83046bff547f2bae1b14758dfeeca4a3b
 MD5 7c45a8bbbc2031c74c67c34bcf037c56 files/gsm-1.0.12-memcpy.patch 301
 RMD160 21c1e4c83046bff547f2bae1b14758dfeeca4a3b files/gsm-1.0.12-memcpy.patch 301
 SHA256 3d6637db82d739c89cb4127bd28ce9d5b97cee7f27862943952d130a0fb6e9fe files/gsm-1.0.12-memcpy.patch 301
+AUX gsm-1.0.12-shared.patch 3713 RMD160 6d9cd3e0e6eb7354900b990aa6e195cc12e8e733 SHA1 d2e08db4e95fa96661e989b59318e3eca06e01d2 SHA256 30661e6f947e74ce2f1c42452d666e76175e18269490d5adfa695bad3cf4ff47
+MD5 add04a89611a49a875f5f3db0c27dfc3 files/gsm-1.0.12-shared.patch 3713
+RMD160 6d9cd3e0e6eb7354900b990aa6e195cc12e8e733 files/gsm-1.0.12-shared.patch 3713
+SHA256 30661e6f947e74ce2f1c42452d666e76175e18269490d5adfa695bad3cf4ff47 files/gsm-1.0.12-shared.patch 3713
 DIST gsm-1.0.12.tar.gz 62156 RMD160 c780aa1405f5029aaacf96183577c6720691dd31 SHA1 69c22bdda35871d223affdac09115b6abb0932b1 SHA256 dde4e62e4ce35af29a15d26beca2fc0f98c0219553927453425cda01f16e4de4
+EBUILD gsm-1.0.12-r1.ebuild 1474 RMD160 399da0d5bf338e0af2930f8f1fb0ae9f39dcf6e1 SHA1 b57f1734d7e4efd22a15771da14f66efc8dc055b SHA256 2bf7cbf8a1c8819183b80d225192c357f77fbd5c5172995439ec2b92c1569528
+MD5 5d506628e4018c11192526180b7bdcde gsm-1.0.12-r1.ebuild 1474
+RMD160 399da0d5bf338e0af2930f8f1fb0ae9f39dcf6e1 gsm-1.0.12-r1.ebuild 1474
+SHA256 2bf7cbf8a1c8819183b80d225192c357f77fbd5c5172995439ec2b92c1569528 gsm-1.0.12-r1.ebuild 1474
 EBUILD gsm-1.0.12.ebuild 1402 RMD160 d19f44dce5a3046cc514a53a1d7d4b2f3c31a94a SHA1 ee9891e1b47b403ded43eacdba585f61be41b1ab SHA256 7b71469fac88a2f59d7cddcdebb7ac57f8c39aff4ab13eb693741b8e3821ce51
 MD5 bd047574233542f1c5582efee5557f3f gsm-1.0.12.ebuild 1402
 RMD160 d19f44dce5a3046cc514a53a1d7d4b2f3c31a94a gsm-1.0.12.ebuild 1402
 SHA256 7b71469fac88a2f59d7cddcdebb7ac57f8c39aff4ab13eb693741b8e3821ce51 gsm-1.0.12.ebuild 1402
-MISC ChangeLog 2364 RMD160 fbb1e48e94f7fc76cea2d535d074b992a36f1246 SHA1 ddca8eddcf2a069ab4117f4b061cb9835abbbe8b SHA256 65b1725e7ec862958ba6f3b16894437b3484ce3b62b6509eb732a0a72f022b9e
-MD5 2a2ed89df8aa67052a25afc903bf6123 ChangeLog 2364
-RMD160 fbb1e48e94f7fc76cea2d535d074b992a36f1246 ChangeLog 2364
-SHA256 65b1725e7ec862958ba6f3b16894437b3484ce3b62b6509eb732a0a72f022b9e ChangeLog 2364
+MISC ChangeLog 2565 RMD160 b2b8b6f53538488b01ff735994aca88cf7543d42 SHA1 1d6e522540b2b0d465e8f3029e8f3cf288fcc770 SHA256 710af2852cc21c0409f7a80c73b164105ba57fb3fbda98d002123ea668d0ea77
+MD5 77dfa715ad4cc5a438230e720df6010b ChangeLog 2565
+RMD160 b2b8b6f53538488b01ff735994aca88cf7543d42 ChangeLog 2565
+SHA256 710af2852cc21c0409f7a80c73b164105ba57fb3fbda98d002123ea668d0ea77 ChangeLog 2565
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -22,3 +30,6 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 dbddf10519655c9ee40154de0b62e135 files/digest-gsm-1.0.12 229
 RMD160 532faaafe993d064df4cb474efe2627f99ff7428 files/digest-gsm-1.0.12 229
 SHA256 7715ee47e9290995b3bb7ce008e6b57d0dac84be9b87724ab8f8bbd274b0a328 files/digest-gsm-1.0.12 229
+MD5 dbddf10519655c9ee40154de0b62e135 files/digest-gsm-1.0.12-r1 229
+RMD160 532faaafe993d064df4cb474efe2627f99ff7428 files/digest-gsm-1.0.12-r1 229
+SHA256 7715ee47e9290995b3bb7ce008e6b57d0dac84be9b87724ab8f8bbd274b0a328 files/digest-gsm-1.0.12-r1 229
diff --git a/media-sound/gsm/files/digest-gsm-1.0.12-r1 b/media-sound/gsm/files/digest-gsm-1.0.12-r1
new file mode 100644
index 000000000000..7cae8d182ed8
--- /dev/null
+++ b/media-sound/gsm/files/digest-gsm-1.0.12-r1
@@ -0,0 +1,3 @@
+MD5 8909828c601e82e842e6a0ceade60a4e gsm-1.0.12.tar.gz 62156
+RMD160 c780aa1405f5029aaacf96183577c6720691dd31 gsm-1.0.12.tar.gz 62156
+SHA256 dde4e62e4ce35af29a15d26beca2fc0f98c0219553927453425cda01f16e4de4 gsm-1.0.12.tar.gz 62156
diff --git a/media-sound/gsm/files/gsm-1.0.12-shared.patch b/media-sound/gsm/files/gsm-1.0.12-shared.patch
new file mode 100644
index 000000000000..49e56c23055a
--- /dev/null
+++ b/media-sound/gsm/files/gsm-1.0.12-shared.patch
@@ -0,0 +1,151 @@
+diff -ur gsm-1.0-pl12.orig/Makefile gsm-1.0-pl12/Makefile
+--- gsm-1.0-pl12.orig/Makefile	2006-04-26 22:14:26.000000000 +0300
++++ gsm-1.0-pl12/Makefile	2007-12-15 18:47:22.000000000 +0200
+@@ -96,7 +96,7 @@
+ #  Other tools
+ 
+ SHELL		= /bin/sh
+-LN		= ln
++LN		= ln -s
+ BASENAME 	= basename
+ AR		= ar
+ ARFLAGS		= cr
+@@ -140,6 +140,7 @@
+ # Targets
+ 
+ LIBGSM	= $(LIB)/libgsm.a
++LIBGSMSO= $(LIB)/libgsm.so
+ 
+ TOAST	= $(BIN)/toast
+ UNTOAST	= $(BIN)/untoast
+@@ -203,24 +204,43 @@
+ 
+ # Object files
+ 
+-GSM_OBJECTS =	$(SRC)/add.o		\
+-		$(SRC)/code.o		\
+-		$(SRC)/debug.o		\
+-		$(SRC)/decode.o		\
+-		$(SRC)/long_term.o	\
+-		$(SRC)/lpc.o		\
+-		$(SRC)/preprocess.o	\
+-		$(SRC)/rpe.o		\
+-		$(SRC)/gsm_destroy.o	\
+-		$(SRC)/gsm_decode.o	\
+-		$(SRC)/gsm_encode.o	\
+-		$(SRC)/gsm_explode.o	\
+-		$(SRC)/gsm_implode.o	\
+-		$(SRC)/gsm_create.o	\
+-		$(SRC)/gsm_print.o	\
+-		$(SRC)/gsm_option.o	\
+-		$(SRC)/short_term.o	\
+-		$(SRC)/table.o
++STATIC_GSM_OBJECTS =	$(SRC)/add.o		\
++			$(SRC)/code.o		\
++			$(SRC)/debug.o		\
++			$(SRC)/decode.o		\
++			$(SRC)/long_term.o	\
++			$(SRC)/lpc.o		\
++			$(SRC)/preprocess.o	\
++			$(SRC)/rpe.o		\
++			$(SRC)/gsm_destroy.o	\
++			$(SRC)/gsm_decode.o	\
++			$(SRC)/gsm_encode.o	\
++			$(SRC)/gsm_explode.o	\
++			$(SRC)/gsm_implode.o	\
++			$(SRC)/gsm_create.o	\
++			$(SRC)/gsm_print.o	\
++			$(SRC)/gsm_option.o	\
++			$(SRC)/short_term.o	\
++			$(SRC)/table.o
++
++SHARED_GSM_OBJECTS =	$(SRC)/add.lo		\
++			$(SRC)/code.lo		\
++			$(SRC)/debug.lo		\
++			$(SRC)/decode.lo	\
++			$(SRC)/long_term.lo	\
++			$(SRC)/lpc.lo		\
++			$(SRC)/preprocess.lo	\
++			$(SRC)/rpe.lo		\
++			$(SRC)/gsm_destroy.lo	\
++			$(SRC)/gsm_decode.lo	\
++			$(SRC)/gsm_encode.lo	\
++			$(SRC)/gsm_explode.lo	\
++			$(SRC)/gsm_implode.lo	\
++			$(SRC)/gsm_create.lo	\
++			$(SRC)/gsm_print.lo	\
++			$(SRC)/gsm_option.lo	\
++			$(SRC)/short_term.lo	\
++			$(SRC)/table.lo
+ 
+ TOAST_OBJECTS =	$(SRC)/toast.o 		\
+ 		$(SRC)/toast_lin.o	\
+@@ -228,7 +248,7 @@
+ 		$(SRC)/toast_alaw.o	\
+ 		$(SRC)/toast_audio.o
+ 
+-OBJECTS =	 $(GSM_OBJECTS) $(TOAST_OBJECTS)
++OBJECTS =	$(STATIC_GSM_OBJECTS) $(SHARED_GSM_OBJECTS) $(TOAST_OBJECTS)
+ 
+ # Manuals
+ 
+@@ -277,9 +297,12 @@
+ 		$(CC) $(CFLAGS) $?
+ 		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
+ 
++%.lo: %.c
++		$(CC) $(CFLAGS) -fPIC -c $< -o $@
++
+ # Target rules
+ 
+-all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
++all:		$(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
+ 		@-echo $(ROOT): Done.
+ 
+ tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
+@@ -299,24 +322,29 @@
+ 
+ # The basic API: libgsm
+ 
+-$(LIBGSM):	$(LIB) $(GSM_OBJECTS)
++$(LIBGSMSO):	$(LIB) $(SHARED_GSM_OBJECTS)
++		$(LD) -o $@.1.0.12 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(SHARED_GSM_OBJECTS) -lc
++		ln -fs libgsm.so.1.0.12 lib/libgsm.so.1
++		ln -fs libgsm.so.1.0.12 lib/libgsm.so
++
++$(LIBGSM):	$(LIB) $(STATIC_GSM_OBJECTS)
+ 		-rm $(RMFLAGS) $(LIBGSM)
+-		$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
++		$(AR) $(ARFLAGS) $(LIBGSM) $(STATIC_GSM_OBJECTS)
+ 		$(RANLIB) $(LIBGSM)
+ 
+ 
+ # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
+ 
+ $(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM)
+-		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
++		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
+ 
+ $(UNTOAST):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(UNTOAST)
+-		$(LN) $(TOAST) $(UNTOAST)
++		$(LN) toast $(UNTOAST)
+ 
+ $(TCAT):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(TCAT)
+-		$(LN) $(TOAST) $(TCAT)
++		$(LN) toast $(TCAT)
+ 
+ 
+ # The local bin and lib directories
+@@ -426,7 +454,9 @@
+ 
+ clean:	semi-clean
+ 		-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add		\
+-			$(TOAST) $(TCAT) $(UNTOAST)	\
++			$(LIBGSMSO) $(LIB)/libgsm.so.1.0.12	\
++			$(LIB)libgsm.so.1			\
++			$(TOAST) $(TCAT) $(UNTOAST)		\
+ 			$(ROOT)/gsm-1.0.tar.Z
+ 
+ 
diff --git a/media-sound/gsm/gsm-1.0.12-r1.ebuild b/media-sound/gsm/gsm-1.0.12-r1.ebuild
new file mode 100644
index 000000000000..e447cb38906c
--- /dev/null
+++ b/media-sound/gsm/gsm-1.0.12-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/gsm-1.0.12-r1.ebuild,v 1.1 2007/12/15 17:02:41 drac Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs versionator
+
+DESCRIPTION="Lossy speech compression library and tool."
+HOMEPAGE="http://kbs.cs.tu-berlin.de/~jutta/toast.html"
+SRC_URI="http://www.cs.tu-berlin.de/~jutta/${PN}/${P}.tar.gz"
+
+LICENSE="OSI-Approved"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${PN}-"$(replace_version_separator 2 '-pl' )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-shared.patch
+	epatch "${FILESDIR}"/${P}-memcpy.patch
+	epatch "${FILESDIR}"/${P}-64bit.patch
+}
+
+src_compile() {
+	# From upstream Makefile. Define this if your host multiplies
+	# floats faster than integers, e.g. on a SPARCstation.
+	use sparc && append-flags -DUSE_FLOAT_MUL -DFAST
+
+	emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \
+		CC="$(tc-getCC)" || die "emake failed."
+}
+
+src_install() {
+	dodir /usr/bin /usr/$(get_libdir) /usr/include/gsm /usr/share/man/man{1,3}
+
+	emake -j1 INSTALL_ROOT="${D}"/usr \
+		GSM_INSTALL_LIB="${D}"/usr/$(get_libdir) \
+		GSM_INSTALL_INC="${D}"/usr/include/gsm \
+		GSM_INSTALL_MAN="${D}"/usr/share/man/man3 \
+		TOAST_INSTALL_MAN="${D}"/usr/share/man/man1 \
+		install || die "emake install failed."
+
+	dolib lib/libgsm.so*
+
+	dodoc ChangeLog* MACHINES MANIFEST README
+}