Merge remote-tracking branch 'x/master'

* x/master:
  sushi: needs gobject-introspection to build.
  kernel-uml: update to 3.2.7.
  kernel-manpages: update to 3.2.6.
  swh-lv2: switch to gnu-makefile build_style, needs pkg-config.
  tdb: needs coreutils to build.
  totem: update to 3.2.2.
  clutter: proper build/run deps, revbump.
This commit is contained in:
davehome 2012-02-21 12:43:26 -07:00
commit 55887002bb
12 changed files with 51 additions and 45 deletions

View file

@ -5,15 +5,26 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc." This package contains files for development, headers, static libs, etc."
Add_dependency run json-glib-devel revision=1
Add_dependency run gtk+-devel
Add_dependency run cogl-devel 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 Add_dependency run clutter
do_install() do_install() {
{ vmove usr/include usr
mkdir -p ${DESTDIR}/usr/{lib,share} vmove usr/lib/pkgconfig usr/lib
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr vmove usr/share/gtk-doc usr/share
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib vmove "usr/share/gir-*" usr/share
mv ${SRCPKGDESTDIR}/usr/share/{gtk-doc,gir*} ${DESTDIR}/usr/share
} }

View file

@ -1,2 +1,2 @@
abi_depends=">=1.0.8" abi_depends=">=1.0.8"
api_depends="${abi_depends}" api_depends=">=1.8.4_1" # fixed rundeps for -devel subpkg.

View file

@ -1,6 +1,7 @@
# Template file for 'clutter' # Template file for 'clutter'
pkgname=clutter pkgname=clutter
version=1.8.4 version=1.8.4
revision=1
distfiles="${GNOME_SITE}/clutter/1.8/clutter-$version.tar.xz" distfiles="${GNOME_SITE}/clutter/1.8/clutter-$version.tar.xz"
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-introspection" configure_args="--enable-introspection"
@ -17,6 +18,8 @@ subpackages="clutter-devel"
Add_dependency build pkg-config Add_dependency build pkg-config
Add_dependency build intltool Add_dependency build intltool
Add_dependency build libXi-devel
Add_dependency build libXcomposite-devel
Add_dependency build libdrm-devel Add_dependency build libdrm-devel
Add_dependency build json-glib-devel Add_dependency build json-glib-devel
Add_dependency build gtk+-devel Add_dependency build gtk+-devel

View file

@ -1,8 +1,11 @@
# Template file for 'kernel-manpages'. # Template file for 'kernel-manpages'.
# #
. ${XBPS_SRCPKGDIR}/kernel/common-vars
pkgname=kernel-manpages 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" short_desc="${pkgname} development manual pages"
long_desc=" long_desc="
This package contains manual pages for developping for the Linux kernel." 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 perl ">=0"
Add_dependency build xmlto Add_dependency build xmlto
do_build() do_build() {
{
make ${makejobs} mandocs make ${makejobs} mandocs
} }
do_install() do_install() {
{ vmkdir usr/share/man/man9
install -d ${DESTDIR}/usr/share/man/man9 install -m644 Documentation/DocBook/man/*.9.gz \
install -m644 ${wrksrc}/Documentation/DocBook/man/*.9.gz \
${DESTDIR}/usr/share/man/man9 ${DESTDIR}/usr/share/man/man9
} }

View file

@ -1,8 +1,11 @@
# Build template for 'kernel-uml'. # Build template for 'kernel-uml'.
. ${XBPS_SRCPKGDIR}/kernel/common-vars #
pkgname=kernel-uml 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" short_desc="Kernel ${version} for User Mode Linux"
long_desc=" long_desc="
User-mode Linux (UML) is a port of the Linux kernel to its own system call 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 build libpcap-devel
Add_dependency full uml-utilities Add_dependency full uml-utilities
do_build() do_build() {
{
make LDFLAGS= ARCH=um defconfig && make LDFLAGS= ARCH=um ${makejobs} make LDFLAGS= ARCH=um defconfig && make LDFLAGS= ARCH=um ${makejobs}
} }
do_install() do_install() {
{ vinstall linux 755 usr/bin
install -D -m755 ${wrksrc}/linux ${DESTDIR}/usr/bin/linux
make ARCH=um INSTALL_MOD_PATH=${DESTDIR}/usr/lib/uml modules_install make ARCH=um INSTALL_MOD_PATH=${DESTDIR}/usr/lib/uml modules_install
rm -f ${DESTDIR}/usr/lib/uml/lib/modules/${version}/{build,source} rm -f ${DESTDIR}/usr/lib/uml/lib/modules/${version}/{build,source}
mv ${DESTDIR}/usr/lib/uml/lib/modules ${DESTDIR}/usr/lib/uml mv ${DESTDIR}/usr/lib/uml/lib/modules ${DESTDIR}/usr/lib/uml

View file

@ -23,3 +23,4 @@ Add_dependency build clutter-gst-devel
Add_dependency build clutter-gtk-devel Add_dependency build clutter-gtk-devel
Add_dependency build evince-devel Add_dependency build evince-devel
Add_dependency build libmusicbrainz-devel Add_dependency build libmusicbrainz-devel
Add_dependency build gobject-introspection

View file

@ -1,3 +1,3 @@
libc.so.6 libc.so.6
libfftw3f.so.3 libfftw3f.so.3
libm.so.6 libm.so.6 i686

View file

@ -1,9 +1,11 @@
# Template file for 'swh-lv2' # Template file for 'swh-lv2'
pkgname=swh-lv2 pkgname=swh-lv2
version=1.0.15 version=1.0.15
revision=2
build_style=gnu-makefile
make_install_target="install-system"
homepage="http://plugin.org.uk/" homepage="http://plugin.org.uk/"
distfiles="http://plugin.org.uk/lv2/${pkgname}-${version}.tar.gz" distfiles="http://plugin.org.uk/lv2/${pkgname}-${version}.tar.gz"
revision=2
short_desc="Collection of GPL (free software) LV2 audio plugins" short_desc="Collection of GPL (free software) LV2 audio plugins"
maintainer="davehome <davehome@redthumb.info.tm>" maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-3" license="GPL-3"
@ -11,20 +13,10 @@ checksum=5809441a94571d2f492a5e015ad035ea747127e0322e531b79a960fd0c3d250d
long_desc=" long_desc="
Collection of GPL (free software) LV2 audio plugins" Collection of GPL (free software) LV2 audio plugins"
Add_dependency build pkg-config
Add_dependency build fftw-devel Add_dependency build fftw-devel
Add_dependency build libxslt Add_dependency build libxslt
do_configure() pre_build() {
{
sed -i -e "s|/usr/local|$DESTDIR/usr|" Makefile sed -i -e "s|/usr/local|$DESTDIR/usr|" Makefile
} }
do_build()
{
make ${makejobs}
}
do_install()
{
make ${makejobs} install-system
}

View file

@ -16,6 +16,7 @@ long_desc="
subpackages="libtdb tdb-devel tdb-python" subpackages="libtdb tdb-devel tdb-python"
Add_dependency build coreutils
Add_dependency build pkg-config Add_dependency build pkg-config
Add_dependency build python-devel Add_dependency build python-devel
Add_dependency build libxslt Add_dependency build libxslt

View file

@ -1,7 +1,6 @@
# Template file for 'totem' # Template file for 'totem'
pkgname=totem pkgname=totem
version=3.2.1 version=3.2.2
revision=5
distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-scrollkeeper --disable-static configure_args="--disable-scrollkeeper --disable-static
@ -10,7 +9,7 @@ short_desc="A GNOME2 integrated movie player based on Gstreamer"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org" homepage="http://www.gnome.org"
license="custom, GPL-2" license="custom, GPL-2"
checksum=e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4 checksum=b065e486e6b70b27d3a589e70c5459ff16a7affeff0b219ead5942585d4d0c9a
long_desc=" long_desc="
Totem is a simple yet featureful media player for GNOME which can read Totem is a simple yet featureful media player for GNOME which can read
a large number of file formats. It features : a large number of file formats. It features :

View file

@ -5,8 +5,6 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc." This package contains files for development, headers, static libs, etc."
revision=1
Add_dependency run gtk+3-devel Add_dependency run gtk+3-devel
Add_dependency run totem-pl-parser-devel Add_dependency run totem-pl-parser-devel
Add_dependency run totem Add_dependency run totem

View file

@ -1,6 +1,5 @@
# Template file for 'totem-mozilla-plugins'. # Template file for 'totem-mozilla-plugins'.
# #
revision=1
short_desc="Mozilla plug-in for Totem media player" short_desc="Mozilla plug-in for Totem media player"
long_desc="${long_desc} long_desc="${long_desc}