Merge branch 'master' of git.m2x.eu:vlc into vaapi

Conflicts:
	modules/codec/avcodec/video.c

.gitignore

@@ -5,7 +5,6 @@
 *.lo
 *.lo?
 *.la
-*.mak
 *.moc.cpp
 *.o
 *.so

AUTHORS

@@ -97,6 +97,7 @@ Oleksandr Natalenko - Ukranian
 Omer Ensari - Kurmanji (Kurdish)
 Otto Kekäläinen - Finnish
 Pittayakom Saingtong - Thai
+Predrag Ljubenović - Serbian
 Roustam Ghizdatov - Russian
 Salar Khalilzadeh" - Persian
 Сергей Дарьичев - Belarusian

INSTALL.win32

@@ -24,21 +24,20 @@ Building VLC from the source code
 If you want to build VLC from sources, you can do it in several ways:
 
 - On GNU/Linux, using the mingw32 cross-compiler.
-  This method is preferred over all the others.
+  This is the preferred method, as this is the one used by VideoLAN to
+  build the official Windows binaries.
 
 - natively on Windows, using MSYS+MINGW (www.mingw.org)
   (MSYS is a minimal build environment to compile Unixish projects under
   windows. It provides all the common Unix tools like sh, gmake...)
 
-UNSUPPORTED METHODS
--------------------
+UNSUPPORTED METHOD
+------------------
+
 - natively on Windows, using cygwin (www.cygwin.com) with or without the
-  POSIX emulation layer. This is the preferred way to compile vlc if you want
-  to do it on Windows.
+  POSIX emulation layer.
   Read http://wiki.videolan.org/Win32CompileCygwinNew to have a complete HOWTO
 
-- natively on Windows, using Microsoft Visual Studio. This will not work.
-
 
 Getting the right compiler tools
 ================================
@@ -65,14 +64,14 @@ Usually, you don't want to compile those by yourself, so use pre-compiled ones.
 * We also provide a package with all the libraries already compiled so it is
   actually really easy to compile a full-featured version of vlc (these compiled
   libraries will only work with mingw or cygwin):
-  http://download.videolan.org/pub/testing/win32/contrib-200xxxxx-win32-bin-gcc-x.x.x-only.tar.bz2
+  http://download.videolan.org/pub/testing/win32/contrib-201xxxxx-win32-bin-gcc-x.x.x-runtime-x.xx.x-only.tar.bz2
   (Check out for more recent versions at the same location). 
 
   All you need to do is extract it in your root directory (the include files
   and libraries will be put in /usr/win32). You can do this with the following
   command: 
 
-    tar xjvf contrib-20060330-win32-bin-gcc-3.4.5-only.tar.bz2 -C /
+    tar xjvf contrib-20110614-win32-bin-gcc-4.4.4-runtime-3.15.2-only.tar.bz2 -C /
 
   Please note the "-C /".
 

NEWS

@@ -6,11 +6,13 @@ Important changes for packagers:
    its file systems and files content (except the Windows port). If this is
    not acceptable, pass --enable-non-utf8 to the configure script.
    Non-UTF-8 file systems support will be removed in future versions.
- * The VLC plugins path can be overriden with the VLC_PLUGIN_PATH environment
+ * The VLC plugins path can be overridden with the VLC_PLUGIN_PATH environment
    variable. The --plugin-path command line option was removed.
  * The default tarballs are now compressed with XZ/LZMA: .tar.xz
  * OSS support is not compiled on Linux by default, pass --enable-oss to the
    configure script if you use OSSv4 or really want to use OSS emulation.
+ * The Windows version will only work with Windows XP SP2 or later.
+   Windows 2000 SP4, Windows XP < SP2, Windows 2003 SP0 are now unsupported.
 
  * The NPAPI webplugin has moved to git://git.videolan.org/npapi-vlc.git
  * The ActiveX webplugin has moved to git://git.videolan.org/activex-vlc.git
@@ -45,13 +47,18 @@ Codecs:
  * You can now use ffmpeg-mt in conjunction with vlc
  * Important fixes for RealVideo 3.0 and 4.0 playback, notably in MKV
  * Experimental Hardware decoding using Broadcom CrystalHD cards
- * New module for Dirac encoding, using the faster libschroedinger
-   The Schroedinger module should be prefered to the Dirac one
+ * New module for decoding EBU subtitles (.stl)
+ * Support for 9bits and 10bits H.264/AVC decoding
+ * Support for Lagarith Lossless video codec
 
 Demuxers:
- * new images demuxer supporting jpeg, png, targa, xcf, git, tiff, bmp, pcx, lbm
- * Ogg seeking improvements
+ * New images demuxer supporting jpeg, png, targa, xcf, git, tiff, bmp, pcx, lbm
  * C64 SID file playback support using sidplay2
+ * Ogg seeking improvements
+ * Support for images/cover art in wma/wmv/asf files
+ * Improvements in .ape files metadata reading and writing
+ * New demuxer module for EBU subtitles (.stl)
+ * Support for caf, mtv, awb, f4v, amr, vro (DVD-VR) files
 
 Interfaces:
  * Skins2 / Qt: misc improvements and usability fixes
@@ -63,9 +70,13 @@ Interfaces:
  * ncurses: heavy refactor of the complete interface
  * Mac OS X: new Audio Effects panel adding Compressor and Spatializer filters
  * Mac OS X: new Track Synchronization panel
+ * Mac OS X: new Video Effects panel for color and geometry adjustments
+ * Mac OS X: re-written Open Disc functionality with automatic media detection
  * The rc and telnet lua interfaces were merged into a new "cli" interface
  * dbus: Rewrite of the main loop to use a more efficient poll-based model
  * dbus: Upgrade to an mpris2 compliant interface, see http://www.mpris.org
+ * webUI/http: Rewrite of the web interface, using jQuery
+ * webUI/http: some requests are now supported in JSON in addition to XML
 
 Video Output:
  * New video output based on Direct2D for Windows 7 and Vista (with Platform Update)
@@ -75,11 +86,14 @@ Video Output:
  * Various vmem improvements
  * OpenGL video output now accepts YUV as input and uses fragment programs for
    chroma conversion
+ * New video output for Android platform, based on Surface
+ * Support for 9/10bits output in the OpenGL output
 
 Audio Output:
  * New audio output based on AudioQueue API for iOS
  * New audio output in memory (amem)
  * Important simplification and improvements in the core audio output
+ * New audio output based on OpenSL ES API for Android
 
 Video Filter:
  * New gradfun filter for debanding videos using dithering
@@ -91,6 +105,9 @@ Video Filter:
  * New deinterlacer mode IVTC, to do live inverse telecine for NTSC films
  * New subsdelay filter to change subtitles delay
  * New anti-flickering filter
+ * New OpenMAX DL IPCS filter for color space conversion and resizing
+ * Major improvements in the freetype text-rendering module, notably supporting
+   blackbox and customizable shadow
 
 Audio Filter:
  * New Compressor filter, a dynamic range compressor
@@ -135,6 +152,80 @@ Removed modules:
  * upnp: use upnp_intel
  * removal of old telnet interface in favor of the new lua CLI
  * removal of http interface in favor of luahttp
+ * remove of the noise filter
+
+
+Changes between 1.1.10 and 1.1.11:
+----------------------------------
+
+Security:
+ * Fix buffer overflows in the RealMedia demuxer (CVE-2011-2587)
+   and the AVI one (CVE-2011-2588).
+
+Mac OS X:
+ * Fixed scrolling direction if the input device's signal is inverted
+ * Update Auhal audio output to the latest API
+ * Fix images disappearing issue on the interface
+ * Reduced installation size by up to 30 MB
+ * Resolved conflict between iTunes and VLC wrt Media Key handling
+
+Mozilla/ActiveX webplugin:
+ * Fullscreen mode is fixed on Win32
+ * Very simple fullscreen controller is visible on Win32
+
+Demuxers/Meta Readers:
+ * Better support for cover art embedded in mp4, wma
+
+Muxers/Output:
+ * Fix AVI muxer so the generated files are readable on other players
+
+Extensions:
+ * Multiple fixes for crashes and malfunctionning issues
+
+Qt Interface:
+ * Fix quitting on Linux
+ * Fix opening of VIDEO_TS folders through the open disc dialog on Windows
+ * Miscellaneous
+
+Win32 port:
+ * Update of codecs, fixing the mpeg-2 decoder crash
+
+Translations:
+ * Update of Slovak, Lithunanian, Russian, Brazillian Portuguese, Serbian
+
+
+Changes between 1.1.9 and 1.1.10:
+---------------------------------
+
+Windows and Mac OS X:
+ * Update of external library modplug, to address multiple security issues
+
+Mac OS X Interface:
+ * Improved Media Key handling based upon SPMediaKeyTap by Spotify AB
+ * Fix for various crashes and small issues
+
+Demuxer:
+ * Fix heap corruption / integer overflow in XSPF playlist parser
+
+Audio output:
+ * PulseAudio output re-written due to unstability of the current one
+
+Win32 port:
+ * Remove the fontconfig dependency from the freetype module
+
+Miscellaneous fixes in:
+ * Windows 7 taskbar buttons
+ * Qt interface
+ * asx, live555, dvdnav demuxer
+ * RTP output and XML export
+ * Subtitles colours when using GPU decoding on Windows
+ * v4l2 access
+
+Translations:
+ * Update of Norwegian Bokmål, Slovak, Afrikaans, Luganda,
+   Brazillian Portuguese, Irish, Thai, Estonian, Chinese, Polish,
+   Dutch, German, Galician, Bulgarian, Lithuanian and Japanese translations
+ * Initial Basque, Zulu, Peul, Amharic, Acoli, Chiga translations
 
 
 Changes between 1.1.8 and 1.1.9:

bin/Makefile.am

@@ -41,13 +41,14 @@ vlc_static_CFLAGS = $(AM_CFLAGS) \
 	$(NULL)
 vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES)
 vlc_static_LDADD = $(vlc_LDADD)
-vlc_static_LDFLAGS = $(vlc_LDFLAGS) -no-install -static
+vlc_static_LDFLAGS = $(vlc_LDFLAGS)
 
 if HAVE_WIN32
 vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT)
 vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT)
 else
 vlc_LDADD += $(LIBDL)
+vlc_static_LDFLAGS += -no-install -static
 endif
 
 vlc_win32_rc.rc: $(top_builddir)/config.status vlc_win32_rc.rc.in
@@ -62,3 +63,8 @@ vlc_cache_gen_LDADD = \
 	$(GNUGETOPT_LIBS) \
 	../compat/libcompat.la \
 	../src/libvlc.la ../src/libvlccore.la
+if HAVE_WIN32
+vlc_cache_gen_LDADD += vlc_win32_rc.$(OBJEXT)
+vlc_cache_gen_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
+endif
+

bin/override.c

 /*****************************************************************************
- * override.c: overriden function calls for VLC media player
+ * override.c: overridden function calls for VLC media player
  *****************************************************************************
  * Copyright (C) 2010 Rémi Denis-Courmont
  *

bin/vlc.c

@@ -121,11 +121,11 @@ int main( int i_argc, const char *ppsz_argv[] )
 
     setlocale (LC_ALL, "");
 
-#ifndef __APPLE__
-    /* This clutters OSX GUI error logs */
-    fprintf( stderr, "VLC media player %s (revision %s)\n",
-             libvlc_get_version(), libvlc_get_changeset() );
-#endif
+    if (isatty (STDERR_FILENO))
+        /* This message clutters error logs. It is print it only on a TTY.
+         * Forunately, LibVLC prints version infos with -vv anyhow. */
+        fprintf (stderr, "VLC media player %s (revision %s)\n",
+                 libvlc_get_version(), libvlc_get_changeset());
 
     sigset_t set;
 

bin/vlc_win32_rc.rc.in

-#define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA_RC@
-#define VERSION_NUMBER_STR "@VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA_RC@"
+#define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@
+#define VERSION_NUMBER_STR "@VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@"
 
 VLC_ICON ICON "vlc.ico"
 
@@ -13,14 +13,15 @@ BEGIN
   BEGIN
     BLOCK "040904E4"
     BEGIN
-      VALUE "CompanyName", "the VideoLAN Team"
+      VALUE "CompanyName", "VideoLAN"
       VALUE "ProductName", "VLC media player"
       VALUE "ProductVersion", VERSION_NUMBER_STR
-      VALUE "InternalName", ""
+      VALUE "InternalName", "vlc"
       VALUE "OriginalFilename", "vlc.exe"
       VALUE "FileVersion", "@VERSION@"
-      VALUE "FileDescription", "VLC media player"
-      VALUE "LegalCopyright", "(c) @COPYRIGHT_YEARS@ the VideoLAN Team"
+      VALUE "FileDescription", "VLC media player @VERSION@"
+      VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ VideoLAN and VLC Authors"
+      VALUE "LegalTrademarks", "VLC media player, VideoLAN and x264 are registered trademarks from VideoLAN"
     END
   END
   BLOCK "VarFileInfo"

bin/winvlc.c

@@ -115,6 +115,11 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
                     int nCmdShow )
 {
     int argc;
+
+#ifdef TOP_BUILDDIR
+    putenv("VLC_PLUGIN_PATH=Z:"TOP_BUILDDIR"/modules");
+#endif
+
 #ifndef UNDER_CE
     HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0);
 
@@ -137,12 +142,15 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     if (wargv == NULL)
         return 1;
 
-    char *argv[argc + 2];
+    char *argv[argc + 3];
     BOOL crash_handling = TRUE;
     int j = 0;
 
     argv[j++] = FromWide( L"--media-library" );
     argv[j++] = FromWide( L"--no-ignore-config" );
+#ifdef TOP_SRCDIR
+    argv[j++] = FromWide (L"--data-path=Z:"TOP_SRCDIR"/share");
+#endif
     for (int i = 1; i < argc; i++)
     {
         if(!wcscmp(wargv[i], L"--no-crashdump"))
@@ -249,7 +257,8 @@ static void check_crashdump()
                     MessageBox( NULL, L"There was an error while connecting to the FTP server. "\
                                     "Thanks a lot for the help anyway.",
                                     L"Report sending failed", MB_OK);
-                    fprintf(stderr,"Can't connect to FTP server%d\n",GetLastError());
+                    fprintf(stderr,"Can't connect to FTP server 0x%08lu\n",
+                            (unsigned long)GetLastError());
                 }
                 InternetCloseHandle(Hint);
             }

modules/gui/macosx/sidestatusview.h → compat/fsync.c

 /*****************************************************************************
- * sidestatusview.h: MacOS X interface module
+ * fsync.c: POSIX fsync() replacement
  *****************************************************************************
- * Copyright (C) 2005-2008 the VideoLAN team
- * $Id$
- *
- * Authors: Eric Dudiak <dudiak at gmail dot com>
- *          Colloquy <http://colloquy.info/>
+ * Copyright © 2011 Rémi Denis-Courmont
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,17 +13,26 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#import <Cocoa/Cocoa.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
-@interface sidestatusview : NSView {
-    IBOutlet NSSplitView *splitView;
-	float _clickOffset;
-	BOOL _insideResizeArea;
-}
+#ifdef WIN32
+# include <io.h>
+#endif
 
-@end
+int fsync (int fd)
+{
+#if defined(WIN32) && !defined(UNDER_CE)
+    /* WinCE can use FlushFileBuffers() but it operates on file handles */
+    return _commit (fd);
+#else
+# warning fsync() not implemented!
+    return 0;
+#endif
+}

contrib/.gitignore

+vlc-contrib-*.tar.xz

contrib/bootstrap

+#! /bin/sh
+# Copyright (C) 2003-2011 the VideoLAN team
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+
+#
+# Command line handling
+#
+usage()
+{
+	echo "Usage: $0 [--build=BUILD] [--host=HOST] [--prefix=PREFIX]"
+	echo "  --build=BUILD    configure for building on BUILD"
+	echo "  --host=HOST      cross-compile to build to run on HOST"
+	echo "  --prefix=PREFIX  install files in PREFIX"
+	echo "  --disable-FOO    configure to not build package FOO"
+	echo "  --enable-FOO     configure to build package FOO"
+	echo "  --disable-disc   configure to not build optical discs packages"
+	echo "  --disable-sout   configure to not build stream output packages"
+}
+
+BUILD=
+HOST=
+PREFIX=
+PKGS_ENABLE=
+PKGS_DISABLE=
+BUILD_ENCODERS="1"
+BUILD_DISCS="1"
+
+if test ! -f "../../contrib/src/main.mak"
+then
+	echo "$0 must be run from a subdirectory"
+	exit 1
+fi
+
+while test -n "$1"
+do
+	case "$1" in
+		--build=*)
+			BUILD="${1#--build=}"
+			;;
+		--help|-h)
+			usage
+			exit 0
+			;;
+		--host=*)
+			HOST="${1#--host=}"
+			;;
+		--prefix=*)
+			PREFIX="${1#--prefix=}"
+			;;
+		--disable-disc)
+			BUILD_DISCS=
+			;;
+		--disable-sout)
+			BUILD_ENCODERS=
+			;;
+		--disable-*)
+			PKGS_DISABLE="${PKGS_DISABLE} ${1#--disable-}"
+			;;
+		--enable-*)
+			PKGS_ENABLE="${PKGS_ENABLE} ${1#--enable-}"
+			;;
+		*)
+			echo "Unrecognized options $1"
+			usage
+			exit 1
+			;;
+	esac
+	shift
+done
+
+if test -z "$BUILD"
+then
+	echo -n "Guessing build system... "
+	BUILD="`cc -dumpmachine`"
+	if test -z "$BUILD"; then
+		echo "FAIL!"
+		exit 1
+	fi
+	echo "$BUILD"
+fi
+
+if test -z "$HOST"
+then
+	echo -n "Guessing host system...  "
+	HOST="$BUILD"
+	echo "$HOST"
+fi
+
+if test "$PREFIX"
+then
+	# strip trailing slash
+	PREFIX="${PREFIX%/}"
+fi
+
+#
+# Prepare files
+#
+echo "Creating configuration file... config.mak"
+exec 3>config.mak
+cat >&3 << EOF
+# This file was automatically generated.
+# Any change will be overwritten if ../bootstrap is run again.
+BUILD := $BUILD
+HOST := $HOST
+PKGS_DISABLE := $PKGS_DISABLE
+PKGS_ENABLE := $PKGS_ENABLE
+EOF
+
+add_make()
+{
+	while test -n "$1"
+	do
+		echo "$1" >&3
+		shift
+	done
+}
+
+add_make_enabled()
+{
+	while test -n "$1"
+	do
+		add_make "$1 := 1"
+		shift
+	done
+}
+
+test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
+test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
+test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
+
+#
+# Checks
+#
+OS="${HOST#*-}" # strip architecture
+case "${OS}" in
+	apple-darwin*)
+		add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
+		;;
+	*darwin*)
+		add_make_enabled "HAVE_DARWIN_OS" "HAVE_BSD"
+		;;
+	*bsd*)
+		add_make_enabled "HAVE_BSD"
+		;;
+	*linux*)
+		add_make_enabled "HAVE_LINUX"
+		;;
+	*wince*)
+		add_make_enabled "HAVE_WINCE"
+		;;
+	*mingw*)
+		add_make_enabled "HAVE_WIN32"
+		;;
+esac
+
+#
+# Results output
+#
+test -e Makefile && unlink Makefile
+ln -sf ../../contrib/src/main.mak Makefile
+cat << EOF
+Bootstrap completed.
+
+The following packages were selected:
+$PKGS
+
+Run "make" to start compilation.
+
+Other targets:
+ * make install      same as "make"
+ * make fetch        fetch required source tarballs
+ * make fetch-all    fetch all source tarballs
+ * make distclean    clean everything and undo bootstrap
+ * make mostlyclean  clean everything except source tarballs
+ * make clean        clean everything
+ * make list         list packages
+EOF
+
+mkdir -p ../../contrib/tarballs

contrib/src/README

+Writing rules
+==============
+
+At the bare minimum, a package in contrib must provide two Makefile
+targets in src/foo/rules.mak:
+ - .foo to build and install the package, and
+ - .sum-foo to fetch or create a source tarball and verify it,
+where foo the package name.
+
+
+Tarball
+--------
+
+.sum-foo typically depends on a separate target that fetches the source
+code. In that case, .sum-foo needs only verify that the tarball
+is correct, e.g.:
+
+
+	$(TARBALLS)/libfoo-$(FOO_VERSION).tar.bz2:
+		$(call download,$(FOO_URL))
+
+	# This will use the default rule: check SHA-512
+	.sum-foo: libfoo-$(FOO_VERSION).tar.bz2
+
+NOTE: contrary to the previous VLC contribs, this system always uses
+a source tarball, even if the source code is downloaded from a VCS.
+This serves two purposes:
+ - offline builds (or behind a firewall),
+ - source code requirements compliance.
+
+
+Compilation
+------------
+
+Similarly, .foo typically depends on the source code directory. In this
+case, care must be taken that the directory name only exists if the
+source code is fully ready. Otherwise Makefile dependencies will break
+(this is not an issue for files, only directories).
+
+	libfoo: libfoo-$(FOO_VERSION).tar.bz2 .sum-foo
+		$(UNPACK) # to libfoo-$(FOO_VERSION)
+		### apply patches here ###
+		# last command: make the target directory
+		$(MOVE)
+
+	.foo: libfoo
+		cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+		cd $< && $(MAKE) install
+		touch $@
+
+Conditional builds
+-------------------
+
+As far as possible, build rules should determine automatically whether
+a package is useful (for VLC media player) or not. Useful packages
+should be listed in the PKGS special variable. See some examples:
+
+	# FFmpeg is always useful
+	PKGS += ffmpeg
+
+	# DirectX headers are useful only on Windows
+	ifdef HAVE_WIN32
+	PKGS += directx
+	endif
+
+	# x264 is only useful when stream output is enabled
+	ifdef BUILD_ENCODERS
+	PKGS += x264
+	endif
+
+Some packages may be provided by the target system. This is especially
+common when building natively on Linux or BSD. When this situation is
+detected, the package name should be added to the PKGS_FOUND special
+variable. The build system will then skip building this package:
+
+	# Asks pkg-config if foo version 1.2.3 or later is present:
+	ifeq ($(call need_pkg,'foo >= 1.2.3'),)
+	PKGS_FOUND += foo
+	endif
+
+Note: The need_pkg function always return 1 during cross-compilation.
+This is a bug.
+
+
+Dependencies
+-------------
+
+If package bar depends on package foo, the special DEPS_bar variable
+should be defined as follow:
+
+	DEPS_bar = foo $(DEPS_foo)
+
+Note that dependency resolution is unfortunately _not_ recursive.
+Therefore $(DEPS_foo) really should be specified explicitly as shown
+above. (In practice, this will not make any difference insofar as there
+are no pure second-level nested dependencies. For instance, libass
+depends on FontConfig, which depends on FreeType, but libass depends
+directly on FreeType anyway.)
+
+Also note that DEPS_bar is set "recursively" with =, rather than
+"immediately" with :=. This is so that $(DEPS_foo) is expanded
+correctly, even if DEPS_foo it is defined after DEPS_bar.
+
+Implementation note:
+
+	If you must know, the main.mak build hackery will automatically
+	emit a dependency from .bar onto .dep-foo:
+
+		.bar: .dep-foo
+
+	...whereby .dep-foo will depend on .foo:
+
+		.dep-foo: .foo
+			touch $@
+
+	...unless foo was detected in the target distribution:
+
+		.dep-foo:
+			touch $@
+
+	So you really only need to set DEPS_bar.

contrib/src/SDL_image/SDL_image.patch

+diff -ruN SDL_image/Makefile.am SDL_image_new/Makefile.am
+--- SDL_image/Makefile.am	2007-07-21 07:26:34.000000000 +0200
++++ SDL_image_new/Makefile.am	2007-08-04 12:08:51.000000000 +0200
+@@ -44,7 +44,6 @@
+ else
+ libSDL_image_la_LDFLAGS = 	\
+ 	-no-undefined		\
+-	-release $(LT_RELEASE)	\
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ libSDL_image_la_LIBADD = $(IMG_LIBS)
+ endif
+diff -ruN SDL_image/Makefile.in SDL_image_new/Makefile.in
+--- SDL_image/Makefile.in	2007-07-21 07:27:57.000000000 +0200
++++ SDL_image_new/Makefile.in	2007-08-04 12:12:00.000000000 +0200
+@@ -260,12 +260,10 @@
+ 
+ @USE_VERSION_RC_FALSE@libSDL_image_la_LDFLAGS = \
+ @USE_VERSION_RC_FALSE@	-no-undefined		\
+-@USE_VERSION_RC_FALSE@	-release $(LT_RELEASE)	\
+ @USE_VERSION_RC_FALSE@	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ @USE_VERSION_RC_TRUE@libSDL_image_la_LDFLAGS = \
+ @USE_VERSION_RC_TRUE@	-no-undefined		\
+-@USE_VERSION_RC_TRUE@	-release $(LT_RELEASE)	\
+ @USE_VERSION_RC_TRUE@	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -Wl,version.o
+ 
+ @USE_VERSION_RC_FALSE@libSDL_image_la_LIBADD = $(IMG_LIBS)

contrib/src/SDL_image/SHA512SUMS

+0ccdde079d62979f5e482711eca40db65dbf791ceb36ff6c9bc5ac43b5187f61403876f1c4a8628cdc932e4b07ed09ae7ab6c1e05d998fa4e80c5efbd7a5ed0b  SDL_image-1.2.10.tar.gz

contrib/src/SDL_image/rules.mak

