[vcpkg-ci-ffmpeg] remove tensorflow feature from dependencies by strega-nil-ms · Pull Request #23857 · microsoft/vcpkg

strega-nil-ms · 2022-03-29T20:46:26Z

This means that ffmpeg actually gets built

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
index 8b7f00e..eecd580 100644
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@@ -33,7 +33,10 @@
         {
           "name": "ffmpeg",
           "default-features": false,
-          "features": [ "all-ci", "tensorflow" ]
+          "features": [
+            "all-ci",
+            "tensorflow"
+          ]
         }
       ]
     },
@@ -197,7 +200,10 @@
         {
           "name": "ffmpeg",
           "default-features": false,
-          "features": ["all-gpl-ci", "tensorflow"]
+          "features": [
+            "all-gpl-ci",
+            "tensorflow"
+          ]
         }
       ]
     },
@@ -245,7 +251,10 @@
         {
           "name": "ffmpeg",
           "default-features": false,
-          "features": [ "all-nonfree-ci", "tensorflow" ]
+          "features": [
+            "all-nonfree-ci",
+            "tensorflow"
+          ]
         }
       ]
     },

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 773516ecf6014d89cc69b11bb54605ad4be56694 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 316e85c..7ce4828 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2178,7 +2178,7 @@
     },
     "ffmpeg": {
       "baseline": "4.4.1",
-      "port-version": 10
+      "port-version": 11
     },
     "ffnvcodec": {
       "baseline": "11.1.5.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 0ca6708..f4720d4 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7d3ab45dbe43a3c17ed25445fe06cf29ba3f71ba",
+      "version": "4.4.1",
+      "port-version": 11
+    },
     {
       "git-tree": "d525f98e7146a1fd731febe7c472232142d62821",
       "version": "4.4.1",

You have modified or added at least one vcpkg.json where a "license" field is missing.

Details

If you feel able to do so, please consider adding a "license" field to the following files:

scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

Details

If you feel able to do so, please consider adding a "license" field to the following files:

scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json

Valid values for the license field can be found in the documentation

Neumann-A · 2022-03-29T20:51:44Z

Hmm I would rather like to see vcpkg-ci-ffmpeg to be modified instead of the ffmpeg port.

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

Details

If you feel able to do so, please consider adding a "license" field to the following files:

scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json

Valid values for the license field can be found in the documentation

vcpkg-ci-ffmpeg -> ffmpeg[all-nonfree] -> ffmpeg[tensorflow]

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

Details

If you feel able to do so, please consider adding a "license" field to the following files:

scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json

Valid values for the license field can be found in the documentation

ras0219-msft · 2022-03-29T21:57:40Z

scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json

    {
      "name": "ffmpeg",
+      "default-features": false
+    },


Suggested change

{

"name": "ffmpeg",

"default-features": false

},

This is implied by the second dependency item

ah, this was an issue left behind by a different change.

ras0219-msft

LGTM assuming it fixes the problem

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

Details

If you feel able to do so, please consider adding a "license" field to the following files:

scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json

Valid values for the license field can be found in the documentation

strega-nil-ms · 2022-03-30T20:44:06Z

vcpkg-ci-ffmpeg:x64-windows: SUCCEEDED: 136.5 ms

strega-nil-ms mentioned this pull request Mar 29, 2022

Dont clober cmake program path #23755

Merged

github-actions bot requested changes Mar 29, 2022

View reviewed changes

strega-nil-ms force-pushed the ffmpeg-ci branch from 745afc2 to c6612a0 Compare March 29, 2022 20:48

github-actions bot approved these changes Mar 29, 2022

View reviewed changes

strega-nil-ms force-pushed the ffmpeg-ci branch from c6612a0 to 73fd564 Compare March 29, 2022 21:33

github-actions bot approved these changes Mar 29, 2022

View reviewed changes

[ci] stop ffmpeg depending on tensorflow

fd5310c

vcpkg-ci-ffmpeg -> ffmpeg[all-nonfree] -> ffmpeg[tensorflow]

strega-nil-ms force-pushed the ffmpeg-ci branch from 73fd564 to fd5310c Compare March 29, 2022 21:35

github-actions bot approved these changes Mar 29, 2022

View reviewed changes

ras0219-msft reviewed Mar 29, 2022

View reviewed changes

ras0219-msft approved these changes Mar 29, 2022

View reviewed changes

JonLiu1993 assigned JackBoosY Mar 30, 2022

JackBoosY added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:internal labels Mar 30, 2022

Robert CRs

9872e08

github-actions bot approved these changes Mar 30, 2022

View reviewed changes

strega-nil-ms changed the title ~~[ffmpeg] remove tensorflow from dependencies in ci~~ [vcpkg-ci-ffmpeg] remove tensorflow feature from dependencies Mar 30, 2022

strega-nil-ms merged commit 3048b9a into microsoft:master Mar 30, 2022

strega-nil deleted the ffmpeg-ci branch March 31, 2025 16:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[vcpkg-ci-ffmpeg] remove tensorflow feature from dependencies#23857

[vcpkg-ci-ffmpeg] remove tensorflow feature from dependencies#23857
strega-nil-ms merged 2 commits intomicrosoft:masterfrom
strega-nil:ffmpeg-ci

strega-nil-ms commented Mar 29, 2022

Uh oh!

github-actions bot left a comment

Uh oh!

github-actions bot left a comment

Uh oh!

Neumann-A commented Mar 29, 2022

Uh oh!

github-actions bot left a comment

Uh oh!

github-actions bot left a comment

Uh oh!

ras0219-msft Mar 29, 2022

Uh oh!

strega-nil-ms Mar 30, 2022

Uh oh!

ras0219-msft left a comment

Uh oh!

github-actions bot left a comment

Uh oh!

strega-nil-ms commented Mar 30, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

strega-nil-ms commented Mar 29, 2022

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Neumann-A commented Mar 29, 2022

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

ras0219-msft Mar 29, 2022

Choose a reason for hiding this comment

Uh oh!

strega-nil-ms Mar 30, 2022

Choose a reason for hiding this comment

Uh oh!

ras0219-msft left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

strega-nil-ms commented Mar 30, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants