[aml] move AMLUtils.cpp to utils dir and conditional build on amcodec…

… or amlplayer set in configure

.gitignore

@@ -591,6 +591,8 @@ lib/cmyth/Makefile
 /xbmc/cores/amlplayer/Makefile
 /xbmc/cores/omxplayer/Makefile
 
+/xbmc/utils/Makefile
+
 # /lib/ffmpeg/
 /lib/ffmpeg/config.h
 /lib/ffmpeg/config.err

configure.in

@@ -2390,7 +2390,8 @@ OUTPUT_FILES="Makefile \
     xbmc/peripherals/devices/Makefile \
     xbmc/android/activity/Makefile \
     xbmc/android/loader/Makefile \
-    xbmc/main/Makefile"
+    xbmc/main/Makefile \
+    xbmc/utils/Makefile"
 
 if test "$use_skin_touched" = "yes"; then
 OUTPUT_FILES="$OUTPUT_FILES addons/skin.touched/media/Makefile"

tools/amlogic/depends/xbmc/xbmc.mk

@@ -9,7 +9,7 @@ $(SOURCE)/xbmc.bin: $(SOURCE)/Makefile
 $(SOURCE)/Makefile: $(SOURCE)/configure
 	cd $(SOURCE); $(TARGET_CONFIGURE_OPTS) $(TARGET_CONFIGURE_ARGS) $(XBMC_CONF_ENV) \
         ./configure --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) --build=$(GNU_HOST_NAME) \
-        --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc $(XBMC_CONF_OPT) --disable-external-ffmpeg --enable-codec=amcodec
+        --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc $(XBMC_CONF_OPT) --disable-external-ffmpeg
 
 $(SOURCE)/configure: $(BUILDROOT)/package/thirdparty/xbmc/xbmc.mk  $(GCC)
 	cd $(SOURCE); ./bootstrap

xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp

@@ -34,7 +34,7 @@
 #include "threads/SingleLock.h"
 #include "settings/GUISettings.h"
 #if defined(HAS_AMLPLAYER) || defined(HAS_LIBAMCODEC)
-#include "cores/amlplayer/AMLUtils.h"
+#include "utils/AMLUtils.h"
 #endif
 
 #define ALSA_OPTIONS (SND_PCM_NONBLOCK | SND_PCM_NO_AUTO_FORMAT | SND_PCM_NO_AUTO_CHANNELS | SND_PCM_NO_AUTO_RESAMPLE)

xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp

@@ -23,8 +23,8 @@
 #include "Utils/AERingBuffer.h"
 #include "android/activity/XBMCApp.h"
 #include "utils/log.h"
-#if defined(HAS_AMLPLAYER)
-#include "cores/amlplayer/AMLUtils.h"
+#if defined(HAS_AMLPLAYER) || defined(HAS_LIBAMCODEC)
+#include "utils/AMLUtils.h"
 #endif
 
 #include <jni.h>

xbmc/cores/amlplayer/AMLPlayer.cpp

@@ -54,7 +54,7 @@
 #include "settings/VideoSettings.h"
 
 // amlogic libplayer
-#include "AMLUtils.h"
+#include "utils/AMLUtils.h"
 #include "DllLibamplayer.h"
 
 struct AMLChapterInfo

xbmc/cores/amlplayer/Makefile.in

@@ -3,7 +3,6 @@
 INCLUDES += -I$(prefix)/include/amlplayer
 
 SRCS = AMLPlayer.cpp
-SRCS+= AMLUtils.cpp
 SRCS+= FileURLProtocol.cpp
 
 LIB  = amlplayer.a
@@ -13,4 +12,3 @@ LIB  = amlplayer.a
 
 include @abs_top_srcdir@/Makefile.include
 -include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
-

xbmc/cores/dvdplayer/DVDCodecs/Video/Amlogic.cpp

@@ -26,9 +26,9 @@
 
 #include "Application.h"
 #include "cores/dvdplayer/DVDClock.h"
