Add a patch to fix build failure on armv4l, and stabilize on arm

Package-Manager: portage-2.1.6.13/cvs/Linux ia64

4 files changed, 84 insertions, 16 deletions

diff --git a/media-libs/libmpeg2/ChangeLog b/media-libs/libmpeg2/ChangeLog
index f65289eacfff..516518c11fd3 100644
--- a/media-libs/libmpeg2/ChangeLog
+++ b/media-libs/libmpeg2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmpeg2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.73 2010/01/15 09:34:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.74 2010/01/24 15:59:57 armin76 Exp $
+
+  24 Jan 2010; Raúl Porcel <armin76@gentoo.org> libmpeg2-0.5.1-r1.ebuild,
+  +files/libmpeg-0.5.1-armv4l.patch:
+  Add a patch to fix build failure on armv4l, and stabilize on arm
 
   15 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   libmpeg2-0.5.1-r1.ebuild:
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index b24ea44835cf..b0cd13c37634 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libmpeg-0.5.1-armv4l.patch 8323 RMD160 0d88da48b3c6e8c4a7aa31a4846c5cd698784b5f SHA1 f90f254a93168be1cc5c61418a7554deee2e1fb0 SHA256 d3d6f8a2e4db3b52fd48eaed924000e6398c5b85b7eb30eaa70e88c314ebf9f8
 AUX libmpeg2-0.4.1-use-readelf-for-test.patch 869 RMD160 55939dd2417015c1bf8052fe506495d55514337b SHA1 6476adaecd05519941cc70c14daeab27732e4d51 SHA256 56d43bb88a4179dbc3859c77ca445b89bbdd1223ee8d78bcc7d7148dee7ae534
 AUX libmpeg2-0.5.1-arm-private-symbols.patch 1222 RMD160 ce216f2999be25af92392ad8b3fcbeed084f4a17 SHA1 364560cc5ef894c3dd02c40e7d1e2769d2e46ab9 SHA256 c012b21203452efc0f5bb2334e65461c45d53110c0b0e9b79efab68a7784c944
 AUX libmpeg2-0.5.1-global-symbol-test.patch 1931 RMD160 5a6ad7fcfbb493f15c8864a1a03fd5cbfee6d98a SHA1 639f8288404e499067ceb8566a7c778ad23c86bb SHA256 67fde111b731ef04c31318aa05568fac6614cc102499dbfb8afc409a78b5680f
 DIST libmpeg2-0.5.1.tar.gz 524776 RMD160 00b2d669655ed3f7a176f5eecc925045159a0301 SHA1 0f9163d8fd52db5f577ebe45636f674252641fd7 SHA256 dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4
 DIST mpeg2dec-0.4.1.tar.gz 494539 RMD160 5377ae45abdd37fabcea6d3d0a9d74e493b84483 SHA1 80be8b16dff4caa4253470d1a3b563fdc0177fcb SHA256 c74a76068f8ec36d4bb59a03bf1157be44118ca02252180e8b358b0b5e3edeee
 EBUILD libmpeg2-0.4.1.ebuild 1338 RMD160 b486051b9683d1e9b9bd3d17abec9016a2138cc5 SHA1 29656bdc81f5e16a9cfa55459eecebf6e795fce4 SHA256 7779ffee6c3c11bf82e2e7109a28ccb07f19784aa4113469b0f154104a408118
-EBUILD libmpeg2-0.5.1-r1.ebuild 1261 RMD160 51c8c4de9a9e716c10250fda5691e45f3eec471b SHA1 7e01db68084f90dd33937f9f8b1f661456930673 SHA256 e22f55df924fbd854a01bd54b2e3327df1181ff43c641bdd5144d7aeec60273f
+EBUILD libmpeg2-0.5.1-r1.ebuild 1298 RMD160 1421426349fe36d51e02354cfc43ab1fed611fe5 SHA1 0e8b92eed4c109d08ce75cdf15af25d9b8849ee7 SHA256 532cb55813a045bcdfedb1e28c4e622a1e91f035795a4eed0880bb616cb2800e
 EBUILD libmpeg2-0.5.1.ebuild 1320 RMD160 cb62eda14b9daec73411e6269244307cb0dd65bc SHA1 2e9127d8d96e70f794ddacac60c2ccbdb7cf5e47 SHA256 cbb27269523ead3124dbf436fddb2260584aa5e609515b12430d2b3230fa4637
