Remove extras/contrib

NEWS

 Changes between 2.0.0 and 2.1.0-git:
 --------------------------------
 
+3rd party libraries (contrib):
+ * /extras/contrib has been replaced by a better system in /contrib
+
 Audio output:
  * OpenBSD sndio audio output support
 

extras/contrib/.gitignore

-# Ignore install path
-build
-hosts
-translations
-demos
-examples
-mkspecs
-phrasebooks
-*.xml
-*.tar.bz2
-*.bak
-toolchain.cmake
-build-src/
-distro.mak
-config.mak

extras/contrib/README

-This is the contrib build system for VLC Media Player. It has been
-primarily developed for Mac, it has been adapted for Win32.
-It would be not too difficult to extend it to other sytem.
-
-To use it, first in the contrib directory, type :
-	./bootstrap
-
-You can specify an argument to cross compile, for example:
-    ./bootstrap i586-mingw32msvc
-This will look for a i586-mingw32msvc-gcc cross compiler. Default is to
-build natively.
-
-Bootstrap generates your default contrib configuration and puts it in a file
-named 'distro.mak'. Edit this file to fine-tune your preferences for 3rd-party
-libraries that will be build in the contrib system.
-
-Customize config.mak if you need to, then you need to choose between
-building from source (can take a long time but is easily customizable)
-and fetching a pre-compiled binary package. Either type 'make src'
-or 'make bin' (also from the contrib directory).
-
-Once the contribs are built, you can start building VLC.
-See: http://developers.videolan.org/vlc/osx-compile.html 
-or INSTALL.win32 for more details on that.
-
-Happy hacking.
---Meuuh 2003-11-15

extras/contrib/change_prefix.sh

-#!/bin/sh
-# ***************************************************************************
-# change_prefix.sh : allow to transfer a contrib dir
-# ***************************************************************************
-# Copyright (C) 2003 the VideoLAN team
-# $Id$
-#
-# Authors: Christophe Massiot <massiot@via.ecp.fr>
-#
-# 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.
-# ***************************************************************************
-
-usage="Usage: $0 <directory> <prefix> <new_prefix>"
-
-LANG=C
-export LANG
-
-if test .$1 = .-h -o .$1 = .--help -o $# != 3; then
-  echo $usage
-  exit 1
-fi
-
-top_dir=`cd $1; pwd`
-prefix=$2
-new_prefix2=$3
-new_prefix=/$new_prefix2
-
-if test -z $prefix -o -z $new_prefix; then
-  echo $usage
-  exit 1
-fi
-
-cd $top_dir
-pwd
-files=`find . -type f`
-for file in $files; do
- if test ".`file $file | grep Mach-O`" != "." ; then
-    echo "Changing prefixes of '$file'"
-    islib=n
-    if test ".`file $file | grep 'dynamically linked shared library'`" != "." ; then
-      islib=y
-    fi
-    libs=`otool -L $file 2>/dev/null | grep $prefix | cut -d\  -f 1`
-    first=y
-    for i in "" $libs; do
-      if ! test -z $i; then
-        if test $islib = y -a $first = y; then
-            install_name_tool -id `echo $i | sed -e "s,$prefix,$new_prefix,"` $file
-            first=n
-        else
-            install_name_tool -change $i `echo $i | sed -e "s,$prefix,$new_prefix,"` $file
-        fi
-      fi
-    done
-  elif test ".`file $file | grep \"text\|shell\"`" != "." -o ".`echo $file | grep pc$`" != "."; then
-   echo "Fixing up shell/text/pc file "$file""
-    cp $file $file.tmp
-    sed -e "s,$prefix,$new_prefix,g" < $file > $file.tmp
-    mv -f $file.tmp $file
-  else
-    echo "Not doing anything with $file"
-  fi
-done
-
-files=`find . -name *.la`
-for file in $files; do
-   echo "Fixing up .la $file"
-   cp $file $file.tmp
-   sed -e "s,$prefix,$new_prefix,g" < $file > $file.tmp
-   mv -f $file.tmp $file
-done
-

extras/contrib/contrib.mak

