Commit 40531e0e authored by Rafaël Carré's avatar Rafaël Carré Committed by Jean-Baptiste Kempf

live555: patch after extracting, before compiling

(cherry picked from commit 341253ed)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 1a868911
...@@ -11,16 +11,6 @@ $(TARBALLS)/$(LIVE555_FILE): ...@@ -11,16 +11,6 @@ $(TARBALLS)/$(LIVE555_FILE):
.sum-live555: $(LIVE555_FILE) .sum-live555: $(LIVE555_FILE)
live555: $(LIVE555_FILE) .sum-live555
rm -Rf live
$(UNPACK)
chmod -R u+w live
ifdef HAVE_ANDROID
patch -p0 < $(SRC)/live555/android.patch
endif
mv live $@
touch $@
LIVE_TARGET = $(error live555 target not defined!) LIVE_TARGET = $(error live555 target not defined!)
ifdef HAVE_LINUX ifdef HAVE_LINUX
LIVE_TARGET := linux LIVE_TARGET := linux
...@@ -35,19 +25,29 @@ ifdef HAVE_MACOSX ...@@ -35,19 +25,29 @@ ifdef HAVE_MACOSX
LIVE_TARGET := macosx LIVE_TARGET := macosx
endif endif
.live555: live555 live555: $(LIVE555_FILE) .sum-live555
rm -Rf live
$(UNPACK)
chmod -R u+w live
ifdef HAVE_ANDROID
patch -p0 < $(SRC)/live555/android.patch
endif
ifdef HAVE_WINCE ifdef HAVE_WINCE
cd $< && sed -e 's/-lws2_32/-lws2/g' -i.orig config.mingw cd live && sed -e 's/-lws2_32/-lws2/g' -i.orig config.mingw
endif endif
ifdef HAVE_MACOSX ifdef HAVE_MACOSX
cd $< && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx* cd live && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
endif endif
cd $< && sed \ cd live && sed \
-e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' \ -e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' \
-e 's%cc%$(CC)%' \ -e 's%cc%$(CC)%' \
-e 's%c++%$(CXX)\ $(EXTRA_LDFLAGS)%' \ -e 's%c++%$(CXX)\ $(EXTRA_LDFLAGS)%' \
-i.orig config.macosx -i.orig config.macosx
cd $< && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux cd live && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux
mv live $@
touch $@
.live555: live555
cd $< && ./genMakefiles $(LIVE_TARGET) cd $< && ./genMakefiles $(LIVE_TARGET)
cd $< && $(MAKE) $(HOSTVARS) cd $< && $(MAKE) $(HOSTVARS)
mkdir -p -- "$(PREFIX)/lib" "$(PREFIX)/include" mkdir -p -- "$(PREFIX)/lib" "$(PREFIX)/include"
......
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