Skip to content
Browse files

depends: nuke old android depends

  • Loading branch information...
1 parent 71c5bda commit eded34c67a52f6622d2304de1ea39fcbae87153a Cory Fields committed Mar 19, 2013
Showing with 0 additions and 18,695 deletions.
  1. +0 −10 tools/android/depends/.gitignore
  2. +0 −92 tools/android/depends/Makefile.in
  3. +0 −83 tools/android/depends/Makefile.include.in
  4. +0 −26 tools/android/depends/afpfs-ng/01-gcrypt.patch
  5. +0 −280 tools/android/depends/afpfs-ng/02-pointer.patch
  6. +0 −25 tools/android/depends/afpfs-ng/04-boxee1.patch
  7. +0 −89 tools/android/depends/afpfs-ng/05-boxee2.patch
  8. +0 −141 tools/android/depends/afpfs-ng/06-boxee3.patch
  9. +0 −27 tools/android/depends/afpfs-ng/07-boxee4.patch
  10. +0 −11 tools/android/depends/afpfs-ng/08-boxee5.patch
  11. +0 −23 tools/android/depends/afpfs-ng/10-fix-errno.patch
  12. +0 −11 tools/android/depends/afpfs-ng/11-fix-stat.patch
  13. +0 −60 tools/android/depends/afpfs-ng/Makefile
  14. +0 −64 tools/android/depends/afpfs-ng/android.patch
  15. +0 −3,082 tools/android/depends/afpfs-ng/fix_afpfs-ng_includes.patch
  16. +0 −60 tools/android/depends/alsa-lib/Makefile
  17. +0 −11 tools/android/depends/alsa-lib/removeshm-2.patch
  18. +0 −11 tools/android/depends/alsa-lib/removeshm-3.patch
  19. +0 −187 tools/android/depends/alsa-lib/removeshm-upstream.patch
  20. +0 −11 tools/android/depends/alsa-lib/timeval.patch
  21. +0 −53 tools/android/depends/android-sys/Makefile
  22. +0 −473 tools/android/depends/android-sys/iomx.cpp
  23. +0 −40 tools/android/depends/autoconf/Makefile
  24. +0 −40 tools/android/depends/automake/Makefile
  25. +0 −34 tools/android/depends/boost/Makefile
  26. +0 −73 tools/android/depends/boost/add-arm-mem-barrier.patch
  27. +0 −58 tools/android/depends/boost/fix-deprecated-swp.patch
  28. +0 −1 tools/android/depends/bootstrap
  29. +0 −40 tools/android/depends/bzip2/Makefile
  30. +0 −34 tools/android/depends/bzip2/Makefile.patch
  31. +0 −40 tools/android/depends/cmake/Makefile
  32. +0 −151 tools/android/depends/configure.in
  33. +0 −48 tools/android/depends/curl/Makefile
  34. +0 −40 tools/android/depends/dbus/Makefile
  35. +0 −24 tools/android/depends/dummy-libxbmc/Makefile
  36. +0 −4 tools/android/depends/dummy-libxbmc/dummy-libxbmc.c
  37. +0 −40 tools/android/depends/expat/Makefile
  38. +0 −80 tools/android/depends/fontconfig/01-fontconfig-cross-compile-fix.patch
  39. +0 −45 tools/android/depends/fontconfig/Makefile
  40. +0 −18 tools/android/depends/fontconfig/lconv.patch
  41. +0 −43 tools/android/depends/freetype2/Makefile
  42. +0 −42 tools/android/depends/fribidi/Makefile
  43. +0 −52 tools/android/depends/gettext-native/Makefile
  44. +0 −12 tools/android/depends/gettext/02-gettext_msginit.patch
  45. +0 −50 tools/android/depends/gettext/Makefile
  46. +0 −40 tools/android/depends/help2man/Makefile
  47. +0 −44 tools/android/depends/jasper/Makefile
  48. +0 −39 tools/android/depends/jpeg/Makefile
  49. +0 −14 tools/android/depends/libamplayer/Makefile
  50. +0 −89 tools/android/depends/libamplayer/libamplayer/include/amports/aformat.h
  51. +0 −148 tools/android/depends/libamplayer/libamplayer/include/amports/amstream.h
  52. +0 −111 tools/android/depends/libamplayer/libamplayer/include/amports/vformat.h
  53. +0 −40 tools/android/depends/libamplayer/libamplayer/include/log_print.h
  54. +0 −90 tools/android/depends/libamplayer/libamplayer/include/message.h
  55. +0 −80 tools/android/depends/libamplayer/libamplayer/include/player.h
  56. +0 −63 tools/android/depends/libamplayer/libamplayer/include/player_error.h
  57. +0 −14 tools/android/depends/libamplayer/libamplayer/include/player_id.h
  58. +0 −80 tools/android/depends/libamplayer/libamplayer/include/player_set_sys.h
  59. +0 −27 tools/android/depends/libamplayer/libamplayer/include/player_thumbnail.h
  60. +0 −271 tools/android/depends/libamplayer/libamplayer/include/player_type.h
  61. +0 −43 tools/android/depends/libamplayer/libamplayer/include/stream_format.h
  62. +0 −45 tools/android/depends/libass/Makefile
  63. +0 −46 tools/android/depends/libbluray/Makefile
  64. +0 −47 tools/android/depends/libcdio/Makefile
  65. +0 −11 tools/android/depends/libcdio/configure.patch
  66. +0 −43 tools/android/depends/libcec/Makefile
  67. +0 −39 tools/android/depends/libffi/Makefile
  68. +0 −48 tools/android/depends/libflac/Makefile
  69. +0 −14 tools/android/depends/libflac/nasm.patch
  70. +0 −13 tools/android/depends/libgcrypt/01-gcrypt-android-select.patch
  71. +0 −48 tools/android/depends/libgcrypt/Makefile
  72. +0 −24 tools/android/depends/libgcrypt/gcrypt-disable-tests.patch
  73. +0 −41 tools/android/depends/libgpg-error/Makefile
  74. +0 −42 tools/android/depends/libiconv/Makefile
  75. +0 −42 tools/android/depends/libjpeg-turbo-native/Makefile
  76. +0 −41 tools/android/depends/libjpeg-turbo/Makefile
  77. +0 −42 tools/android/depends/liblzo2-native/Makefile
  78. +0 −41 tools/android/depends/liblzo2/Makefile
  79. +0 −118 tools/android/depends/libmad/01-libmad-pkgconfig.patch
  80. +0 −50 tools/android/depends/libmad/Makefile
  81. +0 −44 tools/android/depends/libmicrohttpd/Makefile
  82. +0 −33 tools/android/depends/libmicrohttpd/fix-android-include.patch
  83. +0 −45 tools/android/depends/libmodplug/Makefile
  84. +0 −53 tools/android/depends/libmpeg2/Makefile
  85. +0 −44 tools/android/depends/libnfs/Makefile
  86. +0 −46 tools/android/depends/libogg/Makefile
  87. +0 −43 tools/android/depends/libomxil-bellagio/Makefile
  88. +0 −33 tools/android/depends/libomxil-bellagio/android-fix-build.patch
  89. +0 −159 tools/android/depends/libomxil-bellagio/oscl/oscl_base_macros.h
  90. +0 −105 tools/android/depends/libomxil-bellagio/oscl/osclconfig.h
  91. +0 −42 tools/android/depends/libomxil-bellagio/oscl/osclconfig_ansi_memory.h
  92. +0 −423 tools/android/depends/libomxil-bellagio/oscl/osclconfig_check.h
  93. +0 −44 tools/android/depends/libomxil-bellagio/oscl/osclconfig_compiler_warnings.h
  94. +0 −53 tools/android/depends/libomxil-bellagio/oscl/osclconfig_error.h
  95. +0 −63 tools/android/depends/libomxil-bellagio/oscl/osclconfig_error_check.h
  96. +0 −30 tools/android/depends/libomxil-bellagio/oscl/osclconfig_global_new_delete.h
  97. +0 −31 tools/android/depends/libomxil-bellagio/oscl/osclconfig_global_placement_new.h
  98. +0 −309 tools/android/depends/libomxil-bellagio/oscl/osclconfig_io.h
  99. +0 −605 tools/android/depends/libomxil-bellagio/oscl/osclconfig_io_check.h
  100. +0 −41 tools/android/depends/libomxil-bellagio/oscl/osclconfig_ix86.h
  101. +0 −63 tools/android/depends/libomxil-bellagio/oscl/osclconfig_lib.h
  102. +0 −67 tools/android/depends/libomxil-bellagio/oscl/osclconfig_lib_check.h
  103. +0 −88 tools/android/depends/libomxil-bellagio/oscl/osclconfig_limits_typedefs.h
  104. +0 −91 tools/android/depends/libomxil-bellagio/oscl/osclconfig_memory.h
  105. +0 −72 tools/android/depends/libomxil-bellagio/oscl/osclconfig_memory_check.h
  106. +0 −71 tools/android/depends/libomxil-bellagio/oscl/osclconfig_no_os.h
  107. +0 −43 tools/android/depends/libomxil-bellagio/oscl/osclconfig_proc.h
  108. +0 −157 tools/android/depends/libomxil-bellagio/oscl/osclconfig_proc_check.h
  109. +0 −60 tools/android/depends/libomxil-bellagio/oscl/osclconfig_proc_unix_android.h
  110. +0 −59 tools/android/depends/libomxil-bellagio/oscl/osclconfig_proc_unix_common.h
  111. +0 −50 tools/android/depends/libomxil-bellagio/oscl/osclconfig_time.h
  112. +0 −47 tools/android/depends/libomxil-bellagio/oscl/osclconfig_time_check.h
  113. +0 −105 tools/android/depends/libomxil-bellagio/oscl/osclconfig_unix_android.h
  114. +0 −103 tools/android/depends/libomxil-bellagio/oscl/osclconfig_unix_common.h
  115. +0 −43 tools/android/depends/libomxil-bellagio/oscl/osclconfig_util.h
  116. +0 −58 tools/android/depends/libomxil-bellagio/oscl/osclconfig_util_check.h
  117. +0 −11 tools/android/depends/libplist/0001-dontbuildswig.patch
  118. +0 −12 tools/android/depends/libplist/0002-missing-libs.patch
  119. +0 −23 tools/android/depends/libplist/0003-no-so-version.patch
  120. +0 −54 tools/android/depends/libplist/Makefile
  121. +0 −42 tools/android/depends/libpng-native/Makefile
  122. +0 −41 tools/android/depends/libpng/Makefile
  123. +0 −56 tools/android/depends/librtmp/Makefile
  124. +0 −1,913 tools/android/depends/librtmp/librtmp-60-second-fix.patch
  125. +0 −10 tools/android/depends/librtmp/prefix.patch
  126. +0 −42 tools/android/depends/libsamplerate/Makefile
  127. +0 −33 tools/android/depends/libsdl/01-SDL_SetWidthHeight.patch
  128. +0 −12 tools/android/depends/libsdl/02-mmx.patch
  129. +0 −43 tools/android/depends/libsdl/Makefile
  130. +0 −40 tools/android/depends/libsdl_image/Makefile
  131. +0 −270 tools/android/depends/libshairport/001_add_ao.patch
  132. +0 −12 tools/android/depends/libshairport/002_fix_install_header.patch
  133. +0 −10 tools/android/depends/libshairport/003_fix_deadlock.patch
  134. +0 −22 tools/android/depends/libshairport/004_fix_bad_access.patch
  135. +0 −10 tools/android/depends/libshairport/005_fix_shutdown.patch
  136. +0 −843 tools/android/depends/libshairport/006_no_printf.patch
  137. +0 −24 tools/android/depends/libshairport/007_fix_syslog_defines.patch
  138. +0 −21 tools/android/depends/libshairport/008-add-missing-libs.patch
  139. +0 −22 tools/android/depends/libshairport/009_fix_ipv6.patch
  140. +0 −154 tools/android/depends/libshairport/010_handle_metadata.patch
  141. +0 −10 tools/android/depends/libshairport/011_fix_ipv4_fallback.patch
  142. +0 −58 tools/android/depends/libshairport/Makefile
  143. +0 −21 tools/android/depends/libshairport/android.patch
  144. +0 −46 tools/android/depends/libssh/Makefile
  145. +0 −49 tools/android/depends/libssh/android.patch
  146. +0 −72 tools/android/depends/libssh/md5.patch
  147. +0 −10 tools/android/depends/libssh/removelegacy.patch
  148. +0 −48 tools/android/depends/libssh2/Makefile
  149. +0 −43 tools/android/depends/libtool/Makefile
  150. +0 −13 tools/android/depends/libtool/fix-libcrystax.patch
  151. +0 −40 tools/android/depends/libusb/Makefile
  152. +0 −63 tools/android/depends/libvorbis/Makefile
  153. +0 −43 tools/android/depends/libxml2/Makefile
  154. +0 −39 tools/android/depends/libzip/Makefile
  155. +0 −170 tools/android/depends/mysql/01-mysqlclient-cross-compile.patch
  156. +0 −27 tools/android/depends/mysql/02-mysqlclient-ios.patch
  157. +0 −93 tools/android/depends/mysql/03-mysqlclient-android.patch
  158. +0 −52 tools/android/depends/mysql/Makefile
  159. +0 −41 tools/android/depends/ncurses/Makefile
  160. +0 −45 tools/android/depends/openssl/Makefile
  161. +0 −41 tools/android/depends/pcre-native/Makefile
  162. +0 −39 tools/android/depends/pcre/Makefile
  163. +0 −41 tools/android/depends/pkg-config/Makefile
  164. +0 −38 tools/android/depends/python26-native/Makefile
  165. +0 −36 tools/android/depends/python26-native/cpython-2.6.5-multiarch.patch
  166. +0 −127 tools/android/depends/python26-native/cpython-2.6.5-nosslv2.patch
  167. +0 −53 tools/android/depends/python26/Makefile
  168. +0 −45 tools/android/depends/python26/Python-2.6-ctypes.patch
  169. +0 −61 tools/android/depends/python26/Python-2.6.2-android.patch
  170. +0 −301 tools/android/depends/python26/Python-2.6.5-xcompile.patch
  171. +0 −12 tools/android/depends/python26/Python-no-export-path.patch
  172. +0 −12 tools/android/depends/python26/Python-no-modules.patch
  173. +0 −519 tools/android/depends/python26/modules.setup
  174. +0 −20 tools/android/depends/readline/01-readline-setpwent.patch
  175. +0 −41 tools/android/depends/readline/Makefile
  176. +0 −16 tools/android/depends/rpl/Makefile
  177. +0 −310 tools/android/depends/rpl/rpl
  178. +0 −101 tools/android/depends/samba/Makefile
  179. +0 −38 tools/android/depends/samba/samba30-3.0.37-CVE-2010-2063.patch
  180. +0 −64 tools/android/depends/samba/samba30-3.0.37-configure.in.patch
  181. +0 −11 tools/android/depends/samba/samba30-3.0.37-silence-receive-warning.patch
  182. +0 −16 tools/android/depends/samba/samba30-3.0.37-vfs_default.c.patch
  183. +0 −101 tools/android/depends/samba/samba30-3.0.37-wle-fix.patch
  184. +0 −220 tools/android/depends/samba/samba_android.patch
  185. +0 −45 tools/android/depends/sqlite3/Makefile
  186. +0 −41 tools/android/depends/swig-native/Makefile
  187. +0 −43 tools/android/depends/taglib/Makefile
  188. +0 −42 tools/android/depends/tiff-native/Makefile
  189. +0 −41 tools/android/depends/tiff/Makefile
  190. +0 −39 tools/android/depends/tinyxml/Makefile
  191. +0 −54 tools/android/depends/xbmc-pvr-addons/Makefile
  192. +0 −42 tools/android/depends/xbmc/Makefile
  193. +0 −52 tools/android/depends/yajl/Makefile
  194. +0 −20 tools/android/depends/yajl/shared.patch
  195. +0 −19 tools/android/depends/yajl/static.patch
  196. +0 −41 tools/android/depends/yasm/Makefile
