Skip to content

V
vlc
Commit 07371bd2 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

We need to update gettext and libgpg-error to current releases in order to use a current libgcrypt. 

Needs testing on Win32 with Cygwin
parent d98a1f05
Show whitespace changes
Inline Side-by-side
Showing with 135 additions and 108 deletions
extras/contrib/src/Makefile
View file @ 07371bd2
......@@ -403,16 +403,18 @@ gettext-$(GETTEXT_VERSION).tar.gz:
gettext: gettext-$(GETTEXT_VERSION).tar.gz
$(EXTRACT_GZ)
ifdef HAVE_WIN32
patch -p0 < Patches/gettext-win32.patch
endif
ifdef HAVE_DARWIN_OS
patch -p 0 < Patches/gettext-macosx.patch
(cd $@; ./autogen.sh)
patch -p0 < Patches/gettext-macosx.patch
endif
.intl: gettext .iconv
ifdef HAVE_WIN32
( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX))
( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX) --disable-java --disable-native-java)
else
( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) )
( 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
......@@ -420,15 +422,20 @@ ifeq ($(BUILD),i586-pc-beos)
( cd $< && for f in `find . -name libtool`; do sed -e 's/ -shared / -nostart /' -e 's/^predep_objects.*/predep_objects=""/' -i $$f; chmod +x $$f; done )
endif
ifneq ($(HOST),$(BUILD))
# We'll use the installed gettext and only need to cross-compile libintl
( cd $< && make -C gettext-runtime/intl && make -C gettext-runtime/intl install )
ifndef HAVE_CYGWIN
# 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 && patch -p1 < ../Patches/libintl.patch && make -C gettext-runtime/intl install && make -C gettext-tools/misc install )
else
# We are compiling for MinGW on Cygwin -- build the full current gettext
( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install )
endif
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 '283 c #if !1' libintl.h)
(cd ../include; sed -i.orig '311 c #if 0' libintl.h)
endif
$(INSTALL_NAME)
touch $@
......@@ -1523,86 +1530,23 @@ DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
# gpg-error
# ***************************************************************************
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 -p 0 < Patches/libgpg-error.patch
libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2
$(EXTRACT_BZ2)
.gpg-error: libgpg-error
ifeq ($(HOST),i686-apple-darwin8)
(cd $<; ./autogen.sh)
endif
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls --disable-shared && make && make install)
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls --disable-shared --disable-languages && make && make install)
# $(INSTALL_NAME)
touch $@
# libraw1394
# ***************************************************************************
#ifdef SVN
#libraw1394:
# $(SVN) co -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394 libraw1394
# (cd $<; libtoolize --copy --force; \
# autopoint -f; \
# aclocal -I extras/contrib/share/aclocal; \
# autoconf; \
# autoheader; \
# automake --add-missing --copy -Wall)
#
#else
libraw1394-$(LIBRAW1394_VERSION).tar.gz:
$(WGET) $(LIBRAW1394_URL)
libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz
$(EXTRACT_GZ)
#endif
.libraw1394: libraw1394
(cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PRFIX) install)
touch $@
CLEAN_file += .libraw1394
CLEAN_PKG += libraw1394
DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION)
# ***************************************************************************
# libdc1394
# ***************************************************************************
#ifdef SVN
#libdc1394:
# $(SVN) co -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394 libdc1394
# (cd $<; libtoolize --copy --force; \
# autopoint -f; \
# aclocal -I extras/contrib/share/aclocal; \
# autoconf; \
# autoheader; \
# automake --add-missing --copy -Wall)
#
#else
libdc1394-$(LIBDC1394_VERSION).tar.gz:
$(WGET) $(LIBDC1394_URL)
libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz
$(EXTRACT_GZ)
#endif
.libdc1394: libdc1394
(cd $<; ./configure --prefix=$(PREFIX) && \
patch -p1 < ../Patches/libdc1394-noexamples.patch && \
make && make DESTDIR=$(PRFIX) install)
touch $@
CLEAN_file += .libdc1394
CLEAN_PKG += libdc1394
DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION)
# ***************************************************************************
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
......@@ -1676,6 +1620,68 @@ CLEAN_FILE += .opendaap
CLEAN_PKG += libopendaap
DISTCLEAN_PKG += libopendaap-$(DAAP_VERSION).tar.bz2
# ***************************************************************************
# libraw1394
# ***************************************************************************
#ifdef SVN
#libraw1394:
# $(SVN) co -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394 libraw1394
# (cd $<; libtoolize --copy --force; \
# autopoint -f; \
# aclocal -I extras/contrib/share/aclocal; \
# autoconf; \
# autoheader; \
# automake --add-missing --copy -Wall)
#
#else
libraw1394-$(LIBRAW1394_VERSION).tar.gz:
$(WGET) $(LIBRAW1394_URL)
libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz
$(EXTRACT_GZ)
#endif
.libraw1394: libraw1394
(cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PRFIX) install)
touch $@
CLEAN_file += .libraw1394
CLEAN_PKG += libraw1394
DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION)
# ***************************************************************************
# libdc1394
# ***************************************************************************
#ifdef SVN
#libdc1394:
# $(SVN) co -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394 libdc1394
# (cd $<; libtoolize --copy --force; \
# autopoint -f; \
# aclocal -I extras/contrib/share/aclocal; \
# autoconf; \
# autoheader; \
# automake --add-missing --copy -Wall)
#
#else
libdc1394-$(LIBDC1394_VERSION).tar.gz:
$(WGET) $(LIBDC1394_URL)
libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz
$(EXTRACT_GZ)
#endif
.libdc1394: libdc1394
(cd $<; ./configure --prefix=$(PREFIX) && \
patch -p1 < ../Patches/libdc1394-noexamples.patch && \
make && make DESTDIR=$(PRFIX) install)
touch $@
CLEAN_file += .libdc1394
CLEAN_PKG += libdc1394
DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION)
# ***************************************************************************
# glib
# ***************************************************************************
......
extras/contrib/src/Patches/gettext-macosx.patch
View file @ 07371bd2
diff -ruN gettext/gettext-runtime/m4/gettext.m4 gettext-0.14.5/gettext-runtime/m4/gettext.m4
--- gettext/gettext-runtime/m4/gettext.m4 2005-04-07 13:37:04.000000000 +0200
+++ gettext-0.14.5/gettext-runtime/m4/gettext.m4 2006-04-05 23:21:45.000000000 +0200
@@ -445,7 +445,7 @@
fi
--- gettext/gettext-tools/src/msgmerge.c.orig 2007-10-21 03:25:52.000000000 +0200
+++ gettext/gettext-tools/src/msgmerge.c 2008-03-23 19:54:36.000000000 +0100
@@ -96,7 +96,7 @@
if test -n "$INTL_MACOSX_LIBS"; then
- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+ CPPFLAGS="$CPPFLAGS -framework CoreFoundation"
fi
/* Update mode. */
static bool update_mode = false;
-static const char *version_control_string;
+static const char *version_control_string = "none";
static const char *backup_suffix_string;
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
@@ -489,7 +489,7 @@
AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
gt_cv_func_CFPreferencesCopyAppValue,
[gt_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+ CPPFLAGS="$CPPFLAGS -framework CoreFoundation"
gt_save_LIBS="$LIBS"
LIBS="$LIBS -framework CoreFoundation"
AC_TRY_LINK([#include <CFPreferences.h>],
@@ -505,7 +505,7 @@
dnl Check for API introduced in MacOS X 10.3.
AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
[gt_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+ CPPFLAGS="$CPPFLAGS -framework CoreFoundation"
gt_save_LIBS="$LIBS"
LIBS="$LIBS -framework CoreFoundation"
AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
/* Long options. */
extras/contrib/src/Patches/gettext-win32.patch 0 → 100644
View file @ 07371bd2
--- gettext-0.17/gettext-runtime/intl/Makefile.in 2007-11-04 21:21:12.000000000 +0000
+++ gettext/gettext-runtime/intl/Makefile.in 2008-03-07 18:14:53.000000000 +0000
@@ -280,15 +280,7 @@
# so that they work with the sed-3.02 that is shipped with MSYS. We can use
# GNU bash's $'\n' syntax to obtain such a newline.
libintl.res: $(srcdir)/libintl.rc
- nl=$$'\n'; \
- sed_extract_major='/^[0-9]/{'$${nl}'s/^\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
- sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
- sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
- $(WINDRES) \
- "-DPACKAGE_VERSION_STRING=\\\"$(VERSION)\\\"" \
- "-DPACKAGE_VERSION_MAJOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_major"` \
- "-DPACKAGE_VERSION_MINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_minor"` \
- "-DPACKAGE_VERSION_SUBMINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_subminor"` \
+ $(WINDRES) `$(top_srcdir)/../windows/windres-options --escape $(VERSION)`\
-i $(srcdir)/libintl.rc -o libintl.res --output-format=coff
ref-add.sed: $(srcdir)/ref-add.sin
extras/contrib/src/Patches/libintl.patch 0 → 100644
View file @ 07371bd2
--- gettext/gettext-runtime/intl/libgnuintl.h.in 2006-12-03 17:42:40.265625000 -0500
+++ gettext/gettext-runtime/intl/libgnuintl.h.in 2006-12-04 19:27:03.125000000 -0500
@@ -88,7 +88,7 @@
If he doesn't, we choose the method. A third possible method is
_INTL_REDIRECT_ASM, supported only by GCC. */
#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
-# if __GNUC__ >= 2 && !(__APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
+# if __GNUC__ >= 2 && !((defined __APPLE_CC__) && (__APPLE_CC__ > 1)) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
# define _INTL_REDIRECT_ASM
# else
# ifdef __cplusplus
@@ -110,7 +110,7 @@
/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
its n-th argument literally. This enables GCC to warn for example about
printf (gettext ("foo %y")). */
-#if __GNUC__ >= 3 && !(__APPLE_CC__ > 1 && defined __cplusplus)
+#if __GNUC__ >= 3 && !((defined __APPLE_CC__) && (__APPLE_CC__ > 1) && defined __cplusplus)
# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
#else
# define _INTL_MAY_RETURN_STRING_ARG(n)
extras/contrib/src/packages.mak
View file @ 07371bd2
......@@ -40,7 +40,7 @@ PKGCFG_VERSION=0.15.0
PKGCFG_URL=http://pkgconfig.freedesktop.org/releases/pkgconfig-$(PKGCFG_VERSION).tar.gz
LIBICONV_VERSION=1.9.2
LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
GETTEXT_VERSION=0.14.6
GETTEXT_VERSION=0.17
GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
FREETYPE2_VERSION=2.1.9
FREETYPE2_URL=$(SF)/freetype/freetype-$(FREETYPE2_VERSION).tar.gz
......@@ -121,9 +121,9 @@ CDIO_VERSION=0.77
CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
PNG_VERSION=1.2.29
PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
GPGERROR_VERSION=1.3
#GPGERROR_URL=http://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.gz
GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.gz
GPGERROR_VERSION=1.6
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
GCRYPT_VERSION=1.4.1
#GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment