Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Mar 23, 2011
  1. Merge branch 'master' into pvr-ppa

    authored
    Conflicts:
    	xbmc/pvr/PVRManager.cpp
  2. pvr: fix memory leak. new string objects were being created without f…

    authored
    …reeing the old ones. re-using previous objects now.
  3. pvr: initialise the epg cache in CGUIWindowPVR directly after the epg…

    authored
    … has been loaded from the database instead of on the first call to UpdateData(). speeds up the initial load of the timeline view
Commits on Mar 22, 2011
  1. tvheadend addon: make the 'skip_I_frame' count option an enum with va…

    authored
    …lues in range 0-15 and default to 0 as this should no longer be needed. the dvdplayer will buffer up if needed.
  2. @davilla
  3. @davilla

    [arm-tegra2] fixed, tegra2 is armv7 but no neon and gcc-4.4 seems to …

    davilla authored
    …lack the PLD arm instruction, thx Phaeodaria for looking into this
  4. fixed: MYSQL_TYPE_NEWDECIMAL wasn't supported, and this is used for S…

    amet authored
    …UM() queries in mysql (so watched counts weren't read)
  5. pvr: - fix GUIInfoManager CharInfo methods in CPVRManager. fixes cras…

    authored
    …hes and lockups on win32
    
         - don't update timers and recordings when asking for directory contents in GetDirectory() methods.
         - sleep a bit longer in the EPG update loop so the GUI can get a full directory listing while an update is running.
         - implement compare methods in CEpgInfoTag
         - set initial values properly in CPVRManager
         - fix bug: timer update was waiting for m_bTriggerRecordingsUpdate to become true
         - reduce log spam when updates are requested by addons
         - cosmetics: compiler warnings and little typos
  6. Merge branch 'container_foldername'

    Jonathan Marshall authored
    This patch set addresses #10313, providing localizable names of the current container foldername via the Container.Foldername infolabel.
    
    I've done this by utilizing the label of the CFileItemList, setting it either in the directory classes (addons, videodb, musicdb) or directly by looking up the source name (files nodes) or by using GetTitleForPath.
  7. @paulepanter @davilla

    LinuxRendererGLES.h: correct path to `DVDVideoCodec.h`

    paulepanter authored davilla committed
    Commit fcba7fc [1]
    
    	[ios] add corevideo ref buffer support
    
    has the following change
    
    	-#include "../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h"
    	+#include "DVDCodecs/Video/DVDVideoCodec.h"
    
    which breaks the build using OpenEmbedded [2] with `angstrom-2008.1` and `MACHINE = "beagleboard"`.
    
    	arm-angstrom-linux-gnueabi-g++ -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb --sysroot=/oe/build-angstrom-next/angstrom-dev/s
    	ysroots/armv7a-angstrom-linux-gnueabi -MD -c -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_RE
    	ENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-ne
    	on-quad -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE
    	_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad -fexpensive-optimizations -fo
    	mit-frame-pointer -frename-registers -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2
    	 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad -D_LINUX -D_FILE_DEFINED -D__STDC_CONSTANT_MACROS -DBIN_INSTALL_PA
    	TH="\"/usr/lib/xbmc\"" -DINSTALL_PATH="\"/usr/share/xbmc\"" -DHAS_SDL_JOYSTICK -D'GIT_REV="Unknown"' -D_ARMEL -DHAVE_CONFIG_H  -D_GNU_SOURCE=1 -D_REENTRANT -I/oe/build-an
    	gstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/SDL -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/
    	alsa -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/dbus-1.0 -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-a
    	ngstrom-linux-gnueabi/usr/include/freetype2 -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/fribidi -I/oe/build-angstr
    	om-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/libpng12 -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/dbu
    	s-1.0/include -I/oe/build-angstrom-next/angstrom-dev/sysroots/i686-linux/usr/armv7a/include -I/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gn
    	ueabi/xbmc-10.05-r11+gitr0+2da92bc3acd51af9884c8cdbc148a56d3ee01923/git -I/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+2da
    	92bc3acd51af9884c8cdbc148a56d3ee01923/git/lib -I/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+2da92bc3acd51af9884c8cdbc148a
    	56d3ee01923/git/xbmc -I/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+2da92bc3acd51af9884c8cdbc148a56d3ee01923/git/xbmc/linu
    	x Application.cpp -o Application.o
    
    	In file included from cores/VideoRenderers/RenderManager.h:29:0,
    		               from Application.cpp:107:
    	cores/VideoRenderers/LinuxRendererGLES.h:33:43: fatal error: DVDCodecs/Video/DVDVideoCodec.h: No such file or directory
    	compilation terminated.
    	make[1]: *** [Application.o] Error 1
    	make[1]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+2da92bc3acd51af9884c8cdbc148a56d3ee01923/git/xbmc'
    	make: *** [xbmc/xbmc.a] Error 2
    	make: *** Waiting for unfinished jobs....
    
    Reverting that change fixes the build.
    
    [1] xbmc@fcba7fc
    [2] http://www.openembedded.org/
    
    Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
    Closes: Trac ticket #11362
  8. @paulepanter @davilla

    emu_msvcrt.cpp: include `mntent.h` independently of `HAS_DVD_DRIVE`

    paulepanter authored davilla committed
    With commit c4175e4 [1] `mntent.h` is only included when `HAS_DVD_DRIVE` is defined. This results in the following compile error using OpenEmbedded [2] with `angstrom-2008.1` and `MACHINE = "beagleboard"` with the configure option `--disable-optical-drive`.
    
    	arm-angstrom-linux-gnueabi-g++ -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb --sysroot=/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi -MD -c -fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad -fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad -fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad -D_LINUX -D_FILE_DEFINED -D__STDC_CONSTANT_MACROS -DBIN_INSTALL_PATH="\"/usr/lib/xbmc\"" -DINSTALL_PATH="\"/usr/share/xbmc\"" -DHAS_SDL_JOYSTICK -D'GIT_REV="Unknown"' -D_ARMEL -DHAVE_CONFIG_H  -D_GNU_SOURCE=1 -D_REENTRANT -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/SDL -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/alsa -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/dbus-1.0 -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/freetype2 -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/fribidi -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/libpng12 -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/dbus-1.0/include -I/oe/build/angstrom-dev/sysroots/i686-linux/usr/armv7a/include -I/oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+c4d98da91c7f1b5d3c557240a787c666f79037e9/git -I/oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+c4d98da91c7f1b5d3c557240a787c666f79037e9/git/lib -I/oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+c4d98da91c7f1b5d3c557240a787c666f79037e9/git/xbmc -I/oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+c4d98da91c7f1b5d3c557240a787c666f79037e9/git/xbmc/linux emu_msvcrt.cpp -o emu_msvcrt.o
    	emu_msvcrt.cpp:1: warning: switch -mcpu=cortex-a8 conflicts with -march= switch
    	mv -f .deps/pscan.Tpo .deps/pscan.Plo
    
    	emu_msvcrt.cpp: In function 'FILE* dll_fopen(const char*, const char*)':
    	emu_msvcrt.cpp:1168: error: 'MOUNTED' was not declared in this scope
    	emu_msvcrt.cpp:1169: error: 'MNTTAB' was not declared in this scope
    	emu_msvcrt.cpp: In function 'mntent* dll_getmntent(FILE*)':
    	emu_msvcrt.cpp:2159: error: 'getmntent' was not declared in this scope
    	make[2]: *** [emu_msvcrt.o] Error 1
    	make[2]: Leaving directory `/oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+c4d98da91c7f1b5d3c557240a787c666f79037e9/git/xbmc/cores/DllLoader/exports'
    	make[1]: *** [xbmc/cores/DllLoader/exports/exports.a] Error 2
    	make[1]: Leaving directory `/oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+c4d98da91c7f1b5d3c557240a787c666f79037e9/git'
    	make: *** [exports] Error 2
    	make: *** Waiting for unfinished jobs....
    
    Including `mntent.h` again fixes this error.
    
    [1] xbmc@c4175e4
    [2] http://www.openembedded.org/
    
    Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
    Signed-off-by: S. Davilla <davilla@4pi.com>
  9. @firnsy

    changed: missing space in general tvshow query. reverts #89bdffb7a405…

    firnsy authored
    …db2a6fa96a7e35cdeea5f631cd56 and addresses the root issue introduced in #1abe6055aa243886c2d4c3973eb46e9d9c6c133e.
  10. @davilla
  11. @davilla
Commits on Mar 21, 2011
  1. @davilla
  2. [win32] fixed: log was not copied if noprompt was set.

    theuni authored
    buildbot uses noprompt, this should help it find the log.
  3. @amet

    [ios] cleanup mkdeb scripts, Allows us to run mkdeb-xbmc-xxx.sh from …

    amet authored
    …anywhere in the three, rather than the tools/osx/packaging/xbmc-xxx folder only
  4. changed: use supported '-n 1' param instead for determining revision …

    theuni authored
    …string.
    
    The '-1' param works, but only because it works at some deeper level,
    and is much more likely to break.
  5. @davilla

    [arm] fixed trac #11352, yuv2rgb.neon.S needs both adorned and non-ad…

    davilla authored
    …orned symbolification and including in makefile. thx PaulePanter for poking at this
  6. @anssih

    fixed: build with recent external ffmpeg (fixes #11259)

    anssih authored
    Libavcore was merged to libavutil in FFmpeg commit 737eb5976f6a on
    2011-02-15. Fix build with an external FFmpeg where that is the case.
    
    Tested by Paul Menzel <paulepanter@users.sourceforge.net>.
  7. @JezzX
  8. [osx] added: quick script for buildbot to determine if osx-build-deps…

    theuni authored
    … have changed since the last fetch
Something went wrong with that request. Please try again.