diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2010-01-25 17:29:42 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2010-01-25 17:29:42 +0000 |
| commit | 021124f2c528bc41c875f9df4bf246d8a3bf5d57 (patch) | |
| tree | b1f8d9b3cb7956660efc36a5c1e78fa68e5f42ba /media-libs/libmpeg2 | |
| parent | Version bump KDE 4.3.5 (diff) | |
| download | gentoo-2-021124f2c528bc41c875f9df4bf246d8a3bf5d57.tar.gz gentoo-2-021124f2c528bc41c875f9df4bf246d8a3bf5d57.tar.bz2 gentoo-2-021124f2c528bc41c875f9df4bf246d8a3bf5d57.zip | |
Fix patch name+patch
(Portage version: 2.1.6.13/cvs/Linux ia64)
Diffstat (limited to 'media-libs/libmpeg2')
| -rw-r--r-- | media-libs/libmpeg2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libmpeg2/files/libmpeg-0.5.1-armv4l.patch | 72 | ||||
| -rw-r--r-- | media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch | 20 |
3 files changed, 25 insertions, 73 deletions
diff --git a/media-libs/libmpeg2/ChangeLog b/media-libs/libmpeg2/ChangeLog index 516518c11fd3..cab56099ebb0 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.74 2010/01/24 15:59:57 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.75 2010/01/25 17:29:42 armin76 Exp $ + + 25 Jan 2010; Raúl Porcel <armin76@gentoo.org> + -files/libmpeg-0.5.1-armv4l.patch, +files/libmpeg2-0.5.1-armv4l.patch: + Fix patch name+patch 24 Jan 2010; Raúl Porcel <armin76@gentoo.org> libmpeg2-0.5.1-r1.ebuild, +files/libmpeg-0.5.1-armv4l.patch: diff --git a/media-libs/libmpeg2/files/libmpeg-0.5.1-armv4l.patch b/media-libs/libmpeg2/files/libmpeg-0.5.1-armv4l.patch deleted file mode 100644 index 7e654293b283..000000000000 --- a/media-libs/libmpeg2/files/libmpeg-0.5.1-armv4l.patch +++ /dev/null @@ -1,72 +0,0 @@ -<?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 -urNp libmpeg2.orig/libmpeg2/motion_comp_arm_s.S libmpeg2/libmpeg2/motion_comp_arm_s.S</div> -<div class="pre"><a id="l2" href="#l2" class="linenr"> 2</a> --- libmpeg2.orig/libmpeg2/motion_comp_arm_s.S 2008-07-09 21:16:05.000000000 +0200</div> -<div class="pre"><a id="l3" href="#l3" class="linenr"> 3</a> +++ libmpeg2/libmpeg2/motion_comp_arm_s.S 2009-11-20 19:55:22.000000000 +0100</div> -<div class="pre"><a id="l4" href="#l4" class="linenr"> 4</a> @@ -19,6 +19,16 @@</div> -<div class="pre"><a id="l5" href="#l5" class="linenr"> 5</a> @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div> -<div class="pre"><a id="l6" href="#l6" class="linenr"> 6</a> </div> -<div class="pre"><a id="l7" href="#l7" class="linenr"> 7</a> </div> -<div class="pre"><a id="l8" href="#l8" class="linenr"> 8</a> +@ Data preload is supported only by ARM V5TE and 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 (defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_3__) \</div> -<div class="pre"><a id="l11" href="#l11" class="linenr"> 11</a> + || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \</div> -<div class="pre"><a id="l12" href="#l12" class="linenr"> 12</a> + || defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_5__) \</div> -<div class="pre"><a id="l13" href="#l13" class="linenr"> 13</a> + || defined (__ARM_ARCH_5T__))</div> -<div class="pre"><a id="l14" href="#l14" class="linenr"> 14</a> +.macro pld 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> .text</div> -<div class="pre"><a id="l19" href="#l19" class="linenr"> 19</a> </div> -<div class="pre"><a id="l20" href="#l20" class="linenr"> 20</a> @ ----------------------------------------------------------------</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/files/libmpeg2-0.5.1-armv4l.patch b/media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch new file mode 100644 index 000000000000..bd9561e0c46f --- /dev/null +++ b/media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch @@ -0,0 +1,20 @@ +diff -urNp libmpeg2.orig/libmpeg2/motion_comp_arm_s.S libmpeg2/libmpeg2/motion_comp_arm_s.S +--- libmpeg2.orig/libmpeg2/motion_comp_arm_s.S 2008-07-09 21:16:05.000000000 +0200 ++++ libmpeg2/libmpeg2/motion_comp_arm_s.S 2009-11-20 19:55:22.000000000 +0100 +@@ -19,6 +19,16 @@ + @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + ++@ Data preload is supported only by ARM V5TE and above ++ ++#if (defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_3__) \ ++ || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \ ++ || defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_5__) \ ++ || defined (__ARM_ARCH_5T__)) ++.macro pld reg ++.endm ++#endif ++ + .text + + @ ---------------------------------------------------------------- |