-# ***************************************************************************
-# Makefile : Build vlc-contrib files
-# ***************************************************************************
-# Copyright (C) 2003-2011 the VideoLAN team
-# $Id$
-# 
-# Authors: Christophe Massiot <massiot@via.ecp.fr>
-#          Derk-Jan Hartman <hartman at videolan dot org>
-#          Christophe Mutricy <xtophe at videolan dot org>
-#          Felix Paul Kühne <fkuehne at videolan dot org>
-#
-# 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.
-# ***************************************************************************
-
-include ./config.mak
-
-BUILDDIRS = hosts build
-
-ifdef HAVE_MACOSX
-TARGETALL=using-bin
-else
-TARGETALL=using-src
-endif
-
-all: $(TARGETALL)
-
-using-src:
-	$(MAKE) -C build-src tools
-	$(MAKE) -C build-src
-
-ifdef HAVE_MACOSX_DARWIN_10
-	(cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig)
-endif
-
-# shortcut
-src: using-src
-
-ifdef HAVE_DARWIN_OS
-
-CONTRIBREV=50
-
-contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
-	$(WGET) http://downloads.videolan.org/pub/videolan/testing/contrib/macosx/$@
-
-.$(CONTRIBREV): contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
-	@if test -d tmp; then \
-		echo "Move away ./tmp, it's in the way" ; \
-		exit 1 ; \
-	fi
-	mkdir tmp
-	mkdir -p $(PREFIX)
-	(cd tmp && tar jxvf ../$<)
-	$(SRCDIR)/change_prefix.sh tmp @@CONTRIB_PREFIX@@  $(PREFIX)
-	(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 build-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_MACOSX_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 build-src && rm -f .iconv && $(MAKE) .iconv-from-os)
-endif
-	touch .$(CONTRIBREV)
-
-using-bin: .$(CONTRIBREV) 
-
-endif
-
-clean:
-	rm -rf $(BUILDDIRS)
-	$(MAKE) -C build-src clean
-
-clean-bin:
-	rm -rf $(BUILDDIRS)
-	$(MAKE) -C build-src clean-dots
-
-distclean:
-	rm -rf $(BUILDDIRS) config.mak distro.mak build-src toolchain.cmake Makefile
-
-bin: using-bin
-
-package-macosx:
-	@if test -d tmp; then \
-		echo "Move away ./tmp, it's in the way" ; \
-		exit 1 ; \
-	fi
-	mkdir tmp
-	(cd $(PREFIX); tar cf - Sparkle Growl BGHUDAppKit 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
-	rm -f contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
-	mv contrib-macosx.tar.bz2 contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
-
-DISTDIR = usr/win$*
-
-package-win%:
-	@if test -d tmp; then \
-		echo "Move away ./tmp, it's in the way" ; \
-		exit 1 ; \
-	fi
-	mkdir -p tmp/$(DISTDIR)
-	(cd $(PREFIX); tar cf - --dereference bin sbin include lib share/aclocal*\
-		share/autoconf* share/qt4* \
-		share/automake* share/gettext* gecko-sdk)\
-		| (cd tmp/$(DISTDIR); tar xpf -)
-#kludge for live.com
-	mkdir -p tmp/$(DISTDIR)/live.com
-	for i in groupsock liveMedia UsageEnvironment BasicUsageEnvironment; do \
-		mkdir -p  tmp/$(DISTDIR)/live.com/$$i/include; \
-		cp -r build-src/live/$$i/include tmp/$(DISTDIR)/live.com/$$i; \
-		cp build-src/live/$$i/lib$${i}.a  tmp/$(DISTDIR)/live.com/$$i; \
-	done;
-# Change Prefix.
-	./change_prefix.sh tmp $(PREFIX) $(DISTDIR)
-# Remove unused and potentially harmful files (but skip qt4 executables)
-	(cd tmp/$(DISTDIR)/bin && rm -fv `find . -name 'uic.exe' -o -name 'rcc.exe' -o -name 'moc.exe' -o -name '*.exe' -printf '%p '` && chmod a+x * || true)
-# Tar it.
-	(cd tmp; tar cf - $(DISTDIR)) | bzip2 -c > contrib-`date +%Y%m%d`-win$*-bin-gcc-`$(CC) --version|head -n 1|cut -f 3 -d ' '`-runtime-`/bin/echo -e "#include <_mingw.h>\n#define CONCAT2(a,b) a##b\n#define CONCAT(a,b) CONCAT2(a,b)\n#ifdef __MINGW64_VERSION_MAJOR\nCONCAT(CONCAT(__MINGW64_VERSION_MAJOR,.),__MINGW64_VERSION_MINOR)\n#else\n__MINGW32_VERSION\n#endif"|$(CC) -E -|tail -1`-only.tar.bz2
-	rm -rf tmp
-
-.PHONY: all clean-src clean-bin clean package-macosx

extras/contrib/src/Distributions/android.mak

-# android rules
-# Not compiling: .shout .live .mod .x264 .caca .mpcdec .dirac .schroedinger .libass
-all: .zlib \
-     .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
-     .flac .speex .faad .lame .ffmpeg \
-     .twolame \
-     .png .dvbpsi \
-     .dca .kate .ebml .matroska .tag
-
-
-ANDROID_INCLUDE=$(ANDROID_NDK)/platforms/android-9/arch-arm/usr/include
-ANDROID_LIB=$(ANDROID_NDK)/platforms/android-9/arch-arm/usr/lib
-
-EXTRA_CPPFLAGS+=-I$(ANDROID_INCLUDE)
-EXTRA_LDFLAGS+=-Wl,-rpath-link=$(ANDROID_LIB),-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined -L$(ANDROID_LIB)

extras/contrib/src/Distributions/davinci.mak

-# Contrib configuration for TI Davinci based SoC
-
-all: \
-	.a52 .mad .ogg \
-	.flac .faad .ffmpeg \
-	.live .png .dvbpsi .tremor
-
-FFMPEGCONF += --arch=arm --cpu=arm926ej-s --disable-armvfp

extras/contrib/src/Distributions/ios.mak

-# iOS rules
-all: .ffmpeg .live .dvbpsi .faad
-

extras/contrib/src/Distributions/macosx32.mak

-# Darwin rules
-TOOLS = .autoconf .automake .libtool .intl .pkgcfg .yasm
-
-all: .freetype \
-    .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
-    .flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \
-    .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
-    .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
-    .SDL_image .gecko .mpcdec \
-    .dca .tag .x264 .goom2k4 .lua .zvbi .fluid .fontconfig .ncurses \
-    .schroedinger .libass .libupnp .kate .sqlite3 .BGHUDAppKit .Growl .Sparkle
-
-# .expat don't work with SDK yet
-# .glib .IDL .gecko are required to build the mozilla plugin
-# .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package
-

extras/contrib/src/Distributions/macosx64.mak

-# Darwin rules
-TOOLS = .autoconf .automake .libtool .intl .pkgcfg .yasm
-
-all: .freetype \
-    .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .fluid .theora \
-    .flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \
-    .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
-    .png .jpeg .tiff .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
-    .gecko .mpcdec \
-    .dca .tag .x264 .lua .zvbi .fontconfig .ncurses \
-    .schroedinger .libass .libupnp .kate .sqlite3 .BGHUDAppKit .Growl .Sparkle
-
-# .expat don't work with SDK yet
-# .glib .IDL .gecko are required to build the mozilla plugin
-# .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package
-

extras/contrib/src/Distributions/maemo5.mak

-# Maemo 5
-all: \
-	.mad .mpcdec .lame .mpeg2 \
-	.tag .libass \
-	.ogg .tremor .vorbisenc .flac .speex .theora .kate .tiger \
-	.twolame .dirac .x264 \
-	.ebml .matroska .ffmpeg .mod .fluid \
-	.live .dvbpsi .zvbi \
-	.lua .xcb .xcb-util
-#.faad -> way slower than libavcodec
-#.gpg-error .gcrypt .gnutls -> OpenSSL
-#.dvdcss .dvdnav -> no DVD

extras/contrib/src/Distributions/netbox3.mak

-#
-# Fine tune ffmpeg's capabiities for this system
-#
-FFMPEGCONF += --enable-encoders --disable-muxers --disable-demuxers --disable-demuxer=dv1394 --enable-demuxer=avi --enable-demuxer=avisynth --enable-demuxer=gif --enable-demuxer=h261 --enable-demuxer=h263 --enable-demuxer=h264 --enable-demuxer=m4v --enable-demuxer=mjpg --enable-demuxer=mov --enable-demuxer=mpegps --enable-demuxer=mpegvideo --enable-demuxer=yuv4mpegpipe --disable-parsers --enable-parser=mpeg4video --enable-parser=vc1 --enable-parser=mjpeg --enable-parser=mpegaudio --enable-parser=mpegvideo --enable-parser=pnm --enable-parser=h264 --enable-parser=h263 --enable-parser=h264 --disable-decoders --enable-decoder=h261 --enable-decoder=h263 --enable-decoder=h263i --enable-decoder=h264 --enable-decoder=huffyuv --enable-decoder=idcin --enable-decoder=jpegls --enable-decoder=mjpeg --enable-decoder=mjpegb --enable-decoder=mmvideo --enable-decoder=mpeg1video --enable-decoder=mpeg2video --enable-decoder=mpeg4 --enable-decoder=mpeg4aac --enable-decoder=mpegvideo --enable-decoder=msmpeg4v1 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=msvideo1 --enable-decoder=png --enable-decoder=bmp --enable-decoder=rv10 --enable-decoder=rv20 --enable-decoder=vc1 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=zlib --enable-decoder=gif --enable-decoder=tiff --disable-protocols --enable-encoder=bmp --enable-encoder=gif --enable-encoder=jpegls --enable-encoder=mjpeg --enable-encoder=png --enable-encoder=huffyuv --enable-muxer=mjpeg --enable-encoder=zlib
-
-#
-# NetBOX Linux rules
-#
-all: .iconv .intl .freetype .zlib \
-	.ffmpeg .live .xml \
-	.dvbpsi
-

extras/contrib/src/Distributions/symbian.mak

-#Compiled but not linked libtool broken .faad .mpeg2 .ogg .dvbpsi
-all: .a52 .mad  \
-     .lame .ffmpeg
-LDFLAGS=-L$(EPOCROOT)/../cls-gcc/arm-none-symbianelf/lib -L$(EPOCROOT)/epoc32/release/armv5/lib -nostdlib -shared -Wl,--no-undefined $(EPOCROOT)/epoc32/release/armv5/lib/libm.dso $(EPOCROOT)/epoc32/release/armv5/lib/libc.dso  $(EPOCROOT)/epoc32/release/armv5/lib/libz.dso
-EXTRA_CPPFLAGS=-D_UNICODE -D__GCCE__ -D__SYMBIAN32__ -D__S60_3X__ -D__FreeBSD_cc_version -include $(SYMBIAN_INCLUDE)/gcce/gcce.h  -I$(SYMBIAN_INCLUDE)/stdapis -I$(SYMBIAN_INCLUDE)/stdapis/sys -I$(SYMBIAN_INCLUDE)/variant -I$(SYMBIAN_INCLUDE)

extras/contrib/src/Distributions/unix.mak

-# Standard Linux or other UNIX-like systems
-all: .iconv .intl .freetype .fribidi .zlib \
-	.a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
-	.flac .speex .faad  .lame .ebml .matroska .ffmpeg .dvdcss \
-	.live .goom2k4 .caca .mod .x264  .xml .twolame \
-	.png .gpg-error .gcrypt .gnutls .mpcdec \
-	.dvdnav .dvbpsi .dirac \
-	.dca .raw1394 .dc1394 .lua .zvbi \
-	.kate .tiger
-#	.png .gpg-error .gcrypt .gnutls .mpcdec \
-#	.SDL_image  .daap .cddb .cdio .vcdimager
-

extras/contrib/src/Distributions/win32.mak

-# WIN32 rules
-all: .iconv .intl .freetype .fribidi .zlib \
-        .gpg-error .gcrypt .gnutls .pthreads .xml .fontconfig \
-        .a52 .mpeg2 .mad .ogg .vorbis .shout .vorbisenc .theora \
-        .flac .speex .faad .lame .ebml .matroska .ffmpeg \
-        .live .goom2k4 .caca .mod .x264 .twolame \
-        .png .mpcdec .schroedinger .dvbpsi \
-        .dca .kate .libass .zvbi .fluid .SDL_image .gme  \
-        .libbluray .dvdcss .libupnp .dvdnav .qt4_win32 \
-        .dx_headers .dshow_headers .portaudio .gecko \
-        .lua .tag .peflags .cddb .sqlite3 .libprojectM
-#       .daap .cdio .vcdimager

extras/contrib/src/Distributions/win64.mak

-# WIN64 rules
-all: .iconv .intl .freetype .fribidi .zlib \
-        .gpg-error .gcrypt .gnutls .xml .fontconfig \
-        .a52 .mpeg2 .mad .ogg .vorbis .shout .vorbisenc .theora \
-        .flac .speex .faad .lame .ebml .matroska .ffmpeg \
-        .goom2k4 .caca .mod .x264 .twolame \
-        .png .schroedinger .dvbpsi \
-        .dca .kate .libass .SDL_image  \
-        .libbluray .dvdcss .libupnp .dvdnav .qt4_win32 \
-        .dx_headers .dshow_headers .portaudio .gecko \
-        .lua .peflags .sqlite3 .tag
-# .live ## XXX: disabled temporarily
-
-# .libprojectM
-# .pthreads
-#.zvbi \
-#        .fluid
-#       .daap .cddb .cdio .vcdimager

extras/contrib/src/Distributions/wince.mak

-# WinCE rules
-all: .errno .iconv .zlib \
-        .a52 .mpeg2 .ogg .tremor .theora .vorbis .ffmpeg \
-        .live .dvbpsi
-#       .faad .lame
-

extras/contrib/src/Patches/QtCoreMac.pc.in

-prefix=/Library/Frameworks/QtCore.framework/Versions/4/
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/Headers
-
-Name: Qtcore
-Description: Qtcore Library
-Version: 4.6.1
-Libs: -F/Library/Frameworks -L/Library/Frameworks -framework QtGui -framework QtCore 
-Cflags: -I/usr/local/Qt4.6/mkspecs/macx-g++ -I. -I${includedir} -DQT_CORE_LIB -DQT_SHARED
-
-
-
-

extras/contrib/src/Patches/QtGuiMac.pc.in

-prefix=/Library/Frameworks/QtGui.framework/Versions/4/
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/Headers
-
-Name: Qtgui
-Description: Qtgui Library
-Version: 4.6.1
-Libs: -F/Library/Frameworks -L/Library/Frameworks -framework QtGui -framework QtCore 
-Cflags: -I/usr/local/Qt4.6/mkspecs/macx-g++ -I. -I${includedir} -DQT_GUI_LIB -DQT_SHARED
-
-
-
-

extras/contrib/src/Patches/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)

extras/contrib/src/Patches/daap.patch

---- libopendaap-orig/http_client.c	2005-05-12 07:52:03.000000000 +0200
-+++ libopendaap/http_client.c	2005-08-04 14:06:24.000000000 +0200
-@@ -35,6 +35,8 @@
- # include <tcpd.h>
- #endif
- 
-+# include <netinet/in.h>
-+
- #ifdef SYSTEM_POSIX
- # include <unistd.h>
- # include <sys/types.h>

extras/contrib/src/Patches/dirac-autotools.patch

---- dirac/Makefile.am.orig	2010-11-01 01:31:21.638194470 +0100
-+++ dirac/Makefile.am	2010-11-01 01:31:25.174196742 +0100
-@@ -1,6 +1,8 @@
- # $Id: Makefile.am,v 1.22 2008/10/01 05:33:56 asuraparaju Exp $
- #
- 
-+ACLOCAL_AMFLAGS= -I m4
-+
- SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder \
-           libdirac_decoder encoder decoder $(CPPUNITTESTS_DIR) \
-           tests $(DOC_DIR) win32
---- dirac/configure.ac.orig	2010-11-01 01:26:21.058194985 +0100
-+++ dirac/configure.ac	2010-11-01 01:32:22.062185299 +0100
-@@ -57,8 +57,6 @@
- AM_PROG_LIBTOOL
- AC_SYS_LARGEFILE
- 
--ACLOCAL_AMFLAGS="-I m4 $ACLOCAL_AMFLAGS"
--AC_SUBST(ACLOCAL_AMFLAGS)
- 
- 
- dnl -------------------------------------------------------------------------

