Merge CV, ver=5.1; ops/methods from HV, and interface from CV where possible

[goodguy/history.git] / cinelerra-5.0 / thirdparty / src / mjpegtools.patch1

diff --git a/cinelerra-5.0/thirdparty/src/mjpegtools.patch1 b/cinelerra-5.0/thirdparty/src/mjpegtools.patch1
deleted file mode 100644 (file)
index 6f310b4..0000000
--- a/cinelerra-5.0/thirdparty/src/mjpegtools.patch1
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/cpuinfo.sh       2009-08-31 15:59:37.000000000 -0600
-+++ b/cpuinfo.sh       2015-02-01 22:20:28.469910599 -0700
-@@ -144,9 +144,6 @@
-                           # synonym for 'k8'
-                          proc=k8
-                          ;;
--                      16)
--                         proc=barcelona
--                         ;;
-                       *) proc=athlon-xp
-                          ;;
-               esac
-@@ -165,9 +162,7 @@
-                          fi
-                          ;;
-                       6) iproc=686
--                           if test "$pmodel" -ge 23; then
--                                proc=core2
--                           elif test "$pmodel" -ge 15; then
-+                           if test "$pmodel" -ge 15; then
-                                 proc=nocona
-                            elif test "$pmodel" -ge 13; then
-                                 proc=pentium-m
-@@ -228,11 +223,6 @@
-     fi
- fi
- 
--# Seems some variants of gcc accept 'core2' instead of 'nocona'.
--if test "$proc" = "core2"; then
--        do_cc  -march=$proc $_opt_mcpu=$proc || proc=nocona
--fi
--
- if test "$proc" = "pentium4" || test "$proc" = "pentium3" || test "$proc" = "pentium2" || test "$proc" = "athlon"; then
-       do_cc -march=$proc $_opt_mcpu=$proc || proc=i686
- fi
-@@ -249,7 +239,6 @@
-       do_cc -march=$proc $_opt_mcpu=$proc || proc=error
- fi
- if test "$proc" = "error" ; then
--      echo "Your $CC does not even support \"i386\" for '-march' and $_opt_mcpu."
-       _mcpu=""
-       _march=""
- elif test "$proc" = "i586-i686"; then