[osx/ios] remove glib2 (thank god), liboil and update libplist with glib free version

5 files changed, 5 insertions, 110 deletions

diff --git a/tools/darwin/depends/Makefile.in b/tools/darwin/depends/Makefile.in
index 22cc72eeab..2bc5cdf0d9 100644
--- a/tools/darwin/depends/Makefile.in
+++ b/tools/darwin/depends/Makefile.in
@@ -11,6 +11,7 @@ SUBDIRS := \
 	libass libcdio libsamplerate librtmp libcrystalhd libnfs \
 	libGLEW libsdl libsdl_mixer libsdl_image \
 	libmicrohttpd libmodplug libbluray libyajl \
+	libplist \
 	samba python26 mysqlclient boost \
 
 ifeq ($(DARWIN), ios)
diff --git a/tools/darwin/depends/libglib-2/Makefile b/tools/darwin/depends/libglib-2/Makefile
deleted file mode 100644
index 737a3fbd2e..0000000000
--- a/tools/darwin/depends/libglib-2/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-include ../Makefile.include
-
-# lib name, version
-LIBNAME=glib
-VERSION=2.24.2
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.bz2
-
-BASE_URL=http://ftp.acc.umu.se/pub/gnome/sources/glib/2.24
-
-# configuration settings
-# convert filenames from locale encoding to UTF-8
-#export G_BROKEN_FILENAMES=1
-CONFIGURE=./configure --prefix=$(PREFIX) \
-  --disable-gtk-doc \
-  --disable-gtk-doc-html \
-  --disable-gtk-doc-pdf \
-  --disable-man \
-  glib_cv_stack_grows=no \
-  glib_cv_rtldglobal_broken=no \
-  glib_cv_uscore=no \
-  ac_cv_lib_dld_shl_load=yes \
-  ac_cv_func_posix_getpwuid_r=yes \
-  ac_cv_func_posix_getgrgid_r=yes \
-  ac_cv_path_GLIB_GENMARSHAL=`pwd`/../glib-genmarshal
-
-LIBDYLIB=$(SOURCE)/glib/.libs/libglib-2.0.dylib
-
-all: $(LIBDYLIB) .installed
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
-	$(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
-	rm -rf $(SOURCE)
-	$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	echo $(SOURCE) > .gitignore
-	if test "$(DARWIN)" = "ios"; then \
-		sed -i "" -e "s|-framework Carbon| |" "$(SOURCE)/configure"; \
-	fi
-	cd $(SOURCE); $(CONFIGURE)
-	if test "$(DARWIN)" = "ios"; then \
-		sed -i "" -e "s|#define HAVE_CARBON 1| |" "$(SOURCE)/config.h"; \
-		sed -i "" -e "s|defined(USE_LIBICONV_GNU)|!defined(__APPLE__) \&\& defined(USE_LIBICONV_GNU)|g" "$(SOURCE)/glib/gconvert.c"; \
-	fi
-
-$(LIBDYLIB): $(SOURCE)
-	make -j 1 -C $(SOURCE)
-
-.installed:
-	make -C $(SOURCE) install
-	touch $@
-
-clean:
-	make -C $(SOURCE) clean
-	rm -f .installed
-
-distclean::
-	rm -rf $(SOURCE) .installed
diff --git a/tools/darwin/depends/libglib-2/glib-genmarshal b/tools/darwin/depends/libglib-2/glib-genmarshal
deleted file mode 100755
index 50e3d35e5f..0000000000
--- a/tools/darwin/depends/libglib-2/glib-genmarshal
+++ /dev/null
diff --git a/tools/darwin/depends/liboil/Makefile b/tools/darwin/depends/liboil/Makefile
deleted file mode 100644
index a11fca0641..0000000000
--- a/tools/darwin/depends/liboil/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-include ../Makefile.include
-include ../config.site.mk
-
-# lib name, version
-LIBNAME=liboil
-VERSION=0.3.17
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-
-BASE_URL=http://liboil.freedesktop.org/download
-
-# configuration settings
-export PKG_CONFIG=pkg-config --define-variable prefix=$(SDKSTAGE)
-CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \
-  --disable-gtk-doc \
-  --disable-static
-
-LIBDYLIB=$(SOURCE)/.libs/liboil-0.3.dylib
-
-all: $(LIBDYLIB) .installed
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
-	$(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
-	rm -rf $(SOURCE)
-	$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	echo $(SOURCE) > .gitignore
-	cd $(SOURCE); $(CONFIGURE)
-	# arm uses asm which needs leading underscores
-	if test "$(DARWIN)" = "ios"; then \
-		sed -i "" -e "s|vfp_ ##|_vfp_ ##|g" "$(SOURCE)/liboil/arm/math_vfp_asm.S"; \
-	fi
-
-$(LIBDYLIB): $(SOURCE)
-	make -j 1 -C $(SOURCE)
-
-.installed:
-	make -C $(SOURCE) install
-	touch $@
-
-clean:
-	make -C $(SOURCE) clean
-	rm -f .installed
-
-distclean::
-	rm -rf $(SOURCE) .installed
diff --git a/tools/darwin/depends/libplist/Makefile b/tools/darwin/depends/libplist/Makefile
index 03806c016b..26c79095d9 100644
--- a/tools/darwin/depends/libplist/Makefile
+++ b/tools/darwin/depends/libplist/Makefile
@@ -3,12 +3,12 @@ include ../config.site.mk
 
 # lib name, version
 LIBNAME=libplist
-VERSION=1.3
-SOURCE=JonathanBeck-libplist-02cf35b
+VERSION=1.6
+SOURCE=$(LIBNAME)-$(VERSION)
 FILENAME=v$(VERSION)
-ARCHIVE=$(FILENAME).tar.gz
+ARCHIVE=$(SOURCE).tar.gz
 
-BASE_URL=http://githubredir.debian.net/github/JonathanBeck/libplist/
+BASE_URL=http://cgit.sukimashita.com/libplist.git/snapshot
 
 LIBDYLIB=$(SOURCE)/build/src/$(LIBNAME).dylib