diff options
| author |   Gregorio Guidi <greg_g@gentoo.org> | 2005-03-17 11:43:04 +0000 |
|---|---|---|
| committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-03-17 11:43:04 +0000 |
| commit | 9b43a68b1f13755ddeadedb9a9a3c9b37505f2ec (patch) | |
| tree | 8e79c186f029f1f59c19ecb9a18d00e530a64d88 /kde-base/mpeglib | |
| parent | Version bump. Apparently the build number of the latest release candidate cha... (diff) | |
| download | historical-9b43a68b1f13755ddeadedb9a9a3c9b37505f2ec.tar.gz historical-9b43a68b1f13755ddeadedb9a9a3c9b37505f2ec.tar.bz2 historical-9b43a68b1f13755ddeadedb9a9a3c9b37505f2ec.zip | |
Readd patch that was mistakenly removed.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'kde-base/mpeglib')
| -rw-r--r-- | kde-base/mpeglib/files/kdemultimedia-3.4.0-amd64.patch | 20 | ||||
| -rw-r--r-- | kde-base/mpeglib/files/kdemultimedia-64bit.patch | 20 | ||||
| -rw-r--r-- | kde-base/mpeglib/mpeglib-3.4.0.ebuild | 5 | ||||
| -rw-r--r-- | kde-base/mpeglib/mpeglib-3.4.0_rc1.ebuild | 5 |
4 files changed, 24 insertions, 26 deletions
diff --git a/kde-base/mpeglib/files/kdemultimedia-3.4.0-amd64.patch b/kde-base/mpeglib/files/kdemultimedia-3.4.0-amd64.patch new file mode 100644 index 000000000000..7d019d1a575e --- /dev/null +++ b/kde-base/mpeglib/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/mpeglib/files/kdemultimedia-64bit.patch b/kde-base/mpeglib/files/kdemultimedia-64bit.patch deleted file mode 100644 index a2eb8cc89e28..000000000000 --- a/kde-base/mpeglib/files/kdemultimedia-64bit.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mpeglib/lib/input/cdromAccess.cpp.orig 2004-12-17 19:48:52.348984280 +0000 -+++ mpeglib/lib/input/cdromAccess.cpp 2004-12-17 19:49:01.656900680 +0000 -@@ -26,9 +26,14 @@ - #include <linux/version.h> - #include <sys/types.h> - #ifndef __u64 -- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70) -- typedef unsigned long long __u64; -- #endif -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70) -+ #include <bits/wordsize.h> -+ #if __WORDSIZE == 64 -+ typedef unsigned long __u64; -+ #else -+ typedef unsigned long long __u64; -+ #endif -+ #endif - #endif - #include "cdromAccess_Linux.cpp" - #endif diff --git a/kde-base/mpeglib/mpeglib-3.4.0.ebuild b/kde-base/mpeglib/mpeglib-3.4.0.ebuild index 034c923e1410..c678120e513a 100644 --- a/kde-base/mpeglib/mpeglib-3.4.0.ebuild +++ b/kde-base/mpeglib/mpeglib-3.4.0.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/kde-base/mpeglib/mpeglib-3.4.0.ebuild,v 1.2 2005/03/14 15:18:14 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.4.0.ebuild,v 1.3 2005/03/17 11:43:04 greg_g Exp $ KMNAME=kdemultimedia MAXKDEVER=$PV @@ -14,5 +14,4 @@ DEPEND="media-sound/cdparanoia" myconf="--with-cdparanoia --enable-cdparanoia" -PATCHES="${FILESDIR}/kdemultimedia-3.4.0_beta1-amd64.patch" - +PATCHES="${FILESDIR}/kdemultimedia-3.4.0-amd64.patch" diff --git a/kde-base/mpeglib/mpeglib-3.4.0_rc1.ebuild b/kde-base/mpeglib/mpeglib-3.4.0_rc1.ebuild index 27385dceebd4..8cd6b3b4161c 100644 --- a/kde-base/mpeglib/mpeglib-3.4.0_rc1.ebuild +++ b/kde-base/mpeglib/mpeglib-3.4.0_rc1.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/kde-base/mpeglib/mpeglib-3.4.0_rc1.ebuild,v 1.1 2005/03/06 01:34:59 motaboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.4.0_rc1.ebuild,v 1.2 2005/03/17 11:43:04 greg_g Exp $ KMNAME=kdemultimedia MAXKDEVER=3.4.0_rc1 @@ -16,6 +16,5 @@ myconf="--with-cdparanoia --enable-cdparanoia" src_unpack() { kde-meta_src_unpack - epatch "${FILESDIR}/kdemultimedia-3.4.0_beta1-amd64.patch" + epatch "${FILESDIR}/kdemultimedia-3.4.0-amd64.patch" } - |