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
Updates gstreamer and plugins to 1.14.0 #38149
Conversation
While at it, could you please also try to port the packages to meson as per #32803? |
postInstall = '' | ||
for prog in "$dev/bin/"*; do | ||
wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" | ||
done | ||
''; | ||
|
||
preConfigure= '' | ||
configureFlagsArray+=("--exec-prefix=$dev") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will not be used with meson, so you can just remove it. Actually, it does not seem to do anything even with autotools.
]; | ||
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices; | ||
buildInputs = [ libcap libunwind ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices; | ||
|
||
propagatedBuildInputs = [ glib ]; | ||
|
||
enableParallelBuilding = true; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This can be removed as well, meson does this by default.
@jtojnar I ported everything to meson :) |
@@ -3,7 +3,7 @@ pkgconf = configuration_data() | ||
pkgconf.set('prefix', join_paths(get_option('prefix'))) | ||
pkgconf.set('exec_prefix', '${prefix}') | ||
pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The libdir
needs the same fix as includedir
.
@@ -3,7 +3,7 @@ pkgconf = configuration_data() | ||
pkgconf.set('prefix', get_option('prefix')) | ||
pkgconf.set('exec_prefix', '${prefix}') | ||
pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The libdir
needs the same fix as includedir
.
outputs = [ "out" "dev" ]; | ||
outputBin = "dev"; | ||
|
||
nativeBuildInputs = [ | ||
pkgconfig perl bison flex python gobjectIntrospection makeWrapper | ||
meson ninja pkgconfig gettext bison flex python3 makeWrapper valgrind gtk3 gsl |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why id gtk3 in nativeBuildInputs
? If it is for tests, could you please add a comment?
@@ -3,7 +3,7 @@ pkgconf = configuration_data() | ||
pkgconf.set('prefix', join_paths(get_option('prefix'))) | ||
pkgconf.set('exec_prefix', '${prefix}') | ||
pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The libdir
needs the same fix as includedir
.
@@ -3,7 +3,7 @@ pkgconf = configuration_data() | ||
pkgconf.set('prefix', get_option('prefix')) | ||
pkgconf.set('exec_prefix', '${prefix}') | ||
pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The libdir
needs the same fix as includedir
.
}; | ||
|
||
outputs = [ "out" "dev" ]; | ||
|
||
nativeBuildInputs = [ pkgconfig python ]; | ||
nativeBuildInputs = [ meson ninja pkgconfig python ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gettext
is missing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why isn't gettext
and ninja
automatically propagated by meson? But I will add it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not every project uses i18n. And ninja is not needed for meson to work, you can use other builders.
}; | ||
|
||
outputs = [ "out" "dev" ]; | ||
|
||
nativeBuildInputs = [ | ||
pkgconfig python gobjectIntrospection | ||
pkgconfig python meson ninja |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gettext
is missing.
}; | ||
|
||
outputs = [ "out" "dev" ]; | ||
|
||
nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are you removing gobjectIntrospection
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
}; | ||
|
||
outputs = [ "out" "dev" ]; | ||
|
||
nativeBuildInputs = [ pkgconfig ]; | ||
nativeBuildInputs = [ meson ninja pkgconfig ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gobjectIntrospection
is missing.
}; | ||
|
||
outputs = [ "out" "dev" ]; | ||
|
||
nativeBuildInputs = [ pkgconfig python ]; | ||
nativeBuildInputs = [ meson ninja pkgconfig python ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gettext
is missing.
You might also want to update |
Opened an issue about gst-validate lacking meson support: https://bugzilla.gnome.org/show_bug.cgi?id=794871 |
@jtojnar I think I'm ready now. Regarding |
pkgconf.set('exec_prefix', '${prefix}') | ||
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) | ||
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) | ||
+pkgconf.set('libdir', get_option('libdir')) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs to be absolute. Use join_paths(get_option('prefix'), get_option('ilibdir'))
.
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) | ||
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) | ||
+pkgconf.set('libdir', get_option('libdir')) | ||
+pkgconf.set('includedir', get_option('includedir')) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This probably too, though it works as long we use multiple outputs.
I am getting the following error when building
|
pkgconf.set('exec_prefix', '${prefix}') | ||
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) | ||
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) | ||
+pkgconf.set('libdir', get_option('libdir')) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This path being non-absolute is causing the webkitgtk failure, most likely.
And for some reason |
Yeah, maybe we should open a bug, if the files are not installed anymore. |
@bkchr the patch I sent on IRC yesterday worked for me, did you try it? |
No I did not try. Should I test and push or do you want to push it to my pull request? |
If you can, please. |
@jtojnar I think this error occurs, because I don't have any gnome services running. (I'm using KDE) |
I tested it and it starts fine. I cannot play MP3 files, however:
Maybe something to do with the move of MP3 codecs to You can also test with |
A bug about the But |
But mp3 is not working with |
I think that is most likely caused by the move as mentioned above. That should be fixed. |
@jtojnar |
@jtojnar corebird now also works. I'm gone through the list of moved things and fixed everything so far. |
Great job, thanks. |
Please check on staging |
@FRidh I rebased |
@bkchr To run |
Ahh, ty :) |
@bkchr I meant to check the expressions. There was a merge conflict when merging staging and master, so I'm not quite sure the changes you intended survived. |
Motivation for this change
Things done
build-use-sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)