diff options
| author |   Gregorio Guidi <greg_g@gentoo.org> | 2005-03-17 11:23:06 +0000 |
|---|---|---|
| committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-03-17 11:23:06 +0000 |
| commit | 70b0e5b6c4657d1ae0455b33ec12888d4c3bb9de (patch) | |
| tree | ab6674ea30157d8b5ca96c70a00a5a2addeb4845 /kde-base/kdemultimedia | |
| parent | Readd patch that was mistakenly removed. (diff) | |
| download | gentoo-2-70b0e5b6c4657d1ae0455b33ec12888d4c3bb9de.tar.gz gentoo-2-70b0e5b6c4657d1ae0455b33ec12888d4c3bb9de.tar.bz2 gentoo-2-70b0e5b6c4657d1ae0455b33ec12888d4c3bb9de.zip | |
Readd patch that was mistakenly removed.
(Portage version: 2.0.51.19)
Diffstat (limited to 'kde-base/kdemultimedia')
| -rw-r--r-- | kde-base/kdemultimedia/files/kdemultimedia-3.4.0-amd64.patch | 20 | ||||
| -rw-r--r-- | kde-base/kdemultimedia/kdemultimedia-3.4.0.ebuild | 6 | ||||
| -rw-r--r-- | kde-base/kdemultimedia/kdemultimedia-3.4.0_rc1.ebuild | 6 |
3 files changed, 26 insertions, 6 deletions
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.4.0-amd64.patch b/kde-base/kdemultimedia/files/kdemultimedia-3.4.0-amd64.patch new file mode 100644 index 000000000000..7d019d1a575e --- /dev/null +++ b/kde-base/kdemultimedia/files/kdemultimedia-3.4.0-amd64.patch @@ -0,0 +1,20 @@ +--- mpeglib/lib/input/cdromAccess.cpp.org 2005-02-02 14:06:28.000000000 +0100 ++++ mpeglib/lib/input/cdromAccess.cpp 2005-02-02 14:07:30.000000000 +0100 +@@ -27,6 +27,9 @@ + #include <sys/types.h> + #ifndef __u64 + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70) ++ #ifdef __x86_64__ ++ typedef unsigned long long __u64; ++ #else + #include <bits/wordsize.h> + #if __WORDSIZE == 64 + typedef unsigned long __u64; +@@ -35,6 +38,7 @@ + #endif + #endif + #endif ++ #endif + #include "cdromAccess_Linux.cpp" + #endif + diff --git a/kde-base/kdemultimedia/kdemultimedia-3.4.0.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.4.0.ebuild index 8ccb3ba1a961..cfc00c229b63 100644 --- a/kde-base/kdemultimedia/kdemultimedia-3.4.0.ebuild +++ b/kde-base/kdemultimedia/kdemultimedia-3.4.0.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.4.0.ebuild,v 1.1 2005/03/14 21:39:03 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.4.0.ebuild,v 1.2 2005/03/17 11:23:06 greg_g Exp $ inherit kde-dist eutils DESCRIPTION="KDE multimedia apps: noatun, kscd, juk..." KEYWORDS="~x86 ~amd64 ~sparc" -IUSE="alsa audiofile encode flac gstreamer mad oggvorbis speex theora xine" +IUSE="alsa audiofile encode flac gstreamer jack mad oggvorbis speex theora xine" DEPEND="~kde-base/kdebase-${PV} media-sound/cdparanoia @@ -30,7 +30,7 @@ DEPEND="~kde-base/kdebase-${PV} src_unpack() { kde_src_unpack - epatch "${FILESDIR}/kdemultimedia-3.4.0_beta1-amd64.patch" + epatch "${FILESDIR}/kdemultimedia-3.4.0-amd64.patch" } src_compile() { diff --git a/kde-base/kdemultimedia/kdemultimedia-3.4.0_rc1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.4.0_rc1.ebuild index b1dee7790af9..2b42d3762c59 100644 --- a/kde-base/kdemultimedia/kdemultimedia-3.4.0_rc1.ebuild +++ b/kde-base/kdemultimedia/kdemultimedia-3.4.0_rc1.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.4.0_rc1.ebuild,v 1.2 2005/02/28 14:30:04 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.4.0_rc1.ebuild,v 1.3 2005/03/17 11:23:06 greg_g Exp $ inherit kde-dist eutils DESCRIPTION="KDE multimedia apps: noatun, kscd, juk..." KEYWORDS="~x86 ~amd64 ~sparc" -IUSE="alsa audiofile encode flac gstreamer mad oggvorbis speex theora xine" +IUSE="alsa audiofile encode flac gstreamer jack mad oggvorbis speex theora xine" DEPEND="~kde-base/kdebase-${PV} media-sound/cdparanoia @@ -30,7 +30,7 @@ DEPEND="~kde-base/kdebase-${PV} src_unpack() { kde_src_unpack - epatch "${FILESDIR}/kdemultimedia-3.4.0_beta1-amd64.patch" + epatch "${FILESDIR}/kdemultimedia-3.4.0-amd64.patch" } src_compile() { |