Updated libtool patch to compile the shared libraries with -fPIC on all platforms.

(Portage version: 2.0.51.22-r2)

5 files changed, 160 insertions, 14 deletions

diff --git a/media-libs/libdts/ChangeLog b/media-libs/libdts/ChangeLog
index 852999518bd7..bec1d6244151 100644
--- a/media-libs/libdts/ChangeLog
+++ b/media-libs/libdts/ChangeLog
@@ -1,6 +1,13 @@
 # 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.14 2005/05/09 00:52:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdts/ChangeLog,v 1.15 2005/07/21 10:17:46 flameeyes Exp $
+
+*libdts-0.0.2-r2 (21 Jul 2005)
+
+  21 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libdts-0.0.2-libtool2.patch, +libdts-0.0.2-r2.ebuild:
+  Updated libtool patch to compile the shared libraries with -fPIC on all
+  platforms.
 
   08 May 2005; Aron Griffis <agriffis@gentoo.org> libdts-0.0.2-r1.ebuild:
   stable on ia64
diff --git a/media-libs/libdts/Manifest b/media-libs/libdts/Manifest
index e755a8b7e302..8080e5c2213e 100644
--- a/media-libs/libdts/Manifest
+++ b/media-libs/libdts/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 6eacf1d9a1c45c7fd1b3e43eb5df4c25 ChangeLog 1799
 MD5 54bd93cd5d53bea79dfc9554eca7b56d libdts-0.0.2-r1.ebuild 1297
 MD5 418e8000e6a6318f7d3163c1fb10d444 libdts-0.0.2.ebuild 967
-MD5 6eacf1d9a1c45c7fd1b3e43eb5df4c25 ChangeLog 1799
-MD5 ab9838cb8c25fd47f0bee4b94a3d3e26 files/libdts-0.0.2-libtool.patch 3208
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 d83c81857b7fb0668a4d9ea8647cca72 libdts-0.0.2-r2.ebuild 1322
 MD5 9d1c5f06b01f4cc5b729407e44de4078 files/digest-libdts-0.0.2 64
 MD5 9d1c5f06b01f4cc5b729407e44de4078 files/digest-libdts-0.0.2-r1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzyjhgIKl8Uu19MoRAszoAJ4r4P3YDSTF4NRh2wn6Ck3YtaqPRwCdGSW+
-F/t8/g+O7iQbs0AOZJUcZq0=
-=+kA9
------END PGP SIGNATURE-----
+MD5 ab9838cb8c25fd47f0bee4b94a3d3e26 files/libdts-0.0.2-libtool.patch 3208
+MD5 16606801cd83f170926d1212513689f6 files/libdts-0.0.2-libtool2.patch 3222
+MD5 9d1c5f06b01f4cc5b729407e44de4078 files/digest-libdts-0.0.2-r2 64
diff --git a/media-libs/libdts/files/digest-libdts-0.0.2-r2 b/media-libs/libdts/files/digest-libdts-0.0.2-r2
new file mode 100644
index 000000000000..969bee6c5327
--- /dev/null
+++ b/media-libs/libdts/files/digest-libdts-0.0.2-r2
@@ -0,0 +1 @@
+MD5 a1c0dac95d7031498c2d19d7a3107469 libdts-0.0.2.tar.gz 295185
diff --git a/media-libs/libdts/files/libdts-0.0.2-libtool2.patch b/media-libs/libdts/files/libdts-0.0.2-libtool2.patch
new file mode 100644
index 000000000000..314174aced23
--- /dev/null
+++ b/media-libs/libdts/files/libdts-0.0.2-libtool2.patch
@@ -0,0 +1,97 @@
+diff -ur -x '*~' libdts-0.0.2/configure.ac libdts-0.0.2-pic/configure.ac
+--- libdts-0.0.2/configure.ac	2004-02-29 13:00:32.000000000 +0100
++++ libdts-0.0.2-pic/configure.ac	2005-07-21 12:03:12.762170496 +0200
+@@ -77,22 +77,22 @@
+     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 -ur -x '*~' libdts-0.0.2/libdts/Makefile.am libdts-0.0.2-pic/libdts/Makefile.am
+--- libdts-0.0.2/libdts/Makefile.am	2004-02-25 14:52:15.000000000 +0100
++++ libdts-0.0.2-pic/libdts/Makefile.am	2005-07-21 12:12:24.275327752 +0200
+@@ -1,22 +1,23 @@
+ 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
++libdts_la_CFLAGS = -fPIC $(AM_CFLAGS)
++
++#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 -ur -x '*~' libdts-0.0.2/src/Makefile.am libdts-0.0.2-pic/src/Makefile.am
+--- libdts-0.0.2/src/Makefile.am	2004-02-25 14:52:16.000000000 +0100
++++ libdts-0.0.2-pic/src/Makefile.am	2005-07-21 12:03:12.763170344 +0200
+@@ -2,10 +2,10 @@
+ 
+ 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-r2.ebuild b/media-libs/libdts/libdts-0.0.2-r2.ebuild
new file mode 100644
index 000000000000..078050c60f64
--- /dev/null
+++ b/media-libs/libdts/libdts-0.0.2-r2.ebuild
@@ -0,0 +1,48 @@
+# 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-r2.ebuild,v 1.1 2005/07/21 10:17:46 flameeyes 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="oss debug"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	=sys-devel/automake-1.7*
+	>=sys-devel/autoconf-2.52d-r1"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-libtool2.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) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/libdts.txt
+}
+
+src_test() { :; }