Fix -fPIC usage. Use libtool to build shared and static libs.

(Portage version: 2.0.51.19)

5 files changed, 153 insertions, 2 deletions

diff --git a/media-libs/libdts/ChangeLog b/media-libs/libdts/ChangeLog
index 837067cc1ff5..4ba094f5caba 100644
--- a/media-libs/libdts/ChangeLog
+++ b/media-libs/libdts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libdts
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdts/ChangeLog,v 1.8 2005/02/06 17:52:46 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdts/ChangeLog,v 1.9 2005/03/26 11:15:12 eradicator Exp $
+
+*libdts-0.0.2-r1 (26 Mar 2005)
+
+  26 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/libdts-0.0.2-libtool.patch, +libdts-0.0.2-r1.ebuild:
+  Fix -fPIC usage.  Use libtool to build shared and static libs.
 
   06 Feb 2005; Markus Rothe <corsair@gentoo.org> libdts-0.0.2.ebuild:
   Stable on ppc64
diff --git a/media-libs/libdts/Manifest b/media-libs/libdts/Manifest
index 1cd14bb9cc12..e7078f5feaa7 100644
--- a/media-libs/libdts/Manifest
+++ b/media-libs/libdts/Manifest
@@ -1,4 +1,6 @@
 MD5 b77df2a068bec14cf2bba619f31cb7b9 ChangeLog 1060
-MD5 329a8f417c0af0f03afa8e5b58472b7c libdts-0.0.2.ebuild 945
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 203079b42f499a51c0710b59035b9d3d libdts-0.0.2-r1.ebuild 1029
+MD5 329a8f417c0af0f03afa8e5b58472b7c libdts-0.0.2.ebuild 945
 MD5 9d1c5f06b01f4cc5b729407e44de4078 files/digest-libdts-0.0.2 64
