From: Alexis Ballier Date: Sat, 11 Nov 2006 20:29:31 +0000 (+0000) Subject: Adding a patch from mpeg4ip cvs to follow x264 api changes X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7c53e248962e43e58382c7ca0db08492e3c7d67a;p=gentoo.git Adding a patch from mpeg4ip cvs to follow x264 api changes Package-Manager: portage-2.1.2_rc1-r5 --- diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog index dd2c14e6e34e..e1aa64d1cdd9 100644 --- a/media-video/mpeg4ip/ChangeLog +++ b/media-video/mpeg4ip/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/mpeg4ip # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.43 2006/10/23 16:05:46 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.44 2006/11/11 20:29:31 aballier Exp $ + +*mpeg4ip-1.5.0.1-r1 (11 Nov 2006) + + 11 Nov 2006; Alexis Ballier + +files/mpeg4ip-1.5.0.1-x264.patch, +mpeg4ip-1.5.0.1-r1.ebuild: + Adding a patch from mpeg4ip cvs to follow x264 api changes 23 Oct 2006; Simon Stelling mpeg4ip-1.5.0.1.ebuild: remove ugly x86? in DEPEND diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest index f8446c2fd2c6..ccf40239564d 100644 --- a/media-video/mpeg4ip/Manifest +++ b/media-video/mpeg4ip/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX mpeg4ip-1.4.1-disable-faac-test.patch 1149 RMD160 fabfac7262e34ad8ba0aea08938fa61ca9f2c389 SHA1 a84ae2a263374edbe104c682fd2db385ff1145ca SHA256 cbe9093e82530731e4dc53973c62e3879b7297199f52f25b7d0317cfe4c0d2ba MD5 22a76c68f55b131dfc602a61ededb699 files/mpeg4ip-1.4.1-disable-faac-test.patch 1149 RMD160 fabfac7262e34ad8ba0aea08938fa61ca9f2c389 files/mpeg4ip-1.4.1-disable-faac-test.patch 1149 @@ -6,6 +9,10 @@ AUX mpeg4ip-1.4.1-gcc41.patch 5332 RMD160 c23b8af9f13f6fdb5e65d20276a6632464c514 MD5 75ef8fbc1d49d5a13a8f6ece3b8fff78 files/mpeg4ip-1.4.1-gcc41.patch 5332 RMD160 c23b8af9f13f6fdb5e65d20276a6632464c51416 files/mpeg4ip-1.4.1-gcc41.patch 5332 SHA256 a4ce2cfd0448c03cec335d46099fdca7b3aed7ea75395dce8b97e38f816a5219 files/mpeg4ip-1.4.1-gcc41.patch 5332 +AUX mpeg4ip-1.5.0.1-x264.patch 2632 RMD160 4df7016973fc0a657fa25ea118199b6cb37193cf SHA1 f8f9edc71f66a097c32ceed25b9f7d006a0db16b SHA256 3e88f3cc2e6ed398bd9f2a38c97d53590e8209c373a97389f732a1cdce95d5d3 +MD5 db4c08a5fa7937e4c9d1c80936315612 files/mpeg4ip-1.5.0.1-x264.patch 2632 +RMD160 4df7016973fc0a657fa25ea118199b6cb37193cf files/mpeg4ip-1.5.0.1-x264.patch 2632 +SHA256 3e88f3cc2e6ed398bd9f2a38c97d53590e8209c373a97389f732a1cdce95d5d3 files/mpeg4ip-1.5.0.1-x264.patch 2632 DIST mpeg4ip-1.4.1.tar.gz 4791075 RMD160 656d06433d490aadadd8c6fd8e8d5727870e8766 SHA1 f0a4b9ecfb281c6c20b332002a7e341e27a9ea10 SHA256 6c60d8a37edcbf9e140f9352fabf3bf87ebbc8d819d251c503dda8b46e62ab10 DIST mpeg4ip-1.5.0.1.tar.gz 4826180 RMD160 fee5c21c17a470e6de349e07d233a1eb46b2064a SHA1 1271de695ed65284d9c39aa91bf26c5494603fd3 SHA256 23535dd818898ec75ffa0df22d9f27189e77361ce8a500d58328073ee247bcb6 EBUILD mpeg4ip-1.4.1-r1.ebuild 3429 RMD160 5e4707134b30b681cd0128990c57d47efe75f7fe SHA1 f924681a2b82c4463fc4ea02930f0d93911d0f39 SHA256 ecef2f89725eb9402a3b80816bf34b232e40a42574416026249c57bfd3806671 @@ -16,14 +23,18 @@ EBUILD mpeg4ip-1.4.1.ebuild 3298 RMD160 a335e93dc293d5903c871dfa43293e3fb2351355 MD5 2522a72059ab600d950d25f47dfe4e96 mpeg4ip-1.4.1.ebuild 3298 RMD160 a335e93dc293d5903c871dfa43293e3fb2351355 mpeg4ip-1.4.1.ebuild 3298 SHA256 c71c038c9af91670c1a0a37604663af6d9192b443a8927c31e3cf6a6aa07e340 mpeg4ip-1.4.1.ebuild 3298 +EBUILD mpeg4ip-1.5.0.1-r1.ebuild 3605 RMD160 a7d3c7ad205267e41f4bb54c7c09192d16f86b4c SHA1 6d85873afe26b2da5d719fe26d0fbd561a33503d SHA256 ed1671fdbdf3f0b2667ae97f5c8384a11ae4fb8025f418969c890cb6f2861abf +MD5 73823a02b13e3900d58ed80d481efe77 mpeg4ip-1.5.0.1-r1.ebuild 3605 +RMD160 a7d3c7ad205267e41f4bb54c7c09192d16f86b4c mpeg4ip-1.5.0.1-r1.ebuild 3605 +SHA256 ed1671fdbdf3f0b2667ae97f5c8384a11ae4fb8025f418969c890cb6f2861abf mpeg4ip-1.5.0.1-r1.ebuild 3605 EBUILD mpeg4ip-1.5.0.1.ebuild 3561 RMD160 28146aeecb6b7ff59af1dc57c779fdab9f5193d8 SHA1 5cbced3884c65df3af9432470771c8c33b699346 SHA256 19f54dafdbc44a5b66fba1986161274f8c5fd71b01816bbf1814864b29e4c79c MD5 c339e5a5d5e588e911b34958a257bd6f mpeg4ip-1.5.0.1.ebuild 3561 RMD160 28146aeecb6b7ff59af1dc57c779fdab9f5193d8 mpeg4ip-1.5.0.1.ebuild 3561 SHA256 19f54dafdbc44a5b66fba1986161274f8c5fd71b01816bbf1814864b29e4c79c mpeg4ip-1.5.0.1.ebuild 3561 -MISC ChangeLog 7207 RMD160 ced76ec23026c24c11de2241061da078440f2f73 SHA1 3037851b2da06349ff9f366cd5e16cde6aa105c3 SHA256 a5a46c1cfba8e9620ddf43223aa1935b1f0dcafab9fad23769f40751f095a0c9 -MD5 bb6cd7c0e9c1deaa9830c91d9763523d ChangeLog 7207 -RMD160 ced76ec23026c24c11de2241061da078440f2f73 ChangeLog 7207 -SHA256 a5a46c1cfba8e9620ddf43223aa1935b1f0dcafab9fad23769f40751f095a0c9 ChangeLog 7207 +MISC ChangeLog 7424 RMD160 f0a9f165825931579fd26569d50559239d9e5911 SHA1 35a21d9d226cbd43caeacec0dc7b72304c18cabf SHA256 8279e72e69f1087aa929d365cdd8a99ead462251bb1bc8dd6c96490a8e37f64a +MD5 843a0f6fc0be6b61b1f6aa3ef7edcc25 ChangeLog 7424 +RMD160 f0a9f165825931579fd26569d50559239d9e5911 ChangeLog 7424 +SHA256 8279e72e69f1087aa929d365cdd8a99ead462251bb1bc8dd6c96490a8e37f64a ChangeLog 7424 MISC metadata.xml 255 RMD160 5270d78482f975182f91bf12c1c35f02f1724b80 SHA1 ab610963bd3bcba3a951090a167f9fd5755b6cde SHA256 1711781f9f166223d7d8e3bda1083ed9e144627c3ccc3bbdbafbb59db0bfce1f MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255 RMD160 5270d78482f975182f91bf12c1c35f02f1724b80 metadata.xml 255 @@ -37,3 +48,13 @@ SHA256 1ffffd6707a54c8f378bfcd9616bef82c93d6d15bb56d1e582e8297ccf887c03 files/di MD5 e2f664c0648cfd656f71ec99f49c8a32 files/digest-mpeg4ip-1.5.0.1 250 RMD160 92cd3b3759cc48d6714f344756350b6d045478db files/digest-mpeg4ip-1.5.0.1 250 SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/digest-mpeg4ip-1.5.0.1 250 +MD5 e2f664c0648cfd656f71ec99f49c8a32 files/digest-mpeg4ip-1.5.0.1-r1 250 +RMD160 92cd3b3759cc48d6714f344756350b6d045478db files/digest-mpeg4ip-1.5.0.1-r1 250 +SHA256 0f7df09398e7002cb89b9685203d3148c6c6c878c748380a78735aaaa7ba1bbc files/digest-mpeg4ip-1.5.0.1-r1 250 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFVjKsvFcC4BYPU0oRAvlyAKCaEyygJBLxyNZQA4YThHrzNWkPJQCgvupy +aV6ay6d/SsF3UKBEUuBOcwo= +=eYE6 +-----END PGP SIGNATURE----- diff --git a/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r1 b/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r1 new file mode 100644 index 000000000000..c15cf36b860f --- /dev/null +++ b/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r1 @@ -0,0 +1,3 @@ +MD5 f53b06c62e914ab724bda9d9af041e08 mpeg4ip-1.5.0.1.tar.gz 4826180 +RMD160 fee5c21c17a470e6de349e07d233a1eb46b2064a mpeg4ip-1.5.0.1.tar.gz 4826180 +SHA256 23535dd818898ec75ffa0df22d9f27189e77361ce8a500d58328073ee247bcb6 mpeg4ip-1.5.0.1.tar.gz 4826180 diff --git a/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-x264.patch b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-x264.patch new file mode 100644 index 000000000000..ff74651af4bd --- /dev/null +++ b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-x264.patch @@ -0,0 +1,67 @@ +--- mpeg4ip-1.5.0.1/server/mp4live/video_x264.cpp 2006-05-11 22:23:19.000000000 +0200 ++++ /home/alexis/mpeg4ip/mpeg4ip/server/mp4live/video_x264.cpp 2006-09-29 21:55:42.000000000 +0200 +@@ -32,7 +32,9 @@ + + static config_index_t CFG_X264_FORCE_BASELINE; + static config_index_t CFG_X264_USE_CABAC; ++#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD + static config_index_t CFG_X264_USE_CBR; ++#endif + static config_index_t CFG_X264_BIT_RATE_TOLERANCE; + static config_index_t CFG_X264_USE_VBV; + static config_index_t CFG_X264_VBV_BITRATE_MULT; +@@ -44,7 +46,9 @@ + static SConfigVariable X264EncoderVariables[] = { + CONFIG_BOOL(CFG_X264_FORCE_BASELINE, "x264ForceBaseline", false), + CONFIG_BOOL(CFG_X264_USE_CABAC, "x264UseCabac", true), ++#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD + CONFIG_BOOL(CFG_X264_USE_CBR, "x264UseCbr", true), ++#endif + CONFIG_FLOAT(CFG_X264_BIT_RATE_TOLERANCE, "x264BitRateTolerance", 1.0), + CONFIG_BOOL(CFG_X264_USE_VBV, "x264UseVbv", false), + CONFIG_FLOAT(CFG_X264_VBV_BITRATE_MULT, "x264VbvBitRateMult", 1.0), +@@ -56,7 +60,9 @@ + + GUI_BOOL(gui_baseline, CFG_X264_FORCE_BASELINE, "Force Baseline (overrides below)"); + GUI_BOOL(gui_cabac, CFG_X264_USE_CABAC, "Use Cabac"); ++#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD + GUI_BOOL(gui_cbr, CFG_X264_USE_CBR, "Use CBR"); ++#endif + GUI_BOOL(gui_bframe, CFG_VIDEO_USE_B_FRAMES, "Use B Frames"); + GUI_INT_RANGE(gui_bframenum, CFG_VIDEO_NUM_OF_B_FRAMES, "Number of B frames", 1, 4); + +@@ -75,7 +81,9 @@ + DECLARE_TABLE(x264_gui_options) = { + TABLE_GUI(gui_baseline), + TABLE_GUI(gui_cabac), ++#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD + TABLE_GUI(gui_cbr), ++#endif + TABLE_GUI(gui_bframe), + TABLE_GUI(gui_bframenum), + TABLE_GUI(gui_brate), +@@ -168,7 +176,11 @@ + m_param.i_bframe = 0; + //debug_message("h264 b frames %d", m_param.i_bframe); + m_param.rc.i_bitrate = Profile()->GetIntegerValue(CFG_VIDEO_BIT_RATE); ++#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD + m_param.rc.b_cbr = Profile()->GetBoolValue(CFG_X264_USE_CBR) ? 1 : 0; ++#else ++ m_param.rc.i_rc_method = X264_RC_ABR; ++#endif + m_param.rc.f_rate_tolerance = Profile()->GetFloatValue(CFG_X264_BIT_RATE_TOLERANCE); + if (Profile()->GetBoolValue(CFG_X264_USE_VBV)) { + if (Profile()->GetBoolValue(CFG_X264_FORCE_BASELINE)) { +--- mpeg4ip-1.5.0.1/server/mp4live/video_x264.h.old 2006-11-11 20:56:48.000000000 +0100 ++++ mpeg4ip-1.5.0.1/server/mp4live/video_x264.h 2006-11-11 20:57:49.000000000 +0100 +@@ -33,6 +33,10 @@ + } + #endif + ++#if X264_BUILD > 47 ++#define HAVE_X264_PARAM_T_RC_I_RC_METHOD ++#endif ++ + class CX264VideoEncoder : public CVideoEncoder { + public: + CX264VideoEncoder(CVideoProfile *vp, diff --git a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild new file mode 100644 index 000000000000..2b7b6fa196a1 --- /dev/null +++ b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r1.ebuild,v 1.1 2006/11/11 20:29:31 aballier Exp $ + +inherit eutils multilib + +DESCRIPTION="MPEG 4 implementation library" + +HOMEPAGE="http://www.mpeg4ip.net/" + +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="MPL-1.1 LGPL-2 GPL-2 LGPL-2.1 BSD UCL MPEG4" + +SLOT="0" + +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="ipv6 mmx v4l2 xvid nas alsa esd arts ffmpeg a52 mpeg2 lame aac id3 player mp4live x264" + +RDEPEND=" media-libs/libsdl + player? ( + >=x11-libs/gtk+-2 + ffmpeg? ( >=media-video/ffmpeg-0.4.7 ) + mpeg2? ( media-libs/libmpeg2 ) + id3? ( media-libs/libid3tag ) + a52? ( media-libs/a52dec ) + ) + xvid? ( >=media-libs/xvid-0.9.8 ) + mp4live? ( + >=x11-libs/gtk+-2 + lame? ( >=media-sound/lame-3.92 ) + aac? ( >=media-libs/faac-1.24-r1 ) + ffmpeg? ( >=media-video/ffmpeg-0.4.7 ) + x264? ( media-libs/x264-svn ) + ) + nas? ( media-libs/nas || ( x11-libs/libXt virtual/x11 ) ) + alsa? ( media-libs/alsa-lib ) + arts? ( kde-base/arts ) + esd? ( media-sound/esound ) + =media-libs/libmp4v2-1.5.0.1 + !