diff options
| -rw-r--r-- | kde-base/kdemultimedia/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kdemultimedia/Manifest | 5 | ||||
| -rw-r--r-- | kde-base/kdemultimedia/files/kdemultimedia-3.4.0_beta1-amd64.patch | 20 | ||||
| -rw-r--r-- | kde-base/kdemultimedia/kdemultimedia-3.4.0_beta1.ebuild | 8 |
4 files changed, 36 insertions, 4 deletions
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog index 5b667ee98574..d48a6ead6aae 100644 --- a/kde-base/kdemultimedia/ChangeLog +++ b/kde-base/kdemultimedia/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdemultimedia # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.148 2005/02/02 11:48:19 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.149 2005/02/02 13:13:24 lanius Exp $ + + 02 Feb 2005; Heinrich Wendel <lanius@gentoo.org> + +files/kdemultimedia-3.4.0_beta1-amd64.patch, + kdemultimedia-3.4.0_beta1.ebuild: + fix compilation on amd64 02 Feb 2005; Heinrich Wendel <lanius@gentoo.org> kdemultimedia-3.4.0_beta1.ebuild: diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest index b5fc0c3e7517..9febe86ce46c 100644 --- a/kde-base/kdemultimedia/Manifest +++ b/kde-base/kdemultimedia/Manifest @@ -1,11 +1,11 @@ MD5 77bd278e178adb16aead4fe2382ed31e kdemultimedia-3.3.2.ebuild 1779 MD5 63b7567afe23e1445e88a2288aab69a2 kdemultimedia-3.2.3.ebuild 1547 -MD5 a375249a306057e68351384871f22289 kdemultimedia-3.4.0_beta1.ebuild 1516 +MD5 c64ba0963787ff0694b9a5a53840b1ac kdemultimedia-3.4.0_beta1.ebuild 1596 MD5 27fc32c94ade093f8716cf25808e0027 kdemultimedia-3.3.1.ebuild 1722 MD5 5cc7ded8167f4037596dc6210b68f7cc kdemultimedia-3.2.0.ebuild 2254 MD5 ffd16297960f48c790d83561757ad93a kdemultimedia-3.2.2-r1.ebuild 1462 MD5 4708f39fb6297897dafd78de707b5be3 kdemultimedia-3.3.0.ebuild 1803 -MD5 f84b43741dac368b8969e1ba913c054a ChangeLog 21469 +MD5 7b6e568acae7f6f91d234087a4ec9453 ChangeLog 21632 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 MD5 a39413062132d248ceae0b20ed262e79 files/flac-patch.diff 450 MD5 373aaabfcb29c89281c6880b2a784c2a files/digest-kdemultimedia-3.2.2-r1 73 @@ -19,3 +19,4 @@ MD5 ff71f209a5c07db1d7ba70b4109484f0 files/digest-kdemultimedia-3.3.0 73 MD5 b25b44699f69e998481bd9aad08e1cef files/digest-kdemultimedia-3.3.1 73 MD5 30810bdee5baa766c389b0a4d8533a4e files/digest-kdemultimedia-3.3.2 73 MD5 0af60268ec8424c72256db89062b6f31 files/kdemultimedia-64bit.patch 634 +MD5 b7a984a57c27e1e62a606d90d0c39437 files/kdemultimedia-3.4.0_beta1-amd64.patch 523 diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.4.0_beta1-amd64.patch b/kde-base/kdemultimedia/files/kdemultimedia-3.4.0_beta1-amd64.patch new file mode 100644 index 000000000000..7d019d1a575e --- /dev/null +++ b/kde-base/kdemultimedia/files/kdemultimedia-3.4.0_beta1-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_beta1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.4.0_beta1.ebuild index ff7108143397..0ab8a3b0503e 100644 --- a/kde-base/kdemultimedia/kdemultimedia-3.4.0_beta1.ebuild +++ b/kde-base/kdemultimedia/kdemultimedia-3.4.0_beta1.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/kdemultimedia/kdemultimedia-3.4.0_beta1.ebuild,v 1.6 2005/02/02 11:48:19 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.4.0_beta1.ebuild,v 1.7 2005/02/02 13:13:24 lanius Exp $ inherit kde-dist flag-o-matic @@ -25,6 +25,12 @@ DEPEND="~kde-base/kdebase-${PV} media-libs/tunepimp !media-sound/juk" +src_unpack() { + kde_src_unpack + cd ${S} + epatch ${FILESDIR}/${P}-amd64.patch +} + src_compile() { use xine && myconf="$myconf --with-xine-prefix=/usr" use xine || DO_NOT_COMPILE="$DO_NOT_COMPILE xine_artsplugin" |