summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/connman/connman-gnome/3g.patch2
-rw-r--r--meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch2
-rw-r--r--meta/recipes-multimedia/lame/lame-3.98.4/no-gtk1.patch2
-rw-r--r--meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch2
-rw-r--r--meta/recipes-multimedia/libtiff/files/libtool2.patch2
-rw-r--r--meta/recipes-multimedia/pulseaudio/libatomics-ops/doublefix.patch2
-rw-r--r--meta/recipes-multimedia/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch5
-rw-r--r--meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch4
8 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/connman/connman-gnome/3g.patch b/meta/recipes-connectivity/connman/connman-gnome/3g.patch
index c73c1ea4b8..58fa5e6783 100644
--- a/meta/recipes-connectivity/connman/connman-gnome/3g.patch
+++ b/meta/recipes-connectivity/connman/connman-gnome/3g.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
commit 15852e826b0b47f577718ada4b68b63515387f4d
Author: dongxiao <dongxiao@dongxiao-osel.(none)>
Date: Wed Jun 1 14:56:16 2011 +0800
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch b/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
index 86263368b8..658e1903d2 100644
--- a/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
+++ b/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
From f9b017c2c958d968cc5dfd36dc68fc8e5fb89a58 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Fri, 11 Jun 2010 09:48:58 +0200
diff --git a/meta/recipes-multimedia/lame/lame-3.98.4/no-gtk1.patch b/meta/recipes-multimedia/lame/lame-3.98.4/no-gtk1.patch
index 8669d3b43b..e88d7f1bb4 100644
--- a/meta/recipes-multimedia/lame/lame-3.98.4/no-gtk1.patch
+++ b/meta/recipes-multimedia/lame/lame-3.98.4/no-gtk1.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
# Acquired from OpenEmbedded
--- lame-3.96.1/configure.in~no-gtk1.patch 2004-07-25 15:52:12.000000000 +0100
diff --git a/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch b/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch
index 5734bce465..359f3d1a7a 100644
--- a/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch
+++ b/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: libtheora-1.1.1/Makefile.am
===================================================================
--- libtheora-1.1.1.orig/Makefile.am 2009-11-25 22:01:53.593775926 +0100
diff --git a/meta/recipes-multimedia/libtiff/files/libtool2.patch b/meta/recipes-multimedia/libtiff/files/libtool2.patch
index 8285be51d2..2ee8309d1d 100644
--- a/meta/recipes-multimedia/libtiff/files/libtool2.patch
+++ b/meta/recipes-multimedia/libtiff/files/libtool2.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops/doublefix.patch b/meta/recipes-multimedia/pulseaudio/libatomics-ops/doublefix.patch
index 2172cac41e..0d3b718597 100644
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops/doublefix.patch
+++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops/doublefix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Double path references breaks recent autoconf+automake
RP 2/1/10
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch b/meta/recipes-multimedia/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
index 51161dbe0f..315ae917fa 100644
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
+++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
@@ -1,3 +1,8 @@
+Upstream-Status: Inappropriate [others]
+
+The patch is imported from fedora project, and is not appropriate for us
+to upstream it.
+
http://cvs.fedoraproject.org/viewcvs/devel/libatomic_ops/libatomic_ops-1.2-ppclwzfix.patch
* add fix for bad variable handling on PPC
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch b/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch
index 29f07b9f99..971379d3ad 100644
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch
+++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch
@@ -1,3 +1,7 @@
+Upstream-Status: Inappropriate [others]
+
+Patch from gentoo which is not appropriate for us to upstream.
+
# Patch copied from the OpenEmbedded libatomics-ops recipe. Original
# source was from Gentoo.
#