|
3106
|
1 |
--- old/contrib/ffmpeg/P01-solaris.patch Sun Apr 25 17:15:43 2010
|
|
|
2 |
+++ new/contrib/ffmpeg/P01-solaris.patch Thu Jan 6 00:33:19 2011
|
|
|
3 |
@@ -1,23 +1,113 @@
|
|
|
4 |
-Index: configure
|
|
|
5 |
-===================================================================
|
|
|
6 |
---- ffmpeg.orig/configure (revision 22823)
|
|
|
7 |
-+++ ffmpeg/configure (working copy)
|
|
|
8 |
-@@ -54,6 +54,9 @@
|
|
|
9 |
- exit 1
|
|
|
10 |
- fi
|
|
|
11 |
-
|
|
|
12 |
-+# Solaris must use the xpg4 version of grep
|
|
|
13 |
-+PATH=/usr/xpg4/bin:$PATH
|
|
|
14 |
-+
|
|
|
15 |
- show_help(){
|
|
|
16 |
- cat <<EOF
|
|
|
17 |
- Usage: configure [options]
|
|
|
18 |
-@@ -2387,7 +2390,7 @@
|
|
|
19 |
- check_cc <<EOF || die "endian test failed"
|
|
|
20 |
- unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
|
|
|
21 |
+--- orig/configure 2011-01-05 17:25:34.141380827 -0500
|
|
|
22 |
++++ new/configure 2011-01-05 17:31:14.093219964 -0500
|
|
|
23 |
+@@ -1,4 +1,4 @@
|
|
|
24 |
+-#!/bin/sh
|
|
|
25 |
++#!/bin/bash
|
|
|
26 |
+ #
|
|
|
27 |
+ # FFmpeg configure script
|
|
|
28 |
+ #
|
|
|
29 |
+@@ -1549,7 +1549,7 @@
|
|
|
30 |
+ thing=$1
|
|
|
31 |
+ pattern=$2
|
|
|
32 |
+ file=$source_path/$3
|
|
|
33 |
+- sed -n "s/^[^#]*$pattern.*([^,]*, *\([^,]*\)\(,.*\)*).*/\1_$thing/p" "$file"
|
|
|
34 |
++ /usr/gnu/bin/sed -n "s/^[^#]*$pattern.*([^,]*, *\([^,]*\)\(,.*\)*).*/\1_$thing/p" "$file"
|
|
|
35 |
+ }
|
|
|
36 |
+
|
|
|
37 |
+ ENCODER_LIST=$(find_things encoder ENC libavcodec/allcodecs.c)
|
|
|
38 |
+@@ -1898,7 +1898,7 @@
|
|
|
39 |
+ gcc)
|
|
|
40 |
+ check_native(){
|
|
|
41 |
+ $cc $1=native -v -c -o $TMPO $TMPC >$TMPE 2>&1 || return
|
|
|
42 |
+- sed -n "/$1=/{
|
|
|
43 |
++ /usr/gnu/bin/sed -n "/$1=/{
|
|
|
44 |
+ s/.*$1=\\([^ ]*\\).*/\\1/
|
|
|
45 |
+ p
|
|
|
46 |
+ q
|
|
|
47 |
+@@ -2365,7 +2365,7 @@
|
|
|
48 |
+ check_cc <<EOF || die "Symbol mangling check failed."
|
|
|
49 |
+ int ff_extern;
|
|
|
50 |
EOF
|
|
|
51 |
--od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
|
|
|
52 |
-+/usr/bin/tr -cd "BIGE" < $TMPO | grep -q 'B *I *G *E' && enable bigendian
|
|
|
53 |
+-sym=$($nm $nm_opts $TMPO | awk '/ff_extern/{ print substr($0, match($0, /[^ \t]*ff_extern/)) }')
|
|
|
54 |
++sym=$($nm $nm_opts $TMPO | gawk '/ff_extern/{ print substr($0, match($0, /[^ \t]*ff_extern/)) }')
|
|
|
55 |
+ extern_prefix=${sym%%ff_extern*}
|
|
|
56 |
+
|
|
|
57 |
+ check_cc <<EOF && enable inline_asm
|
|
|
58 |
+@@ -3047,7 +3047,7 @@
|
|
|
59 |
+ get_version(){
|
|
|
60 |
+ name=$1
|
|
|
61 |
+ file=$source_path/$2
|
|
|
62 |
+- eval $(grep "#define ${name}_VERSION_M" "$file" | awk '{ print $2"="$3 }')
|
|
|
63 |
++ eval $(grep "#define ${name}_VERSION_M" "$file" | gawk '{ print $2"="$3 }')
|
|
|
64 |
+ eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
|
|
|
65 |
+ lcname=$(tolower $name)
|
|
|
66 |
+ eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
|
|
|
67 |
+--- ffmpeg/version.sh Sat Jun 7 03:19:09 2008
|
|
|
68 |
++++ ffmpeg.solaris/version.sh Sat Jun 7 03:19:09 2008
|
|
|
69 |
+@@ -1,40 +1,6 @@
|
|
|
70 |
+-#!/bin/sh
|
|
|
71 |
++#!/bin/ksh
|
|
|
72 |
|
|
|
73 |
- if enabled alpha; then
|
|
|
74 |
+-# check for SVN revision number
|
|
|
75 |
+-revision=$(cd "$1" && cat snapshot_version 2> /dev/null)
|
|
|
76 |
+-test $revision || revision=$(cd "$1" && LC_ALL=C svn info 2> /dev/null | grep "Last Changed Rev" | cut -d' ' -f4)
|
|
|
77 |
+-test $revision || revision=$(cd "$1" && grep committed-rev .svn/entries 2>/dev/null | head -n 1 | cut -d '"' -f2)
|
|
|
78 |
+-test $revision || revision=$(cd "$1" && sed -n -e '/^dir$/{n
|
|
|
79 |
+-p
|
|
|
80 |
+-q
|
|
|
81 |
+-}' .svn/entries 2>/dev/null)
|
|
|
82 |
+-test $revision && revision=SVN-r$revision
|
|
|
83 |
+-
|
|
|
84 |
+-# check for git svn revision number
|
|
|
85 |
+-if ! test $revision; then
|
|
|
86 |
+- revision=$(cd "$1" && git svn find-rev HEAD 2> /dev/null)
|
|
|
87 |
+- test $revision && revision=git-svn-r$revision
|
|
|
88 |
+-fi
|
|
|
89 |
+-
|
|
|
90 |
+-# check for git short hash
|
|
|
91 |
+-if ! test $revision; then
|
|
|
92 |
+- revision=$(cd "$1" && git log -1 --pretty=format:%h 2> /dev/null)
|
|
|
93 |
+- test $revision && revision=git-$revision
|
|
|
94 |
+-fi
|
|
|
95 |
+-
|
|
|
96 |
+-# no revision number found
|
|
|
97 |
+-test $revision || revision=UNKNOWN
|
|
|
98 |
+-
|
|
|
99 |
+-# releases extract the version number from the VERSION file
|
|
|
100 |
+-version=$(cd "$1" && cat VERSION 2> /dev/null)
|
|
|
101 |
+-test $version || version=$revision
|
|
|
102 |
+-
|
|
|
103 |
+-test -n "$3" && version=$version-$3
|
|
|
104 |
+-
|
|
|
105 |
+-if [ -z "$2" ]; then
|
|
|
106 |
+- echo "$version"
|
|
|
107 |
+- exit
|
|
|
108 |
+-fi
|
|
|
109 |
++version=0.6.1
|
|
|
110 |
|
|
|
111 |
+ NEW_REVISION="#define FFMPEG_VERSION \"$version\""
|
|
|
112 |
+ OLD_REVISION=$(cat version.h 2> /dev/null)
|
|
|
113 |
+--- ffmpeg/tests/codec-regression.sh Sat Jun 7 03:19:09 2008
|
|
|
114 |
++++ ffmpeg.solaris/tests/codec-regression.sh Thu Jun 19 12:10:48 2008
|
|
|
115 |
+@@ -1,4 +1,4 @@
|
|
|
116 |
+-#!/bin/sh
|
|
|
117 |
++#!/bin/bash
|
|
|
118 |
+ #
|
|
|
119 |
+ # automatic regression test for ffmpeg
|
|
|
120 |
+ #
|
|
|
121 |
+--- ffmpeg.orig/libavcodec/mlp.h.orig Sun Dec 26 17:50:15 2010
|
|
|
122 |
++++ ffmpeg/libavcodec/mlp.h Sun Dec 26 17:51:57 2010
|
|
|
123 |
+@@ -53,9 +53,11 @@
|
|
|
124 |
+ #define MAX_SAMPLERATE (MAX_RATEFACTOR * 48000)
|
|
|
125 |
+
|
|
|
126 |
+ /** maximum number of audio samples within one access unit */
|
|
|
127 |
+-#define MAX_BLOCKSIZE (40 * MAX_RATEFACTOR)
|
|
|
128 |
++/*#define MAX_BLOCKSIZE (40 * MAX_RATEFACTOR)*/
|
|
|
129 |
++#define MAX_BLOCKSIZE 160
|
|
|
130 |
+ /** next power of two greater than MAX_BLOCKSIZE */
|
|
|
131 |
+-#define MAX_BLOCKSIZE_POW2 (64 * MAX_RATEFACTOR)
|
|
|
132 |
++/*#define MAX_BLOCKSIZE_POW2 (64 * MAX_RATEFACTOR)*/
|
|
|
133 |
++#define MAX_BLOCKSIZE_POW2 256
|
|
|
134 |
+
|
|
|
135 |
+ /** number of allowed filters */
|
|
|
136 |
+ #define NUM_FILTERS 2
|