Skip to content

Instantly share code, notes, and snippets.

@dlintw
Created March 2, 2014 22:54
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save dlintw/9315205 to your computer and use it in GitHub Desktop.
Save dlintw/9315205 to your computer and use it in GitHub Desktop.
error when compile xbmc 12.3-Frodo
---- REVISIONS ----
1) Sat, 14 Apr 2012 12:36 - 460e79416c5cb13010456794f36f89d49d25da75
2) Sun, 10 Jun 2012 13:53 - 327710767d2257dad27e3885effba1d49d4557f0
3) Fri, 31 Aug 2012 22:34 - Frodo_alpha5 - 12840c28d8fbfd71c26be798ff6b13828b05b168
4) Fri, 31 Oct 2012 22:34 - Frodo_alpha7 - e292b1147bd89a7e53742e3e5039b9a906a3b1d0
5) Fri, 02 Jan 2013 22:34 - Frodo_rc3 - 7a6cb7f49ae19dca3c48c40fa3bd20dc3c490e60
6) Thu, 12 Dec 2013 13:47 - 12.3-Frodo - 9ed3e580ea7c000541273cbac116ec9e314124ca
7) current inactive... comming soon, here is the next stable (case 7 == DIFF=7)
read -p Select:
Selection: 6
Revision: 12.3-Frodo
Already up-to-date.
PVR Revision: 12.0-Frodo
Already up-to-date.
Note: checking out '12.3-Frodo'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b new_branch_name
HEAD is now at 9ed3e58... Merge pull request #3821 from MartijnKaijser/12.3
Note: checking out '12.0-Frodo'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b new_branch_name
HEAD is now at 96774c4... Merge branch 'master' into frodo
patching file configure.in
patching file configure.in.orig
patching file m4/ax_python_devel.m4
patching file Makefile.in
patching file tools/TexturePacker/XBMCTex.cpp
patching file tools/TexturePacker/XBMCTex.cpp.orig
patching file xbmc/Application.cpp
patching file xbmc/Application.cpp.orig
patching file xbmc/cores/AudioEngine/AEFactory.cpp
patching file xbmc/cores/DllLoader/DllLoaderContainer.cpp
patching file xbmc/cores/DllLoader/DllLoader.h
patching file xbmc/cores/DllLoader/ldt_keeper.c
patching file xbmc/cores/gstplayer/GSTPlayer.cpp
patching file xbmc/cores/gstplayer/GSTPlayer.h
patching file xbmc/cores/gstplayer/Makefile.in
patching file xbmc/cores/paplayer/ICodec.h
patching file xbmc/cores/paplayer/Makefile.in
patching file xbmc/cores/playercorefactory/PlayerCoreConfig.h
patching file xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
patching file xbmc/cores/playercorefactory/PlayerCoreFactory.h
patching file xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
patching file xbmc/cores/VideoRenderers/LinuxRendererGLES.h
patching file xbmc/cores/VideoRenderers/Makefile.in
patching file xbmc/cores/VideoRenderers/OverlayRenderer.cpp
patching file xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
patching file xbmc/cores/VideoRenderers/OverlayRendererGL.cpp.orig
patching file xbmc/cores/VideoRenderers/OverlayRendererGL.h
patching file xbmc/cores/VideoRenderers/RenderManager.cpp
patching file xbmc/cores/VideoRenderers/RenderManager.h
patching file xbmc/guilib/GUIFontTTFGL.cpp
patching file xbmc/guilib/GUITextureGLES.cpp
patching file xbmc/guilib/Makefile.in
patching file xbmc/guilib/MatrixGLES.cpp
patching file xbmc/guilib/TextureGL.cpp
patching file xbmc/input/linux/LinuxInputDevices.cpp
patching file xbmc/input/linux/LIRC.cpp
patching file xbmc/interfaces/legacy/ModuleXbmc.cpp
patching file xbmc/interfaces/legacy/ModuleXbmc.h
patching file xbmc/interfaces/legacy/Player.cpp
patching file xbmc/linux/PlatformDefs.h
patching file xbmc/pictures/SlideShowPicture.cpp
patching file xbmc/rendering/gles/RenderSystemGLES.cpp
patching file xbmc/rendering/gles/RenderSystemGLES.cpp.orig
patching file xbmc/rendering/gles/RenderSystemGLES.h
patching file xbmc/settings/AdvancedSettings.cpp
patching file xbmc/settings/GUISettings.cpp
patching file xbmc/settings/GUIWindowSettingsCategory.cpp
patching file xbmc/system_gl.h
patching file xbmc/system.h
patching file xbmc/threads/Atomics.cpp
patching file xbmc/threads/Atomics.h
patching file xbmc/threads/LockFree.cpp
patching file xbmc/threads/LockFree.h
patching file xbmc/utils/CPUInfo.cpp
patching file xbmc/utils/fastmemcpy.c
patching file xbmc/utils/fastmemcpy.h
patching file xbmc/utils/GLUtils.cpp
patching file xbmc/utils/MathUtils.h
patching file xbmc/utils/Screenshot.cpp
patching file xbmc/video/windows/GUIWindowFullScreen.cpp
patching file xbmc/windowing/egl/EGLNativeTypeStgles.cpp
patching file xbmc/windowing/egl/EGLNativeTypeStgles.h
patching file xbmc/windowing/egl/EGLWrapper.cpp
patching file xbmc/windowing/egl/Makefile
patching file pvr-addons/lib/platform/util/atomic.h
Hunk #1 succeeded at 66 (offset -12 lines).
patching file pvr-addons/xbmc/libXBMC_addon.h
patching file pvr-addons/configure.ac
patching file xbmc/input/linux/LIRC.cpp
Hunk #1 FAILED at 139.
1 out of 1 hunk FAILED -- saving rejects to file xbmc/input/linux/LIRC.cpp.rej
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment