Commit 6ab838a6 authored by Felix Paul Kühne's avatar Felix Paul Kühne

build script, xcodeproj and podspec: raise minimal versions for iOS and tvOS...

build script, xcodeproj and podspec: raise minimal versions for iOS and tvOS to support VideoToolbox in FFmpeg

On iOS, we require 8.0, on tvOS 10.2
parent 7e692a77
...@@ -1010,7 +1010,7 @@ ...@@ -1010,7 +1010,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/libvlc/vlc/include"; HEADER_SEARCH_PATHS = "$(SRCROOT)/libvlc/vlc/include";
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
OTHER_LIBTOOLFLAGS = "$(PROJECT_DIR)/libvlc/vlc/install-iPhone/core/libcompat.a $(PROJECT_DIR)/libvlc/vlc/install-iPhone/core/libvlc.a $(PROJECT_DIR)/libvlc/vlc/install-iPhone/core/libvlccore.a $(VLC_PLUGINS_LDFLAGS) $(OTHER_CFLAGS)"; OTHER_LIBTOOLFLAGS = "$(PROJECT_DIR)/libvlc/vlc/install-iPhone/core/libcompat.a $(PROJECT_DIR)/libvlc/vlc/install-iPhone/core/libvlc.a $(PROJECT_DIR)/libvlc/vlc/install-iPhone/core/libvlccore.a $(VLC_PLUGINS_LDFLAGS) $(OTHER_CFLAGS)";
PRODUCT_NAME = MobileVLCKit; PRODUCT_NAME = MobileVLCKit;
}; };
...@@ -1023,10 +1023,11 @@ ...@@ -1023,10 +1023,11 @@
GCC_C_LANGUAGE_STANDARD = c99; GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos; SDKROOT = iphoneos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
TVOS_DEPLOYMENT_TARGET = 10.2;
}; };
name = Release; name = Release;
}; };
...@@ -1070,7 +1071,7 @@ ...@@ -1070,7 +1071,7 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos; SDKROOT = appletvos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
TVOS_DEPLOYMENT_TARGET = 9.0; TVOS_DEPLOYMENT_TARGET = 10.2;
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
}; };
name = Release; name = Release;
...@@ -1122,7 +1123,7 @@ ...@@ -1122,7 +1123,7 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos; SDKROOT = appletvos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
TVOS_DEPLOYMENT_TARGET = 9.0; TVOS_DEPLOYMENT_TARGET = 10.2;
}; };
name = Debug; name = Debug;
}; };
...@@ -1133,10 +1134,11 @@ ...@@ -1133,10 +1134,11 @@
GCC_C_LANGUAGE_STANDARD = c99; GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos; SDKROOT = iphoneos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
TVOS_DEPLOYMENT_TARGET = 10.2;
}; };
name = Debug; name = Debug;
}; };
...@@ -1160,7 +1162,7 @@ ...@@ -1160,7 +1162,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/libvlc/vlc/include"; HEADER_SEARCH_PATHS = "$(SRCROOT)/libvlc/vlc/include";
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
OTHER_LIBTOOLFLAGS = "$(PROJECT_DIR)/libvlc/vlc/install-iPhone/core/libcompat.a $(PROJECT_DIR)/libvlc/vlc/install-iPhone/core/libvlc.a $(PROJECT_DIR)/libvlc/vlc/install-iPhone/core/libvlccore.a $(VLC_PLUGINS_LDFLAGS) $(OTHER_CFLAGS)"; OTHER_LIBTOOLFLAGS = "$(PROJECT_DIR)/libvlc/vlc/install-iPhone/core/libcompat.a $(PROJECT_DIR)/libvlc/vlc/install-iPhone/core/libvlc.a $(PROJECT_DIR)/libvlc/vlc/install-iPhone/core/libvlccore.a $(VLC_PLUGINS_LDFLAGS) $(OTHER_CFLAGS)";
PRODUCT_NAME = MobileVLCKit; PRODUCT_NAME = MobileVLCKit;
}; };
...@@ -1432,7 +1434,7 @@ ...@@ -1432,7 +1434,7 @@
SDKROOT = appletvos; SDKROOT = appletvos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 3; TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0; TVOS_DEPLOYMENT_TARGET = 10.2;
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = ""; VERSION_INFO_PREFIX = "";
...@@ -1496,7 +1498,7 @@ ...@@ -1496,7 +1498,7 @@
SDKROOT = appletvos; SDKROOT = appletvos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 3; TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0; TVOS_DEPLOYMENT_TARGET = 10.2;
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = ""; VERSION_INFO_PREFIX = "";
}; };
...@@ -1540,7 +1542,7 @@ ...@@ -1540,7 +1542,7 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos; SDKROOT = appletvos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
TVOS_DEPLOYMENT_TARGET = 9.0; TVOS_DEPLOYMENT_TARGET = 10.2;
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
}; };
name = Release; name = Release;
...@@ -1590,7 +1592,7 @@ ...@@ -1590,7 +1592,7 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos; SDKROOT = appletvos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
TVOS_DEPLOYMENT_TARGET = 9.0; TVOS_DEPLOYMENT_TARGET = 10.2;
}; };
name = Debug; name = Debug;
}; };
......
...@@ -17,7 +17,7 @@ Pod::Spec.new do |s| ...@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
s.ios.vendored_framework = 'MobileVLCKit.framework' s.ios.vendored_framework = 'MobileVLCKit.framework'
s.source_files = 'MobileVLCKit.framework/Headers/*.h' s.source_files = 'MobileVLCKit.framework/Headers/*.h'
s.public_header_files = 'MobileVLCKit.framework/Headers/*.h' s.public_header_files = 'MobileVLCKit.framework/Headers/*.h'
s.ios.deployment_target = '7.0' s.ios.deployment_target = '8.0'
s.frameworks = 'QuartzCore', 'CoreText', 'AVFoundation', 'Security', 'CFNetwork', 'AudioToolbox', 'OpenGLES', 'CoreGraphics', 'VideoToolbox', 'CoreMedia' s.frameworks = 'QuartzCore', 'CoreText', 'AVFoundation', 'Security', 'CFNetwork', 'AudioToolbox', 'OpenGLES', 'CoreGraphics', 'VideoToolbox', 'CoreMedia'
s.libraries = 'c++', 'xml2', 'z', 'bz2', 'iconv' s.libraries = 'c++', 'xml2', 'z', 'bz2', 'iconv'
s.requires_arc = false s.requires_arc = false
......
...@@ -17,7 +17,7 @@ Pod::Spec.new do |s| ...@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
s.ios.vendored_framework = 'MobileVLCKit.framework' s.ios.vendored_framework = 'MobileVLCKit.framework'
s.source_files = 'MobileVLCKit.framework/Headers/*.h' s.source_files = 'MobileVLCKit.framework/Headers/*.h'
s.public_header_files = 'MobileVLCKit.framework/Headers/*.h' s.public_header_files = 'MobileVLCKit.framework/Headers/*.h'
s.ios.deployment_target = '7.0' s.ios.deployment_target = '8.0'
s.frameworks = 'QuartzCore', 'CoreText', 'AVFoundation', 'Security', 'CFNetwork', 'AudioToolbox', 'OpenGLES', 'CoreGraphics', 'VideoToolbox', 'CoreMedia' s.frameworks = 'QuartzCore', 'CoreText', 'AVFoundation', 'Security', 'CFNetwork', 'AudioToolbox', 'OpenGLES', 'CoreGraphics', 'VideoToolbox', 'CoreMedia'
s.libraries = 'c++', 'xml2', 'z', 'bz2', 'iconv' s.libraries = 'c++', 'xml2', 'z', 'bz2', 'iconv'
s.requires_arc = false s.requires_arc = false
......
...@@ -741,7 +741,7 @@ ...@@ -741,7 +741,7 @@
); );
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
MACOSX_DEPLOYMENT_TARGET = 10.13; MACOSX_DEPLOYMENT_TARGET = 10.9;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
OTHER_LIBTOOLFLAGS = "$(PROJECT_DIR)/libvlc/vlc/install-MacOSX/x86_64/lib/libvlccore.a $(PROJECT_DIR)/libvlc/vlc/install-MacOSX/x86_64/lib/libvlc.a $(PROJECT_DIR)/libvlc/vlc/install-MacOSX/x86_64/lib/vlc/libcompat.a $(VLC_PLUGINS_LDFLAGS)"; OTHER_LIBTOOLFLAGS = "$(PROJECT_DIR)/libvlc/vlc/install-MacOSX/x86_64/lib/libvlccore.a $(PROJECT_DIR)/libvlc/vlc/install-MacOSX/x86_64/lib/libvlc.a $(PROJECT_DIR)/libvlc/vlc/install-MacOSX/x86_64/lib/vlc/libcompat.a $(VLC_PLUGINS_LDFLAGS)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
...@@ -778,7 +778,7 @@ ...@@ -778,7 +778,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11; GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
MACOSX_DEPLOYMENT_TARGET = 10.13; MACOSX_DEPLOYMENT_TARGET = 10.9;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LIBTOOLFLAGS = "$(PROJECT_DIR)/libvlc/vlc/install-MacOSX/x86_64/lib/libvlccore.a $(PROJECT_DIR)/libvlc/vlc/install-MacOSX/x86_64/lib/libvlc.a $(PROJECT_DIR)/libvlc/vlc/install-MacOSX/x86_64/lib/vlc/libcompat.a $(VLC_PLUGINS_LDFLAGS)"; OTHER_LIBTOOLFLAGS = "$(PROJECT_DIR)/libvlc/vlc/install-MacOSX/x86_64/lib/libvlccore.a $(PROJECT_DIR)/libvlc/vlc/install-MacOSX/x86_64/lib/libvlc.a $(PROJECT_DIR)/libvlc/vlc/install-MacOSX/x86_64/lib/vlc/libcompat.a $(VLC_PLUGINS_LDFLAGS)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
......
...@@ -9,7 +9,7 @@ BUILD_SIMULATOR=yes ...@@ -9,7 +9,7 @@ BUILD_SIMULATOR=yes
BUILD_STATIC_FRAMEWORK=no BUILD_STATIC_FRAMEWORK=no
BUILD_DYNAMIC_FRAMEWORK=no BUILD_DYNAMIC_FRAMEWORK=no
SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version` SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version`
SDK_MIN=7.0 SDK_MIN=8.0
VERBOSE=no VERBOSE=no
DEBUG=no DEBUG=no
CONFIGURATION="Release" CONFIGURATION="Release"
...@@ -102,7 +102,7 @@ do ...@@ -102,7 +102,7 @@ do
IOS=no IOS=no
BITCODE=yes BITCODE=yes
SDK_VERSION=`xcrun --sdk appletvos --show-sdk-version` SDK_VERSION=`xcrun --sdk appletvos --show-sdk-version`
SDK_MIN=9.0 SDK_MIN=10.2
OSVERSIONMINCFLAG=mtvos-version-min OSVERSIONMINCFLAG=mtvos-version-min
OSVERSIONMINLDFLAG=tvos_version_min OSVERSIONMINLDFLAG=tvos_version_min
;; ;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment