[vlc-commits] Contribs: update orc to 0.4.17

[Jean-Baptiste Kempf]

vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jul  4 19:02:37 2013 +0200| [4560267103910d7b843099df31654865cacecc84] | committer: Jean-Baptiste Kempf

Contribs: update orc to 0.4.17

(cherry picked from commit a3022ae9b3760395759a7c852e98d9184465a128)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/orc/SHA512SUMS       |    2 +-
 contrib/src/orc/orc-stdint.patch |   30 ------------------------------
 contrib/src/orc/rules.mak        |    3 +--
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/contrib/src/orc/SHA512SUMS b/contrib/src/orc/SHA512SUMS
index db04c82..9c29991 100644
--- a/contrib/src/orc/SHA512SUMS
+++ b/contrib/src/orc/SHA512SUMS
@@ -1 +1 @@
-e9d3c4e8682119253c201addcd2cb623a61e45d7cb8b0b406a3509f1a9443af9375a418a68f832d29af4a523cd91bf702bdd002cf143be0f7cc9f5a0b77f7ae0  orc-0.4.16.tar.gz
+3a69da6d39e80dd68570aeac341aed692c041c1cfd91abbc36a269167a9b97b5ab539b873dbf800d4735da276e3aa43d664a7efb13559124e0862d2fc2202306  orc-0.4.17.tar.gz
diff --git a/contrib/src/orc/orc-stdint.patch b/contrib/src/orc/orc-stdint.patch
deleted file mode 100644
index 4f97829..0000000
--- a/contrib/src/orc/orc-stdint.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- orc/orc/orc.h	2011-04-14 21:07:08.000000000 +0200
-+++ orc.new/orc/orc.h	2011-05-08 19:03:51.294908858 +0200
-@@ -2,6 +2,7 @@
- #ifndef _ORC_ORC_H_
- #define _ORC_ORC_H_
- 
-+#include <orc/orcutils.h>
- #include <orc/orcprogram.h>
- #include <orc/orc-stdint.h>
- #include <orc/orcarm.h>
-@@ -12,7 +13,6 @@
- #include <orc/orcparse.h>
- #include <orc/orcprogram.h>
- #include <orc/orcsse.h>
--#include <orc/orcutils.h>
- #include <orc/orcx86.h>
- #include <orc/orcpowerpc.h>
- 
---- orc/orc/orcutils.h	2011-04-28 00:29:24.000000000 +0200
-+++ orc.new/orc/orcutils.h	2011-05-08 19:10:13.380803529 +0200
-@@ -30,8 +30,8 @@
- 
- #ifndef _ORC_INTEGER_TYPEDEFS_
- #define _ORC_INTEGER_TYPEDEFS_
--#if defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L
- #include <stdint.h>
-+#if defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L
- typedef int8_t orc_int8;
- typedef int16_t orc_int16;
- typedef int32_t orc_int32;
diff --git a/contrib/src/orc/rules.mak b/contrib/src/orc/rules.mak
index 13007e2..ad7b074 100644
--- a/contrib/src/orc/rules.mak
+++ b/contrib/src/orc/rules.mak
@@ -1,6 +1,6 @@
 # orc
 
-ORC_VERSION := 0.4.16
+ORC_VERSION := 0.4.17
 
 ORC_URL := http://code.entropywave.com/download/orc/orc-$(ORC_VERSION).tar.gz
 
@@ -15,7 +15,6 @@ $(TARBALLS)/orc-$(ORC_VERSION).tar.gz:
 
 orc: orc-$(ORC_VERSION).tar.gz .sum-orc
 	$(UNPACK)
-	$(APPLY) $(SRC)/orc/orc-stdint.patch
 	$(APPLY) $(SRC)/orc/android.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)