[gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2009-03-24 14:14 Steve Dibb (beandog)
  0 siblings, 0 replies; 73+ messages in thread
From: Steve Dibb (beandog) @ 2009-03-24 14:14 UTC (permalink / raw
  To: gentoo-commits

beandog     09/03/24 14:14:39

  Modified:             ChangeLog
  Added:                mplayer-9999.ebuild
  Log:
  Add live ebuild
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.630                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.630&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.630&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.629&r2=1.630

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.629
retrieving revision 1.630
diff -u -r1.629 -r1.630
--- ChangeLog	24 Mar 2009 14:07:05 -0000	1.629
+++ ChangeLog	24 Mar 2009 14:14:39 -0000	1.630
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.629 2009/03/24 14:07:05 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.630 2009/03/24 14:14:39 beandog Exp $
+
+*mplayer-9999 (24 Mar 2009)
+
+  24 Mar 2009; Steve Dibb <beandog@gentoo.org> +mplayer-9999.ebuild:
+  Add live ebuild
 
   24 Mar 2009; Steve Dibb <beandog@gentoo.org>
   mplayer-1.0_rc2_p20090226.ebuild, mplayer-1.0_rc2_p20090322.ebuild:



1.1                  media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.1&content-type=text/plain

Index: mplayer-9999.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.1 2009/03/24 14:14:39 beandog Exp $

EAPI="1"

ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"

inherit eutils flag-o-matic multilib subversion

IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +amrnb +amrwb arts +ass
bidi bindist bl +cddb +cdio cdparanoia -cpudetection -custom-cflags
-custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav dxr3
+enca +encode esd +faac +faad fbcon ftp gif ggi -gtk +iconv ipv6 jack
joystick jpeg kernel_linux ladspa libcaca lirc +live lzo mad md5sum +mmx
mmxext mng +mp2 +mp3 musepack nas +nemesi +network openal +opengl oss png pnm
pulseaudio pvr +quicktime radio +rar +real +rtc -samba
+schroedinger sdl +speex sse sse2 ssse3 svga teletext tga +theora +tremor
+truetype +unicode v4l v4l2 vdpau vidix +vorbis -win32codecs +X +x264 xanim
xinerama +xscreensaver +xv +xvid xvmc zoran"

VIDEO_CARDS="s3virge mga tdfx nvidia vesa"

for x in ${VIDEO_CARDS}; do
	IUSE="${IUSE} video_cards_${x}"
done

BLUV="1.7"
SVGV="1.9.17"
AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
SRC_URI="!truetype? ( 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 )
	!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="Media Player for Linux"
HOMEPAGE="http://www.mplayerhq.hu/"

RDEPEND="sys-libs/ncurses
	!bindist? (
		x86? (
			win32codecs? ( media-libs/win32codecs )
			)
	)
	aalib? ( media-libs/aalib )
	alsa? ( media-libs/alsa-lib )
	amrnb? ( media-libs/amrnb )
	amrwb? ( media-libs/amrwb )
	arts? ( kde-base/arts )
	ass? ( media-libs/freetype:2
		media-libs/fontconfig )
	openal? ( media-libs/openal )
	bidi? ( dev-libs/fribidi )
	cdio? ( dev-libs/libcdio )
	cdparanoia? ( media-sound/cdparanoia )
	dirac? ( media-video/dirac )
	directfb? ( dev-libs/DirectFB )
	dga? ( x11-libs/libXxf86dga  )
	dts? ( media-libs/libdca )
	dv? ( media-libs/libdv )
	dvb? ( media-tv/linuxtv-dvb-headers )
	encode? (
		mp2? ( media-sound/twolame )
		mp3? ( media-sound/lame )
		faac? ( media-libs/faac )
		x264? ( >=media-libs/x264-0.0.20081006 )
		xvid? ( media-libs/xvid )
		)
	esd? ( media-sound/esound )
	enca? ( app-i18n/enca )
	faad? ( media-libs/faad2 )
	gif? ( media-libs/giflib )
	ggi? ( media-libs/libggi
		media-libs/libggiwmh )
	gtk? ( media-libs/libpng
		x11-libs/libXxf86vm
		x11-libs/libXext
		x11-libs/libXi
		x11-libs/gtk+:2 )
	jpeg? ( media-libs/jpeg )
	ladspa? ( media-libs/ladspa-sdk )
	libcaca? ( media-libs/libcaca )
	lirc? ( app-misc/lirc )
	lzo? ( >=dev-libs/lzo-2 )
	mad? ( media-libs/libmad )
	mng? ( media-libs/libmng )
	musepack? ( >=media-libs/libmpcdec-1.2.2 )
	nas? ( media-libs/nas )
	opengl? ( virtual/opengl )
	png? ( media-libs/libpng )
	pnm? ( media-libs/netpbm )
	pulseaudio? ( media-sound/pulseaudio )
	rar? ( || ( app-arch/unrar-gpl
		app-arch/unrar ) )
	samba? ( net-fs/samba )
	schroedinger? ( media-libs/schroedinger )
	sdl? ( media-libs/libsdl )
	speex? ( media-libs/speex )
	svga? ( media-libs/svgalib )
	theora? ( media-libs/libtheora )
	live? ( media-plugins/live )
	truetype? ( media-libs/freetype:2
		media-libs/fontconfig )
	video_cards_nvidia? (
		vdpau? ( >=x11-drivers/nvidia-drivers-180.37 )
	)
	vidix? ( x11-libs/libXxf86vm
			 x11-libs/libXext )
	vorbis? ( media-libs/libvorbis )
	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 ) )
	X? ( x11-libs/libXxf86vm
		x11-libs/libXext
	)"

DEPEND="${RDEPEND}
	doc? ( dev-libs/libxslt )
	dga? ( x11-proto/xf86dgaproto )
	dxr3? ( media-video/em8300-libraries )
	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 )"

SLOT="0"
LICENSE="GPL-2"
KEYWORDS=""

pkg_setup() {

	elog ""
	elog "This is a live ebuild which installs the latest from upstream's"
	elog "subversion repository, and is unsupported by Gentoo."
	elog "Everything but bugs in the ebuild itself will be ignored."
	elog ""

	if [[ -n ${LINGUAS} ]]; then
		elog ""
		elog "MPlayer's build system uses the LINGUAS variable for both"
		elog "output messages and which man pages to build.  The first"
		elog "language in the LINGUAS variable will be used to display"
		elog "output messages.  See bug #228799."
	fi

	if use gtk; then
		ewarn ""
		ewarn "You've enabled the 'gtk' use flag which will build"
		ewarn "GMPlayer, which is no longer actively developed upstream"
		ewarn "and is not supported by Gentoo.  There are alternatives"
		ewarn "for a GUI frontend: smplayer, gnome-mplayer and kmplayer."
	fi

	if use cpudetection; then
		ewarn ""
		ewarn "You've enabled the cpudetection flag.  This feature is"
		ewarn "included mainly for people who want to use the same"
		ewarn "binary on another system with a different CPU architecture."
		ewarn "MPlayer will already detect your CPU settings by default at"
		ewarn "buildtime; this flag is used for runtime detection."
		ewarn "You won't need this turned on if you are only building"
		ewarn "mplayer for this system.  Also, if your compile fails, try"
		ewarn "disabling this use flag."
	fi

	if use custom-cflags; then
		ewarn ""
		ewarn "You've enabled the custom-cflags USE flag, which overrides"
		ewarn "mplayer's recommended behavior, making this build unsupported."
		ewarn ""
		ewarn "Re-emerge mplayer without this flag before filing bugs."
	fi

	if use custom-cpuopts; then
		ewarn ""
		ewarn "You are using the custom-cpuopts flag which will"
		ewarn "specifically allow you to enable / disable certain"
		ewarn "CPU optimizations."
		ewarn ""
		ewarn "Most desktop users won't need this functionality, but it"
		ewarn "is included for corner cases like cross-compiling and"
		ewarn "certain profiles.  If unsure, disable this flag and MPlayer"
		ewarn "will automatically detect and use your available CPU"
		ewarn "optimizations."
		ewarn ""
		ewarn "Using this flag means your build is unsupported, so"
		ewarn "please make sure your CPU optimization use flags (3dnow"
		ewarn "3dnowext mmx mmxext sse sse2 ssse3) are properly set."
	fi
}

src_unpack() {
	subversion_src_unpack

	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 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Ä…dano:ZaÅ¼Ä…dano:' -i help/help_mp-pl.h
}

src_compile() {

	local myconf=""

	# 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="${LINGUAS/da/dk}"

	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
	# compilation in almost every situation.  The reason for this is
	# because if --enable is used, it will force the build of that option,
	# regardless of whether the dependency is available or not.

	################
	#Optional features#
	###############
	myconf="${myconf} --enable-menu"
	myconf="${myconf} $(use_enable network)"
	use ass || myconf="${myconf} --disable-ass"
	use bidi || myconf="${myconf} --disable-fribidi"
	use bl && myconf="${myconf} --enable-bl"
	use enca || myconf="${myconf} --disable-enca"
	use encode || myconf="${myconf} --disable-mencoder"
	use ftp || myconf="${myconf} --disable-ftp"
	use ipv6 || myconf="${myconf} --disable-inet6"
	use lirc || myconf="${myconf} --disable-lirc --disable-lircc"
	use nemesi || myconf="${myconf} --disable-nemesi"
	use rar || myconf="${myconf} --disable-unrarexec"
	use rtc || myconf="${myconf} --disable-rtc"
	use samba || myconf="${myconf} --disable-smb"
	use xscreensaver || myconf="${myconf} --disable-xss"
	myconf="${myconf} $(use_enable joystick)"

	# libcdio support: prefer libcdio over cdparanoia
	# don't check for cddb w/cdio
	if use cdio; then
		myconf="${myconf} --disable-cdparanoia"
	else
		myconf="${myconf} --disable-libcdio"
		use cdparanoia || myconf="${myconf} --disable-cdparanoia"
		use cddb || myconf="${myconf} --disable-cddb"
	fi

	###############
	# DVD read, navigation support
	###############
	#
	# dvdread - accessing a DVD
	# dvdnav - navigation of menus
	#
	# internal dvdread and dvdnav use flags enable internal
	# versions of the libraries, which are snapshots of the fork.
	#
	# Only check for disabled a52 use flag inside the DVD check,
	# since many users were getting confused why there was no
	# audio stream.
	#
	if use dvd; then
		use dvdnav || myconf="${myconf} --disable-dvdnav"
	else
		myconf="${myconf} --disable-dvdnav --disable-dvdread \
			--disable-dvdread-internal --disable-libdvdcss-internal"
		use a52 || myconf="${myconf} --disable-liba52-internal"
	fi

	###############
	# Subtitles
	###############
	#
	# SRT/ASS/SSA (subtitles) requires freetype support
	# freetype support requires iconv
	# iconv optionally can use unicode
	if ! use ass; then
		if ! use truetype; then
			myconf="${myconf} --disable-freetype"
			if ! use iconv; then
				myconf="${myconf} --disable-iconv --charset=noconv"
			fi
		fi
	fi
	use iconv && use unicode && myconf="${myconf} --charset=UTF-8"

	###############
	# DVB / Video4Linux / Radio support
	###############
	myconf="${myconf} --disable-tv-bsdbt848"
	# broken upstream, won't work with recent kernels
	myconf="${myconf} --disable-ivtv"
	if { use dvb || use v4l || use v4l2 || use pvr || use radio; }; then
		use dvb || myconf="${myconf} --disable-dvb --disable-dvbhead"
		use pvr || myconf="${myconf} --disable-pvr"
		use v4l	|| myconf="${myconf} --disable-tv-v4l1"
		use v4l2 || myconf="${myconf} --disable-tv-v4l2"
		use teletext || myconf="${myconf} --disable-tv-teletext"
		if use radio && { use dvb || use v4l || use v4l2; }; then
			myconf="${myconf} --enable-radio $(use_enable encode radio-capture)"
		else
			myconf="${myconf} --disable-radio-v4l2 --disable-radio-bsdbt848"
		fi
	else
		myconf="${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 --disable-pvr"
	fi

	#########
	# Codecs #
	########
	# Won't work with external liba52
	myconf="${myconf} --disable-liba52"

	use aac || myconf="${myconf} --disable-faad-internal"
	use amrnb || myconf="${myconf} --disable-libamr_nb"
	use amrwb || myconf="${myconf} --disable-libamr_wb"
	use dirac || myconf="${myconf} --disable-libdirac-lavc"
	use dts || myconf="${myconf} --disable-libdca"
	use dv || myconf="${myconf} --disable-libdv"
	use faad || myconf="${myconf} --disable-faad"
	use lzo || myconf="${myconf} --disable-liblzo"
	use mp3 || myconf="${myconf} --disable-mp3lame --disable-mp3lame-lavc \
		--disable-mp3lib"
	use schroedinger || myconf="${myconf} --disable-libschroedinger-lavc"
	use xanim && myconf="${myconf} --xanimcodecsdir=/usr/lib/xanim/mods"
	! use png && ! use gtk && myconf="${myconf} --disable-png"
	for x in gif jpeg live mad mng musepack pnm speex tga theora xanim; do
		use ${x} || myconf="${myconf} --disable-${x}"
	done
	if use vorbis || use tremor; then
		use tremor || myconf="${myconf} --disable-tremor-internal"
		use vorbis || myconf="${myconf} --disable-libvorbis"
	else
		myconf="${myconf} --disable-tremor-internal --disable-tremor \
			--disable-libvorbis"
	fi
	# Encoding
	if use encode; then
		use aac || myconf="${myconf} --disable-faac-lavc"
		use faac || myconf="${myconf} --disable-faac"
		use x264 || myconf="${myconf} --disable-x264"
		use xvid || myconf="${myconf} --disable-xvid"
		use mp2 || myconf="${myconf} --disable-twolame --disable-toolame"
	else
		myconf="${myconf} --disable-faac-lavc --disable-faac --disable-x264 \
			--disable-xvid --disable-x264-lavc --disable-xvid-lavc \
			--disable-twolame --disable-toolame"
	fi

	###############
	# Binary codecs
	###############
	# bug 213836
	if ! use x86 || ! use win32codecs; then
		use quicktime || myconf="${myconf} --disable-qtx"
	fi

	###############
	# RealPlayer support
	###############
	#
	# Realplayer support shows up in four places:
	# - libavcodec (internal)
	# - win32codecs
	# - realcodecs (win32codecs libs)
	# - realcodecs (realplayer libs)
	#

	# internal
	use real || myconf="${myconf} --disable-real"

	# Real binary codec support only available on x86, amd64
	if use real; then
		use x86 && myconf="${myconf} \
			--realcodecsdir=/opt/RealPlayer/codecs"
		use amd64 && myconf="${myconf} \
			 --realcodecsdir=/usr/$(get_libdir)/codecs"
	elif ! use bindist; then
			myconf="${myconf} $(use_enable win32codecs win32dll)"
	fi

	#############
	# Video Output #
	#############
	for x in directfb ggi md5sum sdl xinerama; do
		use ${x} || myconf="${myconf} --disable-${x}"
	done
	use aalib || myconf="${myconf} --disable-aa"
	use dga || myconf="${myconf} --disable-dga1 --disable-dga2"
	use fbcon || myconf="${myconf} --disable-fbdev"
	use fbcon && use video_cards_s3virge && myconf="${myconf} --enable-s3fb"
	use libcaca || myconf="${myconf} --disable-caca"
	use opengl || myconf="${myconf} --disable-gl"
	use video_cards_vesa || myconf="${myconf} --disable-vesa"
	use video_cards_nvidia && use vdpau || myconf="${myconf} --disable-vdpau"
	use vidix || myconf="${myconf} --disable-vidix --disable-vidix-pcidb"
	use zoran || myconf="${myconf} --disable-zr"

	# MPlayer incorrectly looks for DXR3 support, so forcibly enable
	# if requested. See bug 223587
	myconf="${myconf} $(use_enable dxr3)"

	# GTK gmplayer gui
	# Unsupported by Gentoo, upstream has dropped development
	myconf="${myconf} $(use_enable gtk gui)"

	if use xv; then
		if use xvmc; then
			myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCW"
		else
			myconf="${myconf} --disable-xvmc"
		fi
	else
		myconf="${myconf} --disable-xv --disable-xvmc"
	fi

	if ! use kernel_linux && ! use video_cards_mga; then
		 myconf="${myconf} --disable-mga --disable-xmga"
	fi

	if use video_cards_tdfx; then
		myconf="${myconf} $(use_enable video_cards_tdfx tdfxvid) \
			$(use_enable fbcon tdfxfb)"
	else
		myconf="${myconf} --disable-3dfx --disable-tdfxvid --disable-tdfxfb"
	fi

	#############
	# Audio Output #
	#############
	for x in alsa arts esd jack ladspa nas openal; do
		use ${x} || myconf="${myconf} --disable-${x}"
	done
	use pulseaudio || myconf="${myconf} --disable-pulse"
	if ! use radio; then
		use oss || myconf="${myconf} --disable-ossaudio"
	fi

	#################
	# Advanced Options #
	#################
	# Platform specific flags, hardcoded on amd64 (see below)
	if use cpudetection; then
		myconf="${myconf} --enable-runtime-cpudetection"
	fi

	# Turning off CPU optimizations usually will break the build.
	# However, this use flag, if enabled, will allow users to completely
	# specify which ones to use.  If disabled, mplayer will automatically
	# enable all CPU optimizations that the host build supports.
	if use custom-cpuopts; then
		for x in 3dnow 3dnowext mmx mmxext sse sse2 ssse3; do
			myconf="${myconf} $(use_enable $x)"
		done
	fi

	use debug && myconf="${myconf} --enable-debug=3"

	myconf="${myconf} $(use_enable altivec)"

	if use custom-cflags; then

		# Can't remember why this was in here, commented out, please
		# document if you are going to re-enable it, bug 260064
		# 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="--cc=$(tc-getCC) \
		--host-cc=$(tc-getBUILD_CC) \
		--prefix=/usr \
		--confdir=/etc/mplayer \
		--datadir=/usr/share/mplayer \
		--libdir=/usr/$(get_libdir) \
		${myconf}"

	#echo "CFLAGS=\"${CFLAGS}\" ./configure ${myconf}"
	CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died"

	emake || die "Failed to build MPlayer!"
	use doc && make -C DOCS/xml html-chunked
}

