From: Alexis Ballier Date: Wed, 16 Jun 2010 14:19:32 +0000 (+0000) Subject: do not ignore cxxflags and fix build with ffmpeg-0.6 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=363329019258b63798cf6c6a4397851312197308;p=gentoo.git do not ignore cxxflags and fix build with ffmpeg-0.6 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog index 00d3e00ae95b..80566f534670 100644 --- a/media-video/noad/ChangeLog +++ b/media-video/noad/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/noad # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.43 2010/03/27 20:37:47 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.44 2010/06/16 14:19:32 aballier Exp $ + + 16 Jun 2010; Alexis Ballier + +files/patches-0.7.x/noad-0.7.2-cflags.patch, noad-0.7.2.ebuild: + do not ignore cxxflags and fix build with ffmpeg-0.6 27 Mar 2010; Joerg Bornkessel -noad-0.7.0.20100119.ebuild, -noad-0.7.1-r1.ebuild: diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest index 9d4d85aa0a8a..93bdd640fc2a 100644 --- a/media-video/noad/Manifest +++ b/media-video/noad/Manifest @@ -19,19 +19,19 @@ AUX patches-0.6.0/hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38 AUX patches-0.6.0/lavc.patch 524 RMD160 ba56259bec165aa79bcb5a9b94c8bd5eb5d97d4d SHA1 0583ba0c6dbc7a7fd014af68376ab7eabf49a609 SHA256 bc544218c4894eba6f48b90ea5df12f86fdb38330d93d4d2e0ac305f71a0d5c4 AUX patches-0.6.0/new-ffmpeg-extern-c.diff 316 RMD160 c90e734ef1b105833a13e1dbd6ea85ece333c4b0 SHA1 10854a6893cb3388876a46e9179140790d051c6e SHA256 bc69d37f89aa5415953dca8480d47db4e34ec4996ef279649c0d7e10c6b3f55e AUX patches-0.6.0/series 126 RMD160 8b73b009a02477de8bf24980cab7260036a84c34 SHA1 bf359b445135235a38d5bcd39c7e38a80c542902 SHA256 a74330aed7d138edccfc1477626d830f21844fdd4b7929a5cae6176722f2b60a +AUX patches-0.7.x/noad-0.7.2-cflags.patch 504 RMD160 1687a8e9ea8809f40580b82d26813889d8fe3b12 SHA1 686d438e68753ea45a4d30b8dfe3aea872d2fc26 SHA256 b0ac44bc934c79d8198e16eca784889082818e6470191fad13a137ab9fd138c6 AUX patches-0.7.x/noad-0.7.2-hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 SHA1 1dd89e80e32ef30ee4692eb05c3b63da431be3e7 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46 AUX pre-shutdown-15-noad.sh 771 RMD160 3b68196b18d4820ebc49cbd1dc517de5dd10c741 SHA1 052504eea27ea04d10dff671df3929b62a404e15 SHA256 c5a711256fc48bf8edd7b28f23ae61aa365370cec9b0470ca1c017a5e36e66c2 DIST noad-0.6.0.tar.bz2 151369 RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd SHA1 21ade875f92b5f3a24456fbf6897634966bb0286 SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183 DIST noad-0.7.2.tar.bz2 175293 RMD160 c4ab24407a695d1831fd205be0f36ad23ef711e2 SHA1 cdf3acd0b0a31a56a39edda5025e8c2848370c44 SHA256 5ee00ecaabfe4d9e5c8e6de028a661121f681b59f5cb4387853e5010c194e08f EBUILD noad-0.6.0-r9.ebuild 2646 RMD160 c15910b990adca073f044eb7fafa1781b34aad86 SHA1 c2fffe220aa6fd590ee9b82e334ec6684a6745c2 SHA256 c2ba17500a4959f24147eb90e3d1f4d6c19b675265a87c5fb7607ae090d7fc91 -EBUILD noad-0.7.2.ebuild 1881 RMD160 fc2317af4d6d8d71af4eada4bac75964174d7993 SHA1 9d7011065ac65de16998d4c694091e00f2b2ebe6 SHA256 faad6518dd3e4048e2fb3ef6957fc88a387f531383b5df3ccb7d31a9052dc7cc -MISC ChangeLog 9213 RMD160 7a8c79b2c1ac3a808d0fc59368019b5673710f70 SHA1 faa788d324c584961e0d25feb36b63710d809b79 SHA256 5ded0400fda33137a4463caf74efa6ef1d5051dd521d473c8877ef144f95938f +EBUILD noad-0.7.2.ebuild 2051 RMD160 d943cd8244ef5bad0a2aebf198da7bcf9adef509 SHA1 e49004bfa0fc37231ad1e1cc3bdacc4205150840 SHA256 7c030f71cf398899f25d5a4f89bc4db2cc4bf3b5ca404f877d3f663956981f7b +MISC ChangeLog 9387 RMD160 fa30800cd35676834fce866b7af997127cd3f360 SHA1 02041f587de15e99f956055e4dfe40e583f69042 SHA256 2bea0c68b6181aec6b310cec0c36d23ce629d890eee9b1325370600eb6927605 MISC metadata.xml 345 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 SHA1 01fde850e9581b6a2ccdb95b24d90a1a0511417f SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) -Comment: added by hd_brummy@gentoo.org +Version: GnuPG v2.0.15 (GNU/Linux) -iD8DBQFLrmuCdn07HTTCgIoRArm1AKCmpzFKAHze2bNnaLtD+p0F/eQ6ygCgmfgu -SF/KsvLWZuXDLa1I1TV1W8o= -=eau2 +iEYEARECAAYFAkwY3XgACgkQvFcC4BYPU0rn/wCgili8cmqr/kQEcN5mOtRp0WRk +JXQAn3UoV35J2E7ud3JdEZzrcqodhTJw +=En/Z -----END PGP SIGNATURE----- diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.2-cflags.patch b/media-video/noad/files/patches-0.7.x/noad-0.7.2-cflags.patch new file mode 100644 index 000000000000..5e67e6814542 --- /dev/null +++ b/media-video/noad/files/patches-0.7.x/noad-0.7.2-cflags.patch @@ -0,0 +1,12 @@ +Index: noad-0.7.2/configure.ac +=================================================================== +--- noad-0.7.2.orig/configure.ac ++++ noad-0.7.2/configure.ac +@@ -267,7 +267,6 @@ AC_FUNC_STRFTIME + AC_CHECK_FUNCS([gettimeofday localtime_r memmove memset mkdir select socket strchr strdup strerror strrchr strstr]) + AC_CHECK_FUNCS([strsignal]) + #CXXFLAGS='-g -O3 -pg' +-CXXFLAGS='-g -O3' + + dnl --------------------------------------------------------------------------- + dnl check for a usable avcodec.h diff --git a/media-video/noad/noad-0.7.2.ebuild b/media-video/noad/noad-0.7.2.ebuild index 4fe4bab7701d..36893ae2b920 100644 --- a/media-video/noad/noad-0.7.2.ebuild +++ b/media-video/noad/noad-0.7.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.2.ebuild,v 1.1 2010/03/24 20:20:27 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.2.ebuild,v 1.2 2010/06/16 14:19:32 aballier Exp $ EAPI="2" -inherit eutils +inherit eutils flag-o-matic autotools DESCRIPTION="Mark commercial Breaks in VDR records" HOMEPAGE="http://noad.heliohost.org/" @@ -22,6 +22,10 @@ DEPEND="media-libs/libmpeg2 src_prepare() { epatch "${FILESDIR}"/patches-0.7.x/"${P}"-hangcheck.diff + epatch "${FILESDIR}"/patches-0.7.x/"${P}"-cflags.patch + eautoreconf + # UINT64_C is needed by ffmpeg headers + append-flags -D__STDC_CONSTANT_MACROS } src_configure() {