From d62c9cc28bb1f1fe0debf12b9b942e564ccb3c5c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 21 Feb 2012 12:32:58 +0100 Subject: [PATCH 1/7] clutter: proper build/run deps, revbump. --- srcpkgs/clutter/clutter-devel.template | 27 ++++++++++++++++++-------- srcpkgs/clutter/depends | 2 +- srcpkgs/clutter/template | 3 +++ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/srcpkgs/clutter/clutter-devel.template b/srcpkgs/clutter/clutter-devel.template index 81457e9219b..bb07f54adc4 100644 --- a/srcpkgs/clutter/clutter-devel.template +++ b/srcpkgs/clutter/clutter-devel.template @@ -5,15 +5,26 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run json-glib-devel -Add_dependency run gtk+-devel +revision=1 + Add_dependency run cogl-devel +Add_dependency run cairo-devel +Add_dependency run atk-devel +Add_dependency run pango-devel +Add_dependency run json-glib-devel +Add_dependency run MesaLib-devel +Add_dependency run libdrm-devel +Add_dependency run libX11-devel +Add_dependency run libXext-devel +Add_dependency run libXfixes-devel +Add_dependency run libXdamage-devel +Add_dependency run libXcomposite-devel +Add_dependency run libXi-devel Add_dependency run clutter -do_install() -{ - mkdir -p ${DESTDIR}/usr/{lib,share} - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/{gtk-doc,gir*} ${DESTDIR}/usr/share +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove usr/share/gtk-doc usr/share + vmove "usr/share/gir-*" usr/share } diff --git a/srcpkgs/clutter/depends b/srcpkgs/clutter/depends index 9ee6dd9885e..179baa21289 100644 --- a/srcpkgs/clutter/depends +++ b/srcpkgs/clutter/depends @@ -1,2 +1,2 @@ abi_depends=">=1.0.8" -api_depends="${abi_depends}" +api_depends=">=1.8.4_1" # fixed rundeps for -devel subpkg. diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template index a67b64324d8..80b6e130848 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -1,6 +1,7 @@ # Template file for 'clutter' pkgname=clutter version=1.8.4 +revision=1 distfiles="${GNOME_SITE}/clutter/1.8/clutter-$version.tar.xz" build_style=gnu-configure configure_args="--enable-introspection" @@ -17,6 +18,8 @@ subpackages="clutter-devel" Add_dependency build pkg-config Add_dependency build intltool +Add_dependency build libXi-devel +Add_dependency build libXcomposite-devel Add_dependency build libdrm-devel Add_dependency build json-glib-devel Add_dependency build gtk+-devel From 9ba781327960905f1ac2c75e03620806b2f56958 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 21 Feb 2012 14:03:26 +0100 Subject: [PATCH 2/7] totem: update to 3.2.2. --- srcpkgs/totem/template | 5 ++--- srcpkgs/totem/totem-devel.template | 2 -- srcpkgs/totem/totem-mozilla-plugin.template | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index 287318df22a..3172bc3cf73 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -1,7 +1,6 @@ # Template file for 'totem' pkgname=totem -version=3.2.1 -revision=5 +version=3.2.2 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-scrollkeeper --disable-static @@ -10,7 +9,7 @@ short_desc="A GNOME2 integrated movie player based on Gstreamer" maintainer="Juan RP " homepage="http://www.gnome.org" license="custom, GPL-2" -checksum=e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4 +checksum=b065e486e6b70b27d3a589e70c5459ff16a7affeff0b219ead5942585d4d0c9a long_desc=" Totem is a simple yet featureful media player for GNOME which can read a large number of file formats. It features : diff --git a/srcpkgs/totem/totem-devel.template b/srcpkgs/totem/totem-devel.template index 066823984c4..c8d2ff9ef0a 100644 --- a/srcpkgs/totem/totem-devel.template +++ b/srcpkgs/totem/totem-devel.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 - Add_dependency run gtk+3-devel Add_dependency run totem-pl-parser-devel Add_dependency run totem diff --git a/srcpkgs/totem/totem-mozilla-plugin.template b/srcpkgs/totem/totem-mozilla-plugin.template index 200a0dfd91f..9a09948d86e 100644 --- a/srcpkgs/totem/totem-mozilla-plugin.template +++ b/srcpkgs/totem/totem-mozilla-plugin.template @@ -1,6 +1,5 @@ # Template file for 'totem-mozilla-plugins'. # -revision=1 short_desc="Mozilla plug-in for Totem media player" long_desc="${long_desc} From 8fa52bff425b600d1338dc11a662e46f8d1a3d1a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 21 Feb 2012 16:31:33 +0100 Subject: [PATCH 3/7] tdb: needs coreutils to build. --- srcpkgs/tdb/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template index 7ab74df741d..472684ca179 100644 --- a/srcpkgs/tdb/template +++ b/srcpkgs/tdb/template @@ -16,6 +16,7 @@ long_desc=" subpackages="libtdb tdb-devel tdb-python" +Add_dependency build coreutils Add_dependency build pkg-config Add_dependency build python-devel Add_dependency build libxslt From 51f126298c98f4bf2647e1627d59cbad8047a28a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 21 Feb 2012 16:57:30 +0100 Subject: [PATCH 4/7] swh-lv2: switch to gnu-makefile build_style, needs pkg-config. --- srcpkgs/swh-lv2/swh-lv2.rshlibs | 2 +- srcpkgs/swh-lv2/template | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/srcpkgs/swh-lv2/swh-lv2.rshlibs b/srcpkgs/swh-lv2/swh-lv2.rshlibs index 7915e9f0587..b95fed5e175 100644 --- a/srcpkgs/swh-lv2/swh-lv2.rshlibs +++ b/srcpkgs/swh-lv2/swh-lv2.rshlibs @@ -1,3 +1,3 @@ libc.so.6 libfftw3f.so.3 -libm.so.6 +libm.so.6 i686 diff --git a/srcpkgs/swh-lv2/template b/srcpkgs/swh-lv2/template index 84a0069f26e..b617f0607a4 100644 --- a/srcpkgs/swh-lv2/template +++ b/srcpkgs/swh-lv2/template @@ -1,9 +1,11 @@ # Template file for 'swh-lv2' pkgname=swh-lv2 version=1.0.15 +revision=2 +build_style=gnu-makefile +make_install_target="install-system" homepage="http://plugin.org.uk/" distfiles="http://plugin.org.uk/lv2/${pkgname}-${version}.tar.gz" -revision=2 short_desc="Collection of GPL (free software) LV2 audio plugins" maintainer="davehome " license="GPL-3" @@ -11,20 +13,10 @@ checksum=5809441a94571d2f492a5e015ad035ea747127e0322e531b79a960fd0c3d250d long_desc=" Collection of GPL (free software) LV2 audio plugins" +Add_dependency build pkg-config Add_dependency build fftw-devel Add_dependency build libxslt -do_configure() -{ +pre_build() { sed -i -e "s|/usr/local|$DESTDIR/usr|" Makefile } - -do_build() -{ - make ${makejobs} -} - -do_install() -{ - make ${makejobs} install-system -} From 76a4200ab60bca160153511489f88df5a3abb458 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 21 Feb 2012 17:25:57 +0100 Subject: [PATCH 5/7] kernel-manpages: update to 3.2.6. --- srcpkgs/kernel-manpages/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/kernel-manpages/template b/srcpkgs/kernel-manpages/template index cc564da2254..333cabbf7b7 100644 --- a/srcpkgs/kernel-manpages/template +++ b/srcpkgs/kernel-manpages/template @@ -1,8 +1,11 @@ # Template file for 'kernel-manpages'. # -. ${XBPS_SRCPKGDIR}/kernel/common-vars - pkgname=kernel-manpages +version=3.2.6 +wrksrc=linux-${version} +homepage="http://www.kernel.org" +distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz" +checksum=9db97d45638017e6dfaed768cfa9f47533c9c9fb3538bce0e594d9feff5489b4 short_desc="${pkgname} development manual pages" long_desc=" This package contains manual pages for developping for the Linux kernel." @@ -12,14 +15,12 @@ noarch=yes Add_dependency build perl ">=0" Add_dependency build xmlto -do_build() -{ +do_build() { make ${makejobs} mandocs } -do_install() -{ - install -d ${DESTDIR}/usr/share/man/man9 - install -m644 ${wrksrc}/Documentation/DocBook/man/*.9.gz \ +do_install() { + vmkdir usr/share/man/man9 + install -m644 Documentation/DocBook/man/*.9.gz \ ${DESTDIR}/usr/share/man/man9 } From 983c999c0a1162fcd007a24df7d40520f1d95759 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 21 Feb 2012 17:29:58 +0100 Subject: [PATCH 6/7] kernel-uml: update to 3.2.7. --- srcpkgs/kernel-uml/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/kernel-uml/template b/srcpkgs/kernel-uml/template index d37b2cd8eaf..836a202f12c 100644 --- a/srcpkgs/kernel-uml/template +++ b/srcpkgs/kernel-uml/template @@ -1,8 +1,11 @@ # Build template for 'kernel-uml'. -. ${XBPS_SRCPKGDIR}/kernel/common-vars - +# pkgname=kernel-uml -revision=1 +version=3.2.6 +wrksrc=linux-${version} +homepage="http://www.kernel.org" +distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz" +checksum=9db97d45638017e6dfaed768cfa9f47533c9c9fb3538bce0e594d9feff5489b4 short_desc="Kernel ${version} for User Mode Linux" long_desc=" User-mode Linux (UML) is a port of the Linux kernel to its own system call @@ -17,14 +20,12 @@ Add_dependency build perl ">=0" Add_dependency build libpcap-devel Add_dependency full uml-utilities -do_build() -{ +do_build() { make LDFLAGS= ARCH=um defconfig && make LDFLAGS= ARCH=um ${makejobs} } -do_install() -{ - install -D -m755 ${wrksrc}/linux ${DESTDIR}/usr/bin/linux +do_install() { + vinstall linux 755 usr/bin make ARCH=um INSTALL_MOD_PATH=${DESTDIR}/usr/lib/uml modules_install rm -f ${DESTDIR}/usr/lib/uml/lib/modules/${version}/{build,source} mv ${DESTDIR}/usr/lib/uml/lib/modules ${DESTDIR}/usr/lib/uml From d25f9df8a63f135d29d3d159e77c6eb79b602ca3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 21 Feb 2012 17:49:01 +0100 Subject: [PATCH 7/7] sushi: needs gobject-introspection to build. --- srcpkgs/sushi/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template index 089e68775b8..3f32bd19568 100644 --- a/srcpkgs/sushi/template +++ b/srcpkgs/sushi/template @@ -23,3 +23,4 @@ Add_dependency build clutter-gst-devel Add_dependency build clutter-gtk-devel Add_dependency build evince-devel Add_dependency build libmusicbrainz-devel +Add_dependency build gobject-introspection