Permalink
Browse files

Merge branch 'master' into pvr-ppa

  • Loading branch information...
2 parents 5c6848a + d649b72 commit 522042f4f27e9fb2a0362f26604da86bfa925f88 @opdenkamp opdenkamp committed Aug 29, 2011
Showing 435 changed files with 12,051 additions and 3,739 deletions.
View
@@ -113,6 +113,7 @@ autom4te.cache
/addons/skin.confluence/media/Textures.xbt
/addons/skin.pm3-hd/media/Textures.xbt
/addons/visualization.dxspectrum/Spectrum_win32dx.vis
+/addons/visualization.glesspectrum/gles_spectrum.vis
/addons/visualization.glspectrum/opengl_spectrum.vis
/addons/visualization.milkdrop/MilkDrop_win32dx.vis
/addons/visualization.projectm/projectM.vis
@@ -323,7 +324,7 @@ lib/cmyth/Makefile
/project/output
# /project/Win32BuildSetup/
-/project/Win32BuildSetup/BuildLog.htm
+/project/Win32BuildSetup/XBMC.log
/project/Win32BuildSetup/XBMCSetup*.exe
/project/Win32BuildSetup/languages.nsi
/project/Win32BuildSetup/BUILD_WIN32/
@@ -1216,6 +1217,7 @@ lib/cmyth/Makefile
/xbmc/visualizations/Milkdrop/Release
/xbmc/visualizations/OpenGLSpectrum/Makefile
+/xbmc/visualizations/EGLSpectrum/Makefile
/xbmc/visualizations/WaveForm/Makefile
/xbmc/visualizations/WaveForm/Debug (DirectX)
View
@@ -46,7 +46,7 @@ BIN_DIRS= \
xbmc/network/osx \
xbmc/playlists \
xbmc/powermanagement \
- xbmc/powermanagement/linux \
+ xbmc/powermanagement/linux \
xbmc/rendering \
xbmc/storage \
xbmc/storage/linux \
@@ -83,7 +83,7 @@ BIN_DIRS= \
xbmc/input/linux \
xbmc/osx \
xbmc/threads \
- xbmc/windowing \
+ xbmc/windowing
ifeq (@USE_OPENGL@,1)
BIN_DIRS += xbmc/rendering/gl
@@ -94,10 +94,10 @@ BIN_DIRS += xbmc/windowing/egl
endif
ifeq ($(findstring osx,@ARCH@),osx)
-BIN_DIRS += xbmc/windowing/osx
BIN_DIRS += xbmc/network/osx
BIN_DIRS += xbmc/storage/osx
BIN_DIRS += xbmc/powermanagement/osx
+BIN_DIRS += xbmc/windowing/osx
else
BIN_DIRS += xbmc/windowing/X11
endif
@@ -110,7 +110,7 @@ XBMCTEX_DIRS= \
DVDPCODECS_DIRS= \
lib \
- lib/libdvd \
+ lib/libdvd
DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.a \
xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a \
@@ -119,7 +119,7 @@ DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.a \
xbmc/cores/dvdplayer/DVDCodecs/Video/Video.a \
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxers.a \
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreams.a \
- xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a \
+ xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a
PAPCODECS_DIRS= \
lib/xbadpcm \
@@ -128,7 +128,7 @@ PAPCODECS_DIRS= \
lib/libsidplay2 \
lib/stsound/StSoundLibrary \
lib/snesapu/SNES/SNESAPU \
- lib/vgmstream \
+ lib/vgmstream
ifeq (@USE_ASAP_CODEC@,1)
PAPCODECS_DIRS+= \
@@ -147,23 +147,31 @@ LIB_DIRS=\
SS_DIRS=
ifeq (@USE_OPENGL@,1)
-SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
+ SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
endif
VIS_DIRS=
ifeq (@USE_OPENGL@,1)
VIS_DIRS+=\
xbmc/visualizations/OpenGLSpectrum \
xbmc/visualizations/WaveForm \
- xbmc/visualizations/XBMCProjectM \
-
+ xbmc/visualizations/XBMCProjectM
endif
-ifeq (($(findstring osx,@ARCH@), osx),(@USE_OPENGL@,1))
-VIS_DIRS+=xbmc/visualizations/iTunes
+
+ifeq (($(findstring osx,@ARCH@), osx),(@USE_OPENGL@,1))
+ VIS_DIRS+=xbmc/visualizations/iTunes
endif
+
ifneq (@DISABLE_GOOM@,1)
-VIS_DIRS+=xbmc/visualizations/Goom \
+ VIS_DIRS+=xbmc/visualizations/Goom
+endif
+ifeq (@USE_OPENGLES@,1)
+ ifeq ($(findstring osx,@ARCH@), osx)
+ ifeq (@ARCH@, arm-osx)
+ VIS_DIRS+=xbmc/visualizations/EGLSpectrum
+ endif
+ endif
endif
PVR_DIRS=\
@@ -288,8 +296,6 @@ xbmc/powermanagement/linux/powermanagement_linux.a: force
$(MAKE) -C xbmc/powermanagement/linux
xbmc/powermanagement/osx/powermanagement.a: force
$(MAKE) -C xbmc/powermanagement/osx
-xbmc/windowing/X11/windowing_X11.a: force
- $(MAKE) -C xbmc/windowing/X11
xbmc/rendering/rendering.a: force
$(MAKE) -C xbmc/rendering
xbmc/rendering/gl/rendering_gl.a: force
@@ -302,6 +308,8 @@ xbmc/windowing/egl/windowing_egl.a: force
$(MAKE) -C xbmc/windowing/egl
xbmc/windowing/osx/windowing_osx.a: force
$(MAKE) -C xbmc/windowing/osx
+xbmc/windowing/X11/windowing_X11.a: force
+ $(MAKE) -C xbmc/windowing/X11
xbmc/storage/storage.a: force
$(MAKE) -C xbmc/storage
xbmc/storage/linux/storage_linux.a: force
@@ -536,49 +544,38 @@ OBJSXBMC= \
lib/libsquish/libsquish.a \
lib/SlingboxLib/SlingboxLib.a \
lib/libapetag/.libs/libapetag.a \
+ lib/libhts/libhts.a \
lib/xbmc-dll-symbols/dll-symbols.a \
- xbmc/rendering/rendering.a \
- xbmc/windowing/windowing.a \
+ xbmc/rendering/rendering.a \
+ xbmc/windowing/windowing.a \
+ lib/libTcpSocket/libTcpSocket.a
ifeq (@USE_OPENGL@,1)
-OBJSXBMC+= \
- xbmc/rendering/gl/rendering_gl.a
+OBJSXBMC += xbmc/rendering/gl/rendering_gl.a
endif
ifeq (@USE_OPENGLES@,1)
-OBJSXBMC+= \
- xbmc/rendering/gles/rendering_gles.a \
- xbmc/windowing/egl/windowing_egl.a
+OBJSXBMC += xbmc/rendering/gles/rendering_gles.a
+OBJSXBMC += xbmc/windowing/egl/windowing_egl.a
endif
ifeq (@HAVE_XBMC_NONFREE@,1)
-OBJSXBMC+= \
- lib/UnrarXLib/UnrarXLib.a
+OBJSXBMC += lib/UnrarXLib/UnrarXLib.a
endif
-OBJSXBMC+= \
- lib/libTcpSocket/libTcpSocket.a \
- lib/libhts/libhts.a
-
# platform dependend objects
ifeq ($(findstring osx,@ARCH@), osx)
-OBJSXBMC += \
- xbmc/osx/osx.a \
- xbmc/windowing/osx/windowing_osx.a \
- xbmc/powermanagement/osx/powermanagement.a \
- xbmc/network/osx/network.a \
- xbmc/storage/osx/storage.a \
- xbmc/network/linux/network_linux.a \
-
+OBJSXBMC += xbmc/osx/osx.a
+OBJSXBMC += xbmc/network/osx/network.a
+OBJSXBMC += xbmc/network/linux/network_linux.a
+OBJSXBMC += xbmc/powermanagement/osx/powermanagement.a
+OBJSXBMC += xbmc/storage/osx/storage.a
+OBJSXBMC += xbmc/windowing/osx/windowing_osx.a
else
-OBJSXBMC += \
- xbmc/input/linux/input_linux.a \
- xbmc/network/linux/network_linux.a \
- xbmc/powermanagement/linux/powermanagement_linux.a \
- xbmc/storage/linux/storage_linux.a
-ifeq (@USE_OPENGL@,1)
-OBJSXBMC+= \
- xbmc/windowing/X11/windowing_X11.a
-endif
+OBJSXBMC += xbmc/input/linux/input_linux.a
+OBJSXBMC += xbmc/network/linux/network_linux.a
+OBJSXBMC += xbmc/powermanagement/linux/powermanagement_linux.a
+OBJSXBMC += xbmc/storage/linux/storage_linux.a
+OBJSXBMC += xbmc/windowing/X11/windowing_X11.a
endif
DYNOBJSXBMC= \
@@ -608,7 +605,7 @@ ifneq (1,@USE_XRANDR@)
# xbmc-xrandr.c gets picked up by the default make rules
@echo "excluding xbmc-xrandr"
else
- $(CC) $(CFLAGS) $(LDFLAGS) -o xbmc-xrandr xbmc-xrandr.c -lXrandr -lX11
+ $(CC) $(CFLAGS) $(LDFLAGS) -o xbmc-xrandr xbmc-xrandr.c -lXrandr -lX11
endif
tools/XBMCTex/XBMCTex:
@@ -683,7 +680,7 @@ ifeq ($(findstring bsd,@ARCH@), bsd)
-exec printf " -- %-75.75s\r" "{}" \;
else
@find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.pvr|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
-endif
+endif
@# Icons and links
@install -d $(DESTDIR)$(datarootdir)/applications
@install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
@@ -727,7 +724,7 @@ reallyclean:
echo " The following files may need reverted (svn revert <file>)"; \
svn st | sed -e "s/^M */ /p" -e d; \
else \
- echo; \
+ echo; \
fi
clean-xbmc.bin:
View
@@ -1,3 +1,4 @@
+
TOC
1. Introduction
2. Getting the source code
@@ -53,7 +54,8 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev,
libbluetooth-dev, zlib1g-dev, libsmbclient-dev, libboost-thread-dev
libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
- libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev, libyajl-dev
+ libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev, libyajl-dev,
+ libplist-dev
*** For developers and anyone else who compiles frequently it is recommended to
use ccache
View
@@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:
For Ubuntu (all versions >= 7.04):
- # sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev
+ # sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev
For Ubuntu Maverick (10.10):
# sudo apt-get install autopoint
Oops, something went wrong.

0 comments on commit 522042f

Please sign in to comment.