| 1 |
scarabeus 10/11/01 13:50:53 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog mplayer-9999.ebuild |
| 4 |
Log: |
| 5 |
Fix mga videocard check per bug #341171. Add missing options per bug #334793. |
| 6 |
|
| 7 |
(Portage version: 2.2_rc98/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.35 media-video/mplayer/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.35&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.35&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?r1=1.34&r2=1.35 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/metadata.xml,v |
| 19 |
retrieving revision 1.34 |
| 20 |
retrieving revision 1.35 |
| 21 |
diff -u -r1.34 -r1.35 |
| 22 |
--- metadata.xml 10 Oct 2010 19:43:25 -0000 1.34 |
| 23 |
+++ metadata.xml 1 Nov 2010 13:50:53 -0000 1.35 |
| 24 |
@@ -23,10 +23,12 @@ |
| 25 |
<flag name="faac">Use external faac library for AAC encoding</flag> |
| 26 |
<flag name="faad">Use external faad library for AAC decoding</flag> |
| 27 |
<flag name="gmplayer">Build gmplayer, a GTK+ MPlayer gui (UNSUPPORTED)</flag> |
| 28 |
+ <flag name="libmpeg2">Build support for mpeg2 over media-libs/libmpeg2 rather than using ffmpeg.</flag> |
| 29 |
<flag name="live">Enables live.com streaming media support</flag> |
| 30 |
<flag name="md5sum">Enables md5sum video output</flag> |
| 31 |
<flag name="mmxext">Enables mmx2 support</flag> |
| 32 |
<flag name="mng">MNG input support</flag> |
| 33 |
+ <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123.</flag> |
| 34 |
<flag name="network">Enables network streaming support</flag> |
| 35 |
<flag name="nut">Enables support for the NUT container format</flag> |
| 36 |
<flag name="osdmenu">Enables support for on-screen display (OSD) menus</flag> |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.764 media-video/mplayer/ChangeLog |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.764&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.764&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.763&r2=1.764 |
| 45 |
|
| 46 |
Index: ChangeLog |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v |
| 49 |
retrieving revision 1.763 |
| 50 |
retrieving revision 1.764 |
| 51 |
diff -u -r1.763 -r1.764 |
| 52 |
--- ChangeLog 10 Oct 2010 19:43:25 -0000 1.763 |
| 53 |
+++ ChangeLog 1 Nov 2010 13:50:53 -0000 1.764 |
| 54 |
@@ -1,6 +1,10 @@ |
| 55 |
# ChangeLog for media-video/mplayer |
| 56 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.763 2010/10/10 19:43:25 scarabeus Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.764 2010/11/01 13:50:53 scarabeus Exp $ |
| 59 |
+ |
| 60 |
+ 01 Nov 2010; Tomáš Chvátal <scarabeus@g.o> mplayer-9999.ebuild, |
| 61 |
+ metadata.xml: |
| 62 |
+ Fix mga videocard check per bug #341171. Add missing options per bug #334793. |
| 63 |
|
| 64 |
10 Oct 2010; Tomáš Chvátal <scarabeus@g.o> mplayer-9999.ebuild, |
| 65 |
metadata.xml: |
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
1.83 media-video/mplayer/mplayer-9999.ebuild |
| 70 |
|
| 71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.83&view=markup |
| 72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.83&content-type=text/plain |
| 73 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.82&r2=1.83 |
| 74 |
|
| 75 |
Index: mplayer-9999.ebuild |
| 76 |
=================================================================== |
| 77 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v |
| 78 |
retrieving revision 1.82 |
| 79 |
retrieving revision 1.83 |
| 80 |
diff -u -r1.82 -r1.83 |
| 81 |
--- mplayer-9999.ebuild 10 Oct 2010 23:31:27 -0000 1.82 |
| 82 |
+++ mplayer-9999.ebuild 1 Nov 2010 13:50:53 -0000 1.83 |
| 83 |
@@ -1,6 +1,6 @@ |
| 84 |
# Copyright 1999-2010 Gentoo Foundation |
| 85 |
# Distributed under the terms of the GNU General Public License v2 |
| 86 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.82 2010/10/10 23:31:27 mr_bones_ Exp $ |
| 87 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.83 2010/11/01 13:50:53 scarabeus Exp $ |
| 88 |
|
| 89 |
EAPI=3 |
| 90 |
|
| 91 |
@@ -16,11 +16,12 @@ |
| 92 |
bs2b +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac |
| 93 |
directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon |
| 94 |
ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa |
| 95 |
-libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal |
| 96 |
-amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc |
| 97 |
-rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor |
| 98 |
-+truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis vpx |
| 99 |
-win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran" |
| 100 |
+libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas |
| 101 |
++network nut openal amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime |
| 102 |
+radio +rar +real +rtc rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3 |
| 103 |
+tga +theora +tremor +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix |
| 104 |
++vorbis vpx win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc |
| 105 |
+zoran" |
| 106 |
[[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg" |
| 107 |
|
| 108 |
VIDEO_CARDS="s3virge mga tdfx vesa" |
| 109 |
@@ -96,6 +97,10 @@ |
| 110 |
dts? ( media-libs/libdca ) |
| 111 |
dv? ( media-libs/libdv ) |
| 112 |
dvb? ( media-tv/linuxtv-dvb-headers ) |
| 113 |
+ dvd? ( |
| 114 |
+ >=media-libs/libdvdread-4.1.3 |
| 115 |
+ dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) |
| 116 |
+ ) |
| 117 |
encode? ( |
| 118 |
!twolame? ( toolame? ( media-sound/toolame ) ) |
| 119 |
twolame? ( media-sound/twolame ) |
| 120 |
@@ -115,11 +120,13 @@ |
| 121 |
jpeg2k? ( media-libs/openjpeg ) |
| 122 |
ladspa? ( media-libs/ladspa-sdk ) |
| 123 |
libcaca? ( media-libs/libcaca ) |
| 124 |
+ libmpeg2? ( media-libs/libmpeg2 ) |
| 125 |
lirc? ( app-misc/lirc ) |
| 126 |
live? ( media-plugins/live ) |
| 127 |
lzo? ( >=dev-libs/lzo-2 ) |
| 128 |
mad? ( media-libs/libmad ) |
| 129 |
mng? ( media-libs/libmng ) |
| 130 |
+ mpg123? ( media-sound/mpg123 ) |
| 131 |
nas? ( media-libs/nas ) |
| 132 |
nut? ( >=media-libs/libnut-661 ) |
| 133 |
openal? ( media-libs/openal ) |
| 134 |
@@ -310,8 +317,8 @@ |
| 135 |
# dvdread - accessing a DVD |
| 136 |
# dvdnav - navigation of menus |
| 137 |
# |
| 138 |
- # internal dvdread and dvdnav use flags enable internal |
| 139 |
- # versions of the libraries, which are snapshots of the fork. |
| 140 |
+ # use external libdvdcss, dvdread and dvdnav |
| 141 |
+ myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal" |
| 142 |
|
| 143 |
if use dvd; then |
| 144 |
use dvdnav || myconf+=" --disable-dvdnav" |
| 145 |
@@ -319,8 +326,6 @@ |
| 146 |
myconf+=" |
| 147 |
--disable-dvdnav |
| 148 |
--disable-dvdread |
| 149 |
- --disable-dvdread-internal |
| 150 |
- --disable-libdvdcss-internal |
| 151 |
" |
| 152 |
fi |
| 153 |
|
| 154 |
@@ -382,7 +387,7 @@ |
| 155 |
########## |
| 156 |
myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support |
| 157 |
myconf+=" --disable-faad-internal" # always use system media-libs/faad2 |
| 158 |
- myconf+=" --disable-libmpeg2-internal" # always use system version |
| 159 |
+ myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2 |
| 160 |
use dirac || myconf+=" --disable-libdirac-lavc" |
| 161 |
use dts || myconf+=" --disable-libdca" |
| 162 |
if ! use mp3; then |
| 163 |
@@ -401,7 +406,7 @@ |
| 164 |
# https://bugs.gentoo.org/show_bug.cgi?id=299405#c6 |
| 165 |
{ use amr && use !bindist ; } || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb" |
| 166 |
|
| 167 |
- uses="faad gif jpeg live mad mng png pnm speex tga theora xanim" |
| 168 |
+ uses="faad gif jpeg libmpeg2 live mad mng mpg123 png pnm speex tga theora xanim" |
| 169 |
for i in ${uses}; do |
| 170 |
use ${i} || myconf+=" --disable-${i}" |
| 171 |
done |
| 172 |
@@ -478,7 +483,7 @@ |
| 173 |
use libcaca || myconf+=" --disable-caca" |
| 174 |
use zoran || myconf+=" --disable-zr" |
| 175 |
|
| 176 |
- if ! use kernel_linux && ! use video_cards_mga; then |
| 177 |
+ if ! use kernel_linux || ! use video_cards_mga; then |
| 178 |
myconf+=" --disable-mga --disable-xmga" |
| 179 |
fi |
| 180 |
|
| 181 |
@@ -605,7 +610,6 @@ |
| 182 |
myconf+=" |
| 183 |
--enable-macosx-finder |
| 184 |
--enable-macosx-bundle |
| 185 |
- --enable-libdvdcss-internal |
| 186 |
" |
| 187 |
fi |
| 188 |
|
| 189 |
@@ -616,12 +620,12 @@ |
| 190 |
use external-ffmpeg && myconf+=" --disable-ffmpeg_a" |
| 191 |
fi |
| 192 |
|
| 193 |
- myconf="--cc=$(tc-getCC) \ |
| 194 |
- --host-cc=$(tc-getBUILD_CC) \ |
| 195 |
- --prefix=${EPREFIX}/usr \ |
| 196 |
- --confdir=${EPREFIX}/etc/mplayer \ |
| 197 |
- --datadir=${EPREFIX}/usr/share/mplayer \ |
| 198 |
- --libdir=${EPREFIX}/usr/$(get_libdir) \ |
| 199 |
+ myconf="--cc=$(tc-getCC) |
| 200 |
+ --host-cc=$(tc-getBUILD_CC) |
| 201 |
+ --prefix=${EPREFIX}/usr |
| 202 |
+ --confdir=${EPREFIX}/etc/mplayer |
| 203 |
+ --datadir=${EPREFIX}/usr/share/mplayer |
| 204 |
+ --libdir=${EPREFIX}/usr/$(get_libdir) |
| 205 |
${myconf}" |
| 206 |
|
| 207 |
CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died" |
Archives