Skip to content

Commit

Permalink
Merge branch 'master' into pvr-ppa
Browse files Browse the repository at this point in the history
  • Loading branch information
@opdenkamp
opdenkamp committed Jul 17, 2011
2 parents 615e173 + 38ce959 commit b485416
Show file tree
Hide file tree
Showing 1,286 changed files with 33,558 additions and 65,506 deletions.
28 changes: 16 additions & 12 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# global patterns
testMain

# commonly used editors
# vim
*.swp
# Eclipse
*.project
*.cproject

# generated files etc
config.cache
Expand Down Expand Up @@ -142,6 +146,12 @@ autom4te.cache

# /lib/asap/
/lib/asap/Makefile
/lib/asap/players.h
/lib/asap/players/*.obx
/lib/asap/win32/xbmc_asap.dll
/lib/asap/win32/xbmc_asap.lib
/lib/asap/xbmc/xbmc_asap.res


# /lib/addons/
/lib/addons/library.xbmc.addon/Makefile
Expand Down Expand Up @@ -244,10 +254,6 @@ lib/cmyth/Makefile
/lib/libass/m4/ltversion.m4
/lib/libass/m4/lt~obsolete.m4

# /lib/libcdio
/lib/libcdio/Debug
/lib/libcdio/Release

# /lib/libiconv
/lib/libiconv/libiconv_win32/Debug
/lib/libiconv/libiconv_win32/Release
Expand Down Expand Up @@ -322,7 +328,8 @@ lib/cmyth/Makefile
/project/Win32BuildSetup/dependencies/pcre.dll
/project/Win32BuildSetup/dependencies/pcrecpp.dll
/project/Win32BuildSetup/dependencies/python26.dll
project/Win32BuildSetup/dependencies/libcdio-10.dll
/project/Win32BuildSetup/dependencies/libcdio-12.dll
/project/Win32BuildSetup/dependencies/vcredist

# /project/Win32BuildSetup/
/project/Win32BuildSetup/BuildLog.htm
Expand Down Expand Up @@ -360,6 +367,7 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/project/VS2010Express/libs
/project/VS2010Express/objs
/project/VS2010Express/ipch
/project/VS2010Express/*.vsp

# /skin/
/skin/Confluence/media/Textures.xbt
Expand Down Expand Up @@ -393,6 +401,7 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/system/players/dvdplayer/avcore-0.dll
/system/players/dvdplayer/avformat-52.dll
/system/players/dvdplayer/avutil-50.dll
/system/players/dvdplayer/avfilter-1.dll
/system/players/dvdplayer/freetype6.dll
/system/players/dvdplayer/libass.dll
/system/players/dvdplayer/libdvdcss-2.dll
Expand All @@ -401,13 +410,12 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/system/players/dvdplayer/libfontconfig-1.dll
/system/players/dvdplayer/librtmp.dll
/system/players/dvdplayer/postproc-51.dll
/system/players/dvdplayer/swscale-0.6.1.dll
/system/players/dvdplayer/swscale-0.dll
/system/players/dvdplayer/libbluray.dll
/system/players/dvdplayer/libmpeg2-0.dll
/system/players/dvdplayer/libmad.dll

# /system/players/paplayer
/system/players/paplayer/wavpack.dll
/system/players/paplayer/libmodplug.dll
/system/players/paplayer/StSoundLibrary.dll
/system/players/paplayer/vorbisfile.dll
Expand Down Expand Up @@ -674,6 +682,7 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/lib/libmpeg2/libtool
/lib/libmpeg2/configure.lineno
/lib/libmpeg2/Makefile
/lib/libmpeg2/src/*.exe

# /lib/libmpeg2/doc/
/lib/libmpeg2/doc/Makefile
Expand Down Expand Up @@ -903,11 +912,6 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/lib/win32/libsamplerate/libsamplerate_win32/Debug
/lib/win32/libsamplerate/libsamplerate_win32/Release

# /lib/win32/libwavpack/
/lib/win32/libwavpack/Makefile
/lib/win32/libwavpack/Debug
/lib/win32/libwavpack/Release

# /lib/win32/sqlite
/lib/win32/sqlite/libsqlite_win32/Debug
/lib/win32/sqlite/libsqlite_win32/Release
Expand Down
19 changes: 6 additions & 13 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ BIN_DIRS= \
xbmc/dbwrappers \
lib/UnrarXLib \
lib/libsquish \
lib/SlingboxLib \
xbmc/visualizations \
xbmc/screensavers \
xbmc/pvr \
Expand All @@ -82,7 +83,6 @@ BIN_DIRS= \
xbmc/input/linux \
xbmc/osx \
xbmc/threads \
xbmc/threads/posix \
xbmc/windowing \

ifeq (@USE_OPENGL@,1)
Expand Down Expand Up @@ -134,8 +134,7 @@ LIB_DIRS=\
lib/libid3tag \
lib/libapetag \
lib/cpluff \
lib/xbmc-dll-symbols \
lib/jsoncpp/src/lib_json
lib/xbmc-dll-symbols

SS_DIRS=\
xbmc/screensavers/rsxs-0.9/xbmc
Expand Down Expand Up @@ -352,8 +351,6 @@ lib/libUPnP/libupnp.a: force
$(MAKE) -C lib/libUPnP
lib/libXDAAP/libxdaap.a: force
$(MAKE) -C lib/libXDAAP
lib/jsoncpp/src/lib_json/libjsoncpp.a: force
$(MAKE) -C lib/jsoncpp/src/lib_json
xbmc/interfaces/http-api/http-api.a: force
$(MAKE) -C xbmc/interfaces/http-api
xbmc/interfaces/json-rpc/json-rpc.a: force
Expand All @@ -364,12 +361,10 @@ lib/UnrarXLib/UnrarXLib.a: force
$(MAKE) -C lib/UnrarXLib
lib/libsquish/libsquish.a: force
$(MAKE) -C lib/libsquish
lib/SlingboxLib/SlingboxLib.a: force
$(MAKE) -C lib/SlingboxLib
xbmc/linux/linux.a: force
$(MAKE) -C xbmc/linux
xbmc/threads/posix/threads_posix.a: force
$(MAKE) -C xbmc/threads/posix
xbmc/threads/darwin/threads_darwin.a: force
$(MAKE) -C xbmc/threads/darwin
xbmc/addons/addons.a: force
$(MAKE) -C xbmc/addons
xbmc/settings/settings.a: force
Expand Down Expand Up @@ -489,7 +484,7 @@ xcode_depends: \
lib/libapetag/.libs/libapetag.a \
lib/libRTV/librtv.a \
lib/libXDAAP/libxdaap.a \
lib/jsoncpp/src/lib_json/libjsoncpp.a
lib/SlingboxLib/SlingboxLib.a

# platform independend objects
OBJSXBMC= \
Expand Down Expand Up @@ -547,10 +542,10 @@ OBJSXBMC= \
xbmc/interfaces/interfaces.a \
xbmc/cdrip/cdrip.a \
xbmc/interfaces/json-rpc/json-rpc.a \
lib/jsoncpp/src/lib_json/libjsoncpp.a \
xbmc/interfaces/http-api/http-api.a \
xbmc/dbwrappers/dbwrappers.a \
lib/libsquish/libsquish.a \
lib/SlingboxLib/SlingboxLib.a \
lib/libapetag/.libs/libapetag.a \
lib/xbmc-dll-symbols/dll-symbols.a \
xbmc/rendering/rendering.a \
Expand Down Expand Up @@ -580,15 +575,13 @@ ifeq ($(findstring osx,@ARCH@), osx)
OBJSXBMC += \
xbmc/osx/osx.a \
xbmc/windowing/osx/windowing_osx.a \
xbmc/threads/darwin/threads_darwin.a \
xbmc/powermanagement/osx/powermanagement.a \
xbmc/network/osx/network.a \
xbmc/storage/osx/storage.a \
xbmc/network/linux/network_linux.a \

else
OBJSXBMC += \
xbmc/threads/posix/threads_posix.a \
xbmc/input/linux/input_linux.a \
xbmc/network/linux/network_linux.a \
xbmc/powermanagement/linux/powermanagement_linux.a \
Expand Down
4 changes: 2 additions & 2 deletions Makefile.include.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ ifneq (@USE_EXTERNAL_FFMPEG@,1)
INCLUDES+=-I@abs_top_srcdir@/lib/ffmpeg
endif
INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
DEFINES+= \
-D_LINUX \
@ARCH_DEFINES@ \
-D_FILE_DEFINED \
-D__STDC_CONSTANT_MACROS \
-DBIN_INSTALL_PATH="\"$(libdir)/xbmc\"" \
-DINSTALL_PATH="\"$(datarootdir)/xbmc\"" \
@SDL_DEFINES@ \
@ARCH_DEFINES@ \
@DEFS@ \

ifeq ($(findstring osx,$(ARCH)), osx)
Expand Down
18 changes: 11 additions & 7 deletions README.ios
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ TOC
-----------------------------------------------------------------------------

This is a platform port of XBMC for the Apple iOS operating system.
The current build system is Xcode 3.2.5 and iOS SDK 4.2
The current build system is Xcode 3.x and iOS SDK 4.2/4.3
There are two ways to build XBMC for Mac.

1) command-line or
Expand Down Expand Up @@ -50,8 +50,11 @@ The preferred version is Xcode 3.2.5 and iOS SDK 4.2.
-----------------------------------------------------------------------------

$ cd $HOME/XBMC
$ sudo mkdir -p /usr/local/bin; sudo cp tools/osx/ios-depends/gas-preprocessor/gas-preprocessor.pl /usr/local/bin/
$ make -C tools/osx/ios-depends
$ sudo mkdir -p /usr/local/bin; sudo cp tools/darwin/depends/gas-preprocessor/gas-preprocessor.pl /usr/local/bin/
$ cd tools/darwin/depends
$ ./bootstrap
$ ./configure --with-darwin=ios
$ make

-----------------------------------------------------------------------------
4. How to compile
Expand All @@ -60,7 +63,7 @@ Both Xcode and Terminal compilation require that build environment be setup
from the step 3.1.

$ cd $HOME/XBMC
$ make -C tools/osx/ios-depends/xbmc
$ make -C tools/darwin/depends/xbmc
$ make clean
$ make xcode_depends

Expand All @@ -87,7 +90,8 @@ or

5. Gesture Handling on iPad/iPhone/iPod touch

Double Tap : Right Mouse Click
Swipe Left : Backspace
Swipe Right : Tab
double finger swipe left -> back
double finger tap -> right mouse
single finger tap -> left mouse
panning, and flicking -> panning and flicking works for media lists only at the moment ... scrollbars and other stuff are only clickable (single tap), for now

6 changes: 3 additions & 3 deletions README.linux
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
libavahi-common-dev, libavahi-client-dev, libxrandr-dev, libavcodec-dev,
libavformat-dev, libavutil-dev, libpostproc-dev, libswscale-dev,
libmpeg2-4-dev, libass-dev (>= 0.9.8), libmpcdec-dev, libflac-dev,
libwavpack-dev, python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev,
libbluetooth-dev, zlib1g-dev, libsmbclient-dev,
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
libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev, libyajl-dev

*** For developers and anyone else who compiles frequently it is recommended to
use ccache
Expand Down
9 changes: 6 additions & 3 deletions README.osx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ if you are running a previous Xcode 3.x version. Xcode 3.x only runs on 10.5.
-----------------------------------------------------------------------------

$ cd $HOME/XBMC
$ make -C tools/osx/osx-depends
$ cd tools/darwin/depends
$ ./bootstrap
$ ./configure --with-darwin=osx
$ make

-----------------------------------------------------------------------------
4. How to compile
Expand All @@ -58,7 +61,7 @@ Both Xcode and Terminal compilation require that build environment be setup
first. This is a simple step and involves the following:

$ cd $HOME/XBMC
$ make -C tools/osx/osx-depends/xbmc
$ make -C tools/darwin/depends/xbmc
$ make clean
$ make xcode_depends

Expand Down Expand Up @@ -137,7 +140,7 @@ distribution.

1. build XBMC.app from XCode so that the application bundle is correctly updated.

2. make -C tools/PackageMaker/
2. make -C tools/darwin/packaging/xbmc-osx

3. If completed successfully, a disk image named XBMC_for_Mac.dmg will be
present in the users XBMC build directory:
Expand Down
4 changes: 2 additions & 2 deletions README.ubuntu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:

For Ubuntu (all versions >= 7.04):

# sudo apt-get install subversion 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 libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-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

For Ubuntu Maverick (10.10):
# sudo apt-get install autopoint
Expand All @@ -70,7 +70,7 @@ PPA to your system here:

The PPA used for XBMC (developpement version) is located on the following page:

http://launchpad.net/~team-xbmc-svn/+archive/ppa
http://launchpad.net/~team-xbmc/+archive/unstable

[Note 1] Click on "Technical details about this PPA" to display the sources.list entries.

Expand Down
Loading

0 comments on commit b485416

Please sign in to comment.