Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
c848f906
Commit
c848f906
authored
Jun 08, 2014
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: schroedinger: remove obsolete patches
parent
351af417
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
63 deletions
+0
-63
contrib/src/orc/android.patch
contrib/src/orc/android.patch
+0
-49
contrib/src/orc/rules.mak
contrib/src/orc/rules.mak
+0
-2
contrib/src/schroedinger/android.patch
contrib/src/schroedinger/android.patch
+0
-11
contrib/src/schroedinger/rules.mak
contrib/src/schroedinger/rules.mak
+0
-1
No files found.
contrib/src/orc/android.patch
deleted
100644 → 0
View file @
351af417
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"
contrib/src/orc/rules.mak
View file @
c848f906
...
...
@@ -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
$@
contrib/src/schroedinger/android.patch
deleted
100644 → 0
View file @
351af417
--- 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__
contrib/src/schroedinger/rules.mak
View file @
c848f906
...
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment