forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1685 from microsoft/master
[x264] Update to 0.164.3108, use official upstream (microsoft#39460)
- Loading branch information
Showing
8 changed files
with
94 additions
and
52 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
diff --git a/configure b/configure | ||
index e242e73c..e0d1df76 100755 | ||
--- a/configure | ||
+++ b/configure | ||
@@ -1,4 +1,7 @@ | ||
-#!/bin/bash | ||
+#!/usr/bin/env bash | ||
+ | ||
+export CFLAGS="${CPPFLAGS} ${CFLAGS}" | ||
+test "${AS:-:}" = ":" && unset AS | ||
|
||
if test x"$1" = x"-h" -o x"$1" = x"--help" ; then | ||
cat <<EOF | ||
@@ -837,6 +840,7 @@ case $host_cpu in | ||
AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -as-type armasm -- armasm64 -nologo}" | ||
else | ||
AS="${AS-${CC}}" | ||
+ test "${AS}" = "${CC}" && ASFLAGS="${CPPFLAGS} ${ASFLAGS}" | ||
fi | ||
;; | ||
arm*) | ||
@@ -855,6 +859,7 @@ case $host_cpu in | ||
AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch arm -as-type clang -force-thumb -- ${CC} -mimplicit-it=always}" | ||
else | ||
AS="${AS-${CC}}" | ||
+ test "${AS}" = "${CC}" && ASFLAGS="${CPPFLAGS} ${ASFLAGS}" | ||
fi | ||
;; | ||
s390|s390x) | ||
@@ -1354,8 +1359,10 @@ if [ $SYS = WINDOWS -a $ARCH = X86 -a $compiler = GNU ] ; then | ||
fi | ||
|
||
if cc_check "stdio.h" "" "fseeko(stdin,0,0);" ; then | ||
+ if cc_check "" "" "#if defined(__ANDROID_API__) && __ANDROID_API__ < 24\n#error\n#endif\n" ; then | ||
define fseek fseeko | ||
define ftell ftello | ||
+ fi | ||
elif cc_check "stdio.h" "" "fseeko64(stdin,0,0);" ; then | ||
define fseek fseeko64 | ||
define ftell ftello64 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff --git a/version.sh b/version.sh | ||
index 178fc952..06728796 100755 | ||
--- a/version.sh | ||
+++ b/version.sh | ||
@@ -3,8 +3,8 @@ | ||
cd "$(dirname "$0")" >/dev/null && [ -f x264.h ] || exit 1 | ||
|
||
api="$(grep '#define X264_BUILD' < x264.h | sed 's/^.* \([1-9][0-9]*\).*$/\1/')" | ||
-ver="x" | ||
-version="" | ||
+ver="@revision@ @short_ref@" | ||
+version=" r${ver} vcpkg" | ||
|
||
if [ -d .git ] && command -v git >/dev/null 2>&1 ; then | ||
localver="$(($(git rev-list HEAD | wc -l)))" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters