* extras/contrib/src/Patches/x264-svn-win32.patch: revert [25113] and [25140] log...

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 469a3cc91480cc8377f24806b19cac1fa5c2ae96..8dea3a451116485b312c0ad4c3376bf4ddac558a 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -38,10 +38,6 @@ include ./packages.mak
 export PATH := $(PREFIX)/bin:$(EXTRA_PATH):$(PATH)
 export PKG_CONFIG_PATH
 export PKG_CONFIG_LIBDIR = $(PREFIX)/lib/pkgconfig
-export DYLD_LIBRARY_PATH = $(PREFIX)/lib
-# following is required for configure scripts that check dyld libraries
-# by building and running a test app 
-export DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):$(PREFIX)/vlc-lib
 export MACOSX_DEPLOYMENT_TARGET = $(SDK_TARGET)
 export LIBRARY_PATH := $(PREFIX)/lib:$(LIBRARY_PATH)
 export CFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
@@ -159,7 +155,7 @@ endif
 endif
 
 ifdef HAVE_AMR
-FFMPEGCONF+= --enable-libamr --enable-libamr-nb --enable-libamr-wb
+FFMPEGCONF+= --enable-libamr-nb --enable-libamr-wb --enable-nonfree
 endif
 
 DATE=`date +%Y-%m-%d`
@@ -261,6 +257,24 @@ CLEAN_FILE += .autoconf
 CLEAN_PKG += autoconf
 DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.bz2
 
+# ***************************************************************************
+# CMake
+# ***************************************************************************
+
+cmake-$(CMAKE_VERSION).tar.gz:
+       $(WGET) $(CMAKE_URL)
+
+cmake: cmake-$(CMAKE_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.cmake: cmake
+       (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+       touch $@
+
+CLEAN_FILE += .cmake
+CLEAN_PKG += cmake
+DISTCLEAN_PKG += cmake-$(CMAKE_VERSION).tar.gz
+
 # ***************************************************************************
 # libtool
 # ***************************************************************************
@@ -1184,6 +1198,14 @@ else
 endif
 endif
 endif
+       cp $</groupsock/libgroupsock.a $(PREFIX)/lib
+       cp $</liveMedia/libliveMedia.a $(PREFIX)/lib
+       cp $</UsageEnvironment/libUsageEnvironment.a $(PREFIX)/lib
+       cp $</BasicUsageEnvironment/libBasicUsageEnvironment.a $(PREFIX)/lib
+       cp $</groupsock/include/*.hh $</groupsock/include/*.h $(PREFIX)/include
+       cp $</liveMedia/include/*.hh $(PREFIX)/include
+       cp $</UsageEnvironment/include/*.hh $(PREFIX)/include
+       cp $</BasicUsageEnvironment/include/*.hh $(PREFIX)/include
        touch $@
 
 CLEAN_FILE += .live
@@ -1220,12 +1242,12 @@ goom: goom$(GOOM2k4_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
        patch -p0 < Patches/goom.patch
+       patch -p0 < Patches/goom2k4-0-mmx.patch
 endif
 ifdef HAVE_WIN32
        (cd $@; dos2unix configure.in)
        patch -p0 < Patches/goom2k4-0-win32.patch
 endif
-       patch -p0 < Patches/goom2k4-0-mmx.patch
 
 .goom2k4: goom
 ifdef HAVE_DARWIN_OS
@@ -1298,11 +1320,12 @@ x264-$(X264_VERSION).tar.gz:
 ifdef SVN
 x264: 
        $(SVN) co svn://svn.videolan.org/x264/trunk/ x264
+       patch -p0 < Patches/x264-svn-info-threads.patch
 ifdef HAVE_WIN32
        (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
 endif
 ifdef HAVE_DARWIN_OS
-       (cd $@; patch -p 0 < ../Patches/x264-svn-darwin.patch )
+       (cd $@; patch -p0 < ../Patches/x264-svn-darwin.patch )
 endif
 else
 
@@ -1500,10 +1523,10 @@ DISTCLEAN_PKG += qt-win-opensource-$(QT4T_VERSION)-mingw.exe
 # qt4 (source-code compilation for Mac)
 # ***************************************************************************
 
-qt-mac-opensource-src-$(QT4_VERSION).tar.gz:
+qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz:
        $(WGET) $(QT4_MAC_URL)
 
-qt4_mac: qt-mac-opensource-src-$(QT4_VERSION).tar.gz
+qt4_mac: qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .qt4_mac: qt4_mac
@@ -1512,7 +1535,7 @@ qt4_mac: qt-mac-opensource-src-$(QT4_VERSION).tar.gz
 
 CLEAN_FILE += .qt4_mac
 CLEAN_PKG += qt4_mac
-DISTCLEAN_PKG += qt-mac-opensource-src-$(QT4_VERSION).tar.gz
+DISTCLEAN_PKG += qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
 
 # ***************************************************************************
 # zlib
@@ -1890,6 +1913,9 @@ gecko-sdk: gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
        $(EXTRACT_GZ)
 
 .gecko: gecko-sdk
+       rm -rf ../gecko-sdk
+       mv gecko-sdk ..
+       mkdir gecko-sdk #creating an empty dir is faster than copying the whole dir
        (cd $<)
        touch $@
 
@@ -1933,7 +1959,7 @@ mozilla-source-$(MOZILLA_VERSION).tar.bz2:
 mozilla: mozilla-source-$(MOZILLA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 
-.mozilla-macosx: mozilla-macosx
+.mozilla-macosx: mozilla
        (cd $<; ./configure --prefix=$(PREFIX) --enable-default-toolkit=mac --enable-standalone-modules=xpcom,plugin && make && make install)
        touch $@
 
@@ -2243,7 +2269,7 @@ pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
        $(EXTRACT_GZ)
 
 .pthreads: pthreads
-       (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC-static && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && cp -v *.a $(PREFIX)/lib/)
+       (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.a $(PREFIX)/lib/)
        $(INSTALL_NAME)
        touch $@