[prev in list] [next in list] [prev in thread] [next in thread]
List: gstreamer-cvs
Subject: [1.2] sdk/cerbero: libiconv: fix patch set
From: slomo () kemper ! freedesktop ! org (Sebastian Dröge)
Date: 2013-10-31 11:49:05
Message-ID: 20131031114905.CC2C87656B () kemper ! freedesktop ! org
[Download RAW message or body]
Module: sdk/cerbero
Branch: 1.2
Commit: c711fac1d0b270486cb613d195aa2e792fe7e742
URL: http://cgit.freedesktop.org/gstreamer/sdk/cerbero/commit/?idÇ11fac1d0b270486cb613d195aa2e792fe7e742
Author: Andoni Morales Alastruey <ylatuya@gmail.com>
Date: Tue Oct 29 01:46:18 2013 +0100
libiconv: fix patch set
---
recipes/libiconv.recipe | 6 +--
.../0001-Use-correct-autotools-versions.patch | 4 +-
...id.patch => 0002-Add-support-for-Android.patch} | 34 ++++++++---------
...-fix-build-with-Android-s-Bionic-fox-x86.patch} | 15 ++++----
.../0004-stdint-Improve-support-for-Android.patch | 39 --------------------
5 files changed, 27 insertions(+), 71 deletions(-)
diff --git a/recipes/libiconv.recipe b/recipes/libiconv.recipe
index 0298aa4..65afcea 100644
--- a/recipes/libiconv.recipe
+++ b/recipes/libiconv.recipe
@@ -9,10 +9,8 @@ class Recipe(recipe.Recipe):
stype = SourceType.TARBALL
url = 'http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz'
patches = ['libiconv/0001-Use-correct-autotools-versions.patch',
- 'libiconv/0002-stdint-Add-support-for-Android.patch',
- 'libiconv/0004-stdint-Improve-support-for-Android.patch',
- 'libiconv/0005-stdint-fix-build-with-Android-s-Bionic-fox-x86.patch',]
-
+ 'libiconv/0002-Add-support-for-Android.patch',
+ 'libiconv/0003-stdint-fix-build-with-Android-s-Bionic-fox-x86.patch',]
configure_options = '--disable-nls --enable-static'
platform_deps = {Platform.WINDOWS: ['gettext']}
diff --git a/recipes/libiconv/0001-Use-correct-autotools-versions.patch \
b/recipes/libiconv/0001-Use-correct-autotools-versions.patch index 3fd5596..751bc4b \
100644
--- a/recipes/libiconv/0001-Use-correct-autotools-versions.patch
+++ b/recipes/libiconv/0001-Use-correct-autotools-versions.patch
@@ -1,4 +1,4 @@
-From de6c08eedac8e0ed7bd7f8099ecb94cbee5d3e58 Mon Sep 17 00:00:00 2001
+From 14da1c1216fcbdecf4956d73e8be3278d0caaab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian Dröge?= <sebastian.droege@collabora.co.uk>
Date: Tue, 21 Aug 2012 13:37:42 +0200
Subject: [PATCH 1/3] Use correct autotools versions
@@ -61,5 +61,5 @@ index 544059a..c8ac0a8 100644
RM = rm -f
--
-1.8.4
+1.8.1.2
diff --git a/recipes/libiconv/0002-stdint-Add-support-for-Android.patch \
b/recipes/libiconv/0002-Add-support-for-Android.patch similarity index 55%
rename from recipes/libiconv/0002-stdint-Add-support-for-Android.patch
rename to recipes/libiconv/0002-Add-support-for-Android.patch
index b334706..80f852e 100644
--- a/recipes/libiconv/0002-stdint-Add-support-for-Android.patch
+++ b/recipes/libiconv/0002-Add-support-for-Android.patch
@@ -1,28 +1,26 @@
-From 11cd159f52a9abb8835b1d03cd3560f5ccc06e63 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Sat, 21 Jan 2012 13:09:08 +0100
-Subject: [PATCH] stdint: Add support for Android.
+From 9a20774d34736e9c5b7464ff9105001cf929c720 Mon Sep 17 00:00:00 2001
+From: Andoni Morales Alastruey <ylatuya@gmail.com>
+Date: Tue, 29 Oct 2013 01:41:43 +0100
+Subject: [PATCH 2/3] Add support for Android
-* lib/stdint.in.h: When included from Bionic <sys/types.h>, just
-include the system's <stdint.h>.
-Reported by Simon Josefsson <simon@josefsson.org>.
---
- ChangeLog | 7 +++++++
- lib/stdint.in.h | 9 +++++++++
- 2 files changed, 16 insertions(+)
+ srclib/stdint.in.h | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
diff --git a/srclib/stdint.in.h b/srclib/stdint.in.h
-index 69e83dc..591371c 100644
+index b6d08c7..bd62bea 100644
--- a/srclib/stdint.in.h
+++ b/srclib/stdint.in.h
-@@ -34,6 +34,14 @@
+@@ -34,6 +34,16 @@
<inttypes.h>. */
#define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+/* On Android (Bionic libc), <sys/types.h> includes this file before
+ having defined 'time_t'. Therefore in this case avoid including
-+ other system header files; just include the system's <stdint.h>. */
-+#if defined __BIONIC__ \
++ other system header files; just include the system's <stdint.h>.
++ Ideally we should test __BIONIC__ here, but it is only defined after
++ <sys/cdefs.h> has been included; hence test __ANDROID__ instead. */
++#if defined __ANDROID__ \
+ && defined _SYS_TYPES_H_ && !defined _SSIZE_T_DEFINED_
+# @INCLUDE_NEXT@ @NEXT_STDINT_H@
+#else
@@ -30,12 +28,12 @@ index 69e83dc..591371c 100644
/* Get those types that are already defined in other system include
files, so that we can "#define int8_t signed char" below without
worrying about a later system include file containing a "typedef
-@@ -606,4 +614,5 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof \
(uintmax_t)
- #endif
+@@ -603,4 +613,5 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof \
(uintmax_t) + #endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
#endif /* _@GUARD_PREFIX@_STDINT_H */
-+#endif /* !(defined __BIONIC__ && ...) */
++#endif /* !(defined __ANDROID__ && ...) */
#endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined \
_GL_JUST_INCLUDE_SYSTEM_STDINT_H */
--
-1.8.4
+1.8.1.2
diff --git a/recipes/libiconv/0005-stdint-fix-build-with-Android-s-Bionic-fox-x86.patch \
b/recipes/libiconv/0003-stdint-fix-build-with-Android-s-Bionic-fox-x86.patch \
similarity index 73% rename from \
recipes/libiconv/0005-stdint-fix-build-with-Android-s-Bionic-fox-x86.patch rename to \
recipes/libiconv/0003-stdint-fix-build-with-Android-s-Bionic-fox-x86.patch index \
6a84ad6..f77900c 100644
--- a/recipes/libiconv/0005-stdint-fix-build-with-Android-s-Bionic-fox-x86.patch
+++ b/recipes/libiconv/0003-stdint-fix-build-with-Android-s-Bionic-fox-x86.patch
@@ -1,7 +1,7 @@
-From 1e3c93f9fcf473eaaf772a352c4db0e59b9f1ea4 Mon Sep 17 00:00:00 2001
+From 553f9a811245684009c4588a90afbdfa2a42e2dc Mon Sep 17 00:00:00 2001
From: Andoni Morales Alastruey <ylatuya@gmail.com>
Date: Tue, 15 Jan 2013 11:41:52 +0100
-Subject: [PATCH] stdint: fix build with Android's Bionic fox x86
+Subject: [PATCH 3/3] stdint: fix build with Android's Bionic fox x86
* lib/stdint.in.h: fix check to test if included-fixed/sys/types.h
was already included as _SSIZE_T_DEFINED_ might also be defined
@@ -9,15 +9,14 @@ in include/machine/_types.h, which is included by stdio.h
Signed-off-by: Eric Blake <eblake@redhat.com>
---
- ChangeLog | 7 +++++++
- lib/stdint.in.h | 2 +-
- 2 files changed, 8 insertions(+), 1 deletion(-)
+ srclib/stdint.in.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srclib/stdint.in.h b/srclib/stdint.in.h
-index e1108c5..1896015 100644
+index bd62bea..1ada667 100644
--- a/srclib/stdint.in.h
+++ b/srclib/stdint.in.h
-@@ -39,7 +39,7 @@
+@@ -40,7 +40,7 @@
Ideally we should test __BIONIC__ here, but it is only defined after
<sys/cdefs.h> has been included; hence test __ANDROID__ instead. */
#if defined __ANDROID__ \
@@ -27,5 +26,5 @@ index e1108c5..1896015 100644
#else
--
-1.8.4
+1.8.1.2
diff --git a/recipes/libiconv/0004-stdint-Improve-support-for-Android.patch \
b/recipes/libiconv/0004-stdint-Improve-support-for-Android.patch deleted file mode \
100644 index ad9b023..0000000
--- a/recipes/libiconv/0004-stdint-Improve-support-for-Android.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 98716b76d5f78e8ea0670b841ca470dffefb53d9 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Tue, 24 Jan 2012 12:22:41 +0100
-Subject: [PATCH] stdint: Improve support for Android.
-
-* lib/stdint.in.h: Test __ANDROID__, not __BIONIC__.
-Reported by Simon Josefsson <simon@josefsson.org>.
----
- ChangeLog | 6 ++++++
- lib/stdint.in.h | 8 +++++---
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/srclib/stdint.in.h b/srclib/stdint.in.h
-index 591371c..1d0759e 100644
---- a/srclib/stdint.in.h
-+++ b/srclib/stdint.in.h
-@@ -36,8 +36,10 @@
-
- /* On Android (Bionic libc), <sys/types.h> includes this file before
- having defined 'time_t'. Therefore in this case avoid including
-- other system header files; just include the system's <stdint.h>. */
--#if defined __BIONIC__ \
-+ other system header files; just include the system's <stdint.h>.
-+ Ideally we should test __BIONIC__ here, but it is only defined after
-+ <sys/cdefs.h> has been included; hence test __ANDROID__ instead. */
-+#if defined __ANDROID__ \
- && defined _SYS_TYPES_H_ && !defined _SSIZE_T_DEFINED_
- # @INCLUDE_NEXT@ @NEXT_STDINT_H@
- #else
-@@ -614,5 +616,5 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof \
(uintmax_t)
- #endif
-
- #endif /* _@GUARD_PREFIX@_STDINT_H */
--#endif /* !(defined __BIONIC__ && ...) */
-+#endif /* !(defined __ANDROID__ && ...) */
- #endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined \
_GL_JUST_INCLUDE_SYSTEM_STDINT_H */
---
-1.8.4
-
_______________________________________________
gstreamer-commits mailing list
gstreamer-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/gstreamer-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic