contribs: use latest OS X binary package

[vlc] / extras / contrib / Makefile

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index ece24c0d66c0c2d813282e57dd831d97b7e68d20..97efcece9e98ea6a325e1e657ad612b8fbbf5719 100644 (file)
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -1,7 +1,7 @@
 # ***************************************************************************
 # Makefile : Build vlc-contrib files
 # ***************************************************************************
-# Copyright (C) 2003-2009 the VideoLAN team
+# Copyright (C) 2003-2010 the VideoLAN team
 # $Id$
 # 
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -47,7 +47,7 @@ src: using-src
 
 ifdef HAVE_DARWIN_OS
 
-CONTRIBREV=23
+CONTRIBREV=32
 
 contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
        $(WGET) http://downloads.videolan.org/pub/videolan/testing/contrib/$@
@@ -64,11 +64,13 @@ hosts/$(HOST)/.$(CONTRIBREV): contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
        (cd tmp && find . -type d) | while read dir; do mkdir -p -- "$(PREFIX)/$$dir"; done
        (cd tmp && find . -not -type d) | while read i; do mv -f -- tmp/"$$i" "$(PREFIX)/$$i"; done
        rm -rf tmp
+       # install the gecko-sdk, which isn't part of the package for size and speed reasons
+       (cd src && rm -rf *gecko* && $(MAKE) .gecko)
     # libiconv.la is no longer present on Snow Leopard, so fix possible references to it, which would
     # result in linking issues
 ifdef HAVE_DARWIN_10
        (cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig)
-       (cd src && $(MAKE) .iconv)
+       (cd src && rm -f .iconv && $(MAKE) .iconv)
 endif
        touch hosts/$(HOST)/.$(CONTRIBREV)
 
@@ -97,7 +99,8 @@ package-macosx:
                exit 1 ; \
        fi
        mkdir tmp
-       (cd $(PREFIX); tar cf - *) | (cd tmp; tar xf -)
+       (cd $(PREFIX); tar cf - Sparkle bin sbin include lib share/aclocal* share/autoconf* \
+               share/automake* share/gettext* share/libtool*) | (cd tmp; tar xf -)
        ./change_prefix.sh tmp $(PREFIX) @@CONTRIB_PREFIX@@
        (cd tmp; tar cf - .) | bzip2 -c > contrib-macosx.tar.bz2
        rm -rf tmp