From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JygZr-0003aM-Mf for garchives@archives.gentoo.org; Wed, 21 May 2008 05:09:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E476CE02BF; Wed, 21 May 2008 05:09:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 65984E02BF for ; Wed, 21 May 2008 05:09:26 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id D1BA0678AA for ; Wed, 21 May 2008 05:09:25 +0000 (UTC) Received: from beandog by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JygZo-0000Cc-IG for gentoo-commits@lists.gentoo.org; Wed, 21 May 2008 05:09:24 +0000 From: "Steve Dibb (beandog)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, beandog@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-1.0_rc2_p26753-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog mplayer-1.0_rc2_p26753-r1.ebuild X-VCS-Directories: media-video/mplayer X-VCS-Committer: beandog X-VCS-Committer-Name: Steve Dibb Content-Type: text/plain; charset=utf8 Message-Id: Sender: Steve Dibb Date: Wed, 21 May 2008 05:09:24 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c8d10a36-9405-4d75-855a-a81e5975d5fa X-Archives-Hash: da5acde57044f9eecab24ccd4947ffda beandog 08/05/21 05:09:24 Modified: ChangeLog Added: mplayer-1.0_rc2_p26753-r1.ebuild Log: Fix compilation on sparc, x86; remove strip restrction; move cpu opts o= ut of custom-cflags check (Portage version: 2.1.5) Revision Changes Path 1.573 media-video/mplayer/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/ChangeLog?rev=3D1.573&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/ChangeLog?rev=3D1.573&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/ChangeLog?r1=3D1.572&r2=3D1.573 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v retrieving revision 1.572 retrieving revision 1.573 diff -u -r1.572 -r1.573 --- ChangeLog 17 May 2008 14:04:09 -0000 1.572 +++ ChangeLog 21 May 2008 05:09:24 -0000 1.573 @@ -1,6 +1,20 @@ # ChangeLog for media-video/mplayer # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.572= 2008/05/17 14:04:09 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.573= 2008/05/21 05:09:24 beandog Exp $ + +*mplayer-1.0_rc2_p26753-r1 (21 May 2008) + + 21 May 2008; Steve Dibb + +files/configure-altivec.patch, +files/libswscale-sparc.patch, + +mplayer-1.0_rc2_p26753-r1.ebuild: + Fix compilation on ppc, sparc, bugs 217773, 222447 and 215006 + + Fix installing mplayer.desktop and mplayer.xpm, bug 219133 + + Remove strip restriction, bug 164492 + + Move CPU optimization checks out of custom-cflags use flag check, bug + 212318 =20 17 May 2008; Tobias Klausmann mplayer-1.0_rc2_p26753.ebuild: 1.1 media-video/mplayer/mplayer-1.0_rc2_p26753-r1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/mplayer-1.0_rc2_p26753-r1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/mplayer-1.0_rc2_p26753-r1.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: mplayer-1.0_rc2_p26753-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p2= 6753-r1.ebuild,v 1.1 2008/05/21 05:09:24 beandog Exp $ EAPI=3D"1" inherit eutils flag-o-matic multilib MPLAYER_REVISION=3D26753 IUSE=3D"3dnow 3dnowext +a52 aac -aalib +alsa altivec amrnb amrwb -arts bi= di bl bindist cddb cdio cdparanoia cpudetection custom-cflags debug dga doc dts= dvb directfb +dvd dv enca encode esd -fbcon ftp -gif ggi gtk iconv ipv6 jack = joystick -jpeg kernel_linux ladspa -libcaca lirc live lzo +mad -md5sum +m= mx mmxext mp2 +mp3 musepack nas nemesi unicode +vorbis opengl openal oss -png -pnm puls= eaudio quicktime radio -rar real rtc -samba sdl speex srt sse sse2 ssse3 svga te= letext tga +theora +truetype v4l v4l2 vidix win32codecs +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran" VIDEO_CARDS=3D"s3virge mga tdfx vesa" for x in ${VIDEO_CARDS}; do IUSE=3D"${IUSE} video_cards_${x}" done BLUV=3D"1.7" SVGV=3D"1.9.17" AMR_URI=3D"http://www.3gpp.org/ftp/Specs/archive" SRC_URI=3D"mirror://gentoo/${P}.tar.bz2 !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.b= z2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 ) !iconv? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 ) gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 ) svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2= )" DESCRIPTION=3D"Media Player for Linux" HOMEPAGE=3D"http://www.mplayerhq.hu/" RDEPEND=3D"sys-libs/ncurses !bindist? ( x86? ( win32codecs? ( media-libs/win32codecs ) real? ( media-libs/win32codecs media-video/realplayer ) ) amd64? ( real? ( media-libs/amd64codecs ) ) ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) amrnb? ( media-libs/amrnb ) amrwb? ( media-libs/amrwb ) arts? ( kde-base/arts ) openal? ( media-libs/openal ) bidi? ( dev-libs/fribidi ) cdio? ( dev-libs/libcdio ) cdparanoia? ( media-sound/cdparanoia ) directfb? ( dev-libs/DirectFB ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( media-tv/linuxtv-dvb-headers ) encode? ( aac? ( media-libs/faac ) mp2? ( media-sound/twolame ) mp3? ( media-sound/lame ) x264? ( media-libs/x264 ) ) esd? ( media-sound/esound ) enca? ( app-i18n/enca ) gif? ( media-libs/giflib ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gtk? ( media-libs/libpng x11-libs/libXxf86vm x11-libs/libXext x11-libs/libXi =3Dx11-libs/gtk+-2* ) jpeg? ( media-libs/jpeg ) ladspa? ( media-libs/ladspa-sdk ) libcaca? ( media-libs/libcaca ) lirc? ( app-misc/lirc ) lzo? ( >=3Ddev-libs/lzo-2 ) mad? ( media-libs/libmad ) musepack? ( >=3Dmedia-libs/libmpcdec-1.2.2 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( >=3Dmedia-libs/speex-1.1.7 ) srt? ( >=3Dmedia-libs/freetype-2.1 media-libs/fontconfig ) svga? ( media-libs/svgalib ) theora? ( media-libs/libtheora ) live? ( >=3Dmedia-plugins/live-2007.02.20 ) truetype? ( >=3Dmedia-libs/freetype-2.1 media-libs/fontconfig ) vidix? ( x11-libs/libXxf86vm x11-libs/libXext ) xanim? ( media-video/xanim ) xinerama? ( x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/libXext ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv x11-libs/libXxf86vm x11-libs/libXext xvmc? ( x11-libs/libXvMC ) ) xvid? ( media-libs/xvid ) X? ( x11-libs/libXxf86vm x11-libs/libXext )" DEPEND=3D"${RDEPEND} doc? ( >=3Dapp-text/docbook-sgml-dtd-4.1.2 app-text/docbook-xml-dtd >=3Dapp-text/docbook-xml-simple-dtd-1.50.0 dev-libs/libxslt ) dga? ( x11-proto/xf86dgaproto ) xinerama? ( x11-proto/xineramaproto ) xv? ( x11-proto/videoproto x11-proto/xf86vidmodeproto ) gtk? ( x11-proto/xextproto x11-proto/xf86vidmodeproto ) X? ( x11-proto/xextproto x11-proto/xf86vidmodeproto ) xscreensaver? ( x11-proto/scrnsaverproto ) iconv? ( virtual/libiconv )" # Make sure the assembler USE flags are unmasked on amd64 # Remove this once default-linux/amd64/2006.1 is deprecated DEPEND=3D"${DEPEND} amd64? ( >=3Dsys-apps/portage-2.1.2 ) mp2? ( >=3Dsys-apps/portage-2.1.2 )" SLOT=3D"0" LICENSE=3D"GPL-2" KEYWORDS=3D"~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" pkg_setup() { if [[ -n ${LINGUAS} ]]; then elog "For MPlayer's language support, the configuration will" elog "use your LINGUAS variable from /etc/make.conf. If you have more" elog "than one language enabled, then the first one in the list will" elog "be used to output the messages, if a translation is available." elog "man pages will be created for all languages where translations" elog "are also available." fi if use x86 || use amd64; then if ! use mmx; then ewarn "You have the 'mmx' use flag disabled for this package, which" ewarn "means that no CPU optimizations will be used at all." ewarn "" ewarn "The build will either break or playback and encode very" ewarn "slowly." ewarn "" ewarn "Check /proc/cpuinfo for possible CPU optimization" ewarn "flags that apply to this ebuild (mmx, mmxext, 3dnow," ewarn "3dnowext, sse, sse2), or if you are unsure enable them" ewarn "for this package in /etc/portage/package.use and they" ewarn "will be automatically detected by the build process." fi fi } src_unpack() { unpack ${A} if ! use truetype ; then unpack font-arial-iso-8859-1.tar.bz2 \ font-arial-iso-8859-2.tar.bz2 \ font-arial-cp1250.tar.bz2 fi use gtk && unpack "Blue-${BLUV}.tar.bz2" use svga && unpack "svgalib_helper-${SVGV}-mplayer.tar.bz2" cd "${S}" # Fix sparc compilation, bug 215006 epatch "${FILESDIR}/libswscale-sparc.patch" # Fix PPC configure check, but 222447 epatch "${FILESDIR}/configure-altivec.patch" # Set version # sed -i s/UNKNOWN/${MPLAYER_REVISION}/ "${S}/version.sh" # Fix hppa compilation use hppa && sed -i -e "s/-O4/-O1/" "${S}/configure" if use svga; then echo einfo "Enabling vidix non-root mode." einfo "(You need a proper svgalib_helper.o module for your kernel" einfo "to actually use this)" echo mv "${WORKDIR}/svgalib_helper" "${S}/libdha" fi # Fix polish spelling errors [[ -n ${LINGUAS} ]] && sed -e 's:Zarz=C4=85dano:Za=C5=BC=C4=85dano:' -i = help/help_mp-pl.h } src_compile() { local myconf=3D" --disable-tv-bsdbt848 \ --disable-faad-external" # broken upstream, won't work with recent kernels myconf=3D"${myconf} --disable-ivtv --disable-pvr" # MPlayer reads in the LINGUAS variable from make.conf, and sets # the languages accordingly. Some will have to be altered to match # upstream's naming scheme. [[ -n $LINGUAS ]] && LINGUAS=3D${LINGUAS/da/dk} ################ #Optional features# ############### use bidi || myconf=3D"${myconf} --disable-fribidi" use bl && myconf=3D"${myconf} --enable-bl" use enca || myconf=3D"${myconf} --disable-enca" use ftp || myconf=3D"${myconf} --disable-ftp" use nemesi || myconf=3D"${myconf} --disable-nemesi" use xscreensaver || myconf=3D"${myconf} --disable-xss" # libcdio support: prefer libcdio over cdparanoia # don't check for cddb w/cdio if use cdio; then myconf=3D"${myconf} --disable-cdparanoia" else myconf=3D"${myconf} --disable-libcdio" use cdparanoia || myconf=3D"${myconf} --disable-cdparanoia" use cddb || myconf=3D"${myconf} --disable-cddb" fi # DVD support # dvdread and libdvdcss are internal libs # http://www.mplayerhq.hu/DOCS/HTML/en/dvd.html # You can optionally use external dvdread support, but against # upstream's suggestion. We don't. if ! use dvd; then myconf=3D"${myconf} --disable-dvdnav --disable-dvdread" use a52 || myconf=3D"${myconf} --disable-liba52" fi if use encode; then use aac || myconf=3D"${myconf} --disable-faac --disable-faac-lavc" use dv || myconf=3D"${myconf} --disable-libdv" use mp3 || myconf=3D"${myconf} --disable-mp3lame --disable-mp3lame-lavc= " use x264 || myconf=3D"${myconf} --disable-x264 --disable-x264-lavc" use xvid || myconf=3D"${myconf} --disable-xvid --disable-xvid-lavc" else myconf=3D"${myconf} --disable-mencoder --disable-libdv --disable-x264 \ --disable-faac" fi # SRT (subtitles) requires freetype support # freetype support requires iconv # iconv optionally can use unicode if ! use srt; then myconf=3D"${myconf} --disable-ass" if ! use truetype; then myconf=3D"${myconf} --disable-freetype" if ! use iconv; then myconf=3D"${myconf} --disable-iconv --charset=3Dnoconv" fi fi fi use iconv && use unicode && myconf=3D"${myconf} --charset=3DUTF-8" use lirc || myconf=3D"${myconf} --disable-lirc --disable-lircc" myconf=3D"${myconf} $(use_enable joystick)" use ipv6 || myconf=3D"${myconf} --disable-inet6" use rar || myconf=3D"${myconf} --disable-unrarexec" use rtc || myconf=3D"${myconf} --disable-rtc" use samba || myconf=3D"${myconf} --disable-smb" # DVB / Video4Linux / Radio support if { use dvb || use v4l || use v4l2 || use radio; }; then use dvb || myconf=3D"${myconf} --disable-dvb --disable-dvbhead" use v4l || myconf=3D"${myconf} --disable-tv-v4l1" use v4l2 || myconf=3D"${myconf} --disable-tv-v4l2" use teletext || myconf=3D"${myconf} --disable-tv-teletext" if use radio && { use dvb || use v4l || use v4l2; }; then myconf=3D"${myconf} --enable-radio $(use_enable encode radio-capture)" else myconf=3D"${myconf} --disable-radio-v4l2 --disable-radio-bsdbt848" fi else myconf=3D"${myconf} --disable-tv --disable-tv-v4l1 --disable-tv-v4l2 \ --disable-radio --disable-radio-v4l2 --disable-radio-bsdbt848 \ --disable-dvb --disable-dvbhead --disable-tv-teletext \ --disable-v4l2" fi ######### # Codecs # ######## for x in gif jpeg live mad musepack pnm speex tga theora xanim; do use ${x} || myconf=3D"${myconf} --disable-${x}" done use amrnb || myconf=3D"${myconf} --disable-libamr_nb" use amrwb || myconf=3D"${myconf} --disable-libamr_wb" use dts || myconf=3D"${myconf} --disable-libdca" ! use png && ! use gtk && myconf=3D"${myconf} --disable-png" use lzo || myconf=3D"${myconf} --disable-liblzo" use encode && use mp2 || myconf=3D"${myconf} --disable-twolame \ --disable-toolame" use mp3 || myconf=3D"${myconf} --disable-mp3lib" use vorbis || myconf=3D"${myconf} --disable-libvorbis" use xanim && myconf=3D"${myconf} --xanimcodecsdir=3D/usr/lib/xanim/mods" if use x86 || use amd64; then # Real codec support, only available on x86, amd64 if use real && use x86; then myconf=3D"${myconf} --realcodecsdir=3D/opt/RealPlayer/codecs" elif use real && use amd64; then myconf=3D"${myconf} --realcodecsdir=3D/usr/$(get_libdir)/codecs" else myconf=3D"${myconf} --disable-real" fi if ! use bindist && ! use real; then myconf=3D"${myconf} $(use_enable win32codecs win32dll)" fi fi # bug 213836 if ! use x86 || ! use win32codecs; then use quicktime || myconf=3D"${myconf} --disable-qtx" fi ############# # Video Output # ############# for x in directfb ggi md5sum sdl xinerama; do use ${x} || myconf=3D"${myconf} --disable-${x}" done use aalib || myconf=3D"${myconf} --disable-aa" use dga || myconf=3D"${myconf} --disable-dga1 --disable-dga2" use fbcon || myconf=3D"${myconf} --disable-fbdev" use fbcon && use video_cards_s3virge && myconf=3D"${myconf} --enable-s3f= b" use libcaca || myconf=3D"${myconf} --disable-caca" use opengl || myconf=3D"${myconf} --disable-gl" use video_cards_vesa || myconf=3D"${myconf} --disable-vesa" use vidix || myconf=3D"${myconf} --disable-vidix-internal \ --disable-vidix-external \ --disable-vidix-pcidb" use zoran || myconf=3D"${myconf} --disable-zr" # GTK gmplayer gui myconf=3D"${myconf} $(use_enable gtk gui)" if use xv; then if use xvmc; then myconf=3D"${myconf} --enable-xvmc --with-xvmclib=3DXvMCW" else myconf=3D"${myconf} --disable-xvmc" fi else myconf=3D"${myconf} --disable-xv --disable-xvmc" fi if ! use kernel_linux && ! use video_cards_mga; then myconf=3D"${myconf} --disable-mga --disable-xmga" fi if use video_cards_tdfx; then myconf=3D"${myconf} $(use_enable video_cards_tdfx tdfxvid) \ $(use_enable fbcon tdfxfb)" else myconf=3D"${myconf} --disable-3dfx --disable-tdfxvid --disable-tdfxfb" fi ############# # Audio Output # ############# for x in alsa arts esd jack ladspa nas openal; do use ${x} || myconf=3D"${myconf} --disable-${x}" done use pulseaudio || myconf=3D"${myconf} --disable-pulse" if ! use radio; then use oss || myconf=3D"${myconf} --disable-ossaudio" fi ################# # Advanced Options # ################# # Platform specific flags, hardcoded on amd64 (see below) if use x86 || use amd64 || use ppc; then if use cpudetection || use bindist; then myconf=3D"${myconf} --enable-runtime-cpudetection" fi fi # Turning off CPU optimizations usually will break the build. Forcbily # enabling them isn't an option, so ewarn from above hopefully will # suffice. if use mmx; then for x in 3dnow 3dnowext mmxext sse sse2 ssse3; do use ${x} || myconf=3D"${myconf} --disable-${x}" done else myconf=3D"${myconf} --disable-mmx --disable-mmxext --disable-sse \ --disable-sse2 --disable-ssse3 --disable-3dnow \ --disable-3dnowext" fi use debug && myconf=3D"${myconf} --enable-debug=3D3" # This should be use masked on non ppc arches myconf=3D"${myconf} $(use_enable altivec)" if use custom-cflags; then # let's play the filtration game! MPlayer hates on all! strip-flags # ugly optimizations cause MPlayer to cry on x86 systems! if use x86 || use x86-fbsd ; then replace-flags -O* -O2 filter-flags -fPIC -fPIE use debug || append-flags -fomit-frame-pointer fi append-flags -D__STDC_LIMIT_MACROS else unset CFLAGS CXXFLAGS fi myconf=3D"--cc=3D$(tc-getCC) \ --host-cc=3D$(tc-getBUILD_CC) \ --prefix=3D/usr \ --confdir=3D/etc/mplayer \ --datadir=3D/usr/share/mplayer \ --libdir=3D/usr/$(get_libdir) \ --enable-menu \ --enable-network \ ${myconf}" #echo "CFLAGS=3D\"${CFLAGS}\" ./configure ${myconf}" CFLAGS=3D"${CFLAGS}" ./configure ${myconf} || die "configure died" emake || die "Failed to build MPlayer!" use doc && make -C DOCS/xml html-chunked } src_install() { make prefix=3D"${D}/usr" \ BINDIR=3D"${D}/usr/bin" \ LIBDIR=3D"${D}/usr/$(get_libdir)" \ CONFDIR=3D"${D}/etc/mplayer" \ DATADIR=3D"${D}/usr/share/mplayer" \ MANDIR=3D"${D}/usr/share/man" \ install || die "Failed to install MPlayer!" dodoc AUTHORS Changelog README # Install the documentation; DOCS is all mixed up not just html if use doc ; then find "${S}/DOCS" -type d | xargs -- chmod 0755 find "${S}/DOCS" -type f | xargs -- chmod 0644 cp -r "${S}/DOCS" "${D}/usr/share/doc/${PF}/" || die "cp docs died" fi # Copy misc tools to documentation path, as they're not installed direct= ly # and yes, we are nuking the +x bit. find "${S}/TOOLS" -type d | xargs -- chmod 0755 find "${S}/TOOLS" -type f | xargs -- chmod 0644 cp -r "${S}/TOOLS" "${D}/usr/share/doc/${PF}/" || die "cp docs died" # Install the default Skin and Gnome menu entry if use gtk; then dodir /usr/share/mplayer/skins cp -r "${WORKDIR}/Blue" \ "${D}/usr/share/mplayer/skins/default" || die "cp skins died" # Fix the symlink rm -rf "${D}/usr/bin/gmplayer" dosym mplayer /usr/bin/gmplayer # This version of Makefile doesn't call install-gui directly, # leaving out mplayer.{desktop,xpm}, bug 219133 emake DESTDIR=3D"${D}" install-gui fi if ! use srt && ! use truetype; then dodir /usr/share/mplayer/fonts local x=3D # Do this generic, as the mplayer people like to change the structure # of their zips ... for x in $(find "${WORKDIR}/" -type d -name 'font-arial-*') do cp -pPR "${x}" "${D}/usr/share/mplayer/fonts" done # Fix the font symlink ... rm -rf "${D}/usr/share/mplayer/font" dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font fi insinto /etc/mplayer newins "${S}/etc/example.conf" mplayer.conf if use srt || use truetype; then cat >> "${D}/etc/mplayer/mplayer.conf" << EOT fontconfig=3D1 subfont-osd-scale=3D4 subfont-text-scale=3D3 EOT fi dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf dobin "${D}/usr/share/doc/${PF}/TOOLS/midentify" insinto /usr/share/mplayer doins "${S}/etc/input.conf" doins "${S}/etc/menu.conf" } pkg_preinst() { if [[ -d ${ROOT}/usr/share/mplayer/Skin/default ]] then rm -rf "${ROOT}/usr/share/mplayer/Skin/default" fi } pkg_postrm() { # Cleanup stale symlinks if [ -L "${ROOT}/usr/share/mplayer/font" -a \ ! -e "${ROOT}/usr/share/mplayer/font" ] then rm -f "${ROOT}/usr/share/mplayer/font" fi if [ -L "${ROOT}/usr/share/mplayer/subfont.ttf" -a \ ! -e "${ROOT}/usr/share/mplayer/subfont.ttf" ] then rm -f "${ROOT}/usr/share/mplayer/subfont.ttf" fi } --=20 gentoo-commits@lists.gentoo.org mailing list