Merge branch 'master' into testing

This commit is contained in:
Juan RP 2013-12-29 10:10:42 +01:00
commit 05a48878e6
18 changed files with 311 additions and 105 deletions

View File

@ -418,6 +418,121 @@ package is downloaded, compiled and installed.
NOTE: A function defined in a template has preference over the same function
defined by a `build_style` script.
Run-time dependencies
~~~~~~~~~~~~~~~~~~~~~
Dependencies for ELF executables or shared libraries are detected
automatically by `xbps-src`, hence run-time dependencies must not be specified
in the *package sections* with the following exceptions:
- ELF binaries using dlopen(3).
- non ELF objects, i.e perl/python/ruby/etc modules.
- Overriding the minimal version specified in the `shlibs` file.
The run-time dependencies for ELF binaries are detected by checking which SONAMEs
use and then the SONAMEs are mapped to a binary package name with a minimal
required version. The `shlibs` file in the `xbps-packages/common` directory
sets up the `SONAME pkgname>=version` mappings.
For example the `foo-1.0_1` package provides the `libfoo.so.1` SONAME and
software requiring this library will link to `libfoo`; the resulting binary
package will have a run-time dependency to `foo>=1.0_1` package as specified in
`common/shlibs`:
-----------------------
# common/shlibs
...
libfoo.so.1 foo-1.0_1
...
-----------------------
- The first field specifies the SONAME.
- The second field specified the package name and minimal version required.
- A third optional field specifies the architecture (rarely used).
Build options
~~~~~~~~~~~~~
Some packages might be built with different build options to enable/disable
additional features; `xbps-src` allows you to do this with some simple tweaks
to the `template` file.
The following variables may be set to allow package build options:
*build_options*::
Sets the build options supported by the source package.
*build_options_default*::
Sets the default build options to be used by the source package.
*desc_option_<option>*::
Sets the description for the build option `option`. This must match the
keyword set in *build_options*.
After defining those required variables, you can check for the
`build_option_<option>` variable to know if it has been set and adapt the source
package accordingly.
The following example shows how to change a source package that uses GNU
configure to enable a new build option to support PNG images:
-----------------------------------------------------------------------
# Template file for 'foo'
pkgname=foo
version=1.0
revision=1
build_style=gnu-configure
...
# Package build options
build_options="png"
desc_option_png="Enable support for PNG images"
# To build the package by default with the `png` option:
#
# build_options_default="png"
if [ "$build_option_png" ]; then
configure_args+=" --with-png"
makedepends+=" libpng-devel"
else
configure_args+=" --without-png"
fi
...
-----------------------------------------------------------------------
The supported build options for a source package can be shown with xbps-src:
---------------------------
$ xbps-src show-options foo
---------------------------
Build options can be enabled with the `-o` flag of xbps-src:
--------------------------------
$ xbps-src -o option,option1 foo
--------------------------------
Build options can be disabled by prefixing them with `~`:
----------------------------------
$ xbps-src -o ~option,~option1 foo
----------------------------------
Both ways can be used together to enable and/or disable multiple options
at the same time with xbps-src:
------------------------------------------
$ xbps-src -o option,~option1,~option2 foo
------------------------------------------
The build options can also be shown for binary packages via `xbps-query(8)`:
--------------------------------------------
$ xbps-query -R --property=build-options foo
--------------------------------------------
Contributing via git
~~~~~~~~~~~~~~~~~~~~

22
srcpkgs/ansible/template Normal file
View File

@ -0,0 +1,22 @@
# Template file for 'ansible'
pkgname=ansible
version=1.4.3
revision=1
build_style=python-module
hostmakedepends="python"
makedepends="python-devel python-jinja python-paramiko pyyaml"
short_desc="A radically simple deployment, model-driven configuration management, and command execution framework"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://www.ansibleworks.com"
distfiles="http://www.ansibleworks.com/releases/$pkgname-$version.tar.gz"
checksum=0741788cdd86d2e3bbfb4474c26bb13d57690ed2e2c8ff8dd1c271a7de590ee3
ansible_package() {
noarch="yes"
pycompile_module="${pkgname}"
depends="python python-jinja python-paramiko pyyaml"
pkg_install() {
vmove all
}
}

View File