src_install() {

	make prefix="${D}/usr" \
		BINDIR="${D}/usr/bin" \
		LIBDIR="${D}/usr/$(get_libdir)" \
		CONFDIR="${D}/etc/mplayer" \
		DATADIR="${D}/usr/share/mplayer" \
		MANDIR="${D}/usr/share/man" \
		INSTALLSTRIP="" \
		install || die "Failed to install MPlayer!"

	dodoc AUTHORS Changelog Copyright README etc/codecs.conf

	docinto tech/
	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
	docinto tech/realcodecs/
	dodoc DOCS/tech/realcodecs/*
	docinto tech/mirrors/
	dodoc DOCS/tech/mirrors/*

	docinto TOOLS/
	dodoc TOOLS/*
	docinto TOOLS/realcodecs/
	dodoc TOOLS/realcodecs/*

	# 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
	fi

	if ! use ass && ! use truetype; then
		dodir /usr/share/mplayer/fonts
		local x=
		# 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 ass || use truetype;	then
		cat >> "${D}/etc/mplayer/mplayer.conf" << EOT
fontconfig=1
subfont-osd-scale=4
subfont-text-scale=3
EOT
	fi

	# bug 256203
	if use rar; then
		cat >> "${D}/etc/mplayer/mplayer.conf" << EOT
unrarexec=/usr/bin/unrar
EOT
	fi

	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf

	newbin "${S}/TOOLS/midentify.sh" 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
}






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2009-05-30 23:07 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-05-30 23:07 UTC (permalink / raw
  To: gentoo-commits

scarabeus    09/05/30 23:07:31

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Update live ebuild. Reorder the DEPS to be alphabetic and more logicaly separated. Update ebuild to work as snapshot version if properly renamed. Minor whitespace updates. Use src_prepare function.
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.636                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.636&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.636&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.635&r2=1.636

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -r1.635 -r1.636
--- ChangeLog	30 May 2009 21:53:39 -0000	1.635
+++ ChangeLog	30 May 2009 23:07:31 -0000	1.636
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.635 2009/05/30 21:53:39 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.636 2009/05/30 23:07:31 scarabeus Exp $
+
+  30 May 2009; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Update live ebuild. Reorder the DEPS to be alphabetic and more logicaly
+  separated. Update ebuild to work as snapshot version if properly renamed.
+  Minor whitespace updates. Use src_prepare function.
 
 *mplayer-1.0_rc2_p20090530 (30 May 2009)
 



1.5                  media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.4&r2=1.5

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mplayer-9999.ebuild	30 May 2009 21:31:18 -0000	1.4
+++ mplayer-9999.ebuild	30 May 2009 23:07:31 -0000	1.5
@@ -1,21 +1,24 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.4 2009/05/30 21:31:18 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.5 2009/05/30 23:07:31 scarabeus Exp $
 
 EAPI="2"
 
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion" || SVN_ECLASS=""
 
-inherit eutils flag-o-matic multilib subversion
+inherit eutils flag-o-matic multilib ${SVN_ECLASS}
 
-IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +amrnb +amrwb arts +ass
+[[ ${PV} != *9999* ]] && MPLAYER_REVISION=29330
+
+IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +amrnb +amrwb +ass
 bidi bindist bl +cddb +cdio cdparanoia cpudetection custom-cflags
 custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav dxr3
 +enca +encode esd +faac +faad fbcon ftp gif ggi -gmplayer +iconv ipv6 jack
 joystick jpeg kernel_linux ladspa libcaca lirc +live lzo mad md5sum +mmx
 mmxext mng +mp2 +mp3 musepack nas +nemesi +network nut openal +opengl +osdmenu
-oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc samba
-+schroedinger sdl +shm +speex sse sse2 ssse3 svga teletext tga +theora +tremor
+oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc samba +shm
++schroedinger sdl +speex sse sse2 ssse3 svga teletext tga +theora +tremor
 +truetype +unicode v4l v4l2 vdpau vidix +vorbis win32codecs +X +x264 xanim
 xinerama +xscreensaver +xv +xvid xvmc zoran"
 
@@ -28,32 +31,46 @@
 BLUV="1.7"
 SVGV="1.9.17"
 AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
-SRC_URI="!truetype? ( 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 )
-	!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 )
+FONT_URI="
+	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
+"
+if [[ ${PV} = *9999* ]]; then
+	RELEASE_URI=""
+else
+	RELEASE_URI="mirror://gentoo/${P}.tar.bz2"
+fi
+SRC_URI="${RELEASE_URI}
+	!truetype? ( ${FONT_URI} )
 	gmplayer? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
-	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )"
+	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
+"
 
 DESCRIPTION="Media Player for Linux"
 HOMEPAGE="http://www.mplayerhq.hu/"
 
+FONT_RDEPS="
+	media-libs/fontconfig
+	media-libs/freetype:2
+"
+X_RDEPS="
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+"
+# Rar: althrought -gpl version is nice, it cant do most functions normal rar can
 RDEPEND="sys-libs/ncurses
 	!bindist? (
 		x86? (
 			win32codecs? ( media-libs/win32codecs )
-			)
+		)
 	)
+	X? ( ${X_RDEPS} )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	amrnb? ( media-libs/amrnb )
 	amrwb? ( media-libs/amrwb )
-	arts? ( kde-base/arts )
-	ass? ( media-libs/freetype:2
-		media-libs/fontconfig )
-	openal? ( media-libs/openal )
+	ass? ( ${FONT_RDEPS} )
 	bidi? ( dev-libs/fribidi )
 	cdio? ( dev-libs/libcdio )
 	cdparanoia? ( media-sound/cdparanoia )
@@ -64,92 +81,105 @@
 	dv? ( media-libs/libdv )
 	dvb? ( media-tv/linuxtv-dvb-headers )
 	encode? (
+		faac? ( media-libs/faac )
 		mp2? ( media-sound/twolame )
 		mp3? ( media-sound/lame )
-		faac? ( media-libs/faac )
 		x264? ( >=media-libs/x264-0.0.20081006 )
 		xvid? ( media-libs/xvid )
-		)
+	)
 	esd? ( media-sound/esound )
 	enca? ( app-i18n/enca )
 	faad? ( !aac? ( media-libs/faad2 ) )
 	gif? ( media-libs/giflib )
-	ggi? ( media-libs/libggi
-		media-libs/libggiwmh )
-	gmplayer? ( media-libs/libpng
-		x11-libs/libXxf86vm
-		x11-libs/libXext
+	ggi? (
+		media-libs/libggi
+		media-libs/libggiwmh
+	)
+	gmplayer? (
+		media-libs/libpng
+		x11-libs/gtk+:2
 		x11-libs/libXi
-		x11-libs/gtk+:2 )
+		${X_RDEPS}
+	)
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg? ( media-libs/jpeg )
 	ladspa? ( media-libs/ladspa-sdk )
 	libcaca? ( media-libs/libcaca )
 	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live )
 	lzo? ( >=dev-libs/lzo-2 )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
 	musepack? ( >=media-libs/libmpcdec-1.2.2 )
 	nas? ( media-libs/nas )
 	nut? ( >=media-libs/libnut-661 )
+	openal? ( media-libs/openal )
 	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng )
 	pnm? ( media-libs/netpbm )
 	pulseaudio? ( media-sound/pulseaudio )
-	rar? ( || ( app-arch/unrar-gpl
-		app-arch/unrar
-		app-arch/rar ) )
+	rar? (
+		|| (
+			app-arch/unrar
+			app-arch/unrar-gpl
+			app-arch/rar
+		)
+	)
 	samba? ( net-fs/samba )
 	schroedinger? ( media-libs/schroedinger )
 	sdl? ( media-libs/libsdl )
 	speex? ( media-libs/speex )
 	svga? ( media-libs/svgalib )
 	theora? ( media-libs/libtheora )
-	live? ( media-plugins/live )
-	truetype? ( media-libs/freetype:2
-		media-libs/fontconfig )
+	truetype? ( ${FONT_RDEPS} )
 	video_cards_nvidia? (
 		vdpau? ( >=x11-drivers/nvidia-drivers-180.51 )
 	)
-	vidix? ( x11-libs/libXxf86vm
-			 x11-libs/libXext )
+	vidix? ( ${X_RDEPS} )
 	vorbis? ( media-libs/libvorbis )
 	xanim? ( media-video/xanim )
-	xinerama? ( x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/libXext )
+	xinerama? (
+		x11-libs/libXinerama
+		${X_RDEPS}
+	)
 	xscreensaver? ( x11-libs/libXScrnSaver )
-	xv? ( x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		xvmc? ( x11-libs/libXvMC ) )
-	X? ( x11-libs/libXxf86vm
-		x11-libs/libXext
-	)"
+	xv? (
+		${X_RDEPS}
+		x11-libs/libXv
+		xvmc? ( x11-libs/libXvMC )
+	)
+"
 
+X_DEPS="
+	x11-proto/videoproto
+	x11-proto/xf86vidmodeproto
+"
+ASM_DEP="dev-lang/yasm"
 DEPEND="${RDEPEND}
-	amd64? ( dev-lang/yasm )
-	doc? ( dev-libs/libxslt )
+	X? ( ${X_DEPS} )
+	amd64? ( ${ASM_DEP} )
 	dga? ( x11-proto/xf86dgaproto )
+	doc? ( dev-libs/libxslt )
 	dxr3? ( media-video/em8300-libraries )
+	gmplayer? ( ${X_DEPS} )
+	iconv? ( virtual/libiconv )
+	xv? ( ${X_DEPS} )
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )
 	xinerama? ( x11-proto/xineramaproto )
-	xv? ( x11-proto/videoproto
-		  x11-proto/xf86vidmodeproto )
-	gmplayer? ( x11-proto/xextproto
-		   x11-proto/xf86vidmodeproto )
-	X? ( x11-proto/xextproto
-		 x11-proto/xf86vidmodeproto )
-	x86? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
 	xscreensaver? ( x11-proto/scrnsaverproto )
-	iconv? ( virtual/libiconv )"
+	xv? ( ${X_DEPS} )
+"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS=""
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+else
+	KEYWORDS=""
+fi
 
 pkg_setup() {
-
 	elog ""
 	elog "This is a live ebuild which installs the latest from upstream's"
 	elog "subversion repository, and is unsupported by Gentoo."
@@ -210,26 +240,27 @@
 }
 
 src_unpack() {
-	subversion_src_unpack
+	[[ ${PV} = *9999* ]] && subversion_src_unpack || unpack ${A}
 
-	if ! use truetype ; then
+	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
 
-
-	cd "${WORKDIR}"
-
 	use gmplayer && unpack "Blue-${BLUV}.tar.bz2"
-
 	use svga && unpack "svgalib_helper-${SVGV}-mplayer.tar.bz2"
+}
 
-	cd "${S}"
-
-	# Set SVN version manually
-	subversion_wc_info
-	sed -i s/UNKNOWN/${ESVN_WC_REVISION}/ "${S}/version.sh"
+src_prepare() {
+	if [[ ${PV} = *9999* ]]; then
+		# Set SVN version manually
+		subversion_wc_info
+		sed -i s/UNKNOWN/${ESVN_WC_REVISION}/ "${S}/version.sh"
+	else
+		# Set version #
+		sed -i s/UNKNOWN/${MPLAYER_REVISION}/ "${S}/version.sh"
+	fi
 
 	if use svga; then
 		echo
@@ -243,7 +274,6 @@
 }
 
 src_configure() {
-
 	local myconf=""
 
 	# MPlayer reads in the LINGUAS variable from make.conf, and sets
@@ -259,7 +289,10 @@
 	################
 	#Optional features#
 	###############
-	myconf="${myconf} $(use_enable network)"
+	myconf="${myconf}
+		--disable-arts
+		$(use_enable network)
+	"
 	use ass || myconf="${myconf} --disable-ass"
 	use bidi || myconf="${myconf} --disable-fribidi"
 	use bl && myconf="${myconf} --enable-bl"
@@ -471,7 +504,7 @@
 	#############
 	# Audio Output #
 	#############
-	for x in alsa arts esd jack ladspa nas openal; do
+	for x in alsa esd jack ladspa nas openal; do
 		use ${x} || myconf="${myconf} --disable-${x}"
 	done
 	use pulseaudio || myconf="${myconf} --disable-pulse"
@@ -523,7 +556,6 @@
 
 	#echo "CFLAGS=\"${CFLAGS}\" ./configure ${myconf}"
 	CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died"
-
 }
 
 src_compile() {
@@ -532,7 +564,6 @@
 }
 
 src_install() {
-
 	make prefix="${D}/usr" \
 		BINDIR="${D}/usr/bin" \
 		LIBDIR="${D}/usr/$(get_libdir)" \
@@ -612,15 +643,11 @@
 }
 
 pkg_preinst() {
-
-	if [[ -d ${ROOT}/usr/share/mplayer/Skin/default ]]
-	then
+	[[ -d ${ROOT}/usr/share/mplayer/Skin/default ]] && \
 		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" ]






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2009-06-02 17:43 Steve Dibb (beandog)
  0 siblings, 0 replies; 73+ messages in thread
From: Steve Dibb (beandog) @ 2009-06-02 17:43 UTC (permalink / raw
  To: gentoo-commits

beandog     09/06/02 17:43:43

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Fix skin SRC_URI; Display live ebuild einfo only on live ebuild
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.641                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.641&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.641&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.640&r2=1.641

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.640
retrieving revision 1.641
diff -u -r1.640 -r1.641
--- ChangeLog	2 Jun 2009 13:59:50 -0000	1.640
+++ ChangeLog	2 Jun 2009 17:43:43 -0000	1.641
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.640 2009/06/02 13:59:50 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.641 2009/06/02 17:43:43 beandog Exp $
+
+  02 Jun 2009; Steve Dibb <beandog@gentoo.org> mplayer-9999.ebuild:
+  Fix skin SRC_URI; Display live ebuild einfo only on live ebuild
 
   02 Jun 2009; Steve Dibb <beandog@gentoo.org>
   mplayer-1.0_rc2_p28058-r1.ebuild, mplayer-1.0_rc2_p28288.ebuild,



1.6                  media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.5&r2=1.6

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mplayer-9999.ebuild	30 May 2009 23:07:31 -0000	1.5
+++ mplayer-9999.ebuild	2 Jun 2009 17:43:43 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.5 2009/05/30 23:07:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.6 2009/06/02 17:43:43 beandog Exp $
 
 EAPI="2"
 
@@ -43,7 +43,7 @@
 fi
 SRC_URI="${RELEASE_URI}
 	!truetype? ( ${FONT_URI} )
-	gmplayer? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
+	gmplayer? ( mirror://mplayer/skins/Blue-${BLUV}.tar.bz2 )
 	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
 "
 
@@ -180,11 +180,13 @@
 fi
 
 pkg_setup() {
-	elog ""
-	elog "This is a live ebuild which installs the latest from upstream's"
-	elog "subversion repository, and is unsupported by Gentoo."
-	elog "Everything but bugs in the ebuild itself will be ignored."
-	elog ""
+	if [[ ${PV} = *9999* ]]; then
+		elog ""
+		elog "This is a live ebuild which installs the latest from upstream's"
+		elog "subversion repository, and is unsupported by Gentoo."
+		elog "Everything but bugs in the ebuild itself will be ignored."
+		elog ""
+	fi
 
 	if [[ -n ${LINGUAS} ]]; then
 		elog ""






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2009-07-24 22:46 Steve Dibb (beandog)
  0 siblings, 0 replies; 73+ messages in thread
From: Steve Dibb (beandog) @ 2009-07-24 22:46 UTC (permalink / raw
  To: gentoo-commits

beandog     09/07/24 22:46:58

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Drop support for old AMR libs
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.652                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.652&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.652&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.651&r2=1.652

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -r1.651 -r1.652
--- ChangeLog	4 Jul 2009 12:47:46 -0000	1.651
+++ ChangeLog	24 Jul 2009 22:46:58 -0000	1.652
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.651 2009/07/04 12:47:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.652 2009/07/24 22:46:58 beandog Exp $
+
+  24 Jul 2009; Steve Dibb <beandog@gentoo.org> mplayer-9999.ebuild:
+  Drop support for old AMR libs
 
   04 Jul 2009; Brent Baude <ranger@gentoo.org>
   mplayer-1.0_rc2_p20090322.ebuild:



1.9                  media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.8&r2=1.9

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mplayer-9999.ebuild	21 Jun 2009 19:02:38 -0000	1.8
+++ mplayer-9999.ebuild	24 Jul 2009 22:46:58 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.8 2009/06/21 19:02:38 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.9 2009/07/24 22:46:58 beandog Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@
 
 [[ ${PV} != *9999* ]] && MPLAYER_REVISION=29330
 
-IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +amrnb +amrwb +ass
+IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +ass
 bidi bindist bl +cddb +cdio cdparanoia cpudetection custom-cflags
 custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav dxr3
 +enca +encode esd +faac +faad fbcon ftp gif ggi -gmplayer +iconv ipv6 jack
@@ -68,8 +68,6 @@
 	X? ( ${X_RDEPS} )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
-	amrnb? ( media-libs/amrnb )
-	amrwb? ( media-libs/amrwb )
 	ass? ( ${FONT_RDEPS} )
 	bidi? ( dev-libs/fribidi )
 	cdio? ( dev-libs/libcdio )
@@ -393,8 +391,6 @@
 	myconf="${myconf} --disable-liba52"
 
 	use aac || myconf="${myconf} --disable-faad-internal"
-	use amrnb || myconf="${myconf} --disable-libamr_nb"
-	use amrwb || myconf="${myconf} --disable-libamr_wb"
 	use dirac || myconf="${myconf} --disable-libdirac-lavc"
 	use dts || myconf="${myconf} --disable-libdca"
 	use dv || myconf="${myconf} --disable-libdv"






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2009-08-03  6:42 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2009-08-03  6:42 UTC (permalink / raw
  To: gentoo-commits

aballier    09/08/03 06:42:36

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Use tr instead of sed for creating the linguas list, this fixes a build issue when LINGUAS contains more than two languages.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.663                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.663&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.663&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.662&r2=1.663

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.662
retrieving revision 1.663
diff -u -r1.662 -r1.663
--- ChangeLog	3 Aug 2009 03:55:29 -0000	1.662
+++ ChangeLog	3 Aug 2009 06:42:36 -0000	1.663
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.662 2009/08/03 03:55:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.663 2009/08/03 06:42:36 aballier Exp $
+
+  03 Aug 2009; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  Use tr instead of sed for creating the linguas list, this fixes a build
+  issue when LINGUAS contains more than two languages.
 
   03 Aug 2009; Jeroen Roovers <jer@gentoo.org>
   mplayer-1.0_rc2_p20090731.ebuild:



1.13                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.12&r2=1.13

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mplayer-9999.ebuild	31 Jul 2009 20:43:25 -0000	1.12
+++ mplayer-9999.ebuild	3 Aug 2009 06:42:36 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.12 2009/07/31 20:43:25 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.13 2009/08/03 06:42:36 aballier Exp $
 
 EAPI="2"
 
@@ -282,7 +282,7 @@
 	if [[ -n $LINGUAS ]]; then
 		LINGUAS="${LINGUAS/da/dk}"
 		available_linguas=$(echo $LINGUAS | awk '{ print $1 }')
-		myconf_linguas=$(echo $LINGUAS | sed s/\ /,/)
+		myconf_linguas=$(echo $LINGUAS | tr ' ' ',')
 		myconf="${myconf} --language=${available_linguas} \
 			--language-doc=${myconf_linguas} --language-man=${myconf_linguas}"
 	fi






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2009-11-19 14:39 Steve Dibb (beandog)
  0 siblings, 0 replies; 73+ messages in thread
From: Steve Dibb (beandog) @ 2009-11-19 14:39 UTC (permalink / raw
  To: gentoo-commits

beandog     09/11/19 14:39:32

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Remove teletext support, bug 292792
  (Portage version: 2.2_rc42/cvs/Linux x86_64)

Revision  Changes    Path
1.689                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.689&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.689&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.688&r2=1.689

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.688
retrieving revision 1.689
diff -u -r1.688 -r1.689
--- ChangeLog	18 Nov 2009 17:53:39 -0000	1.688
+++ ChangeLog	19 Nov 2009 14:39:32 -0000	1.689
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.688 2009/11/18 17:53:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.689 2009/11/19 14:39:32 beandog Exp $
+
+  19 Nov 2009; Steve Dibb <beandog@gentoo.org> mplayer-9999.ebuild:
+  Remove teletext support, bug 292792
 
   18 Nov 2009; Raúl Porcel <armin76@gentoo.org>
   mplayer-1.0_rc4_p20091026.ebuild, mplayer-1.0_rc4_p20091026-r1.ebuild:



1.15                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.14&r2=1.15

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mplayer-9999.ebuild	3 Aug 2009 20:39:26 -0000	1.14
+++ mplayer-9999.ebuild	19 Nov 2009 14:39:32 -0000	1.15
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.14 2009/08/03 20:39:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.15 2009/11/19 14:39:32 beandog Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@
 ipv6 jack joystick jpeg kernel_linux ladspa libcaca lirc +live lzo mad md5sum
 +mmx mmxext mng +mp2 +mp3 nas +nemesi +network nut openal +opengl +osdmenu
 oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc samba +shm
-+schroedinger sdl +speex sse sse2 ssse3 svga teletext tga +theora +tremor
++schroedinger sdl +speex sse sse2 ssse3 svga tga +theora +tremor
 +truetype +unicode v4l v4l2 vdpau vidix +vorbis win32codecs +X +x264 xanim
 xinerama +xscreensaver +xv +xvid xvmc zoran"
 
@@ -377,7 +377,6 @@
 		use pvr || myconf="${myconf} --disable-pvr"
 		use v4l	|| myconf="${myconf} --disable-tv-v4l1"
 		use v4l2 || myconf="${myconf} --disable-tv-v4l2"
-		use teletext || myconf="${myconf} --disable-tv-teletext"
 		if use radio && { use dvb || use v4l || use v4l2; }; then
 			myconf="${myconf} --enable-radio $(use_enable encode radio-capture)"
 		else
@@ -386,7 +385,7 @@
 	else
 		myconf="${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-dvb --disable-dvbhead \
 			--disable-v4l2 --disable-pvr"
 	fi
 






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-02-02 16:21 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-02-02 16:21 UTC (permalink / raw
  To: gentoo-commits

scarabeus    10/02/02 16:21:23

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Add arm to 9999 ebuild too.
  (Portage version: 2.2_rc62/cvs/Linux x86_64, RepoMan options: --force)

Revision  Changes    Path
1.707                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.707&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.707&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.706&r2=1.707

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.706
retrieving revision 1.707
diff -u -r1.706 -r1.707
--- ChangeLog	1 Feb 2010 20:11:08 -0000	1.706
+++ ChangeLog	2 Feb 2010 16:21:23 -0000	1.707
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.706 2010/02/01 20:11:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.707 2010/02/02 16:21:23 scarabeus Exp $
+
+  02 Feb 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Add arm to 9999 ebuild too.
 
   01 Feb 2010; Raúl Porcel <armin76@gentoo.org>
   mplayer-1.0_rc4_p20091026-r1.ebuild, mplayer-1.0_rc4_p20091124-r1.ebuild:



1.21                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.20&r2=1.21

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mplayer-9999.ebuild	3 Jan 2010 16:43:01 -0000	1.20
+++ mplayer-9999.ebuild	2 Feb 2010 16:21:23 -0000	1.21
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.20 2010/01/03 16:43:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.21 2010/02/02 16:21:23 scarabeus Exp $
 
 EAPI="2"
 
@@ -172,7 +172,7 @@
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 else
 	KEYWORDS=""
 fi






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-02-26 23:19 Sebastian Pipping (sping)
  0 siblings, 0 replies; 73+ messages in thread
From: Sebastian Pipping (sping) @ 2010-02-26 23:19 UTC (permalink / raw
  To: gentoo-commits

sping       10/02/26 23:19:15

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  media-video/mplayer: Copy latest to 9999 before proceeding
  (Portage version: 2.2_rc61/cvs/Linux i686)

Revision  Changes    Path
1.711                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.711&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.711&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.710&r2=1.711

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.710
retrieving revision 1.711
diff -u -r1.710 -r1.711
--- ChangeLog	13 Feb 2010 21:50:48 -0000	1.710
+++ ChangeLog	26 Feb 2010 23:19:14 -0000	1.711
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.710 2010/02/13 21:50:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.711 2010/02/26 23:19:14 sping Exp $
+
+  26 Feb 2010; Sebastian Pipping <sping@gentoo.org> mplayer-9999.ebuild:
+  Copy latest to 9999 before proceeding
 
   13 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   mplayer-1.0_rc4_p20100213.ebuild, metadata.xml:



1.23                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.22&r2=1.23

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mplayer-9999.ebuild	13 Feb 2010 19:46:16 -0000	1.22
+++ mplayer-9999.ebuild	26 Feb 2010 23:19:14 -0000	1.23
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.22 2010/02/13 19:46:16 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.23 2010/02/26 23:19:14 sping Exp $
 
 EAPI="2"
 
@@ -9,13 +9,13 @@
 
 inherit eutils flag-o-matic multilib base ${SVN_ECLASS}
 
-[[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r29964
+[[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r30554
 
 IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +ass bidi bindist bl bs2b
 +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb
 doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
-gif ggi -gmplayer +iconv ipv6 jack joystick jpeg kernel_linux ladspa libcaca
-lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
+gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
 +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
 samba +shm +schroedinger sdl +speex sse sse2 ssse3 svga tga +theora +tremor
 +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis win32codecs
@@ -128,6 +128,7 @@
 	nas? ( media-libs/nas )
 	nut? ( >=media-libs/libnut-661 )
 	openal? ( media-libs/openal )
+	jpeg2k? ( media-libs/openjpeg )
 	png? ( media-libs/libpng )
 	pnm? ( media-libs/netpbm )
 	pulseaudio? ( media-sound/pulseaudio )
@@ -279,14 +280,16 @@
 	###################
 	myconf+="
 		--disable-arts
+		--disable-kai
 		$(use_enable network)
 		$(use_enable joystick)
 	"
-	uses="ass bl enca ftp rtc" # nemesi <- not working with in-tree ebuild
+	uses="bl enca ftp rtc" # nemesi <- not working with in-tree ebuild
 	myconf+=" --disable-nemesi" # nemesi automagic disable
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
+	use ass || myconf+=" --disable-ass --disable-ass-internal"
 	use bidi || myconf+=" --disable-fribidi"
 	use encode || myconf+=" --disable-mencoder"
 	use ipv6 || myconf+=" --disable-inet6"
@@ -426,6 +429,7 @@
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
+	use jpeg2k || myconf+=" --disable-libopenjpeg"
 	if use vorbis || use tremor; then
 		use tremor || myconf+=" --disable-tremor-internal"
 		use vorbis || myconf+=" --disable-libvorbis"






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-03-09 14:25 Steve Dibb (beandog)
  0 siblings, 0 replies; 73+ messages in thread
From: Steve Dibb (beandog) @ 2010-03-09 14:25 UTC (permalink / raw
  To: gentoo-commits

beandog     10/03/09 14:25:37

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Drop dvbhead argument, bug 307951
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.715                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.715&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.715&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.714&r2=1.715

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.714
retrieving revision 1.715
diff -u -r1.714 -r1.715
--- ChangeLog	2 Mar 2010 22:26:50 -0000	1.714
+++ ChangeLog	9 Mar 2010 14:25:37 -0000	1.715
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.714 2010/03/02 22:26:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.715 2010/03/09 14:25:37 beandog Exp $
+
+  09 Mar 2010; Steve Dibb <beandog@gentoo.org> mplayer-9999.ebuild:
+  Drop dvbhead argument, bug 307951
 
   02 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   mplayer-1.0_rc4_p20100213-r1.ebuild, mplayer-9999.ebuild:



1.29                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.28&r2=1.29

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mplayer-9999.ebuild	2 Mar 2010 22:26:50 -0000	1.28
+++ mplayer-9999.ebuild	9 Mar 2010 14:25:37 -0000	1.29
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.28 2010/03/02 22:26:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.29 2010/03/09 14:25:37 beandog Exp $
 
 EAPI="2"
 
@@ -371,7 +371,7 @@
 	# broken upstream, won't work with recent kernels
 	myconf+=" --disable-ivtv"
 	if { use dvb || use v4l || use v4l2 || use pvr || use radio; }; then
-		use dvb || myconf+=" --disable-dvb --disable-dvbhead"
+		use dvb || myconf+=" --disable-dvb"
 		use pvr || myconf+=" --disable-pvr"
 		use v4l	|| myconf+=" --disable-tv-v4l1"
 		use v4l2 || myconf+=" --disable-tv-v4l2"






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-03-26 12:51 Dror Levin (spatz)
  0 siblings, 0 replies; 73+ messages in thread
From: Dror Levin (spatz) @ 2010-03-26 12:51 UTC (permalink / raw
  To: gentoo-commits

spatz       10/03/26 12:51:59

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Remove dvbhead configure argument, bug 307951.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.718                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.718&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.718&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.717&r2=1.718

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.717
retrieving revision 1.718
diff -u -r1.717 -r1.718
--- ChangeLog	15 Mar 2010 15:13:19 -0000	1.717
+++ ChangeLog	26 Mar 2010 12:51:59 -0000	1.718
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.717 2010/03/15 15:13:19 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.718 2010/03/26 12:51:59 spatz Exp $
+
+  26 Mar 2010; Dror Levin <spatz@gentoo.org> mplayer-9999.ebuild:
+  Remove dvbhead configure argument, bug 307951.
 
   15 Mar 2010; Fabio Erculiani <lxnay@gentoo.org>
   mplayer-1.0_rc4_p20100213-r1.ebuild, mplayer-9999.ebuild:



1.33                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.32&r2=1.33

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mplayer-9999.ebuild	15 Mar 2010 15:15:35 -0000	1.32
+++ mplayer-9999.ebuild	26 Mar 2010 12:51:59 -0000	1.33
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.32 2010/03/15 15:15:35 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.33 2010/03/26 12:51:59 spatz Exp $
 
 EAPI="2"
 
@@ -393,7 +393,6 @@
 			--disable-radio-v4l2
 			--disable-radio-bsdbt848
 			--disable-dvb
-			--disable-dvbhead
 			--disable-v4l2
 			--disable-pvr"
 	fi






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-04-24 11:57 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-04-24 11:57 UTC (permalink / raw
  To: gentoo-commits

aballier    10/04/24 11:57:50

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Fix codecsdir handling; default to real ones, the default can be overriden with codecpath=somewhere in cli or config file, bug #310389 and bug #309931
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.722                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.722&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.722&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.721&r2=1.722

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.721
retrieving revision 1.722
diff -u -r1.721 -r1.722
--- ChangeLog	23 Apr 2010 13:04:43 -0000	1.721
+++ ChangeLog	24 Apr 2010 11:57:49 -0000	1.722
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.721 2010/04/23 13:04:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.722 2010/04/24 11:57:49 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  Fix codecsdir handling; default to real ones, the default can be overriden
+  with codecpath=somewhere in cli or config file, bug #310389 and bug
+  #309931
 
   23 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
   mplayer-1.0_rc4_p20091026-r1.ebuild, mplayer-1.0_rc4_p20100213-r1.ebuild,



1.37                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.36&r2=1.37

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mplayer-9999.ebuild	23 Apr 2010 13:04:43 -0000	1.36
+++ mplayer-9999.ebuild	24 Apr 2010 11:57:49 -0000	1.37
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.36 2010/04/23 13:04:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.37 2010/04/24 11:57:49 aballier Exp $
 
 EAPI="2"
 
@@ -418,7 +418,6 @@
 	fi
 	use bs2b || myconf+=" --disable-libbs2b"
 	use schroedinger || myconf+=" --disable-libschroedinger-lavc"
-	use xanim && myconf+=" --xanimcodecsdir=/usr/lib/xanim/mods"
 	if ! use png && ! use gmplayer; then
 		myconf+=" --disable-png"
 	fi
@@ -484,8 +483,8 @@
 
 	# Real binary codec support only available on x86, amd64
 	if use real; then
-		use x86 && myconf+=" --realcodecsdir=/opt/RealPlayer/codecs"
-		use amd64 && myconf+=" --realcodecsdir=/usr/$(get_libdir)/codecs"
+		use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
+		use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
 	elif ! use bindist; then
 			myconf+=" $(use_enable win32codecs win32dll)"
 	fi






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-04-24 12:18 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-04-24 12:18 UTC (permalink / raw
  To: gentoo-commits

aballier    10/04/24 12:18:44

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  fix opencore-amr automagic dep
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.723                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.723&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.723&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.722&r2=1.723

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.722
retrieving revision 1.723
diff -u -r1.722 -r1.723
--- ChangeLog	24 Apr 2010 11:57:49 -0000	1.722
+++ ChangeLog	24 Apr 2010 12:18:43 -0000	1.723
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.722 2010/04/24 11:57:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.723 2010/04/24 12:18:43 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  fix opencore-amr automagic dep
 
   24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   Fix codecsdir handling; default to real ones, the default can be overriden



1.38                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.37&r2=1.38

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mplayer-9999.ebuild	24 Apr 2010 11:57:49 -0000	1.37
+++ mplayer-9999.ebuild	24 Apr 2010 12:18:44 -0000	1.38
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.37 2010/04/24 11:57:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.38 2010/04/24 12:18:44 aballier Exp $
 
 EAPI="2"
 
@@ -418,6 +418,7 @@
 	fi
 	use bs2b || myconf+=" --disable-libbs2b"
 	use schroedinger || myconf+=" --disable-libschroedinger-lavc"
+	use amr || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb"
 	if ! use png && ! use gmplayer; then
 		myconf+=" --disable-png"
 	fi






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-04-24 12:33 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-04-24 12:33 UTC (permalink / raw
  To: gentoo-commits

aballier    10/04/24 12:33:02

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  use system libass, require freetype 2.2.1 at least
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.724                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.724&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.724&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.723&r2=1.724

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.723
retrieving revision 1.724
diff -u -r1.723 -r1.724
--- ChangeLog	24 Apr 2010 12:18:43 -0000	1.723
+++ ChangeLog	24 Apr 2010 12:33:02 -0000	1.724
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.723 2010/04/24 12:18:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.724 2010/04/24 12:33:02 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  use system libass, require freetype 2.2.1 at least
 
   24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   fix opencore-amr automagic dep



1.39                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.38&r2=1.39

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mplayer-9999.ebuild	24 Apr 2010 12:18:44 -0000	1.38
+++ mplayer-9999.ebuild	24 Apr 2010 12:33:02 -0000	1.39
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.38 2010/04/24 12:18:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.39 2010/04/24 12:33:02 aballier Exp $
 
 EAPI="2"
 
@@ -52,7 +52,7 @@
 FONT_RDEPS="
 	virtual/ttf-fonts
 	media-libs/fontconfig
-	media-libs/freetype:2
+	>=media-libs/freetype-2.2.1:2
 "
 X_RDEPS="
 	x11-libs/libXext
@@ -70,7 +70,7 @@
 	)
 	X? (
 		${X_RDEPS}
-		ass? ( ${FONT_RDEPS} )
+		ass? ( ${FONT_RDEPS} media-libs/libass )
 		dga? ( x11-libs/libXxf86dga )
 		ggi? (
 			media-libs/libggi
@@ -288,7 +288,8 @@
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
-	use ass || myconf+=" --disable-ass --disable-ass-internal"
+	use ass || myconf+=" --disable-ass"
+	myconf+=" --disable-ass-internal"
 	use bidi || myconf+=" --disable-fribidi"
 	use encode || myconf+=" --disable-mencoder"
 	use ipv6 || myconf+=" --disable-inet6"






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-04-24 12:44 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-04-24 12:44 UTC (permalink / raw
  To: gentoo-commits

aballier    10/04/24 12:44:45

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  allow ass and truetype without X, by Andrew Savchenko, bug #299405
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.725                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.725&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.725&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.724&r2=1.725

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.724
retrieving revision 1.725
diff -u -r1.724 -r1.725
--- ChangeLog	24 Apr 2010 12:33:02 -0000	1.724
+++ ChangeLog	24 Apr 2010 12:44:45 -0000	1.725
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.724 2010/04/24 12:33:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.725 2010/04/24 12:44:45 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  allow ass and truetype without X, by Andrew Savchenko, bug #299405
 
   24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   use system libass, require freetype 2.2.1 at least



1.40                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.39&r2=1.40

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mplayer-9999.ebuild	24 Apr 2010 12:33:02 -0000	1.39
+++ mplayer-9999.ebuild	24 Apr 2010 12:44:45 -0000	1.40
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.39 2010/04/24 12:33:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.40 2010/04/24 12:44:45 aballier Exp $
 
 EAPI="2"
 
@@ -70,7 +70,6 @@
 	)
 	X? (
 		${X_RDEPS}
-		ass? ( ${FONT_RDEPS} media-libs/libass )
 		dga? ( x11-libs/libXxf86dga )
 		ggi? (
 			media-libs/libggi
@@ -82,7 +81,6 @@
 			x11-libs/libXi
 		)
 		opengl? ( virtual/opengl )
-		truetype? ( ${FONT_RDEPS} )
 		vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) )
 		xinerama? ( x11-libs/libXinerama )
 		xscreensaver? ( x11-libs/libXScrnSaver )
@@ -93,6 +91,7 @@
 	)
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
+	ass? ( ${FONT_RDEPS} media-libs/libass )
 	bidi? ( dev-libs/fribidi )
 	bs2b? ( media-libs/libbs2b )
 	cdio? ( dev-libs/libcdio )
@@ -143,6 +142,7 @@
 	speex? ( media-libs/speex )
 	svga? ( media-libs/svgalib )
 	theora? ( media-libs/libtheora )
+	truetype? ( ${FONT_RDEPS} )
 	vorbis? ( media-libs/libvorbis )
 	xanim? ( media-video/xanim )
 "






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-04-24 13:03 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-04-24 13:03 UTC (permalink / raw
  To: gentoo-commits

aballier    10/04/24 13:03:41

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Disable opencore-amr support with bindist, Apache-2.0 vs GPL-2 issues, https://bugs.gentoo.org/show_bug.cgi?id=299405#c6
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.726                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.726&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.726&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.725&r2=1.726

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.725
retrieving revision 1.726
diff -u -r1.725 -r1.726
--- ChangeLog	24 Apr 2010 12:44:45 -0000	1.725
+++ ChangeLog	24 Apr 2010 13:03:41 -0000	1.726
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.725 2010/04/24 12:44:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.726 2010/04/24 13:03:41 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  Disable opencore-amr support with bindist, Apache-2.0 vs GPL-2 issues,
+  https://bugs.gentoo.org/show_bug.cgi?id=299405#c6
 
   24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   allow ass and truetype without X, by Andrew Savchenko, bug #299405



1.42                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.41&r2=1.42

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mplayer-9999.ebuild	24 Apr 2010 12:47:28 -0000	1.41
+++ mplayer-9999.ebuild	24 Apr 2010 13:03:41 -0000	1.42
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.41 2010/04/24 12:47:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.42 2010/04/24 13:03:41 aballier Exp $
 
 EAPI="2"
 
@@ -91,7 +91,7 @@
 	)
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
+	amr? ( !bindist? ( media-libs/opencore-amr ) )
 	ass? ( ${FONT_RDEPS} media-libs/libass )
 	bidi? ( dev-libs/fribidi )
 	bs2b? ( media-libs/libbs2b )
@@ -419,7 +419,9 @@
 	fi
 	use bs2b || myconf+=" --disable-libbs2b"
 	use schroedinger || myconf+=" --disable-libschroedinger-lavc"
-	use amr || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb"
+	# Disable opencore-amr with bindist
+	# https://bugs.gentoo.org/show_bug.cgi?id=299405#c6
+	{ use amr && use !bindist ; } || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb"
 	if ! use png && ! use gmplayer; then
 		myconf+=" --disable-png"
 	fi






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-04-24 13:24 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-04-24 13:24 UTC (permalink / raw
  To: gentoo-commits

aballier    10/04/24 13:24:32

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  remove aac useflag: let faad and faac useflags handle it; otherwise there is support in ffmpeg; always use system libfaad
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.727                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.727&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.727&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.726&r2=1.727

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.726
retrieving revision 1.727
diff -u -r1.726 -r1.727
--- ChangeLog	24 Apr 2010 13:03:41 -0000	1.726
+++ ChangeLog	24 Apr 2010 13:24:32 -0000	1.727
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.726 2010/04/24 13:03:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.727 2010/04/24 13:24:32 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  remove aac useflag: let faad and faac useflags handle it; otherwise there
+  is support in ffmpeg; always use system libfaad
 
   24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   Disable opencore-amr support with bindist, Apache-2.0 vs GPL-2 issues,



1.44                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.43&r2=1.44

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- mplayer-9999.ebuild	24 Apr 2010 13:07:53 -0000	1.43
+++ mplayer-9999.ebuild	24 Apr 2010 13:24:32 -0000	1.44
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.43 2010/04/24 13:07:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.44 2010/04/24 13:24:32 aballier Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@
 
 [[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r30554
 
-IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +ass bidi bindist bl bs2b
+IUSE="3dnow 3dnowext +a52 aalib +alsa altivec +ass bidi bindist bl bs2b
 +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb
 doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
 gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
@@ -112,7 +112,7 @@
 	)
 	esd? ( media-sound/esound )
 	enca? ( app-i18n/enca )
-	faad? ( !aac? ( media-libs/faad2 ) )
+	faad? ( media-libs/faad2 )
 	gif? ( media-libs/giflib )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg? ( media-libs/jpeg )
@@ -403,7 +403,7 @@
 	# Use internal musepack codecs for SV7 and SV8 support
 	myconf+=" --disable-musepack"
 
-	use aac || myconf+=" --disable-faad-internal"
+	myconf+=" --disable-faad-internal" # always use system media-libs/faad2
 	use dirac || myconf+=" --disable-libdirac-lavc"
 	use dts || myconf+=" --disable-libdca"
 	use dv || myconf+=" --disable-libdv"
@@ -446,7 +446,7 @@
 		for i in ${uses}; do
 			use ${i} || myconf+=" --disable-${i}"
 		done
-		use aac || myconf+=" --disable-faac-lavc"
+		use faac || myconf+=" --disable-faac-lavc"
 	else
 		myconf+="
 			--disable-faac-lavc
@@ -458,7 +458,7 @@
 			--disable-twolame
 			--disable-toolame
 		"
-		uses="aac faac x264 xvid toolame twolame"
+		uses="faac x264 xvid toolame twolame"
 		for i in ${uses}; do
 			use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work."
 		done






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-04-24 13:30 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-04-24 13:30 UTC (permalink / raw
  To: gentoo-commits

aballier    10/04/24 13:30:48

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  dont depend on cdparanoia if cdio is enabled, we wont use it; patch by Andrew Savchenko, bug #299405
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.728                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.728&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.728&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.727&r2=1.728

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.727
retrieving revision 1.728
diff -u -r1.727 -r1.728
--- ChangeLog	24 Apr 2010 13:24:32 -0000	1.727
+++ ChangeLog	24 Apr 2010 13:30:48 -0000	1.728
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.727 2010/04/24 13:24:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.728 2010/04/24 13:30:48 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  dont depend on cdparanoia if cdio is enabled, we wont use it; patch by
+  Andrew Savchenko, bug #299405
 
   24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   remove aac useflag: let faad and faac useflags handle it; otherwise there



1.45                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.44&r2=1.45

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mplayer-9999.ebuild	24 Apr 2010 13:24:32 -0000	1.44
+++ mplayer-9999.ebuild	24 Apr 2010 13:30:48 -0000	1.45
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.44 2010/04/24 13:24:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.45 2010/04/24 13:30:48 aballier Exp $
 
 EAPI="2"
 
@@ -96,7 +96,7 @@
 	bidi? ( dev-libs/fribidi )
 	bs2b? ( media-libs/libbs2b )
 	cdio? ( dev-libs/libcdio )
-	cdparanoia? ( media-sound/cdparanoia )
+	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
 	dirac? ( media-video/dirac )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdca )






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-04-24 13:56 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-04-24 13:56 UTC (permalink / raw
  To: gentoo-commits

aballier    10/04/24 13:56:22

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Build and install html documentation into the correct location, based on the LINGUAS variable, from on a patch by Andrew Savchenko in bug #299405
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.729                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.729&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.729&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.728&r2=1.729

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.728
retrieving revision 1.729
diff -u -r1.728 -r1.729
--- ChangeLog	24 Apr 2010 13:30:48 -0000	1.728
+++ ChangeLog	24 Apr 2010 13:56:22 -0000	1.729
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.728 2010/04/24 13:30:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.729 2010/04/24 13:56:22 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  Build and install html documentation into the correct location, based on
+  the LINGUAS variable, from on a patch by Andrew Savchenko in bug #299405
 
   24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   dont depend on cdparanoia if cdio is enabled, we wont use it; patch by



1.46                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.45&r2=1.46

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mplayer-9999.ebuild	24 Apr 2010 13:30:48 -0000	1.45
+++ mplayer-9999.ebuild	24 Apr 2010 13:56:22 -0000	1.46
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.45 2010/04/24 13:30:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.46 2010/04/24 13:56:22 aballier Exp $
 
 EAPI="2"
 
@@ -641,7 +641,24 @@
 src_compile() {
 	base_src_compile
 	emake || die "Failed to build MPlayer!"
-	use doc && make -C DOCS/xml html-chunked
+	# Build only user-requested docs if they're available.
+	if use doc ; then
+		# select available languages from $LINGUAS
+		LINGUAS=${LINGUAS/zh/zh_CN}
+		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+		local BUILT_DOCS=""
+		for i in ${LINGUAS} ; do
+			hasq $i ${ALLOWED_LINGUAS} && BUILT_DOCS+=" $i"
+		done
+		if [[ -z $BUILT_DOCS ]]
+		then 
+			emake -j1 -C DOCS/xml html-chunked || die "Failed to generate html docs"
+		else
+			for i in ${BUILT_DOCS} ; do
+				emake -j1 -C DOCS/xml html-chunked-$i || die "Failed to generate html docs for $i"
+			done
+		fi
+	fi
 }
 
 src_install() {
@@ -672,6 +689,7 @@
 	dodoc DOCS/tech/mirrors/* || die
 
 	if use doc; then
+		docinto html/
 		dohtml -r "${S}"/DOCS/HTML/* || die
 	fi
 






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-04-24 14:13 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-04-24 14:13 UTC (permalink / raw
  To: gentoo-commits

aballier    10/04/24 14:13:36

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  drop now unneeded append-flags
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.730                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.730&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.730&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.729&r2=1.730

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.729
retrieving revision 1.730
diff -u -r1.729 -r1.730
--- ChangeLog	24 Apr 2010 13:56:22 -0000	1.729
+++ ChangeLog	24 Apr 2010 14:13:36 -0000	1.730
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.729 2010/04/24 13:56:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.730 2010/04/24 14:13:36 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  drop now unneeded append-flags
 
   24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   Build and install html documentation into the correct location, based on



1.47                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.46&r2=1.47

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- mplayer-9999.ebuild	24 Apr 2010 13:56:22 -0000	1.46
+++ mplayer-9999.ebuild	24 Apr 2010 14:13:36 -0000	1.47
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.46 2010/04/24 13:56:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.47 2010/04/24 14:13:36 aballier Exp $
 
 EAPI="2"
 
@@ -560,7 +560,6 @@
 		append-ldflags -nopie
 	fi
 
-	append-flags -D__STDC_LIMIT_MACROS
 	is-flag -O? || append-flags -O2
 	if use x86 || use x86-fbsd; then
 		use debug || append-flags -fomit-frame-pointer






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-04-24 15:49 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-04-24 15:49 UTC (permalink / raw
  To: gentoo-commits

aballier    10/04/24 15:49:46

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  fix x264 deps
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.731                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.731&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.731&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.730&r2=1.731

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.730
retrieving revision 1.731
diff -u -r1.730 -r1.731
--- ChangeLog	24 Apr 2010 14:13:36 -0000	1.730
+++ ChangeLog	24 Apr 2010 15:49:46 -0000	1.731
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.730 2010/04/24 14:13:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.731 2010/04/24 15:49:46 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  fix x264 deps
 
   24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   drop now unneeded append-flags



1.50                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.49&r2=1.50

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- mplayer-9999.ebuild	24 Apr 2010 14:30:57 -0000	1.49
+++ mplayer-9999.ebuild	24 Apr 2010 15:49:46 -0000	1.50
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.49 2010/04/24 14:30:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.50 2010/04/24 15:49:46 aballier Exp $
 
 EAPI="2"
 
@@ -107,7 +107,7 @@
 		twolame? ( media-sound/twolame )
 		faac? ( media-libs/faac )
 		mp3? ( media-sound/lame )
-		x264? ( >=media-libs/x264-0.0.20091124 )
+		x264? ( >=media-libs/x264-0.0.20100423 )
 		xvid? ( media-libs/xvid )
 	)
 	esd? ( media-sound/esound )






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-05-01 15:39 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-05-01 15:39 UTC (permalink / raw
  To: gentoo-commits

aballier    10/05/01 15:39:08

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Add missing dep on app-text/docbook-xml-dtd by Scott Burgess <scottburgess@diamondkey.com>, bug #317559
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.735                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.735&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.735&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.734&r2=1.735

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.734
retrieving revision 1.735
diff -u -r1.734 -r1.735
--- ChangeLog	29 Apr 2010 17:08:12 -0000	1.734
+++ ChangeLog	1 May 2010 15:39:08 -0000	1.735
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.734 2010/04/29 17:08:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.735 2010/05/01 15:39:08 aballier Exp $
+
+  01 May 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  Add missing dep on app-text/docbook-xml-dtd by Scott Burgess
+  <scottburgess@diamondkey.com>, bug #317559
 
   29 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
   mplayer-1.0_rc4_p20100427.ebuild, mplayer-9999.ebuild:



1.55                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.54&r2=1.55

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mplayer-9999.ebuild	29 Apr 2010 17:08:12 -0000	1.54
+++ mplayer-9999.ebuild	1 May 2010 15:39:08 -0000	1.55
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.54 2010/04/29 17:08:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.55 2010/05/01 15:39:08 aballier Exp $
 
 EAPI="2"
 
@@ -162,7 +162,7 @@
 		xscreensaver? ( x11-proto/scrnsaverproto )
 	)
 	amd64? ( ${ASM_DEP} )
-	doc? ( dev-libs/libxslt )
+	doc? ( dev-libs/libxslt app-text/docbook-xml-dtd )
 	iconv? ( virtual/libiconv )
 	x86? ( ${ASM_DEP} )
 	x86-fbsd? ( ${ASM_DEP} )






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-05-01 15:41 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-05-01 15:41 UTC (permalink / raw
  To: gentoo-commits

aballier    10/05/01 15:41:18

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  iconv should be in RDEPEND too
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.736                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.736&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.736&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.735&r2=1.736

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.735
retrieving revision 1.736
diff -u -r1.735 -r1.736
--- ChangeLog	1 May 2010 15:39:08 -0000	1.735
+++ ChangeLog	1 May 2010 15:41:17 -0000	1.736
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.735 2010/05/01 15:39:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.736 2010/05/01 15:41:17 aballier Exp $
+
+  01 May 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  iconv should be in RDEPEND too
 
   01 May 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   Add missing dep on app-text/docbook-xml-dtd by Scott Burgess



1.56                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.55&r2=1.56

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mplayer-9999.ebuild	1 May 2010 15:39:08 -0000	1.55
+++ mplayer-9999.ebuild	1 May 2010 15:41:17 -0000	1.56
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.55 2010/05/01 15:39:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.56 2010/05/01 15:41:17 aballier Exp $
 
 EAPI="2"
 
@@ -113,6 +113,7 @@
 	enca? ( app-i18n/enca )
 	faad? ( media-libs/faad2 )
 	gif? ( media-libs/giflib )
+	iconv? ( virtual/libiconv )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg? ( media-libs/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
@@ -163,7 +164,6 @@
 	)
 	amd64? ( ${ASM_DEP} )
 	doc? ( dev-libs/libxslt app-text/docbook-xml-dtd )
-	iconv? ( virtual/libiconv )
 	x86? ( ${ASM_DEP} )
 	x86-fbsd? ( ${ASM_DEP} )
 "






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-05-05  8:37 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-05-05  8:37 UTC (permalink / raw
  To: gentoo-commits

scarabeus    10/05/05 08:37:34

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Remove emake call from src_compile, is already run by base eclass.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.737                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.737&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.737&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.736&r2=1.737

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.736
retrieving revision 1.737
diff -u -r1.736 -r1.737
--- ChangeLog	1 May 2010 15:41:17 -0000	1.736
+++ ChangeLog	5 May 2010 08:37:34 -0000	1.737
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.736 2010/05/01 15:41:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.737 2010/05/05 08:37:34 scarabeus Exp $
+
+  05 May 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Remove emake call from src_compile, is already run by base eclass.
 
   01 May 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   iconv should be in RDEPEND too



1.57                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.56&r2=1.57

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- mplayer-9999.ebuild	1 May 2010 15:41:17 -0000	1.56
+++ mplayer-9999.ebuild	5 May 2010 08:37:34 -0000	1.57
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.56 2010/05/01 15:41:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.57 2010/05/05 08:37:34 scarabeus Exp $
 
 EAPI="2"
 
@@ -633,7 +633,6 @@
 
 src_compile() {
 	base_src_compile
-	emake || die "Failed to build MPlayer!"
 	# Build only user-requested docs if they're available.
 	if use doc ; then
 		# select available languages from $LINGUAS






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-05-09 16:44 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-05-09 16:44 UTC (permalink / raw
  To: gentoo-commits

aballier    10/05/09 16:44:59

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  internal a52dec support has been dropped, use external one
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.739                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.739&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.739&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.738&r2=1.739

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.738
retrieving revision 1.739
diff -u -r1.738 -r1.739
--- ChangeLog	6 May 2010 13:38:12 -0000	1.738
+++ ChangeLog	9 May 2010 16:44:58 -0000	1.739
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.738 2010/05/06 13:38:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.739 2010/05/09 16:44:58 aballier Exp $
+
+  09 May 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  internal a52dec support has been dropped, use external one
 
 *mplayer-1.0_rc4_p20100506 (06 May 2010)
 



1.58                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.57&r2=1.58

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- mplayer-9999.ebuild	5 May 2010 08:37:34 -0000	1.57
+++ mplayer-9999.ebuild	9 May 2010 16:44:58 -0000	1.58
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.57 2010/05/05 08:37:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.58 2010/05/09 16:44:58 aballier Exp $
 
 EAPI="2"
 
@@ -88,6 +88,7 @@
 			xvmc? ( x11-libs/libXvMC )
 		)
 	)
+	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	amr? ( !bindist? ( media-libs/opencore-amr ) )
@@ -392,12 +393,10 @@
 	##########
 	# Codecs #
 	##########
-	# Won't work with external liba52
-	myconf+=" --disable-liba52"
-	use a52 && myconf+=" --enable-liba52-internal"
 	# Use internal musepack codecs for SV7 and SV8 support
 	myconf+=" --disable-musepack"
 
+	use a52 || myconf+=" --disable-liba52"
 	myconf+=" --disable-faad-internal" # always use system media-libs/faad2
 	use dirac || myconf+=" --disable-libdirac-lavc"
 	use dts || myconf+=" --disable-libdca"






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-05-31 13:41 Luca Barbato (lu_zero)
  0 siblings, 0 replies; 73+ messages in thread
From: Luca Barbato (lu_zero) @ 2010-05-31 13:41 UTC (permalink / raw
  To: gentoo-commits

lu_zero     10/05/31 13:41:41

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  fix sed lines
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.742                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.742&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.742&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.741&r2=1.742

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.741
retrieving revision 1.742
diff -u -r1.741 -r1.742
--- ChangeLog	20 May 2010 14:39:32 -0000	1.741
+++ ChangeLog	31 May 2010 13:41:40 -0000	1.742
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.741 2010/05/20 14:39:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.742 2010/05/31 13:41:40 lu_zero Exp $
+
+  31 May 2010; Luca Barbato <lu_zero@gentoo.org> mplayer-9999.ebuild:
+  make sure sed line is safe as suggested by Nikoli on #gentoo-media
 
   20 May 2010; Jeroen Roovers <jer@gentoo.org>
   mplayer-1.0_rc4_p20100506.ebuild:



1.59                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.58&r2=1.59

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mplayer-9999.ebuild	9 May 2010 16:44:58 -0000	1.58
+++ mplayer-9999.ebuild	31 May 2010 13:41:41 -0000	1.59
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.58 2010/05/09 16:44:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.59 2010/05/31 13:41:41 lu_zero Exp $
 
 EAPI="2"
 
@@ -243,10 +243,10 @@
 	if [[ ${PV} = *9999* ]]; then
 		# Set SVN version manually
 		subversion_wc_info
-		sed -i s/UNKNOWN/${ESVN_WC_REVISION}/ "${S}/version.sh"
+		sed -i -e "s/UNKNOWN/${ESVN_WC_REVISION}/" "${S}/version.sh" || die
 	else
 		# Set version #
-		sed -i s/UNKNOWN/${MPLAYER_REVISION}/ "${S}/version.sh"
+		sed -i -e "s/UNKNOWN/${MPLAYER_REVISION}/" "${S}/version.sh" || die
 	fi
 
 	if use svga; then






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-06-01  0:27 Luca Barbato (lu_zero)
  0 siblings, 0 replies; 73+ messages in thread
From: Luca Barbato (lu_zero) @ 2010-06-01  0:27 UTC (permalink / raw
  To: gentoo-commits

lu_zero     10/06/01 00:27:28

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  doc deps fixed
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.743                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.743&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.743&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.742&r2=1.743

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.742
retrieving revision 1.743
diff -u -r1.742 -r1.743
--- ChangeLog	31 May 2010 13:41:40 -0000	1.742
+++ ChangeLog	1 Jun 2010 00:27:28 -0000	1.743
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.742 2010/05/31 13:41:40 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.743 2010/06/01 00:27:28 lu_zero Exp $
+
+  01 Jun 2010; Luca Barbato <lu_zero@gentoo.org> mplayer-9999.ebuild:
+  Change doc deps as reported in bug #317559
 
   31 May 2010; Luca Barbato <lu_zero@gentoo.org> mplayer-9999.ebuild:
   make sure sed line is safe as suggested by Nikoli on #gentoo-media



1.60                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.59&r2=1.60

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- mplayer-9999.ebuild	31 May 2010 13:41:41 -0000	1.59
+++ mplayer-9999.ebuild	1 Jun 2010 00:27:28 -0000	1.60
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.59 2010/05/31 13:41:41 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.60 2010/06/01 00:27:28 lu_zero Exp $
 
 EAPI="2"
 
@@ -164,7 +164,8 @@
 		xscreensaver? ( x11-proto/scrnsaverproto )
 	)
 	amd64? ( ${ASM_DEP} )
-	doc? ( dev-libs/libxslt app-text/docbook-xml-dtd )
+	doc? ( dev-libs/libxslt app-text/docbook-xml-dtd 
+		   app-text/docbook-xsl-stylesheets )
 	x86? ( ${ASM_DEP} )
 	x86-fbsd? ( ${ASM_DEP} )
 "






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-06-02 16:25 Luca Barbato (lu_zero)
  0 siblings, 0 replies; 73+ messages in thread
From: Luca Barbato (lu_zero) @ 2010-06-02 16:25 UTC (permalink / raw
  To: gentoo-commits

lu_zero     10/06/02 16:25:29

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Ebuild improvements from Nikoli
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.744                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.744&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.744&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.743&r2=1.744

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.743
retrieving revision 1.744
diff -u -r1.743 -r1.744
--- ChangeLog	1 Jun 2010 00:27:28 -0000	1.743
+++ ChangeLog	2 Jun 2010 16:25:28 -0000	1.744
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.743 2010/06/01 00:27:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.744 2010/06/02 16:25:28 lu_zero Exp $
+
+  02 Jun 2010; Luca Barbato <lu_zero@gentoo.org> mplayer-9999.ebuild:
+  Ebuild improvements from Nikoli <nikoli@lavabit.com> see bug #322377
 
   01 Jun 2010; Luca Barbato <lu_zero@gentoo.org> mplayer-9999.ebuild:
   Change doc deps as reported in bug #317559



1.62                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.61&r2=1.62

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- mplayer-9999.ebuild	1 Jun 2010 04:31:51 -0000	1.61
+++ mplayer-9999.ebuild	2 Jun 2010 16:25:28 -0000	1.62
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.61 2010/06/01 04:31:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.62 2010/06/02 16:25:28 lu_zero Exp $
 
 EAPI="2"
 
@@ -62,6 +62,8 @@
 #	nemesi? ( net-libs/libnemesi )
 RDEPEND+="
 	sys-libs/ncurses
+	app-arch/bzip2
+	sys-libs/zlib
 	!bindist? (
 		x86? (
 			win32codecs? ( media-libs/win32codecs )
@@ -142,7 +144,7 @@
 	sdl? ( media-libs/libsdl )
 	speex? ( media-libs/speex )
 	svga? ( media-libs/svgalib )
-	theora? ( media-libs/libtheora )
+	theora? ( media-libs/libtheora[encode?] )
 	truetype? ( ${FONT_RDEPS} )
 	vorbis? ( media-libs/libvorbis )
 	xanim? ( media-video/xanim )
@@ -228,7 +230,13 @@
 }
 
 src_unpack() {
-	[[ ${PV} = *9999* ]] && subversion_src_unpack || unpack ${A}
+	if [[ ${PV} = *9999* ]]; then
+		subversion_src_unpack
+
+		cd "${WORKDIR}"
+	else
+		unpack ${A}
+	fi
 
 	if ! use truetype; then
 		unpack font-arial-iso-8859-1.tar.bz2 \
@@ -291,7 +299,6 @@
 		use ${i} || myconf+=" --disable-${i}"
 	done
 	use bidi || myconf+=" --disable-fribidi"
-	use encode || myconf+=" --disable-mencoder"
 	use ipv6 || myconf+=" --disable-inet6"
 	use nut || myconf+=" --disable-libnut"
 	use rar || myconf+=" --disable-unrarexec"
@@ -394,15 +401,10 @@
 	##########
 	# Codecs #
 	##########
-	# Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-musepack"
-
-	use a52 || myconf+=" --disable-liba52"
+	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
 	myconf+=" --disable-faad-internal" # always use system media-libs/faad2
 	use dirac || myconf+=" --disable-libdirac-lavc"
 	use dts || myconf+=" --disable-libdca"
-	use dv || myconf+=" --disable-libdv"
-	use lzo || myconf+=" --disable-liblzo"
 	if ! use mp3; then
 		myconf+="
 			--disable-mp3lame
@@ -410,7 +412,10 @@
 			--disable-mp3lib
 		"
 	fi
-	use bs2b || myconf+=" --disable-libbs2b"
+	uses="a52 bs2b dv lzo"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-lib${i}"
+	done
 	use schroedinger || myconf+=" --disable-libschroedinger-lavc"
 	# Disable opencore-amr with bindist
 	# https://bugs.gentoo.org/show_bug.cgi?id=299405#c6
@@ -435,25 +440,17 @@
 		"
 	fi
 	# Encoding
+	uses="faac x264 xvid toolame twolame"
 	if use encode; then
-		uses="faac x264 xvid toolame twolame"
 		for i in ${uses}; do
 			use ${i} || myconf+=" --disable-${i}"
 		done
 		use faac || myconf+=" --disable-faac-lavc"
 	else
-		myconf+="
-			--disable-faac-lavc
-			--disable-faac
-			--disable-x264
-			--disable-xvid
-			--disable-x264-lavc
-			--disable-xvid-lavc
-			--disable-twolame
-			--disable-toolame
-		"
-		uses="faac x264 xvid toolame twolame"
+		myconf+=" --disable-mencoder"
+		myconf+="--disable-faac-lavc"
 		for i in ${uses}; do
+			myconf+=" --disable-${i}"
 			use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work."
 		done
 	fi
@@ -606,6 +603,7 @@
 		--disable-xss
 		--disable-xv
 		--disable-xvmc
+		--disable-x11
 		"
 		uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv"
 		for i in ${uses}; do
@@ -640,14 +638,14 @@
 		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
 		local BUILT_DOCS=""
 		for i in ${LINGUAS} ; do
-			hasq $i ${ALLOWED_LINGUAS} && BUILT_DOCS+=" $i"
+			hasq ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
 		done
 		if [[ -z $BUILT_DOCS ]]
 		then
 			emake -j1 -C DOCS/xml html-chunked || die "Failed to generate html docs"
 		else
 			for i in ${BUILT_DOCS} ; do
-				emake -j1 -C DOCS/xml html-chunked-$i || die "Failed to generate html docs for $i"
+				emake -j1 -C DOCS/xml html-chunked-${i} || die "Failed to generate html docs for ${i}"
 			done
 		fi
 	fi






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-06-11 13:59 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-06-11 13:59 UTC (permalink / raw
  To: gentoo-commits

aballier    10/06/11 13:59:50

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  fix the configure options building with mencoder disabled, bug #323097
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.745                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.745&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.745&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.744&r2=1.745

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.744
retrieving revision 1.745
diff -u -r1.744 -r1.745
--- ChangeLog	2 Jun 2010 16:25:28 -0000	1.744
+++ ChangeLog	11 Jun 2010 13:59:49 -0000	1.745
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.744 2010/06/02 16:25:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.745 2010/06/11 13:59:49 aballier Exp $
+
+  11 Jun 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  fix the configure options building with mencoder disabled, bug #323097
 
   02 Jun 2010; Luca Barbato <lu_zero@gentoo.org> mplayer-9999.ebuild:
   Ebuild improvements from Nikoli <nikoli@lavabit.com> see bug #322377



1.64                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.63&r2=1.64

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- mplayer-9999.ebuild	6 Jun 2010 21:27:23 -0000	1.63
+++ mplayer-9999.ebuild	11 Jun 2010 13:59:50 -0000	1.64
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.63 2010/06/06 21:27:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.64 2010/06/11 13:59:50 aballier Exp $
 
 EAPI="2"
 
@@ -450,7 +450,7 @@
 		use faac || myconf+=" --disable-faac-lavc"
 	else
 		myconf+=" --disable-mencoder"
-		myconf+="--disable-faac-lavc"
+		myconf+=" --disable-faac-lavc"
 		for i in ${uses}; do
 			myconf+=" --disable-${i}"
 			use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work."






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-06-25 11:51 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-06-25 11:51 UTC (permalink / raw
  To: gentoo-commits

aballier    10/06/25 11:51:10

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  disable faac with use bindist, by Nikoli <nikoli@lavabit.com>, bug #323353
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.749                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.749&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.749&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.748&r2=1.749

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.748
retrieving revision 1.749
diff -u -r1.748 -r1.749
--- ChangeLog	13 Jun 2010 10:07:24 -0000	1.748
+++ ChangeLog	25 Jun 2010 11:51:10 -0000	1.749
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.748 2010/06/13 10:07:24 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.749 2010/06/25 11:51:10 aballier Exp $
+
+  25 Jun 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  disable faac with use bindist, by Nikoli <nikoli@lavabit.com>, bug #323353
 
   13 Jun 2010; Dror Levin <spatz@gentoo.org>
   mplayer-1.0_rc4_p20100612.ebuild:



1.66                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.65&r2=1.66

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- mplayer-9999.ebuild	12 Jun 2010 18:14:40 -0000	1.65
+++ mplayer-9999.ebuild	25 Jun 2010 11:51:10 -0000	1.66
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.65 2010/06/12 18:14:40 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.66 2010/06/25 11:51:10 aballier Exp $
 
 EAPI="2"
 
@@ -107,7 +107,7 @@
 	encode? (
 		!twolame? ( toolame? ( media-sound/toolame ) )
 		twolame? ( media-sound/twolame )
-		faac? ( media-libs/faac )
+		faac? ( !bindist? ( media-libs/faac ) )
 		mp3? ( media-sound/lame )
 		x264? ( >=media-libs/x264-0.0.20100423 )
 		xvid? ( media-libs/xvid )
@@ -450,6 +450,11 @@
 			use ${i} || myconf+=" --disable-${i}"
 		done
 		use faac || myconf+=" --disable-faac-lavc"
+		if use bindist
+		then
+			use faac && ewarn "faac is nonfree and cannot be distributed; disabling faac support."
+			myconf+=" --disable-faac --disable-faac-lavc"
+		fi
 	else
 		myconf+=" --disable-mencoder"
 		myconf+=" --disable-faac-lavc"






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-06-25 11:53 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-06-25 11:53 UTC (permalink / raw
  To: gentoo-commits

aballier    10/06/25 11:53:40

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  propagate enca useflag to libass, by Alexey Shildyakov <ashl1future@gmail.com>, bug #321863
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.750                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.750&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.750&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.749&r2=1.750

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.749
retrieving revision 1.750
diff -u -r1.749 -r1.750
--- ChangeLog	25 Jun 2010 11:51:10 -0000	1.749
+++ ChangeLog	25 Jun 2010 11:53:40 -0000	1.750
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.749 2010/06/25 11:51:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.750 2010/06/25 11:53:40 aballier Exp $
+
+  25 Jun 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  propagate enca useflag to libass, by Alexey Shildyakov
+  <ashl1future@gmail.com>, bug #321863
 
   25 Jun 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   disable faac with use bindist, by Nikoli <nikoli@lavabit.com>, bug #323353



1.67                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.66&r2=1.67

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- mplayer-9999.ebuild	25 Jun 2010 11:51:10 -0000	1.66
+++ mplayer-9999.ebuild	25 Jun 2010 11:53:40 -0000	1.67
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.66 2010/06/25 11:51:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.67 2010/06/25 11:53:40 aballier Exp $
 
 EAPI="2"
 
@@ -94,7 +94,7 @@
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	amr? ( !bindist? ( media-libs/opencore-amr ) )
-	ass? ( ${FONT_RDEPS} media-libs/libass )
+	ass? ( ${FONT_RDEPS} media-libs/libass[enca?] )
 	bidi? ( dev-libs/fribidi )
 	bs2b? ( media-libs/libbs2b )
 	cdio? ( dev-libs/libcdio )






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-06-30 16:45 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-06-30 16:45 UTC (permalink / raw
  To: gentoo-commits

scarabeus    10/06/30 16:45:23

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Drop svga useflag.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.754                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.754&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.754&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.753&r2=1.754

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.753
retrieving revision 1.754
diff -u -r1.753 -r1.754
--- ChangeLog	30 Jun 2010 16:41:24 -0000	1.753
+++ ChangeLog	30 Jun 2010 16:45:23 -0000	1.754
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.753 2010/06/30 16:41:24 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.754 2010/06/30 16:45:23 scarabeus Exp $
+
+  30 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Drop svga useflag.
 
   30 Jun 2010; Fabio Erculiani <lxnay@gentoo.org>
   mplayer-1.0_rc4_p20091026-r1.ebuild, mplayer-1.0_rc4_p20100506.ebuild,



1.70                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.69&r2=1.70

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- mplayer-9999.ebuild	30 Jun 2010 16:41:24 -0000	1.69
+++ mplayer-9999.ebuild	30 Jun 2010 16:45:23 -0000	1.70
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.69 2010/06/30 16:41:24 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.70 2010/06/30 16:45:23 scarabeus Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@
 gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
 amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
-samba +shm +schroedinger sdl +speex sse sse2 ssse3 svga tga +theora +tremor
+samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor
 +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis vpx
 win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
 [[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg"
@@ -42,8 +42,7 @@
 fi
 SRC_URI="${RELEASE_URI}
 	!truetype? ( ${FONT_URI} )
-	gmplayer? ( mirror://mplayer/skins/Blue-${BLUV}.tar.bz2 )
-	svga? ( mirror://gentoo/svgalib_helper-${SVGV}-mplayer.tar.gz )"
+	gmplayer? ( mirror://mplayer/skins/Blue-${BLUV}.tar.bz2 )"
 
 DESCRIPTION="Media Player for Linux"
 HOMEPAGE="http://www.mplayerhq.hu/"
@@ -143,7 +142,6 @@
 	schroedinger? ( media-libs/schroedinger )
 	sdl? ( media-libs/libsdl )
 	speex? ( media-libs/speex )
-	svga? ( media-libs/svgalib )
 	theora? ( media-libs/libtheora[encode?] )
 	truetype? ( ${FONT_RDEPS} )
 	vorbis? ( media-libs/libvorbis )
@@ -248,7 +246,6 @@
 	fi
 
 	use gmplayer && unpack "Blue-${BLUV}.tar.bz2"
-	use svga && unpack "svgalib_helper-${SVGV}-mplayer.tar.gz"
 }
 
 src_prepare() {
@@ -261,16 +258,6 @@
 		sed -i -e "s/UNKNOWN/${MPLAYER_REVISION}/" "${S}/version.sh" || die
 	fi
 
-	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
-
 	base_src_prepare
 }
 
@@ -290,6 +277,7 @@
 	#Optional features#
 	###################
 	myconf+="
+		--disable-svga --enable-svgalib_helper
 		--disable-arts
 		--disable-kai
 		$(use_enable network)
@@ -306,7 +294,6 @@
 	use nut || myconf+=" --disable-libnut"
 	use rar || myconf+=" --disable-unrarexec"
 	use samba || myconf+=" --disable-smb"
-	use svga || myconf+=" --disable-svga --enable-svgalib_helper"
 	if ! use lirc; then
 		myconf+="
 			--disable-lirc






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-07-18  9:47 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-07-18  9:47 UTC (permalink / raw
  To: gentoo-commits

aballier    10/07/18 09:47:30

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  network configure option has been renamed to networking
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.758                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.758&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.758&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.757&r2=1.758

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.757
retrieving revision 1.758
diff -u -r1.757 -r1.758
--- ChangeLog	17 Jul 2010 16:36:23 -0000	1.757
+++ ChangeLog	18 Jul 2010 09:47:30 -0000	1.758
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.757 2010/07/17 16:36:23 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.758 2010/07/18 09:47:30 aballier Exp $
+
+  18 Jul 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  network configure option has been renamed to networking
 
   17 Jul 2010; Steve Dibb <beandog@gentoo.org> mplayer-9999.ebuild:
   Revert libass change; Always use external versions where possible



1.75                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.74&r2=1.75

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mplayer-9999.ebuild	17 Jul 2010 16:36:23 -0000	1.74
+++ mplayer-9999.ebuild	18 Jul 2010 09:47:30 -0000	1.75
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.74 2010/07/17 16:36:23 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.75 2010/07/18 09:47:30 aballier Exp $
 
 EAPI="2"
 
@@ -281,7 +281,7 @@
 		--disable-svga --enable-svgalib_helper
 		--disable-arts
 		--disable-kai
-		$(use_enable network)
+		$(use_enable network networking)
 		$(use_enable joystick)
 	"
 	uses="ass bl enca ftp rtc" # nemesi <- not working with in-tree ebuild






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-10-01  2:44 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2010-10-01  2:44 UTC (permalink / raw
  To: gentoo-commits

aballier    10/10/01 02:44:10

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  fix configure options for external ffmpeg
  
  (Portage version: 2.2_rc88/cvs/Linux x86_64)

Revision  Changes    Path
1.759                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.759&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.759&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.758&r2=1.759

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.758
retrieving revision 1.759
diff -u -r1.758 -r1.759
--- ChangeLog	18 Jul 2010 09:47:30 -0000	1.758
+++ ChangeLog	1 Oct 2010 02:44:10 -0000	1.759
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.758 2010/07/18 09:47:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.759 2010/10/01 02:44:10 aballier Exp $
+
+  01 Oct 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  fix configure options for external ffmpeg
 
   18 Jul 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   network configure option has been renamed to networking



1.76                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.75&r2=1.76

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- mplayer-9999.ebuild	18 Jul 2010 09:47:30 -0000	1.75
+++ mplayer-9999.ebuild	1 Oct 2010 02:44:10 -0000	1.76
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.75 2010/07/18 09:47:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.76 2010/10/01 02:44:10 aballier Exp $
 
 EAPI="2"
 
@@ -616,7 +616,7 @@
 		###################
 		# External FFmpeg #
 		###################
-		use external-ffmpeg && myconf+=" --disable-libavutil_a --disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a --disable-libswscale_a"
+		use external-ffmpeg && myconf+=" --disable-ffmpeg_a"
 	fi
 
 	myconf="--cc=$(tc-getCC) \






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-10-10  9:04 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-10-10  9:04 UTC (permalink / raw
  To: gentoo-commits

scarabeus    10/10/10 09:04:03

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Always disable internal libmpeg2, update changelog.
  
  (Portage version: 2.2_rc91/cvs/Linux x86_64)

Revision  Changes    Path
1.760                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.760&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.760&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.759&r2=1.760

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.759
retrieving revision 1.760
diff -u -r1.759 -r1.760
--- ChangeLog	1 Oct 2010 02:44:10 -0000	1.759
+++ ChangeLog	10 Oct 2010 09:04:02 -0000	1.760
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.759 2010/10/01 02:44:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.760 2010/10/10 09:04:02 scarabeus Exp $
+
+  10 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Always disable internal libmpeg2.
+
+  10 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild,
+  metadata.xml:
+  Ebuild cleanup. Drop gmplayer useflag. Introduce rtmpdump useflag. Thanks
+  to Andrew Savchenko. Fixes bug #336021 and bug #337284.
 
   01 Oct 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   fix configure options for external ffmpeg



1.78                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.78&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.78&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.77&r2=1.78

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- mplayer-9999.ebuild	10 Oct 2010 08:49:51 -0000	1.77
+++ mplayer-9999.ebuild	10 Oct 2010 09:04:02 -0000	1.78
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.77 2010/10/10 08:49:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.78 2010/10/10 09:04:02 scarabeus Exp $
 
 EAPI="2"
 
@@ -381,6 +381,7 @@
 	##########
 	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
 	myconf+=" --disable-faad-internal" # always use system media-libs/faad2
+	myconf+=" --disable-libmpeg2-internal" # always use system version
 	use dirac || myconf+=" --disable-libdirac-lavc"
 	use dts || myconf+=" --disable-libdca"
 	if ! use mp3; then






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-10-10 11:29 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-10-10 11:29 UTC (permalink / raw
  To: gentoo-commits

scarabeus    10/10/10 11:29:50

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Introduce gsm useflag. Adds support for the gsm lossy speech compression codec.
  
  (Portage version: 2.2_rc91/cvs/Linux x86_64)

Revision  Changes    Path
1.761                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.761&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.761&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.760&r2=1.761

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.760
retrieving revision 1.761
diff -u -r1.760 -r1.761
--- ChangeLog	10 Oct 2010 09:04:02 -0000	1.760
+++ ChangeLog	10 Oct 2010 11:29:50 -0000	1.761
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.760 2010/10/10 09:04:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.761 2010/10/10 11:29:50 scarabeus Exp $
+
+  10 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Introduce gsm useflag. Adds support for the gsm lossy speech compression
+  codec.
 
   10 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
   Always disable internal libmpeg2.



1.79                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.79&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.79&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.78&r2=1.79

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- mplayer-9999.ebuild	10 Oct 2010 09:04:02 -0000	1.78
+++ mplayer-9999.ebuild	10 Oct 2010 11:29:50 -0000	1.79
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.78 2010/10/10 09:04:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.79 2010/10/10 11:29:50 scarabeus Exp $
 
 EAPI="2"
 
@@ -9,12 +9,13 @@
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
+# BUMP ME PLZ, NO COOKIES OTHERWISE
 [[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r30554
 
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec +ass bidi bindist bl bluray bs2b
 +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb
 doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
-gif ggi +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
 amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
 rtmpdump samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor
@@ -107,6 +108,7 @@
 	enca? ( app-i18n/enca )
 	faad? ( media-libs/faad2 )
 	gif? ( media-libs/giflib )
+	gsm? ( media-sound/gsm )
 	iconv? ( virtual/libiconv )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg? ( media-libs/jpeg )
@@ -350,7 +352,7 @@
 	if { use dvb || use v4l || use v4l2 || use pvr || use radio; }; then
 		use dvb || myconf+=" --disable-dvb"
 		use pvr || myconf+=" --disable-pvr"
-		use v4l	|| myconf+=" --disable-tv-v4l1"
+		use v4l || myconf+=" --disable-tv-v4l1"
 		use v4l2 || myconf+=" --disable-tv-v4l2"
 		if use radio && { use dvb || use v4l || use v4l2; }; then
 			myconf+="
@@ -391,7 +393,7 @@
 			--disable-mp3lib
 		"
 	fi
-	uses="a52 bs2b dv lzo"
+	uses="a52 bs2b dv gsm lzo"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-lib${i}"
 	done






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-10-10 13:46 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-10-10 13:46 UTC (permalink / raw
  To: gentoo-commits

scarabeus    10/10/10 13:46:33

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  EAPI3fy for prefix support.
  
  (Portage version: 2.2_rc91/cvs/Linux x86_64)

Revision  Changes    Path
1.762                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.762&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.762&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.761&r2=1.762

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.761
retrieving revision 1.762
diff -u -r1.761 -r1.762
--- ChangeLog	10 Oct 2010 11:29:50 -0000	1.761
+++ ChangeLog	10 Oct 2010 13:46:33 -0000	1.762
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.761 2010/10/10 11:29:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.762 2010/10/10 13:46:33 scarabeus Exp $
+
+  10 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  EAPI3fy for prefix support.
 
   10 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
   Introduce gsm useflag. Adds support for the gsm lossy speech compression



1.80                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.79&r2=1.80

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- mplayer-9999.ebuild	10 Oct 2010 11:29:50 -0000	1.79
+++ mplayer-9999.ebuild	10 Oct 2010 13:46:33 -0000	1.80
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.79 2010/10/10 11:29:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.80 2010/10/10 13:46:33 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 [[ ${PV} = *9999* ]] && SVN_ECLASS="subversion" || SVN_ECLASS=""
@@ -12,10 +12,10 @@
 # BUMP ME PLZ, NO COOKIES OTHERWISE
 [[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r30554
 
-IUSE="3dnow 3dnowext +a52 aalib +alsa altivec +ass bidi bindist bl bluray bs2b
-+cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb
-doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
-gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
+bs2b +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac
+directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon
+ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
 amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
 rtmpdump samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor
@@ -170,7 +170,7 @@
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x64-macos"
 else
 	KEYWORDS=""
 fi
@@ -243,6 +243,9 @@
 		sed -i -e "s/UNKNOWN/${MPLAYER_REVISION}/" "${S}/version.sh" || die
 	fi
 
+	# fix path to bash executable in configure scripts
+	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
+
 	base_src_prepare
 }
 
@@ -329,16 +332,13 @@
 	# SRT/ASS/SSA (subtitles) requires freetype support
 	# freetype support requires iconv
 	# iconv optionally can use unicode
-
-	if ! use ass; then
-		if ! use truetype; then
-			myconf+=" --disable-freetype"
-			if ! use iconv; then
-				myconf+="
-					--disable-iconv
-					--charset=noconv
-				"
-			fi
+	if ! use ass && ! use truetype; then
+		myconf+=" --disable-freetype"
+		if ! use iconv; then
+			myconf+="
+				--disable-iconv
+				--charset=noconv
+			"
 		fi
 	fi
 	use iconv && use unicode && myconf+=" --charset=UTF-8"
@@ -496,6 +496,9 @@
 		"
 	fi
 
+	# sun card, disable by default, see bug #258729
+	myconf+=" --disable-xvr100"
+
 	################
 	# Audio Output #
 	################
@@ -539,6 +542,11 @@
 		use debug || append-flags -fomit-frame-pointer
 	fi
 
+	# workaround bug, x86 just has too few registers, see c.f.
+	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402950#44
+	# and 32b osx, bug 329861
+	[[ ${CHOST} == i?86-*solaris* || ${CHOST} == i?86-*darwin* ]] && append-flags -fomit-frame-pointer
+
 	###########################
 	# X enabled configuration #
 	###########################
@@ -571,19 +579,19 @@
 		fi
 	else
 		myconf+="
-		--disable-dga1
-		--disable-dga2
-		--disable-dxr3
-		--disable-ggi
-		--disable-gl
-		--disable-vdpau
-		--disable-vidix
-		--disable-vidix-pcidb
-		--disable-xinerama
-		--disable-xss
-		--disable-xv
-		--disable-xvmc
-		--disable-x11
+			--disable-dga1
+			--disable-dga2
+			--disable-dxr3
+			--disable-ggi
+			--disable-gl
+			--disable-vdpau
+			--disable-vidix
+			--disable-vidix-pcidb
+			--disable-xinerama
+			--disable-xss
+			--disable-xv
+			--disable-xvmc
+			--disable-x11
 		"
 		uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv"
 		for i in ${uses}; do
@@ -591,19 +599,31 @@
 		done
 	fi
 
+	############################
+	# OSX (aqua) configuration #
+	############################
+	if use aqua; then
+		myconf+="
+			--enable-macosx-finder
+			--enable-macosx-bundle
+			--enable-libdvdcss-internal
+		"
+	fi
+
+
+	###################
+	# External FFmpeg #
+	###################
 	if [[ ${PV} == *9999* ]]; then
-		###################
-		# External FFmpeg #
-		###################
 		use external-ffmpeg && myconf+=" --disable-ffmpeg_a"
 	fi
 
 	myconf="--cc=$(tc-getCC) \
 		--host-cc=$(tc-getBUILD_CC) \
-		--prefix=/usr \
-		--confdir=/etc/mplayer \
-		--datadir=/usr/share/mplayer \
-		--libdir=/usr/$(get_libdir) \
+		--prefix=${EPREFIX}/usr \
+		--confdir=${EPREFIX}/etc/mplayer \
+		--datadir=${EPREFIX}/usr/share/mplayer \
+		--libdir=${EPREFIX}/usr/$(get_libdir) \
 		${myconf}"
 
 	CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died"
@@ -633,12 +653,12 @@
 src_install() {
 	local i
 
-	emake prefix="${D}/usr" \
-		BINDIR="${D}/usr/bin" \
-		LIBDIR="${D}/usr/$(get_libdir)" \
-		CONFDIR="${D}/etc/mplayer" \
-		DATADIR="${D}/usr/share/mplayer" \
-		MANDIR="${D}/usr/share/man" \
+	emake prefix="${ED}/usr" \
+		BINDIR="${ED}/usr/bin" \
+		LIBDIR="${ED}/usr/$(get_libdir)" \
+		CONFDIR="${ED}/etc/mplayer" \
+		DATADIR="${ED}/usr/share/mplayer" \
+		MANDIR="${ED}/usr/share/man" \
 		INSTALLSTRIP="" \
 		install || die "emake install failed"
 
@@ -667,10 +687,10 @@
 		# Do this generic, as the mplayer people like to change the structure
 		# of their zips ...
 		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
-			cp -pPR "${i}" "${D}/usr/share/mplayer/fonts"
+			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
 		done
 		# Fix the font symlink ...
-		rm -rf "${D}/usr/share/mplayer/font"
+		rm -rf "${ED}/usr/share/mplayer/font"
 		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
 	fi
 
@@ -682,7 +702,7 @@
 	fi
 
 	if use ass || use truetype; then
-		cat >> "${D}/etc/mplayer/mplayer.conf" << _EOF_
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
 fontconfig=1
 subfont-osd-scale=4
 subfont-text-scale=3
@@ -691,8 +711,8 @@
 
 	# bug 256203
 	if use rar; then
-		cat >> "${D}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=/usr/bin/unrar
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
 _EOF_
 	fi
 
@@ -701,17 +721,17 @@
 }
 
 pkg_preinst() {
-	[[ -d ${ROOT}/usr/share/mplayer/Skin/default ]] && \
-		rm -rf "${ROOT}/usr/share/mplayer/Skin/default"
+	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
+		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
 }
 
 pkg_postrm() {
 	# Cleanup stale symlinks
-	[ -L "${ROOT}/usr/share/mplayer/font" -a \
-			! -e "${ROOT}/usr/share/mplayer/font" ] && \
-		rm -f "${ROOT}/usr/share/mplayer/font"
-
-	[ -L "${ROOT}/usr/share/mplayer/subfont.ttf" -a \
-			! -e "${ROOT}/usr/share/mplayer/subfont.ttf" ] && \
-		rm -f "${ROOT}/usr/share/mplayer/subfont.ttf"
+	[ -L "${EROOT}/usr/share/mplayer/font" -a \
+			! -e "${EROOT}/usr/share/mplayer/font" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/font"
+
+	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
+			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
 }






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-01-02  2:35 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-01-02  2:35 UTC (permalink / raw
  To: gentoo-commits

aballier    11/01/02 02:35:39

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  The internal copy of faad2 is gone, bug #350316
  
  (Portage version: 2.2.0_alpha11/cvs/Linux x86_64)

Revision  Changes    Path
1.770                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.770&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.770&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.769&r2=1.770

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.769
retrieving revision 1.770
diff -u -r1.769 -r1.770
--- ChangeLog	19 Dec 2010 10:54:52 -0000	1.769
+++ ChangeLog	2 Jan 2011 02:35:39 -0000	1.770
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.769 2010/12/19 10:54:52 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.770 2011/01/02 02:35:39 aballier Exp $
+
+  02 Jan 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  The internal copy of faad2 is gone, bug #350316
 
 *mplayer-1.0_rc4_p20101219 (19 Dec 2010)
 



1.87                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.86&r2=1.87

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mplayer-9999.ebuild	19 Dec 2010 10:54:52 -0000	1.86
+++ mplayer-9999.ebuild	2 Jan 2011 02:35:39 -0000	1.87
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.86 2010/12/19 10:54:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.87 2011/01/02 02:35:39 aballier Exp $
 
 EAPI=3
 
@@ -386,7 +386,6 @@
 	# Codecs #
 	##########
 	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
-	myconf+=" --disable-faad-internal" # always use system media-libs/faad2
 	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
 	use dirac || myconf+=" --disable-libdirac-lavc"
 	use dts || myconf+=" --disable-libdca"






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-01-14 16:26 Fabian Groffen (grobian)
  0 siblings, 0 replies; 73+ messages in thread
From: Fabian Groffen (grobian) @ 2011-01-14 16:26 UTC (permalink / raw
  To: gentoo-commits

grobian     11/01/14 16:26:20

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Simplify and generalise too few registers logic for all x86 hosts, bug #351588
  
  (Portage version: 2.2.01.17583-prefix/cvs/Darwin powerpc)

Revision  Changes    Path
1.772                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.772&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.772&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.771&r2=1.772

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.771
retrieving revision 1.772
diff -u -r1.771 -r1.772
--- ChangeLog	2 Jan 2011 19:57:12 -0000	1.771
+++ ChangeLog	14 Jan 2011 16:26:20 -0000	1.772
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.771 2011/01/02 19:57:12 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.772 2011/01/14 16:26:20 grobian Exp $
+
+  14 Jan 2011; Fabian Groffen <grobian@gentoo.org> mplayer-9999.ebuild:
+  Simplify and generalise too few registers logic for all x86 hosts, bug
+  #351588
 
   02 Jan 2011; Tobias Klausmann <klausman@gentoo.org>
   mplayer-1.0_rc4_p20101114.ebuild:



1.88                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.87&r2=1.88

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- mplayer-9999.ebuild	2 Jan 2011 02:35:39 -0000	1.87
+++ mplayer-9999.ebuild	14 Jan 2011 16:26:20 -0000	1.88
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.87 2011/01/02 02:35:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.88 2011/01/14 16:26:20 grobian Exp $
 
 EAPI=3
 
@@ -541,14 +541,13 @@
 	fi
 
 	is-flag -O? || append-flags -O2
-	if use x86 || use x86-fbsd; then
-		use debug || append-flags -fomit-frame-pointer
-	fi
 
 	# workaround bug, x86 just has too few registers, see c.f.
 	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402950#44
-	# and 32b osx, bug 329861
-	[[ ${CHOST} == i?86-*solaris* || ${CHOST} == i?86-*darwin* ]] && append-flags -fomit-frame-pointer
+	# and 32-bits OSX, bug 329861
+	if [[ ${CHOST} == i?86-* ]] ; then
+		use debug || append-flags -fomit-frame-pointer
+	fi
 
 	###########################
 	# X enabled configuration #






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-01-30 11:20 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-01-30 11:20 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/01/30 11:20:53

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Fix dependency on vdpau (it specificaly check for headers in libvdpau). Per bug #352422.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.776                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.776&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.776&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.775&r2=1.776

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.775
retrieving revision 1.776
diff -u -r1.775 -r1.776
--- ChangeLog	26 Jan 2011 01:42:48 -0000	1.775
+++ ChangeLog	30 Jan 2011 11:20:53 -0000	1.776
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.775 2011/01/26 01:42:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.776 2011/01/30 11:20:53 scarabeus Exp $
+
+  30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Fix dependency on vdpau (it specificaly check for headers in libvdpau). Per
+  bug #352422.
 
   26 Jan 2011; Jeroen Roovers <jer@gentoo.org>
   mplayer-1.0_rc4_p20101114.ebuild:



1.89                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.89&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.89&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.88&r2=1.89

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- mplayer-9999.ebuild	14 Jan 2011 16:26:20 -0000	1.88
+++ mplayer-9999.ebuild	30 Jan 2011 11:20:53 -0000	1.89
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.88 2011/01/14 16:26:20 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.89 2011/01/30 11:20:53 scarabeus Exp $
 
 EAPI=3
 
@@ -74,7 +74,7 @@
 			media-libs/libggiwmh
 		)
 		opengl? ( virtual/opengl )
-		vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) )
+		vdpau? ( x11-libs/libvdpau )
 		xinerama? ( x11-libs/libXinerama )
 		xscreensaver? ( x11-libs/libXScrnSaver )
 		xv? (






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-01-30 12:55 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-01-30 12:55 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/01/30 12:55:54

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Update live verison to eapi4 and use_required syntax. Fix default configuration section, some setitngs were eaten for me otherwise.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.777                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.777&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.777&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.776&r2=1.777

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.776
retrieving revision 1.777
diff -u -r1.776 -r1.777
--- ChangeLog	30 Jan 2011 11:20:53 -0000	1.776
+++ ChangeLog	30 Jan 2011 12:55:54 -0000	1.777
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.776 2011/01/30 11:20:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.777 2011/01/30 12:55:54 scarabeus Exp $
+
+  30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Update live verison to eapi4 and use_required syntax. Fix default
+  configuration section, some setitngs were eaten for me otherwise.
 
   30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
   Fix dependency on vdpau (it specificaly check for headers in libvdpau). Per



1.90                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.89&r2=1.90

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- mplayer-9999.ebuild	30 Jan 2011 11:20:53 -0000	1.89
+++ mplayer-9999.ebuild	30 Jan 2011 12:55:54 -0000	1.90
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.89 2011/01/30 11:20:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.90 2011/01/30 12:55:54 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 [[ ${PV} = *9999* ]] && SVN_ECLASS="subversion" || SVN_ECLASS=""
@@ -182,6 +182,47 @@
 	KEYWORDS=""
 fi
 
+# bindist does not cope with amr codecs (#299405#c6), faac codecs are nonfree, win32codecs are nonfree
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
+# dvd navigation requires dvd read support
+# ass and freetype font require iconv and ass requires freetype fonts
+# unicode transformations are usefull only with iconv
+# libvorbis require external tremor to work
+# radio requires oss or alsa backend
+# xvmc requires xvideo support
+REQUIRED_USE="bindist? ( !amr !faac !win32codecs )
+	cdio? ( !cdparanoia !cddb )
+	dvdnav? ( dvd )
+	ass? ( iconv truetype )
+	truetype? ( iconv )
+	unicode? ( iconv )
+	vorbis? ( tremor )
+	radio? ( || ( alsa oss ) )
+	xvmc? ( xv )"
+# encoder codecs needs encoder support enabled
+uses="faac x264 xvid toolame twolame"
+for x in ${uses}; do
+	REQUIRED_USE+="
+		${x}? ( encode )
+	"
+done
+# cpu options needs custom-cpuopts enabled
+# but since it is not so fatal we rather ignore them
+#uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
+#for x in ${uses}; do
+#	REQUIRED_USE+="
+#		${x}? ( custom-cpuopts )
+#	"
+#done
+# xorg options require X useflag enabled
+uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv xvmc"
+for x in ${uses}; do
+	REQUIRED_USE+="
+		${x}? ( X )
+	"
+done
+unset uses
+
 PATCHES=(
 )
 
@@ -300,15 +341,10 @@
 		"
 	fi
 
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf+=" --disable-cdparanoia"
-	else
-		myconf+=" --disable-libcdio"
-		use cdparanoia || myconf+=" --disable-cdparanoia"
-		use cddb || myconf+=" --disable-cddb"
-	fi
+	use cdio && myconf+=" --disable-cdparanoia"
+	use cdio || myconf+=" --disable-libcdio"
+	use cdparanoia || myconf+=" --disable-cdparanoia"
+	use cddb || myconf+=" --disable-cddb"
 
 	################################
 	# DVD read, navigation support #
@@ -319,15 +355,8 @@
 	#
 	# use external libdvdcss, dvdread and dvdnav
 	myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
-
-	if use dvd; then
-		use dvdnav || myconf+=" --disable-dvdnav"
-	else
-		myconf+="
-			--disable-dvdnav
-			--disable-dvdread
-		"
-	fi
+	use dvd || myconf+=" --disable-dvdread"
+	use dvdnav || myconf+=" --disable-dvdnav"
 
 	#############
 	# Subtitles #
@@ -336,16 +365,14 @@
 	# SRT/ASS/SSA (subtitles) requires freetype support
 	# freetype support requires iconv
 	# iconv optionally can use unicode
-	if ! use ass && ! use truetype; then
-		myconf+=" --disable-freetype"
-		if ! use iconv; then
-			myconf+="
-				--disable-iconv
-				--charset=noconv
-			"
-		fi
+	use truetype || myconf+=" --disable-freetype"
+	if ! use iconv; then
+		myconf+="
+			--disable-iconv
+			--charset=noconv
+		"
 	fi
-	use iconv && use unicode && myconf+=" --charset=UTF-8"
+	use unicode && myconf+=" --charset=UTF-8"
 
 	#####################################
 	# DVB / Video4Linux / Radio support #
@@ -401,45 +428,24 @@
 		use ${i} || myconf+=" --disable-lib${i}"
 	done
 	use schroedinger || myconf+=" --disable-libschroedinger-lavc"
-	# Disable opencore-amr with bindist
-	# https://bugs.gentoo.org/show_bug.cgi?id=299405#c6
-	{ use amr && use !bindist ; } || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb"
+	use amr || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb"
 
 	uses="faad gif jpeg libmpeg2 live mad mng mpg123 png pnm speex tga theora xanim"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
 	use jpeg2k || myconf+=" --disable-libopenjpeg"
-	if use vorbis || use tremor; then
-		use tremor || myconf+=" --disable-tremor-internal"
-		use vorbis || myconf+=" --disable-libvorbis"
-	else
-		myconf+="
-			--disable-tremor-internal
-			--disable-tremor
-			--disable-libvorbis
-		"
-	fi
+	use tremor && myconf+=" --disable-tremor-internal"
+	use tremor || myconf+=" --disable-tremor-internal --disable-tremor"
+	use vorbis || myconf+=" --disable-libvorbis"
 	use vpx || myconf+=" --disable-libvpx-lavc"
 	# Encoding
+	use encode || myconf+=" --disable-mencoder"
 	uses="faac x264 xvid toolame twolame"
-	if use encode; then
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-		use faac || myconf+=" --disable-faac-lavc"
-		if use bindist && use faac; then
-			ewarn "faac is nonfree and cannot be distributed; disabling faac support."
-			myconf+=" --disable-faac --disable-faac-lavc"
-		fi
-	else
-		myconf+=" --disable-mencoder"
-		myconf+=" --disable-faac-lavc"
-		for i in ${uses}; do
-			myconf+=" --disable-${i}"
-			use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work."
-		done
-	fi
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use faac || myconf+=" --disable-faac-lavc"
 
 	#################
 	# Binary codecs #
@@ -465,9 +471,8 @@
 	if use real; then
 		use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
 		use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
-	elif ! use bindist; then
-		myconf+=" $(use_enable win32codecs win32dll)"
 	fi
+	myconf+=" $(use_enable win32codecs win32dll)"
 
 	################
 	# Video Output #
@@ -510,17 +515,13 @@
 		use ${i} || myconf+=" --disable-${i}"
 	done
 	use pulseaudio || myconf+=" --disable-pulse"
-	if ! use radio; then
-		use oss || myconf+=" --disable-ossaudio"
-	fi
+	use oss || myconf+=" --disable-ossaudio"
 
 	####################
 	# Advanced Options #
 	####################
 	# Platform specific flags, hardcoded on amd64 (see below)
-	if use cpudetection; then
-		myconf+=" --enable-runtime-cpudetection"
-	fi
+	use cpudetection && myconf+=" --enable-runtime-cpudetection"
 
 	# Turning off CPU optimizations usually will break the build.
 	# However, this use flag, if enabled, will allow users to completely
@@ -553,53 +554,17 @@
 	# X enabled configuration #
 	###########################
 	myconf+=" --disable-gui"
-	if use X; then
-		uses="dxr3 ggi xinerama"
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-		use dga || myconf+=" --disable-dga1 --disable-dga2"
-		use opengl || myconf+=" --disable-gl"
-		use osdmenu && myconf+=" --enable-menu"
-		use vdpau || myconf+=" --disable-vdpau"
-		use video_cards_vesa || myconf+=" --disable-vesa"
-		use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
-		use xscreensaver || myconf+=" --disable-xss"
-
-		if use xv; then
-			if use xvmc; then
-				myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-			else
-				myconf+=" --disable-xvmc"
-			fi
-		else
-			myconf+="
-				--disable-xv
-				--disable-xvmc
-			"
-			use xvmc && elog "Disabling xvmc because it requires \"xv\" useflag enabled."
-		fi
-	else
-		myconf+="
-			--disable-dga1
-			--disable-dga2
-			--disable-dxr3
-			--disable-ggi
-			--disable-gl
-			--disable-vdpau
-			--disable-vidix
-			--disable-vidix-pcidb
-			--disable-xinerama
-			--disable-xss
-			--disable-xv
-			--disable-xvmc
-			--disable-x11
-		"
-		uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv"
-		for i in ${uses}; do
-			use ${i} && elog "Useflag \"${i}\" require \"X\" useflag enabled to work."
-		done
-	fi
+	uses="dxr3 ggi vdpau vidix xinerama xv xvmc"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use dga || myconf+=" --disable-dga1 --disable-dga2"
+	use opengl || myconf+=" --disable-gl"
+	use osdmenu && myconf+=" --enable-menu"
+	use video_cards_vesa || myconf+=" --disable-vesa"
+	use vidix || myconf+=" --disable-vidix-pcidb"
+	use xscreensaver || myconf+=" --disable-xss"
+	use xvmc && myconf+=" --with-xvmclib=XvMCW"
 
 	############################
 	# OSX (aqua) configuration #
@@ -626,7 +591,7 @@
 		--libdir=${EPREFIX}/usr/$(get_libdir)
 		${myconf}"
 
-	CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died"
+	CFLAGS="${CFLAGS}" ./configure ${myconf} || die
 }
 
 src_compile() {
@@ -641,10 +606,10 @@
 			hasq ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
 		done
 		if [[ -z $BUILT_DOCS ]]; then
-			emake -j1 -C DOCS/xml html-chunked || die "Failed to generate html docs"
+			emake -j1 -C DOCS/xml html-chunked
 		else
 			for i in ${BUILT_DOCS}; do
-				emake -j1 -C DOCS/xml html-chunked-${i} || die "Failed to generate html docs for ${i}"
+				emake -j1 -C DOCS/xml html-chunked-${i}
 			done
 		fi
 	fi
@@ -660,26 +625,26 @@
 		DATADIR="${ED}/usr/share/mplayer" \
 		MANDIR="${ED}/usr/share/man" \
 		INSTALLSTRIP="" \
-		install || die "emake install failed"
+		install
 
-	dodoc AUTHORS Changelog Copyright README etc/codecs.conf || die
+	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
 
 	docinto tech/
-	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist} || die
+	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
 	docinto TOOLS/
-	dodoc TOOLS/* || die
+	dodoc TOOLS/*
 	if use real; then
 		docinto tech/realcodecs/
-		dodoc DOCS/tech/realcodecs/* || die
+		dodoc DOCS/tech/realcodecs/*
 		docinto TOOLS/realcodecs/
-		dodoc TOOLS/realcodecs/* || die
+		dodoc TOOLS/realcodecs/*
 	fi
 	docinto tech/mirrors/
-	dodoc DOCS/tech/mirrors/* || die
+	dodoc DOCS/tech/mirrors/*
 
 	if use doc; then
 		docinto html/
-		dohtml -r "${S}"/DOCS/HTML/* || die
+		dohtml -r "${S}"/DOCS/HTML/*
 	fi
 
 	if ! use ass && ! use truetype; then
@@ -695,10 +660,15 @@
 	fi
 
 	insinto /etc/mplayer
-	newins "${S}/etc/example.conf" mplayer.conf || die
-	doins "${S}/etc/input.conf" || die
+	newins "${S}/etc/example.conf" mplayer.conf
+	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+	doins "${S}/etc/input.conf"
 	if use osdmenu; then
-		doins "${S}/etc/menu.conf" || die
+		doins "${S}/etc/menu.conf"
 	fi
 
 	if use ass || use truetype; then
@@ -717,7 +687,7 @@
 	fi
 
 	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-	newbin "${S}/TOOLS/midentify.sh" midentify || die
+	newbin "${S}/TOOLS/midentify.sh" midentify
 }
 
 pkg_preinst() {






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-01-30 21:08 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-01-30 21:08 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/01/30 21:08:15

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Clone the ffmpeg from git as svn external was removed.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.778                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.778&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.778&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.777&r2=1.778

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.777
retrieving revision 1.778
diff -u -r1.777 -r1.778
--- ChangeLog	30 Jan 2011 12:55:54 -0000	1.777
+++ ChangeLog	30 Jan 2011 21:08:15 -0000	1.778
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.777 2011/01/30 12:55:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.778 2011/01/30 21:08:15 scarabeus Exp $
+
+  30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Clone the ffmpeg from git as svn external was removed.
 
   30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
   Update live verison to eapi4 and use_required syntax. Fix default



1.91                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.90&r2=1.91

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- mplayer-9999.ebuild	30 Jan 2011 12:55:54 -0000	1.90
+++ mplayer-9999.ebuild	30 Jan 2011 21:08:15 -0000	1.91
@@ -1,11 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.90 2011/01/30 12:55:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.91 2011/01/30 21:08:15 scarabeus Exp $
 
 EAPI=4
 
+EGIT_REPO_URI="git://git.ffmpeg.org/ffmpeg.git"
+EGIT_PROJECT="ffmpeg"
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion" || SVN_ECLASS=""
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git" || SVN_ECLASS=""
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
@@ -268,8 +270,9 @@
 src_unpack() {
 	if [[ ${PV} = *9999* ]]; then
 		subversion_src_unpack
-
 		cd "${WORKDIR}"
+		rm -rf "${WORKDIR}/${P}/ffmpeg/"
+		( S="${WORKDIR}/${P}/ffmpeg/" git_src_unpack )
 	else
 		unpack ${A}
 	fi






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-03-01 15:31 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-03-01 15:31 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/03/01 15:31:15

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Update ebuild per bug #354023 and #354625. Thanks to reporters for patches.
  
  (Portage version: 2.2.0_alpha25/cvs/Linux x86_64)

Revision  Changes    Path
1.780                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.780&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.780&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.779&r2=1.780

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.779
retrieving revision 1.780
diff -u -r1.779 -r1.780
--- ChangeLog	15 Feb 2011 14:17:35 -0000	1.779
+++ ChangeLog	1 Mar 2011 15:31:15 -0000	1.780
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.779 2011/02/15 14:17:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.780 2011/03/01 15:31:15 scarabeus Exp $
+
+  01 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Update ebuild per bug #354023 and #354625. Thanks to reporters for patches.
 
   30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
   Clone the ffmpeg from git as svn external was removed.



1.92                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.91&r2=1.92

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- mplayer-9999.ebuild	30 Jan 2011 21:08:15 -0000	1.91
+++ mplayer-9999.ebuild	1 Mar 2011 15:31:15 -0000	1.92
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.91 2011/01/30 21:08:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.92 2011/03/01 15:31:15 scarabeus Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@
 [[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r32598
 
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
-bs2b +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac
+bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas
@@ -589,9 +589,11 @@
 	myconf="--cc=$(tc-getCC)
 		--host-cc=$(tc-getBUILD_CC)
 		--prefix=${EPREFIX}/usr
-		--confdir=${EPREFIX}/etc/mplayer
-		--datadir=${EPREFIX}/usr/share/mplayer
+		--bindir=${EPREFIX}/usr/bin
 		--libdir=${EPREFIX}/usr/$(get_libdir)
+		--confdir=${EPREFIX}/etc/mplayer
+		--datadir=${EPREFIX}/usr/share/mplayer${namesuf}
+		--mandir=${EPREFIX}/usr/share/man
 		${myconf}"
 
 	CFLAGS="${CFLAGS}" ./configure ${myconf} || die
@@ -621,12 +623,8 @@
 src_install() {
 	local i
 
-	emake prefix="${ED}/usr" \
-		BINDIR="${ED}/usr/bin" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		CONFDIR="${ED}/etc/mplayer" \
-		DATADIR="${ED}/usr/share/mplayer" \
-		MANDIR="${ED}/usr/share/man" \
+	emake \
+		DESTDIR="${D}" \
 		INSTALLSTRIP="" \
 		install
 






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-03-20 22:12 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-03-20 22:12 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/03/20 22:12:46

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Move to use libav in live mplayer ebuild and snapshot preparator. Force due to unsynced tree.
  
  (Portage version: 2.2.0_alpha28/cvs/Linux x86_64, RepoMan options: --force)

Revision  Changes    Path
1.784                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.784&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.784&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.783&r2=1.784

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.783
retrieving revision 1.784
diff -u -r1.783 -r1.784
--- ChangeLog	20 Mar 2011 11:19:47 -0000	1.783
+++ ChangeLog	20 Mar 2011 22:12:45 -0000	1.784
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.783 2011/03/20 11:19:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.784 2011/03/20 22:12:45 scarabeus Exp $
+
+  20 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild,
+  files/prepare_mplayer.sh:
+  Move to use libav in live mplayer ebuild and snapshot preparator.
 
   20 Mar 2011; Raúl Porcel <armin76@gentoo.org>
   mplayer-1.0_rc4_p20101114.ebuild:



1.94                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.93&r2=1.94

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- mplayer-9999.ebuild	2 Mar 2011 16:54:36 -0000	1.93
+++ mplayer-9999.ebuild	20 Mar 2011 22:12:45 -0000	1.94
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.93 2011/03/02 16:54:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.94 2011/03/20 22:12:45 scarabeus Exp $
 
 EAPI=4
 
-EGIT_REPO_URI="git://git.ffmpeg.org/ffmpeg.git"
+EGIT_REPO_URI="git://git.libav.org/libav.git"
 EGIT_PROJECT="ffmpeg"
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 [[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git" || SVN_ECLASS=""






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-03-26 14:38 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-03-26 14:38 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/03/26 14:38:15

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Depend on virtual/ffmpeg
  
  (Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

Revision  Changes    Path
1.787                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.787&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.787&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.786&r2=1.787

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.786
retrieving revision 1.787
diff -u -r1.786 -r1.787
--- ChangeLog	22 Mar 2011 23:58:03 -0000	1.786
+++ ChangeLog	26 Mar 2011 14:38:15 -0000	1.787
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.786 2011/03/22 23:58:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.787 2011/03/26 14:38:15 scarabeus Exp $
+
+  26 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Depend on virtual/ffmpeg
 
   22 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   mplayer-1.0_rc4_p20110322.ebuild, mplayer-9999.ebuild:



1.97                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.96&r2=1.97

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- mplayer-9999.ebuild	22 Mar 2011 23:58:03 -0000	1.96
+++ mplayer-9999.ebuild	26 Mar 2011 14:38:15 -0000	1.97
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.96 2011/03/22 23:58:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.97 2011/03/26 14:38:15 scarabeus Exp $
 
 EAPI=4
 
@@ -57,7 +57,7 @@
 	x11-libs/libXext
 	x11-libs/libXxf86vm
 "
-[[ ${PV} == *9999* ]] && RDEPEND+=" external-ffmpeg? ( media-video/ffmpeg )"
+[[ ${PV} == *9999* ]] && RDEPEND+=" external-ffmpeg? ( virtual/ffmpeg )"
 # Rar: althrought -gpl version is nice, it cant do most functions normal rars can
 #	nemesi? ( net-libs/libnemesi )
 RDEPEND+="






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-04-03 10:22 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-04-03 10:22 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/04/03 10:22:41

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Drop useless egit_project definition
  
  (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

Revision  Changes    Path
1.788                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.788&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.788&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.787&r2=1.788

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.787
retrieving revision 1.788
diff -u -r1.787 -r1.788
--- ChangeLog	26 Mar 2011 14:38:15 -0000	1.787
+++ ChangeLog	3 Apr 2011 10:22:41 -0000	1.788
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.787 2011/03/26 14:38:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.788 2011/04/03 10:22:41 scarabeus Exp $
+
+  03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Drop useless egit_project definition
 
   26 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
   Depend on virtual/ffmpeg



1.98                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.97&r2=1.98

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- mplayer-9999.ebuild	26 Mar 2011 14:38:15 -0000	1.97
+++ mplayer-9999.ebuild	3 Apr 2011 10:22:41 -0000	1.98
@@ -1,11 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.97 2011/03/26 14:38:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.98 2011/04/03 10:22:41 scarabeus Exp $
 
 EAPI=4
 
 EGIT_REPO_URI="git://git.libav.org/libav.git"
-EGIT_PROJECT="ffmpeg"
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 [[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git" || SVN_ECLASS=""
 






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-04-03 10:24 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 73+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-04-03 10:24 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/04/03 10:24:10

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Set egit project properly.
  
  (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

Revision  Changes    Path
1.789                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.789&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.789&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.788&r2=1.789

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.788
retrieving revision 1.789
diff -u -r1.788 -r1.789
--- ChangeLog	3 Apr 2011 10:22:41 -0000	1.788
+++ ChangeLog	3 Apr 2011 10:24:10 -0000	1.789
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.788 2011/04/03 10:22:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.789 2011/04/03 10:24:10 scarabeus Exp $
+
+  03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Set egit project properly.
 
   03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
   Drop useless egit_project definition



1.99                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.98&r2=1.99

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- mplayer-9999.ebuild	3 Apr 2011 10:22:41 -0000	1.98
+++ mplayer-9999.ebuild	3 Apr 2011 10:24:10 -0000	1.99
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.98 2011/04/03 10:22:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.99 2011/04/03 10:24:10 scarabeus Exp $
 
 EAPI=4
 
 EGIT_REPO_URI="git://git.libav.org/libav.git"
+EGIT_PROJECT="libav" # git eclass sets it to PN otherwise
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 [[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git" || SVN_ECLASS=""
 






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-06-08 19:43 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-06-08 19:43 UTC (permalink / raw
  To: gentoo-commits

aballier    11/06/08 19:43:31

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  remove useless CFLAGS variable assignment
  
  (Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

Revision  Changes    Path
1.792                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.792&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.792&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.791&r2=1.792

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.791
retrieving revision 1.792
diff -u -r1.791 -r1.792
--- ChangeLog	8 Jun 2011 19:33:06 -0000	1.791
+++ ChangeLog	8 Jun 2011 19:43:31 -0000	1.792
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.791 2011/06/08 19:33:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.792 2011/06/08 19:43:31 aballier Exp $
+
+  08 Jun 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  remove useless CFLAGS variable assignment
 
   08 Jun 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild,
   +files/dump_ffmpeg.sh, metadata.xml:



1.101                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.100&r2=1.101

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- mplayer-9999.ebuild	8 Jun 2011 19:33:06 -0000	1.100
+++ mplayer-9999.ebuild	8 Jun 2011 19:43:31 -0000	1.101
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.100 2011/06/08 19:33:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.101 2011/06/08 19:43:31 aballier Exp $
 
 EAPI=4
 
@@ -626,7 +626,7 @@
 		--mandir=${EPREFIX}/usr/share/man
 		${myconf}"
 
-	CFLAGS="${CFLAGS}" ./configure ${myconf} || die
+	./configure ${myconf} || die
 }
 
 src_compile() {






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-06-08 19:50 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-06-08 19:50 UTC (permalink / raw
  To: gentoo-commits

aballier    11/06/08 19:50:57

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  fix variable quoting
  
  (Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

Revision  Changes    Path
1.793                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.793&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.793&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.792&r2=1.793

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.792
retrieving revision 1.793
diff -u -r1.792 -r1.793
--- ChangeLog	8 Jun 2011 19:43:31 -0000	1.792
+++ ChangeLog	8 Jun 2011 19:50:57 -0000	1.793
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.792 2011/06/08 19:43:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.793 2011/06/08 19:50:57 aballier Exp $
+
+  08 Jun 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  fix variable quoting
 
   08 Jun 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   remove useless CFLAGS variable assignment



1.102                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.102&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.102&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.101&r2=1.102

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- mplayer-9999.ebuild	8 Jun 2011 19:43:31 -0000	1.101
+++ mplayer-9999.ebuild	8 Jun 2011 19:50:57 -0000	1.102
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.101 2011/06/08 19:43:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.102 2011/06/08 19:50:57 aballier Exp $
 
 EAPI=4
 
@@ -611,22 +611,17 @@
 		"
 	fi
 
-	###################
-	# External FFmpeg #
-	###################
-	myconf+=" --disable-ffmpeg_a"
-
-	myconf="--cc=$(tc-getCC)
-		--host-cc=$(tc-getBUILD_CC)
-		--prefix=${EPREFIX}/usr
-		--bindir=${EPREFIX}/usr/bin
-		--libdir=${EPREFIX}/usr/$(get_libdir)
-		--confdir=${EPREFIX}/etc/mplayer
-		--datadir=${EPREFIX}/usr/share/mplayer${namesuf}
-		--mandir=${EPREFIX}/usr/share/man
-		${myconf}"
-
-	./configure ${myconf} || die
+	./configure \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)" \
+		--prefix="${EPREFIX}/usr" \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--confdir="${EPREFIX}/etc/mplayer" \
+		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--disable-ffmpeg_a \
+		${myconf} || die
 }
 
 src_compile() {






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-06-23 16:11 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-06-23 16:11 UTC (permalink / raw
  To: gentoo-commits

aballier    11/06/23 16:11:12

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  do not default enable faac, its non free, not compatible with binary distribution, and ffmpeg has an encoder now
  
  (Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

Revision  Changes    Path
1.794                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.794&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.794&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.793&r2=1.794

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.793
retrieving revision 1.794
diff -u -r1.793 -r1.794
--- ChangeLog	8 Jun 2011 19:50:57 -0000	1.793
+++ ChangeLog	23 Jun 2011 16:11:12 -0000	1.794
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.793 2011/06/08 19:50:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.794 2011/06/23 16:11:12 aballier Exp $
+
+  23 Jun 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  do not default enable faac, its non free, not compatible with binary
+  distribution, and ffmpeg has an encoder now
 
   08 Jun 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   fix variable quoting



1.103                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.102&r2=1.103

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- mplayer-9999.ebuild	8 Jun 2011 19:50:57 -0000	1.102
+++ mplayer-9999.ebuild	23 Jun 2011 16:11:12 -0000	1.103
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.102 2011/06/08 19:50:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.103 2011/06/23 16:11:12 aballier Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@
 
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
 bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga
-directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon
+directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas
 +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-06-23 16:17 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-06-23 16:17 UTC (permalink / raw
  To: gentoo-commits

aballier    11/06/23 16:17:31

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  use git-2.eclass for ffmpeg
  
  (Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

Revision  Changes    Path
1.795                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.795&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.795&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.794&r2=1.795

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.794
retrieving revision 1.795
diff -u -r1.794 -r1.795
--- ChangeLog	23 Jun 2011 16:11:12 -0000	1.794
+++ ChangeLog	23 Jun 2011 16:17:31 -0000	1.795
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.794 2011/06/23 16:11:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.795 2011/06/23 16:17:31 aballier Exp $
+
+  23 Jun 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  use git-2.eclass for ffmpeg
 
   23 Jun 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   do not default enable faac, its non free, not compatible with binary



1.104                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.103&r2=1.104

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- mplayer-9999.ebuild	23 Jun 2011 16:11:12 -0000	1.103
+++ mplayer-9999.ebuild	23 Jun 2011 16:17:31 -0000	1.104
@@ -1,13 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.103 2011/06/23 16:11:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.104 2011/06/23 16:17:31 aballier Exp $
 
 EAPI=4
 
 EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-EGIT_PROJECT="ffmpeg" # git eclass sets it to PN otherwise
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git" || SVN_ECLASS=""
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
@@ -237,7 +236,7 @@
 		subversion_src_unpack
 		cd "${WORKDIR}"
 		rm -rf "${WORKDIR}/${P}/ffmpeg/"
-		( S="${WORKDIR}/${P}/ffmpeg/" git_src_unpack )
+		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
 		cd "${S}"
 		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
 		chmod +x dump_ffmpeg.sh






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-12-15 12:30 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-12-15 12:30 UTC (permalink / raw
  To: gentoo-commits

aballier    11/12/15 12:30:44

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  depend on ffmpeg 0.9, bug #392405
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.811                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.811&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.811&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.810&r2=1.811

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.810
retrieving revision 1.811
diff -u -r1.810 -r1.811
--- ChangeLog	15 Dec 2011 12:29:06 -0000	1.810
+++ ChangeLog	15 Dec 2011 12:30:44 -0000	1.811
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.810 2011/12/15 12:29:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.811 2011/12/15 12:30:44 aballier Exp $
+
+  15 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  depend on ffmpeg 0.9, bug #392405
 
   15 Dec 2011; Alexis Ballier <aballier@gentoo.org> files/prepare_mplayer.sh:
   update the prepare_mplayer script to use ffmpeg instead of libav and use



1.107                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.107&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.107&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.106&r2=1.107

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- mplayer-9999.ebuild	31 Oct 2011 17:12:00 -0000	1.106
+++ mplayer-9999.ebuild	15 Dec 2011 12:30:44 -0000	1.107
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.106 2011/10/31 17:12:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.107 2011/12/15 12:30:44 aballier Exp $
 
 EAPI=4
 
@@ -61,7 +61,7 @@
 	sys-libs/ncurses
 	app-arch/bzip2
 	sys-libs/zlib
-	>=virtual/ffmpeg-0.6.90
+	>=media-video/ffmpeg-0.9
 	!bindist? (
 		x86? (
 			win32codecs? ( media-libs/win32codecs )






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-12-15 12:48 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-12-15 12:48 UTC (permalink / raw
  To: gentoo-commits

aballier    11/12/15 12:48:11

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  sync with snapshot
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.813                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.813&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.813&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.812&r2=1.813

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.812
retrieving revision 1.813
diff -u -r1.812 -r1.813
--- ChangeLog	15 Dec 2011 12:37:11 -0000	1.812
+++ ChangeLog	15 Dec 2011 12:48:11 -0000	1.813
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.812 2011/12/15 12:37:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.813 2011/12/15 12:48:11 aballier Exp $
+
+  15 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  sync with snapshot
 
 *mplayer-1.0_rc4_p20111215 (15 Dec 2011)
 



1.108                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.108&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.108&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.107&r2=1.108

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- mplayer-9999.ebuild	15 Dec 2011 12:30:44 -0000	1.107
+++ mplayer-9999.ebuild	15 Dec 2011 12:48:11 -0000	1.108
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.107 2011/12/15 12:30:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.108 2011/12/15 12:48:11 aballier Exp $
 
 EAPI=4
 
@@ -37,8 +37,7 @@
 if [[ ${PV} == *9999* ]]; then
 	RELEASE_URI=""
 else
-	RELEASE_URI="http://dev.gentoo.org/~scarabeus/${P}.tar.xz
-		mirror://gentoo/${P}.tar.xz"
+	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
 fi
 SRC_URI="${RELEASE_URI}
 	!truetype? ( ${FONT_URI} )"






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-12-16 13:36 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-12-16 13:36 UTC (permalink / raw
  To: gentoo-commits

aballier    11/12/16 13:36:05

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  generate on the fly a snapshot version for live ebuilds and use that file for generating a VERSION file that advertises it is a Gentoo build as suggested by Reimar Döffinger in bug #328817
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.817                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.817&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.817&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.816&r2=1.817

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.816
retrieving revision 1.817
diff -u -r1.816 -r1.817
--- ChangeLog	16 Dec 2011 13:24:10 -0000	1.816
+++ ChangeLog	16 Dec 2011 13:36:05 -0000	1.817
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.816 2011/12/16 13:24:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.817 2011/12/16 13:36:05 aballier Exp $
+
+  16 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  generate on the fly a snapshot version for live ebuilds and use that file for
+  generating a VERSION file that advertises it is a Gentoo build as suggested
+  by Reimar Döffinger in bug #328817
 
   16 Dec 2011; Alexis Ballier <aballier@gentoo.org> files/prepare_mplayer.sh:
   generate snapshot_version the same way as upstream version.sh and use printf



1.110                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.109&r2=1.110

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- mplayer-9999.ebuild	16 Dec 2011 12:19:54 -0000	1.109
+++ mplayer-9999.ebuild	16 Dec 2011 13:36:05 -0000	1.110
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.109 2011/12/16 12:19:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.110 2011/12/16 13:36:05 aballier Exp $
 
 EAPI=4
 
@@ -10,9 +10,6 @@
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
-# BUMP ME PLZ, NO COOKIES OTHERWISE
-[[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r33094
-
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
 bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd faac +faad fbcon
@@ -252,14 +249,15 @@
 }
 
 src_prepare() {
+	local svf=snapshot_version
 	if [[ ${PV} = *9999* ]]; then
 		# Set SVN version manually
 		subversion_wc_info
-		sed -i -e "s/UNKNOWN/${ESVN_WC_REVISION}/" "${S}/version.sh" || die
-	else
-		# Set version #
-		sed -i -e "s/UNKNOWN/${MPLAYER_REVISION}/" "${S}/version.sh" || die
+		printf "${ESVN_WC_REVISION}" > $svf
 	fi
+	[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+	local sv=$(<$svf)
+	printf "SVN-r${sv} (Gentoo)" > VERSION
 
 	# fix path to bash executable in configure scripts
 	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-12-16 13:52 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-12-16 13:52 UTC (permalink / raw
  To: gentoo-commits

aballier    11/12/16 13:52:53

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  use libmpg123 for mp3 decoding and remove internal mp3lib, bug #384849 by Samuli Suominen
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.818                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.818&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.818&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.817&r2=1.818

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.817
retrieving revision 1.818
diff -u -r1.817 -r1.818
--- ChangeLog	16 Dec 2011 13:36:05 -0000	1.817
+++ ChangeLog	16 Dec 2011 13:52:53 -0000	1.818
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.817 2011/12/16 13:36:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.818 2011/12/16 13:52:53 aballier Exp $
+
+  16 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  use libmpg123 for mp3 decoding and remove internal mp3lib, bug #384849 by
+  Samuli Suominen
 
   16 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   generate on the fly a snapshot version for live ebuilds and use that file for



1.111                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.110&r2=1.111

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- mplayer-9999.ebuild	16 Dec 2011 13:36:05 -0000	1.110
+++ mplayer-9999.ebuild	16 Dec 2011 13:52:53 -0000	1.111
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.110 2011/12/16 13:36:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.111 2011/12/16 13:52:53 aballier Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@
 bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas
+libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas
 +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
 radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3
 tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix
@@ -121,7 +121,7 @@
 	lzo? ( >=dev-libs/lzo-2 )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
-	mpg123? ( media-sound/mpg123 )
+	mp3? ( media-sound/mpg123 )
 	nas? ( media-libs/nas )
 	nut? ( >=media-libs/libnut-661 )
 	openal? ( media-libs/openal )
@@ -396,10 +396,16 @@
 	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
 	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
 	use dts || myconf+=" --disable-libdca"
+	# Disable internal mp3lib, bug #384849
+	# Samuli Suominen: Looks like MPlayer in Portage is using internal mp3lib by
+	# default, where as mpg123 upstream has incorporated all the optimizations
+	# from mplayer's mp3lib	in libmpg123 and more.
+	# It makes very little sense to use the internal copy as default anymore.
+	myconf+=" --disable-mp3lib"
 	if ! use mp3; then
 		myconf+="
 			--disable-mp3lame
-			--disable-mp3lib
+			--disable-mpg123
 		"
 	fi
 	uses="a52 bs2b dv gsm lzo rtmp"
@@ -407,7 +413,7 @@
 		use ${i} || myconf+=" --disable-lib${i}"
 	done
 
-	uses="faad gif jpeg libmpeg2 live mad mng mpg123 png pnm speex tga theora xanim"
+	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora xanim"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-12-17 15:52 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-12-17 15:52 UTC (permalink / raw
  To: gentoo-commits

aballier    11/12/17 15:52:03

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  remove dead code: faac + bindist is disallowed by REQUIRED_USE
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.820                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.820&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.820&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.819&r2=1.820

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.819
retrieving revision 1.820
diff -u -r1.819 -r1.820
--- ChangeLog	17 Dec 2011 13:01:33 -0000	1.819
+++ ChangeLog	17 Dec 2011 15:52:03 -0000	1.820
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.819 2011/12/17 13:01:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.820 2011/12/17 15:52:03 aballier Exp $
+
+  17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  remove dead code: faac + bindist is disallowed by REQUIRED_USE
 
   17 Dec 2011; Alexis Ballier <aballier@gentoo.org>
   mplayer-1.0_rc4_p20111215.ebuild, mplayer-9999.ebuild:



1.113                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.112&r2=1.113

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- mplayer-9999.ebuild	17 Dec 2011 13:01:33 -0000	1.112
+++ mplayer-9999.ebuild	17 Dec 2011 15:52:03 -0000	1.113
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.112 2011/12/17 13:01:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.113 2011/12/17 15:52:03 aballier Exp $
 
 EAPI=4
 
@@ -99,7 +99,7 @@
 	encode? (
 		!twolame? ( toolame? ( media-sound/toolame ) )
 		twolame? ( media-sound/twolame )
-		faac? ( !bindist? ( media-libs/faac ) )
+		faac? ( media-libs/faac )
 		mp3? ( media-sound/lame )
 		x264? ( >=media-libs/x264-0.0.20100423 )
 		xvid? ( media-libs/xvid )
@@ -434,10 +434,6 @@
 		for i in ${uses}; do
 			use ${i} || myconf+=" --disable-${i}"
 		done
-		if use bindist && use faac; then
-			ewarn "faac is nonfree and cannot be distributed; disabling faac support."
-			myconf+=" --disable-faac"
-		fi
 	else
 		myconf+=" --disable-mencoder"
 		for i in ${uses}; do






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-12-17 15:56 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-12-17 15:56 UTC (permalink / raw
  To: gentoo-commits

aballier    11/12/17 15:56:34

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  remove custom-cpuopts option: if anything breaks the build we can disallow it with REQUIRED_USE
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.821                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.821&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.821&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.820&r2=1.821

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.820
retrieving revision 1.821
diff -u -r1.820 -r1.821
--- ChangeLog	17 Dec 2011 15:52:03 -0000	1.820
+++ ChangeLog	17 Dec 2011 15:56:34 -0000	1.821
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.820 2011/12/17 15:52:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.821 2011/12/17 15:56:34 aballier Exp $
+
+  17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  remove custom-cpuopts option: if anything breaks the build we can disallow it
+  with REQUIRED_USE
 
   17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   remove dead code: faac + bindist is disallowed by REQUIRED_USE



1.114                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.114&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.114&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.113&r2=1.114

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- mplayer-9999.ebuild	17 Dec 2011 15:52:03 -0000	1.113
+++ mplayer-9999.ebuild	17 Dec 2011 15:56:34 -0000	1.114
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.113 2011/12/17 15:52:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.114 2011/12/17 15:56:34 aballier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
-bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga
+bs2b cddb +cdio cdparanoia cpudetection debug dga
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas
@@ -208,23 +208,6 @@
 		ewarn "mplayer for this system. Also, if your compile fails, try"
 		ewarn "disabling this use flag."
 	fi
-
-	if use custom-cpuopts; then
-		ewarn
-		ewarn "You are using the custom-cpuopts flag which will"
-		ewarn "specifically allow you to enable / disable certain"
-		ewarn "CPU optimizations."
-		ewarn
-		ewarn "Most desktop users won't need this functionality, but it"
-		ewarn "is included for corner cases like cross-compiling and"
-		ewarn "certain profiles. If unsure, disable this flag and MPlayer"
-		ewarn "will automatically detect and use your available CPU"
-		ewarn "optimizations."
-		ewarn
-		ewarn "Using this flag means your build is unsupported, so"
-		ewarn "please make sure your CPU optimization use flags (3dnow"
-		ewarn "3dnowext mmx mmxext sse sse2 ssse3) are properly set."
-	fi
 }
 
 src_unpack() {
@@ -520,16 +503,10 @@
 	# Platform specific flags, hardcoded on amd64 (see below)
 	use cpudetection && myconf+=" --enable-runtime-cpudetection"
 
-	# Turning off CPU optimizations usually will break the build.
-	# However, this use flag, if enabled, will allow users to completely
-	# specify which ones to use. If disabled, mplayer will automatically
-	# enable all CPU optimizations that the host build supports.
-	if use custom-cpuopts; then
-		uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
-		for i in ${uses}; do
-			myconf+=" $(use_enable ${i})"
-		done
-	fi
+	uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
+	for i in ${uses}; do
+		myconf+=" $(use_enable ${i})"
+	done
 
 	use debug && myconf+=" --enable-debug=3"
 






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-12-17 17:47 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-12-17 17:47 UTC (permalink / raw
  To: gentoo-commits

aballier    11/12/17 17:47:36

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  reflect some inter use flag dependencies by REQUIRED_USE
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.823                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.823&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.823&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.822&r2=1.823

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.822
retrieving revision 1.823
diff -u -r1.822 -r1.823
--- ChangeLog	17 Dec 2011 15:57:56 -0000	1.822
+++ ChangeLog	17 Dec 2011 17:47:36 -0000	1.823
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.822 2011/12/17 15:57:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.823 2011/12/17 17:47:36 aballier Exp $
+
+  17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  reflect some inter use flag dependencies by REQUIRED_USE
 
   17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   cosmetics



1.116                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.116&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.116&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.115&r2=1.116

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- mplayer-9999.ebuild	17 Dec 2011 15:57:56 -0000	1.115
+++ mplayer-9999.ebuild	17 Dec 2011 17:47:36 -0000	1.116
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.115 2011/12/17 15:57:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.116 2011/12/17 17:47:36 aballier Exp $
 
 EAPI=4
 
@@ -82,7 +82,7 @@
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
-	ass? ( ${FONT_RDEPS} >=media-libs/libass-0.9.10[enca?] )
+	ass? ( >=media-libs/libass-0.9.10[enca?] )
 	bidi? ( dev-libs/fribidi )
 	bluray? ( >=media-libs/libbluray-0.2.1 )
 	bs2b? ( media-libs/libbs2b )
@@ -183,7 +183,9 @@
 # libvorbis require external tremor to work
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
-REQUIRED_USE="bindist? ( !faac !win32codecs )"
+REQUIRED_USE="bindist? ( !faac !win32codecs )
+	ass? ( truetype )
+	truetype? ( iconv )"
 
 pkg_setup() {
 	if [[ ${PV} == *9999* ]]; then
@@ -324,15 +326,8 @@
 	# SRT/ASS/SSA (subtitles) requires freetype support
 	# freetype support requires iconv
 	# iconv optionally can use unicode
-	if ! use ass && ! use truetype; then
-		myconf+=" --disable-freetype"
-		if ! use iconv; then
-			myconf+="
-				--disable-iconv
-				--charset=noconv
-			"
-		fi
-	fi
+	use truetype || myconf+=" --disable-freetype"
+	use iconv || myconf+=" --disable-iconv --charset=noconv"
 	use iconv && use unicode && myconf+=" --charset=UTF-8"
 
 	#####################################
@@ -643,7 +638,7 @@
 		dohtml -r "${S}"/DOCS/HTML/*
 	fi
 
-	if ! use ass && ! use truetype; then
+	if ! use truetype; then
 		dodir /usr/share/mplayer/fonts
 		# Do this generic, as the mplayer people like to change the structure
 		# of their zips ...
@@ -667,7 +662,7 @@
 		doins "${S}/etc/menu.conf"
 	fi
 
-	if use ass || use truetype; then
+	if use truetype; then
 		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
 fontconfig=1
 subfont-osd-scale=4






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-12-17 17:59 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-12-17 17:59 UTC (permalink / raw
  To: gentoo-commits

aballier    11/12/17 17:59:34

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  dvdnav requires dvd, simplifying ebuild
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.824                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.824&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.824&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.823&r2=1.824

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.823
retrieving revision 1.824
diff -u -r1.823 -r1.824
--- ChangeLog	17 Dec 2011 17:47:36 -0000	1.823
+++ ChangeLog	17 Dec 2011 17:59:34 -0000	1.824
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.823 2011/12/17 17:47:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.824 2011/12/17 17:59:34 aballier Exp $
+
+  17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  dvdnav requires dvd, simplifying ebuild
 
   17 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   reflect some inter use flag dependencies by REQUIRED_USE



1.117                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.117&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.117&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.116&r2=1.117

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- mplayer-9999.ebuild	17 Dec 2011 17:47:36 -0000	1.116
+++ mplayer-9999.ebuild	17 Dec 2011 17:59:34 -0000	1.117
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.116 2011/12/17 17:47:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.117 2011/12/17 17:59:34 aballier Exp $
 
 EAPI=4
 
@@ -184,6 +184,7 @@
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
 REQUIRED_USE="bindist? ( !faac !win32codecs )
+	dvdnav? ( dvd )
 	ass? ( truetype )
 	truetype? ( iconv )"
 
@@ -310,14 +311,8 @@
 	#
 	# use external libdvdcss, dvdread and dvdnav
 	myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
-	if use dvd; then
-		use dvdnav || myconf+=" --disable-dvdnav"
-	else
-		myconf+="
-			--disable-dvdnav
-			--disable-dvdread
-		"
-	fi
+	use dvd || myconf+=" --disable-dvdread"
+	use dvdnav || myconf+=" --disable-dvdnav"
 
 	#############
 	# Subtitles #






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-12-18 15:06 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-12-18 15:06 UTC (permalink / raw
  To: gentoo-commits

aballier    11/12/18 15:06:04

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  mp3lib failed to build on x86 with -O0 and frame-pointer, since we dropped internal mp3lib we can also avoid messing with CFLAGS and let people build with the -O flag they wish.
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.827                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.827&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.827&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.826&r2=1.827

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.826
retrieving revision 1.827
diff -u -r1.826 -r1.827
--- ChangeLog	18 Dec 2011 14:56:59 -0000	1.826
+++ ChangeLog	18 Dec 2011 15:06:04 -0000	1.827
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.826 2011/12/18 14:56:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.827 2011/12/18 15:06:04 aballier Exp $
+
+  18 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  mp3lib failed to build on x86 with -O0 and frame-pointer, since we dropped
+  internal mp3lib we can also avoid messing with CFLAGS and let people build
+  with the -O flag they wish.
 
   18 Dec 2011; Alexis Ballier <aballier@gentoo.org> files/dump_ffmpeg.sh:
   allfilters.c is also checked, inlude it too



1.119                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.119&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.119&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.118&r2=1.119

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- mplayer-9999.ebuild	17 Dec 2011 18:02:24 -0000	1.118
+++ mplayer-9999.ebuild	18 Dec 2011 15:06:04 -0000	1.119
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.118 2011/12/17 18:02:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.119 2011/12/18 15:06:04 aballier Exp $
 
 EAPI=4
 
@@ -496,15 +496,6 @@
 		append-ldflags -nopie
 	fi
 
-	is-flag -O? || append-flags -O2
-
-	# workaround bug, x86 just has too few registers, see c.f.
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402950#44
-	# and 32-bits OSX, bug 329861
-	if [[ ${CHOST} == i?86-* ]] ; then
-		use debug || append-flags -fomit-frame-pointer
-	fi
-
 	###########################
 	# X enabled configuration #
 	###########################






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2011-12-19 16:43 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2011-12-19 16:43 UTC (permalink / raw
  To: gentoo-commits

aballier    11/12/19 16:43:13

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Simplify X checks in ebuild: use REQUIRED_USE instead of silently disabling features, people enabling X related features should know they will require X. Remove video_cards_vesa useflag that does nothing.
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.829                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.829&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.829&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.828&r2=1.829

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.828
retrieving revision 1.829
diff -u -r1.828 -r1.829
--- ChangeLog	19 Dec 2011 15:23:54 -0000	1.828
+++ ChangeLog	19 Dec 2011 16:43:12 -0000	1.829
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.828 2011/12/19 15:23:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.829 2011/12/19 16:43:12 aballier Exp $
+
+  19 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  Simplify X checks in ebuild: use REQUIRED_USE instead of silently disabling
+  features, people enabling X related features should know they will require X.
+  Remove video_cards_vesa useflag that does nothing.
 
   19 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   some new formats have been added after ffmpeg 0.9 which mplayer trunk now



1.121                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.121&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.121&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.120&r2=1.121

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- mplayer-9999.ebuild	19 Dec 2011 15:23:54 -0000	1.120
+++ mplayer-9999.ebuild	19 Dec 2011 16:43:13 -0000	1.121
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.120 2011/12/19 15:23:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.121 2011/12/19 16:43:13 aballier Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@
 +vorbis win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc
 zoran"
 
-VIDEO_CARDS="s3virge mga tdfx vesa"
+VIDEO_CARDS="s3virge mga tdfx"
 for x in ${VIDEO_CARDS}; do
 	IUSE+=" video_cards_${x}"
 done
@@ -63,22 +63,6 @@
 			win32codecs? ( media-libs/win32codecs )
 		)
 	)
-	X? (
-		${X_RDEPS}
-		dga? ( x11-libs/libXxf86dga )
-		ggi? (
-			media-libs/libggi
-			media-libs/libggiwmh
-		)
-		opengl? ( virtual/opengl )
-		vdpau? ( x11-libs/libvdpau )
-		xinerama? ( x11-libs/libXinerama )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		xv? (
-			x11-libs/libXv
-			xvmc? ( x11-libs/libXvMC )
-		)
-	)
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
@@ -88,6 +72,7 @@
 	bs2b? ( media-libs/libbs2b )
 	cdio? ( dev-libs/libcdio )
 	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
+	dga? ( x11-libs/libXxf86dga )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdca )
 	dv? ( media-libs/libdv )
@@ -107,6 +92,7 @@
 	esd? ( media-sound/esound )
 	enca? ( app-i18n/enca )
 	faad? ( media-libs/faad2 )
+	ggi? ( media-libs/libggi media-libs/libggiwmh )
 	gif? ( media-libs/giflib )
 	gsm? ( media-sound/gsm )
 	iconv? ( virtual/libiconv )
@@ -125,6 +111,7 @@
 	nas? ( media-libs/nas )
 	nut? ( >=media-libs/libnut-661 )
 	openal? ( media-libs/openal )
+	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng )
 	pnm? ( media-libs/netpbm )
 	pulseaudio? ( media-sound/pulseaudio )
@@ -140,8 +127,14 @@
 	speex? ( media-libs/speex )
 	theora? ( media-libs/libtheora[encode?] )
 	truetype? ( ${FONT_RDEPS} )
+	vdpau? ( x11-libs/libvdpau )
 	vorbis? ( media-libs/libvorbis )
+	X? ( ${X_RDEPS}	)
 	xanim? ( media-video/xanim )
+	xinerama? ( x11-libs/libXinerama )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )
 "
 
 X_DEPS="
@@ -151,13 +144,11 @@
 ASM_DEP="dev-lang/yasm"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	X? (
-		${X_DEPS}
-		dga? ( x11-proto/xf86dgaproto )
-		dxr3? ( media-video/em8300-libraries )
-		xinerama? ( x11-proto/xineramaproto )
-		xscreensaver? ( x11-proto/scrnsaverproto )
-	)
+	dga? ( x11-proto/xf86dgaproto )
+	dxr3? ( media-video/em8300-libraries )
+	X? ( ${X_DEPS} )
+	xinerama? ( x11-proto/xineramaproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
 	amd64? ( ${ASM_DEP} )
 	doc? (
 		dev-libs/libxslt app-text/docbook-xml-dtd
@@ -186,7 +177,18 @@
 REQUIRED_USE="bindist? ( !faac !win32codecs )
 	dvdnav? ( dvd )
 	ass? ( truetype )
-	truetype? ( iconv )"
+	truetype? ( iconv )
+	dxr3? ( X )
+	ggi? ( X )
+	xinerama? ( X )
+	dga? ( X )
+	opengl? ( X )
+	osdmenu? ( X )
+	vdpau? ( X )
+	vidix? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+	xvmc? ( xv )"
 
 pkg_setup() {
 	if [[ ${PV} == *9999* ]]; then
@@ -500,52 +502,21 @@
 	# X enabled configuration #
 	###########################
 	myconf+=" --disable-gui"
-	if use X; then
-		uses="dxr3 ggi xinerama"
-		for i in ${uses}; do
-			use ${i} || myconf+=" --disable-${i}"
-		done
-		use dga || myconf+=" --disable-dga1 --disable-dga2"
-		use opengl || myconf+=" --disable-gl"
-		use osdmenu && myconf+=" --enable-menu"
-		use vdpau || myconf+=" --disable-vdpau"
-		use video_cards_vesa || myconf+=" --disable-vesa"
-		use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
-		use xscreensaver || myconf+=" --disable-xss"
-
-		if use xv; then
-			if use xvmc; then
-				myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-			else
-				myconf+=" --disable-xvmc"
-			fi
-		else
-			myconf+="
-				--disable-xv
-				--disable-xvmc
-			"
-			use xvmc && elog "Disabling xvmc because it requires \"xv\" useflag enabled."
-		fi
+	myconf+=" --disable-vesa"
+	uses="dxr3 ggi vdpau xinerama xv"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use dga          || myconf+=" --disable-dga1 --disable-dga2"
+	use opengl       || myconf+=" --disable-gl"
+	use osdmenu      && myconf+=" --enable-menu"
+	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
+	use xscreensaver || myconf+=" --disable-xss"
+	use X            || myconf+=" --disable-x11"
+	if use xvmc; then
+		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
 	else
-		myconf+="
-			--disable-dga1
-			--disable-dga2
-			--disable-dxr3
-			--disable-ggi
-			--disable-gl
-			--disable-vdpau
-			--disable-vidix
-			--disable-vidix-pcidb
-			--disable-xinerama
-			--disable-xss
-			--disable-xv
-			--disable-xvmc
-			--disable-x11
-		"
-		uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv"
-		for i in ${uses}; do
-			use ${i} && elog "Useflag \"${i}\" require \"X\" useflag enabled to work."
-		done
+		myconf+=" --disable-xvmc"
 	fi
 
 	############################






^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2012-10-25 12:48 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2012-10-25 12:48 UTC (permalink / raw
  To: gentoo-commits

aballier    12/10/25 12:48:11

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  internal mp3lib is gone, no need to disable it anymore
  
  (Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.864                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.864&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.864&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.863&r2=1.864

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.863
retrieving revision 1.864
diff -u -r1.863 -r1.864
--- ChangeLog	21 Oct 2012 19:53:57 -0000	1.863
+++ ChangeLog	25 Oct 2012 12:48:11 -0000	1.864
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.863 2012/10/21 19:53:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.864 2012/10/25 12:48:11 aballier Exp $
+
+  25 Oct 2012; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  internal mp3lib is gone, no need to disable it anymore
 
   21 Oct 2012; Anthony G. Basile <blueness@gentoo.org> mplayer-1.1-r1.ebuild:
   stable ppc ppc64, bug #394809



1.134                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.134&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.134&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.133&r2=1.134

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- mplayer-9999.ebuild	21 Jun 2012 08:10:42 -0000	1.133
+++ mplayer-9999.ebuild	25 Oct 2012 12:48:11 -0000	1.134
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.133 2012/06/21 08:10:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.134 2012/10/25 12:48:11 aballier Exp $
 
 EAPI=4
 
@@ -369,12 +369,6 @@
 	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
 	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
 	use dts || myconf+=" --disable-libdca"
-	# Disable internal mp3lib, bug #384849
-	# Samuli Suominen: Looks like MPlayer in Portage is using internal mp3lib by
-	# default, where as mpg123 upstream has incorporated all the optimizations
-	# from mplayer's mp3lib	in libmpg123 and more.
-	# It makes very little sense to use the internal copy as default anymore.
-	myconf+=" --disable-mp3lib"
 	if ! use mp3; then
 		myconf+="
 			--disable-mp3lame





^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2013-02-08 13:21 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2013-02-08 13:21 UTC (permalink / raw
  To: gentoo-commits

aballier    13/02/08 13:21:38

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  fix and simplify tremor and vorbis useflags by using external tremor, bug #437594
  
  (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.876                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.876&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.876&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.875&r2=1.876

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.875
retrieving revision 1.876
diff -u -r1.875 -r1.876
--- ChangeLog	8 Feb 2013 12:55:53 -0000	1.875
+++ ChangeLog	8 Feb 2013 13:21:38 -0000	1.876
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.875 2013/02/08 12:55:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.876 2013/02/08 13:21:38 aballier Exp $
+
+  08 Feb 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  fix and simplify tremor and vorbis useflags by using external tremor, bug
+  #437594
 
   08 Feb 2013; Alexis Ballier <aballier@gentoo.org>
   -mplayer-1.0_rc4_p20110322-r1.ebuild,



1.135                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.135&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.135&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.134&r2=1.135

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- mplayer-9999.ebuild	25 Oct 2012 12:48:11 -0000	1.134
+++ mplayer-9999.ebuild	8 Feb 2013 13:21:38 -0000	1.135
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.134 2012/10/25 12:48:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.135 2013/02/08 13:21:38 aballier Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@
 +libass libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas
 +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
 radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3
-tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix
+tga +theora tremor +truetype +toolame +twolame +unicode v4l vdpau vidix
 +vorbis win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc
 zoran"
 
@@ -127,9 +127,10 @@
 	sdl? ( media-libs/libsdl )
 	speex? ( media-libs/speex )
 	theora? ( media-libs/libtheora[encode?] )
+	tremor? ( media-libs/tremor )
 	truetype? ( ${FONT_RDEPS} )
 	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( media-libs/libvorbis )
+	vorbis? ( !tremor? ( media-libs/libvorbis ) )
 	X? ( ${X_RDEPS}	)
 	xanim? ( media-video/xanim )
 	xinerama? ( x11-libs/libXinerama )
@@ -172,7 +173,6 @@
 # dvd navigation requires dvd read support
 # ass and freetype font require iconv and ass requires freetype fonts
 # unicode transformations are usefull only with iconv
-# libvorbis require external tremor to work
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
 REQUIRED_USE="bindist? ( !faac !win32codecs )
@@ -375,26 +375,17 @@
 			--disable-mpg123
 		"
 	fi
-	uses="a52 bs2b dv gsm lzo rtmp"
+	uses="a52 bs2b dv gsm lzo rtmp vorbis"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-lib${i}"
 	done
 
-	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora xanim"
+	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
 	use jpeg2k || myconf+=" --disable-libopenjpeg"
-	if use vorbis || use tremor; then
-		use tremor || myconf+=" --disable-tremor-internal"
-		use vorbis || myconf+=" --disable-libvorbis"
-	else
-		myconf+="
-			--disable-tremor-internal
-			--disable-tremor
-			--disable-libvorbis
-		"
-	fi
+
 	# Encoding
 	uses="faac x264 xvid toolame twolame"
 	if use encode; then





^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2013-02-08 13:29 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2013-02-08 13:29 UTC (permalink / raw
  To: gentoo-commits

aballier    13/02/08 13:29:33

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  disable opus since it only controls opus support in internal ffmpeg which we do not use, bug #434258
  
  (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.877                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.877&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.877&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.876&r2=1.877

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.876
retrieving revision 1.877
diff -u -r1.876 -r1.877
--- ChangeLog	8 Feb 2013 13:21:38 -0000	1.876
+++ ChangeLog	8 Feb 2013 13:29:33 -0000	1.877
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.876 2013/02/08 13:21:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.877 2013/02/08 13:29:33 aballier Exp $
+
+  08 Feb 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  disable opus since it only controls opus support in internal ffmpeg which we
+  do not use, bug #434258
 
   08 Feb 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   fix and simplify tremor and vorbis useflags by using external tremor, bug



1.136                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.136&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.136&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.135&r2=1.136

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- mplayer-9999.ebuild	8 Feb 2013 13:21:38 -0000	1.135
+++ mplayer-9999.ebuild	8 Feb 2013 13:29:33 -0000	1.136
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.135 2013/02/08 13:21:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.136 2013/02/08 13:29:33 aballier Exp $
 
 EAPI=4
 
@@ -274,11 +274,14 @@
 	# disable svga since we don't want it
 	# disable arts since we don't have kde3
 	# always disable internal ass
+	# disable opus since it only controls opus support in internal ffmpeg which
+	#         we do not use
 	myconf+="
 		--disable-svga --disable-svgalib_helper
 		--disable-ass-internal
 		--disable-arts
 		--disable-kai
+		--disable-libopus
 		$(use_enable network networking)
 		$(use_enable joystick)
 	"





^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2013-02-08 13:50 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2013-02-08 13:50 UTC (permalink / raw
  To: gentoo-commits

aballier    13/02/08 13:50:18

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  disable libilbc for the same reason as libopus: it is for internal ffmpeg only.
  
  (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.880                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.880&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.880&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.879&r2=1.880

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.879
retrieving revision 1.880
diff -u -r1.879 -r1.880
--- ChangeLog	8 Feb 2013 13:41:43 -0000	1.879
+++ ChangeLog	8 Feb 2013 13:50:18 -0000	1.880
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.879 2013/02/08 13:41:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.880 2013/02/08 13:50:18 aballier Exp $
+
+  08 Feb 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  disable libilbc for the same reason as libopus: it is for internal ffmpeg
+  only.
 
   08 Feb 2013; Alexis Ballier <aballier@gentoo.org> mplayer-1.1-r1.ebuild,
   mplayer-9999.ebuild:



1.138                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.138&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.138&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.137&r2=1.138

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- mplayer-9999.ebuild	8 Feb 2013 13:41:43 -0000	1.137
+++ mplayer-9999.ebuild	8 Feb 2013 13:50:18 -0000	1.138
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.137 2013/02/08 13:41:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.138 2013/02/08 13:50:18 aballier Exp $
 
 EAPI=4
 
@@ -274,14 +274,15 @@
 	# disable svga since we don't want it
 	# disable arts since we don't have kde3
 	# always disable internal ass
-	# disable opus since it only controls opus support in internal ffmpeg which
-	#         we do not use
+	# disable opus and ilbc since it only controls support in internal
+	#         ffmpeg which we do not use
 	myconf+="
 		--disable-svga --disable-svgalib_helper
 		--disable-ass-internal
 		--disable-arts
 		--disable-kai
 		--disable-libopus
+		--disable-libilbc
 		$(use_enable network networking)
 		$(use_enable joystick)
 	"





^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2013-02-08 14:05 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2013-02-08 14:05 UTC (permalink / raw
  To: gentoo-commits

aballier    13/02/08 14:05:32

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Merge all binary codec support under win32codecs useflag
  
  (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.881                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.881&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.881&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.880&r2=1.881

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.880
retrieving revision 1.881
diff -u -r1.880 -r1.881
--- ChangeLog	8 Feb 2013 13:50:18 -0000	1.880
+++ ChangeLog	8 Feb 2013 14:05:32 -0000	1.881
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.880 2013/02/08 13:50:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.881 2013/02/08 14:05:32 aballier Exp $
+
+  08 Feb 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  Merge all binary codec support under win32codecs useflag
 
   08 Feb 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   disable libilbc for the same reason as libopus: it is for internal ffmpeg



1.139                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.139&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.139&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.138&r2=1.139

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- mplayer-9999.ebuild	8 Feb 2013 13:50:18 -0000	1.138
+++ mplayer-9999.ebuild	8 Feb 2013 14:05:32 -0000	1.139
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.138 2013/02/08 13:50:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.139 2013/02/08 14:05:32 aballier Exp $
 
 EAPI=4
 
@@ -15,8 +15,8 @@
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 +libass libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas
-+network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
-radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3
++network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr
+radio +rar +rtc rtmp samba +shm sdl +speex sse sse2 ssse3
 tga +theora tremor +truetype +toolame +twolame +unicode v4l vdpau vidix
 +vorbis win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc
 zoran"
@@ -407,23 +407,11 @@
 	#################
 	# Binary codecs #
 	#################
-	# bug 213836
-	if ! use x86 || ! use win32codecs; then
-		use quicktime || myconf+=" --disable-qtx"
-	fi
-
-	######################
-	# RealPlayer support #
-	######################
-	# Realplayer support shows up in four places:
-	# - libavcodec (internal)
-	# - win32codecs
-	# - realcodecs (win32codecs libs)
-	# - realcodecs (realplayer libs)
-
-	# internal
-	use real || myconf+=" --disable-real"
-	myconf+=" $(use_enable win32codecs win32dll)"
+	if use win32codecs ; then
+		myconf+=" --enable-win32dll"
+	else
+		myconf+=" --disable-qtx --disable-real --disable-win32dll"
+	fi
 
 	################
 	# Video Output #
@@ -568,7 +556,7 @@
 	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
 	docinto TOOLS/
 	dodoc -r TOOLS
-	if use real; then
+	if use win32codecs; then
 		docinto tech/realcodecs/
 		dodoc DOCS/tech/realcodecs/*
 	fi





^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2013-02-14 21:01 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2013-02-14 21:01 UTC (permalink / raw
  To: gentoo-commits

aballier    13/02/14 21:01:11

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  It seems fine with libav-9 so allow it in the deps
  
  (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.882                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.882&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.882&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.881&r2=1.882

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.881
retrieving revision 1.882
diff -u -r1.881 -r1.882
--- ChangeLog	8 Feb 2013 14:05:32 -0000	1.881
+++ ChangeLog	14 Feb 2013 21:01:11 -0000	1.882
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.881 2013/02/08 14:05:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.882 2013/02/14 21:01:11 aballier Exp $
+
+  14 Feb 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  It seems fine with libav-9 so allow it in the deps
 
   08 Feb 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   Merge all binary codec support under win32codecs useflag



1.140                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.140&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.140&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.139&r2=1.140

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- mplayer-9999.ebuild	8 Feb 2013 14:05:32 -0000	1.139
+++ mplayer-9999.ebuild	14 Feb 2013 21:01:11 -0000	1.140
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.139 2013/02/08 14:05:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.140 2013/02/14 21:01:11 aballier Exp $
 
 EAPI=4
 
@@ -61,7 +61,7 @@
 	sys-libs/ncurses
 	app-arch/bzip2
 	sys-libs/zlib
-	>=media-video/ffmpeg-0.11.1
+	|| ( >=media-video/ffmpeg-1.0 >=media-video/libav-9 )
 	!bindist? (
 		x86? (
 			win32codecs? ( media-libs/win32codecs )





^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2013-04-13 17:17 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2013-04-13 17:17 UTC (permalink / raw
  To: gentoo-commits

aballier    13/04/13 17:17:38

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  trunk now requires ffmpeg 1.1, reported in bug #463588 by  foux
  
  (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.884                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.884&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.884&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.883&r2=1.884

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.883
retrieving revision 1.884
diff -u -r1.883 -r1.884
--- ChangeLog	21 Mar 2013 07:08:36 -0000	1.883
+++ ChangeLog	13 Apr 2013 17:17:38 -0000	1.884
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.883 2013/03/21 07:08:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.884 2013/04/13 17:17:38 aballier Exp $
+
+  13 Apr 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  trunk now requires ffmpeg 1.1, reported in bug #463588 by foux
 
   21 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> mplayer-1.1-r1.ebuild,
   mplayer-9999.ebuild:



1.142                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.142&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.142&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.141&r2=1.142

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- mplayer-9999.ebuild	21 Mar 2013 07:08:36 -0000	1.141
+++ mplayer-9999.ebuild	13 Apr 2013 17:17:38 -0000	1.142
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.141 2013/03/21 07:08:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.142 2013/04/13 17:17:38 aballier Exp $
 
 EAPI=4
 
@@ -61,7 +61,7 @@
 	sys-libs/ncurses
 	app-arch/bzip2
 	sys-libs/zlib
-	|| ( >=media-video/ffmpeg-1.0 >=media-video/libav-9 )
+	|| ( >=media-video/ffmpeg-1.1 >=media-video/libav-9 )
 	!bindist? (
 		x86? (
 			win32codecs? ( media-libs/win32codecs )





^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2013-07-29 20:00 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-29 20:00 UTC (permalink / raw
  To: gentoo-commits

aballier    13/07/29 20:00:11

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  EAPI5, add slot dep on ffmpeg, x264 and libav. Fix ffmpeg dep.
  
  (Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.901                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.901&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.901&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.900&r2=1.901

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.900
retrieving revision 1.901
diff -u -r1.900 -r1.901
--- ChangeLog	28 Jul 2013 21:13:48 -0000	1.900
+++ ChangeLog	29 Jul 2013 20:00:11 -0000	1.901
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.900 2013/07/28 21:13:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.901 2013/07/29 20:00:11 aballier Exp $
+
+  29 Jul 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  EAPI5, add slot dep on ffmpeg, x264 and libav. Fix ffmpeg dep.
 
   28 Jul 2013; Alexis Ballier <aballier@gentoo.org> mplayer-1.1.1-r1.ebuild,
   mplayer-9999.ebuild:



1.146                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.146&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.146&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.145&r2=1.146

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- mplayer-9999.ebuild	28 Jul 2013 21:13:48 -0000	1.145
+++ mplayer-9999.ebuild	29 Jul 2013 20:00:11 -0000	1.146
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.145 2013/07/28 21:13:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.146 2013/07/29 20:00:11 aballier Exp $
 
-EAPI=4
+EAPI=5
 
 EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
@@ -60,7 +60,7 @@
 	sys-libs/ncurses
 	app-arch/bzip2
 	sys-libs/zlib
-	|| ( >=media-video/ffmpeg-1.1 >=media-video/libav-9 )
+	|| ( >=media-video/ffmpeg-2.0:= >=media-video/libav-9:= )
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
@@ -81,7 +81,7 @@
 		twolame? ( media-sound/twolame )
 		faac? ( media-libs/faac )
 		mp3? ( media-sound/lame )
-		x264? ( >=media-libs/x264-0.0.20100423 )
+		x264? ( >=media-libs/x264-0.0.20100423:= )
 		xvid? ( media-libs/xvid )
 	)
 	enca? ( app-i18n/enca )





^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2013-07-29 20:08 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-29 20:08 UTC (permalink / raw
  To: gentoo-commits

aballier    13/07/29 20:08:24

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Sort alphabetically REQUIRED_USE entries and make enca require iconv, by Nikoli, bug #476322.
  
  (Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.902                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.902&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.902&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.901&r2=1.902

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.901
retrieving revision 1.902
diff -u -r1.901 -r1.902
--- ChangeLog	29 Jul 2013 20:00:11 -0000	1.901
+++ ChangeLog	29 Jul 2013 20:08:24 -0000	1.902
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.901 2013/07/29 20:00:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.902 2013/07/29 20:08:24 aballier Exp $
+
+  29 Jul 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  Sort alphabetically REQUIRED_USE entries and make enca require iconv, by
+  Nikoli, bug #476322.
 
   29 Jul 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   EAPI5, add slot dep on ffmpeg, x264 and libav. Fix ffmpeg dep.



1.147                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.147&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.147&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.146&r2=1.147

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- mplayer-9999.ebuild	29 Jul 2013 20:00:11 -0000	1.146
+++ mplayer-9999.ebuild	29 Jul 2013 20:08:24 -0000	1.147
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.146 2013/07/29 20:00:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.147 2013/07/29 20:08:24 aballier Exp $
 
 EAPI=5
 
@@ -169,18 +169,20 @@
 # unicode transformations are usefull only with iconv
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
-REQUIRED_USE="bindist? ( !faac )
+REQUIRED_USE="
+	bindist? ( !faac )
+	dga? ( X )
 	dvdnav? ( dvd )
-	libass? ( truetype )
-	truetype? ( iconv )
 	dxr3? ( X )
+	enca? ( iconv )
 	ggi? ( X )
-	xinerama? ( X )
-	dga? ( X )
+	libass? ( truetype )
 	opengl? ( X )
 	osdmenu? ( X )
+	truetype? ( iconv )
 	vdpau? ( X )
 	vidix? ( X )
+	xinerama? ( X )
 	xscreensaver? ( X )
 	xv? ( X )
 	xvmc? ( xv )"





^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2013-07-29 20:17 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-29 20:17 UTC (permalink / raw
  To: gentoo-commits

aballier    13/07/29 20:17:17

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  do not default enable rtc, by Nikoli, bug #476316
  
  (Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.904                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.904&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.904&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.903&r2=1.904

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.903
retrieving revision 1.904
diff -u -r1.903 -r1.904
--- ChangeLog	29 Jul 2013 20:11:04 -0000	1.903
+++ ChangeLog	29 Jul 2013 20:17:17 -0000	1.904
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.903 2013/07/29 20:11:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.904 2013/07/29 20:17:17 aballier Exp $
+
+  29 Jul 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  do not default enable rtc, by Nikoli, bug #476316
 
   29 Jul 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   remove comment about win32codecs



1.149                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.149&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.149&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.148&r2=1.149

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- mplayer-9999.ebuild	29 Jul 2013 20:11:04 -0000	1.148
+++ mplayer-9999.ebuild	29 Jul 2013 20:17:17 -0000	1.149
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.148 2013/07/29 20:11:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.149 2013/07/29 20:17:17 aballier Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 +libass libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas
 +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr
-radio +rar +rtc rtmp samba +shm sdl +speex sse sse2 ssse3
+radio +rar rtc rtmp samba +shm sdl +speex sse sse2 ssse3
 tga +theora tremor +truetype +toolame +twolame +unicode v4l vdpau vidix
 +vorbis +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
 





^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2013-07-29 20:39 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-29 20:39 UTC (permalink / raw
  To: gentoo-commits

aballier    13/07/29 20:39:05

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Drop some more default enabled useflags.
  
  (Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.905                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.905&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.905&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.904&r2=1.905

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.904
retrieving revision 1.905
diff -u -r1.904 -r1.905
--- ChangeLog	29 Jul 2013 20:17:17 -0000	1.904
+++ ChangeLog	29 Jul 2013 20:39:05 -0000	1.905
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.904 2013/07/29 20:17:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.905 2013/07/29 20:39:05 aballier Exp $
+
+  29 Jul 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  Drop some more default enabled useflags.
 
   29 Jul 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   do not default enable rtc, by Nikoli, bug #476316



1.150                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.150&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.150&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.149&r2=1.150

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- mplayer-9999.ebuild	29 Jul 2013 20:17:17 -0000	1.149
+++ mplayer-9999.ebuild	29 Jul 2013 20:39:05 -0000	1.150
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.149 2013/07/29 20:17:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.150 2013/07/29 20:39:05 aballier Exp $
 
 EAPI=5
 
@@ -10,15 +10,15 @@
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
-IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua bidi bindist bl bluray
+IUSE="3dnow 3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode faac +faad fbcon
+directfb doc dts dv dvb +dvd +dvdnav dxr3 +enca +encode faac faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas
-+network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr
-radio +rar rtc rtmp samba +shm sdl +speex sse sse2 ssse3
-tga +theora tremor +truetype +toolame +twolame +unicode v4l vdpau vidix
-+vorbis +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
++libass libcaca libmpeg2 lirc live lzo mad md5sum +mmx mmxext mng mp3 nas
++network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
+radio rar rtc rtmp samba +shm sdl speex sse sse2 ssse3
+tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
+vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
 
 VIDEO_CARDS="s3virge mga tdfx"
 for x in ${VIDEO_CARDS}; do





^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2014-07-21 15:23 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 73+ messages in thread
From: Samuli Suominen (ssuominen) @ 2014-07-21 15:23 UTC (permalink / raw
  To: gentoo-commits

ssuominen    14/07/21 15:23:36

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  Update live ebuild as well to match last change done in 1.2_pre for linguas zh
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.916                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.916&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.916&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.915&r2=1.916

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -r1.915 -r1.916
--- ChangeLog	21 Jul 2014 15:20:46 -0000	1.915
+++ ChangeLog	21 Jul 2014 15:23:36 -0000	1.916
@@ -1,9 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.915 2014/07/21 15:20:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.916 2014/07/21 15:23:36 ssuominen Exp $
 
   21 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
-  mplayer-1.2_pre20130729.ebuild:
+  mplayer-1.2_pre20130729.ebuild, mplayer-9999.ebuild:
   Fix building with LINGUAS="zh" by replacing it with LINGUAS="zh_CN" which is
   the only "zh" language supported by mplayer wrt #482968 by "Hamlet"
 



1.158                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.158&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.158&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.157&r2=1.158

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- mplayer-9999.ebuild	21 Jul 2014 15:07:41 -0000	1.157
+++ mplayer-9999.ebuild	21 Jul 2014 15:23:36 -0000	1.158
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.157 2014/07/21 15:07:41 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.158 2014/07/21 15:23:36 ssuominen Exp $
 
 EAPI=5
 
@@ -268,6 +268,7 @@
 
 	# set LINGUAS
 	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
 
 	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
 	# compilation in almost every situation. The reason for this is





^ permalink raw reply	[flat|nested] 73+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2014-12-15 14:42 Alexis Ballier (aballier)
  0 siblings, 0 replies; 73+ messages in thread
From: Alexis Ballier (aballier) @ 2014-12-15 14:42 UTC (permalink / raw
  To: gentoo-commits

aballier    14/12/15 14:42:24

  Modified:             ChangeLog mplayer-9999.ebuild
  Log:
  update for recent upstream changes on internal dvd libs, bug #528706 by Dan Douglas
  
  Signed-off-by: aballier@gentoo.org
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.931                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.931&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.931&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.930&r2=1.931

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.930
retrieving revision 1.931
diff -u -r1.930 -r1.931
--- ChangeLog	15 Dec 2014 14:33:48 -0000	1.930
+++ ChangeLog	15 Dec 2014 14:42:24 -0000	1.931
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.930 2014/12/15 14:33:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.931 2014/12/15 14:42:24 aballier Exp $
+
+  15 Dec 2014; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  update for recent upstream changes on internal dvd libs, bug #528706 by Dan
+  Douglas
 
   15 Dec 2014; Alexis Ballier <aballier@gentoo.org>
   mplayer-1.2_pre20141011.ebuild:



1.165                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.165&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.165&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.164&r2=1.165

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- mplayer-9999.ebuild	2 Nov 2014 12:02:09 -0000	1.164
+++ mplayer-9999.ebuild	15 Dec 2014 14:42:24 -0000	1.165
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.164 2014/11/02 12:02:09 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.165 2014/12/15 14:42:24 aballier Exp $
 
 EAPI=5
 
@@ -322,9 +322,6 @@
 	#
 	# dvdread - accessing a DVD
 	# dvdnav - navigation of menus
-	#
-	# use external libdvdcss, dvdread and dvdnav
-	myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
 	use dvd || myconf+=" --disable-dvdread"
 	use dvdnav || myconf+=" --disable-dvdnav"
 





^ permalink raw reply	[flat|nested] 73+ messages in thread

end of thread, other threads:[~2014-12-15 14:42 UTC | newest]

Thread overview: 73+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-13 17:17 [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild Alexis Ballier (aballier)
  -- strict thread matches above, loose matches on Subject: below --
2014-12-15 14:42 Alexis Ballier (aballier)
2014-07-21 15:23 Samuli Suominen (ssuominen)
2013-07-29 20:39 Alexis Ballier (aballier)
2013-07-29 20:17 Alexis Ballier (aballier)
2013-07-29 20:08 Alexis Ballier (aballier)
2013-07-29 20:00 Alexis Ballier (aballier)
2013-02-14 21:01 Alexis Ballier (aballier)
2013-02-08 14:05 Alexis Ballier (aballier)
2013-02-08 13:50 Alexis Ballier (aballier)
2013-02-08 13:29 Alexis Ballier (aballier)
2013-02-08 13:21 Alexis Ballier (aballier)
2012-10-25 12:48 Alexis Ballier (aballier)
2011-12-19 16:43 Alexis Ballier (aballier)
2011-12-18 15:06 Alexis Ballier (aballier)
2011-12-17 17:59 Alexis Ballier (aballier)
2011-12-17 17:47 Alexis Ballier (aballier)
2011-12-17 15:56 Alexis Ballier (aballier)
2011-12-17 15:52 Alexis Ballier (aballier)
2011-12-16 13:52 Alexis Ballier (aballier)
2011-12-16 13:36 Alexis Ballier (aballier)
2011-12-15 12:48 Alexis Ballier (aballier)
2011-12-15 12:30 Alexis Ballier (aballier)
2011-06-23 16:17 Alexis Ballier (aballier)
2011-06-23 16:11 Alexis Ballier (aballier)
2011-06-08 19:50 Alexis Ballier (aballier)
2011-06-08 19:43 Alexis Ballier (aballier)
2011-04-03 10:24 Tomas Chvatal (scarabeus)
2011-04-03 10:22 Tomas Chvatal (scarabeus)
2011-03-26 14:38 Tomas Chvatal (scarabeus)
2011-03-20 22:12 Tomas Chvatal (scarabeus)
2011-03-01 15:31 Tomas Chvatal (scarabeus)
2011-01-30 21:08 Tomas Chvatal (scarabeus)
2011-01-30 12:55 Tomas Chvatal (scarabeus)
2011-01-30 11:20 Tomas Chvatal (scarabeus)
2011-01-14 16:26 Fabian Groffen (grobian)
2011-01-02  2:35 Alexis Ballier (aballier)
2010-10-10 13:46 Tomas Chvatal (scarabeus)
2010-10-10 11:29 Tomas Chvatal (scarabeus)
2010-10-10  9:04 Tomas Chvatal (scarabeus)
2010-10-01  2:44 Alexis Ballier (aballier)
2010-07-18  9:47 Alexis Ballier (aballier)
2010-06-30 16:45 Tomas Chvatal (scarabeus)
2010-06-25 11:53 Alexis Ballier (aballier)
2010-06-25 11:51 Alexis Ballier (aballier)
2010-06-11 13:59 Alexis Ballier (aballier)
2010-06-02 16:25 Luca Barbato (lu_zero)
2010-06-01  0:27 Luca Barbato (lu_zero)
2010-05-31 13:41 Luca Barbato (lu_zero)
2010-05-09 16:44 Alexis Ballier (aballier)
2010-05-05  8:37 Tomas Chvatal (scarabeus)
2010-05-01 15:41 Alexis Ballier (aballier)
2010-05-01 15:39 Alexis Ballier (aballier)
2010-04-24 15:49 Alexis Ballier (aballier)
2010-04-24 14:13 Alexis Ballier (aballier)
2010-04-24 13:56 Alexis Ballier (aballier)
2010-04-24 13:30 Alexis Ballier (aballier)
2010-04-24 13:24 Alexis Ballier (aballier)
2010-04-24 13:03 Alexis Ballier (aballier)
2010-04-24 12:44 Alexis Ballier (aballier)
2010-04-24 12:33 Alexis Ballier (aballier)
2010-04-24 12:18 Alexis Ballier (aballier)
2010-04-24 11:57 Alexis Ballier (aballier)
2010-03-26 12:51 Dror Levin (spatz)
2010-03-09 14:25 Steve Dibb (beandog)
2010-02-26 23:19 Sebastian Pipping (sping)
2010-02-02 16:21 Tomas Chvatal (scarabeus)
2009-11-19 14:39 Steve Dibb (beandog)
2009-08-03  6:42 Alexis Ballier (aballier)
2009-07-24 22:46 Steve Dibb (beandog)
2009-06-02 17:43 Steve Dibb (beandog)
2009-05-30 23:07 Tomas Chvatal (scarabeus)
2009-03-24 14:14 Steve Dibb (beandog)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox