浏览代码

Remove patches merged upstream

Felix Paul Kühne 11 年之前
父节点
当前提交
33f93615dc

+ 0 - 24
patches/0004-extras-ios-enable-zvbi-compilation.patch

@@ -1,25 +0,0 @@
-From 0b437a1b4aec64429b9f8fc759e1834110ba2a36 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Thu, 8 Aug 2013 22:12:57 +0200
-Subject: [PATCH 04/17] extras/ios: enable zvbi compilation
-
----
- extras/package/ios/build.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
-index 39d90bd..8155062 100755
---- a/extras/package/ios/build.sh
-+++ b/extras/package/ios/build.sh
-@@ -190,7 +190,7 @@ fi
-     --disable-sdl \
-     --disable-SDL_image \
-     --disable-iconv \
--    --disable-zvbi \
-+    --enable-zvbi \
-     --disable-kate \
-     --disable-caca \
-     --disable-gettext \
-1.7.12.4 (Apple Git-37)
-

+ 0 - 27
patches/0015-contribs-zvbi-don-t-reconf-after-decompressing-the-s.patch

@@ -1,28 +0,0 @@
-From dd8ba1147111e9a80938d9ce107384678d296e6a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Thu, 8 Aug 2013 21:47:46 +0200
-Subject: [PATCH 15/17] contribs/zvbi: don't reconf after decompressing the
- source code so we don't need to compile gettext just
- for this
-
----
- contrib/src/zvbi/rules.mak | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/contrib/src/zvbi/rules.mak b/contrib/src/zvbi/rules.mak
-index 7584eed..627ae7c 100644
---- a/contrib/src/zvbi/rules.mak
-+++ b/contrib/src/zvbi/rules.mak
-@@ -41,7 +41,9 @@ ZVBI_CFLAGS += -DPTW32_STATIC_LIB
- endif
- 
- .zvbi: zvbi
-+ifndef HAVE_IOS
- 	$(RECONF)
-+endif
- 	cd $< && $(HOSTVARS) CFLAGS="$(ZVBI_CFLAGS)" ./configure $(ZVBICONF)
- 	cd $</src && $(MAKE) install
- 	cd $< && $(MAKE) SUBDIRS=. install
-1.7.12.4 (Apple Git-37)
-