videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

[Contribs] Update libgcrypt to 1.4.3

pull/2/head
Jean-Baptiste Kempf 18 years ago
parent
4c30e1d7df
commit
1b1a6a4ef3
3 changed files with 8 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      extras/contrib/src/Makefile
  2. 13
      extras/contrib/src/Patches/gcrypt.patch
  3. 2
      extras/contrib/src/packages.mak

2
extras/contrib/src/Makefile
View File

@ -1880,7 +1880,7 @@ CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd1
.gcrypt: libgcrypt .gpg-error .gcrypt: libgcrypt .gpg-error
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install) (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && make && make install)
else else
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && make && make install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && make && make install)
endif endif

13
extras/contrib/src/Patches/gcrypt.patch
View File

@ -1,12 +1,11 @@
diff -urN libgcrypt/Makefile.am libgcrypt.patched/Makefile.am --- libgcrypt/Makefile.am.orig 2008-08-19 17:20:08.000000000 +0200
--- libgcrypt/Makefile.am 2008-04-02 00:27:11.000000000 +0400 +++ libgcrypt/Makefile.am 2008-10-21 09:57:33.000000000 +0200
+++ libgcrypt.patched/Makefile.am 2008-04-02 00:34:34.000000000 +0400
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
--enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
DIST_SUBDIRS = m4 mpi cipher src doc tests DIST_SUBDIRS = m4 mpi cipher random src doc tests
-SUBDIRS = mpi cipher src doc tests -SUBDIRS = mpi cipher random src doc tests
+SUBDIRS = mpi cipher src +SUBDIRS = mpi cipher random src
EXTRA_DIST = BUGS autogen.sh README.SVN EXTRA_DIST = autogen.sh README.SVN
DISTCLEANFILES = DISTCLEANFILES =

2
extras/contrib/src/packages.mak
View File

@ -144,7 +144,7 @@ PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
GPGERROR_VERSION=1.6 GPGERROR_VERSION=1.6
GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.bz2 GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.bz2
#GPGERROR_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2 #GPGERROR_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
GCRYPT_VERSION=1.4.1 GCRYPT_VERSION=1.4.3
#GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2 #GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2 GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
GNUTLS_VERSION=2.4.2 GNUTLS_VERSION=2.4.2

Write Preview
Loading…
Cancel
Save