Commit 6b4239f7 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

patches: remove patches merged upstream

parent 2df23bbe
From 316586ace910955aaa800b7883cc941f9d3a9cd9 Mon Sep 17 00:00:00 2001
From: Gleb Pinigin <gpinigin@gmail.com>
Date: Fri, 19 Jul 2013 20:52:51 +0700
Subject: [PATCH] ios: disable VNCServer contrib
---
extras/package/ios/build.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index c9fea60..bf065b0 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -203,6 +203,7 @@ fi
--disable-samplerate \
--disable-goom \
--disable-gcrypt \
+ --disable-vncserver \
--disable-gnutls \
--disable-orc \
--disable-schroedinger \
--
1.7.12.4 (Apple Git-37)
From bd9bc29764da7cdbe7a88f25b90f8c6e0b6aad01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sat, 20 Jul 2013 21:46:17 +0200
Subject: [PATCH 12/12] contrib: export CCAS correctly
---
contrib/src/main.mak | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 69465e6..132ab7d 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -131,6 +131,7 @@ AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
else
AS=xcrun as
endif
+CCAS=gas-preprocessor.pl $(CC)
AR=xcrun ar
LD=xcrun ld
STRIP=xcrun strip
@@ -249,7 +250,7 @@ endif
HOSTTOOLS := \
CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
- AR="$(AR)" RANLIB="$(RANLIB)" STRIP="$(STRIP)" \
+ AR="$(AR)" CCAS="$(CCAS)" RANLIB="$(RANLIB)" STRIP="$(STRIP)" \
PATH="$(PREFIX)/bin:$(PATH)"
HOSTVARS := $(HOSTTOOLS) \
CPPFLAGS="$(CPPFLAGS)" \
--
1.8.3.1 (Apple Git-46)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment