contribs: live555 compilation fix

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 857b08ec47d7519894758cc454ffe432676a5ad5..8744d83c33ae5b2bcd275f3bdf0c6b8bf4956afc 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -133,7 +133,7 @@ endif
 FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp
 FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
 else
-FFMPEGCONF+= --enable-libmp3lame --enable-libfaac
+FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-libgsm
 endif
 
 ifdef HAVE_BEOS
@@ -669,6 +669,9 @@ libmad-$(LIBMAD_VERSION).tar.gz:
 
 libmad: libmad-$(LIBMAD_VERSION).tar.gz
        $(EXTRACT_GZ)
+ifdef HAVE_DARWIN_OS
+       ( cd $@; sed -e 's%-march=i486%$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' -i.orig  configure )
+endif
 
 .mad: libmad
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make && make install)
@@ -1117,7 +1120,7 @@ else
 ifdef HAVE_UCLIBC
 .ffmpeg: ffmpeg
 else
-.ffmpeg: ffmpeg .faac .lame
+.ffmpeg: ffmpeg .faac .lame .gsm
 endif
 endif
        (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
@@ -1262,6 +1265,9 @@ live: live555-$(LIVEDOTCOM_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p0 < Patches/live-noapps.patch
        patch -p0 < Patches/live-uselocale.patch
+ifdef HAVE_WIN32
+       patch -p0 < Patches/live-win32-nonblock.patch
+endif
 
 .live: live
 ifdef HAVE_WIN32
@@ -2201,7 +2207,6 @@ dirac-$(DIRAC_VERSION).tar.gz:
 
 dirac: dirac-$(DIRAC_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p1 -d dirac <Patches/dirac-cross.patch
 ifdef HAVE_CYGWIN
        # incorrect compile warning with cygwin compiler 3.4.4
        patch -p0 <Patches/dirac-cygwin.patch
@@ -2404,7 +2409,7 @@ pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
        (cd $@; patch -p0 < ../Patches/pthreads-detach.patch)
 
 .pthreads: pthreads
-       (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.{a,dll} $(PREFIX)/lib/)
+       (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.a *.dll $(PREFIX)/lib/)
        $(INSTALL_NAME)
        touch $@
 
@@ -2479,7 +2484,6 @@ liboil-$(OIL_VERSION).tar.gz:
 
 liboil: liboil-$(OIL_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -d liboil -p1 < Patches/liboil-noshared.patch
 
 .liboil: liboil
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2" && make && make install)
@@ -2498,6 +2502,7 @@ schroedinger-$(SCHROED_VERSION).tar.gz:
 
 schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -d schroedinger -p1 < Patches/schroedinger-1.0.6-fixes.patch
 
 .schroedinger: schroedinger .liboil
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
@@ -2549,6 +2554,29 @@ CLEAN_FILE += .libupnp
 CLEAN_PKG += libupnp
 DISTCLEAN_PKG += libupnp-$(UPNP_VERSION).tar.bz2
 
+# *********
+# GSM
+# *********
+gsm-$(GSM_VERSION).tar.gz:
+       $(WGET) $(GSM_URL)
+
+gsm: gsm-$(GSM_VERSION).tar.gz
+       rm -rf $@ || true
+       gunzip -c $< | tar xf - --exclude='[*?:<>\|]'
+       mv gsm-1.0-* gsm || true
+ifneq ($(HOST),$(BUILD))
+       (patch -p0 < Patches/gsm-cross.patch)
+endif
+
+.gsm: gsm
+       (cd $<; $(HOSTCC) make && cp inc/gsm.h $(PREFIX)/include && cp lib/libgsm.a  $(PREFIX)/lib)
+       touch $@
+
+CLEAN_FILE += .gsm
+CLEAN_PKG += gsm
+DISTCLEAN_PKG += gsm-$(GSM_VERSION).tar.gz
+
+
 
 # ***************************************************************************
 # Some cleaning