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

x264: 20170731-2245 -> 20190517-2245; add myself as maintainer #61683

Merged
merged 1 commit into from May 22, 2019

Conversation

tadeokondrak
Copy link
Member

  • yasm has been replaced by nasm

  • both 10-bit and 8-bit are in the same binary now

  • patchPhase replaced with postPatch to allow patching with overrides

  • enableParallelBuilding enabled, long build and doesn't seem to cause
    issues

  • dev output added

Motivation for this change

Was using this, noticed it hadn't been updated in a long time.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@tadeokondrak
Copy link
Member Author

Should this go into staging?

@c0bw3b
Copy link
Contributor

c0bw3b commented May 19, 2019

Should this go into staging?

It's ok for master

@GrahamcOfBorg build handbrake
@GrahamcOfBorg test handbrake

@c0bw3b
Copy link
Contributor

c0bw3b commented May 19, 2019

ofBorg built and tested ffmpeg + handbrake ☑️

Tested some more reverse-deps on my end:
Result of nix-review pr 61683 1

3 package were build:
  • opal (adoptopenjdk-hotspot-bin-11 ,adoptopenjdk-jre-hotspot-bin-11 ,amarok-kf5 ,bitwig-studio2 ,ffmpeg_2_8 ,ffmpeg_3 ,ffmpeg_3_4 ,freerdpUnstable ,gnome3.empathy ,gnome3.epiphany ,gnome3.evince ,gnome3.gnome-tweak-tool ,gnome3.gnome_control_center ,gnome3.gnome_session ,gnome3.gnome_shell ,gnome3.gnome_terminal ,kdeApplications.dolphin ,kdeApplications.dragon ,kdeApplications.ffmpegthumbs ,kdeApplications.gwenview ,kdeApplications.k3b ,kdeApplications.kdenlive ,kdeApplications.kfind ,kdeApplications.krdc ,kdeFrameworks.baloo ,kdeFrameworks.kfilemetadata ,libsForQt512.baloo ,libsForQt512.kfilemetadata ,libsForQt512.khotkeys ,libsForQt512.libopenshot ,libsForQt512.libqtav ,libsForQt512.mlt ,libsForQt512.phonon-backend-gstreamer ,libsForQt512.phonon-backend-vlc ,libsForQt512.telepathy ,libsForQt512.vlc ,plasma5.kde-cli-tools ,plasma5.kdeplasma-addons ,libsForQt5.khotkeys ,plasma5.kmenuedit ,plasma5.plasma-desktop ,plasma5.plasma-workspace ,plasma5.powerdevil ,gnome3.rhythmbox ,plasma5.systemsettings ,libsForQt5.vlc ,vlc_qt5 ,winePackages.full ,plasma5.xdg-desktop-portal-kde ,xfce4-12.parole ,xfceUnstable.tumbler ,python37Packages.youtube-dl)
  • transcode (adoptopenjdk-hotspot-bin-11 ,adoptopenjdk-jre-hotspot-bin-11 ,amarok-kf5 ,bitwig-studio2 ,ffmpeg_2_8 ,ffmpeg_3 ,ffmpeg_3_4 ,freerdpUnstable ,gnome3.empathy ,gnome3.epiphany ,gnome3.evince ,gnome3.gnome-tweak-tool ,gnome3.gnome_control_center ,gnome3.gnome_session ,gnome3.gnome_shell ,gnome3.gnome_terminal ,kdeApplications.dolphin ,kdeApplications.dragon ,kdeApplications.ffmpegthumbs ,kdeApplications.gwenview ,kdeApplications.k3b ,kdeApplications.kdenlive ,kdeApplications.kfind ,kdeApplications.krdc ,kdeFrameworks.baloo ,kdeFrameworks.kfilemetadata ,libsForQt512.baloo ,libsForQt512.kfilemetadata ,libsForQt512.khotkeys ,libsForQt512.libopenshot ,libsForQt512.libqtav ,libsForQt512.mlt ,libsForQt512.phonon-backend-gstreamer ,libsForQt512.phonon-backend-vlc ,libsForQt512.telepathy ,libsForQt512.vlc ,plasma5.kde-cli-tools ,plasma5.kdeplasma-addons ,libsForQt5.khotkeys ,plasma5.kmenuedit ,plasma5.plasma-desktop ,plasma5.plasma-workspace ,plasma5.powerdevil ,gnome3.rhythmbox ,plasma5.systemsettings ,libsForQt5.vlc ,vlc_qt5 ,winePackages.full ,plasma5.xdg-desktop-portal-kde ,xfce4-12.parole ,xfceUnstable.tumbler ,python37Packages.youtube-dl)
  • x264 (adoptopenjdk-hotspot-bin-11 ,adoptopenjdk-jre-hotspot-bin-11 ,amarok-kf5 ,bitwig-studio2 ,ffmpeg_2_8 ,ffmpeg_3 ,ffmpeg_3_4 ,freerdpUnstable ,gnome3.empathy ,gnome3.epiphany ,gnome3.evince ,gnome3.gnome-tweak-tool ,gnome3.gnome_control_center ,gnome3.gnome_session ,gnome3.gnome_shell ,gnome3.gnome_terminal ,kdeApplications.dolphin ,kdeApplications.dragon ,kdeApplications.ffmpegthumbs ,kdeApplications.gwenview ,kdeApplications.k3b ,kdeApplications.kdenlive ,kdeApplications.kfind ,kdeApplications.krdc ,kdeFrameworks.baloo ,kdeFrameworks.kfilemetadata ,libsForQt512.baloo ,libsForQt512.kfilemetadata ,libsForQt512.khotkeys ,libsForQt512.libopenshot ,libsForQt512.libqtav ,libsForQt512.mlt ,libsForQt512.phonon-backend-gstreamer ,libsForQt512.phonon-backend-vlc ,libsForQt512.telepathy ,libsForQt512.vlc ,plasma5.kde-cli-tools ,plasma5.kdeplasma-addons ,libsForQt5.khotkeys ,plasma5.kmenuedit ,plasma5.plasma-desktop ,plasma5.plasma-workspace ,plasma5.powerdevil ,gnome3.rhythmbox ,plasma5.systemsettings ,libsForQt5.vlc ,vlc_qt5 ,winePackages.full ,plasma5.xdg-desktop-portal-kde ,xfce4-12.parole ,xfceUnstable.tumbler ,python37Packages.youtube-dl)

So LGTM apart from nasm location

- yasm has been replaced by nasm
- both 10-bit and 8-bit are in the same binary now

- patchPhase replaced with postPatch to allow patching with overrides
- enableParallelBuilding enabled, long build and doesn't seem to cause
issues
- dev output added
@c0bw3b c0bw3b merged commit 3e59b87 into NixOS:master May 22, 2019
@jlesquembre jlesquembre mentioned this pull request May 24, 2019
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants