Fixed datatype of sample_rate to match faad header files. Fixes compilation on archs where sizeof(int) != sizeof(long). Removed 0.17-r1 as it is identical to 0.17-r2.

Package-Manager: portage-2.0.51.19

6 files changed, 36 insertions, 68 deletions

diff --git a/media-plugins/mythmusic/ChangeLog b/media-plugins/mythmusic/ChangeLog
index 58474af5c80f..d7df5bf0acb0 100644
--- a/media-plugins/mythmusic/ChangeLog
+++ b/media-plugins/mythmusic/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/mythmusic
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/ChangeLog,v 1.29 2005/03/26 08:38:57 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/ChangeLog,v 1.30 2005/03/27 00:33:23 eradicator Exp $
+
+  27 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/mythmusic-0.17-sample_rate_type.patch, -mythmusic-0.17-r1.ebuild,
+  mythmusic-0.17-r2.ebuild:
+  Fixed datatype of sample_rate to match faad header files. Fixes compilation
+  on archs where sizeof(int) != sizeof(long). Removed 0.17-r1 as it is
+  identical to 0.17-r2.
 
 *mythmusic-0.17-r2 (26 Mar 2005)
 
diff --git a/media-plugins/mythmusic/Manifest b/media-plugins/mythmusic/Manifest
index 6bded2a5f0ca..e80daa3be8f2 100644
--- a/media-plugins/mythmusic/Manifest
+++ b/media-plugins/mythmusic/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 fcfafb8a248e085bdcfc5ca9bd5b545d ChangeLog 5304
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 MD5 b38502c2e8035e7f49ccf7e716b7e431 mythmusic-0.16.ebuild 1187
-MD5 212326e55d537dd7dec5dfd123c5eb3b ChangeLog 4966
-MD5 0694ae82e83bfce9c15af063ca57f5dc mythmusic-0.17-r1.ebuild 1296
-MD5 163bd6caf32c9b5a73c8c38dd1c7b73e mythmusic-0.17-r2.ebuild 1292
-MD5 0c4f0d4e54c834f25ac644f8eed3b589 files/digest-mythmusic-0.17-r2 67
-MD5 0c4f0d4e54c834f25ac644f8eed3b589 files/digest-mythmusic-0.17-r1 67
+MD5 4bf6915f1ed05b87994160c277052da6 mythmusic-0.17-r2.ebuild 1362
 MD5 8042c0bc391d60a2d3842e9956cb6ad7 files/digest-mythmusic-0.16 67
+MD5 0c4f0d4e54c834f25ac644f8eed3b589 files/digest-mythmusic-0.17-r2 67
+MD5 45daa2aa4f56c4d0bdf8f37c470e4775 files/mythmusic-0.17-sample_rate_type.patch 505
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCRR+y5+pdB4IBr0URArf5AKCYGe/whlvu0p1xg2hlWc+iYYrvcACgktvV
-0m5KHg79e6dewu39IuY/cVc=
-=nLGf
+iD8DBQFCRf9hArHZZzCEUG0RAlZzAJ9lMT8gSUCGn2smK7m3JSI556iePgCfZw8T
+rJYpfbPGGD0ACPByPaL6I/E=
+=MzdH
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/mythmusic/files/digest-mythmusic-0.17-r1 b/media-plugins/mythmusic/files/digest-mythmusic-0.17-r1
deleted file mode 100644
index 1f3483a8df01..000000000000
--- a/media-plugins/mythmusic/files/digest-mythmusic-0.17-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a196419e77ec40b3e35c70404d2430fe mythmusic-0.17.tar.bz2 295078
diff --git a/media-plugins/mythmusic/files/mythmusic-0.17-sample_rate_type.patch b/media-plugins/mythmusic/files/mythmusic-0.17-sample_rate_type.patch
new file mode 100644
index 000000000000..6721283bd23e
--- /dev/null
+++ b/media-plugins/mythmusic/files/mythmusic-0.17-sample_rate_type.patch
@@ -0,0 +1,12 @@
+diff -Naurp mythmusic-0.17.orig/mythmusic/aacdecoder.h mythmusic-0.17/mythmusic/aacdecoder.h
+--- mythmusic-0.17.orig/mythmusic/aacdecoder.h	2005-02-05 22:14:36.000000000 -0800
++++ mythmusic-0.17/mythmusic/aacdecoder.h	2005-03-26 16:24:37.000000000 -0800
+@@ -53,7 +53,7 @@ class aacDecoder : public Decoder
+     bool done, finish;
+     long len, bitrate;
+     uchar channels;
+-    unsigned long sample_rate;
++    unsigned int sample_rate;
+     unsigned long output_size;
+     double totalTime, seekTime;
+ 
diff --git a/media-plugins/mythmusic/mythmusic-0.17-r1.ebuild b/media-plugins/mythmusic/mythmusic-0.17-r1.ebuild
deleted file mode 100644
index e9c4d4798893..000000000000
--- a/media-plugins/mythmusic/mythmusic-0.17-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/mythmusic-0.17-r1.ebuild,v 1.2 2005/02/27 10:38:12 eradicator Exp $
-
-inherit myth flag-o-matic toolchain-funcs
-
-DESCRIPTION="Music player module for MythTV."
-HOMEPAGE="http://www.mythtv.org/"
-SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mmx opengl sdl X aac"
-
-DEPEND=">=media-sound/cdparanoia-3.9.8
-	>=media-libs/libmad-0.14.2b
-	>=media-libs/libid3tag-0.14.2b
-	>=media-libs/libvorbis-1.0
-	>=media-libs/libcdaudio-0.99.6
-	>=media-libs/flac-1.1.0
-	>=sys-apps/sed-4
-	aac? ( media-libs/faad2 )
-	X? ( =sci-libs/fftw-2* )
-	opengl? ( virtual/opengl =sci-libs/fftw-2* )
-	sdl? ( >=media-libs/libsdl-1.2.5 )
-	|| ( ~media-tv/mythtv-${PV} ~media-tv/mythfrontend-${PV} )"
-
-setup_pro() {
-	if ! use x86 || ! use mmx; then
-		echo "DEFINES -= HAVE_MMX" >> ${S}/settings.pro
-	fi
-}
-
-src_unpack() {
-	if [[ $(gcc-version) = "3.2" || $(gcc-version) == "3.3" ]]; then
-		replace-cpu-flags pentium4 pentium3
-	fi
-
-	myth_src_unpack || die "unpack failed"
-}
-
-src_compile() {
-	econf \
-		`use_enable aac` \
-		`use_enable X fftw` \
-		`use_enable opengl` \
-		`use_enable sdl`
-
-	myth_src_compile || die
-}
diff --git a/media-plugins/mythmusic/mythmusic-0.17-r2.ebuild b/media-plugins/mythmusic/mythmusic-0.17-r2.ebuild
index 082f235a5ca3..f6809adb6cce 100644
--- a/media-plugins/mythmusic/mythmusic-0.17-r2.ebuild
+++ b/media-plugins/mythmusic/mythmusic-0.17-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/mythmusic-0.17-r2.ebuild,v 1.1 2005/03/26 08:38:57 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/mythmusic-0.17-r2.ebuild,v 1.2 2005/03/27 00:33:23 eradicator Exp $
 
-inherit myth flag-o-matic toolchain-funcs
+inherit myth flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="Music player module for MythTV."
 HOMEPAGE="http://www.mythtv.org/"
@@ -38,14 +38,16 @@ src_unpack() {
 	fi
 
 	myth_src_unpack || die "unpack failed"
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-sample_rate_type.patch
 }
 
 src_compile() {
-	econf \
-		`use_enable aac` \
-		`use_enable X fftw` \
-		`use_enable opengl` \
-		`use_enable sdl`
+	econf 	$(use_enable aac) \
+		$(use_enable X fftw) \
+		$(use_enable opengl) \
+		$(use_enable sdl)
 
 	myth_src_compile || die
 }