From 6f4f0d191fb7c15cd9ce48dbae3f366cd1a1171a Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Tue, 3 Aug 2010 14:44:14 +0200 Subject: [PATCH] fusionsound: fixed to build by adding upstream patches --- audio/fusionsound/build-fix.patch | 135 +++++++++++++++++++++++++++++ audio/fusionsound/ffmpeg-fix.patch | 69 +++++++++++++++ audio/fusionsound/fusionsound.conf | 16 ++++ 3 files changed, 220 insertions(+) create mode 100644 audio/fusionsound/build-fix.patch create mode 100644 audio/fusionsound/ffmpeg-fix.patch create mode 100644 audio/fusionsound/fusionsound.conf diff --git a/audio/fusionsound/build-fix.patch b/audio/fusionsound/build-fix.patch new file mode 100644 index 000000000..213e93251 --- /dev/null +++ b/audio/fusionsound/build-fix.patch @@ -0,0 +1,135 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../fusionsound/build-fix.patch +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. +# --- SDE-COPYRIGHT-NOTE-END --- + +From: Ville Syrjala +Date: Tue, 21 Oct 2008 13:17:46 +0000 (+0300) +Subject: Fix build with LDFLAGS="-Wl,-no-undefined". +X-Git-Url: http://git.directfb.org/?p=core%2FFusionSound.git;a=commitdiff_plain;h=215457b66c687a64af1bd7e27f5df28bc9c51853 + +Fix build with LDFLAGS="-Wl,-no-undefined". +--- + +diff --git a/configure.in b/configure.in +index e827300..322f0d6 100644 +--- a/configure.in ++++ b/configure.in +@@ -216,6 +216,8 @@ DIRECT_REQUIRED_VERSION=1.1.0 + + AC_MSG_CHECKING(for libdirect) + if $PKG_CONFIG --atleast-version $DIRECT_REQUIRED_VERSION direct ; then ++ DIRECT_CFLAGS=`$PKG_CONFIG --cflags direct` ++ DIRECT_LIBS=`$PKG_CONFIG --libs direct` + MODULEDIR=$libdir/`$PKG_CONFIG --variable=moduledirname direct` + AC_MSG_RESULT([found (moduledir = $MODULEDIR)]) + else +@@ -560,6 +562,8 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + + AM_CONDITIONAL(BUILD_STATIC, test "$enable_static" = "yes") + ++AC_SUBST(DIRECT_CFLAGS) ++AC_SUBST(DIRECT_LIBS) + AC_SUBST(FUSION_CFLAGS) + AC_SUBST(FUSION_LIBS) + AC_SUBST(LITE_CFLAGS) +diff --git a/drivers/Makefile.am b/drivers/Makefile.am +index 92b919e..2c71515 100644 +--- a/drivers/Makefile.am ++++ b/drivers/Makefile.am +@@ -28,21 +28,21 @@ drivers_LTLIBRARIES = \ + + libfusionsound_oss_la_SOURCES = oss.c + +-libfusionsound_oss_la_LIBADD = ../src/libfusionsound.la ++libfusionsound_oss_la_LIBADD = $(DIRECT_LIBS) ../src/libfusionsound.la + + libfusionsound_oss_la_LDFLAGS = -export-dynamic -avoid-version -module + + + libfusionsound_alsa_la_SOURCES = alsa.c + +-libfusionsound_alsa_la_LIBADD = ../src/libfusionsound.la $(ALSA_LIBS) ++libfusionsound_alsa_la_LIBADD = $(DIRECT_LIBS) ../src/libfusionsound.la $(ALSA_LIBS) + + libfusionsound_alsa_la_LDFLAGS = -export-dynamic -avoid-version -module + + + libfusionsound_wave_la_SOURCES = wave.c + +-libfusionsound_wave_la_LIBADD = ../src/libfusionsound.la ++libfusionsound_wave_la_LIBADD = $(DIRECT_LIBS) ../src/libfusionsound.la + + libfusionsound_wave_la_LDFLAGS = -export-dynamic -avoid-version -module + +diff --git a/interfaces/IFusionSoundMusicProvider/Makefile.am b/interfaces/IFusionSoundMusicProvider/Makefile.am +index 55da3cc..901c340 100644 +--- a/interfaces/IFusionSoundMusicProvider/Makefile.am ++++ b/interfaces/IFusionSoundMusicProvider/Makefile.am +@@ -53,47 +53,49 @@ ifusionsoundmusicprovider_LTLIBRARIES = \ + + libifusionsoundmusicprovider_timidity_la_SOURCES = ifusionsoundmusicprovider_timidity.c + +-libifusionsoundmusicprovider_timidity_la_LIBADD = $(TIMIDITY_LIBS) ++libifusionsoundmusicprovider_timidity_la_LIBADD = $(DIRECT_LIBS) $(TIMIDITY_LIBS) + + libifusionsoundmusicprovider_timidity_la_LDFLAGS = -avoid-version -module + + + libifusionsoundmusicprovider_wave_la_SOURCES = ifusionsoundmusicprovider_wave.c + +-libifusionsoundmusicprovider_wave_la_LIBADD = ++libifusionsoundmusicprovider_wave_la_LIBADD = $(DIRECT_LIBS) $(top_builddir)/src/libfusionsound.la + + libifusionsoundmusicprovider_wave_la_LDFLAGS = -avoid-version -module + + + libifusionsoundmusicprovider_vorbis_la_SOURCES = ifusionsoundmusicprovider_vorbis.c + +-libifusionsoundmusicprovider_vorbis_la_LIBADD = $(VORBISFILE_LIBS) ++libifusionsoundmusicprovider_vorbis_la_LIBADD = $(DIRECT_LIBS) $(top_builddir)/src/libfusionsound.la $(VORBISFILE_LIBS) + + libifusionsoundmusicprovider_vorbis_la_LDFLAGS = -avoid-version -module + + + libifusionsoundmusicprovider_mad_la_SOURCES = ifusionsoundmusicprovider_mad.c + +-libifusionsoundmusicprovider_mad_la_LIBADD = $(MAD_LIBS) -lm ++libifusionsoundmusicprovider_mad_la_LIBADD = $(DIRECT_LIBS) $(MAD_LIBS) -lm + + libifusionsoundmusicprovider_mad_la_LDFLAGS = -avoid-version -module + + + libifusionsoundmusicprovider_cdda_la_SOURCES = ifusionsoundmusicprovider_cdda.c + +-libifusionsoundmusicprovider_cdda_la_LIBADD = $(CDDB_LIBS) ++libifusionsoundmusicprovider_cdda_la_LIBADD = $(DIRECT_LIBS) $(CDDB_LIBS) + + libifusionsoundmusicprovider_cdda_la_LDFLAGS = -avoid-version -module + + + libifusionsoundmusicprovider_playlist_la_SOURCES = ifusionsoundmusicprovider_playlist.c + ++libifusionsoundmusicprovider_playlist_la_LIBADD = $(DIRECT_LIBS) $(top_builddir)/src/libfusionsound.la ++ + libifusionsoundmusicprovider_playlist_la_LDFLAGS = -avoid-version -module + + + libifusionsoundmusicprovider_ffmpeg_la_SOURCES = ifusionsoundmusicprovider_ffmpeg.c + +-libifusionsoundmusicprovider_ffmpeg_la_LIBADD = $(FFMPEG_LIBS) ++libifusionsoundmusicprovider_ffmpeg_la_LIBADD = $(DIRECT_LIBS) $(top_builddir)/src/libfusionsound.la $(FFMPEG_LIBS) + + libifusionsoundmusicprovider_ffmpeg_la_LDFLAGS = -avoid-version -module + diff --git a/audio/fusionsound/ffmpeg-fix.patch b/audio/fusionsound/ffmpeg-fix.patch new file mode 100644 index 000000000..9645e800e --- /dev/null +++ b/audio/fusionsound/ffmpeg-fix.patch @@ -0,0 +1,69 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../fusionsound/ffmpeg-fix.patch +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. +# --- SDE-COPYRIGHT-NOTE-END --- + +From: Ville Syrjala +Date: Tue, 21 Oct 2008 13:17:17 +0000 (+0300) +Subject: ffmpeg: Follow ffmpeg changes +X-Git-Url: http://git.directfb.org/?p=core%2FFusionSound.git;a=commitdiff_plain;h=6c9f3e777453b0cdbdf3e1db57ae4bfd7dd922d5 + +ffmpeg: Follow ffmpeg changes +--- + +diff --git a/configure.in b/configure.in +index a9ba0b1..3fab648 100644 +--- a/configure.in ++++ b/configure.in +@@ -523,11 +523,11 @@ AC_ARG_WITH(ffmpeg, + + if test "x$with_ffmpeg" = "xyes"; then + AC_MSG_CHECKING([for libavcodec/libavformat]) +- if $PKG_CONFIG libavcodec libavformat; then ++ if $PKG_CONFIG libavcodec libavformat libavutil; then + AC_MSG_RESULT(yes) + ffmpeg="yes" +- FFMPEG_CFLAGS=`$PKG_CONFIG --cflags libavcodec libavformat` +- FFMPEG_LIBS=`$PKG_CONFIG --libs libavcodec libavformat` ++ FFMPEG_CFLAGS=`$PKG_CONFIG --cflags libavcodec libavformat libavutil` ++ FFMPEG_LIBS=`$PKG_CONFIG --libs libavcodec libavformat libavutil` + else + AC_MSG_RESULT(no) + AC_MSG_WARN([ +diff --git a/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c b/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c +index 2a99a16..6ec5317 100644 +--- a/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c ++++ b/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c +@@ -41,8 +41,8 @@ + + #include + +-#include +-#include ++#include ++#include + + static DirectResult + Probe( IFusionSoundMusicProvider_ProbeContext *ctx ); +@@ -123,8 +123,8 @@ av_read_callback( void *opaque, uint8_t *buf, int size ) + return len; + } + +-static offset_t +-av_seek_callback( void *opaque, offset_t offset, int whence ) ++static int64_t ++av_seek_callback( void *opaque, int64_t offset, int whence ) + { + IFusionSoundMusicProvider_FFmpeg_data *data = opaque; + unsigned int pos = 0; diff --git a/audio/fusionsound/fusionsound.conf b/audio/fusionsound/fusionsound.conf new file mode 100644 index 000000000..4f1fdfca8 --- /dev/null +++ b/audio/fusionsound/fusionsound.conf @@ -0,0 +1,16 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../fusionsound/fusionsound.conf +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# 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; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +# we include patches that patch configure.in +autogen=1