From 9b2a22eb2762e61a72a46b2524e310e9b6e9333b Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 8 Dec 2006 23:36:42 +0000 Subject: [PATCH] Various fixes from Timothy Redaelli : prestripping, does not use LDFLAGS, does not use CHOST-CXX, bug #157531. Plus another fix to not ignore CXXFLAGS. Package-Manager: portage-2.1.2_rc2-r5 --- media-video/mpgtx/ChangeLog | 11 ++- media-video/mpgtx/Manifest | 43 ++++++++---- media-video/mpgtx/files/digest-mpgtx-1.3.1 | 2 + media-video/mpgtx/files/digest-mpgtx-1.3.1-r1 | 3 + .../mpgtx/files/mpgtx-1.3.1-configure.patch | 69 +++++++++++++++++++ .../mpgtx-1.3.1-dont-ignore-cxx-flags.patch | 11 +++ media-video/mpgtx/mpgtx-1.3.1-r1.ebuild | 53 ++++++++++++++ 7 files changed, 177 insertions(+), 15 deletions(-) create mode 100644 media-video/mpgtx/files/digest-mpgtx-1.3.1-r1 create mode 100644 media-video/mpgtx/files/mpgtx-1.3.1-configure.patch create mode 100644 media-video/mpgtx/files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch create mode 100644 media-video/mpgtx/mpgtx-1.3.1-r1.ebuild diff --git a/media-video/mpgtx/ChangeLog b/media-video/mpgtx/ChangeLog index c01d49127c1d..115b054d6b56 100644 --- a/media-video/mpgtx/ChangeLog +++ b/media-video/mpgtx/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-video/mpgtx # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpgtx/ChangeLog,v 1.13 2006/05/03 20:56:54 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpgtx/ChangeLog,v 1.14 2006/12/08 23:36:42 aballier Exp $ + +*mpgtx-1.3.1-r1 (08 Dec 2006) + + 08 Dec 2006; Alexis Ballier + +files/mpgtx-1.3.1-configure.patch, + +files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch, +mpgtx-1.3.1-r1.ebuild: + Various fixes from Timothy Redaelli : prestripping, does + not use LDFLAGS, does not use CHOST-CXX, bug #157531. Plus another fix to + not ignore CXXFLAGS. 03 May 2006; Diego Pettenò metadata.xml: Update metadata to list media-video@gentoo.org as maintainer. diff --git a/media-video/mpgtx/Manifest b/media-video/mpgtx/Manifest index 5a4d02300ceb..22c19e27c173 100644 --- a/media-video/mpgtx/Manifest +++ b/media-video/mpgtx/Manifest @@ -1,26 +1,41 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -DIST mpgtx-1.3.1.tar.gz 89170 size 89170 -EBUILD mpgtx-1.3.1.ebuild 1445 RMD160 c6d41bd222d19794b88d22e771295ca26d403405 SHA1 ed865ce6b4d5896138fcce958df9973fecbb19ad SHA256 27c664e573ac5786aaad65ddd78d080d27892e23ec3791191628f33ddb9ba6c2 size 1445 +AUX mpgtx-1.3.1-configure.patch 2414 RMD160 888e593fdf6ea71c4386b92b44e18aa34bac9759 SHA1 9a8085828c97ffb963ec74cb927fe7036d8213c5 SHA256 8825f978fdbf67af78722667b6971636da5f6dd1448eadc35b84cdd0c8ee23d3 +MD5 13fe237516cad2285ad8e82684e520d7 files/mpgtx-1.3.1-configure.patch 2414 +RMD160 888e593fdf6ea71c4386b92b44e18aa34bac9759 files/mpgtx-1.3.1-configure.patch 2414 +SHA256 8825f978fdbf67af78722667b6971636da5f6dd1448eadc35b84cdd0c8ee23d3 files/mpgtx-1.3.1-configure.patch 2414 +AUX mpgtx-1.3.1-dont-ignore-cxx-flags.patch 364 RMD160 5209b2f5930ba9e5663acd0092420ebbafcdc6e2 SHA1 1201664d0048ed55fadab03d98ca17a1d5ec6249 SHA256 71352548c6b2e6cddb23811035e8238d4c2dd365b04f7882c2805d69c78bd46a +MD5 cfac2647cbc09e20d1c17e201b3e52bf files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch 364 +RMD160 5209b2f5930ba9e5663acd0092420ebbafcdc6e2 files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch 364 +SHA256 71352548c6b2e6cddb23811035e8238d4c2dd365b04f7882c2805d69c78bd46a files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch 364 +DIST mpgtx-1.3.1.tar.gz 89170 RMD160 f39704aef3e2b325d77f48817ecb883ea6a2a029 SHA1 58b3d18b6dac968e8dd969a7b33c8a8fc31569cd SHA256 8815e73e98b862f12ba1ef5eaaf49407cf211c1f668c5ee325bf04af27f8e377 +EBUILD mpgtx-1.3.1-r1.ebuild 1369 RMD160 f767c219de3bc9e32591a057eb06c3488b534bb8 SHA1 83b0691f6ad29c083bb4d8752ddabc3ffa7415f6 SHA256 0d5cc554744f49f1dc49592b10213703921a11e3af019aef12b11217c5ce4e4a +MD5 0018e1865f1fc6208898113bbb748f41 mpgtx-1.3.1-r1.ebuild 1369 +RMD160 f767c219de3bc9e32591a057eb06c3488b534bb8 mpgtx-1.3.1-r1.ebuild 1369 +SHA256 0d5cc554744f49f1dc49592b10213703921a11e3af019aef12b11217c5ce4e4a mpgtx-1.3.1-r1.ebuild 1369 +EBUILD mpgtx-1.3.1.ebuild 1445 RMD160 c6d41bd222d19794b88d22e771295ca26d403405 SHA1 ed865ce6b4d5896138fcce958df9973fecbb19ad SHA256 27c664e573ac5786aaad65ddd78d080d27892e23ec3791191628f33ddb9ba6c2 MD5 2f3030f4b9b295a7e312393e025a95ed mpgtx-1.3.1.ebuild 1445 RMD160 c6d41bd222d19794b88d22e771295ca26d403405 mpgtx-1.3.1.ebuild 1445 SHA256 27c664e573ac5786aaad65ddd78d080d27892e23ec3791191628f33ddb9ba6c2 mpgtx-1.3.1.ebuild 1445 -MISC ChangeLog 1811 RMD160 d9153c0ce9dc21edbfe8815b67355752c8197a55 SHA1 b00f844f8ef2bfd62378b092a782b3e46cd0b818 SHA256 88b9feebffddde569274bb92d447cdac7fd3472a0d47ea8e1ae133a7c1ff92af size 1811 -MD5 32f6d59714a6697d1d31df98a417c101 ChangeLog 1811 -RMD160 d9153c0ce9dc21edbfe8815b67355752c8197a55 ChangeLog 1811 -SHA256 88b9feebffddde569274bb92d447cdac7fd3472a0d47ea8e1ae133a7c1ff92af ChangeLog 1811 -MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 size 223 +MISC ChangeLog 2184 RMD160 4cae0e8b61248bd63680a95e805ecaa22c27902b SHA1 b841de24d6a703baefd17d25de441178fcc04b78 SHA256 ff489401d9a2504e75c13e9bbf107f430e84074488e86a36c29d26d2665ddc81 +MD5 fb0f9700264bed94da9bb8939290850a ChangeLog 2184 +RMD160 4cae0e8b61248bd63680a95e805ecaa22c27902b ChangeLog 2184 +SHA256 ff489401d9a2504e75c13e9bbf107f430e84074488e86a36c29d26d2665ddc81 ChangeLog 2184 +MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 metadata.xml 223 -MD5 e7a438b14d3a5d4e41f591b09d90b6cf files/digest-mpgtx-1.3.1 62 -RMD160 45b01a49af0504556c5ac7b86de97a6d35bb94e4 files/digest-mpgtx-1.3.1 62 -SHA256 a2e57bf9e27e6591ea7009f7fc316c7eea08ab6fe28aacc7a75c639274199365 files/digest-mpgtx-1.3.1 62 +MD5 b72812781967f9eaf46fb5f4828d834c files/digest-mpgtx-1.3.1 232 +RMD160 50af605515fdc7014c1cbc8ac2c4cd31e6d31a73 files/digest-mpgtx-1.3.1 232 +SHA256 b4a34f7c5cb447906fd8aa8dd6c51d721d89c4633af63e41495985d0008793ad files/digest-mpgtx-1.3.1 232 +MD5 b72812781967f9eaf46fb5f4828d834c files/digest-mpgtx-1.3.1-r1 232 +RMD160 50af605515fdc7014c1cbc8ac2c4cd31e6d31a73 files/digest-mpgtx-1.3.1-r1 232 +SHA256 b4a34f7c5cb447906fd8aa8dd6c51d721d89c4633af63e41495985d0008793ad files/digest-mpgtx-1.3.1-r1 232 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.3 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFEWRkcAiZjviIA2XgRApyMAKD0KC3+f9RQnbgB6J3DQEBdJpgSkwCfauZV -0xPibh4v8FHMX7gLaerJmRY= -=LIKM +iD8DBQFFefcJvFcC4BYPU0oRAp1lAKDIISMpLruGkmJwmKITff8JmUvRwgCfWeze +Kjs/pIkTJbR+fgLJVeu9C/o= +=ML92 -----END PGP SIGNATURE----- diff --git a/media-video/mpgtx/files/digest-mpgtx-1.3.1 b/media-video/mpgtx/files/digest-mpgtx-1.3.1 index c12562455ef1..0619bf61b54e 100644 --- a/media-video/mpgtx/files/digest-mpgtx-1.3.1 +++ b/media-video/mpgtx/files/digest-mpgtx-1.3.1 @@ -1 +1,3 @@ MD5 d628060aa04ad3b40a175bf35f5167cf mpgtx-1.3.1.tar.gz 89170 +RMD160 f39704aef3e2b325d77f48817ecb883ea6a2a029 mpgtx-1.3.1.tar.gz 89170 +SHA256 8815e73e98b862f12ba1ef5eaaf49407cf211c1f668c5ee325bf04af27f8e377 mpgtx-1.3.1.tar.gz 89170 diff --git a/media-video/mpgtx/files/digest-mpgtx-1.3.1-r1 b/media-video/mpgtx/files/digest-mpgtx-1.3.1-r1 new file mode 100644 index 000000000000..0619bf61b54e --- /dev/null +++ b/media-video/mpgtx/files/digest-mpgtx-1.3.1-r1 @@ -0,0 +1,3 @@ +MD5 d628060aa04ad3b40a175bf35f5167cf mpgtx-1.3.1.tar.gz 89170 +RMD160 f39704aef3e2b325d77f48817ecb883ea6a2a029 mpgtx-1.3.1.tar.gz 89170 +SHA256 8815e73e98b862f12ba1ef5eaaf49407cf211c1f668c5ee325bf04af27f8e377 mpgtx-1.3.1.tar.gz 89170 diff --git a/media-video/mpgtx/files/mpgtx-1.3.1-configure.patch b/media-video/mpgtx/files/mpgtx-1.3.1-configure.patch new file mode 100644 index 000000000000..ec36e76ba641 --- /dev/null +++ b/media-video/mpgtx/files/mpgtx-1.3.1-configure.patch @@ -0,0 +1,69 @@ +--- configure.old 2006-12-07 19:51:08.000000000 +0100 ++++ configure 2006-12-07 19:51:02.000000000 +0100 +@@ -9,7 +9,6 @@ + prefix="/usr/local" + manprefix='$(PREFIX)' + #compiler flags +-CC="g++" + common_cflags="-Wall" + devel_cflags="-g -Werror -fno-builtin" + optimization_cflags="-O3" +@@ -36,7 +35,6 @@ + + if [ "${HOSTNAME}" = "powerpc-apple-darwin6.0" ]; then + #compiler flags +-CC="c++" + common_cflags="-pedantic -Wall" + #devel_cflags="-g -Werror -fno-builtin" + devel_cflags="-g -fno-builtin" +@@ -153,8 +151,15 @@ + if test "$gcc_minor" = "0" -o "$gcc_minor" = "1"; then + optimization_cflags="-O2"; + fi ++ if test "$gcc_minor" -ge 4; then ++ optimization_cflags="$optimization_cflags -fno-unit-at-a-time" ++ fi ++elif test "$gcc_major" -ge "4"; then ++ optimization_cflags="$optimization_cflags -fno-unit-at-a-time" + fi + ++ ++ + # Now check if the system handles large file support + # unless user has specified not to do so + if test $LFS = "yes"; then +@@ -165,7 +170,7 @@ + return (int)(fseeko(stdin,0,SEEK_SET)); + } + EOF +- $CC __LFStest.cpp -o __LFStestPASSED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 1>__LFSout 2>__LFSerror ++ ${CXX:-c++} __LFStest.cpp -o __LFStestPASSED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 1>__LFSout 2>__LFSerror + if test -f __LFStestPASSED; then + echo "PASSED"; + cflags="$cflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"; +@@ -211,7 +211,6 @@ + fi + + if test $devel = "no" -a $debug = "no"; then +-lflags="$lflags -s"; + cflags="$cflags $optimization_cflags"; + fi + +@@ -293,15 +298,15 @@ + @echo "" + + mpgtx : commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o common.hh +- $CC \$(CFLAGS) \$(OFLAGS) -o mpgtx commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o \$(LFLAGS) ++ \$(CXX) \$(CFLAGS) \$(OFLAGS) \$(LDFLAGS) -o mpgtx commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o \$(LFLAGS) + mpegOut.o : mpegOut.cxx mpegOut.hh mpeg.hh common.hh +- $CC \$(CFLAGS) \$(OFLAGS) -c mpegOut.cxx ++ \$(CXX) \$(CFLAGS) \$(OFLAGS) -c mpegOut.cxx + mpeg.o : mpeg.cxx mpeg.hh mpegOut.hh common.hh +- $CC \$(CFLAGS) \$(OFLAGS) -c mpeg.cxx ++ \$(CXX) \$(CFLAGS) \$(OFLAGS) -c mpeg.cxx + chunkTab.o : chunkTab.cxx chunkTab.hh common.hh +- $CC \$(CFLAGS) \$(OFLAGS) -c chunkTab.cxx ++ \$(CXX) \$(CFLAGS) \$(OFLAGS) -c chunkTab.cxx + id3command.o : id3command.cxx id3command.hh common.hh +- $CC \$(CFLAGS) \$(OFLAGS) -c id3command.cxx ++ \$(CXX) \$(CFLAGS) \$(OFLAGS) -c id3command.cxx diff --git a/media-video/mpgtx/files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch b/media-video/mpgtx/files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch new file mode 100644 index 000000000000..3a7f5da67458 --- /dev/null +++ b/media-video/mpgtx/files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch @@ -0,0 +1,11 @@ +--- mpgtx-1.3.1/configure.old 2006-12-09 00:26:18.000000000 +0100 ++++ mpgtx-1.3.1/configure 2006-12-09 00:28:52.000000000 +0100 +@@ -11,7 +11,7 @@ + #compiler flags + common_cflags="-Wall" + devel_cflags="-g -Werror -fno-builtin" +-optimization_cflags="-O3" ++optimization_cflags="${CXXFLAGS}" + release_cflags=$optimization_cflags + OFLAGS="-ansi" + cflags=$common_cflags diff --git a/media-video/mpgtx/mpgtx-1.3.1-r1.ebuild b/media-video/mpgtx/mpgtx-1.3.1-r1.ebuild new file mode 100644 index 000000000000..d8c99f32c910 --- /dev/null +++ b/media-video/mpgtx/mpgtx-1.3.1-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/mpgtx/mpgtx-1.3.1-r1.ebuild,v 1.1 2006/12/08 23:36:42 aballier Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="mpgtx a command line MPEG audio/video/system file toolbox" +SRC_URI="mirror://sourceforge/mpgtx/${P}.tar.gz" +HOMEPAGE="http://mpgtx.sourceforge.net/" + +KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86" +IUSE="" +SLOT="0" +LICENSE="GPL-2" + +DEPEND="" +RDEPEND="" + +src_unpack () { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-configure.patch" + epatch "${FILESDIR}/${P}-dont-ignore-cxx-flags.patch" +} + +src_compile() { + tc-export CXX + ./configure --parachute --prefix=/usr + + emake || die "emake failed" +} + +src_install() { + dobin mpgtx + + dosym mpgtx /usr/bin/mpgjoin + dosym mpgtx /usr/bin/mpgsplit + dosym mpgtx /usr/bin/mpgcat + dosym mpgtx /usr/bin/mpginfo + dosym mpgtx /usr/bin/mpgdemux + dosym mpgtx /usr/bin/tagmp3 + + doman man/mpgtx.1 man/tagmp3.1 + + dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpgcat.1 + dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpgjoin.1 + dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpginfo.1 + dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpgsplit.1 + dosym /usr/share/man/man1/mpgtx.1 /usr/share/man/man1/mpgdemux.1 + + dodoc AUTHORS ChangeLog README TODO +} -- 2.26.2