[osx/ios] banish libass to xxx-depends, this removes the need for an external flag...

diff --git a/Makefile.in b/Makefile.in
index 8257e6a..9c6bf67 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -101,10 +101,6 @@ DVDPCODECS_DIRS= \
        lib \
        lib/libdvd \
 
-ifneq (@USE_EXTERNAL_LIBASS@,1)
-DVDPCODECS_DIRS+=lib/libass/xbmc
-endif
-
 PAPCODECS_DIRS= \
        lib/xbadpcm \
        lib/nosefart \
@@ -426,9 +422,6 @@ python: dllloader
 dvdpcodecs: dllloader
        $(MAKE) -C lib 
        $(MAKE) -C lib/libdvd
-ifneq (@USE_EXTERNAL_LIBASS@,1)
-       $(MAKE) -C lib/libass/xbmc
-endif
 eventclients:
 ifeq ($(findstring osx,@ARCH@), osx)
 ifneq ($(findstring arm,@ARCH@), arm)

diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj
index 8fca30d..b98a11f 100644 (file)
--- a/XBMC-ATV2.xcodeproj/project.pbxproj
+++ b/XBMC-ATV2.xcodeproj/project.pbxproj
@@ -933,6 +933,7 @@
                F5A29F2712A72246003A610C /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A29F2612A72246003A610C /* VideoToolbox.framework */; };
                F5B13836133080CA0045076D /* libmodplug.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13834133080CA0045076D /* libmodplug.dylib */; };
                F5B13837133080CB0045076D /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13835133080CA0045076D /* libmicrohttpd.dylib */; };
+               F5B13B021333248E0045076D /* libass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13B011333248E0045076D /* libass.dylib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -2875,6 +2876,7 @@
                F5A29F2612A72246003A610C /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/PrivateFrameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
                F5B13834133080CA0045076D /* libmodplug.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmodplug.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libmodplug.dylib"; sourceTree = "<absolute>"; };
                F5B13835133080CA0045076D /* libmicrohttpd.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmicrohttpd.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libmicrohttpd.dylib"; sourceTree = "<absolute>"; };
+               F5B13B011333248E0045076D /* libass.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libass.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libass.dylib"; sourceTree = "<absolute>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -2938,6 +2940,7 @@
                                F56C7EE1131F0965000AD0F6 /* libjsoncpp.a in Frameworks */,
                                F5B13836133080CA0045076D /* libmodplug.dylib in Frameworks */,
                                F5B13837133080CB0045076D /* libmicrohttpd.dylib in Frameworks */,
+                               F5B13B021333248E0045076D /* libass.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -5719,6 +5722,7 @@
                                F589AE301288DEE000D8079E /* libpcre.dylib */,
                                F589AE321288DEE900D8079E /* libpcrecpp.dylib */,
                                F589AE2E1288DEC900D8079E /* libcrypto.dylib */,
+                               F5B13B011333248E0045076D /* libass.dylib */,
                                F589AE2A1288DEA400D8079E /* libmad.dylib */,
                                F54D9DD712B56A7D006870F9 /* libfaad.dylib */,
                                F589AE281288DE9600D8079E /* libmpeg2.dylib */,

diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj
index af5593f..653fd0c 100644 (file)
--- a/XBMC-IOS.xcodeproj/project.pbxproj
+++ b/XBMC-IOS.xcodeproj/project.pbxproj
@@ -933,6 +933,7 @@
                F5A29F2712A72246003A610C /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A29F2612A72246003A610C /* VideoToolbox.framework */; };
                F5B1380D13306B890045076D /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B1380C13306B890045076D /* libmicrohttpd.dylib */; };
                F5B138131330732A0045076D /* libmodplug.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138121330732A0045076D /* libmodplug.dylib */; };
+               F5B13AFE1333247D0045076D /* libass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13AFD1333247D0045076D /* libass.dylib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -2875,6 +2876,7 @@
                F5A29F2612A72246003A610C /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/PrivateFrameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
                F5B1380C13306B890045076D /* libmicrohttpd.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmicrohttpd.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libmicrohttpd.dylib"; sourceTree = "<absolute>"; };
                F5B138121330732A0045076D /* libmodplug.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmodplug.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libmodplug.dylib"; sourceTree = "<absolute>"; };
+               F5B13AFD1333247D0045076D /* libass.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libass.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libass.dylib"; sourceTree = "<absolute>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -2937,6 +2939,7 @@
                                F56C8C14131F4811000AD0F6 /* libxdaap-arm-osx.a in Frameworks */,
                                F5B1380D13306B890045076D /* libmicrohttpd.dylib in Frameworks */,
                                F5B138131330732A0045076D /* libmodplug.dylib in Frameworks */,