+MD5 9d1c5f06b01f4cc5b729407e44de4078 files/digest-libdts-0.0.2-r1 64
diff --git a/media-libs/libdts/files/digest-libdts-0.0.2-r1 b/media-libs/libdts/files/digest-libdts-0.0.2-r1
new file mode 100644
index 000000000000..969bee6c5327
--- /dev/null
+++ b/media-libs/libdts/files/digest-libdts-0.0.2-r1
@@ -0,0 +1 @@
+MD5 a1c0dac95d7031498c2d19d7a3107469 libdts-0.0.2.tar.gz 295185
diff --git a/media-libs/libdts/files/libdts-0.0.2-libtool.patch b/media-libs/libdts/files/libdts-0.0.2-libtool.patch
new file mode 100644
index 000000000000..d9e230866e1c
--- /dev/null
+++ b/media-libs/libdts/files/libdts-0.0.2-libtool.patch
@@ -0,0 +1,96 @@
+diff -Naurp libdts-0.0.2.orig/configure.ac libdts-0.0.2/configure.ac
+--- libdts-0.0.2.orig/configure.ac	2004-02-29 04:00:32.000000000 -0800
++++ libdts-0.0.2/configure.ac	2005-03-26 03:11:21.000000000 -0800
+@@ -77,22 +77,22 @@ else
+     esac
+ fi
+ 
+-#libtool# dnl Checks for libtool - this must be done after we set cflags
+-#libtool# AC_DISABLE_SHARED
+-#libtool# AC_LIBTOOL_WIN32_DLL
+-#libtool# AC_PROG_LIBTOOL
++dnl Checks for libtool - this must be done after we set cflags
++#AC_DISABLE_SHARED
++AC_LIBTOOL_WIN32_DLL
++AC_PROG_LIBTOOL
+ 
+ dnl Build the PIC library? - to be removed once libtool is re-enabled
+-AC_PROG_RANLIB
+-case "${target_os}" in
+-  *mingw32* | *cygwin* | *djgpp*)
+-    NEED_PIC=false
+-    ;;
+-  *)
+-    NEED_PIC=:
+-    ;;
+-esac
+-AM_CONDITIONAL(NEED_PIC, ${NEED_PIC})
++#AC_PROG_RANLIB
++#case "${target_os}" in
++#  *mingw32* | *cygwin* | *djgpp*)
++#    NEED_PIC=false
++#    ;;
++#  *)
++#    NEED_PIC=:
++#    ;;
++#esac
++#AM_CONDITIONAL(NEED_PIC, ${NEED_PIC})
+ 
+ dnl Checks for libraries.
+ LIBAO_LIBS="-lm"
+diff -Naurp libdts-0.0.2.orig/libdts/Makefile.am libdts-0.0.2/libdts/Makefile.am
+--- libdts-0.0.2.orig/libdts/Makefile.am	2004-02-25 05:52:15.000000000 -0800
++++ libdts-0.0.2/libdts/Makefile.am	2005-03-26 03:05:59.000000000 -0800
+@@ -1,22 +1,22 @@
+ AM_CFLAGS = $(OPT_CFLAGS) $(LIBDTS_CFLAGS)
+ 
+-#libtool# lib_LTLIBRARIES = libdts.la
+-#libtool# 
+-#libtool# libdts_la_SOURCES = bitstream.c parse.c downmix.c
+-#libtool# libdts_la_LIBADD = $(LIBDTS_LIBS)
+-#libtool# libdts_la_LDFLAGS = -no-undefined
++lib_LTLIBRARIES = libdts.la
+ 
+-lib_LIBRARIES = libdts.a $(libdts_pic_a)
+-libdts_a_SOURCES = bitstream.c parse.c downmix.c
++libdts_la_SOURCES = bitstream.c parse.c downmix.c
++libdts_la_LIBADD = $(LIBDTS_LIBS)
++libdts_la_LDFLAGS = -no-undefined
++
++#lib_LIBRARIES = libdts.a $(libdts_pic_a)
++#libdts_a_SOURCES = bitstream.c parse.c downmix.c
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libdts.pc
+ 
+ EXTRA_DIST = configure.incl dts_internal.h bitstream.h tables.h tables_quantization.h tables_huffman.h tables_fir.h tables_adpcm.h tables_vq.h
+ 
+-if NEED_PIC
+-libdts_pic_a = libdts_pic.a
+-endif
+-libdts_pic_a_SOURCES = $(libdts_a_SOURCES)
+-libdts_pic_a_CPPFLAGS = -fPIC -DPIC
++#if NEED_PIC
++#libdts_pic_a = libdts_pic.a
++#endif
++#libdts_pic_a_SOURCES = $(libdts_a_SOURCES)
++#libdts_pic_a_CPPFLAGS = -fPIC -DPIC
+ 
+diff -Naurp libdts-0.0.2.orig/src/Makefile.am libdts-0.0.2/src/Makefile.am
+--- libdts-0.0.2.orig/src/Makefile.am	2004-02-25 05:52:16.000000000 -0800
++++ libdts-0.0.2/src/Makefile.am	2005-03-26 03:06:30.000000000 -0800
+@@ -2,10 +2,10 @@ AM_CFLAGS = $(DTSDEC_CFLAGS)
+ 
+ bin_PROGRAMS = dtsdec extract_dts
+ dtsdec_SOURCES = dtsdec.c getopt.c gettimeofday.c
+-#libtool# dtsdec_LDADD = $(top_builddir)/libdts/libdts.la \
+-#libtool# 	       $(top_builddir)/libao/libao.a $(LIBAO_LIBS)
+-dtsdec_LDADD = $(top_builddir)/libdts/libdts.a \
+-	       $(top_builddir)/libao/libao.a $(LIBAO_LIBS)
++dtsdec_LDADD = $(top_builddir)/libdts/libdts.la \
++ 	       $(top_builddir)/libao/libao.a $(LIBAO_LIBS)
++#dtsdec_LDADD = $(top_builddir)/libdts/libdts.a \
++#	       $(top_builddir)/libao/libao.a $(LIBAO_LIBS)
+ extract_dts_SOURCES = extract_dts.c getopt.c
+ 
+ man_MANS = dtsdec.1 extract_dts.1
diff --git a/media-libs/libdts/libdts-0.0.2-r1.ebuild b/media-libs/libdts/libdts-0.0.2-r1.ebuild
new file mode 100644
index 000000000000..0cb53eeff133
--- /dev/null
+++ b/media-libs/libdts/libdts-0.0.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdts/libdts-0.0.2-r1.ebuild,v 1.1 2005/03/26 11:15:12 eradicator Exp $
+
+inherit eutils
+
+DESCRIPTION="library for decoding DTS Coherent Acoustics streams used in DVD"
+HOMEPAGE="http://www.videolan.org/dtsdec.html"
+SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~hppa ~ppc64 ~alpha"
+IUSE="oss debug"
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	=sys-devel/automake-1.7*
+	>=sys-devel/autoconf-2.52d-r1"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-libtool.patch
+
+	cd ${S}
+
+	export WANT_AUTOMAKE=1.7
+	export WANT_AUTOCONF=2.5
+
+	libtoolize --force --copy || die "libtoolize --force --copy failed"
+	aclocal || die "aclocal failed"
+	autoheader || die "autoheader failed"
+	automake --gnu --add-missing --include-deps --force-missing --copy || die "automake failed"
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	econf $(use_enable oss) $(use_enable debug)
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/libdts.txt
+}