ffmpeg issue workaround.

This commit is contained in:
Micha Glave 2009-09-30 16:07:02 +02:00
parent a24abd2437
commit 59d4cb8f64
2 changed files with 19 additions and 17 deletions

View File

@ -1,16 +1,4 @@
AUX mt-daapd.conf.example 8404 RMD160 caaa958ce0d495c09ec219ef0284df2adb544b33 SHA1 f0039dff3f305db683b8210bbe0b8db2856779ae SHA256 09666e7653f09b96dcedec51124d7fae9801b0bd902646ed3bda10b8ec32c753 AUX mt-daapd.conf.example 8404 RMD160 caaa958ce0d495c09ec219ef0284df2adb544b33 SHA1 f0039dff3f305db683b8210bbe0b8db2856779ae SHA256 09666e7653f09b96dcedec51124d7fae9801b0bd902646ed3bda10b8ec32c753
MD5 52d1ad5e83c798afd782c336835cdf82 files/mt-daapd.conf.example 8404
RMD160 caaa958ce0d495c09ec219ef0284df2adb544b33 files/mt-daapd.conf.example 8404
SHA256 09666e7653f09b96dcedec51124d7fae9801b0bd902646ed3bda10b8ec32c753 files/mt-daapd.conf.example 8404
AUX mt-daapd.init.2 1200 RMD160 b5dc96a1bf7c390d9a818ea5a8018ac6c1f8a90c SHA1 96187b2ca0ac89e5a69834df87c10997ae013cf5 SHA256 6e4336639ead7da81d659a289fad0600b30b112420016fd63bf426eeae2098a1 AUX mt-daapd.init.2 1200 RMD160 b5dc96a1bf7c390d9a818ea5a8018ac6c1f8a90c SHA1 96187b2ca0ac89e5a69834df87c10997ae013cf5 SHA256 6e4336639ead7da81d659a289fad0600b30b112420016fd63bf426eeae2098a1
MD5 674db97976bcc4e34df95a17ffe8750c files/mt-daapd.init.2 1200
RMD160 b5dc96a1bf7c390d9a818ea5a8018ac6c1f8a90c files/mt-daapd.init.2 1200
SHA256 6e4336639ead7da81d659a289fad0600b30b112420016fd63bf426eeae2098a1 files/mt-daapd.init.2 1200
DIST mt-daapd-svn-1696.tar.gz 1371458 RMD160 bf474230890fe501d3f8f1da1ecbd415d3a6925e SHA1 03f04643ceb0b0bbf278d8482c61a5b0e0ea1a7b SHA256 9c3f1fc4d46391286ec8572c3080bb28d681ea6b1afe3ba51ffadf2eb7cfa344 DIST mt-daapd-svn-1696.tar.gz 1371458 RMD160 bf474230890fe501d3f8f1da1ecbd415d3a6925e SHA1 03f04643ceb0b0bbf278d8482c61a5b0e0ea1a7b SHA256 9c3f1fc4d46391286ec8572c3080bb28d681ea6b1afe3ba51ffadf2eb7cfa344
EBUILD mt-daapd-0.3.0_pre1696.ebuild 3795 RMD160 558279dcf26ec22cc91e7c6b57b671d1c80b2635 SHA1 36dc15c5a80006acf8633a6cb28db1ddec6486e4 SHA256 40e2b4aca4c1dfd3b844cf269242719f9903492c999722592ef79bcb92c11c3f EBUILD mt-daapd-0.3.0_pre1696.ebuild 4389 RMD160 0aed31bdc07a7b154771fc24b31b810229818d2b SHA1 68920e88538c2416adefb5c860983d2831f042f3 SHA256 d56eb7a548bf097b775d30233b01fad4f8bf17df2167d2b5502fa4e29a9a48e9
MD5 b71f9d9be0f3ada265bdc413d55ae6b5 mt-daapd-0.3.0_pre1696.ebuild 3795
RMD160 558279dcf26ec22cc91e7c6b57b671d1c80b2635 mt-daapd-0.3.0_pre1696.ebuild 3795
SHA256 40e2b4aca4c1dfd3b844cf269242719f9903492c999722592ef79bcb92c11c3f mt-daapd-0.3.0_pre1696.ebuild 3795
MD5 953eb9b58f73dfb95621cc852bfc3434 files/digest-mt-daapd-0.3.0_pre1696 256
RMD160 e82b9e54982385b2e2e6371ed2d79b3039998161 files/digest-mt-daapd-0.3.0_pre1696 256
SHA256 2172759a61ed250b89eb85dbbb9bb70b65ab91e5604f89f4fe472080d583980f files/digest-mt-daapd-0.3.0_pre1696 256

View File

@ -2,13 +2,13 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.3.0_pre1376.ebuild,v 1.3 2007/02/17 01:02:34 flameeyes Exp $ # $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.3.0_pre1376.ebuild,v 1.3 2007/02/17 01:02:34 flameeyes Exp $
inherit eutils flag-o-matic base inherit eutils flag-o-matic multilib
SVN="${PV#*pre}" SVN="${PV#*pre}"
if [[ -n ${SVN} ]] ; then if [[ -n ${SVN} ]] ; then
MY_P="${PN}-svn-${SVN}" MY_P="${PN}-svn-${SVN}"
SRC_URI="http://nightlies.mt-daapd.org/${MY_P}.tar.gz" SRC_URI="http://nightlies.fireflymediaserver.org/nightlies/svn-${SVN}/mt-daapd-svn-${SVN}.tar.gz"
else else
MY_P="${P/_/-}" MY_P="${P/_/-}"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
@ -68,13 +68,27 @@ src_compile() {
myconf="${myconf} --enable-oggvorbis" myconf="${myconf} --enable-oggvorbis"
fi fi
# Should handle either older or latest without intervention;
# this won't work forever, but it should be okay for a while...
if use ffmpeg; then
myconf="${myconf} --with-ffmpeg \
--with-ffmpeg-libs=/usr/$(get_libdir)"
if has_version ">=media-video/ffmpeg-0.4.9_p20080326" ; then
# must pass multiple include dirs now; if you have a better
# way to do this, please speak up and file a bug :)
myconf="${myconf} --with-ffmpeg-includes=/usr/include/libav*"
else
myconf="${myconf} --with-ffmpeg-includes=/usr/include/ffmpeg"
fi
else
myconf="${myconf} --without-ffmpeg"
fi
econf \ econf \
$(use_enable vorbis oggvorbis) \ $(use_enable vorbis oggvorbis) \
$(use_enable flac) \ $(use_enable flac) \
$(use_enable !sqlite3 sqlite) \ $(use_enable !sqlite3 sqlite) \
$(use_enable sqlite3) \ $(use_enable sqlite3) \
$(use_enable ffmpeg) \
--with-ffmpeg-includes=/usr/include/ffmpeg \
${myconf} || die "configure failed" ${myconf} || die "configure failed"
emake || die "make failed" emake || die "make failed"