+                               F5B13AFE1333247D0045076D /* libass.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -5718,6 +5721,7 @@
                                F56C8BD1131F4795000AD0F6 /* libpcre.dylib */,
                                F56C8BD2131F4795000AD0F6 /* libpcrecpp.dylib */,
                                F56C8BD3131F4795000AD0F6 /* libcrypto.dylib */,
+                               F5B13AFD1333247D0045076D /* libass.dylib */,
                                F56C8BD4131F4795000AD0F6 /* libmad.dylib */,
                                F56C8BD5131F4796000AD0F6 /* libfaad.dylib */,
                                F56C8BD6131F4796000AD0F6 /* libmpeg2.dylib */,

diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index f713d15..1a72789 100644 (file)
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -1820,6 +1820,8 @@
                F5B13867133081310045076D /* libmodplug.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13865133081310045076D /* libmodplug.dylib */; };
                F5B13868133081390045076D /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138641330811D0045076D /* libmicrohttpd.dylib */; };
                F5B138691330813A0045076D /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138641330811D0045076D /* libmicrohttpd.dylib */; };
+               F5B13AD1133319310045076D /* libass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13AD0133319310045076D /* libass.dylib */; };
+               F5B13AD2133319310045076D /* libass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13AD0133319310045076D /* libass.dylib */; };
                F5BDB80C120202F400F0B710 /* DVDSubtitleTagSami.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BDB80B120202F400F0B710 /* DVDSubtitleTagSami.cpp */; };
                F5BDB80D120202F400F0B710 /* DVDSubtitleTagSami.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BDB80B120202F400F0B710 /* DVDSubtitleTagSami.cpp */; };
                F5BDB81A1202032400F0B710 /* DVDSubtitleTagMicroDVD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BDB8191202032400F0B710 /* DVDSubtitleTagMicroDVD.cpp */; };
@@ -3779,6 +3781,7 @@
                F5AD1EA70F488A1A0065EB5D /* GUIWindowKaraokeLyrics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowKaraokeLyrics.cpp; sourceTree = "<group>"; };
                F5B138641330811D0045076D /* libmicrohttpd.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmicrohttpd.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libmicrohttpd.dylib"; sourceTree = "<absolute>"; };
                F5B13865133081310045076D /* libmodplug.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmodplug.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libmodplug.dylib"; sourceTree = "<absolute>"; };
+               F5B13AD0133319310045076D /* libass.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libass.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libass.dylib"; sourceTree = "<absolute>"; };
                F5B413131065900C0035D105 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
                F5BDB80A120202F400F0B710 /* DVDSubtitleTagSami.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDSubtitleTagSami.h; sourceTree = "<group>"; };
                F5BDB80B120202F400F0B710 /* DVDSubtitleTagSami.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDSubtitleTagSami.cpp; sourceTree = "<group>"; };
@@ -3920,6 +3923,7 @@
                                F57A1E3D132AAB1A00498CC7 /* libSDL_mixer.dylib in Frameworks */,
                                F5B13866133081310045076D /* libmodplug.dylib in Frameworks */,
                                F5B13868133081390045076D /* libmicrohttpd.dylib in Frameworks */,
+                               F5B13AD1133319310045076D /* libass.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -3987,6 +3991,7 @@
                                F57A1E3E132AAB1A00498CC7 /* libSDL_mixer.dylib in Frameworks */,
                                F5B13867133081310045076D /* libmodplug.dylib in Frameworks */,
                                F5B138691330813A0045076D /* libmicrohttpd.dylib in Frameworks */,
+                               F5B13AD2133319310045076D /* libass.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -6912,6 +6917,7 @@
                                F56C8D2B131F5E84000AD0F6 /* libpcre.dylib */,
                                F56C8D2C131F5E84000AD0F6 /* libpcrecpp.dylib */,
                                F56C8D2D131F5E84000AD0F6 /* libcrypto.dylib */,
