Contribs: update gpg-error to 1.10

[vlc] / extras / contrib / src / contrib-src.mak

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 21829bbd5db04f173b66bfffff85b62509cc04de..4477743fe083150979c4a027a37db31537229a4a 100644 (file)
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -946,6 +946,7 @@ FFMPEGCONF = --disable-doc \
        --disable-ffserver \
        --disable-ffmpeg \
        --disable-ffplay \
+       --disable-avconv \
        --disable-devices \
        --disable-protocols \
        --disable-avfilter \
@@ -1168,8 +1169,11 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
 # ***************************************************************************
 # libdvdread: We use dvdnav's dvdread
 # ***************************************************************************
-libdvdread:
-       $(SVN) co -r $(LIBDVDREAD_SVN_REV) $(LIBDVDREAD_SVN)  libdvdread
+libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
+       $(WGET) $(LIBDVDREAD_URL)
+
+libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
        (cd $@; patch  -p 0 < ../Patches/libdvdread-dvdcss-static.patch)
 ifdef HAVE_WIN32
        (cd $@; patch  -p 0 < ../Patches/libdvdread-win32.patch)
@@ -1183,29 +1187,19 @@ endif
 
 CLEAN_FILE += .libdvdread
 CLEAN_PKG += libdvdread
-#DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.gz
+DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
 
 # ***************************************************************************
 # libdvdnav
 # ***************************************************************************
 
-ifdef SVN
-libdvdnav:
-       $(SVN) co -r $(LIBDVDNAV_SVN_REV) $(LIBDVDNAV_SVN)  libdvdnav
-       patch -d libdvdnav -p0 < Patches/libdvdnav.patch
-       (cd $@; ./autogen.sh noconfig)
-else
-libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
+libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
        $(WGET) $(LIBDVDNAV_URL)
 
-libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
-       $(EXTRACT_GZ)
+libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
        patch -p0 < Patches/libdvdnav.patch
-ifdef HAVE_WIN32
-       patch -p0 < Patches/libdvdnav-win32.patch
-endif
        (cd $@; ./autogen.sh noconfig)
-endif
 
 .dvdnav: libdvdnav .libdvdread
 ifdef HAVE_WIN32
@@ -1644,10 +1638,6 @@ portaudio: pa_stable_v$(PORTAUDIO_VERSION).tgz
 ifneq ($(HOST),$(BUILD))
        (patch -p0 < Patches/portaudio-cross.patch;cd $@;  autoconf)
 endif
-ifdef HAVE_WIN64
-       patch -p0 < Patches/portaudio-static.patch
-       (cd $@ ; autoreconf -if)
-endif
 
 .portaudio: portaudio
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make  install)
@@ -1830,8 +1820,8 @@ libgpg-error-$(GPGERROR_VERSION).tar.bz2:
 libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 ifdef HAVE_WIN32
-#      patch -p 0 < Patches/libgpg-error-win32.patch
-#      (cd $@; ./autogen.sh)
+       patch -p 0 < Patches/libgpg-error-win32.patch
+       (cd $@; autoreconf -ivf)
 endif
 
 .gpg-error: libgpg-error
@@ -1856,9 +1846,12 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
 
 CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-publickey-digests=dsa
 
+ifdef HAVE_WIN64
+ac_cv_sys_symbol_underscore=no
+endif
 .gcrypt: libgcrypt .gpg-error
 ifdef HAVE_WIN32
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls ac_cv_sys_symbol_underscore=$(ac_cv_sys_symbol_underscore) && make && make install)
 else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -lgpg-error" $(CIPHDIG) && make && make install)
 endif
@@ -2234,8 +2227,13 @@ ifdef HAVE_CYGWIN
        patch -p0 < Patches/taglib-cygwin.patch
 endif
 
+ifdef HAVE_WIN64
+TAGLIB_CMAKE_OPTS=-DCMAKE_SYSTEM_NAME=Generic
+else
+TAGLIB_CMAKE_OPTS=
+endif
 .tag: taglib
-       (cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DENABLE_STATIC:BOOL=ON -DWITH_ASF:BOOL=ON -DWITH_MP4:BOOL=ON && make && make install)
+       (cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DENABLE_STATIC:BOOL=ON -DWITH_ASF:BOOL=ON -DWITH_MP4:BOOL=ON $(TAGLIB_CMAKE_OPTS) && make && make install)
        $(INSTALL_NAME)
        touch $@
 
@@ -2380,8 +2378,8 @@ libass: libass-$(ASS_VERSION).tar.gz
        $(EXTRACT_GZ)
        (cd $@; autoreconf -ivf)
 
-.libass: libass .freetype .fontconfig
-       (cd $<; $(HOSTCC) ./configure --disable-png --disable-shared $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
+.libass: libass .freetype .fontconfig .fribidi
+       (cd $<; $(HOSTCC) ./configure --disable-shared $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
        touch $@
 
 CLEAN_FILE += .libass