]> git.sesse.net Git - vlc/blobdiff - extras/contrib/src/Makefile
live-starttime.patch is merged upstream and bumping up livemedia's version number...
[vlc] / extras / contrib / src / Makefile
index 919950904e3fd47e897c84dd6d7132f22c9b43fa..214ba03b6b8c76d6b39389fd4a0a5f8a84039545 100644 (file)
@@ -129,11 +129,11 @@ endif
 
 ifdef HAVE_UCLIBC
 ifdef HAVE_BIGENDIAN
-FFMPEGCONF+= --arch=armeb
+FFMPEGCONF+= --arch=armeb --enable-armv5te --enable-iwmmxt
 else
 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
+FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp
 FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
 else
 FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52 --enable-swscaler
@@ -147,6 +147,10 @@ ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEGCONF += --enable-memalign-hack --cpu=pentium-m
 endif
 
+ifdef HAVE_DARWIN_9
+FFMPEGCONF += --disable-mmx
+endif
+
 ifdef HAVE_DARWIN_OS
 X264CONF += --enable-pic
 ifdef HAVE_DARWIN_OS_ON_INTEL
@@ -154,6 +158,10 @@ FFMPEG_CFLAGS += -DHAVE_LRINTF
 endif
 endif
 
+ifdef HAVE_AMR
+FFMPEGCONF+= --enable-libamr --enable-libamr-nb --enable-libamr-wb
+endif
+
 DATE=`date +%Y-%m-%d`
 
 # ***************************************************************************
@@ -448,22 +456,23 @@ DISTCLEAN_PKG += libiconv-$(LIBICONV_VERSION).tar.gz
 fontconfig-$(FONTCONFIG_VERSION).tar.gz:
        $(WGET) $(FONTCONFIG_URL)
 
-fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Makefile Patches/fontconfig.patch
+fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.patch
        $(EXTRACT_GZ)
        patch -p0 < Patches/fontconfig.patch
+       patch -p0 < Patches/fontconfig-nodocs.patch
 
 .fontconfig: fontconfig
 ifdef HAVE_WIN32
   ifdef HAVE_CYGWIN
