Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
x264: fix portability issues with ksh. Closes #297
Browse files Browse the repository at this point in the history
  • Loading branch information
dylanaraps committed Jul 21, 2021
1 parent a5548c7 commit fa80406
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 3 deletions.
2 changes: 1 addition & 1 deletion extra/x264/build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh -e

patch -p1 < x264-no-bash.patch
patch -p1 < portability.patch

./configure \
--prefix=/usr \
Expand Down
2 changes: 1 addition & 1 deletion extra/x264/checksums
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
404e7ba61123720a7b2cc45356ace6859860ef4ce3503758465e92c1ce11995e
a78a518c3685813fdfdc8813acd48e292968892e6ff5ea60d91f5c514c35acee
ff0292e4cf86e8352e174091091e842c2e9ab444d8f5f292b3f1a7d11a392f41
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
diff --git a/tools/cltostr.sh b/tools/cltostr.sh
index 23b6cc7..3feaafe 100755
--- a/tools/cltostr.sh
+++ b/tools/cltostr.sh
@@ -18,7 +18,7 @@ dump() {
}

# Print MD5 hash w/o newline character to not embed the character in the array.
-hash() {
+_hash() {
# md5sum is not standard, so try different platform-specific alternatives.
{ md5sum "$1" || md5 -q "$1" || digest -a md5 "$1"; } 2>/dev/null |
cut -b -32 | tr -d '\n\r'
@@ -29,5 +29,5 @@ trap 'rm -f "$1.temp"' EXIT
sanitize | tee "$1.temp" |
dump 'x264_opencl_source' > "$1"

-hash "$1.temp" |
+_hash "$1.temp" |
dump 'x264_opencl_source_hash' >> "$1"
diff --git a/configure b/configure-posix
index 3cf63e0..1e1fce5 100755
--- a/configure-posix
Expand Down
2 changes: 1 addition & 1 deletion extra/x264/sources
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-VERSION-stable.tar.bz2
patches/x264-no-bash.patch
patches/portability.patch

0 comments on commit fa80406

Please sign in to comment.