summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-05-06 11:16:06 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-05-06 11:16:06 +0000
commit01f20eb1048c52bcdd261ec7784cbea6f15457e1 (patch)
treefa3b539e4911f91dc17bb98518b625f98d7619f7 /media-video
parentUse gentoo mirrors (diff)
downloadhistorical-01f20eb1048c52bcdd261ec7784cbea6f15457e1.tar.gz
historical-01f20eb1048c52bcdd261ec7784cbea6f15457e1.tar.bz2
historical-01f20eb1048c52bcdd261ec7784cbea6f15457e1.zip
More Makefile fixes wrt bug #318353
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-video')
-rw-r--r--media-video/flvstreamer/ChangeLog7
-rw-r--r--media-video/flvstreamer/Manifest14
-rw-r--r--media-video/flvstreamer/flvstreamer-2.1a.ebuild8
3 files changed, 12 insertions, 17 deletions
diff --git a/media-video/flvstreamer/ChangeLog b/media-video/flvstreamer/ChangeLog
index 4aeb306e0ade..3e2c6bda6a25 100644
--- a/media-video/flvstreamer/ChangeLog
+++ b/media-video/flvstreamer/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/flvstreamer
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flvstreamer/ChangeLog,v 1.7 2010/01/10 18:37:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/flvstreamer/ChangeLog,v 1.8 2010/05/06 11:16:06 hwoarang Exp $
+
+ 06 May 2010; Markos Chandras <hwoarang@gentoo.org>
+ flvstreamer-2.1a.ebuild:
+ More Makefile fixes wrt bug #318353. Thanks to Nathan Phillip Brink
+ (ohnobinki) <ohnobinki@ohnopublishing.net>
*flvstreamer-2.1a (10 Jan 2010)
diff --git a/media-video/flvstreamer/Manifest b/media-video/flvstreamer/Manifest
index 676b804e67fc..610637c101de 100644
--- a/media-video/flvstreamer/Manifest
+++ b/media-video/flvstreamer/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
DIST flvstreamer-1.8i.tar.gz 53059 RMD160 1519d63eff4094d6b13b066e0e8e21e84edc236c SHA1 c3281a95886fedf5da803d0a40ff910b259b063b SHA256 6ad47dd48966c71ad72eaf02fcd7e7575db6f4bc33eb247e3c3d4e7cd1942f59
DIST flvstreamer-1.9.tar.gz 59988 RMD160 4e6aa1eac32a644a64f3bd1acd7c6fa6f8ab0c2b SHA1 85c9ba1492175f34ce5b05236d7d931718532d10 SHA256 ae41fc20dd83647410a4710309238d2f62f96836155c77bdc63c95f1dc903a46
DIST flvstreamer-2.1a.tar.gz 70731 RMD160 52757709575905bdee4563dd30050085dc11a18a SHA1 971faf1dbe6c99bd93dd45df90266563a24fedc4 SHA256 5df6649dfcfd6c4d7259a99b6cb2f031491fc88ca9b2751632e4e78105f58df5
EBUILD flvstreamer-1.8i.ebuild 994 RMD160 40d089bb05a7a08757bbacb6b21663cc7df52acb SHA1 5bbd067383e7fd96a333fbd0736033efb0a40e07 SHA256 8ff656df44f4cf607478f58f6a4df04d533b112172ed08a64b9daf5f30c1b795
EBUILD flvstreamer-1.9.ebuild 937 RMD160 ad8a92879958f7da34cdf7a1cb3d57fbd02e0587 SHA1 d9541bec1c9bf7f6ba99e3354966cf4e3ef2765f SHA256 346daa55749c3bdac7fae6ea89851794e9509b12ea2c98f1aa688d153e069b49
-EBUILD flvstreamer-2.1a.ebuild 932 RMD160 96dd5971c751de857bc08d18bc12f184199789a5 SHA1 0f2ed65c7fecc24579168fc2432bf4ffe80f5b45 SHA256 c3aed6e46772ea66dad66866ebb6d7f8f3a73af0e6184f49d10dbbdd2327f940
-MISC ChangeLog 1076 RMD160 afca36709d1bdfd1b1e7dea8b861bd79ff88bc09 SHA1 95b243f56a119fc7c7ff4b52edc9499926318b7a SHA256 cd25d756d13ec6ecad7f3f275d51ecb9497331885690f46e73e5a8b774933a5f
+EBUILD flvstreamer-2.1a.ebuild 941 RMD160 754c9d15e3f49027b306e5239ff7d3ab0d02ade1 SHA1 96172aa68fc2a2d3511881dff4640cb705ed2e5a SHA256 182ef5e8a75987470e020499d152decd9705d804902e7bc5649ac56fb791534b
+MISC ChangeLog 1275 RMD160 597f9f96530e257ae288e9991cd36f959c275de6 SHA1 a6c1859b4e52c9e27d54c45e9444056d663f82d9 SHA256 4646f65f8f2475b8cc3037a9c201f1d33654caafd053ee6d80c961798d1a6860
MISC metadata.xml 322 RMD160 5767330dc0a31aad9eb12bc2285b53b19f21ce8f SHA1 0d25b9db188cf0613d9e606eb7a312d9f51f8b25 SHA256 f209fd21093cba883428650fff0174fd9471beba34e35d5edfcb925aeb374a4e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktKHmsACgkQr2QksT29OyBf+ACfVxoX//hrw08hnswHKF0z3Joa
-zPwAnRgzhmiZp0LRqwAH31Ps+MlWLMCS
-=Wqgl
------END PGP SIGNATURE-----
diff --git a/media-video/flvstreamer/flvstreamer-2.1a.ebuild b/media-video/flvstreamer/flvstreamer-2.1a.ebuild
index 0e27e3231c91..3e2ed7d6b188 100644
--- a/media-video/flvstreamer/flvstreamer-2.1a.ebuild
+++ b/media-video/flvstreamer/flvstreamer-2.1a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flvstreamer/flvstreamer-2.1a.ebuild,v 1.1 2010/01/10 18:37:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/flvstreamer/flvstreamer-2.1a.ebuild,v 1.2 2010/05/06 11:16:06 hwoarang Exp $
EAPI="2"
@@ -17,13 +17,13 @@ IUSE=""
S="${WORKDIR}/${PN}"
src_prepare() {
- #fix Makefile ( bug #298535 )
- sed -i "s/\$(MAKEFLAGS)/-\$(MAKEFLAGS)/" Makefile \
+ #fix Makefile ( bug #298535 and bug #318353)
+ sed -i 's/\$(MAKEFLAGS)//g' Makefile \
|| die "failed to fixe Makefile"
}
src_compile() {
- emake CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}" linux
}