-       (cd $<; LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
+       (cd $<; autoreconf && LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
   else
-       (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
+       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
   endif
 else
   ifdef HAVE_DARWIN_OS
-       (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-confdir=/etc/fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install-exec && (cd fontconfig ; make install-data))
+       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-confdir=/etc/fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data))
   else
-       (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
+       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
   endif
 endif
        $(INSTALL_NAME)
@@ -501,11 +510,11 @@ DISTCLEAN_PKG += freetype-$(FREETYPE2_VERSION).tar.gz
 # fribidi
 # ***************************************************************************
 
-fribidi-$(FRIBIDI_VERSION).tar.bz2:
+fribidi-$(FRIBIDI_VERSION).tar.gz:
        $(WGET) $(FRIBIDI_URL)
 
-fribidi: fribidi-$(FRIBIDI_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
+fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz
+       $(EXTRACT_GZ)
        patch -p0 < Patches/fribidi.patch.real
 ifdef HAVE_WIN32
        patch -p0 <Patches/fribidi-win32.patch
@@ -521,7 +530,7 @@ endif
 
 CLEAN_FILE += .fribidi
 CLEAN_PKG += fribidi
-DISTCLEAN_PKG += fribidi-$(FRIBIDI_VERSION).tar.bz2
+DISTCLEAN_PKG += fribidi-$(FRIBIDI_VERSION).tar.gz
 
 # ***************************************************************************
 # liba52
@@ -655,12 +664,6 @@ DISTCLEAN_PKG += libmad-$(LIBMAD_VERSION).tar.gz
 # ogg
 # ***************************************************************************
 
-#ogg:
-#      @echo "*** Please type \"anoncvs\" here : ***"
-#      cvs -d $(OGG_CVSROOT) login
-#      cvs -d $(OGG_CVSROOT) co ogg
-#      (cd $@; ./autogen.sh)
-
 libogg-$(OGG_VERSION).tar.gz:
        $(WGET) $(OGG_URL)
 
@@ -722,7 +725,7 @@ DISTCLEAN_PKG += libvorbis-$(VORBIS_VERSION).tar.gz
 
 ifdef SVN
 tremor: 
-       $(SVN) export http://svn.xiph.org/trunk/Tremor tremor
+       $(SVN) co http://svn.xiph.org/trunk/Tremor tremor
        (cd $@ && patch -p0 < ../Patches/tremor.patch)
        (cd $@; rm -f ogg.h && echo "#include <ogg/ogg.h>" > ogg.h && rm -f os_types.h && echo "#include <ogg/os_types.h>" > os_types.h && ./autogen.sh)
 else
@@ -767,8 +770,11 @@ 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
+       (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)
-
+  endif
 endif
        $(INSTALL_NAME)
        touch $@
@@ -863,27 +869,20 @@ DISTCLEAN_PKG += speex-$(SPEEX_VERSION).tar.gz
 # faad2
 # ***************************************************************************
 
-#faad2:
-#      @echo "*** Please type return here : ***"
-#      cvs -d $(FAAD2_CVSROOT) login
-#      cvs -d $(FAAD2_CVSROOT) co faad2
-#      (cd $@; patch -p1 < ../Patches/faad2.patch)
-#      (cd $@; sh ./bootstrap)
-
-faad2-$(FAAD2_VERSION).tar.bz2:
+faad2-$(FAAD2_VERSION).tar.gz:
        $(WGET) $(FAAD2_URL)
 
-faad: faad2-$(FAAD2_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
-       (cd $@; patch -p1 < ../Patches/faad2.patch && ./bootstrap)
+faad2: faad2-$(FAAD2_VERSION).tar.gz
+       $(EXTRACT_GZ)
+       (cd $@; ./bootstrap)
 
-.faad: faad
+.faad: faad2
        (cd $< && $(HOSTCC) ./configure $(HOSTCONF) --disable-shared --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install)
        touch $@
 
 CLEAN_FILE += .faad
-CLEAN_PKG += faad
-DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.bz2
+CLEAN_PKG += faad2
+DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz
 
 # ***************************************************************************
 # faac
@@ -931,7 +930,7 @@ libebml-$(LIBEBML_VERSION).tar.bz2:
 ## No reasons to use SVN anymore
 #ifdef SVN
 #libebml:
-#      $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libebml libebml
+#      $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml
 #else
 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
        $(EXTRACT_BZ2)
@@ -970,7 +969,7 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
 ## No reasons to use SVN anymore
 #if SVN
 #libmatroska:
-#      $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska
+#      $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska
 #else
 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
@@ -1002,13 +1001,52 @@ CLEAN_PKG += libmatroska
 DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 
 # ***************************************************************************
+# libamrnb
+# ***************************************************************************
+
+amrnb-$(LIBAMR_NB_VERSION).tar.bz2:
+       $(WGET) $(LIBAMR_NB)
+
+libamrnb: amrnb-$(LIBAMR_NB_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+
+.libamrnb: libamrnb
+       (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --enable-shared && make && make install)
+       touch $@
+
+CLEAN_FILE += .libamrnb
+CLEAN_PKG += libamrnb
+DISTCLEAN_PKG += amrnb-$(LIBAMR_NB_VERSION).tar.bz2
+
+# ***************************************************************************
+# libamrwb
+# ***************************************************************************
+
+amrwb-$(LIBAMR_WB_VERSION).tar.bz2:
+       $(WGET) $(LIBAMR_WB)
+
+libamrwb: amrwb-$(LIBAMR_WB_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+
+.libamrwb: libamrwb
+       (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --enable-shared && make && make install)
+       touch $@
+
+
+CLEAN_FILE += .libamrwb
+CLEAN_PKG += libamrwb
+DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
+
+# ***************************************************************************
+
 # ffmpeg
 # ***************************************************************************
 
 ifdef SVN
 ffmpeg:
-       $(SVN) export $(FFMPEG_SVN)  ffmpeg
-       (cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch)
+       $(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
@@ -1019,12 +1057,17 @@ ifdef HAVE_BEOS
        (cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
 endif
 ifdef HAVE_DARWIN_OS
-       patch -p0 < Patches/ffmpeg-macosx-intel-mmx.patch
+       (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
+endif
+ifdef HAVE_DARWIN_9
+ifdef HAVE_DARWIN_OS_ON_INTEL
+       (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
-       patch -p0 < Patches/ffmpeg-svn-grab.patch
+       patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
 
 else
@@ -1069,7 +1112,7 @@ libdvdcss-$(LIBDVDCSS_VERSION).tar.gz:
 
 ifdef SVN
 libdvdcss: 
-       $(SVN) export svn://svn.videolan.org/libdvdcss/trunk libdvdcss
+       $(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss
        cd $@ && sh bootstrap
 else
 libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
@@ -1097,7 +1140,9 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # ***************************************************************************
 .dvdread: .dvdnav
        $(INSTALL_NAME)
-       (install_name_tool -change $(PREFIX)/lib/libdvdread.0.dylib @executable_path/lib/vlc_libdvdread.dylib $(PREFIX)/vlc-lib/vlc_libdvdnav.dylib)
+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
@@ -1106,18 +1151,30 @@ CLEAN_FILE += .dvdread
 # libdvdnav
 # ***************************************************************************
 
-libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
+ifdef SVN
+libdvdnav:
+       $(SVN) co $(LIBDVDNAV_SVN)  libdvdnav
+       patch -p0 < Patches/libdvdnav.patch
+ifdef HAVE_WIN32
+       patch -p0 < Patches/libdvdnav-win32.patch
+endif
+       (cd $@; ./autogen.sh noconfig)
+else
+libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
        $(WGET) $(LIBDVDNAV_URL)
 
-libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
-       patch -p0 < Patches/dvdnav.patch
-       patch -p0 < Patches/libdvdnav-mactel.patch
+libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
+       $(EXTRACT_GZ)
+       patch -p0 < Patches/libdvdnav.patch
+ifdef HAVE_WIN32
+       patch -p0 < Patches/libdvdnav-win32.patch
+endif
        (cd $@; ./autogen.sh noconfig)
+endif
 
 .dvdnav: libdvdnav .dvdcss
 ifdef HAVE_WIN32       
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -Dssize_t=long" && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install)
 else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
 endif
@@ -1132,10 +1189,10 @@ DISTCLEAN_PKG += libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 # libdvbpsi
 # ***************************************************************************
 
-libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz:
+libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz:
        $(WGET) $(LIBDVBPSI_URL)
 
-libdvbpsi: libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz
+libdvbpsi: libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .dvbpsi: libdvbpsi
@@ -1145,7 +1202,7 @@ libdvbpsi: libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz
 
 CLEAN_FILE += .dvbpsi
 CLEAN_PKG += libdvbpsi
-DISTCLEAN_PKG += libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz
+DISTCLEAN_PKG += libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz
 
 # ***************************************************************************
 # live
@@ -1156,26 +1213,9 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/live.patch
-ifdef HAVE_WIN32 
-       patch -p0 < Patches/livedotcom-win32.patch
-endif
-ifdef HAVE_DARWIN_OS
-       patch -p0 < Patches/live-osx.patch
-endif
-       patch -p0 < Patches/live-starttime.patch
-       (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
-ifdef HAVE_UCLIBC
        patch -p0 < Patches/live-noapps.patch
-endif
 
 .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)
@@ -1188,7 +1228,6 @@ endif
 else
        (cd $<; ./genMakefiles linux && make $(HOSTCC))
 endif
-endif
 endif
        touch $@
 
@@ -1279,6 +1318,7 @@ libdca: libdca-$(LIBDCA_VERSION).tar.bz2
 
 .dca: libdca
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       $(INSTALL_NAME)
        touch $@
 
 CLEAN_FILE += .dca
@@ -1294,10 +1334,13 @@ x264-$(X264_VERSION).tar.gz:
 
 ifdef SVN
 x264: 
-       $(SVN) export svn://svn.videolan.org/x264/trunk/ x264
+       $(SVN) co svn://svn.videolan.org/x264/trunk/ x264
 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 )
+endif
 else
 
 x264: x264-$(X264_VERSION).tar.gz
@@ -1458,6 +1501,39 @@ CLEAN_FILE += .qt4
 CLEAN_PKG += qt4
 DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz
 
+# ***************************************************************************
+# qt4 (trolltech binaries)
+# ***************************************************************************
+
+qt-win-opensource-$(QT4T_VERSION)-mingw.exe:
+       wget $(QT4T_URL)
+
+Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe
+       mkdir Qt
+       7z -oQt x qt-win-opensource-$(QT4T_VERSION)-mingw.exe \$$OUTDIR/bin\ /bin \$$OUTDIR/bin\ /lib \$$OUTDIR/bin\ /include/QtCore \$$OUTDIR/bin\ /include/QtGui \$$OUTDIR/bin\ /src/gui \$$OUTDIR/bin\ /src/corelib \$$OUTDIR/bin\ /translations
+       mv Qt/\$$OUTDIR/bin\ /* Qt/ && rmdir Qt/\$$OUTDIR/bin\  Qt/\$$OUTDIR
+       find Qt -name '* ' -exec sh -c "mv \"{}\" `echo {}`" \;
+       find Qt/src -name '*.cpp' -exec rm {} \;
+       find Qt/translations -type f -a ! -name 'qt_*.qm' -exec rm {} \;
+       find Qt/include -name '*.h' -exec sh -c "mv {} {}.tmp; sed 's,..\/..\/src,..\/src,' {}.tmp > {}; rm -f {}.tmp" \;
+       mkdir Qt/lib/pkgconfig
+       sed -e s,@@VERSION@@,$(QT4T_VERSION), -e s,@@PREFIX@@,$(PREFIX), Patches/QtCore.pc.in > Qt/lib/pkgconfig/QtCore.pc
+       sed -e s,@@VERSION@@,$(QT4T_VERSION), -e s,@@PREFIX@@,$(PREFIX), Patches/QtGui.pc.in > Qt/lib/pkgconfig/QtGui.pc
+
+.Qt: Qt
+       mkdir -p $(PREFIX)/bin $(PREFIX)/include/qt4/src $(PREFIX)/lib/pkgconfig $(PREFIX)/share/qt4/translations
+       cp Qt/bin/moc.exe Qt/bin/rcc.exe Qt/bin/uic.exe $(PREFIX)/bin
+       cp -r Qt/include/QtCore Qt/include/QtGui $(PREFIX)/include/qt4
+       cp -r Qt/src/corelib Qt/src/gui $(PREFIX)/include/qt4/src
+       cp Qt/lib/libQtCore4.a Qt/lib/libQtGui4.a $(PREFIX)/lib
+       cp Qt/lib/pkgconfig/* $(PREFIX)/lib/pkgconfig
+       cp Qt/translations/* $(PREFIX)/share/qt4/translations 
+       touch $@
+
+CLEAN_FILE += .Qt
+CLEAN_PKG += Qt
+DISTCLEAN_PKG += qt-win-opensource-$(QT4T_VERSION)-mingw.exe
+
 # ***************************************************************************
 # zlib
 # ***************************************************************************
@@ -1620,6 +1696,7 @@ ifdef HAVE_DARWIN_OS
 else
        (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
 endif
+       $(INSTALL_NAME)
        touch $@
 
 CLEAN_FILE += .zvbi
@@ -1632,7 +1709,7 @@ DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
 
 #ifdef SVN
 #libraw1394:
-#      $(SVN) export -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394  libraw1394
+#      $(SVN) co -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394  libraw1394
 #        (cd $<; libtoolize --copy --force; \
 #                autopoint -f; \
 #                aclocal -I extras/contrib/share/aclocal; \
@@ -1663,7 +1740,7 @@ DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz
 
 #ifdef SVN
 #libdc1394:
-#      $(SVN) export -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394  libdc1394
+#      $(SVN) co -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394  libdc1394
 #        (cd $<; libtoolize --copy --force; \
 #                autopoint -f; \
 #                aclocal -I extras/contrib/share/aclocal; \
@@ -1698,9 +1775,6 @@ libgpg-error-$(GPGERROR_VERSION).tar.bz2:
 
 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
 ifdef HAVE_DARWIN_OS_ON_INTEL