diff options
author | Patrick Kursawe <phosphan@gentoo.org> | 2004-06-08 05:50:35 +0000 |
---|---|---|
committer | Patrick Kursawe <phosphan@gentoo.org> | 2004-06-08 05:50:35 +0000 |
commit | b22fa4ab484c7d44c862e0600fc3f09208a91fa4 (patch) | |
tree | 8eed4be10ad148cfae4f0b2866e39448c27fe3e4 /media-video | |
parent | Added a patch for nsswitch.ldap so a files lookup is done before dns to resol... (diff) | |
download | historical-b22fa4ab484c7d44c862e0600fc3f09208a91fa4.tar.gz historical-b22fa4ab484c7d44c862e0600fc3f09208a91fa4.tar.bz2 historical-b22fa4ab484c7d44c862e0600fc3f09208a91fa4.zip |
Doing matrox related stuff only when matrox is in USE, see bug #53222
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/mplayer/ChangeLog | 6 | ||||
-rw-r--r-- | media-video/mplayer/Manifest | 54 | ||||
-rw-r--r-- | media-video/mplayer/mplayer-1.0_pre4-r3.ebuild | 41 | ||||
-rw-r--r-- | media-video/mplayer/mplayer-1.0_pre4-r4.ebuild | 42 |
4 files changed, 78 insertions, 65 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index a21882d442cc..a92d86451e18 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.143 2004/06/02 21:50:53 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.144 2004/06/08 05:50:35 phosphan Exp $ + + 08 Jun 2004; Patrick Kursawe <phosphan@gentoo.org> + mplayer-1.0_pre4-r3.ebuild, mplayer-1.0_pre4-r4.ebuild: + Doing matrox related stuff only when matrox is in USE, see bug #53222 02 Jun 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r1.ebuild, mplayer-1.0_pre4-r2.ebuild, mplayer-1.0_pre4-r3.ebuild, diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 0014c3443b3f..5f7d8c74e8b0 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,39 +1,39 @@ -MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 -MD5 06a993cb89fac55613aad364670c41fb mplayer-0.92-r1.ebuild 11570 -MD5 f98bc5b521254207cb231a9eb853f522 mplayer-1.0_pre2-r1.ebuild 11435 -MD5 95426d21a3f8920fc3b0d94ade8ad0bd mplayer-1.0_pre3-r3.ebuild 11549 -MD5 5750ffac79bdaf1edf0bd57c07c14c73 ChangeLog 25351 MD5 633cbda54fcb59b371bbfb86f475bd84 mplayer-1.0_pre3-r4.ebuild 11851 +MD5 4dfda0625a988c965b48c519427bbe2b mplayer-1.0_pre4-r3.ebuild 12827 +MD5 673771f087789227dc198d67782311cc mplayer-1.0_pre4.ebuild 11395 +MD5 95426d21a3f8920fc3b0d94ade8ad0bd mplayer-1.0_pre3-r3.ebuild 11549 +MD5 f98bc5b521254207cb231a9eb853f522 mplayer-1.0_pre2-r1.ebuild 11435 +MD5 c3d248335b112a76d4d6277befe02a40 mplayer-1.0_pre4-r2.ebuild 11787 MD5 1a08c3bbc9cc90150bcf0228848ec76f mplayer-1.0_pre3-r5.ebuild 11525 +MD5 d2f3cdc5c4764cf3a7de026575122dc3 mplayer-1.0_pre4-r4.ebuild 13082 +MD5 06a993cb89fac55613aad364670c41fb mplayer-0.92-r1.ebuild 11570 +MD5 2f9bc408f7dcc0920548a79845c6381d ChangeLog 25534 +MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 MD5 6ed3850c8189e79bb2d7665797497a5e mplayer-1.0_pre4-r1.ebuild 11517 -MD5 c3d248335b112a76d4d6277befe02a40 mplayer-1.0_pre4-r2.ebuild 11787 -MD5 7c5f06c078016983ff939c816d7375f5 mplayer-1.0_pre4-r3.ebuild 12742 -MD5 3959c036afb446c12d64214bbefe062e mplayer-1.0_pre4-r4.ebuild 12994 -MD5 673771f087789227dc198d67782311cc mplayer-1.0_pre4.ebuild 11395 -MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396 MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355 +MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183 +MD5 98c7d58f544829621b15427ad53b98e4 files/mga-kernel-2.6.patch 16767 +MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515 +MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520 +MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396 +MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857 +MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre3-alsa-gcc34.patch 299 +MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231 +MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119 +MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411 +MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4 358 +MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903 +MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049 +MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810 +MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467 MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r3 358 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r4 358 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r5 358 -MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4 358 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r1 358 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r2 358 -MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520 -MD5 98c7d58f544829621b15427ad53b98e4 files/mga-kernel-2.6.patch 16767 -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 -MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183 -MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903 -MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre3-alsa-gcc34.patch 299 -MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.patch 5010 -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 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r3 358 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r4 358 +MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299 +MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.patch 5010 +MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064 diff --git a/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild index bac66224751c..260cc7523577 100644 --- a/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild,v 1.8 2004/06/02 21:50:53 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild,v 1.9 2004/06/08 05:50:35 phosphan Exp $ inherit eutils flag-o-matic kmod @@ -111,26 +111,27 @@ src_unpack() { epatch ${FILESDIR}/${P}-alsa-gcc34.patch # fixes for mga driver with kernel 2.6 - get_kernel_info - epatch ${FILESDIR}/mga-kernel-2.6.patch - sed -i -e "s/KERNEL_VERSION_HERE/${KV_VERSION_FULL}/" drivers/Makefile \ - || die "sed failed on kernel version substitution" - - # preparing build for 2.6 mga kernel module - cp ${KV_OUTPUT}/.config ${T}/ - ln -s /usr/src/linux/scripts ${T}/ - ln -s /usr/src/linux/include ${T}/ - sed -e "s:SUBDIRS:O=${T} SUBDIRS:" -i drivers/Makefile \ - || die "sed failed setting O=${T}" - sed -e "s:^MDIR = .*:MDIR = ${D}/lib/modules/${KV_VERSION_FULL}/kernel/drivers/char/:" -i drivers/Makefile \ - || die "sed failed correcting module install path" - sed -e "s:depmod -a::" -i drivers/Makefile \ - || die "sed failed removing depmod" - + if use matrox; then + get_kernel_info + epatch ${FILESDIR}/mga-kernel-2.6.patch + sed -i -e "s/KERNEL_VERSION_HERE/${KV_VERSION_FULL}/" drivers/Makefile \ + || die "sed failed on kernel version substitution" + + # preparing build for 2.6 mga kernel module + cp ${KV_OUTPUT}/.config ${T}/ + ln -s /usr/src/linux/scripts ${T}/ + ln -s /usr/src/linux/include ${T}/ + sed -e "s:SUBDIRS:O=${T} SUBDIRS:" -i drivers/Makefile \ + || die "sed failed setting O=${T}" + sed -e "s:^MDIR = .*:MDIR = ${D}/lib/modules/${KV_VERSION_FULL}/kernel/drivers/char/:" -i drivers/Makefile \ + || die "sed failed correcting module install path" + sed -e "s:depmod -a::" -i drivers/Makefile \ + || die "sed failed removing depmod" + fi # end of matrox related stuff # Fix hppa detection [ "${ARCH}" = "hppa" ] && sed -i -e "s/9000*/parisc*/" "${S}/configure" - if [ "`use svga`" ] + if use svga then echo einfo "Enabling vidix non-root mode." @@ -416,7 +417,9 @@ pkg_postinst() { einfo "application that depends on it, install >=ffmpeg-0.4.8.20040222" fi - depmod -a &>/dev/null || : + if use matrox; then + depmod -a &>/dev/null || : + fi } pkg_postrm() { diff --git a/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild index 389f81d71f95..53639cbf9abc 100644 --- a/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild,v 1.7 2004/06/02 21:50:53 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild,v 1.8 2004/06/08 05:50:35 phosphan Exp $ inherit eutils flag-o-matic kmod @@ -114,26 +114,30 @@ src_unpack() { epatch ${FILESDIR}/${P}-alsa-gcc34.patch # fixes for mga driver with kernel 2.6 - get_kernel_info - epatch ${FILESDIR}/mga-kernel-2.6.patch - sed -i -e "s/KERNEL_VERSION_HERE/${KV_VERSION_FULL}/" drivers/Makefile \ - || die "sed failed on kernel version substitution" - - # preparing build for 2.6 mga kernel module - cp ${KV_OUTPUT}/.config ${T}/ - ln -s /usr/src/linux/scripts ${T}/ - ln -s /usr/src/linux/include ${T}/ - sed -e "s:SUBDIRS:O=${T} SUBDIRS:" -i drivers/Makefile \ - || die "sed failed setting O=${T}" - sed -e "s:^MDIR = .*:MDIR = ${D}/lib/modules/${KV_VERSION_FULL}/kernel/drivers/char/:" -i drivers/Makefile \ - || die "sed failed correcting module install path" - sed -e "s:depmod -a::" -i drivers/Makefile \ - || die "sed failed removing depmod" + if use matrox; then + get_kernel_info + + epatch ${FILESDIR}/mga-kernel-2.6.patch + sed -i -e "s/KERNEL_VERSION_HERE/${KV_VERSION_FULL}/" drivers/Makefile \ + || die "sed failed on kernel version substitution" + + # preparing build for 2.6 mga kernel module + cp ${KV_OUTPUT}/.config ${T}/ + ln -s /usr/src/linux/scripts ${T}/ + ln -s /usr/src/linux/include ${T}/ + sed -e "s:SUBDIRS:O=${T} SUBDIRS:" -i drivers/Makefile \ + || die "sed failed setting O=${T}" + sed -e "s:^MDIR = .*:MDIR = ${D}/lib/modules/${KV_VERSION_FULL}/kernel/drivers/char/:" -i drivers/Makefile \ + || die "sed failed correcting module install path" + sed -e "s:depmod -a::" -i drivers/Makefile \ + || die "sed failed removing depmod" + + fi # end of matrox related stuff # Fix hppa compilation [ "${ARCH}" = "hppa" ] && sed -i -e "s/-O4/-O1/" "${S}/configure" - if [ "`use svga`" ] + if use svga then echo einfo "Enabling vidix non-root mode." @@ -425,7 +429,9 @@ pkg_postinst() { einfo "application that depends on it, install >=ffmpeg-0.4.8.20040222" fi - depmod -a &>/dev/null || : + if use matrox; then + depmod -a &>/dev/null || : + fi } pkg_postrm() { |