diff options
author | 2007-02-16 16:02:34 +0000 | |
---|---|---|
committer | 2007-02-16 16:02:34 +0000 | |
commit | 9a29da12827fe37d4f9d088c857a950b8a5392d5 (patch) | |
tree | 8e4e57e456706c4f82b88a19bd99e98c926a81db | |
parent | dropping multilib useflag here, too. and adding missing depend, wtf (diff) | |
download | overlay-9a29da12827fe37d4f9d088c857a950b8a5392d5.tar.gz overlay-9a29da12827fe37d4f9d088c857a950b8a5392d5.tar.bz2 overlay-9a29da12827fe37d4f9d088c857a950b8a5392d5.zip |
added/restricted some deps and rearranged some env-vars
svn path=/overlay/; revision=26
-rw-r--r-- | media-libs/libcaptury/Manifest | 8 | ||||
-rw-r--r-- | media-libs/libcaptury/libcaptury-0.1.0.ebuild | 20 |
2 files changed, 19 insertions, 9 deletions
diff --git a/media-libs/libcaptury/Manifest b/media-libs/libcaptury/Manifest index b8673f0..306190c 100644 --- a/media-libs/libcaptury/Manifest +++ b/media-libs/libcaptury/Manifest @@ -1,8 +1,8 @@ DIST captury-0.1.0.tar.bz2 34881 RMD160 ee105288e16cd2dc120adfc533f21d01f9e68528 SHA1 1a0ecc20ee557f25584c0f8799581aa7263ed466 SHA256 74dfb36d8275e1c5e1a893b33a2bdd24080887d8441fd80aa1d450342ff1d9a9 -EBUILD libcaptury-0.1.0.ebuild 1478 RMD160 43e01b78404395cc5e928b634995123a540a4513 SHA1 c5657281cabb5c5f2d946c951395dce622a615cb SHA256 f1c37535b1e75c634305fd925d8dd9bea959957fc75f3c67ffbfbd5b811ae7a5 -MD5 26f7fdd8b6cabaf419e4cc854ba22cde libcaptury-0.1.0.ebuild 1478 -RMD160 43e01b78404395cc5e928b634995123a540a4513 libcaptury-0.1.0.ebuild 1478 -SHA256 f1c37535b1e75c634305fd925d8dd9bea959957fc75f3c67ffbfbd5b811ae7a5 libcaptury-0.1.0.ebuild 1478 +EBUILD libcaptury-0.1.0.ebuild 1646 RMD160 a14cb0235dc60f9a9e71be8598a7d756cdd9688a SHA1 17f002c2ed1876bf53a65d26fefa15a1f909f776 SHA256 ca153a5c286586c2e8cbefe537c3f9d159c59af32433d14d8b951a1f0b8ff94a +MD5 7da2c5ae926644bce4d506db2e32cb19 libcaptury-0.1.0.ebuild 1646 +RMD160 a14cb0235dc60f9a9e71be8598a7d756cdd9688a libcaptury-0.1.0.ebuild 1646 +SHA256 ca153a5c286586c2e8cbefe537c3f9d159c59af32433d14d8b951a1f0b8ff94a libcaptury-0.1.0.ebuild 1646 MISC ChangeLog 186 RMD160 5872ae9a465d4945dc091199477c214f846116d9 SHA1 0ecc2f1b60f1efe824d759767f97403703340417 SHA256 cb1f8827777dff98664829d67a8ca59074a6e4342c751397f2edca2fb758eee1 MD5 6304595e350b0b4ba1b3c2ee4001b09c ChangeLog 186 RMD160 5872ae9a465d4945dc091199477c214f846116d9 ChangeLog 186 diff --git a/media-libs/libcaptury/libcaptury-0.1.0.ebuild b/media-libs/libcaptury/libcaptury-0.1.0.ebuild index 30979ab..43c3946 100644 --- a/media-libs/libcaptury/libcaptury-0.1.0.ebuild +++ b/media-libs/libcaptury/libcaptury-0.1.0.ebuild @@ -15,7 +15,10 @@ IUSE="debug" RDEPEND="media-libs/xvid x11-libs/libX11 virtual/opengl - amd64? ( app-emulation/emul-linux-x86-xlibs )" + amd64? ( + >=app-emulation/emul-linux-x86-xlibs-7.0-r8 + >=app-emulation/emul-linux-x86-medialibs-1.2-r1 + )" DEPEND="${RDEPEND} dev-util/pkgconfig" @@ -24,6 +27,14 @@ RESTRICT="multilib-pkg-force" S="${WORKDIR}/captury-${PV}/${PN}" +setup_env() { + use debug && append-flags -O0 -g3 + use debug || append-flags -DNDEBUG=1 + +# export LD_LIBRARY_PATH=/usr/$(get_libdir) +# append-ldflags -L/usr/$(get_libdir) +} + src_compile() { if [[ -z ${OABI} ]] && has_multilib_profile; then einfo "Building multilib ${PN} for ABIs: $(get_install_abis)" @@ -35,9 +46,6 @@ src_compile() { ABI=${OABI} fi - use debug && append-flags -O0 -g3 - use debug || append-flags -DNDEBUG=1 - if [[ ! -f configure ]]; then ./autogen.sh || die "autogen.sh failed" fi @@ -45,10 +53,12 @@ src_compile() { mkdir abi-${ABI} pushd abi-${ABI} + setup_env + ../configure \ --prefix="/usr" \ --host="$(get_abi_CHOST ${ABI})" \ - --libdir="/usr/$(get_abi_LIBDIR ${ABI})" \ + --libdir="/usr/$(get_libdir)" \ || die "./configure for ABI ${ABI} failed" emake || die "make for ABI ${ABI} failed" |