RetroSearch Browse

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from https://github.com/Haivision/srt/commit/73b49feb9031d78828ac18d412c196e2b3d05b57 below:

[build] Support NDK r23, OpenSSL v3 (#2148) · Haivision/srt@73b49fe · GitHub

File tree Expand file treeCollapse file tree 2 files changed

+20

-66

lines changed

Filter options

Expand file treeCollapse file tree 2 files changed

+20

-66

lines changed Original file line number Diff line number Diff line change


 @@ -3,24 +3,24 @@

3 3


 echo_help()

4 4

5 5


 echo "Usage: $0 [options...]"

6

-
 echo " -n Specify NDK root path for the build."

7

-
 echo " -a Select target API level."

8

-
 echo " -t Select target architectures."

9

-
 echo " Android supports the following architectures: armeabi-v7a arm64-v8a x86 x86_64."

6

+
 echo " -n NDK root path for the build"

7

+
 echo " -a Target API level"

8

+
 echo " -t Space-separated list of target architectures"

9

+
 echo " Android supports the following architectures: armeabi-v7a arm64-v8a x86 x86_64"

10 10


 echo " -e Encryption library to be used. Possible options: openssl (default) mbedtls"

11

-
 echo " -o Select OpenSSL (1.1.1 series) version. E.g. 1.1.1h"

12

-
 echo " -m Select Mbed TLS version. E.g. v2.26.0"

13

-
 echo " -s Select SRT version. E.g. v1.4.3"

11

+
 echo " -o OpenSSL version. E.g. 1.1.1l"

12

+
 echo " -m Mbed TLS version. E.g. v2.26.0"

13

+
 echo " -s SRT version. E.g. v1.4.4"

14 14


 echo

15

-
 echo "Example: ./build-android -n /home/username/Android/Sdk/ndk/21.4.7075529 -a 28 -t \"armeabi-v7a arm64-v8a x86 x86_64\" -o 1.1.1h -s v1.4.3"

15

+
 echo "Example: ./build-android -n /home/username/Android/Sdk/ndk/23.0.7599858 -a 28 -t \"arm64-v8a x86_64\""

16 16


 echo

17 17

18 18 19 19


 # Init optional command line vars

20 20


 NDK_ROOT=""

21 21


 API_LEVEL=28

22 22


 BUILD_TARGETS="armeabi-v7a arm64-v8a x86 x86_64"

23

-
 OPENSSL_VERSION=1.1.1h

23

+
 OPENSSL_VERSION=1.1.1l

24 24


 SRT_VERSION=""

25 25


 ENC_LIB=openssl

26 26


 MBEDTLS_VERSION=v2.26.0

Original file line number Diff line number Diff line change


 @@ -29,48 +29,22 @@ fi

29 29


 cd openssl-${OPENSSL_VERSION} || exit 128

30 30 31 31 32

-
 ##### Prepare Files #####

33

-
 sed -i.bak 's/.*-mandroid.*//' Configurations/15-android.conf

34

-
 patch -p1 -N <<EOP

35

-
 --- old/Configurations/unix-Makefile.tmpl 2018-09-11 14:48:19.000000000 +0200

36

-
 +++ new/Configurations/unix-Makefile.tmpl 2018-10-18 09:06:27.282007245 +0200

37

-
 @@ -43,12 +43,17 @@

38

-
  # will return the name from shlib(\$libname) with any SO version number

39

-
  # removed. On some systems, they may therefore return the exact same

40

-
  # string.

41

-
 - sub shlib {

42

-
 + sub shlib_simple {

43

-
  my \$lib = shift;

44

-
  return () if \$disabled{shared} || \$lib =~ /\\.a$/;

45

-
 - return \$unified_info{sharednames}->{\$lib}. \$shlibvariant. '\$(SHLIB_EXT)';

46

-
 +

47

-
 + if (windowsdll()) {

48

-
 + return \$lib . '\$(SHLIB_EXT_IMPORT)';

49

-
 + }

50

-
 + return \$lib . '\$(SHLIB_EXT_SIMPLE)';

51

-
  }

52

-
 - sub shlib_simple {

53

-
 +

54

-
 + sub shlib {

55

-
  my \$lib = shift;

56

-
  return () if \$disabled{shared} || \$lib =~ /\\.a$/;

57 - 58

-
 EOP

59 - 60

-
 ##### remove output-directory #####

61

-
 #rm -rf $OUT_DIR

62 - 63 32


 ##### export ndk directory. Required by openssl-build-scripts #####

64

-
 export ANDROID_NDK

33

+
 case ${OPENSSL_VERSION} in

34

+
 1.1.1*)

35

+
 export ANDROID_NDK_HOME=$ANDROID_NDK

36

+
 ;;

37

+
 *)

38

+
 export ANDROID_NDK_ROOT=$ANDROID_NDK

39

+
 ;;

40

+
 esac

41 + 42

+
 export PATH=$ANDROID_NDK/toolchains/llvm/prebuilt/$HOST_TAG/bin:$PATH

65 43 66 44


 ##### build-function #####

67 45


 build_the_thing() {

68

-
 TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/$HOST_TAG

69

-
 export PATH=$TOOLCHAIN/$TRIBLE/bin:$TOOLCHAIN/bin:"$PATH"

70

-
 echo $PATH

71 46


 make clean

72

-
 #./Configure $SSL_TARGET $OPTIONS -fuse-ld="$TOOLCHAIN/$TRIBLE/bin/ld" "-gcc-toolchain $TOOLCHAIN" && \

73

-
 ./Configure $SSL_TARGET $OPTIONS -fuse-ld="$TOOLCHAIN/$TRIBLE/bin/ld" && \

47

+
 ./Configure $SSL_TARGET -D__ANDROID_API__=$API_LEVEL && \

74 48


 make && \

75 49


 make install DESTDIR=$DESTDIR || exit 128

76 50


 @@ -79,39 +53,19 @@ echo $PATH

79 53


 for build_target in $BUILD_TARGETS

80 54

do

81 55


 case $build_target in

82

-
 armeabi)

83

-
 TRIBLE="arm-linux-androideabi"

84

-
 TC_NAME="arm-linux-androideabi-4.9"

85

-
 #OPTIONS="--target=armv5te-linux-androideabi -mthumb -fPIC -latomic -D__ANDROID_API__=$API_LEVEL"

86

-
 OPTIONS="--target=armv5te-linux-androideabi -mthumb -fPIC -latomic -D__ANDROID_API__=$API_LEVEL"

87

-
 DESTDIR="$BUILD_DIR/armeabi"

88

-
 SSL_TARGET="android-arm"

89

-
 ;;

90 56


 armeabi-v7a)

91

-
 TRIBLE="arm-linux-androideabi"

92

-
 TC_NAME="arm-linux-androideabi-4.9"

93

-
 OPTIONS="--target=armv7a-linux-androideabi -Wl,--fix-cortex-a8 -fPIC -D__ANDROID_API__=$API_LEVEL"

94 57


 DESTDIR="$BUILD_DIR/armeabi-v7a"

95 58


 SSL_TARGET="android-arm"

96 59

;;

97 60


 x86)

98

-
 TRIBLE="i686-linux-android"

99

-
 TC_NAME="x86-4.9"

100

-
 OPTIONS="-fPIC -D__ANDROID_API__=${API_LEVEL}"

101 61


 DESTDIR="$BUILD_DIR/x86"

102 62


 SSL_TARGET="android-x86"

103 63

;;

104 64


 x86_64)

105

-
 TRIBLE="x86_64-linux-android"

106

-
 TC_NAME="x86_64-4.9"

107

-
 OPTIONS="-fPIC -D__ANDROID_API__=${API_LEVEL}"

108 65


 DESTDIR="$BUILD_DIR/x86_64"

109 66


 SSL_TARGET="android-x86_64"

110 67

;;

111 68


 arm64-v8a)

112

-
 TRIBLE="aarch64-linux-android"

113

-
 TC_NAME="aarch64-linux-android-4.9"

114

-
 OPTIONS="-fPIC -D__ANDROID_API__=${API_LEVEL}"

115 69


 DESTDIR="$BUILD_DIR/arm64-v8a"

116 70


 SSL_TARGET="android-arm64"

117 71

;;

You can’t perform that action at this time.

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4