Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8247947: Build DirectShow Samples (Base Classes) from source checked into repo #254

Closed
wants to merge 2 commits into from

Conversation

@sashamatveev
Copy link
Member

@sashamatveev sashamatveev commented Jun 25, 2020

  • Added DirectShow baseclasses to repository.
  • Dependency on Windows SDK 7.1 DirectShow baseclasses was removed.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8247947: Build DirectShow Samples (Base Classes) from source checked into repo

Reviewers

  • Kevin Rushforth (kcr - Reviewer)
  • Ambarish Rapte (arapte - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jfx pull/254/head:pull/254
$ git checkout pull/254

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 25, 2020

👋 Welcome back almatvee! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Jun 25, 2020

/reviewers 2

@openjdk
Copy link

@openjdk openjdk bot commented Jun 25, 2020

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

@openjdk openjdk bot added the rfr label Jun 25, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 26, 2020

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks good. I was able to do a build and test with the patch applied. I confirm that it now builds without needing C:/Program Files/Microsoft SDKs/Windows/v7.1.

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Jun 26, 2020

@arapte can you be the second reviewer on this?

@johanvos @tiainen FYI, in case you want to take a look as well: It's a straight-forward build change with no changes other than the location of the Microsoft DirectShow samples (Base Classes), which are now in the repo. No more external dependency on Windows 7.1 SDK.

arapte
arapte approved these changes Jun 30, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Jun 30, 2020

@sashamatveev This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

8247947: Build DirectShow Samples (Base Classes) from source checked into repo

Reviewed-by: kcr, arapte
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there have been 4 commits pushed to the master branch:

  • 527cc2b: 8248551: [TestBug] Ignore two failing FXML unit tests which use Nashorn script engine
  • 45c9854: 8238080: FXMLLoader: if script engines implement javax.script.Compilable compile scripts
  • 15f97ed: 8240264: iOS: Unnecessary logging on every pulse when GL context changes
  • 2ca509a: 8193800: TreeTableView selection changes on sorting

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 527cc2b074efb83f8a4031e754626e1d6dafac4d.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jun 30, 2020
@sashamatveev
Copy link
Member Author

@sashamatveev sashamatveev commented Jun 30, 2020

/integrate

@openjdk openjdk bot closed this Jun 30, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Jun 30, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Jun 30, 2020

@sashamatveev The following commits have been pushed to master since your change was applied:

  • 527cc2b: 8248551: [TestBug] Ignore two failing FXML unit tests which use Nashorn script engine
  • 45c9854: 8238080: FXMLLoader: if script engines implement javax.script.Compilable compile scripts
  • 15f97ed: 8240264: iOS: Unnecessary logging on every pulse when GL context changes
  • 2ca509a: 8193800: TreeTableView selection changes on sorting

Your commit was automatically rebased without conflicts.

Pushed as commit 62f8cee.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants