Commit da580de6 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Add TVVLCKit

parent 8ff9e574
......@@ -3,8 +3,10 @@
*.pbxuser
xcuserdata
project.xcworkspace
MobileVLCKit/vlc-plugins.xcconfig
MobileVLCKit/vlc-plugins.h
MobileVLCKit/vlc-plugins-AppleTV.h
MobileVLCKit/vlc-plugins-AppleTV.xcconfig
MobileVLCKit/vlc-plugins-iPhone.h
MobileVLCKit/vlc-plugins-iPhone.xcconfig
.DS_Store
build
/vlc-unstable
......
......@@ -23,6 +23,25 @@
7A5ECB5811DE961700F66AF3 /* VLCMediaPlayer.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAD711DE8FAB00F66AF3 /* VLCMediaPlayer.h */; };
7A5ECB5911DE961700F66AF3 /* VLCTime.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAD811DE8FAB00F66AF3 /* VLCTime.h */; };
7A5ECB9E11DE975A00F66AF3 /* MobileVLCKit.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECB9D11DE975700F66AF3 /* MobileVLCKit.h */; };
7D13295C1BA304D900BE647E /* TVVLCKit.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7D13295B1BA304D900BE647E /* TVVLCKit.h */; };
7D1329621BA3056800BE647E /* VLCEventManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A5ECAC411DE8F7300F66AF3 /* VLCEventManager.m */; };
7D1329631BA3056800BE647E /* VLCLibrary.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A5ECAC511DE8F7300F66AF3 /* VLCLibrary.m */; };
7D1329641BA3056800BE647E /* VLCMedia.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A5ECAC611DE8F7300F66AF3 /* VLCMedia.m */; };
7D1329651BA3056800BE647E /* VLCMediaList.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A5ECAC711DE8F7300F66AF3 /* VLCMediaList.m */; };
7D1329661BA3056800BE647E /* VLCMediaPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A5ECAC811DE8F7300F66AF3 /* VLCMediaPlayer.m */; };
7D1329671BA3056800BE647E /* VLCMediaListPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D5F8009185B72EB00C2CD75 /* VLCMediaListPlayer.m */; };
7D1329681BA3056800BE647E /* VLCMediaThumbnailer.m in Sources */ = {isa = PBXBuildFile; fileRef = 636E975711EBC67A002FE8A9 /* VLCMediaThumbnailer.m */; };
7D1329691BA3056800BE647E /* VLCMediaDiscoverer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6360B0E111E7F0C000EAD790 /* VLCMediaDiscoverer.m */; };
7D13296A1BA3056800BE647E /* VLCTime.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A5ECAC911DE8F7300F66AF3 /* VLCTime.m */; };
7D13296B1BA3057D00BE647E /* VLCLibrary.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7A5ECAD411DE8FAB00F66AF3 /* VLCLibrary.h */; };
7D13296C1BA3057D00BE647E /* VLCMedia.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7A5ECAD511DE8FAB00F66AF3 /* VLCMedia.h */; };
7D13296D1BA3057D00BE647E /* VLCMediaThumbnailer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 636E979011EBC96D002FE8A9 /* VLCMediaThumbnailer.h */; };
7D13296E1BA3057D00BE647E /* VLCMediaList.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7A5ECAD611DE8FAB00F66AF3 /* VLCMediaList.h */; };
7D13296F1BA3057E00BE647E /* VLCMediaPlayer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7A5ECAD711DE8FAB00F66AF3 /* VLCMediaPlayer.h */; };
7D1329701BA3057E00BE647E /* VLCMediaListPlayer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7D5F800B185B730F00C2CD75 /* VLCMediaListPlayer.h */; };
7D1329711BA3057E00BE647E /* VLCMediaDiscoverer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6360B0E311E7F0D300EAD790 /* VLCMediaDiscoverer.h */; };
7D1329721BA3057E00BE647E /* VLCTime.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7A5ECAD811DE8FAB00F66AF3 /* VLCTime.h */; };
7D1329741BA305A200BE647E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D1329731BA305A200BE647E /* Foundation.framework */; };
7D5F800A185B72EB00C2CD75 /* VLCMediaListPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D5F8009185B72EB00C2CD75 /* VLCMediaListPlayer.m */; };
7D5F800C185B733800C2CD75 /* VLCMediaListPlayer.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 7D5F800B185B730F00C2CD75 /* VLCMediaListPlayer.h */; };
7D89392C1B500D1C008F2B14 /* DynamicMobileVLCKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 7D89392B1B500D1C008F2B14 /* DynamicMobileVLCKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
......@@ -60,7 +79,6 @@
7DDC02101B501ECF0078FC84 /* VLCMediaListPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 7D5F800B185B730F00C2CD75 /* VLCMediaListPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
7DDC02111B501ECF0078FC84 /* VLCMediaDiscoverer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6360B0E311E7F0D300EAD790 /* VLCMediaDiscoverer.h */; settings = {ATTRIBUTES = (Public, ); }; };
7DDC02121B501ECF0078FC84 /* VLCTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAD811DE8FAB00F66AF3 /* VLCTime.h */; settings = {ATTRIBUTES = (Public, ); }; };
7DDC02141B501ED70078FC84 /* vlc-plugins.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECB3411DE94D600F66AF3 /* vlc-plugins.h */; settings = {ATTRIBUTES = (Private, ); }; };
7DDC02151B501ED70078FC84 /* VLCLibVLCBridging.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAE411DE8FEF00F66AF3 /* VLCLibVLCBridging.h */; settings = {ATTRIBUTES = (Private, ); }; };
7DDC02161B501ED70078FC84 /* VLCEventManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A5ECAE511DE8FEF00F66AF3 /* VLCEventManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
......@@ -86,6 +104,24 @@
name = "Copy Headers";
runOnlyForDeploymentPostprocessing = 0;
};
7D1329571BA304D900BE647E /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "$(PRODUCT_NAME)";
dstSubfolderSpec = 16;
files = (
7D13295C1BA304D900BE647E /* TVVLCKit.h in CopyFiles */,
7D13296B1BA3057D00BE647E /* VLCLibrary.h in CopyFiles */,
7D13296C1BA3057D00BE647E /* VLCMedia.h in CopyFiles */,
7D13296D1BA3057D00BE647E /* VLCMediaThumbnailer.h in CopyFiles */,
7D13296E1BA3057D00BE647E /* VLCMediaList.h in CopyFiles */,
7D13296F1BA3057E00BE647E /* VLCMediaPlayer.h in CopyFiles */,
7D1329701BA3057E00BE647E /* VLCMediaListPlayer.h in CopyFiles */,
7D1329711BA3057E00BE647E /* VLCMediaDiscoverer.h in CopyFiles */,
7D1329721BA3057E00BE647E /* VLCTime.h in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
7D89394C1B500DBC008F2B14 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
......@@ -115,9 +151,14 @@
7A5ECAD811DE8FAB00F66AF3 /* VLCTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCTime.h; path = Headers/Public/VLCTime.h; sourceTree = "<group>"; };
7A5ECAE411DE8FEF00F66AF3 /* VLCLibVLCBridging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCLibVLCBridging.h; path = Headers/Internal/VLCLibVLCBridging.h; sourceTree = "<group>"; };
7A5ECAE511DE8FEF00F66AF3 /* VLCEventManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCEventManager.h; path = Headers/Internal/VLCEventManager.h; sourceTree = "<group>"; };
7A5ECB3411DE94D600F66AF3 /* vlc-plugins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "vlc-plugins.h"; path = "MobileVLCKit/vlc-plugins.h"; sourceTree = "<group>"; };
7A5ECB9D11DE975700F66AF3 /* MobileVLCKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MobileVLCKit.h; path = Headers/Public/MobileVLCKit.h; sourceTree = "<group>"; };
7D2DF7FF1B67828600FB78AB /* vlc-plugins.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "vlc-plugins.xcconfig"; path = "MobileVLCKit/vlc-plugins.xcconfig"; sourceTree = "<group>"; };
7D1329591BA304D900BE647E /* libTVVLCKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libTVVLCKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
7D13295B1BA304D900BE647E /* TVVLCKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TVVLCKit.h; sourceTree = "<group>"; };
7D1329731BA305A200BE647E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
7D1329751BA305D600BE647E /* vlc-plugins-AppleTV.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "vlc-plugins-AppleTV.xcconfig"; path = "MobileVLCKit/vlc-plugins-AppleTV.xcconfig"; sourceTree = "<group>"; };
7D1329761BA306DE00BE647E /* vlc-plugins-iPhone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "vlc-plugins-iPhone.h"; path = "MobileVLCKit/vlc-plugins-iPhone.h"; sourceTree = "<group>"; };
7D1329771BA306E600BE647E /* vlc-plugins-AppleTV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "vlc-plugins-AppleTV.h"; path = "MobileVLCKit/vlc-plugins-AppleTV.h"; sourceTree = "<group>"; };
7D1329791BA3074100BE647E /* vlc-plugins-iPhone.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "vlc-plugins-iPhone.xcconfig"; path = "MobileVLCKit/vlc-plugins-iPhone.xcconfig"; sourceTree = "<group>"; };
7D5F8009185B72EB00C2CD75 /* VLCMediaListPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCMediaListPlayer.m; path = Sources/VLCMediaListPlayer.m; sourceTree = "<group>"; };
7D5F800B185B730F00C2CD75 /* VLCMediaListPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMediaListPlayer.h; path = Headers/Public/VLCMediaListPlayer.h; sourceTree = "<group>"; };
7D8938BB1B5008E9008F2B14 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
......@@ -146,6 +187,14 @@
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
7D1329561BA304D900BE647E /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
7D1329741BA305A200BE647E /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
7D8939231B500D1C008F2B14 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
......@@ -193,6 +242,7 @@
D2AAC07E0554694100DB518D /* libMobileVLCKit.a */,
7D8939271B500D1C008F2B14 /* DynamicMobileVLCKit.framework */,
7D89394E1B500DBC008F2B14 /* libStaticLibVLC.a */,
7D1329591BA304D900BE647E /* libTVVLCKit.a */,
);
name = Products;
sourceTree = "<group>";
......@@ -206,6 +256,7 @@
7D8938B91B5008E9008F2B14 /* MobileVLCKit-dynamic */,
7D8939281B500D1C008F2B14 /* DynamicMobileVLCKit */,
7D89394F1B500DBC008F2B14 /* StaticLibVLC */,
7D13295A1BA304D900BE647E /* TVVLCKit */,
0867D69AFE84028FC02AAC07 /* Frameworks */,
034768DFFF38A50411DB9C8B /* Products */,
);
......@@ -215,6 +266,7 @@
0867D69AFE84028FC02AAC07 /* Frameworks */ = {
isa = PBXGroup;
children = (
7D1329731BA305A200BE647E /* Foundation.framework */,
7D8939031B5009E2008F2B14 /* libiconv.dylib */,
7D8939011B5009DD008F2B14 /* CoreFoundation.framework */,
7D8938FF1B5009D8008F2B14 /* libc++.dylib */,
......@@ -253,8 +305,9 @@
32C88DFF0371C24200C91783 /* Other Sources */ = {
isa = PBXGroup;
children = (
7D2DF7FF1B67828600FB78AB /* vlc-plugins.xcconfig */,
7D1329791BA3074100BE647E /* vlc-plugins-iPhone.xcconfig */,
AA747D9E0F9514B9006C5449 /* MobileVLCKit_Prefix.pch */,
7D1329751BA305D600BE647E /* vlc-plugins-AppleTV.xcconfig */,
);
name = "Other Sources";
sourceTree = "<group>";
......@@ -279,13 +332,22 @@
7A5ECAE311DE8FDF00F66AF3 /* Internal */ = {
isa = PBXGroup;
children = (
7A5ECB3411DE94D600F66AF3 /* vlc-plugins.h */,
7D1329761BA306DE00BE647E /* vlc-plugins-iPhone.h */,
7D1329771BA306E600BE647E /* vlc-plugins-AppleTV.h */,
7A5ECAE411DE8FEF00F66AF3 /* VLCLibVLCBridging.h */,
7A5ECAE511DE8FEF00F66AF3 /* VLCEventManager.h */,
);
name = Internal;
sourceTree = "<group>";
};
7D13295A1BA304D900BE647E /* TVVLCKit */ = {
isa = PBXGroup;
children = (
7D13295B1BA304D900BE647E /* TVVLCKit.h */,
);
path = TVVLCKit;
sourceTree = "<group>";
};
7D8938B91B5008E9008F2B14 /* MobileVLCKit-dynamic */ = {
isa = PBXGroup;
children = (
......@@ -343,7 +405,6 @@
7DDC02101B501ECF0078FC84 /* VLCMediaListPlayer.h in Headers */,
7DDC02111B501ECF0078FC84 /* VLCMediaDiscoverer.h in Headers */,
7DDC02121B501ECF0078FC84 /* VLCTime.h in Headers */,
7DDC02141B501ED70078FC84 /* vlc-plugins.h in Headers */,
7DDC02151B501ED70078FC84 /* VLCLibVLCBridging.h in Headers */,
7DDC02161B501ED70078FC84 /* VLCEventManager.h in Headers */,
);
......@@ -352,6 +413,23 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
7D1329581BA304D900BE647E /* TVVLCKit */ = {
isa = PBXNativeTarget;
buildConfigurationList = 7D1329611BA304D900BE647E /* Build configuration list for PBXNativeTarget "TVVLCKit" */;
buildPhases = (
7D1329551BA304D900BE647E /* Sources */,
7D1329571BA304D900BE647E /* CopyFiles */,
7D1329561BA304D900BE647E /* Frameworks */,
);
buildRules = (
);
dependencies = (
);
name = TVVLCKit;
productName = TVVLCKit;
productReference = 7D1329591BA304D900BE647E /* libTVVLCKit.a */;
productType = "com.apple.product-type.library.static";
};
7D8939261B500D1C008F2B14 /* DynamicMobileVLCKit */ = {
isa = PBXNativeTarget;
buildConfigurationList = 7D89393A1B500D1D008F2B14 /* Build configuration list for PBXNativeTarget "DynamicMobileVLCKit" */;
......@@ -412,6 +490,9 @@
attributes = {
LastUpgradeCheck = 0420;
TargetAttributes = {
7D1329581BA304D900BE647E = {
CreatedOnToolsVersion = 7.1;
};
7D8939261B500D1C008F2B14 = {
CreatedOnToolsVersion = 6.4;
};
......@@ -435,6 +516,7 @@
D2AAC07D0554694100DB518D /* MobileVLCKit */,
7D8939261B500D1C008F2B14 /* DynamicMobileVLCKit */,
7D89394D1B500DBC008F2B14 /* StaticLibVLC */,
7D1329581BA304D900BE647E /* TVVLCKit */,
);
};
/* End PBXProject section */
......@@ -450,6 +532,22 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
7D1329551BA304D900BE647E /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
7D1329621BA3056800BE647E /* VLCEventManager.m in Sources */,
7D1329631BA3056800BE647E /* VLCLibrary.m in Sources */,
7D1329641BA3056800BE647E /* VLCMedia.m in Sources */,
7D1329651BA3056800BE647E /* VLCMediaList.m in Sources */,
7D1329661BA3056800BE647E /* VLCMediaPlayer.m in Sources */,
7D1329671BA3056800BE647E /* VLCMediaListPlayer.m in Sources */,
7D1329681BA3056800BE647E /* VLCMediaThumbnailer.m in Sources */,
7D1329691BA3056800BE647E /* VLCMediaDiscoverer.m in Sources */,
7D13296A1BA3056800BE647E /* VLCTime.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
7D8939221B500D1C008F2B14 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
......@@ -495,7 +593,7 @@
/* Begin XCBuildConfiguration section */
1DEB922008733DC00010E9CD /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7D2DF7FF1B67828600FB78AB /* vlc-plugins.xcconfig */;
baseConfigurationReference = 7D1329791BA3074100BE647E /* vlc-plugins-iPhone.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = (
......@@ -513,7 +611,7 @@
HEADER_SEARCH_PATHS = "$(SRCROOT)/MobileVLCKit/ImportedSources/vlc/include";
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
OTHER_LIBTOOLFLAGS = "$(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios/core/libcompat.a $(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios/core/libvlc.a $(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios/core/libvlccore.a $(VLC_PLUGINS_LDFLAGS) $(OTHER_CFLAGS)";
OTHER_LIBTOOLFLAGS = "$(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios-iPhone/core/libcompat.a $(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios-iPhone/core/libvlc.a $(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios-iPhone/core/libvlccore.a $(VLC_PLUGINS_LDFLAGS) $(OTHER_CFLAGS)";
PRODUCT_NAME = MobileVLCKit;
};
name = Release;
......@@ -532,6 +630,102 @@
};
name = Release;
};
7D13295F1BA304D900BE647E /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7D1329751BA305D600BE647E /* vlc-plugins-AppleTV.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = MobileVLCKit_Prefix.pch;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/MobileVLCKit/ImportedSources/vlc/include";
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = "-ObjC";
OTHER_LIBTOOLFLAGS = "$(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios-AppleTV/core/libcompat.a $(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios-AppleTV/core/libvlc.a $(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios-AppleTV/core/libvlccore.a $(VLC_PLUGINS_LDFLAGS) $(OTHER_CFLAGS)";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SKIP_INSTALL = YES;
TVOS_DEPLOYMENT_TARGET = 9.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
};
7D1329601BA304D900BE647E /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7D1329751BA305D600BE647E /* vlc-plugins-AppleTV.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = MobileVLCKit_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/MobileVLCKit/ImportedSources/vlc/include";
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
OTHER_LIBTOOLFLAGS = "$(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios-AppleTV/core/libcompat.a $(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios-AppleTV/core/libvlc.a $(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios-AppleTV/core/libvlccore.a $(VLC_PLUGINS_LDFLAGS) $(OTHER_CFLAGS)";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SKIP_INSTALL = YES;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Debug;
};
7D8938931B500013008F2B14 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
......@@ -548,7 +742,7 @@
};
7D8938941B500013008F2B14 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7D2DF7FF1B67828600FB78AB /* vlc-plugins.xcconfig */;
baseConfigurationReference = 7D1329791BA3074100BE647E /* vlc-plugins-iPhone.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = (
......@@ -566,7 +760,7 @@
HEADER_SEARCH_PATHS = "$(SRCROOT)/MobileVLCKit/ImportedSources/vlc/include";
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
OTHER_LIBTOOLFLAGS = "$(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios/core/libcompat.a $(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios/core/libvlc.a $(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios/core/libvlccore.a $(VLC_PLUGINS_LDFLAGS) $(OTHER_CFLAGS)";
OTHER_LIBTOOLFLAGS = "$(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios-iPhone/core/libcompat.a $(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios-iPhone/core/libvlc.a $(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc/install-ios-iPhone/core/libvlccore.a $(VLC_PLUGINS_LDFLAGS) $(OTHER_CFLAGS)";
PRODUCT_NAME = MobileVLCKit;
};
name = Debug;
......@@ -699,7 +893,7 @@
};
7D8939601B500DBC008F2B14 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7D2DF7FF1B67828600FB78AB /* vlc-plugins.xcconfig */;
baseConfigurationReference = 7D1329791BA3074100BE647E /* vlc-plugins-iPhone.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
......@@ -738,7 +932,7 @@
};
7D8939611B500DBC008F2B14 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7D2DF7FF1B67828600FB78AB /* vlc-plugins.xcconfig */;
baseConfigurationReference = 7D1329791BA3074100BE647E /* vlc-plugins-iPhone.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
......@@ -802,6 +996,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
7D1329611BA304D900BE647E /* Build configuration list for PBXNativeTarget "TVVLCKit" */ = {
isa = XCConfigurationList;
buildConfigurations = (
7D13295F1BA304D900BE647E /* Release */,
7D1329601BA304D900BE647E /* Debug */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
7D89393A1B500D1D008F2B14 /* Build configuration list for PBXNativeTarget "DynamicMobileVLCKit" */ = {
isa = XCConfigurationList;
buildConfigurations = (
......
From 89565c4b412d8db0c73f5c3e66b75c7f2cb9fc54 Mon Sep 17 00:00:00 2001
From 511e1f215608bedf9f72adcf87f5ce73c92ee375 Mon Sep 17 00:00:00 2001
From: David Geldreich <david.geldreich@free.fr>
Date: Fri, 20 Apr 2012 16:41:19 +0200
Subject: [PATCH 01/13] arm_neon: added function macro to handle the underscore
......
From 9684fd3703bd1e3d5bb08d0352c3a6188f98ae6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 19:58:40 +0200
Subject: [PATCH 1/2] src/misc: fix compilation for OS without fork()
---
src/misc/cpu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index 4a5f2a0..79b28e4 100644
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -63,7 +63,7 @@ static uint32_t cpu_flags;
#if defined (__i386__) || defined (__x86_64__) || defined (__powerpc__) \
|| defined (__ppc__) || defined (__ppc64__) || defined (__powerpc64__)
-# if !defined (_WIN32) && !defined (__OS2__)
+# if !defined (_WIN32) && !defined (__OS2__) && !defined (__APPLE__)
static bool vlc_CPU_check (const char *name, void (*func) (void))
{
pid_t pid = fork();
--
2.5.1
From 25263f49ca2f8438f567ed74051ad854894ad2a3 Mon Sep 17 00:00:00 2001
From fab89c00905a120d23d875056869241a091b9089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Aug 2012 16:02:07 +0200
Subject: [PATCH 02/13] deinterlace/merge: use a macro to fix compilation for
......
From 37a7ea8e90cc67762e237419f72195b83b9d1cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 11 Sep 2015 16:47:49 +0200
Subject: [PATCH 2/2] libvlc: remove daemon mode
---
src/interface/interface.c | 10 ++--------
src/libvlc-module.c | 15 ++-------------
src/libvlc.c | 48 -----------------------------------------------
3 files changed, 4 insertions(+), 69 deletions(-)
diff --git a/src/interface/interface.c b/src/interface/interface.c
index 4bc709a..8321654 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -197,14 +197,8 @@ int libvlc_InternalAddIntf(libvlc_int_t *libvlc, const char *name)
char *intf = var_InheritString(libvlc, "intf");
if (intf == NULL) /* "intf" has not been set */
{
-#if !defined(_WIN32) && !defined(__OS2__)
- char *pidfile = var_InheritString(libvlc, "pidfile");
- if (pidfile != NULL)
- free(pidfile);
- else
-#endif
- msg_Info(libvlc, _("Running vlc with the default interface. "
- "Use 'cvlc' to use vlc without interface."));
+ msg_Info(libvlc, _("Running vlc with the default interface. "
+ "Use 'cvlc' to use vlc without interface."));
}
ret = intf_Create(playlist, intf);
free(intf);
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index a13093d..1cdbdd5 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1030,14 +1030,6 @@ static const char *const ppsz_prefres[] = {
#define STATS_LONGTEXT N_( \
"Collect miscellaneous local statistics about the playing media.")
-#define DAEMON_TEXT N_("Run as daemon process")
-#define DAEMON_LONGTEXT N_( \
- "Runs VLC as a background daemon process.")
-
-#define PIDFILE_TEXT N_("Write process id to file")
-#define PIDFILE_LONGTEXT N_( \
- "Writes process id into specified file.")
-
#define ONEINSTANCE_TEXT N_("Allow only one running instance")
#if defined( _WIN32 ) || defined( __OS2__ )
#define ONEINSTANCE_LONGTEXT N_( \
@@ -2035,11 +2027,8 @@ vlc_module_begin ()
change_volatile ()
add_obsolete_string( "verbose-objects" ) /* since 2.1.0 */
#if !defined(_WIN32) && !defined(__OS2__)
- add_bool( "daemon", 0, DAEMON_TEXT, DAEMON_LONGTEXT, true )
- change_short('d')
-
- add_string( "pidfile", NULL, PIDFILE_TEXT, PIDFILE_LONGTEXT,
- false )
+ add_obsolete_bool( "daemon" )
+ add_obsolete_string( "pidfile" )
#endif
#if defined (_WIN32) || defined (__APPLE__)
diff --git a/src/libvlc.c b/src/libvlc.c
index 34824da..20c1f87 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -199,42 +199,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
return VLC_ENOMOD;
}
-#ifdef HAVE_DAEMON
- /* Check for daemon mode */
- if( var_InheritBool( p_libvlc, "daemon" ) )
- {
- if( daemon( 1, 0) != 0 )
- {
- msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" );
- vlc_LogDeinit (p_libvlc);
- module_EndBank (true);
- return VLC_ENOMEM;
- }
-
- /* lets check if we need to write the pidfile */
- char *pidfile = var_InheritString( p_libvlc, "pidfile" );
- if( pidfile != NULL )
- {
- FILE *stream = vlc_fopen( pidfile, "w" );
- if( stream != NULL )
- {
- fprintf( stream, "%d", (int)getpid() );
- fclose( stream );
- msg_Dbg( p_libvlc, "written PID file %s", pidfile );
- }
- else
- msg_Err( p_libvlc, "cannot write PID file %s: %s",
- pidfile, vlc_strerror_c(errno) );
- free( pidfile );
- }
- }
- else
- {
- var_Create( p_libvlc, "pidfile", VLC_VAR_STRING );
- var_SetString( p_libvlc, "pidfile", "" );
- }
-#endif
-
/* FIXME: could be replaced by using Unix sockets */
#ifdef HAVE_DBUS
@@ -511,18 +475,6 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
}
#endif
-#if !defined( _WIN32 ) && !defined( __OS2__ )
- char *pidfile = var_InheritString( p_libvlc, "pidfile" );
- if( pidfile != NULL )
- {
- msg_Dbg( p_libvlc, "removing PID file %s", pidfile );
- if( unlink( pidfile ) )
- msg_Warn( p_libvlc, "cannot remove PID file %s: %s",
- pidfile, vlc_strerror_c(errno) );
- free( pidfile );
- }
-#endif
-
if (priv->parser != NULL)
playlist_preparser_Delete(priv->parser);
--
2.5.1
From 5bb95788397dc4be5a497ed260497133392dba48 Mon Sep 17 00:00:00 2001
From 837dc0740a82c2c7cf734213ffc5e2b714a5775f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 29 May 2013 13:25:54 +0200
Subject: [PATCH 03/13] libass: fix text rendering on iOS by providing a font
......
From 211592b2a265569db5889e97d6c7eb9a111e4815 Mon Sep 17 00:00:00 2001
From ceba5188773cc8faeb3c8b95f451436becf8c7f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 22 Jan 2014 13:55:16 +0100
Subject: [PATCH 04/13] freetype: added a fake font lookup mechanism for iOS to
......
From ffc12c5e40be6990298cefd73d95be38f484ef56 Mon Sep 17 00:00:00 2001
From db872f03d5ddd2f86778de022846149d7dde93a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 9 Dec 2014 22:14:55 +0100
Subject: [PATCH 06/13] lib/media player: inherit deinterlace variable to
Subject: [PATCH 05/13] lib/media player: inherit deinterlace variable to
achieve correct value on first use
---
......
From 275aee51004bb7c934e787b9446a8d35f05f887d Mon Sep 17 00:00:00 2001
From e2967d6ac21dfc8b737ee815b00e7108b9d738c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 18 Feb 2015 21:35:16 +0100
Subject: [PATCH 07/13] arm_neon: work-around libtool issue
Subject: [PATCH 06/13] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......
From 13a062f670cc6c3d9f5c6167bd8be64bb14ccf43 Mon Sep 17 00:00:00 2001
From 6c281b6c77325bd1d4a123eed7fd79f2fb7f4935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 19 Jun 2015 15:26:06 +0200
Subject: [PATCH 08/13] libvlc/media: re-parse if flags changed
Subject: [PATCH 07/13] libvlc/media: re-parse if flags changed
---
lib/media.c | 6 ++++++
......
From b61af62ad15909d14676d5a2262a2d65b391e8e2 Mon Sep 17 00:00:00 2001
From 642d87c7a95a3192b272ffba4c6c5e69caac3503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 31 Mar 2014 17:54:01 +0200
Subject: [PATCH 09/13] libvlc: add preliminary code path to modify quartztext
Subject: [PATCH 08/13] libvlc: add preliminary code path to modify quartztext
variables on-the-fly
---
......@@ -45,10 +45,10 @@ index 0c7351b..b0b4208 100644
/** \defgroup libvlc_audio LibVLC audio controls
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index 487fcba..06c9826 100644
index a7e814b..97b153b 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -226,6 +226,8 @@ libvlc_video_get_spu_count
@@ -227,6 +227,8 @@ libvlc_video_get_spu_count
libvlc_video_get_spu_delay
libvlc_video_get_spu_description
libvlc_video_get_teletext
......@@ -57,7 +57,7 @@ index 487fcba..06c9826 100644
libvlc_video_get_title_description
libvlc_video_get_track
libvlc_video_get_track_count
@@ -250,6 +252,8 @@ libvlc_video_set_spu
@@ -251,6 +253,8 @@ libvlc_video_set_spu
libvlc_video_set_spu_delay
libvlc_video_set_subtitle_file
libvlc_video_set_teletext
......
From f5cebbdbdcbda90664b2daf3fbf727f060a1cca3 Mon Sep 17 00:00:00 2001
From c428a0b86fa8df8df9bf431ad4f504b03ef4b1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 14:04:52 +0200
Subject: [PATCH 12/13] arm_neon: fix iOS linking
Subject: [PATCH 09/13] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
......
From 397f6aead4e316e64f1ca220f407da274ddb6faf Mon Sep 17 00:00:00 2001
From f03186abd2d5483bdcf91afa139302435fbf79e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Jul 2015 19:57:18 +0200
Subject: [PATCH 13/13] disable neon volume plugin
Subject: [PATCH 10/13] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......
From 01143837e290318cad524bf3bbae18ae1989706c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 10 Sep 2015 13:40:26 +0200
Subject: [PATCH 10/13] libvlc media list player: attach observer after player
instance creation
---
lib/media_list_player.c | 1 +
1 file changed, 1 insertion(+)