extras/contrib/src/Patches/dirac-cygwin.patch

---- dirac/configure.ac	2007-09-30 14:45:51.156250000 +1000
-+++ dirac/configure.ac	2007-09-30 14:44:27.625000000 +1000
-@@ -225,8 +225,6 @@
- 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
- 		TRY_CFLAGS="$OPT_CFLAGS -Wall"
- 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
--		TRY_CFLAGS="$OPT_CFLAGS -Werror"
--		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
- 		TRY_CFLAGS="$OPT_CFLAGS -W"
- 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
- 		TRY_CFLAGS="$OPT_CFLAGS -Woverloaded-virtual"

extras/contrib/src/Patches/dirac-noutils.patch

---- dirac/Makefile.am	2008-10-01 07:33:56.000000000 +0200
-+++ dirac.new/Makefile.am	2010-01-09 02:05:45.000000000 +0100
-@@ -2,7 +2,7 @@
- #
- 
- SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder \
--          libdirac_decoder encoder decoder util $(CPPUNITTESTS_DIR) \
-+          libdirac_decoder encoder decoder $(CPPUNITTESTS_DIR) \
-           tests $(DOC_DIR) win32
- 
- .PHONY: valgrind-check

extras/contrib/src/Patches/faad-arm-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,10 @@
- #define FIXED_POINT
- #endif
- 
-+#ifdef __arm__
-+#define FIXED_POINT
-+#endif
-+
- #define ERROR_RESILIENCE
- 
- 
- 

extras/contrib/src/Patches/ffmpeg-svn-internal-define.patch

---- ffmpeg/libavutil/internal.h.orig	2007-05-14 16:24:22.000000000 +0200
-+++ ffmpeg/libavutil/internal.h	2007-05-14 16:24:35.000000000 +0200
-@@ -46,6 +46,10 @@
- #define M_PI    3.14159265358979323846
- #endif
- 
-+#ifndef M_E
-+#define M_E 2.718281828
-+#endif
-+
- #ifndef INT16_MIN
- #define INT16_MIN       (-0x7fff-1)
- #endif

extras/contrib/src/Patches/ffmpeg-svn-libavformat.patch

---- ffmpeg/libavformat/utils.c.org	2007-11-23 10:08:01.000000000 +0100
-+++ ffmpeg/libavformat/utils.c	2007-11-23 10:08:40.000000000 +0100
-@@ -24,6 +24,7 @@
- #include "riff.h"
- #include <sys/time.h>
- #include <time.h>
-+#include <strings.h>
- 
- #undef NDEBUG
- #include <assert.h>

extras/contrib/src/Patches/ffmpeg-svn-uclibc.patch

---- ffmpeg/configure.orig	2007-05-14 15:08:15.000000000 +0200
-+++ ffmpeg/configure	2007-05-14 15:08:55.000000000 +0200
-@@ -1028,6 +1028,10 @@
-   arm|armv[4567]*l)
-     arch="armv4l"
-   ;;
-+  armeb)
-+    arch="armv4"
-+    bigendian="yes"
-+  ;;
-   alpha)
-     arch="alpha"
-     enable fast_64bit

extras/contrib/src/Patches/fluid-win32.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) \
---- 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}

extras/contrib/src/Patches/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 $@

extras/contrib/src/Patches/fontconfig-nodocs.patch

---- fontconfig.orig/configure.in	2006-12-03 00:24:39.000000000 +0100
-+++ fontconfig/configure.in	2007-11-20 21:17:09.000000000 +0100
-@@ -501,7 +501,7 @@
- # Let people not build/install docs if they don't have docbook
- #
- 
--AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
-+AC_CHECK_PROG(HASDOCBOOK, docbook2html, no, no)
- 
- AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
- 

extras/contrib/src/Patches/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;

extras/contrib/src/Patches/fontconfig.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;
- 

extras/contrib/src/Patches/fribidi.patch

-diff -u fribidi.orig/Makefile.am fribidi/Makefile.am
---- fribidi.orig/Makefile.am	2005-08-25 20:35:34.000000000 +0200
-+++ fribidi/Makefile.am	2008-01-28 14:31:19.000000000 +0100
-@@ -9,7 +9,7 @@
- ##############################################################################
- 
- ## The order of subdirs is important, don't change without a reason.
--SUBDIRS = gen.tab charset lib bin doc test
-+SUBDIRS = gen.tab charset lib #bin doc test
- 
- EXTRA_DIST = bootstrap ChangeLog.old
- 
-diff -u fribidi.orig/configure.ac fribidi/configure.ac
---- fribidi.orig/configure.ac	2008-01-16 00:15:46.000000000 +0100
-+++ fribidi/configure.ac	2008-01-28 14:32:38.000000000 +0100
-@@ -165,38 +165,38 @@
- AM_CONDITIONAL(FRIBIDI_CHARSETS, test x$FRIBIDI_CHARSETS = x1)
- 
- # --with[out]-glib
--AC_ARG_WITH(glib,
--              AC_HELP_STRING([--with-glib=@<:@no/auto/yes@:>@],
--                             [use Glib @<:@default=auto@:>@]))
--GLIB_PACKAGE=glib-2.0
--GLIB_MINVERSION=2.4
-+#AC_ARG_WITH(glib,
-+#              AC_HELP_STRING([--with-glib=@<:@no/auto/yes@:>@],
-+#                             [use Glib @<:@default=auto@:>@]))
-+#GLIB_PACKAGE=glib-2.0
-+#GLIB_MINVERSION=2.4
- GLIB_LIBS=
- GLIB_CFLAGS=
--if test x$with_glib = xyes; then
--	PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION)
--	FRIBIDI_USE_GLIB=1
--else
--if test x$with_glib = xno; then
-+#if test x$with_glib = xyes; then
-+#	PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION)
-+#	FRIBIDI_USE_GLIB=1
-+#else
-+#if test x$with_glib = xno; then
- 	FRIBIDI_USE_GLIB=0
--else
--	PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION,
--		FRIBIDI_USE_GLIB=1,
--		FRIBIDI_USE_GLIB=0)
--fi
--fi
--if test x$FRIBIDI_USE_GLIB = x0; then
-+#else
-+#	PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION,
-+#		FRIBIDI_USE_GLIB=1,
-+#		FRIBIDI_USE_GLIB=0)
-+#fi
-+#fi
-+#if test x$FRIBIDI_USE_GLIB = x0; then
- 	GLIB_PACKAGE=
--fi
-+#fi
- AC_SUBST(FRIBIDI_USE_GLIB)
- AM_CONDITIONAL(FRIBIDI_USE_GLIB, test x$FRIBIDI_USE_GLIB = x1)
- 
- 
--MISC_CFLAGS="$GLIB_CFLAGS"
--MISC_LIBS="$GLIB_LIBS"
--MISC_PACKAGES="$GLIB_PACKAGE"
--AC_SUBST(MISC_CFLAGS)
--AC_SUBST(MISC_LIBS)
--AC_SUBST(MISC_PACKAGES)
-+#MISC_CFLAGS="$GLIB_CFLAGS"
-+#MISC_LIBS="$GLIB_LIBS"
-+#MISC_PACKAGES="$GLIB_PACKAGE"
-+#AC_SUBST(MISC_CFLAGS)
-+#AC_SUBST(MISC_LIBS)
-+#AC_SUBST(MISC_PACKAGES)
- 
- # Generate output
- AC_CONFIG_FILES([fribidi.pc
---- fribidi.orig/fribidi.pc.in	2008-02-02 23:06:05.000000000 +0000
-+++ fribidi/fribidi.pc.in	2008-02-02 23:06:39.000000000 +0000
-@@ -7,7 +7,6 @@
- 
- Name: @PACKAGE_NAME@
- Description: Unicode Bidirectional Algorithm Library
--Requires: @MISC_PACKAGES@
- Version: @VERSION@
- Libs: -L${libdir} -lfribidi
- Cflags: -I${includedir}/@PACKAGE@
---- fribidi.orig/lib/fribidi-common.h	2008-02-04 21:30:46.000000000 +0000
-+++ fribidi/lib/fribidi-common.h	2008-02-04 21:32:25.000000000 +0000
-@@ -53,11 +53,7 @@
- 
- /* FRIBIDI_ENTRY is a macro used to declare library entry points. */
- #ifndef FRIBIDI_ENTRY
--# if (defined(WIN32)) || (defined(_WIN32_WCE))
--#  define FRIBIDI_ENTRY __declspec(dllimport)
--# else /* !WIN32 */
- #  define FRIBIDI_ENTRY		/* empty */
--# endif	/* !WIN32 */
- #endif /* !FRIBIDI_ENTRY */
- 
- #if FRIBIDI_USE_GLIB+0

extras/contrib/src/Patches/gcrypt.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 = 
- 
-diff -ur libgcrypt.orig//Makefile.in libgcrypt/Makefile.in
---- libgcrypt.orig//Makefile.in	2011-09-23 01:27:00.000000000 +0200
-+++ libgcrypt/Makefile.in	2011-09-23 01:28:03.000000000 +0200
-@@ -240,7 +240,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 = 
- all: config.h

extras/contrib/src/Patches/gettext-macosx.patch

---- 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 @@
- 
- /* 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;
- 
- /* Long options.  */

extras/contrib/src/Patches/glew-win32.patch

---- glew/Makefile	2008-11-03 07:25:21.000000000 +0100
-+++ glew.new/Makefile	2009-12-03 22:30:47.000000000 +0100
-@@ -31,7 +31,7 @@
- include config/version
- 
- SHELL = /bin/sh
--SYSTEM = $(shell config/config.guess | cut -d - -f 3 | sed -e 's/[0-9\.]//g;')
-+SYSTEM = mingw
- SYSTEM.SUPPORTED = $(shell test -f config/Makefile.$(SYSTEM) && echo 1)
- 
- ifeq ($(SYSTEM.SUPPORTED), 1)
-@@ -48,9 +48,7 @@
- TARDIR = ../glew-$(GLEW_VERSION)
- TARBALL = ../glew_$(GLEW_VERSION).tar.gz
- 
--AR = ar
- INSTALL = install
--STRIP = strip
- RM = rm -f
- LN = ln -sf
- ifeq ($(MAKECMDGOALS), debug)
-@@ -75,7 +73,7 @@
- VISUALINFO.BIN.OBJS = $(VISUALINFO_BIN.SRCS:.c=.o)
- BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL)
- 
--all debug: lib/$(LIB.SHARED) lib/$(LIB.STATIC) bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN)
-+all debug: lib/$(LIB.SHARED) lib/$(LIB.STATIC)
- 
- lib:
- 	mkdir lib
-@@ -112,27 +110,17 @@
- 	$(INSTALL) -d -m 0755 $(INCDIR)
- 	$(INSTALL) -d -m 0755 $(LIBDIR)
- # runtime
--ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
--	$(STRIP) -x lib/$(LIB.SHARED)
--	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
--else
- 	$(STRIP) -x lib/$(LIB.SHARED)
- 	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
- 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
--endif
- # development files
- 	$(INSTALL) -m 0644 include/GL/wglew.h $(INCDIR)/
- 	$(INSTALL) -m 0644 include/GL/glew.h $(INCDIR)/
- 	$(INSTALL) -m 0644 include/GL/glxew.h $(INCDIR)/
--ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
--	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
--else
--	strip -x lib/$(LIB.STATIC)
-+	$(STRIP) -x lib/$(LIB.STATIC)
- 	$(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
- 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
--endif
- # utilities
--	$(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
- 
- uninstall:
- 	$(RM) $(INCDIR)/wglew.h
---- glew/config/Makefile.mingw	2008-11-03 07:25:20.000000000 +0100
-+++ glew.new/config/Makefile.mingw	2009-12-03 22:18:32.000000000 +0100
-@@ -1,13 +1,11 @@
- NAME = glew32
--CC = gcc
- # use gcc for linking, with ld it does not work
--LD = gcc
- ifneq (undefined, $(origin GLEW_MX))
- CFLAGS.EXTRA = -DGLEW_MX
- endif
--CFLAGS.SO = -DGLEW_BUILD
-+CFLAGS.SO = -DGLEW_BUILD -DSTATIC
- #LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK)
--LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK)
-+#LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK)
- LDFLAGS.GL = -lglu32 -lopengl32 -lgdi32 -luser32 -lkernel32
- LDFLAGS.EXTRA = -L/mingw/lib
- WARN = -Wall -W
-diff -ur glew.orig//include/GL/glew.h glew/include/GL/glew.h
---- glew.orig//include/GL/glew.h	2011-09-23 01:38:28.524786958 -0400
-+++ glew/include/GL/glew.h	2011-09-23 01:45:16.405385194 -0400
-@@ -150,7 +150,7 @@
- #endif
- #if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_)
- #  ifdef _WIN64
--typedef __int64 ptrdiff_t;
-+#include <stdint.h>
- #  else
- typedef _W64 int ptrdiff_t;
- #  endif

extras/contrib/src/Patches/gme-static.patch

---- game-music-emu-0.5.5/gme/CMakeLists.txt	2009-07-13 06:53:08.000000000 +0200
-+++ game-music-emu-0.5.5.new/gme/CMakeLists.txt	2010-11-01 14:39:13.570651361 +0100
-@@ -148,7 +148,7 @@
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
- # Add library to be compiled.
--add_library(gme SHARED ${libgme_SRCS})
-+add_library(gme STATIC ${libgme_SRCS})
- 
- # The version is the release.  The "soversion" is the API version.  As long
- # as only build fixes are performed (i.e. no changes/additions to API) the
-@@ -158,6 +158,6 @@
-                SOVERSION 0)
- 
- # TODO: Libsuffix for 64-bit?
--install(TARGETS gme LIBRARY DESTINATION lib)
-+install(TARGETS gme ARCHIVE DESTINATION lib)
- 
- install(FILES ${EXPORTED_HEADERS} DESTINATION include/gme)

extras/contrib/src/Patches/gnutls-win32.patch

---- gnutls-2.2.5/gl/gai_strerror.c	2008-02-21 08:58:18.000000000 +0100
-+++ gnutls/gl/gai_strerror.c	2008-05-22 08:20:56.000000000 +0200
-@@ -62,7 +62,7 @@
-     { EAI_IDN_ENCODE, N_("Parameter string not correctly encoded") }
- #endif
-   };
--
-+#ifndef _WIN32
- const char *
- gai_strerror (int code)
- {
-@@ -73,6 +73,7 @@
- 
-   return _("Unknown error");
- }
-+#endif
- #ifdef _LIBC
- libc_hidden_def (gai_strerror)
- #endif
-

extras/contrib/src/Patches/goom2k4-0-memleaks.patch

-diff -Naur goom-origin/src/convolve_fx.c goom/src/convolve_fx.c
---- goom-origin/src/convolve_fx.c	2005-02-07 14:46:42.000000000 +0100
-+++ goom/src/convolve_fx.c	2009-03-23 11:16:13.000000000 +0100
-@@ -107,7 +107,9 @@
- }
- 
- static void convolve_free(VisualFX *_this) {
--  free (_this->fx_data);
-+  ConvData *data = _this->fx_data;
-+  free (data->params.params);
-+  free (data);
- }
- 
- static void create_output_with_brightness(VisualFX *_this, Pixel *src, Pixel *dest,
-diff -Naur goom-origin/src/filters.c goom/src/filters.c
---- goom-origin/src/filters.c	2005-02-07 14:46:41.000000000 +0100
-+++ goom/src/filters.c	2009-03-23 10:46:34.000000000 +0100
-@@ -731,6 +731,12 @@
- 
- static void zoomFilterVisualFXWrapper_free (struct _VISUAL_FX *_this)
- {
-+    ZoomFilterFXWrapperData *data = (ZoomFilterFXWrapperData*)_this->fx_data;
-+    if (data->brutS) free (data->freebrutS);
-+    if (data->brutD) free (data->freebrutD);
-+    if (data->brutT) free (data->freebrutT);
-+    free (data->firedec);
-+    free (data->params.params);
-     free(_this->fx_data);
- }
- 
-diff -Naur goom-origin/src/flying_stars_fx.c goom/src/flying_stars_fx.c
---- goom-origin/src/flying_stars_fx.c	2005-02-07 14:46:41.000000000 +0100
-+++ goom/src/flying_stars_fx.c	2009-03-23 11:18:57.000000000 +0100
-@@ -129,7 +129,10 @@
- }
- 
- static void fs_free(VisualFX *_this) {
--	free (_this->fx_data);
-+        FSData *data = (FSData*)_this->fx_data;
-+        free (data->stars);
-+        free (data->params.params);
-+	free (data);
- }
- 
- 
-diff -Naur goom-origin/src/gfontlib.c goom/src/gfontlib.c
---- goom-origin/src/gfontlib.c	2005-02-07 14:46:41.000000000 +0100
-+++ goom/src/gfontlib.c	2009-03-23 09:06:27.000000000 +0100
-@@ -126,6 +126,8 @@
-         small_font_width [32] = font_width [32]/2;
-         font_chars [32] = 0;
-         small_font_chars [32] = 0;
-+        free( gfont );
-+        free( font_pos );
- }
- 
- void    goom_draw_text (Pixel * buf,int resolx,int resoly,
-diff -Naur goom-origin/src/goom_core.c goom/src/goom_core.c
---- goom-origin/src/goom_core.c	2005-02-07 14:46:41.000000000 +0100
-+++ goom/src/goom_core.c	2009-03-23 11:21:11.000000000 +0100
-@@ -765,6 +765,15 @@
-     goomInfo->star_fx.free(&goomInfo->star_fx);
-     goomInfo->tentacles_fx.free(&goomInfo->tentacles_fx);
-     goomInfo->zoomFilter_fx.free(&goomInfo->zoomFilter_fx);
-+
-+    // Release info visual
-+    free (goomInfo->params);
-+    free (goomInfo->sound.params.params);
-+
-+    // Release PluginInfo
-+    free (goomInfo->visuals);
-+    gsl_free (goomInfo->scanner);
-+    gsl_free (goomInfo->main_scanner);
-     
-     free(goomInfo);
- }
-diff -Naur goom-origin/src/goomsl.c goom/src/goomsl.c
---- goom-origin/src/goomsl.c	2005-02-07 14:46:41.000000000 +0100
-+++ goom/src/goomsl.c	2009-03-23 11:07:25.000000000 +0100
-@@ -90,6 +90,7 @@
- 
- void iflow_free(InstructionFlow *_this)
- { /* {{{ */
-+  free(_this->instr);
-   goom_hash_free(_this->labels);
-   free(_this); /*TODO: finir cette fonction */
- } /* }}} */
-@@ -1422,8 +1423,12 @@
- void gsl_free(GoomSL *gss)
- { /* {{{ */
-   iflow_free(gss->iflow);
--  free(gss->vars);
--  free(gss->functions);
-+  goom_hash_free(gss->vars);
-+  goom_hash_free(gss->functions);
-+  goom_hash_free(gss->structIDS);
-+  free(gss->gsl_struct);
-+  goom_heap_delete(gss->data_heap);
-+  free(gss->ptrArray);
-   free(gss);
- } /* }}} */
- 
-diff -Naur goom-origin/src/lines.c goom/src/lines.c
---- goom-origin/src/lines.c	2005-02-07 14:46:41.000000000 +0100
-+++ goom/src/lines.c	2009-03-23 10:28:26.000000000 +0100
-@@ -199,6 +199,7 @@
- goom_lines_free (GMLine ** l)
- {
- 	free ((*l)->points);
-+	free ((*l)->points2);
- 	free (*l);
- 	l = NULL;
- }
-diff -Naur goom-origin/src/tentacle3d.c goom/src/tentacle3d.c
---- goom-origin/src/tentacle3d.c	2005-02-07 14:46:41.000000000 +0100
-+++ goom/src/tentacle3d.c	2009-03-23 11:13:38.000000000 +0100
-@@ -90,7 +90,9 @@
- }
- 
- static void tentacle_fx_free(VisualFX *_this) {
--	tentacle_free((TentacleFXData*)_this->fx_data);
-+        TentacleFXData *data = (TentacleFXData*)_this->fx_data;
-+        free(data->params.params);
-+	tentacle_free(data);
- 	free(_this->fx_data);
- }
- 
-@@ -106,6 +108,13 @@
- 
- static void tentacle_free (TentacleFXData *data) {
- 	/* TODO : un vrai FREE GRID!! */
-+        int tmp;
-+        for (tmp=0;tmp<nbgrid;tmp++){
-+            grid3d *g = data->grille[tmp];
-+            free (g->surf.vertex);
-+            free (g->surf.svertex);
-+            free (g);
-+        }
- 	free (data->vals);
- }
- 

extras/contrib/src/Patches/goom2k4-0-mmx.patch

-diff -ruN goom.orig/src/xmmx.c goom/src/xmmx.c
---- goom.orig/src/xmmx.c	2006-10-01 22:10:15.000000000 +0200
-+++ goom/src/xmmx.c	2006-10-01 23:45:59.000000000 +0200
-@@ -69,8 +69,8 @@
- 		 */
- 
- 		asm volatile
--      ("#1 \n\t movq %[brutS], %%mm0"
--       "#1 \n\t movq %[brutD], %%mm1"
-+      ("#1 \n\t movq (%[brutS]), %%mm0"
-+       "#1 \n\t movq (%[brutD]), %%mm1"
-        "#1 \n\t psubd   %%mm0, %%mm1" /* mm1 = D - S */
-        "#1 \n\t movq    %%mm1, %%mm2" /* mm2 = D - S */
-        "#1 \n\t pslld     $16, %%mm1"

extras/contrib/src/Patches/goom2k4-0-win32.patch

-diff -Naur goom-orig/configure.in goom/configure.in
---- goom-orig/configure.in	2005-02-07 14:46:41.000000000 +0100
-+++ goom/configure.in	2005-08-26 16:37:03.000000000 +0200
-@@ -1,6 +1,5 @@
- AC_INIT(README)
- 
--AM_DISABLE_STATIC
- AM_INIT_AUTOMAKE(SDL_Goom, 2k4)
- 
- ACLOCAL="$ACLOCAL -I m4"
-@@ -76,24 +75,7 @@
- AM_CONDITIONAL(MACTARGET,test "x$MACTARGET" = "xyes")
- 
- 
--AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed - please install first ***]))
--
--PTHREAD_LIBS=error
--AC_CHECK_LIB(pthread, pthread_attr_init, PTHREAD_LIBS="-lpthread")
--
--if test "x$PTHREAD_LIBS" = xerror; then
--    AC_CHECK_LIB(pthreads, pthread_attr_init, PTHREAD_LIBS="-lpthreads")
--fi
--
--if test "x$PTHREAD_LIBS" = xerror; then
--    AC_CHECK_LIB(c_r, pthread_attr_init, PTHREAD_LIBS="-lc_r")
--fi
--
--if test "x$PTHREAD_LIBS" = xerror; then
--    AC_CHECK_FUNC(pthread_attr_init, PTHREAD_LIBS="")
--fi
--
--AC_SUBST(PTHREAD_LIBS)
-+dnl AC_SUBST(PTHREAD_LIBS)
- 
- dnl rm -f mmx_zoom.s
- dnl 	echo -n checking for nasm...
-diff -Naur goom-orig/src/filters.c goom/src/filters.c
---- goom-orig/src/filters.c	2005-02-07 14:46:41.000000000 +0100
-+++ goom/src/filters.c	2005-08-26 16:31:17.000000000 +0200
-@@ -201,8 +201,8 @@
-     /* Noise */
-     if (data->noisify)
-     {
--        vx += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
--        vy += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
-+        vx += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
-+        vy += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
-     }
-     
-     /* Hypercos */
-diff -Naur goom-orig/src/goom_core.c goom/src/goom_core.c
---- goom-orig/src/goom_core.c	2005-02-07 14:46:41.000000000 +0100
-+++ goom/src/goom_core.c	2005-08-26 16:33:01.000000000 +0200
-@@ -40,11 +40,11 @@
- static void init_buffers(PluginInfo *goomInfo, int buffsize)
- {
-     goomInfo->pixel = (guint32 *) malloc (buffsize * sizeof (guint32) + 128);
--    bzero (goomInfo->pixel, buffsize * sizeof (guint32) + 128);
-+    memset (goomInfo->pixel, 0, buffsize * sizeof (guint32) + 128);
-     goomInfo->back = (guint32 *) malloc (buffsize * sizeof (guint32) + 128);
--    bzero (goomInfo->back, buffsize * sizeof (guint32) + 128);
-+    memset (goomInfo->back, 0, buffsize * sizeof (guint32) + 128);
-     goomInfo->conv = (Pixel *) malloc (buffsize * sizeof (guint32) + 128);
--    bzero (goomInfo->conv, buffsize * sizeof (guint32) + 128);
-+    memset (goomInfo->conv, 0, buffsize * sizeof (guint32) + 128);
- 
-     goomInfo->outputBuf = goomInfo->conv;
-     

extras/contrib/src/Patches/goom2k4-autotools.patch

---- goom/src/Makefile.am	2005-02-07 14:46:41.000000000 +0100
-+++ goom.new/src/Makefile.am	2009-08-19 09:21:57.000000000 +0200
-@@ -16,7 +16,7 @@
- goom2_libdir = $(libdir)
- 
- goom2_library_includedir=$(includedir)/goom
--goom2_library_include_HEADERS = goom.h goom_plugin_info.h goom_typedefs.h goom_graphic.h goom_config_param.h goom_visual_fx.h goom_filters.h goom_tools.h goomsl.h goomsl_hash.h goomsl_heap.h goom_tools.h goom_config.h
-+goom2_library_include_HEADERS = goom.h goom_plugin_info.h goom_typedefs.h goom_graphic.h goom_config_param.h goom_visual_fx.h goom_filters.h goom_tools.h goomsl.h goomsl_hash.h goomsl_heap.h goom_config.h
- libgoom2_la_LDFLAGS = -export-dynamic -export-symbols-regex "goom.*" 
- libgoom2_la_SOURCES = \
- 	goomsl_yacc.y goomsl_lex.l goomsl.c goomsl_hash.c goomsl_heap.c \
---- goom/Makefile.am.orig	2010-10-31 21:43:45.514184001 +0100
-+++ goom/Makefile.am	2010-10-31 21:44:01.382194251 +0100
-@@ -1,3 +1,4 @@
-+ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = src xmms-goom sdl-goom @MACFOLDER@
- 
- #.pc file

extras/contrib/src/Patches/goom2k4-noxmmx.patch

---- goom/src/plugin_info.c	2005-02-07 14:46:41.000000000 +0100
-+++ goom.new/src/plugin_info.c	2011-01-23 15:37:37.524184437 +0100
-@@ -31,6 +31,7 @@
- /*    p->methods.create_output_with_brightness = create_output_with_brightness;*/
- 
- #ifdef CPU_X86
-+#if 0
- 	if (cpuFlavour & CPU_OPTION_XMMX) {
- #ifdef VERBOSE
- 		printf ("Extented MMX detected. Using the fastest methods !\n");
-@@ -38,7 +39,8 @@
- 		p->methods.draw_line = draw_line_mmx;
- 		p->methods.zoom_filter = zoom_filter_xmmx;
- 	}
--	else if (cpuFlavour & CPU_OPTION_MMX) {
-+#endif
-+	if (cpuFlavour & CPU_OPTION_MMX) {
- #ifdef VERBOSE
- 		printf ("MMX detected. Using fast methods !\n");
- #endif

extras/contrib/src/Patches/goom2k4-osx.patch

---- goom/configure.in.orig	2010-11-01 00:05:11.000000000 +0100
-+++ goom/configure.in	2010-11-01 00:05:16.000000000 +0100
-@@ -43,8 +43,6 @@
- dnl HOST
- case "$host" in
- *-apple-darwin*)
--	MACTARGET="yes"
--	MACFOLDER="mac"
- 	AC_SUBST(MACFOLDER)
-   	CCAS='$(CC)'
-   	AC_SUBST(CCAS)

extras/contrib/src/Patches/goom2k4-xmmslibdir.patch

---- goom/xmms-goom/Makefile.am	2005-02-07 22:46:42.000000000 +0900
-+++ goom.new/xmms-goom/Makefile.am	2011-04-16 02:03:15.420291009 +0900
-@@ -2,7 +2,7 @@
- 
- if HAVE_XMMS
- xmms_lib_LTLIBRARIES = libxmmsgoom2.la
--xmms_libdir = $(XMMS_VISUALIZATION_PLUGIN_DIR)
-+xmms_libdir = $(libdir)
- libxmmsgoom2_la_LIBADD = $(top_builddir)/src/libgoom2.la $(XMMS_LIBS)
- libxmmsgoom2_la_SOURCES = xmms_goom.c
- INCLUDES=-DDATADIR=\"@XMMS_DATA_DIR@\" @XMMS_CFLAGS@ -Wall -I../src/

extras/contrib/src/Patches/gsm-cross.patch

-diff -ruN gsm/Makefile gsm.new/Makefile
---- gsm/Makefile	2006-04-26 21:14:26.000000000 +0200
-+++ gsm.new/Makefile	2009-03-29 20:12:39.000000000 +0200
-@@ -43,10 +43,8 @@
- # CC		= /usr/lang/acc
- # CCFLAGS 	= -c -O
- 
--CC		= gcc -ansi -pedantic
- CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1
- 
--LD 		= $(CC)
- 
- # LD		= gcc
- # LDFLAGS 	=
-@@ -98,14 +96,11 @@
- SHELL		= /bin/sh
- LN		= ln
- BASENAME 	= basename
--AR		= ar
- ARFLAGS		= cr
- RMFLAGS		=
- FIND		= find
- COMPRESS 	= compress
- COMPRESSFLAGS 	= 
--# RANLIB 	= true
--RANLIB	 	= ranlib
- 
- #
- #    You shouldn't have to configure below this line if you're porting.
-@@ -279,7 +274,7 @@
- 
- # Target rules
- 
--all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
-+all:		$(LIBGSM)
- 		@-echo $(ROOT): Done.
- 
- tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result

extras/contrib/src/Patches/lame-win64.patch

---- lame/libmp3lame/vbrquantize.c.orig	2011-11-03 10:26:28.414360800 -0400
-+++ lame/libmp3lame/vbrquantize.c	2011-11-03 10:26:30.478371043 -0400
-@@ -81,6 +81,11 @@
- #define FORCEINLINE
- #endif
- 
-+#ifdef WIN64
-+#undef FORCEINLINE
-+#define FORCEINLINE __inline__ __attribute__((always_inline))
-+#endif
-+
- typedef VOLATILE union {
-     float   f;
-     int     i;

extras/contrib/src/Patches/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

extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch

---- libcaca/configure.orig	2010-02-08 14:46:58.000000000 +0100
-+++ libcaca/configure	2010-08-09 17:46:59.000000000 +0200
-@@ -16785,33 +16785,9 @@
- done
- 
-   if test "${ac_cv_my_have_cocoa}" = "yes"; then
--    case x${target} in
--    xpowerpc*darwin*)
--      # 10.3 needed to link with X11
--      MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.3.9.sdk}"
--      GCC_VERSION="${GCC_VERSION:-3.3}"
--      ARCH="${ARCH:--arch ppc}"
--      MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--nostdinc -isystem ${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION} -isystem ${MACOSX_SDK}/usr/include}"
--      MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:--nostdinc++ -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++ -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++/ppc-darwin -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++/backward}"
--      MACOSX_SDK_LDFLAGS="${MACOSX_SDK_LDFLAGS:--L${MACOSX_SDK}/usr/lib/gcc/darwin -L${MACOSX_SDK}/usr/lib/gcc/darwin/${GCC_VERSION} -L${MACOSX_SDK}/usr/lib}"
--      ;;
--    x*86_64*darwin*)
--      MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.5.sdk}"
--      GCC_VERSION="${GCC_VERSION:-4.0}"
--      ARCH="${ARCH:--arch i386}"
--      MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--isysroot ${MACOSX_SDK}}"
--      MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:-${MACOSX_SDK_CFLAGS}}"
--      ;;
--    x*86*darwin*)
--      MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.6.sdk}"
--      GCC_VERSION="${GCC_VERSION:-4.0}"
--      ARCH="${ARCH:--arch i386}"
--      MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--isysroot ${MACOSX_SDK}}"
--      MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:-${MACOSX_SDK_CFLAGS}}"
--      ;;
--    esac
--    CC="${CC:-gcc-${GCC_VERSION}}"
--    CXX="${CXX:-g++-${GCC_VERSION}}"
-+    MACOSX_SDK=/Developer/SDKs/MacOSX10.5.sdk
-+    MACOSX_SDK_CFLAGS="-isysroot ${MACOSX_SDK}"
-+    MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CFLAGS}"
-     MACOSX_SDK_FRAMEWORKS="${MACOSX_SDK_FRAMEWORKS:--F${MACOSX_SDK}/System/Library/Frameworks}"
-     CPPFLAGS="${CPPFLAGS} ${ARCH} ${MACOSX_SDK_FRAMEWORKS}"
-     CFLAGS="${CFLAGS} ${MACOSX_SDK_CFLAGS}"

extras/contrib/src/Patches/libcaca-win32-static.patch

---- libcaca/caca/caca.h	2010-02-08 13:34:28.000000000 +0100
-+++ libcaca.new/caca/caca.h	2010-08-24 19:27:39.000000000 +0200
-@@ -31,7 +31,7 @@
- #if defined _DOXYGEN_SKIP_ME
- #elif defined _WIN32 && defined __LIBCACA__ && defined DLL_EXPORT
- #   define __extern extern __declspec(dllexport)
--#elif defined _WIN32 && !defined __LIBCACA__
-+#elif defined _WIN32 && !defined __LIBCACA__ && defined __NULL
- #   define __extern extern __declspec(dllimport)
- #else
- #   define __extern extern

extras/contrib/src/Patches/libcddb-cross.patch

---- Makefile.am.orig	2009-10-24 17:24:43.000000000 +0200
-+++ Makefile.am	2009-10-24 17:26:58.000000000 +0200
-@@ -1,5 +1,5 @@
- 
--SUBDIRS	= include lib examples tests
-+SUBDIRS	= include lib 
- EXTRA_DIST = doc/doxygen.conf misc/$(PACKAGE).ebuild
- 
- dist-hook:
---- configure.ac.orig	2009-10-25 01:51:35.000000000 +0200
-+++ configure.ac	2009-10-25 01:51:44.000000000 +0200
-@@ -107,8 +107,6 @@
- AC_TYPE_SIZE_T
- 
- dnl Checks for library functions.
--AC_FUNC_MALLOC
--AC_FUNC_REALLOC
- AC_FUNC_STAT
- AC_FUNC_VPRINTF
- AC_FUNC_SELECT_ARGTYPES
---- include/cddb/cddb_ni.h.orig	2009-10-25 21:58:20.000000000 +0100
-+++ include/cddb/cddb_ni.h	2009-10-25 21:58:46.000000000 +0100
-@@ -35,6 +35,7 @@
- #  include <iconv.h>
- #else
-    typedef void *iconv_t;       /* for code uniformity */
-+   #define ICONV_CONST const
- #endif
- 
- #ifdef HAVE_WINDOWS_H

extras/contrib/src/Patches/libcddb-darwin.patch

---- include/cddb/cddb_ni.h.orig	2009-10-25 21:58:20.000000000 +0100
-+++ include/cddb/cddb_ni.h	2009-10-25 21:58:46.000000000 +0100
-@@ -35,6 +35,7 @@
- #  include <iconv.h>
- #else
-    typedef void *iconv_t;       /* for code uniformity */
-+   #define ICONV_CONST const
- #endif
- 
- #ifdef HAVE_WINDOWS_H

extras/contrib/src/Patches/libcddb-getenv-crash.patch

---- libcddb/lib/cddb_conn.c	2006-10-15 13:53:11.000000000 +0200
-+++ libcddb.new/lib/cddb_conn.c	2010-11-28 21:03:39.012749230 +0100
-@@ -100,9 +100,17 @@
-         c->use_cache = CACHE_ON;
-         /* construct cache dir '$HOME/[DEFAULT_CACHE]' */
-         s = getenv("HOME");
--        c->cache_dir = (char*)malloc(strlen(s) + 1 + sizeof(DEFAULT_CACHE) + 1);
--        sprintf(c->cache_dir, "%s/%s", s, DEFAULT_CACHE);
--        c->cache_read = FALSE;
-+        if( s )
-+        {
-+            c->cache_dir = (char*)malloc(strlen(s) + 1 + sizeof(DEFAULT_CACHE) + 1);
-+            sprintf(c->cache_dir, "%s/%s", s, DEFAULT_CACHE);
-+            c->cache_read = FALSE;
-+        }
-+        else
-+        {
-+            c->cache_dir = NULL;
-+            c->use_cache = CACHE_OFF;
-+        }
- 
-         /* use anonymous@localhost */
-         c->user = strdup(DEFAULT_USER);

extras/contrib/src/Patches/libcddb-win32.patch

---- libcddb.pc.in.orig	2009-10-25 21:36:57.000000000 +0100
-+++ libcddb.pc.in	2009-10-25 21:36:11.000000000 +0100
-@@ -6,5 +6,5 @@
- Name: libcddb
- Description: CDDB server access library
- Version: @VERSION@
--Libs: -L${libdir} -lcddb @LIBICONV@
-+Libs: -L${libdir} -lcddb -lregex ${libdir}/libregex.a @LIBICONV@ -lws2_32
- Cflags: -I${includedir}

extras/contrib/src/Patches/libcdio-install-cdparanoia-pc.patch

---- libcdio/Makefile.am	2008-03-15 19:21:28.000000000 +0300
-+++ libcdio.patched/Makefile.am	2008-04-04 03:29:17.000000000 +0400
-@@ -48,8 +48,8 @@
- 	         libcdio++.pc  \
- 	         libiso9660.pc \
- 	         libiso9660++.pc \
--	         libudf.pc
--		 $(paranoiapcs)
-+	         libudf.pc \
-+			 $(paranoiapcs)
- 
- 
- $(pkgconfig_DATA): config.status

extras/contrib/src/Patches/libcdio-modernOSX.patch

---- libcdio-orig/lib/driver/osx.c	2007-08-12 14:38:25.000000000 +0200
-+++ libcdio/lib/driver/osx.c	2008-12-27 00:38:21.000000000 +0100
-@@ -58,7 +58,7 @@
- 
- #include <mach/mach.h>
- #include <Carbon/Carbon.h>
--#include <IOKit/scsi-commands/SCSITaskLib.h>
-+#include <IOKit/scsi/SCSITaskLib.h>
- #include <IOKit/IOCFPlugIn.h>
- #include <mach/mach_error.h>
- 
-@@ -77,7 +77,7 @@
- #include <CoreFoundation/CoreFoundation.h>
- #include <IOKit/IOKitLib.h>
- #include <IOKit/IOBSD.h>
--#include <IOKit/scsi-commands/IOSCSIMultimediaCommandsDevice.h>
-+#include <IOKit/scsi/IOSCSIMultimediaCommandsDevice.h>
- #include <IOKit/storage/IOCDTypes.h>
- #include <IOKit/storage/IODVDTypes.h>
- #include <IOKit/storage/IOMedia.h>

extras/contrib/src/Patches/libdc1394-noexamples.patch

---- libdc1394-1.2.1/Makefile	2006-11-22 21:49:05.000000000 +0100
-+++ libdc1394/Makefile	2006-11-22 21:48:12.000000000 +0100
-@@ -177,7 +177,7 @@ sbindir = ${exec_prefix}/sbin
- sharedstatedir = ${prefix}/com
- sysconfdir = ${prefix}/etc
- target_alias = 
--SUBDIRS = libdc1394 examples
-+SUBDIRS = libdc1394 
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
- 	stamp-h.in
- 

extras/contrib/src/Patches/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];
-         }

extras/contrib/src/Patches/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

extras/contrib/src/Patches/libdvdnav.patch

-diff -ruN libdvdnav/Makefile.am libdvdnav.new/Makefile.am
---- libdvdnav/Makefile.am	2008-06-18 17:06:33.000000000 +0200
-+++ libdvdnav.new/Makefile.am	2011-10-11 01:02:18.768524699 +0200
-@@ -1,7 +1,7 @@
- include $(top_srcdir)/misc/Makefile.common
- 
- 
--SUBDIRS = src examples doc misc m4
-+SUBDIRS = src misc m4
- 
- EXTRA_DIST = autogen.sh \
- 	     AUTHORS \
-diff -ruN libdvdnav/src/vm/vm.c libdvdnav.new/src/vm/vm.c
---- libdvdnav/src/vm/vm.c	2010-11-22 00:59:43.000000000 +0100
-+++ libdvdnav.new/src/vm/vm.c	2011-10-11 01:02:07.852470536 +0200
-@@ -174,12 +174,11 @@
-     fd = open(device, O_RDONLY);
-     if (fd > 0) {
-       off = lseek( fd, 32 * (off_t) DVD_VIDEO_LB_LEN, SEEK_SET );
--      if( off == ( 32 * (off_t) DVD_VIDEO_LB_LEN ) ) {
-+      if (off == 16) {
-         off = read( fd, data, DVD_VIDEO_LB_LEN );
--        close(fd);
-         if (off == ( (off_t) DVD_VIDEO_LB_LEN )) {
-           fprintf(MSG_OUT, "libdvdnav: DVD Title: ");
--          for(i=25; i < 73; i++ ) {
-+          for(i=40; i < 73; i++ ) {
-             if((data[i] == 0)) break;
-             if((data[i] > 32) && (data[i] < 127)) {
-               fprintf(MSG_OUT, "%c", data[i]);
-@@ -187,10 +186,12 @@
-               fprintf(MSG_OUT, " ");
-             }
-           }
--          strncpy(name, (char*) &data[25], 48);
--          name[48] = 0;
-+          strncpy(name, (char*) &data[40], 32);
-+          i=31;
-+          while( (i>=0) && (name[i] <= ' ')) --i;
-+          name[i+1] = '\0';
-           fprintf(MSG_OUT, "\nlibdvdnav: DVD Serial Number: ");
--          for(i=73; i < 89; i++ ) {
-+          for(i=813; i < 829; i++ ) {
-             if((data[i] == 0)) break;
-             if((data[i] > 32) && (data[i] < 127)) {
-               fprintf(MSG_OUT, "%c", data[i]);

extras/contrib/src/Patches/libdvdread-dvdcss-static.patch

-Index: configure.ac
-===================================================================
---- configure.ac	(revision 1162)
-+++ configure.ac	(working copy)
-@@ -137,27 +137,59 @@
- dnl ---------------------------------------------
- dnl dynamic linker
- dnl ---------------------------------------------
--case $host in
--  *mingw32*)
--    CFLAGS="-idirafter \$(top_srcdir)/msvc/include $CFLAGS"
--    LDFLAGS="-no-undefined $LDFLAGS"
--    ;;
--  *cygwin*)
--    LDFLAGS="-no-undefined $LDFLAGS"
--    ;;
--  *os2*)
--    LDFLAGS="-no-undefined -Zbin-files $LDFLAGS"
--    ;;
--  *)
--    AC_CHECK_LIB(c, dlopen,
--                 DYNAMIC_LD_LIBS="",
--                 AC_CHECK_LIB(dl, dlopen,
--                              DYNAMIC_LD_LIBS="-ldl",
--                              AC_MSG_ERROR(dynamic linker needed)))
--    AC_SUBST(DYNAMIC_LD_LIBS)
--    ;;
--esac
-+AC_ARG_WITH( [libdvdcss],
-+    [  --with-libdvdcss[=PATH]    force linking against libdvdcss],
-+    [if test x"$withval" != xno; then
-+       link_dvdcss=yes
-+     fi
-+     if test x"$withval" != xyes; then
-+       dvdcss_path=$withval
-+     fi])
- 
-+if test x"$link_dvdcss" != xyes; then
-+dnl dlopen libdvdcss
-+  AC_CHECK_FUNC( dlopen,
-+    [DL_LIBS="" ],
-+    AC_CHECK_LIB( dl, dlopen,
-+      [DL_LIBS=-ld ],
-+      AC_MSG_ERROR(You need libdl (dlopen))
-+    )
-+  )
-+else
-+dnl link with libdvdcss
-+  if test -z "$dvdcss_path"; then
-+    AC_CHECK_LIB(dvdcss, dvdcss_interface_2,
-+      [ CSS_LIBS=-ldvdcss ],
-+      AC_MSG_ERROR(You need libdvdcss.so.2 or later)
-+    )
-+    AC_CHECK_HEADERS(dvdcss/dvdcss.h,
-+      [ ],
-+      AC_MSG_ERROR(You need libdvdcss (dvdcss.h))
-+    )
-+  else
-+    saved_CFLAGS=$CFLAGS
-+    CFLAGS="$CFLAGS -L$dvdcss_path/lib"
-+    AC_CHECK_LIB(dvdcss, dvdcss_interface_2,
-+      [ CSS_LIBS="-L$dvdcss_path/lib -R$dvdcss_path/lib -ldvdcss"
-+        CSS_CFLAGS=-I$dvdcss_path/include ],
-+      AC_MSG_ERROR(You need libdvdcss.so.2 or later)
-+    )
-+    CFLAGS=$saved_CFLAGS
-+    dnl -w added to shutup GCC3.1's cpp warning about -I/usr/local
-+    saved_CPPFLAGS=$CPPFLAGS
-+    CPPFLAGS="-w $CPPFLAGS -I$dvdcss_path/include"
-+    AC_CHECK_HEADERS(dvdcss/dvdcss.h,
-+      [ ],
-+      AC_MSG_ERROR(You need libdvdcss (dvdcss.h))
-+    )
-+    CPPFLAGS=$saved_CPPFLAGS
-+  fi
-+fi
-+
-+AC_SUBST(DL_LIBS)
-+AC_SUBST(CSS_LIBS)
-+AC_SUBST(CSS_CFLAGS)
-+
- dnl ---------------------------------------------
- dnl cflags
- dnl ---------------------------------------------

extras/contrib/src/Patches/libdvdread-win32.patch

-Index: src/dvd_reader.c
-===================================================================
---- src/dvd_reader.c	(revision 1157)
-+++ src/dvd_reader.c	(working copy)
-@@ -34,6 +34,7 @@
- #include <limits.h>
- #include <dirent.h>
- 
-+#if 0
- /* misc win32 helpers */
- #ifdef WIN32
- #ifndef HAVE_GETTIMEOFDAY
-@@ -52,6 +53,7 @@
- #include <io.h> /* read() */
- #define lseek64 _lseeki64
- #endif
-+#endif
- 
- #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DARWIN__)
- #define SYS_BSD 1
-Index: src/dvdread/ifo_types.h
-===================================================================
---- src/dvdread/ifo_types.h	(révision 1188)
-+++ src/dvdread/ifo_types.h	(copie de travail)
-@@ -32,7 +32,7 @@
- 
- #if defined(__GNUC__)
- #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
--#define ATTRIBUTE_PACKED __attribute__ ((packed))
-+#define ATTRIBUTE_PACKED __attribute__ ((packed,gcc_struct))
- #define PRAGMA_PACK 0
- #endif
- #endif

extras/contrib/src/Patches/libgpg-error-win32.patch

---- libgpg-error/src/Makefile.am	2010-04-14 11:16:44.000000000 +0200
-+++ libgpg-error.new/src/Makefile.am	2010-08-09 11:21:56.000000000 +0200
-@@ -60,7 +60,7 @@
- arch_sources = w32-gettext.c
- 
- RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--            -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS)
-+            -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS)
- LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
- 
- SUFFIXES = .rc .lo

extras/contrib/src/Patches/libiconv-wince-hack.patch

-diff -urNp libiconv.orig/configure libiconv/configure
---- libiconv.orig/configure	2009-06-30 22:51:53.000000000 +0200
-+++ libiconv/configure	2009-11-12 04:41:02.000000000 +0100
-@@ -20344,6 +20344,7 @@ rm -f conftest*
- 
- 
- fi
-+gl_cv_header_signal_h_SIGPIPE=yes
- { $as_echo "$as_me:$LINENO: result: $gl_cv_header_signal_h_SIGPIPE" >&5
- $as_echo "$gl_cv_header_signal_h_SIGPIPE" >&6; }
- 
-@@ -23459,7 +23460,6 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <signal.h>
- /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
- #include <sys/types.h>
- 
-diff -urNp libiconv.orig/signal.h libiconv/signal.h
---- libiconv.orig/signal.h	1970-01-01 01:00:00.000000000 +0100
-+++ libiconv/signal.h	2009-11-12 04:39:24.000000000 +0100
-@@ -0,0 +1,11 @@
-+#ifndef	_SIGNAL_H_
-+#define	_SIGNAL_H_
-+
-+#define	SIGABRT		22	/* Abnormal termination (abort) */
-+
-+typedef	void (*__p_sig_fn_t)(int);
-+#define	SIG_DFL	((__p_sig_fn_t) 0)
-+#define	SIG_IGN	((__p_sig_fn_t) 1)
-+#define	SIG_ERR ((__p_sig_fn_t) -1)
-+
-+#endif	/* Not _SIGNAL_H_ */

extras/contrib/src/Patches/libiconv-wince.patch

-diff -urNp libiconv.orig/src/iconv.c libiconv/src/iconv.c
---- libiconv.orig/src/iconv.c	2009-06-21 13:17:33.000000000 +0200
-+++ libiconv/src/iconv.c	2009-11-11 05:35:58.000000000 +0100
-@@ -26,7 +26,9 @@
- #include <string.h>
- #include <iconv.h>
- #include <errno.h>
--#include <locale.h>
-+#ifdef HAVE_SETLOCALE
-+# include <locale.h>
-+#endif
- #include <fcntl.h>
- 
- /* Ensure that iconv_no_i18n does not depend on libintl.  */

extras/contrib/src/Patches/libmpc-simple.patch

-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt	(révision 468)
-+++ CMakeLists.txt	(copie de travail)
-@@ -23,11 +23,9 @@
- add_subdirectory(libmpcpsy)
- add_subdirectory(libmpcenc)
- add_subdirectory(libwavformat)
--add_subdirectory(mpcgain)
- add_subdirectory(mpcdec)
- add_subdirectory(mpcenc)
- add_subdirectory(mpc2sv8)
- add_subdirectory(mpccut)
--add_subdirectory(mpcchap)
- add_subdirectory(wavcmp)
- add_subdirectory(include)

extras/contrib/src/Patches/libmpeg2-arm-pld.patch

-diff -urNp libmpeg2.orig/libmpeg2/motion_comp_arm_s.S libmpeg2/libmpeg2/motion_comp_arm_s.S
---- libmpeg2.orig/libmpeg2/motion_comp_arm_s.S	2008-07-09 21:16:05.000000000 +0200
-+++ libmpeg2/libmpeg2/motion_comp_arm_s.S	2009-11-20 19:55:22.000000000 +0100
-@@ -19,6 +19,16 @@
- @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- 
-+@ Data preload is supported only by ARM V5TE and above
-+
-+#if (defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_3__) \
-+     || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \
-+     || defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_5__) \
-+     || defined (__ARM_ARCH_5T__))
-+.macro pld reg
-+.endm
-+#endif
-+
- 	.text
- 
- @ ----------------------------------------------------------------

