gst-plugins-good: Switch to meson build system
This commit is contained in:
parent
edd17a0cab
commit
fd0474e6f8
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, python
|
{ stdenv, fetchurl, meson, ninja, pkgconfig, python
|
||||||
, gst-plugins-base, orc, bzip2
|
, gst-plugins-base, orc, bzip2, gettext
|
||||||
, libv4l, libdv, libavc1394, libiec61883
|
, libv4l, libdv, libavc1394, libiec61883
|
||||||
, libvpx, speex, flac, taglib, libshout
|
, libvpx, speex, flac, taglib, libshout
|
||||||
, cairo, gdk_pixbuf, aalib, libcaca
|
, cairo, gdk_pixbuf, aalib, libcaca
|
||||||
@ -32,7 +32,9 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig python ];
|
patches = [ ./fix_pkgconfig_includedir.patch ];
|
||||||
|
|
||||||
|
nativeBuildInputs = [ pkgconfig python meson ninja gettext ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gst-plugins-base orc bzip2
|
gst-plugins-base orc bzip2
|
||||||
@ -44,10 +46,5 @@ stdenv.mkDerivation rec {
|
|||||||
++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
|
++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
|
||||||
++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
|
++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
|
||||||
|
|
||||||
preFixup = ''
|
|
||||||
mkdir -p "$dev/lib/gstreamer-1.0"
|
|
||||||
mv "$out/lib/gstreamer-1.0/"*.la "$dev/lib/gstreamer-1.0"
|
|
||||||
'';
|
|
||||||
|
|
||||||
LDFLAGS = optionalString stdenv.isDarwin "-lintl";
|
LDFLAGS = optionalString stdenv.isDarwin "-lintl";
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,15 @@
|
|||||||
|
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
|
||||||
|
index b3bf0d4d4..fb4386cfc 100644
|
||||||
|
--- a/pkgconfig/meson.build
|
||||||
|
+++ b/pkgconfig/meson.build
|
||||||
|
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
|
||||||
|
|
||||||
|
pkgconf.set('prefix', get_option('prefix'))
|
||||||
|
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'))
|
||||||
|
+pkgconf.set('includedir', get_option('includedir'))
|
||||||
|
pkgconf.set('GST_API_VERSION', api_version)
|
||||||
|
pkgconf.set('VERSION', gst_version)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user