View
10 tools/android/depends/.gitignore
@@ -1,10 +0,0 @@
-/Makefile
-/configure
-/Makefile.include
-/autom4te.cache/
-/**/.gitignore
-/**/.installed-*
-/*/x86/*
-/*/x86-native/*
-/*/armeabi-v7a/*
-/*/armeabi-v7a-native/*
View
92 tools/android/depends/Makefile.in
@@ -1,92 +0,0 @@
-#include Makefile.include
-
-BUILDTOOLS = help2man gettext-native autoconf automake libtool pkg-config yasm cmake
-
-SUBDIRS = \
- ncurses pcre expat libiconv gettext readline sqlite3 libgpg-error \
- libgcrypt bzip2 liblzo2 libzip freetype2 fontconfig \
- openssl libssh2 curl \
- libjpeg-turbo tiff jasper libpng \
- libogg libvorbis libflac libmad fribidi libmpeg2 \
- libass libsamplerate \
- libmodplug librtmp libxml2 yajl libmicrohttpd mysql libffi \
- python26-native python26 samba alsa-lib libcdio afpfs-ng libshairport \
- libplist libcec libbluray boost tinyxml dummy-libxbmc libsdl \
- liblzo2-native libjpeg-turbo-native libpng-native tiff-native libsdl_image rpl \
- libamplayer libssh taglib swig-native pcre-native xbmc-pvr-addons libusb libnfs
-
-.PHONY: buildtools $(BUILDTOOLS) subdirs $(SUBDIRS) arm
-
-all: subdirs
- @echo "Dependencies built successfully."
-
-release: armeabi-v7a x86
-
-# Dependency layout for parallel builds
-gettext: libiconv ncurses
-libgcrypt: libgpg-error
-fontconfig: freetype2 expat libiconv
-libssh2: libgcrypt openssl rpl
-curl: openssl libssh2 rpl
-tiff: libjpeg-turbo
-jasper: libjpeg-turbo
-libvorbis: libogg rpl
-libflac: libogg gettext rpl
-libass: fontconfig libpng freetype2 expat libiconv rpl
-librtmp: openssl rpl
-libxml2: libiconv
-libmicrohttpd: openssl libgpg-error libgcrypt
-python26: python26-native expat gettext libxml2 sqlite3 openssl libffi
-libcdio: libiconv
-afpfs-ng: libgcrypt readline libiconv rpl
-libshairport: openssl rpl
-libplist: libxml2 cmake
-libbluray: libiconv libxml2 rpl
-yajl: cmake
-libsdl_image: buildtools libsdl libjpeg-turbo-native libpng-native tiff-native
-python26-native: buildtools
-libsdl: buildtools
-alsa-lib: rpl
-libcec: rpl
-libmad: rpl
-libmodplug: rpl
-libmpeg2: rpl
-libogg: rpl
-rpl: python26-native
-libjpeg-turbo-native: buildtools
-libpng-native: buildtools
-tiff-native: buildtools libjpeg-turbo-native
-liblzo2-native: buildtools
-libssh: openssl cmake rpl
-taglib: cmake
-swig-native: buildtools pcre-native
-pcre-native: buildtools
-libnfs: rpl
-xbmc-pvr-addons: boost mysql
-
-
-X86OVERRIDES=XBMC_OVERRIDE_HOST=i686-android-linux XBMC_OVERRIDE_TOOLCHAIN=$(XBMC_X86_TOOLCHAIN)
-ARMOVERRIDES=XBMC_OVERRIDE_HOST=arm-linux-androideabi XBMC_OVERRIDE_TOOLCHAIN=$(XBMC_ARM_TOOLCHAIN)
-
-buildtools: $(BUILDTOOLS)
-$(BUILDTOOLS):
- $(MAKE) -C $@
-
-subdirs: $(SUBDIRS)
-$(SUBDIRS): help2man autoconf automake libtool pkg-config yasm
- $(MAKE) -C $@
-clean:
- for d in $(BUILDTOOLS); do $(MAKE) -C $$d clean; done
- for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done
-
-distclean::
- for d in $(BUILDTOOLS); do $(MAKE) -C $$d distclean; done
- for d in $(SUBDIRS); do $(MAKE) -C $$d distclean; done
-
-arm: armeabi-v7a
-
-armeabi-v7a: $(XBMC_ARM_TOOLCHAIN)
- XBMC_OVERRIDE_PLATFORM=$@ $(ARMOVERRIDES) $(MAKE) all
-
-x86: $(XBMC_X86_TOOLCHAIN)
- XBMC_OVERRIDE_PLATFORM=$@ $(X86OVERRIDES) $(MAKE) all
View
83 tools/android/depends/Makefile.include.in
@@ -1,83 +0,0 @@
-TOOLCHAIN=@use_toolchain@
-NDKROOT=@use_ndk@
-SDKROOT=@use_sdk@
-XBMCPREFIX=@use_staging@
-TARBALLS_LOCATION=@use_tarballs@
-HOST=@use_host@
-PLATFORM=@use_cpu@
-NATIVEPLATFORM=@use_cpu@-native
-SDK_PLATFORM=@use_sdk_platform@
-RETRIEVE_TOOL=@CURL@
-ARCHIVE_TOOL=@TAR@
-
-ifneq ($(XBMC_OVERRIDE_TOOLCHAIN),)
-TOOLCHAIN=$(XBMC_OVERRIDE_TOOLCHAIN)
-endif
-
-ifneq ($(XBMC_OVERRIDE_PLATFORM),)
-PLATFORM=$(XBMC_OVERRIDE_PLATFORM)
-NATIVEPLATFORM=$(XBMC_OVERRIDE_PLATFORM)-native
-endif
-
-ifneq ($(XBMC_OVERRIDE_HOST),)
-HOST=$(XBMC_OVERRIDE_HOST)
-endif
-
-PREFIX=$(XBMCPREFIX)/$(PLATFORM)
-NATIVEPREFIX=$(XBMCPREFIX)/$(NATIVEPLATFORM)
-
-PLATFORM_FLAGS=-DANDROID -Os
-ifeq ($(PLATFORM),armeabi-v7a)
- PLATFORM_FLAGS+=-march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp -mfpu=neon -D__ARM_ARCH_7__ -D__ARM_ARCH_7A__
-endif
-
-ifeq ($(PLATFORM),x86)
- PLATFORM_FLAGS+=-fomit-frame-pointer
-endif
-
-BASE_URL=http://mirrors.xbmc.org/build-deps/sources
-RETRIEVE_TOOL_FLAGS=-Ls --create-dirs -f --output $(TARBALLS_LOCATION)/$(ARCHIVE)
-ARCHIVE_TOOL_FLAGS=-C $(PLATFORM) --strip-components=1 -xf
-CONFIG_SUB=$(NATIVEPREFIX)/share/automake-1.11/config.sub
-CONFIG_GUESS=$(NATIVEPREFIX)/share/automake-1.11/config.guess
-RPL=$(NATIVEPREFIX)/bin/python $(NATIVEPREFIX)/bin/rpl
-YASM=$(NATIVEPREFIX)/bin/yasm
-
-ifneq ($(NATIVE_BUILD),1)
- export SYSROOT=$(TOOLCHAIN)/sysroot
- export CROSSTOOLS=$(TOOLCHAIN)/bin/$(HOST)-
- export LD=$(CROSSTOOLS)ld
- export CC=$(CROSSTOOLS)gcc
- export CXX=$(CROSSTOOLS)g++
- export AR=$(CROSSTOOLS)ar
- export AS=$(CROSSTOOLS)as
- export NM=$(CROSSTOOLS)nm
- export STRIP=$(CROSSTOOLS)strip
- export RANLIB=$(CROSSTOOLS)ranlib
- export OBJDUMP=$(CROSSTOOLS)objdump
- export READELF=$(CROSSTOOLS)readelf
- export CFLAGS=$(PLATFORM_FLAGS) -I$(PREFIX)/include -I$(PREFIX)/include/$(SDK_PLATFORM) -fexceptions
- export LDFLAGS=$(PLATFORM_FLAGS) -L$(PREFIX)/lib -L$(PREFIX)/lib/$(SDK_PLATFORM)
- export CPPFLAGS=$(PLATFORM_FLAGS) -I$(PREFIX)/include -I$(PREFIX)/include/$(SDK_PLATFORM) -fexceptions
- export CXXFLAGS=$(PLATFORM_FLAGS) -I$(PREFIX)/include -I$(PREFIX)/include/$(SDK_PLATFORM) -fexceptions -frtti
-
- export PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig
- export PKG_CONFIG=$(NATIVEPREFIX)/bin/pkg-config
-
- export AUTOMAKE=$(NATIVEPREFIX)/bin/automake
- export AUTOCONF=$(NATIVEPREFIX)/bin/autoconf
- export ACLOCAL=$(NATIVEPREFIX)/bin/aclocal
- export ACLOCAL_PATH=$(PREFIX)/share/aclocal:$(NATIVEPREFIX)/share/aclocal
- export LIBTOOLIZE=$(NATIVEPREFIX)/bin/libtoolize
- export AUTORECONF=$(NATIVEPREFIX)/bin/autoreconf
-else
- PLATFORM=$(NATIVEPLATFORM)
- PREFIX=$(NATIVEPREFIX)
-
- export CFLAGS=-I$(PREFIX)/include
- export LDFLAGS=-L$(PREFIX)/lib
- export CPPFLAGS=-I$(PREFIX)/include
- export CXXFLAGS=-I$(PREFIX)/include
-endif
- export PATH:=$(NATIVEPREFIX)/bin:$(PATH)
- export LD_LIBRARY_PATH:=$(NATIVEPREFIX)/lib:$(LD_LIBRARY_PATH)
View
26 tools/android/depends/afpfs-ng/01-gcrypt.patch
@@ -1,26 +0,0 @@
-diff -ru afpfs-ng-0.8.1/configure.ac afpfs-ng-0.8.1+iPhone/configure.ac
---- afpfs-ng-0.8.1/configure.ac 2008-03-08 16:23:12.000000000 +0000
-+++ afpfs-ng-0.8.1+iPhone/configure.ac 2010-10-24 05:26:15.000000000 +0000
-@@ -50,21 +50,6 @@
- case $host in
- *-*-darwin*)
- AC_MSG_CHECKING([for correct gcrypt version])
-- AC_RUN_IFELSE(
-- [AC_LANG_PROGRAM([
-- #include <gcrypt.h>
-- #include <stdio.h>],[
-- char*p= GCRYPT_VERSION;
-- unsigned int vers;
-- vers=atoi(p)*10000;
-- p=strchr(p,'.')+1;
-- vers+=atoi(p)*100;
-- p=strchr(p,'.')+1;
-- vers+=atoi(p);
-- if (vers<10400) return 1;
-- ])],
-- [AC_MSG_RESULT([yes])],
-- [AC_MSG_ERROR([version is < 1.4.0])])
- AM_CONDITIONAL(HAVE_LIBGCRYPT, true)
- AC_DEFINE([HAVE_LIBGCRYPT], [1] )
- ;;
-
View
280 tools/android/depends/afpfs-ng/02-pointer.patch
@@ -1,280 +0,0 @@
-diff -up afpfs-ng-0.8.1/cmdline/getstatus.c.pointer afpfs-ng-0.8.1/cmdline/getstatus.c
---- afpfs-ng-0.8.1/cmdline/getstatus.c.pointer 2011-06-14 17:06:35.000000000 +0200
-+++ afpfs-ng-0.8.1/cmdline/getstatus.c 2011-06-14 17:07:25.000000000 +0200
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <pthread.h>
-
-diff -up afpfs-ng-0.8.1/fuse/client.c.pointer afpfs-ng-0.8.1/fuse/client.c
---- afpfs-ng-0.8.1/fuse/client.c.pointer 2008-03-08 03:44:16.000000000 +0100
-+++ afpfs-ng-0.8.1/fuse/client.c 2011-06-14 17:02:15.000000000 +0200
-@@ -61,8 +61,9 @@ static int start_afpfsd(void)
- snprintf(filename, PATH_MAX,
- "/usr/local/bin/%s",AFPFSD_FILENAME);
- if (access(filename,X_OK)) {
-- snprintf(filename, "/usr/bin/%s",
-+ snprintf(filename, sizeof(filename), "/usr/bin/%s",
- AFPFSD_FILENAME);
-+ filename[sizeof(filename) - 1] = 0;
- if (access(filename,X_OK)) {
- printf("Could not find server (%s)\n",
- filename);
-diff -up afpfs-ng-0.8.1/fuse/fuse_int.c.pointer afpfs-ng-0.8.1/fuse/fuse_int.c
---- afpfs-ng-0.8.1/fuse/fuse_int.c.pointer 2008-03-02 06:06:24.000000000 +0100
-+++ afpfs-ng-0.8.1/fuse/fuse_int.c 2011-06-14 17:02:15.000000000 +0200
-@@ -197,7 +197,7 @@ static int fuse_open(const char *path, s
- ret = ml_open(volume,path,flags,&fp);
-
- if (ret==0)
-- fi->fh=(void *) fp;
-+ fi->fh=(unsigned long) fp;
-
- return ret;
- }
-diff -up afpfs-ng-0.8.1/include/afpfs-ng/afp.h.pointer afpfs-ng-0.8.1/include/afp.h
---- afpfs-ng-0.8.1/include/afpfs-ng/afp.h.pointer 2008-03-08 17:08:18.000000000 +0100
-+++ afpfs-ng-0.8.1/include/afpfs-ng/afp.h 2011-06-14 17:02:15.000000000 +0200
-@@ -370,7 +370,7 @@ int afp_unmount_all_volumes(struct afp_s
-
- int afp_opendt(struct afp_volume *volume, unsigned short * refnum);
-
--int afp_closedt(struct afp_server * server, unsigned short * refnum);
-+int afp_closedt(struct afp_server * server, unsigned short refnum);
-
- int afp_getcomment(struct afp_volume *volume, unsigned int did,
- const char * pathname, struct afp_comment * comment);
-diff -up afpfs-ng-0.8.1/include/afpfs-gn/utils.h.pointer afpfs-ng-0.8.1/include/utils.h
---- afpfs-ng-0.8.1/include/afpfs-ng/utils.h.pointer 2008-02-18 04:33:58.000000000 +0100
-+++ afpfs-ng-0.8.1/include/afpfs-ng/utils.h 2011-06-14 17:02:15.000000000 +0200
-@@ -8,8 +8,8 @@
- #define hton64(x) (x)
- #define ntoh64(x) (x)
- #else /* BYTE_ORDER == BIG_ENDIAN */
--#define hton64(x) ((u_int64_t) (htonl(((x) >> 32) & 0xffffffffLL)) | \
-- (u_int64_t) ((htonl(x) & 0xffffffffLL) << 32))
-+#define hton64(x) ((u_int64_t) (htonl((((unsigned long long)(x)) >> 32) & 0xffffffffLL)) | \
-+ (u_int64_t) ((htonl((unsigned long long)(x)) & 0xffffffffLL) << 32))
- #define ntoh64(x) (hton64(x))
- #endif /* BYTE_ORDER == BIG_ENDIAN */
-
-diff -up afpfs-ng-0.8.1/lib/afp_url.c.pointer afpfs-ng-0.8.1/lib/afp_url.c
---- afpfs-ng-0.8.1/lib/afp_url.c.pointer 2008-03-04 21:16:49.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/afp_url.c 2011-06-14 17:02:15.000000000 +0200
-@@ -33,7 +33,7 @@ static int check_port(char * port)
- static int check_uamname(const char * uam)
- {
- char * p;
-- for (p=uam;*p;p++) {
-+ for (p=(char *)uam;*p;p++) {
- if (*p==' ') continue;
- if ((*p<'A') || (*p>'z')) return -1;
- }
-@@ -188,7 +188,7 @@ int afp_parse_url(struct afp_url * url,
- return -1;
-
- }
-- if (p==NULL) p=toparse;
-+ if (p==NULL) p=(char *)toparse;
-
- /* Now split on the first / */
- if (sscanf(p,"%[^/]/%[^$]",
-diff -up afpfs-ng-0.8.1/lib/did.c.pointer afpfs-ng-0.8.1/lib/did.c
---- afpfs-ng-0.8.1/lib/did.c.pointer 2008-02-18 04:39:17.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/did.c 2011-06-14 17:02:15.000000000 +0200
-@@ -226,7 +226,7 @@ int get_dirid(struct afp_volume * volume
-
-
- /* Go to the end of last known entry */
-- p=path+(p-copy);
-+ p=(char *)path+(p-copy);
- p2=p;
-
- while ((p=strchr(p+1,'/'))) {
-diff -up afpfs-ng-0.8.1/lib/dsi.c.pointer afpfs-ng-0.8.1/lib/dsi.c
---- afpfs-ng-0.8.1/lib/dsi.c.pointer 2008-02-18 04:53:03.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/dsi.c 2011-06-14 17:02:15.000000000 +0200
-@@ -474,7 +474,7 @@ void dsi_getstatus_reply(struct afp_serv
- }
- server->flags=ntohs(reply1->flags);
-
-- p=(void *)((unsigned int) server->incoming_buffer + sizeof(*reply1));
-+ p=(void *)((unsigned long) server->incoming_buffer + sizeof(*reply1));
- p+=copy_from_pascal(server->server_name,p,AFP_SERVER_NAME_LEN)+1;
-
- /* Now work our way through the variable bits */
-@@ -757,7 +757,7 @@ gotenough:
- printf("<<< read() of rest of AFP, %d bytes\n",amount_to_read);
- #endif
- ret = read(server->fd, (void *)
-- (((unsigned int) server->incoming_buffer)+server->data_read),
-+ (((unsigned long) server->incoming_buffer)+server->data_read),
- amount_to_read);
- if (ret<0) return -1;
- if (ret==0) {
-diff -up afpfs-ng-0.8.1/lib/loop.c.pointer afpfs-ng-0.8.1/lib/loop.c
---- afpfs-ng-0.8.1/lib/loop.c.pointer 2008-02-18 04:40:11.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/loop.c 2011-06-14 17:02:15.000000000 +0200
-@@ -25,7 +25,7 @@
- static unsigned char exit_program=0;
-
- static pthread_t ending_thread;
--static pthread_t main_thread = NULL;
-+static pthread_t main_thread = (pthread_t)NULL;
-
- static int loop_started=0;
- static pthread_cond_t loop_started_condition;
-diff -up afpfs-ng-0.8.1/lib/lowlevel.c.pointer afpfs-ng-0.8.1/lib/lowlevel.c
---- afpfs-ng-0.8.1/lib/lowlevel.c.pointer 2008-02-20 02:33:17.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/lowlevel.c 2011-06-14 17:02:15.000000000 +0200
-@@ -582,7 +582,7 @@ int ll_getattr(struct afp_volume * volum
- if (volume->server->using_version->av_number>=30)
- stbuf->st_mode |= fp.unixprivs.permissions;
- else
-- set_nonunix_perms(stbuf,&fp);
-+ set_nonunix_perms(&stbuf->st_mode,&fp);
-
- stbuf->st_uid=fp.unixprivs.uid;
- stbuf->st_gid=fp.unixprivs.gid;
-diff -up afpfs-ng-0.8.1/lib/midlevel.c.pointer afpfs-ng-0.8.1/lib/midlevel.c
---- afpfs-ng-0.8.1/lib/midlevel.c.pointer 2008-03-08 17:08:18.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/midlevel.c 2011-06-14 17:02:15.000000000 +0200
-@@ -713,7 +713,7 @@ int ml_write(struct afp_volume * volume,
- {
-
- int ret,err=0;
-- int totalwritten = 0;
-+ size_t totalwritten = 0;
- uint64_t sizetowrite, ignored;
- unsigned char flags = 0;
- unsigned int max_packet_size=volume->server->tx_quantum;
-diff -up afpfs-ng-0.8.1/lib/proto_attr.c.pointer afpfs-ng-0.8.1/lib/proto_attr.c
---- afpfs-ng-0.8.1/lib/proto_attr.c.pointer 2008-01-30 05:37:58.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/proto_attr.c 2011-06-14 17:02:15.000000000 +0200
-@@ -166,7 +166,7 @@ int afp_getextattr(struct afp_volume * v
- copy_path(server,p,pathname,strlen(pathname));
- unixpath_to_afppath(server,p);
- p2=p+sizeof_path_header(server)+strlen(pathname);
-- if (((unsigned int ) p2) & 0x1) p2++;
-+ if (((unsigned long) p2) & 0x1) p2++;
- req2=(void *) p2;
-
- req2->len=htons(namelen);
-diff -up afpfs-ng-0.8.1/lib/proto_desktop.c.pointer afpfs-ng-0.8.1/lib/proto_desktop.c
---- afpfs-ng-0.8.1/lib/proto_desktop.c.pointer 2008-02-18 04:44:11.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/proto_desktop.c 2011-06-14 17:02:15.000000000 +0200
-@@ -168,7 +168,7 @@ int afp_getcomment_reply(struct afp_serv
- return 0;
- }
-
--int afp_closedt(struct afp_server * server, unsigned short * refnum)
-+int afp_closedt(struct afp_server * server, unsigned short refnum)
- {
- struct {
- struct dsi_header dsi_header __attribute__((__packed__));
-diff -up afpfs-ng-0.8.1/lib/proto_directory.c.pointer afpfs-ng-0.8.1/lib/proto_directory.c
---- afpfs-ng-0.8.1/lib/proto_directory.c.pointer 2008-02-19 03:39:29.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/proto_directory.c 2011-06-14 17:02:15.000000000 +0200
-@@ -248,6 +248,7 @@ int afp_enumerate_reply(struct afp_serve
-
- return 0;
- }
-+
- int afp_enumerateext2_reply(struct afp_server *server, char * buf, unsigned int size, void * other)
- {
-
-@@ -266,8 +267,7 @@ int afp_enumerateext2_reply(struct afp_s
- char * p = buf + sizeof(*reply);
- int i;
- char *max=buf+size;
-- struct afp_file_info * filebase = NULL, *filecur=NULL, *new_file=NULL;
-- void ** x = other;
-+ struct afp_file_info * filebase = NULL, *filecur = NULL, *new_file = NULL, **x = (struct afp_file_info **) other;
-
- if (reply->dsi_header.return_code.error_code) {
- return reply->dsi_header.return_code.error_code;
-diff -up afpfs-ng-0.8.1/lib/proto_map.c.pointer afpfs-ng-0.8.1/lib/proto_map.c
---- afpfs-ng-0.8.1/lib/proto_map.c.pointer 2008-01-30 05:37:59.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/proto_map.c 2011-06-14 17:02:15.000000000 +0200
-@@ -122,7 +122,7 @@ int afp_mapid_reply(struct afp_server *s
-
- if (reply->header.return_code.error_code!=kFPNoErr) return -1;
-
-- copy_from_pascal_two(name,&reply->name,255);
-+ copy_from_pascal_two(name,reply->name,255);
-
- return 0;
- }
-diff -up afpfs-ng-0.8.1/lib/proto_session.c.pointer afpfs-ng-0.8.1/lib/proto_session.c
---- afpfs-ng-0.8.1/lib/proto_session.c.pointer 2008-02-18 04:46:19.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/proto_session.c 2011-06-14 17:02:15.000000000 +0200
-@@ -39,7 +39,7 @@ int afp_getsessiontoken(struct afp_serve
- switch (type) {
- case kLoginWithTimeAndID:
- case kReconnWithTimeAndID: {
-- uint32_t *p = (void *) (((unsigned int) request)+
-+ uint32_t *p = (void *) (((unsigned long) request)+
- sizeof(*request));
-
- offset=sizeof(timestamp);
-@@ -63,7 +63,7 @@ int afp_getsessiontoken(struct afp_serve
- goto error;
- }
-
-- data=(void *) (((unsigned int) request)+sizeof(*request)+offset);
-+ data=(void *) (((unsigned long) request)+sizeof(*request)+offset);
- request->idlength=htonl(datalen);
- request->pad=0;
- request->type=htons(type);
-@@ -127,7 +127,7 @@ int afp_disconnectoldsession(struct afp_
- if ((request=malloc(sizeof(*request) + AFP_TOKEN_MAX_LEN))==NULL)
- return -1;
-
-- token_data = request + sizeof(*request);
-+ token_data = (char *)request + sizeof(*request);
-
- request->type=htons(type);
-
-diff -up afpfs-ng-0.8.1/lib/uams.c.pointer afpfs-ng-0.8.1/lib/uams.c
---- afpfs-ng-0.8.1/lib/uams.c.pointer 2008-01-04 04:52:44.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/uams.c 2011-06-14 17:02:15.000000000 +0200
-@@ -180,7 +180,7 @@ static int cleartxt_login(struct afp_ser
- goto cleartxt_fail;
-
- p += copy_to_pascal(p, username) + 1;
-- if ((int)p & 0x1)
-+ if ((long)p & 0x1)
- len--;
- else
- p++;
-@@ -230,7 +230,7 @@ static int cleartxt_passwd(struct afp_se
- goto cleartxt_fail;
-
- p += copy_to_pascal(p, username) + 1;
-- if ((int)p & 0x1)
-+ if ((long)p & 0x1)
- len--;
- else
- p++;
-@@ -580,7 +580,7 @@ static int dhx_login(struct afp_server *
- if (ai == NULL)
- goto dhx_noctx_fail;
- d += copy_to_pascal(ai, username) + 1;
-- if (((int)d) % 2)
-+ if (((long)d) % 2)
- d++;
- else
- ai_len--;
-diff -up afpfs-ng-0.8.1/lib/utils.c.pointer afpfs-ng-0.8.1/lib/utils.c
---- afpfs-ng-0.8.1/lib/utils.c.pointer 2008-02-18 04:53:37.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/utils.c 2011-06-14 17:02:15.000000000 +0200
-@@ -196,7 +196,7 @@ int invalid_filename(struct afp_server *
- maxlen=255;
-
-
-- p=filename+1;
-+ p=(char *)filename+1;
- while ((q=strchr(p,'/'))) {
- if (q>p+maxlen)
- return 1;
View
25 tools/android/depends/afpfs-ng/04-boxee1.patch
@@ -1,25 +0,0 @@
---- afpfs-ng-0.8.1/include/afpfs-ng/dsi.h 2008-02-18 04:33:24.000000000 +0100
-+++ afpfs-ng-0.8.1/include/afpfs-ng/dsi.h 2011-08-26 21:33:33.000000000 +0200
-@@ -6,13 +6,15 @@
-
- struct dsi_request
- {
-- unsigned short requestid;
-- unsigned char subcommand;
-- void * other;
-- unsigned char wait;
-- pthread_cond_t condition_cond;
-- struct dsi_request * next;
-- int return_code;
-+ unsigned short requestid;
-+ unsigned char subcommand;
-+ void * other;
-+ int wait;
-+ int done_waiting;
-+ pthread_cond_t waiting_cond;
-+ pthread_mutex_t waiting_mutex;
-+ struct dsi_request * next;
-+ int return_code;
- };
-
- int dsi_receive(struct afp_server * server, void * data, int size);
View
89 tools/android/depends/afpfs-ng/05-boxee2.patch
@@ -1,89 +0,0 @@
---- afpfs-ng-0.8.1/lib/afp.c 2008-03-08 03:44:16.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/afp.c 2011-08-26 21:33:33.000000000 +0200
-@@ -68,7 +68,7 @@
- afp_getsessiontoken_reply,afp_blank_reply, NULL, NULL,
- afp_enumerateext2_reply, NULL, NULL, NULL, /*64 - 71 */
- afp_listextattrs_reply, NULL, NULL, NULL,
-- afp_blank_reply, NULL, NULL, NULL, /*72 - 79 */
-+ afp_blank_reply, NULL, afp_blank_reply, afp_blank_reply, /*72 - 79 */
-
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL,
-@@ -320,8 +320,16 @@
-
- struct dsi_request * p;
- struct afp_server *s2;
-+
-+
-+ if (s==NULL)
-+ goto out;
-+
- for (p=s->command_requests;p;p=p->next) {
-- pthread_cond_signal(&p->condition_cond);
-+ pthread_mutex_lock(&p->waiting_mutex);
-+ p->done_waiting=1;
-+ pthread_cond_signal(&p->waiting_cond);
-+ pthread_mutex_unlock(&p->waiting_mutex);
- }
-
- if (s==server_base) {
-@@ -354,7 +362,7 @@
- s->exit_flag = 0;
- s->path_encoding=kFPUTF8Name; /* This is a default */
- s->next=NULL;
-- s->bufsize=2048;
-+ s->bufsize=4096;
- s->incoming_buffer=malloc(s->bufsize);
-
- s->attention_quantum=AFP_DEFAULT_ATTENTION_QUANTUM;
-@@ -524,13 +532,14 @@
- kFPVolCreateDateBit|kFPVolIDBit |
- kFPVolNameBit;
- char new_encoding;
-+ int ret;
-
- if (server->using_version->av_number>=30)
- bitmap|= kFPVolNameBit|kFPVolBlockSizeBit;
-
-- switch (afp_volopen(volume,bitmap,
-- (strlen(volume->volpassword)>0) ? volume->volpassword : NULL))
-- {
-+ ret = afp_volopen(volume,bitmap,
-+ (strlen(volume->volpassword)>0) ? volume->volpassword : NULL);
-+ switch(ret){
- case kFPAccessDenied:
- *l+=snprintf(mesg,max-*l,
- "Incorrect volume password\n");
-@@ -544,6 +553,10 @@
- *l+=snprintf(mesg,max-*l,
- "Could not open volume\n");
- goto error;
-+ case ETIMEDOUT:
-+ *l+=snprintf(mesg,max-*l,
-+ "Timed out waiting to open volume\n");
-+ goto error;
- }
-
- /* It is said that if a volume's encoding will be the same
-@@ -641,7 +654,6 @@
- add_server(server);
-
- add_fd_and_signal(server->fd);
--
- if (!full) {
- return 0;
- }
-@@ -649,10 +661,13 @@
- /* Get the status, and calculate the transmit time. We use this to
- * calculate our rx quantum. */
- gettimeofday(&t1,NULL);
-+
- if ((error=dsi_getstatus(server))!=0)
- goto error;
- gettimeofday(&t2,NULL);
-
-+ afp_server_identify(server);
-+
- if ((t2.tv_sec - t1.tv_sec) > 0)
- server->tx_delay= (t2.tv_sec - t1.tv_sec) * 1000;
- else
View
141 tools/android/depends/afpfs-ng/06-boxee3.patch
@@ -1,141 +0,0 @@
---- afpfs-ng-0.8.1/lib/dsi.c 2011-08-26 17:27:16.000000000 +0200
-+++ afpfs-ng-0.8.1/lib/dsi.c 2011-08-26 21:33:33.000000000 +0200
-@@ -64,7 +64,7 @@
- rx.size=0;
- dsi_setup_header(server,&header,DSI_DSIGetStatus);
- /* We're intentionally ignoring the results */
-- ret=dsi_send(server,(char *) &header,sizeof(struct dsi_header),20,
-+ ret=dsi_send(server,(char *) &header,sizeof(struct dsi_header),60,
- 0,(void *) &rx);
-
- free(rx.data);
-@@ -197,6 +197,7 @@
- new_request->other=other;
- new_request->wait=wait;
- new_request->next=NULL;
-+ new_request->done_waiting=0;
-
- pthread_mutex_lock(&server->request_queue_mutex);
- if (server->command_requests==NULL) {
-@@ -208,7 +209,8 @@
- server->stats.requests_pending++;
- pthread_mutex_unlock(&server->request_queue_mutex);
-
-- pthread_cond_init(&new_request->condition_cond,NULL);
-+ pthread_cond_init(&new_request->waiting_cond,NULL);
-+ pthread_mutex_init(&new_request->waiting_mutex,NULL);
-
- if (server->connect_state==SERVER_STATE_DISCONNECTED) {
- char mesg[1024];
-@@ -240,16 +242,12 @@
- server->stats.tx_bytes+=size;
- pthread_mutex_unlock(&server->send_mutex);
-
-- int tmpwait=new_request->wait;
- #ifdef DEBUG_DSI
- printf("=== Waiting for response for %d %s\n",
- new_request->requestid,
- afp_get_command_name(new_request->subcommand));
- #endif
-- if (tmpwait<0) {
--
-- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-- pthread_mutex_lock(&mutex);
-+ if (new_request->wait<0) {
-
- /* Wait forever */
- #ifdef DEBUG_DSI
-@@ -258,14 +256,17 @@
- afp_get_command_name(new_request->subcommand));
- #endif
-
-- rc=pthread_cond_wait(
-- &new_request->condition_cond,
-- &mutex );
-- pthread_mutex_unlock(&mutex);
--
-- } else if (tmpwait>0) {
-- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-- pthread_mutex_lock(&mutex);
-+ pthread_mutex_lock(&new_request->waiting_mutex);
-+
-+ if (new_request->done_waiting==0)
-+ rc=pthread_cond_wait(
-+ &new_request->waiting_cond,
-+ &new_request->waiting_mutex );
-+
-+ pthread_mutex_unlock(&new_request->waiting_mutex);
-+
-+ } else if (new_request->wait>0) {
-+ /* wait for new_request->wait seconds */
-
- #ifdef DEBUG_DSI
- printf("=== Waiting for %d %s, for %ds\n",
-@@ -283,13 +284,15 @@
- printf("=== Changing my mind, no longer waiting for %d\n",
- new_request->requestid);
- #endif
-- pthread_mutex_unlock(&mutex);
- goto skip;
- }
-- rc=pthread_cond_timedwait(
-- &new_request->condition_cond,
-- &mutex,&ts);
-- pthread_mutex_unlock(&mutex);
-+ pthread_mutex_lock(&new_request->waiting_mutex);
-+ if (new_request->done_waiting==0)
-+ rc=pthread_cond_timedwait(
-+ &new_request->waiting_cond,
-+ &new_request->waiting_mutex,&ts);
-+ pthread_mutex_unlock(&new_request->waiting_mutex);
-+
- if (rc==ETIMEDOUT) {
- /* FIXME: should handle this case properly */
- #ifdef DEBUG_DSI
-@@ -299,6 +302,7 @@
- goto out;
- }
- } else {
-+ /* Don't wait */
- #ifdef DEBUG_DSI
- printf("=== Skipping wait altogether for %d\n",new_request->requestid);
- #endif
-@@ -474,7 +478,7 @@
- }
- server->flags=ntohs(reply1->flags);
-
-- p=(void *)((unsigned long) server->incoming_buffer + sizeof(*reply1));
-+ p=(void *)((unsigned int) server->incoming_buffer + sizeof(*reply1));
- p+=copy_from_pascal(server->server_name,p,AFP_SERVER_NAME_LEN)+1;
-
- /* Now work our way through the variable bits */
-@@ -577,6 +581,7 @@
- unsigned char mins=0;
- unsigned char checkmessage=0;
-
-+ memset(mesg,0,AFP_LOGINMESG_LEN);
-
- /* The logic here's undocumented. If we get an attention packet and
- there's no flag, then go check the message. Also, go check the
-@@ -757,7 +762,7 @@
- printf("<<< read() of rest of AFP, %d bytes\n",amount_to_read);
- #endif
- ret = read(server->fd, (void *)
-- (((unsigned long) server->incoming_buffer)+server->data_read),
-+ (((unsigned int) server->incoming_buffer)+server->data_read),
- amount_to_read);
- if (ret<0) return -1;
- if (ret==0) {
-@@ -862,8 +867,11 @@
- #ifdef DEBUG_DSI
- printf("<<< Signalling %d, returning %d or %d\n",request->requestid,request->return_code,rc);
- #endif
-+ pthread_mutex_lock(&request->waiting_mutex);
- request->wait=0;
-- pthread_cond_signal(&request->condition_cond);
-+ request->done_waiting=1;
-+ pthread_cond_signal(&request->waiting_cond);
-+ pthread_mutex_unlock(&request->waiting_mutex);
- } else {
- dsi_remove_from_request_queue(server,request);
- }
View
27 tools/android/depends/afpfs-ng/07-boxee4.patch
@@ -1,27 +0,0 @@
---- afpfs-ng-0.8.1/lib/identify.c 1970-01-01 01:00:00.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/identify.c 2011-08-26 21:33:33.000000000 +0200
-@@ -0,0 +1,24 @@
-+#include <string.h>
-+#include <afpfs-ng/afp.h>
-+
-+
-+/*
-+ * afp_server_identify()
-+ *
-+ * Identifies a server
-+ *
-+ * Right now, this only does identification using the machine_type
-+ * given in getsrvrinfo, but this could later use mDNS to get
-+ * more details.
-+ */
-+void afp_server_identify(struct afp_server * s)
-+{
-+ if (strcmp(s->machine_type,"Netatalk")==0)
-+ s->server_type=AFPFS_SERVER_TYPE_NETATALK;
-+ else if (strcmp(s->machine_type,"AirPort")==0)
-+ s->server_type=AFPFS_SERVER_TYPE_AIRPORT;
-+ else if (strcmp(s->machine_type,"Macintosh")==0)
-+ s->server_type=AFPFS_SERVER_TYPE_MACINTOSH;
-+ else
-+ s->server_type=AFPFS_SERVER_TYPE_UNKNOWN;
-+}
View
11 tools/android/depends/afpfs-ng/08-boxee5.patch
@@ -1,11 +0,0 @@
---- afpfs-ng-0.8.1/lib/Makefile.am 2008-02-18 04:34:32.000000000 +0100
-+++ afpfs-ng-0.8.1/lib/Makefile.am 2011-08-26 21:33:33.000000000 +0200
-@@ -4,7 +4,7 @@
-
- lib_LTLIBRARIES = libafpclient.la
-
--libafpclient_la_SOURCES = afp.c codepage.c did.c dsi.c map_def.c uams.c uams_def.c unicode.c users.c utils.c resource.c log.c client.c server.c connect.c loop.c midlevel.c proto_attr.c proto_desktop.c proto_directory.c proto_files.c proto_fork.c proto_login.c proto_map.c proto_replyblock.c proto_server.c proto_volume.c proto_session.c afp_url.c status.c forklist.c debug.c lowlevel.c
-+libafpclient_la_SOURCES = afp.c codepage.c did.c dsi.c map_def.c uams.c uams_def.c unicode.c users.c utils.c resource.c log.c client.c server.c connect.c loop.c midlevel.c proto_attr.c proto_desktop.c proto_directory.c proto_files.c proto_fork.c proto_login.c proto_map.c proto_replyblock.c proto_server.c proto_volume.c proto_session.c afp_url.c status.c forklist.c debug.c lowlevel.c identify.c
-
- # libafpclient_la_LDFLAGS = -module -avoid-version
-
View
23 tools/android/depends/afpfs-ng/10-fix-errno.patch
@@ -1,23 +0,0 @@
---- afpfs-ng-0.8.1/lib/afp.c 2011-09-04 19:42:42.000000000 +0200
-+++ afpfs-ng-0.8.1/lib/afp.c 2011-09-04 19:39:44.000000000 +0200
-@@ -19,7 +19,6 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/socket.h>
--#include <errno.h>
-
- #include <afpfs-ng/afp_protocol.h>
- #include <afpfs-ng/libafpclient.h>
---- afpfs-ng-0.8.1/lib/afp_url.c 2011-09-04 19:42:42.000000000 +0200
-+++ afpfs-ng-0.8.1/lib/afp_url.c 2011-09-04 19:40:27.000000000 +0200
-@@ -21,7 +21,9 @@
-
- static int check_port(char * port)
- {
-- long long ret = strtol(port,NULL,10);
-+ long long ret = 0;
-+ errno = 0;
-+ ret = strtol(port,NULL,10);
- if ((ret<0) || (ret>32767)) return -1;
- if (errno) {
- printf("port error\n");
View
11 tools/android/depends/afpfs-ng/11-fix-stat.patch
@@ -1,11 +0,0 @@
---- afpfs-ng-0.8.1/lib/lowlevel.c 2011-10-01 20:36:55.000000000 +0200
-+++ afpfs-ng-0.8.1/lib/lowlevel.c 2011-10-01 20:46:00.000000000 +0200
-@@ -579,7 +579,7 @@
- return -EIO;
- }
-
-- if (volume->server->using_version->av_number>=30)
-+ if (volume->server->using_version->av_number>=30 && fp.unixprivs.permissions != 0)
- stbuf->st_mode |= fp.unixprivs.permissions;
- else
- set_nonunix_perms(&stbuf->st_mode,&fp);
View
60 tools/android/depends/afpfs-ng/Makefile
@@ -1,60 +0,0 @@
-include ../Makefile.include
-DEPS= ../Makefile.include 01-gcrypt.patch 02-pointer.patch 04-boxee1.patch \
- 05-boxee2.patch 06-boxee3.patch 07-boxee4.patch \
- 08-boxee5.patch 10-fix-errno.patch 11-fix-stat.patch \
- android.patch fix_afpfs-ng_includes.patch Makefile
-
-# lib name, version
-LIBNAME=afpfs-ng
-VERSION=0.8.1
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.bz2
-
-# configuration settings
-export PATH:=$(TOOLCHAIN)/bin:$(PATH)
-export LIBS=-liconv
-CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \
- --disable-fuse ac_cv_func_malloc_0_nonnull=yes
-
-LIBDYLIB=$(PLATFORM)/lib/.libs/libafpclient.so.0.0.0
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
- $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
- rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
- $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- cd $(PLATFORM); patch -p1 <../fix_afpfs-ng_includes.patch
- cd $(PLATFORM); patch -p1 <../01-gcrypt.patch
- cd $(PLATFORM); patch -p1 <../02-pointer.patch
- cd $(PLATFORM); patch -p1 <../04-boxee1.patch
- cd $(PLATFORM); patch -p1 <../05-boxee2.patch
- cd $(PLATFORM); patch -p1 <../06-boxee3.patch
- cd $(PLATFORM); patch -p1 <../07-boxee4.patch
- cd $(PLATFORM); patch -p1 <../08-boxee5.patch
- cd $(PLATFORM); patch -p1 <../10-fix-errno.patch
- cd $(PLATFORM); patch -p1 <../11-fix-stat.patch
- cd $(PLATFORM); patch -p0 < ../android.patch
- cd $(PLATFORM); $(AUTORECONF) -vif
- cd $(PLATFORM); $(CONFIGURE)
-
-$(LIBDYLIB): $(PLATFORM)
- $(MAKE) -j 1 -C $(PLATFORM)/lib
-
-.installed-$(PLATFORM): $(LIBDYLIB)
- $(MAKE) -C $(PLATFORM)/lib install
- $(MAKE) -C $(PLATFORM)/include install
- rm -f $(PREFIX)/lib/libafpclient.la $(PREFIX)/lib/libafpclient.so $(PREFIX)/lib/libafpclient.so.0
- mv -f $(PREFIX)/lib/libafpclient.so.0.0.0 $(PREFIX)/lib/libafpclient.so
- $(RPL) -e "libafpclient.so.0" "libafpclient.so\x00\x00" $(PREFIX)/lib/libafpclient.so
- -$(READELF) --dynamic $(PREFIX)/lib/libafpclient.so | grep ibrary
- touch $@
-
-clean:
- $(MAKE) -C $(PLATFORM) clean
- rm -f .installed-$(PLATFORM)
-
-distclean::
- rm -rf $(PLATFORM) .installed-$(PLATFORM)
View
64 tools/android/depends/afpfs-ng/android.patch
@@ -1,64 +0,0 @@
---- include/afpfs-ng/afp.h 2012-06-03 22:47:49.014348648 -0400
-+++ include/afpfs-ng/afp.h 2012-06-03 22:46:28.924348698 -0400
-@@ -5,7 +5,13 @@
- #include <arpa/inet.h>
- #include <pthread.h>
- #include <netdb.h>
-+#ifndef ANDROID
- #include <sys/statvfs.h>
-+#else
-+#include <sys/vfs.h>
-+#define statvfs statfs
-+#define fstatvfs fstatfs
-+#endif
- #include <pwd.h>
- #include <afpfs-ng/afp_protocol.h>
- #include <afpfs-ng/libafpclient.h>
---- lib/midlevel.c 2012-06-03 22:47:49.014348648 -0400
-+++ lib/midlevel.c 2012-06-03 22:46:28.924348698 -0400
-@@ -1388,10 +1388,12 @@
- stat->f_frsize=0;
- stat->f_files=0;
- stat->f_ffree=0;
-+#ifndef ANDROID
- stat->f_favail=0;
- stat->f_fsid=0;
- stat->f_flag=0;
- stat->f_namemax=255;
-+#endif
- return 0;
-
- }
---- lib/lowlevel.c 2012-06-03 22:47:49.054348648 -0400
-+++ lib/lowlevel.c 2012-06-03 22:46:28.914348698 -0400
-@@ -612,7 +612,7 @@
- modification_date=fp.modification_date;
- }
-
--#ifdef __linux__
-+#if defined(__linux__) && !defined(ANDROID)
- stbuf->st_ctim.tv_sec=creation_date;
- stbuf->st_mtim.tv_sec=modification_date;
- #else
---- lib/dsi.c 2012-06-03 23:24:15.454347269 -0400
-+++ lib/dsi.c 2012-06-03 23:25:01.634347240 -0400
-@@ -610,7 +610,7 @@
- afp_getsrvrmsg(server,AFPMESG_SERVER,
- ((server->using_version->av_number>=30)?1:0),
- DSI_DEFAULT_TIMEOUT,mesg);
-- if(bcmp(mesg,"The server is going down for maintenance.",41)==0)
-+ if(memcmp(mesg,"The server is going down for maintenance.",41)==0)
- shutdown=1;
- }
-
---- lib/afp.c 2012-06-03 23:24:15.474347269 -0400
-+++ lib/afp.c 2012-06-03 23:25:12.464347233 -0400
-@@ -205,7 +205,7 @@
- {
- struct afp_server *s;
- for (s=server_base;s;s=s->next) {
-- if (bcmp(&s->address,address,sizeof(struct sockaddr_in))==0)
-+ if (memcmp(&s->address,address,sizeof(struct sockaddr_in))==0)
- return s;
- }
- return NULL;
View
3,082 tools/android/depends/afpfs-ng/fix_afpfs-ng_includes.patch
0 additions, 3,082 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
60 tools/android/depends/alsa-lib/Makefile
@@ -1,60 +0,0 @@
-include ../Makefile.include
-DEPS= ../Makefile.include Makefile removeshm-2.patch removeshm-3.patch removeshm-upstream.patch timeval.patch
-
-# lib name, version
-LIBNAME=libasound
-VERSION=1.0.23
-SOURCE=alsa-lib-$(VERSION)
-ARCHIVE=$(SOURCE).tar.bz2
-
-# configuration settings
-CFLAGS += \
- -fPIC -DPIC \
- -finline-limit=300 -finline-functions -fno-inline-functions-called-once \
-
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
- $(AUTORECONF) -vif; \
- ./configure --prefix=$(PREFIX) --host=$(HOST) \
- --with-alsa-devdir=/dev/snd/ --with-plugindir=/system/usr/lib/alsa-lib --with-configdir=/system/usr/share/alsa \
- --with-ctl-plugins=ext \
- --with-pcm-plugins="copy,linear,route,mulaw,alaw,adpcm,rate,plug,multi,file,null,empty,share,meter,hooks,lfloat,ladspa,asym,iec958,softvol,extplug,ioplug,mmap_emul" \
- --disable-resmgr --enable-aload --enable-mixer --enable-pcm --disable-rawmidi --enable-hwdep --disable-seq --disable-alisp --disable-old-symbols --disable-python \
- --with-softfloat=yes --with-libdl=yes --with-pthread=yes --with-librt=no \
-
-LIBDYLIB=$(PLATFORM)/src/.libs/$(LIBNAME).so
-
-CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
- $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
- rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- cd $(PLATFORM); patch -p1 < ../removeshm-upstream.patch
- cd $(PLATFORM); patch -p0 < ../removeshm-2.patch
- cd $(PLATFORM); patch -p0 < ../removeshm-3.patch
- cd $(PLATFORM); patch -p0 < ../timeval.patch
- cd $(PLATFORM); $(CONFIGURE)
-
-$(LIBDYLIB): $(PLATFORM)
- $(MAKE) -C $(PLATFORM)/src
-
-.installed-$(PLATFORM): $(LIBDYLIB)
- $(MAKE) -C $(PLATFORM)/src install-libLTLIBRARIES
- $(MAKE) -C $(PLATFORM)/include install
- $(MAKE) -C $(PLATFORM)/utils install
- rm -f $(PREFIX)/lib/libasound.la $(PREFIX)/lib/libasound.so $(PREFIX)/lib/libxbasound.so $(PREFIX)/lib/libasound.so.2
- mv -f $(PREFIX)/lib/libasound.so.2.0.0 $(PREFIX)/lib/libasound.so
- $(RPL) -e "libasound.so.2" "libasound.so\x00\x00" $(PREFIX)/lib/libasound.so
- -$(READELF) --dynamic $(PREFIX)/lib/libasound.so | grep ibrary
- touch $@
-
-clean:
- $(MAKE) -C $(PLATFORM) clean
- rm -f .installed-$(PLATFORM)
-
-distclean::
- rm -rf $(PLATFORM) .installed-$(PLATFORM)
View
11 tools/android/depends/alsa-lib/removeshm-2.patch
@@ -1,11 +0,0 @@
---- src/compat/Makefile.am 2012-05-25 00:00:09.824890740 -0400
-+++ src/compat/Makefile.am 2012-05-25 14:47:53.694857153 -0400
-@@ -1,8 +1,3 @@
- noinst_LTLIBRARIES = libcompat.la
--EXTRA_libcompat_la_SOURCES = hsearch_r.c
-
--if ALSA_HSEARCH_R
--libcompat_la_SOURCES = empty.c hsearch_r.c
--else
- libcompat_la_SOURCES = empty.c
--endif
View
11 tools/android/depends/alsa-lib/removeshm-3.patch
@@ -1,11 +0,0 @@
---- src/Makefile.am 2011-01-12 17:02:37.000000000 -0500
-+++ src/Makefile.am 2012-05-25 00:10:22.184890354 -0400
-@@ -14,7 +14,7 @@
- endif
-
- lib_LTLIBRARIES = libasound.la
--libasound_la_SOURCES = conf.c confmisc.c input.c output.c async.c error.c dlmisc.c socket.c shmarea.c userfile.c names.c
-+libasound_la_SOURCES = conf.c confmisc.c input.c output.c async.c error.c dlmisc.c socket.c userfile.c names.c
-
- SUBDIRS=control
- libasound_la_LIBADD = control/libcontrol.la
View
187 tools/android/depends/alsa-lib/removeshm-upstream.patch
@@ -1,187 +0,0 @@
-From: Sean McNeil <sean.mcneil@windriver.com>
-Date: Wed, 7 Jul 2010 02:03:47 +0000 (+0700)
-Subject: Remove shared memory access.
-X-Git-Tag: tegra-10.11.0~2
-X-Git-Url: http://nv-tegra.nvidia.com/gitweb/?p=android%2Fplatform%2Fexternal%2Falsa-lib.git;a=commitdiff_plain;h=24def9277c1bf4ed5c19b73ed3e76d761f992ddb
-
-Remove shared memory access.
-
-Somehow these changes didn't get committed.
-
-Change-Id: Ida7b706de56d95c8fb22d2708711a4d68c41ddaa
----
-
-diff --git a/src/alisp/alisp.c b/src/alisp/alisp.c
-index f3580f9..279a24c 100644
---- a/src/alisp/alisp.c
-+++ b/src/alisp/alisp.c
-@@ -1025,6 +1025,7 @@ static const char *obj_type_str(struct alisp_object * p)
- case ALISP_OBJ_CONS: return "cons";
- default: assert(0);
- }
-+ return 0; /* make compiler happy */
- }
-
- static void print_obj_lists(struct alisp_instance *instance, snd_output_t *out)
-diff --git a/src/dlmisc.c b/src/dlmisc.c
-index a0d62d3..b84eaf6 100644
---- a/src/dlmisc.c
-+++ b/src/dlmisc.c
-@@ -27,6 +27,7 @@
- *
- */
-
-+#define _GNU_SOURCE
- #include "list.h"
- #include "local.h"
-
-@@ -53,13 +54,13 @@ void *snd_dlopen(const char *name, int mode)
- #else
- #ifdef HAVE_LIBDL
- if (name == NULL) {
-- static const char * self = NULL;
-- if (self == NULL) {
-- Dl_info dlinfo;
-- if (dladdr(snd_dlopen, &dlinfo) > 0)
-- self = dlinfo.dli_fname;
-- }
-- name = self;
-+#ifdef ANDROID
-+ return RTLD_DEFAULT;
-+#else
-+ Dl_info dlinfo;
-+ if (dladdr(snd_dlopen, &dlinfo) > 0)
-+ name = dlinfo.dli_fname;
-+#endif
- }
- #endif
- #endif
-@@ -85,6 +86,10 @@ int snd_dlclose(void *handle)
- return 0;
- #endif
- #ifdef HAVE_LIBDL
-+#ifdef ANDROID
-+ if (handle == RTLD_DEFAULT)
-+ return 0;
-+#endif
- return dlclose(handle);
- #else
- return 0;
-diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
-index f910189..71d5e99 100644
---- a/src/pcm/pcm.c
-+++ b/src/pcm/pcm.c
-@@ -634,7 +634,6 @@ playback devices.
- #include <stdarg.h>
- #include <signal.h>
- #include <sys/poll.h>
--#include <sys/shm.h>
- #include <sys/mman.h>
- #include <limits.h>
- #include "pcm_local.h"
-diff --git a/src/pcm/pcm_generic.c b/src/pcm/pcm_generic.c
-index 84ea85f..d26aead 100644
---- a/src/pcm/pcm_generic.c
-+++ b/src/pcm/pcm_generic.c
-@@ -26,7 +26,6 @@
- *
- */
-
--#include <sys/shm.h>
- #include <sys/ioctl.h>
- #include <limits.h>
- #include "pcm_local.h"
-diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
-index 9d243d5..7f88a5b 100644
---- a/src/pcm/pcm_hw.c
-+++ b/src/pcm/pcm_hw.c
-@@ -36,7 +36,6 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
--#include <sys/shm.h>
- #include "pcm_local.h"
- #include "../control/control_local.h"
- #include "../timer/timer_local.h"
-diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c
-index 4621fe6..4b7a353 100644
---- a/src/pcm/pcm_mmap.c
-+++ b/src/pcm/pcm_mmap.c
-@@ -23,7 +23,9 @@
- #include <string.h>
- #include <sys/poll.h>
- #include <sys/mman.h>
-+#ifndef ANDROID
- #include <sys/shm.h>
-+#endif
- #include "pcm_local.h"
-
- size_t page_size(void)
-@@ -371,6 +373,7 @@ int snd_pcm_mmap(snd_pcm_t *pcm)
- }
- i->addr = ptr;
- break;
-+#ifndef ANDROID
- case SND_PCM_AREA_SHM:
- if (i->u.shm.shmid < 0) {
- int id;
-@@ -416,6 +419,7 @@ int snd_pcm_mmap(snd_pcm_t *pcm)
- }
- i->addr = ptr;
- break;
-+#endif
- case SND_PCM_AREA_LOCAL:
- ptr = malloc(size);
- if (ptr == NULL) {
-@@ -496,6 +500,7 @@ int snd_pcm_munmap(snd_pcm_t *pcm)
- }
- errno = 0;
- break;
-+#ifndef ANDROID
- case SND_PCM_AREA_SHM:
- if (i->u.shm.area) {
- snd_shm_area_destroy(i->u.shm.area);
-@@ -513,6 +518,7 @@ int snd_pcm_munmap(snd_pcm_t *pcm)
- }
- }
- break;
-+#endif
- case SND_PCM_AREA_LOCAL:
- free(i->addr);
- break;
-diff --git a/src/pcm/pcm_null.c b/src/pcm/pcm_null.c
-index 692254a..2f2a42f 100644
---- a/src/pcm/pcm_null.c
-+++ b/src/pcm/pcm_null.c
-@@ -28,7 +28,6 @@
-
- #include <byteswap.h>
- #include <limits.h>
--#include <sys/shm.h>
- #include "pcm_local.h"
- #include "pcm_plugin.h"
-
-diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
-index 0ef394a..a751deb 100644
---- a/src/pcm/pcm_plugin.c
-+++ b/src/pcm/pcm_plugin.c
-@@ -82,7 +82,6 @@ pcm.rate44100Hz {
-
- */
-
--#include <sys/shm.h>
- #include <limits.h>
- #include "pcm_local.h"
- #include "pcm_plugin.h"
-diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c
-index 56a8685..72084fc 100644
---- a/src/pcm/pcm_share.c
-+++ b/src/pcm/pcm_share.c
-@@ -35,7 +35,6 @@
- #include <math.h>
- #include <sys/socket.h>
- #include <sys/poll.h>
--#include <sys/shm.h>
- #include <pthread.h>
- #include "pcm_local.h"
-
View
11 tools/android/depends/alsa-lib/timeval.patch
@@ -1,11 +0,0 @@
---- include/global.h 2010-04-16 07:11:05.000000000 -0400
-+++ include/global.h 2012-05-25 15:38:15.494855247 -0400
-@@ -133,7 +133,7 @@
-
- int snd_user_file(const char *file, char **result);
-
--#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE)
-+#if 0
- struct timeval {
- time_t tv_sec; /* seconds */
- long tv_usec; /* microseconds */
View
53 tools/android/depends/android-sys/Makefile
@@ -1,53 +0,0 @@
-include ../Makefile.include
-DEPS = ../Makefile.include Makefile iomx.cpp
-
-LIBNAME=android-sys
-VERSION=0.1
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-
-PRIVATE_LIBDIR=$(PLATFORM)/android-libs
-PRIVATE_LIBS =$(PRIVATE_LIBDIR)/libutils.so
-PRIVATE_LIBS+=$(PRIVATE_LIBDIR)/libmedia.so
-PRIVATE_LIBS+=$(PRIVATE_LIBDIR)/libbinder.so
-PRIVATE_LIBS+=$(PRIVATE_LIBDIR)/libstagefright.so
-
-CXXFLAGS =$(PLATFORM_FLAGS) -I$(PREFIX)/include -fexceptions
-LDFLAGS += -L$(PRIVATE_LIBDIR) -lmedia -lutils -lbinder
-INCLUDES+=-I$(PLATFORM)/$(SDK_PLATFORM)/system/core/include
-INCLUDES+=-I$(PLATFORM)/$(SDK_PLATFORM)/frameworks/base/include
-INCLUDES+=-I$(PLATFORM)/$(SDK_PLATFORM)/frameworks/base/include/media/stagefright/openmax
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
- $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
- rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-
-$(PRIVATE_LIBS:.so=.symbols): $(PLATFORM)
-
-$(PRIVATE_LIBS:.so=.c): $(PRIVATE_LIBS:.so=.symbols)
- rm -f $@
- for s in `cat $(@:.c=.symbols)`; do echo "void $$s() {}" >> $@; done
-
-$(PRIVATE_LIBS): $(PRIVATE_LIBS:.so=.c)
- $(CC) $(@:.so=.c) -shared -o $@
-
-$(PLATFORM)/$(SDK_PLATFORM)/libiomx.so: iomx.cpp
- $(CXX) $(CXXFLAGS) $(INCLUDES) -shared -o $@ iomx.cpp $(LDFLAGS) -lstagefright
-
-.installed-$(PLATFORM): $(PRIVATE_LIBS) $(PLATFORM)/$(SDK_PLATFORM)/libiomx.so
- mkdir -p $(PREFIX)/include/$(SDK_PLATFORM)
- mkdir -p $(PREFIX)/lib/$(SDK_PLATFORM)
- cp -f $(PLATFORM)/$(SDK_PLATFORM)/libiomx.so $(PREFIX)/lib/$(SDK_PLATFORM)/
- cp -f $(PLATFORM)/$(SDK_PLATFORM)/frameworks/base/include/media/stagefright/openmax/* $(PREFIX)/include/$(SDK_PLATFORM)/
- touch $@
-
-clean:
- rm -f .installed-$(PLATFORM) $(PLATFORM)/libiomx.so $(PRIVATE_LIBS) $(PRIVATE_LIBS:.so=.c)
-
-distclean::
- rm -rf $(PLATFORM) .installed-$(PLATFORM)
View
473 tools/android/depends/android-sys/iomx.cpp
@@ -1,473 +0,0 @@
-/*****************************************************************************
- * iomx.cpp: OpenMAX interface implementation based on IOMX
- *****************************************************************************
- * Copyright (C) 2011 VLC authors and VideoLAN
- *
- * Authors: Martin Storsjo <martin@martin.st>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-
-#include <media/stagefright/OMXClient.h>
-#include <media/IOMX.h>
-#include <binder/MemoryDealer.h>
-#include <OMX_Component.h>
-
-extern "C" {
-
-int android_printf(const char *format, ...)
-{
- // For use before CLog is setup by XBMC_Run()
- va_list args;
- va_start(args, format);
- int result = __android_log_vprint(ANDROID_LOG_VERBOSE, "XBMC", format, args);
- va_end(args);
- return result;
-}
-}
-
-//#define PREFIX(x) I ## x
-#define PREFIX(x) x
-
-using namespace android;
-
-class IOMXContext {
-public:
- IOMXContext() {
- }
-
- sp<IOMX> iomx;
- List<IOMX::ComponentInfo> components;
-};
-
-static IOMXContext *ctx;
-
-class OMXNode;
-
-class OMXCodecObserver : public BnOMXObserver {
-public:
- OMXCodecObserver() {
- node = NULL;
- }
- void setNode(OMXNode* n) {
- node = n;
- }
- void onMessage(const omx_message &msg);
- void registerBuffers(const sp<IMemoryHeap> &) {
- }
-private:
- OMXNode *node;
-};
-
-class OMXNode {
-public:
- IOMX::node_id node;
- sp<OMXCodecObserver> observer;
- OMX_CALLBACKTYPE callbacks;
- OMX_PTR app_data;
- OMX_STATETYPE state;
- List<OMX_BUFFERHEADERTYPE*> buffers;
- OMX_HANDLETYPE handle;
- String8 component_name;
-};
-
-class OMXBuffer {
-public:
- sp<MemoryDealer> dealer;
- IOMX::buffer_id id;
-};
-
-void OMXCodecObserver::onMessage(const omx_message &msg)
-{
- if (!node)
- return;
- switch (msg.type) {
- case omx_message::EVENT:
- // TODO: Needs locking
- if (msg.u.event_data.event == OMX_EventCmdComplete && msg.u.event_data.data1 == OMX_CommandStateSet)
- node->state = (OMX_STATETYPE) msg.u.event_data.data2;
- node->callbacks.EventHandler(node->handle, node->app_data, msg.u.event_data.event, msg.u.event_data.data1, msg.u.event_data.data2, NULL);
- break;
- case omx_message::EMPTY_BUFFER_DONE:
- for( List<OMX_BUFFERHEADERTYPE*>::iterator it = node->buffers.begin(); it != node->buffers.end(); it++ ) {
- OMXBuffer* info = (OMXBuffer*) (*it)->pPlatformPrivate;
- if (msg.u.buffer_data.buffer == info->id) {
- node->callbacks.EmptyBufferDone(node->handle, node->app_data, *it);
- break;
- }
- }
- break;
- case omx_message::FILL_BUFFER_DONE:
- for( List<OMX_BUFFERHEADERTYPE*>::iterator it = node->buffers.begin(); it != node->buffers.end(); it++ ) {
- OMXBuffer* info = (OMXBuffer*) (*it)->pPlatformPrivate;
- if (msg.u.extended_buffer_data.buffer == info->id) {
- OMX_BUFFERHEADERTYPE *buffer = *it;
- buffer->nOffset = msg.u.extended_buffer_data.range_offset;
- buffer->nFilledLen = msg.u.extended_buffer_data.range_length;
- buffer->nFlags = msg.u.extended_buffer_data.flags;
- buffer->nTimeStamp = msg.u.extended_buffer_data.timestamp;
- node->callbacks.FillBufferDone(node->handle, node->app_data, buffer);
- break;
- }
- }
- break;
- default:
- break;
- }
-}
-
-static OMX_ERRORTYPE get_error(status_t err)
-{
- if (err == OK)
- return OMX_ErrorNone;
- return OMX_ErrorUndefined;
-}
-
-static int get_param_size(OMX_INDEXTYPE param_index)
-{
- switch (param_index) {
- case OMX_IndexParamPortDefinition:
- return sizeof(OMX_PARAM_PORTDEFINITIONTYPE);
- case OMX_IndexParamStandardComponentRole:
- return sizeof(OMX_PARAM_COMPONENTROLETYPE);
- case OMX_IndexParamVideoInit:
- case OMX_IndexParamAudioInit:
- case OMX_IndexParamImageInit:
- case OMX_IndexParamOtherInit:
- return sizeof(OMX_PORT_PARAM_TYPE);
- case OMX_IndexParamNumAvailableStreams:
- return sizeof(OMX_PARAM_U32TYPE);
- case OMX_IndexParamAudioPcm:
- return sizeof(OMX_AUDIO_PARAM_PCMMODETYPE);
- case OMX_IndexParamAudioAdpcm:
- return sizeof(OMX_AUDIO_PARAM_AMRTYPE);
- case OMX_IndexParamAudioAmr:
- return sizeof(OMX_AUDIO_PARAM_AMRTYPE);
- case OMX_IndexParamAudioG723:
- return sizeof(OMX_AUDIO_PARAM_G723TYPE);
- case OMX_IndexParamAudioG726:
- return sizeof(OMX_AUDIO_PARAM_G726TYPE);
- case OMX_IndexParamAudioG729:
- return sizeof(OMX_AUDIO_PARAM_G729TYPE);
- case OMX_IndexParamAudioAac:
- return sizeof(OMX_AUDIO_PARAM_AACPROFILETYPE);
- case OMX_IndexParamAudioMp3:
- return sizeof(OMX_AUDIO_PARAM_MP3TYPE);
- case OMX_IndexParamAudioSbc:
- return sizeof(OMX_AUDIO_PARAM_SBCTYPE);
- case OMX_IndexParamAudioVorbis:
- return sizeof(OMX_AUDIO_PARAM_VORBISTYPE);
- case OMX_IndexParamAudioWma:
- return sizeof(OMX_AUDIO_PARAM_WMATYPE);
- case OMX_IndexParamAudioRa:
- return sizeof(OMX_AUDIO_PARAM_RATYPE);
- case OMX_IndexParamVideoPortFormat:
- return sizeof(OMX_VIDEO_PARAM_PORTFORMATTYPE);
- case OMX_IndexParamVideoBitrate:
- return sizeof(OMX_VIDEO_PARAM_BITRATETYPE);
- case OMX_IndexParamVideoH263:
- return sizeof(OMX_VIDEO_PARAM_H263TYPE);
- case OMX_IndexParamVideoMpeg4:
- return sizeof(OMX_VIDEO_PARAM_MPEG4TYPE);
- case OMX_IndexParamVideoAvc:
- return sizeof(OMX_VIDEO_PARAM_AVCTYPE);
- default:
- return 0;
- }
-}
-
-static int get_config_size(OMX_INDEXTYPE param_index)
-{
- switch (param_index) {
- case OMX_IndexConfigCommonOutputCrop:
- return sizeof(OMX_CONFIG_RECTTYPE);
- default:
- /* Dynamically queried config indices could have any size, but
- * are currently only used with OMX_BOOL. */
- return sizeof(OMX_BOOL);
- }
-}
-
-static OMX_ERRORTYPE iomx_send_command(OMX_HANDLETYPE component, OMX_COMMANDTYPE command, OMX_U32 param1, OMX_PTR)
-{
- android_printf("iomx_send_command\n");
- OMXNode* node = (OMXNode*) ((OMX_COMPONENTTYPE*)component)->pComponentPrivate;
- return get_error(ctx->iomx->sendCommand(node->node, command, param1));
-}
-
-static OMX_ERRORTYPE iomx_get_parameter(OMX_HANDLETYPE component, OMX_INDEXTYPE param_index, OMX_PTR param)
-{
- android_printf("iomx_get_parameter\n");
- OMXNode* node = (OMXNode*) ((OMX_COMPONENTTYPE*)component)->pComponentPrivate;
- return get_error(ctx->iomx->getParameter(node->node, param_index, param, get_param_size(param_index)));
-}
-
-static OMX_ERRORTYPE iomx_set_parameter(OMX_HANDLETYPE component, OMX_INDEXTYPE param_index, OMX_PTR param)
-{
- android_printf("iomx_set_parameter\n");
- OMXNode* node = (OMXNode*) ((OMX_COMPONENTTYPE*)component)->pComponentPrivate;
- return get_error(ctx->iomx->setParameter(node->node, param_index, param, get_param_size(param_index)));
-}
-
-static OMX_ERRORTYPE iomx_get_state(OMX_HANDLETYPE component, OMX_STATETYPE *ptr)
-{
- android_printf("iomx_get_state\n");
- OMXNode* node = (OMXNode*) ((OMX_COMPONENTTYPE*)component)->pComponentPrivate;
- *ptr = node->state;
- return OMX_ErrorNone;
-}
-
-static OMX_ERRORTYPE iomx_allocate_buffer(OMX_HANDLETYPE component, OMX_BUFFERHEADERTYPE **bufferptr, OMX_U32 port_index, OMX_PTR app_private, OMX_U32 size)
-{
- android_printf("iomx_allocate_buffer\n");
- OMXNode* node = (OMXNode*) ((OMX_COMPONENTTYPE*)component)->pComponentPrivate;
- OMXBuffer* info = new OMXBuffer;
- info->dealer = new MemoryDealer(size + 4096); // Do we need to keep this around, or is it kept alive via the IMemory that references it?
- sp<IMemory> mem = info->dealer->allocate(size);
- int ret = ctx->iomx->allocateBufferWithBackup(node->node, port_index, mem, &info->id);
- if (ret != OK)
- return OMX_ErrorUndefined;
- OMX_BUFFERHEADERTYPE *buffer = (OMX_BUFFERHEADERTYPE*) calloc(1, sizeof(OMX_BUFFERHEADERTYPE));
- *bufferptr = buffer;
- buffer->pPlatformPrivate = info;
- buffer->pAppPrivate = app_private;
- buffer->nAllocLen = size;
- buffer->pBuffer = (OMX_U8*) mem->pointer();
- node->buffers.push_back(buffer);
- return OMX_ErrorNone;
-}
-
-static OMX_ERRORTYPE iomx_free_buffer(OMX_HANDLETYPE component, OMX_U32 port, OMX_BUFFERHEADERTYPE *buffer)
-{
- android_printf("iomx_free_buffer\n");
- OMXNode* node = (OMXNode*) ((OMX_COMPONENTTYPE*)component)->pComponentPrivate;
- OMXBuffer* info = (OMXBuffer*) buffer->pPlatformPrivate;
- status_t ret = ctx->iomx->freeBuffer(node->node, port, info->id);
- for( List<OMX_BUFFERHEADERTYPE*>::iterator it = node->buffers.begin(); it != node->buffers.end(); it++ ) {
- if (buffer == *it) {
- node->buffers.erase(it);
- break;
- }
- }
- free(buffer);
- delete info;
- return get_error(ret);
-}
-
-static OMX_ERRORTYPE iomx_empty_this_buffer(OMX_HANDLETYPE component, OMX_BUFFERHEADERTYPE *buffer)
-{
- android_printf("iomx_empty_this_buffer\n");
- OMXNode* node = (OMXNode*) ((OMX_COMPONENTTYPE*)component)->pComponentPrivate;
- OMXBuffer* info = (OMXBuffer*) buffer->pPlatformPrivate;
- return get_error(ctx->iomx->emptyBuffer(node->node, info->id, buffer->nOffset, buffer->nFilledLen, buffer->nFlags, buffer->nTimeStamp));
-}
-
-static OMX_ERRORTYPE iomx_fill_this_buffer(OMX_HANDLETYPE component, OMX_BUFFERHEADERTYPE *buffer)
-{
- android_printf("iomx_fill_this_buffer\n");
- OMXNode* node = (OMXNode*) ((OMX_COMPONENTTYPE*)component)->pComponentPrivate;
- OMXBuffer* info = (OMXBuffer*) buffer->pPlatformPrivate;
- return get_error(ctx->iomx->fillBuffer(node->node, info->id));
-}
-
-static OMX_ERRORTYPE iomx_component_role_enum(OMX_HANDLETYPE component, OMX_U8 *role, OMX_U32 index)
-{
- android_printf("iomx_component_role_enum\n");
- OMXNode* node = (OMXNode*) ((OMX_COMPONENTTYPE*)component)->pComponentPrivate;
- for( List<IOMX::ComponentInfo>::iterator it = ctx->components.begin(); it != ctx->components.end(); it++ ) {
- if (node->component_name == it->mName) {
- if (index >= it->mRoles.size())
- return OMX_ErrorNoMore;
- List<String8>::iterator it2 = it->mRoles.begin();
- for( OMX_U32 i = 0; it2 != it->mRoles.end() && i < index; i++, it2++ ) ;
- strncpy((char*)role, it2->string(), OMX_MAX_STRINGNAME_SIZE);
- if (it2->length() >= OMX_MAX_STRINGNAME_SIZE)
- role[OMX_MAX_STRINGNAME_SIZE - 1] = '\0';
- return OMX_ErrorNone;
- }
- }
- return OMX_ErrorInvalidComponentName;
-}
-
-static OMX_ERRORTYPE iomx_get_extension_index(OMX_HANDLETYPE component, OMX_STRING parameter, OMX_INDEXTYPE *index)
-{
- android_printf("iomx_get_extension_index\n");
- OMXNode* node = (OMXNode*) ((OMX_COMPONENTTYPE*)component)->pComponentPrivate;
- return get_error(ctx->iomx->getExtensionIndex(node->node, parameter, index));
-}
-
-static OMX_ERRORTYPE iomx_set_config(OMX_HANDLETYPE component, OMX_INDEXTYPE index, OMX_PTR param)
-{
- android_printf("iomx_set_config\n");
- OMXNode* node = (OMXNode*) ((OMX_COMPONENTTYPE*)component)->pComponentPrivate;
- return get_error(ctx->iomx->setConfig(node->node, index, param, get_config_size(index)));
-}
-
-static OMX_ERRORTYPE iomx_get_config(OMX_HANDLETYPE component, OMX_INDEXTYPE index, OMX_PTR param)
-{
- android_printf("iomx_get_config\n");
- OMXNode* node = (OMXNode*) ((OMX_COMPONENTTYPE*)component)->pComponentPrivate;
- return get_error(ctx->iomx->getConfig(node->node, index, param, get_config_size(index)));
-}
-
-extern "C" {
-OMX_ERRORTYPE PREFIX(OMX_GetHandle)(OMX_HANDLETYPE *handle_ptr, OMX_STRING component_name, OMX_PTR app_data, OMX_CALLBACKTYPE *callbacks)
-{
- android_printf("OMX_GetHandle\n");
- OMXNode* node = new OMXNode();
- node->app_data = app_data;
- node->callbacks = *callbacks;
- node->observer = new OMXCodecObserver();
- node->observer->setNode(node);
- node->state = OMX_StateLoaded;
- node->component_name = component_name;
-
- OMX_COMPONENTTYPE* component = (OMX_COMPONENTTYPE*) malloc(sizeof(OMX_COMPONENTTYPE));
- memset(component, 0, sizeof(OMX_COMPONENTTYPE));
- component->nSize = sizeof(OMX_COMPONENTTYPE);
- component->nVersion.s.nVersionMajor = 1;
- component->nVersion.s.nVersionMinor = 0;
- component->nVersion.s.nRevision = 0;
- component->nVersion.s.nStep = 0;
- component->pComponentPrivate = node;
- component->SendCommand = iomx_send_command;
- component->GetParameter = iomx_get_parameter;
- component->SetParameter = iomx_set_parameter;
- component->FreeBuffer = iomx_free_buffer;
- component->EmptyThisBuffer = iomx_empty_this_buffer;
- component->FillThisBuffer = iomx_fill_this_buffer;
- component->GetState = iomx_get_state;
- component->AllocateBuffer = iomx_allocate_buffer;
- component->ComponentRoleEnum = iomx_component_role_enum;
- component->GetExtensionIndex = iomx_get_extension_index;
- component->SetConfig = iomx_set_config;
- component->GetConfig = iomx_get_config;
-
- *handle_ptr = component;
- node->handle = component;
- status_t ret;
- if ((ret = ctx->iomx->allocateNode( component_name, node->observer, &node->node )) != OK)
- return OMX_ErrorUndefined;
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE PREFIX(OMX_FreeHandle)(OMX_HANDLETYPE handle)
-{
- android_printf("OMX_FreeHandle\n");
- OMXNode* node = (OMXNode*) ((OMX_COMPONENTTYPE*)handle)->pComponentPrivate;
- ctx->iomx->freeNode( node->node );
- node->observer->setNode(NULL);
- delete node;
- free(handle);
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE PREFIX(OMX_Init)(void)
-{
- android_printf("OMX_Init\n");
- OMXClient client;
- if (client.connect() != OK)
- return OMX_ErrorUndefined;
-
- if (!ctx)
- ctx = new IOMXContext();
- ctx->iomx = client.interface();
- ctx->iomx->listNodes(&ctx->components);
-
- for (List<IOMX::ComponentInfo>::iterator it = ctx->components.begin(); it != ctx->components.end(); it++)
- {
- const IOMX::ComponentInfo &info = *it;
- const char* componentName = info.mName.string();
- for (List<String8>::const_iterator role_it = info.mRoles.begin(); role_it != info.mRoles.end(); role_it++)
- {
- const char* componentRole = (*role_it).string();
- android_printf("componentName:%s,componentRole:%s\n", componentName, componentRole);
- }
- }
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE PREFIX(OMX_Deinit)(void)
-{
- android_printf("OMX_Deinit\n");
- ctx->iomx = NULL;
- delete ctx;
- ctx = NULL;
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE PREFIX(OMX_ComponentNameEnum)(OMX_STRING component_name, OMX_U32 name_length, OMX_U32 index)
-{
- android_printf("OMX_ComponentNameEnum\n");
- if (index >= ctx->components.size())
- return OMX_ErrorNoMore;
- List<IOMX::ComponentInfo>::iterator it = ctx->components.begin();
- for( OMX_U32 i = 0; i < index; i++ )
- it++;
- strncpy(component_name, it->mName.string(), name_length);
- component_name[name_length - 1] = '\0';
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE PREFIX(OMX_GetRolesOfComponent)(OMX_STRING component_name, OMX_U32 *num_roles, OMX_U8 **roles)
-{
- android_printf("OMX_GetRolesOfComponent\n");
- for( List<IOMX::ComponentInfo>::iterator it = ctx->components.begin(); it != ctx->components.end(); it++ ) {
- if (!strcmp(component_name, it->mName.string())) {
- if (!roles) {
- *num_roles = it->mRoles.size();
- return OMX_ErrorNone;
- }
- if (*num_roles < it->mRoles.size())
- return OMX_ErrorInsufficientResources;
- *num_roles = it->mRoles.size();
- OMX_U32 i = 0;
- for( List<String8>::iterator it2 = it->mRoles.begin(); it2 != it->mRoles.end(); i++, it2++ ) {
- strncpy((char*)roles[i], it2->string(), OMX_MAX_STRINGNAME_SIZE);
- roles[i][OMX_MAX_STRINGNAME_SIZE - 1] = '\0';
- }
- return OMX_ErrorNone;
- }
- }
- return OMX_ErrorInvalidComponentName;
-}
-
-OMX_ERRORTYPE PREFIX(OMX_GetComponentsOfRole)(OMX_STRING role, OMX_U32 *num_comps, OMX_U8 **comp_names)
-{
- android_printf("OMX_GetComponentsOfRole\n");
- OMX_U32 i = 0;
- for( List<IOMX::ComponentInfo>::iterator it = ctx->components.begin(); it != ctx->components.end(); it++ ) {
- for( List<String8>::iterator it2 = it->mRoles.begin(); it2 != it->mRoles.end(); it2++ ) {
- if (!strcmp(it2->string(), role)) {
- if (comp_names) {
- if (*num_comps < i)
- return OMX_ErrorInsufficientResources;
- strncpy((char*)comp_names[i], it->mName.string(), OMX_MAX_STRINGNAME_SIZE);
- comp_names[i][OMX_MAX_STRINGNAME_SIZE - 1] = '\0';
- }
- i++;
- break;
- }
- }
- }
- *num_comps = i;
- return OMX_ErrorNone;
-}
-}
-
View
40 tools/android/depends/autoconf/Makefile
@@ -1,40 +0,0 @@
-NATIVE_BUILD=1
-include ../Makefile.include
-DEPS= ../Makefile.include Makefile
-
-# lib name, version
-LIBNAME=autoconf
-VERSION=2.68
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-
-# configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX)
-
-LIBDYLIB=$(PLATFORM)/bin/autoconf
-
-CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
- $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
- -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-
-$(LIBDYLIB): $(PLATFORM)
- cd $(PLATFORM); $(CONFIGURE)
- $(MAKE) -C $(PLATFORM)
-
-.installed-$(PLATFORM): $(LIBDYLIB)
- $(MAKE) -C $(PLATFORM) install
- touch $@
-
-clean:
- $(MAKE) -C $(PLATFORM) clean
- rm -f .installed-$(PLATFORM)
-
-distclean::
- rm -rf $(PLATFORM) .installed-$(PLATFORM)
View
40 tools/android/depends/automake/Makefile
@@ -1,40 +0,0 @@
-NATIVE_BUILD=1
-include ../Makefile.include
-DEPS= ../Makefile.include Makefile
-
-# lib name, version
-LIBNAME=automake
-VERSION=1.11.3
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-
-# configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX)
-
-LIBDYLIB=$(PLATFORM)/automake
-
-CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
- $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
- -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- cd $(PLATFORM); $(CONFIGURE)
-
-$(LIBDYLIB): $(PLATFORM)
- $(MAKE) -C $(PLATFORM)
-
-.installed-$(PLATFORM): $(LIBDYLIB)
- $(MAKE) -C $(PLATFORM) install
- touch $@
-
-clean:
- $(MAKE) -C $(PLATFORM) clean
- rm -f .installed-$(PLATFORM)
-
-distclean::
- rm -rf $(PLATFORM) .installed-$(PLATFORM)
View
34 tools/android/depends/boost/Makefile
@@ -1,34 +0,0 @@
-include ../Makefile.include
-DEPS= ../Makefile.include add-arm-mem-barrier.patch fix-deprecated-swp.patch Makefile
-
-#Headers Only!
-LIBNAME=boost
-VERSION=1_44_0
-SOURCE=$(LIBNAME)_$(VERSION)
-ARCHIVE=$(SOURCE).tar.bz2
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
- $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-.installed-$(PLATFORM): $(LIBDYLIB) $(TARBALLS_LOCATION)/$(ARCHIVE)
- rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- echo 'using gcc : : $(CC) : ' > $(PLATFORM)/tools/build/v2/user-config.jam
- echo ' <cflags>"$(CFLAGS)"' >> $(PLATFORM)/tools/build/v2/user-config.jam
- echo ' <cxxflags>"$(CXXFLAGS)"' >> $(PLATFORM)/tools/build/v2/user-config.jam
- echo ' ;' >> $(PLATFORM)/tools/build/v2/user-config.jam
- cd $(PLATFORM); patch -p1 < ../add-arm-mem-barrier.patch
- cd $(PLATFORM); patch -p1 < ../fix-deprecated-swp.patch
- cd $(PLATFORM); ./bootstrap.sh --prefix=$(PREFIX)
- cd $(PLATFORM); ./bjam --prefix=$(PREFIX) toolset=gcc --toolset-root=$(TOOLCHAIN)/$(HOST)/bin --disable-icu \
- --without-date_time --without-filesystem --without-graph --without-graph_parallel --without-iostreams --without-math --without-mpi --without-program_options \
---without-python --without-random --without-regex --without-serialization --without-signals --without-system --without-test --without-thread --without-wave install
- touch .installed-$(PLATFORM)
-
-clean:
- rm -rf $(PLATFORM) .installed-$(PLATFORM)
-
-distclean::
- rm -rf $(PLATFORM) .installed-$(PLATFORM)
View
73 tools/android/depends/boost/add-arm-mem-barrier.patch
@@ -1,73 +0,0 @@
-From c87ad09331d239d6566e5eb409898ae38f04799a Mon Sep 17 00:00:00 2001
-From: Peter Dimov <pdimov@boostpro.com>
-Date: Mon, 7 Nov 2011 17:50:31 +0000
-Subject: [PATCH] Add ARM memory barriers. Refs #5372.
-
-SVN-Revision: 75389
----
- boost/smart_ptr/detail/spinlock_gcc_arm.hpp | 23 ++++++++++++++++++++---
- 1 file changed, 20 insertions(+), 3 deletions(-)
-
-diff --git a/boost/smart_ptr/detail/spinlock_gcc_arm.hpp b/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
-index ba6c511..f58ea44 100644
---- a/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
-+++ b/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
-@@ -2,7 +2,7 @@
- #define BOOST_SMART_PTR_DETAIL_SPINLOCK_GCC_ARM_HPP_INCLUDED
-
- //
--// Copyright (c) 2008 Peter Dimov
-+// Copyright (c) 2008, 2011 Peter Dimov
- //
- // Distributed under the Boost Software License, Version 1.0.
- // See accompanying file LICENSE_1_0.txt or copy at
-@@ -11,6 +11,20 @@
-
- #include <boost/smart_ptr/detail/yield_k.hpp>
-
-+#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)
-+
-+# define BOOST_SP_ARM_BARRIER "dmb"
-+
-+#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__)
-+
-+# define BOOST_SP_ARM_BARRIER "mcr p15, 0, r0, c7, c10, 5"
-+
-+#else
-+
-+# define BOOST_SP_ARM_BARRIER ""
-+
-+#endif
-+
- namespace boost
- {
-
-@@ -30,7 +44,8 @@ class spinlock
- int r;
-
- __asm__ __volatile__(
-- "swp %0, %1, [%2]":
-+ "swp %0, %1, [%2]\n\t"
-+ BOOST_SP_ARM_BARRIER :
- "=&r"( r ): // outputs
- "r"( 1 ), "r"( &v_ ): // inputs
- "memory", "cc" );
-@@ -48,7 +63,7 @@ class spinlock
-
- void unlock()
- {
-- __asm__ __volatile__( "" ::: "memory" );
-+ __asm__ __volatile__( BOOST_SP_ARM_BARRIER ::: "memory" );
- *const_cast< int volatile* >( &v_ ) = 0;
- }
-
-@@ -82,4 +97,6 @@ class spinlock
-
- #define BOOST_DETAIL_SPINLOCK_INIT {0}
-
-+#undef BOOST_SP_ARM_BARRIER
-+
- #endif // #ifndef BOOST_SMART_PTR_DETAIL_SPINLOCK_GCC_ARM_HPP_INCLUDED
---
-1.7.10
-
View
58 tools/android/depends/boost/fix-deprecated-swp.patch
@@ -1,58 +0,0 @@
-From 8d1ba081260f98d879759433a9d7248d6bd98966 Mon Sep 17 00:00:00 2001
-From: Peter Dimov <pdimov@boostpro.com>
-Date: Mon, 12 Mar 2012 17:31:21 +0000
-Subject: [PATCH] Apply patch from #5331. Refs #5331.
-
-SVN-Revision: 77315
----
- boost/smart_ptr/detail/spinlock_gcc_arm.hpp | 29 +++++++++++++++++++++++++--
- 1 file changed, 27 insertions(+), 2 deletions(-)
-
-diff --git a/boost/smart_ptr/detail/spinlock_gcc_arm.hpp b/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
-index f58ea44..f1bbaf6 100644
---- a/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
-+++ b/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
-@@ -43,13 +43,38 @@ class spinlock
- {
- int r;
-
-+#if defined(__ARM_ARCH_6__) \
-+ || defined(__ARM_ARCH_6J__) \
-+ || defined(__ARM_ARCH_6K__) \
-+ || defined(__ARM_ARCH_6Z__) \
-+ || defined(__ARM_ARCH_6ZK__) \
-+ || defined(__ARM_ARCH_6T2__) \
-+ || defined(__ARM_ARCH_7__) \
-+ || defined(__ARM_ARCH_7A__) \
-+ || defined(__ARM_ARCH_7R__) \
-+ || defined(__ARM_ARCH_7M__) \
-+ || defined(__ARM_ARCH_7EM__)
-+
-+ __asm__ __volatile__(
-+ "ldrex %0, [%2]; \n"
-+ "cmp %0, %1; \n"
-+ "strexne %0, %1, [%2]; \n"
-+ BOOST_SP_ARM_BARRIER :
-+ "=&r"( r ): // outputs
-+ "r"( 1 ), "r"( &v_ ): // inputs
-+ "memory", "cc" );
-+
-+#else
-+
- __asm__ __volatile__(
-- "swp %0, %1, [%2]\n\t"
-- BOOST_SP_ARM_BARRIER :
-+ "swp %0, %1, [%2];\n"
-+ BOOST_SP_ARM_BARRIER :
- "=&r"( r ): // outputs
- "r"( 1 ), "r"( &v_ ): // inputs
- "memory", "cc" );
-
-+#endif
-+
- return r == 0;
- }
-
---
-1.7.10
-
View
1 tools/android/depends/bootstrap
@@ -1 +0,0 @@
-autoconf
View
40 tools/android/depends/bzip2/Makefile
@@ -1,40 +0,0 @@
-include ../Makefile.include
-DEPS= ../Makefile.include Makefile Makefile.patch
-
-# lib name, version
-LIBNAME=bzip2
-VERSION=1.0.6
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-
-# configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --disable-shared
-<