diff --git a/extra/libvpx/build b/extra/libvpx/build index f055b6e3..7ca7cd7d 100755 --- a/extra/libvpx/build +++ b/extra/libvpx/build @@ -2,12 +2,11 @@ export CC=${CC:-cc} CXX=${CXX:-c++} -patch -p1 < fix-busybox-diff.patch - -# Remove the perl requirement from configure -# as we have removed the perl requirement -# ourselves :-). -sed -i 's/perl/:/g' configure +# Remove the perl requirement from configure. +# Also fix issue with non-GNU diff. +sed 's/perl/:/g;s/diff --version/command -v diff/' configure > _ +mv -f _ configure +chmod +x configure ./configure \ --prefix=/usr \ diff --git a/extra/libvpx/checksums b/extra/libvpx/checksums index 60cdc5df..dacdbfd2 100644 --- a/extra/libvpx/checksums +++ b/extra/libvpx/checksums @@ -1,5 +1,4 @@ 85803ccbdbdd7a3b03d930187cb055f1353596969c1f92ebec2db839fa4f834a -ce802d64bcbeb4230527aea2b4284d9844fb12fa5aca868a94e03982f85ec45b e6aa264d60371d76e39a8fa0118e37915ea348400f82046d083a4511d229f8eb bc2ab604abf616682374d65c9d154e6e2dac0524fd969b12ab4d81e30452b904 77716ffb6d08322a3f300b9adad302641836af6e923854eba040a95e0766fa70 diff --git a/extra/libvpx/patches/fix-busybox-diff.patch b/extra/libvpx/patches/fix-busybox-diff.patch deleted file mode 100644 index fa93b0a6..00000000 --- a/extra/libvpx/patches/fix-busybox-diff.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index e5a74c6..11f660d 100755 ---- a/configure -+++ b/configure -@@ -170,7 +170,7 @@ for t in ${all_targets}; do - [ -f "${source_path}/${t}.mk" ] && enable_feature ${t} - done - --if ! diff --version >/dev/null; then -+if ! command -v diff >/dev/null; then - die "diff missing: Try installing diffutils via your package manager." - fi - diff --git a/extra/libvpx/sources b/extra/libvpx/sources index 3c8a026c..14a6cfda 100644 --- a/extra/libvpx/sources +++ b/extra/libvpx/sources @@ -1,5 +1,4 @@ https://github.com/webmproject/libvpx/archive/v1.10.0.tar.gz -patches/fix-busybox-diff.patch files/vp9_rtcd.h files/vp8_rtcd.h files/vpx_scale_rtcd.h