{"action":"created","comment":{"url":"https://api.github.com/repos/OSVR/OSVR-Core/pulls/comments/38136989","id":38136989,"diff_hunk":"@@ -173,6 +177,17 @@ if(BUILD_OPENCV_CAMERA_PLUGIN)\n     list(APPEND OPENCV_MODULES_USED ${OPENCV_CAMERA_EXTRA_LIBS})\n endif()\n \n+if(BUILD_VIDEOTRACKER_PLUGIN)\n+    set(VIDEOTRACKER_EXTRA_LIBS\n+        opencv_imgproc\n+        opencv_features2d\n+        opencv_calib3d","path":"CMakeLists.txt","position":29,"original_position":29,"commit_id":"cdd725f68652170a6656fe62b24055eecc54b242","original_commit_id":"cdd725f68652170a6656fe62b24055eecc54b242","user":{"login":"rpavlik","id":61129,"avatar_url":"https://avatars.githubusercontent.com/u/61129?v=3","gravatar_id":"","url":"https://api.github.com/users/rpavlik","html_url":"https://github.com/rpavlik","followers_url":"https://api.github.com/users/rpavlik/followers","following_url":"https://api.github.com/users/rpavlik/following{/other_user}","gists_url":"https://api.github.com/users/rpavlik/gists{/gist_id}","starred_url":"https://api.github.com/users/rpavlik/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rpavlik/subscriptions","organizations_url":"https://api.github.com/users/rpavlik/orgs","repos_url":"https://api.github.com/users/rpavlik/repos","events_url":"https://api.github.com/users/rpavlik/events{/privacy}","received_events_url":"https://api.github.com/users/rpavlik/received_events","type":"User","site_admin":false},"body":"Do you know if these libs are the same in OpenCV 3? For instance, I know highgui's video capture got split out into `videoio` (see the lines above)","created_at":"2015-08-27T19:36:47Z","updated_at":"2015-08-27T19:36:47Z","html_url":"https://github.com/OSVR/OSVR-Core/pull/196#discussion_r38136989","pull_request_url":"https://api.github.com/repos/OSVR/OSVR-Core/pulls/196","_links":{"self":{"href":"https://api.github.com/repos/OSVR/OSVR-Core/pulls/comments/38136989"},"html":{"href":"https://github.com/OSVR/OSVR-Core/pull/196#discussion_r38136989"},"pull_request":{"href":"https://api.github.com/repos/OSVR/OSVR-Core/pulls/196"}}},"pull_request":{"url":"https://api.github.com/repos/OSVR/OSVR-Core/pulls/196","id":43517689,"html_url":"https://github.com/OSVR/OSVR-Core/pull/196","diff_url":"https://github.com/OSVR/OSVR-Core/pull/196.diff","patch_url":"https://github.com/OSVR/OSVR-Core/pull/196.patch","issue_url":"https://api.github.com/repos/OSVR/OSVR-Core/issues/196","number":196,"state":"open","locked":false,"title":"Video based tracker new rebased for merge","user":{"login":"russell-taylor","id":762320,"avatar_url":"https://avatars.githubusercontent.com/u/762320?v=3","gravatar_id":"","url":"https://api.github.com/users/russell-taylor","html_url":"https://github.com/russell-taylor","followers_url":"https://api.github.com/users/russell-taylor/followers","following_url":"https://api.github.com/users/russell-taylor/following{/other_user}","gists_url":"https://api.github.com/users/russell-taylor/gists{/gist_id}","starred_url":"https://api.github.com/users/russell-taylor/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/russell-taylor/subscriptions","organizations_url":"https://api.github.com/users/russell-taylor/orgs","repos_url":"https://api.github.com/users/russell-taylor/repos","events_url":"https://api.github.com/users/russell-taylor/events{/privacy}","received_events_url":"https://api.github.com/users/russell-taylor/received_events","type":"User","site_admin":false},"body":"When I rebased the project on master, I got a merge conflict in:\r\n\ttests/cplusplus/Util/CMakeLists.txt\r\n\ttests/cplusplus/Common/CmakeLists.txt\r\n\r\nI resolved them both based on the non-head version of the files, which talked about factoring out things\r\n\tfor gtest.\r\n\r\nIf that is okay, this should be ready to merge.  It mostly changes things in directories that are not yet in master, for video-based tracking.","created_at":"2015-08-27T13:37:50Z","updated_at":"2015-08-27T19:36:47Z","closed_at":null,"merged_at":null,"merge_commit_sha":"3c52d67a57b5ff2d6b36061117722ae523802293","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/OSVR/OSVR-Core/pulls/196/commits","review_comments_url":"https://api.github.com/repos/OSVR/OSVR-Core/pulls/196/comments","review_comment_url":"https://api.github.com/repos/OSVR/OSVR-Core/pulls/comments{/number}","comments_url":"https://api.github.com/repos/OSVR/OSVR-Core/issues/196/comments","statuses_url":"https://api.github.com/repos/OSVR/OSVR-Core/statuses/cdd725f68652170a6656fe62b24055eecc54b242","head":{"label":"OSVR:video-based-tracker-new-rebased-for-merge","ref":"video-based-tracker-new-rebased-for-merge","sha":"cdd725f68652170a6656fe62b24055eecc54b242","user":{"login":"OSVR","id":10343613,"avatar_url":"https://avatars.githubusercontent.com/u/10343613?v=3","gravatar_id":"","url":"https://api.github.com/users/OSVR","html_url":"https://github.com/OSVR","followers_url":"https://api.github.com/users/OSVR/followers","following_url":"https://api.github.com/users/OSVR/following{/other_user}","gists_url":"https://api.github.com/users/OSVR/gists{/gist_id}","starred_url":"https://api.github.com/users/OSVR/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OSVR/subscriptions","organizations_url":"https://api.github.com/users/OSVR/orgs","repos_url":"https://api.github.com/users/OSVR/repos","events_url":"https://api.github.com/users/OSVR/events{/privacy}","received_events_url":"https://api.github.com/users/OSVR/received_events","type":"Organization","site_admin":false},"repo":{"id":25528375,"name":"OSVR-Core","full_name":"OSVR/OSVR-Core","owner":{"login":"OSVR","id":10343613,"avatar_url":"https://avatars.githubusercontent.com/u/10343613?v=3","gravatar_id":"","url":"https://api.github.com/users/OSVR","html_url":"https://github.com/OSVR","followers_url":"https://api.github.com/users/OSVR/followers","following_url":"https://api.github.com/users/OSVR/following{/other_user}","gists_url":"https://api.github.com/users/OSVR/gists{/gist_id}","starred_url":"https://api.github.com/users/OSVR/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OSVR/subscriptions","organizations_url":"https://api.github.com/users/OSVR/orgs","repos_url":"https://api.github.com/users/OSVR/repos","events_url":"https://api.github.com/users/OSVR/events{/privacy}","received_events_url":"https://api.github.com/users/OSVR/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/OSVR/OSVR-Core","description":"The core libraries, applications, and plugins of the OSVR software platform.","fork":false,"url":"https://api.github.com/repos/OSVR/OSVR-Core","forks_url":"https://api.github.com/repos/OSVR/OSVR-Core/forks","keys_url":"https://api.github.com/repos/OSVR/OSVR-Core/keys{/key_id}","collaborators_url":"https://api.github.com/repos/OSVR/OSVR-Core/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/OSVR/OSVR-Core/teams","hooks_url":"https://api.github.com/repos/OSVR/OSVR-Core/hooks","issue_events_url":"https://api.github.com/repos/OSVR/OSVR-Core/issues/events{/number}","events_url":"https://api.github.com/repos/OSVR/OSVR-Core/events","assignees_url":"https://api.github.com/repos/OSVR/OSVR-Core/assignees{/user}","branches_url":"https://api.github.com/repos/OSVR/OSVR-Core/branches{/branch}","tags_url":"https://api.github.com/repos/OSVR/OSVR-Core/tags","blobs_url":"https://api.github.com/repos/OSVR/OSVR-Core/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/OSVR/OSVR-Core/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/OSVR/OSVR-Core/git/refs{/sha}","trees_url":"https://api.github.com/repos/OSVR/OSVR-Core/git/trees{/sha}","statuses_url":"https://api.github.com/repos/OSVR/OSVR-Core/statuses/{sha}","languages_url":"https://api.github.com/repos/OSVR/OSVR-Core/languages","stargazers_url":"https://api.github.com/repos/OSVR/OSVR-Core/stargazers","contributors_url":"https://api.github.com/repos/OSVR/OSVR-Core/contributors","subscribers_url":"https://api.github.com/repos/OSVR/OSVR-Core/subscribers","subscription_url":"https://api.github.com/repos/OSVR/OSVR-Core/subscription","commits_url":"https://api.github.com/repos/OSVR/OSVR-Core/commits{/sha}","git_commits_url":"https://api.github.com/repos/OSVR/OSVR-Core/git/commits{/sha}","comments_url":"https://api.github.com/repos/OSVR/OSVR-Core/comments{/number}","issue_comment_url":"https://api.github.com/repos/OSVR/OSVR-Core/issues/comments{/number}","contents_url":"https://api.github.com/repos/OSVR/OSVR-Core/contents/{+path}","compare_url":"https://api.github.com/repos/OSVR/OSVR-Core/compare/{base}...{head}","merges_url":"https://api.github.com/repos/OSVR/OSVR-Core/merges","archive_url":"https://api.github.com/repos/OSVR/OSVR-Core/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/OSVR/OSVR-Core/downloads","issues_url":"https://api.github.com/repos/OSVR/OSVR-Core/issues{/number}","pulls_url":"https://api.github.com/repos/OSVR/OSVR-Core/pulls{/number}","milestones_url":"https://api.github.com/repos/OSVR/OSVR-Core/milestones{/number}","notifications_url":"https://api.github.com/repos/OSVR/OSVR-Core/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/OSVR/OSVR-Core/labels{/name}","releases_url":"https://api.github.com/repos/OSVR/OSVR-Core/releases{/id}","created_at":"2014-10-21T14:56:46Z","updated_at":"2015-08-11T18:17:15Z","pushed_at":"2015-08-27T19:33:54Z","git_url":"git://github.com/OSVR/OSVR-Core.git","ssh_url":"git@github.com:OSVR/OSVR-Core.git","clone_url":"https://github.com/OSVR/OSVR-Core.git","svn_url":"https://github.com/OSVR/OSVR-Core","homepage":"","size":14812,"stargazers_count":44,"watchers_count":44,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":11,"mirror_url":null,"open_issues_count":109,"forks":11,"open_issues":109,"watchers":44,"default_branch":"master"}},"base":{"label":"OSVR:master","ref":"master","sha":"2fd1139ce9a9c9f2aa25e0aceb1856a756b5a1b6","user":{"login":"OSVR","id":10343613,"avatar_url":"https://avatars.githubusercontent.com/u/10343613?v=3","gravatar_id":"","url":"https://api.github.com/users/OSVR","html_url":"https://github.com/OSVR","followers_url":"https://api.github.com/users/OSVR/followers","following_url":"https://api.github.com/users/OSVR/following{/other_user}","gists_url":"https://api.github.com/users/OSVR/gists{/gist_id}","starred_url":"https://api.github.com/users/OSVR/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OSVR/subscriptions","organizations_url":"https://api.github.com/users/OSVR/orgs","repos_url":"https://api.github.com/users/OSVR/repos","events_url":"https://api.github.com/users/OSVR/events{/privacy}","received_events_url":"https://api.github.com/users/OSVR/received_events","type":"Organization","site_admin":false},"repo":{"id":25528375,"name":"OSVR-Core","full_name":"OSVR/OSVR-Core","owner":{"login":"OSVR","id":10343613,"avatar_url":"https://avatars.githubusercontent.com/u/10343613?v=3","gravatar_id":"","url":"https://api.github.com/users/OSVR","html_url":"https://github.com/OSVR","followers_url":"https://api.github.com/users/OSVR/followers","following_url":"https://api.github.com/users/OSVR/following{/other_user}","gists_url":"https://api.github.com/users/OSVR/gists{/gist_id}","starred_url":"https://api.github.com/users/OSVR/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OSVR/subscriptions","organizations_url":"https://api.github.com/users/OSVR/orgs","repos_url":"https://api.github.com/users/OSVR/repos","events_url":"https://api.github.com/users/OSVR/events{/privacy}","received_events_url":"https://api.github.com/users/OSVR/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/OSVR/OSVR-Core","description":"The core libraries, applications, and plugins of the OSVR software platform.","fork":false,"url":"https://api.github.com/repos/OSVR/OSVR-Core","forks_url":"https://api.github.com/repos/OSVR/OSVR-Core/forks","keys_url":"https://api.github.com/repos/OSVR/OSVR-Core/keys{/key_id}","collaborators_url":"https://api.github.com/repos/OSVR/OSVR-Core/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/OSVR/OSVR-Core/teams","hooks_url":"https://api.github.com/repos/OSVR/OSVR-Core/hooks","issue_events_url":"https://api.github.com/repos/OSVR/OSVR-Core/issues/events{/number}","events_url":"https://api.github.com/repos/OSVR/OSVR-Core/events","assignees_url":"https://api.github.com/repos/OSVR/OSVR-Core/assignees{/user}","branches_url":"https://api.github.com/repos/OSVR/OSVR-Core/branches{/branch}","tags_url":"https://api.github.com/repos/OSVR/OSVR-Core/tags","blobs_url":"https://api.github.com/repos/OSVR/OSVR-Core/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/OSVR/OSVR-Core/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/OSVR/OSVR-Core/git/refs{/sha}","trees_url":"https://api.github.com/repos/OSVR/OSVR-Core/git/trees{/sha}","statuses_url":"https://api.github.com/repos/OSVR/OSVR-Core/statuses/{sha}","languages_url":"https://api.github.com/repos/OSVR/OSVR-Core/languages","stargazers_url":"https://api.github.com/repos/OSVR/OSVR-Core/stargazers","contributors_url":"https://api.github.com/repos/OSVR/OSVR-Core/contributors","subscribers_url":"https://api.github.com/repos/OSVR/OSVR-Core/subscribers","subscription_url":"https://api.github.com/repos/OSVR/OSVR-Core/subscription","commits_url":"https://api.github.com/repos/OSVR/OSVR-Core/commits{/sha}","git_commits_url":"https://api.github.com/repos/OSVR/OSVR-Core/git/commits{/sha}","comments_url":"https://api.github.com/repos/OSVR/OSVR-Core/comments{/number}","issue_comment_url":"https://api.github.com/repos/OSVR/OSVR-Core/issues/comments{/number}","contents_url":"https://api.github.com/repos/OSVR/OSVR-Core/contents/{+path}","compare_url":"https://api.github.com/repos/OSVR/OSVR-Core/compare/{base}...{head}","merges_url":"https://api.github.com/repos/OSVR/OSVR-Core/merges","archive_url":"https://api.github.com/repos/OSVR/OSVR-Core/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/OSVR/OSVR-Core/downloads","issues_url":"https://api.github.com/repos/OSVR/OSVR-Core/issues{/number}","pulls_url":"https://api.github.com/repos/OSVR/OSVR-Core/pulls{/number}","milestones_url":"https://api.github.com/repos/OSVR/OSVR-Core/milestones{/number}","notifications_url":"https://api.github.com/repos/OSVR/OSVR-Core/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/OSVR/OSVR-Core/labels{/name}","releases_url":"https://api.github.com/repos/OSVR/OSVR-Core/releases{/id}","created_at":"2014-10-21T14:56:46Z","updated_at":"2015-08-11T18:17:15Z","pushed_at":"2015-08-27T19:33:54Z","git_url":"git://github.com/OSVR/OSVR-Core.git","ssh_url":"git@github.com:OSVR/OSVR-Core.git","clone_url":"https://github.com/OSVR/OSVR-Core.git","svn_url":"https://github.com/OSVR/OSVR-Core","homepage":"","size":14812,"stargazers_count":44,"watchers_count":44,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":11,"mirror_url":null,"open_issues_count":109,"forks":11,"open_issues":109,"watchers":44,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/OSVR/OSVR-Core/pulls/196"},"html":{"href":"https://github.com/OSVR/OSVR-Core/pull/196"},"issue":{"href":"https://api.github.com/repos/OSVR/OSVR-Core/issues/196"},"comments":{"href":"https://api.github.com/repos/OSVR/OSVR-Core/issues/196/comments"},"review_comments":{"href":"https://api.github.com/repos/OSVR/OSVR-Core/pulls/196/comments"},"review_comment":{"href":"https://api.github.com/repos/OSVR/OSVR-Core/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/OSVR/OSVR-Core/pulls/196/commits"},"statuses":{"href":"https://api.github.com/repos/OSVR/OSVR-Core/statuses/cdd725f68652170a6656fe62b24055eecc54b242"}}}}