[vlc-commits] contrib/bghudappkit: patch to upgrade the xcodeproj used for compilation

Felix Paul Kühne git at videolan.org
Thu Aug 30 17:03:17 CEST 2012


vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Aug 19 15:10:42 2012 +0200| [e4cc885a18e91e0b32066a0e5e403484d9be5afc] | committer: Felix Paul Kühne

contrib/bghudappkit: patch to upgrade the xcodeproj used for compilation
(cherry picked from commit 643d29c97c787139a1f8d45c5c756814635d92eb)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=e4cc885a18e91e0b32066a0e5e403484d9be5afc
---

 contrib/src/bghudappkit/bghudappkit-xcode4.patch |  204 ++++++++++++++++++++++
 contrib/src/bghudappkit/rules.mak                |    1 +
 2 files changed, 205 insertions(+)

diff --git a/contrib/src/bghudappkit/bghudappkit-xcode4.patch b/contrib/src/bghudappkit/bghudappkit-xcode4.patch
new file mode 100644
index 0000000..2ec2016
--- /dev/null
+++ b/contrib/src/bghudappkit/bghudappkit-xcode4.patch
@@ -0,0 +1,204 @@
+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-19 14:42:43.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;
+@@ -1130,6 +1139,7 @@
+ 					0xb0440100,
+ 				);
+ 				PRODUCT_NAME = BGHUDAppKit;
++				SDKROOT = "";
+ 				SKIP_INSTALL = NO;
+ 			};
+ 			name = Debug;
+@@ -1138,6 +1148,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;
+@@ -1155,6 +1166,7 @@
+ 					0xb0000000,
+ 				);
+ 				PRODUCT_NAME = BGHUDAppKit;
++				SDKROOT = "";
+ 				SEPARATE_STRIP = YES;
+ 				SKIP_INSTALL = NO;
+ 				STRIP_INSTALLED_PRODUCT = YES;
+@@ -1165,6 +1177,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,7 +1190,6 @@
+ 				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;
+@@ -1185,6 +1197,7 @@
+ 				GCC_PREFIX_HEADER = BGHUDAppKitPlugin_Prefix.pch;
+ 				INFOPLIST_FILE = Info.plist;
+ 				PRODUCT_NAME = BGHUDAppKitPlugin;
++				SDKROOT = "";
+ 				WRAPPER_EXTENSION = ibplugin;
+ 				ZERO_LINK = YES;
+ 			};
+@@ -1194,6 +1207,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;
+@@ -1214,6 +1228,7 @@
+ 				INFOPLIST_FILE = Info.plist;
+ 				INSTALL_PATH = "@loader_path/../Frameworks";
+ 				PRODUCT_NAME = BGHUDAppKitPlugin;
++				SDKROOT = "";
+ 				WRAPPER_EXTENSION = ibplugin;
+ 			};
+ 			name = Release;
+@@ -1221,12 +1236,13 @@
+ 		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;
+ 				PRODUCT_NAME = All;
++				SDKROOT = "";
+ 				WARNING_CFLAGS = (
+ 					"-Wmost",
+ 					"-Wno-four-char-constants",
+@@ -1239,9 +1255,11 @@
+ 		C056398908A954F8003078D8 /* Release */ = {
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
++				COMBINE_HIDPI_IMAGES = YES;
+ 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ 				GCC_MODEL_TUNING = G5;
+ 				PRODUCT_NAME = All;
++				SDKROOT = "";
+ 				WARNING_CFLAGS = (
+ 					"-Wmost",
+ 					"-Wno-four-char-constants",
+@@ -1258,8 +1276,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 +1291,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/rules.mak b/contrib/src/bghudappkit/rules.mak
index 0376d59..6212bf7 100644
--- a/contrib/src/bghudappkit/rules.mak
+++ b/contrib/src/bghudappkit/rules.mak
@@ -17,6 +17,7 @@ $(TARBALLS)/bghudappkit-git.tar.xz:
 
 bghudappkit: bghudappkit-git.tar.xz .sum-bghudappkit
 	$(UNPACK)
+	$(APPLY) $(SRC)/bghudappkit/bghudappkit-xcode4.patch
 	$(MOVE)
 
 .bghudappkit: bghudappkit



More information about the vlc-commits mailing list