+                               F5B13AD0133319310045076D /* libass.dylib */,
                                F56C8D2E131F5E84000AD0F6 /* libmad.dylib */,
                                F56C8D30131F5E84000AD0F6 /* libmpeg2.dylib */,
                                F56C8D31131F5E84000AD0F6 /* libwavpack.dylib */,
@@ -9086,16 +9092,12 @@
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)",
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)",
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)",
-                                       "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)",
-                                       "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)",
                                );
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
-                               LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12 = "\"$XBMC_DEPENDS/lib\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13 = "\"$XBMC_DEPENDS/lib/mysql\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14 = "\"$(SRCROOT)/xbmc/interfaces/http-api\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15 = "\"$(SRCROOT)/xbmc/interfaces/json-rpc\"";
-                               LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/lib/libRTV\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/lib/libXBMS\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/lib/libXDAAP\"";
@@ -9175,16 +9177,12 @@
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)",
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)",
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)",
-                                       "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)",
-                                       "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)",
                                );
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
-                               LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12 = "\"$XBMC_DEPENDS/lib\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13 = "\"$XBMC_DEPENDS/lib/mysql\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14 = "\"$(SRCROOT)/xbmc/interfaces/http-api\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15 = "\"$(SRCROOT)/xbmc/interfaces/json-rpc\"";
-                               LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/lib/libRTV\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/lib/libXBMS\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/lib/libXDAAP\"";
@@ -9324,12 +9322,14 @@
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
+                                       "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6)",
                                );
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib/mysql\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
+                               LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
                                LINK_WITH_STANDARD_LIBRARIES = YES;
                                OTHER_LDFLAGS = (
                                        "-headerpad_max_install_names",
@@ -9404,12 +9404,14 @@
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
+                                       "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6)",
                                );
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib/mysql\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
+                               LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_6 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
                                LINK_WITH_STANDARD_LIBRARIES = YES;
                                OTHER_LDFLAGS = (
                                        "-headerpad_max_install_names",

diff --git a/bootstrap b/bootstrap
index 12b2dc1..35fbda0 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -4,9 +4,7 @@ set -e
 
 autoreconf -vif
 autoreconf -vif lib/cpluff
-# we must autoreconf libass as we don't know till later if it's used.
-[ -d lib/libass ] && autoreconf -vif lib/libass
-# order matters with libbdnav and friends
+# order matters with libdvd and friends
 [ -d lib/libdvd/libdvdcss ] && \
   autoreconf -vif lib/libdvd/libdvdcss
 autoreconf -vif lib/libdvd/libdvdread

diff --git a/configure.in b/configure.in
index a79f3e8..8f1d454 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -86,7 +86,6 @@ vtbdecoder_enabled="== VTBDecoder support enabled. =="
 vtbdecoder_disabled="== VTBDecoder support manually disabled. =="
 openmax_disabled="== OpenMax support manually disabled. =="
 openmax_not_found="== Could not find libnvomx. OpenMax support disabled. =="
-libass_using_internal="== External Libass not found, using internal. =="
 ssh_not_found="== Could not find libssh. SSH FTP VFS support disabled. =="
 librtmp_not_found="== Could not find libRTMP. RTMP support disabled. =="
 librtmp_disabled="== RTMP support disabled. =="
@@ -310,7 +309,6 @@ AC_ARG_ENABLE([external-python],
   [use_external_python=$enableval],
   [use_external_python=$use_external_libraries])
 
-use_external_libass="yes"
 ### End of external library options
 
 if test "x$host_vendor" != "xapple"; then
@@ -542,7 +540,7 @@ AC_CHECK_HEADER([samplerate.h],,     AC_MSG_ERROR($missing_library))
 AC_CHECK_HEADER([ogg/ogg.h],,        AC_MSG_ERROR($missing_library))
 AC_CHECK_HEADER([vorbis/vorbisfile.h],, AC_MSG_ERROR($missing_library))
 AC_CHECK_HEADER([vorbis/vorbisenc.h],, AC_MSG_ERROR($missing_library))
-AC_CHECK_LIB([ass], [ass_set_message_cb],,use_external_libass="no")
+AC_CHECK_LIB([ass],         [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([bz2],         [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([jpeg],        [main],, AC_MSG_ERROR($missing_library)) # check for cximage
 AC_CHECK_LIB([pthread],     [main],, AC_MSG_ERROR($missing_library))
@@ -1408,16 +1406,6 @@ if test "$host_vendor" = "apple"; then
     lib/libflac/Makefile"
 fi
 
-if test "$use_external_libass" = "no"; then
-  OUTPUT_FILES="$OUTPUT_FILES \
-    lib/libass/xbmc/Makefile"
-  USE_EXTERNAL_LIBASS=0
-  AC_MSG_NOTICE($libass_using_internal)
-else
-  AC_DEFINE([USE_EXTERNAL_LIBASS], [1], [Whether to use external libass library.])
-  USE_EXTERNAL_LIBASS=1
-fi
-
 # Line below is used so we can use AM_INIT_AUTOMAKE. The corresponding
 # .dummy.am does nothing.
 AC_CONFIG_FILES([.dummy])
@@ -1434,7 +1422,6 @@ AC_SUBST(SDL_DEFINES)
 AC_SUBST(BUILD_DVDCSS)
 AC_SUBST(BUILD_GOOM)
 AC_SUBST(USE_EXTERNAL_FFMPEG)
-AC_SUBST(USE_EXTERNAL_LIBASS)
 AC_SUBST(USE_EXTERNAL_LIBMPEG2)
 AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
 AC_SUBST(USE_EXTERNAL_PYTHON)
@@ -1747,23 +1734,6 @@ XB_CONFIG_MODULE([lib/cximage-6.0/zlib], [
   fi
 ], [$HOST_NOT_APPLE])
 
-XB_CONFIG_MODULE([lib/libass], [
-  if test "$host_vendor" = "apple" ; then
-    CFLAGS="$CFLAGS -fno-common" \
-    LDFLAGS="-Wl,-read_only_relocs,suppress" \
-    ./configure \
-      --host=$host_alias \
-      --build=$build_alias \
-      --target=$target_alias
-  else
-    CFLAGS="$CFLAGS" \
-    ./configure \
-      --host=$host_alias \
-      --build=$build_alias \
-      --target=$target_alias
-  fi
-], [$USE_EXTERNAL_LIBASS])
-
 XB_CONFIG_MODULE([lib/libid3tag/libid3tag],[
   if test "$host_vendor" = "apple" ; then
     CFLAGS="$CFLAGS -fno-common" \

diff --git a/lib/libass/xbmc/Makefile.in b/lib/libass/xbmc/Makefile.in
deleted file mode 100644 (file)
index 13726e7..0000000
--- a/lib/libass/xbmc/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-abs_top_srcdir=@abs_top_srcdir@
-
-ARCH=@ARCH@
-SYSROOT=@SYSROOT@
-
-SYSDIR=$(abs_top_srcdir)/system/players/dvdplayer
-SO=libass-$(ARCH).so
-SLIB=$(SYSDIR)/$(SO)
-DIRS=..
-
-.PHONY: compile
-
-ifeq ($(findstring osx,$(ARCH)), osx)
-$(SLIB): ../libass/.libs/libass.dylib
-       $(CC) $(SYSROOT) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
-               -bundle -undefined dynamic_lookup -read_only_relocs suppress -lfontconfig -o $@ \
-               @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o ../libass/.libs/*.o
-
-../libass/.libs/libass.dylib: compile
-       $(MAKE) -C ..
-else
-$(SLIB): ../libass/.libs/libass.so
-       $(CXX) $(LDFLAGS) -lfontconfig -shared -fPIC -o $(SLIB) ../libass/.libs/*.o \
-         `cat ../../../xbmc/cores/DllLoader/exports/wrapper.def` \
-         ../../../xbmc/cores/DllLoader/exports/wrapper.o
-
-../libass/.libs/libass.so: compile
-       $(MAKE) -C ..
-endif
-
-include $(abs_top_srcdir)/Makefile.include

diff --git a/tools/osx/ios-depends/Makefile b/tools/osx/ios-depends/Makefile
index b5d43c9..2dd7f80 100644 (file)
--- a/tools/osx/ios-depends/Makefile
+++ b/tools/osx/ios-depends/Makefile
@@ -8,7 +8,7 @@ SUBDIRS = \
        openssl libssh2 curl \
        jpeg tiff libpng libogg \
        libvorbis libmad fribidi libwavpack libmpeg2 \
-       faad2 libcdio libsamplerate librtmp \
+       faad2 libass libcdio libsamplerate librtmp \
        libmicrohttpd libmodplug libbluray \
        samba python26 mysqlclient boost
 

diff --git a/tools/osx/ios-depends/libass/Makefile b/tools/osx/ios-depends/libass/Makefile
new file mode 100644 (file)
index 0000000..26b5313
--- /dev/null
+++ b/tools/osx/ios-depends/libass/Makefile
@@ -0,0 +1,52 @@
+#  A quick and dirty Makefile to download/build and install
+#
+#  Usage:
+#    make
+#    sudo make install
+
+include ../config.mk
+
+# lib name, version
+LIBNAME=libass
+VERSION=0.9.11
+SOURCE=$(LIBNAME)-$(VERSION)
+# download location and format
+BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs
+ARCHIVE=$(SOURCE).tar.bz2
+TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs
+RETRIEVE_TOOL=/usr/bin/curl
+RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE)
+ARCHIVE_TOOL=tar
+ARCHIVE_TOOL_FLAGS=xf
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST)
+
+LIBDYLIB=$(SOURCE)/$(LIBNAME)/.libs/$(LIBNAME).dylib
+
+CLEAN_FILES=$(ARCHIVE) $(SOURCE)
+
+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)
+
+$(LIBDYLIB): $(SOURCE)
+       make -C $(SOURCE)
+
+.installed:
+       make -C $(SOURCE) install
+       touch $@
+
+clean:
+       make -C $(SOURCE) clean
+       rm .installed
+
+distclean::
+       rm -rf $(SOURCE) .installed

diff --git a/tools/osx/ios-depends/libflac/Makefile b/tools/osx/ios-depends/libflac/Makefile
new file mode 100644 (file)
index 0000000..b50b6db
--- /dev/null
+++ b/tools/osx/ios-depends/libflac/Makefile
@@ -0,0 +1,55 @@
+#  A quick and dirty Makefile to download/build and install
+#
+#  Usage:
+#    make
+#    sudo make install
+
+include ../config.mk
+
+# lib name, version
+LIBNAME=flac
+VERSION=1.2.1
+SOURCE=$(LIBNAME)-$(VERSION)
+# download location and format
+BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs
+ARCHIVE=$(SOURCE).tar.gz
+TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs
+RETRIEVE_TOOL=/usr/bin/curl
+RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE)
+ARCHIVE_TOOL=tar
+ARCHIVE_TOOL_FLAGS=xf
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \
+  --disable-asm-optimizations \
+  --disable-xmms-plugin \
+  --disable-cpplibs
+
+LIBDYLIB=$(SOURCE)/$(LIBNAME)/.libs/$(LIBNAME).dylib
+
+CLEAN_FILES=$(ARCHIVE) $(SOURCE)
+
+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)
+
+$(LIBDYLIB): $(SOURCE)
+       make -C $(SOURCE)
+
+.installed:
+       make -C $(SOURCE) install
+       touch $@
+
+clean:
+       make -C $(SOURCE) clean
+       rm .installed
+
+distclean::
+       rm -rf $(SOURCE) .installed

diff --git a/tools/osx/osx-depends/Makefile b/tools/osx/osx-depends/Makefile
index 69921e1..96c6b46 100644 (file)
--- a/tools/osx/osx-depends/Makefile
+++ b/tools/osx/osx-depends/Makefile
@@ -7,7 +7,7 @@ SUBDIRS = \
        openssl libssh2 curl \
        jpeg tiff libpng libogg \
        libvorbis libmad fribidi libwavpack libmpeg2 \
-       faad2 libcdio libsamplerate librtmp \
+       faad2 libass libcdio libsamplerate librtmp \
        libGLEW libsdl libsdl_mixer libsdl_image \
        libmicrohttpd libmodplug libbluray \
        samba python26 mysqlclient boost \

diff --git a/tools/osx/osx-depends/libass/Makefile b/tools/osx/osx-depends/libass/Makefile
new file mode 100644 (file)
index 0000000..26b5313
--- /dev/null
+++ b/tools/osx/osx-depends/libass/Makefile
@@ -0,0 +1,52 @@
+#  A quick and dirty Makefile to download/build and install
+#
+#  Usage:
+#    make
+#    sudo make install
+
+include ../config.mk
+
+# lib name, version
+LIBNAME=libass
+VERSION=0.9.11
+SOURCE=$(LIBNAME)-$(VERSION)
+# download location and format
+BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs
+ARCHIVE=$(SOURCE).tar.bz2
+TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs
+RETRIEVE_TOOL=/usr/bin/curl
+RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE)
+ARCHIVE_TOOL=tar
+ARCHIVE_TOOL_FLAGS=xf
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST)
+
+LIBDYLIB=$(SOURCE)/$(LIBNAME)/.libs/$(LIBNAME).dylib
+
+CLEAN_FILES=$(ARCHIVE) $(SOURCE)
+
+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)
+
+$(LIBDYLIB): $(SOURCE)
+       make -C $(SOURCE)
+
+.installed:
+       make -C $(SOURCE) install
+       touch $@
+
+clean:
+       make -C $(SOURCE) clean
+       rm .installed
+
+distclean::
+       rm -rf $(SOURCE) .installed

diff --git a/tools/osx/osx-depends/libflac/Makefile b/tools/osx/osx-depends/libflac/Makefile
new file mode 100644 (file)
index 0000000..b50b6db
--- /dev/null
+++ b/tools/osx/osx-depends/libflac/Makefile
@@ -0,0 +1,55 @@
+#  A quick and dirty Makefile to download/build and install
+#
+#  Usage:
+#    make
+#    sudo make install
+
+include ../config.mk
+
+# lib name, version
+LIBNAME=flac
+VERSION=1.2.1
+SOURCE=$(LIBNAME)-$(VERSION)
+# download location and format
+BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs
+ARCHIVE=$(SOURCE).tar.gz
+TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs
+RETRIEVE_TOOL=/usr/bin/curl
+RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE)
+ARCHIVE_TOOL=tar
+ARCHIVE_TOOL_FLAGS=xf
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \
+  --disable-asm-optimizations \
+  --disable-xmms-plugin \
+  --disable-cpplibs
+
+LIBDYLIB=$(SOURCE)/$(LIBNAME)/.libs/$(LIBNAME).dylib
+
+CLEAN_FILES=$(ARCHIVE) $(SOURCE)
+
+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)
+
+$(LIBDYLIB): $(SOURCE)
+       make -C $(SOURCE)
+
+.installed:
+       make -C $(SOURCE) install
+       touch $@
+
+clean:
+       make -C $(SOURCE) clean
+       rm .installed
+
+distclean::
+       rm -rf $(SOURCE) .installed

diff --git a/xbmc/DllPaths_generated.h.in b/xbmc/DllPaths_generated.h.in
index 3c8c4a7..d1de14c 100644 (file)
--- a/xbmc/DllPaths_generated.h.in
+++ b/xbmc/DllPaths_generated.h.in
@@ -68,7 +68,6 @@
 #define DLL_PATH_OGG_CODEC     "@VORBISFILE_SONAME@"
 
 /* dvdplayer */
-#define DLL_PATH_LIBASS        "special://xbmcbin/system/players/dvdplayer/libass-@ARCH@.so"
 #if defined(__APPLE__)
 #define DLL_PATH_LIBMPEG2      "libmpeg2.0.dylib"
 #else

diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h b/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
index aa7d6c1..69ecc4b 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
+++ b/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
@@ -25,7 +25,7 @@
   #include "config.h"
 #endif
 extern "C" {
-#if (defined USE_EXTERNAL_LIBASS)
+#if !defined(WIN32)
   #include <ass/ass.h>
 #else
   #include "lib/libass/libass/ass.h"
@@ -70,7 +70,7 @@ public:
                                 , void *data)=0;
 };
 
-#if (defined USE_EXTERNAL_LIBASS)
+#if !defined(WIN32)
 
 class DllLibass : public DllDynamic, DllLibassInterface
 {