+# SDL_image
+
+SDL_IMAGE_VERSION := 1.2.10
+SDL_IMAGE_URL := http://www.libsdl.org/projects/SDL_image/release/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
+
+PKGS += SDL_image
+ifeq ($(call need_pkg,"SDL_image"),)
+PKGS_FOUND += SDL_image
+endif
+
+$(TARBALLS)/SDL_image-$(SDL_IMAGE_VERSION).tar.gz:
+	$(call download,$(SDL_IMAGE_URL))
+
+.sum-SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz
+
+SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz .sum-SDL_image
+	$(UNPACK)
+	$(APPLY) $(SRC)/SDL_image/SDL_image.patch
+	$(MOVE)
+
+DEPS_SDL_image = png $(DEPS_png) jpeg $(DEPS_jpeg) tiff $(DEPS_tiff) \
+	sdl $(DEPS_sdl)
+
+.SDL_image: SDL_image .png .jpeg .sdl
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-tif --disable-sdltest
+	cd $< && $(MAKE) install
+	touch $@

contrib/src/a52/SHA512SUMS

+4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848  a52dec-0.7.4.tar.gz

contrib/src/a52/rules.mak

+# liba52
+
+A52DEC_VERSION := 0.7.4
+A52DEC_URL := $(CONTRIB_VIDEOLAN)/a52dec-$(A52DEC_VERSION).tar.gz
+
+PKGS += a52
+
+$(TARBALLS)/a52dec-$(A52DEC_VERSION).tar.gz:
+	$(call download,$(A52DEC_URL))
+
+.sum-a52: a52dec-$(A52DEC_VERSION).tar.gz
+
+a52dec: a52dec-$(A52DEC_VERSION).tar.gz .sum-a52
+	$(UNPACK)
+ifndef HAVE_FPU
+	$(APPLY) $(SRC)/a52/liba52-fixed.diff
+endif
+	$(MOVE)
+
+.a52: a52dec
+ifdef HAVE_WIN64
+	$(RECONF)
+endif
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $</liba52 && $(MAKE) install
+	cd $</include && $(MAKE) install
+	touch $@

contrib/src/ass/SHA512SUMS

+345b5138875a31bce4f08bd378ab064d01b26cb51df2010056970158e8f845519f4aedebb0e0609200781e9e28e000ceba17b30e81ba5925f97499b09347e461  libass-0.9.12.tar.gz

contrib/src/ass/rules.mak

+# ASS
+ASS_VERSION := 0.9.12
+ASS_URL := http://libass.googlecode.com/files/libass-$(ASS_VERSION).tar.gz
+
+PKGS += ass
+ifeq ($(call need_pkg,"libass"),)
+PKGS_FOUND += ass
+endif
+
+$(TARBALLS)/libass-$(ASS_VERSION).tar.gz:
+	$(call download,$(ASS_URL))
+
+.sum-ass: libass-$(ASS_VERSION).tar.gz
+
+libass: libass-$(ASS_VERSION).tar.gz .sum-ass
+	$(UNPACK)
+	$(MOVE)
+
+DEPS_ass = freetype2 $(DEPS_freetype2) fontconfig $(DEPS_fontconfig)
+
+.ass: libass
+	#$(RECONF)
+	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) --disable-png --disable-enca
+	cd $< && $(MAKE) install
+	touch $@

contrib/src/dca/SHA512SUMS

+d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287  libdca-0.0.5.tar.bz2

contrib/src/dca/libdca-llvm-gcc.patch

+Index: libdca/parse.c
+===================================================================
+--- libdca/parse.c	(revision 90)
++++ libdca/parse.c	(working copy)
+@@ -1193,11 +1193,14 @@
+         for (k=0;k<16;k++)
+         {
+             B[k] = 0.0;
+-            for (i=0;i<16;i++)
++
++            B[k]+=(raXin[0])*state->cos_mod[j++];
++
++            for (i=1;i<16;i++)
+             {
+-                if(i>0) B[k]+=(raXin[2*i]+raXin[2*i-1])*state->cos_mod[j++];
+-                else B[k]+=(raXin[2*i])*state->cos_mod[j++];
++                B[k]+=(raXin[2*i]+raXin[2*i-1])*state->cos_mod[j++];
+             }
++
+             SUM[k]=A[k]+B[k];
+             DIFF[k]=A[k]-B[k];
+         }

contrib/src/dca/rules.mak

+# libdca
+
+DCA_VERSION := 0.0.5
+DCA_URL := $(VIDEOLAN)/libdca/$(DCA_VERSION)/libdca-$(DCA_VERSION).tar.bz2
+
+ifdef HAVE_FPU
+PKGS += dca
+endif
+ifeq ($(call need_pkg,"libdca"),)
+PKGS_FOUND += dca
+endif
+
+$(TARBALLS)/libdca-$(DCA_VERSION).tar.bz2:
+	$(call download,$(DCA_URL))
+
+.sum-dca: libdca-$(DCA_VERSION).tar.bz2
+
+libdca: libdca-$(DCA_VERSION).tar.bz2 .sum-dca
+	$(UNPACK)
+	#$(APPLY) $(SRC)/dca/libdca-llvm-gcc.patch
+	$(MOVE)
+
+.dca: libdca
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $< && $(MAKE) install
+	touch $@

contrib/src/directx/SHA512SUMS

+03620b89ed8f9e9e339be9f7024d1f9a71468cba0ac2389eabd68ed1f1aa0a2d6e67c42c93f9a91eb43cf06964112dc9942ae49f8b532ff5c69db53d6b03edf8  directx-oss.tar.bz2
+e62868480379fbb7bc7a433836c6884d51e35ca2d903b9b1f0944250a9d87814be087237240ce84e6d173ea84faed5ea834f2b38800e5ac2c2d8365726defb6a  dxva2api.h

contrib/src/directx/rules.mak

+# DirectX headers
+
+DX_HEADERS_URL := $(CONTRIB_VIDEOLAN)/directx-oss.tar.bz2
+DXVA2_URL := $(CONTRIB_VIDEOLAN)/dxva2api.h
+
+ifdef HAVE_WIN32
+PKGS += directx
+endif
+
+$(TARBALLS)/directx-oss.tar.bz2:
+	$(call download,$(DX_HEADERS_URL))
+
+$(TARBALLS)/dxva2api.h:
+	$(call download,$(DXVA2_URL))
+
+.sum-directx: directx-oss.tar.bz2 dxva2api.h
+
+.directx: directx-oss.tar.bz2 dxva2api.h .sum-directx
+	mkdir -p -- "$(PREFIX)/include"
+	tar xvjf $< -C "$(PREFIX)/include"
+	cp $(TARBALLS)/dxva2api.h "$(PREFIX)/include/"
+	touch $@

contrib/src/dshow/SHA512SUMS

+779c4a36a4276c6e18017b898903cdf162c186b2f8de22ac12d995b316fe40d8277374eb88c695e8a760497239ad176a85ea4ecccd0df841283f95ff591997a7  dshow-headers-oss.tar.bz2

contrib/src/dshow/rules.mak

+# DirectX headers
+
+DSHOW_HEADERS_URL := $(CONTRIB_VIDEOLAN)/dshow-headers-oss.tar.bz2
+D2D_HASH := b1affb70c021200b410eccd377ad5aeef2c5a85b
+D2D_URL := http://nodeload.github.com/2of1/d2d1headers/tarball/master
+# FIXME: ^ D2D not working
+
+ifdef HAVE_WIN32
+PKGS += dshow
+endif
+
+$(TARBALLS)/dshow-headers-oss.tar.bz2:
+	$(call download,$(DSHOW_HEADERS_URL))
+
+$(TARBALLS)/d2d_headers.tar.gz:
+	$(call download,$(D2D_URL))
+
+DSHOW_SOURCES := dshow-headers-oss.tar.bz2 d2d_headers.tar.gz
+
+.sum-dshow: $(DSHOW_SOURCES)
+
+.dshow: $(DSHOW_SOURCES) .sum-dshow
+	mkdir -p -- "$(PREFIX)/include"
+	tar xjf $< -C "$(PREFIX)/include" \
+		--wildcards --no-anchored '*.h' --strip-components=1
+	tar xzf $(TARBALLS)/d2d_headers.tar.gz -C "$(PREFIX)/include" \
+		 --wildcards --no-anchored '*.h' --strip-components=1
+	touch $@

contrib/src/dvbpsi/SHA512SUMS

+c04f38631a3b9d5ff394afd51bf3370c46a8ffb31b37184784cf45c7f3dfa128a2bb8f114480068c16d03e8cd685739e5ab87eeb5c08c56b80f1483021b2c2d5  libdvbpsi-0.2.0.tar.bz2

contrib/src/dvbpsi/libdvbpsi-example.patch

