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 | 109c5412eda3ee87c43d9d3d57ecfea9d8296fec (patch) | |
| tree | 544f311b658778a2887263ee29146ce2b4defb2f /kde-base | |
| parent | Readd patch that was mistakenly removed. (diff) | |
| download | historical-109c5412eda3ee87c43d9d3d57ecfea9d8296fec.tar.gz historical-109c5412eda3ee87c43d9d3d57ecfea9d8296fec.tar.bz2 historical-109c5412eda3ee87c43d9d3d57ecfea9d8296fec.zip | |
Readd patch that was mistakenly removed.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdemultimedia/Manifest | 17 | ||||
| -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 |
4 files changed, 35 insertions, 14 deletions
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest index f7eb51c12925..d8d3e77fabf4 100644 --- a/kde-base/kdemultimedia/Manifest +++ b/kde-base/kdemultimedia/Manifest @@ -1,15 +1,16 @@ -MD5 c5019ea992fa01620e6479bb5843a8f2 kdemultimedia-3.3.2.ebuild 1768 -MD5 d8efa8b52887fa4357e5d94b6ee25f53 kdemultimedia-3.4.0_rc1.ebuild 1544 -MD5 31d9d85a18bcc6fdb30e40eadba73a53 kdemultimedia-3.4.0.ebuild 1540 +MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 MD5 6bbcf1aafec0078c22497fa89978e86d kdemultimedia-3.2.3.ebuild 1528 MD5 963d43f63fa58026d51d9033ac072a50 kdemultimedia-3.3.1.ebuild 1703 +MD5 c5019ea992fa01620e6479bb5843a8f2 kdemultimedia-3.3.2.ebuild 1768 MD5 3df8dab9a9c2a9e3f1e254e4be4dde66 ChangeLog 22512 -MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 -MD5 b9cce2b0015700be978730f7bba11352 files/3.2.3-Makefile-synth.am.diff 537 +MD5 324fdb53e30000a4c8101ed91b38522e kdemultimedia-3.4.0.ebuild 1539 +MD5 64d0da2dee26922a83d21f991b5a49fc kdemultimedia-3.4.0_rc1.ebuild 1543 +MD5 b7a984a57c27e1e62a606d90d0c39437 files/kdemultimedia-3.4.0-amd64.patch 523 MD5 02f0ce7ea2ec6f7f7042f7f40f7f7fe7 files/artsc-typo.diff 439 -MD5 5df31531a06abbf1c3a8d53c21d9452f files/digest-kdemultimedia-3.4.0_rc1 77 MD5 ddadc716d5d607434a4fa830a241ac65 files/digest-kdemultimedia-3.2.3 73 -MD5 b25b44699f69e998481bd9aad08e1cef files/digest-kdemultimedia-3.3.1 73 MD5 30810bdee5baa766c389b0a4d8533a4e files/digest-kdemultimedia-3.3.2 73 -MD5 1b6b47988f359abcece7b1f1f5b98377 files/digest-kdemultimedia-3.4.0 73 MD5 0af60268ec8424c72256db89062b6f31 files/kdemultimedia-64bit.patch 634 +MD5 b25b44699f69e998481bd9aad08e1cef files/digest-kdemultimedia-3.3.1 73 +MD5 1b6b47988f359abcece7b1f1f5b98377 files/digest-kdemultimedia-3.4.0 73 +MD5 b9cce2b0015700be978730f7bba11352 files/3.2.3-Makefile-synth.am.diff 537 +MD5 5df31531a06abbf1c3a8d53c21d9452f files/digest-kdemultimedia-3.4.0_rc1 77 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() { |