[OSX/Linux] fixed: vorbis and ogg are both external libs on linux and osx => remove stale files and update build system

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27184 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

8 files changed, 20 insertions, 124 deletions

diff --git a/Makefile.in b/Makefile.in
index 812a79f934..e6aac27792 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,7 +83,6 @@ endif
 
 ifeq ($(findstring osx,$(ARCH)),osx)
 PAPCODEC_DIRS+= \
-	xbmc/cores/paplayer/vorbisfile \
 	xbmc/cores/paplayer/FLACCodec
 endif
 
@@ -310,7 +309,6 @@ papcodecs: dllloader dvdpcodecs
 	$(MAKE) -C xbmc/cores/paplayer/ADPCMCodec
 ifeq ($(findstring osx,$(ARCH)), osx)
 	$(MAKE) -C xbmc/cores/paplayer/FLACCodec
-	$(MAKE) -C xbmc/cores/paplayer/vorbisfile
 endif
 	$(MAKE) -C xbmc/cores/paplayer/GYMCodec
 	$(MAKE) -C xbmc/cores/paplayer/vgmstream
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index d3285a36e2..1dc2110ba7 100644
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -917,6 +917,8 @@
 		E435380411076A2900792AB8 /* eprintf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5ACB5370FC3DF3D00AAA056 /* eprintf.cpp */; };
 		E46F7C2A0F77217400C25D29 /* Zeroconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E46F7C280F77217400C25D29 /* Zeroconf.cpp */; };
 		E46F7C2D0F77219700C25D29 /* ZeroconfOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E46F7C2C0F77219700C25D29 /* ZeroconfOSX.cpp */; };
+		E49070F4110E7E76003865FD /* libvorbisenc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E49070F3110E7E76003865FD /* libvorbisenc.dylib */; };
+		E49070F5110E7E76003865FD /* libvorbisenc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E49070F3110E7E76003865FD /* libvorbisenc.dylib */; };
 		E4907BF80FDAC38B00E2F075 /* libmysqlclient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E4907BF70FDAC38B00E2F075 /* libmysqlclient.dylib */; };
 		E4907BF90FDAC38B00E2F075 /* libmysqlclient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E4907BF70FDAC38B00E2F075 /* libmysqlclient.dylib */; };
 		E49ACD8C100745C400A86ECD /* ZeroconfDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E49ACD8B100745C400A86ECD /* ZeroconfDirectory.cpp */; };
@@ -3562,6 +3564,7 @@
 		E46F7C290F77217400C25D29 /* Zeroconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Zeroconf.h; sourceTree = "<group>"; };
 		E46F7C2B0F77219700C25D29 /* ZeroconfOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZeroconfOSX.h; sourceTree = "<group>"; };
 		E46F7C2C0F77219700C25D29 /* ZeroconfOSX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZeroconfOSX.cpp; sourceTree = "<group>"; };
+		E49070F3110E7E76003865FD /* libvorbisenc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisenc.dylib; path = /opt/local/lib/libvorbisenc.dylib; sourceTree = "<absolute>"; };
 		E4907BF70FDAC38B00E2F075 /* libmysqlclient.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmysqlclient.dylib; path = /opt/local/lib/mysql5/mysql/libmysqlclient.dylib; sourceTree = "<absolute>"; };
 		E49ACD8A100745C400A86ECD /* ZeroconfDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZeroconfDirectory.h; sourceTree = "<group>"; };
 		E49ACD8B100745C400A86ECD /* ZeroconfDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZeroconfDirectory.cpp; sourceTree = "<group>"; };
@@ -3850,6 +3853,7 @@
 				F5DC888E110A655000EE1B15 /* libmodplug.a in Frameworks */,
 				F5F241D5110BFCD6009126C6 /* libmpeg2.dylib in Frameworks */,
 				F5F241D8110BFCF4009126C6 /* libwavpack.dylib in Frameworks */,
