Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-video/mplayer
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-07-23 18:18:41 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-07-23 18:18:41 +0000
commit3b3b1bf28de714e5efc5c4816616f9664055202d (patch)
tree7ded593b77a5da3fe7adbb9849d5093cad20d4e9 /media-video/mplayer
parentStable on macos. (diff)
downloadhistorical-3b3b1bf28de714e5efc5c4816616f9664055202d.tar.gz
historical-3b3b1bf28de714e5efc5c4816616f9664055202d.tar.bz2
historical-3b3b1bf28de714e5efc5c4816616f9664055202d.zip
Added kernel-2.6 fix on sparc (removes old workaround).
Diffstat (limited to 'media-video/mplayer')
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/Manifest30
-rw-r--r--media-video/mplayer/mplayer-1.0_pre5-r1.ebuild6
3 files changed, 25 insertions, 17 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 1f29488bfa11..c95e659d00ef 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.172 2004/07/23 15:56:56 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.173 2004/07/23 18:18:41 eradicator Exp $
+
+ 23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ mplayer-1.0_pre5-r1.ebuild:
+ Added kernel-2.6 fix on sparc (removes old workaround).
23 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r6.ebuild,
mplayer-1.0_pre5-r1.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 46358b1b296d..efe5e9cad2e4 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,4 +1,4 @@
-MD5 0ed4f618a008682b0112d7245ec1bab8 ChangeLog 30902
+MD5 ad108a13200495cfb675e742d80f502a ChangeLog 31048
MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
MD5 b813a65769af5d2a2ca1ceba1347974d mplayer-0.92-r1.ebuild 11511
MD5 7eeb1235c1263ecb110925e53de1eb06 mplayer-1.0_pre2-r1.ebuild 11375
@@ -9,10 +9,9 @@ MD5 1c2c6d32766ce3bf0974895533252491 mplayer-1.0_pre4-r1.ebuild 11659
MD5 fbdd96b2a3f0f78bdc8cbded3bb3927b mplayer-1.0_pre4-r2.ebuild 11948
MD5 6b9e16c4f08ac48748812909ed431f31 mplayer-1.0_pre4-r3.ebuild 13034
MD5 d13f33f9022f7abccfe9b14f96531057 mplayer-1.0_pre4-r4.ebuild 13157
-MD5 917db1eb81ce81527a7e2e5e018f819c mplayer-1.0_pre4-r6.ebuild 12540
MD5 071a354aa3c0e9290b6dcfc8c3621d87 mplayer-1.0_pre4.ebuild 11319
-MD5 793bf3aa4042e24778fe57d872ffce48 mplayer-1.0_pre5-r1.ebuild 12208
-MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
+MD5 917db1eb81ce81527a7e2e5e018f819c mplayer-1.0_pre4-r6.ebuild 12540
+MD5 aa751f9e7587133190a122a65df74131 mplayer-1.0_pre5-r1.ebuild 12384
MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358
@@ -25,7 +24,7 @@ MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r2 358
MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r3 358
MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r4 358
MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
-MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
+MD5 b0c29f18a794b9299a45b80f70cb5325 files/cachefill.patch 6053
MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
@@ -36,22 +35,23 @@ MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.pat
MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810
MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411
MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
+MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
+MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
+MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
+MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
MD5 aaadaff9756ff85c9855b2bbd50da184 files/mplayer-1.0_pre4-gcc34-mtune.patch 3493
MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267
+MD5 084f1aa4fbe48d34c3154d5a4f238579 files/amd64_fix_the_blue_love.patch 17751
+MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r6 358
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
MD5 ad254e1f8a5166ae1c5b53bc3c76ffd2 files/mplayer-1.0_pre5-yuv2rbg_kludge.patch 12585
-MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
MD5 d7d214ab46189ad1138a0a37eaa859d4 files/noenca.patch 289
-MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
-MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
-MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
-MD5 b0c29f18a794b9299a45b80f70cb5325 files/cachefill.patch 6053
-MD5 3aabe241ce3c7d60ea6f607cb7ab033a files/digest-mplayer-1.0_pre5-r1 358
+MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
-MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
-MD5 084f1aa4fbe48d34c3154d5a4f238579 files/amd64_fix_the_blue_love.patch 17751
MD5 7dce8f2598e84e3d94186e2eb50f553b files/mplayer-1.0_pre4-mga-kernel2.6.patch 27826
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
-MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r6 358
+MD5 3aabe241ce3c7d60ea6f607cb7ab033a files/digest-mplayer-1.0_pre5-r1 358
+MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild
index 54eb52244859..a4aa6928e7f8 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild,v 1.6 2004/07/23 15:56:56 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild,v 1.7 2004/07/23 18:18:41 eradicator Exp $
inherit eutils flag-o-matic kmod
@@ -140,6 +140,10 @@ src_unpack() {
mv ${WORKDIR}/svgalib_helper ${S}/libdha
fi
+
+ # Remove kernel-2.6 workaround as the problem it works around is
+ # fixed, and the workaround breaks sparc
+ use sparc && sed -i 's:#define __KERNEL__::' osdep/kerneltwosix.h
}
src_compile() {