Remove libtool2 patch for PPC, fixing finally the PIC thing. It was due to -prefer-non-pic flag used in libdtls/configure.incls. Similar problem was fixed in a52dec-0.7.4-build.patch, from which libdts derive.

Package-Manager: portage-2.0.53_rc7

5 files changed, 46 insertions, 127 deletions

diff --git a/media-libs/libdts/ChangeLog b/media-libs/libdts/ChangeLog
index ad77d405d5bf..76073e71a464 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.23 2005/10/31 16:07:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdts/ChangeLog,v 1.24 2005/11/25 00:59:37 flameeyes Exp $
+
+  25 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  files/libdts-0.0.2-libtool.patch, -files/libdts-0.0.2-libtool2.patch,
+  libdts-0.0.2-r3.ebuild:
+  Remove libtool2 patch for PPC, fixing finally the PIC thing. It was due to
+  -prefer-non-pic flag used in libdtls/configure.incls. Similar problem was
+  fixed in a52dec-0.7.4-build.patch, from which libdts derive.
 
   31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> -libdts-0.0.2.ebuild:
   Remove old version.
diff --git a/media-libs/libdts/Manifest b/media-libs/libdts/Manifest
index 030238e8671d..6c54c623d680 100644
--- a/media-libs/libdts/Manifest
+++ b/media-libs/libdts/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 45b52b85661ccbc83bab0b3acbc520db ChangeLog 3197
+MD5 175ae7731e3b11c6367455d0336b4102 ChangeLog 3565
 MD5 9d1c5f06b01f4cc5b729407e44de4078 files/digest-libdts-0.0.2-r3 64
 MD5 fd6b9d9fe6c3ddd6a9c69a3f5fa00fdd files/libdts-0.0.2-freebsd.patch 501
-MD5 ab9838cb8c25fd47f0bee4b94a3d3e26 files/libdts-0.0.2-libtool.patch 3208
-MD5 16606801cd83f170926d1212513689f6 files/libdts-0.0.2-libtool2.patch 3222
-MD5 1239367abcdfff9c5eb1e1d222acadbc libdts-0.0.2-r3.ebuild 1286
+MD5 dba7d5229c9b50235aa3bac69135e046 files/libdts-0.0.2-libtool.patch 3571
+MD5 36c61aa8915913184f93d0c7f49919e2 libdts-0.0.2-r3.ebuild 1034
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDZkFbj5H05b2HAEkRAl1XAJ4krKXOsQB+BLc4RKp3TahxM4q7zgCfYhMz
-VXgkPXVWqffhobVRaG9M1K0=
-=Uu2Z
+iD8DBQFDhmIFAiZjviIA2XgRAtUOAJ9xF4jHOOdZacRtzb7vKndydzEkEgCfbm0P
+atTVxjBpzaE4BrkIQVBZzV4=
+=TWBT
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libdts/files/libdts-0.0.2-libtool.patch b/media-libs/libdts/files/libdts-0.0.2-libtool.patch
index d9e230866e1c..ed784b4556b3 100644
--- a/media-libs/libdts/files/libdts-0.0.2-libtool.patch
+++ b/media-libs/libdts/files/libdts-0.0.2-libtool.patch
@@ -1,6 +1,7 @@
-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
+Index: libdts-0.0.2/configure.ac
+===================================================================
+--- libdts-0.0.2.orig/configure.ac
++++ libdts-0.0.2/configure.ac
 @@ -77,22 +77,22 @@ else
      esac
  fi
@@ -38,9 +39,10 @@ diff -Naurp libdts-0.0.2.orig/configure.ac libdts-0.0.2/configure.ac
  
  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
+Index: libdts-0.0.2/libdts/Makefile.am
+===================================================================
+--- libdts-0.0.2.orig/libdts/Makefile.am
++++ libdts-0.0.2/libdts/Makefile.am
 @@ -1,22 +1,22 @@
  AM_CFLAGS = $(OPT_CFLAGS) $(LIBDTS_CFLAGS)
  
@@ -76,9 +78,10 @@ diff -Naurp libdts-0.0.2.orig/libdts/Makefile.am libdts-0.0.2/libdts/Makefile.am
 +#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
+Index: libdts-0.0.2/src/Makefile.am
+===================================================================
+--- libdts-0.0.2.orig/src/Makefile.am
++++ libdts-0.0.2/src/Makefile.am
 @@ -2,10 +2,10 @@ AM_CFLAGS = $(DTSDEC_CFLAGS)
  
  bin_PROGRAMS = dtsdec extract_dts
@@ -94,3 +97,17 @@ diff -Naurp libdts-0.0.2.orig/src/Makefile.am libdts-0.0.2/src/Makefile.am
  extract_dts_SOURCES = extract_dts.c getopt.c
  
  man_MANS = dtsdec.1 extract_dts.1
+Index: libdts-0.0.2/libdts/configure.incl
+===================================================================
+--- libdts-0.0.2.orig/libdts/configure.incl
++++ libdts-0.0.2/libdts/configure.incl
+@@ -1,9 +1,6 @@
+ AC_SUBST([LIBDTS_CFLAGS])
+ AC_SUBST([LIBDTS_LIBS])
+ 
+-dnl avoid -fPIC when possible
+-AC_LIBTOOL_NON_PIC([LIBDTS_CFLAGS="$LIBDTS_CFLAGS -prefer-non-pic"])
+-
+ AC_ARG_ENABLE([fixed],
+     [  --enable-fixed          use fixed-point (integer-based) arithmetic])
+ AC_ARG_ENABLE([double],
diff --git a/media-libs/libdts/files/libdts-0.0.2-libtool2.patch b/media-libs/libdts/files/libdts-0.0.2-libtool2.patch
deleted file mode 100644
index 314174aced23..000000000000
--- a/media-libs/libdts/files/libdts-0.0.2-libtool2.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-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-r3.ebuild b/media-libs/libdts/libdts-0.0.2-r3.ebuild
index f89eb2f6e7bd..895bf1f20853 100644
--- a/media-libs/libdts/libdts-0.0.2-r3.ebuild
+++ b/media-libs/libdts/libdts-0.0.2-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.7 2005/10/31 15:58:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdts/libdts-0.0.2-r3.ebuild,v 1.8 2005/11/25 00:59:37 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -22,18 +22,11 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	if use ppc ; then
-		# For some reason, ppc isn't properly using -fPIC... this
-		# patch is broken, but makes it "work" on ppc.  If someone
-		# will get me access, I'll fix it... --eradicator
-		# Bug #98494
-		epatch ${FILESDIR}/${P}-libtool2.patch
-	else
-		epatch ${FILESDIR}/${P}-libtool.patch
-	fi
-	epatch ${FILESDIR}/${P}-freebsd.patch
-
-	cd ${S}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-libtool.patch"
+	epatch "${FILESDIR}/${P}-freebsd.patch"
+
 	eautoreconf
 }