public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome3.rygel: 0.38.4 -> 0.40.0

Browse Source 
* add gst_all_1.gst-editing-services dependency
This commit is contained in:
Piotr Bogdan 2020-09-18 16:16:17 +01:00 committed by Jan Tojnar
parent 733aebb1c6
commit b08184bbc1
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch
View File

@ -1,5 +1,5 @@
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 209d4187..58580980 100644 index 4aa683d6..a930d533 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -20,7 +20,11 @@ if not get_option('uninstalled') @@ -20,7 +20,11 @@ if not get_option('uninstalled')
@ -14,7 +14,7 @@ index 209d4187..58580980 100644
+ endif + endif
rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins') rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins')
rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines') rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines')
rygel_presetdir = join_paths(rygel_datadir, 'rygel', 'presets') rygel_presetdir = join_paths(rygel_datadir, 'presets')
@@ -55,7 +59,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir) @@ -55,7 +59,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir)
conf.set_quoted('PLUGIN_DIR', rygel_plugindir) conf.set_quoted('PLUGIN_DIR', rygel_plugindir)
conf.set_quoted('BIG_ICON_DIR', rygel_bigicondir) conf.set_quoted('BIG_ICON_DIR', rygel_bigicondir)
@ -25,7 +25,7 @@ index 209d4187..58580980 100644
conf.set_quoted('MX_EXTRACT_PATH', join_paths(rygel_libexecdir, 'mx-extract')) conf.set_quoted('MX_EXTRACT_PATH', join_paths(rygel_libexecdir, 'mx-extract'))
conf.set_quoted('DESKTOP_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'applications')) conf.set_quoted('DESKTOP_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'applications'))
diff --git a/meson_options.txt b/meson_options.txt diff --git a/meson_options.txt b/meson_options.txt
index f09cac58..ff11c548 100644 index cb604c4e..1b049b77 100644
--- a/meson_options.txt --- a/meson_options.txt
+++ b/meson_options.txt +++ b/meson_options.txt
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
@ -33,6 +33,6 @@ index f09cac58..ff11c548 100644
option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation') option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation')
option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path') option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path')
+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') +option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker']) option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3'])
option('engines', type : 'array', choices : ['simple', 'gstreamer']) option('engines', type : 'array', choices : ['simple', 'gstreamer'])
option('examples', type : 'boolean', value : 'true') option('examples', type : 'boolean', value : 'true')

7
pkgs/desktops/gnome-3/core/rygel/default.nix
View File

@ -28,14 +28,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rygel"; pname = "rygel";
version = "0.38.4"; version = "0.40.0";
# TODO: split out lib # TODO: split out lib
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0rm1m1z8rcvyj9873wqcz5i3qdg8j6gv6k1p01xifk0y9phg7rzc"; sha256 = "0xrbdsgm78h3g4qcvq2p8k70q31x9xdbb35bixz36q6h9s1wqznn";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
shared-mime-info shared-mime-info
] ++ (with gst_all_1; [ ] ++ (with gst_all_1; [
gstreamer gstreamer
gst-editing-services
gst-plugins-base gst-plugins-base
gst-plugins-good gst-plugins-good
gst-plugins-bad gst-plugins-bad
@ -77,6 +78,8 @@ stdenv.mkDerivation rec {
"-Dapi-docs=false" "-Dapi-docs=false"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc" "-Dsysconfdir_install=${placeholder "out"}/etc"
# Build all plug-ins except for tracker 2
"-Dplugins=external,gst-launch,lms,media-export,mpris,playbin,ruih,tracker3"
]; ];
doCheck = true; doCheck = true;