diff options
| author | ponce <matteo.bernardini@gmail.com> | 2012-08-21 17:27:23 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2012-08-21 15:36:50 -0500 |
| commit | 48264f82812465dd9ee149eb6d9bf6145864c323 (patch) | |
| tree | a80a1f9d7806bfdfc8b9752b8f3186d1cfd77648 /multimedia/mpgtx/patches | |
| parent | 2a67646695cf8d3f81087ca426836cd035f23244 (diff) | |
| download | slackbuilds-48264f82812465dd9ee149eb6d9bf6145864c323.tar.gz | |
multimedia/mpgtx: Included some patches from gentoo + small cleanups
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'multimedia/mpgtx/patches')
| -rw-r--r-- | multimedia/mpgtx/patches/mpgtx-1.3.1-configure.patch | 69 | ||||
| -rw-r--r-- | multimedia/mpgtx/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch | 12 |
2 files changed, 81 insertions, 0 deletions
diff --git a/multimedia/mpgtx/patches/mpgtx-1.3.1-configure.patch b/multimedia/mpgtx/patches/mpgtx-1.3.1-configure.patch new file mode 100644 index 0000000000..ec36e76ba6 --- /dev/null +++ b/multimedia/mpgtx/patches/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/multimedia/mpgtx/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch b/multimedia/mpgtx/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch new file mode 100644 index 0000000000..dc53dfd7e6 --- /dev/null +++ b/multimedia/mpgtx/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch @@ -0,0 +1,12 @@ +diff -Naur mpgtx-1.3.1.orig/configure mpgtx-1.3.1/configure +--- mpgtx-1.3.1.orig/configure 2010-11-28 11:58:58.000000000 +0100 ++++ mpgtx-1.3.1/configure 2010-11-28 12:00:00.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 |