@ -1,6 +1,6 @@
# Template file for 'cairo-dock-plugins'
pkgname=cairo-dock-plugins
version=3.3.1
version=3.3.2
revision=1
build_style=cmake
hostmakedepends="cmake pkg-config"
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="https://launchpad.net/cairo-dock"
distfiles="http://launchpad.net/cairo-dock-plug-ins/${version%.?}/${version}/+download/${pkgname}-${version}.tar.gz"
checksum=21d41ffeac6848dced05280641d764709445cad4c4e19082404b74ecd6436fd4
checksum=48f0caddb0a563d8a64176f66610ca35df5c952071e5574486d39bb574994643
cairo-dock-plugins-python2_package() {
depends="python-devel ${sourcepkg}>=${version}_${revision}"

View File

@ -1,7 +1,7 @@
# Template file for 'cairo-dock'
pkgname=cairo-dock
version=3.3.1
revision=2
version=3.3.2
revision=1
build_style=cmake
configure_args="-Denable-desktop-manager=ON"
hostmakedepends="cmake pkg-config"
@ -9,9 +9,9 @@ makedepends="libcurl-devel dbus-glib-devel libXtst-devel gtk+3-devel librsvg-dev
short_desc="Light eye-candy fully themable animated dock"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="https://launchpad.net/cairo-dock"
homepage="https://launchpad.net/${pkgname}"
distfiles="http://launchpad.net/${pkgname}-core/${version%.?}/${version}/+download/${pkgname}-${version}.tar.gz"
checksum=4d7c5c58606ac1e22dcbe6d80404e38d747c2c846102df09f25d5b97943f0459
checksum=a2d3854771d7ef5b262593b37aed216ece7eeacfc3e2a08deb4a797f175f6af8
cairo-dock-devel_package() {
short_desc+=" - development files"

View File

@ -1,6 +1,6 @@
# Template file for 'enlightenment'
pkgname=enlightenment
version=0.18.1
version=0.18.2
revision=1
build_style=gnu-configure
configure_args="--enable-pam"
@ -13,7 +13,7 @@ short_desc="Enlightenment desktop"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=13e36f3dc9b8bb6113c94fbc34971b2de24c5e7cfea8e21d42bb45065f1a0f86
checksum=a481cccc83c638aeb0b4ae5e0a34ae5cf1cbf366df26a2a6d4378dc2ad02e28e
post_install() {
vmkdir usr/share/licenses/${pkgname}

22
srcpkgs/enventor/template Normal file
View File

@ -0,0 +1,22 @@
# Template file for 'enventor'
pkgname=enventor
version=0.1
revision=1
wrksrc="${pkgname}-${version}.0"
hostmakedepends="pkg-config"
makedepends="efl-devel>=1.8 elementary-devel>=1.8 desktop-file-utils"
build_style=gnu-configure
configure_args="--disable-static"
homepage="http://enlightenment.org"
short_desc="Enlightenment's EDC editor with some convenient functions"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=144ca4eabea0c5b640e338f8f03a5692f60d51f4d667d264fc9299ed4148f67d
enventor_package() {
depends="desktop-file-utils"
pkg_install() {
vmove all
}
}

View File

@ -1,20 +1,15 @@
# Template file for 'libcap'
pkgname=libcap
version=2.22
revision=8
hostmakedepends="gperf perl"
version=2.23
revision=1
hostmakedepends="gperf perl pam-devel"
makedepends="pam-devel attr-devel"
short_desc="POSIX.1e capabilities suite"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://sites.google.com/site/fullycapable/"
license="GPL-2"
distfiles="ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz"
#distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/$pkgname-$version.tar.bz2"
checksum=e1cae65d8febf2579be37c255d2e058715785ead481a4e6a4357a06aff84721f
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" pam-devel"
fi
distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/$pkgname-$version.tar.bz2"
checksum=deebc3b9ff44760a281feb4b379adacc641f5e90999089feb3d7717862242355
do_build() {
make CC="$CC" BUILD_CC=cc
@ -23,7 +18,8 @@ do_build() {
do_install() {
make DESTDIR=${DESTDIR} MANDIR=${DESTDIR}/usr/share/man \
SBINDIR=${DESTDIR}/usr/sbin LIBDIR=${DESTDIR}/usr/lib \
RAISE_SETFCAP=no install
RAISE_SETFCAP=no PKGCONFIGDIR=${DESTDIR}/usr/lib/pkgconfig install
vinstall pam_cap/capability.conf 644 etc/security
chmod 755 ${DESTDIR}/usr/lib/libcap.so.*
}
@ -34,7 +30,9 @@ libcap-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/libcap.a
vmove usr/lib/libcap.so
vmove usr/share/man/man3
vmove usr/lib/pkgconfig
}
}
@ -57,6 +55,6 @@ libcap-progs_package() {
libcap_package() {
pkg_install() {
vmove usr
vmove all
}
}

1
srcpkgs/libcec-devel Symbolic link
View File

@ -0,0 +1 @@
libcec

View File

@ -1,19 +1,23 @@
# Template file for 'libcec'
pkgname=libcec
version=2.1.1
version=2.1.4
revision=1
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
hostmakedepends="automake pkg-config libtool"
makedepends="libudev-devel lockdev-devel"
short_desc="USB CEC Adapter communication Library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://github.com/Pulse-Eight/libcec"
license="GPL-2"
distfiles="https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"
checksum=f61378798d900d496ed3a5ff7747b0bb35bdfec9b5c4168dcea38396e3569bf1
hostmakedepends="automake pkg-config libtool"
makedepends="libudev-devel lockdev-devel"
checksum=79bef5232a5c9ab987ca3a2d4bfcaeb80480fd26f502dc1a996fe845d90fe147
if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
configure_args+=" --enable-rpi"
configure_args+=" --with-rpi-include-path=${XBPS_CROSS_BASE}/opt/vc/include"
configure_args+=" --with-rpi-lib-path=${XBPS_CROSS_BASE}/opt/vc/lib"
configure_args+=" LDFLAGS="
makedepends+=" rpi-firmware"
fi
@ -21,38 +25,27 @@ pre_configure() {
autoreconf -fi
}
do_configure() {
if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
configure_args+=" --enable-rpi "
if [ "$XBPS_CROSS_BASE" ]; then
configure_args+=" --with-rpi-include-path=${XBPS_CROSS_BASE}/opt/vc/include "
configure_args+=" --with-rpi-lib-path=${XBPS_CROSS_BASE}/opt/vc/lib "
else
configure_args+=" --with-rpi-include-path=/opt/vc/include "
configure_args+=" --with-rpi-lib-path=/opt/vc/lib "
fi
fi
./configure ${configure_args} LDFLAGS=
}
do_build() {
make ${make_build_args}
}
do_install() {
make DESTDIR=${DESTDIR} install
}
cec-client_package() {
depends="libcec>=${version}"
short_desc="${short_desc} -- client tool"
short_desc+=" - client tool"
pkg_install() {
vmove usr/bin
}
}
libcec_package() {
libcec-devel_package() {
short_desc+=" - development files"
depends="libcec>=${version}_${revision}"
pkg_install() {
vmove usr
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
}
libcec_package() {
pkg_install() {
vmove all
}
}

View File

@ -1,41 +1,33 @@
# Template file for 'libtirpc'
pkgname=libtirpc
version=0.2.3
revision=2
version=0.2.4
revision=1
build_style=gnu-configure
configure_args="--enable-gss --disable-static"
hostmakedepends="automake libtool pkg-config"
makedepends="libgssglue-devel"
configure_args="--disable-static"
hostmakedepends="pkg-config"
makedepends="mit-krb5-devel libgssglue-devel"
short_desc="Transport Independent RPC library (SunRPC replacement)"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
homepage="http://libtirpc.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
checksum=4f29ea0491b4ca4c29f95f3c34191b857757873bbbf4b069f9dd4da01a6a923c
pre_configure() {
sed -i "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g" configure.ac
autoreconf -fi
}
post_install() {
vinstall doc/etc_netconfig 644 etc netconfig
}
checksum=45c3e21dfc23a5ba501f9dfc6671678316fdfdb8355a1ec404ae2aa2f81943a1
libtirpc-devel_package() {
depends="libgssglue-devel libtirpc>=${version}"
short_desc="${short_desc} - development files"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/man/man3
vmove "usr/lib/*.so"
}
}
libtirpc_package() {
conf_files="/etc/netconfig"
pkg_install() {
vmove etc
vmove usr
vmove all
vinstall ${wrksrc}/doc/netconfig 644 etc
}
}

View File

@ -1,34 +1,31 @@
# Template file for 'pycrypto'
pkgname=pycrypto
version=2.6
version=2.6.1
revision=1
build_style=python-module
hostmakedepends="python"
makedepends="gmp-devel python-devel"
short_desc="The Python Cryptography Toolkit"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://www.dlitz.net/software/pycrypto/"
license="PSF, Public domain"
distfiles="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/$pkgname-$version.tar.gz"
checksum=7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8
checksum=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
long_desc="
The Python cryptography toolkit is intended to provide a reliable and stable
base for writing Python programs that require cryptographic functions."
if [ "$CROSS_BUILD" ]; then
hostmakedepends="python"
fi
pre_build() {
if [ "$CROSS_BUILD" ]; then
sed -e "s|'/usr/include/'|''|g" -i setup.py
configure_args+=" ac_cv_func_malloc_0_nonnull=yes "
configure_args+=" ac_cv_func_malloc_0_nonnull=yes"
fi
./configure ${configure_args}
CC= CFLAGS= ./configure ${configure_args}
}
pycrypto_package() {
pycompile_module="Crypto"
pkg_install() {
vmove usr
vmove all
}
}

View File

@ -0,0 +1,22 @@
# Template file for 'python-ecdsa'
pkgname=python-ecdsa
version=0.10
revision=1
wrksrc="${pkgname/python-/}-${version}"
build_style=python-module
hostmakedepends="python"
makedepends="python-devel python-setuptools"
short_desc="Python Implementation of ECDSA"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://github.com/warner/python-ecdsa"
license="MIT"
distfiles="http://pypi.python.org/packages/source/e/ecdsa/ecdsa-$version.tar.gz"
checksum=67dae9e1af2b0fd71bc9a378654f7dc89211c1c5aee71e160f8cfce1fa6d6980
python-ecdsa_package() {
noarch="yes"
pycompile_module="ecdsa"
pkg_install() {
vmove all
}
}

View File

@ -0,0 +1,23 @@
# Template file for 'python-paramiko'
pkgname=python-paramiko
version=1.12.0
revision=1
wrksrc="${pkgname/python-/}-${version}"
build_style=python-module
hostmakedepends="python"
makedepends="python-devel python-ecdsa pycrypto"
short_desc="Python module that implements the SSH2 protocol"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://github.com/paramiko/paramiko"
license="MIT"
distfiles="http://pypi.python.org/packages/source/p/paramiko/paramiko-$version.tar.gz"
checksum=cc0c0549f611ccc1358a0e1c760e00074990adba723d4d647a2637a1fadbdd71
python-paramiko_package() {
noarch="yes"
pycompile_module="paramiko"
depends="python python-ecdsa pycrypto"
pkg_install() {
vmove all
}
}

View File

@ -2,8 +2,8 @@
pkgname=s-nail
version=14.5.1
_version="14_5_1"
revision=1
makedepends="openssl-devel"
revision=2
makedepends="openssl-devel libidn-devel"
short_desc="Mail processing system with a command syntax reminiscent of ed"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="BSD"
@ -13,7 +13,7 @@ checksum=5db746771d1cd33350ff6dc3a1249cf7b7a5b025fc5b90f9ff21a917f599501a
do_build() {
make PREFIX=/usr SYSCONFDIR=/etc SID= NAIL=mail BINDIR=/usr/bin \
MANDIR=/usr/share/man MAILSPOOL=/var/spool/mail XPAGER=less config
MANDIR=/usr/share/man MAILSPOOL=/var/spool/mail XPAGER=less WANT_IDNA=1 config
make CC=$CC ${makejobs} build
}

19
srcpkgs/task/template Normal file
View File

@ -0,0 +1,19 @@
# Template file for 'task'
pkgname=task
version=2.2.0
revision=1
hostmakedepends="cmake"
makedepends="libuuid-devel"
build_style="cmake"
maintainer="Philipp Hirsch <itself@hanspolo.net>"
license="MIT"
homepage="http://taskwarrior.org/projects/taskwarrior"
distfiles="http://www.taskwarrior.org/download/${pkgname}-${version}.tar.gz"
checksum=39e25dd285e6bc8474337a5868cb2ec55675978fa1f08c802e6da58b4181ee14
short_desc="a command-line todo list manager"
task_package() {
pkg_install() {
vmove all
}
}

View File

@ -1,18 +1,21 @@
# Template file for 'xbmc'
pkgname=xbmc
version=12.2
revision=4
version=12.3
revision=1
wrksrc="xbmc-${version}-Frodo"
short_desc="XBMC Media Center"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.xbmc.org"
license="GPL-2"
distfiles="http://mirrors.xbmc.org/releases/source/xbmc-$version.tar.gz"
checksum=b2330634fc513d27a44b131bbbe4ca6b61d60a1fe6c7ca27a7dc749df0bcea1c
checksum=3e15c960d034efdea5f92a7b74716cb48094842d077b076025fd8640754ede73
broken_as_needed=yes
# XXX add support for webserver (microhttpd), afp and libcec.
hostmakedepends="pkg-config gperf cmake zip unzip nasm yasm python-devel swig jre"
hostmakedepends="
automake libtool pkg-config gperf cmake zip unzip nasm yasm python-devel
swig jre which gettext-devel libltdl-devel"
makedepends="
libudev-devel>=183 pcre-devel>=8.30 expat-devel libpng-devel>=1.6 libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel SDL_mixer-devel samba-devel tiff-devel
@ -22,9 +25,15 @@ makedepends="
libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel
taglib-devel libcap-devel lame-devel libbluray-devel libnfs-devel"
taglib-devel libcap-devel lame-devel libbluray-devel libnfs-devel systemd-devel
libcec-devel"
makedepends+=" udisks upower hicolor-icon-theme desktop-file-utils glxinfo"
makedepends+=" udisks2 upower hicolor-icon-theme desktop-file-utils glxinfo"
pre_configure() {
. /etc/profile.d/jre.sh
./bootstrap
}
do_configure() {
. /etc/profile.d/jre.sh
@ -40,7 +49,7 @@ do_configure() {
--enable-airplay --disable-airtunes --enable-ffmpeg-libvorbis \
--disable-hal --enable-avahi --disable-webserver \
--enable-libbluray --enable-texturepacker --enable-udev \
--disable-libcec --enable-external-libraries \
--enable-libcec --enable-external-libraries \
--disable-external-ffmpeg --disable-ssh
}
@ -63,7 +72,7 @@ do_install() {
xbmc_package() {
# The following dependencies are dlopen(3)ed.
depends="libbluray libmad libogg libcurl libflac libmodplug libass libmpeg2 lame librtmp libnfs libplist"
depends+=" glxinfo udisks upower hicolor-icon-theme desktop-file-utils"
depends+=" glxinfo udisks2 upower hicolor-icon-theme desktop-file-utils"
pkg_install() {
vmove all
}

View File

@ -1,18 +1,17 @@
# Template file for 'xfce4-terminal'
pkgname=xfce4-terminal
version=0.6.2
version=0.6.3
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="dbus-glib-devel exo-devel vte-devel gtk+-devel libxfce4ui-devel
hicolor-icon-theme desktop-file-utils"
short_desc="A modern terminal emulator primarly for the Xfce desktop environment"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.xfce.org"
license="GPL-2"
distfiles="http://archive.se.xfce.org/src/apps/${pkgname}/0.6/${pkgname}-${version}.tar.bz2"
checksum=3d92422288d26311880af694bb4e02c9235997ca307a5e85001bf6bef65c3b35
hostmakedepends="pkg-config intltool"
makedepends="dbus-glib-devel exo-devel vte-devel gtk+-devel libxfce4ui-devel
hicolor-icon-theme desktop-file-utils"
checksum=912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08
xfce4-terminal_package() {
replaces="Terminal>=0"

View File

@ -1,8 +1,9 @@
# Template build file for 'zlib'
pkgname=zlib
version=1.2.8
revision=1
revision=2
bootstrap=yes
build_style=configure
short_desc="A compression/decompression Library"
maintainer="Juan RP <xtraeme@gmail.com>"
license="zlib"
@ -18,27 +19,20 @@ do_configure() {
CFLAGS="$CFLAGS -fPIC" ./configure --prefix=/usr --shared
}
do_build() {
make ${makejobs}
}
do_install() {
make DESTDIR=${DESTDIR} LDCONFIG= install
}
zlib-devel_package() {
depends="zlib>=${version}"
depends="zlib>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/share
}
}
zlib_package() {
pkg_install() {
vmove usr
vmove all
}
}