Skip to content

xvidcore: fix build with gcc15, cleanup#446034

Merged
fabianhjr merged 2 commits into
NixOS:stagingfrom
ghpzin:pr-xvidcore-gcc15
Dec 1, 2025
Merged

xvidcore: fix build with gcc15, cleanup#446034
fabianhjr merged 2 commits into
NixOS:stagingfrom
ghpzin:pr-xvidcore-gcc15

Conversation

@ghpzin

@ghpzin ghpzin commented Sep 25, 2025

Copy link
Copy Markdown
Contributor

xvidcore: fix build with gcc15

  • add patch from fedora

Fixes build failure with gcc15:

In file included from ../../src/bitstream/bitstream.h:31,
                 from ../../src/decoder.c:40:
../../src/bitstream/../encoder.h:45:13: error: 'bool' cannot be defined via 'typedef'
   45 | typedef int bool;
      |             ^~~~
../../src/bitstream/../encoder.h:45:13: note: 'bool' is a keyword with '-std=c23' onwards
../../src/bitstream/../encoder.h:45:1: warning: useless type name in empty declaration
   45 | typedef int bool;
      | ^~~~~~~

xvidcore: cleanup

  • replace rec with finalAttrs
  • remove with lib; from meta
  • replace sha256 with hash
    nix hash to-sri --type sha256 "1xyg3amgg27zf7188kss7y248s0xhh1vv8rrk0j9bcsd5nasxsmf"
    sha256-ruqulS1Ns5UkmDmjvQOEHWhEhD9aT4TCcf+I96oaz/c=

Tested build with:

nix-build --expr 'with import ./. {}; xvidcore.override { stdenv = gcc15Stdenv; }'

Part of fixes for gcc15 update:
#440456

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Sep 25, 2025
@ghpzin ghpzin changed the base branch from master to staging September 25, 2025 13:30
@nixpkgs-ci nixpkgs-ci Bot closed this Sep 25, 2025
@nixpkgs-ci nixpkgs-ci Bot reopened this Sep 25, 2025
- add patch from fedora

Fixes build failure with gcc15:
```
In file included from ../../src/bitstream/bitstream.h:31,
                 from ../../src/decoder.c:40:
../../src/bitstream/../encoder.h:45:13: error: 'bool' cannot be defined via 'typedef'
   45 | typedef int bool;
      |             ^~~~
../../src/bitstream/../encoder.h:45:13: note: 'bool' is a keyword with '-std=c23' onwards
../../src/bitstream/../encoder.h:45:1: warning: useless type name in empty declaration
   45 | typedef int bool;
      | ^~~~~~~
```
- replace `rec` with `finalAttrs`
- remove `with lib;` from `meta`
- replace `sha256` with `hash`
nix hash to-sri --type sha256 "1xyg3amgg27zf7188kss7y248s0xhh1vv8rrk0j9bcsd5nasxsmf"
sha256-ruqulS1Ns5UkmDmjvQOEHWhEhD9aT4TCcf+I96oaz/c=
@ghpzin ghpzin marked this pull request as ready for review September 25, 2025 14:19
@nix-owners nix-owners Bot requested review from codyopel and lovek323 September 25, 2025 14:20
@fabianhjr

Copy link
Copy Markdown
Member

Was able to build xvidcore from this branch and gcc-15

@fabianhjr fabianhjr added this pull request to the merge queue Dec 1, 2025
@fabianhjr fabianhjr mentioned this pull request Dec 1, 2025
13 tasks
Merged via the queue into NixOS:staging with commit 967cf3e Dec 1, 2025
34 checks passed
@ghpzin ghpzin deleted the pr-xvidcore-gcc15 branch December 1, 2025 05:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants