diff options
| author | S. Davilla <davilla@4pi.com> | 2011-03-19 20:55:29 -0400 |
|---|---|---|
| committer | S. Davilla <davilla@4pi.com> | 2011-03-19 20:55:29 -0400 |
| commit | f5605cd352445aa0ed1db0dc6e1ca36e95da807b (patch) | |
| tree | 9b73ba1b7ea2252e5508470c1a4d8ee55def02e4 /tools/osx | |
| parent | 7d8afcdb6e7204e8270b8ffd896bf2976691b98c (diff) | |
[osx/ios] fixed librtmp build. Thanks jingai(Jonathan Lane)
Diffstat (limited to 'tools/osx')
4 files changed, 31 insertions, 21 deletions
diff --git a/tools/osx/ios-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch b/tools/osx/ios-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch index b71ffb4484..358a0ff6f7 100644 --- a/tools/osx/ios-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch +++ b/tools/osx/ios-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch @@ -49,23 +49,22 @@ diff -uNr rtmpdump-2.3/librtmp/Makefile rtmpdump-2.3-org/librtmp/Makefile SYS=posix CRYPTO=OPENSSL -@@ -27,8 +27,15 @@ +@@ -27,8 +27,14 @@ SO_posix=so.0 SO_mingw=dll -+SO_darwin=so.0 ++SO_darwin=0.dylib SO_EXT=$(SO_$(SYS)) +SO_LDFLAGS_posix=-shared -Wl,-soname,$@ +SO_LDFLAGS_mingw= -+SO_LDFLAGS_darwin=-bundle -flat_namespace -undefined suppress -fno-common \ -+ -headerpad_max_install_names $(XLDFLAGS) ++SO_LDFLAGS_darwin=-dynamiclib -twolevel_namespace $(XLDFLAGS) +SO_LDFLAGS=$(SO_LDFLAGS_$(SYS)) + SHARED=yes SODEF_yes=-fPIC SOLIB_yes=librtmp.$(SO_EXT) -@@ -61,7 +68,7 @@ +@@ -61,7 +67,7 @@ $(AR) rs $@ $? librtmp.$(SO_EXT): $(OBJS) @@ -74,3 +73,13 @@ diff -uNr rtmpdump-2.3/librtmp/Makefile rtmpdump-2.3-org/librtmp/Makefile ln -sf $@ librtmp.so log.o: log.c log.h Makefile +@@ -87,5 +93,9 @@ + cp librtmp.so.0 $(LIBDIR) + cd $(LIBDIR); ln -sf librtmp.so.0 librtmp.so + ++install_0.dylib: librtmp.0.dylib ++ cp librtmp.0.dylib $(LIBDIR) ++ cd $(LIBDIR); ln -sf librtmp.0.dylib librtmp.dylib ++ + install_dll: librtmp.dll + cp librtmp.dll $(BINDIR) diff --git a/tools/osx/ios-depends/librtmp/Makefile b/tools/osx/ios-depends/librtmp/Makefile index a10ae57f06..2e4feead26 100644 --- a/tools/osx/ios-depends/librtmp/Makefile +++ b/tools/osx/ios-depends/librtmp/Makefile @@ -11,7 +11,6 @@ LIBNAME=rtmpdump VERSION=2.3 SOURCE=$(LIBNAME)-$(VERSION) # download location and format -#BASE_URL=http://rtmpdump.mplayerhq.hu/download BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs ARCHIVE=$(SOURCE).tgz TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs @@ -21,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib @@ -45,12 +41,10 @@ $(LIBDYLIB): $(SOURCE) .installed: make SYS=darwin prefix=$(PREFIX) -C $(SOURCE)/librtmp install - cp $(PREFIX)/lib/librtmp.so ../../../../system/ touch $@ clean: - make -C $(SOURCE) clean - rm -f ../../../../system/librtmp.so + make SYS=darwin -C $(SOURCE) clean rm -f .installed distclean:: diff --git a/tools/osx/osx-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch b/tools/osx/osx-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch index b71ffb4484..358a0ff6f7 100644 --- a/tools/osx/osx-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch +++ b/tools/osx/osx-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch @@ -49,23 +49,22 @@ diff -uNr rtmpdump-2.3/librtmp/Makefile rtmpdump-2.3-org/librtmp/Makefile SYS=posix CRYPTO=OPENSSL -@@ -27,8 +27,15 @@ +@@ -27,8 +27,14 @@ SO_posix=so.0 SO_mingw=dll -+SO_darwin=so.0 ++SO_darwin=0.dylib SO_EXT=$(SO_$(SYS)) +SO_LDFLAGS_posix=-shared -Wl,-soname,$@ +SO_LDFLAGS_mingw= -+SO_LDFLAGS_darwin=-bundle -flat_namespace -undefined suppress -fno-common \ -+ -headerpad_max_install_names $(XLDFLAGS) ++SO_LDFLAGS_darwin=-dynamiclib -twolevel_namespace $(XLDFLAGS) +SO_LDFLAGS=$(SO_LDFLAGS_$(SYS)) + SHARED=yes SODEF_yes=-fPIC SOLIB_yes=librtmp.$(SO_EXT) -@@ -61,7 +68,7 @@ +@@ -61,7 +67,7 @@ $(AR) rs $@ $? librtmp.$(SO_EXT): $(OBJS) @@ -74,3 +73,13 @@ diff -uNr rtmpdump-2.3/librtmp/Makefile rtmpdump-2.3-org/librtmp/Makefile ln -sf $@ librtmp.so log.o: log.c log.h Makefile +@@ -87,5 +93,9 @@ + cp librtmp.so.0 $(LIBDIR) + cd $(LIBDIR); ln -sf librtmp.so.0 librtmp.so + ++install_0.dylib: librtmp.0.dylib ++ cp librtmp.0.dylib $(LIBDIR) ++ cd $(LIBDIR); ln -sf librtmp.0.dylib librtmp.dylib ++ + install_dll: librtmp.dll + cp librtmp.dll $(BINDIR) diff --git a/tools/osx/osx-depends/librtmp/Makefile b/tools/osx/osx-depends/librtmp/Makefile index c423d00477..2e4feead26 100644 --- a/tools/osx/osx-depends/librtmp/Makefile +++ b/tools/osx/osx-depends/librtmp/Makefile @@ -11,7 +11,7 @@ LIBNAME=rtmpdump VERSION=2.3 SOURCE=$(LIBNAME)-$(VERSION) # download location and format -BASE_URL=http://rtmpdump.mplayerhq.hu/download +BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs ARCHIVE=$(SOURCE).tgz TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs RETRIEVE_TOOL=/usr/bin/curl @@ -41,12 +41,10 @@ $(LIBDYLIB): $(SOURCE) .installed: make SYS=darwin prefix=$(PREFIX) -C $(SOURCE)/librtmp install - cp $(PREFIX)/lib/librtmp.so ../../../../system/ touch $@ clean: - make -C $(SOURCE) clean - rm -f ../../../../system/librtmp.so + make SYS=darwin -C $(SOURCE) clean rm -f .installed distclean:: |