extras/contrib/src/Patches/libogg-1.1.patch

---- libogg/configure.in	2010-11-01 21:13:42.000000000 +0100
-+++ libogg.new/configure.in	2010-11-03 23:59:54.267733114 +0100
-@@ -28,17 +28,17 @@
-         case $host in 
-         *-*-irix*)
-                 DEBUG="-g -signed" 
--                CFLAGS="-O2 -w -signed"
-+                EXTRA_CFLAGS="-O2 -w -signed"
-                 PROFILE="-p -g3 -O2 -signed"
- 		;;
-         sparc-sun-solaris*)
-                 DEBUG="-v -g"
--                CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
-+                EXTRA_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
-                 PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc"
- 		;;
-         *)
-                 DEBUG="-g"
--                CFLAGS="-O"
-+                EXTRA_CFLAGS="-O"
-                 PROFILE="-g -p" 
- 		;;
-         esac
-@@ -46,27 +46,27 @@
-         case $host in 
-         *-*-linux*)
-                 DEBUG="-g -Wall -fsigned-char"
--                CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
-+                EXTRA_CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
-                 PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char"
- 		;;
-         sparc-sun-*)
-                 DEBUG="-g -Wall -fsigned-char"
--                CFLAGS="-O20 -ffast-math -fsigned-char"
-+                EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char"
-                 PROFILE="-pg -g -O20 -fsigned-char" 
- 		;;
- 	*-*-darwin*)
- 		DEBUG="-fno-common -g -Wall -fsigned-char"
--		CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math"
-+		EXTRA_CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math"
- 		PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math"
- 		;;
-         *)
-                 DEBUG="-g -Wall -fsigned-char"
--                CFLAGS="-O20 -fsigned-char"
-+                EXTRA_CFLAGS="-O20 -fsigned-char"
-                 PROFILE="-O20 -g -pg -fsigned-char" 
- 		;;
-         esac
- fi
--CFLAGS="$CFLAGS $cflags_save"
-+CFLAGS="$EXTRA_CFLAGS $cflags_save"
- DEBUG="$DEBUG $cflags_save"
- PROFILE="$PROFILE $cflags_save"
- 

extras/contrib/src/Patches/libogg-r17608.diff

-https://trac.xiph.org/changeset/17608/trunk/ogg/include/ogg/os_types.h?format=diff&new=17608
-Index: trunk/ogg/include/ogg/os_types.h
-===================================================================
---- trunk/ogg/include/ogg/os_types.h (revision 17566)
-+++ trunk/ogg/include/ogg/os_types.h (revision 17608)
-@@ -71,7 +71,7 @@
- #  include <inttypes.h>
-    typedef int16_t ogg_int16_t;
--   typedef u_int16_t ogg_uint16_t;
-+   typedef uint16_t ogg_uint16_t;
-    typedef int32_t ogg_int32_t;
--   typedef u_int32_t ogg_uint32_t;
-+   typedef uint32_t ogg_uint32_t;
-    typedef int64_t ogg_int64_t;
- 

extras/contrib/src/Patches/libogg-wince.patch

---- libogg/include/ogg/os_types.h	2005-11-22 23:01:12.000000000 +0000
-+++ libogg/include/ogg/os_types.h	2005-11-22 23:05:11.000000000 +0000
-@@ -55,6 +55,10 @@
-      typedef unsigned __int16 ogg_uint16_t;
- #  endif
- 
-+#  if defined(UNDER_CE)
-+#     define exit(a)
-+#  endif
-+
- #elif defined(__MACOS__)
- 
- #  include <sys/types.h>

extras/contrib/src/Patches/libpng-makefile.patch

---- libpng-1.2.8/scripts/makefile.linux	2004-12-03 01:14:31.000000000 +0100
-+++ libpng/scripts/makefile.linux	2006-07-14 10:12:00.000000000 +0200
-@@ -13,7 +13,7 @@
- # where "make install" puts libpng12.a, libpng12.so*,
- # libpng12/png.h and libpng12/pngconf.h
- # Prefix must be a full pathname.
--prefix=/usr/local
-+prefix=$(PREFIX)
- exec_prefix=$(prefix)
- 
- # Where the zlib library and include files are located.
-@@ -53,7 +53,7 @@
- # If you're going to install into a temporary location
- # via DESTDIR, $(DESTDIR)$(prefix) must already exist before
- # you execute make install.
--DESTDIR=
-+#DESTDIR=
- 
- DB=$(DESTDIR)$(BINPATH)
- DI=$(DESTDIR)$(INCPATH)

extras/contrib/src/Patches/libpng-osx.patch

-diff -urN libpng-1.2.41/scripts/makefile.darwin libpng/scripts/makefile.darwin
---- libpng-1.2.41/scripts/makefile.darwin       2009-12-03 04:46:02 +0300
-+++ libpng/scripts/makefile.darwin       2009-12-04 14:37:52 +0300
-@@ -76,7 +76,7 @@
- .c.pic.o:
-        $(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
-
--all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
-+all: libpng.a $(LIBSO) libpng.pc libpng-config
-
- libpng.a: $(OBJS)
-        $(AR_RC) $@ $(OBJS)
-@@ -185,7 +185,7 @@
-        chmod 755 $(DB)/$(LIBNAME)-config
-        (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
--install: install-static install-shared install-man install-config
-+install: install-static install-man install-config
-
- # If you installed in $(DESTDIR), test-installed won't work until you
- # move the library to its final location.  Use test-dd to test it

extras/contrib/src/Patches/libpng-win32.patch

---- scripts/makefile.cygwin	2006-06-27 22:22:40.000000000 +0200
-+++ scripts/makefile.cygwin	2006-07-12 13:18:15.000000000 +0200
-@@ -35,7 +35,6 @@
- # $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency
- # list at the bottom of this makefile.
- 
--CC=gcc
- ifdef MINGW
- MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw
- MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw
-@@ -43,14 +42,13 @@
- 
- # Where "make install" puts libpng*.a, *png*.dll, png.h, and pngconf.h
- ifndef prefix
--prefix=/usr
--$(warning You haven't specified a 'prefix=' location. Defaulting to "/usr")
-+prefix=??PREFIX??
- endif
- exec_prefix=$(prefix)
- 
- # Where the zlib library and include files are located
--ZLIBLIB= /usr/lib
--ZLIBINC=
-+ZLIBLIB= ??PREFIX??/lib
-+ZLIBINC= ??PREFIX??/include
- #ZLIBLIB=../zlib
- #ZLIBINC=../zlib
- 
-@@ -95,7 +93,9 @@
- LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
- 
- MKDIR_P=/bin/mkdir -pv
-+ifndef RANLIB
- RANLIB=ranlib
-+endif
- #RANLIB=echo
- 
- INCPATH=$(prefix)/include
-@@ -174,7 +174,7 @@
- 	$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
- 
- $(STATLIB): $(OBJS)
--	ar rc $@ $(OBJS)
-+	$(AR) rc $@ $(OBJS)
- 	$(RANLIB) $@
- 
- $(SHAREDDEF): scripts/pngw32.def

extras/contrib/src/Patches/libshout-win32.patch

-diff -u libshout/include/shout/shout.h.in libshout-new/include/shout/shout.h.in
---- libshout/include/shout/shout.h.in	2004-10-30 02:23:15.000000000 +0100
-+++ libshout-new/include/shout/shout.h.in	2006-03-12 21:06:13.000000000 +0000
-@@ -22,9 +22,6 @@
- #define __LIBSHOUT_SHOUT_H__
- 
- #include <sys/types.h>
--#ifdef WIN32
--#include <os.h>
--#endif
- 
- #define SHOUTERR_SUCCESS	(0)
- #define SHOUTERR_INSANE		(-1)
---- libshout/Makefile.in	2009-06-15 02:28:13.000000000 +0200
-+++ libshout/Makefile.in	2009-06-15 02:29:10.000000000 +0200
-@@ -246,7 +246,7 @@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = 1.6 foreign
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = include src examples debian doc win32
-+SUBDIRS = include src doc win32
- EXTRA_DIST = INSTALL m4/shout.m4 m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \
- 	m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
- 	m4/xiph_types.m4

extras/contrib/src/Patches/libtheora-includes.patch

---- libtheora/tests/comment.c	2008-04-16 22:25:49.000000000 +0200
-+++ libtheora.old/tests/comment.c	2008-05-14 19:25:34.000000000 +0200
-@@ -15,11 +15,11 @@
- 
-  ********************************************************************/
- 
--#include <theora/theoradec.h>
--
- #include <string.h>
- #include "tests.h"
- 
-+#include <theora/theoradec.h>
-+
- #define ARTIST1 "Bug-eyed Fish"
- #define ARTIST2 "VJ Fugu"
- #define COPYRIGHT "Copyright (C) 2005. Some Rights Reserved."