Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

[osx/ios/atv2] Xcode5 fix #3419

Merged
merged 12 commits into from

3 participants

@amet

this, as the subject states, is the fix for ios7 and xcode5. it also adds some fixes for 10.9 SDK but we cannot build on 10.9 SDK yet, we need some SDL(2) love

below are jenkins results, all works fine ... @davilla @memphiz please check it out

http://jenkins.xbmc.org/view/Dashboard/job/XBMC-Android-ARM/723/
http://jenkins.xbmc.org/view/Dashboard/job/XBMC-LINUX-64/186/
http://jenkins.xbmc.org/view/Dashboard/job/XBMC-WIN-32/783/
http://jenkins.xbmc.org/view/Dashboard/job/XBMC-OSX-32/366/
http://jenkins.xbmc.org/view/Dashboard/job/XBMC-IOS-ATV2/663/

@Memphiz
Owner

@diederich for review too ...

@davilla
Collaborator

ok

@davilla
Collaborator

ok

@Memphiz
Owner

Alot of depend bumps - hopefully we can do those without bikeshedding about all platforms for weeks ;).

jenkins build this please

@Memphiz
Owner

Looks like build broke on LINUX64 because of a mirrorserver hickup - kicked one manually for linux64 to see if it is for real.

@Memphiz
Owner

I have uploaded the bumped tarballs for cmake, pkg-config and libgpg-error - you can switch to our mirror for those @amet.

@amet

@Memphiz it built ok before.. I'll remove hardcoded URLs and force push

@amet

@Memphiz done, urls switched

@Memphiz
Owner

one last time for the color lovers - jenkins build this please :)

@Memphiz Memphiz merged commit 4d9d287 into xbmc:master
@amet amet deleted the amet:xcode5_fix branch
@Memphiz

@amet do you remember where the "no-integrated-as" flag came from? Seems this breaks ios compilation when using current xcode5.1 (clang 503.0.40) (worked with older clang versions maybe ...) - still compiling with the removed flag but it looks promising so far ...

@Memphiz not sure, I just c/p shit around :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
4 lib/cpluff/configure.ac
@@ -109,7 +109,7 @@ if test "$enable_threads" != no; then
AC_LINK_IFELSE(
[AC_LANG_SOURCE([#include <pthread.h>
-int main(int argc, char *argv[]) {
+int main(int argc, char **argv) {
pthread_mutex_t mutex;
pthread_mutex_init(&mutex, NULL);
@@ -126,7 +126,7 @@ cp_threads=Posix], AC_MSG_RESULT([no]))
AC_LINK_IFELSE(
[AC_LANG_SOURCE([#include <windows.h>
-int main(int argc, char *argv[]) {
+int main(int argc, char **argv) {
CreateMutex(NULL, FALSE, NULL);
return 0;
}
View
2  tools/TexturePacker/XBTFWriter.cpp
@@ -23,7 +23,7 @@
#include <inttypes.h>
#include "guilib/XBTF.h"
#include "utils/EndianSwap.h"
-#if defined(TARGET_FREEBSD)
+#if defined(TARGET_FREEBSD) || defined(TARGET_DARWIN)
#include <stdlib.h>
#elif !defined(TARGET_DARWIN)
#include <malloc.h>
View
31 tools/depends/configure.in
@@ -164,16 +164,30 @@ case $host in
platform_cc=gcc-4.2
platform_cxx=g++-4.2
;;
- *)
+ 4.*.*)
platform_cc=llvm-gcc-4.2
platform_cxx=llvm-g++-4.2
+ ;;
+ *)
+ platform_cc=clang
+ platform_cxx=clang++
+ platform_cflags="-fheinous-gnu-extensions -no-cpp-precomp -no-integrated-as"
+ platform_ldflags="-Wl,-search_paths_first"
+ platform_cxxflags="-no-cpp-precomp"
;;
esac
case $host in
*86*-apple-darwin)
found_sdk_version=[`$use_xcodebuild -showsdks | grep macosx | sort | tail -n 1 | grep -oE 'macosx[0-9.0-9]+' | cut -c 7-$NF`]
+ case $use_xcode in
+ 5.* | 5.*.* )
+ use_toolchain="${use_xcodepath}/Toolchains/XcodeDefault.xctoolchain"
+ ;;
+ *)
+ use_toolchain="${use_toolchain:-$use_xcodepath}"
+ ;;
+ esac
use_sdk="${use_sdk:-$found_sdk_version}"
- use_toolchain="${use_toolchain:-$use_xcodepath}"
if test "$use_cpu" = "armv7"; then
AC_MSG_ERROR(error in configure of --with-arch=$use_cpu)
fi
@@ -182,6 +196,7 @@ case $host in
10.6);;
10.7);;
10.8);;
+ 10.9);;
*)
AC_MSG_ERROR(error in configure of --with-sdk=$use_sdk)
esac
@@ -217,11 +232,20 @@ case $host in
found_sdk_version=[`$use_xcodebuild -showsdks | grep iphoneos | sort | tail -n 1 | awk '{ print $2}'`]
use_sdk="${use_sdk:-$found_sdk_version}"
sdk_name=iphoneos$use_sdk
- use_toolchain="${use_toolchain:-`$use_xcodebuild -version -sdk $sdk_name PlatformPath`/Developer}"
+ case $use_xcode in
+ 5.* | 5.*.* )
+ use_toolchain="${use_xcodepath}/Toolchains/XcodeDefault.xctoolchain"
+ ;;
+ *)
+ use_toolchain="${use_toolchain:-`$use_xcodebuild -version -sdk $sdk_name PlatformPath`/Developer}"
+ ;;
+ esac
+
case $use_sdk in
4.*);;
5.*);;
6.*);;
+ 7.*);;
*)
AC_MSG_ERROR(error in configure of --with-sdk=$use_sdk)
;;
@@ -394,6 +418,7 @@ AC_SUBST(link_iconv)
AC_SUBST(need_libiconv)
AC_SUBST(use_gplv3)
AC_SUBST(has_libcrystax)
+AC_SUBST(use_xcode)
AC_OUTPUT
echo -e "toolchain:\t $use_toolchain"
View
2  tools/depends/native/cmake-native/Makefile
@@ -3,7 +3,7 @@ PLATFORM=$(NATIVEPLATFORM)
DEPS= ../../Makefile.include.in Makefile
APPNAME=cmake
-VERSION=2.8.8
+VERSION=2.8.12
SOURCE=$(APPNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.gz
View
4 tools/depends/native/pkg-config-native/Makefile
@@ -6,7 +6,7 @@ DEPS= ../../Makefile.include.in Makefile
# lib name, version
# lib name, version
LIBNAME=pkg-config
-VERSION=0.23
+VERSION=0.28
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.gz
@@ -16,7 +16,7 @@ PC_PATH:=$(PC_PATH):/usr/lib/pkgconfig:/usr/lib/$(HOST)/pkgconfig:/usr/share/pkg
endif
# configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) --enable-indirect-deps --with-pc-path=$(PC_PATH)
+CONFIGURE=./configure --prefix=$(PREFIX) --enable-indirect-deps --with-pc-path=$(PC_PATH) --with-internal-glib
LIBDYLIB=$(PLATFORM)/pkg-config
CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
View
3  tools/depends/target/Toolchain.cmake.in
@@ -2,6 +2,9 @@ SET(OS "@platform_os@")
IF("${OS}" STREQUAL "linux" OR "${OS}" STREQUAL "android")
SET(CMAKE_SYSTEM_NAME Linux)
ENDIF()
+IF("${OS}" STREQUAL "ios" OR "${OS}" STREQUAL "osx")
+SET(CMAKE_OSX_SYSROOT @use_sdk_path@)
+ENDIF()
SET(CMAKE_SYSTEM_VERSION 1)
# specify the cross compiler
View
12 tools/depends/target/afpfs-ng/fix_afpfs-ng_includes.patch
@@ -476,7 +476,7 @@ diff -Naur afpfs-ng-0.8.1/include/afpfs-ng/afp.h afpfs-ng-0.8.1.patch/include/af
+
+struct afp_server * afp_server_full_connect(void * priv, struct afp_connection_request * req);
+
-+void * just_end_it_now(void *other);
++void just_end_it_now(void *other);
+void add_fd_and_signal(int fd);
+void loop_disconnect(struct afp_server *s);
+void afp_wait_for_started_loop(void);
@@ -2685,6 +2685,16 @@ diff -Naur afpfs-ng-0.8.1/lib/loop.c afpfs-ng-0.8.1.patch/lib/loop.c
#define SIGNAL_TO_USE SIGUSR2
+@@ -85,7 +85,7 @@ void signal_main_thread(void)
+ }
+
+ static int ending=0;
+-void * just_end_it_now(void * ignore)
++void just_end_it_now(void * ignore)
+ {
+ if (ending) return;
+ ending=1;
+
diff -Naur afpfs-ng-0.8.1/lib/lowlevel.c afpfs-ng-0.8.1.patch/lib/lowlevel.c
--- afpfs-ng-0.8.1/lib/lowlevel.c 2008-02-20 02:33:17.000000000 +0100
+++ afpfs-ng-0.8.1.patch/lib/lowlevel.c 2011-09-10 12:13:50.136124828 +0200
View
12 tools/depends/target/config.site.in
@@ -134,8 +134,16 @@ fi
if test "@platform_os@" = "ios"; then
# tweaks for libffi (ios must use llvm-gcc-4.2)
if test "${PACKAGE_NAME}" = "libffi" ; then
- export CC="@use_toolchain@/usr/bin/llvm-gcc-4.2"
- export CPP="@use_toolchain@/usr/bin/llvm-gcc-4.2 -E"
+ case "@use_xcode@" in
+ 5.* | 5.*.* )
+ export CC="@use_toolchain@/usr/bin/clang"
+ export CPP="@use_toolchain@/usr/bin/clang -E"
+ ;;
+ *)
+ export CC="@use_toolchain@/usr/bin/llvm-gcc-4.2"
+ export CPP="@use_toolchain@/usr/bin/llvm-gcc-4.2 -E"
+ ;;
+ esac
unset AS
unset CCAS
fi
View
2  tools/depends/target/libgpg-error/Makefile
@@ -3,7 +3,7 @@ DEPS= ../../Makefile.include Makefile
# lib name, version
LIBNAME=libgpg-error
-VERSION=1.10
+VERSION=1.12
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.bz2
View
10 tools/depends/target/libmpeg2/04-clang-fix.patch
@@ -0,0 +1,10 @@
+--- /configure.ac 2013-10-09 22:39:08.000000000 +0400
++++ /configure.ac 2013-06-24 20:34:58.000000000 +0400
+@@ -149,7 +149,6 @@ AC_CHECK_GENERATE_INTTYPES([include])
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+-AC_C_ALWAYS_INLINE
+ AC_C_RESTRICT
+ AC_C_BUILTIN_EXPECT
+ AC_C_BIGENDIAN
View
2  tools/depends/target/libmpeg2/Makefile
@@ -28,6 +28,8 @@ ifeq ($(OS),ios)
cd $(PLATFORM); patch -p0 < ../02-neon.patch
cd $(PLATFORM); patch -p1 < ../03-config-fix.patch
endif
+ cd $(PLATFORM); patch -p1 < ../04-clang-fix.patch
+ cd $(PLATFORM); $(AUTORECONF) -vif
cd $(PLATFORM); $(CONFIGURE)
$(LIBDYLIB): $(PLATFORM)
View
57 tools/depends/target/libplist/0002-fixclang.diff
@@ -0,0 +1,57 @@
+--- /libcnary/node.c 2011-06-25 05:00:48.000000000 +0400
++++ /libcnary/node.c 2013-03-19 20:34:11.000000000 +0400
+@@ -95,16 +95,17 @@
+ }
+
+ int node_detach(node_t* parent, node_t* child) {
+- if (!parent || !child) return 0;
+- if (node_list_remove(parent->children, child) == 0) {
++ if (!parent || !child) return -1;
++ int index = node_list_remove(parent->children, child);
++ if (index >= 0) {
+ parent->count--;
+ }
+- return 0;
++ return index;
+ }
+
+ int node_insert(node_t* parent, unsigned int index, node_t* child)
+ {
+- if (!parent || !child) return;
++ if (!parent || !child) return -1;
+ child->isLeaf = TRUE;
+ child->isRoot = FALSE;
+ child->parent = parent;
+@@ -209,7 +210,7 @@
+ node_t* node_copy_deep(node_t* node, copy_func_t copy_func)
+ {
+ if (!node) return NULL;
+- void *data;
++ void *data = NULL;
+ if (copy_func) {
+ data = copy_func(node->data);
+ }
+
+--- /src/base64.c 2013-10-06 23:14:24.000000000 +0400
++++ /src/base64.c 2013-03-19 20:34:11.000000000 +0400
+@@ -104,9 +104,9 @@
+
+ unsigned char *base64decode(const char *buf, size_t *size)
+ {
+- if (!buf) return;
++ if (!buf) return NULL;
+ size_t len = strlen(buf);
+- if (len <= 0) return;
++ if (len <= 0) return NULL;
+ unsigned char *outbuf = (unsigned char*)malloc((len/4)*3+3);
+
+ unsigned char *line;
+@@ -114,7 +114,7 @@
+
+ line = (unsigned char*)strtok((char*)buf, "\r\n\t ");
+ while (line) {
+- p+=base64decode_block(outbuf+p, line, strlen((char*)line));
++ p+=base64decode_block(outbuf+p, (const char*)line, strlen((char*)line));
+
+ // get next line of base64 encoded block
+ line = (unsigned char*)strtok(NULL, "\r\n\t ");
View
1  tools/depends/target/libplist/Makefile
@@ -18,6 +18,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
cd $(PLATFORM); patch -p1 < ../0001-dontbuildswig.patch
+ cd $(PLATFORM); patch -p1 < ../0002-fixclang.diff
cd $(PLATFORM); sed -ie 's/TARGET_LINK_LIBRARIES( plist /TARGET_LINK_LIBRARIES( plist m z /' src/CMakeLists.txt
cd $(PLATFORM); rm -rf build; mkdir -p build
cd $(PLATFORM)/build; $(CMAKE) VERBOSE=1 -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_LD_FLAGS="$(LDFLAGS)" ..
View
1  tools/depends/target/openssl/Makefile
@@ -41,6 +41,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
cd $(PLATFORM); CFLAGS="$(CFLAGS)" CC=$(CC) RANLIB=$(RANLIB) $(CONFIGURE)
if test "$(OS)" = "osx"; then \
sed -ie "s|CC= /usr/bin/gcc-4.2|CC= $(CC)|" "$(PLATFORM)/Makefile"; \
+ sed -ie "s|CFLAG= |CFLAG=$(CFLAGS) |" "$(PLATFORM)/Makefile"; \
fi
if test "$(OS)" = "ios"; then \
sed -ie "s|CFLAG= |CFLAG=$(CFLAGS) |" "$(PLATFORM)/Makefile"; \
View
2  tools/depends/target/pythonmodule-pil/Makefile
@@ -33,7 +33,7 @@ $(LIBDYLIB): $(PLATFORM)
.installed-$(PLATFORM): $(LIBDYLIB)
mkdir -p $(PREFIX)/lib/python2.6/site-packages/PIL
- unzip $(LIBDYLIB) -d $(PREFIX)/lib/python2.6/site-packages/PIL/
+ unzip -of $(LIBDYLIB) -d $(PREFIX)/lib/python2.6/site-packages/PIL/
echo 'PIL' > $(PREFIX)/lib/python2.6/site-packages/PIL.pth
touch $@
View
2  xbmc/osx/ios/XBMCIOS-Info.plist
@@ -50,6 +50,8 @@
<string>YES</string>
<key>UIStatusBarHidden</key>
<true/>
+ <key>UIViewControllerBasedStatusBarAppearance</key>
+ <false/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationLandscapeLeft</string>
Something went wrong with that request. Please try again.