X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=8dea3a451116485b312c0ad4c3376bf4ddac558a;hb=219a17b028a80e4a192a543fdcffff23892c174b;hp=24d97128bcf441d426d7833469588ac872432ad3;hpb=7587b631f2cce0af2a084f66f58b6a45d4e1f88e;p=vlc

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 24d97128bc..8dea3a4511 100644
--- 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)
@@ -147,7 +143,7 @@ ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEGCONF += --enable-memalign-hack --cpu=pentium-m
 endif
 
-ifdef HAVE_DARWIN_9
+ifdef NO_TEXT_RELOCATION
 FFMPEGCONF += --disable-mmx
 endif
 
@@ -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`
@@ -210,38 +206,6 @@ endef
 #	$(INSTALL_NAME)
 #	touch $@
 
-ifdef HAVE_DARWIN_OS
-# the original libtoto.dylib is copied from contrib/lib to vlc-lib as
-# vlc_libtoto.dylib. a soft link to this library is created in contrib/lib
-# using the orginal dylib name. if libtoto.la also exists, the library named
-# in dlname is also changed to a soft-link to vlc-lib in order to support
-# libtool. to satisfy VLC.app dyld search, vlc_libtoto.dylib dyld id is changed
-# to @executable_path/lib/vlc_libtoto.dylib 
-
-define INSTALL_NAME
-	if which install_name_tool >/dev/null; then \
-		mkdir -p $(PREFIX)/vlc-lib ; \
-		libname='lib$(patsubst .%,%,$@)' ; \
-		dlname="$$libname.dylib" ; \
-		cp $(PREFIX)/lib/$$dlname \
-			$(PREFIX)/vlc-lib/vlc_$$dlname ; \
-		rm $(PREFIX)/lib/$$dlname ; \
-		ln -s $(PREFIX)/vlc-lib/vlc_$$dlname \
-			$(PREFIX)/lib/$$dlname ; \
-		if [ -f $(PREFIX)/lib/$$libname.la ]; then \
-			eval ltname=`sed -n 's/dlname=//p' $(PREFIX)/lib/$$libname.la`; \
-			rm $(PREFIX)/lib/$$ltname ; \
-			ln -s $(PREFIX)/vlc-lib/vlc_$$dlname \
-				$(PREFIX)/lib/$$ltname ; \
-		fi ; \
-		install_name_tool \
-			-id @executable_path/lib/vlc_$$dlname \
-			$(PREFIX)/vlc-lib/vlc_$$dlname ; \
-	fi
-endef
-
-endif
-
 ifeq ($(HOST),i586-pc-beos)
 # We test if the file actually exists, as sometimes (but not always)
 # libtool won't accept to build the shared library
@@ -293,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
 # ***************************************************************************
@@ -380,9 +362,6 @@ gettext-$(GETTEXT_VERSION).tar.gz:
 
 gettext: gettext-$(GETTEXT_VERSION).tar.gz
 	$(EXTRACT_GZ)
-ifdef HAVE_DARWIN_OS
-	patch -p0 < Patches/gettext-macosx.patch 
-endif
 ifdef HAVE_WIN32
 	patch -p0 < Patches/gettext-win32.patch
 endif
@@ -515,13 +494,7 @@ fribidi-$(FRIBIDI_VERSION).tar.gz:
 
 fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p0 < Patches/fribidi.patch.real
-ifdef HAVE_WIN32
-	patch -p0 <Patches/fribidi-win32.patch
-endif
-ifdef HAVE_UCLIBC
-	patch -p0 < Patches/fribidi-uclibc.patch
-endif
+	patch -p0 < Patches/fribidi.patch
 
 .fribidi: fribidi .iconv
 	(cd $<; rm -f configure; ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  && make && make install)
@@ -694,7 +667,6 @@ DISTCLEAN_PKG += libogg-$(OGG_VERSION).tar.gz
 #	cvs -d $(OGG_CVSROOT) login
 #	cvs -d $(OGG_CVSROOT) co vorbis
 #	(cd $@; ./autogen.sh)
-#	patch -p0 < Patches/vorbis.patch
 
 libvorbis-$(VORBIS_VERSION).tar.gz:
 	$(WGET) $(VORBIS_URL)
@@ -770,7 +742,7 @@ libtheora: libtheora-$(THEORA_VERSION).tar.bz2
 ifdef HAVE_BEOS
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install)
 else
-  ifdef HAVE_DARWIN_9
+  ifdef NO_TEXT_RELOCATION
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install)
   else
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples && make && make install)
@@ -1045,8 +1017,6 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 ifdef SVN
 ffmpeg:
 	$(SVN) co $(FFMPEG_SVN) ffmpeg
-	(cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch && \
-	 patch -p1 < ../Patches/ffmpeg-svn-avdevices.patch)
 ifeq ($(HOST),i586-pc-beos)
 	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
@@ -1059,11 +1029,9 @@ endif
 ifdef HAVE_DARWIN_OS
 	(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
 endif
-ifdef HAVE_DARWIN_9
-ifdef HAVE_DARWIN_OS_ON_INTEL
+ifdef NO_TEXT_RELOCATION
 	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
 endif
-endif
 ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-uclibc.patch
 	patch -p0 < Patches/ffmpeg-svn-internal-define.patch
@@ -1089,7 +1057,7 @@ else
 .ffmpeg: ffmpeg .faac .lame
 endif
 endif
-	(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay && make && make install-libs install-headers)
+	(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices && make && make install-libs install-headers)
 	touch $@
 
 ifdef SVN
@@ -1140,9 +1108,6 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # ***************************************************************************
 .dvdread: .dvdnav
 	$(INSTALL_NAME)
-ifdef HAVE_DARWIN_OS
-	install_name_tool -change $(PREFIX)/lib/libdvdread.4.dylib @executable_path/lib/vlc_libdvdread.dylib $(PREFIX)/vlc-lib/vlc_libdvdnav.dylib
-endif
 	touch $@
 
 CLEAN_FILE += .dvdread
@@ -1213,14 +1178,12 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
 	$(EXTRACT_GZ)
-#Still needed 
-	(cd live/liveMedia/include; \
-		mv liveMedia_version.hh liveMedia_version.hh.bak; \
-	sed -e 's/.*LIVEMEDIA_LIBRARY_VERSION_INT.*/#define LIVEMEDIA_LIBRARY_VERSION_INT         9999999999/' liveMedia_version.hh.bak > liveMedia_version.hh )
-	patch -Np0 < Patches/live-config.patch
 	patch -p0 < Patches/live-noapps.patch
 
 .live: live
+ifdef HAVE_WIN32  
+	(cd $<;./genMakefiles mingw && make $(HOSTCC)) 
+else 
 ifdef HAVE_DARWIN_OS
 	(cd $<; sed -e 's%EXTRA_CFLAGS%$(EXTRA_CFLAGS)%' -e 's%EXTRA_LDFLAGS%$(EXTRA_LDFLAGS)%' -i.orig  config.macosx)
 	(cd $<; ./genMakefiles macosx && make)
@@ -1234,6 +1197,15 @@ else
 	(cd $<; ./genMakefiles linux && make $(HOSTCC))
 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
@@ -1270,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,12 +1270,20 @@ libcaca-$(LIBCACA_VERSION).tar.gz:
 
 libcaca: libcaca-$(LIBCACA_VERSION).tar.gz
 	$(EXTRACT_GZ)
+ifdef HAVE_DARWIN_OS
+	#remove me at next libcaca upgrade
+	patch -p0 < Patches/caca_driver_cocoa.diff
+	patch -p0 < Patches/caca_macosx.diff
+ifndef HAVE_DARWIN_OS_ON_INTEL
+	patch -p0 < Patches/caca-osx-ppc.patch
+endif
+endif
 
 .caca: libcaca
 ifdef HAVE_WIN32
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-win32 --disable-x11 --disable-imlib2 --disable-doc && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-win32 --disable-x11 --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && make && make install)
 else
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && make && make install)
 endif
 	touch $@
 
@@ -1340,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
 
@@ -1472,7 +1453,6 @@ wxWidgets-$(WXWIDGETS_VERSION).tar.gz:
 wxwidgets: wxWidgets-$(WXWIDGETS_VERSION).tar.gz
 	$(EXTRACT_GZ)
 	(cd wxwidgets; patch -p0 < ../Patches/wxwidgets_uri.patch)
-#	(cd wxwidgets; patch -p1 <../Patches/wxMSW-win32.patch)
 
 .wxwidgets: wxwidgets
 	(cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --enable-unicode --disable-threads --disable-gif --disable-pcx --disable-iff --disable-pnm --without-zlib  --without-libpng --without-libjpeg --without-libtiff --without-regex  --disable-zipstream --disable-fs_zip --enable-no_rtti  --enable-no_exceptions --disable-exceptions --disable-stl --disable-html --without-expat --disable-protocols --disable-protocol --disable-xrc --disable-sound --disable-dialupman --disable-mediactrl  --disable-joystick --disable-grid --disable-datepick --disable-postscript--disable-filesystem --disable-fileproto --disable-ipc --disable-sockets --disable-precomp-headers && make && make install)
@@ -1487,11 +1467,11 @@ DISTCLEAN_PKG += wxWidgets-$(WXWIDGETS_VERSION).tar.gz
 # qt4 (win32 binary)
 # ***************************************************************************
 
-qt4-$(QT4_VERSION)-win32-bin.tar.gz:
+qt4-$(QT4_VERSION)-win32-bin.tar.bz2:
 	$(WGET) $(QT4_URL)
 
-qt4: qt4-$(QT4_VERSION)-win32-bin.tar.gz
-	$(EXTRACT_GZ)
+qt4: qt4-$(QT4_VERSION)-win32-bin.tar.bz2
+	$(EXTRACT_BZ2)
 
 .qt4: qt4
 	(cd qt4;mkdir -p $(PREFIX)/bin; mkdir -p $(PREFIX)/include;mkdir -p $(PREFIX)/lib/pkgconfig;rm -f $(PREFIX)/lib/pkgconfig/Qt*; sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtCore.pc.in > $(PREFIX)/lib/pkgconfig/QtCore.pc;sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc;cp -r include/* $(PREFIX)/include;cp lib/*a $(PREFIX)/lib)
@@ -1539,6 +1519,24 @@ CLEAN_FILE += .Qt
 CLEAN_PKG += Qt
 DISTCLEAN_PKG += qt-win-opensource-$(QT4T_VERSION)-mingw.exe
 
+# ***************************************************************************
+# qt4 (source-code compilation for Mac)
+# ***************************************************************************
+
+qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz:
+	$(WGET) $(QT4_MAC_URL)
+
+qt4_mac: qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
+	$(EXTRACT_GZ)
+
+.qt4_mac: qt4_mac
+	(cd qt4_mac; ./configure -prefix $(PREFIX) -release -fast -no-qt3support -sdk $(MACOSX_SDK) -no-framework && make && make install)
+	touch $@
+
+CLEAN_FILE += .qt4_mac
+CLEAN_PKG += qt4_mac
+DISTCLEAN_PKG += qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
+
 # ***************************************************************************
 # zlib
 # ***************************************************************************
@@ -1660,7 +1658,7 @@ ifdef HAVE_DARWIN_OS_ON_INTEL
 	(patch -p0 < Patches/libpng-darwin-mactel.patch)
 endif
 
-.png: libpng 
+.png: libpng .zlib
 ifdef HAVE_DARWIN_OS
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 else
@@ -1915,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 $@
 
@@ -1958,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 $@
 
@@ -2037,6 +2038,7 @@ SDL_image-$(SDL_IMAGE_VERSION).tar.gz:
 SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz 
 	$(EXTRACT_GZ)
 	patch -p0 < Patches/SDL_image.patch
+	patch -p0 < Patches/SDL_image-CVE-2006-4484.patch
 
 .SDL_image: SDL_image .SDL .png .jpeg .tiff
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --enable-tif --disable-sdltest && make && make install)
@@ -2267,13 +2269,14 @@ 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 $@
 
 CLEAN_FILE += .pthreads
 CLEAN_PKG += pthreads
 DISTCLEAN_PKG += pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
+
 # ***************************************************************************
 # ncurses library (with wide chars support)
 # ***************************************************************************
@@ -2292,6 +2295,25 @@ CLEAN_FILE += .ncurses
 CLEAN_PKG += ncurses
 DISTCLEAN_PKG += ncurses-$(NCURSES_VERSION).tar.gz
 
+# ***************************************************************************
+# asa library (ASS/SSA support)
+# ***************************************************************************
+
+asa.git.tar.gz:
+	$(WGET) $(ASA_URL) -O $@
+
+asa: asa.git.tar.gz
+	$(EXTRACT_GZ)
+
+.asa: asa
+	(cd $<; ./bootstrap; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+	touch $@
+
+CLEAN_FILE += .asa
+CLEAN_PKG += asa
+DISTCLEAN_PKG += asa.git.tar.gz
+
+#
 # ***************************************************************************
 # Some cleaning
 # ***************************************************************************