-MISC ChangeLog 9265 RMD160 3c6e5635ecc005d3918176f58b9a91fb8b25c27a SHA1 c7632feab4fd5f63abc159b771b68f0ecb288323 SHA256 68ce0826251ceb196d85ebf550da807116530229d9df1db5227aedfaa592c4d9
+MISC ChangeLog 9447 RMD160 ae88d78497f98145cdb05015fd8b49a89b5b1f2f SHA1 bbc6beadbc43a17a506e6a3b29cbc2bf929670d6 SHA256 15a209a893ff0a820778e299f61dfee482947aeb8a77376586aa01439b0d986b
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktQNq0ACgkQNQqtfCuFnePpqgCfanKha0c2yi+BYFPlyaCOA4bv
-A/4An1f7rjwab+BR9RPcdM0fih0oi/o5
-=xvK7
------END PGP SIGNATURE-----
diff --git a/media-libs/libmpeg2/files/libmpeg-0.5.1-armv4l.patch b/media-libs/libmpeg2/files/libmpeg-0.5.1-armv4l.patch
new file mode 100644
index 000000000000..7e654293b283
--- /dev/null
+++ b/media-libs/libmpeg2/files/libmpeg-0.5.1-armv4l.patch
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
+<!-- git web interface version 1.5.6.5, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke -->
+<!-- git core binaries version 1.5.6.5 -->
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+<meta name="generator" content="gitweb/1.5.6.5 git/1.5.6.5"/>
+<meta name="robots" content="index, nofollow"/>
+<title>git.videolan.org Git - vlc.git/blob - extras/contrib/src/Patches/libmpeg2-arm-pld.patch</title>
+<link rel="stylesheet" type="text/css" href="/gitweb.css"/>
+<link rel="alternate" title="vlc.git - history of extras/contrib/src/Patches/libmpeg2-arm-pld.patch - RSS feed" href="/gitweb.cgi?p=vlc.git;a=rss;f=extras/contrib/src/Patches/libmpeg2-arm-pld.patch" type="application/rss+xml" />
+<link rel="alternate" title="vlc.git - history of extras/contrib/src/Patches/libmpeg2-arm-pld.patch - RSS feed (no merges)" href="/gitweb.cgi?p=vlc.git;a=rss;f=extras/contrib/src/Patches/libmpeg2-arm-pld.patch;opt=--no-merges" type="application/rss+xml" />
+<link rel="alternate" title="vlc.git - history of extras/contrib/src/Patches/libmpeg2-arm-pld.patch - Atom feed" href="/gitweb.cgi?p=vlc.git;a=atom;f=extras/contrib/src/Patches/libmpeg2-arm-pld.patch;opt=--no-merges" type="application/atom+xml" />
+<link rel="alternate" title="vlc.git - history of extras/contrib/src/Patches/libmpeg2-arm-pld.patch - Atom feed (no merges)" href="/gitweb.cgi?p=vlc.git;a=atom;f=extras/contrib/src/Patches/libmpeg2-arm-pld.patch;opt=--no-merges" type="application/atom+xml" />
+<link rel="shortcut icon" href="/git-favicon.png" type="image/png" />
+</head>
+<body>
+<div class="page_header">
+<a title="git homepage" href="http://git.or.cz/"><img src="/git-logo.png" width="72" height="27" alt="git" class="logo"/></a><a href="/gitweb.cgi">git.videolan.org</a> / <a href="/gitweb.cgi?p=vlc.git;a=summary">vlc.git</a> / blob
+</div>
+<form method="get" action="/gitweb.cgi" enctype="application/x-www-form-urlencoded">
+<div class="search">
+<input name="p" type="hidden" value="vlc.git" />
+<input name="a" type="hidden" value="search" />
+<input name="h" type="hidden" value="5e7bc5f267c0a0378dfc25867b34f1a662ddbb06" />
+<select name="st" >
+<option selected="selected" value="commit">commit</option>
+<option value="grep">grep</option>
+<option value="author">author</option>
+<option value="committer">committer</option>
+<option value="pickaxe">pickaxe</option>
+</select><sup><a href="/gitweb.cgi?p=vlc.git;a=search_help">?</a></sup> search:
+<input type="text" name="s"  />
+<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span></div>
+</form>
+<div class="page_nav">
+<a href="/gitweb.cgi?p=vlc.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=vlc.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=vlc.git;a=log">log</a> | <a href="/gitweb.cgi?p=vlc.git;a=commit;h=5e7bc5f267c0a0378dfc25867b34f1a662ddbb06">commit</a> | <a href="/gitweb.cgi?p=vlc.git;a=commitdiff;h=5e7bc5f267c0a0378dfc25867b34f1a662ddbb06">commitdiff</a> | <a href="/gitweb.cgi?p=vlc.git;a=tree;h=dfb28d0ade47364b98df5281a53a0e82027319e1;hb=5e7bc5f267c0a0378dfc25867b34f1a662ddbb06">tree</a><br/>
+<a href="/gitweb.cgi?p=vlc.git;a=blame;f=extras/contrib/src/Patches/libmpeg2-arm-pld.patch;h=bd9561e0c46fa106b8703bab2be51ad35abeed2f;hb=5e7bc5f267c0a0378dfc25867b34f1a662ddbb06">blame</a> | <a href="/gitweb.cgi?p=vlc.git;a=history;f=extras/contrib/src/Patches/libmpeg2-arm-pld.patch;h=bd9561e0c46fa106b8703bab2be51ad35abeed2f;hb=5e7bc5f267c0a0378dfc25867b34f1a662ddbb06">history</a> | <a href="/gitweb.cgi?p=vlc.git;a=blob_plain;f=extras/contrib/src/Patches/libmpeg2-arm-pld.patch;h=bd9561e0c46fa106b8703bab2be51ad35abeed2f;hb=5e7bc5f267c0a0378dfc25867b34f1a662ddbb06">raw</a> | <a href="/gitweb.cgi?p=vlc.git;a=blob;f=extras/contrib/src/Patches/libmpeg2-arm-pld.patch;hb=HEAD">HEAD</a><br/>
+</div>
+<div class="header">
+<a class="title" href="/gitweb.cgi?p=vlc.git;a=commit;h=5e7bc5f267c0a0378dfc25867b34f1a662ddbb06">contrib: fix libmpeg2 patch</a>
+</div>
+<div class="page_path"><a title="tree root" href="/gitweb.cgi?p=vlc.git;a=tree;hb=5e7bc5f267c0a0378dfc25867b34f1a662ddbb06">[vlc.git]</a> / <a title="extras" href="/gitweb.cgi?p=vlc.git;a=tree;f=extras;hb=5e7bc5f267c0a0378dfc25867b34f1a662ddbb06">extras</a> / <a title="extras/contrib" href="/gitweb.cgi?p=vlc.git;a=tree;f=extras/contrib;hb=5e7bc5f267c0a0378dfc25867b34f1a662ddbb06">contrib</a> / <a title="extras/contrib/src" href="/gitweb.cgi?p=vlc.git;a=tree;f=extras/contrib/src;hb=5e7bc5f267c0a0378dfc25867b34f1a662ddbb06">src</a> / <a title="extras/contrib/src/Patches" href="/gitweb.cgi?p=vlc.git;a=tree;f=extras/contrib/src/Patches;hb=5e7bc5f267c0a0378dfc25867b34f1a662ddbb06">Patches</a> / <a title="extras/contrib/src/Patches/libmpeg2-arm-pld.patch" href="/gitweb.cgi?p=vlc.git;a=blob_plain;f=extras/contrib/src/Patches/libmpeg2-arm-pld.patch;hb=5e7bc5f267c0a0378dfc25867b34f1a662ddbb06">libmpeg2-arm-pld.patch</a><br/></div>
+<div class="page_body">
+<div class="pre"><a id="l1" href="#l1" class="linenr">   1</a> diff&nbsp;-urNp&nbsp;libmpeg2.orig/libmpeg2/motion_comp_arm_s.S&nbsp;libmpeg2/libmpeg2/motion_comp_arm_s.S</div>
+<div class="pre"><a id="l2" href="#l2" class="linenr">   2</a> ---&nbsp;libmpeg2.orig/libmpeg2/motion_comp_arm_s.S&nbsp;&nbsp;2008-07-09&nbsp;21:16:05.000000000&nbsp;+0200</div>
+<div class="pre"><a id="l3" href="#l3" class="linenr">   3</a> +++&nbsp;libmpeg2/libmpeg2/motion_comp_arm_s.S&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2009-11-20&nbsp;19:55:22.000000000&nbsp;+0100</div>
+<div class="pre"><a id="l4" href="#l4" class="linenr">   4</a> @@&nbsp;-19,6&nbsp;+19,16&nbsp;@@</div>
+<div class="pre"><a id="l5" href="#l5" class="linenr">   5</a> &nbsp;@&nbsp;Foundation,&nbsp;Inc.,&nbsp;59&nbsp;Temple&nbsp;Place,&nbsp;Suite&nbsp;330,&nbsp;Boston,&nbsp;MA&nbsp;&nbsp;02111-1307&nbsp;&nbsp;USA</div>
+<div class="pre"><a id="l6" href="#l6" class="linenr">   6</a> &nbsp;</div>
+<div class="pre"><a id="l7" href="#l7" class="linenr">   7</a> &nbsp;</div>
+<div class="pre"><a id="l8" href="#l8" class="linenr">   8</a> +@&nbsp;Data&nbsp;preload&nbsp;is&nbsp;supported&nbsp;only&nbsp;by&nbsp;ARM&nbsp;V5TE&nbsp;and&nbsp;above</div>
+<div class="pre"><a id="l9" href="#l9" class="linenr">   9</a> +</div>
+<div class="pre"><a id="l10" href="#l10" class="linenr">  10</a> +#if&nbsp;(defined&nbsp;(__ARM_ARCH_2__)&nbsp;||&nbsp;defined&nbsp;(__ARM_ARCH_3__)&nbsp;\</div>
+<div class="pre"><a id="l11" href="#l11" class="linenr">  11</a> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;||&nbsp;defined&nbsp;(__ARM_ARCH_3M__)&nbsp;||&nbsp;defined&nbsp;(__ARM_ARCH_4__)&nbsp;\</div>
+<div class="pre"><a id="l12" href="#l12" class="linenr">  12</a> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;||&nbsp;defined&nbsp;(__ARM_ARCH_4T__)&nbsp;||&nbsp;defined&nbsp;(__ARM_ARCH_5__)&nbsp;\</div>
+<div class="pre"><a id="l13" href="#l13" class="linenr">  13</a> +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;||&nbsp;defined&nbsp;(__ARM_ARCH_5T__))</div>
+<div class="pre"><a id="l14" href="#l14" class="linenr">  14</a> +.macro&nbsp;pld&nbsp;reg</div>
+<div class="pre"><a id="l15" href="#l15" class="linenr">  15</a> +.endm</div>
+<div class="pre"><a id="l16" href="#l16" class="linenr">  16</a> +#endif</div>
+<div class="pre"><a id="l17" href="#l17" class="linenr">  17</a> +</div>
+<div class="pre"><a id="l18" href="#l18" class="linenr">  18</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.text</div>
+<div class="pre"><a id="l19" href="#l19" class="linenr">  19</a> &nbsp;</div>
+<div class="pre"><a id="l20" href="#l20" class="linenr">  20</a> &nbsp;@&nbsp;----------------------------------------------------------------</div>
+</div><div class="page_footer">
+<div class="page_footer_text">VLC Main Developement tree.</div>
+<a class="rss_logo" title="history of extras/contrib/src/Patches/libmpeg2-arm-pld.patch RSS feed" href="/gitweb.cgi?p=vlc.git;a=rss;f=extras/contrib/src/Patches/libmpeg2-arm-pld.patch">RSS</a>
+<a class="rss_logo" title="history of extras/contrib/src/Patches/libmpeg2-arm-pld.patch Atom feed" href="/gitweb.cgi?p=vlc.git;a=atom;f=extras/contrib/src/Patches/libmpeg2-arm-pld.patch">Atom</a>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r1.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r1.ebuild
index 42c5f427c492..f448d0d8948f 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r1.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.5.1-r1.ebuild,v 1.2 2010/01/15 09:34:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.5.1-r1.ebuild,v 1.3 2010/01/24 15:59:57 armin76 Exp $
 
 EAPI=2
 inherit eutils libtool
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="sdl X"
 
 RDEPEND="sdl? ( media-libs/libsdl )
@@ -24,7 +24,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-arm-private-symbols.patch \
-		"${FILESDIR}"/${P}-global-symbol-test.patch
+		"${FILESDIR}"/${P}-global-symbol-test.patch \
+		"${FILESDIR}"/${P}-armv4l.patch
 	elibtoolize
 }