-#include "cores/amlplayer/AMLUtils.h"
 #include "cores/VideoRenderers/RenderManager.h"
 #include "settings/Settings.h"
+#include "utils/AMLUtils.h"
 #include "utils/log.h"
 #include "utils/TimeUtils.h"
 

xbmc/utils/Makefile.in

@@ -0,0 +1,84 @@
+SRCS += AlarmClock.cpp
+SRCS += AliasShortcutUtils.cpp
+SRCS += Archive.cpp
+SRCS += AsyncFileCopy.cpp
+ifeq (@USE_LIBAMCODEC@,1)
+SRCS += AMLUtils.cpp
+else ifeq (@USE_AMLPLAYER@,1)
+SRCS += AMLUtils.cpp
+endif
+SRCS += AutoPtrHandle.cpp
+SRCS += Base64.cpp
+SRCS += BitstreamConverter.cpp
+SRCS += BitstreamStats.cpp
+SRCS += CharsetConverter.cpp
+SRCS += CPUInfo.cpp
+SRCS += Crc32.cpp
+SRCS += CryptThreading.cpp
+SRCS += DatabaseUtils.cpp
+SRCS += DownloadQueue.cpp
+SRCS += DownloadQueueManager.cpp
+SRCS += EndianSwap.cpp
+SRCS += EdenVideoArtUpdater.cpp
+SRCS += Fanart.cpp
+SRCS += fastmemcpy.c
+SRCS += fastmemcpy-arm.S
+SRCS += FileOperationJob.cpp
+SRCS += FileUtils.cpp
+SRCS += fstrcmp.c
+SRCS += fft.cpp
+SRCS += GLUtils.cpp
+SRCS += GroupUtils.cpp
+SRCS += HTMLTable.cpp
+SRCS += HTMLUtil.cpp
+SRCS += HttpHeader.cpp
+SRCS += HttpParser.cpp
+SRCS += HttpResponse.cpp
+SRCS += InfoLoader.cpp
+SRCS += JobManager.cpp
+SRCS += JSONVariantParser.cpp
+SRCS += JSONVariantWriter.cpp
+SRCS += LabelFormatter.cpp
+SRCS += LangCodeExpander.cpp
+SRCS += LCD.cpp
+SRCS += LCDFactory.cpp
+SRCS += log.cpp
+SRCS += md5.cpp
+SRCS += Observer.cpp
+SRCS += Mime.cpp
+SRCS += PerformanceSample.cpp
+SRCS += PerformanceStats.cpp
+SRCS += POUtils.cpp
+SRCS += RecentlyAddedJob.cpp
+SRCS += RegExp.cpp
+SRCS += RingBuffer.cpp
+SRCS += RssReader.cpp
+SRCS += ScraperParser.cpp
+SRCS += ScraperUrl.cpp
+SRCS += Screenshot.cpp
+SRCS += SeekHandler.cpp
+SRCS += SortUtils.cpp
+SRCS += Splash.cpp
+SRCS += Stopwatch.cpp
+SRCS += StreamDetails.cpp
+SRCS += StreamUtils.cpp
+SRCS += StringUtils.cpp
+SRCS += SystemInfo.cpp
+SRCS += TextSearch.cpp
+SRCS += TimeSmoother.cpp
+SRCS += TimeUtils.cpp
+SRCS += TuxBoxUtil.cpp
+SRCS += URIUtils.cpp
+SRCS += UrlOptions.cpp
+SRCS += Variant.cpp
+SRCS += Vector.cpp
+SRCS += Weather.cpp
+SRCS += XBMCTinyXML.cpp
+SRCS += XMLUtils.cpp
+SRCS += XMLVariantParser.cpp
+SRCS += XMLVariantWriter.cpp
+
+LIB   = utils.a
+
+include @abs_top_srcdir@/Makefile.include
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(patsubst %.S,,$(SRCS))))