+--- libdvbpsi/examples/decode_mpeg.c	2010-02-12 11:17:47.000000000 +0100
++++ libdvbpsi.new/examples/decode_mpeg.c	2011-04-29 02:21:40.758841339 +0200
+@@ -529,8 +529,8 @@
+ 
+     int i_fd = -1;
+     int i_mtu = 1316; /* (7 * 188) = 1316 < 1500 network MTU */
+-#ifdef HAVE_SYS_SOCKET_H
+     int i_report = REPORT_UDP; /* REPORT_PCR REPORT_UDP */
++#ifdef HAVE_SYS_SOCKET_H
+     int i_port = 0;
+     char *ipaddress = NULL;
+ #endif

contrib/src/dvbpsi/rules.mak

+# dvbpsi
+
+DVBPSI_VERSION := 0.2.0
+DVBPSI_URL := $(VIDEOLAN)/libdvbpsi/$(DVBPSI_VERSION)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2
+
+PKGS += dvbpsi
+ifeq ($(call need_pkg,"libdvbpsi"),)
+PKGS_FOUND += dvbpsi
+endif
+
+$(TARBALLS)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2:
+	$(call download,$(DVBPSI_URL))
+
+.sum-dvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2
+
+libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
+	$(UNPACK)
+	$(APPLY) $(SRC)/dvbpsi/libdvbpsi-example.patch
+	$(MOVE)
+
+.dvbpsi: libdvbpsi
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-release
+	cd $< && $(MAKE) install
+	touch $@

contrib/src/ebml/SHA512SUMS

+c8bd4d903fcd6ea70cd6aace2096768c7e62deb8ddd41d354b71527d6f4595f06b86169996f2ed56e1da0531b9f7ebcac4c9ccdd2e208614f7cd3271b8cf0f4d  libebml-1.2.1.tar.bz2

contrib/src/ebml/rules.mak

+# ebml
+
+EBML_VERSION := 1.2.1
+EBML_URL := http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar.bz2
+#EBML_URL := $(CONTRIB_VIDEOLAN)/libebml-$(EBML_VERSION).tar.bz2
+
+$(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2:
+	$(call download,$(EBML_URL))
+
+.sum-ebml: libebml-$(EBML_VERSION).tar.bz2
+
+libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
+	$(UNPACK)
+	$(MOVE)
+
+.ebml: libebml
+ifdef HAVE_WIN32
+	cd $< && $(MAKE) -C make/mingw32 prefix="$(PREFIX)" $(HOSTVARS) SHARED=no
+else
+	cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) staticlib
+endif
+	cd $< && $(MAKE) -C make/linux install_staticlib install_headers prefix="$(PREFIX)" $(HOSTVARS)
+	$(RANLIB) "$(PREFIX)/lib/libebml.a"
+	touch $@

contrib/src/faad2/SHA512SUMS

+8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161  faad2-2.7.tar.gz

contrib/src/faad2/faad2-fixed.patch

+diff -ru faad2-2.7/libfaad/common.h faad2/libfaad/common.h
+--- faad2-2.7/libfaad/common.h  2009-02-05 02:51:03.000000000 +0200
++++ faad2/libfaad/common.h      2009-09-01 20:41:20.000000000 +0300
+@@ -79,6 +79,8 @@
+ #define FIXED_POINT
+ #endif
+ 
++#define FIXED_POINT
++
+ #define ERROR_RESILIENCE
+ 
+ 
+ 

contrib/src/faad2/rules.mak

+# faad2
+
+FAAD2_VERSION := 2.7
+FAAD2_URL := $(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz
+
+ifeq ($(findstring $(ARCH),arm),)
+# FAAD is a lot slower than lavc on ARM. Skip it.
+PKGS += faad2
+endif
+
+$(TARBALLS)/faad2-$(FAAD2_VERSION).tar.gz:
+	$(call download,$(FAAD2_URL))
+
+.sum-faad2: faad2-$(FAAD2_VERSION).tar.gz
+
+faad2: faad2-$(FAAD2_VERSION).tar.gz .sum-faad2
+	$(UNPACK)
+ifndef HAVE_FPU
+	$(APPLY) $(SRC)/faad2/faad2-fixed.patch
+endif
+	cd $(UNPACK_DIR) && $(CC) -iquote . -E - </dev/null || sed -i 's/-iquote /-I/' libfaad/Makefile.am
+	$(MOVE)
+
+.faad2: faad2
+	$(RECONF)
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(NOTHUMB)"
+	cd $< && sed -i.orig "s/shrext_cmds/shrext/g" libtool
+	cd $</libfaad && $(MAKE) install
+	touch $@

contrib/src/ffmpeg/ffmpeg-win64.patch

+Index: ffmpeg-svn/libswscale/swscale_template.c
+===================================================================
+--- ffmpeg-svn/libswscale/swscale_template.c	(revision 31036)
++++ ffmpeg-svn/libswscale/swscale_template.c	(working copy)
+@@ -2466,6 +2466,7 @@
+         }
+     } else {
+ #endif /* COMPILE_TEMPLATE_MMX2 */
++#if 0
+         x86_reg xInc_shr16 = (x86_reg) (xInc >> 16);
+         uint16_t xInc_mask = xInc & 0xffff;
+         __asm__ volatile(
+@@ -2501,6 +2502,7 @@
+             "r" (src2)
+             : "%"REG_a, "%"REG_d, "%ecx", "%"REG_D, "%esi"
+         );
++#endif
+ #if COMPILE_TEMPLATE_MMX2
+     } //if MMX2 can't be used
+ #endif

contrib/src/ffmpeg/libavformat-ape.c.patch

+X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavformat%2Fape.c;h=187c9865a4fce398c7a4b4b19aad0a59b281a469;hp=2de47ef483245372a9a3c56656cd48a30a383856;hb=1c31b26bdf66879a46a7a3e340da815c1b2125a8;hpb=6947b0c42e0649f0c8355442d1732d642e467902
+
+diff --git a/libavformat/ape.c b/libavformat/ape.c
+index 2de47ef..187c986 100644
+--- a/libavformat/ape.c
++++ b/libavformat/ape.c
+@@ -242,6 +242,10 @@ static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap)
+             avio_seek(pb, ape->wavheaderlength, SEEK_CUR);
+     }
+ 
++    if(!ape->totalframes){
++        av_log(s, AV_LOG_ERROR, "No frames in the file!\n");
++        return AVERROR(EINVAL);
++    }
+     if(ape->totalframes > UINT_MAX / sizeof(APEFrame)){
+         av_log(s, AV_LOG_ERROR, "Too many frames: %d\n", ape->totalframes);
+         return -1;

contrib/src/ffmpeg/rules.mak

+# FFmpeg
+
+FFMPEG_VERSION=0.4.8
+FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
+FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
+FFMPEG_SVN_REV=26400
+
+FFMPEGCONF = \
+	--cc="$(CC)" \
+	--disable-doc \
+	--disable-decoder=libvpx \
+	--enable-libgsm \
+	--enable-libvpx \
+	--disable-debug \
+	--enable-gpl \
+	--enable-postproc \
+	--disable-ffprobe \
+	--disable-ffserver \
+	--disable-ffmpeg \
+	--disable-ffplay \
+	--disable-devices \
+	--disable-protocols \
+	--disable-avfilter \
+	--disable-network
+DEPS_ffmpeg = zlib gsm vpx $(DEPS_vpx)
+
+# Optional dependencies
+ifdef BUILD_ENCODERS
+# TODO:
+#FFMPEGCONF += --enable-libmp3lame
+#DEPS_ffmpeg += lame $(DEPS_lame)
+else
+FFMPEGCONF += --disable-encoders --disable-muxers
+# XXX: REVISIT --enable-small ?
+endif
+
+# XXX: REVISIT
+#ifndef HAVE_FPU
+#FFMPEGCONF += --disable-mpegaudio-hp
+#endif
+
+ifdef HAVE_CROSS_COMPILE
+FFMPEGCONF += --enable-cross-compile --cross-prefix=$(HOST)-
+endif
+
+# ARM stuff
+ifeq ($(ARCH),arm)
+FFMPEGCONF += --disable-runtime-cpudetect
+endif
+
+# Darwin
+ifdef HAVE_DARWIN_OS
+FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
+FFMPEG_CFLAGS += -DHAVE_LRINTF
+endif
+ifdef HAVE_MACOSX
+ifneq ($(findstring $(ARCH),i386 x86_64),)
+FFMPEGCONF += --enable-memalign-hack
+endif
+ifeq ($(ARCH),x86_64)
+FFMPEGCONF += --cpu=core2
+endif
+DEPS_ffmpeg += yasm $(DEPS_yasm)
+endif
+
+# Linux
+ifdef HAVE_LINUX
+FFMPEGCONF += --target-os=linux --enable-pic
+endif
+
+# Windows
+ifdef HAVE_WIN32
+FFMPEGCONF += --target-os=mingw32 --enable-memalign-hack
+FFMPEGCONF += --enable-w32threads \
+	--disable-bzlib --disable-bsfs \
+	--disable-decoder=dca --disable-encoder=vorbis
+
+ifdef HAVE_WIN64
+FFMPEGCONF += --disable-dxva2
+
+FFMPEGCONF += --cpu=athlon64 --arch=x86_64
+else # !WIN64
+FFMPEGCONF += --enable-dxva2
+DEPS_ffmpeg += directx
+
+FFMPEGCONF+= --cpu=i686 --arch=x86
+endif
+else
+FFMPEGCONF += --enable-pthreads
+endif
+
+ifdef HAVE_WINCE
+FFMPEGCONF += --target-os=mingw32ce --arch=armv4l --cpu=armv4t \
+	--disable-decoder=snow --disable-decoder=vc9 \
+	--disable-decoder=wmv3 --disable-decoder=vorbis \
+	--disable-decoder=dvdsub --disable-decoder=dvbsub
+endif
+
+FFMPEG_CFLAGS += --std=gnu99
+
+# Build
+
+PKGS += ffmpeg
+ifeq ($(call need_pkg,"libavcodec libavformat libswscale"),)
+PKGS_FOUND += ffmpeg
+endif
+
+ffmpeg-$(FFMPEG_VERSION).tar.gz:
+	$(error FFmpeg snapshot is too old, VCS must be used!)
+	$(call download,$(FFMPEG_URL))
+
+$(TARBALLS)/ffmpeg-svn.tar.gz:
+	$(SVN) export $(FFMPEG_SVN) ffmpeg-svn
+	tar cvz ffmpeg-svn > $@
+
+FFMPEG_VERSION := svn
+
+.sum-ffmpeg: $(TARBALLS)/ffmpeg-$(FFMPEG_VERSION).tar.gz
+	$(warning Not implemented.)
+	touch $@
+
+ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
+	$(UNPACK)
+ifdef HAVE_WIN64
+	$(APPLY) $(SRC)/ffmpeg/ffmpeg-win64.patch
+endif
+ifdef HAVE_WIN32
+	sed -i "s/std=c99/std=gnu99/" $@-$(FFMPEG_VERSION)/configure
+endif
+	$(APPLY) $(SRC)/ffmpeg/libavformat-ape.c.patch
+	$(MOVE)
+
+.ffmpeg: ffmpeg
+	cd $< && $(HOSTVARS) ./configure \
+		--extra-cflags="$(FFMPEG_CFLAGS) -DHAVE_STDINT_H"  \
+		--extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) \
+		--prefix="$(PREFIX)" --enable-static --disable-shared
+	cd $< && $(MAKE) install-libs install-headers
+	touch $@

