[vlc-devel] Contrib patches

[Felix Paul Kühne]

On 21.03.2012, at 17:27, Rafaël Carré wrote:

> Le 2012-03-21 09:27, Felix Paul Kühne a écrit :
>> +++ b/contrib/src/ogg/libogg-disable-check.patch
>> @@ -0,0 +1,12 @@
>> +diff -ru libogg/src/Makefile.am libogg/src/Makefile.am
>> +--- libogg/src/Makefile.am	2011-08-04 19:07:42.000000000 +0200
>> ++++ libogg-f/src/Makefile.am	2012-03-21 13:05:23.000000000 +0100
>> +@@ -9,7 +9,7 @@
>> + 
>> + # build and run the self tests on 'make check'
>> + 
>> +-noinst_PROGRAMS = test_bitwise test_framing
>> ++noinst_PROGRAMS =
>> + 
>> + test_bitwise_SOURCES = bitwise.c
>> + test_bitwise_CFLAGS = -D_V_SELFTEST
>> diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
>> index 5d49122..a9d833e 100644
>> --- a/contrib/src/ogg/rules.mak
>> +++ b/contrib/src/ogg/rules.mak
>> @@ -22,11 +22,16 @@ libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
>> ifdef HAVE_WINCE
>> 	$(APPLY) $(SRC)/ogg/libogg-wince.patch
>> endif
>> +ifdef HAVE_IOS
>> +	$(APPLY) $(SRC)/ogg/libogg-disable-check.patch
>> +endif
> 
> Make that unconditionnal
> 
>> 	$(UPDATE_AUTOCONFIG)
>> 	$(MOVE)
>> 
>> .ogg: libogg
>> -	#$(RECONF)
>> +ifdef HAVE_IOS
>> +	$(RECONF)
>> +endif
> 
> Idem

OK.

>> 0005-contrib-lua-added-support-for-iOS.patch
>> 
>> 
>> From 92bf9e277b6d954587283cc3d57fc390832a594a Mon Sep 17 00:00:00 2001
>> From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne at videolan.org>
>> Date: Wed, 21 Mar 2012 14:00:54 +0100
>> Subject: [PATCH 5/6] contrib/lua: added support for iOS
>> 
>> ---
>> contrib/src/lua/lua-ios-support.patch |   25 +++++++++++++++++++++++++
>> contrib/src/lua/rules.mak             |    8 +++++++-
>> 2 files changed, 32 insertions(+), 1 deletions(-)
>> create mode 100644 contrib/src/lua/lua-ios-support.patch
>> 
>> diff --git a/contrib/src/lua/lua-ios-support.patch b/contrib/src/lua/lua-ios-support.patch
>> new file mode 100644
>> index 0000000..014a1e3
>> --- /dev/null
>> +++ b/contrib/src/lua/lua-ios-support.patch
>> @@ -0,0 +1,25 @@
>> +diff -ru lua/Makefile lua-f/Makefile
>> +--- lua/Makefile	2008-08-12 02:40:48.000000000 +0200
>> ++++ lua-f/Makefile	2012-03-21 13:58:30.000000000 +0100
>> +@@ -38,7 +38,7 @@
>> + # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
>> + 
>> + # Convenience platforms targets.
>> +-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
>> ++PLATS= aix ansi bsd freebsd generic linux ios macosx mingw posix solaris
>> + 
>> + # What to install.
>> + TO_BIN= lua luac
>> +diff -ru lua/src/Makefile lua-f/src/Makefile
>> +--- lua/src/Makefile	2012-03-21 13:58:59.000000000 +0100
>> ++++ lua-f/src/Makefile	2012-03-21 13:57:08.000000000 +0100
>> +@@ -98,6 +98,9 @@
>> + linux:
>> + 	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl"
>> + 
>> ++ios:
>> ++	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX
> 
> 
> LUA_USE_LINUX? really?
Yes, that's what the macosx target is using as well.

> 
>> ++
>> + macosx:
>> + 	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
>> + # use this on Mac OS X 10.3-
>> diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak
>> index 765f4e2..dc6d7e9 100644
>> --- a/contrib/src/lua/rules.mak
>> +++ b/contrib/src/lua/rules.mak
>> @@ -14,6 +14,9 @@ endif
>> ifdef HAVE_MACOSX
>> LUA_TARGET := macosx
>> endif
>> +ifdef HAVE_IOS
>> +LUA_TARGET := ios
>> +endif
>> ifdef HAVE_WIN32
>> LUA_TARGET := mingw
>> endif
>> @@ -34,12 +37,15 @@ lua: lua-$(LUA_VERSION).tar.gz .sum-lua
>> 	$(APPLY) $(SRC)/lua/lua-noreadline.patch
>> 	$(APPLY) $(SRC)/lua/luac-32bits.patch
>> 	$(APPLY) $(SRC)/lua/no-localeconv.patch
>> -ifdef HAVE_MACOSX
>> +ifdef HAVE_DARWIN_OS
>> 	(cd $(UNPACK_DIR) && \
>> 	sed -e 's%gcc%$(CC)%' \
>> 		-e 's%LDFLAGS=%LDFLAGS=$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' \
>> 		-i.orig src/Makefile)
>> endif
>> +ifdef HAVE_IOS
>> +	$(APPLY) $(SRC)/lua/lua-ios-support.patch
>> +endif
> 
> Make that unconditional since the patch doesn't affect other platforms

Okay. I thought that we shouldn't apply patches which aren't used anyway, but sure, I can do that.

> 
>> ifdef HAVE_WIN32
>> 	cd $(UNPACK_DIR) && sed -i.orig -e 's/lua luac/lua.exe/' Makefile
>> endif
>> -- 1.7.7.5 (Apple Git-26)
> 
> Btw what is the problem with the macosx target?
It tries to use -lreadline, which isn't available on iOS.


Thanks for the review!

Felix