ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-10 00:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '168352d1e870345bce020acba829e9ba453145de'

Browse Source
This commit is contained in:
Peter 2018-12-14 18:01:23 +04:00
commit 8bca60393a
3 changed files with 64 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
FFMpeg.xcodeproj/project.pbxproj
View File

@ -33,6 +33,7 @@
D04555D721BF8B2F007A6DD9 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D04555D621BF8B2F007A6DD9 /* AudioToolbox.framework */; };
D04555D921BF8B4E007A6DD9 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D04555D821BF8B4E007A6DD9 /* libiconv.tbd */; };
D04555DB21BF8B77007A6DD9 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D04555DA21BF8B77007A6DD9 /* libopus.a */; };
D0CAD6A721C049D9001E3055 /* ffmpeg-4.1 in Resources */ = {isa = PBXBuildFile; fileRef = D0CAD6A621C049D9001E3055 /* ffmpeg-4.1 */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@ -64,6 +65,7 @@
D04555D621BF8B2F007A6DD9 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
D04555D821BF8B4E007A6DD9 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
D04555DA21BF8B77007A6DD9 /* libopus.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopus.a; path = opus/lib/libopus.a; sourceTree = "<group>"; };
D0CAD6A621C049D9001E3055 /* ffmpeg-4.1 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "ffmpeg-4.1"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -105,6 +107,7 @@
D04554B721BF0E8E007A6DD9 /* FFMpeg */ = {
isa = PBXGroup;
children = (
D0CAD6A621C049D9001E3055 /* ffmpeg-4.1 */,
D04554B821BF0E8E007A6DD9 /* FFMpeg.h */,
D04554B921BF0E8E007A6DD9 /* Info.plist */,
D04555A321BF115E007A6DD9 /* FFMpegGlobals.h */,
@ -221,6 +224,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D0CAD6A721C049D9001E3055 /* ffmpeg-4.1 in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -243,7 +247,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "BUILD_CONF=\"\"\nif [[ $CONFIGURATION == Debug* ]]\nthen\n BUILD_CONF=\"debug\"\nelif [[ $CONFIGURATION == Release* ]]\nthen\n BUILD_CONF=\"release\"\nelse\n echo \"Unknown configuration $CONFIGURATION\"\n exit 1\nfi\n\nBUILD_DIR=\"$BUILT_PRODUCTS_DIR/FFMpeg\"\nSOURCE_DIR=\"$PROJECT_DIR/FFMpeg\"\n\n$PROJECT_DIR/FFMpeg/build-ffmpeg.sh debug \"$ARCHS\" \"$BUILD_DIR\" \"$SOURCE_DIR\" \n";
shellScript = "BUILD_CONF=\"\"\nif [[ $CONFIGURATION == Debug* ]]\nthen\n BUILD_CONF=\"debug\"\nelif [[ $CONFIGURATION == Release* ]]\nthen\n BUILD_CONF=\"release\"\nelse\n echo \"Unknown configuration $CONFIGURATION\"\n exit 1\nfi\n\nBUILD_DIR=\"$BUILT_PRODUCTS_DIR/FFMpeg\"\nSOURCE_DIR=\"$PROJECT_DIR/FFMpeg\"\n\n$PROJECT_DIR/FFMpeg/build-ffmpeg.sh $BUILD_CONF \"$ARCHS\" \"$BUILD_DIR\" \"$SOURCE_DIR\" \n";
};
/* End PBXShellScriptBuildPhase section */
@ -318,7 +322,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
@ -374,7 +378,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
@ -387,10 +391,11 @@
D04554BE21BF0E8E007A6DD9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6N38VWS5BX;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@ -417,10 +422,11 @@
D04554BF21BF0E8E007A6DD9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6N38VWS5BX;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@ -496,7 +502,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
@ -509,10 +515,11 @@
D05B076221BFB99900B1D27C /* DebugHockeyapp */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6N38VWS5BX;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@ -588,7 +595,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
@ -601,10 +608,11 @@
D05B076421BFB9A100B1D27C /* DebugFork */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6N38VWS5BX;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@ -680,7 +688,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
@ -693,10 +701,11 @@
D05B076621BFB9A600B1D27C /* DebugAppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6N38VWS5BX;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@ -772,7 +781,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
@ -785,10 +794,11 @@
D05B076821BFB9AF00B1D27C /* DebugAppStoreLLC */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6N38VWS5BX;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@ -858,7 +868,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
@ -871,10 +881,11 @@
D05B076A21BFB9B700B1D27C /* ReleaseHockeyapp */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6N38VWS5BX;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@ -944,7 +955,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
@ -957,10 +968,11 @@
D05B076C21BFB9BE00B1D27C /* ReleaseHockeyappInternal */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6N38VWS5BX;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@ -1030,7 +1042,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
@ -1043,10 +1055,11 @@
D05B076E21BFB9C900B1D27C /* ReleaseAppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6N38VWS5BX;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
@ -1116,7 +1129,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
@ -1129,10 +1142,11 @@
D05B077021BFB9D200B1D27C /* ReleaseAppStoreLLC */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6N38VWS5BX;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";

34
FFMpeg.xcodeproj/xcuserdata/peter.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.SymbolicBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "av_register_all"
moduleName = "">
<Locations>
<Location
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "av_register_all"
moduleName = "FFMpeg"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/peter/Library/Developer/Xcode/DerivedData/Telegram-iOS-fpnltkekwydbckesxzgvscbjujem/Build/Products/Debug%20Hockeyapp-iphonesimulator/FFMpeg/scratch/x86_64/src/libavformat/allformats.c"
timestampString = "566229118.2606"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "603"
endingLineNumber = "603"
offsetFromSymbolStart = "0">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>

32
FFMpeg/build-ffmpeg.sh
View File

@ -4,7 +4,7 @@ ARCHS="$2"
for ARCH in $ARCHS
do
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "arm64" -o "$ARCH" = "arm7" ]
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "arm64" -o "$ARCH" = "armv7" ]
then
echo "1" >/dev/null
else
@ -58,10 +58,19 @@ fi
#CONFIGURE_FLAGS="$CONFIGURE_FLAGS --pkg-config=$PKG_CONFIG"
COMPILE="y"
LIPO="y"
DEPLOYMENT_TARGET="8.0"
LIBS_HASH=""
for ARCH in $ARCHS
do
for LIB in "$THIN/$ARCH/lib/"*.a
do
LIB_DATE=`stat -f "%a,%z" "$LIB"`
LIBS_HASH="$LIBS_HASH $ARCH/$LIB:$LIB_DATE"
done
done
if [ "$COMPILE" ]
then
if [ ! `which yasm` ]
@ -170,6 +179,23 @@ then
done
fi
UPDATED_LIBS_HASH=""
for ARCH in $ARCHS
do
for LIB in "$THIN/$ARCH/lib/"*.a
do
LIB_DATE=`stat -f "%a,%z" "$LIB"`
UPDATED_LIBS_HASH="$UPDATED_LIBS_HASH $ARCH/$LIB:$LIB_DATE"
done
done
if [ "$UPDATED_LIBS_HASH" = "$LIBS_HASH" ]
then
echo "Libs aren't changed, skipping lipo"
else
LIPO="y"
fi
if [ "$LIPO" ]
then
echo "building fat binaries..."
@ -182,7 +208,7 @@ then
cd "$CWD"
echo lipo -create `find "$THIN" -name "$LIB"` -output "$FAT/lib/$LIB" 1>&2
LIPO_INPUT=`find "$THIN" -name "$LIB"`
lipo -create "$LIPO_INPUT" -output "$FAT/lib/$LIB" || exit 1
lipo -create $LIPO_INPUT -output "$FAT/lib/$LIB" || exit 1
done
cd "$CWD"