| 1 |
lu_zero 10/06/02 16:25:29 |
| 2 |
|
| 3 |
Modified: ChangeLog mplayer-9999.ebuild |
| 4 |
Log: |
| 5 |
Ebuild improvements from Nikoli |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.744 media-video/mplayer/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.744&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.744&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.743&r2=1.744 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v |
| 18 |
retrieving revision 1.743 |
| 19 |
retrieving revision 1.744 |
| 20 |
diff -u -r1.743 -r1.744 |
| 21 |
--- ChangeLog 1 Jun 2010 00:27:28 -0000 1.743 |
| 22 |
+++ ChangeLog 2 Jun 2010 16:25:28 -0000 1.744 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for media-video/mplayer |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.743 2010/06/01 00:27:28 lu_zero Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.744 2010/06/02 16:25:28 lu_zero Exp $ |
| 28 |
+ |
| 29 |
+ 02 Jun 2010; Luca Barbato <lu_zero@g.o> mplayer-9999.ebuild: |
| 30 |
+ Ebuild improvements from Nikoli <nikoli@×××××××.com> see bug #322377 |
| 31 |
|
| 32 |
01 Jun 2010; Luca Barbato <lu_zero@g.o> mplayer-9999.ebuild: |
| 33 |
Change doc deps as reported in bug #317559 |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.62 media-video/mplayer/mplayer-9999.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.62&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.62&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.61&r2=1.62 |
| 42 |
|
| 43 |
Index: mplayer-9999.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v |
| 46 |
retrieving revision 1.61 |
| 47 |
retrieving revision 1.62 |
| 48 |
diff -u -r1.61 -r1.62 |
| 49 |
--- mplayer-9999.ebuild 1 Jun 2010 04:31:51 -0000 1.61 |
| 50 |
+++ mplayer-9999.ebuild 2 Jun 2010 16:25:28 -0000 1.62 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2010 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.61 2010/06/01 04:31:51 mr_bones_ Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.62 2010/06/02 16:25:28 lu_zero Exp $ |
| 56 |
|
| 57 |
EAPI="2" |
| 58 |
|
| 59 |
@@ -62,6 +62,8 @@ |
| 60 |
# nemesi? ( net-libs/libnemesi ) |
| 61 |
RDEPEND+=" |
| 62 |
sys-libs/ncurses |
| 63 |
+ app-arch/bzip2 |
| 64 |
+ sys-libs/zlib |
| 65 |
!bindist? ( |
| 66 |
x86? ( |
| 67 |
win32codecs? ( media-libs/win32codecs ) |
| 68 |
@@ -142,7 +144,7 @@ |
| 69 |
sdl? ( media-libs/libsdl ) |
| 70 |
speex? ( media-libs/speex ) |
| 71 |
svga? ( media-libs/svgalib ) |
| 72 |
- theora? ( media-libs/libtheora ) |
| 73 |
+ theora? ( media-libs/libtheora[encode?] ) |
| 74 |
truetype? ( ${FONT_RDEPS} ) |
| 75 |
vorbis? ( media-libs/libvorbis ) |
| 76 |
xanim? ( media-video/xanim ) |
| 77 |
@@ -228,7 +230,13 @@ |
| 78 |
} |
| 79 |
|
| 80 |
src_unpack() { |
| 81 |
- [[ ${PV} = *9999* ]] && subversion_src_unpack || unpack ${A} |
| 82 |
+ if [[ ${PV} = *9999* ]]; then |
| 83 |
+ subversion_src_unpack |
| 84 |
+ |
| 85 |
+ cd "${WORKDIR}" |
| 86 |
+ else |
| 87 |
+ unpack ${A} |
| 88 |
+ fi |
| 89 |
|
| 90 |
if ! use truetype; then |
| 91 |
unpack font-arial-iso-8859-1.tar.bz2 \ |
| 92 |
@@ -291,7 +299,6 @@ |
| 93 |
use ${i} || myconf+=" --disable-${i}" |
| 94 |
done |
| 95 |
use bidi || myconf+=" --disable-fribidi" |
| 96 |
- use encode || myconf+=" --disable-mencoder" |
| 97 |
use ipv6 || myconf+=" --disable-inet6" |
| 98 |
use nut || myconf+=" --disable-libnut" |
| 99 |
use rar || myconf+=" --disable-unrarexec" |
| 100 |
@@ -394,15 +401,10 @@ |
| 101 |
########## |
| 102 |
# Codecs # |
| 103 |
########## |
| 104 |
- # Use internal musepack codecs for SV7 and SV8 support |
| 105 |
- myconf+=" --disable-musepack" |
| 106 |
- |
| 107 |
- use a52 || myconf+=" --disable-liba52" |
| 108 |
+ myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support |
| 109 |
myconf+=" --disable-faad-internal" # always use system media-libs/faad2 |
| 110 |
use dirac || myconf+=" --disable-libdirac-lavc" |
| 111 |
use dts || myconf+=" --disable-libdca" |
| 112 |
- use dv || myconf+=" --disable-libdv" |
| 113 |
- use lzo || myconf+=" --disable-liblzo" |
| 114 |
if ! use mp3; then |
| 115 |
myconf+=" |
| 116 |
--disable-mp3lame |
| 117 |
@@ -410,7 +412,10 @@ |
| 118 |
--disable-mp3lib |
| 119 |
" |
| 120 |
fi |
| 121 |
- use bs2b || myconf+=" --disable-libbs2b" |
| 122 |
+ uses="a52 bs2b dv lzo" |
| 123 |
+ for i in ${uses}; do |
| 124 |
+ use ${i} || myconf+=" --disable-lib${i}" |
| 125 |
+ done |
| 126 |
use schroedinger || myconf+=" --disable-libschroedinger-lavc" |
| 127 |
# Disable opencore-amr with bindist |
| 128 |
# https://bugs.gentoo.org/show_bug.cgi?id=299405#c6 |
| 129 |
@@ -435,25 +440,17 @@ |
| 130 |
" |
| 131 |
fi |
| 132 |
# Encoding |
| 133 |
+ uses="faac x264 xvid toolame twolame" |
| 134 |
if use encode; then |
| 135 |
- uses="faac x264 xvid toolame twolame" |
| 136 |
for i in ${uses}; do |
| 137 |
use ${i} || myconf+=" --disable-${i}" |
| 138 |
done |
| 139 |
use faac || myconf+=" --disable-faac-lavc" |
| 140 |
else |
| 141 |
- myconf+=" |
| 142 |
- --disable-faac-lavc |
| 143 |
- --disable-faac |
| 144 |
- --disable-x264 |
| 145 |
- --disable-xvid |
| 146 |
- --disable-x264-lavc |
| 147 |
- --disable-xvid-lavc |
| 148 |
- --disable-twolame |
| 149 |
- --disable-toolame |
| 150 |
- " |
| 151 |
- uses="faac x264 xvid toolame twolame" |
| 152 |
+ myconf+=" --disable-mencoder" |
| 153 |
+ myconf+="--disable-faac-lavc" |
| 154 |
for i in ${uses}; do |
| 155 |
+ myconf+=" --disable-${i}" |
| 156 |
use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work." |
| 157 |
done |
| 158 |
fi |
| 159 |
@@ -606,6 +603,7 @@ |
| 160 |
--disable-xss |
| 161 |
--disable-xv |
| 162 |
--disable-xvmc |
| 163 |
+ --disable-x11 |
| 164 |
" |
| 165 |
uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv" |
| 166 |
for i in ${uses}; do |
| 167 |
@@ -640,14 +638,14 @@ |
| 168 |
local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN" |
| 169 |
local BUILT_DOCS="" |
| 170 |
for i in ${LINGUAS} ; do |
| 171 |
- hasq $i ${ALLOWED_LINGUAS} && BUILT_DOCS+=" $i" |
| 172 |
+ hasq ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}" |
| 173 |
done |
| 174 |
if [[ -z $BUILT_DOCS ]] |
| 175 |
then |
| 176 |
emake -j1 -C DOCS/xml html-chunked || die "Failed to generate html docs" |
| 177 |
else |
| 178 |
for i in ${BUILT_DOCS} ; do |
| 179 |
- emake -j1 -C DOCS/xml html-chunked-$i || die "Failed to generate html docs for $i" |
| 180 |
+ emake -j1 -C DOCS/xml html-chunked-${i} || die "Failed to generate html docs for ${i}" |
| 181 |
done |
| 182 |
fi |
| 183 |
fi |
Archives