[vlc-commits] contrib: schroedinger: remove obsolete patches

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Jun  8 12:30:32 2014 -0700| [c848f90600c23110fd6ada9b57a4c333b0a6d683] | committer: Rafaël Carré

contrib: schroedinger: remove obsolete patches

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c848f90600c23110fd6ada9b57a4c333b0a6d683
---

 contrib/src/orc/android.patch          |   49 --------------------------------
 contrib/src/orc/rules.mak              |    2 --
 contrib/src/schroedinger/android.patch |   11 -------
 contrib/src/schroedinger/rules.mak     |    1 -
 4 files changed, 63 deletions(-)

diff --git a/contrib/src/orc/android.patch b/contrib/src/orc/android.patch
deleted file mode 100644
index 4c30a4e..0000000
--- a/contrib/src/orc/android.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ur orc.orig/configure.ac orc/configure.ac
---- orc.orig/configure.ac	2011-12-28 10:09:52.724224002 -0500
-+++ orc/configure.ac	2011-12-28 10:14:06.056224002 -0500
-@@ -67,6 +67,21 @@
-    )
- AC_SUBST(LIBRT)
- 
-+HAVE_ANDROID=0
-+AC_MSG_CHECKING([for an Android system])
-+    AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
-+                [[#ifndef __ANDROID__
-+# error Not Android
-+#endif
-+                ]],[[;]])
-+            ],[
-+            HAVE_ANDROID="1"
-+            AC_MSG_RESULT([yes])
-+            ],[
-+            AC_MSG_RESULT([no])
-+            ])
-+test "${HAVE_ANDROID}" = "1" && AC_DEFINE([ORC_RESTRICT],[__restrict__], [restrict keyword])
-+
- AC_CACHE_CHECK(for monotonic clocks,
-     orc_cv_monotonic_clock,AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
- #include <time.h>
-diff -ur orc.orig/orc/orcfunctions.h orc/orc/orcfunctions.h
---- orc.orig/orc/orcfunctions.h	2011-12-28 10:09:52.736224002 -0500
-+++ orc/orc/orcfunctions.h	2011-12-28 10:15:01.216224002 -0500
-@@ -58,7 +58,7 @@
- typedef union { orc_int64 i; double f; orc_int32 x2[2]; float x2f[2]; orc_int16 x4[4]; } orc_union64;
- #endif
- #ifndef ORC_RESTRICT
--#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && !defined(__ANDROID__)
- #define ORC_RESTRICT restrict
- #elif defined(__GNUC__) && __GNUC__ >= 4
- #define ORC_RESTRICT __restrict__
-diff -ru orc.orig/orc/orcprogram-c.c orc/orc/orcprogram-c.c
---- orc.orig/orc/orcprogram-c.c	2011-12-28 10:18:36.624224002 -0500
-+++ orc/orc/orcprogram-c.c	2011-12-28 10:19:12.232224002 -0500
-@@ -76,7 +76,7 @@
-     "typedef union { orc_int64 i; double f; orc_int32 x2[2]; float x2f[2]; orc_int16 x4[4]; } orc_union64;\n"
-     "#endif\n"
-     "#ifndef ORC_RESTRICT\n"
--    "#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L\n"
-+    "#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && !defined(__ANDROID__)\n"
-     "#define ORC_RESTRICT restrict\n"
-     "#elif defined(__GNUC__) && __GNUC__ >= 4\n"
-     "#define ORC_RESTRICT __restrict__\n"
diff --git a/contrib/src/orc/rules.mak b/contrib/src/orc/rules.mak
index c79e552..81c6438 100644
--- a/contrib/src/orc/rules.mak
+++ b/contrib/src/orc/rules.mak
@@ -15,12 +15,10 @@ $(TARBALLS)/orc-$(ORC_VERSION).tar.gz:
 
 orc: orc-$(ORC_VERSION).tar.gz .sum-orc
 	$(UNPACK)
-	$(APPLY) $(SRC)/orc/android.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
 .orc: orc
-	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/schroedinger/android.patch b/contrib/src/schroedinger/android.patch
deleted file mode 100644
index 43c156e..0000000
--- a/contrib/src/schroedinger/android.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- schroedinger/schroedinger/schroorc-dist.c.orig	2012-01-23 01:44:05.000000000 +0100
-+++ schroedinger/schroedinger/schroorc-dist.c	2012-02-25 16:21:34.387026910 +0100
-@@ -52,7 +52,7 @@
- typedef union { orc_int64 i; double f; orc_int32 x2[2]; float x2f[2]; orc_int16 x4[4]; } orc_union64;
- #endif
- #ifndef ORC_RESTRICT
--#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && !defined(__ANDROID__)
- #define ORC_RESTRICT restrict
- #elif defined(__GNUC__) && __GNUC__ >= 4
- #define ORC_RESTRICT __restrict__
diff --git a/contrib/src/schroedinger/rules.mak b/contrib/src/schroedinger/rules.mak
index 7909ffa..79270af 100644
--- a/contrib/src/schroedinger/rules.mak
+++ b/contrib/src/schroedinger/rules.mak
@@ -16,7 +16,6 @@ $(TARBALLS)/schroedinger-$(SCHROEDINGER_VERSION).tar.gz:
 schroedinger: schroedinger-$(SCHROEDINGER_VERSION).tar.gz .sum-schroedinger
 	$(UNPACK)
 	$(APPLY) $(SRC)/schroedinger/schroedinger-notests.patch
-	$(APPLY) $(SRC)/schroedinger/android.patch
 	$(MOVE)
 
 DEPS_schroedinger = orc $(DEPS_orc)