* backport r9238 to 0.8.1 branch

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 77759d02179ac68b5131305414b7f33f110c6843..660e4fe8957f6f699b27b69e472543ac8a4c6338 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -55,7 +55,7 @@ all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .openslp \
        .dvdcss .dvdread .dvdnav .dvbpsi .live .goom2k4 .caca .mod \
-       .png
+       .png .gpgerror .gcrypt .gnutls
 endif
 ifeq ($(SYS),BEOS)
 all: .perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
@@ -1006,6 +1006,60 @@ CLEAN_FILE += .zvbi
 CLEAN_PKG += zvbi
 DISCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
 
+# ***************************************************************************
+# gpg-error 
+# ***************************************************************************
+
+libgpg-error-$(GPGERROR_VERSION).tar.gz:
+       $(WGET) $(GPGERROR_URL)
+
+libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.gpgerror: libgpg-error
+       (cd $<; ./configure --prefix=$(PREFIX) && make && make install )
+       touch $@
+
+CLEAN_FILE += .gpgerror
+CLEAN_PKG += libgpg-error
+DISCLEAN_PKG += libgpg-error-$(GPGERROR_VERSION).tar.gz
+
+# ***************************************************************************
+# libgcrypt
+# ***************************************************************************
+
+libgcrypt-$(GCRYPT_VERSION).tar.gz:
+       $(WGET) $(GCRYPT_URL)
+
+libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.gcrypt: libgcrypt
+       (cd $<; ./configure --prefix=$(PREFIX) && make && make install )
+       touch $@
+
+CLEAN_FILE += .gcrypt
+CLEAN_PKG += libgcrypt
+DISCLEAN_PKG += libgcrypt-$(GCRYPT_VERSION).tar.gz
+
+# ***************************************************************************
+# gnutls
+# ***************************************************************************
+
+gnutls-$(GNUTLS_VERSION).tar.bz2:
+       $(WGET) $(GNUTLS_URL)
+
+gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+
+.gnutls: gnutls
+       (cd $<; ./configure --prefix=$(PREFIX) && make install )
+       touch $@
+
+CLEAN_FILE += .gnutls
+CLEAN_PKG += gnutls
+DISCLEAN_PKG += gnutls-$(GNUTLS_VERSION).tar.bz2
+
 # ***************************************************************************
 # Some cleansing
 # ***************************************************************************

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index d17f1578ba72a7363cc79b54f6915264e1f6413a..aa366c92dd8ed2006de089e90b29aa79e71e7baa 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -111,4 +111,10 @@ TOOLAME_VERSION=02m-beta8
 TOOLAME_URL=$(VIDEOLAN)/testing/contrib/toolame-$(TOOLAME_VERSION).tar.bz2
 PNG_VERSION=1.2.5
 PNG_URL=$(VIDEOLAN)/testing/contrib/libpng-$(PNG_VERSION).tar.bz2
+GPGERROR_VERSION=1.0
+GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.gz
+GCRYPT_VERSION=1.2.0
+GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.gz
+GNUTLS_VERSION=1.1.22
+GNUTLS_URL=$(VIDEOLAN)/testing/contrib/gnutls-$(GNUTLS_VERSION).tar.bz2