diff options
166 files changed, 6053 insertions, 741 deletions
diff --git a/community-testing/catalyst-utils/PKGBUILD b/community-testing/catalyst-utils/PKGBUILD new file mode 100644 index 000000000..2a05774b3 --- /dev/null +++ b/community-testing/catalyst-utils/PKGBUILD @@ -0,0 +1,128 @@ +# $Id: PKGBUILD 76582 2012-09-23 23:07:57Z lcarlier $ +# Maintainer: idontknow +# Contributor: to fill with a lot of people + +pkgbase=catalyst-utils +pkgname=('catalyst-utils' 'opencl-catalyst') +pkgver=12.8 +pkgrel=0.2 +pkgdesc="AMD Catalyst drivers utilities and libraries with OpenCL implementation." +arch=('i686' 'x86_64') +url="http://www.amd.com" +license=('custom') +source=("http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip" + atieventsd + atieventsd.service) +md5sums=('41c5478322b13be6909eeb46412a3aa0' + 'f729bf913613f49b0b9759c246058a87' + '14beb8cc8f59c06d5ef998e222779dae') + +if [ "${CARCH}" = "i686" ]; then + _ARCHDIR="x86" + _ARCHLIB="" + _ARCHXPIC="" +else + _ARCHDIR="x86_64" + _ARCHLIB="64" + _ARCHXPIC="_64a" +fi + +build() { + cd ${srcdir} + + sh ./amd-driver-installer*.run --extract fglrx-install +} + +package_catalyst-utils() { + pkgdesc="AMD Catalyst drivers utilities and libraries." + provides=('libgl') + conflicts=('libgl' 'nvidia-utils') + depends=('xorg-server>=1.7.0' 'xorg-server<1.13.0' 'gcc-libs' 'libxinerama' \ + 'libxcursor' 'libxxf86vm' 'libxrandr' 'libsm' 'fontconfig' 'libxi' 'netkit-bsd-finger') + optdepends=('qt: amdcccle') + + install -dm755 "${pkgdir}"/usr/{bin,sbin} + install -dm755 "${pkgdir}"/usr/lib/{dri,xorg/modules/{dri,drivers,extensions/fglrx,linux},systemd/system} + install -dm755 "${pkgdir}"/usr/include/GL + install -dm755 "${pkgdir}"/etc/{ati,acpi/events,security/console.apps,rc.d} + install -dm755 "${pkgdir}"/usr/share/{applications,ati/amdcccle,man/man8,pixmaps} + + # binaries + cd ${srcdir}/fglrx-install + install -m755 common/usr/sbin/* "${pkgdir}/usr/sbin/" + install -m755 common/usr/X11R6/bin/* "${pkgdir}/usr/bin/" + install -m755 arch/${_ARCHDIR}/usr/sbin/* "${pkgdir}/usr/sbin/" + install -m755 arch/${_ARCHDIR}/usr/X11R6/bin/* "${pkgdir}/usr/bin/" + + # headers + install -m644 common/usr/include/GL/* "${pkgdir}/usr/include/GL/" + + # xorg/dri/gl/... drivers + cd ${srcdir}/fglrx-install/xpic${_ARCHXPIC}/usr/X11R6/lib${_ARCHLIB}/modules + install -m755 *.so "${pkgdir}/usr/lib/xorg/modules/" + install -m755 drivers/*.so "${pkgdir}/usr/lib/xorg/modules/drivers/" + install -m755 linux/*.so "${pkgdir}/usr/lib/xorg/modules/linux/" + install -m755 extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/" + ln -s fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" + cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}/usr/X11R6/lib${_ARCHLIB} + install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/" + ln -s /usr/lib/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/dri/" + install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/" + install -m755 *.so* "${pkgdir}/usr/lib/" + install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib/" + cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}/usr/lib${_ARCHLIB} + install -m755 *.so* "${pkgdir}/usr/lib/" + # needed symlinks + ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib/libatiuki.so.1" + ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1" + ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so" + ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/libAMDXvBA.so.1" + ln -s libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/libfglrx_dm.so.1" + + # various files + cd ${srcdir}/fglrx-install/common + install -m644 usr/share/man/man8/* "${pkgdir}/usr/share/man/man8/" + install -m644 usr/share/applications/* "${pkgdir}/usr/share/applications/" + install -m644 usr/share/icons/* "${pkgdir}/usr/share/pixmaps/" + install -m644 usr/share/ati/amdcccle/* "${pkgdir}/usr/share/ati/amdcccle/" + install -m644 etc/ati/* "${pkgdir}/etc/ati/" + chmod 755 "${pkgdir}/etc/ati/authatieventsd.sh" + install -m644 etc/security/console.apps/amdcccle-su "${pkgdir}/etc/security/console.apps/" + install -m644 usr/share/applications/*.desktop "${pkgdir}/usr/share/applications/" + # use ACPI example files + install -m755 usr/share/doc/fglrx/examples/etc/acpi/*.sh "${pkgdir}/etc/acpi/" + install -m644 usr/share/doc/fglrx/examples/etc/acpi/events/* "${pkgdir}/etc/acpi/events/" + # systemd and rc.d scripts + install -m755 "${srcdir}/atieventsd" "${pkgdir}/etc/rc.d/" + install -m644 "${srcdir}/atieventsd.service" "${pkgdir}/usr/lib/systemd/system/" + + # provided in opencl-catalyst package + rm "${pkgdir}"/usr/lib/lib{amdocl*,OpenCL}.so* + + # licenses + install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" + install -Dm644 "${srcdir}/fglrx-install/common/usr/share/doc/amdcccle/ccc_copyrights.txt" \ + "${pkgdir}/usr/share/licenses/${pkgname}/amdcccle_copyrights.txt" +} + +package_opencl-catalyst() { + pkgdesc="OpenCL implemention from AMD" + provides=('libcl') + conflicts=('libcl') + depends=('gcc-libs') + optdepends=('opencl-headers: headers necessary for OpenCL development') + + install -dm755 "${pkgdir}"/usr/{bin,lib} + install -dm755 "${pkgdir}/etc/OpenCL/vendors" + + cd ${srcdir}/fglrx-install/arch/${_ARCHDIR} + + install -m755 usr/bin/clinfo "${pkgdir}/usr/bin/" + install -m644 etc/OpenCL/vendors/amdocl*.icd "${pkgdir}/etc/OpenCL/vendors/" + install -m755 usr/lib${_ARCHLIB}/libamdocl*.so "${pkgdir}/usr/lib/" + install -m755 usr/lib${_ARCHLIB}/libOpenCL.so.1 "${pkgdir}/usr/lib/" + ln -s libOpenCL.so.1 "${pkgdir}/usr/lib/libOpenCL.so" + + # license + install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" +} diff --git a/community-testing/catalyst-utils/atieventsd b/community-testing/catalyst-utils/atieventsd new file mode 100644 index 000000000..16bd9a4fa --- /dev/null +++ b/community-testing/catalyst-utils/atieventsd @@ -0,0 +1,41 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +ATID_PID=`pidof -o %PPID /usr/sbin/atieventsd` + +case "$1" in + start) + rc=0 + stat_busy "Starting ATI Events Daemon" + [ -z "$ATID_PID" ] && /usr/sbin/atieventsd + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + else + add_daemon atieventsd + stat_done + fi + ;; + stop) + rc=0 + stat_busy "Stopping ATI Events Daemon" + kill $ATID_PID &>/dev/null + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + else + rm_daemon atieventsd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/catalyst-utils/atieventsd.service b/community-testing/catalyst-utils/atieventsd.service new file mode 100644 index 000000000..14dd7e210 --- /dev/null +++ b/community-testing/catalyst-utils/atieventsd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Catalyst event Daemon + +[Service] +ExecStart=/usr/sbin/atieventsd --nodaemon + +[Install] +WantedBy=multi-user.target + diff --git a/community-testing/catalyst/3.5-do_mmap.patch b/community-testing/catalyst/3.5-do_mmap.patch new file mode 100644 index 000000000..04248eb7b --- /dev/null +++ b/community-testing/catalyst/3.5-do_mmap.patch @@ -0,0 +1,50 @@ +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200 ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200 +@@ -2106,6 +2106,12 @@ + } + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) ++# define NO_DO_MMAP ++# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f) ++# define do_munmap(a,b,c) vm_munmap(b, c) ++#endif ++ + unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval( + KCL_IO_FILE_Handle file, + unsigned long addr, +@@ -2117,10 +2123,13 @@ + + flags = MAP_SHARED; + prot = PROT_READ|PROT_WRITE; +- ++#ifdef NO_DO_MMAP ++ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff); ++#else + down_write(¤t->mm->mmap_sem); + vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff); + up_write(¤t->mm->mmap_sem); ++#endif + if (IS_ERR(vaddr)) + return 0; + else +@@ -2131,7 +2140,9 @@ + { + int retcode = 0; + ++#ifndef NO_DO_MMAP + down_write(¤t->mm->mmap_sem); ++#endif + #ifdef FGL_LINUX_RHEL_MUNMAP_API + retcode = do_munmap(current->mm, + addr, +@@ -2142,7 +2153,9 @@ + addr, + len); + #endif ++#ifndef NO_DO_MMAP + up_write(¤t->mm->mmap_sem); ++#endif + return retcode; + } + diff --git a/community-testing/catalyst/PKGBUILD b/community-testing/catalyst/PKGBUILD new file mode 100644 index 000000000..80652f726 --- /dev/null +++ b/community-testing/catalyst/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 76561 2012-09-23 08:26:49Z lcarlier $ +# Maintainer: idontknow +# Contributor: to fill with a lot of people + +pkgname=catalyst +pkgver=12.8 +pkgrel=0.1 +_extramodules=extramodules-3.5-ARCH +pkgdesc="AMD proprietary gpu drivers" +arch=('i686' 'x86_64') +url="http://www.amd.com" +license=('custom') +depends=('linux>=3.5' 'linux<3.6') +makedepends=('linux-headers>=3.5' 'linux-headers<3.6') +#conflicts=('nvidia' 'xf86-video-ati' 'ati-dri') +source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip + 3.5-do_mmap.patch) +md5sums=('41c5478322b13be6909eeb46412a3aa0' + 'a450e2e3db61994b09e9d99d95bee837') +install=catalyst.install + +build() { + cd ${srcdir} + + if [ "${CARCH}" = "x86_64" ]; then + BUILDARCH=x86_64 + _archdir=x86_64 + else + BUILDARCH=i386 + _archdir=x86 + fi + + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + sh ./amd-driver-installer*.run --extract fglrx-install + + cd fglrx-install + patch -Np1 -i ../3.5-do_mmap.patch + + cd common/lib/modules/fglrx/build_mod + ln -s "${srcdir}/fglrx-install/arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a + ln -s 2.6.x/Makefile + + CFLAGS_MODULE="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=0 -DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space -D__SMP__ -DMODVERSIONS" + + make -C /usr/lib/modules/${_kernver}/build SUBDIRS="`pwd`" ARCH=${BUILDARCH} \ + MODFLAGS="$CFLAGS_MODULE" CFLAGS_MODULE="$CFLAGS_MODULE" \ + KVER=${_kernver} PAGE_ATTR_FIX=0 modules +} + +package() { + depends=(${depends[@]} "catalyst-utils=${pkgver}") + + cd ${srcdir}/fglrx-install/common/lib/modules/fglrx/build_mod + + install -Dm644 fglrx.ko "${pkgdir}/usr/lib/modules/${_extramodules}/fglrx.ko" + install -dm755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/catalyst.install" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/fglrx.ko" + + # license + install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" +} diff --git a/community-testing/catalyst/catalyst.install b/community-testing/catalyst/catalyst.install new file mode 100644 index 000000000..22b72ea84 --- /dev/null +++ b/community-testing/catalyst/catalyst.install @@ -0,0 +1,16 @@ +post_install() { + EXTRAMODULES='extramodules-3.5-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use the catalyst module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.5-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.5-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 1e7a0e365..1623f8045 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74612 2012-07-31 19:55:33Z ebelanger $ +# $Id: PKGBUILD 76647 2012-09-25 15:44:46Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, @@ -6,7 +6,7 @@ pkgname=cegui pkgver=0.7.6 -pkgrel=5 +pkgrel=6 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64' 'mips64el') url="http://crayzedsgui.sourceforge.net" diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index a67a10498..3d02d9512 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,10 +1,10 @@ -#$ID$ +$Id: PKGBUILD 76664 2012-09-25 22:41:38Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.6 -pkgrel=3 +pkgver=1.7 +pkgrel=1 pkgdesc="Wireless LAN network manager" url="http://connman.net/" arch=('i686' 'x86_64') @@ -18,9 +18,8 @@ options=('!libtool') source=('connmand-daemon' "http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'allow_group_network.diff') - md5sums=('88ece7cbf1d0d289545ce4f8553fdab8' - '317fc8603c15fba07478d71c1891e7cb' + '9c6cf5a95989ae72d90b270ac7c6e38c' 'a8d22ee089fb0ed725130d16ad393047') build() { diff --git a/community/dwb/PKGBUILD b/community/dwb/PKGBUILD new file mode 100644 index 000000000..5d8cd77f3 --- /dev/null +++ b/community/dwb/PKGBUILD @@ -0,0 +1,24 @@ +$Id: PKGBUILD 76661 2012-09-25 22:31:13Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: portix <portix at gmx.net> + +pkgname=dwb +pkgver=2012.08.22 +pkgrel=3 +pkgdesc="A webkit web browser with vi-like keyboard shortcuts, stable snapshot" +url="http://portix.bitbucket.org/dwb/" +arch=('i686' 'x86_64') +install=dwb.install +license=('GPL') +depends=('libwebkit' 'desktop-file-utils') +source=(https://bitbucket.org/portix/"${pkgname}"/downloads/"${pkgname}"-"${pkgver}".tar.gz) +md5sums=('5cdf3a2b3f8845071529b44e2d93d653') + +build() { + cd "${srcdir}"/"${pkgname}"-"${pkgver}" + make +} +package() { + cd "${srcdir}"/"${pkgname}"-"${pkgver}" + make DESTDIR=${pkgdir} install +} diff --git a/community/dwb/dwb.install b/community/dwb/dwb.install new file mode 100644 index 000000000..5a5553eba --- /dev/null +++ b/community/dwb/dwb.install @@ -0,0 +1,11 @@ +post_install(){ + update-desktop-database -q +} + +post_upgrade(){ + post_install +} + +post_remove(){ + post_install +} diff --git a/community/ext4magic/PKGBUILD b/community/ext4magic/PKGBUILD index d229cb03f..3734d6aa7 100644 --- a/community/ext4magic/PKGBUILD +++ b/community/ext4magic/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 67335 2012-03-09 01:54:07Z seblu $ +# $Id: PKGBUILD 76580 2012-09-23 20:37:13Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ext4magic -pkgver=0.3.0 +pkgver=0.3.1 pkgrel=1 pkgdesc='Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems' arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url='http://developer.berlios.de/projects/ext4magic/' license=('GPL2') depends=('bzip2' 'file' 'util-linux' 'e2fsprogs') source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('54ed503730b7e279c5cddc99a8821de3') +md5sums=('59c194b71e33aa6bd098b91f802e67d5') build() { cd $pkgname-$pkgver diff --git a/community/frei0r-plugins/PKGBUILD b/community/frei0r-plugins/PKGBUILD index 3190c641e..fbf3b1149 100644 --- a/community/frei0r-plugins/PKGBUILD +++ b/community/frei0r-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 65204 2012-02-20 10:14:02Z spupykin $ +# $Id: PKGBUILD 76620 2012-09-25 09:17:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=frei0r-plugins pkgver=1.3 -pkgrel=3 +pkgrel=4 pkgdesc="frei0r is a minimalistic plugin API for video sources and filters." arch=(i686 x86_64 'mips64el') url="http://www.piksel.org/frei0r" diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index c7ec7ff3f..9a72caf7c 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76500 2012-09-19 17:49:55Z ttopper $ +# $Id: PKGBUILD 76540 2012-09-22 15:17:46Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 pkgver=4.3 -pkgrel=1 +pkgrel=2 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64' 'mips64el') url="http://i3wm.org/" @@ -13,8 +13,7 @@ replaces=("i3" "i3bar") groups=("i3") depends=('libxcursor' 'xcb-util-keysyms' 'xcb-util-wm' 'libev' 'yajl' 'startup-notification' 'pango') makedepends=('bison' 'flex') -optdepends=('rxvt-unicode: The terminal emulator used in the default config.' - 'dmenu: As menu.' +optdepends=('dmenu: As menu.' 'i3lock: For locking your screen.' 'i3status: To display systeminformation with a bar.' 'perl: To migrate your configuration to v4 format.') diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index 5828a7a3f..4270bf249 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 73450 2012-07-07 23:42:48Z seblu $ +# $Id: PKGBUILD 76538 2012-09-22 15:01:58Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ipset -pkgver=6.13 +pkgver=6.14 pkgrel=1 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" "$pkgname.rc" "$pkgname.systemd" "$pkgname.service") -md5sums=('0b7f5db12a1852d9c31b1ec13d31ade1' +md5sums=('70f2d4c054592236dcda285855a4ee58' '3e606a2823a700b4e9c5f17511a6f6a5' 'de89b054d967036e08b13bc6a7235286' 'dfc3105b89ed41fc4a1feb4f4f13f2a3' diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 638c534d9..8c35c0f67 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75795 2012-08-31 14:01:54Z spupykin $ +# $Id: PKGBUILD 76586 2012-09-24 09:56:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') @@ -36,7 +36,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd-guests.conf.d libvirt.tmpfiles.d openbsd-netcat-default.patch) -md5sums=('5f628e53437b0b0e78477904ba3310af' +md5sums=('a5e50860d9da238ba270b528411c4a0d' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' '8297b1be794a24cc77f66af9380ace59' diff --git a/community/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD index c339165b5..85dbc9304 100644 --- a/community/mediaproxy/PKGBUILD +++ b/community/mediaproxy/PKGBUILD @@ -1,24 +1,23 @@ -# $Id: PKGBUILD 56530 2011-10-07 21:31:08Z spupykin $ +# $Id: PKGBUILD 76639 2012-09-25 15:05:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=mediaproxy pkgver=2.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Open-source media proxy for OpenSER" url="http://mediaproxy.ag-projects.com/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('python2' 'libnetfilter_conntrack' 'iptables' 'python-application' 'python-cjson' 'python-gnutls') -backup=('opt/mediaproxy/config.ini') +#backup=('opt/mediaproxy/config.ini') source=("http://download.ag-projects.com/MediaProxy/mediaproxy-$pkgver.tar.gz" "mediaproxy.init") md5sums=('840de8f52e656991be728c15ec30bb5e' '64042f4686de69a9bdd27d51cbe8a548') -build() -{ +build() { cd $srcdir/mediaproxy-$pkgver install -D -m0755 $srcdir/mediaproxy.init $pkgdir/etc/rc.d/mediaproxy python2 setup.py install --root=$pkgdir diff --git a/community/mesa-dri1/PKGBUILD b/community/mesa-dri1/PKGBUILD index 4676e046a..f63f0d717 100644 --- a/community/mesa-dri1/PKGBUILD +++ b/community/mesa-dri1/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: ConnorBehan <connor.behan@gmail.com> pkgbase=mesa-dri1 -pkgname=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') +pkgname=('unichrome-dri' 'i810-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') pkgver=7.11.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.14' 'dri2proto' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'llvm' 'udev') @@ -18,7 +18,7 @@ build() { autoreconf -vfi ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-dri-drivers=unichrome,mach64,mga,r128,savage,sis,tdfx \ + --with-dri-drivers=unichrome,i810,mach64,mga,r128,savage,sis,tdfx \ --with-gallium-drivers= \ --disable-gallium-llvm \ --enable-glx-tls \ @@ -41,6 +41,13 @@ package_unichrome-dri() { make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install } +package_i810-dri() { + depends=("libgl") + pkgdesc="Mesa DRI drivers for Intel i810" + + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install +} + package_mach64-dri() { depends=("libgl") pkgdesc="Mesa DRI drivers for ATI Mach64" diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD index 6882392cb..694a30ae6 100644 --- a/community/mingw32-gcc-base/PKGBUILD +++ b/community/mingw32-gcc-base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72373 2012-06-13 10:03:53Z spupykin $ +# $Id: PKGBUILD 76624 2012-09-25 09:56:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> @@ -8,8 +8,8 @@ _w32apiver=3.17 _runtimever=3.20 _uprel=1 _upw32rel=1 -pkgrel=1 -arch=(i686 x86_64 'mips64el') +pkgrel=2 +arch=(i686 x86_64) pkgdesc="A C cross-compiler for building Windows executables on Linux" depends=(mingw32-binutils) makedepends=(p7zip mingw32-runtime mingw32-w32api) diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD index c342bd7bf..6f29bd109 100644 --- a/community/motion/PKGBUILD +++ b/community/motion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73478 2012-07-08 09:30:42Z ibiru $ +# $Id: PKGBUILD 76588 2012-09-24 09:58:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=motion pkgver=3.2.12 -pkgrel=6 +pkgrel=7 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,11 +13,15 @@ backup=('etc/motion/motion.conf') options=('!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.motion + motion.service + motion.tmpfiles ffmpeg-0.8.patch linux-headers.patch ffmpeg-compat.patch) md5sums=('1ba0065ed50509aaffb171594c689f46' '2e8c53c4980edddd420f08fdd572c9be' + 'b5b589f8f39939b7a1802cbd9dbe2e1a' + 'f863f8c025f7f025b2178def8418decd' 'd36687710837d69fbce4608b1345fa34' 'd8c3c4fdded5cfbd729710475559a21d' 'e85c596292aceb425fcf17e5072e2fff') @@ -42,4 +46,6 @@ package(){ make DESTDIR="${pkgdir}" install mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf" install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion" + install -Dm644 "${srcdir}/motion.service" "${pkgdir}/usr/lib/systemd/system/motion.service" + install -Dm644 "${srcdir}/motion.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/motion.conf" } diff --git a/community/motion/motion.service b/community/motion/motion.service new file mode 100644 index 000000000..23aba29cd --- /dev/null +++ b/community/motion/motion.service @@ -0,0 +1,12 @@ +[Unit] +Description=Motion daemon +After=local-fs.target + +[Service] +ExecStart=/usr/bin/motion +Type=forking +#StandardOutput=null +StandardError=null + +[Install] +WantedBy=multi-user.target diff --git a/community/motion/motion.tmpfiles b/community/motion/motion.tmpfiles new file mode 100644 index 000000000..b558b66df --- /dev/null +++ b/community/motion/motion.tmpfiles @@ -0,0 +1 @@ +D /var/run/motion 0755 root root diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD index dc8c305c7..9496b00da 100644 --- a/community/mygui/PKGBUILD +++ b/community/mygui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69363 2012-04-14 17:09:46Z svenstaro $ +# $Id: PKGBUILD 76650 2012-09-25 16:18:14Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrew Belitsky <belitsky.a@gmail.com> pkgbase=mygui pkgname=('mygui' 'mygui-docs') pkgver=3.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="A multilayer and overlappable GUI System for OGRE" arch=('i686' 'x86_64' 'mips64el') url="http://mygui.info/" @@ -24,6 +24,7 @@ build() { -e 's:"bin":"../opt/MYGUI":' \ CMake/InstallResources.cmake sed -i '71 i set(MYGUI_GCC_VISIBILITY_FLAGS "")' CMakeLists.txt + sed -i 's/\${OIS_LIBRARIES}/${OIS_LIBRARIES} boost_system/g' Common/CMakeLists.txt # get a clean build dir [[ -d build ]] && rm -rf build diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index d933da1aa..e7f709f19 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 70836 2012-05-17 14:29:47Z spupykin $ +# $Id: PKGBUILD 76626 2012-09-25 10:38:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc -pkgver=5.1.11 -pkgrel=3 +pkgver=5.2.2 +pkgrel=1 pkgdesc="ODBC driver/connector for MySQL" arch=(i686 x86_64 'mips64el') url="http://dev.mysql.com/downloads/connector/odbc/" @@ -11,8 +11,8 @@ depends=('unixodbc' 'libmysqlclient') makedepends=('cmake') license=('GPL') options=('libtool') -source=("http://mysql.skynet.be/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-$pkgver-src.tar.gz") -md5sums=('1d868f404038bbce6623a28255c8a9f7') +source=("http://cdn.mysql.com/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-$pkgver-src.tar.gz") +md5sums=('bb7829c68338b99debe312839edb79ad') build() { cd $srcdir/mysql-connector-odbc-${pkgver}-src diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 02752388f..62ffecfaa 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74874 2012-08-08 06:49:13Z spupykin $ +# $Id: PKGBUILD 76652 2012-09-25 18:40:48Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -7,7 +7,7 @@ _cfgdir=/etc/nginx _tmpdir=/var/lib/nginx pkgname=nginx -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') @@ -31,7 +31,7 @@ source=(http://nginx.org/download/nginx-$pkgver.tar.gz rc.d service nginx.logrotate) -md5sums=('0a986e60826d9e3b453dbefc36bf8f6c' +md5sums=('a7c9a515f632c8cbb07ab67392208088' 'f62c7c9b5a53471d4666a4c49ad363fb' '62d494d23aef31d0b867161f9fffa6eb' 'b38744739022876554a0444d92e6603b') diff --git a/community/openbsd-netcat/PKGBUILD b/community/openbsd-netcat/PKGBUILD index bcc1f52f6..0ec2d4194 100644 --- a/community/openbsd-netcat/PKGBUILD +++ b/community/openbsd-netcat/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70324 2012-05-04 10:32:12Z spupykin $ +# $Id: PKGBUILD 76590 2012-09-24 09:58:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname="openbsd-netcat" pkgver=1.105 -pkgrel=3 -_patch=6 +pkgrel=4 +_patch=7 pkgdesc="TCP/IP swiss army knife. OpenBSD variant." arch=('i686' 'x86_64' 'mips64el') url="http://packages.debian.org/sid/netcat-openbsd" @@ -15,7 +15,7 @@ makedepends=('gcc' 'make') source=("http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}.orig.tar.gz" "http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}-${_patch}.debian.tar.gz") md5sums=('7e67b22f1ad41a1b7effbb59ff28fca1' - '1928b269b86d404ffb8ff57d3ead1d2c') + 'e914f8eb7eda5c75c679dd77787ac76b') build() { cd $srcdir/netcat-openbsd-${pkgver} diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 879dbf684..8c8c09485 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75316 2012-08-19 08:00:44Z heftig $ +# $Id: PKGBUILD 76563 2012-09-23 10:10:49Z jelle $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu -pkgver=0.7.13 -pkgrel=4 +pkgver=0.7.14 +pkgrel=1 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64' 'mips64el') url="http://pdf2djvu.googlecode.com" @@ -31,3 +31,4 @@ check() { sed -i 's/nosetests/nosetests2/' tests/Makefile make test } +md5sums=('bfeb443f81d0df7544fd393ad7ee6cd7') diff --git a/community/php-memcache/PKGBUILD b/community/php-memcache/PKGBUILD index 8e9d67f97..7327f30bc 100644 --- a/community/php-memcache/PKGBUILD +++ b/community/php-memcache/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 70503 2012-05-09 18:48:11Z pschmitz $ +# $Id: PKGBUILD 76558 2012-09-23 05:22:53Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=php-memcache -pkgver=3.0.6 -pkgrel=3 +pkgver=3.0.7 +pkgrel=1 pkgdesc="Memcache module for PHP" arch=('i686' 'x86_64' 'mips64el') url="http://pecl.php.net/package/memcache" @@ -12,7 +12,7 @@ depends=('php') backup=('etc/php/conf.d/memcache.ini') install=php-memcache.install source=(http://pecl.php.net/get/memcache-$pkgver.tgz) -sha256sums=('cf6871f0944ee38022c5f84910f306d83b0f51564bbc08624a215e06d8486618') +sha256sums=('f34e2ef42dd8f1f7e6a2cfbb9417a9e58e3bfd7f5db7227ca5afab686cefdd1f') build() { cd "$srcdir/memcache-$pkgver" diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD index e2a8a1086..8fd3a5ca0 100644 --- a/community/postgis/PKGBUILD +++ b/community/postgis/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 71631 2012-05-31 14:23:54Z andrea $ +# $Id: PKGBUILD 76606 2012-09-24 15:07:54Z dan $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=postgis -pkgver=2.0.0 -pkgrel=2 +pkgver=2.0.1 +pkgrel=1 pkgdesc="Adds support for geographic objects to PostgreSQL" arch=('i686' 'x86_64' 'mips64el') url="http://postgis.org/" license=('GPL') -depends=('postgresql' 'gdal' 'json-c') +depends=('postgresql>=9.2' 'postgresql<9.3' 'proj' 'geos' 'gdal' 'json-c' 'libxml2') changelog=$pkgname.changelog options=('!libtool') source=("http://postgis.org/download/${pkgname}-${pkgver}.tar.gz") -sha256sums=('12179e24e348421c60c501590fda25bd349e2f697003958d9493f5c91b280081') +sha256sums=('32d181bbf0e648fe31c95b3dd23f7e4e49094d93cb4278fdf71c8feed4e9593c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/postgis/postgis.changelog b/community/postgis/postgis.changelog index 13d851351..4e12d69f7 100644 --- a/community/postgis/postgis.changelog +++ b/community/postgis/postgis.changelog @@ -1,3 +1,7 @@ +2012-09-24 Dan McGee <dan@archlinux.org> + * Rebuild for PostgreSQL 9.2.x + * Update to minor release 2.0.1 + 2012-05-31 Andrea Scarpino <andrea@archlinux.org> * Add JSON-C support * Build utils (FS#25836) diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD index f64fd7893..481bfbd75 100644 --- a/community/task/PKGBUILD +++ b/community/task/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: coolkehon <coolkehon@gmail.com> pkgname=task -pkgver=2.1.1 +pkgver=2.1.2 pkgrel=1 pkgdesc="A command-line todo list manager" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('lua' 'util-linux') makedepends=('cmake' 'lua') optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon') source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz) -sha256sums=('b2a3d15093988c703ed0fc9b011c532f662fc939ea741dd8b9c996d83901b05e') +sha256sums=('cf5171b54b6d2d2dcd9c559f437cf8a2cb3836c7631edf96a16efbf8b4383e36') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD index 547d604d7..50acdd99b 100644 --- a/community/virtviewer/PKGBUILD +++ b/community/virtviewer/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73649 2012-07-12 13:51:32Z spupykin $ +# $Id: PKGBUILD 76592 2012-09-24 09:59:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jonathan Wiersma <archaur at jonw dot org> pkgname=virtviewer -pkgver=0.5.3 +pkgver=0.5.4 pkgrel=1 pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS." depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt') @@ -12,11 +12,10 @@ url="http://virt-manager.et.redhat.com" arch=('i686' 'x86_64' 'mips64el') license=('GPL') source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz") -md5sums=('69a7c6d5cbd23d478396da4883567261') +md5sums=('43c269da571e65b12421b6fc9f871e98') build() { cd $srcdir/virt-viewer-$pkgver -# export LDFLAGS=-lX11 ./configure --prefix=/usr make make DESTDIR=$pkgdir install diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index 36702c2bc..44ced294f 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,43 +1,25 @@ -# $Id: PKGBUILD 163714 2012-07-18 02:16:52Z dreisner $ +# $Id: PKGBUILD 166962 2012-09-23 12:22:15Z tomegun $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=coreutils -pkgver=8.17 -pkgrel=3 +pkgver=8.19 +pkgrel=1 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://www.gnu.org/software/coreutils" groups=('base') depends=('glibc' 'pam' 'acl' 'gmp' 'libcap') -replaces=('mktemp') -backup=('etc/pam.d/su') install=${pkgname}.install -options=('!emptydirs') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} - coreutils-pam.patch - 0001-ls-color-each-symlink-to-relative-name-in-properly.patch - su.pam) -md5sums=('bbda656ce8ca2c6903948f9faa204ba3' - 'ebecd29b095aa21b0b2f833f1ec20d70' - 'aad79a2aa6d566c375d7bdd1b0767278' - 'd7c691898a695a6284a927e6a9426fe4' - 'fa85e5cce5d723275b14365ba71a8aad') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('1a01231a2f3ed37c0efc073ccdda9375' + '7f564749d834397aa67f0f05bacb62d5') build() { cd ${srcdir}/${pkgname}-${pkgver} - # added su wheel group pam patch (from fedora git) - patch -Np1 -i ${srcdir}/coreutils-pam.patch - - # fix coloring for symlinks in / - # upstream commit 6124a3842dfa8484b52e067a8ab8105c3875a4f7 - patch -Np1 -i $srcdir/0001-ls-color-each-symlink-to-relative-name-in-properly.patch - - autoreconf -v - ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \ - --enable-install-program=su \ + ./configure --prefix=/usr --libexecdir=/usr/lib \ --enable-no-install-program=groups,hostname,kill,uptime \ --enable-pam make @@ -53,14 +35,13 @@ package() { make DESTDIR=${pkgdir} install cd ${pkgdir}/usr/bin - install -dm755 ${pkgdir}/{bin,usr/sbin} + install -dm755 ${pkgdir}/bin # binaries required by FHS _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false' - 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'su' 'sync' + 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'sync' 'true' 'uname') - mv ${_fhs[@]} ${pkgdir}/bin - - mv chroot ${pkgdir}/usr/sbin - install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su + for i in ${_fhs[@]}; do + ln -s ../usr/bin/$i ${pkgdir}/bin/$i + done } diff --git a/core/coreutils/coreutils.install b/core/coreutils/coreutils.install index 8caae6686..22cfcb2a1 100644 --- a/core/coreutils/coreutils.install +++ b/core/coreutils/coreutils.install @@ -1,11 +1,9 @@ infodir=usr/share/info -filelist=(coreutils.info) +file=coreutils.info post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done + [[ -x usr/bin/install-info ]] || return 0 + install-info $infodir/$file.gz $infodir/dir 2> /dev/null } post_upgrade() { @@ -13,9 +11,7 @@ post_upgrade() { } pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done + [[ -x usr/bin/install-info ]] || return 0 + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null } diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD index 40e2f5780..9ae02b8f6 100644 --- a/core/libarchive/PKGBUILD +++ b/core/libarchive/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 155375 2012-04-02 16:12:53Z dan $ +# $Id: PKGBUILD 167058 2012-09-25 03:07:21Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=libarchive pkgver=3.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64' 'mips64el') url="http://libarchive.googlecode.com/" license=('BSD') depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') -source=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz") -md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16') -sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac') +source=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz" + libarchive-3.0.x-fix-mtree-writer.patch) +md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16' + '6d36a50a7282db6576bd1fbc23f08055') +sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac' + 'f0081c0d7d7875fc91c683b14fe4876d56b6585f45be9181c755eba4b522f5b9') + build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i $srcdir/libarchive-3.0.x-fix-mtree-writer.patch ./configure --prefix=/usr --without-xml2 make } diff --git a/core/libarchive/libarchive-3.0.x-fix-mtree-writer.patch b/core/libarchive/libarchive-3.0.x-fix-mtree-writer.patch new file mode 100644 index 000000000..dbc89686a --- /dev/null +++ b/core/libarchive/libarchive-3.0.x-fix-mtree-writer.patch @@ -0,0 +1,34 @@ +--- a/libarchive/archive_write_set_format_mtree.c ++++ b/libarchive/archive_write_set_format_mtree.c +@@ -887,6 +887,19 @@ write_entry(struct archive_write *a, struct mtree_entry *me) + + archive_string_empty(&mtree->ebuf); + str = (mtree->indent)? &mtree->ebuf : &mtree->buf; ++ ++ /* If the pathname does not have a path separator, we have to ++ * add "./" to the head of the pathename because mtree reader ++ * will suppose that it is v1(a.k.a classic) mtree format and ++ * change the directory unexpectedly and so it will make a wrong ++ * path. */ ++ if (strchr(me->pathname, '/') == NULL && ++ strcmp(me->pathname, ".") != 0) { ++ archive_strcat(str, "./"); ++ } ++ /* mtree reader does not accept an absolute path. */ ++ else if (me->pathname[0] == '/') ++ archive_strappend_char(str, '.'); + mtree_quote(str, me->pathname); + keys = get_keys(mtree, me); + if ((keys & F_NLINK) != 0 && +--- a/libarchive/test/test_read_format_mtree.c ++++ b/libarchive/test/test_read_format_mtree.c +@@ -37,7 +37,8 @@ test_read_format_mtree1(void) + * without relying on overflow. This assumes that long long + * is at least 64 bits. */ + static const long long max_int64 = ((((long long)1) << 62) - 1) + (((long long)1) << 62); +- time_t min_time, t; ++ time_t min_time; ++ volatile time_t t; + + extract_reference_file(reffile); +
\ No newline at end of file diff --git a/core/mlocate/PKGBUILD b/core/mlocate/PKGBUILD index c45a7132a..9ebf0261c 100644 --- a/core/mlocate/PKGBUILD +++ b/core/mlocate/PKGBUILD @@ -1,51 +1,49 @@ -# $Id: PKGBUILD 162719 2012-06-29 02:14:10Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 166971 2012-09-23 22:22:21Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: lydgate pkgname=mlocate -pkgver=0.25 -pkgrel=2 -pkgdesc="Faster merging drop-in for slocate" +pkgver=0.26 +pkgrel=1 +pkgdesc='Merging locate/updatedb implementation' +url='https://fedorahosted.org/mlocate/' arch=('i686' 'x86_64' 'mips64el') -url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate" license=('GPL') -depends=('glibc' 'coreutils' 'sh') backup=('etc/updatedb.conf' 'etc/cron.daily/updatedb') -source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz - updatedb.conf - updatedb.cron.daily) -md5sums=('c6d043b170613b0e327a815b497f680a' - 'b56d81de17fe29b01b4b28861acb8fd4' - 'cde5da81bebad2de556ef2e43d895e13') +source=("https://fedorahosted.org/releases/m/l/mlocate/mlocate-${pkgver}.tar.xz" + 'updatedb.conf' + 'updatedb.cron') +sha1sums=('c6e6d81b25359c51c545f4b8ba0f3b469227fcbc' + '0150379149bf9d714bc81332d775fc273e7e3535' + '8301e6277d27db539af6cf4bc243e8e247bffc2e') build() { - cd $srcdir/$pkgname-$pkgver - - sed -i '/^groupname /s/mlocate/locate/' Makefile.in - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib - make + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i '/^groupname /s/mlocate/locate/' Makefile.in + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib + make } check() { - cd $srcdir/$pkgname-$pkgver - make check + cd "${srcdir}/${pkgname}-${pkgver}" + make check } package() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=$pkgdir install + make DESTDIR="${pkgdir}" install - ln -s locate $pkgdir/usr/bin/slocate - chgrp 21 $pkgdir/usr/bin/locate - chmod 2755 $pkgdir/usr/bin/locate + chgrp 21 "${pkgdir}/usr/bin/locate" + chmod 2755 "${pkgdir}/usr/bin/locate" + ln -s locate "${pkgdir}/usr/bin/slocate" - install -dm755 $pkgdir/var/lib - install -dm750 -g21 $pkgdir/var/lib/locate - - # Set up a default updatedb.conf and a daily cronjob - install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf - install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb + install -dm755 "${pkgdir}/var/lib" + install -dm750 -g21 "${pkgdir}/var/lib/locate" + + install -Dm644 ../updatedb.conf "${pkgdir}/etc/updatedb.conf" + install -Dm744 ../updatedb.cron "${pkgdir}/etc/cron.daily/updatedb" } diff --git a/core/mlocate/updatedb.cron b/core/mlocate/updatedb.cron new file mode 100755 index 000000000..431cb533e --- /dev/null +++ b/core/mlocate/updatedb.cron @@ -0,0 +1,6 @@ +#!/bin/sh + +NICE='nice -n 19' +IONICE='ionice -c 2 -n 7' + +exec ${IONICE} ${NICE} updatedb -f proc diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD index fe2c7d8b9..71a967c00 100644 --- a/core/procps-ng/PKGBUILD +++ b/core/procps-ng/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 163561 2012-07-15 23:10:42Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> +# $Id: PKGBUILD 166961 2012-09-23 12:22:10Z tomegun $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Eric Bélanger <eric@archlinux.org> pkgname=procps-ng pkgver=3.3.3 -pkgrel=3 -pkgdesc="Utilities for monitoring your system and processes on your system" +pkgrel=6 +pkgdesc='Utilities for monitoring your system and its processes' arch=('i686' 'x86_64' 'mips64el') url="http://gitorious.org/procps" license=('GPL' 'LGPL') @@ -19,7 +20,7 @@ options=('!libtool') source=(procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver} sysctl.conf) sha1sums=('e78a098f1a3c06722155800cc5cfa0c865af03c0' - 'efb6cdc17ee39be8433ae9c8e9bb02d1f47eeefc') + '97ff07bab9aa5daa8d54a1346f73ba74f8e12a53') build() { cd "${srcdir}/procps-procps" @@ -32,5 +33,9 @@ build() { package() { cd "${srcdir}/procps-procps" make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/sysctl.conf" "${pkgdir}/etc/sysctl.conf" + install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf" + + # provided by util-linux + rm "${pkgdir}/bin/kill" + rm "${pkgdir}/usr/share/man/man1/kill.1" } diff --git a/core/procps-ng/sysctl.conf b/core/procps-ng/sysctl.conf index baddd90a6..4695cdd92 100644 --- a/core/procps-ng/sysctl.conf +++ b/core/procps-ng/sysctl.conf @@ -1,46 +1,41 @@ -# /etc/sysctl.conf - Configuration file for setting system variables -# See sysctl.conf (5) for information. +# Configuration file for runtime kernel parameters. +# See sysctl.conf(5) for more information. -# you can have the CD-ROM close when you use it, and open -# when you are done. -#dev.cdrom.autoeject = 1 +# Have the CD-ROM close when you use it, and open when you are done. #dev.cdrom.autoclose = 1 +#dev.cdrom.autoeject = 1 -# protection from the SYN flood attack +# Protection from the SYN flood attack. net.ipv4.tcp_syncookies = 1 -# see the evil packets in your log files +# See evil packets in your logs. #net.ipv4.conf.all.log_martians = 1 -# if not functioning as a router, there is no need to accept redirects or source routes +# Never accept redirects or source routes (these are only useful for routers). #net.ipv4.conf.all.accept_redirects = 0 #net.ipv4.conf.all.accept_source_route = 0 #net.ipv6.conf.all.accept_redirects = 0 #net.ipv6.conf.all.accept_source_route = 0 -# Disable packet forwarding +# Disable packet forwarding. net.ipv4.ip_forward = 0 net.ipv6.conf.all.forwarding = 0 -# Enable IPv6 Privacy Extensions -net.ipv6.conf.default.use_tempaddr = 2 -net.ipv6.conf.all.use_tempaddr = 2 - -# sets the port range used for outgoing connections -#net.ipv4.ip_local_port_range = 32768 61000 +# Tweak the port range used for outgoing connections. +#net.ipv4.ip_local_port_range = 32768 61000 -# Swapping too much or not enough? Disks spinning up when you'd -# rather they didn't? Tweak these. +# Tweak those values to alter disk syncing and swap behavior. #vm.vfs_cache_pressure = 100 #vm.laptop_mode = 0 #vm.swappiness = 60 +# Tweak how the flow of kernel messages is throttled. #kernel.printk_ratelimit_burst = 10 #kernel.printk_ratelimit = 5 -#kernel.panic_on_oops = 0 -# Reboot 600 seconds after a panic +# Reboot 600 seconds after kernel panic or oops. +#kernel.panic_on_oops = 1 #kernel.panic = 600 -# Disable SysRq key (note: console security issues) +# Disable SysRq key to avoid console security issues. kernel.sysrq = 0 diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD index d59b20267..1cc58ea81 100644 --- a/core/sysvinit/PKGBUILD +++ b/core/sysvinit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165862 2012-09-01 20:01:12Z tomegun $ +# $Id: PKGBUILD 166964 2012-09-23 12:22:41Z tomegun $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgbase=sysvinit pkgname=('sysvinit-tools' 'sysvinit') pkgver=2.88 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/sysvinit" license=('GPL') @@ -37,11 +37,10 @@ package_sysvinit-tools() { cd "${pkgdir}" rm bin/mountpoint rm usr/share/man/man1/mountpoint.1 -# once u-l-2.22 is out -# rm usr/bin/{mesg,utmpdump,wall} -# rm usr/share/man/man1/{mesg,utmpdump,wall}.1 -# rm sbin/sulogin -# rm usr/share/man/man8/sulogin.8 + rm usr/bin/{mesg,utmpdump,wall} + rm usr/share/man/man1/{mesg,utmpdump,wall}.1 + rm sbin/sulogin + rm usr/share/man/man8/sulogin.8 ### split out sysvinit rm -rf ${srcdir}/_sysvinit diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index c546f4d57..5c3006962 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,36 +1,59 @@ -# $Id: PKGBUILD 163535 2012-07-15 00:25:36Z tomegun $ +# $Id: PKGBUILD 166963 2012-09-23 12:22:32Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.21.2 -pkgrel=5 +pkgver=2.22 +pkgrel=6 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64' 'mips64el') groups=('base') -depends=('pam') -conflicts=('util-linux-ng') -provides=("util-linux-ng=${pkgver}") +depends=('pam' 'shadow') +makedepends=('bc') # for check() only, change this to checkdepends for pacman 4.1 +conflicts=('util-linux-ng' 'eject') +provides=("util-linux-ng=${pkgver}" 'eject') license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.22/${pkgname}-${pkgver}.tar.xz + su.1 + uuidd.tmpfiles pam-login - pam-common) -backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login) + pam-common + pam-su + hwclock-systz.patch) +backup=(etc/pam.d/chfn + etc/pam.d/chsh + etc/pam.d/login + etc/pam.d/su + etc/pam.d/su-l) install=util-linux.install build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../hwclock-systz.patch + + # unbreak --localstatedir + # TODO(dreisner): find out what sami had in mind with these heuristics + sed -i '71,75d' configure.ac + ./autogen.sh + ./configure --prefix=/usr \ --libdir=/usr/lib \ + --localstatedir=/run \ --enable-fs-paths-extra=/usr/bin:/usr/sbin \ - --enable-write \ --enable-raw \ - --disable-wall \ - --enable-new-mount \ - --enable-login-utils + --enable-vipw \ + --enable-newgrp \ + --enable-chfn-chsh \ + --enable-write \ + --enable-mesg \ + --enable-socket-activation + +# --enable-reset \ # part of ncurses +# --enable-last \ # not part of any package +# --enable-line \ # not compat make } @@ -46,20 +69,29 @@ package() { cd "${pkgdir}" - # broken tool, going away in next major release, so just remove it now - rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1} - - # delete stray empty dir, fixed upstream - rm -r usr/share/man/ru - # setuid chfn and chsh - chmod 4755 "$pkgdir"/usr/bin/ch{sh,fn} + chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}} # install PAM files for login-utils install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn" install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh" install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login" + install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su" + install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su-l" + + # broken buildsys doesn't include su(1), which means it + # isn't even in the dist tarball + # TODO(dreisner): patched upstream + install -m644 "$srcdir/su.1" "$pkgdir/usr/share/man/man1/su.1" + + # include tmpfiles fragment for uuidd + # TODO(dreisner): offer this upstream? + install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" } -md5sums=('54ba880f1d66782c2287ee2c898520e9' +md5sums=('ba2d8cc12a937231c80a04f7f7149303' + '7f524538dcf57284a86f03a98e624f04' + 'a39554bfd65cccfd8254bb46922f4a67' '4368b3f98abd8a32662e094c54e7f9b1' - 'a31374fef2cba0ca34dfc7078e2969e4') + 'a31374fef2cba0ca34dfc7078e2969e4' + 'fa85e5cce5d723275b14365ba71a8aad' + '19eaa197a0cfb046661dede2e991120b') diff --git a/core/util-linux/hwclock-systz.patch b/core/util-linux/hwclock-systz.patch new file mode 100644 index 000000000..79ed1a5f3 --- /dev/null +++ b/core/util-linux/hwclock-systz.patch @@ -0,0 +1,96 @@ +From 46a8834c2eb9b0c37d92e30d1a262e41306cf36f Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Wed, 19 Sep 2012 18:10:34 +0200 +Subject: [PATCH 1/2] hwclock: don't warp the systemtime if it is in UTC + +A sideeffect of 839be2ba6b44fa9dc927f081d547ebadec9de19c is that we now +warp the systemtime according to the timezone, on the first call of +--systz. This is not always the correct thing to do, and causes a +regression for us in Arch Linux. + +This is the correct thing to do if the RTC, and hence the systemtime is +set in localtime. However, if the systemtime is already in UTC we don't +want to touch it when we set the kernel timezone (which we still need to +do as e.g. FAT stores timestamps in localtime). + +An almost identical issue was also fixed in systemd commit +72edcff5db936e54cfc322d9392ec46e2428fd9b. + +Fixes: +Signed-off-by: Tom Gundersen <teg@jklm.no> +--- + sys-utils/hwclock.8 | 11 +++++++---- + sys-utils/hwclock.c | 17 +++++++++++++++-- + 2 files changed, 22 insertions(+), 6 deletions(-) + +diff --git a/sys-utils/hwclock.8 b/sys-utils/hwclock.8 +index 07d9fc0..5c599ad 100644 +--- a/sys-utils/hwclock.8 ++++ b/sys-utils/hwclock.8 +@@ -58,10 +58,12 @@ This is a good option to use in one of the system startup scripts. + Set the Hardware Clock to the current System Time. + .TP + .B \-\-systz +-Reset the System Time based on the current timezone. ++Set the kernel's timezone and reset the System Time based on the current timezone. + +-Also set the kernel's timezone value to the local timezone +-as indicated by the TZ environment variable and/or ++The system time is only reset on the first call after boot. ++ ++The local timezone is taken to be what is ++indicated by the TZ environment variable and/or + .IR /usr/share/zoneinfo , + as + .BR tzset (3) +@@ -74,7 +76,8 @@ This is an alternate option to + .B \-\-hctosys + that does not read the hardware clock, and may be used in system startup + scripts for recent 2.6 kernels where you know the System Time contains +-the Hardware Clock time. ++the Hardware Clock time. If the Hardware Clock is already in UTC, it is ++not reset. + .TP + .B \-\-adjust + Add or subtract time from the Hardware Clock to account for systematic +diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c +index 5a4c87e..351ce1f 100644 +--- a/sys-utils/hwclock.c ++++ b/sys-utils/hwclock.c +@@ -772,7 +772,6 @@ static int set_system_clock_timezone(const bool universal, const bool testing) + struct timeval tv; + struct tm *broken; + int minuteswest; +- int rc; + + gettimeofday(&tv, NULL); + if (debug) { +@@ -818,10 +817,24 @@ static int set_system_clock_timezone(const bool universal, const bool testing) + ("Not setting system clock because running in test mode.\n")); + retcode = 0; + } else { ++ const struct timezone tz_utc = { 0, 0 }; + const struct timezone tz = { minuteswest, 0 }; + const struct timeval *tv_null = NULL; ++ int rc = 0; ++ ++ /* The first call to settimeofday after boot will assume the systemtime ++ * is in localtime, and adjust it according to the given timezone to ++ * compensate. If the systemtime is in fact in UTC, then this is wrong ++ * so we first do a dummy call to make sure the time is not shifted. ++ */ ++ if (universal) ++ rc = settimeofday(tv_null, &tz_utc); ++ ++ /* Now we set the real timezone. Due to the above dummy call, this will ++ * only warp the systemtime if the RTC is not in UTC. */ ++ if (!rc) ++ rc = settimeofday(tv_null, &tz); + +- rc = settimeofday(tv_null, &tz); + if (rc) { + if (errno == EPERM) { + warnx(_ +-- +1.7.12.1 + diff --git a/core/util-linux/pam-su b/core/util-linux/pam-su new file mode 100644 index 000000000..cf15f40f1 --- /dev/null +++ b/core/util-linux/pam-su @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +# Uncomment the following line to implicitly trust users in the "wheel" group. +#auth sufficient pam_wheel.so trust use_uid +# Uncomment the following line to require a user to be in the "wheel" group. +#auth required pam_wheel.so use_uid +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/core/util-linux/su.1 b/core/util-linux/su.1 new file mode 100644 index 000000000..59e17314d --- /dev/null +++ b/core/util-linux/su.1 @@ -0,0 +1,230 @@ +.TH SU "1" "June 2012" "util-linux" "User Commands" +.SH NAME +su \- run a command with substitute user and group ID +.SH SYNOPSIS +.B su +[options...] [\-] [user [args...]] +.SH DESCRIPTION +.B su +allows to run commands with substitute user and group ID. +.PP +When called without arguments +.B su +defaults to running an interactive shell as +.IR root . +.PP +For backward compatibility +.B su +defaults to not change the current directory and to only set the +environment variables +.B HOME +and +.B SHELL +(plus +.B USER +and +.B LOGNAME +if the target +.I user +is not root). It is recommended to always use the +.B \-\-login +option (instead it's shortcut +.BR \- ) +to avoid side effects caused by mixing environments. +.PP +This version of +.B su +uses PAM for authentication, account and session management. Some +configuration options found in other +.B su +implementations such as e.g. support of a wheel group have to be +configured via PAM. +.SH OPTIONS +.TP +\fB\-c\fR \fIcommand\fR, \fB\-\-command\fR=\fIcommand\fR +Pass +.I command +to the shell with the +.B \-c +option. +.TP +\fB\-\-session\-command\fR=\fIcommand\fR +Same as +.B \-c +but do not create a new session (discouraged). +.TP +\fB\-f\fR, \fB\-\-fast\fR +Pass +.B \-f +to the shell which may or may not be useful depending on the +shell. +.TP +\fB\-g\fR, \fB\-\-group\fR=\fIgroup\fR\fR +specify the primary group, this option is allowed for root user only +.TP +\fB\-G\fR, \fB\-\-supp-group\fR=\fIgroup\fR\fR +specify a supplemental group, this option is allowed for root user only +.TP +\fB\-\fR, \fB\-l\fR, \fB\-\-login\fR +Starts the shell as login shell with an environment similar to a real +login: +.RS 10 +.TP +o +clears all environment variables except for +.B TERM +.TP +o +initializes the environment variables +.BR HOME , +.BR SHELL , +.BR USER , +.BR LOGNAME , +.B PATH +.TP +o +changes to the target user's home directory +.TP +o +sets argv[0] of the shell to +.RB ' \- ' +in order to make the shell a login shell +.RE +.TP +\fB\-m\fR, \fB\-p\fR, \fB\-\-preserve-environment\fR +Preserves the whole environment, ie does not set +.BR HOME , +.BR SHELL , +.B USER +nor +.BR LOGNAME . +.TP +\fB\-s\fR \fISHELL\fR, \fB\-\-shell\fR=\fISHELL\fR +Runs the specified shell instead of the default. The shell to run is +selected according to the following rules in order: +.RS 10 +.TP +o +the shell specified with +.B \-\-shell +.TP +o +The shell specified in the environment variable +.B SHELL +if the +.B \-\-preserve-environment +option is used. +.TP +o +the shell listed in the passwd entry of the target user +.TP +o +/bin/sh +.RE +.IP +If the target user has a restricted shell (i.e. not listed in +/etc/shells) the +.B \-\-shell +option and the +.B SHELL +environment variables are ignored unless the calling user is root. +.TP +\fB\-\-help\fR +Display help text and exit. +.TP +\fB\-\-version\fR +Display version information and exit. +.SH CONFIG FILES +.B su +reads the +.I /etc/default/su +and +.I /etc/login.defs +configuration files. The following configuration items are relevant +for +.BR su (1): +.PP +.B FAIL_DELAY +(number) +.RS 4 +Delay in seconds in case of authentication failure. Number must be +a non-negative integer. +.RE +.PP +.B ENV_PATH +(string) +.RS 4 +Defines the PATH environment variable for a regular user. The +default value is +.IR /usr/local/bin:\:/bin:\:/usr/bin . +.RE +.PP +.B ENV_ROOTPATH +(string) +.br +.B ENV_SUPATH +(string) +.RS 4 +Defines the PATH environment variable for root. The default value is +.IR /usr/local/sbin:\:/usr/local/bin:\:/sbin:\:/bin:\:/usr/sbin:\:/usr/bin . +.RE +.PP +.B ALWAYS_SET_PATH +(boolean) +.RS 4 +If set to +.I yes +and \-\-login and \-\-preserve\-environment were not specified +.B su +initializes +.BR PATH . +.RE +.SH EXIT STATUS +.B su +normally returns the exit status of the command it executed. If the +command was killed by a signal, +.B su +returns the number of the signal plus 128. +.PP +Exit status generated by +.B su +itself: +.RS 10 +.TP +1 +Generic error before executing the requested command +.TP +126 +The requested command could not be executed +.TP +127 +The requested command could was not found +.RE +.SH FILES +.PD 0 +.TP 17 +/etc/pam.d/su +default PAM configuration file +.TP +/etc/pam.d/su-l +PAM configuration file if \-\-login is specified +.TP +/etc/default/su +command specific logindef config file +.TP +/etc/login.defs +global logindef config file +.PD 1 +.SH "SEE ALSO" +.BR pam (8), +.BR shells (5), +.BR login.defs (5) +.SH AUTHOR +Derived from coreutils' su which was based on an implementation from +David MacKenzie. +.SH AVAILABILITY +The su command is part of the util-linux package and is +available from +.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/ +Linux Kernel Archive +.UE . diff --git a/core/util-linux/util-linux.install b/core/util-linux/util-linux.install index 90ce5bd73..35f80e2a2 100644 --- a/core/util-linux/util-linux.install +++ b/core/util-linux/util-linux.install @@ -1,3 +1,20 @@ +post_install() { + # create user for uuidd + if ! getent group uuidd >/dev/null; then + groupadd -r uuidd + fi + + if ! getent passwd uuidd >/dev/null; then + useradd -r -s /sbin/nologin -d / -g uuidd uuidd + fi + + # we don't want use systemd-tmpfiles here because + # the package dependency would create a circular dep. + if [ ! -d run/uuidd ]; then + install -o uuidd -g uuidd -dm755 run/uuidd + fi +} + post_upgrade() { if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then if [ -f /var/lib/hwclock/adjtime ]; then @@ -7,4 +24,16 @@ post_upgrade() { rmdir /var/lib/hwclock fi fi + + post_install +} + +post_remove() { + if getent passwd uuidd >/dev/null; then + userdel uuidd + fi + + if getent group uuidd >/dev/null; then + userdel uuidd + fi } diff --git a/core/util-linux/uuidd.tmpfiles b/core/util-linux/uuidd.tmpfiles new file mode 100644 index 000000000..b059cfe65 --- /dev/null +++ b/core/util-linux/uuidd.tmpfiles @@ -0,0 +1 @@ +d /run/uuidd 0755 uuidd uuidd diff --git a/elementary/gtk-engine-equinox/PKGBUILD b/elementary/gtk-engine-equinox/PKGBUILD index 06e425336..db7b71343 100644 --- a/elementary/gtk-engine-equinox/PKGBUILD +++ b/elementary/gtk-engine-equinox/PKGBUILD @@ -1,33 +1,34 @@ -# created 16:18:42 - 21/03/10 -# Maintainer: Frikilinux <frikilinux at frikilinux.com.ar> +# Maintainer : SpepS <dreamspepser at yahoo dot it> +# Contributor: Frikilinux <frikilinux at frikilinux.com.ar> pkgname=gtk-engine-equinox pkgver=1.50 -pkgrel=2 +pkgrel=3 pkgdesc="A heavily modified version of the beautiful Aurora engine" url="http://gnome-look.org/content/show.php/Equinox+GTK+Engine?content=121881" -license=('GPL2') +license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('gtk2') -makedepends=('pkgconfig') -conflicts=() +makedepends=('libtool') options=('!libtool') -source=("http://gnome-look.org/CONTENT/content-files/121881-equinox-${pkgver}.tar.gz") +source=("http://gnome-look.org/CONTENT/content-files/121881-equinox-$pkgver.tar.gz") sha256sums=('0cf8b8cc841e0da7d4a08ab5a70d3bb330fd76bdcb03165a47aaddcd47e02227') build() { - # extract engine files - #tar xzf equinox-gtk-engine.tar.gz - cd "${srcdir}"/equinox-$pkgver + cd "$srcdir/equinox-$pkgver" - # Toolbar Fix - sed -i "s|\(EQUINOX_IS_TOOLBAR.*parent\)|widget \&\& \1|" src/equinox_style.c - - ./configure --prefix=/usr --enable-animation - make + # toolbar fix + sed -i "s/=\( EQUINOX_IS_TOOLBAR\)/= widget \&\&\1/" \ + src/equinox_style.c + # glib2 fix + sed -i "/gtimer/d" src/animation.c + + ./configure --prefix=/usr \ + --enable-animation + make } package() { - cd "${srcdir}"/equinox-$pkgver - make DESTDIR="${pkgdir}" install + cd "$srcdir/equinox-$pkgver" + make DESTDIR="$pkgdir/" install } diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 946e2a51f..086a8e942 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 165171 2012-08-12 04:07:04Z bisson $ +# $Id: PKGBUILD 166973 2012-09-23 22:56:56Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=3.3.1 +pkgver=3.3.2 pkgrel=1 pkgdesc='Lightweight, advanced audio player focused on audio quality' url='http://audacious-media-player.org/' -license=('GPL3') +license=('custom:BSD') arch=('i686' 'x86_64' 'mips64el') depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('unzip-libre: zipped skins support') source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('6ccd6856df853d939ea41402be4bfc76a5423a8f') +sha1sums=('bab3bcb267b8b333570c85cae9590470fe509eb9') provides=('audacious-player') replaces=('audacious-player') @@ -29,4 +29,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 9b85d9dfe..469e1175f 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166615 2012-09-13 08:59:14Z andrea $ +# $Id: PKGBUILD 166927 2012-09-22 09:45:48Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -31,10 +31,16 @@ makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' 'openjpeg' 'kdegraphics-okular' 'pstoedit') groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('b4f1532d802a6c97fbcfa6a0467b7216') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" + 'lcms24.patch') +md5sums=('b4f1532d802a6c97fbcfa6a0467b7216' + '42065ccf5617fc340b29d6bfbe9fa32f') build() { + cd ${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/lcms24.patch + cd .. + mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/extra/calligra/lcms24.patch b/extra/calligra/lcms24.patch new file mode 100644 index 000000000..b2427aff1 --- /dev/null +++ b/extra/calligra/lcms24.patch @@ -0,0 +1,12 @@ +--- a/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h ++++ b/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h +@@ -22,6 +22,8 @@ + + #include <LcmsColorSpace.h> + #include <KoColorSpaceTraits.h> ++ ++#define TYPE_XYZA_FLT (FLOAT_SH(1)|COLORSPACE_SH(PT_XYZ)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4)) + + #include <KoColorModelStandardIds.h> + + diff --git a/extra/gperftools/PKGBUILD b/extra/gperftools/PKGBUILD new file mode 100644 index 000000000..c8ad827ae --- /dev/null +++ b/extra/gperftools/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 166940 2012-09-22 20:23:08Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Thomas Jost <schnouki@schnouki.net> +# Contributor: JaDa <jada@archlinux.us> +# Contributor: Joaquim Pedro <osmano807@gmail.com> +# Contributor: Jan Rüegg <rggjan@gmail.com> + +pkgname=gperftools +pkgver=2.0 +pkgrel=4 +pkgdesc="Fast, multi-threaded malloc() and nifty performance analysis tools" +arch=('i686' 'x86_64') +url="http://code.google.com/p/gperftools/" +license=('BSD') +depends=('perl') +optdepends=('graphviz: pprof graph generation' + 'gv: pprof postscript generation') +options=('!libtool') +source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz") +sha256sums=('7de3dd91f018825b1e7d332af1edace15c6211f430186febede1835069861080') + +build() { + cd "$pkgname-$pkgver" + + # fix for glibc 2.16 + sed -i 's:siginfo_t:siginfo:' src/base/linuxthreads.cc + + ./configure --prefix=/usr --enable-frame-pointers + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 6e9bbb1e1..99b7cfe98 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166579 2012-09-12 17:20:44Z jgc $ +# $Id: PKGBUILD 166992 2012-09-24 15:54:53Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.12 +pkgver=2.24.13 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch) -sha256sums=('c5eba3b9259e4bf7554e9dc9db5d72038aa8b1bdd40fa0364b3705c226d11808' +sha256sums=('35e1a01e46b02970b02ee9f299390d0aa57c1215ad2667bcd584b72f4ea6513d' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD new file mode 100644 index 000000000..23b59b1da --- /dev/null +++ b/extra/leveldb/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 166942 2012-09-22 20:23:58Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: feydaykyn <feydaykyn@yahoo.fr> + +pkgname=leveldb +pkgver=1.5.0 +pkgrel=4 +pkgdesc="A fast and lightweight key/value database library" +arch=('i686' 'x86_64') +url="https://code.google.com/p/leveldb/" +license=('BSD') +depends=('gperftools' 'snappy') +source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz") +sha1sums=('b5b45ff74065f242c37f465b13dafb925972ca43') + +build() { + # buildsys doesn't play nicely with -Wl,--as-needed + LDFLAGS=-Wl,-O1,--sort-common,-z,relro + + make -C "$pkgname-$pkgver" +} + +check() { + make -C "$pkgname-$pkgver" check +} + +package() { + cd "$pkgname-$pkgver" + + install -dm755 \ + "$pkgdir"/usr/{include/leveldb,lib} \ + "$pkgdir"/usr/share/doc/"$pkgname" + + # libraries + install -m755 -t "$pkgdir/usr/lib" libleveldb.so.1.5 libleveldb.a + cp -P libleveldb.so{,.1} "$pkgdir/usr/lib" + + # headers + install -m644 -t "$pkgdir/usr/include/leveldb" include/leveldb/* + + # documentation + cp -r doc/* "$pkgdir/usr/share/doc/$pkgname" + + # license + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD index c2e1dd7cb..e9f9b4d35 100644 --- a/extra/libffado/PKGBUILD +++ b/extra/libffado/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166872 2012-09-20 10:13:42Z schiv $ +# $Id: PKGBUILD 166955 2012-09-23 09:44:31Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: galiyosha@gmail.com # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> pkgname=libffado pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Driver for FireWire audio devices" arch=('i686' 'x86_64' 'mips64el') url="http://www.ffado.org/" @@ -26,6 +26,7 @@ _scons-conf() { PREFIX=/usr \ MANDIR=/usr/share/man \ UDEVDIR=/usr/lib/udev/rules.d \ + ENABLE_SETBUFFERSIZE_API_VER=false \ COMPILE_FLAGS="$CFLAGS" $@ } diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index c78d08cbf..550ced111 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165552 2012-08-23 17:48:12Z tomegun $ +# $Id: PKGBUILD 166960 2012-09-23 11:44:00Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: damir <damir@archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libmtp -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=1 pkgdesc="Library implementation of the Media Transfer Protocol" arch=("i686" "x86_64" "mips64el") @@ -24,4 +24,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('27d9bcbc925c1ef84869eb27fdda54e8') +md5sums=('f80e45c0e6e5798c434bb1c26a7b602d') diff --git a/extra/libsigc++/PKGBUILD b/extra/libsigc++/PKGBUILD index 1827712aa..59a9b4a03 100644 --- a/extra/libsigc++/PKGBUILD +++ b/extra/libsigc++/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 151408 2012-02-26 10:35:06Z pierre $ +# $Id: PKGBUILD 166999 2012-09-24 17:45:03Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=libsigc++ pkgname=('libsigc++' 'libsigc++-docs') -pkgver=2.2.10 -pkgrel=2 +pkgver=2.2.11 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://libsigc.sourceforge.net/" makedepends=('gcc-libs') options=('!libtool' '!emptydirs') -source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.bz2") -sha256sums=('d3d810c2ad469edfb2d4db29643bef189b7613019eadbd4a72823af3c73c959c') +source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.xz") +sha256sums=('9834045f74f56752c2c6b3cdc195c30ab8314ad22dc8e626d6f67f940f1e4957') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/mutt/1a4c43138685.patch b/extra/mutt/1a4c43138685.patch new file mode 100644 index 000000000..ec1bc198a --- /dev/null +++ b/extra/mutt/1a4c43138685.patch @@ -0,0 +1,12 @@ +Index: muttlib.c
+===================================================================
+--- muttlib.c (revision 6128:eff500f87889)
++++ muttlib.c (revision 6161:1a4c43138685)
+@@ -1961,5 +1961,6 @@
+ char *p = safe_strdup (src);
+ int rc = mutt_convert_string (&p, Charset, "utf-8", 0);
+- strfcpy (dest, rc == 0 ? p : src, dlen);
++ /* `src' may be NULL, such as when called from the pop3 driver. */
++ strfcpy (dest, (rc == 0) ? NONULL(p) : NONULL(src), dlen);
+ FREE (&p);
+ }
diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD index 572e4d753..486fbde00 100644 --- a/extra/mutt/PKGBUILD +++ b/extra/mutt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143812 2011-11-29 13:33:33Z stephane $ +# $Id: PKGBUILD 166981 2012-09-24 06:32:03Z bisson $ # Contributor: tobias [tobias [at] archlinux.org] # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=mutt pkgver=1.5.21 -pkgrel=6 +pkgrel=7 pkgdesc='Small but very powerful text-based mail client' url='http://www.mutt.org/' license=('GPL') @@ -12,13 +12,16 @@ backup=('etc/Muttrc') arch=('i686' 'x86_64' 'mips64el') optdepends=('smtp-forwarder: to send mail') depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5') -source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz") -sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9') +source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz" + '1a4c43138685.patch') +sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9' + '32dbcafe05e4a919fd00c6a1064c6ecd205e6eb1') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -i ../1a4c43138685.patch # FS#31536 ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index 39de08afd..fa5bc6408 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162757 2012-06-29 15:32:58Z andyrtr $ +# $Id: PKGBUILD 166924 2012-09-22 09:16:46Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=nx pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers') -pkgver=3.5.0.14 +pkgver=3.5.0.15 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://wiki.x2go.org/" @@ -14,11 +14,11 @@ makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from ) source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz nx-x11.ld.so.conf.d) -md5sums=('f20f5a12e15849bae8a1f2d7b44830ab' +md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0' 'f2ec60c7e2d81bef2f7292d2b33681a6') build() { - cd "${srcdir}/nx-libs_$pkgver" + cd "${srcdir}/nx-libs-$pkgver" make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include" # fake install mkdir $srcdir/fakeinstall @@ -47,7 +47,7 @@ package_nxproxy() { ln -sv /usr/lib/nx/bin/nxproxy . # the wrapper - cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin + cp -a ${srcdir}/nx-libs-$pkgver/bin/nxproxy ${pkgdir}/usr/bin chmod +x ${pkgdir}/usr/bin/nxproxy cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1 } @@ -79,7 +79,7 @@ package_nx-x11() { ln -sv /usr/lib/nx/bin/nxauth . # the wrapper - cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin + cp -a ${srcdir}/nx-libs-$pkgver/bin/nxauth ${pkgdir}/usr/bin chmod +x ${pkgdir}/usr/bin/nxauth install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf" @@ -96,10 +96,10 @@ package_nxagent() { ln -sv /usr/lib/nx/bin/nxagent . # the wrapper - cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin + cp -a ${srcdir}/nx-libs-$pkgver/bin/nxagent ${pkgdir}/usr/bin chmod +x ${pkgdir}/usr/bin/nxagent # required nxcompshad libs - cp -a ${srcdir}/nx-libs_$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx + cp -a ${srcdir}/nx-libs-$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx cd ${pkgdir}/usr/lib/nx ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3 ln -sv libXcompshad.so.3.5.0 libXcompshad.so diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index d5681db66..dee5a706b 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,34 +1,44 @@ -# $Id: PKGBUILD 165415 2012-08-18 15:08:12Z dan $ +# $Id: PKGBUILD 166985 2012-09-24 14:37:09Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=postgresql-old-upgrade -pkgver=9.0.9 +pkgver=9.1.6 _majorver=${pkgver%.*} pkgrel=1 -pkgdesc="Minimal PostgreSQL build for migrating between major versions with pg_upgrade" +pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" license=('custom:PostgreSQL') depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0') +makedepends=('krb5' 'python2' 'perl' 'tcl') source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2) build() { cd "${srcdir}/postgresql-${pkgver}" ./configure --prefix=/opt/pgsql-${_majorver} \ - --with-libxml --with-openssl --without-perl \ - --without-python --with-pam --without-readline \ - --with-system-tzdata=/usr/share/zoneinfo --disable-nls \ + --with-krb5 \ + --with-libxml \ + --with-openssl \ + --with-perl \ + --with-python PYTHON=/usr/bin/python2 \ + --with-tcl \ + --with-pam \ + --without-readline \ + --with-system-tzdata=/usr/share/zoneinfo \ + --disable-nls \ --enable-thread-safety make -C src all + make -C contrib all } package() { cd "${srcdir}/postgresql-${pkgver}" # install - make DESTDIR="${pkgdir}" -C src install + make -C src DESTDIR="${pkgdir}" install + make -C contrib DESTDIR="${pkgdir}" install # install license install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" @@ -37,5 +47,5 @@ package() { rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/" } -md5sums=('284303098b161240fd13df7c251822a5') -sha256sums=('87417d181a0f534fa96ba1d315a62b721f5bc22b7bb70af3f674bc1a68a5da8a') +md5sums=('000755f66c0de58bbd4cd2b89b45b8e2') +sha256sums=('6e396aca621a95b9f5f7292a79ebe6ce892e36c7f7021814e1bd94bcfc6c31e7') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index 0fe507e95..ca3fbcdcb 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,17 +1,32 @@ -# $Id: PKGBUILD 160730 2012-06-04 17:58:05Z dan $ +# $Id: PKGBUILD 166983 2012-09-24 14:35:11Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.1.4 +pkgver=9.2.1 _majorver=${pkgver%.*} pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" license=('custom:PostgreSQL') makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0') -source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 - postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate) +source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 + postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate + postgresql.service postgresql-check-db-dir) +md5sums=('c0b4799ea9850eae3ead14f0a60e9418' + '1ddd1df8010549f237e7983bb326025e' + 'a54d09a20ab1672adf08f037df188d53' + '96f82c38f3f540b53f3e5144900acf17' + 'd28e443f9f65a5712c52018b84e27137' + '89b48774b0dae7c37fbb0e907c3c1db8' + '505e0e4abfc746cae9558584d471a03c') +sha256sums=('db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461' + '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45' + '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81' + '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' + '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' + 'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68' + '3a3279d290f556bf7a362670e32b491794f47ed218f6b8c6acef366a3291f669') build() { cd "${srcdir}/postgresql-${pkgver}" @@ -122,6 +137,10 @@ package_postgresql() { # install launch script install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql" + install -D -m644 "${srcdir}/postgresql.service" \ + "${pkgdir}/usr/lib/systemd/system/postgresql.service" + install -D -m755 "${srcdir}/postgresql-check-db-dir" \ + "${pkgdir}/usr/bin/postgresql-check-db-dir" # install conf file install -D -m644 ${srcdir}/postgresql.confd \ @@ -133,14 +152,3 @@ package_postgresql() { install -D -m644 ${srcdir}/postgresql.logrotate \ "${pkgdir}/etc/logrotate.d/postgresql" } - -md5sums=('a8035688dba988b782725ac1aec60186' - '1ddd1df8010549f237e7983bb326025e' - 'a54d09a20ab1672adf08f037df188d53' - '96f82c38f3f540b53f3e5144900acf17' - 'd28e443f9f65a5712c52018b84e27137') -sha256sums=('a0795a8eb3ae2d1a2914b63bf143d20182835d90699915ff43567c041d3c9712' - '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45' - '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81' - '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' - '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e') diff --git a/extra/postgresql/postgresql-check-db-dir b/extra/postgresql/postgresql-check-db-dir new file mode 100755 index 000000000..542c82209 --- /dev/null +++ b/extra/postgresql/postgresql-check-db-dir @@ -0,0 +1,49 @@ +#!/bin/sh + +# This script verifies that the postgresql data directory has been correctly +# initialized. We do not want to automatically initdb it, because that has +# a risk of catastrophic failure (ie, overwriting a valuable database) in +# corner cases, such as a remotely mounted database on a volume that's a +# bit slow to mount. But we can at least emit a message advising newbies +# what to do. + +PGDATA="$1" + +if [ -z "$PGDATA" ] +then + echo "Usage: $0 database-path" + exit 1 +fi + +# PGMAJORVERSION is major version +PGMAJORVERSION=9.2 +# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades +PREVMAJORVERSION=9.1 + +# Check for the PGDATA structure +if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ] +then + # Check version of existing PGDATA + if [ x`cat "$PGDATA/PG_VERSION"` = x"$PGMAJORVERSION" ] + then + : A-OK + elif [ x`cat "$PGDATA/PG_VERSION"` = x"$PREVMAJORVERSION" ] + then + echo $"An old version of the database format was found." + echo $"See https://wiki.archlinux.org/index.php/PostgreSQL#Upgrading_PostgreSQL" + exit 1 + else + echo $"An old version of the database format was found." + echo $"You need to dump and reload before using PostgreSQL $PGMAJORVERSION." + echo $"See http://www.postgresql.org/docs/9.2/static/upgrading.html" + exit 1 + fi +else + # No existing PGDATA! Warn the user to initdb it. + echo $"\"$PGDATA\" is missing or empty. Use a command like" + echo $" su - postgres -c \"initdb --locale en_US.UTF-8 -D '$PGDATA'\"" + echo $"with relevant options, to initialize the database cluster." + exit 1 +fi + +exit 0 diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install index c52432271..7b73f6fa9 100644 --- a/extra/postgresql/postgresql.install +++ b/extra/postgresql/postgresql.install @@ -2,9 +2,13 @@ post_install() { if [ ! -d '/var/lib/postgres' ]; then mkdir -p '/var/lib/postgres' fi - getent group postgres >/dev/null || groupadd -g 88 postgres - getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres - passwd -l postgres >/dev/null + if ! getent group postgres >/dev/null; then + groupadd -g 88 postgres + fi + if ! getent passwd postgres >/dev/null; then + useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres + passwd -l postgres >/dev/null + fi } post_upgrade() { diff --git a/extra/postgresql/postgresql.service b/extra/postgresql/postgresql.service new file mode 100644 index 000000000..294b66e8f --- /dev/null +++ b/extra/postgresql/postgresql.service @@ -0,0 +1,26 @@ +[Unit] +Description=PostgreSQL database server +After=network.target + +[Service] +Type=forking +TimeoutSec=120 +User=postgres +Group=postgres + +Environment=PGROOT=/var/lib/postgres + +SyslogIdentifier=postgres +PIDFile=/var/lib/postgres/data/postmaster.pid + +ExecStartPre=/usr/bin/postgresql-check-db-dir ${PGROOT}/data +ExecStart= /usr/bin/pg_ctl -s -D ${PGROOT}/data start -w -t 120 +ExecReload=/usr/bin/pg_ctl -s -D ${PGROOT}/data reload +ExecStop= /usr/bin/pg_ctl -s -D ${PGROOT}/data stop -m fast + +# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in +# killing Postgres, so adjust it downward +OOMScoreAdjust=-200 + +[Install] +WantedBy=multi-user.target diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index f3646cf9a..680247643 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166901 2012-09-21 13:44:23Z andrea $ +# $Id: PKGBUILD 166954 2012-09-23 09:22:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.3 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -20,14 +20,16 @@ source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' 'improve-cups-support.patch' - 'fix-crash-in-assistant.patch') + 'fix-crash-in-assistant.patch' + 'undo-fix-jit-crash-on-x86_64.patch') md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' 'c439c7731c25387352d8453ca7574971' - '57590084078b6379f0501f7728b02ae2') + '57590084078b6379f0501f7728b02ae2' + '094e5a4e30e52423c77daa4a9c782df5') build() { cd "${srcdir}"/${_pkgfqn} @@ -38,8 +40,11 @@ build() { # (FS#28381) (KDEBUG#180051) patch -p1 -i "${srcdir}"/improve-cups-support.patch - # (FS#) + # (FS#29469) patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch + + # (FS#31654) + patch -Rp1 -i "${srcdir}"/undo-fix-jit-crash-on-x86_64.patch export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} diff --git a/extra/qt/undo-fix-jit-crash-on-x86_64.patch b/extra/qt/undo-fix-jit-crash-on-x86_64.patch new file mode 100644 index 000000000..ac86a846b --- /dev/null +++ b/extra/qt/undo-fix-jit-crash-on-x86_64.patch @@ -0,0 +1,280 @@ +Description: Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow) + . + Cherry-picked from webkit commit + a5b3261a8c4386b4e14ce40a34c7fc933a5f7001 +Origin: commit ada98493bbfbd9af0d0b593017e29d39bcd3495e +Author: Kent Hansen <kent.hansen@nokia.com> +Forwarded: not-needed +Applied-Upstream: yes +Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> +Reviewed-by: Kent Hansen <kent.hansen@nokia.com> +--- + .../javascriptcore/JavaScriptCore/ChangeLog | 27 +++++++++++++++++ + .../JavaScriptCore/JavaScriptCore.pri | 1 + + .../JavaScriptCore/jit/ExecutableAllocator.cpp | 21 +++++++++++++ + .../jit/ExecutableAllocatorFixedVMPool.cpp | 31 +++++++++++++------- + .../jit/ExecutableAllocatorPosix.cpp | 29 ++---------------- + .../jit/ExecutableAllocatorSymbian.cpp | 2 +- + .../JavaScriptCore/jit/ExecutableAllocatorWin.cpp | 2 +- + .../javascriptcore/JavaScriptCore/wtf/Platform.h | 10 +++++++ + 8 files changed, 84 insertions(+), 39 deletions(-) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog +index 9cbf0c1..5ab23e6 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog +@@ -1,3 +1,30 @@ ++2010-07-08 Gavin Barraclough <barraclough@apple.com> ++ ++ Reviewed by Sam Weinig. ++ ++ https://bugs.webkit.org/show_bug.cgi?id=41641 ++ ++ Update compile flags to allow use of ExecutableAllocatorFixedVMPool on platforms ++ other than x86-64 (this may be useful on 32-bit platforms, too). ++ ++ Simplify ifdefs by dividing into thwo broad allocation strategies ++ (ENABLE_EXECUTABLE_ALLOCATOR_FIXED & ENABLE_EXECUTABLE_ALLOCATOR_DEMAND). ++ ++ Rename constant used in the code to have names descriptive of their purpose, ++ rather than their specific value on a given platform. ++ ++ * jit/ExecutableAllocator.cpp: ++ (JSC::ExecutableAllocator::reprotectRegion): ++ (JSC::ExecutableAllocator::cacheFlush): ++ * jit/ExecutableAllocatorFixedVMPool.cpp: ++ (JSC::FixedVMPoolAllocator::FixedVMPoolAllocator): ++ (JSC::FixedVMPoolAllocator::free): ++ (JSC::ExecutablePool::systemAlloc): ++ * jit/ExecutableAllocatorPosix.cpp: ++ * jit/ExecutableAllocatorSymbian.cpp: ++ * jit/ExecutableAllocatorWin.cpp: ++ * wtf/Platform.h: ++ + 2010-08-24 Oliver Hunt <oliver@apple.com> + + Reviewed by Geoff Garen. +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +index b061321..847f69c 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +@@ -100,6 +100,7 @@ SOURCES += \ + interpreter/CallFrame.cpp \ + interpreter/Interpreter.cpp \ + interpreter/RegisterFile.cpp \ ++ jit/ExecutableAllocatorFixedVMPool.cpp \ + jit/ExecutableAllocatorPosix.cpp \ + jit/ExecutableAllocatorSymbian.cpp \ + jit/ExecutableAllocatorWin.cpp \ +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp +index f6b27ec..f0ebbab 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp +@@ -33,6 +33,27 @@ namespace JSC { + + size_t ExecutableAllocator::pageSize = 0; + ++#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) ++void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting) ++{ ++ if (!pageSize) ++ intializePageSize(); ++ ++ // Calculate the start of the page containing this region, ++ // and account for this extra memory within size. ++ intptr_t startPtr = reinterpret_cast<intptr_t>(start); ++ intptr_t pageStartPtr = startPtr & ~(pageSize - 1); ++ void* pageStart = reinterpret_cast<void*>(pageStartPtr); ++ size += (startPtr - pageStartPtr); ++ ++ // Round size up ++ size += (pageSize - 1); ++ size &= ~(pageSize - 1); ++ ++ mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX); ++} ++#endif ++ + } + + #endif // HAVE(ASSEMBLER) +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp +index dd1db4e..16d0fb1 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp +@@ -27,25 +27,33 @@ + + #include "ExecutableAllocator.h" + +-#include <errno.h> ++#if ENABLE(EXECUTABLE_ALLOCATOR_FIXED) + +-#if ENABLE(ASSEMBLER) && OS(DARWIN) && CPU(X86_64) ++#include <errno.h> + + #include "TCSpinLock.h" +-#include <mach/mach_init.h> +-#include <mach/vm_map.h> + #include <sys/mman.h> + #include <unistd.h> + #include <wtf/AVLTree.h> + #include <wtf/VMTags.h> + ++#if CPU(X86_64) ++ // These limits suitable on 64-bit platforms (particularly x86-64, where we require all jumps to have a 2Gb max range). ++ #define VM_POOL_SIZE (2u * 1024u * 1024u * 1024u) // 2Gb ++ #define COALESCE_LIMIT (16u * 1024u * 1024u) // 16Mb ++#else ++ // These limits are hopefully sensible on embedded platforms. ++ #define VM_POOL_SIZE (32u * 1024u * 1024u) // 32Mb ++ #define COALESCE_LIMIT (4u * 1024u * 1024u) // 4Mb ++#endif ++ ++// ASLR currently only works on darwin (due to arc4random) & 64-bit (due to address space size). ++#define VM_POOL_ASLR (OS(DARWIN) && CPU(X86_64)) ++ + using namespace WTF; + + namespace JSC { + +-#define TWO_GB (2u * 1024u * 1024u * 1024u) +-#define SIXTEEN_MB (16u * 1024u * 1024u) +- + // FreeListEntry describes a free chunk of memory, stored in the freeList. + struct FreeListEntry { + FreeListEntry(void* pointer, size_t size) +@@ -291,9 +299,12 @@ public: + // for now instead of 2^26 bits of ASLR lets stick with 25 bits of randomization plus + // 2^24, which should put up somewhere in the middle of usespace (in the address range + // 0x200000000000 .. 0x5fffffffffff). +- intptr_t randomLocation = arc4random() & ((1 << 25) - 1); ++ intptr_t randomLocation = 0; ++#if VM_POOL_ASLR ++ randomLocation = arc4random() & ((1 << 25) - 1); + randomLocation += (1 << 24); + randomLocation <<= 21; ++#endif + m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0); + if (!m_base) + CRASH(); +@@ -387,7 +398,7 @@ public: + // 16MB of allocations have been freed, sweep m_freeList + // coalescing any neighboring fragments. + m_countFreedSinceLastCoalesce += size; +- if (m_countFreedSinceLastCoalesce >= SIXTEEN_MB) { ++ if (m_countFreedSinceLastCoalesce >= COALESCE_LIMIT) { + m_countFreedSinceLastCoalesce = 0; + coalesceFreeSpace(); + } +@@ -429,7 +440,7 @@ ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t size) + SpinLockHolder lock_holder(&spinlock); + + if (!allocator) +- allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, TWO_GB); ++ allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, VM_POOL_SIZE); + ExecutablePool::Allocation alloc = {reinterpret_cast<char*>(allocator->alloc(size)), size}; + return alloc; + } +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp +index 2eb0c87..b04049c 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp +@@ -27,7 +27,7 @@ + + #include "ExecutableAllocator.h" + +-#if ENABLE(ASSEMBLER) && OS(UNIX) && !OS(SYMBIAN) ++#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && !OS(WINDOWS) && !OS(SYMBIAN) + + #include <sys/mman.h> + #include <unistd.h> +@@ -35,8 +35,6 @@ + + namespace JSC { + +-#if !(OS(DARWIN) && !PLATFORM(QT) && CPU(X86_64)) +- + void ExecutableAllocator::intializePageSize() + { + ExecutableAllocator::pageSize = getpagesize(); +@@ -57,29 +55,6 @@ void ExecutablePool::systemRelease(const ExecutablePool::Allocation& alloc) + ASSERT_UNUSED(result, !result); + } + +-#endif // !(OS(DARWIN) && !PLATFORM(QT) && CPU(X86_64)) +- +-#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) +-void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting) +-{ +- if (!pageSize) +- intializePageSize(); +- +- // Calculate the start of the page containing this region, +- // and account for this extra memory within size. +- intptr_t startPtr = reinterpret_cast<intptr_t>(start); +- intptr_t pageStartPtr = startPtr & ~(pageSize - 1); +- void* pageStart = reinterpret_cast<void*>(pageStartPtr); +- size += (startPtr - pageStartPtr); +- +- // Round size up +- size += (pageSize - 1); +- size &= ~(pageSize - 1); +- +- mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX); +-} +-#endif +- + } + +-#endif // HAVE(ASSEMBLER) ++#endif +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp +index e82975c..9028f50 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp +@@ -22,7 +22,7 @@ + + #include "ExecutableAllocator.h" + +-#if ENABLE(ASSEMBLER) && OS(SYMBIAN) ++#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(SYMBIAN) + + #include <e32hal.h> + #include <e32std.h> +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp +index e38323c..72a1d5f 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp +@@ -27,7 +27,7 @@ + + #include "ExecutableAllocator.h" + +-#if ENABLE(ASSEMBLER) && OS(WINDOWS) ++#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(WINDOWS) + + #include "windows.h" + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +index 700977e..d930ed7 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -1016,6 +1016,16 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ + #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0 + #endif + ++/* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in. ++ On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */ ++#if ENABLE(ASSEMBLER) ++#if CPU(X86_64) ++#define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1 ++#else ++#define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1 ++#endif ++#endif ++ + #if !defined(ENABLE_PAN_SCROLLING) && OS(WINDOWS) + #define ENABLE_PAN_SCROLLING 1 + #endif +-- +1.7.10.4 + diff --git a/extra/scim-uim/PKGBUILD b/extra/scim-uim/PKGBUILD index 297d43ef5..0a5f38545 100644 --- a/extra/scim-uim/PKGBUILD +++ b/extra/scim-uim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149050 2012-02-05 15:34:14Z bisson $ +# $Id: PKGBUILD 166977 2012-09-24 04:57:10Z bisson $ # Contributor: damir <damir@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org pkgname=scim-uim pkgver=0.2.0 -pkgrel=5 +pkgrel=6 pkgdesc='UIM bridging input engine for SCIM' url='http://www.scim-im.org/' license=('GPL') @@ -12,7 +12,7 @@ options=('!libtool') depends=('scim' 'uim') arch=('i686' 'x86_64' 'mips64el') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz" - 'scim-uim-0.2.0-fix-gcc43-build.patch' + 'fix-gcc43-build.patch' 'uim-1.5.5-header.patch') sha1sums=('456621d5969b6552c3c33c83cf295aa4134fff0a' 'a9d67946f956d0572c73065e2b4b268bfdf149e3' @@ -20,7 +20,7 @@ sha1sums=('456621d5969b6552c3c33c83cf295aa4134fff0a' build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../scim-uim-0.2.0-fix-gcc43-build.patch + patch -p1 -i ../fix-gcc43-build.patch patch -p1 -i ../uim-1.5.5-header.patch ./configure --prefix=/usr --sysconfdir=/etc --disable-static make diff --git a/extra/scim-uim/fix-gcc43-build.patch b/extra/scim-uim/fix-gcc43-build.patch new file mode 100644 index 000000000..d142fd7b7 --- /dev/null +++ b/extra/scim-uim/fix-gcc43-build.patch @@ -0,0 +1,10 @@ +--- scim-uim-0.2.0/src/scim_uim_imengine.cpp 2007-04-10 07:43:59.000000000 +0200 ++++ scim-uim-0.2.0/src/scim_uim_imengine.cpp.gcc43buildfixed 2008-03-23 10:53:23.000000000 +0100 +@@ -32,6 +32,7 @@ + #include <config.h> + #endif + ++#include <string.h> + #include <scim.h> + #include "scim_uim_imengine.h" + #include <uim/uim-compat-scm.h> diff --git a/extra/snappy/PKGBUILD b/extra/snappy/PKGBUILD new file mode 100644 index 000000000..fbd7a1ac5 --- /dev/null +++ b/extra/snappy/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 166939 2012-09-22 20:17:43Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Antony Male <antony dot male at geemail dot com>> + +pkgname=snappy +pkgver=1.0.5 +pkgrel=2 +pkgdesc='A fast compressor/decompressor library' +arch=('i686' 'x86_64') +url="http://code.google.com/p/snappy/" +license=('BSD') +depends=('glibc' 'gcc-libs') +checkdepends=('zlib') +options=('!libtool') +source=("http://snappy.googlecode.com/files/$pkgname-$pkgver.tar.gz") +md5sums=('4c0af044e654f5983f4acbf00d1ac236') + +build() { + cd "$pkgname-$pkgver" + + # compile without assertions + CXXFLAGS+=\ -DNDEBUG + + ./configure --prefix=/usr + make +} + +check() { + # compile without assertions + CXXFLAGS+=\ -DNDEBUG + + make -C "$pkgname-$pkgver" check +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -m644 -D COPYING "$pkgdir/usr/share/licenses/snappy/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/taglib/PKGBUILD b/extra/taglib/PKGBUILD index aed74cccf..f5a71aae8 100644 --- a/extra/taglib/PKGBUILD +++ b/extra/taglib/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 163967 2012-07-23 03:03:00Z allan $ +# $Id: PKGBUILD 166944 2012-09-22 20:46:26Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Ike Devolder <ike.devolder@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=taglib -pkgver=1.7.2 -pkgrel=2 +pkgver=1.8 +pkgrel=1 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats" arch=('i686' 'x86_64' 'mips64el') url="http://developer.kde.org/~wheeler/taglib.html" @@ -13,12 +14,11 @@ license=('LGPL' 'MPL') depends=('sh' 'zlib' 'gcc-libs') makedepends=('cmake' 'pkg-config') options=('!libtool') -source=("http://developer.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz" - 'ape-idev2.patch') +source=("https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('dcb8bd1b756f2843e18b1fdf3aaeee15') build() { cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/ape-idev2.patch cd "${srcdir}" mkdir build @@ -35,5 +35,3 @@ package() { cd "${srcdir}"/build make DESTDIR="${pkgdir}" install } -md5sums=('b0a9e797d3833fb933c7c3176de3d720' - 'c7c165d99acf01456351ba39ff7056cb') diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD index 64bba79c6..439ac4a14 100644 --- a/extra/tftp-hpa/PKGBUILD +++ b/extra/tftp-hpa/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 151760 2012-03-02 09:20:56Z tpowa $ +# $Id: PKGBUILD 166932 2012-09-22 13:11:31Z thomas $ # Maintainer: dorphell <dorphell@archlinux.org> # Contributor: Jose Javier <jojapa@terra.es> pkgname=tftp-hpa pkgver=5.2 -pkgrel=2 +pkgrel=3 pkgdesc="Official tftp server" arch=('i686' 'x86_64' 'mips64el') -url="http://www.kernel.org/pub/software/network/tftp/" +url="http://www.kernel.org/pub/software/network/tftp/tftp-hpa/" license=('BSD') depends=('readline>=6.0.00') conflicts=('netkit-tftp') @@ -15,7 +15,16 @@ source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgve tftpd.rc tftpd.conf LICENSE + tftpd.service + tftpd.socket tftp-hpa-0.49-fortify-strcpy-crash.patch) +md5sums=('3de3038e7c2bf6fc5d496825893ac8e7' + '83fbb6f52205d95951a3c059e5351ca2' + 'f41f484f94e91175e9183e872a2bff3b' + '6ce21e27b6fdc1a1adf85c81e42aeecf' + '165b98f814f74568635a720e674d7f18' + 'a23369ea33be8b4a5427ec2cfc5373dd' + '22e8629ef19bc276a102c5d4d284c1bd') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -29,14 +38,12 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make INSTALLROOT="${pkgdir}" install install -d "${pkgdir}/etc/rc.d" - install -d "${pkgdir}/var/tftpboot" + install -d "${pkgdir}/srv/tftp" install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd" install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd" - rm "${pkgdir}/usr/share/man/man8/tftpd.8" + install -D -m655 "${srcdir}/tftpd.service" "${pkgdir}/usr/lib/systemd/system/tftpd.service" + install -D -m655 "${srcdir}/tftpd.socket" "${pkgdir}/usr/lib/systemd/system/tftpd.socket" install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + # Remove conflict with iputils + rm "${pkgdir}/usr/share/man/man8/tftpd.8" } -md5sums=('3de3038e7c2bf6fc5d496825893ac8e7' - '83fbb6f52205d95951a3c059e5351ca2' - '414a79dc891bced056d99a9bb790fc9e' - '6ce21e27b6fdc1a1adf85c81e42aeecf' - '22e8629ef19bc276a102c5d4d284c1bd') diff --git a/extra/tftp-hpa/tftpd.conf b/extra/tftp-hpa/tftpd.conf index 4705cc3a9..a4329f608 100644 --- a/extra/tftp-hpa/tftpd.conf +++ b/extra/tftp-hpa/tftpd.conf @@ -1,4 +1,4 @@ # # Parameters to be passed to TFTPD # -TFTPD_ARGS="-l -s /var/tftpboot" +TFTPD_ARGS="-l -s /srv/tftp/" diff --git a/extra/tftp-hpa/tftpd.service b/extra/tftp-hpa/tftpd.service new file mode 100644 index 000000000..62562343d --- /dev/null +++ b/extra/tftp-hpa/tftpd.service @@ -0,0 +1,8 @@ +[Unit] +Description=hpa's original TFTP daemon + +[Service] +ExecStart=/usr/sbin/in.tftpd -s /srv/tftp/ +StandardInput=socket +StandardOutput=inherit +StandardError=journal diff --git a/extra/tftp-hpa/tftpd.socket b/extra/tftp-hpa/tftpd.socket new file mode 100644 index 000000000..0315ed608 --- /dev/null +++ b/extra/tftp-hpa/tftpd.socket @@ -0,0 +1,5 @@ +[Socket] +ListenDatagram=69 + +[Install] +WantedBy=sockets.target diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 2cfd6a06b..a4ad2997d 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165472 2012-08-20 13:29:51Z tomegun $ +# $Id: PKGBUILD 166956 2012-09-23 09:55:03Z tomegun $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') pkgver=2.61 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') diff --git a/extra/transmission/transmission-cli.install b/extra/transmission/transmission-cli.install index 68df89498..8ab275e61 100644 --- a/extra/transmission/transmission-cli.install +++ b/extra/transmission/transmission-cli.install @@ -3,14 +3,15 @@ post_install() { If you want to run the Transmission daemon at boot, add transmissiond to the DAEMONS array in /etc/rc.conf. - _EOF + +post_upgrade +passwd -l transmission &>/dev/null } post_upgrade() { # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files getent group transmission >/dev/null || groupadd -g 169 transmission getent passwd transmission >/dev/null || useradd -c 'Transmission BitTorrent Client' -u 169 -g transmission -b '/var/lib' -m -s /bin/false transmission - passwd -l transmission &>/dev/null systemd-tmpfiles --create transmission.conf } diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index fa4d21b40..66a42fcf6 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164051 2012-07-25 06:08:06Z giovanni $ +# $Id: PKGBUILD 166946 2012-09-23 04:27:14Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=whois -pkgver=5.0.18 +pkgver=5.0.19 pkgrel=1 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('libidn') makedepends=('perl') source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz") -md5sums=('15d777273d44a5b9a0814c1ea0d22b1a') +md5sums=('16b0a0e5e3757287462bbeb01b66b191') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xdelta3/PKGBUILD b/extra/xdelta3/PKGBUILD index 65dbad1d2..658251df1 100644 --- a/extra/xdelta3/PKGBUILD +++ b/extra/xdelta3/PKGBUILD @@ -1,46 +1,31 @@ -# $Id: PKGBUILD 145279 2011-12-21 02:07:07Z allan $ +# $Id: PKGBUILD 167057 2012-09-25 00:09:23Z eric $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com> # Contributor: Henning Garus <henning.garus@gmail.com> pkgname=xdelta3 -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.4 +pkgrel=1 pkgdesc="A diff utility which works with binary files" arch=('i686' 'x86_64' 'mips64el') url="http://xdelta.org/" license=('GPL') -makedepends=('python2') -optdepends=('python2: for python modules') -source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz - xdelta3-makefile.patch) -md5sums=('5fe038be3a266d2a7913e10d1cec6d88' - 'fa5973870faf7523043c4858ab7c3bdb') +depends=('xz') +source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz) +md5sums=('c04f7fd9da45741a0095438cfe527b89') build() { - cd $srcdir/xdelta$pkgver - - patch -Np1 -i $srcdir/xdelta3-makefile.patch - sed -i "/PYVER = /s/2.6/2.7/" Makefile - - make xdelta3 - make xdelta3module.so - - # for testsuite - make xdelta3-debug + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make } check() { - cd $srcdir/xdelta$pkgver - - make test + cd "$srcdir/$pkgname-$pkgver" + ./xdelta3 test } package() { - cd $srcdir/xdelta$pkgver - - install -D xdelta3 $pkgdir/usr/bin/xdelta3 - python2 ./setup.py install --root ${pkgdir} - install -m644 {xdelta3.py,xdelta3module.so} ${pkgdir}/usr/lib/python2.7/site-packages + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install } - diff --git a/gnome-unstable/clutter-gst/PKGBUILD b/gnome-unstable/clutter-gst/PKGBUILD new file mode 100644 index 000000000..78c557bed --- /dev/null +++ b/gnome-unstable/clutter-gst/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 167009 2012-09-24 18:09:58Z jgc $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=clutter-gst +pkgver=1.9.90 +pkgrel=1 +pkgdesc="GStreamer bindings for clutter" +arch=('i686' 'x86_64') +url="http://www.clutter-project.org/" +license=('LGPL') +depends=('clutter' 'gst-plugins-base-libs' 'libxdamage') +makedepends=('gobject-introspection') +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('4b05f2d282baf308e6f2e480da5fe05d0755569778caf4c320a2d47cfc682a2d') + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/colord-gtk/PKGBUILD b/gnome-unstable/colord-gtk/PKGBUILD new file mode 100644 index 000000000..35de482ba --- /dev/null +++ b/gnome-unstable/colord-gtk/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 167097 2012-09-25 11:36:27Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> + +pkgname=colord-gtk +pkgver=0.1.23 +pkgrel=1 +pkgdesc="GTK integration for libcolord" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/software/colord" +license=('GPL2') +depends=('lcms2' 'gtk3' 'colord') +makedepends=('intltool' 'gobject-introspection' 'vala' 'gtk-doc') +source=($url/releases/$pkgname-$pkgver.tar.xz) +options=('!libtool') +sha1sums=('71fd56b34ba91ddf76c1ac394c2a31fa5e24770c') + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --sysconfdir=/etc --libexecdir=/usr/lib/colord \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/colord/PKGBUILD b/gnome-unstable/colord/PKGBUILD new file mode 100644 index 000000000..d51085cf5 --- /dev/null +++ b/gnome-unstable/colord/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 167094 2012-09-25 11:25:42Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> + +pkgname=colord +pkgver=0.1.23 +pkgrel=1 +pkgdesc="Color daemon" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/software/colord" +license=('GPL2') +depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite' 'udev') +makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') +source=($url/releases/$pkgname-$pkgver.tar.xz) +options=('!libtool') +sha1sums=('08019c86f89b1675e4e155772cc555ed748f319e') + +build() { + cd "$pkgname-$pkgver" + + # put udev files in /usr/lib + sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure + + ./configure --prefix=/usr \ + --sysconfdir=/etc --libexecdir=/usr/lib/colord \ + --localstatedir=/var --disable-static \ + --with-systemdsystemunitdir=/usr/lib/systemd/system + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install \ + bashcompletiondir=/usr/share/bash-completion/completions +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/devhelp/PKGBUILD b/gnome-unstable/devhelp/PKGBUILD new file mode 100644 index 000000000..c6aaf552f --- /dev/null +++ b/gnome-unstable/devhelp/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 167107 2012-09-25 11:54:01Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Link Dupont <link@subpop.net> + +pkgname=devhelp +pkgver=3.6.0 +pkgrel=2 +pkgdesc="API documentation browser for GNOME" +arch=(i686 x86_64) +license=('GPL') +url="http://live.gnome.org/devhelp/" +depends=('gconf' 'webkitgtk3' 'hicolor-icon-theme') +makedepends=('pkgconfig' 'intltool' 'python2') +options=('!libtool' '!emptydirs') +install=devhelp.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('bf0576d5d70496367ccb22be53be620bbfe341bd491c1d725cfb59d566769fe1') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --with-webkit2 + make +} + +package() { + cd $pkgname-$pkgver + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain devhelp ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/gnome-unstable/devhelp/devhelp.install b/gnome-unstable/devhelp/devhelp.install new file mode 100644 index 000000000..4db5f6e5c --- /dev/null +++ b/gnome-unstable/devhelp/devhelp.install @@ -0,0 +1,22 @@ +pkgname=devhelp + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/gnome-unstable/epiphany/PKGBUILD b/gnome-unstable/epiphany/PKGBUILD new file mode 100644 index 000000000..c15e8c13a --- /dev/null +++ b/gnome-unstable/epiphany/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 167069 2012-09-25 09:09:57Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=epiphany +pkgver=3.6.0 +pkgrel=1 +install=epiphany.install +pkgdesc="A GNOME web browser based on the WebKit rendering engine." +arch=('i686' 'x86_64') +license=('GPL') +depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils' + 'hicolor-icon-theme' 'gcr' 'gnome-desktop') +makedepends=('intltool' 'gnome-doc-utils' 'startup-notification') +options=('!libtool' '!emptydirs') +groups=('gnome') +url="http://www.gnome.org/projects/epiphany/" +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('54458b220e5f320b93f2f59840971627f43f2aa6b1ff5fa3e6a8fad5deef2207') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/epiphany/epiphany.install b/gnome-unstable/epiphany/epiphany.install new file mode 100644 index 000000000..8b17fa3d4 --- /dev/null +++ b/gnome-unstable/epiphany/epiphany.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/evince/PKGBUILD b/gnome-unstable/evince/PKGBUILD new file mode 100644 index 000000000..69115bd42 --- /dev/null +++ b/gnome-unstable/evince/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 167083 2012-09-25 10:11:40Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=evince +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Simply a document viewer" +url="http://projects.gnome.org/evince/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk3' 'libgxps' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') +makedepends=('itstool' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection' 'docbook-xsl') +optdepends=('texlive-bin: DVI support') +groups=('gnome-extra') +install=evince.install +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('8dfa7b9c2f0b910d06b1612ff445d3f3050c44d25f2e78718966374d30ab83f2') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/evince \ + --disable-static --enable-nautilus \ + --enable-pdf --enable-tiff \ + --enable-djvu --enable-dvi \ + --enable-t1lib --enable-comics \ + --disable-scrollkeeper --disable-schemas-compile \ + --enable-introspection + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/evince/evince.install b/gnome-unstable/evince/evince.install new file mode 100644 index 000000000..1571179ca --- /dev/null +++ b/gnome-unstable/evince/evince.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules new file mode 100644 index 000000000..a76c1e73c --- /dev/null +++ b/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules @@ -0,0 +1,11 @@ +# Get access to /dev/rfkill for users +# See https://bugzilla.redhat.com/show_bug.cgi?id=514798 +# +# Updated for udev >= 154 +# http://bugs.debian.org/582188 +# https://bugzilla.redhat.com/show_bug.cgi?id=588660 + +ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end" +ACTION!="add|change", GOTO="gnome_bluetooth_end" +KERNEL=="rfkill", TAG+="udev-acl" +LABEL="gnome_bluetooth_end" diff --git a/gnome-unstable/gnome-bluetooth/PKGBUILD b/gnome-unstable/gnome-bluetooth/PKGBUILD new file mode 100644 index 000000000..7437fc613 --- /dev/null +++ b/gnome-unstable/gnome-bluetooth/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 167079 2012-09-25 09:40:56Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Roman Kyrylych <roman@archlinux.org> + +pkgname=gnome-bluetooth +pkgver=3.5.92 +pkgrel=1 +pkgdesc="The GNOME Bluetooth Subsystem" +arch=('i686' 'x86_64') +url="http://live.gnome.org/GnomeBluetooth" +license=('GPL' 'LGPL') +depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify') +makedepends=('intltool' 'nautilus-sendto' 'gobject-introspection' 'itstool' 'docbook-xsl') +options=('!libtool' '!emptydirs') +install=gnome-bluetooth.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + 61-gnome-bluetooth-rfkill.rules) +sha256sums=('bb832118364be36510d32e6e33e90788c0f651c82c146f9abd800403f0a235f8' + 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-desktop-update \ + --disable-icon-update \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + install -m644 -D ../61-gnome-bluetooth-rfkill.rules \ + "$pkgdir/usr/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules" +} diff --git a/gnome-unstable/gnome-bluetooth/gnome-bluetooth.install b/gnome-unstable/gnome-bluetooth/gnome-bluetooth.install new file mode 100644 index 000000000..8c991877f --- /dev/null +++ b/gnome-unstable/gnome-bluetooth/gnome-bluetooth.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/gnome-control-center/PKGBUILD b/gnome-unstable/gnome-control-center/PKGBUILD new file mode 100644 index 000000000..b7792151a --- /dev/null +++ b/gnome-unstable/gnome-control-center/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 167087 2012-09-25 10:41:31Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-control-center +pkgver=3.6.0 +pkgrel=1 +pkgdesc="The Control Center for GNOME" +arch=('i686' 'x86_64') +depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' + 'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3' + 'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' 'libpwquality' 'libsystemd') +optdepends=('mesa-demos: provides glxinfo for graphics information' + 'gnome-color-manager: for color management tasks') +makedepends=('gnome-doc-utils' 'intltool' 'docbook-xsl') +url="http://www.gnome.org" +groups=('gnome') +install=gnome-control-center.install +license=('GPL') +options=('!libtool' '!emptydirs') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('7d58d0ccc3defe622f66f4ce8e1229e443f4f57c58f85eecde12b642b8a8e893') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-systemd --with-libsocialweb \ + --disable-update-mimedb \ + --without-cheese + + #https://bugzilla.gnome.org/show_bug.cgi?id=656229 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-control-center/gnome-control-center.install b/gnome-unstable/gnome-control-center/gnome-control-center.install new file mode 100644 index 000000000..079e0fa34 --- /dev/null +++ b/gnome-unstable/gnome-control-center/gnome-control-center.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/gnome-control-center/systemd-fallback.patch b/gnome-unstable/gnome-control-center/systemd-fallback.patch new file mode 100644 index 000000000..709e54019 --- /dev/null +++ b/gnome-unstable/gnome-control-center/systemd-fallback.patch @@ -0,0 +1,81 @@ +commit 9873a7536844f5c38c2a123be58175c2774e5dcc +Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +Date: Mon Mar 12 01:12:11 2012 +0100 + + Fallback to CK if systemd is not available + + Be nice to distributions where systemd is optional. This will select + the code path at runtime depending on whether the system was booted + using systemd. + +diff --git a/configure.ac b/configure.ac +index aee97ac..867f061 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd], + [with_systemd=$enableval], + [with_systemd=no]) + if test "$with_systemd" = "yes" ; then +- SYSTEMD=libsystemd-login ++ SYSTEMD="libsystemd-login libsystemd-daemon" + AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available]) + else + SYSTEMD= +diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c +index f027754..5ebbe29 100644 +--- a/panels/user-accounts/um-user.c ++++ b/panels/user-accounts/um-user.c +@@ -37,6 +37,11 @@ + + #include <gio/gunixoutputstream.h> + ++#ifdef HAVE_SYSTEMD ++# include <systemd/sd-login.h> ++# include <systemd/sd-daemon.h> ++#endif ++ + #include "um-user.h" + #include "um-account-type.h" + #include "um-utils.h" +@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser *user, + } + } + +-#ifdef HAVE_SYSTEMD +- +-#include <systemd/sd-login.h> +- + gboolean + um_user_is_logged_in (UmUser *user) + { +- int n_sessions; +- +- n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0; +- +- return n_sessions > 0; +-} ++#ifdef HAVE_SYSTEMD ++ if (sd_booted () > 0) { ++ int n_sessions; + +-#else ++ n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL); + +-gboolean +-um_user_is_logged_in (UmUser *user) +-{ ++ return n_sessions > 0; ++ } ++#endif + GVariant *result; + GVariantIter *iter; + gint n_sessions; +@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user) + return n_sessions > 0; + } + +-#endif +- + void + um_user_set_automatic_login (UmUser *user, + gboolean enabled) diff --git a/gnome-unstable/gnome-font-viewer/PKGBUILD b/gnome-unstable/gnome-font-viewer/PKGBUILD new file mode 100644 index 000000000..186904af7 --- /dev/null +++ b/gnome-unstable/gnome-font-viewer/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 167040 2012-09-24 20:36:55Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=gnome-font-viewer +pkgver=3.6.0 +pkgrel=1 +pkgdesc="GNOME font viewer and thumbnailer" +arch=(i686 x86_64) +license=('GPL') +depends=('gtk3' 'desktop-file-utils' 'gnome-desktop') +makedepends=('intltool') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +groups=('gnome-extra') +install=gnome-font-viewer.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('3625c9f70ef227cd6cdaa1fea4990d87ba12ba3681e105cf5db731edec208e74') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-font-viewer/gnome-font-viewer.install b/gnome-unstable/gnome-font-viewer/gnome-font-viewer.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/gnome-unstable/gnome-font-viewer/gnome-font-viewer.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-menus/PKGBUILD b/gnome-unstable/gnome-menus/PKGBUILD new file mode 100644 index 000000000..2a1fda39e --- /dev/null +++ b/gnome-unstable/gnome-menus/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 167081 2012-09-25 09:50:30Z jgc $ +# Maintainer: Jan de Groot <jan@archlinux.org> + +pkgname=gnome-menus +pkgver=3.5.92 +pkgrel=1 +pkgdesc="GNOME menu specifications" +arch=('i686' 'x86_64') +depends=('glib2' 'python2-gobject') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +license=('GPL' 'LGPL') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + menus.patch) +sha256sums=('e56022b4329e97fdcadf0c70212dba04c4da9c51be2036e6c931ab0fd48fef0f' + 'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc') + +build() { + cd "$pkgname-$pkgver" + + patch -Np0 -i "$srcdir/menus.patch" + + PYTHON=/usr/bin/python2 ./configure \ + --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package(){ + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + sed -i "1s|#!/usr/bin/env python$|&2|" \ + "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py" +} diff --git a/gnome-unstable/gnome-menus/menus.patch b/gnome-unstable/gnome-menus/menus.patch new file mode 100644 index 000000000..bf73e86cd --- /dev/null +++ b/gnome-unstable/gnome-menus/menus.patch @@ -0,0 +1,25 @@ +--- layout/applications.menu 2005-06-28 10:16:39.000000000 +0200 ++++ layout/applications.menu 2005-09-12 23:21:20.000000000 +0200 +@@ -7,7 +7,6 @@ + <Directory>Applications.directory</Directory> + + <!-- Scan legacy dirs first, as later items take priority --> +- <KDELegacyDirs/> + <LegacyDir>/etc/X11/applnk</LegacyDir> + <LegacyDir>/usr/share/gnome/apps</LegacyDir> + +@@ -18,6 +17,14 @@ + <!-- Read in overrides and child menus from applications-merged/ --> + <DefaultMergeDirs/> + ++ <!-- Archlinux submenu --> ++ <Menu> ++ <Name>Archlinux</Name> ++ <Directory>Archlinux.directory</Directory> ++ <Include> ++ <Category>Archlinux</Category> ++ </Include> ++ </Menu> <!-- End Archlinux --> + <!-- Accessories submenu --> + <Menu> + <Name>Accessories</Name> diff --git a/gnome-unstable/gnome-screenshot/PKGBUILD b/gnome-unstable/gnome-screenshot/PKGBUILD new file mode 100644 index 000000000..4f78d4fa7 --- /dev/null +++ b/gnome-unstable/gnome-screenshot/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 167044 2012-09-24 20:43:36Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gnome-screenshot +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Take pictures of your screen" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3' 'libcanberra') +makedepends=('intltool') +groups=('gnome-extra') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('96626b86d0ebaacf420b68ddd846d5185dc90a58e5d86843799c2071255b7636') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gnome-screenshot/gnome-screenshot.install b/gnome-unstable/gnome-screenshot/gnome-screenshot.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/gnome-unstable/gnome-screenshot/gnome-screenshot.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-shell/PKGBUILD b/gnome-unstable/gnome-shell/PKGBUILD new file mode 100644 index 000000000..16f68f0f9 --- /dev/null +++ b/gnome-unstable/gnome-shell/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 167089 2012-09-25 10:46:37Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Flamelab <panosfilip@gmail.com + +pkgname=gnome-shell +pkgver=3.5.92 +pkgrel=1 +pkgdesc="The next generation GNOME Shell" +arch=('i686' 'x86_64') +url="http://live.gnome.org/GnomeShell" +license=('GPL2') +depends=('caribou' 'folks' 'gcr' 'gjs' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libcroco' 'libpulse' 'mutter' 'nautilus' 'networkmanager' 'telepathy-logger' 'telepathy-mission-control' 'unzip') +makedepends=('intltool' 'gnome-doc-utils') +optdepends=('network-manager-applet: shell integration for networkmanager') +options=('!libtool' '!emptydirs') +install=gnome-shell.install +groups=(gnome) +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('bf43ade818f2fd7631492a5eb61522524b7bdb84d3627a21bd4bde9100e0e6af') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gnome-shell \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-shell/gnome-shell.install b/gnome-unstable/gnome-shell/gnome-shell.install new file mode 100644 index 000000000..27d70b19d --- /dev/null +++ b/gnome-unstable/gnome-shell/gnome-shell.install @@ -0,0 +1,19 @@ +pkgname=gnome-shell + +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + gconfpkg --uninstall $pkgname + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-shell/recorder.patch b/gnome-unstable/gnome-shell/recorder.patch new file mode 100644 index 000000000..41134a31a --- /dev/null +++ b/gnome-unstable/gnome-shell/recorder.patch @@ -0,0 +1,28 @@ +From 915524e1ab7d2c5efb95985f30ee2f7c5ca69554 Mon Sep 17 00:00:00 2001 +From: Rui Matos <tiagomatos@gmail.com> +Date: Wed, 02 May 2012 14:44:40 +0000 +Subject: main: Close the recorder instead of pausing it + +Pausing means that we will continue to use the same output file when +the keybinding is activated again. While useful to record a single +video in chunks, it doesn't seem to be how most users understand the +keybinding. Closing the recorder will close the file and create a new +one the next time the keybinding is pressed. + +https://bugzilla.gnome.org/show_bug.cgi?id=675128 +--- +diff --git a/js/ui/main.js b/js/ui/main.js +index 3b80297..25ad8d8 100644 +--- a/js/ui/main.js ++++ b/js/ui/main.js +@@ -110,7 +110,7 @@ function _initRecorder() { + } + + if (recorder.is_recording()) { +- recorder.pause(); ++ recorder.close(); + Meta.enable_unredirect_for_screen(global.screen); + } else { + // read the parameters from GSettings always in case they have changed +-- +cgit v0.9.0.2 diff --git a/gnome-unstable/gnome-system-log/PKGBUILD b/gnome-unstable/gnome-system-log/PKGBUILD new file mode 100644 index 000000000..954b61179 --- /dev/null +++ b/gnome-unstable/gnome-system-log/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 167047 2012-09-24 20:47:21Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gnome-system-log +pkgver=3.6.0 +pkgrel=1 +pkgdesc="View your system logs" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3') +makedepends=('intltool' 'itstool' 'docbook-xsl') +groups=('gnome-extra') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('46dea7cb8c63c26578bd0c854aa9143e86b094bc676564400bf4c57fc259369a') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gnome-system-log/gnome-system-log.install b/gnome-unstable/gnome-system-log/gnome-system-log.install new file mode 100644 index 000000000..847019792 --- /dev/null +++ b/gnome-unstable/gnome-system-log/gnome-system-log.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-system-monitor/PKGBUILD b/gnome-unstable/gnome-system-monitor/PKGBUILD new file mode 100644 index 000000000..82b3f0d90 --- /dev/null +++ b/gnome-unstable/gnome-system-monitor/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 167036 2012-09-24 20:18:58Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-system-monitor +pkgver=3.6.0 +pkgrel=1 +pkgdesc="A system monitor for GNOME" +arch=(i686 x86_64) +license=('GPL') +depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd') +makedepends=('itstool' 'docbook-xsl' 'intltool') +options=(!emptydirs) +url="http://www.gnome.org" +groups=('gnome-extra') +install=gnome-system-monitor.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('5e427d6c7dbe3cfb87afe3feb93882485f79ce71556e5b855152055d8a6080ab') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install b/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gst-plugins-base/PKGBUILD b/gnome-unstable/gst-plugins-base/PKGBUILD new file mode 100644 index 000000000..03ef9d0f9 --- /dev/null +++ b/gnome-unstable/gst-plugins-base/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 153256 2012-03-12 15:48:30Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gst-plugins-base +pkgname=('gst-plugins-base-libs' 'gst-plugins-base') +pkgver=1.0.0 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') +options=(!libtool !emptydirs) +url="http://gstreamer.freedesktop.org/" +source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz) +sha256sums=('4b98a74712e31d5426dd1cf2de883b6af59fd37997b0ffaed53914eb6df45053') + +build() { + cd "${srcdir}/$pkgbase-${pkgver}" + sed -i '/AC_PATH_XTRA/d' configure.ac + autoreconf + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Base Plugins (Archlinux)" \ + --with-package-origin="http://www.archlinux.org/" + + make + sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile +} + +check() { + cd "${srcdir}/gst-plugins-base-${pkgver}" + # Testsuite fails on one test. Some refcount leak + #make check +} + +package_gst-plugins-base-libs() { + pkgdesc="GStreamer Multimedia Framework Base plugin libraries" + depends=('gstreamer' 'orc' 'libxv') + + cd "${srcdir}/$pkgbase-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_gst-plugins-base() { + pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base)" + depends=("gst-plugins-base-libs=$pkgver" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango') + + cd "${srcdir}/$pkgbase-${pkgver}" + make -C gst-libs DESTDIR="${pkgdir}" install + make -C ext DESTDIR="${pkgdir}" install + make -C gst-libs DESTDIR="${pkgdir}" uninstall +} diff --git a/gnome-unstable/gstreamer/PKGBUILD b/gnome-unstable/gstreamer/PKGBUILD index 5f5526a1b..bfd5c74a4 100644 --- a/gnome-unstable/gstreamer/PKGBUILD +++ b/gnome-unstable/gstreamer/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer -pkgver=0.11.99 +pkgver=1.0.0 pkgrel=1 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') options=('!libtool') source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -sha256sums=('a4b1c2fd2ff8762688c1f0f819001d98fd3924618c861cf96995ecfb343895ff') +sha256sums=('d0f9887ff1c81a33220add2e6d3eb84d869c485c83523a8da0ce1f0cb2463f58') build() { cd "${srcdir}/gstreamer-${pkgver}" diff --git a/gnome-unstable/gtksourceview3/PKGBUILD b/gnome-unstable/gtksourceview3/PKGBUILD new file mode 100644 index 000000000..8c03cb8e1 --- /dev/null +++ b/gnome-unstable/gtksourceview3/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 167022 2012-09-24 19:12:48Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gtksourceview3 +_pkgbasename=gtksourceview +pkgver=3.5.4 +pkgrel=1 +pkgdesc="A text widget adding syntax highlighting and more to GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk3' 'libxml2') +makedepends=('intltool' 'gobject-introspection' 'glade') +options=('!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) +sha256sums=('7f3bbccf4b6b91c9a2c7ac14957876970fe305e5903a2d15ca81dd507835df3b') + +build() { + cd "$_pkgbasename-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-glade-catalog + make +} + +package() { + cd "$_pkgbasename-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/libpwquality/PKGBUILD b/gnome-unstable/libpwquality/PKGBUILD new file mode 100644 index 000000000..b40a35d4b --- /dev/null +++ b/gnome-unstable/libpwquality/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libpwquality +pkgver=1.2.0 +pkgrel=1 +pkgdesc="Library for password quality checking and generating random passwords" +arch=('i686' 'x86_64') +url="https://fedorahosted.org/libpwquality/" +license=('GPL') +options=('!libtool') +depends=('cracklib') +optdepends=('python2: Python bindings') +makedepends=('python2') +source=(https://fedorahosted.org/releases/l/i/libpwquality/$pkgname-$pkgver.tar.bz2) +md5sums=('8827419118064539db70090cbed5cb21') + +build() { + cd "$pkgname-$pkgver" + sed -i -e 's/python setup.py/python2 setup.py/' python/Makefile.in + + PYTHON=python2 ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/libxklavier/PKGBUILD b/gnome-unstable/libxklavier/PKGBUILD new file mode 100644 index 000000000..94e99d10e --- /dev/null +++ b/gnome-unstable/libxklavier/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 167099 2012-09-25 11:40:49Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Arjan Timmerman <arjan@archlinux.org> + +pkgname=libxklavier +pkgver=5.3 +pkgrel=1 +pkgdesc="High-level API for X Keyboard Extension" +arch=(i686 x86_64) +license=('LGPL') +depends=('glib2' 'libxkbfile' 'libxml2' 'xkeyboard-config' 'libxi' 'iso-codes') +makedepends=('gobject-introspection') +options=('!libtool' '!emptydirs') +url="http://gswitchit.sourceforge.net" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +sha256sums=('ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --with-xkb-base=/usr/share/X11/xkb --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/mousetweaks/PKGBUILD b/gnome-unstable/mousetweaks/PKGBUILD new file mode 100644 index 000000000..4dddd4cb5 --- /dev/null +++ b/gnome-unstable/mousetweaks/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 2392 2008-06-01 19:38:25Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=mousetweaks +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Mouse accessibility enhancements for the GNOME desktop" +arch=(i686 x86_64) +license=('GPL3' 'FDL') +depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas') +makedepends=('gnome-doc-utils' 'intltool') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +install=mousetweaks.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('2c48f655c5b53615270503fd1631e0cf7baa5872b20f75af8608983f039c5cfc') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/mousetweaks/mousetweaks.install b/gnome-unstable/mousetweaks/mousetweaks.install new file mode 100644 index 000000000..1ae919322 --- /dev/null +++ b/gnome-unstable/mousetweaks/mousetweaks.install @@ -0,0 +1,17 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall mousetweaks + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/nautilus-sendto/PKGBUILD b/gnome-unstable/nautilus-sendto/PKGBUILD new file mode 100644 index 000000000..01d5804e7 --- /dev/null +++ b/gnome-unstable/nautilus-sendto/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 167075 2012-09-25 09:23:58Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Eduardo Romero <eduardo@archlinux.org> +# Contributor: Tor Krill <tor@krill.nu> + +pkgname=nautilus-sendto +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Nautilus context menu for sending files." +arch=('i686' 'x86_64') +url="http://download.gnome.org/sources/nautilus-sendto/" +license=('GPL') +groups=('gnome-extra') +depends=('evolution-data-server' 'nautilus' 'dconf') +makedepends=('pidgin' 'gajim' 'gettext' 'intltool' 'gupnp') +options=('!libtool' '!emptydirs') +install=nautilus-sendto.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('5f90a1a7b054257545dc72fa3a63de8f5564815576f90a21c320ebb177b9268e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/nautilus-sendto/nautilus-sendto.install b/gnome-unstable/nautilus-sendto/nautilus-sendto.install new file mode 100644 index 000000000..d33a1b261 --- /dev/null +++ b/gnome-unstable/nautilus-sendto/nautilus-sendto.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/sushi/PKGBUILD b/gnome-unstable/sushi/PKGBUILD new file mode 100644 index 000000000..3276116b3 --- /dev/null +++ b/gnome-unstable/sushi/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 167042 2012-09-24 20:39:02Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=sushi +pkgver=3.6.0 +pkgrel=1 +pkgdesc="A quick previewer for Nautilus" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL2') +groups=(gnome-extra) +depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz5' 'webkitgtk3' 'gtksourceview3' 'evince') +install=sushi.install +makedepends=('intltool' 'gobject-introspection') +options=(!libtool) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('506f0f1f934e9e6c0f5584619c3f2ab0d5906248472ca1bf08a159504ad02f78') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --libexecdir=/usr/lib/sushi + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/sushi/sushi.install b/gnome-unstable/sushi/sushi.install new file mode 100644 index 000000000..c19349f72 --- /dev/null +++ b/gnome-unstable/sushi/sushi.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/totem-plparser/PKGBUILD b/gnome-unstable/totem-plparser/PKGBUILD new file mode 100644 index 000000000..3665ad94b --- /dev/null +++ b/gnome-unstable/totem-plparser/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 167018 2012-09-24 18:57:55Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=totem-plparser +pkgver=3.4.3 +pkgrel=1 +url="http://www.gnome.org" +pkgdesc="Totem playlist parser library" +license=('LGPL') +arch=(i686 x86_64) +depends=('gmime' 'libsoup-gnome' 'libarchive' 'libquvi') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz) +sha256sums=('ab8beed4dd5d3a5d7ed5dc8b357e94dc03a8553fef6e33c2e7fb63a76e44c42b') + +build() { + cd totem-pl-parser-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static + make +} + +package(){ + cd totem-pl-parser-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/yelp/PKGBUILD b/gnome-unstable/yelp/PKGBUILD new file mode 100644 index 000000000..7dcd1c68c --- /dev/null +++ b/gnome-unstable/yelp/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 167105 2012-09-25 11:50:12Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=yelp +pkgver=3.6.0 +pkgrel=1 +pkgdesc="A help browser for GNOME" +arch=('i686' 'x86_64') +depends=('webkitgtk3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' + 'desktop-file-utils' 'dconf') +makedepends=('intltool' 'gtk-doc' 'itstool') +groups=('gnome') +license=('GPL') +options=('!emptydirs' '!libtool') +url="http://www.gnome.org" +install=yelp.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('966a513420674c488b18df0ffcf51f8b4687cdba04b1d1d5e76d59c0484ac048') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/yelp/yelp.install b/gnome-unstable/yelp/yelp.install new file mode 100644 index 000000000..2a1cb91e9 --- /dev/null +++ b/gnome-unstable/yelp/yelp.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index d5b1e5313..1644c5576 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164182 2012-07-27 00:15:41Z bisson $ +# $Id: PKGBUILD 166974 2012-09-23 22:57:12Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> @@ -7,12 +7,12 @@ _pkgname=audacious-plugins pkgname=audacious-plugins-libre -pkgver=3.3.1 +pkgver=3.3.2 pkgrel=1 pkgdesc='Plugins for Audacious without unfree plugins' url='http://audacious-media-player.org/' +license=('GPL' 'GPL3' 'LGPL' 'custom:BSD') arch=('i686' 'x86_64') -license=('GPL' 'GPL3' 'LGPL' 'custom') # Licensing issues: # The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice @@ -60,7 +60,8 @@ optdepends=('oss: Open Sound System v4 output' 'libcue: CUE playlist format') source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('7775ff82a7fe2a1de7eb8a76322718c845a1f225') +sha1sums=('869d3820263ff35609bfc6f2e69885a00d660513') + build() { # Retrieve upstream & remove plugin 'psf' due to issues mentioned above. sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure @@ -115,4 +116,5 @@ build() { package() { cd "${srcdir}/${_pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/libre/lib32-mesa-demos-libre/PKGBUILD b/libre/lib32-mesa-demos-libre/PKGBUILD new file mode 100644 index 000000000..1719f138d --- /dev/null +++ b/libre/lib32-mesa-demos-libre/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 94667 2010-10-09 11:21:35Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgbasename=mesa-demos-libre +pkgname=lib32-$_pkgbasename +pkgver=8.0.1 +pkgrel=2 +arch=(x86_64) +pkgdesc="Mesa demos and tools (32-bit), libre" +url="http://mesa3d.sourceforge.net" +license=('custom') +depends=('lib32-glew>=1.5.6' mesa-demos-libre) +provides=("lib32-mesa-demos=$pkgver") +replaces=('lib32-mesa-demos') +conflicts=('lib32-mesa-demos') +makedepends=(gcc-multilib) +source=(ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2 + mesa-demos-libre.patch) +md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4' + '1858e95d40ac9e5e0b59753ce9e673e3') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/mesa-demos-${pkgver}" + patch -Np1 -i "${srcdir}/mesa-demos-libre.patch" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/mesa-demos-${pkgver}" + make DESTDIR="${pkgdir}" install + + for i in "$pkgdir/usr/bin/"*; do + mv "$i" "$i"32 + done + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s mesa-demos "$pkgdir/usr/share/licenses/lib32-mesa-demos" +} diff --git a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch new file mode 100755 index 000000000..c5261f8e9 --- /dev/null +++ b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch @@ -0,0 +1,1192 @@ +diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//src/demos/Makefile.am +--- Desktop/mesa-demos-8.0.1//src/demos/Makefile.am 2010-07-13 14:46:40.000000000 -0400 ++++ mesa-demos-8.0.1/src/demos/Makefile.am 2011-06-04 15:34:18.000000000 -0400 +@@ -62,7 +62,6 @@ bin_PROGRAMS = \ + morph3d \ + multiarb \ + paltex \ +- pointblast \ + projtex \ + ray \ + readpix \ +@@ -71,7 +70,6 @@ bin_PROGRAMS = \ + shadowtex \ + singlebuffer \ + spectex \ +- spriteblast \ + stex3d \ + teapot \ + terrain \ +diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//src/demos/Makefile.in +--- Desktop/mesa-demos-8.0.1//src/demos/Makefile.in 2010-07-13 14:53:23.000000000 -0400 ++++ mesa-demos-8.0.1/src/demos/Makefile.in 2011-06-04 15:35:32.000000000 -0400 +@@ -73,11 +73,10 @@ host_triplet = @host@ + @HAVE_GLUT_TRUE@ ipers$(EXEEXT) isosurf$(EXEEXT) \ + @HAVE_GLUT_TRUE@ lodbias$(EXEEXT) morph3d$(EXEEXT) \ + @HAVE_GLUT_TRUE@ multiarb$(EXEEXT) paltex$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ pointblast$(EXEEXT) projtex$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ ray$(EXEEXT) readpix$(EXEEXT) reflect$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ renormal$(EXEEXT) shadowtex$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ singlebuffer$(EXEEXT) spectex$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ spriteblast$(EXEEXT) stex3d$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ spectex$(EXEEXT) stex3d$(EXEEXT) \ + @HAVE_GLUT_TRUE@ teapot$(EXEEXT) terrain$(EXEEXT) \ + @HAVE_GLUT_TRUE@ tessdemo$(EXEEXT) texcyl$(EXEEXT) \ + @HAVE_GLUT_TRUE@ texenv$(EXEEXT) textures$(EXEEXT) \ +@@ -188,9 +187,6 @@ multiarb_DEPENDENCIES = ../util/libutil. + paltex_SOURCES = paltex.c + paltex_OBJECTS = paltex.$(OBJEXT) + paltex_LDADD = $(LDADD) +-pointblast_SOURCES = pointblast.c +-pointblast_OBJECTS = pointblast.$(OBJEXT) +-pointblast_LDADD = $(LDADD) + projtex_SOURCES = projtex.c + projtex_OBJECTS = projtex.$(OBJEXT) + projtex_DEPENDENCIES = ../util/libutil.la +@@ -215,9 +211,6 @@ singlebuffer_LDADD = $(LDADD) + spectex_SOURCES = spectex.c + spectex_OBJECTS = spectex.$(OBJEXT) + spectex_LDADD = $(LDADD) +-spriteblast_SOURCES = spriteblast.c +-spriteblast_OBJECTS = spriteblast.$(OBJEXT) +-spriteblast_LDADD = $(LDADD) + stex3d_SOURCES = stex3d.c + stex3d_OBJECTS = stex3d.$(OBJEXT) + stex3d_LDADD = $(LDADD) +@@ -285,21 +278,20 @@ SOURCES = arbfplight.c arbfslight.c arbo + fbo_firecube.c fbotexture.c fire.c fogcoord.c fplight.c \ + fslight.c gamma.c gearbox.c gears.c geartrain.c glinfo.c \ + gloss.c gltestperf.c ipers.c isosurf.c lodbias.c morph3d.c \ +- multiarb.c paltex.c pointblast.c projtex.c ray.c readpix.c \ +- reflect.c renormal.c shadowtex.c singlebuffer.c spectex.c \ +- spriteblast.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \ +- texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \ +- vao_demo.c winpos.c ++ multiarb.c paltex.c projtex.c ray.c readpix.c reflect.c \ ++ renormal.c shadowtex.c singlebuffer.c spectex.c stex3d.c \ ++ teapot.c terrain.c tessdemo.c texcyl.c texenv.c textures.c \ ++ trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c + DIST_SOURCES = arbfplight.c arbfslight.c arbocclude.c bounce.c \ + clearspd.c copypix.c cubemap.c dinoshade.c dissolve.c \ + drawpix.c engine.c fbo_firecube.c fbotexture.c fire.c \ + fogcoord.c fplight.c fslight.c gamma.c gearbox.c gears.c \ + geartrain.c glinfo.c gloss.c gltestperf.c ipers.c isosurf.c \ +- lodbias.c morph3d.c multiarb.c paltex.c pointblast.c projtex.c \ +- ray.c readpix.c reflect.c renormal.c shadowtex.c \ +- singlebuffer.c spectex.c spriteblast.c stex3d.c teapot.c \ +- terrain.c tessdemo.c texcyl.c texenv.c textures.c trispd.c \ +- $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c ++ lodbias.c morph3d.c multiarb.c paltex.c projtex.c ray.c \ ++ readpix.c reflect.c renormal.c shadowtex.c singlebuffer.c \ ++ spectex.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \ ++ texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \ ++ vao_demo.c winpos.c + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -653,9 +645,6 @@ multiarb$(EXEEXT): $(multiarb_OBJECTS) $ + paltex$(EXEEXT): $(paltex_OBJECTS) $(paltex_DEPENDENCIES) + @rm -f paltex$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(paltex_OBJECTS) $(paltex_LDADD) $(LIBS) +-pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) +- @rm -f pointblast$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS) + projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) + @rm -f projtex$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS) +@@ -680,9 +669,6 @@ singlebuffer$(EXEEXT): $(singlebuffer_OB + spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) + @rm -f spectex$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS) +-spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) +- @rm -f spriteblast$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS) + stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) + @rm -f stex3d$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS) +@@ -756,7 +742,6 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/morph3d.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@ +@@ -765,7 +750,6 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spriteblast.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@ +diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/pointblast.c mesa-demos-8.0.1//src/demos/pointblast.c +--- Desktop/mesa-demos-8.0.1//src/demos/pointblast.c 2010-07-07 13:57:15.000000000 -0400 ++++ mesa-demos-8.0.1/src/demos/pointblast.c 1969-12-31 19:00:00.000000000 -0500 +@@ -1,504 +0,0 @@ +- +-/* Copyright (c) Mark J. Kilgard, 1997. */ +- +-/* This program is freely distributable without licensing fees +- and is provided without guarantee or warrantee expressed or +- implied. This program is -not- in the public domain. */ +- +-/* This example demonstrates how to render particle effects +- with OpenGL. A cloud of pinkish/orange particles explodes with the +- particles bouncing off the ground. When the EXT_point_parameters +- is present , the particle size is attenuated based on eye distance. */ +- +- +-#include <stdio.h> +-#include <stdlib.h> +-#include <string.h> +-#include <math.h> /* for cos(), sin(), and sqrt() */ +-#ifdef _WIN32 +-#include <windows.h> +-#endif +-#include <GL/glew.h> +-#include <GL/glut.h> +- +-/* Some <math.h> files do not define M_PI... */ +-#ifndef M_PI +-#define M_PI 3.14159265 +-#endif +- +-#if 0 /* For debugging. */ +-#undef GL_EXT_point_parameters +-#endif +- +-static GLfloat angle = -150; /* in degrees */ +-static int spin = 0; +-static int moving, begin; +-static int newModel = 1; +-static float theTime; +-static int repeat = 1; +-static int blend = 1; +-int useMipmaps = 1; +-int linearFiltering = 1; +- +-static GLfloat constant[3] = { 1/5.0, 0.0, 0.0 }; +-static GLfloat linear[3] = { 0.0, 1/5.0, 0.0 }; +-static GLfloat theQuad[3] = { 0.25, 0.0, 1/60.0 }; +- +-#define MAX_POINTS 2000 +- +-static int numPoints = 200; +- +-static GLfloat pointList[MAX_POINTS][3]; +-static GLfloat pointTime[MAX_POINTS]; +-static GLfloat pointVelocity[MAX_POINTS][2]; +-static GLfloat pointDirection[MAX_POINTS][2]; +-static int colorList[MAX_POINTS]; +-static int animate = 1, motion = 0; +- +-static GLfloat colorSet[][4] = { +- /* Shades of red. */ +- { 0.7, 0.2, 0.4, 0.5 }, +- { 0.8, 0.0, 0.7, 0.5 }, +- { 1.0, 0.0, 0.0, 0.5 }, +- { 0.9, 0.3, 0.6, 0.5 }, +- { 1.0, 0.4, 0.0, 0.5 }, +- { 1.0, 0.0, 0.5, 0.5 }, +-}; +- +-#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0])) +- +-#define DEAD (NUM_COLORS+1) +- +- +-#if 0 /* drand48 might be better on Unix machines */ +-#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48()) +-#else +-static float float_rand(void) { return rand() / (float) RAND_MAX; } +-#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand()) +-#endif +- +-#define MEAN_VELOCITY 3.0 +-#define GRAVITY 2.0 +- +-/* Modeling units of ground extent in each X and Z direction. */ +-#define EDGE 12 +- +-static void +-makePointList(void) +-{ +- float angle, velocity, direction; +- int i; +- +- motion = 1; +- for (i=0; i<numPoints; i++) { +- pointList[i][0] = 0.0; +- pointList[i][1] = 0.0; +- pointList[i][2] = 0.0; +- pointTime[i] = 0.0; +- angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0; +- direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0; +- pointDirection[i][0] = cos(direction); +- pointDirection[i][1] = sin(direction); +- velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0); +- pointVelocity[i][0] = velocity * cos(angle); +- pointVelocity[i][1] = velocity * sin(angle); +- colorList[i] = rand() % NUM_COLORS; +- } +- theTime = 0.0; +-} +- +-static void +-updatePointList(void) +-{ +- float distance; +- int i; +- +- static double t0 = -1.; +- double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0; +- if (t0 < 0.0) +- t0 = t; +- dt = t - t0; +- t0 = t; +- +- motion = 0; +- for (i=0; i<numPoints; i++) { +- distance = pointVelocity[i][0] * theTime; +- +- /* X and Z */ +- pointList[i][0] = pointDirection[i][0] * distance; +- pointList[i][2] = pointDirection[i][1] * distance; +- +- /* Z */ +- pointList[i][1] = +- (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i]; +- +- /* If we hit the ground, bounce the point upward again. */ +- if (pointList[i][1] <= 0.0) { +- if (distance > EDGE) { +- /* Particle has hit ground past the distance duration of +- the particles. Mark particle as dead. */ +- colorList[i] = NUM_COLORS; /* Not moving. */ +- continue; +- } +- +- pointVelocity[i][1] *= 0.8; /* 80% of previous up velocity. */ +- pointTime[i] = 0.0; /* Reset the particles sense of up time. */ +- } +- motion = 1; +- pointTime[i] += dt; +- } +- theTime += dt; +- if (!motion && !spin) { +- if (repeat) { +- makePointList(); +- } else { +- glutIdleFunc(NULL); +- } +- } +-} +- +-static void +-idle(void) +-{ +- updatePointList(); +- if (spin) { +- angle += 0.3; +- newModel = 1; +- } +- glutPostRedisplay(); +-} +- +-static void +-visible(int vis) +-{ +- if (vis == GLUT_VISIBLE) { +- if (animate && (motion || spin)) { +- glutIdleFunc(idle); +- } +- } else { +- glutIdleFunc(NULL); +- } +-} +- +-static void +-recalcModelView(void) +-{ +- glPopMatrix(); +- glPushMatrix(); +- glRotatef(angle, 0.0, 1.0, 0.0); +- newModel = 0; +-} +- +-static void +-redraw(void) +-{ +- int i; +- +- glDepthMask(GL_TRUE); +- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); +- if (newModel) +- recalcModelView(); +- +- +- /* Draw the floor. */ +-/* glEnable(GL_TEXTURE_2D);*/ +- glColor3f(0.5, 1.0, 0.5); +- glBegin(GL_QUADS); +- glTexCoord2f(0.0, 0.0); +- glVertex3f(-EDGE, -0.05, -EDGE); +- glTexCoord2f(20.0, 0.0); +- glVertex3f(EDGE, -0.05, -EDGE); +- glTexCoord2f(20.0, 20.0); +- glVertex3f(EDGE, -0.05, EDGE); +- glTexCoord2f(0.0, 20.0); +- glVertex3f(-EDGE, -0.05, EDGE); +- glEnd(); +- +- /* Allow particles to blend with each other. */ +- glDepthMask(GL_FALSE); +- +- if (blend) +- glEnable(GL_BLEND); +- +- glDisable(GL_TEXTURE_2D); +- glBegin(GL_POINTS); +- for (i=0; i<numPoints; i++) { +- /* Draw alive particles. */ +- if (colorList[i] != DEAD) { +- glColor4fv(colorSet[colorList[i]]); +- glVertex3fv(pointList[i]); +- } +- } +- glEnd(); +- +- glDisable(GL_BLEND); +- +- glutSwapBuffers(); +-} +- +-/* ARGSUSED2 */ +-static void +-mouse(int button, int state, int x, int y) +-{ +- /* Scene can be spun around Y axis using left +- mouse button movement. */ +- if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) { +- moving = 1; +- begin = x; +- } +- if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) { +- moving = 0; +- } +-} +- +-/* ARGSUSED1 */ +-static void +-mouseMotion(int x, int y) +-{ +- if (moving) { +- angle = angle + (x - begin); +- begin = x; +- newModel = 1; +- glutPostRedisplay(); +- } +-} +- +-static void +-menu(int option) +-{ +- switch (option) { +- case 0: +- makePointList(); +- break; +-#ifdef GL_ARB_point_parameters +- case 1: +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant); +- break; +- case 2: +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear); +- break; +- case 3: +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); +- break; +-#endif +- case 4: +- blend = 1; +- break; +- case 5: +- blend = 0; +- break; +-#ifdef GL_ARB_point_parameters +- case 6: +- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0); +- break; +- case 7: +- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0); +- break; +-#endif +- case 8: +- glEnable(GL_POINT_SMOOTH); +- break; +- case 9: +- glDisable(GL_POINT_SMOOTH); +- break; +- case 10: +- glPointSize(2.0); +- break; +- case 11: +- glPointSize(4.0); +- break; +- case 12: +- glPointSize(8.0); +- break; +- case 13: +- spin = 1 - spin; +- if (animate && (spin || motion)) { +- glutIdleFunc(idle); +- } else { +- glutIdleFunc(NULL); +- } +- break; +- case 14: +- numPoints = 200; +- break; +- case 15: +- numPoints = 500; +- break; +- case 16: +- numPoints = 1000; +- break; +- case 17: +- numPoints = 2000; +- break; +- case 666: +- exit(0); +- } +- glutPostRedisplay(); +-} +- +-/* ARGSUSED1 */ +-static void +-key(unsigned char c, int x, int y) +-{ +- switch (c) { +- case 13: +- animate = 1 - animate; /* toggle. */ +- if (animate && (motion || spin)) { +- glutIdleFunc(idle); +- } else { +- glutIdleFunc(NULL); +- } +- break; +- case ' ': +- animate = 1; +- makePointList(); +- glutIdleFunc(idle); +- break; +- case 27: +- exit(0); +- } +-} +- +-/* Nice floor texture tiling pattern. */ +-static char *circles[] = { +- "....xxxx........", +- "..xxxxxxxx......", +- ".xxxxxxxxxx.....", +- ".xxx....xxx.....", +- "xxx......xxx....", +- "xxx......xxx....", +- "xxx......xxx....", +- "xxx......xxx....", +- ".xxx....xxx.....", +- ".xxxxxxxxxx.....", +- "..xxxxxxxx......", +- "....xxxx........", +- "................", +- "................", +- "................", +- "................", +-}; +- +-static void +-makeFloorTexture(void) +-{ +- GLubyte floorTexture[16][16][3]; +- GLubyte *loc; +- int s, t; +- +- /* Setup RGB image for the texture. */ +- loc = (GLubyte*) floorTexture; +- for (t = 0; t < 16; t++) { +- for (s = 0; s < 16; s++) { +- if (circles[t][s] == 'x') { +- /* Nice blue. */ +- loc[0] = 0x1f; +- loc[1] = 0x1f; +- loc[2] = 0x8f; +- } else { +- /* Light gray. */ +- loc[0] = 0xca; +- loc[1] = 0xca; +- loc[2] = 0xca; +- } +- loc += 3; +- } +- } +- +- glPixelStorei(GL_UNPACK_ALIGNMENT, 1); +- +- if (useMipmaps) { +- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, +- GL_LINEAR_MIPMAP_LINEAR); +- gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 16, 16, +- GL_RGB, GL_UNSIGNED_BYTE, floorTexture); +- } else { +- if (linearFiltering) { +- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); +- } else { +- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); +- } +- glTexImage2D(GL_TEXTURE_2D, 0, 3, 16, 16, 0, +- GL_RGB, GL_UNSIGNED_BYTE, floorTexture); +- } +-} +- +-int +-main(int argc, char **argv) +-{ +- int i; +- +- glutInitWindowSize(300, 300); +- glutInit(&argc, argv); +- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE); +- +- for (i=1; i<argc; i++) { +- if(!strcmp("-noms", argv[i])) { +- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); +- printf("forcing no multisampling\n"); +- } else if(!strcmp("-nomipmaps", argv[i])) { +- useMipmaps = 0; +- } else if(!strcmp("-nearest", argv[i])) { +- linearFiltering = 0; +- } +- } +- +- glutCreateWindow("point burst"); +- glewInit(); +- glutDisplayFunc(redraw); +- glutMouseFunc(mouse); +- glutMotionFunc(mouseMotion); +- glutVisibilityFunc(visible); +- glutKeyboardFunc(key); +- glutCreateMenu(menu); +- glutAddMenuEntry("Reset time", 0); +- glutAddMenuEntry("Constant", 1); +- glutAddMenuEntry("Linear", 2); +- glutAddMenuEntry("Quadratic", 3); +- glutAddMenuEntry("Blend on", 4); +- glutAddMenuEntry("Blend off", 5); +- glutAddMenuEntry("Threshold 1", 6); +- glutAddMenuEntry("Threshold 10", 7); +- glutAddMenuEntry("Point smooth on", 8); +- glutAddMenuEntry("Point smooth off", 9); +- glutAddMenuEntry("Point size 2", 10); +- glutAddMenuEntry("Point size 4", 11); +- glutAddMenuEntry("Point size 8", 12); +- glutAddMenuEntry("Toggle spin", 13); +- glutAddMenuEntry("200 points ", 14); +- glutAddMenuEntry("500 points ", 15); +- glutAddMenuEntry("1000 points ", 16); +- glutAddMenuEntry("2000 points ", 17); +- glutAddMenuEntry("Quit", 666); +- glutAttachMenu(GLUT_RIGHT_BUTTON); +- +- if (!glutExtensionSupported("GL_ARB_point_parameters")) { +- fprintf(stderr, "Sorry, GL_ARB_point_parameters is not supported.\n"); +- return -1; +- } +- +- glShadeModel(GL_FLAT); +- glEnable(GL_DEPTH_TEST); +- glEnable(GL_POINT_SMOOTH); +- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); +- glPointSize(8.0); +-#if GL_ARB_point_parameters +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); +-#endif +- glMatrixMode(GL_PROJECTION); +- gluPerspective( /* field of view in degree */ 40.0, +- /* aspect ratio */ 1.0, +- /* Z near */ 0.5, /* Z far */ 40.0); +- glMatrixMode(GL_MODELVIEW); +- gluLookAt(0.0, 1.0, 8.0, /* eye location */ +- 0.0, 1.0, 0.0, /* center is at (0,0,0) */ +- 0.0, 1.0, 0.); /* up is in postivie Y direction */ +- glPushMatrix(); /* dummy push so we can pop on model +- recalc */ +- +- makePointList(); +- makeFloorTexture(); +- +- glutMainLoop(); +- return 0; /* ANSI C requires main to return int. */ +-} +diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c mesa-demos-8.0.1//src/demos/spriteblast.c +--- Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c 2010-07-07 13:57:15.000000000 -0400 ++++ mesa-demos-8.0.1/src/demos/spriteblast.c 1969-12-31 19:00:00.000000000 -0500 +@@ -1,555 +0,0 @@ +- +-/* Copyright (c) Mark J. Kilgard, 1997. */ +- +-/* This program is freely distributable without licensing fees +- and is provided without guarantee or warrantee expressed or +- implied. This program is -not- in the public domain. */ +- +-/* This example demonstrates how to render particle effects +- with OpenGL. A cloud of pinkish/orange particles explodes with the +- particles bouncing off the ground. When the EXT_point_parameters +- is present , the particle size is attenuated based on eye distance. */ +- +- +-/* Modified by Brian Paul to test GL_ARB_point_sprite */ +- +- +-#include <stdio.h> +-#include <stdlib.h> +-#include <string.h> +-#include <math.h> /* for cos(), sin(), and sqrt() */ +-#ifdef _WIN32 +-#include <windows.h> +-#endif +-#include <GL/glew.h> +-#include <GL/glut.h> +- +-/* Some <math.h> files do not define M_PI... */ +-#ifndef M_PI +-#define M_PI 3.14159265 +-#endif +- +-#if 0 /* For debugging. */ +-#undef GL_EXT_point_parameters +-#endif +- +-static GLfloat angle = -150; /* in degrees */ +-static int spin = 0; +-static int moving, begin; +-static float theTime; +-static int repeat = 1; +-static int blend = 1; +-int useMipmaps = 1; +-int linearFiltering = 1; +- +-static GLfloat constant[3] = { .2, 0.0, 0.0 }; +-static GLfloat linear[3] = { .0, .1, 0.0 }; +-static GLfloat theQuad[3] = { .005, 0.1, 1/600.0 }; +- +-#define MAX_POINTS 2000 +- +-static int numPoints = 200; +- +-static GLfloat pointList[MAX_POINTS][3]; +-static GLfloat pointTime[MAX_POINTS]; +-static GLfloat pointVelocity[MAX_POINTS][2]; +-static GLfloat pointDirection[MAX_POINTS][2]; +-static int colorList[MAX_POINTS]; +-static int animate = 1, motion = 0, org = 0, sprite = 1, smooth = 1; +- +-static GLfloat colorSet[][4] = { +- /* Shades of red. */ +- { 0.7, 0.2, 0.4, 0.5 }, +- { 0.8, 0.0, 0.7, 0.5 }, +- { 1.0, 0.0, 0.0, 0.5 }, +- { 0.9, 0.3, 0.6, 0.5 }, +- { 1.0, 0.4, 0.0, 0.5 }, +- { 1.0, 0.0, 0.5, 0.5 }, +-}; +- +-#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0])) +- +-#define DEAD (NUM_COLORS+1) +- +- +-/* GL */ +-static GLint spritePattern[16][16] = { +- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, +- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, +- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, +- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0 }, +- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0 }, +- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, +- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, +- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } +-}; +- +- +- +- +-#if 0 /* drand48 might be better on Unix machines */ +-#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48()) +-#else +-static float float_rand(void) { return rand() / (float) RAND_MAX; } +-#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand()) +-#endif +- +-#define MEAN_VELOCITY 3.0 +-#define GRAVITY 2.0 +- +-/* Modeling units of ground extent in each X and Z direction. */ +-#define EDGE 12 +- +-static void +-makePointList(void) +-{ +- float angle, velocity, direction; +- int i; +- +- motion = 1; +- for (i=0; i<numPoints; i++) { +- pointList[i][0] = 0.0; +- pointList[i][1] = 0.0; +- pointList[i][2] = 0.0; +- pointTime[i] = 0.0; +- angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0; +- direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0; +- pointDirection[i][0] = cos(direction); +- pointDirection[i][1] = sin(direction); +- velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0); +- pointVelocity[i][0] = velocity * cos(angle); +- pointVelocity[i][1] = velocity * sin(angle); +- colorList[i] = rand() % NUM_COLORS; +- } +- theTime = 0.0; +-} +- +-static void +-updatePointList(void) +-{ +- float distance; +- int i; +- +- static double t0 = -1.; +- double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0; +- if (t0 < 0.0) +- t0 = t; +- dt = t - t0; +- t0 = t; +- +- motion = 0; +- for (i=0; i<numPoints; i++) { +- distance = pointVelocity[i][0] * theTime; +- +- /* X and Z */ +- pointList[i][0] = pointDirection[i][0] * distance; +- pointList[i][2] = pointDirection[i][1] * distance; +- +- /* Z */ +- pointList[i][1] = +- (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i]; +- +- /* If we hit the ground, bounce the point upward again. */ +- if (pointList[i][1] <= 0.0) { +- if (distance > EDGE) { +- /* Particle has hit ground past the distance duration of +- the particles. Mark particle as dead. */ +- colorList[i] = NUM_COLORS; /* Not moving. */ +- continue; +- } +- +- pointVelocity[i][1] *= 0.8; /* 80% of previous up velocity. */ +- pointTime[i] = 0.0; /* Reset the particles sense of up time. */ +- } +- motion = 1; +- pointTime[i] += dt; +- } +- theTime += dt; +- if (!motion && !spin) { +- if (repeat) { +- makePointList(); +- } else { +- glutIdleFunc(NULL); +- } +- } +-} +- +-static void +-idle(void) +-{ +- updatePointList(); +- if (spin) { +- angle += 0.3; +- } +- glutPostRedisplay(); +-} +- +-static void +-visible(int vis) +-{ +- if (vis == GLUT_VISIBLE) { +- if (animate && (motion || spin)) { +- glutIdleFunc(idle); +- } +- } else { +- glutIdleFunc(NULL); +- } +-} +- +-static void +-redraw(void) +-{ +- int i; +- +- glDepthMask(GL_TRUE); +- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); +- +- glPushMatrix(); +- glRotatef(15.0, 1.0, 0.0, 0.0); +- glRotatef(angle, 0.0, 1.0, 0.0); +- +- +- /* Draw the floor. */ +-/* glEnable(GL_TEXTURE_2D);*/ +- glColor3f(0.1, 0.5, 1.0); +- glBegin(GL_QUADS); +- glTexCoord2f(0.0, 0.0); +- glVertex3f(-EDGE, -0.05, -EDGE); +- glTexCoord2f(20.0, 0.0); +- glVertex3f(EDGE, -0.05, -EDGE); +- glTexCoord2f(20.0, 20.0); +- glVertex3f(EDGE, -0.05, EDGE); +- glTexCoord2f(0.0, 20.0); +- glVertex3f(-EDGE, -0.05, EDGE); +- glEnd(); +- +- /* Allow particles to blend with each other. */ +- glDepthMask(GL_FALSE); +- +- if (blend) +- glEnable(GL_BLEND); +- +- if (sprite) { +- glEnable(GL_TEXTURE_2D); +-#ifdef GL_ARB_point_sprite +- glEnable(GL_POINT_SPRITE_ARB); +-#endif +- } +- +- glColor3f(1,1,1); +- glBegin(GL_POINTS); +- for (i=0; i<numPoints; i++) { +- /* Draw alive particles. */ +- if (colorList[i] != DEAD) { +- if (!sprite) glColor4fv(colorSet[colorList[i]]); +- glVertex3fv(pointList[i]); +- } +- } +- glEnd(); +- +- glDisable(GL_TEXTURE_2D); +-#ifdef GL_ARB_point_sprite +- glDisable(GL_POINT_SPRITE_ARB); +-#endif +- glDisable(GL_BLEND); +- +- glPopMatrix(); +- +- glutSwapBuffers(); +-} +- +-/* ARGSUSED2 */ +-static void +-mouse(int button, int state, int x, int y) +-{ +- /* Scene can be spun around Y axis using left +- mouse button movement. */ +- if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) { +- moving = 1; +- begin = x; +- } +- if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) { +- moving = 0; +- } +-} +- +-/* ARGSUSED1 */ +-static void +-mouseMotion(int x, int y) +-{ +- if (moving) { +- angle = angle + (x - begin); +- begin = x; +- glutPostRedisplay(); +- } +-} +- +-static void +-menu(int option) +-{ +- switch (option) { +- case 0: +- makePointList(); +- break; +-#ifdef GL_ARB_point_parameters +- case 1: +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant); +- break; +- case 2: +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear); +- break; +- case 3: +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); +- break; +-#endif +- case 4: +- blend = 1; +- break; +- case 5: +- blend = 0; +- break; +-#ifdef GL_ARB_point_parameters +- case 6: +- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0); +- break; +- case 7: +- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0); +- break; +-#endif +- case 8: +- glEnable(GL_POINT_SMOOTH); +- smooth = 1; +- break; +- case 9: +- glDisable(GL_POINT_SMOOTH); +- smooth = 0; +- break; +- case 10: +- glPointSize(16.0); +- break; +- case 11: +- glPointSize(32.0); +- break; +- case 12: +- glPointSize(64.0); +- break; +- case 13: +- spin = 1 - spin; +- if (animate && (spin || motion)) { +- glutIdleFunc(idle); +- } else { +- glutIdleFunc(NULL); +- } +- break; +- case 14: +- numPoints = 200; +- break; +- case 15: +- numPoints = 500; +- break; +- case 16: +- numPoints = 1000; +- break; +- case 17: +- numPoints = 2000; +- break; +- case 666: +- exit(0); +- } +- glutPostRedisplay(); +-} +- +-/* ARGSUSED1 */ +-static void +-key(unsigned char c, int x, int y) +-{ +- switch (c) { +- case 13: +- animate = 1 - animate; /* toggle. */ +- if (animate && (motion || spin)) { +- glutIdleFunc(idle); +- } else { +- glutIdleFunc(NULL); +- } +- break; +- case ' ': +- animate = 1; +- makePointList(); +- glutIdleFunc(idle); +- break; +- case 'o': +- case 'O': +- org ^= 1; +-#ifdef GL_VERSION_2_0 +-#ifdef GL_ARB_point_parameters +- glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, +- org ? GL_LOWER_LEFT : GL_UPPER_LEFT); +-#endif +-#endif +- glutPostRedisplay(); +- break; +- case 't': +- case 'T': +- sprite ^= 1; +- glutPostRedisplay(); +- break; +- case 's': +- case 'S': +- (smooth ^= 1) ? glEnable(GL_POINT_SMOOTH) : glDisable(GL_POINT_SMOOTH); +- glutPostRedisplay(); +- break; +- case '0': +- glPointSize(1.0); +- glutPostRedisplay(); +- break; +- case '1': +- glPointSize(16.0); +- glutPostRedisplay(); +- break; +- case '2': +- glPointSize(32.0); +- glutPostRedisplay(); +- break; +- case '3': +- glPointSize(64.0); +- glutPostRedisplay(); +- break; +- case '4': +- glPointSize(128.0); +- glutPostRedisplay(); +- break; +- case 27: +- exit(0); +- } +-} +- +- +- +-static void +-makeSprite(void) +-{ +- GLubyte texture[16][16][4]; +- int i, j; +- +- if (!glutExtensionSupported("GL_ARB_point_sprite")) { +- printf("Sorry, this demo requires GL_ARB_point_sprite.\n"); +- exit(0); +- } +- if (!glutExtensionSupported("GL_ARB_point_parameters")) { +- printf("Sorry, this demo requires GL_ARB_point_parameters.\n"); +- exit(0); +- } +- +- for (i = 0; i < 16; i++) { +- for (j = 0; j < 16; j++) { +- if (spritePattern[i][j]) { +- texture[i][j][0] = 255; +- texture[i][j][1] = 255; +- texture[i][j][2] = 255; +- texture[i][j][3] = 255; +- } +- else { +- texture[i][j][0] = 255; +- texture[i][j][1] = 0; +- texture[i][j][2] = 0; +- texture[i][j][3] = 0; +- } +- } +- } +- +- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, +- texture); +- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); +- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); +-#ifdef GL_ARB_point_sprite +- glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); +-#endif +-} +- +- +-static void +-reshape(int width, int height) +-{ +- GLfloat h = (GLfloat) height / (GLfloat) width; +- +- glViewport(0, 0, (GLint) width, (GLint) height); +- glMatrixMode(GL_PROJECTION); +- glLoadIdentity(); +- glFrustum(-1.0, 1.0, -h, h, 2.0, 30.0); +- glMatrixMode(GL_MODELVIEW); +- glLoadIdentity(); +- glTranslatef(0.0, 0.0, -10.0); +-} +- +-int +-main(int argc, char **argv) +-{ +- int i; +- +- glutInitWindowSize(600,300); +- glutInit(&argc, argv); +- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE); +- +- for (i=1; i<argc; i++) { +- if(!strcmp("-noms", argv[i])) { +- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); +- printf("forcing no multisampling\n"); +- } else if(!strcmp("-nomipmaps", argv[i])) { +- useMipmaps = 0; +- } else if(!strcmp("-nearest", argv[i])) { +- linearFiltering = 0; +- } +- } +- glutCreateWindow("sprite blast"); +- glewInit(); +- glutReshapeFunc(reshape); +- glutDisplayFunc(redraw); +- glutMouseFunc(mouse); +- glutMotionFunc(mouseMotion); +- glutVisibilityFunc(visible); +- glutKeyboardFunc(key); +- glutCreateMenu(menu); +- glutAddMenuEntry("Reset time", 0); +- glutAddMenuEntry("Constant", 1); +- glutAddMenuEntry("Linear", 2); +- glutAddMenuEntry("Quadratic", 3); +- glutAddMenuEntry("Blend on", 4); +- glutAddMenuEntry("Blend off", 5); +- glutAddMenuEntry("Threshold 1", 6); +- glutAddMenuEntry("Threshold 10", 7); +- glutAddMenuEntry("Point smooth on", 8); +- glutAddMenuEntry("Point smooth off", 9); +- glutAddMenuEntry("Point size 16", 10); +- glutAddMenuEntry("Point size 32", 11); +- glutAddMenuEntry("Point size 64", 12); +- glutAddMenuEntry("Toggle spin", 13); +- glutAddMenuEntry("200 points ", 14); +- glutAddMenuEntry("500 points ", 15); +- glutAddMenuEntry("1000 points ", 16); +- glutAddMenuEntry("2000 points ", 17); +- glutAddMenuEntry("Quit", 666); +- glutAttachMenu(GLUT_RIGHT_BUTTON); +- +- makePointList(); +- makeSprite(); +- +- glShadeModel(GL_FLAT); +- glEnable(GL_DEPTH_TEST); +- glEnable(GL_POINT_SMOOTH); +- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); +- glPointSize(32.0); +-#ifdef GL_ARB_point_parameters +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); +-#endif +- +- glutMainLoop(); +- return 0; /* ANSI C requires main to return int. */ +-} diff --git a/libre/lib32-sdl-libre/PKGBUILD b/libre/lib32-sdl-libre/PKGBUILD new file mode 100644 index 000000000..a1fa02a0a --- /dev/null +++ b/libre/lib32-sdl-libre/PKGBUILD @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgbasename=sdl-libre +pkgname=lib32-$_pkgbasename +pkgver=1.2.15 +pkgrel=3 +pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit)" +arch=('x86_64') +url="http://www.libsdl.org" +license=('LGPL') +provides=("lib32-sdl=${pkgver}") +conflicts=('lib32-sdl') +replaces=('lib32-sdl') +depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename) +makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib) +optdepends=('lib32-alsa-lib: ALSA audio driver' + 'lib32-libpulse: PulseAudio audio driver') +options=('!libtool') +source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz + sdl-1.2.14-fix-mouse-clicking.patch + sdl-1.2.14-disable-mmx.patch + fix_joystick_misc_axes.diff + libsdl-1.2.15-resizing.patch + libre.patch) +md5sums=('9d96df8417572a2afb781a7c4c811a85' + '04d8c179f125e04bcd4c9d60e013c2d7' + 'e5c16b7611f62c7cb25f0534eff68852' + '687586a108b597a2a6b73070c1d37e51' + '3dd50347d8856160a9cbd7f80383a1f8' + '5c665f72b8a2adc97a91f6db6f2da79a') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd SDL-$pkgver + patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch + patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch + patch -Np1 -i ../fix_joystick_misc_axes.diff + patch -Np1 -i ../libsdl-1.2.15-resizing.patch + patch -Np0 -i ../libre.patch + ./configure --prefix=/usr --disable-nasm --enable-alsa \ + --with-x --disable-rpath --disable-static --libdir=/usr/lib32 + make +} + +package() { + cd SDL-$pkgver + make DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/{include,share} + + cd "$pkgdir/usr/bin" + mv sdl-config sdl-config-32 +} diff --git a/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff b/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff new file mode 100644 index 000000000..75e3755c9 --- /dev/null +++ b/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff @@ -0,0 +1,13 @@ +diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c +index ee43974..80e46e4 100644 +--- a/src/joystick/linux/SDL_sysjoystick.c ++++ b/src/joystick/linux/SDL_sysjoystick.c +@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd) + ++joystick->nbuttons; + } + } +- for ( i=0; i<ABS_MISC; ++i ) { ++ for ( i=0; i<ABS_MAX; ++i ) { + /* Skip hats */ + if ( i == ABS_HAT0X ) { + i = ABS_HAT3Y; diff --git a/libre/lib32-sdl-libre/libre.patch b/libre/lib32-sdl-libre/libre.patch new file mode 100644 index 000000000..72f7da56a --- /dev/null +++ b/libre/lib32-sdl-libre/libre.patch @@ -0,0 +1,578 @@ +--- src/video/fbcon/riva_mmio.h 2012-01-19 04:30:06.000000000 -0200 ++++ /dev/null 2012-04-01 13:58:27.776718756 -0300 +@@ -1,449 +0,0 @@ +-/***************************************************************************\ +-|* *| +-|* Copyright 1993-1999 NVIDIA, Corporation. All rights reserved. *| +-|* *| +-|* NOTICE TO USER: The source code is copyrighted under U.S. and *| +-|* international laws. Users and possessors of this source code are *| +-|* hereby granted a nonexclusive, royalty-free copyright license to *| +-|* use this code in individual and commercial software. *| +-|* *| +-|* Any use of this source code must include, in the user documenta- *| +-|* tion and internal comments to the code, notices to the end user *| +-|* as follows: *| +-|* *| +-|* Copyright 1993-1999 NVIDIA, Corporation. All rights reserved. *| +-|* *| +-|* NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY *| +-|* OF THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" *| +-|* WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND. NVIDIA, CORPOR- *| +-|* ATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOURCE CODE, *| +-|* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE- *| +-|* MENT, AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL *| +-|* NVIDIA, CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT, INCI- *| +-|* DENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RE- *| +-|* SULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION *| +-|* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *| +-|* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. *| +-|* *| +-|* U.S. Government End Users. This source code is a "commercial *| +-|* item," as that term is defined at 48 C.F.R. 2.101 (OCT 1995), *| +-|* consisting of "commercial computer software" and "commercial *| +-|* computer software documentation," as such terms are used in *| +-|* 48 C.F.R. 12.212 (SEPT 1995) and is provided to the U.S. Govern- *| +-|* ment only as a commercial end item. Consistent with 48 C.F.R. *| +-|* 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (JUNE 1995), *| +-|* all U.S. Government End Users acquire the source code with only *| +-|* those rights set forth herein. *| +-|* *| +-\***************************************************************************/ +- +-#ifndef __RIVA_HW_H__ +-#define __RIVA_HW_H__ +-#define RIVA_SW_VERSION 0x00010003 +- +-/* +- * Typedefs to force certain sized values. +- */ +-typedef Uint8 U008; +-typedef Uint16 U016; +-typedef Uint32 U032; +- +-/* +- * HW access macros. +- */ +-#define NV_WR08(p,i,d) (((U008 *)(p))[i]=(d)) +-#define NV_RD08(p,i) (((U008 *)(p))[i]) +-#define NV_WR16(p,i,d) (((U016 *)(p))[(i)/2]=(d)) +-#define NV_RD16(p,i) (((U016 *)(p))[(i)/2]) +-#define NV_WR32(p,i,d) (((U032 *)(p))[(i)/4]=(d)) +-#define NV_RD32(p,i) (((U032 *)(p))[(i)/4]) +-#define VGA_WR08(p,i,d) NV_WR08(p,i,d) +-#define VGA_RD08(p,i) NV_RD08(p,i) +- +-/* +- * Define supported architectures. +- */ +-#define NV_ARCH_03 0x03 +-#define NV_ARCH_04 0x04 +-#define NV_ARCH_10 0x10 +-/***************************************************************************\ +-* * +-* FIFO registers. * +-* * +-\***************************************************************************/ +- +-/* +- * Raster OPeration. Windows style ROP3. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 Rop3; +-} RivaRop; +-/* +- * 8X8 Monochrome pattern. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BD]; +- U032 Shape; +- U032 reserved03[0x001]; +- U032 Color0; +- U032 Color1; +- U032 Monochrome[2]; +-} RivaPattern; +-/* +- * Scissor clip rectangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 TopLeft; +- U032 WidthHeight; +-} RivaClip; +-/* +- * 2D filled rectangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 Color; +- U032 reserved03[0x03E]; +- U032 TopLeft; +- U032 WidthHeight; +-} RivaRectangle; +-/* +- * 2D screen-screen BLT. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 TopLeftSrc; +- U032 TopLeftDst; +- U032 WidthHeight; +-} RivaScreenBlt; +-/* +- * 2D pixel BLT. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 TopLeft; +- U032 WidthHeight; +- U032 WidthHeightIn; +- U032 reserved02[0x03C]; +- U032 Pixels; +-} RivaPixmap; +-/* +- * Filled rectangle combined with monochrome expand. Useful for glyphs. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 reserved03[(0x040)-1]; +- U032 Color1A; +- struct +- { +- U032 TopLeft; +- U032 WidthHeight; +- } UnclippedRectangle[64]; +- U032 reserved04[(0x080)-3]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipB; +- U032 Color1B; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClippedRectangle[64]; +- U032 reserved05[(0x080)-5]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipC; +- U032 Color1C; +- U032 WidthHeightC; +- U032 PointC; +- U032 MonochromeData1C; +- U032 reserved06[(0x080)+121]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipD; +- U032 Color1D; +- U032 WidthHeightInD; +- U032 WidthHeightOutD; +- U032 PointD; +- U032 MonochromeData1D; +- U032 reserved07[(0x080)+120]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipE; +- U032 Color0E; +- U032 Color1E; +- U032 WidthHeightInE; +- U032 WidthHeightOutE; +- U032 PointE; +- U032 MonochromeData01E; +-} RivaBitmap; +-/* +- * 3D textured, Z buffered triangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BC]; +- U032 TextureOffset; +- U032 TextureFormat; +- U032 TextureFilter; +- U032 FogColor; +-/* This is a problem on LynxOS */ +-#ifdef Control +-#undef Control +-#endif +- U032 Control; +- U032 AlphaTest; +- U032 reserved02[0x339]; +- U032 FogAndIndex; +- U032 Color; +- float ScreenX; +- float ScreenY; +- float ScreenZ; +- float EyeM; +- float TextureS; +- float TextureT; +-} RivaTexturedTriangle03; +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 ColorKey; +- U032 TextureOffset; +- U032 TextureFormat; +- U032 TextureFilter; +- U032 Blend; +-/* This is a problem on LynxOS */ +-#ifdef Control +-#undef Control +-#endif +- U032 Control; +- U032 FogColor; +- U032 reserved02[0x39]; +- struct +- { +- float ScreenX; +- float ScreenY; +- float ScreenZ; +- float EyeM; +- U032 Color; +- U032 Specular; +- float TextureS; +- float TextureT; +- } Vertex[16]; +- U032 DrawTriangle3D; +-} RivaTexturedTriangle05; +-/* +- * 2D line. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 Color; /* source color 0304-0307*/ +- U032 Reserved02[0x03e]; +- struct { /* start aliased methods in array 0400- */ +- U032 point0; /* y_x S16_S16 in pixels 0- 3*/ +- U032 point1; /* y_x S16_S16 in pixels 4- 7*/ +- } Lin[16]; /* end of aliased methods in array -047f*/ +- struct { /* start aliased methods in array 0480- */ +- U032 point0X; /* in pixels, 0 at left 0- 3*/ +- U032 point0Y; /* in pixels, 0 at top 4- 7*/ +- U032 point1X; /* in pixels, 0 at left 8- b*/ +- U032 point1Y; /* in pixels, 0 at top c- f*/ +- } Lin32[8]; /* end of aliased methods in array -04ff*/ +- U032 PolyLin[32]; /* y_x S16_S16 in pixels 0500-057f*/ +- struct { /* start aliased methods in array 0580- */ +- U032 x; /* in pixels, 0 at left 0- 3*/ +- U032 y; /* in pixels, 0 at top 4- 7*/ +- } PolyLin32[16]; /* end of aliased methods in array -05ff*/ +- struct { /* start aliased methods in array 0600- */ +- U032 color; /* source color 0- 3*/ +- U032 point; /* y_x S16_S16 in pixels 4- 7*/ +- } ColorPolyLin[16]; /* end of aliased methods in array -067f*/ +-} RivaLine; +-/* +- * 2D/3D surfaces +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BE]; +- U032 Offset; +-} RivaSurface; +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BD]; +- U032 Pitch; +- U032 RenderBufferOffset; +- U032 ZBufferOffset; +-} RivaSurface3D; +- +-/***************************************************************************\ +-* * +-* Virtualized RIVA H/W interface. * +-* * +-\***************************************************************************/ +- +-struct _riva_hw_inst; +-struct _riva_hw_state; +-/* +- * Virtialized chip interface. Makes RIVA 128 and TNT look alike. +- */ +-typedef struct _riva_hw_inst +-{ +- /* +- * Chip specific settings. +- */ +- U032 Architecture; +- U032 Version; +- U032 CrystalFreqKHz; +- U032 RamAmountKBytes; +- U032 MaxVClockFreqKHz; +- U032 RamBandwidthKBytesPerSec; +- U032 EnableIRQ; +- U032 IO; +- U032 VBlankBit; +- U032 FifoFreeCount; +- U032 FifoEmptyCount; +- /* +- * Non-FIFO registers. +- */ +- volatile U032 *PCRTC; +- volatile U032 *PRAMDAC; +- volatile U032 *PFB; +- volatile U032 *PFIFO; +- volatile U032 *PGRAPH; +- volatile U032 *PEXTDEV; +- volatile U032 *PTIMER; +- volatile U032 *PMC; +- volatile U032 *PRAMIN; +- volatile U032 *FIFO; +- volatile U032 *CURSOR; +- volatile U032 *CURSORPOS; +- volatile U032 *VBLANKENABLE; +- volatile U032 *VBLANK; +- volatile U008 *PCIO; +- volatile U008 *PVIO; +- volatile U008 *PDIO; +- /* +- * Common chip functions. +- */ +- int (*Busy)(struct _riva_hw_inst *); +- void (*CalcStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *,int,int,int,int,int,int,int,int,int,int,int,int,int); +- void (*LoadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *); +- void (*UnloadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *); +- void (*SetStartAddress)(struct _riva_hw_inst *,U032); +- void (*SetSurfaces2D)(struct _riva_hw_inst *,U032,U032); +- void (*SetSurfaces3D)(struct _riva_hw_inst *,U032,U032); +- int (*ShowHideCursor)(struct _riva_hw_inst *,int); +- void (*LockUnlock)(struct _riva_hw_inst *, int); +- /* +- * Current extended mode settings. +- */ +- struct _riva_hw_state *CurrentState; +- /* +- * FIFO registers. +- */ +- RivaRop *Rop; +- RivaPattern *Patt; +- RivaClip *Clip; +- RivaPixmap *Pixmap; +- RivaScreenBlt *Blt; +- RivaBitmap *Bitmap; +- RivaLine *Line; +- RivaTexturedTriangle03 *Tri03; +- RivaTexturedTriangle05 *Tri05; +-} RIVA_HW_INST; +-/* +- * Extended mode state information. +- */ +-typedef struct _riva_hw_state +-{ +- U032 bpp; +- U032 width; +- U032 height; +- U032 repaint0; +- U032 repaint1; +- U032 screen; +- U032 pixel; +- U032 horiz; +- U032 arbitration0; +- U032 arbitration1; +- U032 vpll; +- U032 pllsel; +- U032 general; +- U032 config; +- U032 cursor0; +- U032 cursor1; +- U032 cursor2; +- U032 offset0; +- U032 offset1; +- U032 offset2; +- U032 offset3; +- U032 pitch0; +- U032 pitch1; +- U032 pitch2; +- U032 pitch3; +-} RIVA_HW_STATE; +- +-/* +- * FIFO Free Count. Should attempt to yield processor if RIVA is busy. +- */ +- +-#define RIVA_FIFO_FREE(hwptr,cnt) \ +-{ \ +- while (FifoFreeCount < (cnt)) \ +- FifoFreeCount = hwptr->FifoFree >> 2; \ +- FifoFreeCount -= (cnt); \ +-} +-#endif /* __RIVA_HW_H__ */ +- +--- src/video/fbcon/SDL_fbriva.c 2012-01-19 04:30:06.000000000 -0200 ++++ src/video/fbcon/SDL_fbriva.c 2012-04-01 15:10:10.108451467 -0300 +@@ -24,12 +24,10 @@ + #include "SDL_video.h" + #include "../SDL_blit.h" + #include "SDL_fbriva.h" +-#include "riva_mmio.h" + #include "riva_regs.h" + + + static int FifoEmptyCount = 0; +-static int FifoFreeCount = 0; + + /* Wait for vertical retrace */ + static void WaitVBL(_THIS) +@@ -41,20 +39,6 @@ + while ( !(*port & 0x08) ) + ; + } +-static void NV3WaitIdle(_THIS) +-{ +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); +- while ( (Rop->FifoFree < FifoEmptyCount) || +- (*(mapped_io + PGRAPH_OFFSET + 0x000006B0) & 0x01) ) +- ; +-} +-static void NV4WaitIdle(_THIS) +-{ +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); +- while ( (Rop->FifoFree < FifoEmptyCount) || +- (*(mapped_io + PGRAPH_OFFSET + 0x00000700) & 0x01) ) +- ; +-} + + #if 0 /* Not yet implemented? */ + /* Sets video mem colorkey and accelerated blit function */ +@@ -74,7 +58,6 @@ + { + int dstX, dstY; + int dstW, dstH; +- RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET); + + /* Don't blit to the display surface when switched away */ + if ( switched_away ) { +@@ -93,13 +76,6 @@ + dstX += rect->x; + dstY += rect->y; + +- RIVA_FIFO_FREE(Bitmap, 1); +- Bitmap->Color1A = color; +- +- RIVA_FIFO_FREE(Bitmap, 2); +- Bitmap->UnclippedRectangle[0].TopLeft = (dstX << 16) | dstY; +- Bitmap->UnclippedRectangle[0].WidthHeight = (dstW << 16) | dstH; +- + FB_AddBusySurface(dst); + + if ( dst == this->screen ) { +@@ -115,7 +91,6 @@ + int srcX, srcY; + int dstX, dstY; + int dstW, dstH; +- RivaScreenBlt *Blt = (RivaScreenBlt *)(mapped_io + BLT_OFFSET); + + /* FIXME: For now, only blit to display surface */ + if ( dst->pitch != SDL_VideoSurface->pitch ) { +@@ -142,11 +117,6 @@ + dstX += dstrect->x; + dstY += dstrect->y; + +- RIVA_FIFO_FREE(Blt, 3); +- Blt->TopLeftSrc = (srcY << 16) | srcX; +- Blt->TopLeftDst = (dstY << 16) | dstX; +- Blt->WidthHeight = (dstH << 16) | dstW; +- + FB_AddBusySurface(src); + FB_AddBusySurface(dst); + +@@ -185,23 +155,15 @@ + + void FB_RivaAccel(_THIS, __u32 card) + { +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); + + /* We have hardware accelerated surface functions */ + this->CheckHWBlit = CheckHWBlit; + wait_vbl = WaitVBL; + switch (card) { +- case FB_ACCEL_NV3: +- wait_idle = NV3WaitIdle; +- break; +- case FB_ACCEL_NV4: +- wait_idle = NV4WaitIdle; +- break; + default: + /* Hmm... FIXME */ + break; + } +- FifoEmptyCount = Rop->FifoFree; + + /* The Riva has an accelerated color fill */ + this->info.blit_fill = 1; +--- src/video/fbcon/SDL_fbvideo.c.orig 2011-09-08 17:30:03.670583685 +0200 ++++ src/video/fbcon/SDL_fbvideo.c 2011-09-08 17:30:24.230582737 +0200 +@@ -46,7 +46,6 @@ + #include "SDL_fbevents_c.h" + #include "SDL_fb3dfx.h" + #include "SDL_fbmatrox.h" +-#include "SDL_fbriva.h" + + /*#define FBCON_DEBUG*/ + +@@ -769,13 +768,6 @@ + #endif + FB_3DfxAccel(this, finfo.accel); + break; +- case FB_ACCEL_NV3: +- case FB_ACCEL_NV4: +-#ifdef FBACCEL_DEBUG +- printf("NVidia hardware accelerator!\n"); +-#endif +- FB_RivaAccel(this, finfo.accel); +- break; + default: + #ifdef FBACCEL_DEBUG + printf("Unknown hardware accelerator.\n"); diff --git a/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch b/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch new file mode 100644 index 000000000..0655a13e1 --- /dev/null +++ b/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch @@ -0,0 +1,63 @@ +Description: Revert change that breaks window corner resizing + http://bugzilla.libsdl.org/show_bug.cgi?id=1430 +Author: Andrew Caudwell <acaudwell@gmail.com> +Last-Update: 2012-04-10 +Bug-Debian: http://bugs.debian.org/665779 + +diff -r c787fb1b5699 src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 +@@ -57,12 +57,6 @@ + static SDLKey MISC_keymap[256]; + SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); + +-/* +- Pending resize target for ConfigureNotify (so outdated events don't +- cause inappropriate resize events) +-*/ +-int X11_PendingConfigureNotifyWidth = -1; +-int X11_PendingConfigureNotifyHeight = -1; + + #ifdef X_HAVE_UTF8_STRING + Uint32 Utf8ToUcs4(const Uint8 *utf8) +@@ -825,16 +819,6 @@ + #ifdef DEBUG_XEVENTS + printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); + #endif +- if ((X11_PendingConfigureNotifyWidth != -1) && +- (X11_PendingConfigureNotifyHeight != -1)) { +- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && +- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { +- /* Event is from before the resize, so ignore. */ +- break; +- } +- X11_PendingConfigureNotifyWidth = -1; +- X11_PendingConfigureNotifyHeight = -1; +- } + if ( SDL_VideoSurface ) { + if ((xevent.xconfigure.width != SDL_VideoSurface->w) || + (xevent.xconfigure.height != SDL_VideoSurface->h)) { +diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h +--- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 +@@ -27,8 +27,3 @@ + extern void X11_InitOSKeymap(_THIS); + extern void X11_PumpEvents(_THIS); + extern void X11_SetKeyboardState(Display *display, const char *key_vec); +- +-/* Variables to be exported */ +-extern int X11_PendingConfigureNotifyWidth; +-extern int X11_PendingConfigureNotifyHeight; +- +diff -r c787fb1b5699 src/video/x11/SDL_x11video.c +--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 +@@ -1182,8 +1182,6 @@ + current = NULL; + goto done; + } +- X11_PendingConfigureNotifyWidth = width; +- X11_PendingConfigureNotifyHeight = height; + } else { + if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { + current = NULL; diff --git a/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch new file mode 100644 index 000000000..1bb6e0e47 --- /dev/null +++ b/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch @@ -0,0 +1,13 @@ +# and another one from FS#26020 + +--- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 ++++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700 +@@ -89,6 +89,8 @@ + #include "SDL_yuvfuncs.h" + #include "SDL_yuv_sw_c.h" + ++#undef __OPTIMIZE__ ++ + /* The functions used to manipulate software video overlays */ + static struct private_yuvhwfuncs sw_yuvfuncs = { + SDL_LockYUV_SW, diff --git a/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch new file mode 100644 index 000000000..7d3e5acfc --- /dev/null +++ b/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch @@ -0,0 +1,23 @@ +--- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 ++++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 +@@ -423,12 +423,15 @@ + if ( xevent.xcrossing.mode == NotifyUngrab ) + printf("Mode: NotifyUngrab\n"); + #endif +- if ( this->input_grab == SDL_GRAB_OFF ) { +- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ if ( (xevent.xcrossing.mode != NotifyGrab) && ++ (xevent.xcrossing.mode != NotifyUngrab) ) { ++ if ( this->input_grab == SDL_GRAB_OFF ) { ++ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ } ++ posted = SDL_PrivateMouseMotion(0, 0, ++ xevent.xcrossing.x, ++ xevent.xcrossing.y); + } +- posted = SDL_PrivateMouseMotion(0, 0, +- xevent.xcrossing.x, +- xevent.xcrossing.y); + } + break; + diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index d06832782..7d115e1d3 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -2,9 +2,9 @@ # Contributor: fauno <fauno@kiwwwi.com.ar> pkgbase=libretools -pkgname=(libretools libretools-mips64el) +pkgname=(libretools libretools-pr libretools-mips64el) pkgver=$(date -u +%Y%m%d) -pkgrel=1 +pkgrel=2 pkgdesc="Scripts for easing Parabola's tasks" arch=('any') url="http://parabolagnulinux.org" @@ -12,7 +12,6 @@ license=('GPL3+') depends=(openssh rsync git wget) optdepends=('devtools: For chroot (libremkchroot, librechroot, libremakepkg)') makedepends=(git) -backup=(etc/libretools.conf) install=libretools.install source=() md5sums=() @@ -36,41 +35,45 @@ build() { } package_libretools() { - - install -d ${pkgdir}/etc - install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/ + backup=(etc/libretools.conf) install -d ${pkgdir}/etc/libretools.d - touch ${pkgdir}/etc/libretools.d/cleansystem + install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/ install -d ${pkgdir}/usr/bin - install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin - install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin - install -m755 ${_gitname}/aur ${pkgdir}/usr/bin - install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/diff-unfree ${pkgdir}/usr/bin - install -m755 ${_gitname}/fullpkg ${pkgdir}/usr/bin - install -m755 ${_gitname}/fullpkg-find ${pkgdir}/usr/bin - install -m755 ${_gitname}/fullpkg-build ${pkgdir}/usr/bin - install -m755 ${_gitname}/is_built ${pkgdir}/usr/bin - install -m755 ${_gitname}/is_unfree ${pkgdir}/usr/bin - install -m755 ${_gitname}/lb ${pkgdir}/usr/bin - install -m755 ${_gitname}/libreaddiff ${pkgdir}/usr/bin - install -m755 ${_gitname}/librechroot ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/libremkchroot ${pkgdir}/usr/bin - install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin - install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin - install -m755 ${_gitname}/update-cleansystem ${pkgdir}/usr/bin - install -d ${pkgdir}/usr/sbin - install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin/ - + install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin + install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin + install -m755 ${_gitname}/aur ${pkgdir}/usr/bin + install -m755 ${_gitname}/buildenv ${pkgdir}/usr/sbin + install -m755 ${_gitname}/chcleanup ${pkgdir}/usr/bin + install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin + install -m755 ${_gitname}/diff-unfree ${pkgdir}/usr/bin + install -m755 ${_gitname}/fullpkg ${pkgdir}/usr/bin + install -m755 ${_gitname}/fullpkg-build ${pkgdir}/usr/bin + install -m755 ${_gitname}/fullpkg-find ${pkgdir}/usr/bin + install -m755 ${_gitname}/is_built ${pkgdir}/usr/bin + install -m755 ${_gitname}/is_unfree ${pkgdir}/usr/bin + install -m755 ${_gitname}/lb ${pkgdir}/usr/bin + install -m755 ${_gitname}/libreaddiff ${pkgdir}/usr/bin + install -m755 ${_gitname}/librebasebuilder ${pkgdir}/usr/bin + install -m755 ${_gitname}/librechroot ${pkgdir}/usr/sbin + install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin + install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin + install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin + install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin + install -m755 ${_gitname}/libremkchroot ${pkgdir}/usr/bin + install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin + install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin + install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin + install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin + install -m755 ${_gitname}/toru ${pkgdir}/usr/bin + install -m755 ${_gitname}/toru-path ${pkgdir}/usr/bin + install -m755 ${_gitname}/toru-utils ${pkgdir}/usr/bin + install -m755 ${_gitname}/toru-where ${pkgdir}/usr/bin + install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin + install -m755 ${_gitname}/update-cleansystem ${pkgdir}/usr/sbin + install -d ${pkgdir}/usr/share/pacman install -m755 ${_gitname}/rePKGBUILD.proto ${pkgdir}/usr/share/pacman @@ -81,6 +84,8 @@ package_libretools() { } package_libretools-pr() { + backup=('etc/libretools.d/prtools.conf') + install -d ${pkgdir}/etc/libretools.d install -m644 ${_gitname}/prtools/prtools.conf ${pkgdir}/etc/libretools.d @@ -91,6 +96,8 @@ package_libretools-pr() { } package_libretools-mips64el() { + backup=('etc/libretools.d/mips64el.conf') + install -d ${pkgdir}/etc/libretools.d install -m755 ${_gitname}/mips64el/mips64el.conf ${pkgdir}/etc/libretools.d diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index 163956024..cff1e97db 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -1,3 +1,5 @@ +#!/bin/sh + # arg 1: the new package version post_install() { update-cleansystem @@ -9,6 +11,7 @@ If you plan using fullpkg you should read http://wiki.parabolagnulinux.org/fullp and install libretools-$arch if avaliable EOF + update-cleansystem } ## arg 1: the new package version @@ -19,6 +22,7 @@ post_upgrade() { Check your /etc/libretools.conf EOF + update-cleansystem } # vim:set ts=2 sw=2 et: diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD index 839585e37..c14bdb53b 100644 --- a/libre/sdl-libre/PKGBUILD +++ b/libre/sdl-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165847 2012-09-01 12:22:15Z heftig $ +# $Id: PKGBUILD 166672 2012-09-15 09:39:11Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -8,7 +8,7 @@ pkgname=sdl-libre pkgver=1.2.15 -pkgrel=2 +pkgrel=3 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" arch=('i686' 'x86_64' 'mips64el') url="http://www.libsdl.org" @@ -18,16 +18,20 @@ conflicts=('sdl') replaces=('sdl') depends=('glibc' 'libxext' 'libxrender' 'libx11') makedepends=('alsa-lib' 'mesa' 'libpulse') +optdepends=('alsa-lib: ALSA audio driver' + 'libpulse: PulseAudio audio driver') options=('!libtool') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz sdl-1.2.14-fix-mouse-clicking.patch sdl-1.2.14-disable-mmx.patch fix_joystick_misc_axes.diff + libsdl-1.2.15-resizing.patch libre.patch) md5sums=('9d96df8417572a2afb781a7c4c811a85' '04d8c179f125e04bcd4c9d60e013c2d7' 'e5c16b7611f62c7cb25f0534eff68852' '687586a108b597a2a6b73070c1d37e51' + '3dd50347d8856160a9cbd7f80383a1f8' '5c665f72b8a2adc97a91f6db6f2da79a') build() { @@ -35,8 +39,9 @@ build() { patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch patch -Np1 -i ../fix_joystick_misc_axes.diff + patch -Np1 -i ../libsdl-1.2.15-resizing.patch patch -Np0 -i ../libre.patch - ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \ + ./configure --prefix=/usr --disable-nasm --enable-alsa \ --with-x --disable-rpath --disable-static make } diff --git a/libre/sdl-libre/libsdl-1.2.15-resizing.patch b/libre/sdl-libre/libsdl-1.2.15-resizing.patch new file mode 100644 index 000000000..0655a13e1 --- /dev/null +++ b/libre/sdl-libre/libsdl-1.2.15-resizing.patch @@ -0,0 +1,63 @@ +Description: Revert change that breaks window corner resizing + http://bugzilla.libsdl.org/show_bug.cgi?id=1430 +Author: Andrew Caudwell <acaudwell@gmail.com> +Last-Update: 2012-04-10 +Bug-Debian: http://bugs.debian.org/665779 + +diff -r c787fb1b5699 src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 +@@ -57,12 +57,6 @@ + static SDLKey MISC_keymap[256]; + SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); + +-/* +- Pending resize target for ConfigureNotify (so outdated events don't +- cause inappropriate resize events) +-*/ +-int X11_PendingConfigureNotifyWidth = -1; +-int X11_PendingConfigureNotifyHeight = -1; + + #ifdef X_HAVE_UTF8_STRING + Uint32 Utf8ToUcs4(const Uint8 *utf8) +@@ -825,16 +819,6 @@ + #ifdef DEBUG_XEVENTS + printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); + #endif +- if ((X11_PendingConfigureNotifyWidth != -1) && +- (X11_PendingConfigureNotifyHeight != -1)) { +- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && +- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { +- /* Event is from before the resize, so ignore. */ +- break; +- } +- X11_PendingConfigureNotifyWidth = -1; +- X11_PendingConfigureNotifyHeight = -1; +- } + if ( SDL_VideoSurface ) { + if ((xevent.xconfigure.width != SDL_VideoSurface->w) || + (xevent.xconfigure.height != SDL_VideoSurface->h)) { +diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h +--- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 +@@ -27,8 +27,3 @@ + extern void X11_InitOSKeymap(_THIS); + extern void X11_PumpEvents(_THIS); + extern void X11_SetKeyboardState(Display *display, const char *key_vec); +- +-/* Variables to be exported */ +-extern int X11_PendingConfigureNotifyWidth; +-extern int X11_PendingConfigureNotifyHeight; +- +diff -r c787fb1b5699 src/video/x11/SDL_x11video.c +--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 +@@ -1182,8 +1182,6 @@ + current = NULL; + goto done; + } +- X11_PendingConfigureNotifyWidth = width; +- X11_PendingConfigureNotifyHeight = height; + } else { + if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { + current = NULL; diff --git a/libre/virtualbox-libre/60-vboxguest.rules b/libre/virtualbox-libre/60-vboxguest.rules new file mode 100644 index 000000000..6285f7249 --- /dev/null +++ b/libre/virtualbox-libre/60-vboxguest.rules @@ -0,0 +1,2 @@ +ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" +ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 27e15f01f..7dbb749d7 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -10,36 +10,88 @@ pkgbase=virtualbox-libre pkgname=('virtualbox-libre' 'virtualbox-libre-sdk' 'virtualbox-libre-host-source' - 'virtualbox-libre-guest-additions' + 'virtualbox-libre-guest-utils' 'virtualbox-libre-guest-source') pkgver=4.2.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl-libre' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk7-openjdk' 'gsoap' 'vde2' 'cdrkit') -#'xorg-server-devel' 'xf86driproto' 'libxcomposite') +makedepends=('alsa-lib' + 'bin86' + 'cdrkit-libre' + 'curl' + 'dev86' + 'gsoap' + 'iasl' + 'jdk7-openjdk' + 'libidl2' + 'libpulse' + 'libstdc++5' + 'libvncserver' + 'libxcursor' + 'libxinerama' + 'libxml2' + 'libxmu' + 'libxrandr' + 'libxslt' + 'libxtst' + 'linux-libre-headers' + 'mesa' + 'python2' + 'qt' + 'sdl-libre' + 'sdl_ttf' + 'vde2' + 'xalan-c') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') -source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 - 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk - change_default_driver_dir.patch vboxservice.conf vboxservice.rc vboxservice.service - vboxweb.conf vboxweb.rc vboxweb.service os_blag_64.png os_blag.png os_dragora_64.png - os_dragora.png os_dynebolic.png os_gnewsense_64.png os_gnewsense.png os_gnu_64.png - os_gnuhurd.png os_gnulinux_64.png os_gnulinux.png os_gnu.png os_musix_64.png - os_musix.png os_parabola_64.png os_parabola.png os_trisquel_64.png os_trisquel.png - os_ututo_64.png os_ututo.png os_venenux.png libre.patch free-distros.patch) +source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2" + '10-vboxdrv.rules' + '60-vboxguest.rules' + 'LocalConfig.kmk' + 'vboxservice.conf' + 'vboxservice.rc' + 'vboxservice.service' + 'vboxweb.conf' + 'vboxweb.rc' + 'vboxweb.service' + 'change_default_driver_dir.patch' + 'vboxdrv-reference.patch' + 'os_blag_64.png' + 'os_blag.png' + 'os_dragora_64.png' + 'os_dragora.png' + 'os_dynebolic.png' + 'os_gnewsense_64.png' + 'os_gnewsense.png' + 'os_gnu_64.png' + 'os_gnuhurd.png' + 'os_gnulinux_64.png' + 'os_gnulinux.png' + 'os_gnu.png' + 'os_musix_64.png' + 'os_musix.png' + 'os_parabola_64.png' + 'os_parabola.png' + 'os_trisquel_64.png' + 'os_trisquel.png' + 'os_ututo_64.png' + 'os_ututo.png' + 'os_venenux.png' + 'libre.patch' + 'free-distros.patch') md5sums=('691b4134983ce7d89b9fb683305cb647' '5f85710e0b8606de967716ded7b2d351' - 'aa0c090e33aab3e2853b679cc52cba2a' + 'ed1341881437455d9735875ddf455fbe' '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' - '97e193f050574dd272a38e5ee5ebe62b' '3c08ad30b89add47d3f45121200a5360' '7d9823507206de9b8528a72af2f18d74' '07c5f6d86c4b7839d719c8ee0c53653b' '7e9483b1069a54f181546083ac7e5469' 'c159d683ba1947290fc2ad2c64194150' 'bc9efed88e0469cd7fc460d5a5cd7b4b' + '97e193f050574dd272a38e5ee5ebe62b' + '4f1692638d6740df4c4ad9766ba4e179' '8538dba8686d7449cb481c9bae9d722a' '545c925b46f2ac95e5f8ae407fad101a' 'f6416f509c2e5460e4dc624e0a57f3c1' @@ -64,8 +116,8 @@ md5sums=('691b4134983ce7d89b9fb683305cb647' '67cc4c8611890038eb3e4114ae899525' '71df5e3eebe07e683782b264dadf65e7') -_extramodules=extramodules-3.5-LIBRE -_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true +#_extramodules=extramodules-3.5-LIBRE +#_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true build() { cd "VirtualBox-$pkgver" @@ -104,7 +156,8 @@ build() { --enable-webservice \ --enable-vde \ --enable-vnc \ - --with-linux=/usr/src/linux-${_kernver} + --disable-kmods +# --with-linux=/usr/src/linux-${_kernver} source ./env.sh kmk all sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" @@ -115,14 +168,13 @@ build() { } package_virtualbox-libre() { - pkgdesc="Powerful x86 virtualization for enterprise as well as home use (without non-free distros and others OS presets for the VM creation wizard; Oracle VM VirtualBox Extension Pack support removed)" + pkgdesc='Powerful x86 virtualization for enterprise as well as home use (without non-free distros and others OS presets for the VM creation wizard; Oracle VM VirtualBox Extension Pack support removed)' depends=('virtualbox-libre-host-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl-libre' 'libxmu' 'curl' 'libvncserver' 'libpng') - optdepends=('qt: for VirtualBox GUI' + optdepends=('qt: VirtualBox GUI support' 'vde2: Virtual Distributed Ethernet support' - 'virtualbox-libre-sdk: developer kit' - 'virtualbox-libre-host-source: host kernel libre source modules for non-stock kernels' - 'net-tools: for host-only or bridged networking') - + 'virtualbox-libre-sdk: Developer kit' + 'virtualbox-libre-host-source: Host kernel libre source modules for non-stock kernels' + 'net-tools: Host-only or bridged networking support') backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb') replaces=('virtualbox' 'virtualbox-ose') conflicts=('virtualbox' 'virtualbox-ose') @@ -184,7 +236,7 @@ package_virtualbox-libre() { echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg" #udev and licence - install -D -m 0644 "$srcdir/VirtualBox-${pkgver}/COPYING" \ + install -D -m 0644 "$srcdir/VirtualBox-$pkgver/COPYING" \ "$pkgdir/usr/share/licenses/virtualbox/LICENSE" install -D -m 0644 "$srcdir/10-vboxdrv.rules" \ "$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules" @@ -214,14 +266,14 @@ package_virtualbox-libre-sdk() { install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py" #python sdk pushd sdk/installer - VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "${pkgdir}" + VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "$pkgdir" popd rm -rf sdk/installer mv sdk "$pkgdir/usr/lib/virtualbox" } package_virtualbox-libre-host-source() { - pkgdesc='VirtualBox kernel libre modules source' + pkgdesc='VirtualBox Host kernel libre modules source' depends=('dkms' 'gcc' 'make') provides=("virtualbox-host-source=$pkgver" 'virtualbox-libre-host-modules') replaces=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source') @@ -237,9 +289,9 @@ package_virtualbox-libre-host-source() { } package_virtualbox-libre-guest-source() { - pkgdesc='VirtualBox Additions kernel libre modules source' + pkgdesc='VirtualBox Guest kernel libre modules source' depends=('dkms' 'gcc' 'make') - provides=("virtualbox-guest-source=${pkgver}" 'virtualbox-libre-guest-modules') + provides=("virtualbox-guest-source=$pkgver" 'virtualbox-libre-guest-modules') replaces=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source') conflicts=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source') optdepends=('linux-libre-headers' @@ -252,23 +304,21 @@ package_virtualbox-libre-guest-source() { cp -r src "$pkgdir/usr/src/vboxguest-$pkgver" } -package_virtualbox-libre-guest-additions(){ - pkgdesc='Additions for guests only (userspace tools)' +package_virtualbox-libre-guest-utils(){ + pkgdesc='VirtualBox Guest userspace utilities' depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') - provides=("virtualbox-guest-additions=${pkgver}") - replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions') - conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions') + optdepends=('virtualbox-guest-source: Guest kernel libre source modules for non-stock kernels') + provides=("virtualbox-guest-utils=$pkgver") + replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions') + conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions') backup=('etc/conf.d/vboxservice') - install=virtualbox-libre-guest-additions.install + install=virtualbox-libre-guest-utils.install source "VirtualBox-$pkgver/env.sh" - - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" - + pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" install -d "$pkgdir"/{usr/bin,sbin} install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" install -m755 mount.vboxsf "$pkgdir/sbin" - install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ "$pkgdir"/usr/bin/VBoxClient-all install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \ @@ -279,14 +329,15 @@ package_virtualbox-libre-guest-additions(){ install -m755 VBoxOGL*.so "$pkgdir/usr/lib" ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so" install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so" - + popd + # install udev rules + install -D -m 0644 60-vboxguest.rules \ + "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules" # install rc.d script - install -D -m755 "$srcdir/vboxservice.rc" "$pkgdir/etc/rc.d/vboxservice" - + install -D -m755 vboxservice.rc "$pkgdir/etc/rc.d/vboxservice" # install sample config - install -D -m644 "$srcdir/vboxservice.conf" "$pkgdir/etc/conf.d/vboxservice" - + install -D -m644 vboxservice.conf "$pkgdir/etc/conf.d/vboxservice" # install systemd service file - install -D -m644 "$srcdir/vboxservice.service" \ + install -D -m644 vboxservice.service \ "$pkgdir/usr/lib/systemd/system/vboxservice.service" } diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch index 4703da68d..51fd6361c 100644 --- a/libre/virtualbox-libre/vboxdrv-reference.patch +++ b/libre/virtualbox-libre/vboxdrv-reference.patch @@ -20,7 +20,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V - "DKMS package first. This package keeps track of Linux kernel changes and " - "recompiles the vboxdrv kernel module if necessary." + "libre module by executing<br/><br/>" -+ " <font color=blue>'pacman -S virtualbox-libre-modules'</font><br/><br/>" ++ " <font color=blue>'pacman -S virtualbox-libre-host-modules'</font><br/><br/>" + "as root. If you don't use our stock kernel libre, install virtualbox-libre-host-source and " + "execute dkms autoinstall ." ); @@ -81,7 +81,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- - load. Please recompile the kernel module and install it by +WARNING: The vboxdrv kernel libre module is not loaded. Either there is no module + available for the current kernel libre (`uname -r`) or it failed to -+ load. Please reinstall the kernel libre module virtualbox-libre-modules or ++ load. Please reinstall the kernel libre module virtualbox-libre-host-modules or + if you don't use our stock kernel libre compile the modules with - sudo /etc/init.d/vboxdrv setup diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-source.install b/libre/virtualbox-libre/virtualbox-libre-guest-source.install index 966fb5681..2d62eae43 100755 --- a/libre/virtualbox-libre/virtualbox-libre-guest-source.install +++ b/libre/virtualbox-libre/virtualbox-libre-guest-source.install @@ -2,6 +2,7 @@ # arg 1: the new package version post_install() { + dkms add vboxguest/${1%-*} cat << EOF ==> To build and install your modules run dkms install vboxguest/${1%-*} ==> To do this automatically at startup you can add dkms in your DAEMONS diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-utils.install b/libre/virtualbox-libre/virtualbox-libre-guest-utils.install new file mode 100755 index 000000000..38bbe807d --- /dev/null +++ b/libre/virtualbox-libre/virtualbox-libre-guest-utils.install @@ -0,0 +1,31 @@ +#!/bin/sh + +# arg 1: the new package version +post_install() { + getent group vboxsf > /dev/null || groupadd -g 109 vboxsf + true +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" + # rename /etc/rc.d/vboxservice + if [ "`vercmp $2 4.1.18-3`" -lt 0 ]; then + cat << EOF +==> rc.d vbox-service script was renamed to vboxservice. +EOF + fi + # fix gid of vboxsf + if [ "`vercmp $2 4.1.18-4`" -lt 0 ]; then + groupmod -g 109 vboxsf + fi + true +} + +# arg 1: the old package version +post_remove() { + groupdel vboxsf >/dev/null 2>&1 || true +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/virtualbox-libre-host-source.install b/libre/virtualbox-libre/virtualbox-libre-host-source.install index 6a3994c8d..8028cb7e0 100755 --- a/libre/virtualbox-libre/virtualbox-libre-host-source.install +++ b/libre/virtualbox-libre/virtualbox-libre-host-source.install @@ -2,6 +2,7 @@ # arg 1: the new package version post_install() { + dkms add vboxhost/${1%-*} cat << EOF ==> To build and install your modules run dkms install vboxhost/${1%-*} ==> To do this automatically at startup you can add dkms in your DAEMONS diff --git a/pcr/perl-expect/PKGBUILD b/pcr/perl-expect/PKGBUILD new file mode 100644 index 000000000..fefa03a0b --- /dev/null +++ b/pcr/perl-expect/PKGBUILD @@ -0,0 +1,52 @@ +# CPAN Name : Expect +# Contributor: Max Roder <maxroder@web.de> +# Contributor: DarkHeart +# Generator : CPANPLUS::Dist::Arch 1.19 +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname='perl-expect' +pkgver='1.21' +pkgrel='2' +pkgdesc="Perl version of Don Libes' Tcl-Expect" +arch=('any') +license=('PerlArtistic' 'GPL') +options=('!emptydirs') +depends=('perl-io-tty>=1.03') +makedepends=() +url='http://search.cpan.org/dist/Expect' +source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGIERSIG/Expect-1.21.tar.gz') +md5sums=('a151b0dc4d1a35c73941c65b7c26da5b') +sha512sums=('496716b9e6544e9d6809b7f704df8199291d18ec9ec9ebb4fd2b7b341aa10d9b03989335c1f22d1faddbff0974ceba5b2823685fa08ce6a75e2f3ccaeb944e74') +_distdir="${srcdir}/Expect-1.21" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + cd "$_distdir" + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + make test + ) +} + +package() { + cd "$_distdir" + make install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/pcr/perl-php-serialization/PKGBUILD b/pcr/perl-php-serialization/PKGBUILD new file mode 100644 index 000000000..f09269c92 --- /dev/null +++ b/pcr/perl-php-serialization/PKGBUILD @@ -0,0 +1,50 @@ +# Contributor: Justin Davis <jrcd83@gmail.com> +# Generator : CPANPLUS::Dist::Arch 1.18 +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname='perl-php-serialization' +pkgver='0.34' +pkgrel='1' +pkgdesc="simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa." +arch=('any') +license=('PerlArtistic' 'GPL') +options=('!emptydirs') +depends=('perl') +makedepends=() +url='http://search.cpan.org/dist/PHP-Serialization' +source=('http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz') +md5sums=('333af0848ad79931875a35cc61dc22e0') +sha512sums=('72218973f21ab71419751cf818e6bd998235aa74bf8ae60ec4a6080ba169d0d7fcefde4f433ce3f6f30ed3084a651deb8aa3a5dd818fc6ebf3fb6188def4efe7') +_distdir="${srcdir}/PHP-Serialization-0.34" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + cd "$_distdir" + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + make test + ) +} + +package() { + cd "$_distdir" + make install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD index 334d32325..91c6c9175 100644 --- a/pcr/zoneminder/PKGBUILD +++ b/pcr/zoneminder/PKGBUILD @@ -2,115 +2,114 @@ # Contributor: Jason Gardner <buhrietoe@gmail.com> # Contributor: Ross melin <rdmelin@gmail.com> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> + +# based of debian squeeze package pkgname=zoneminder pkgver=1.25.0 -pkgrel=14 -pkgdesc="Capture, analyse, record and monitor video security cameras" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.zoneminder.com" -license=('GPL') -depends=('cambozola' 'apache' 'php' 'php-gd' 'php-mcrypt' 'mysql' 'pcre' 'openssl' 'ffmpeg' 'perl-libwww' 'perl-date-manip' 'perl-unicode-map' 'perl-dbi' 'perl-dbd-mysql' 'perl-io-stringy' 'perl-mime-lite' 'perl-timedate' 'perl-x10' 'perl-time-modules' 'perl-net-smtp-ssl' 'perl-sys-mmap' 'perl-net-sftp-foreign' 'perl-mime-tools' 'perl-io-tty' 'libv4l' 'libjpeg' 'gnutls' 'php-apache') -makedepends=() -install=zoneminder.install -source=("http://www.zoneminder.com/downloads/ZoneMinder-${pkgver}.tar.gz" - zm.rc.d - Controls_Orbit.sql - zminit.arch - customdb - httpd-zm.conf - zmeventbackup - patch-ffmpeg-0.11.patch - patch-libavcodec-detection.patch - zoneminder-1.25.0-kernel35.patch - arm-context.patch) - -md5sums=('eaefa14befd482154970541252aa1a39' - '9fb81f81b056c18be6eef3f1c8e0dd6d' - '5033bc098bf497c8aed1fc1b3c9c5f9c' - 'f9720872736f26d17bc49d8725b75ae4' - '942f6641c744ffe7d64846a5c34d84f1' - 'e63262d1417105ae24c7a03d98b2c64c' - '1a6d7c43af79c786b27cc88f7ba7ed3e' - 'b872dd86926ab00c5d4733e7e38eaa9c' - '94bf5d95fe5429f7df458ddfbabf0c12' - '88bd124dfb841320cecb0a757b2a78c1' - 'b28c8eb392a7e7b6ef665817d7fe61f4') - +pkgrel=16 +pkgdesc='Capture, analyse, record and monitor video security cameras' +arch=(i686 x86_64 mips64el) +backup=(etc/zm.conf etc/httpd/conf/extra/httpd-zm.conf) +url=http://www.$pkgname.com +license=(GPL) +depends=( + apache cambozola ffmpeg gnutls mysql perl-archive-zip perl-date-manip + perl-dbd-mysql perl-dbi perl-expect perl-libwww perl-mime-lite + perl-mime-tools perl-php-serialization perl-net-sftp-foreign perl-sys-mmap + perl-time-modules perl-x10 php php-apache php-gd php-mcrypt +) +makedepends=(netpbm) +install=$pkgname.install +source=( + http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz + patch-ffmpeg-0.11.patch + patch-libavcodec-detection.patch + $pkgname-1.25.0-kernel35.patch + httpd-zm.conf + zm.rc.d + $pkgname.service +) +md5sums=( + eaefa14befd482154970541252aa1a39 + 81c8be870260142e2633eedf73c72040 + 94bf5d95fe5429f7df458ddfbabf0c12 + 48a3c48394e18bf072f7b32730db18df + 831e3538facff18e27d402e36dbd6b8d + 034b61cda8849fc3001849e76ef26041 + 7487cc72ead82aea0bc78f2e4106ae1a +) build() { - cd "$srcdir/ZoneMinder-$pkgver" + cd $srcdir/ZoneMinder-$pkgver + + export CPPFLAGS=-D__STDC_CONSTANT_MACROS \ + ZM_SSL_LIB=gnutls # Patch for GCC 4.7.x sed -i -e '1 s/^/#include <unistd.h>\n/;' src/zm_logger.cpp sed -i -e '1 s/^/#include <unistd.h>\n/;' src/zm_thread.h - # Patch for build/upgrade path - sed -i -e 's#ZM_PATH_BUILD=@PATH_BUILD@#ZM_PATH_BUILD=/srv/zoneminder/upgrade\nZM_PATH_UPDATE=/srv/zoneminder/upgrade#' zm.conf.in - # Patch for support new ffmpeg - patch -p1 < ../patch-ffmpeg-0.11.patch + patch -p1 < $srcdir/patch-ffmpeg-0.11.patch # Patch for correct libavcodec detection - patch -p0 < ../patch-libavcodec-detection.patch + patch -p0 < $srcdir/patch-libavcodec-detection.patch # Patch for type cast in kernel3.5 - patch -p0 < ../zoneminder-1.25.0-kernel35.patch - - # Patch for ARM - if test "$CARCH" == arm; then - patch -p0 < ../arm-context.patch - fi - - # Add some more configs into DB - cat ../Controls_Orbit.sql >> db/zm_create.sql.in + patch -p0 < $srcdir/$pkgname-1.25.0-kernel35.patch ./configure --prefix=/usr \ + --build \ + --enable-crashtrace=yes \ + --enable-debug=yes \ + --enable-mmap=yes \ + --mandir=/usr/share/man \ --sysconfdir=/etc \ - --with-webuser=http \ + --with-cgidir=/usr/lib/$pkgname/cgi-bin \ + --with-ffmpeg=/usr \ + --with-libarch=lib \ + --with-mysql=/usr \ + --with-webdir=/usr/share/$pkgname \ --with-webgroup=http \ - --with-mysql=/usr \ - --with-webdir=/srv/zoneminder/www \ - --with-cgidir=/srv/zoneminder/cgi-bin \ - --bindir=/srv/zoneminder/bin \ - ZM_SSL_LIB=openssl \ - CPPFLAGS=-D__STDC_CONSTANT_MACROS - - # chown line mucks everything up, we'll chown it in the install script - sed -i '/chown/d' Makefile - - # modify hard-coded paths - sed -i 's#/var/lib/zm#/srv/zoneminder/backup#' scripts/zmdbrestore.in - sed -i 's#/var/lib/zm#/srv/zoneminder/backup#' scripts/zmlogrotate.conf.in - sed -i 's#/var/lib/zm#/srv/zoneminder/backup#' scripts/zmdbbackup.in - - # Build it! - make || return 1 - make DESTDIR="$pkgdir" ZM_RUNDIR="$pkgdir/var/run" ZM_TMPDIR="$pkgdir/tmp" ZM_LOGDIR="$pkgdir/var/log" install || return 1 - - install -D -m 700 $startdir/src/zminit.arch $startdir/pkg/srv/zoneminder/bin/zminit - install -D -m 755 $startdir/src/zm.rc.d $startdir/pkg/etc/rc.d/zm - install -D -m 700 scripts/zmdbbackup $startdir/pkg/srv/zoneminder/bin/zmdbbackup - install -D -m 700 scripts/zmdbbackup $startdir/pkg/srv/zoneminder/bin/zmdbbackup - install -D -m 700 scripts/zmdbrestore $startdir/pkg/srv/zoneminder/bin/zmdbrestore - install -D -m 700 scripts/zmeventdump $startdir/pkg/srv/zoneminder/bin/zmeventdump - install -D -m 700 scripts/zmlogrotate.conf $startdir/pkg/etc/logrotate.d/zm - install -D -m 700 $startdir/src/zmeventbackup $startdir/pkg/etc/cron.hourly/zmeventbackup - - mkdir -p $startdir/pkg/etc/httpd/conf/extra/ - install -m 644 $startdir/src/httpd-zm.conf $startdir/pkg/etc/httpd/conf/extra/httpd-zm.conf - - install -D -m 700 $startdir/src/customdb $startdir/pkg/srv/zoneminder/upgrade/customdb - install -D db/zm*.sql $startdir/pkg/srv/zoneminder/upgrade/ - - mkdir -p $startdir/pkg/var/run/zm - - ### remove special files - find $startdir/pkg/ -name "perllocal.pod" \ - -o -name ".packlist" \ - -o -name "*.bs" \ - |xargs -i rm -f {} - + --with-webuser=http + make V=0 } -# vim:set ft=sh ts=2 sw=2 et: +package() { + cd $srcdir/ZoneMinder-$pkgver + + make DESTDIR=$pkgdir \ + ZM_LOGDIR=$pkgdir/var/log/zm \ + ZM_RUNDIR=$pkgdir/run \ + ZM_TMPDIR=$pkgdir/tmp \ + install + + rmdir $pkgdir/run + rmdir $pkgdir/tmp + + mkdir -p $pkgdir/etc/httpd/conf/extra + mkdir -p $pkgdir/etc/rc.d + mkdir -p $pkgdir/usr/lib/systemd/system + mkdir -p $pkgdir/usr/share/license/$pkgname + mkdir -p $pkgdir/usr/share/$pkgname/db + mkdir -p $pkgdir/var/cache/$pkgname + + for i in events images temp; do + mv $pkgdir/usr/share/$pkgname/$i $pkgdir/var/cache/$pkgname/$i + ln -s /var/cache/$pkgname/$i $pkgdir/usr/share/$pkgname/$i + done + + ln -s /usr/lib/$pkgname/cgi-bin $pkgdir/usr/share/$pkgname + ln -s /usr/share/cambozola/cambozola.jar $pkgdir/usr/share/$pkgname + + chown http.http $pkgdir/etc/zm.conf + chown -R http.http $pkgdir/var/cache/$pkgname + chown http.http $pkgdir/var/log/zm + + install -D -m 644 $srcdir/httpd-zm.conf $pkgdir/etc/httpd/conf/extra + install -D -m 644 $srcdir/zm.rc.d $pkgdir/etc/rc.d/zm + install -D -m 644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system + install -D -m 644 COPYING $pkgdir/usr/share/license/$pkgname + install -D -m 644 db/zm*.sql $pkgdir/usr/share/$pkgname/db +} diff --git a/pcr/zoneminder/httpd-zm.conf b/pcr/zoneminder/httpd-zm.conf index ad24cbbe4..e48ea9fc6 100644 --- a/pcr/zoneminder/httpd-zm.conf +++ b/pcr/zoneminder/httpd-zm.conf @@ -1,16 +1,18 @@ # /etc/httpd/conf/extra/httpd-zm.conf # Config for zoneminder web app -Alias /zm "/srv/zoneminder/www" -<Directory "/srv/zoneminder/www"> - Options -Indexes MultiViews FollowSymLinks - AllowOverride All - Order allow,deny - Allow from all +Alias /zm "/usr/share/zoneminder" +<Directory "/usr/share/zoneminder"> + Options -Indexes MultiViews FollowSymLinks + AllowOverride All + Order allow,deny + Allow from all + # The code unfortunately uses short tags in many places + php_value short_open_tag 1 </Directory> -ScriptAlias /cgi-bin "/srv/zoneminder/cgi-bin" -<Directory "/srv/zoneminder/cgi-bin"> +ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin" +<Directory "/usr/lib/zoneminder/cgi-bin"> AllowOverride All Options ExecCGI Order allow,deny diff --git a/pcr/zoneminder/patch-ffmpeg-0.11.patch b/pcr/zoneminder/patch-ffmpeg-0.11.patch index 8356fff83..ac56e4c69 100644 --- a/pcr/zoneminder/patch-ffmpeg-0.11.patch +++ b/pcr/zoneminder/patch-ffmpeg-0.11.patch @@ -2,7 +2,7 @@ diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp index 42927f6..61df606 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
-@@ -108,7 +108,7 @@ int FfmpegCamera::PrimeCapture()
+@@ -91,7 +91,7 @@ int FfmpegCamera::PrimeCapture()
Info( "Priming capture from %s", mPath.c_str() );
// Open the input, not necessarily a file
@@ -11,7 +11,7 @@ index 42927f6..61df606 100644 Fatal( "Unable to open input %s due to: %s", mPath.c_str(), strerror(errno) );
// Locate stream info from input
-@@ -139,7 +139,7 @@ int FfmpegCamera::PrimeCapture()
+@@ -122,7 +122,7 @@ int FfmpegCamera::PrimeCapture()
Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
// Open the codec
@@ -25,7 +25,7 @@ diff --git a/src/zm_mpeg.cpp b/src/zm_mpeg.cpp index f5de2a4..d614346 100644
--- a/src/zm_mpeg.cpp
+++ b/src/zm_mpeg.cpp
-@@ -167,10 +167,12 @@ void VideoStream::SetParameters()
+@@ -130,10 +130,12 @@ void VideoStream::SetParameters()
{
/* set the output parameters (must be done even if no
parameters). */
@@ -40,7 +40,7 @@ index f5de2a4..d614346 100644 //dump_format(ofc, 0, filename, 1);
}
-@@ -259,7 +261,7 @@ void VideoStream::OpenStream()
+@@ -222,7 +224,7 @@ void VideoStream::OpenStream()
if ( !(of->flags & AVFMT_NOFILE) )
{
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
@@ -49,7 +49,7 @@ index f5de2a4..d614346 100644 #else
if ( url_fopen(&ofc->pb, filename, URL_WRONLY) < 0 )
#endif
-@@ -278,7 +280,7 @@ void VideoStream::OpenStream()
+@@ -241,7 +243,7 @@ void VideoStream::OpenStream()
}
/* write the stream header, if any */
@@ -57,4 +57,4 @@ index f5de2a4..d614346 100644 + avformat_write_header(ofc, NULL);
}
- VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height )
\ No newline at end of file + VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height )
diff --git a/pcr/zoneminder/zm.rc.d b/pcr/zoneminder/zm.rc.d index 99a1f1f22..c4cbf4d3f 100644 --- a/pcr/zoneminder/zm.rc.d +++ b/pcr/zoneminder/zm.rc.d @@ -1,172 +1,63 @@ #!/bin/bash -# Source function library. +daemon_name=zm + . /etc/rc.conf . /etc/rc.d/functions -prog=ZoneMinder -ZM_VERSION="1.25.0" -ZM_PATH_BIN="/srv/zoneminder/bin" -ZM_CONFIG="/etc/zm.conf" -command="$ZM_PATH_BIN/zmpkg.pl" - -loadconf() -{ - if [ -f $ZM_CONFIG ]; then - . $ZM_CONFIG - else - echo "ERROR: $ZM_CONFIG not found. -" - return 1 - fi -} - -# Check for old config and update if needed -checkcfg() -{ - # Check config - if [ "$ZM_DB_HOST" = "" -o "$ZM_DB_NAME" = "" -o "$ZM_DB_USER" = "" -o "$ZM_DB_PASS" = "" ]; then - echo "In $ZM_CONFIG there should not be null values. -" - return 1 - loadconf - fi -} - -checkdb() -{ - # Check database exisits and version - GetVer="select Value from Config where Name='ZM_DYN_DB_VERSION'" - OLD_VERSION=`echo $GetVer | mysql -B -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'` - if [ "$OLD_VERSION" = "" ]; then - GetVer="select Value from Config where Name='ZM_DYN_CURR_VERSION'" - OLD_VERSION=`echo $GetVer | mysql -B -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'` - if [ "$OLD_VERSION" = "" ]; then - echo "You must run $ZM_PATH_BIN/zminit manually -" - return 1 - fi - fi - RETVAL=$? - - if [ $RETVAL != 0 ]; then - tbls=`mysql -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS -s -e 'show tables' $ZM_DB_NAME` - RETVAL=$? - if [ $RETVAL = 0 ]; then - echo "Initialize $prog database: -" - echo tbls | grep Config >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL != 0 ]; then - mysql -B -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME < $ZM_PATH_UPDATE/zm_create.sql - RETVAL=$? - [ $RETVAL = 0 ] && stat_done - [ $RETVAL != 0 ] && stat_fail - echo - return $RETVAL - fi - ( cd $ZM_PATH_UPDATE; perl $ZM_PATH_BIN/zmupdate.pl -f ) - RETVAL=$? - [ $RETVAL = 0 ] && stat_done - [ $RETVAL != 0 ] && stat_fail - echo - return $RETVAL - else - echo "No access to ZoneMinder database. -Run $ZM_PATH_BIN/zminit manually. -" - return $RETVAL - fi - else - [ "$ZM_VERSION" = "$OLD_VERSION" ] && return 0 - echo "Upgrade %s database: " "$prog" - $ZM_PATH_BIN/zmupdate.pl --version=$OLD_VERSION --noi && ( cd $ZM_PATH_UPDATE; perl $ZM_PATH_BIN/zmupdate.pl -f ) - RETVAL=$? - [ $RETVAL = 0 ] && stat_done - [ $RETVAL != 0 ] && stat_fail - echo - return $RETVAL - fi -} - -start() -{ - loadconf || return $? - checkcfg || return $? - checkdb || return $? - stat_busy "Starting $prog" - [ -d /var/run/zm ] || mkdir -m 774 /var/run/zm - chown -R $ZM_WEB_USER:$ZM_WEB_GROUP /var/run/zm - GetPath="select Value from Config where Name='ZM_PATH_SOCKS'" - ZM_PATH_SOCK=`echo $GetPath | mysql -B -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'` - [ -d $ZM_PATH_SOCK ] || mkdir -m 774 -p $ZM_PATH_SOCK - sudo -u $ZM_WEB_USER test -O $ZM_PATH_SOCK \ - || chown -R $ZM_WEB_USER:$ZM_WEB_GROUP $ZM_PATH_SOCK - # Setup the log dir - [ -d /var/log/zm ] || mkdir /var/log/zm - for logs in zmaudit.log zmdc.log zmfilter.log zmpkg.log zmupdate.log zmwatch.log; do - touch /var/log/zm/$logs - done - chown -R $ZM_WEB_USER:$ZM_WEB_GROUP /var/log/zm - $command start - RETVAL=$? - [ $RETVAL = 0 ] && stat_done && add_daemon zm - [ $RETVAL != 0 ] && stat_fail - #[ $RETVAL = 0 ] && touch /var/lock/subsys/zm - return $RETVAL -} - -stop() -{ - stat_busy "Stopping $prog" - $command stop - RETVAL=$? - [ $RETVAL = 0 ] && stat_done && rm_daemon zm - [ $RETVAL != 0 ] && stat_fail - #[ $RETVAL = 0 ] && rm -f /var/lock/subsys/zm -} - -status() -{ - result=`$command status` - if [ "$result" = "running" ]; then - echo "ZoneMinder is running -" - RETVAL=0 - else - echo "ZoneMinder is stopped -" - RETVAL=1 - fi -} - case "$1" in - 'start') - start - ;; - 'stop') - stop - ;; - 'restart') - stop - start - ;; - 'condrestart') - loadconf - checkcfg - result=`$ZM_PATH_BIN/zmdc.pl check` - if [ "$result" = "running" ]; then - $ZM_PATH_BIN/zmdc.pl shutdown > /dev/null - start - fi - ;; - 'status') - status - ;; - *) - echo "Usage: zm { start | stop | restart | condrestart | status } -" - RETVAL=1 - ;; + start) + stat_busy "Starting Zoneminder" + /usr/bin/zmfix -a + if /usr/bin/zmpkg.pl start >/dev/null ; then + add_daemon $daemon_name + stat_done + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping Zoneminder" + if /usr/bin/zmpkg.pl stop >/dev/null ; then + rm_daemon $daemon_name + stat_done + else + stat_fail + exit 1 + fi + ;; + + reload) + stat_busy "Reloading Zoneminder" + if /usr/bin/zmpkg.pl graceful >/dev/null ; then + add_daemon $daemon_name + stat_done + else + stat_fail + exit 1 + fi + ;; + + restart) + stat_busy "Restarting Zoneminder" + if /usr/bin/zmpkg.pl restart >/dev/null ; then + add_daemon $daemon_name + stat_done + else + stat_fail + exit 1 + fi + ;; + + status) + stat_busy "Checking Zoneminder status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|reload|restart|status}" esac -exit $RETVAL + +exit 0 diff --git a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch index 51bc1288d..9939dc5c3 100644 --- a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch +++ b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch @@ -1,7 +1,7 @@ diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp --- ./src/zm_local_camera.cpp.kernel35 2012-07-16 15:01:22.182614878 -0500 +++ ./src/zm_local_camera.cpp 2012-07-16 15:02:16.491941730 -0500 -@@ -740,7 +740,7 @@ void LocalCamera::Terminate() +@@ -739,7 +739,7 @@ void LocalCamera::Terminate() { Debug( 3, "Terminating video stream" ); //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; @@ -10,7 +10,7 @@ diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 ) Error( "Failed to stop capture stream: %s", strerror(errno) ); -@@ -1520,7 +1520,7 @@ int LocalCamera::PrimeCapture() +@@ -1519,7 +1519,7 @@ int LocalCamera::PrimeCapture() Debug( 3, "Starting video stream" ); //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install index be449a5ca..3ade5355e 100644 --- a/pcr/zoneminder/zoneminder.install +++ b/pcr/zoneminder/zoneminder.install @@ -1,57 +1,100 @@ -# zoneminder.install +pre_install() { + set -e + abort=false + if [ -L /usr/share/zoneminder/events ]; then + l=$(readlink /usr/share/zoneminder/events) + if [ $l != /var/cache/zoneminder/events ]; then + abort=true + fi + fi + if [ -L /usr/share/zoneminder/images ]; then + l=$(readlink /usr/share/zoneminder/images ) + if [ $l != /var/cache/zoneminder/images ]; then + abort=true + fi + fi + if [ $abort = true ]; then + cat >&2 << EOF +Aborting installation of zoneminder due to non-default symlinks in +/usr/share/zoneminder for the images and/or events directory, which could +result in loss of data. Please move your data in each of these directories to +/var/cache/zoneminder before installing zoneminder from the package. +EOF + exit 1 + fi + exit 0 +} -## arg 1: the new package version post_install() { - ln -s /usr/share/cambozola/cambozola.jar /srv/zoneminder/www/ - chown -R http.http /srv/zoneminder - chown http.http /etc/zm.conf - mkdir /srv/zoneminder/backup - mkdir /srv/zoneminder/socks + mkdir /usr/share/zoneminder/backup + mkdir /usr/share/zoneminder/socks cat << EOF Note: -==> To initialize the ZoneMinder database run (as root) -==> /srv/zoneminder/bin/zminit -EOF +==> To run Zoneminder, you must install the database running mysql service (as root): +==> "rc.d start mysqld" (in initscripts) or "systemctl start mysqld.service" (in systemd) +==> and add Zoneminder database typing: +==> mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload +==> cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p +==> echo 'grant lock tables, alter,select,insert,update,delete on zm.*'"\ +==> "' to 'zmuser'@localhost identified by "zmpass";' | +==> mysql --defaults-file=/etc/mysql/my.cnf -p mysql" - cat << EOF -==> Check /etc/php/php.ini and make sure these are uncommented -==> extension=gd.so -==> extension=gettext.so -==> extension=mcrypt.so -==> extension=mysql.so -==> extension=mysqli.so -==> extension=session.so -==> extension=sockets.so -EOF - cat << EOF -==> Check /etc/php/php.ini and make sure short_open_tag = On -EOF +Note: +==> You must uncomment that line in /etc/php/php.ini: +==> "extension=mysql.so" +==> check and make sure these are uncommented: +==> "extension=gd.so" +==> "extension=gettext.so" +==> "extension=mcrypt.so" +==> "extension=mysqli.so" +==> "extension=session.so" +==> "extension=sockets.so" +==> Check /etc/php/php.ini and make sure short_open_tag = On +==> or ZoneMinder will not work. - cat /etc/php/php.ini |grep "^open_basedir.*/etc/" | \ -grep "/srv/zoneminder/www">/dev/null || cat << EOF -==> You must edit /etc/php/php.ini and add to open_basedir "/etc/" and -==> "/srv/zoneminder/" like so -==> open_basedir = /home/:/tmp/:/usr/share/pear/:/etc/:/srv/zoneminder/ +==> You must edit /etc/php/php.ini and add to open_basedir "/etc" and +==> "/usr/share/zoneminder" like so +==> open_basedir = /home:/tmp:/usr/share/pear:/etc:/usr/share/zoneminder ==> Otherwise ZoneMinder will be unable to read /etc/zm.conf ==> or display its own web directory -EOF - cat << EOF Note: -==> You must edit /etc/httpd/conf/httpd.conf and uncomment/add the line +==> You must edit /etc/httpd/conf/httpd.conf and add the line: ==> LoadModule php5_module modules/libphp5.so -==> You must also add these lines: -==> Include conf/extra/php5_module.conf +==> and: ==> Include /etc/httpd/conf/extra/httpd-zm.conf EOF - touch /srv/zoneminder/zm_backup.sql } - -## arg 1: the new package version -## arg 2: the old package version post_upgrade() { - /srv/zoneminder/bin/zmupdate.pl -f >/dev/null + /usr/bin/zmupdate.pl -f >/dev/null +} + +post_remove() { + cat << EOF +Note: +==> To clean Zoneminder mysql database, run as root: +==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql" +==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql" +==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f drop zm" + +==> Disable http with php if it isn't needed with others servers, +==> comment or remove that lines in /etc/httpd/conf/httpd.conf: +==> "LoadModule php5_module modules/libphp5.so" +==> "Include /etc/httpd/conf/extra/httpd-zm.conf" + +==> Disable php with mysql if it isn't needed with others servers, +==> comment that lines in /etc/php/php.ini: +==> "extension=mysql.so" +==> "extension=gd.so" +==> "extension=gettext.so" +==> "extension=mcrypt.so" +==> "extension=mysqli.so" +==> "extension=session.so" +==> "extension=sockets.so" + +==> edit /etc/php/php.ini and remove "/etc" and "/usr/share/zoneminder" +==> in the open_basedir. +EOF } -# vim:set ts=2 sw=2 et: diff --git a/pcr/zoneminder/zoneminder.service b/pcr/zoneminder/zoneminder.service new file mode 100644 index 000000000..ba41e8926 --- /dev/null +++ b/pcr/zoneminder/zoneminder.service @@ -0,0 +1,14 @@ +[Unit] +Description=Capture, analyse, record and monitor video security cameras +After=network.target remote-fs.target +Required=mysqld.service + +[Service] +Type=forking +PIDFile=/run/zm.pid +ExecStart=/usr/bin/zmpkg.pl start +ExecRestart=/usr/bin/zmpkg.pl restart +ExecStop=/usr/bin/zmpkg.pl stop + +[Install] +WantedBy=multi-user.target diff --git a/social/libnatpmp/PKGBUILD b/social/libnatpmp/PKGBUILD new file mode 100644 index 000000000..e81d3445f --- /dev/null +++ b/social/libnatpmp/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Pierre Bourdon <delroth@gmail.com> + +pkgname=libnatpmp +pkgver=20120821 +pkgrel=1 +pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol" +arch=('i686' 'x86_64') +url="http://miniupnp.free.fr/libnatpmp.html" +license=('BSD') +depends=('glibc') +makedepends=() +source=(libnatpmp-$pkgver.tar.gz::http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALLPREFIX="$pkgdir/usr" \ + INSTALLDIRINC="$pkgdir/usr/include/libnatpmp" install + + # Needed by some packages + install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp" + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} +md5sums=('d2b9c2dedba3a00deb0e7589982ceced') diff --git a/social/miniupnpc/PKGBUILD b/social/miniupnpc/PKGBUILD index eb11f384b..a28b9842f 100644 --- a/social/miniupnpc/PKGBUILD +++ b/social/miniupnpc/PKGBUILD @@ -1,14 +1,14 @@ # Contributor: Florian Loitsch <archlinux@florian.loitsch.com> pkgname=miniupnpc -pkgver=1.6 -pkgrel=2 +pkgver=1.7.20120830 +pkgrel=1 pkgdesc='A small UPnP client library/tool to access Internet Gateway Devices' arch=('i686' 'x86_64' 'mips64el') url="http://miniupnp.free.fr" license=('BSD') depends=('sh') source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz") -md5sums=('88055f2d4a061cfd4cfe25a9eae22f67') +md5sums=('c74b24b906e11860005fc425b4979fe6') build() { cd $srcdir/$pkgname-$pkgver diff --git a/social/miniupnpd/PKGBUILD b/social/miniupnpd/PKGBUILD new file mode 100644 index 000000000..b0d67c09e --- /dev/null +++ b/social/miniupnpd/PKGBUILD @@ -0,0 +1,41 @@ +pkgname=miniupnpd +pkgver=1.7.20120824 +pkgrel=2 +pkgdesc="Lightweight UPnP IGD daemon" +arch=('i686' 'x86_64' 'mips64el') +url="http://miniupnp.free.fr" +license=('BSD') +backup=(etc/miniupnpd/miniupnpd.conf) +depends=('libnfnetlink') + +eval $(wget "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/iptables" -O - | awk -F= ' + $1 == "pkgver" { pkgver=$2 } + $1 == "source" { sub(/\${pkgname}/, "iptables"); sub(/\${pkgver}/, pkgver); print $0 "); " } + $1 == "sha1sums" { print $0 ");" } + END { print "_iptables=iptables-" pkgver }') + +source+=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz" miniupnpd.init miniupnpd.systemd) +sha1sums+=('7abca8ecbcd8596392175eb312941083ed5faf21' + 'c84031d7af122c5bede8609bcfa80bc31f2a5e61' + 'bc0ae02a88eceef4f172b07f6f67d5fd54cc6ae0') + +build() { + cd "$srcdir/$_iptables" + ./configure --enable-static + make + + cd "$srcdir/$pkgname-$pkgver" + make -f Makefile.linux config.h + IPTABLESPATH="$srcdir/$_iptables" make -f Makefile.linux +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + mkdir -p "$pkgdir/usr/share/man/man8" + make PREFIX="$pkgdir/" -f Makefile.linux install + rm -r "${pkgdir}/etc/init.d" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm755 "${srcdir}/miniupnpd.init" "${pkgdir}/etc/rc.d/miniupnpd" + install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service" +} + diff --git a/social/miniupnpd/miniupnpd.init b/social/miniupnpd/miniupnpd.init new file mode 100644 index 000000000..e09ac3ade --- /dev/null +++ b/social/miniupnpd/miniupnpd.init @@ -0,0 +1,51 @@ +#!/bin/sh + +MINIUPNPD=/usr/sbin/miniupnpd +ARGS='-f /etc/miniupnpd/miniupnpd.conf' +PIDFILE='/var/run/miniupnpd.pid' +IPTABLES_CREATE=/etc/miniupnpd/iptables_init.sh +IPTABLES_REMOVE=/etc/miniupnpd/iptables_removeall.sh + +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting MiniUPNPd" + + if ! pidof -o %PPID $MINIUPNPD &> /dev/null; then + rm -f "$PIDFILE" + fi + + $IPTABLES_CREATE > /dev/null 2>&1 + + PID="$(cat "$PIDFILE" 2> /dev/null)" + + if [ -z "$PID" ] && $MINIUPNPD $ARGS; then + add_daemon miniupnpd + stat_done + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping MiniUPNPd" + PID="$(cat "$PIDFILE" 2> /dev/null)" + if [ -n "$PID" ] && kill "$PID" &> /dev/null; then + rm -f "$PIDFILE" + rm_daemon miniupnpd + stat_done + else + stat_fail + fi + ;; + restart) + "$0" stop + sleep 1 + "$0" start + ;; + *) + echo "Usage: /etc/rc.d/miniupnpd {start|stop|restart}" + exit 2 + ;; +esac +exit 0 diff --git a/social/miniupnpd/miniupnpd.systemd b/social/miniupnpd/miniupnpd.systemd new file mode 100644 index 000000000..0449e8a69 --- /dev/null +++ b/social/miniupnpd/miniupnpd.systemd @@ -0,0 +1,8 @@ +[Unit] +Description=Lightweight UPnP IGD daemon + +[Service] +ExecStart=/usr/sbin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d + +[Install] +WantedBy=network.target diff --git a/social/nitroshare/PKGBUILD b/social/nitroshare/PKGBUILD new file mode 100644 index 000000000..7896a356e --- /dev/null +++ b/social/nitroshare/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Sid Karunaratne <sid at karunaratne dot net> +# Contributor: Nathan Osman <https://launchpad.net/~george-edison55> + +pkgname=nitroshare +pkgver=0.2 +pkgrel=2 +pkgdesc="Makes sending a file to another machine on the local network as easy as dragging-and-dropping" +arch=('i686' 'x86_64') +url="https://launchpad.net/nitroshare" +license=('GPL3') +depends=('qt' 'qjson' 'qxmlrpc') +makedepends=() +options=() +source=(https://launchpad.net/${pkgname}/${pkgver}/${pkgver}/+download/${pkgname}_${pkgver}.tar.gz nitroshare.install) +md5sums=('00f670fadf385ee2a920b67a4120295d' + '0e8cd7761d04a45d22d28ac7b98fa234') + +build () { + cd "${srcdir}/${pkgname}" + sed -i "s_target.path = /opt/extras.ubuntu.com/nitroshare_target.path = ${pkgdir}/usr/bin_g" nitroshare.pro + sed -i "s_Exec=/opt/extras.ubuntu.com/nitroshare/nitroshare_Exec=/usr/bin/${pkgname}_g" resource/other/extras-${pkgname}.desktop + qmake + make +} + +package (){ + cd "${srcdir}/${pkgname}" + make install + mkdir -p ${pkgdir}/usr/share/applications + install -Dm644 resource/other/extras-${pkgname}.desktop ${pkgdir}/usr/share/applications/ + install -Dm644 resource/images/logo.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/social/nitroshare/nitroshare.install b/social/nitroshare/nitroshare.install new file mode 100644 index 000000000..d6519a6e8 --- /dev/null +++ b/social/nitroshare/nitroshare.install @@ -0,0 +1,4 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor + update-desktop-database -q +} diff --git a/social/qxmlrpc/01_build_targets.patch b/social/qxmlrpc/01_build_targets.patch new file mode 100644 index 000000000..bee6d5167 --- /dev/null +++ b/social/qxmlrpc/01_build_targets.patch @@ -0,0 +1,9 @@ +Index: qxmlrpc-0.0.svn6/qxmlrpc.pro +=================================================================== +--- qxmlrpc-0.0.svn6.orig/qxmlrpc.pro 2010-06-04 14:39:33.000000000 +0400 ++++ qxmlrpc-0.0.svn6/qxmlrpc.pro 2010-06-04 14:39:44.000000000 +0400 +@@ -1,3 +1,3 @@ + TEMPLATE = subdirs +-SUBDIRS = xmlrpc test/unit examples/client examples/server ++SUBDIRS = xmlrpc + CONFIG += ordered diff --git a/social/qxmlrpc/02_staticlib_removed.patch b/social/qxmlrpc/02_staticlib_removed.patch new file mode 100644 index 000000000..58f1d68d1 --- /dev/null +++ b/social/qxmlrpc/02_staticlib_removed.patch @@ -0,0 +1,12 @@ +Index: qxmlrpc-0.0.svn6/xmlrpc/xmlrpc.pro +=================================================================== +--- qxmlrpc-0.0.svn6.orig/xmlrpc/xmlrpc.pro 2010-06-04 18:18:24.000000000 +0400 ++++ qxmlrpc-0.0.svn6/xmlrpc/xmlrpc.pro 2010-06-04 18:23:23.000000000 +0400 +@@ -4,7 +4,6 @@ + win32:TARGET = ../qxmlrpc + + CONFIG += warn_on +-CONFIG += staticlib + CONFIG += debug_and_release + CONFIG += precompile_header + diff --git a/social/qxmlrpc/03_client.h_include_fix.patch b/social/qxmlrpc/03_client.h_include_fix.patch new file mode 100644 index 000000000..6f174cb95 --- /dev/null +++ b/social/qxmlrpc/03_client.h_include_fix.patch @@ -0,0 +1,13 @@ +Index: qxmlrpc-0.0.svn6/xmlrpc/client.h +=================================================================== +--- qxmlrpc-0.0.svn6.orig/xmlrpc/client.h 2010-06-04 18:18:24.000000000 +0400 ++++ qxmlrpc-0.0.svn6/xmlrpc/client.h 2010-06-04 18:20:21.000000000 +0400 +@@ -7,7 +7,7 @@ + #include <qobject.h> + #include <QHttp> + +-#include "xmlrpc/variant.h" ++#include "variant.h" + class QAuthenticator; + + namespace xmlrpc { diff --git a/social/qxmlrpc/04_do_not_link_gui.patch b/social/qxmlrpc/04_do_not_link_gui.patch new file mode 100644 index 000000000..c086d4990 --- /dev/null +++ b/social/qxmlrpc/04_do_not_link_gui.patch @@ -0,0 +1,24 @@ +Index: qxmlrpc-0.0.svn6/xmlrpc/stable.h +=================================================================== +--- qxmlrpc-0.0.svn6.orig/xmlrpc/stable.h 2010-06-04 18:23:58.000000000 +0400 ++++ qxmlrpc-0.0.svn6/xmlrpc/stable.h 2010-06-04 18:24:20.000000000 +0400 +@@ -2,7 +2,6 @@ + #ifndef STABLE_H + #define STABLE_H + #if defined(__cplusplus) and not defined(__OBJC__) +- #include <QtGui> + #include <QtXml> + #include <QtCore> + #include <QtNetwork> +Index: qxmlrpc-0.0.svn6/xmlrpc/xmlrpc.pro +=================================================================== +--- qxmlrpc-0.0.svn6.orig/xmlrpc/xmlrpc.pro 2010-06-04 18:23:54.000000000 +0400 ++++ qxmlrpc-0.0.svn6/xmlrpc/xmlrpc.pro 2010-06-04 18:24:12.000000000 +0400 +@@ -10,6 +10,7 @@ + DEPENDPATH += . + INCLUDEPATH += . .. + ++QT -= gui + QT += xml + QT += network + diff --git a/social/qxmlrpc/PKGBUILD b/social/qxmlrpc/PKGBUILD new file mode 100644 index 000000000..2e23c0a47 --- /dev/null +++ b/social/qxmlrpc/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Sid Karunaratne <sid at karunaratne dot net> +pkgname=qxmlrpc +pkgver=6 +pkgrel=1 +pkgdesc="a full Qt4 based implementation of XML-RPC protocol" +arch=('i686' 'x86_64') +url="https://code.google.com/p/qxmlrpc" +license=('LGPL') +depends=('qt') +makedepends=('subversion') +source=("https://repo.parabolagnulinux.org/other/$pkgname-$pkgver-$pkgrel-any.src.tar.xz"{,.sig} + "01_build_targets.patch" + "02_staticlib_removed.patch" + "03_client.h_include_fix.patch" + "04_do_not_link_gui.patch") +md5sums=("87a89cc118e816265989a87a2b3c9321" + "7f10b0f33b6d0a67136838740b4b7c72" + "7d997d9fc0f8ec08e7b0c640480eb941" + "ee1a3d2a284c93f41d3c76c163ee734d" + "c5cacf7e13b93abb3e8e223118c5abbb" + "8ff188be390bcd1966b354d7159fd0e6") + +build () { + cd "${srcdir}/${pkgname}" + msg "Starting build..." + + patch -p1 < ../01_build_targets.patch + patch -p1 < ../02_staticlib_removed.patch + patch -p1 < ../03_client.h_include_fix.patch + patch -p1 < ../04_do_not_link_gui.patch + + qmake + make +} + +package() { + install -Dm 755 "$srcdir/$pkgname/libqxmlrpc.so" "$pkgdir/usr/lib/libqxmlrpc.so" + install -Dm 755 "$srcdir/$pkgname/xmlrpc/client.h" "$pkgdir/usr/include/qxmlrpc/client.h" + install -Dm 755 "$srcdir/$pkgname/xmlrpc/request.h" "$pkgdir/usr/include/qxmlrpc/request.h" + install -Dm 755 "$srcdir/$pkgname/xmlrpc/response.h" "$pkgdir/usr/include/qxmlrpc/response.h" + install -Dm 755 "$srcdir/$pkgname/xmlrpc/server.h" "$pkgdir/usr/include/qxmlrpc/server.h" + install -Dm 755 "$srcdir/$pkgname/xmlrpc/serverintrospection.h" "$pkgdir/usr/include/qxmlrpc/serverintrospection.h" + install -Dm 755 "$srcdir/$pkgname/xmlrpc/variant.h" "$pkgdir/usr/include/qxmlrpc/variant.h" +} diff --git a/social/qxmlrpc/SRCBUILD b/social/qxmlrpc/SRCBUILD new file mode 100644 index 000000000..b5fe17ebf --- /dev/null +++ b/social/qxmlrpc/SRCBUILD @@ -0,0 +1,30 @@ +pkgname=qxmlrpc +pkgver=6 +pkgrel=1 +pkgdesc="a full Qt4 based implementation of XML-RPC protocol" +arch=('any') +url="https://code.google.com/p/qxmlrpc" +license=('LGPL') +makedepends=('subversion') +_svntrunk="http://qxmlrpc.googlecode.com/svn/trunk/" +_svnmod="qxmlrpc" + +build() { + msg "Connecting to SVN server...." + + if [[ -d "$_svnmod/.svn" ]]; then + (cd "$_svnmod" && svn up -r "$pkgver") + else + svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod" + fi + + msg "SVN checkout done or server timeout" +} + +package() { + export PKGEXT=.src.tar.xz + export PKGDEST=${SRCDEST} + + mv ${srcdir}/${_svnmod} ${pkgdir}/ + +} diff --git a/staging/glu/PKGBUILD b/staging/glu/PKGBUILD new file mode 100644 index 000000000..1aadbccb1 --- /dev/null +++ b/staging/glu/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 166931 2012-09-22 12:55:01Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Laurent Carlier <lordheavym@gmail.com> + +pkgname=glu +pkgver=9.0.0 +pkgrel=1 +pkgdesc="Mesa OpenGL Utility library" +arch=('i686' 'x86_64') +url="http://cgit.freedesktop.org/mesa/glu/" +license=('LGPL') +depends=('libgl') +makedepends=('mesa') +options=('!libtool') +source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/testing/hwloc/PKGBUILD b/testing/hwloc/PKGBUILD new file mode 100644 index 000000000..79fd2f67d --- /dev/null +++ b/testing/hwloc/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 167124 2012-09-25 18:41:34Z stephane $ +# Maintainer : Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Sylvain HENRY <hsyl20@yahoo.fr> +# Contributor: Hervé YVIQUEL <elldekaa@gmail.com> + +pkgname=hwloc +pkgver=1.5 +pkgrel=1 +pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" +arch=('i686' 'x86_64') +url="http://www.open-mpi.org/projects/hwloc/" +license=('BSD') +depends=('sh' 'pciutils' 'cairo' 'libxml2') +makedepends=('pkg-config') +options=('!libtool' '!docs') +source=(http://www.open-mpi.org/software/hwloc/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('b2e60bd40cfc6ca79dde68b19a83e8a4719d6b14') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/libffado/PKGBUILD b/testing/libffado/PKGBUILD new file mode 100644 index 000000000..2537c7a73 --- /dev/null +++ b/testing/libffado/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 166937 2012-09-22 19:34:15Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: galiyosha@gmail.com +# Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> + +pkgname=libffado +pkgver=2.1.0 +pkgrel=2 +pkgdesc="Driver for FireWire audio devices" +arch=('i686' 'x86_64') +url="http://www.ffado.org/" +license=('GPL') +depends=('libiec61883' 'libavc1394' 'dbus-c++' + 'libxml++' 'alsa-lib' 'libsigc++' 'libconfig') +makedepends=('scons' 'subversion' 'python2-pyqt') +optdepends=('python2: ffado-diag' + 'python2-pyqt: mixer applet') +provides=('ffado') +source=("http://www.ffado.org/files/$pkgname-$pkgver.tgz" + 'python2-qt.patch') +md5sums=('26bce2be0b9c1fa4e614f2f494edf388' + '10aa837f5521da213caa93e1ddc58c0e') + +_scons-conf() { + scons DEBUG=False \ + PREFIX=/usr \ + MANDIR=/usr/share/man \ + UDEVDIR=/usr/lib/udev/rules.d \ + ENABLE_SETBUFFERSIZE_API_VER=false \ + COMPILE_FLAGS="$CFLAGS" $@ +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # python2 fix + patch -Np1 -i "$srcdir/python2-qt.patch" + + # build! + if [ "$CARCH" = 'x86_64' ]; then + _scons-conf ENABLE_OPTIMIZATIONS=True + else + _scons-conf + fi +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + scons DESTDIR="$pkgdir" WILL_DEAL_WITH_XDG_MYSELF="True" install + + # desktop files & icons + install -Dm644 support/xdg/ffado.org-ffadomixer.desktop \ + "$pkgdir/usr/share/applications/ffadomixer.desktop" + + install -Dm644 support/xdg/hi64-apps-ffado.png \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/libffado/python2-qt.patch b/testing/libffado/python2-qt.patch new file mode 100644 index 000000000..042aa2665 --- /dev/null +++ b/testing/libffado/python2-qt.patch @@ -0,0 +1,246 @@ +diff -baur libffado-2.1.0.orig/SConstruct libffado-2.1.0/SConstruct +--- libffado-2.1.0.orig/SConstruct 2012-09-19 14:18:53.827448582 +0800 ++++ libffado-2.1.0/SConstruct 2012-09-19 14:20:01.670414379 +0800 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + # + # Copyright (C) 2007, 2008, 2010 Arnold Krille +@@ -134,7 +134,7 @@ + + def CheckForPyModule( context, module ): + context.Message( "Checking for the python module '" + module + "' " ) +- ret = context.TryAction( "python $SOURCE", "import %s" % module, ".py" ) ++ ret = context.TryAction( "python2 $SOURCE", "import %s" % module, ".py" ) + context.Result( ret[0] ) + return ret[0] + +@@ -351,7 +351,7 @@ + + # PyQT checks + build_mixer = False +-if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ): ++if conf.CheckForApp( 'which python2-pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ): + env['PYUIC4'] = True + build_mixer = True + +diff -baur libffado-2.1.0.orig/admin/dbus.py libffado-2.1.0/admin/dbus.py +--- libffado-2.1.0.orig/admin/dbus.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/dbus.py 2012-09-19 14:19:02.957399122 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # Copyright (C) 2007-2008 Pieter Palmers +diff -baur libffado-2.1.0.orig/admin/doxygen.py libffado-2.1.0/admin/doxygen.py +--- libffado-2.1.0.orig/admin/doxygen.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/doxygen.py 2012-09-19 14:19:02.957399122 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +diff -baur libffado-2.1.0.orig/admin/pkgconfig.py libffado-2.1.0/admin/pkgconfig.py +--- libffado-2.1.0.orig/admin/pkgconfig.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/pkgconfig.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +diff -baur libffado-2.1.0.orig/admin/pyuic.py libffado-2.1.0/admin/pyuic.py +--- libffado-2.1.0.orig/admin/pyuic.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/pyuic.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +diff -baur libffado-2.1.0.orig/admin/pyuic4.py libffado-2.1.0/admin/pyuic4.py +--- libffado-2.1.0.orig/admin/pyuic4.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/pyuic4.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +@@ -21,10 +21,8 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + # + +-import imp +- + def pyuic4_action( target, source, env ): +- env.Execute( "pyuic4 " + str( source[0] ) + " > " + str( target[0] ) ) ++ env.Execute( "python2-pyuic4 " + str( source[0] ) + " > " + str( target[0] ) ) + return 0 + + def pyuic4_string( target, source, env ): +@@ -34,7 +32,7 @@ + context.Message( "Checking for pyuic4 (by checking for the python module pyqtconfig) " ) + ret = True + try: +- imp.find_module( "pyqtconfig" ) ++ import PyQt4.pyqtconfig + except ImportError: + ret = False + context.Result( ret ) +diff -baur libffado-2.1.0.orig/admin/scanreplace.py libffado-2.1.0/admin/scanreplace.py +--- libffado-2.1.0.orig/admin/scanreplace.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/scanreplace.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +diff -baur libffado-2.1.0.orig/doc/SConscript libffado-2.1.0/doc/SConscript +--- libffado-2.1.0.orig/doc/SConscript 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/doc/SConscript 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/python2 + + Import( 'env' ) + +diff -baur libffado-2.1.0.orig/support/dbus/SConscript libffado-2.1.0/support/dbus/SConscript +--- libffado-2.1.0.orig/support/dbus/SConscript 2012-09-19 14:18:53.827448582 +0800 ++++ libffado-2.1.0/support/dbus/SConscript 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/bin/env python ++#!/usr/bin/python2 + # + # Copyright (C) 2007,2008,2011 Arnold Krille + # Copyright (C) 2007-2008 Pieter Palmers +diff -baur libffado-2.1.0.orig/support/mixer-qt4/SConscript libffado-2.1.0/support/mixer-qt4/SConscript +--- libffado-2.1.0.orig/support/mixer-qt4/SConscript 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/mixer-qt4/SConscript 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2009 Arnold Krille + # Copyright (C) 2007-2008 Pieter Palmers +diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado/ffadowindow.py libffado-2.1.0/support/mixer-qt4/ffado/ffadowindow.py +--- libffado-2.1.0.orig/support/mixer-qt4/ffado/ffadowindow.py 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/mixer-qt4/ffado/ffadowindow.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2008 by Pieter Palmers + # 2007-2009 by Arnold Krille +diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer-profiler.in libffado-2.1.0/support/mixer-qt4/ffado-mixer-profiler.in +--- libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer-profiler.in 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/mixer-qt4/ffado-mixer-profiler.in 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2009 by Pieter Palmers + # 2007-2009 by Arnold Krille +diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer.in libffado-2.1.0/support/mixer-qt4/ffado-mixer.in +--- libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer.in 2012-09-19 14:18:53.834115214 +0800 ++++ libffado-2.1.0/support/mixer-qt4/ffado-mixer.in 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2008 by Pieter Palmers + # 2007-2009 by Arnold Krille +diff -baur libffado-2.1.0.orig/support/tools/SConscript libffado-2.1.0/support/tools/SConscript +--- libffado-2.1.0.orig/support/tools/SConscript 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/SConscript 2012-09-19 14:20:51.970141882 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # Copyright (C) 2007-2008 Pieter Palmers +@@ -43,7 +43,7 @@ + # For the installation of the stuff + e['pythondir'] = Template( os.path.join( e['sharedir'], 'python' ) ).safe_substitute( e ) + +-e.Command( "static_info.txt", "#/SConstruct", "python support/tools/ffado-diag-static > $TARGET" ) ++e.Command( "static_info.txt", "#/SConstruct", "python2 support/tools/ffado-diag-static > $TARGET" ) + + e.ScanReplace( "ffado-diag.in" ) + +diff -baur libffado-2.1.0.orig/support/tools/ffado-diag-static libffado-2.1.0/support/tools/ffado-diag-static +--- libffado-2.1.0.orig/support/tools/ffado-diag-static 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/ffado-diag-static 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + + # +@@ -74,7 +74,7 @@ + # check libraries + print " gcc ............... %s" % get_version_first_line('gcc --version') + print " g++ ............... %s" % get_version_first_line('g++ --version') +- print " PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version') ++ print " PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version') + print " jackd ............. %s" % get_version_first_line('jackd --version') + print " path ............ %s" % get_command_path('jackd') + print " flags ........... %s" % get_package_flags("jack") +diff -baur libffado-2.1.0.orig/support/tools/ffado-diag.in libffado-2.1.0/support/tools/ffado-diag.in +--- libffado-2.1.0.orig/support/tools/ffado-diag.in 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/ffado-diag.in 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + + # +@@ -120,7 +120,7 @@ + print " Prerequisites (dynamic at run-time)..." + print " gcc ............... %s" % get_version_first_line('gcc --version') + print " g++ ............... %s" % get_version_first_line('g++ --version') +- print " PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version') ++ print " PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version') + print " jackd ............. %s" % get_version_first_line('jackd --version') + print " path ............ %s" % get_command_path('jackd') + print " flags ........... %s" % get_package_flags("jack") +diff -baur libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py libffado-2.1.0/support/tools/ffado-sandbox-install.py +--- libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/ffado-sandbox-install.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + + # +diff -baur libffado-2.1.0.orig/support/tools/listirqinfo.py libffado-2.1.0/support/tools/listirqinfo.py +--- libffado-2.1.0.orig/support/tools/listirqinfo.py 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/listirqinfo.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + + # +diff -baur libffado-2.1.0.orig/tests/dbus_test.py libffado-2.1.0/tests/dbus_test.py +--- libffado-2.1.0.orig/tests/dbus_test.py 2012-09-19 14:18:53.837448529 +0800 ++++ libffado-2.1.0/tests/dbus_test.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2007 by Pieter Palmers + # 2007-2008 by Arnold Krille +diff -baur libffado-2.1.0.orig/tests/python/test-eap-ctrl.py libffado-2.1.0/tests/python/test-eap-ctrl.py +--- libffado-2.1.0.orig/tests/python/test-eap-ctrl.py 2012-09-19 14:18:53.837448529 +0800 ++++ libffado-2.1.0/tests/python/test-eap-ctrl.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2009 by Pieter Palmers + # diff --git a/testing/mlocate/updatedb.cron b/testing/mlocate/updatedb.cron new file mode 100755 index 000000000..431cb533e --- /dev/null +++ b/testing/mlocate/updatedb.cron @@ -0,0 +1,6 @@ +#!/bin/sh + +NICE='nice -n 19' +IONICE='ionice -c 2 -n 7' + +exec ${IONICE} ${NICE} updatedb -f proc |