diff --git a/srcpkgs/libcompizconfig/depends b/srcpkgs/libcompizconfig/depends index 67f3e101502..2ace6d3fb1f 100644 --- a/srcpkgs/libcompizconfig/depends +++ b/srcpkgs/libcompizconfig/depends @@ -1,2 +1,2 @@ -abi_depends=">=0.8.4" +abi_depends=">=0.9.2" api_depends="${abi_depends}" diff --git a/srcpkgs/libcompizconfig/libcompizconfig-devel.template b/srcpkgs/libcompizconfig/libcompizconfig-devel.template index 8d28de3e363..a18bb181342 100644 --- a/srcpkgs/libcompizconfig/libcompizconfig-devel.template +++ b/srcpkgs/libcompizconfig/libcompizconfig-devel.template @@ -5,23 +5,20 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 - Add_dependency run pkg-config -Add_dependency run libX11-devel +Add_dependency run intltool +Add_dependency run cmake Add_dependency run libstdc++-devel -Add_dependency run compiz-devel +Add_dependency run libX11-devel Add_dependency run libxml2-devel +Add_dependency run compiz-core-devel Add_dependency run libcompizconfig do_install() { - mkdir -p ${DESTDIR}/usr/lib/compiz - mkdir -p ${DESTDIR}/usr/lib/compizconfig/backends + mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/compiz + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/compiz/*.a ${DESTDIR}/usr/lib/compiz - mv ${SRCPKGDESTDIR}/usr/lib/compizconfig/backends/*.a \ - ${DESTDIR}/usr/lib/compizconfig/backends + mv ${SRCPKGDESTDIR}/usr/share/compiz/cmake ${DESTDIR}/usr/share/compiz } diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template index e27ebe8f6a4..159c2ca348b 100644 --- a/srcpkgs/libcompizconfig/template +++ b/srcpkgs/libcompizconfig/template @@ -1,12 +1,11 @@ # Template file for 'libcompizconfig' pkgname=libcompizconfig -version=0.8.4 -revision=1 -distfiles="http://releases.compiz-fusion.org/$version/$pkgname-$version.tar.bz2" -build_style=gnu_configure +version=0.9.2 +distfiles="http://releases.compiz.org/$version/$pkgname-$version.tar.bz2" +build_style=custom-install short_desc="Compiz configuration system library" maintainer="Juan RP " -checksum=41313e935f1beb3375367bded72d97de60e7aabf1129620be53a7fc1aca0b029 +checksum=03cd57ee42a11ba0ade4e88a487fa6b9ce7f5e825e2d7e7a40cef4f7f803c2b3 long_desc=" Compiz is a compositing window manager that uses 3D graphics acceleration via OpenGL. It provides various new graphical effects and features on @@ -14,18 +13,38 @@ long_desc=" This package contains a library for the compiz configuration backend." -conf_files="/etc/compizconfig/config" subpackages="$pkgname-devel" +gconf_schemas="compiz-ccp.schemas" -Add_dependency run libX11 -Add_dependency run libstdc++ Add_dependency run libgcc Add_dependency run glibc -Add_dependency run compiz +Add_dependency run libstdc++ +Add_dependency run libX11 Add_dependency run libxml2 +Add_dependency run compiz-core + Add_dependency build pkg-config Add_dependency build intltool -Add_dependency build libX11-devel +Add_dependency build cmake Add_dependency build libstdc++-devel -Add_dependency build compiz-devel +Add_dependency build libX11-devel Add_dependency build libxml2-devel +Add_dependency build compiz-core-devel + +Add_dependency full GConf + +do_build() +{ + mkdir -p ${wrksrc}/build && cd ${wrksrc}/build && \ + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCOMPIZ_DISABLE_SCHEMAS_INSTALL=yes .. && \ + make ${makejobs} || return 1 +} + +do_install() +{ + cd ${wrksrc}/build && \ + make DESTDIR=${DESTDIR} install && \ + make DESTDIR=${DESTDIR} findcompizconfig_install || return 1 +}