2013-02-23, 12:11
We prefer a clean merge without additional merge commits in it when we get this back to master. Thanx btw for starting to look at it.
(2013-02-23, 12:11)elupus Wrote: We prefer a clean merge without additional merge commits in it when we get this back to master. Thanx btw for starting to look at it.Thanks and agreed!
(2013-02-21, 14:28)Memphiz Wrote: I think for collaboration between you 2 it would make sense to fork ffmpeg git into github and work there maybe?"https://github.com/FlyingRat/FFmpeg-with-XBMC-custom-patches". I'll move all ffmpeg changes to this fork and then merge it with the "bump-fork". But all that hard work has to be put on hold for about a week, because we'll soon be of for a well-deserved winter sports holiday, o yeah!
(2013-02-21, 23:16)flyingrat Wrote: Commited: "Vicbitter ffmpeg1.1.2 + xbmc patches" (check inbox) ...
(2013-02-23, 19:02)vicbitter Wrote:(2013-02-21, 23:16)flyingrat Wrote: Commited: "Vicbitter ffmpeg1.1.2 + xbmc patches" (check inbox) ...
It seems that not all of the ffmpeg files made it into the commit
(2013-02-26, 11:49)Skank Wrote:(2013-02-26, 10:16)vicbitter Wrote: Good news... The first integrated build is up and running
Really for windows too?
Its the latest nightly?
So from now on, each build has ffmpeg 1.1?
4> PeripheralBusCEC.cpp
xbmc\peripherals\bus\virtual\peripheralbuscec.cpp(84): error C2065: 'cec_adapter_descriptor' : undeclared identifier
xbmc\peripherals\bus\virtual\peripheralbuscec.cpp(84): error C2146: syntax error : missing ';' before identifier 'deviceList'
xbmc\peripherals\bus\virtual\peripheralbuscec.cpp(84): error C2065: 'deviceList' : undeclared identifier
xbmc\peripherals\bus\virtual\peripheralbuscec.cpp(85): error C2039: 'DetectAdapters' : is not a member of 'CEC::ICECAdapter'
(2013-03-04, 16:46)flyingrat Wrote: I've done some successfully test builds on osx/ios/linux/ubuntu but I'm having some problems with win32. I've just refreshed the local repo from upstreams but got other problems. From VS:
Anybody who knows which commit in master that will build on win32? Thanks in advance!Code:4> PeripheralBusCEC.cpp
xbmc\peripherals\bus\virtual\peripheralbuscec.cpp(84): error C2065: 'cec_adapter_descriptor' : undeclared identifier
xbmc\peripherals\bus\virtual\peripheralbuscec.cpp(84): error C2146: syntax error : missing ';' before identifier 'deviceList'
xbmc\peripherals\bus\virtual\peripheralbuscec.cpp(84): error C2065: 'deviceList' : undeclared identifier
xbmc\peripherals\bus\virtual\peripheralbuscec.cpp(85): error C2039: 'DetectAdapters' : is not a member of 'CEC::ICECAdapter'
11> ApplicationMessenger.cpp
11> xbmc\network\httprequesthandler\ihttprequesthandler.h(32): fatal error C1083: Cannot open include file:
'microhttpd.h': No such file or directory
(2013-03-04, 20:24)ace20022 Wrote: The first one comes from missing dependences, the second probably too. Try (re)download them: DownloadBuildDeps.bat
Downloading boost
--------------
boost-1_46_1-xbmc-win32-1.7z http://mirrors.xbmc.org/build-deps/win32/
SYSTEM_WGETRC = c:/progra~1/wget/etc/wgetrc
syswgetrc = C:\Users\lars\src\xbmc\project\BuildDependencies/etc/wgetrc
--2013-03-04 21:28:57-- http://mirrors.xbmc.org/build-deps/win32//boost-1_46_1-xbmc-win32-1.7z
Resolving mirrors.xbmc.org... 212.110.166.220
Connecting to mirrors.xbmc.org|212.110.166.220|:80... connected.
HTTP request sent, awaiting response... 302 Found
Location: http://ftp.df.lth.se/pub/xbmc/build-deps/win32/boost-1_46_1-xbmc-win32-1.7z [following]
--2013-03-04 21:28:57-- http://ftp.df.lth.se/pub/xbmc/build-deps/win32/boost-1_46_1-xbmc-win32-1.7z
Resolving ftp.df.lth.se... 194.47.250.18
Connecting to ftp.df.lth.se|194.47.250.18|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 812618 (794K) [application/x-7z-compressed]
Saving to: `boost-1_46_1-xbmc-win32-1.7z'
1. Project/BuildDependencies/DownloadBuildDeps.bat
2. Project/BuildDependencies/DownloadMingwBuildEnv.bat
3. Project/Win32BuildSetup/BuildSetup.bat