Revision: 5397 Author: pebender Date: Wed Sep 2 09:35:11 2009 Log: - Modified mediaplayers/vlc so that it runs the full set of autotools.
http://code.google.com/p/minimyth/source/detail?r=5397 Added: /trunk/gar-minimyth/script/mediaplayers/vlc/files/vlc-1.0.1-libgcrypt_m4.patch Modified: /trunk/gar-minimyth/script/mediaplayers/vlc/Makefile /trunk/gar-minimyth/script/mediaplayers/vlc/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/mediaplayers/vlc/files/vlc-1.0.1-libgcrypt_m4.patch Wed Sep 2 09:35:11 2009 @@ -0,0 +1,112 @@ +diff -Naur vlc-1.0.1-old/m4/libgcrypt.m4 vlc-1.0.1-new/m4/libgcrypt.m4 +--- vlc-1.0.1-old/m4/libgcrypt.m4 1969-12-31 16:00:00.000000000 -0800 ++++ vlc-1.0.1-new/m4/libgcrypt.m4 2009-09-02 06:08:55.000000000 -0700 +@@ -0,0 +1,108 @@ ++dnl Autoconf macros for libgcrypt ++dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc. ++dnl ++dnl This file is free software; as a special exception the author gives ++dnl unlimited permission to copy and/or distribute it, with or without ++dnl modifications, as long as this notice is preserved. ++dnl ++dnl This file is distributed in the hope that it will be useful, but ++dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the ++dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ ++ ++dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, ++dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) ++dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. ++dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed ++dnl with the API version to also check the API compatibility. Example: ++dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed ++dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using ++dnl this features allows to prevent build against newer versions of libgcrypt ++dnl with a changed API. ++dnl ++AC_DEFUN([AM_PATH_LIBGCRYPT], ++[ AC_ARG_WITH(libgcrypt-prefix, ++ AC_HELP_STRING([--with-libgcrypt-prefix=PFX], ++ [prefix where LIBGCRYPT is installed (optional)]), ++ libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") ++ if test x$libgcrypt_config_prefix != x ; then ++ if test x${LIBGCRYPT_CONFIG+set} != xset ; then ++ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config ++ fi ++ fi ++ ++ AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) ++ tmp=ifelse([$1], ,1:1.2.0,$1) ++ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then ++ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` ++ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` ++ else ++ req_libgcrypt_api=0 ++ min_libgcrypt_version="$tmp" ++ fi ++ ++ AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) ++ ok=no ++ if test "$LIBGCRYPT_CONFIG" != "no" ; then ++ req_major=`echo $min_libgcrypt_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` ++ req_minor=`echo $min_libgcrypt_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` ++ req_micro=`echo $min_libgcrypt_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` ++ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` ++ major=`echo $libgcrypt_config_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` ++ minor=`echo $libgcrypt_config_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` ++ micro=`echo $libgcrypt_config_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` ++ if test "$major" -gt "$req_major"; then ++ ok=yes ++ else ++ if test "$major" -eq "$req_major"; then ++ if test "$minor" -gt "$req_minor"; then ++ ok=yes ++ else ++ if test "$minor" -eq "$req_minor"; then ++ if test "$micro" -ge "$req_micro"; then ++ ok=yes ++ fi ++ fi ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ AC_MSG_RESULT([yes ($libgcrypt_config_version)]) ++ else ++ AC_MSG_RESULT(no) ++ fi ++ if test $ok = yes; then ++ # If we have a recent libgcrypt, we should also check that the ++ # API is compatible ++ if test "$req_libgcrypt_api" -gt 0 ; then ++ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` ++ if test "$tmp" -gt 0 ; then ++ AC_MSG_CHECKING([LIBGCRYPT API version]) ++ if test "$req_libgcrypt_api" -eq "$tmp" ; then ++ AC_MSG_RESULT([okay]) ++ else ++ ok=no ++ AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` ++ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` ++ ifelse([$2], , :, [$2]) ++ else ++ LIBGCRYPT_CFLAGS="" ++ LIBGCRYPT_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(LIBGCRYPT_CFLAGS) ++ AC_SUBST(LIBGCRYPT_LIBS) ++]) ======================================= --- /trunk/gar-minimyth/script/mediaplayers/vlc/Makefile Tue Jul 28 03:40:43 2009 +++ /trunk/gar-minimyth/script/mediaplayers/vlc/Makefile Wed Sep 2 09:35:11 2009 @@ -4,7 +4,7 @@ MASTER_SITES = http://download.videolan.org/pub/videolan/$(GARNAME)/$(GARVERSION)/ MASTER_SITES += http://download.videolan.org/pub/videolan/testing/$(DISTNAME)/ DISTFILES = $(DISTNAME).tar.bz2 -PATCHFILES = $(DISTNAME)-vaapi.patch $(DISTNAME)-no_xcb.patch $(DISTNAME).patch.gar +PATCHFILES = $(DISTNAME)-libgcrypt_m4.patch $(DISTNAME)-vaapi.patch $(DISTNAME)-no_xcb.patch $(DISTNAME).patch.gar LICENSE = GPL2 DESCRIPTION = @@ -234,8 +234,7 @@ CXXFLAGS += -DHAVE_AVCODEC_VAAPI pre-configure: - @cd $(WORKSRC) ; aclocal --verbose --force -I m4 - @cd $(WORKSRC) ; automake --foreign --add-missing --ignore-deps + @cd $(WORKSRC) ; autoreconf --verbose --install --force @$(call FIX_LIBTOOL,$(WORKSRC),configure) @$(MAKECOOKIE) ======================================= --- /trunk/gar-minimyth/script/mediaplayers/vlc/checksums Tue Jul 28 03:40:43 2009 +++ /trunk/gar-minimyth/script/mediaplayers/vlc/checksums Wed Sep 2 09:35:11 2009 @@ -1,4 +1,5 @@ 6e299d373e7751bb36de001cdc6a2989 download/vlc-1.0.1.tar.bz2 +ba27a70c96f804a7a4bc3cd740118d9d download/vlc-1.0.1-libgcrypt_m4.patch 41524ffa74c4663624f7417fcf7b5823 download/vlc-1.0.1-vaapi.patch 9d448d26e5173fa4e9fb0678ba3c3072 download/vlc-1.0.1-no_xcb.patch 6df687a0e979871c8b9ba97f0201ee8b download/vlc-1.0.1.patch.gar --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
