diff options
author | Chris White <chriswhite@gentoo.org> | 2005-11-30 09:38:30 +0000 |
---|---|---|
committer | Chris White <chriswhite@gentoo.org> | 2005-11-30 09:38:30 +0000 |
commit | 7b5417ddad588547e9704d275e9dcea35e6db225 (patch) | |
tree | 85762e2800d7be3ac92a6846e2e132d780871f0b /media-sound/moc/files | |
parent | Unmask KDE 3.5. (diff) | |
download | gentoo-2-7b5417ddad588547e9704d275e9dcea35e6db225.tar.gz gentoo-2-7b5417ddad588547e9704d275e9dcea35e6db225.tar.bz2 gentoo-2-7b5417ddad588547e9704d275e9dcea35e6db225.zip |
*** empty log message ***
Diffstat (limited to 'media-sound/moc/files')
-rw-r--r-- | media-sound/moc/files/digest-moc-2.3.1 | 1 | ||||
-rw-r--r-- | media-sound/moc/files/moc-2.3.1-configure.patch | 85 |
2 files changed, 86 insertions, 0 deletions
diff --git a/media-sound/moc/files/digest-moc-2.3.1 b/media-sound/moc/files/digest-moc-2.3.1 new file mode 100644 index 000000000000..49e569a12a5e --- /dev/null +++ b/media-sound/moc/files/digest-moc-2.3.1 @@ -0,0 +1 @@ +MD5 f6c9d56a80eb8000cfe51997b27eb6ed moc-2.3.1.tar.bz2 403800 diff --git a/media-sound/moc/files/moc-2.3.1-configure.patch b/media-sound/moc/files/moc-2.3.1-configure.patch new file mode 100644 index 000000000000..58dcd6745994 --- /dev/null +++ b/media-sound/moc/files/moc-2.3.1-configure.patch @@ -0,0 +1,85 @@ +--- configure.in.old 2005-08-02 05:30:23.000000000 +0900 ++++ configure.in 2005-10-03 23:54:27.000000000 +0900 +@@ -76,19 +76,26 @@ + [EXTRA_LIBS="$EXTRA_LIBS -lossaudio"]) + fi + +-PKG_CHECK_MODULES(ALSA, [alsa >= 0.9], +- [COMPILE_ALSA="yes" +- EXTRA_OBJS="$EXTRA_OBJS alsa.o" +- AC_DEFINE([HAVE_ALSA], 1, [Define if you have ALSA.]) +- EXTRA_LIBS="$EXTRA_LIBS $ALSA_LIBS" +- CFLAGS="$CFLAGS $ALSA_CFLAGS"], +- [COMPILE_ALSA="no"]) ++AC_ARG_WITH(jack, AS_HELP_STRING(--without-jack, Compile without JACK support.)) ++ ++if test "$with_jack" != "xno" ++then ++ PKG_CHECK_MODULES([ALSA], [alsa >= 0.9], ++ [COMPILE_ALSA="yes" ++ EXTRA_OBJS="$EXTRA_OBJS alsa.o" ++ AC_DEFINE([HAVE_ALSA], 1, [Define if you have ALSA.]) ++ EXTRA_LIBS="$EXTRA_LIBS $ALSA_LIBS" ++ CFLAGS="$CFLAGS $ALSA_CFLAGS"], ++ [COMPILE_ALSA="no"]) ++else ++ COMPILE_ALSA="no" ++fi + + AC_ARG_WITH(jack, AS_HELP_STRING(--without-jack, Compile without JACK support.)) + + if test "x$with_jack" != "xno" + then +- PKG_CHECK_MODULES(JACK, [jack >= 0.4], ++ PKG_CHECK_MODULES([JACK], [jack >= 0.4], + [COMPILE_JACK="yes" + EXTRA_OBJS="$EXTRA_OBJS jack.o" + AC_DEFINE([HAVE_JACK], 1, [Define if you have JACK.]) +@@ -214,9 +221,8 @@ + taglib_ver_minor=`echo "$taglib_ver" | awk -F. '{print $2}'` + taglib_ver_extra=`echo "$taglib_ver" | awk -F. '{print $3}'` + +- if test \( "$taglib_ver_major" = "1" -a "$taglib_ver_minor" -ge 4 \) \ +- -o \( "$taglib_ver_major" = "1" -a "$taglib_ver_minor" = "3" \ +- -a "$taglib_ver_extra" -ge 1 \) ++ if test \( "$taglib_ver_major" = "1" -a \ ++ "$taglib_ver_minor" -ge 4 \) + then + AC_MSG_RESULT([$taglib_ver, OK]) + +@@ -248,7 +254,7 @@ + AC_ARG_WITH(ogg, AS_HELP_STRING(--without-ogg,Compile without OGG support.)) + if test "x$with_ogg" != "xno" + then +- PKG_CHECK_MODULES(OGG_VORBIS, [ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0], ++ PKG_CHECK_MODULES([OGG_VORBIS], [ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0], + [AC_SUBST(OGG_VORBIS_LIBS) + AC_SUBST(OGG_VORBIS_CFLAGS) + DECODER_PLUGINS="$DECODER_PLUGINS ogg"], +@@ -269,7 +275,7 @@ + Compile without libsndfile)) + if test "x$with_sndfile" != "xno" + then +- PKG_CHECK_MODULES(sndfile, sndfile >= 1.0.0, ++ PKG_CHECK_MODULES([sndfile], [sndfile >= 1.0.0], + [AC_SUBST(sndfile_LIBS) + AC_SUBST(sndfile_CFLAGS) + DECODER_PLUGINS="$DECODER_PLUGINS sndfile"], +@@ -281,7 +287,7 @@ + Compile without speex support)) + if test "x$with_speex" != "xno" + then +- PKG_CHECK_MODULES(speex, speex >= 1.0.0, ++ PKG_CHECK_MODULES([speex], [speex >= 1.0.0], + [AC_SUBST(speex_LIBS) + AC_SUBST(speex_CFLAGS) + DECODER_PLUGINS="$DECODER_PLUGINS speex"], +@@ -294,7 +300,7 @@ + COMPILE_SAMPLERATE="no" + if test "x$with_samplerate" != "xno" + then +- PKG_CHECK_MODULES(samplerate, samplerate >= 0.1.0, ++ PKG_CHECK_MODULES([samplerate], [samplerate >= 0.1.0], + [EXTRA_LIBS="$EXTRA_LIBS $samplerate_LIBS" + CFLAGS="$CFLAGS $samplerate_CFLAGS" + AC_DEFINE([HAVE_SAMPLERATE], 1, |