diff options
author | Chris White <chriswhite@gentoo.org> | 2004-07-23 03:53:46 +0000 |
---|---|---|
committer | Chris White <chriswhite@gentoo.org> | 2004-07-23 03:53:46 +0000 |
commit | 907ed03227a9aa28a7cf685642792c4e5c047005 (patch) | |
tree | 24d246949419794037a28a4072c34b3bc46c6bac /media-video | |
parent | Added/deleted some use.local.desc entries for mplayer. (diff) | |
download | gentoo-2-907ed03227a9aa28a7cf685642792c4e5c047005.tar.gz gentoo-2-907ed03227a9aa28a7cf685642792c4e5c047005.tar.bz2 gentoo-2-907ed03227a9aa28a7cf685642792c4e5c047005.zip |
Fixes some cleanup issues.
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/mplayer/ChangeLog | 11 | ||||
-rw-r--r-- | media-video/mplayer/Manifest | 10 | ||||
-rw-r--r-- | media-video/mplayer/files/digest-mplayer-1.0_pre4-r6 (renamed from media-video/mplayer/files/digest-mplayer-1.0_pre4-r5) | 0 | ||||
-rw-r--r-- | media-video/mplayer/files/digest-mplayer-1.0_pre5-r1 (renamed from media-video/mplayer/files/digest-mplayer-1.0_pre5) | 0 | ||||
-rw-r--r-- | media-video/mplayer/files/mplayer-mythtv.patch | 381 | ||||
-rw-r--r-- | media-video/mplayer/files/mplayer-odml.patch | 14 | ||||
-rw-r--r-- | media-video/mplayer/mplayer-1.0_pre4-r6.ebuild (renamed from media-video/mplayer/mplayer-1.0_pre4-r5.ebuild) | 170 | ||||
-rw-r--r-- | media-video/mplayer/mplayer-1.0_pre5-r1.ebuild (renamed from media-video/mplayer/mplayer-1.0_pre5.ebuild) | 151 |
8 files changed, 585 insertions, 152 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 975a83803adc..65174d946a8f 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-video/mplayer # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.167 2004/07/22 23:33:33 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.168 2004/07/23 03:53:46 chriswhite Exp $ + +*mplayer-1.0_pre5-r1 (23 Jul 2004) + + 23 Jul 2004; Chris White <chriswhite@gentoo.org> + +files/mplayer-mythtv.patch, +files/mplayer-odml.patch, + -mplayer-1.0_pre4-r5.ebuild, +mplayer-1.0_pre4-r6.ebuild, + +mplayer-1.0_pre5-r1.ebuild, -mplayer-1.0_pre5.ebuild: + Cleaned up with the help of Mr_Bones_, solar, and ferringb. Added in mythtv + patch to fix bug #23544. Stable version for Bug #55456. 23 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r5.ebuild: Helps if you commit the gui vulnerability patch when you're fixing a diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index d55550ff14be..54a933955787 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,4 +1,4 @@ -MD5 093e870970ade3303d041711ee5f5d2e ChangeLog 29624 +MD5 096206d11a6b7840a91fe7a335237e52 ChangeLog 30023 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 MD5 b813a65769af5d2a2ca1ceba1347974d mplayer-0.92-r1.ebuild 11511 MD5 7eeb1235c1263ecb110925e53de1eb06 mplayer-1.0_pre2-r1.ebuild 11375 @@ -8,9 +8,9 @@ MD5 5d11f22039a718f19a725f676e614670 mplayer-1.0_pre3-r5.ebuild 11473 MD5 1c2c6d32766ce3bf0974895533252491 mplayer-1.0_pre4-r1.ebuild 11659 MD5 fbdd96b2a3f0f78bdc8cbded3bb3927b mplayer-1.0_pre4-r2.ebuild 11948 MD5 6b9e16c4f08ac48748812909ed431f31 mplayer-1.0_pre4-r3.ebuild 13034 -MD5 dfc4c528c38ebc450226ad73f2cceb1d mplayer-1.0_pre4-r5.ebuild 12536 MD5 071a354aa3c0e9290b6dcfc8c3621d87 mplayer-1.0_pre4.ebuild 11319 -MD5 04516354f277c8fe6b7b727257aecdf0 mplayer-1.0_pre5.ebuild 12495 +MD5 a061a5d0c3937725de2dd1ab6c34e680 mplayer-1.0_pre5-r1.ebuild 12058 +MD5 bec48dac85aea4dbbbee2f1ca4cbde3b mplayer-1.0_pre4-r6.ebuild 12288 MD5 d13f33f9022f7abccfe9b14f96531057 mplayer-1.0_pre4-r4.ebuild 13157 MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107 MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396 @@ -26,6 +26,7 @@ MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r3 358 MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r4 358 MD5 3aabe241ce3c7d60ea6f607cb7ab033a files/digest-mplayer-1.0_pre5 358 MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520 +MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730 MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857 MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064 MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049 @@ -47,8 +48,11 @@ MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515 MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231 MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467 MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r5 358 +MD5 3aabe241ce3c7d60ea6f607cb7ab033a files/digest-mplayer-1.0_pre5-r1 358 MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950 MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981 MD5 084f1aa4fbe48d34c3154d5a4f238579 files/amd64_fix_the_blue_love.patch 17751 MD5 7dce8f2598e84e3d94186e2eb50f553b files/mplayer-1.0_pre4-mga-kernel2.6.patch 27826 +MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755 +MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r6 358 diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r5 b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r6 index 18d8bea4d6ed..18d8bea4d6ed 100644 --- a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r5 +++ b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r6 diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre5 b/media-video/mplayer/files/digest-mplayer-1.0_pre5-r1 index a5d89e119968..a5d89e119968 100644 --- a/media-video/mplayer/files/digest-mplayer-1.0_pre5 +++ b/media-video/mplayer/files/digest-mplayer-1.0_pre5-r1 diff --git a/media-video/mplayer/files/mplayer-mythtv.patch b/media-video/mplayer/files/mplayer-mythtv.patch new file mode 100644 index 000000000000..db3797b52bdc --- /dev/null +++ b/media-video/mplayer/files/mplayer-mythtv.patch @@ -0,0 +1,381 @@ +diff -ru MPlayer-0.90/libmpcodecs/native/nuppelvideo.c MPlayer-0.90+mdz/libmpcodecs/native/nuppelvideo.c +--- MPlayer-0.90/libmpcodecs/native/nuppelvideo.c 2002-08-28 18:45:45.000000000 -0400 ++++ MPlayer-0.90+mdz/libmpcodecs/native/nuppelvideo.c 2003-04-07 09:49:51.000000000 -0400 +@@ -33,6 +33,7 @@ + static unsigned char *previous_buffer = 0; /* to support Last-frame-copy */ + #endif + static int is_lzo_inited = 0; ++ static int is_rtjpeg_inited = 0; + + // printf("frametype: %c, comtype: %c, encoded_size: %d, width: %d, height: %d\n", + // encodedh->frametype, encodedh->comptype, encoded_size, width, height); +@@ -44,6 +45,7 @@ + /* tables are in encoded */ + if (encodedh->comptype == 'R') + { ++ is_rtjpeg_inited = 1; + RTjpeg_init_decompress ( (unsigned long *)(encoded+12), width, height ); + mp_msg(MSGT_DECVIDEO, MSGL_V, "Found RTjpeg tables (size: %d, width: %d, height: %d)\n", + encoded_size-12, width, height); +@@ -91,7 +93,10 @@ + mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n"); + break; + } +- RTjpeg_decompressYUV420 ( ( __s8 * ) buffer, decoded ); ++ if(is_rtjpeg_inited) ++ RTjpeg_decompressYUV420 ( ( __s8 * ) buffer, decoded ); ++ else /* MythTV */ ++ RTjpeg_decompressYUV420 ( ( __s8 * ) buffer + 12, decoded ); + break; + case '3': /* raw YUV420 with LZO */ + r = lzo1x_decompress ( encoded + 12, encodedh->packetlength, decoded, &out_len, NULL ); +diff -ru MPlayer-0.90/libmpdemux/demux_nuv.c MPlayer-0.90+mdz/libmpdemux/demux_nuv.c +--- MPlayer-0.90/libmpdemux/demux_nuv.c 2002-09-30 17:10:41.000000000 -0400 ++++ MPlayer-0.90+mdz/libmpdemux/demux_nuv.c 2003-04-07 09:50:30.000000000 -0400 +@@ -43,6 +43,60 @@ + nuv_position_t *current_position; + } nuv_priv_t; + ++/* stolen from libmp3lame -mdz */ ++ ++/* Used to find nearest matching bitrate ++ * we need bitrate-based values ++ * determined using tables ++ * ++ * bitrate in kbps ++ * ++ * Gabriel Bouvigne 2002-11-03 ++ */ ++int nearestBitrate(const int bitrate) ++{ ++ /* borrowed from DM abr presets*/ ++ ++ int index; // resolved range ++ ++ const int bitrate_table[] = {8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320}; ++ ++ ++ int lower_range = 0, lower_range_kbps = 0, ++ upper_range = 0, upper_range_kbps = 0; ++ ++ ++ int b; ++ ++ ++ // We assume specified bitrate will be 320kbps ++ upper_range_kbps = bitrate_table[16]; ++ upper_range = 16; ++ lower_range_kbps = bitrate_table[16]; ++ lower_range = 16; ++ ++ // Determine which significant bitrates the value specified falls between, ++ // if loop ends without breaking then we were correct above that the value was 320 ++ for (b = 0; b < 16; b++) { ++ if (bitrate < bitrate_table[b+1]) { ++ upper_range_kbps = bitrate_table[b+1]; ++ upper_range = b+1; ++ lower_range_kbps = bitrate_table[b]; ++ lower_range = (b); ++ break; // We found upper range ++ } ++ } ++ ++ // Determine which range the value specified is closer to ++ if ((upper_range_kbps - bitrate) > (bitrate - lower_range_kbps)) ++ index = lower_range; ++ else ++ index = upper_range; ++ ++ return bitrate_table[index]; ++} ++ ++#define MKTAG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24)) + + /** + * Seek to a position relative to the current position, indicated in time. +@@ -147,17 +201,25 @@ + return 0; /* EOF */ + + #if 0 +- printf("NUV frame: frametype: %c, comptype: %c, packetlength: %d\n", ++ printf("NUV frame: frametype: %c, comptype: %c, packetlength: %d, timecode: %d\n", + rtjpeg_frameheader.frametype, rtjpeg_frameheader.comptype, +- rtjpeg_frameheader.packetlength); ++ rtjpeg_frameheader.packetlength, rtjpeg_frameheader.timecode); + #endif + +- /* Skip Seekpoint, Text and Sync for now */ ++ /* Skip Seekpoint, Extended header and Sync for now */ + if ((rtjpeg_frameheader.frametype == 'R') || +- (rtjpeg_frameheader.frametype == 'T') || +- (rtjpeg_frameheader.frametype == 'S')) ++ (rtjpeg_frameheader.frametype == 'X') || ++ (rtjpeg_frameheader.frametype == 'S')) + return 1; +- ++ ++ /* Skip seektable and text (these have a payload) */ ++ if (rtjpeg_frameheader.frametype == 'Q' || ++ rtjpeg_frameheader.frametype == 'T') { ++ stream_skip(demuxer->stream, rtjpeg_frameheader.packetlength); ++ return 1; ++ } ++ ++ + if (((rtjpeg_frameheader.frametype == 'D') && + (rtjpeg_frameheader.comptype == 'R')) || + (rtjpeg_frameheader.frametype == 'V')) +@@ -175,13 +237,13 @@ + /* put RTjpeg tables, Video info to video buffer */ + stream_seek ( demuxer->stream, orig_pos ); + ds_read_packet ( demuxer->video, demuxer->stream, rtjpeg_frameheader.packetlength + 12, +- rtjpeg_frameheader.timecode*0.001, orig_pos, 0 ); ++ rtjpeg_frameheader.timecode*0.001, orig_pos, 0 ); + + + } else + /* copy PCM only */ + if (demuxer->audio && (rtjpeg_frameheader.frametype == 'A') && +- (rtjpeg_frameheader.comptype == '0')) ++ 1 /*(rtjpeg_frameheader.comptype == '0')*/) + { + priv->current_audio_frame++; + if (want_audio) { +@@ -192,15 +254,110 @@ + orig_pos + 12, 0 ); + } else { + /* skip audio block */ +- stream_seek ( demuxer->stream, +- stream_tell ( demuxer->stream ) +- + rtjpeg_frameheader.packetlength ); ++ stream_skip ( demuxer->stream, ++ rtjpeg_frameheader.packetlength ); + } + } + + return 1; + } + ++/* Scan for the extended data in MythTV nuv streams */ ++int demux_xscan_nuv ( demuxer_t* demuxer, int width, int height ) ++{ ++ int i; ++ struct rtframeheader rtjpeg_frameheader; ++ struct extendeddata ext; ++ sh_video_t* sh_video = demuxer->video->sh; ++ sh_audio_t* sh_audio = demuxer->audio->sh; ++ ++ for( i = 0 ; i < 2 ; ++i ) { ++ if (stream_read ( demuxer->stream, (char*)& rtjpeg_frameheader, sizeof ( rtjpeg_frameheader ) ) < sizeof(rtjpeg_frameheader)) ++ return 0; /* EOF */ ++ ++ if (rtjpeg_frameheader.frametype != 'X') ++ stream_skip( demuxer->stream, rtjpeg_frameheader.packetlength ); ++ } ++ ++ if ( rtjpeg_frameheader.frametype != 'X' ) { ++ stream_reset( demuxer->stream ); ++ return 0; /* No X frame in the expected place */ ++ } ++ ++ if ( rtjpeg_frameheader.packetlength != sizeof(ext) ) { ++ printf("NUV extended frame does not have expected length, ignoring\n"); ++ stream_reset( demuxer->stream ); ++ return 0; ++ } ++ ++ if (stream_read( demuxer->stream, (char*)& ext, sizeof(ext)) < sizeof(ext)) { ++ stream_reset( demuxer->stream ); ++ return 0; /* EOF */ ++ } ++ ++ if ( ext.version != 1 ) { ++ printf("NUV extended frame has unknown version number (%d), ignoring\n", ++ ext.version); ++ stream_reset( demuxer->stream ); ++ return 0; ++ } ++ ++ printf("Detected MythTV stream, reading extended format information\n"); ++ ++ /* Video parameters */ ++ printf("FOURCC: %c%c%c%c\n", ++ (ext.video_fourcc >> 24) & 0xff, ++ (ext.video_fourcc >> 16) & 0xff, ++ (ext.video_fourcc >> 8) & 0xff, ++ (ext.video_fourcc) & 0xff); ++ if ( ext.video_fourcc == mmioFOURCC('R', 'J', 'P', 'G') ) { ++ long buf[128]; ++ ++ /* Ignore the fact that this is initialising the compression ++ Doing this will set the quality factor correctly */ ++ RTjpeg_init_compress(buf,width,height,ext.rtjpeg_quality); ++ RTjpeg_init_decompress(buf,width,height); ++ ++ sh_video->format = mmioFOURCC('N', 'U', 'V', '1'); ++ } else { ++ sh_video->format = ext.video_fourcc; ++ sh_video->i_bps = ext.lavc_bitrate; ++ } ++ ++ /* Audio parameters */ ++ if ( ext.audio_fourcc == mmioFOURCC('L', 'A', 'M', 'E') ) { ++ sh_audio->format = 0x55; ++ } else if ( ext.audio_fourcc == mmioFOURCC('R', 'A', 'W', 'A') ) { ++ sh_audio->format = 0x1; ++ } else { ++ printf("Warning! unknown audio format %d\n", ext.audio_fourcc); ++ } ++ ++ sh_audio->samplerate = ext.audio_sample_rate; ++ sh_audio->channels = ext.audio_channels; ++ ++ /* this is a little silly so that we can use libmp3lame's ++ nearestBitrate verbatim */ ++ if (sh_audio->format != 0x1) ++ sh_audio->i_bps = nearestBitrate(ext.audio_channels ++ * ext.audio_bits_per_sample ++ * ext.audio_sample_rate / ++ ext.audio_compression_ratio / 1000) * 1000; ++ ++ sh_audio->wf->wBitsPerSample = ext.audio_bits_per_sample; ++ sh_audio->wf->nAvgBytesPerSec = sh_audio->i_bps / 8; ++ sh_audio->wf->nBlockAlign = sh_audio->channels * 2; ++ sh_audio->wf->cbSize = 0; ++ sh_audio->wf->nSamplesPerSec = ext.audio_sample_rate; ++ sh_audio->wf->wFormatTag = sh_audio->format; ++ sh_audio->wf->nChannels = ext.audio_channels; ++ ++ printf("channels=%d bitspersample=%d samplerate=%d audio_compression_ratio=%d\n", ext.audio_channels, ext.audio_bits_per_sample, ext.audio_sample_rate, ext.audio_compression_ratio); ++ ++ stream_reset( demuxer->stream ); ++ ++ return 1; ++} + + demuxer_t* demux_open_nuv ( demuxer_t* demuxer ) + { +@@ -240,8 +397,6 @@ + */ + sh_video->ds = demuxer->video; + +- /* Custom fourcc for internal MPlayer use */ +- sh_video->format = mmioFOURCC('N', 'U', 'V', '1'); + + sh_video->disp_w = rtjpeg_fileheader.width; + sh_video->disp_h = rtjpeg_fileheader.height; +@@ -258,26 +413,44 @@ + sh_video->fps = rtjpeg_fileheader.fps; + sh_video->frametime = 1 / sh_video->fps; + +- if (rtjpeg_fileheader.audioblocks != 0) +- { +- sh_audio = new_sh_audio(demuxer, 0); +- demuxer->audio->sh = sh_audio; +- sh_audio->ds = demuxer->audio; +- sh_audio->format = 0x1; +- sh_audio->channels = 2; +- sh_audio->samplerate = 44100; +- +- sh_audio->wf = malloc(sizeof(WAVEFORMATEX)); +- memset(sh_audio->wf, 0, sizeof(WAVEFORMATEX)); +- sh_audio->wf->wFormatTag = sh_audio->format; +- sh_audio->wf->nChannels = sh_audio->channels; +- sh_audio->wf->wBitsPerSample = 16; +- sh_audio->wf->nSamplesPerSec = sh_audio->samplerate; +- sh_audio->wf->nAvgBytesPerSec = sh_audio->wf->nChannels* +- sh_audio->wf->wBitsPerSample*sh_audio->wf->nSamplesPerSec/8; +- sh_audio->wf->nBlockAlign = sh_audio->channels * 2; +- sh_audio->wf->cbSize = 0; +- } ++ if (rtjpeg_fileheader.audioblocks != 0) ++ { ++ sh_audio = new_sh_audio(demuxer, 0); ++ demuxer->audio->sh = sh_audio; ++ sh_audio->ds = demuxer->audio; ++ sh_audio->wf = malloc(sizeof(WAVEFORMATEX)); ++ memset(sh_audio->wf, 0, sizeof(WAVEFORMATEX)); ++ } ++ ++ /* Check for extended data (X frame) and read settings from it */ ++ if (! demux_xscan_nuv( demuxer, ++ rtjpeg_fileheader.width, ++ rtjpeg_fileheader.height) ) { ++ /* Otherwise assume defaults */ ++ printf("No NUV extended frame, using defaults\n"); ++ ++ /* Custom fourcc for internal MPlayer use */ ++ sh_video->format = mmioFOURCC('N', 'U', 'V', '1'); ++ ++ if (rtjpeg_fileheader.audioblocks != 0) ++ { ++ sh_audio->format = 0x1; ++ sh_audio->channels = 2; ++ sh_audio->samplerate = 44100; ++ sh_audio->wf->wBitsPerSample = 16; ++ } ++ ++ if (rtjpeg_fileheader.audioblocks != 0) ++ { ++ sh_audio->wf->wFormatTag = sh_audio->format; ++ sh_audio->wf->nChannels = sh_audio->channels; ++ sh_audio->wf->nSamplesPerSec = sh_audio->samplerate; ++ sh_audio->wf->nAvgBytesPerSec = sh_audio->wf->nChannels* ++ sh_audio->wf->wBitsPerSample*sh_audio->wf->nSamplesPerSec/8; ++ sh_audio->wf->nBlockAlign = sh_audio->channels * 2; ++ sh_audio->wf->cbSize = 0; ++ } ++ } + + priv->index_list = (nuv_position_t*) malloc(sizeof(nuv_position_t)); + priv->index_list->frame = 0; +@@ -300,9 +473,12 @@ + + stream_read(demuxer->stream,(char*)&ns,sizeof(ns)); + +- if ( strncmp ( ns.finfo, "NuppelVideo", 12 ) ) ++ if ( strncmp ( ns.finfo, "NuppelVideo", 12 ) && ++ strncmp ( ns.finfo, "MythTVVideo", 12 ) ) + return 0; /* Not a NuppelVideo file */ +- if ( strncmp ( ns.version, "0.05", 5 ) ) ++ if ( strncmp ( ns.version, "0.05", 5 ) && ++ strncmp ( ns.version, "0.06", 5 ) && ++ strncmp ( ns.version, "0.07", 5 ) ) + return 0; /* Wrong version NuppelVideo file */ + + /* Return to original position */ +Only in MPlayer-0.90+mdz/libmpdemux: demux_nuv.c~ +diff -ru MPlayer-0.90/libmpdemux/nuppelvideo.h MPlayer-0.90+mdz/libmpdemux/nuppelvideo.h +--- MPlayer-0.90/libmpdemux/nuppelvideo.h 2001-12-27 17:20:15.000000000 -0500 ++++ MPlayer-0.90+mdz/libmpdemux/nuppelvideo.h 2003-04-07 09:49:51.000000000 -0400 +@@ -90,3 +90,30 @@ + unsigned char *buffer_offset; + } audbuffertyp; + ++/* for MythTV */ ++typedef struct extendeddata ++{ ++ int version; // yes, this is repeated from the file header ++ int video_fourcc; // video encoding method used ++ int audio_fourcc; // audio encoding method used ++ // generic data ++ int audio_sample_rate; ++ int audio_bits_per_sample; ++ int audio_channels; ++ // codec specific ++ // mp3lame ++ int audio_compression_ratio; ++ int audio_quality; ++ // rtjpeg ++ int rtjpeg_quality; ++ int rtjpeg_luma_filter; ++ int rtjpeg_chroma_filter; ++ // libavcodec ++ int lavc_bitrate; ++ int lavc_qmin; ++ int lavc_qmax; ++ int lavc_maxqdiff; ++ // unused for later -- total size of 128 integers. ++ // new fields must be added at the end, above this comment. ++ int expansion[113]; ++} extendeddata; diff --git a/media-video/mplayer/files/mplayer-odml.patch b/media-video/mplayer/files/mplayer-odml.patch new file mode 100644 index 000000000000..9d6a05e751fc --- /dev/null +++ b/media-video/mplayer/files/mplayer-odml.patch @@ -0,0 +1,14 @@ +diff -urN MPlayer-1.0pre4-orig/libmpdemux/aviheader.c MPlayer-1.0pre4/libmpdemux/aviheader.c +--- MPlayer-1.0pre4-orig/libmpdemux/aviheader.c 2004-04-27 18:08:46.000000000 -0500 ++++ MPlayer-1.0pre4/libmpdemux/aviheader.c 2004-07-22 20:58:18.451988624 -0500 +@@ -225,9 +225,7 @@ + DWORD i; + unsigned msize = 0; + avisuperindex_chunk *s; +- // FIXME: do not use odml index for files that don't need it. +- // apparently the odml code is buggy! +- if (demuxer->movi_end < 0x7fffffff) break; ++/* if (demuxer->movi_end < 0x7fffffff) break;*/ + priv->suidx_size++; + priv->suidx = realloc(priv->suidx, priv->suidx_size * sizeof (avisuperindex_chunk)); + s = &priv->suidx[priv->suidx_size-1]; diff --git a/media-video/mplayer/mplayer-1.0_pre4-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild index 59dbd6a9078b..e93717a17296 100644 --- a/media-video/mplayer/mplayer-1.0_pre4-r5.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r5.ebuild,v 1.6 2004/07/22 23:33:33 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild,v 1.1 2004/07/23 03:53:46 chriswhite Exp $ inherit eutils flag-o-matic kmod -IUSE="3dfx 3dnow aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd dvdread edl encode esd fbdev gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad matroska matrox mmx nas network nls oggvorbis opengl oss png rtc samba sdl sse svga tga theora truetype v4l v4l2 xinerama xmms xvid" +IUSE="3dfx 3dnow aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd edl encode esd fbdev gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad matroska matrox mmx mpeg mythtv nas network nls oggvorbis opengl oss rtc samba sdl sse svga tga theora truetype v4l v4l2 xinerama X xmms xvid" BLUV=1.4 SVGV=1.9.17 @@ -12,7 +12,7 @@ SVGV=1.9.17 # Handle PREversions as well MY_PV="${PV/_/}" S="${WORKDIR}/MPlayer-${MY_PV}" -SRC_URI="http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2 +SRC_URI="mirror://mplayer/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 ) @@ -49,7 +49,7 @@ RDEPEND="xvid? ( jpeg? ( media-libs/jpeg ) libcaca? ( media-libs/libcaca ) lirc? ( app-misc/lirc ) - live? ( >=media-plugins/live-2004.01.05 ) + live? ( >=media-plugins/live-2004.03.27 ) lzo? ( dev-libs/lzo ) mad? ( media-libs/libmad ) matroska? ( >=media-libs/libmatroska-0.6.0 ) @@ -101,18 +101,31 @@ src_unpack() { cd ${S} + # fixes bug #55456 for amd64 and fullscreen Bug #43010 + epatch ${FILESDIR}/gui_vuln_code.patch + + # fixes missing str* linking bugs + cp ${FILESDIR}/strl.c ${S}/osdep + epatch ${FILESDIR}/str_undefined.patch + # Fix head/tail call for new coreutils epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch #bug #49669, horrid syntax errors in help/help_mp-ro.h epatch ${FILESDIR}/mplayer-1.0_pre4-help_mp-ro.h.patch + #fixes bug #53634 + epatch ${FILESDIR}/real_demux.patch + + #Fixes an upstream bug with odml code + epatch ${FILESDIR}/mplayer-odml.patch + + #adds mythtv support to mplayer + use mythtv && epatch ${FILESDIR}/mplayer-mythtv.patch + # GCC 3.4 fixes epatch ${FILESDIR}/mplayer-1.0_pre4-alsa-gcc34.patch - # fixes gui vulnerabilities mentioned in bug #55456 - epatch ${FILESDIR}/gui_vuln_code.patch - #Setup the matrox makefile if use matrox; then get_kernel_info @@ -140,81 +153,85 @@ src_unpack() { src_compile() { + filter-flags -fPIE local myconf= ################ #Optional features# ############### - use bidi && myconf="${myconf} $(use_enable bidi fribidi)" - use cdparanoia && myconf="${myconf} $(use_enable cdparanoia)" - use dvd && myconf="${myconf} $(use_enable dvd mpdvdkit)" - use dvdread &&myconf="${myconf} --disable-mpdvdkit $(use_enable dvdread)" - use edl && myconf="${myconf} $(use_enable edl)" - use encode && myconf="${myconf} $(use_enable encode mencoder)" - use gtk && myconf="${myconf} $(use_enable gtk gui) $(use_enable gtk x11) $(use_enable gtk xv)" - use ipv6 && myconf="${myconf} $(use_enable ipv6 inet6)" - use joystick && myconf="${myconf} $(use_enable joystick)" - use lirc && myconf="${myconf} $(use_enable lirc)" - use live && myconf="${myconf} $(use_enable live)" - use network && myconf="${myconf} $(use_enable network)" - use rtc && myconf="${myconf} $(use_enable rtc)" - use samba && myconf="${myconf} $(use_enable samba smb)" - use truetype && myconf="${myconf} $(use_enable truetype freetype)" - use v4l && myconf="${myconf} $(use_enable v4l tv-v4l)" - use v4l2 && myconf="${myconf} $(use_enable v4l tv-v4l2)" + myconf="${myconf} $(use_enable bidi fribidi)" + myconf="${myconf} $(use_enable cdparanoia)" + myconf="${myconf} $(use_enable dvd mpdvdkit)" + myconf="${myconf} $(use_enable edl)" + myconf="${myconf} $(use_enable encode mencoder)" + myconf="${myconf} $(use_enable gtk gui) $(use_enable gtk x11) $(use_enable gtk xv) $(use_enable gtk vm)" + myconf="${myconf} $(use_enable ipv6 inet6)" + myconf="${myconf} $(use_enable joystick)" + myconf="${myconf} $(use_enable lirc)" + myconf="${myconf} $(use_enable live)" + myconf="${myconf} $(use_enable network) $(use_enable network ftp)" + myconf="${myconf} $(use_enable rtc)" + myconf="${myconf} $(use_enable samba smb)" + myconf="${myconf} $(use_enable truetype freetype)" + myconf="${myconf} $(use_enable v4l tv-v4l)" + myconf="${myconf} $(use_enable v4l tv-v4l2)" ######### # Codecs # ######## - use divx4linux && myconf="${myconf} $(use_enable divx4linux)" - use gif && myconf="${myconf} $(use_enable gif)" - use jpeg && myconf="${myconf} $(use_enable jpeg)" - use lzo && myconf="${myconf} $(use_enable lzo liblzo)" - use matroska && myconf="${myconf} --disable-internal-matroska" - use mad && myconf="${myconf} --disable-internal-faad" - use oggvorbis && myconf="${myconf} $(use_enable oggvorbis vorbis)" - use png && myconf="${myconf} $(use_enable png)" - use theora && myconf="${myconf} $(use_enable theora)" - use xmms && myconf="${myconf} $(use_enable xmms)" - use xvid && mconf="${myconf} $(use_enable xvid)" + myconf="${myconf} $(use_enable divx4linux)" + myconf="${myconf} $(use_enable gif)" + myconf="${myconf} $(use_enable jpeg)" + myconf="${myconf} $(use_enable lzo liblzo)" + myconf="${myconf} $(use_enable matroska external-matroska) $(use_enable !matroska internal-matroska)" + myconf="${myconf} $(use_enable mpeg external-faad) $(use_enable !mpeg internal-faad)" + myconf="${myconf} $(use_enable oggvorbis vorbis)" + myconf="${myconf} $(use_enable theora)" + myconf="${myconf} $(use_enable xmms)" + myconf="${myconf} $(use_enable xvid)" ############# # Video Output # ############# - use 3dfx && myconf="${myconf} $(use_enable 3dfx)" - ( use xvid && use 3dfx ) \ - && myconf="${myconf} --enable-tdfxvid" \ - || myconf="${myconf} --disable-tdfxvid" - use aalib && myconf="${myconf} $(use_enable aalib aa)" - use directfb && myconf="${myconf} $(use_enable directfb)" - use dvb && myconf="${myconf} $(use_enable dvb)" - use fbdev && myconf="${myconf} $(use_enable fbdev)" - use ggi && myconf="${myconf} $(use_enable ggi)" - use libcaca && myconf="${myconf} $(use_enable libcaca caca)" - ( use matrox && use gtk ) && myconf="${myconf} $(use_enable matrox xmga)" - use opengl && myconf="${myconf} $(use_enable opengl gl)" - use sdl && myconf="${myconf} $(use_enable sdl)" - use tga && myconf="${myconf} $(use_enable tga)" - use vesa && myconf="${myconf} $(use_enable vesa)" - use xinerama && myconf="${myconf} $(use_enable xinerama)" + myconf="${myconf} $(use_enable 3dfx)" + if use xvid && use 3dfx; then + myconf="${myconf} --enable-tdfxvid" + else + myconf="${myconf} --disable-tdfxvid" + fi + myconf="${myconf} $(use_enable aalib aa)" + myconf="${myconf} $(use_enable directfb)" + myconf="${myconf} $(use_enable dvb)" + myconf="${myconf} $(use_enable fbdev)" + myconf="${myconf} $(use_enable ggi)" + myconf="${myconf} $(use_enable libcaca caca)" + if use matrox && use X; then + myconf="${myconf} $(use_enable matrox xmga)" + fi + myconf="${myconf} $(use_enable opengl gl)" + myconf="${myconf} $(use_enable sdl)" + myconf="${myconf} $(use_enable svga)" + myconf="${myconf} $(use_enable tga)" + myconf="${myconf} $(use_enable xinerama)" ############# # Audio Output # ############# - use alsa && myconf="${myconf} $(use_enable alsa)" - use arts && myconf="${myconf} $(use_enable arts)" - use esd && myconf="${myconf} $(use_enable esd)" - use nas && myconf="${myconf} $(use_enable nas)" - use oss && myconf="${myconf} $(use_enable oss ossaudio)" + myconf="${myconf} $(use_enable alsa)" + myconf="${myconf} $(use_enable arts)" + myconf="${myconf} $(use_enable esd)" + myconf="${myconf} $(use_enable mad)" + myconf="${myconf} $(use_enable nas)" + myconf="${myconf} $(use_enable oss ossaudio)" ################# # Advanced Options # ################# - use 3dnow && myconf="${myconf} $(use_enable 3dnow) $(use_enable 3dnow 3dnowex)" - use altivec && myconf="${myconf} $(use_enable altivec)" - use debug && myconf="${myconf} $(use_enable debug)" - use mmx && myconf="${myconf} $(use_enable mmx) $(use_enable mmx mmx2)" - use nls && myconf="${myconf} $(use_enable nls i18n)" - use sse && myconf="${myconf} $(use_enable sse) $(use_enable sse sse2)" + myconf="${myconf} $(use_enable 3dnow) $(use_enable 3dnow 3dnowex)" + myconf="${myconf} $(use_enable altivec)" + myconf="${myconf} $(use_enable debug)" + myconf="${myconf} $(use_enable mmx) $(use_enable mmx mmx2)" + myconf="${myconf} $(use_enable nls i18n)" + myconf="${myconf} $(use_enable sse) $(use_enable sse sse2)" if [ -d /opt/RealPlayer9/Real/Codecs ] then @@ -236,16 +253,18 @@ src_compile() { # Build the matrox driver before mplayer configuration. # That way the configure script sees it and builds the support #build the matrox driver before the - if use matrox && use x86 ; then - check_KV - cd ${S}/drivers - # bad hack, will be fixed later - addwrite /usr/src/linux/ - unset ARCH - make all || die "Matrox build failed! Your kernel may need to have `make mrproper` run on it before trying to use matrox support in this ebuild again." - cd ${S} - else - einfo "Not building matrox driver. It doesn't seem to like other archs. Please let me know if you find out otherwise." + if use matrox ; then + if use x86 ; then + check_KV + cd ${S}/drivers + # bad hack, will be fixed later + addwrite /usr/src/linux/ + unset ARCH + make all || die "Matrox build failed! Your kernel may need to have `make mrproper` run on it before trying to use matrox support in this ebuild again." + cd ${S} + else + einfo "Not building matrox driver. It doesn't seem to like other archs. Please let me know at chriswhite@gentoo.org if you find out otherwise." + fi fi unset CFLAGS CXXFLAGS @@ -299,14 +318,11 @@ src_install() { dodoc AUTHORS ChangeLog README # Install the documentation; DOCS is all mixed up not just html - find ${S}/DOCS -type d | xargs -- chmod 0755 - cp -r ${S}/DOCS ${D}/usr/share/doc/${PF}/ || die + docinto /usr/share/doc/${PF} ; dodoc -r ${S}/DOCS # Copy misc tools to documentation path, as they're not installed # directly - find ${S}/TOOLS -type d | xargs -- chmod 0755 - cp -r ${S}/TOOLS ${D}/usr/share/doc/${PF} || die - + docinto /usr/share/doc/${PF} ; dodoc -r ${S}/TOOLS # Install the default Skin and Gnome menu entry if use gtk then diff --git a/media-video/mplayer/mplayer-1.0_pre5.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild index 1149f5271746..e8dd1525194d 100644 --- a/media-video/mplayer/mplayer-1.0_pre5.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5.ebuild,v 1.11 2004/07/22 19:56:54 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild,v 1.1 2004/07/23 03:53:46 chriswhite Exp $ inherit eutils flag-o-matic kmod -IUSE="3dfx 3dnow aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd dvdread edl encode esd fbdev gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad matroska matrox mmx nas network nls oggvorbis opengl oss png rtc samba sdl sse svga tga theora truetype v4l v4l2 xinerama xmms xvid" +IUSE="3dfx 3dnow aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd dvdread edl encode esd fbdev gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mythtv nas network nls oggvorbis opengl oss rtc samba sdl sse svga tga theora truetype v4l v4l2 X xinerama xmms xvid" BLUV=1.4 SVGV=1.9.17 @@ -12,7 +12,7 @@ SVGV=1.9.17 # Handle PREversions as well MY_PV="${PV/_/}" S="${WORKDIR}/MPlayer-${MY_PV}" -SRC_URI="http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2 +SRC_URI="mirror://mplayer/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 ) @@ -107,6 +107,9 @@ src_unpack() { #bug #49669, horrid syntax errors in help/help_mp-ro.h epatch ${FILESDIR}/mplayer-1.0_pre4-help_mp-ro.h.patch + #adds mythtv support to mplayer + use mythtv && epatch ${FILESDIR}/mplayer-mythtv.patch + # GCC 3.4 fixes epatch ${FILESDIR}/mplayer-1.0_pre4-alsa-gcc34.patch @@ -140,80 +143,86 @@ src_unpack() { src_compile() { + filter-flags -fPIE + local myconf= ################ #Optional features# ############### - use bidi && myconf="${myconf} $(use_enable bidi fribidi)" - use cdparanoia && myconf="${myconf} $(use_enable cdparanoia)" - use dvd && myconf="${myconf} $(use_enable dvd mpdvdkit)" - use dvdread &&myconf="${myconf} --disable-mpdvdkit $(use_enable dvdread)" - use edl && myconf="${myconf} $(use_enable edl)" - use encode && myconf="${myconf} $(use_enable encode mencoder)" - use gtk && myconf="${myconf} $(use_enable gtk gui) $(use_enable gtk x11) $(use_enable gtk xv)" - use ipv6 && myconf="${myconf} $(use_enable ipv6 inet6)" - use joystick && myconf="${myconf} $(use_enable joystick)" - use lirc && myconf="${myconf} $(use_enable lirc)" - use live && myconf="${myconf} $(use_enable live)" - use network && myconf="${myconf} $(use_enable network)" - use rtc && myconf="${myconf} $(use_enable rtc)" - use samba && myconf="${myconf} $(use_enable samba smb)" - use truetype && myconf="${myconf} $(use_enable truetype freetype)" - use v4l && myconf="${myconf} $(use_enable v4l tv-v4l)" - use v4l2 && myconf="${myconf} $(use_enable v4l tv-v4l2)" + myconf="${myconf} $(use_enable bidi fribidi)" + myconf="${myconf} $(use_enable cdparanoia)" + myconf="${myconf} $(use_enable dvd mpdvdkit)" + myconf="${myconf} $(use_enable edl)" + myconf="${myconf} $(use_enable encode mencoder)" + myconf="${myconf} $(use_enable gtk gui) $(use_enable gtk x11) $(use_enable gtk xv) $(use_enable gtk vm)" + myconf="${myconf} $(use_enable ipv6 inet6)" + myconf="${myconf} $(use_enable joystick)" + myconf="${myconf} $(use_enable lirc)" + myconf="${myconf} $(use_enable live)" + myconf="${myconf} $(use_enable network) $(use_enable network ftp)" + myconf="${myconf} $(use_enable rtc)" + myconf="${myconf} $(use_enable samba smb)" + myconf="${myconf} $(use_enable truetype freetype)" + myconf="${myconf} $(use_enable v4l tv-v4l)" + myconf="${myconf} $(use_enable v4l tv-v4l2)" ######### # Codecs # ######## - use divx4linux && myconf="${myconf} $(use_enable divx4linux)" - use gif && myconf="${myconf} $(use_enable gif)" - use jpeg && myconf="${myconf} $(use_enable jpeg)" - use lzo && myconf="${myconf} $(use_enable lzo liblzo)" - use matroska && myconf="${myconf} --disable-internal-matroska" - use mad && myconf="${myconf} --disable-internal-faad" - use oggvorbis && myconf="${myconf} $(use_enable oggvorbis vorbis)" - use png && myconf="${myconf} $(use_enable png)" - use theora && myconf="${myconf} $(use_enable theora)" - use xmms && myconf="${myconf} $(use_enable xmms)" - use xvid && mconf="${myconf} $(use_enable xvid)" + myconf="${myconf} $(use_enable divx4linux)" + myconf="${myconf} $(use_enable gif)" + myconf="${myconf} $(use_enable jpeg)" + myconf="${myconf} $(use_enable lzo liblzo)" + myconf="${myconf} $(use_enable matroska external-matroska) $(use_enable !matroska internal-matroska)" + myconf="${myconf} $(use_enable mpeg external-faad) $(use_enable !mpeg internal-faad)" + myconf="${myconf} $(use_enable oggvorbis vorbis)" + myconf="${myconf} $(use_enable theora)" + myconf="${myconf} $(use_enable xmms)" + myconf="${myconf} $(use_enable xvid)" ############# # Video Output # ############# - use 3dfx && myconf="${myconf} $(use_enable 3dfx)" - ( use xvid && use 3dfx ) \ - && myconf="${myconf} --enable-tdfxvid" \ - || myconf="${myconf} --disable-tdfxvid" - use aalib && myconf="${myconf} $(use_enable aalib aa)" - use directfb && myconf="${myconf} $(use_enable directfb)" - use dvb && myconf="${myconf} $(use_enable dvb)" - use fbdev && myconf="${myconf} $(use_enable fbdev)" - use ggi && myconf="${myconf} $(use_enable ggi)" - use libcaca && myconf="${myconf} $(use_enable libcaca caca)" - ( use matrox && use gtk ) && myconf="${myconf} $(use_enable matrox xmga)" - use opengl && myconf="${myconf} $(use_enable opengl gl)" - use sdl && myconf="${myconf} $(use_enable sdl)" - use tga && myconf="${myconf} $(use_enable tga)" - use xinerama && myconf="${myconf} $(use_enable xinerama)" + myconf="${myconf} $(use_enable 3dfx)" + if use xvid && use 3dfx; then + myconf="${myconf} --enable-tdfxvid" + else + myconf="${myconf} --disable-tdfxvid" + fi + myconf="${myconf} $(use_enable aalib aa)" + myconf="${myconf} $(use_enable directfb)" + myconf="${myconf} $(use_enable dvb)" + myconf="${myconf} $(use_enable fbdev)" + myconf="${myconf} $(use_enable ggi)" + myconf="${myconf} $(use_enable libcaca caca)" + if use matrox && use X; then + myconf="${myconf} $(use_enable matrox xmga)" + fi + myconf="${myconf} $(use_enable opengl gl)" + myconf="${myconf} $(use_enable sdl)" + myconf="${myconf} $(use_enable svga)" + myconf="${myconf} $(use_enable tga)" + myconf="${myconf} $(use_enable xinerama)" ############# # Audio Output # ############# - use alsa && myconf="${myconf} $(use_enable alsa)" - use arts && myconf="${myconf} $(use_enable arts)" - use esd && myconf="${myconf} $(use_enable esd)" - use nas && myconf="${myconf} $(use_enable nas)" - use oss && myconf="${myconf} $(use_enable oss ossaudio)" + myconf="${myconf} $(use_enable alsa)" + myconf="${myconf} $(use_enable arts)" + myconf="${myconf} $(use_enable esd)" + myconf="${myconf} $(use_enable mad)" + myconf="${myconf} $(use_enable nas)" + myconf="${myconf} $(use_enable oss ossaudio)" ################# # Advanced Options # ################# - use 3dnow && myconf="${myconf} $(use_enable 3dnow) $(use_enable 3dnow 3dnowex)" - use altivec && myconf="${myconf} $(use_enable altivec)" - use debug && myconf="${myconf} $(use_enable debug)" - use mmx && myconf="${myconf} $(use_enable mmx) $(use_enable mmx mmx2)" - use nls && myconf="${myconf} $(use_enable nls i18n)" - use sse && myconf="${myconf} $(use_enable sse) $(use_enable sse sse2)" + myconf="${myconf} $(use_enable 3dnow) $(use_enable 3dnow 3dnowex)" + myconf="${myconf} $(use_enable altivec)" + myconf="${myconf} $(use_enable debug)" + myconf="${myconf} $(use_enable mmx) $(use_enable mmx mmx2)" + myconf="${myconf} $(use_enable nls i18n)" + myconf="${myconf} $(use_enable sse) $(use_enable sse sse2)" if [ -d /opt/RealPlayer9/Real/Codecs ] then @@ -235,16 +244,18 @@ src_compile() { # Build the matrox driver before mplayer configuration. # That way the configure script sees it and builds the support #build the matrox driver before the - if use matrox && use x86 ; then - check_KV - cd ${S}/drivers - # bad hack, will be fixed later - addwrite /usr/src/linux/ - unset ARCH - make all || die "Matrox build failed! Your kernel may need to have `make mrproper` run on it before trying to use matrox support in this ebuild again." - cd ${S} - else - einfo "Not building matrox driver. It doesn't seem to like other archs. Please let me know if you find out otherwise." + if use matrox ; then + if use x86 ; then + check_KV + cd ${S}/drivers + # bad hack, will be fixed later + addwrite /usr/src/linux/ + unset ARCH + make all || die "Matrox build failed! Your kernel may need to have `make mrproper` run on it before trying to use matrox support in this ebuild again." + cd ${S} + else + einfo "Not building matrox driver. It doesn't seem to like other archs. Please let me know at chriswhite@gentoo.org if you find out otherwise." + fi fi unset CFLAGS CXXFLAGS ./configure --prefix=/usr \ @@ -297,13 +308,11 @@ src_install() { dodoc AUTHORS ChangeLog README # Install the documentation; DOCS is all mixed up not just html - find ${S}/DOCS -type d | xargs -- chmod 0755 - cp -r ${S}/DOCS ${D}/usr/share/doc/${PF}/ || die + docinto /usr/share/doc/${PF} ; dodoc -r ${S}/DOCS # Copy misc tools to documentation path, as they're not installed # directly - find ${S}/TOOLS -type d | xargs -- chmod 0755 - cp -r ${S}/TOOLS ${D}/usr/share/doc/${PF} || die + docinto /usr/share/doc/${PF} ; dodoc -r ${S}/TOOLS # Install the default Skin and Gnome menu entry if use gtk |