contrib: bghudappkit: fix building with Xcode 5

Also overwrite previously installed headers

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

diff --git a/contrib/src/bghudappkit/bghudappkit-xcode4.patch b/contrib/src/bghudappkit/bghudappkit-xcode4.patch
deleted file mode 100644 (file)
index 788d3c7..0000000
--- a/contrib/src/bghudappkit/bghudappkit-xcode4.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-diff -ru bghudappkit/BGHUDAppKit.xcodeproj/project.pbxproj bghudappkit-fixed/BGHUDAppKit.xcodeproj/project.pbxproj
---- bghudappkit/BGHUDAppKit.xcodeproj/project.pbxproj  2012-08-19 13:14:17.000000000 +0200
-+++ bghudappkit-fixed/BGHUDAppKit.xcodeproj/project.pbxproj    2012-08-28 17:40:22.000000000 +0200
-@@ -3,7 +3,7 @@
-       archiveVersion = 1;
-       classes = {
-       };
--      objectVersion = 45;
-+      objectVersion = 46;
-       objects = {
- 
- /* Begin PBXAggregateTarget section */
-@@ -823,8 +823,11 @@
- /* Begin PBXProject section */
-               0259C573FE90428111CA0C5A /* Project object */ = {
-                       isa = PBXProject;
-+                      attributes = {
-+                              LastUpgradeCheck = 0450;
-+                      };
-                       buildConfigurationList = C056398B08A954F8003078D8 /* Build configuration list for PBXProject "BGHUDAppKit" */;
--                      compatibilityVersion = "Xcode 3.1";
-+                      compatibilityVersion = "Xcode 3.2";
-                       developmentRegion = English;
-                       hasScannedForEncodings = 1;
-                       knownRegions = (
-@@ -1017,17 +1020,19 @@
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               LLVM_LTO = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 10.5;
--                              PREBINDING = NO;
--                              SDKROOT = macosx10.6;
-+                              SDKROOT = macosx;
-                       };
-                       name = Release_10.6_10.5_32_64_GC_embed;
-               };
-               3D9BABC01166D18F008CEA8B /* Release_10.6_10.5_32_64_GC_embed */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-+                              COMBINE_HIDPI_IMAGES = YES;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                               GCC_MODEL_TUNING = G5;
-+                              MACOSX_DEPLOYMENT_TARGET = 10.6;
-                               PRODUCT_NAME = All;
-+                              SDKROOT = "";
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-@@ -1039,6 +1044,7 @@
-               3D9BABC11166D18F008CEA8B /* Release_10.6_10.5_32_64_GC_embed */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-+                              COMBINE_HIDPI_IMAGES = YES;
-                               CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)/BGHUDAppKit.framework/Resources/";
-                               CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)";
-                               COPY_PHASE_STRIP = NO;
-@@ -1058,6 +1064,7 @@
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "@loader_path/../Frameworks";
-                               PRODUCT_NAME = BGHUDAppKitPlugin;
-+                              SDKROOT = "";
-                               WRAPPER_EXTENSION = ibplugin;
-                       };
-                       name = Release_10.6_10.5_32_64_GC_embed;
-@@ -1065,6 +1072,7 @@
-               3D9BABC21166D18F008CEA8B /* Release_10.6_10.5_32_64_GC_embed */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-+                              COMBINE_HIDPI_IMAGES = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               DEPLOYMENT_POSTPROCESSING = YES;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-@@ -1082,6 +1090,7 @@
-                                       0xb0000000,
-                               );
-                               PRODUCT_NAME = BGHUDAppKit;
-+                              SDKROOT = "";
-                               SEPARATE_STRIP = YES;
-                               SKIP_INSTALL = NO;
-                               STRIP_INSTALLED_PRODUCT = YES;
-@@ -1092,12 +1101,12 @@
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-+                              COMBINE_HIDPI_IMAGES = YES;
-                               COPY_PHASE_STRIP = NO;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               FRAMEWORK_VERSION = A;
-                               GCC_DYNAMIC_NO_PIC = NO;
--                              GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_ENABLE_OBJC_GC = supported;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-@@ -1125,11 +1134,13 @@
-                               GCC_WARN_UNUSED_VALUE = NO;
-                               INFOPLIST_FILE = "BGHUDAppKitFramework-Info.plist";
-                               INSTALL_PATH = "@executable_path/../Frameworks";
-+                              MACOSX_DEPLOYMENT_TARGET = 10.6;
-                               OTHER_LDFLAGS = (
-                                       "-seg1addr",
-                                       0xb0440100,
-                               );
-                               PRODUCT_NAME = BGHUDAppKit;
-+                              SDKROOT = "";
-                               SKIP_INSTALL = NO;
-                       };
-                       name = Debug;
-@@ -1138,6 +1149,7 @@
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-+                              COMBINE_HIDPI_IMAGES = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               DEPLOYMENT_POSTPROCESSING = YES;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-@@ -1150,11 +1162,13 @@
-                               INFOPLIST_FILE = "BGHUDAppKitFramework-Info.plist";
-                               INSTALL_PATH = "@executable_path/../Frameworks";
-                               LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
-+                              MACOSX_DEPLOYMENT_TARGET = 10.6;
-                               OTHER_LDFLAGS = (
-                                       "-seg1addr",
-                                       0xb0000000,
-                               );
-                               PRODUCT_NAME = BGHUDAppKit;
-+                              SDKROOT = "";
-                               SEPARATE_STRIP = YES;
-                               SKIP_INSTALL = NO;
-                               STRIP_INSTALLED_PRODUCT = YES;
-@@ -1165,6 +1179,7 @@
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-+                              COMBINE_HIDPI_IMAGES = YES;
-                               CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)/BGHUDAppKit.framework/Resources/";
-                               COPY_PHASE_STRIP = NO;
-                               FRAMEWORK_SEARCH_PATHS = (
-@@ -1177,14 +1192,15 @@
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(DEVELOPER_DIR)/Library/Frameworks\"";
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(BUILD_DIR)/$(CONFIGURATION)\"";
-                               GCC_DYNAMIC_NO_PIC = NO;
--                              GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_ENABLE_OBJC_GC = supported;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = BGHUDAppKitPlugin_Prefix.pch;
-                               INFOPLIST_FILE = Info.plist;
-+                              MACOSX_DEPLOYMENT_TARGET = 10.6;
-                               PRODUCT_NAME = BGHUDAppKitPlugin;
-+                              SDKROOT = "";
-                               WRAPPER_EXTENSION = ibplugin;
-                               ZERO_LINK = YES;
-                       };
-@@ -1194,6 +1210,7 @@
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-+                              COMBINE_HIDPI_IMAGES = YES;
-                               CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)/BGHUDAppKit.framework/Resources/";
-                               CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)";
-                               COPY_PHASE_STRIP = NO;
-@@ -1213,7 +1230,9 @@
-                               GCC_PREFIX_HEADER = BGHUDAppKitPlugin_Prefix.pch;
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "@loader_path/../Frameworks";
-+                              MACOSX_DEPLOYMENT_TARGET = 10.6;
-                               PRODUCT_NAME = BGHUDAppKitPlugin;
-+                              SDKROOT = "";
-                               WRAPPER_EXTENSION = ibplugin;
-                       };
-                       name = Release;
-@@ -1221,12 +1240,14 @@
-               C056398808A954F8003078D8 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-+                              COMBINE_HIDPI_IMAGES = YES;
-                               COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
--                              GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-+                              MACOSX_DEPLOYMENT_TARGET = 10.6;
-                               PRODUCT_NAME = All;
-+                              SDKROOT = "";
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-@@ -1239,9 +1260,12 @@
-               C056398908A954F8003078D8 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-+                              COMBINE_HIDPI_IMAGES = YES;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                               GCC_MODEL_TUNING = G5;
-+                              MACOSX_DEPLOYMENT_TARGET = 10.6;
-                               PRODUCT_NAME = All;
-+                              SDKROOT = "";
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-@@ -1258,8 +1282,7 @@
-                               GCC_MODEL_TUNING = "";
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
--                              PREBINDING = NO;
--                              SDKROOT = macosx10.5;
-+                              SDKROOT = macosx;
-                       };
-                       name = Debug;
-               };
-@@ -1274,8 +1297,7 @@
-                               GCC_MODEL_TUNING = "";
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
--                              PREBINDING = NO;
--                              SDKROOT = macosx10.5;
-+                              SDKROOT = macosx;
-                       };
-                       name = Release;
-               };

diff --git a/contrib/src/bghudappkit/bghudappkit-xcode5.patch b/contrib/src/bghudappkit/bghudappkit-xcode5.patch
new file mode 100644 (file)
index 0000000..f746caf
--- /dev/null
+++ b/contrib/src/bghudappkit/bghudappkit-xcode5.patch
@@ -0,0 +1,144 @@
+--- a/BGHUDAppKit.xcodeproj/project.pbxproj    2014-06-25 19:36:42.000000000 -0400
++++ b/BGHUDAppKit.xcodeproj/project.pbxproj    2014-06-25 19:31:38.000000000 -0400
+@@ -823,6 +823,9 @@
+ /* Begin PBXProject section */
+               0259C573FE90428111CA0C5A /* Project object */ = {
+                       isa = PBXProject;
++                      attributes = {
++                              LastUpgradeCheck = 0510;
++                      };
+                       buildConfigurationList = C056398B08A954F8003078D8 /* Build configuration list for PBXProject "BGHUDAppKit" */;
+                       compatibilityVersion = "Xcode 3.1";
+                       developmentRegion = English;
+@@ -1009,7 +1012,7 @@
+               3D9BABBF1166D18F008CEA8B /* Release_10.6_10.5_32_64_GC_embed */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+-                              ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
++                              ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+                               GCC_ENABLE_OBJC_GC = supported;
+                               GCC_MODEL_TUNING = "";
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+@@ -1018,7 +1021,7 @@
+                               LLVM_LTO = YES;
+                               MACOSX_DEPLOYMENT_TARGET = 10.5;
+                               PREBINDING = NO;
+-                              SDKROOT = macosx10.6;
++                              SDKROOT = macosx;
+                       };
+                       name = Release_10.6_10.5_32_64_GC_embed;
+               };
+@@ -1026,6 +1029,7 @@
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
++                              GCC_ENABLE_OBJC_GC = disabled;
+                               GCC_MODEL_TUNING = G5;
+                               PRODUCT_NAME = All;
+                               WARNING_CFLAGS = (
+@@ -1051,7 +1055,7 @@
+                               FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(HOME)/Library/Frameworks/\"";
+                               FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(DEVELOPER_DIR)/Library/Frameworks\"";
+                               FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(BUILD_DIR)/$(CONFIGURATION)\"";
+-                              GCC_ENABLE_OBJC_GC = supported;
++                              GCC_ENABLE_OBJC_GC = disabled;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = BGHUDAppKitPlugin_Prefix.pch;
+@@ -1070,7 +1074,7 @@
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               FRAMEWORK_VERSION = A;
+-                              GCC_ENABLE_OBJC_GC = supported;
++                              GCC_ENABLE_OBJC_GC = disabled;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+@@ -1098,7 +1102,7 @@
+                               FRAMEWORK_VERSION = A;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+-                              GCC_ENABLE_OBJC_GC = supported;
++                              GCC_ENABLE_OBJC_GC = disabled;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+@@ -1143,7 +1147,7 @@
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               FRAMEWORK_VERSION = A;
+-                              GCC_ENABLE_OBJC_GC = supported;
++                              GCC_ENABLE_OBJC_GC = disabled;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+@@ -1178,7 +1182,7 @@
+                               FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(BUILD_DIR)/$(CONFIGURATION)\"";
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+-                              GCC_ENABLE_OBJC_GC = supported;
++                              GCC_ENABLE_OBJC_GC = disabled;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+@@ -1207,7 +1211,7 @@
+                               FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(HOME)/Library/Frameworks/\"";
+                               FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(DEVELOPER_DIR)/Library/Frameworks\"";
+                               FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(BUILD_DIR)/$(CONFIGURATION)\"";
+-                              GCC_ENABLE_OBJC_GC = supported;
++                              GCC_ENABLE_OBJC_GC = disabled;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = BGHUDAppKitPlugin_Prefix.pch;
+@@ -1224,6 +1228,7 @@
+                               COPY_PHASE_STRIP = NO;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
++                              GCC_ENABLE_OBJC_GC = disabled;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               PRODUCT_NAME = All;
+@@ -1240,6 +1245,7 @@
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
++                              GCC_ENABLE_OBJC_GC = disabled;
+                               GCC_MODEL_TUNING = G5;
+                               PRODUCT_NAME = All;
+                               WARNING_CFLAGS = (
+@@ -1253,29 +1259,26 @@
+               C056398C08A954F8003078D8 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+-                              ARCHS = "$(ARCHS_STANDARD_32_BIT)";
++                              ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+                               GCC_ENABLE_OBJC_GC = supported;
+                               GCC_MODEL_TUNING = "";
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
+                               GCC_WARN_UNUSED_VARIABLE = YES;
+                               PREBINDING = NO;
+-                              SDKROOT = macosx10.5;
++                              SDKROOT = macosx;
+                       };
+                       name = Debug;
+               };
+               C056398D08A954F8003078D8 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+-                              ARCHS = (
+-                                      ppc,
+-                                      i386,
+-                              );
++                              ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+                               GCC_ENABLE_OBJC_GC = supported;
+                               GCC_MODEL_TUNING = "";
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
+                               GCC_WARN_UNUSED_VARIABLE = YES;
+                               PREBINDING = NO;
+-                              SDKROOT = macosx10.5;
++                              SDKROOT = macosx;
+                       };
+                       name = Release;
+               };
+Only in bghudappkit-working/BGHUDAppKit.xcodeproj: project.xcworkspace
+Only in bghudappkit-working/: build

diff --git a/contrib/src/bghudappkit/rules.mak b/contrib/src/bghudappkit/rules.mak
index ee4daf95e1511c0cd5290463b8ec1175968a90c1..2c3605bcb2529ff2756ed2edc82c537a0eef2a90 100644 (file)
--- a/contrib/src/bghudappkit/rules.mak
+++ b/contrib/src/bghudappkit/rules.mak
@@ -17,11 +17,11 @@ $(TARBALLS)/bghudappkit-git.tar.xz:
 
 bghudappkit: bghudappkit-git.tar.xz .sum-bghudappkit
        $(UNPACK)
-       $(APPLY) $(SRC)/bghudappkit/bghudappkit-xcode4.patch
+       $(APPLY) $(SRC)/bghudappkit/bghudappkit-xcode5.patch
        $(MOVE)
 
 .bghudappkit: bghudappkit
        cd $< && xcodebuild $(XCODE_FLAGS)
        install -d $(PREFIX)
-       cd $< && cp -R build/Release/BGHUDAppKit.framework "$(PREFIX)"
+       cd $< && cp -rf build/Release/BGHUDAppKit.framework "$(PREFIX)"
        touch $@