contrib/src/flac/SHA512SUMS

+39b216239341fbfe210c3a2fc0d0531ecae26c425365c4b6d4fc1081e44e6dc7a9aba8d4c79cc8025386d0a7bb0d25c413c9b64cf7da9ab04ca34a56d2699787  flac-1.2.1.tar.gz

contrib/src/flac/libFLAC-pc.patch

+--- flac/src/libFLAC/flac.pc.in	2007-02-07 02:07:32.000000000 +0100
++++ flac.new/src/libFLAC/flac.pc.in	2011-06-10 17:53:44.337825845 +0200
+@@ -6,5 +6,6 @@
+ Name: FLAC
+ Description: Free Lossless Audio Codec Library
+ Version: @VERSION@
+-Libs: -L${libdir} -lFLAC -lm
++Libs: -L${libdir} -lFLAC -logg -lm
+ Cflags: -I${includedir}/FLAC
++Requires.private: ogg

contrib/src/flac/rules.mak

+# FLAC
+
+FLAC_VERSION := 1.2.1
+FLAC_URL := $(SF)/flac/flac-$(FLAC_VERSION).tar.gz
+
+PKGS += flac
+ifeq ($(call need_pkg,"flac"),)
+PKGS_FOUND += flac
+endif
+
+$(TARBALLS)/flac-$(FLAC_VERSION).tar.gz:
+	$(call download,$(FLAC_URL))
+
+.sum-flac: flac-$(FLAC_VERSION).tar.gz
+
+flac: flac-$(FLAC_VERSION).tar.gz .sum-flac
+	$(UNPACK)
+	$(APPLY) $(SRC)/flac/flac-win32.patch
+	$(APPLY) $(SRC)/flac/libFLAC-pc.patch
+ifdef HAVE_MACOSX
+	cd $(UNPACK_DIR) && sed -e 's,-dynamiclib,-dynamiclib -arch $(ARCH),' -i.orig configure
+endif
+	$(MOVE)
+
+FLACCONF := $(HOSTCONF) \
+	--disable--thorough-tests \
+	--disable-doxygen-docs \
+	--disable-xmms-plugin \
+	--disable-cpplibs \
+	--disable-oggtest
+# TODO? --enable-sse
+ifdef HAVE_MACOSX
+ifneq ($(findstring $(ARCH),i386 x86_64),)
+FLAC_DISABLE_FLAGS += --disable-asm-optimizations
+endif
+endif
+
+DEPS_flac = ogg $(DEPS_ogg)
+
+.flac: flac
+	cd $< && $(HOSTVARS) ./configure $(FLACCONF)
+	cd $</src && $(MAKE) -C libFLAC install
+	cd $< && $(MAKE) -C include install
+	touch $@

contrib/src/fluid/SHA512SUMS

+9e8ca850d4dbf8404208ef6bb76d9d3775f574f10b2d0045aba23c989b893bcf6386d72dda593e0e4cdcb744f78b03859a2146edf8cce77c027416680ceb0ce1  fluidsynth-1.0.9.tar.gz
+b0f97b9c890d45a59dcb1cc0676a6a157c3f57231f433b38441f8b89a70b5a73f3e9d8ef9e35ecd5209fbbc86c4ec8779439c51cde431295b8a9349b718b118e  fluidsynth-1.1.3.tar.bz2

contrib/src/fluid/fluid-no-bin.patch

+--- fluidsynth/src/Makefile.am	2007-11-11 21:06:28.000000000 +0100
++++ fluidsynth.old/src/Makefile.am	2009-07-08 17:48:53.000000000 +0200
+@@ -39,7 +39,7 @@
+ 	config_win32.h fluid_jack.c
+ 
+ lib_LTLIBRARIES = libfluidsynth.la
+-bin_PROGRAMS = fluidsynth 
++bin_PROGRAMS = 
+ 
+ libfluidsynth_la_SOURCES = \
+ 	$(fluid_alsa) \

contrib/src/fluid/fluid-static-win32.patch

+--- fluidsynth/fluidsynth.pc.in	2007-08-18 23:55:32.000000000 +0200
++++ fluidsynth.new/fluidsynth.pc.in	2009-07-28 23:41:05.000000000 +0200
+@@ -6,5 +6,5 @@
+ Name: FluidSynth
+ Description: Software SoundFont synth
+ Version: @VERSION@
+-Libs: -L${libdir} -lfluidsynth
++Libs: -L${libdir} -lfluidsynth -ldsound -lwinmm
+ Cflags: -I${includedir}

contrib/src/fluid/rules.mak

+# fluid
+
+FLUID_VERSION := 1.1.3
+FLUID_URL := $(SF)/fluidsynth/fluidsynth-$(FLUID_VERSION)/fluidsynth-$(FLUID_VERSION).tar.bz2
+FLUID_OLDURL := $(SF)/fluidsynth/older%20releases/fluidsynth-1.0.9.tar.gz
+
+PKGS += fluid
+ifeq ($(call need_pkg,"fluidsynth"),)
+PKGS_FOUND += fluid
+endif
+
+$(TARBALLS)/fluidsynth-$(FLUID_VERSION).tar.bz2:
+	$(call download,$(FLUID_URL))
+
+$(TARBALLS)/fluidsynth-1.0.9.tar.gz:
+	$(call download,$(FLUID_OLDURL))
+
+.sum-fluid: fluidsynth-$(FLUID_VERSION).tar.bz2 fluidsynth-1.0.9.tar.gz
+
+ifeq ($(call need_pkg,"glib-2.0"),)
+FLUID_TARBALL := fluidsynth-$(FLUID_VERSION).tar.bz2
+else
+FLUID_TARBALL := fluidsynth-1.0.9.tar.gz
+endif
+
+fluidsynth: $(FLUID_TARBALL) .sum-fluid
+	$(UNPACK)
+	$(APPLY) $(SRC)/fluid/fluid-no-bin.patch
+ifdef HAVE_WIN32
+	$(APPLY) $(SRC)/fluid/fluid-static-win32.patch
+endif
+	$(MOVE)
+
+FLUIDCONF := $(HOSTCONF) \
+	--disable-alsa-support \
+	--disable-aufile-support \
+	--disable-coreaudio \
+	--disable-coremidi \
+	--disable-dart \
+	--disable-dbus-support \
+	--disable-jack-support \
+	--disable-ladcca \
+	--disable-lash \
+	--disable-libsndfile-support \
+	--disable-midishare \
+	--disable-oss-support \
+  	--disable-portaudio-support \
+	--disable-pulse-support \
+	--without-readline
+
+.fluid: fluidsynth
+	$(RECONF)
+	cd $< && $(HOSTVARS) ./configure $(FLUIDCONF)
+	cd $< && $(MAKE) install
+	touch $@

contrib/src/fontconfig/SHA512SUMS

+a110e72cc631f1e374324a02f6ba9526b89a547cafe2ae27b9913938b19018843b2940084d62f0dfaf38a6919dea6974fb98422d3908026f6873d5fba17c55a0  fontconfig-2.8.0.tar.gz

contrib/src/fontconfig/fontconfig-march.patch

+diff -urNp fontconfig.orig/fc-arch/Makefile.am fontconfig/fc-arch/Makefile.am
+--- fontconfig.orig/fc-arch/Makefile.am	2009-03-18 22:02:20.000000000 +0100
++++ fontconfig/fc-arch/Makefile.am	2010-01-11 17:58:51.000000000 +0100
+@@ -22,6 +22,8 @@
+ # PERFORMANCE OF THIS SOFTWARE.
+ #
+ 
++CPPFLAGS =
++CFLAGS =
+ CC = @CC_FOR_BUILD@
+ EXEEXT = @EXEEXT_FOR_BUILD@
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+diff -urNp fontconfig.orig/fc-case/Makefile.am fontconfig/fc-case/Makefile.am
+--- fontconfig.orig/fc-case/Makefile.am	2009-03-18 22:02:20.000000000 +0100
++++ fontconfig/fc-case/Makefile.am	2010-01-11 17:56:39.000000000 +0100
+@@ -22,6 +22,8 @@
+ # PERFORMANCE OF THIS SOFTWARE.
+ #
+ 
++CPPFLAGS =
++CFLAGS =
+ CC = @CC_FOR_BUILD@
+ EXEEXT = @EXEEXT_FOR_BUILD@
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+diff -urNp fontconfig.orig/fc-glyphname/Makefile.am fontconfig/fc-glyphname/Makefile.am
+--- fontconfig.orig/fc-glyphname/Makefile.am	2009-03-18 22:02:20.000000000 +0100
++++ fontconfig/fc-glyphname/Makefile.am	2010-01-11 17:57:29.000000000 +0100
+@@ -22,6 +22,8 @@
+ # PERFORMANCE OF THIS SOFTWARE.
+ #
+ 
++CPPFLAGS =
++CFLAGS =
+ CC = @CC_FOR_BUILD@
+ EXEEXT = @EXEEXT_FOR_BUILD@
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+diff -urNp fontconfig.orig/fc-lang/Makefile.am fontconfig/fc-lang/Makefile.am
+--- fontconfig.orig/fc-lang/Makefile.am	2009-06-24 19:52:10.000000000 +0200
++++ fontconfig/fc-lang/Makefile.am	2010-01-11 17:56:56.000000000 +0100
+@@ -22,6 +22,8 @@
+ # PERFORMANCE OF THIS SOFTWARE.
+ #
+ 
++CPPFLAGS =
++CFLAGS =
+ CC = @CC_FOR_BUILD@
+ EXEEXT = @EXEEXT_FOR_BUILD@
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

contrib/src/fontconfig/fontconfig-noxml2.patch

+--- fontconfig/src/fcxml.c	2009-08-13 16:07:13.000000000 +0200
++++ fontconfig.new/src/fcxml.c	2009-08-13 16:05:41.000000000 +0200
+@@ -23,6 +23,8 @@
+  */
+ 
+ #include "fcint.h"
++
++#if 0
+ #include <fcntl.h>
+ #include <stdarg.h>
+ #include <dirent.h>
+@@ -58,6 +60,8 @@
+ #undef STRICT
+ #endif
+ 
++#endif
++
+ static void
+ FcExprDestroy (FcExpr *e);
+ 
+@@ -71,6 +75,7 @@
+     free (test);
+ }
+ 
++#if 0
+ static FcExpr *
+ FcExprCreateInteger (FcConfig *config, int i)
+ {
+@@ -179,7 +184,7 @@
+     }
+     return e;
+ }
+-
++#endif
+ static void
+ FcExprDestroy (FcExpr *e)
+ {
+@@ -255,6 +260,7 @@
+     free (e);
+ }
+ 
++#if 0
+ typedef enum _FcElement {
+     FcElementNone,
+     FcElementFontconfig,
+@@ -2373,6 +2379,7 @@
+     const FcChar8    *bs = *((FcChar8 **) b);
+     return FcStrCmp (as, bs);
+ }
++#endif
+ 
+ static FcBool
+ FcConfigParseAndLoadDir (FcConfig	*config,
+@@ -2380,6 +2387,9 @@
+ 			 const FcChar8	*dir,
+ 			 FcBool		complain)
+ {
++    return FcFalse;
++}
++#if 0
+     DIR		    *d;
+     struct dirent   *e;
+     FcBool	    ret = FcTrue;
+@@ -2589,3 +2599,4 @@
+ #define __fcxml__
+ #include "fcaliastail.h"
+ #undef __fcxml__
++#endif
+diff -ruN fontconfig/src/fcxml.c fontconfig.new/src/fcxml.c
+--- fontconfig/src/fcxml.c	2009-08-13 16:08:49.000000000 +0200
++++ fontconfig.new/src/fcxml.c	2009-08-19 00:03:35.000000000 +0200
+@@ -2466,13 +2466,18 @@
+ bail0:
+     return ret || !complain;
+ }
++#endif
++
+ 
+ FcBool
+ FcConfigParseAndLoad (FcConfig	    *config,
+ 		      const FcChar8 *name,
+ 		      FcBool	    complain)
+ {
++    return FcFalse;
++}
+ 
++#if 0
+     XML_Parser	    p;
+     FcChar8	    *filename;
+     int		    fd;
+--- fontconfig/src/fcinit.c	2010-04-27 15:31:41.000000000 +0200
++++ fontconfig.new/src/fcinit.c	2010-04-27 15:35:42.000000000 +0200
+@@ -34,11 +34,16 @@
+     config = FcConfigCreate ();
+     if (!config)
+ 	goto bail0;
+-    if (!FcConfigAddDir (config, (FcChar8 *) FC_DEFAULT_FONTS))
++    char *path = malloc( MAX_PATH + 1 );
++    GetWindowsDirectory( path, MAX_PATH + 1 );
++    strcat( path, "\\fonts" );
++//    printf( "Fonts dir: %s\n", path );
++    if (!FcConfigAddDir (config, (FcChar8 *) path))
+ 	goto bail1;
+     char dir[MAX_PATH+5];
+     SHGetFolderPath( NULL, CSIDL_APPDATA, NULL, 0, dir );
+     strncat( dir, "\\vlc", 4 );
++//    printf( "Cache dir: %s\n", dir );
+     if (!FcConfigAddCacheDir (config, (FcChar8 *)dir))
+ 	goto bail1;
+     return config;

contrib/src/fontconfig/fontconfig-win32.patch

+diff -ruN fontconfig/src/fcint.h fontconfig.good/src/fcint.h
+--- fontconfig/src/Makefile.in	2009-06-24 21:05:27.000000000 +0200
++++ fontconfig.good/src/Makefile.in	2009-07-03 00:13:38.000000000 +0200
+@@ -664,7 +664,6 @@
+ # gcc import library install/uninstall
+ 
+ @OS_WIN32_TRUE@install-libtool-import-lib: 
+-@OS_WIN32_TRUE@	$(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)
+ @OS_WIN32_TRUE@	$(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
+ 
+ @OS_WIN32_TRUE@uninstall-libtool-import-lib:
+--- fontconfig/src/Makefile.am	2009-03-18 22:02:22.000000000 +0100
++++ fontconfig.good/src/Makefile.am	2009-07-03 00:12:50.000000000 +0200
+@@ -30,7 +30,6 @@
+ # gcc import library install/uninstall
+ 
+ install-libtool-import-lib: 
+-	$(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)
+ 	$(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
+ 
+ uninstall-libtool-import-lib:
+--- fontconfig/src/fcinit.c	2009-06-06 00:59:27.000000000 +0200
++++ fontconfig.good/src/fcinit.c	2009-07-13 14:58:37.000000000 +0200
+@@ -24,6 +24,7 @@
+ 
+ #include "fcint.h"
+ #include <stdlib.h>
++# include <shlobj.h>
+ 
+ static FcConfig *
+ FcInitFallbackConfig (void)
+@@ -35,7 +36,10 @@
+ 	goto bail0;
+     if (!FcConfigAddDir (config, (FcChar8 *) FC_DEFAULT_FONTS))
+ 	goto bail1;
+-    if (!FcConfigAddCacheDir (config, (FcChar8 *) FC_CACHEDIR))
++    char dir[MAX_PATH+5];
++    SHGetFolderPath( NULL, CSIDL_APPDATA, NULL, 0, dir );
++    strncat( dir, "\\vlc", 4 );
++    if (!FcConfigAddCacheDir (config, (FcChar8 *)dir))
+ 	goto bail1;
+     return config;
+ 

contrib/src/fontconfig/rules.mak

+# fontconfig
+
+FONTCONFIG_VERSION := 2.8.0
+FONTCONFIG_URL := http://fontconfig.org/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz
+
+PKGS += fontconfig
+ifeq ($(call need_pkg,"fontconfig"),)
+PKGS_FOUND += fontconfig
+endif
+
+$(TARBALLS)/fontconfig-$(FONTCONFIG_VERSION).tar.gz:
+	$(call download,$(FONTCONFIG_URL))
+
+.sum-fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz
+
+fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz .sum-fontconfig
+	$(UNPACK)
+	$(APPLY) $(SRC)/fontconfig/fontconfig-march.patch
+ifdef HAVE_WIN32
+	$(APPLY) $(SRC)/fontconfig/fontconfig-win32.patch
+	$(APPLY) $(SRC)/fontconfig/fontconfig-noxml2.patch
+endif
+	$(MOVE)
+
+FONTCONFIG_CONF := $(HOSTCONF) \
+	--enable-libxml2 \
+	--disable-docs
+FONTCONFIG_ENV := $(HOSTVARS)
+
+# FreeType flags
+ifneq ($(findstring freetype2,$(PKGS)),)
+FONTCONFIG_CONF += --with-freetype-config="$(PREFIX)/bin/freetype-config"
+endif
+
+ifdef HAVE_CROSS_COMPILE
+FONTCONFIG_CONF += --with-arch=$(ARCH)
+endif
+
+ifdef HAVE_MACOSX
+FONTCONFIG_CONF += \
+	--with-cache-dir=~/Library/Caches/fontconfig \
+	--with-confdir=/usr/X11/lib/X11/fonts \
+	--with-default-fonts=/System/Library/Fonts \
+	--with-add-fonts=/Library/Fonts,~/Library/Fonts
+# libxml2 without pkg-config...
+FONTCONFIG_ENV += LIBXML2_CFLAGS=`xml2-config --cflags`
+FONTCONFIG_ENV += LIBXML2_LIBS=`xml2-config --libs`
+endif
+
+DEPS_fontconfig = freetype2 $(DEPS_freetype2) libxml2 $(DEPS_libxml2)
+
+.fontconfig: fontconfig
+ifdef HAVE_WIN32
+	$(RECONF)
+endif
+	cd $< && $(FONTCONFIG_ENV) ./configure $(FONTCONFIG_CONF)
+	cd $< && $(MAKE)
+ifndef HAVE_MACOSX
+	cd $< && $(MAKE) install
+else
+	cd $< && $(MAKE) install-exec
+	cd $</fontconfig && $(MAKE) install-data
+	sed -e 's%/usr/lib/libiconv.la%%' -i.orig $(PREFIX)/lib/libfontconfig.la
+	cp $</fontconfig.pc $(PREFIX)/lib/pkgconfig/
+endif
+	touch $@

contrib/src/freetype2/SHA512SUMS

+0d01e2dbc7bcde434dfd6301adc753e4b62f98ef8fcd80a566e0c10a62f2b51783e911a5bd3c359c033833e0235617b86cc5c8570775672970efa7408adf754d  freetype-2.4.5.tar.gz

contrib/src/freetype2/rules.mak

+# freetype2
+
+FREETYPE2_VERSION := 2.4.5
+FREETYPE2_URL := $(SF)/freetype/freetype-$(FREETYPE2_VERSION).tar.gz
+
+PKGS += freetype2
+ifeq ($(call need_pkg,"freetype2"),)
+PKGS_FOUND += freetype2
+endif
+
+$(TARBALLS)/freetype-$(FREETYPE2_VERSION).tar.gz:
+	$(call download,$(FREETYPE2_URL))
+
+.sum-freetype2: freetype-$(FREETYPE2_VERSION).tar.gz
+
+freetype: freetype-$(FREETYPE2_VERSION).tar.gz .sum-freetype2
+	$(UNPACK)
+	$(MOVE)
+
+.freetype2: freetype
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $< && $(MAKE) install
+	touch $@

contrib/src/fribidi/SHA512SUMS

+55b3886399ab45fed5849621bd97c24d7ab58f58ef8eb408e1f8cd23894897261239a04bfd0d7120424e38b36b18b6b0cd2e3ca515c6cc4b6b97f665fbb9d62e  fribidi-0.19.2.tar.gz

contrib/src/fribidi/rules.mak

+# FRIBIDI
+FRIBIDI_VERSION := 0.19.2
+FRIBIDI_URL := http://fribidi.org/download/fribidi-$(FRIBIDI_VERSION).tar.gz
+
+PKGS += fribidi
+ifeq ($(call need_pkg,"fribidi"),)
+PKGS_FOUND += fribidi
+endif
+
+$(TARBALLS)/fribidi-$(FRIBIDI_VERSION).tar.gz:
+	$(call download,$(FRIBIDI_URL))
+
+.sum-fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz
+
+fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz .sum-fribidi
+	$(UNPACK)
+	$(APPLY) $(SRC)/fribidi/fribidi.patch
+	$(MOVE)
+
+# FIXME: DEPS_fribidi = iconv $(DEPS_iconv)
+.fribidi: fribidi
+	cd $< && rm -f configure && ./bootstrap
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $< && $(MAKE) install
+	touch $@

contrib/src/gcrypt/SHA512SUMS

+d219b23b36870a526d378a4ce784abc044bcb3a547a5e667b8185f2aceffab707918a6be6420d8473fc0c4d293968be5824b5dcf0cc5f0ef0866490f250b101c  libgcrypt-1.4.6.tar.bz2

contrib/src/gcrypt/gcrypt-nodocs.patch

+--- libgcrypt/Makefile.am.orig	2008-08-19 17:20:08.000000000 +0200
++++ libgcrypt/Makefile.am	2008-10-21 09:57:33.000000000 +0200
+@@ -23,7 +23,7 @@
+   --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
+ 
+ DIST_SUBDIRS = m4 mpi cipher random src doc tests
+-SUBDIRS = mpi cipher random src doc tests
++SUBDIRS = mpi cipher random src
+ EXTRA_DIST = autogen.sh README.SVN
+ DISTCLEANFILES = 
+ 

contrib/src/gcrypt/rules.mak

+# GCRYPT
+GCRYPT_VERSION := 1.4.6
+GCRYPT_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
+
+PKGS += gcrypt
+
+$(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
+	$(call download,$(GCRYPT_URL))
+
+.sum-gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
+
+libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
+	$(UNPACK)
+	$(APPLY) $(SRC)/gcrypt/gcrypt-nodocs.patch
+	$(MOVE)
+
+DEPS_gcrypt = gpg-error
+
+.gcrypt: libgcrypt
+	#$(RECONF)
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-pubkey-ciphers=dsa
+	cd $< && $(MAKE) install
+	touch $@

contrib/src/gme/SHA512SUMS

+dcf341bf0ab8237a98bceef3b0bc8e8bd11851179f989c561878ff421912158bfdbae4bf613ecc9f6a569b02dce4fbd41acf68a3c9c5ea137938bd5cdc353ff4  game-music-emu-0.5.5.tar.bz2

contrib/src/gmp/SHA512SUMS

+30545b690aa49b6c3479f2811d257d2501eb72eee7968cd0190601ead37522e9565b033e751067116d3f89f2207d0d96167546a6e12153d96dcadd5cd32c0f0e  gmp-4.2.1.tar.bz2

contrib/src/gnutls/SHA512SUMS

+f3e82c704311cc62dab9cb4edea6e120929dcefd6e2a9cc4992b512d280552432320e1b92d845176bcf40a0f4d5652a86f64c36aff77888948f72c92f18323de  gnutls-2.12.2.tar.bz2