Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 252418 - media-video/mplayer: patch cleanup
Summary: media-video/mplayer: patch cleanup
Status: RESOLVED FIXED
Alias: None
Product: Gentoo/Alt
Classification: Unclassified
Component: Prefix Support (show other bugs)
Hardware: All All
: High QA (vote)
Assignee: Gentoo Prefix
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-12-24 19:58 UTC by Elias Pipping
Modified: 2008-12-25 20:25 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
mplayer-1.0_rc2_p28058-warnings.patch (mplayer-1.0_rc2_p28058-warnings.patch,470 bytes, patch)
2008-12-24 20:18 UTC, Elias Pipping
Details | Diff
mplayer-1.0_rc2_p28058-nocona.patch (mplayer-1.0_rc2_p28058-nocona.patch,603 bytes, patch)
2008-12-24 21:06 UTC, Elias Pipping
Details | Diff
new patch (mplayer-1.0_rc2_p28058-nocona.patch,770 bytes, patch)
2008-12-25 19:51 UTC, Elias Pipping
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Elias Pipping 2008-12-24 19:58:29 UTC
Here's a list of patches that are currently in mplayer's files dir:

pipping@quicksand ~/gentoo/usr/portage/media-video/mplayer $ l files/
total 96
-rw------- 1 pipping staff  692 2008-10-03 21:05 configure-altivec.patch
-rw------- 1 pipping staff  432 2008-10-03 21:05 configure-unsetauto-v2.patch
-rw------- 1 pipping staff  706 2008-10-03 21:05 libswscale-sparc.patch
-rw------- 1 pipping staff  527 2008-10-03 21:05 mplayer-1.0-darwin.patch
-rw------- 1 pipping staff  494 2008-10-03 21:05 mplayer-1.0-include-stdlib.patch
-rw------- 1 pipping staff  331 2008-10-03 21:05 mplayer-1.0-macosx-include-sysctl.patch
-rw------- 1 pipping staff  200 2008-10-03 21:05 mplayer-1.0-macosx-include-time.patch
-rw------- 1 pipping staff  275 2008-10-03 21:05 mplayer-1.0-macosx-include-user_ldt.patch
-rw------- 1 pipping staff  421 2008-10-03 21:05 mplayer-1.0-nocona.patch
-rw------- 1 pipping staff 1019 2008-10-03 21:05 mplayer-1.0-quantize2.patch
-rw------- 1 pipping staff 3447 2008-10-03 21:05 mplayer-1.0_rc1_p20070927-prefix.patch
-rw------- 1 pipping staff 1217 2008-10-03 21:05 mplayer-1.0_rc2_p24929-pulse.patch
-rw------- 1 pipping staff  679 2008-10-03 21:05 mplayer-1.0_rc2_p25993-prefix.patch
-rw------- 1 pipping staff  546 2008-10-03 21:05 mplayer-1.0_rc2_p26258-darwin.patch
-rw------- 1 pipping staff 4680 2008-10-03 21:05 mplayer-1.0_rc2_p26300-prefix.patch
-rw------- 1 pipping staff 4688 2008-10-03 21:05 mplayer-1.0_rc2_p26450-prefix.patch
-rw------- 1 pipping staff  490 2008-10-03 21:05 mplayer-1.0_rc2_p26454-makefile.patch
-rw------- 1 pipping staff  353 2008-10-03 21:06 mplayer-1.0_rc2_p27458-include-stdlib.patch
-rw------- 1 pipping staff  785 2008-10-08 22:27 mplayer-1.0_rc2_p27725-libx264.patch
-rw------- 1 pipping staff 2222 2008-12-20 23:21 mplayer-1.0_rc2_p28058-demux_vqf.patch
-rw------- 1 pipping staff  318 2008-12-16 20:13 mplayer-libavcodec.patch
-rw------- 1 pipping staff  377 2008-12-16 20:13 mplayer-libmpeg2.patch

These are the patches that are actually used:

pipping@quicksand ~/gentoo/usr/portage/media-video/mplayer $ grep -hF .patch  mplayer*.ebuild | sort -u
        epatch "${FILESDIR}"/${PN}-1.0-nocona.patch
        epatch "${FILESDIR}"/${PN}-1.0_rc2_p26450-prefix.patch
        epatch "${FILESDIR}"/mplayer-1.0_rc2_p28058-demux_vqf.patch
        epatch "${FILESDIR}/mplayer-1.0_rc2_p27725-libx264.patch"
        epatch "${FILESDIR}/mplayer-libavcodec.patch"
        epatch "${FILESDIR}/mplayer-libmpeg2.patch"

The rest can go.
Comment 1 Elias Pipping 2008-12-24 19:59:03 UTC
Since the above list turned out to be unreadable:

pipping@quicksand ~/gentoo/usr/portage/media-video/mplayer $ ls -1 files/
configure-altivec.patch
configure-unsetauto-v2.patch
libswscale-sparc.patch
mplayer-1.0-darwin.patch
mplayer-1.0-include-stdlib.patch
mplayer-1.0-macosx-include-sysctl.patch
mplayer-1.0-macosx-include-time.patch
mplayer-1.0-macosx-include-user_ldt.patch
mplayer-1.0-nocona.patch
mplayer-1.0-quantize2.patch
mplayer-1.0_rc1_p20070927-prefix.patch
mplayer-1.0_rc2_p24929-pulse.patch
mplayer-1.0_rc2_p25993-prefix.patch
mplayer-1.0_rc2_p26258-darwin.patch
mplayer-1.0_rc2_p26300-prefix.patch
mplayer-1.0_rc2_p26450-prefix.patch
mplayer-1.0_rc2_p26454-makefile.patch
mplayer-1.0_rc2_p27458-include-stdlib.patch
mplayer-1.0_rc2_p27725-libx264.patch
mplayer-1.0_rc2_p28058-demux_vqf.patch
mplayer-libavcodec.patch
mplayer-libmpeg2.patch
Comment 2 Elias Pipping 2008-12-24 20:18:01 UTC
Created attachment 176314 [details, diff]
mplayer-1.0_rc2_p28058-warnings.patch

There are quite a couple of warnings about implicit declarations when you compile mplayer. I've fixed all of those (one half was for abort() from stdlib.h, the other half was for _ilog() from tremor).
Comment 3 Elias Pipping 2008-12-24 21:06:16 UTC
Created attachment 176320 [details, diff]
mplayer-1.0_rc2_p28058-nocona.patch

replaces mplayer-1.0-nocona.patch.
gcc-apple 4.0 needs prescott on C2Ds.
gcc-apple 4.2 can handle core2 on C2Ds.
gcc 4.3 can handle native on C2Ds.

All of these work now.
Comment 4 Elias Pipping 2008-12-24 21:27:04 UTC
I've made the above changes in my overlay:

  http://repo.or.cz/w/portage-prefix-bleeding-edge-ebuilds.git?a=commit;h=6c1baf7f7bff712cca18a7a440ae0702e9744c12
Comment 6 Fabian Groffen gentoo-dev 2008-12-25 20:25:00 UTC
Thanks, I cleaned the stuff up here.  Will be a pleasure to sync next time.