vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <[email protected]> | Sat Feb 25 00:13:29 2012 +0100| [21c91469433938fabb79279d549e99abff828513] | committer: Jean-Baptiste Kempf
Contribs: Upgrade schroendinger to 1.0.11 (cherry picked from commit 72c35564542f44a42c3c977ddeb99864bde6839b) (cherry picked from commit 9457b4e1444438a7953bdb75567f2b7051db422d) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=21c91469433938fabb79279d549e99abff828513 --- contrib/src/schroedinger/SHA512SUMS | 2 +- contrib/src/schroedinger/android.patch | 12 ++++++------ contrib/src/schroedinger/rules.mak | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/src/schroedinger/SHA512SUMS b/contrib/src/schroedinger/SHA512SUMS index fa8f1e6..cfb5d98 100644 --- a/contrib/src/schroedinger/SHA512SUMS +++ b/contrib/src/schroedinger/SHA512SUMS @@ -1 +1 @@ -732264bcf1a3d1005924d93534bb36f1473fcb94d288165b0184f2728029b2a496bbe9c06794e26a97a4f20516eda163b1e92768f4127670ff70af9b38f1ef19 schroedinger-1.0.10.tar.gz +a39dd5360eb87a63379de71d91f48cde309ded91632c0ab8b1dc76b73591f7d0dfa7003c606d1b546d495b18c916aae905a9540b48dff7cbeb5b289e0f880438 schroedinger-1.0.11.tar.gz diff --git a/contrib/src/schroedinger/android.patch b/contrib/src/schroedinger/android.patch index a5be6fe..43c156e 100644 --- a/contrib/src/schroedinger/android.patch +++ b/contrib/src/schroedinger/android.patch @@ -1,9 +1,9 @@ ---- schroedinger/schroedinger/schroorc-dist.c.orig 2011-12-28 10:22:01.620224002 -0500 -+++ schroedinger/schroedinger/schroorc-dist.c 2011-12-28 10:22:12.880224003 -0500 -@@ -200,7 +200,7 @@ - #define ORC_ISNAN(x) ((((x)&0x7f800000) == 0x7f800000) && (((x)&0x007fffff) != 0)) - #define ORC_DENORMAL_DOUBLE(x) ((x) & ((((x)&ORC_UINT64_C(0x7ff0000000000000)) == 0) ? ORC_UINT64_C(0xfff0000000000000) : ORC_UINT64_C(0xffffffffffffffff))) - #define ORC_ISNAN_DOUBLE(x) ((((x)&ORC_UINT64_C(0x7ff0000000000000)) == ORC_UINT64_C(0x7ff0000000000000)) && (((x)&ORC_UINT64_C(0x000fffffffffffff)) != 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 diff --git a/contrib/src/schroedinger/rules.mak b/contrib/src/schroedinger/rules.mak index ebecc9e..7909ffa 100644 --- a/contrib/src/schroedinger/rules.mak +++ b/contrib/src/schroedinger/rules.mak @@ -1,6 +1,6 @@ # schroedinger -SCHROEDINGER_VERSION := 1.0.10 +SCHROEDINGER_VERSION := 1.0.11 SCHROEDINGER_URL := http://diracvideo.org/download/schroedinger/schroedinger-$(SCHROEDINGER_VERSION).tar.gz PKGS += schroedinger _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
