X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=9809feeb632e9d8e52e5e57ef8a9bcbf79c80300;hb=3f3025aa794fbdad01150af9401bcb708263488f;hp=7650a0eeb0d84290dea77ff8cf6ecc41d74abc1c;hpb=877636c07b2393732b901cd1916a2c8c71573af7;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 7650a0eeb0..9809feeb63 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -101,12 +101,12 @@ ifneq ($(BUILD),$(HOST)) # ifndef HAVE_CYGWIN # We are REALLY cross compiling - FFMPEGCONF=--cross-prefix=$(HOST)- + FFMPEGCONF=--cross-prefix=$(HOST)- --cross-compile X264CONF=--crosscompile=$(HOST) - PTHREADSCONF="CROSS=$(HOST)-" + PTHREADSCONF="CROSS=$(HOST)-" else # We are compiling for MinGW on Cygwin - PTHREADSCONF=$(HOSTCC) + PTHREADSCONF=$(HOSTCC) endif endif @@ -115,27 +115,37 @@ endif # ifdef HAVE_WIN32 HOSTCONF+= --without-pic --disable-shared --enable-msw --with-included-opencdk --with-included-libtasn1 --disable-dependency-tracking -FFMPEGCONF+= --target-os=MINGW32 --enable-memalign-hack --cpu=i686 --disable-debug +FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --disable-debug endif ifdef HAVE_WINCE HOSTCONF+= --without-pic --disable-shared FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols +endif + +ifdef HAVE_UCLIBC +ifdef HAVE_BIGENDIAN +FFMPEGCONF+= --arch=armeb else -FFMPEGCONF+= --enable-libmp3lame --enable-libfaac +FFMPEGCONF+= --arch=armv4l +endif +FFMPEGCONF+= --enable-small --disable-debug --disable-encoders --disable-muxers --disable-demuxer=mpegts --disable-v4l --disable-v4l2 --disable-bktr --disable-dv1394 --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols --disable-encoders +FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99 +else +FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52 endif ifdef HAVE_BEOS FFMPEGCONF+= --cpu=x86 --disable-debug --disable-audio-beos endif -ifeq ($(HOST),i686-apple-darwin8) +ifdef HAVE_DARWIN_OS_ON_INTEL FFMPEGCONF += --enable-memalign-hack endif ifdef HAVE_DARWIN_OS -X264CONF += --enable-pic --enable-debug -ifneq ($(HOST),i686-apple-darwin8) +X264CONF += --enable-pic +ifdef HAVE_DARWIN_OS_ON_INTEL FFMPEG_CFLAGS += -DHAVE_LRINTF endif endif @@ -157,7 +167,7 @@ FORCE: define EXTRACT_GZ rm -rf $@ || true - tar xzf $< --exclude='[*?:<>\|]' + gunzip -c $< | tar xf - --exclude='[*?:<>\|]' mv $(patsubst %.tar.gz,%,$(patsubst %.tgz,%,$(notdir $<))) $@ || true touch $@ endef @@ -363,7 +373,7 @@ endif ifdef HAVE_WIN32 ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX) --disable-java --disable-native-java) else - ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-java --disable-native-java) + ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-java --disable-native-java --without-emacs) endif ifeq ($(BUILD),i586-pc-beos) # The ugliest kludge ever - so libtool correctly links shared libraries @@ -372,14 +382,14 @@ ifeq ($(BUILD),i586-pc-beos) endif ifneq ($(HOST),$(BUILD)) # We'll use the installed gettext and only need to cross-compile libintl, also build autopoint and gettextsize tools need for VLC bootstrap - ( cd $< && make -C gettext-runtime/intl && make -C gettext-runtime/intl install && make -C gettext-tools/misc install ) + ( cd $< && make -C gettext-runtime/intl && patch -p1 < ../Patches/libintl.patch && make -C gettext-runtime/intl install && make -C gettext-tools/misc install ) else # Build and install the whole gettext - ( cd $< && make && make install ) + ( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install ) endif # Work around another non-sense of autoconf. ifdef HAVE_WIN32 - (cd ../include; sed -i.orig '311 c #if !1' libintl.h) + (cd ../include; sed -i.orig '311 c #if 0' libintl.h) endif $(INSTALL_NAME) touch $@ @@ -400,6 +410,7 @@ libiconv: libiconv-$(LIBICONV_VERSION).tar.gz ifdef HAVE_DARWIN_OS patch -p0 < Patches/libiconv.patch endif + patch -p0 < Patches/libiconv-autoconf-uclibc.patch ifdef HAVE_DARWIN_OS .iconv: @@ -442,15 +453,19 @@ DISTCLEAN_PKG += freetype-$(FREETYPE2_VERSION).tar.gz # fribidi # *************************************************************************** -fribidi-$(FRIBIDI_VERSION).tar.gz: +fribidi-$(FRIBIDI_VERSION).tar.bz2: $(WGET) $(FRIBIDI_URL) -fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz - $(EXTRACT_GZ) +fribidi: fribidi-$(FRIBIDI_VERSION).tar.bz2 + $(EXTRACT_BZ2) patch -p0 < Patches/fribidi.patch.real ifdef HAVE_WIN32 patch -p0 $(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;cp bin/rcc bin/uic bin/moc $(PREFIX)/bin) + (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) +ifeq ($(BUILD),i686-pc-cygwin) + (cd qt4;cp bin/*.exe $(PREFIX)/bin) +else + (cd qt4;cp bin/* $(PREFIX)/bin) +endif touch $@ CLEAN_FILE += .qt4 @@ -1441,6 +1474,9 @@ ifdef HAVE_WIN32 patch -p0 < Patches/xml2-win32.patch rm -f xml/aclocal.m4 endif +ifdef HAVE_UCLIBC + patch -p0 < Patches/xml2-uclibc.patch +endif .xml: xml (cd xml; CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp && make && make install) @@ -1466,13 +1502,10 @@ twolame: twolame-$(TWOLAME_VERSION).tar.gz ifdef HAVE_BEOS patch -p0 < Patches/twolame-BeOS.patch endif -ifdef HAVE_DARWIN_OS - patch -p0 < Patches/twolame-osx.patch -endif .twolame: twolame ifdef HAVE_WIN32 - (cd twolame/win32; wget "http://twolame.svn.sourceforge.net/viewvc/*checkout*/twolame/trunk/win32/winutil.h") + (cd twolame/win32; $(WGET) "http://twolame.svn.sourceforge.net/viewvc/*checkout*/twolame/trunk/win32/winutil.h") endif (cd twolame; $(HOSTCC) CFLAGS="${CFLAGS} -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd libtwolame && make && make install) $(INSTALL_NAME) @@ -1497,13 +1530,13 @@ else (cat Patches/libpng-osx.patch | sed -e 's%??PREFIX??%$(PREFIX)%' -e 's%??EXTRA_CFLAGS??%$(EXTRA_CFLAGS)%' -e 's%??EXTRA_LDFLAGS??%$(EXTRA_LDFLAGS)%' | patch -p0) endif (patch -p0 < Patches/libpng-makefile.patch) -ifeq ($(HOST),i686-apple-darwin8) +ifdef HAVE_DARWIN_OS_ON_INTEL (patch -p0 < Patches/libpng-darwin-mactel.patch) endif .png: libpng ifdef HAVE_DARWIN_OS - (cd $<; cp scripts/makefile.darwin Makefile && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) else ifdef HAVE_WIN32 (cd $<; rm -f INSTALL; cp scripts/makefile.cygwin Makefile && make $(HOSTCC) && make install-static) @@ -1565,12 +1598,12 @@ libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz $(EXTRACT_GZ) #endif -.libraw1394: libraw1394 +.raw1394: libraw1394 (cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PRFIX) install) # sed 's/^typedef u_int8_t byte_t;/\/* typedef u_int8_t byte_t;\*\//' touch $@ -CLEAN_file += .libraw1394 +CLEAN_file += .raw1394 CLEAN_PKG += libraw1394 DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz @@ -1596,29 +1629,28 @@ libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz $(EXTRACT_GZ) #endif -.libdc1394: libdc1394 +.dc1394: libdc1394 (cd $<; ./configure --prefix=$(PREFIX) && \ patch -p1 < ../Patches/libdc1394-noexamples.patch && \ make && make DESTDIR=$(PRFIX) install) touch $@ -CLEAN_file += .libdc1394 +CLEAN_file += .dc1394 CLEAN_PKG += libdc1394 DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION).tar.gz # *************************************************************************** -libgpg-error-$(GPGERROR_VERSION).tar.gz: +libgpg-error-$(GPGERROR_VERSION).tar.bz2: $(WGET) $(GPGERROR_URL) -libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz - $(EXTRACT_GZ) - patch -p0 < Patches/libgpg-error.patch +libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2 + $(EXTRACT_BZ2) ifdef HAVE_WIN32 patch -p0 < Patches/libgpg-error-win32.patch endif .gpg-error: libgpg-error -ifeq ($(HOST),i686-apple-darwin8) +ifdef HAVE_DARWIN_OS_ON_INTEL (cd $<; ./autogen.sh) endif (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls --disable-shared && make && make install) @@ -1627,7 +1659,7 @@ endif CLEAN_FILE += .gpg-error CLEAN_PKG += libgpg-error -DISTCLEAN_PKG += libgpg-error-$(GPGERROR_VERSION).tar.gz +DISTCLEAN_PKG += libgpg-error-$(GPGERROR_VERSION).tar.bz2 # *************************************************************************** # libgcrypt @@ -1644,7 +1676,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 ifdef HAVE_WIN32 (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install) else -ifeq ($(HOST),i686-apple-darwin8) +ifdef HAVE_DARWIN_OS_ON_INTEL (cd $<; $(HOSTCC) ./configure --host=$(HOST) --build=$(BUILD) --prefix=$(PREFIX) --disable-asm CFLAGS="$(CFLAGS)" && make && make install) endif (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install) @@ -1732,11 +1764,11 @@ libIDL-$(LIBIDL_VERSION).tar.gz: libIDL: libIDL-$(LIBIDL_VERSION).tar.gz $(EXTRACT_GZ) -.libidl: libIDL +.IDL: libIDL (cd $<; ./configure --prefix=$(PREFIX) --host=powerpc-apple-macos && make && make install ) touch $@ -CLEAN_FILE += .libidl +CLEAN_FILE += .IDL CLEAN_PKG += libIDL DISTCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz @@ -1893,7 +1925,7 @@ libmpcdec-$(MUSE_VERSION).tar.bz2: mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 $(EXTRACT_BZ2) patch -p0 < Patches/mpcdec.patch - (cd $@; ./autogen.sh) + (cd $@; autoreconf -vif) .mpcdec: mpcdec ifdef HAVE_WIN32 @@ -1920,15 +1952,21 @@ dirac-$(DIRAC_VERSION).tar.gz: dirac: dirac-$(DIRAC_VERSION).tar.gz $(EXTRACT_GZ) ifdef HAVE_DARWIN_OS - patch -p0