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.

Sign up for GitHub

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

Jump to bottom

x265 4.1 #198642

Merged
merged 18 commits into from
Dec 27, 2024
Merged

x265 4.1 #198642

merged 18 commits into from
Dec 27, 2024
+63 −68

Conversation

BrewTestBot
Copy link
Member

Created by brew bump

Created with brew bump-formula-pr.

@github-actions github-actions bot added the bump-formula-pr PR was created using `brew bump-formula-pr` label Nov 22, 2024
@github-actions github-actions bot added the long build Set a long timeout for formula testing label Nov 22, 2024
@daeho-ro daeho-ro added the long dependent tests Set a long timeout for dependent testing label Nov 22, 2024
@daeho-ro
Copy link
Member

daeho-ro commented Nov 23, 2024 •
edited by chenrui333
Loading

for gstreamer

  gcc-11 -Isubprojects/gst-plugins-bad/ext/x265/libgstx265.so.p -Isubprojects/gst-plugins-bad/ext/x265 -I../subprojects/gst-plugins-bad/ext/x265 -Isubprojects/gst-plugins-bad -I../subprojects/gst-plugins-bad -Isubprojects/gst-plugins-base/gst-libs -I../subprojects/gst-plugins-base/gst-libs -Isubprojects/gstreamer/libs -I../subprojects/gstreamer/libs -Isubprojects/gstreamer -I../subprojects/gstreamer -Isubprojects/gst-plugins-base/gst-libs/gst/pbutils -Isubprojects/gst-plugins-base/gst-libs/gst/video -Isubprojects/gstreamer/libs/gst/base -Isubprojects/gstreamer/gst -Isubprojects/gst-plugins-base/gst-libs/gst/audio -Isubprojects/gst-plugins-base/gst-libs/gst/tag -I/home/linuxbrew/.linuxbrew/Cellar/glib/2.82.2/include/glib-2.0 -I/home/linuxbrew/.linuxbrew/Cellar/glib/2.82.2/lib/glib-2.0/include -I/home/linuxbrew/.linuxbrew/Cellar/pcre2/10.44/include -I/home/linuxbrew/.linuxbrew/Cellar/glib/2.82.2/include -I/home/linuxbrew/.linuxbrew/Cellar/libffi/3.4.6/include -I/home/linuxbrew/.linuxbrew/Cellar/orc/0.4.40/include/orc-0.4 -I/home/linuxbrew/.linuxbrew/opt/zlib/include -I/home/linuxbrew/.linuxbrew/Cellar/x265/4.1/include -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -O3 -fvisibility=hidden -fno-strict-aliasing -DG_DISABLE_CAST_CHECKS -Wmissing-prototypes -Wold-style-definition -Wmissing-declarations -Wredundant-decls -Wwrite-strings -Wformat -Wformat-security -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar -Wvla -Wpointer-arith -fPIC -pthread -DHAVE_CONFIG_H -MD -MQ subprojects/gst-plugins-bad/ext/x265/libgstx265.so.p/gstx265enc.c.o -MF subprojects/gst-plugins-bad/ext/x265/libgstx265.so.p/gstx265enc.c.o.d -o subprojects/gst-plugins-bad/ext/x265/libgstx265.so.p/gstx265enc.c.o -c ../subprojects/gst-plugins-bad/ext/x265/gstx265enc.c
  ../subprojects/gst-plugins-bad/ext/x265/gstx265enc.c: In function ‘gst_x265_enc_init_encoder_locked’:
  ../subprojects/gst-plugins-bad/ext/x265/gstx265enc.c:951:54: error: assignment to expression with array type
    951 |       encoder->x265param.masteringDisplayColorVolume =
        |

@chenrui333 chenrui333 added the CI-no-fail-fast Continue CI tests despite failing GitHub Actions matrix builds. label Nov 23, 2024
@chenrui333
Copy link
Member

for gstreamer

  gcc-11 -Isubprojects/gst-plugins-bad/ext/x265/libgstx265.so.p -Isubprojects/gst-plugins-bad/ext/x265 -I../subprojects/gst-plugins-bad/ext/x265 -Isubprojects/gst-plugins-bad -I../subprojects/gst-plugins-bad -Isubprojects/gst-plugins-base/gst-libs -I../subprojects/gst-plugins-base/gst-libs -Isubprojects/gstreamer/libs -I../subprojects/gstreamer/libs -Isubprojects/gstreamer -I../subprojects/gstreamer -Isubprojects/gst-plugins-base/gst-libs/gst/pbutils -Isubprojects/gst-plugins-base/gst-libs/gst/video -Isubprojects/gstreamer/libs/gst/base -Isubprojects/gstreamer/gst -Isubprojects/gst-plugins-base/gst-libs/gst/audio -Isubprojects/gst-plugins-base/gst-libs/gst/tag -I/home/linuxbrew/.linuxbrew/Cellar/glib/2.82.2/include/glib-2.0 -I/home/linuxbrew/.linuxbrew/Cellar/glib/2.82.2/lib/glib-2.0/include -I/home/linuxbrew/.linuxbrew/Cellar/pcre2/10.44/include -I/home/linuxbrew/.linuxbrew/Cellar/glib/2.82.2/include -I/home/linuxbrew/.linuxbrew/Cellar/libffi/3.4.6/include -I/home/linuxbrew/.linuxbrew/Cellar/orc/0.4.40/include/orc-0.4 -I/home/linuxbrew/.linuxbrew/opt/zlib/include -I/home/linuxbrew/.linuxbrew/Cellar/x265/4.1/include -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -O3 -fvisibility=hidden -fno-strict-aliasing -DG_DISABLE_CAST_CHECKS -Wmissing-prototypes -Wold-style-definition -Wmissing-declarations -Wredundant-decls -Wwrite-strings -Wformat -Wformat-security -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar -Wvla -Wpointer-arith -fPIC -pthread -DHAVE_CONFIG_H -MD -MQ subprojects/gst-plugins-bad/ext/x265/libgstx265.so.p/gstx265enc.c.o -MF subprojects/gst-plugins-bad/ext/x265/libgstx265.so.p/gstx265enc.c.o.d -o subprojects/gst-plugins-bad/ext/x265/libgstx265.so.p/gstx265enc.c.o -c ../subprojects/gst-plugins-bad/ext/x265/gstx265enc.c
  ../subprojects/gst-plugins-bad/ext/x265/gstx265enc.c: In function ‘gst_x265_enc_init_encoder_locked’:
  ../subprojects/gst-plugins-bad/ext/x265/gstx265enc.c:951:54: error: assignment to expression with array type
    951 |       encoder->x265param.masteringDisplayColorVolume =
        |

upstream patch, https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7948

chenrui333
chenrui333 reviewed Nov 23, 2024
View reviewed changes
Formula/f/fceux.rb Outdated Show resolved Hide resolved
@chenrui333 chenrui333 added the in progress Stale bot should stay away label Nov 25, 2024
@daeho-ro
Copy link
Member

Even after the patch,

  /tmp/fceux-20241124-58802-lwax2l/src/drivers/Qt/AviRecord.cpp:467:8: error: no matching function for call to 'x265_encoder_encode'
    467 |         ret = x265_encoder_encode( hdl, &nal, &i_nal, pic, pics );
        |               ^~~~~~~~~~~~~~~~~~~
  /opt/homebrew/Cellar/x265/4.1/include/x265.h:2513:5: note: candidate function not viable: no known conversion from 'x265_picture *[1]' to 'x265_picture *' for 5th argument
   2513 | int x265_encoder_encode(x265_encoder* encoder, x265_nal** pp_nal, uint32_t* pi_nal, x265_picture* pic_in, x265_picture* pic_out);
        |     ^                                                                                                     ~~~~~~~~~~~~~~~~~~~~~
  /tmp/fceux-20241124-58802-lwax2l/src/drivers/Qt/AviRecord.cpp:507:12: error: no matching function for call to 'x265_encoder_encode'
    507 |             ret = x265_encoder_encode( hdl, &nal, &i_nal, pic, pics );
        |                   ^~~~~~~~~~~~~~~~~~~
  /opt/homebrew/Cellar/x265/4.1/include/x265.h:2513:5: note: candidate function not viable: no known conversion from 'x265_picture *[1]' to 'x265_picture *' for 5th argument
   2513 | int x265_encoder_encode(x265_encoder* encoder, x265_nal** pp_nal, uint32_t* pi_nal, x265_picture* pic_in, x265_picture* pic_out);
        |     ^                                                                                                     ~~~~~~~~~~~~~~~~~~~~~

chenrui333
chenrui333 reviewed Dec 27, 2024
View reviewed changes
Formula/x/x265.rb Outdated Show resolved Hide resolved
@chenrui333 chenrui333 mentioned this pull request Dec 27, 2024
Open
BrewTestBot and others added 7 commits December 26, 2024 23:29
@BrewTestBot @chenrui333
x265 4.1
b53abab 
x265: update sha

Signed-off-by: Rui Chen <rui@chenrui.dev>
@daeho-ro @chenrui333
fceux: revision bump (x265 4.1)
70acfd3 
fceux: remove x265 4.x build patch

x265 4.1 has reverted the x265_encoder_encode api change in https://bitbucket.org/multicoreware/x265_git/commits/78e5b703b186fe184bf91bb37df82f64059b3f61 per 4.1 release, thus the patch is no longer needed, hence reverting for now. (previous 4.0 API change commit, https://bitbucket.org/multicoreware/x265_git/commits/c69c113960834400545bc4bce2830ff51dcb86b3)

Signed-off-by: Rui Chen <rui@chenrui.dev>
@daeho-ro @chenrui333
ffmpeg: revision bump (x265 4.1)
7afcf9d
@daeho-ro @chenrui333
ffmpeg@2.8: revision bump (x265 4.1)
86bb81a
@daeho-ro @chenrui333
ffmpeg@4: revision bump (x265 4.1)
e9eddc0
@daeho-ro @chenrui333
ffmpeg@5: revision bump (x265 4.1)
8ed386b
@daeho-ro @chenrui333
ffmpeg@6: revision bump (x265 4.1)
d369366
@chenrui333 chenrui333 added CI-no-bottle-cache Disable bottle cache ready to merge PR can be merged once CI is green labels Dec 27, 2024
@github-actions GitHub Actions
Copy link
Contributor

🤖 An automated task has requested bottles to be published to this PR.

@github-actions github-actions bot added the CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. label Dec 27, 2024
@BrewTestBot BrewTestBot added this pull request to the merge queue Dec 27, 2024
Merged via the queue into master with commit 1440398 Dec 27, 2024
15 checks passed
@BrewTestBot BrewTestBot deleted the bump-x265-4.1 branch December 27, 2024 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chenrui333 chenrui333 chenrui333 left review comments

@github-actions github-actions[bot] github-actions[bot] approved these changes

@bevanjkay bevanjkay bevanjkay approved these changes

@iMichka iMichka iMichka approved these changes

Assignees
No one assigned
Labels
bump-formula-pr PR was created using `brew bump-formula-pr` CI-no-bottle-cache Disable bottle cache CI-no-fail-fast Continue CI tests despite failing GitHub Actions matrix builds. CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. in progress Stale bot should stay away long build Set a long timeout for formula testing long dependent tests Set a long timeout for dependent testing ready to merge PR can be merged once CI is green
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@BrewTestBot @daeho-ro @chenrui333 @iMichka @bevanjkay