From d9fdc9c45dcc15d7da86343a1f759e7a0e4f1431 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 8 Dec 2006 23:36:42 +0000 Subject: Various fixes from Timothy Redaelli : prestripping, does not use LDFLAGS, does not use CHOST-CXX, bug #157531. Plus another fix to not ignore CXXFLAGS. (Portage version: 2.1.2_rc2-r5) --- 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 ++++++++++++++++++++++ .../files/mpgtx-1.3.1-dont-ignore-cxx-flags.patch | 11 ++++ 4 files changed, 85 insertions(+) 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 (limited to 'media-video/mpgtx/files') 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 -- cgit v1.2.3-65-gdbad