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

Update project

Browse Source
This commit is contained in:
Peter 2018-12-11 21:56:38 +04:00
parent d53fb89437
commit 929a90c01c
4 changed files with 104 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.gitignore vendored Normal file
View File

@ -0,0 +1,24 @@
fastlane/README.md
fastlane/report.xml
fastlane/test_output/*
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
*.xcscmblueprint
*.moved-aside
DerivedData
*.hmap
*.ipa
*.xcuserstate
.DS_Store
*.dSYM
*.dSYM.zip
*.ipa
*/xcuserdata/*

32
FFMpeg.xcodeproj/project.pbxproj
View File

@ -504,7 +504,7 @@
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = ""; VERSION_INFO_PREFIX = "";
}; };
name = "Debug Hockeyapp"; name = DebugHockeyapp;
}; };
D05B076221BFB99900B1D27C /* DebugHockeyapp */ = { D05B076221BFB99900B1D27C /* DebugHockeyapp */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -534,7 +534,7 @@
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include"; USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include";
}; };
name = "Debug Hockeyapp"; name = DebugHockeyapp;
}; };
D05B076321BFB9A100B1D27C /* DebugFork */ = { D05B076321BFB9A100B1D27C /* DebugFork */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -596,7 +596,7 @@
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = ""; VERSION_INFO_PREFIX = "";
}; };
name = "Debug Fork"; name = DebugFork;
}; };
D05B076421BFB9A100B1D27C /* DebugFork */ = { D05B076421BFB9A100B1D27C /* DebugFork */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -626,7 +626,7 @@
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include"; USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include";
}; };
name = "Debug Fork"; name = DebugFork;
}; };
D05B076521BFB9A600B1D27C /* DebugAppStore */ = { D05B076521BFB9A600B1D27C /* DebugAppStore */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -688,7 +688,7 @@
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = ""; VERSION_INFO_PREFIX = "";
}; };
name = "Debug AppStore"; name = DebugAppStore;
}; };
D05B076621BFB9A600B1D27C /* DebugAppStore */ = { D05B076621BFB9A600B1D27C /* DebugAppStore */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -718,7 +718,7 @@
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include"; USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include";
}; };
name = "Debug AppStore"; name = DebugAppStore;
}; };
D05B076721BFB9AF00B1D27C /* DebugAppStoreLLC */ = { D05B076721BFB9AF00B1D27C /* DebugAppStoreLLC */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -780,7 +780,7 @@
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = ""; VERSION_INFO_PREFIX = "";
}; };
name = "Debug AppStore LLC"; name = DebugAppStoreLLC;
}; };
D05B076821BFB9AF00B1D27C /* DebugAppStoreLLC */ = { D05B076821BFB9AF00B1D27C /* DebugAppStoreLLC */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -810,7 +810,7 @@
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include"; USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include";
}; };
name = "Debug AppStore LLC"; name = DebugAppStoreLLC;
}; };
D05B076921BFB9B700B1D27C /* ReleaseHockeyapp */ = { D05B076921BFB9B700B1D27C /* ReleaseHockeyapp */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -866,7 +866,7 @@
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = ""; VERSION_INFO_PREFIX = "";
}; };
name = "Release Hockeyapp"; name = ReleaseHockeyapp;
}; };
D05B076A21BFB9B700B1D27C /* ReleaseHockeyapp */ = { D05B076A21BFB9B700B1D27C /* ReleaseHockeyapp */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -896,7 +896,7 @@
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include"; USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include";
}; };
name = "Release Hockeyapp"; name = ReleaseHockeyapp;
}; };
D05B076B21BFB9BE00B1D27C /* ReleaseHockeyappInternal */ = { D05B076B21BFB9BE00B1D27C /* ReleaseHockeyappInternal */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -952,7 +952,7 @@
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = ""; VERSION_INFO_PREFIX = "";
}; };
name = "Release Hockeyapp Internal"; name = ReleaseHockeyappInternal;
}; };
D05B076C21BFB9BE00B1D27C /* ReleaseHockeyappInternal */ = { D05B076C21BFB9BE00B1D27C /* ReleaseHockeyappInternal */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -982,7 +982,7 @@
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include"; USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include";
}; };
name = "Release Hockeyapp Internal"; name = ReleaseHockeyappInternal;
}; };
D05B076D21BFB9C900B1D27C /* ReleaseAppStore */ = { D05B076D21BFB9C900B1D27C /* ReleaseAppStore */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -1038,7 +1038,7 @@
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = ""; VERSION_INFO_PREFIX = "";
}; };
name = "Release AppStore"; name = ReleaseAppStore;
}; };
D05B076E21BFB9C900B1D27C /* ReleaseAppStore */ = { D05B076E21BFB9C900B1D27C /* ReleaseAppStore */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -1068,7 +1068,7 @@
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include"; USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include";
}; };
name = "Release AppStore"; name = ReleaseAppStore;
}; };
D05B076F21BFB9D200B1D27C /* ReleaseAppStoreLLC */ = { D05B076F21BFB9D200B1D27C /* ReleaseAppStoreLLC */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -1124,7 +1124,7 @@
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = ""; VERSION_INFO_PREFIX = "";
}; };
name = "Release AppStore LLC"; name = ReleaseAppStoreLLC;
}; };
D05B077021BFB9D200B1D27C /* ReleaseAppStoreLLC */ = { D05B077021BFB9D200B1D27C /* ReleaseAppStoreLLC */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
@ -1154,7 +1154,7 @@
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include"; USER_HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/FFMpeg/FFmpeg-iOS/include";
}; };
name = "Release AppStore LLC"; name = ReleaseAppStoreLLC;
}; };
/* End XCBuildConfiguration section */ /* End XCBuildConfiguration section */

