Skip to content

Commit

Permalink
upstream sync to 16.0 Jarvis release
Browse files Browse the repository at this point in the history
  • Loading branch information
@davilla
davilla committed Mar 12, 2016
1 parent df1a9f9 commit d1f1dfd
Show file tree
Hide file tree
Showing 1,718 changed files with 149,404 additions and 17,685 deletions.
138 changes: 14 additions & 124 deletions .gitignore
View file
Expand Up @@ -13,6 +13,8 @@ testMain
*.kdev4
# gedit
*~
# CLion
/.idea

# generated files etc
config.cache
Expand Down Expand Up @@ -88,8 +90,6 @@ config.log
/build-aux/ltmain.sh
/autotools
/BUILD
/xbmc.log
/xbmc.old.log
/Makefile.depend
/config.status
/configure
Expand All @@ -101,25 +101,10 @@ config.log
/*.patch

# /addons/
/addons/com.nullsoft.milkdrop.xbmc/*.vis
/addons/org.xbmc.addons.dxspectrum/*.vis
/addons/packages
/addons/screensaver.rsxs.euphoria/Euphoria.xbs
/addons/screensaver.rsxs.plasma/Plasma.xbs
/addons/screensaver.rsxs.solarwinds/Solarwinds.xbs
/addons/skin.confluence/media/Makefile
/addons/skin.confluence/media/Textures.xbt
/addons/skin.pm3-hd/media/Textures.xbt
/addons/visualization.dxspectrum/Spectrum_win32dx.vis
/addons/visualization.glspectrum/opengl_spectrum.vis
/addons/visualization.milkdrop/MilkDrop_win32dx.vis
/addons/visualization.projectm/projectM.vis
/addons/visualization.projectm/resources/presets.zip
/addons/visualization.vortex/Vortex_win32dx.vis
/addons/visualization.waveform/Waveform.vis
/addons/visualization.waveform/Waveform_win32.vis
/addons/visualization.itunes/iTunes.mvis
/addons/visualization.fishbmc/fishbmc.vis
/addons/script.module.pil/
/addons/audioencoder.*
/addons/pvr.*
Expand Down Expand Up @@ -159,6 +144,9 @@ config.log
/lib/addons/library.xbmc.codec/project/VS2010Express/Debug
/lib/addons/library.xbmc.pvr/project/VS2010Express/Release
/lib/addons/library.xbmc.pvr/project/VS2010Express/Debug
/lib/addons/library.kodi.audioengine/Makefile
/lib/addons/library.kodi.audioengine/project/VS2010Express/Release/
/lib/addons/library.kodi.audioengine/project/VS2010Express/Debug/

# /lib/cpluff/
/lib/cpluff/ABOUT-NLS
Expand Down Expand Up @@ -307,6 +295,7 @@ lib/cpluff/stamp-h1
/project/cmake/addons/*.error
/project/cmake/addons/.failure
/project/cmake/addons/.success
/project/cmake/addons/addons
/project/cmake/addons/build
/project/cmake/addons/depends/build
/project/cmake/addons/output
Expand Down Expand Up @@ -351,6 +340,7 @@ lib/cpluff/stamp-h1
/project/VS2010Express/*.vsp
/project/VS2010Express/*.metaproj
/project/VS2010Express/*.metaproj.tmp
/project/VS2010Express/.vs

# /skin/
/skin/Confluence/media/Textures.xbt
Expand Down Expand Up @@ -411,24 +401,20 @@ lib/cpluff/stamp-h1
# /system
/system/zlib1.dll


# /screensavers/
/screensavers/Solarwinds.xbs
/screensavers/Euphoria.xbs
/screensavers/Plasma.xbs

# /skin/Confluence/
/skin/Confluence/BUILD

#/tools/android
/tools/android/packaging/xbmc/AndroidManifest.xml
/tools/android/packaging/Makefile
/tools/android/packaging/xbmc/activity_main.xml
/tools/android/packaging/xbmc/AndroidManifest.xml
/tools/android/packaging/xbmc/src/org/xbmc/kodi/Main.java
/tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java
/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCBroadcastReceiver.java
/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCOnAudioFocusChangeListener.java
/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCOnFrameAvailableListener.java
/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCSettingsContentObserver.java
/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCVideoView.java
/tools/android/packaging/xbmc/strings.xml

#/tools/depends
Expand Down Expand Up @@ -494,7 +480,6 @@ lib/cpluff/stamp-h1

# /xbmc/addons/
/xbmc/addons/Makefile
/xbmc/addons/visualization.waveform

# /xbmc/android
/xbmc/android/Makefile
Expand Down Expand Up @@ -550,6 +535,7 @@ lib/cpluff/stamp-h1

# /xbmc/interfaces/
/xbmc/interfaces/Makefile
/xbmc/interfaces/builtins/Makefile
/xbmc/interfaces/json-rpc/ServiceDescription.h
/xbmc/interfaces/python/Makefile
/xbmc/interfaces/python/generated/
Expand All @@ -564,9 +550,7 @@ lib/cpluff/stamp-h1

# /xbmc/messaging/
/xbmc/messaging/Makefile

# /xbmc/music/
/xbmc/music/karaoke/Makefile
/xbmc/messaging/helpers/Makefile

# /xbmc/network/
/xbmc/network/Makefile
Expand All @@ -586,105 +570,9 @@ lib/cpluff/stamp-h1
# /xbmc/main/posix/
xbmc/main/posix/Makefile

#/xbmc/screensavers/
/xbmc/screensavers/Makefile
/xbmc/screensavers/rsxs-0.9/Makefile
/xbmc/screensavers/rsxs-0.9/configure
/xbmc/screensavers/rsxs-0.9/config.h
/xbmc/screensavers/rsxs-0.9/config.log
/xbmc/screensavers/rsxs-0.9/config/Makefile
/xbmc/screensavers/rsxs-0.9/lib/Makefile
/xbmc/screensavers/rsxs-0.9/libltdl/Makefile
/xbmc/screensavers/rsxs-0.9/src/Makefile
/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile
/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile
/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile
/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile
/xbmc/screensavers/rsxs-0.9/src/flux/Makefile
/xbmc/screensavers/rsxs-0.9/src/helios/Makefile
/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile
/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile
/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile
/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile
/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile
/xbmc/screensavers/rsxs-0.9/xbmc/Makefile
/xbmc/screensavers/rsxs-0.9/autom4te.cache/
/xbmc/screensavers/rsxs-0.9/lib/alloca.h
/xbmc/screensavers/rsxs-0.9/lib/argz.h
/xbmc/screensavers/rsxs-0.9/lib/getopt.h
/xbmc/screensavers/rsxs-0.9/rsxs.spec
/xbmc/screensavers/rsxs-0.9/src/.dirstamp
/xbmc/screensavers/rsxs-0.9/src/euphoria/rs-euphoria
/xbmc/screensavers/rsxs-0.9/src/plasma/rs-plasma
/xbmc/screensavers/rsxs-0.9/src/solarwinds/rs-solarwinds
/xbmc/screensavers/rsxs-0.9/stamp-h1
/xbmc/screensavers/rsxs-0.9/aclocal.m4
/xbmc/screensavers/rsxs-0.9/compile
/xbmc/screensavers/rsxs-0.9/config.guess
/xbmc/screensavers/rsxs-0.9/config.h.in
/xbmc/screensavers/rsxs-0.9/config.h.in~
/xbmc/screensavers/rsxs-0.9/config.sub
/xbmc/screensavers/rsxs-0.9/config/Makefile.in
/xbmc/screensavers/rsxs-0.9/depcomp
/xbmc/screensavers/rsxs-0.9/INSTALL
/xbmc/screensavers/rsxs-0.9/install-sh
/xbmc/screensavers/rsxs-0.9/lib/Makefile.in
/xbmc/screensavers/rsxs-0.9/libltdl/Makefile.in
/xbmc/screensavers/rsxs-0.9/Makefile.in
/xbmc/screensavers/rsxs-0.9/missing
/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in
/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in

#/xbmc/utils
/xbmc/utils/Makefile

#/xbmc/visualizations/
/xbmc/visualizations/DirectXSpectrum/Debug (DirectX)
/xbmc/visualizations/DirectXSpectrum/Release (DirectX)
/xbmc/visualizations/EGLHelpers/Makefile
/xbmc/visualizations/fishBMC/Makefile
/xbmc/visualizations/Goom/Makefile
/xbmc/visualizations/Goom/goom2k4-0/aclocal.m4
/xbmc/visualizations/Goom/goom2k4-0/compile
/xbmc/visualizations/Goom/goom2k4-0/configure
/xbmc/visualizations/Goom/goom2k4-0/INSTALL
/xbmc/visualizations/Goom/goom2k4-0/mkinstalldirs
/xbmc/visualizations/Goom/goom2k4-0/Makefile.in
/xbmc/visualizations/Goom/goom2k4-0/config.guess
/xbmc/visualizations/Goom/goom2k4-0/config.sub
/xbmc/visualizations/Goom/goom2k4-0/depcomp
/xbmc/visualizations/Goom/goom2k4-0/install-sh
/xbmc/visualizations/Goom/goom2k4-0/ltmain.sh
/xbmc/visualizations/Goom/goom2k4-0/missing
/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.in
/xbmc/visualizations/Goom/goom2k4-0/src/Makefile.in
/xbmc/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.in
/xbmc/visualizations/Goom/goom2k4-0/ylwrap
/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/confdefs.h
/xbmc/visualizations/Milkdrop/Debug
/xbmc/visualizations/Milkdrop/Release
/xbmc/visualizations/OpenGLSpectrum/Makefile
/xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj.metaproj
/xbmc/visualizations/WaveForm/Makefile
/xbmc/visualizations/WaveForm/Debug (DirectX)
/xbmc/visualizations/WaveForm/Release (DirectX)
/xbmc/visualizations/XBMCProjectM/Makefile
/xbmc/visualizations/XBMCProjectM/libprojectM/Makefile
/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeCache.txt
/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeFiles/
/xbmc/visualizations/XBMCProjectM/libprojectM/cmake_install.cmake
/xbmc/visualizations/XBMCProjectM/libprojectM/config.inp

#/xbmc/win32/
/xbmc/win32/XBMC_PC.rc
# no longer used
Expand Down Expand Up @@ -941,6 +829,8 @@ xbmc/main/posix/Makefile
/addons/library.kodi.guilib/libKODI_guilib.lib
/addons/library.xbmc.pvr/libXBMC_pvr.dll
/addons/library.xbmc.pvr/libXBMC_pvr.lib
/addons/library.kodi.audioengine/libKODI_audioengine.dll
/addons/library.kodi.audioengine/libKODI_audioengine.lib

/pvr-addons
/adsp-addons
Expand Down
19 changes: 15 additions & 4 deletions Makefile.in
View file
Expand Up @@ -11,7 +11,7 @@ EC_DIRS = tools/EventClients
NWAOBJSXBMC = xbmc/threads/threads.a
NWAOBJSXBMC += xbmc/commons/commons.a

DVDPCODECS_DIRS = lib
DVDPCODECS_DIRS = lib lib/libdvd

ifeq (@USE_LIBSTAGEFRIGHT@,1)
DVDPCODECS_DIRS += xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS
Expand Down Expand Up @@ -47,6 +47,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
xbmc/filesystem/filesystem.a \
xbmc/guilib/guilib.a \
xbmc/input/input.a \
xbmc/interfaces/builtins/builtins.a \
xbmc/interfaces/generic/interfaces-generic.a \
xbmc/interfaces/info/info.a \
xbmc/interfaces/interfaces.a \
Expand All @@ -55,6 +56,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
xbmc/listproviders/listproviders.a \
xbmc/media/media.a \
xbmc/messaging/messaging.a \
xbmc/messaging/helpers/messagingHelpers.a \
xbmc/music/dialogs/musicdialogs.a \
xbmc/music/infoscanner/musicscanner.a \
xbmc/music/music.a \
Expand Down Expand Up @@ -145,6 +147,8 @@ DIRECTORY_ARCHIVES += xbmc/storage/android/storage_android.a
DIRECTORY_ARCHIVES += xbmc/windowing/X11/windowing_X11.a
else
DIRECTORY_ARCHIVES += xbmc/input/linux/input_linux.a
DIRECTORY_ARCHIVES += xbmc/input/touch/input_touch.a
DIRECTORY_ARCHIVES += xbmc/input/touch/generic/input_touch_generic.a
DIRECTORY_ARCHIVES += xbmc/network/linux/network_linux.a
DIRECTORY_ARCHIVES += xbmc/powermanagement/linux/powermanagement_linux.a
DIRECTORY_ARCHIVES += xbmc/storage/linux/storage_linux.a
Expand All @@ -162,10 +166,10 @@ DIRECTORY_ARCHIVES += lib/UnrarXLib/UnrarXLib.a
endif

ifeq (@USE_ANDROID@,1)
DIRECTORY_ARCHIVES += xbmc/windowing/android/windowing_android.a
DIRECTORY_ARCHIVES += xbmc/platform/android/jni/jni.a
DIRECTORY_ARCHIVES += xbmc/platform/android/loader/AndroidDyload.a
DIRECTORY_ARCHIVES += xbmc/platform/android/bionic_supplement/bionic_supplement.a
DIRECTORY_ARCHIVES += xbmc/platform/android/jni/jni.a
DIRECTORY_ARCHIVES += xbmc/windowing/android/windowing_android.a
endif

ifeq (@USE_OMXPLAYER@,1)
Expand All @@ -174,6 +178,8 @@ endif

LIBADDON_DIRS=\
lib/addons/library.xbmc.addon \
lib/addons/library.kodi.adsp \
lib/addons/library.kodi.audioengine \
lib/addons/library.xbmc.codec \
lib/addons/library.xbmc.pvr \
lib/addons/library.kodi.guilib \
Expand Down Expand Up @@ -258,10 +264,13 @@ dllloader: exports xbmc/cores/DllLoader/dllloader.a

libaddon: exports
$(MAKE) -C lib/addons/library.xbmc.addon
$(MAKE) -C lib/addons/library.kodi.adsp
$(MAKE) -C lib/addons/library.kodi.audioengine
$(MAKE) -C lib/addons/library.xbmc.codec
$(MAKE) -C lib/addons/library.kodi.guilib
$(MAKE) -C lib/addons/library.xbmc.pvr
dvdpcodecs: dllloader
$(MAKE) -C lib/libdvd

ifeq (@USE_LIBSTAGEFRIGHT@,1)
dvdpextcodecs: lib@APP_NAME_LC@.so
Expand Down Expand Up @@ -330,7 +339,7 @@ OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), $(OBJSXBMC))
BIN_DIRS = $(dir $(DIRECTORY_ARCHIVES)) $(dir $(NWAOBJSXBMC)) $(dir $(MAINOBJS))

DIRS= $(BIN_DIRS) $(EC_DIRS) $(DVDPCODECS_DIRS) \
$(LIBADDON_DIRS) $(SKIN_DIRS) xbmc/main
$(LIB_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) xbmc/main

$(NWAOBJSXBMC) $(DIRECTORY_ARCHIVES) $(MAINOBJS): force
@$(MAKE) $(if $(V),,-s) -C $(@D)
Expand Down Expand Up @@ -509,6 +518,8 @@ clean-eventclients:
for d in $(EC_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
clean-dvdpcodecs:
for d in $(DVDPCODECS_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
clean-libs:
for d in $(LIB_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
clean-libaddons:
for d in $(LIBADDON_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done

Expand Down
2 changes: 2 additions & 0 deletions Makefile.include.in
View file
Expand Up @@ -37,12 +37,14 @@ CFLAGS+=@CFLAGS@
CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@
LDFLAGS+=@LDFLAGS@
LDFLAGS_FOR_BUILD+=@LDFLAGS_FOR_BUILD@
INCLUDES+=-I@abs_top_srcdir@
INCLUDES+=-I@abs_top_srcdir@/lib
INCLUDES+=-I@abs_top_srcdir@/xbmc
INCLUDES+=-I@abs_top_srcdir@/xbmc/addons/include
INCLUDES+=-I@abs_top_srcdir@/addons/library.kodi.guilib
INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.addon
INCLUDES+=-I@abs_top_srcdir@/addons/library.kodi.adsp
INCLUDES+=-I@abs_top_srcdir@/addons/library.kodi.audioengine
INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr
INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec
INCLUDES+=$(sort @INCLUDES@)
Expand Down

0 comments on commit d1f1dfd

Please sign in to comment.