+				E49070F4110E7E76003865FD /* libvorbisenc.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3908,6 +3912,7 @@
 				F5DC888F110A655000EE1B15 /* libmodplug.a in Frameworks */,
 				F5F241D6110BFCD6009126C6 /* libmpeg2.dylib in Frameworks */,
 				F5F241D9110BFCF4009126C6 /* libwavpack.dylib in Frameworks */,
+				E49070F5110E7E76003865FD /* libvorbisenc.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6809,6 +6814,7 @@
 		F57E1ED30E36E96B00700C9D /* macport libs */ = {
 			isa = PBXGroup;
 			children = (
+				E49070F3110E7E76003865FD /* libvorbisenc.dylib */,
 				E4907BF70FDAC38B00E2F075 /* libmysqlclient.dylib */,
 				E38E24270D26317D00618676 /* liblzo.dylib */,
 				F5D8F880104CD40B004A11AB /* liblzo2.dylib */,
diff --git a/configure.in b/configure.in
index 48fe900bd5..73febd30e8 100644
--- a/configure.in
+++ b/configure.in
@@ -57,8 +57,6 @@ external_libdts_enabled="== Use of external libdts enabled. =="
 external_libdts_disabled="== Use of external libdts disabled. =="
 external_libass_enabled="== Use of external libass enabled. =="
 external_libass_disabled="== Use of external libass disabled. =="
-external_libogg_enabled="== Use of external libogg enabled. =="
-external_libogg_disabled="== Use of external libogg disabled. =="
 external_python_enabled="== Use of external python enabled. =="
 external_python_disabled="== Use of external python disabled. =="
 ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
@@ -222,12 +220,6 @@ AC_ARG_ENABLE([external-libass],
             [use_external_libass=$enableval],
             [use_external_libass=no])
 
-AC_ARG_ENABLE([external-libogg],
-            [AS_HELP_STRING([--enable-external-libogg],
-            [enable use of external libogg library (default is no) 'Linux only'])],
-            [use_external_libogg=$enableval],
-            [use_external_libogg=no])
-
 AC_ARG_ENABLE([external-python],
             [AS_HELP_STRING([--enable-external-python],
             [enable use of external python library (default is no) 'Linux only'])],
@@ -601,16 +593,6 @@ else
   USE_EXTERNAL_LIBASS=0
 fi
 
-# External libogg
-if test "$use_external_libraries" = "yes" || test "$use_external_libogg" = "yes"; then
-  AC_MSG_NOTICE($external_libogg_enabled)
-  USE_EXTERNAL_LIBOGG=1
-  AC_DEFINE([USE_EXTERNAL_LIBOGG], [1], [Whether to use external libogg library.])
-else
-  AC_MSG_NOTICE($external_libogg_disabled)
-  USE_EXTERNAL_LIBOGG=0
-fi
-
 # External Python
 if test "$use_external_libraries" = "yes" || test "$use_external_python" = "yes"; then
   AC_CHECK_LIB([python2.6], [main],
@@ -970,11 +952,6 @@ else
   else
     final_message="$final_message\n  External libass:\tNo"
   fi
-  if test "$use_external_libogg" = "yes"; then
-    final_message="$final_message\n  External libogg:\tYes"
-  else
-    final_message="$final_message\n  External libogg:\tNo"
-  fi
   if test "$use_external_python" = "yes"; then
     final_message="$final_message\n  External Python:\tYes"
   else
@@ -1041,8 +1018,8 @@ OUTPUT_FILES="Makefile \
              tools/EventClients/Clients/OSXRemote/Makefile"
 
 if test "$host_vendor" = "apple"; then
-  OUTPUT_FILES+=" xbmc/cores/paplayer/FLACCodec/Makefile \
-             xbmc/cores/paplayer/vorbisfile/Makefile"
+  OUTPUT_FILES+=" \
+                xbmc/cores/paplayer/FLACCodec/Makefile"
 fi
 
 AC_CONFIG_FILES([${OUTPUT_FILES}])
@@ -1060,8 +1037,6 @@ AC_SUBST(USE_EXTERNAL_LIBA52)
 AC_SUBST(USE_EXTERNAL_LIBDTS)
 AC_SUBST(USE_EXTERNAL_LIBMPEG2)
 AC_SUBST(USE_EXTERNAL_LIBASS)
-AC_SUBST(USE_EXTERNAL_LIBVORBIS)
-AC_SUBST(USE_EXTERNAL_LIBOGG)
 AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
 AC_SUBST(USE_EXTERNAL_PYTHON)
 AC_SUBST(USE_PYTHON2_6)
@@ -1148,24 +1123,6 @@ XB_CONFIG_MODULE([xbmc/cores/paplayer/FLACCodec/flac-1.2.1], [
   fi
 ], [0])
 
-XB_CONFIG_MODULE([xbmc/cores/paplayer/vorbisfile/libvorbis], [
-  if test "$host_vendor" = "apple" ; then
-    CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
-    ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic
-  else
-    true
-  fi
-], [0])
-
-XB_CONFIG_MODULE([xbmc/cores/paplayer/vorbisfile/ogg], [
-  if test "$host_vendor" = "apple" ; then
-    CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
-    ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --with-pic
-  else
-    true
-  fi
-], [0])
-
 XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/ffmpeg], [
   if test "$host_vendor" = "apple" ; then
     ./configure \
diff --git a/xbmc/cdrip/DllOgg.h b/xbmc/cdrip/DllOgg.h
index f8d8d7f24d..7a0cb29a80 100644
--- a/xbmc/cdrip/DllOgg.h
+++ b/xbmc/cdrip/DllOgg.h
@@ -24,11 +24,11 @@
 #if (defined HAVE_CONFIG_H) && (!defined WIN32)
   #include "config.h"
 #endif
-#if (defined USE_EXTERNAL_LIBOGG)
+#if (defined WIN32)
+  #include "oggvorbis/ogg.h"
+#else
   #include <ogg/ogg.h>
   #include "utils/log.h"
-#else
-  #include "oggvorbis/ogg.h"
 #endif
 #include "DynamicDll.h"
 
@@ -44,7 +44,7 @@ public:
   virtual ~DllOggInterface() {}
 };
 
-#if (defined USE_EXTERNAL_LIBOGG)
+#if (!defined WIN32)
 
 class DllOgg : public DllDynamic, DllOggInterface
 {
diff --git a/xbmc/cdrip/DllVorbis.h b/xbmc/cdrip/DllVorbis.h
index 3ea27d0140..2436899534 100644
--- a/xbmc/cdrip/DllVorbis.h
+++ b/xbmc/cdrip/DllVorbis.h
@@ -24,11 +24,11 @@
 #if (defined HAVE_CONFIG_H) && (!defined WIN32)
   #include "config.h"
 #endif
-#if (defined USE_EXTERNAL_LIBVORBIS)
+#if (defined WIN32)
+  #include "cdrip/oggvorbis/vorbisenc.h"
+#else
   #include <vorbis/vorbisenc.h>
   #include "utils/log.h"
-#else
-  #include "cdrip/oggvorbis/vorbisenc.h"
 #endif
 #include "DynamicDll.h"
 
@@ -54,7 +54,7 @@ public:
   virtual ~DllVorbisInterface() {}
 };
 
-#if (defined USE_EXTERNAL_LIBVORBIS)
+#if (!defined WIN32)
 
 class DllVorbis : public DllDynamic, DllVorbisInterface
 {
diff --git a/xbmc/cdrip/DllVorbisEnc.h b/xbmc/cdrip/DllVorbisEnc.h
index 58f33da77f..8e5cad62d5 100644
--- a/xbmc/cdrip/DllVorbisEnc.h
+++ b/xbmc/cdrip/DllVorbisEnc.h
@@ -24,11 +24,11 @@
 #if (defined HAVE_CONFIG_H) && (!defined WIN32)
   #include "config.h"
 #endif
-#if (defined USE_EXTERNAL_LIBVORBIS)
+#if (defined WIN32)
+  #include "cdrip/oggvorbis/vorbisenc.h"
+#else
   #include <vorbis/vorbisenc.h>
   #include "utils/log.h"
-#else
-  #include "cdrip/oggvorbis/vorbisenc.h"
 #endif
 #include "DynamicDll.h"
 
@@ -40,7 +40,7 @@ public:
   virtual ~DllVorbisEncInterface() {}
 };
 
-#if (defined USE_EXTERNAL_LIBVORBIS)
+#if (!defined WIN32)
 
 class DllVorbisEnc : public DllDynamic, DllVorbisEncInterface
 {
diff --git a/xbmc/cores/paplayer/vorbisfile/Makefile.in b/xbmc/cores/paplayer/vorbisfile/Makefile.in
deleted file mode 100644
index 3822bef6e3..0000000000
--- a/xbmc/cores/paplayer/vorbisfile/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-ARCH=@ARCH@
-DIRS=ogg libvorbis
-SYSDIR=../../../../system/players/paplayer
-SO=vorbisfile-$(ARCH).so
-SLIB=$(SYSDIR)/$(SO)
-SLIBS=libvorbis/lib/.libs/libvorbis.a ogg/src/.libs/libogg.a
-ifneq (@USE_EXTERNAL_LIBVORBIS@,1)
-  VORBIS_LINK_OPTS+=-Wl,--whole-archive libvorbis/lib/.libs/libvorbisfile.a \
-                    libvorbis/lib/.libs/libvorbis.a -Wl,--no-whole-archive
-else
-  VORBIS_LINK_OPTS+=-lvorbisfile -lvorbis
-endif
-ifneq (@USE_EXTERNAL_LIBOGG@,1)
-  OGG_LINK_OPTS+=-Wl,--whole-archive ogg/src/.libs/libogg.a -Wl,--no-whole-archive
-else
-  OGG_LINK_OPTS+=-logg
-endif
-
-ifeq ($(ARCH), powerpc-osx)
-	BUNDLE1_O=-lbundle1.o
-endif
-
-
-.PHONY: compile
-
-$(SLIB): $(SLIBS)
-ifeq (,$(findstring 1,@USE_EXTERNAL_LIBVORBIS@ @USE_EXTERNAL_LIBOGG@))
-ifeq ($(findstring osx,$(ARCH)), osx)
-	ld -bundle -flat_namespace -undefined suppress -o $@ \
-		libvorbis/lib/.libs/vorbisfile.o \
-		ogg/src/.libs/libogg.a \
-		libvorbis/lib/.libs/libvorbis.a $(BUNDLE1_O)
-	../../../../tools/Mach5/wrapper.rb $@;mv output.so $@
-	chmod +x $@
-else
-	$(CC) -shared -o $@ $(VORBIS_LINK_OPTS) $(OGG_LINK_OPTS) \
-		`cat ../../DllLoader/exports/wrapper.def` \
-		../../DllLoader/exports/wrapper.o
-endif
-endif
-
-$(SLIBS): compile
-
-libvorbis/lib/.libs/libvorbis.a:
-ifneq (@USE_EXTERNAL_LIBVORBIS@,1)
-	$(MAKE) -C libvorbis/lib
-endif
-
-ogg/src/.libs/libogg.a:
-ifneq (@USE_EXTERNAL_LIBOGG@,1)
-	$(MAKE) -C ogg
-endif
-
-include ../../../../Makefile.include
diff --git a/xbmc/cores/paplayer/vorbisfile/README.linux b/xbmc/cores/paplayer/vorbisfile/README.linux
deleted file mode 100644
index 50ace9cd21..0000000000
--- a/xbmc/cores/paplayer/vorbisfile/README.linux
+++ /dev/null
@@ -1,11 +0,0 @@
-To compile:
-# cd libvorbis
-# chmod 755 configure
-# ./configure
-# make
-# cd ../ogg
-# chmod 755 configure
-# ./configure
-# make
-# cd ..
-# make vorbisfile-i486-linux.so