46
FFMpeg/build-ffmpeg.sh
View File

@ -1,16 +1,5 @@
#!/bin/sh #!/bin/sh
if [ "$1" = "debug" ];
then
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-optimizations --disable-stripping"
elif [ "$1" = "release" ];
then
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-debug"
else
echo "No configuration specified (debug / release)"
exit 1
fi
ARCHS="$2" ARCHS="$2"
for ARCH in $ARCHS for ARCH in $ARCHS
@ -35,9 +24,7 @@ FAT="$BUILD_DIR/FFmpeg-iOS"
SCRATCH="$BUILD_DIR/scratch" SCRATCH="$BUILD_DIR/scratch"
THIN="$BUILD_DIR/thin" THIN="$BUILD_DIR/thin"
export PKG_CONFIG_PATH="$SOURCE_DIR/libopus" PKG_CONFIG="$SOURCE_DIR/pkg-config-wrapper.sh"
LIBOPUS="$SOURCE_DIR/libopus"
set -e set -e
@ -56,6 +43,20 @@ CONFIGURE_FLAGS="--enable-cross-compile --disable-programs \
--enable-parser=aac,h264,mp3,libopus \ --enable-parser=aac,h264,mp3,libopus \
" "
if [ "$1" = "debug" ];
then
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-optimizations --disable-stripping"
elif [ "$1" = "release" ];
then
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-debug"
else
echo "No configuration specified (debug / release)"
exit 1
fi
#CONFIGURE_FLAGS="$CONFIGURE_FLAGS --pkg-config=$PKG_CONFIG"
COMPILE="y" COMPILE="y"
LIPO="y" LIPO="y"
@ -97,6 +98,19 @@ then
mkdir -p "$SCRATCH/$ARCH" mkdir -p "$SCRATCH/$ARCH"
cd "$SCRATCH/$ARCH" cd "$SCRATCH/$ARCH"
LIBOPUS_TARGET_PATH="$SCRATCH/$ARCH"
LIBOPUS_PATH="$LIBOPUS_TARGET_PATH/libopus"
rm -rf "$LIBOPUS_PATH"
cp -R "$SOURCE_DIR/libopus" "$LIBOPUS_TARGET_PATH"
echo "prefix=\"$LIBOPUS_PATH\"" > "$LIBOPUS_PATH/opus.pc"
printf "\n" >> "$LIBOPUS_PATH/opus.pc"
cat "$SOURCE_DIR/libopus/opus.pc" >> "$LIBOPUS_PATH/opus.pc"
echo "LIBOPUS_TARGET_PATH = $LIBOPUS_TARGET_PATH"
export PKG_CONFIG_PATH="$LIBOPUS_PATH"
echo "PKG_CONFIG_PATH = $PKG_CONFIG_PATH"
CFLAGS="-arch $ARCH" CFLAGS="-arch $ARCH"
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ] if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]
then then
@ -149,7 +163,9 @@ then
echo "$CONFIGURE_FLAGS" > "$CONFIGURED_MARKER" echo "$CONFIGURE_FLAGS" > "$CONFIGURED_MARKER"
fi fi
make -j20 install $EXPORT || exit 1 CORE_COUNT=`sysctl -n hw.logicalcpu`
make -j$CORE_COUNT install $EXPORT || exit 1
cd "$CWD" cd "$CWD"
done done
fi fi

3
FFMpeg/libopus/opus.pc
View File

@ -1,7 +1,6 @@
prefix=/Users/peter/build/ffmpeg/libopus
exec_prefix=${prefix} exec_prefix=${prefix}
includedir=${prefix}/include includedir=${prefix}/include
libdir=${exec_prefix}/lib libdir=${prefix}/lib
Name: Opus Name: Opus
Description: The Opus library Description: The Opus library