From c59acea4631ea7a5eb29e50d443fad50ee623407 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 5 Jun 2014 00:41:52 +0200 Subject: [PATCH] gst-plugins-good: remove gconf schemas; fixed cross build. --- srcpkgs/gst-plugins-good/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gst-plugins-good/template b/srcpkgs/gst-plugins-good/template index 6b6ab9439a5..4c0f3bde144 100644 --- a/srcpkgs/gst-plugins-good/template +++ b/srcpkgs/gst-plugins-good/template @@ -1,15 +1,14 @@ # Template file for 'gst-plugins-good'. pkgname=gst-plugins-good version=0.10.31 -revision=7 -lib32disabled=yes +revision=8 build_style=gnu-configure configure_args="--with-gudev --with-libv4l2 --enable-experimental --disable-schemas-install --disable-aalib --disable-esd --disable-hal --disable-libcaca --disable-libdv --disable-dv1394 --disable-shout2 --with-gconf-schema-file-dir=/usr/share/gconf/schemas --enable-speex" # XXX: build libcaca, libdv, dv1394 and shout2 modules. -hostmakedepends="pkg-config intltool" +hostmakedepends="pkg-config intltool glib-devel" makedepends="libpng-devel>=1.6 libxml2-devel libgudev-devel libflac-devel libXdamage-devel gtk+-devel taglib-devel libsoup-gnome-devel gst-plugins-base-devel GConf-devel pulseaudio-devel @@ -27,7 +26,8 @@ pre_configure() { } post_install() { - mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} - gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/gstreamer-0.10.schemas \ - --domain ${pkgname}-0.10 ${wrksrc}/*.schemas + # remove gconf schemas completely + if [ -d ${DESTDIR}/usr/share/gconf ]; then + rm -r ${DESTDIR}/usr/share/gconf + fi }