[csw-devel] SF.net SVN: gar:[15096] csw/mgar/pkg/ffmpeg/trunk
janholzh at users.sourceforge.net
janholzh at users.sourceforge.net
Mon Jul 18 13:49:36 CEST 2011
Revision: 15096
http://gar.svn.sourceforge.net/gar/?rev=15096&view=rev
Author: janholzh
Date: 2011-07-18 11:49:36 +0000 (Mon, 18 Jul 2011)
Log Message:
-----------
ffmpeg: get that sucker build, test is failing though
Modified Paths:
--------------
csw/mgar/pkg/ffmpeg/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/ffmpeg/trunk/files/0002-change-linker-flags.patch
csw/mgar/pkg/ffmpeg/trunk/files/0003-fix-testsuite-shells.patch
Removed Paths:
-------------
csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch
csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-inttypes-instead-of-stdint.patch
csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch
Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-07-18 07:54:40 UTC (rev 15095)
+++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-07-18 11:49:36 UTC (rev 15096)
@@ -17,6 +17,8 @@
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
PATCHFILES = 0001-fix-version.sh.patch
+PATCHFILES += 0002-change-linker-flags.patch
+PATCHFILES += 0003-fix-testsuite-shells.patch
BUILD64 = 1
@@ -33,8 +35,10 @@
CONFIGURE_ARGS += --shlibdir=$(libdir)
CONFIGURE_ARGS += --incdir=$(includedir)
CONFIGURE_ARGS += --mandir=$(mandir)
+CONFIGURE_ARGS += --disable-debug
+CONFIGURE_ARGS += --enable-gpl
CONFIGURE_ARGS += --enable-shared
-CONFIGURE_ARGS += --disable-static
+#CONFIGURE_ARGS += --disable-static
GARCOMPILER = GNU
Deleted: csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch 2011-07-18 07:54:40 UTC (rev 15095)
+++ csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch 2011-07-18 11:49:36 UTC (rev 15096)
@@ -1,131 +0,0 @@
-From a0c9edcc57bf41962cd3385baa61d418487e36f7 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 2 Aug 2010 16:30:29 +0200
-Subject: [PATCH] Use ggrep in configure
-
----
- configure | 28 ++++++++++++++--------------
- 1 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/configure b/configure
-index 0166829..f5c9ea7 100755
---- a/configure
-+++ b/configure
-@@ -1532,7 +1532,7 @@ if test -f configure; then
- disable source_path_used
- else
- source_path="$(cd "$source_path"; pwd)"
-- echo "$source_path" | grep -q '[[:blank:]]' &&
-+ echo "$source_path" | ggrep -q '[[:blank:]]' &&
- die "Out of tree builds are impossible with whitespace in source path."
- test -e "$source_path/config.h" &&
- die "Out of tree builds are impossible with config.h in source dir."
-@@ -1726,16 +1726,16 @@ filter_cflags=echo
- filter_cppflags=echo
- filter_asflags=echo
-
--if $cc -v 2>&1 | grep -qi ^gcc; then
-+if $cc -v 2>&1 | ggrep -qi ^gcc; then
- cc_type=gcc
- cc_version=__VERSION__
-- if ! $cc -dumpversion | grep -q '^2\.'; then
-+ if ! $cc -dumpversion | ggrep -q '^2\.'; then
- CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
- AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
- fi
- speed_cflags='-O3'
- size_cflags='-Os'
--elif $cc --version 2>/dev/null | grep -q Intel; then
-+elif $cc --version 2>/dev/null | ggrep -q Intel; then
- cc_type=icc
- cc_version="AV_STRINGIFY(__INTEL_COMPILER)"
- CC_DEPFLAGS='-MMD'
-@@ -1743,12 +1743,12 @@ elif $cc --version 2>/dev/null | grep -q Intel; then
- speed_cflags='-O3'
- size_cflags='-Os'
- noopt_cflags='-O1'
--elif $cc -v 2>&1 | grep -q xlc; then
-+elif $cc -v 2>&1 | ggrep -q xlc; then
- cc_type=xlc
- cc_version="AV_STRINGIFY(__IBMC__)"
- speed_cflags='-O5'
- size_cflags='-O5 -qcompact'
--elif $cc -V 2>/dev/null | grep -q Compaq; then
-+elif $cc -V 2>/dev/null | ggrep -q Compaq; then
- cc_type=ccc
- cc_version="AV_STRINGIFY(__DECC_VER)"
- DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -M'
-@@ -1756,7 +1756,7 @@ elif $cc -V 2>/dev/null | grep -q Compaq; then
- add_ldflags -Wl,-z,now # calls to libots crash without this
- speed_cflags='-fast'
- size_cflags='-O1'
--elif $cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then
-+elif $cc --vsn 2>/dev/null | ggrep -q "ARM C/C++ Compiler"; then
- test -d "$sysroot" || die "No valid sysroot specified."
- cc_type=armcc
- cc_version="AV_STRINGIFY(__ARMCC_VERSION)"
-@@ -1772,7 +1772,7 @@ elif $cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then
- AS_DEPFLAGS='-MMD'
- speed_cflags='-O3'
- size_cflags='-Os'
--elif $cc -version 2>/dev/null | grep -q TMS470; then
-+elif $cc -version 2>/dev/null | ggrep -q TMS470; then
- cc_type=tms470
- cc_version="AV_STRINGIFY(__TI_COMPILER_VERSION__)"
- cc="$cc --gcc --abi=eabi -eo=.o -mc -me"
-@@ -1811,14 +1811,14 @@ elif $cc -version 2>/dev/null | grep -q TMS470; then
- esac
- done
- }
--elif $cc -v 2>&1 | grep -q clang; then
-+elif $cc -v 2>&1 | ggrep -q clang; then
- cc_type=clang
- cc_version=__VERSION__
- CC_DEPFLAGS='-MMD'
- AS_DEPFLAGS='-MMD'
- speed_cflags='-O3'
- size_cflags='-Os'
--elif $cc -V 2>&1 | grep -q Sun; then
-+elif $cc -V 2>&1 | ggrep -q Sun; then
- cc_type=suncc
- cc_version="AV_STRINGIFY(__SUNPRO_C)"
- DEPEND_CMD='$(DEPCC) $(DEPFLAGS) $< | sed -e "1s,^.*: ,$@: ," -e "\$$!s,\$$, \\\," -e "1!s,^.*: , ," > $(@:.o=.d)'
-@@ -2130,7 +2130,7 @@ case $target_os in
- beos|haiku|zeta)
- prefix_default="$HOME/config"
- # 3 gcc releases known for BeOS, each with ugly bugs
-- gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)"
-+ gcc_version="$($cc -v 2>&1 | ggrep version | cut -d ' ' -f3-)"
- case "$gcc_version" in
- 2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc"
- disable mmx
-@@ -2145,7 +2145,7 @@ case $target_os in
- # no need for libm, but the inet stuff
- # Check for BONE
- # XXX: actually should check for NOT net_server
-- if echo $BEINCLUDES | grep -q 'headers/be/bone'; then
-+ if echo $BEINCLUDES | ggrep -q 'headers/be/bone'; then
- network_extralibs="-lbind -lsocket"
- else
- enable beos_netserver
-@@ -2390,7 +2390,7 @@ EOF
- check_cc <<EOF || die "endian test failed"
- unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
- EOF
--od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
-+od -t x1 $TMPO | ggrep -q '42 *49 *47 *45' && enable bigendian
-
- if enabled alpha; then
-
-@@ -3046,7 +3046,7 @@ EOF
- get_version(){
- name=$1
- file=$source_path/$2
-- eval $(grep "#define ${name}_VERSION_M" "$file" | awk '{ print $2"="$3 }')
-+ eval $(ggrep "#define ${name}_VERSION_M" "$file" | awk '{ print $2"="$3 }')
- eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
- lcname=$(tolower $name)
- eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
---
-1.7.1
-
Deleted: csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-inttypes-instead-of-stdint.patch
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-inttypes-instead-of-stdint.patch 2011-07-18 07:54:40 UTC (rev 15095)
+++ csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-inttypes-instead-of-stdint.patch 2011-07-18 11:49:36 UTC (rev 15096)
@@ -1,292 +0,0 @@
-From 75ce36962bc346787026dcfa754f704240abddec Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 23 Feb 2010 15:25:05 +0100
-Subject: [PATCH] Use inttypes instead of stdint
-
----
- libavutil/adler32.h | 2 +-
- libavutil/aes.h | 2 +-
- libavutil/base64.h | 2 +-
- libavutil/bswap.h | 2 +-
- libavutil/crc.h | 2 +-
- libavutil/des.h | 2 +-
- libavutil/fifo.h | 2 +-
- libavutil/integer.h | 2 +-
- libavutil/internal.h | 2 +-
- libavutil/intfloat_readwrite.h | 2 +-
- libavutil/intreadwrite.h | 2 +-
- libavutil/lzo.h | 2 +-
- libavutil/mathematics.h | 2 +-
- libavutil/md5.h | 2 +-
- libavutil/rational.h | 3 ++-
- libavutil/rc4.h | 2 +-
- libavutil/sha1.h | 2 +-
- libavutil/softfloat.h | 2 +-
- libavutil/timer.h | 2 +-
- libavutil/x86_cpu.h | 2 +-
- 20 files changed, 21 insertions(+), 20 deletions(-)
-
-diff --git a/libavutil/adler32.h b/libavutil/adler32.h
-index 34f2b53..76e50ad 100644
---- a/libavutil/adler32.h
-+++ b/libavutil/adler32.h
-@@ -21,7 +21,7 @@
- #ifndef AVUTIL_ADLER32_H
- #define AVUTIL_ADLER32_H
-
--#include <stdint.h>
-+#include <inttypes.h>
- #include "common.h"
-
- unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
-diff --git a/libavutil/aes.h b/libavutil/aes.h
-index 1ca853d..cd7a523 100644
---- a/libavutil/aes.h
-+++ b/libavutil/aes.h
-@@ -21,7 +21,7 @@
- #ifndef AVUTIL_AES_H
- #define AVUTIL_AES_H
-
--#include <stdint.h>
-+#include <inttypes.h>
-
- extern const int av_aes_size;
-
-diff --git a/libavutil/base64.h b/libavutil/base64.h
-index e3152eb..5f3b261 100644
---- a/libavutil/base64.h
-+++ b/libavutil/base64.h
-@@ -21,7 +21,7 @@
- #ifndef AVUTIL_BASE64_H
- #define AVUTIL_BASE64_H
-
--#include <stdint.h>
-+#include <inttypes.h>
-
- /**
- * Decodes the base64-encoded string in \p in and puts the decoded
-diff --git a/libavutil/bswap.h b/libavutil/bswap.h
-index cf68c43..881fdc2 100644
---- a/libavutil/bswap.h
-+++ b/libavutil/bswap.h
-@@ -26,7 +26,7 @@
- #ifndef AVUTIL_BSWAP_H
- #define AVUTIL_BSWAP_H
-
--#include <stdint.h>
-+#include <inttypes.h>
- #include "config.h"
- #include "common.h"
-
-diff --git a/libavutil/crc.h b/libavutil/crc.h
-index fa34059..7d587ca 100644
---- a/libavutil/crc.h
-+++ b/libavutil/crc.h
-@@ -21,7 +21,7 @@
- #ifndef AVUTIL_CRC_H
- #define AVUTIL_CRC_H
-
--#include <stdint.h>
-+#include <inttypes.h>
- #include <stddef.h>
- #include "common.h"
-
-diff --git a/libavutil/des.h b/libavutil/des.h
-index e80bdd3..874ccf1 100644
---- a/libavutil/des.h
-+++ b/libavutil/des.h
-@@ -22,7 +22,7 @@
- #ifndef AVUTIL_DES_H
- #define AVUTIL_DES_H
-
--#include <stdint.h>
-+#include <inttypes.h>
-
- struct AVDES {
- uint64_t round_keys[3][16];
-diff --git a/libavutil/fifo.h b/libavutil/fifo.h
-index 1a549f2..c3471ba 100644
---- a/libavutil/fifo.h
-+++ b/libavutil/fifo.h
-@@ -24,7 +24,7 @@
- #ifndef AVUTIL_FIFO_H
- #define AVUTIL_FIFO_H
-
--#include <stdint.h>
-+#include <inttypes.h>
- #include "avutil.h"
- #include "common.h"
-
-diff --git a/libavutil/integer.h b/libavutil/integer.h
-index d4d0201..28fc91d 100644
---- a/libavutil/integer.h
-+++ b/libavutil/integer.h
-@@ -28,7 +28,7 @@
- #ifndef AVUTIL_INTEGER_H
- #define AVUTIL_INTEGER_H
-
--#include <stdint.h>
-+#include <inttypes.h>
- #include "common.h"
-
- #define AV_INTEGER_SIZE 8
-diff --git a/libavutil/internal.h b/libavutil/internal.h
-index f5f769e..370d7f0 100644
---- a/libavutil/internal.h
-+++ b/libavutil/internal.h
-@@ -31,7 +31,7 @@
- #endif
-
- #include <limits.h>
--#include <stdint.h>
-+#include <inttypes.h>
- #include <stddef.h>
- #include <assert.h>
- #include "config.h"
-diff --git a/libavutil/intfloat_readwrite.h b/libavutil/intfloat_readwrite.h
-index e2d5d5b..2abbafd 100644
---- a/libavutil/intfloat_readwrite.h
-+++ b/libavutil/intfloat_readwrite.h
-@@ -21,7 +21,7 @@
- #ifndef AVUTIL_INTFLOAT_READWRITE_H
- #define AVUTIL_INTFLOAT_READWRITE_H
-
--#include <stdint.h>
-+#include <inttypes.h>
- #include "common.h"
-
- /* IEEE 80 bits extended float */
-diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h
-index 7c5909e..d7c0c6f 100644
---- a/libavutil/intreadwrite.h
-+++ b/libavutil/intreadwrite.h
-@@ -19,7 +19,7 @@
- #ifndef AVUTIL_INTREADWRITE_H
- #define AVUTIL_INTREADWRITE_H
-
--#include <stdint.h>
-+#include <inttypes.h>
- #include "config.h"
- #include "bswap.h"
-
-diff --git a/libavutil/lzo.h b/libavutil/lzo.h
-index 6788054..736d01a 100644
---- a/libavutil/lzo.h
-+++ b/libavutil/lzo.h
-@@ -22,7 +22,7 @@
- #ifndef AVUTIL_LZO_H
- #define AVUTIL_LZO_H
-
--#include <stdint.h>
-+#include <inttypes.h>
-
- /** \defgroup errflags Error flags returned by av_lzo1x_decode
- * \{ */
-diff --git a/libavutil/mathematics.h b/libavutil/mathematics.h
-index 782efcc..b138421 100644
---- a/libavutil/mathematics.h
-+++ b/libavutil/mathematics.h
-@@ -21,7 +21,7 @@
- #ifndef AVUTIL_MATHEMATICS_H
- #define AVUTIL_MATHEMATICS_H
-
--#include <stdint.h>
-+#include <inttypes.h>
- #include <math.h>
- #include "common.h"
- #include "rational.h"
-diff --git a/libavutil/md5.h b/libavutil/md5.h
-index 969202a..8baaee6 100644
---- a/libavutil/md5.h
-+++ b/libavutil/md5.h
-@@ -21,7 +21,7 @@
- #ifndef AVUTIL_MD5_H
- #define AVUTIL_MD5_H
-
--#include <stdint.h>
-+#include <inttypes.h>
-
- extern const int av_md5_size;
-
-diff --git a/libavutil/rational.h b/libavutil/rational.h
-index 5ee70c9..b022e17 100644
---- a/libavutil/rational.h
-+++ b/libavutil/rational.h
-@@ -28,7 +28,8 @@
- #ifndef AVUTIL_RATIONAL_H
- #define AVUTIL_RATIONAL_H
-
--#include <stdint.h>
-+#include <inttypes.h>
-+#include <sys/int_types.h>
- #include "common.h"
-
- /**
-diff --git a/libavutil/rc4.h b/libavutil/rc4.h
-index 07223a5..2568a8c 100644
---- a/libavutil/rc4.h
-+++ b/libavutil/rc4.h
-@@ -21,7 +21,7 @@
- #ifndef AVUTIL_RC4_H
- #define AVUTIL_RC4_H
-
--#include <stdint.h>
-+#include <inttypes.h>
-
- struct AVRC4 {
- uint8_t state[256];
-diff --git a/libavutil/sha1.h b/libavutil/sha1.h
-index 0f14ca8..2cfeb4c 100644
---- a/libavutil/sha1.h
-+++ b/libavutil/sha1.h
-@@ -21,7 +21,7 @@
- #ifndef AVUTIL_SHA1_H
- #define AVUTIL_SHA1_H
-
--#include <stdint.h>
-+#include <inttypes.h>
-
- extern const int av_sha1_size;
-
-diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h
-index 97e09ea..7a2e82c 100644
---- a/libavutil/softfloat.h
-+++ b/libavutil/softfloat.h
-@@ -21,7 +21,7 @@
- #ifndef AVUTIL_SOFTFLOAT_H
- #define AVUTIL_SOFTFLOAT_H
-
--#include <stdint.h>
-+#include <inttypes.h>
- #include "common.h"
-
- #define MIN_EXP -126
-diff --git a/libavutil/timer.h b/libavutil/timer.h
-index 709e12f..9c5b468 100644
---- a/libavutil/timer.h
-+++ b/libavutil/timer.h
-@@ -25,7 +25,7 @@
- #define AVUTIL_TIMER_H
-
- #include <stdlib.h>
--#include <stdint.h>
-+#include <inttypes.h>
- #include "config.h"
-
- #if ARCH_X86 || ARCH_PPC || ARCH_BFIN
-diff --git a/libavutil/x86_cpu.h b/libavutil/x86_cpu.h
-index d29b7d8..2ff3cb8 100644
---- a/libavutil/x86_cpu.h
-+++ b/libavutil/x86_cpu.h
-@@ -21,7 +21,7 @@
- #ifndef AVUTIL_X86_CPU_H
- #define AVUTIL_X86_CPU_H
-
--#include <stdint.h>
-+#include <inttypes.h>
- #include "config.h"
-
- #if ARCH_X86_64
---
-1.6.6
-
Added: csw/mgar/pkg/ffmpeg/trunk/files/0002-change-linker-flags.patch
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/files/0002-change-linker-flags.patch (rev 0)
+++ csw/mgar/pkg/ffmpeg/trunk/files/0002-change-linker-flags.patch 2011-07-18 11:49:36 UTC (rev 15096)
@@ -0,0 +1,34 @@
+From 8a8a681ff57e4ca7d545c2350a70461e24e96355 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Mon, 18 Jul 2011 12:03:36 +0200
+Subject: [PATCH] change-linker-flags
+
+---
+ configure | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index c9eedaf..68793ac 100755
+--- a/configure
++++ b/configure
+@@ -1688,7 +1688,7 @@ enable swscale
+ enable swscale_alpha
+
+ # build settings
+-SHFLAGS='-shared -Wl,-soname,$$(@F)'
++SHFLAGS='-G -Wl,-h,$$(@F)'
+ FFSERVERLDFLAGS=-Wl,-E
+ LIBPREF="lib"
+ LIBSUF=".a"
+@@ -2396,7 +2396,7 @@ case $target_os in
+ ;;
+ sunos)
+ FFSERVERLDFLAGS=""
+- SHFLAGS='-shared -Wl,-h,$$(@F)'
++ SHFLAGS='-G -Wl,-h,$$(@F)'
+ enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS"
+ network_extralibs="-lsocket -lnsl"
+ add_cppflags -D__EXTENSIONS__
+--
+1.7.6
+
Added: csw/mgar/pkg/ffmpeg/trunk/files/0003-fix-testsuite-shells.patch
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/files/0003-fix-testsuite-shells.patch (rev 0)
+++ csw/mgar/pkg/ffmpeg/trunk/files/0003-fix-testsuite-shells.patch 2011-07-18 11:49:36 UTC (rev 15096)
@@ -0,0 +1,110 @@
+From 2b29e3734ad0db1d9cde466f7d424bd886ce5084 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Mon, 18 Jul 2011 13:02:57 +0200
+Subject: [PATCH] fix-testsuite-shells
+
+---
+ tests/codec-regression.sh | 2 +-
+ tests/copycooker.sh | 2 +-
+ tests/fate-run.sh | 2 +-
+ tests/fate-update.sh | 2 +-
+ tests/fate.sh | 2 +-
+ tests/ffserver-regression.sh | 2 +-
+ tests/lavf-regression.sh | 2 +-
+ tests/lavfi-regression.sh | 2 +-
+ tests/regression-funcs.sh | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
+index b210231..3453d96 100755
+--- a/tests/codec-regression.sh
++++ b/tests/codec-regression.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ #
+ # automatic regression test for ffmpeg
+ #
+diff --git a/tests/copycooker.sh b/tests/copycooker.sh
+index 4b5811d..f1e1fcc 100755
+--- a/tests/copycooker.sh
++++ b/tests/copycooker.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+
+ LC_ALL=C
+ export LC_ALL
+diff --git a/tests/fate-run.sh b/tests/fate-run.sh
+index 366145d..a6beab0 100755
+--- a/tests/fate-run.sh
++++ b/tests/fate-run.sh
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#!/opt/csw/bin/bash
+
+ export LC_ALL=C
+
+diff --git a/tests/fate-update.sh b/tests/fate-update.sh
+index 6b4668f..cf3ee98 100755
+--- a/tests/fate-update.sh
++++ b/tests/fate-update.sh
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#!/opt/csw/bin/bash
+
+ set -e
+
+diff --git a/tests/fate.sh b/tests/fate.sh
+index 9fd117c..5f91b3b 100755
+--- a/tests/fate.sh
++++ b/tests/fate.sh
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#!/opt/csw/bin/bash
+
+ config=$1
+
+diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh
+index 11e4a54..2690699 100755
+--- a/tests/ffserver-regression.sh
++++ b/tests/ffserver-regression.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+
+ #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf
+ #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_.asf>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf
+diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
+index 39e752b..373fe84 100755
+--- a/tests/lavf-regression.sh
++++ b/tests/lavf-regression.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ #
+ # automatic regression test for libavformat
+ #
+diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh
+index 0322134..bd83fab 100755
+--- a/tests/lavfi-regression.sh
++++ b/tests/lavfi-regression.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ #
+ # automatic regression test for libavfilter
+ #
+diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
+index e57cdf1..a6fd652 100755
+--- a/tests/regression-funcs.sh
++++ b/tests/regression-funcs.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ #
+ # common regression functions for ffmpeg
+ #
+--
+1.7.6
+
Deleted: csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch 2011-07-18 07:54:40 UTC (rev 15095)
+++ csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch 2011-07-18 11:49:36 UTC (rev 15096)
@@ -1,74 +0,0 @@
---- ffmpeg-0.5/configure.orig 2009-11-25 00:00:57.441086148 +0100
-+++ ffmpeg-0.5/configure 2009-11-25 00:01:18.358790303 +0100
-@@ -1217,7 +1217,7 @@
- disable source_path_used
- else
- source_path="`cd \"$source_path\"; pwd`"
-- echo "$source_path" | grep -q '[[:blank:]]' &&
-+ echo "$source_path" | ggrep -q '[[:blank:]]' &&
- die "Out of tree builds are impossible with whitespace in source path."
- fi
-
-@@ -1363,13 +1363,13 @@
- fi
- rm $TMPSH
-
--if $cc --version 2>/dev/null | grep -qi gcc; then
-+if $cc --version 2>/dev/null | ggrep -qi gcc; then
- cc_type=gcc
--elif $cc --version 2>/dev/null | grep -q Intel; then
-+elif $cc --version 2>/dev/null | ggrep -q Intel; then
- cc_type=icc
--elif $cc -v 2>&1 | grep -q xlc; then
-+elif $cc -v 2>&1 | ggrep -q xlc; then
- cc_type=xlc
--elif $cc -V 2>/dev/null | grep -q Compaq; then
-+elif $cc -V 2>/dev/null | ggrep -q Compaq; then
- cc_type=ccc
- DEPEND_CMD='$(CC) $(CFLAGS) -M $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o,"'
- add_ldflags -Wl,-z,now # calls to libots crash without this
-@@ -1488,7 +1488,7 @@
- # helps building libavcodec
- add_cflags -DPIC -fomit-frame-pointer
- # 3 gcc releases known for BeOS, each with ugly bugs
-- gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`"
-+ gcc_version="`$cc -v 2>&1 | ggrep version | cut -d ' ' -f3-`"
- case "$gcc_version" in
- 2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc"
- disable mmx
-@@ -1503,7 +1503,7 @@
- # no need for libm, but the inet stuff
- # Check for BONE
- # XXX: actually should check for NOT net_server
-- if echo $BEINCLUDES | grep -q 'headers/be/bone'; then
-+ if echo $BEINCLUDES | ggrep -q 'headers/be/bone'; then
- network_extralibs="-lbind -lsocket"
- else
- enable beos_netserver
-@@ -1798,7 +1798,7 @@
- check_cc <<EOF || die "Symbol mangling check failed."
- int ff_extern;
- EOF
--sym=$($nm -P -g $TMPO | grep ff_extern)
-+sym=$($nm -P -g $TMPO | ggrep ff_extern)
- extern_prefix=${sym%%ff_extern*}
-
- check_asm inline_asm '""'
-@@ -1896,7 +1896,7 @@
- check_cc <<EOF || die "endian test failed"
- unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
- EOF
--od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
-+od -A n -t x1 $TMPO | ggrep -q '42 *49 *47 *45' && enable bigendian
-
- # ---
- # check availability of some header files
-@@ -2413,7 +2413,7 @@
- get_version(){
- name=$1
- file=$source_path/$2
-- eval $(grep "#define ${name}_VERSION_M" "$file" | awk '{ print $2"="$3 }')
-+ eval $(ggrep "#define ${name}_VERSION_M" "$file" | awk '{ print $2"="$3 }')
- eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
- lcname=$(tolower $name)
- eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list