diff options
author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-05-27 04:15:07 -0300 |
---|---|---|
committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-05-27 04:15:07 -0300 |
commit | 89629026b63d38e09dc49b3b055ae75c0a0e3c5e (patch) | |
tree | 186d648f9320528fb646dabb007313c1ab9ca008 | |
parent | 94a71cc3e01869f3236825118a53055abbdfede0 (diff) | |
parent | acc167b1b6204a4d23614a438b3f957bec0e10ab (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
42 files changed, 292 insertions, 383 deletions
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index f86e71660..ca6fbb0fa 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185985 2013-05-20 06:09:54Z tpowa $ +# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -pkgver=${_basekernel}.3 +pkgver=${_basekernel}.4 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,8 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('120df29f88622dabf7015a22c7cc8e25' - '4ddd90d45cc8a4e663ef1e984e731232' - 'c4e0f6ed7f166b401dd522b8594efd81' + 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + '7985f1e2cdb6838cf89bd85c0229db6a' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index 87cf2bc63..dd3549ac6 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -5180,7 +5180,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=y # diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index fcd021bd7..a5e974c9b 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.9.3-1-LIBRE-PAE +KERNEL_VERSION=3.9.4-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 4392f493f..7ae0ec08c 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185985 2013-05-20 06:09:54Z tpowa $ +# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -pkgver=${_basekernel}.3 +pkgver=${_basekernel}.4 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,8 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('120df29f88622dabf7015a22c7cc8e25' - '4ddd90d45cc8a4e663ef1e984e731232' - '625f76c5e67c57c1fa35b74cf4a15d5e' + 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + '8cc2a43c771d0fbb652c8264c746c007' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index a933be16e..dd2c45fd8 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -5197,7 +5197,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=y # diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index f59400336..2bde797ef 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.9.3-1-LIBRE-XEN +KERNEL_VERSION=3.9.4-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 31997eb35..fe5469dd0 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.6 _extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install -pkgrel=7 +pkgrel=8 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index f2138e86a..8ea0dbba7 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90185 2013-05-08 10:46:15Z tpowa $ +# $Id: PKGBUILD 91714 2013-05-26 15:39:48Z tpowa $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,7 +7,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 _extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install -pkgrel=44 +pkgrel=45 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD index bab6e70c5..a377c189c 100644 --- a/libre/hexchat-libre/PKGBUILD +++ b/libre/hexchat-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 91125 2013-05-19 21:58:09Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: TingPing <tingping@tingping.se> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,8 +6,8 @@ _pkgname=hexchat pkgname=hexchat-libre pkgver=2.9.5 -pkgrel=4 -pkgdesc="A popular and easy to use graphical IRC (chat) client, without non-free browser reference (Parabola rebranded)" +pkgrel=5 +pkgdesc="A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)" arch=('i686' 'x86_64' 'mips64el') url="http://www.hexchat.org/" license=('GPL') @@ -34,7 +34,7 @@ build() { # Rebrand to Parabola sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c -# Remove non-free browser references +# Remove nonfree browser references patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch" patch -p1 -i "${srcdir}/no-firefox.patch" diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index b800c1444..81165b02d 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -1,18 +1,19 @@ -# $Id$ -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# $Id: PKGBUILD 91608 2013-05-25 11:33:59Z bpiotrowski $ +# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> +# Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com> pkgname=libquicktime-libre _pkgname=libquicktime pkgver=1.2.4 -pkgrel=2 -pkgdesc="A library for reading and writing quicktime files (no unfree faac support)." +pkgrel=6 +pkgdesc="A library for reading and writing quicktime files, without nonfree faac support" arch=('i686' 'x86_64') license=('GPL') url="http://libquicktime.sourceforge.net/" -depends=('gtk2' 'ffmpeg' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2') +depends=('gtk2' 'ffmpeg' 'libxv' 'libxaw' 'faad2') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz) +source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz") sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368') provides=("$_pkgname=$pkgver") conflicts=($_pkgname) @@ -29,7 +30,6 @@ build() { } package() { - cd $srcdir/$_pkgname-$pkgver + cd "$srcdir/$_pkgname-$pkgver" make DESTDIR="$pkgdir" install } - diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index b3176ccbb..ec385c23a 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.9.3 +_kernver=3.9.4 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=4 +pkgrel=5 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 3c8924131..7c3e3ad47 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.79 +_kernver=3.0.80 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=3 +pkgrel=4 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 2dcd13686..baab66b5c 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185987 2013-05-20 06:38:28Z tpowa $ +# $Id: PKGBUILD 186439 2013-05-26 15:23:17Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=79 +_sublevel=80 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.78 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.80 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - '4ddd90d45cc8a4e663ef1e984e731232' + '6dfc33fc2587b36e2bf61ff1b26584c2' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '85cd68841ef098249949638c1e8dd443') + '7a0757288e0f61cbd91f7fc6b2bafb7b') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 8bf93b71e..3c8ebbdae 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.79-1-LIBRE-LTS +KERNEL_VERSION=3.0.80-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 394563806..85ba7dba7 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90492 2013-05-12 22:55:40Z seblu $ +# $Id: PKGBUILD 91131 2013-05-19 23:48:35Z seblu $ # Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -13,7 +13,7 @@ _basekernel=3.9 #_sublevel=6 _pkgver=$_basekernel.$_sublevel pkgver=$_basekernel -pkgrel=2 +pkgrel=3 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index e5f7a6bc1..76c1908f7 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185985 2013-05-20 06:09:54Z tpowa $ +# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -_sublevel=3 +_sublevel=4 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('120df29f88622dabf7015a22c7cc8e25' - '4ddd90d45cc8a4e663ef1e984e731232' - '9de4af59b9c560df524b525afa117328' - 'f350294046f6a74ac1d2748ac6326723' + 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + 'b0bc969b9e8c1767b16cdc0504a7bad7' + '42dfd3a3702433b68c079d6b3fd13c3c' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '4e229083e416b258e0957299971d7859') + '846eb5948403dd0f2f02c50d3acb69c3') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 62baa74b7..107968129 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -5166,7 +5166,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=y # diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 0a16459f0..24d6be2bd 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.3-1 Kernel Configuration +# Linux/x86 3.9.4-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -4978,7 +4978,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=m # diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index a595bb180..619ad6090 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.9.3-1-LIBRE +KERNEL_VERSION=3.9.4-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index cd55468eb..509275d5d 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184774 2013-05-08 10:43:50Z tpowa $ +# $Id: PKGBUILD 186447 2013-05-26 15:45:25Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=45 +pkgrel=46 epoch=1 _extramodules=extramodules-3.9-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -47,7 +47,7 @@ build() { PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \ - --with-transmitter + --sbindir=/usr/bin --with-transmitter # Remove drivers already in kernel sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \ @@ -108,7 +108,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086' '087a7d102e1c96bf1179f38db2b0b237' '9ee196bd03ea44af5a752fb0cc6ca96a' '3deb02604b37811d41816e9b4385fcc3' - 'dab8a73bcc5fd5479d8750493d8d97dc' - 'c2e20fe68b034df752dba2773db16ebe' + '1c7ceace42da44f41e5a42b4dd3b3d76' + '121283a6de274e52ed86522aecd0f6e5' '07131d117fcfe9dcd50c453c3a5e9531' 'febf25c154a7d36f01159e84f26c2d9a') diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service index 953601fd3..2123348fd 100644 --- a/libre/lirc-libre/lirc.service +++ b/libre/lirc-libre/lirc.service @@ -3,7 +3,7 @@ Description=Linux Infrared Remote Control [Service] ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd -ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid +ExecStart=/usr/bin/lircd --pidfile=/run/lirc/lircd.pid Type=forking PIDFile=/run/lirc/lircd.pid diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service index 6b258e312..eedcf5d8f 100644 --- a/libre/lirc-libre/lircm.service +++ b/libre/lirc-libre/lircm.service @@ -4,7 +4,7 @@ After=lirc.service Wants=lirc.service [Service] -ExecStart=/usr/sbin/lircmd -u +ExecStart=/usr/bin/lircmd -u Type=forking [Install] diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 73f1135e0..a49b889bd 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185551 2013-05-14 23:48:31Z foutrelis $ +# $Id: PKGBUILD 186432 2013-05-26 10:14:39Z foutrelis $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,32 +7,30 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=35920 -pkgrel=3 +pkgver=36285 +pkgrel=1 arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion') license=('GPL') url="http://www.mplayerhq.hu/" -options=(!buildflags !emptydirs) -source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch subreader-fix-srt-parsing.patch) -md5sums=('5f96e829d711e7d1ea65e324710dca50' +options=('!buildflags' '!emptydirs') +source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz + mplayer.desktop + cdio-includes.patch) +md5sums=('5e4f0d4d039b0219514cf52ae6da831d' 'c0d6ef795cf6de48e3b87ff7c23f0319' - '7b5be7191aafbea64218dc4916343bbc' - '7cb6019018a95dcc3d1231e1aaa8bbdb') + '7b5be7191aafbea64218dc4916343bbc') prepare() { - cd "$srcdir/$_pkgbase" + cd "$srcdir/$_pkgbase-$pkgver" patch -Np0 -i ../cdio-includes.patch - - # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 - patch -Np1 -i ../subreader-fix-srt-parsing.patch } build() { - cd "$srcdir/$_pkgbase" + cd "$srcdir/$_pkgbase-$pkgver" ./configure --prefix=/usr \ --enable-runtime-cpudetection \ @@ -68,7 +66,7 @@ package_mplayer-libre() { replaces=('mplayer') conflicts=('mplayer') - cd "$srcdir/$_pkgbase" + cd "$srcdir/$_pkgbase-$pkgver" make DESTDIR="$pkgdir" install-mplayer install-mplayer-man install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/" @@ -88,7 +86,7 @@ package_mencoder-libre() { replaces=('mencoder') conflicts=('mencoder') - cd "$srcdir/$_pkgbase" + cd "$srcdir/$_pkgbase-$pkgver" make DESTDIR="$pkgdir" install-mencoder install-mencoder-man - find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; + find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} + } diff --git a/libre/mplayer-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-libre/subreader-fix-srt-parsing.patch deleted file mode 100644 index 84f2de4d9..000000000 --- a/libre/mplayer-libre/subreader-fix-srt-parsing.patch +++ /dev/null @@ -1,60 +0,0 @@ -From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001 -From: wm4 <wm4@nowhere> -Date: Tue, 30 Apr 2013 00:09:31 +0200 -Subject: [PATCH] subreader: fix out of bound write access when parsing .srt - -This broke .srt subtitles on gcc-4.8. The breakage was relatively -subtle: it set all hour components to 0, while everything else was -parsed successfully. - -But the problem is really that sscanf wrote 1 byte past the sep -variable (or more, for invalid/specially prepared input). The %[..] -format specifier is unbounded. Fix that by letting sscanf drop the -parsed contents with "*", and also make it skip only one input -character by adding "1" (=> "%*1[..."). - -The out of bound write could easily lead to security issues. - -Also, this change makes .srt subtitle parsing slightly more strict. -Strictly speaking this is an unrelated change, but do it anyway. It's -more correct. ---- - sub/subreader.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - - (foutrelis: adjusted variable names in first hunk to apply to mplayer) - -diff --git a/sub/subreader.c b/sub/subreader.c -index 23da4c7..0f1b6c9 100644 ---- a/sub/subreader.c -+++ b/sub/subreader.c -@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current, - int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; - - while (!current->text[0]) { -- char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep; -+ char line[LINE_LEN + 1], full_line[LINE_LEN + 1]; - int i; - - /* Parse SubRip header */ - if (!stream_read_line(st, line, LINE_LEN, utf16)) - return NULL; -- if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", -- &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) -+ if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d", -+ &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) - continue; - - current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10; -@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current, - return sub_ass_read_line_subviewer(st, current, args); - while (!current->text[0]) { - if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; -- if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) -+ if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) - continue; - current->start = a1*360000+a2*6000+a3*100+a4/10; - current->end = b1*360000+b2*6000+b3*100+b4/10; --- -1.8.1.6 - diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 023b703b4..311c469ca 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90856 2013-05-14 23:55:05Z foutrelis $ +# $Id: PKGBUILD 91641 2013-05-26 08:06:21Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -8,7 +8,7 @@ pkgname=mplayer-vaapi-libre pkgver=35107 -pkgrel=7 +pkgrel=8 pkgdesc="A movie player, compiled with vaapi, without nonfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" @@ -33,7 +33,7 @@ install=mplayer-vaapi.install sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56' '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b' - '69127a5576e4f1f62f688215bd2ec0e052ddcb36292c7a1766c146ff122cb092') + '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3') prepare() { @@ -43,7 +43,7 @@ prepare() { patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 - patch -Np1 -i "$srcdir/subreader-fix-srt-parsing.patch" + patch -Np0 -i "$srcdir/subreader-fix-srt-parsing.patch" } build() { diff --git a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch index 84f2de4d9..f1c087377 100644 --- a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch +++ b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch @@ -1,34 +1,8 @@ -From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001 -From: wm4 <wm4@nowhere> -Date: Tue, 30 Apr 2013 00:09:31 +0200 -Subject: [PATCH] subreader: fix out of bound write access when parsing .srt - -This broke .srt subtitles on gcc-4.8. The breakage was relatively -subtle: it set all hour components to 0, while everything else was -parsed successfully. - -But the problem is really that sscanf wrote 1 byte past the sep -variable (or more, for invalid/specially prepared input). The %[..] -format specifier is unbounded. Fix that by letting sscanf drop the -parsed contents with "*", and also make it skip only one input -character by adding "1" (=> "%*1[..."). - -The out of bound write could easily lead to security issues. - -Also, this change makes .srt subtitle parsing slightly more strict. -Strictly speaking this is an unrelated change, but do it anyway. It's -more correct. ---- - sub/subreader.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - - (foutrelis: adjusted variable names in first hunk to apply to mplayer) - -diff --git a/sub/subreader.c b/sub/subreader.c -index 23da4c7..0f1b6c9 100644 ---- a/sub/subreader.c -+++ b/sub/subreader.c -@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current, +Index: sub/subreader.c +=================================================================== +--- sub/subreader.c (revision 36284) ++++ sub/subreader.c (revision 36285) +@@ -378,14 +378,14 @@ int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; while (!current->text[0]) { @@ -41,20 +15,26 @@ index 23da4c7..0f1b6c9 100644 return NULL; - if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", - &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) -+ if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d", ++ if (sscanf(line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", + &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) continue; - current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10; -@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current, - return sub_ass_read_line_subviewer(st, current, args); + current->start = h1 * 360000 + m1 * 6000 + s1 * 100 + ms1 / 10; +@@ -442,7 +442,7 @@ + #endif while (!current->text[0]) { if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; - if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) -+ if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) ++ if ((len=sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) continue; current->start = a1*360000+a2*6000+a3*100+a4/10; current->end = b1*360000+b2*6000+b3*100+b4/10; --- -1.8.1.6 - +@@ -1123,7 +1123,7 @@ + {*uses_time=1;return SUB_MPL2;} + if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) + {*uses_time=1;return SUB_SUBRIP;} +- if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10) ++ if (sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) + {*uses_time=1;return SUB_SUBVIEWER;} + if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4) + {*uses_time=1;return SUB_SUBVIEWER2;} diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index a3d48d0f3..4dd77dda3 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90191 2013-05-08 10:50:10Z tpowa $ +# $Id: PKGBUILD 91724 2013-05-26 15:41:39Z tpowa $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=21 +pkgrel=22 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 95f94c9b4..b1f8c6ffb 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90193 2013-05-08 10:51:01Z tpowa $ +# $Id: PKGBUILD 91726 2013-05-26 15:41:55Z tpowa $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.9-LIBRE -pkgrel=24 +pkgrel=25 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 9646cb1f7..a6c22c177 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90212 2013-05-09 00:26:24Z seblu $ +# $Id: PKGBUILD 91728 2013-05-26 15:42:12Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Maintainer (Parabola): Jorge López <jorginho@lavabit.com> @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.12 -pkgrel=5.1 +pkgrel=6 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index 82bda9855..9a98c5752 100644 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -1,4 +1,4 @@ -VERSION='' +VERSION='3.9.4-1-LIBRE' post_install() { cat << EOF diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install index 6c1a57d3a..f0ca024ed 100644 --- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install @@ -1,4 +1,4 @@ -VERSION='' +VERSION='3.9.4-1-LIBRE' post_install() { cat << EOF diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD index e7805a9b4..cc50fb44c 100644 --- a/libre/xchat-libre/PKGBUILD +++ b/libre/xchat-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176357 2013-01-30 21:29:22Z eric $ +# $Id: PKGBUILD 186065 2013-05-20 20:17:32Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,8 +6,8 @@ _pkgname=xchat pkgname=xchat-libre pkgver=2.8.8 -pkgrel=12 -pkgdesc="A GTK+ based IRC client without non-free browser reference" +pkgrel=13 +pkgdesc="A GTK+ based IRC client, without nonfree browser reference" arch=('i686' 'x86_64' 'mips64el') url="http://www.xchat.org/" provides=("xchat=$pkgver") @@ -35,14 +35,18 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532' 'e6a3b69ba333fc7ba0f70792d78d44fba7c4a911' '20aef0ae608af6b30e1b4249f9c53830f8f514f6') -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" +prepare() { + cd ${_pkgname}-${pkgver} sed -i 's/GDK_HAND1/GDK_HAND2/' src/fe-gtk/xtext.c patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch" patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch" patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch" patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch" patch -p1 -i "${srcdir}/no-firefox.patch" +} + +build() { + cd ${_pkgname}-${pkgver} autoconf autoheader @@ -52,7 +56,7 @@ build() { } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd ${_pkgname}-${pkgver} make DESTDIR="${pkgdir}" install for i in 24 32 48 64 128 256 ; do diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index 2404ba154..96c0f3537 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -1,35 +1,37 @@ -# $Id$ +# $Id: PKGBUILD 177534 2013-02-07 02:39:51Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=xscreensaver pkgname=xscreensaver-libre -pkgver=5.15 -pkgrel=3 -pkgdesc="Screen saver and locker for the X Window System (without non-free asm files)" +pkgver=5.21 +pkgrel=1 +pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files" arch=('i686' 'x86_64' 'mips64el') url="http://www.jwz.org/xscreensaver/" license=('BSD') -depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' \ +depends=('libxxf86vm' 'libglade' 'glu' 'xorg-appres' 'libxmu' \ 'perl-libwww' 'perl-http-message') -makedepends=('bc' 'libxpm' 'gdm') +makedepends=('bc' 'libxpm' 'gdm' 'mesa') optdepends=('gdm: for login manager support') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") backup=('etc/pam.d/xscreensaver') source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \ - add-electricsheep.diff xscreensaver.pam LICENSE libre.patch) -sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052' + add-electricsheep.diff xscreensaver.pam LICENSE) +sha1sums=('cc44ddc538ad5b59ff851f70e8a48633763ff077' '677496218b81a42d90bee400026e94dd87fb8ffb' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' - '4209ea586b204fd1d81c382a0522c654f9fd9134' - '327b839eb5d069827c1f25ef19fc8d4e83de7ab2') + '4209ea586b204fd1d81c382a0522c654f9fd9134') build() { cd "${srcdir}/${_pkgname}-${pkgver}" patch -p0 -i "${srcdir}/add-electricsheep.diff" - patch -Np1 -i "${srcdir}/libre.patch" # deleting dmsc.asm file due that doesn't has source code supplied + + # Deleting dmsc.asm file due that don't have source code supplied + rm -v hacks/images/m6502/dmsc.asm + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \ --with-pam --with-login-manager --with-gtk --with-gl \ diff --git a/libre/xscreensaver-libre/libre.patch b/libre/xscreensaver-libre/libre.patch deleted file mode 100644 index 569f8435c..000000000 --- a/libre/xscreensaver-libre/libre.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff -Naur xscreensaver-5.15/hacks/images/m6502/dmsc.asm /dev/null ---- xscreensaver-5.15/hacks/images/m6502/dmsc.asm 2008-03-02 03:34:37.000000000 -0200 -+++ /dev/null 2012-06-14 14:00:43.782877377 -0300 -@@ -1,108 +0,0 @@ --; By DMSC - daniel.serpell@gmail.com --; --; This demo was programmed in ACME: --; http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/acme/ --; --; If you want the source code, send me an email :-) --; -- -- dcb 76, 94, 11,133, 32,162, 8,160, 8,145, 16,136,208,251,165, 16 -- dcb 24,105, 32,133, 16,165, 17,105, 0,133, 17,165, 32,202,208,231 -- dcb 96,230, 48,165, 48, 41, 63,133, 48,170,189,106, 6,170,189, 8 -- dcb 3,105, 1, 41, 3,157, 8, 3,138, 73,231,170,189, 0, 2,105 -- dcb 1, 41, 3,157, 0, 2,165, 48, 73, 63,170,189,106, 6, 73,224 -- dcb 170,189, 8, 2,105, 1, 41, 3,157, 8, 2,138, 73,231,170,189 -- dcb 0, 3,105, 1, 41, 3,157, 0, 3, 96,224,192,160,128, 96,225 -- dcb 64,193,161,226,129, 32,194, 97,162,227,195,130,228, 65,163,196 -- dcb 98,229,131,164,197,230,231,132,165,198, 99, 66, 33, 0,199,166 -- dcb 133,100,167, 67,134,101,135, 34, 68,102,103, 69, 35, 70, 71, 36 -- dcb 1, 37, 38, 39, 2, 3, 4, 5, 6, 7,166, 48,189,198, 6,170 -- dcb 254, 24, 3, 73, 7,170,254, 16, 3, 73,231,170,254, 24, 2, 73 -- dcb 7,170,254, 16, 2, 96, 0, 32, 1, 33, 64, 2, 65, 34, 96, 66 -- dcb 3, 97, 35, 98, 67,128, 4,129, 36, 99,130, 68,160, 5,161,131 -- dcb 100, 37,162, 69,132,192,163,101, 6,193, 38,194, 70,164,133,195 -- dcb 102,224, 7,225, 39,165,226,196,134, 71,227,103,197,166,228,135 -- dcb 198,229,167,230,199,231,166, 49,189, 21, 7,170,189, 0,160,157 -- dcb 0, 5,230, 49, 96,195,227,194,162,228, 97,226,128,129,130,225 -- dcb 64,161,163,224, 96,160,193,196, 32, 98,192, 65, 0,131,229,164 -- dcb 33, 99,197, 66,132, 1,230, 34,165, 67,100,198, 2, 3, 68, 6 -- dcb 35,133,166, 5,101, 4,199, 7, 36,231, 69,134,167, 37, 38,102 -- dcb 135, 70,232, 71, 39,103,136,200,168, 8, 11, 10,169,233,104, 9 -- dcb 12,137,201, 13, 40, 44, 72, 43,170, 42, 45, 41,105, 73,202, 14 -- dcb 138,234, 74, 75,106,203, 76,171, 46, 77,235,107,139, 15,108,172 -- dcb 174,140,173,141,142,204,109,206,207,205, 78,175, 47,236,239,143 -- dcb 237,238,110,240,241,111,208, 16, 79,176,209,242, 48,144,243, 80 -- dcb 177,244,112,210, 17, 49,178,179, 52, 53,147, 18, 81,211,145, 19 -- dcb 146, 51, 85,180, 20, 54,113,148, 22, 50, 84,212, 21, 55,115,245 -- dcb 83,114,116, 23, 82, 86, 88, 89, 87,118,117,119,149,213, 56, 57 -- dcb 181,214, 90,121,122,150,151,182,183,215,246, 58,120,247, 24,153 -- dcb 184,152,216, 25, 26, 59, 91,248,123,185, 27, 60,217,154, 28, 92 -- dcb 249, 29,155,186, 61,218, 93,124,250,187, 30,251, 62,156, 94,125 -- dcb 219,188, 31,252,254,220,253, 63,126,255,157,221, 95,159,191,222 -- dcb 127,189,223,158,190,165, 66, 41,224,208, 72,165, 66, 24,105, 1 -- dcb 41, 31,133, 66,165, 67,240, 7,198, 67,169, 0, 76, 97, 8,198 -- dcb 69,240,247, 16, 37,166, 64,230, 64,189,177, 9, 16, 15, 41,127 -- dcb 133, 67, 73,127,208,228,169, 1,133, 70, 76, 42, 8,170,189,117 -- dcb 8,133, 69,234,234,189,181, 8,133, 65,166, 65,230, 65,189,245 -- dcb 8,133, 68,165, 66, 24,105,224,133, 66,166, 66,169, 1,102, 68 -- dcb 42,157, 0,160, 96, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2 -- dcb 3, 2, 3, 3, 3, 3, 3, 1, 2, 3, 1, 5, 3, 3, 3, 3 -- dcb 3, 2, 2, 3, 3, 5, 4, 3, 3, 5, 4, 4, 4, 3, 3, 4 -- dcb 4, 1, 3, 4, 3, 5, 5, 5, 4, 5, 4, 4, 3, 4, 4, 7 -- dcb 4, 4, 4, 2, 1, 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30 -- dcb 32, 35, 35, 38, 40, 43, 46, 49, 50, 52, 4, 55, 55, 60, 63, 65 -- dcb 68, 71, 73, 75, 78, 78, 33, 83, 86, 89, 94, 98,102,106,109,112 -- dcb 116, 94,120,123,127,130,134,139,144,148,153,157,161,164,167,171 -- dcb 178,171,182,186, 5, 56, 68, 56, 36,124, 4, 76, 84, 36, 68, 84 -- dcb 40, 24, 40,124,100, 84, 88, 56, 84, 72, 76, 80, 96, 40, 84, 40 -- dcb 36, 84, 56, 44, 28,124, 36, 24, 24, 36,124, 24, 52, 16, 60, 80 -- dcb 24, 37, 30,124, 32, 28,188, 1,190,124, 24, 36, 60, 32, 28, 32 -- dcb 28, 24, 36, 24, 63, 36, 24, 36, 63, 60, 16, 32, 52, 44,120, 36 -- dcb 56, 4, 60, 56, 4, 56, 4, 56, 57, 6, 56, 44, 52, 36, 12, 48 -- dcb 208, 48, 12,252,164,164, 88,120,132,132, 72,252,132,132,120,252 -- dcb 164,132,252,160,128,120,132,164, 56,252, 32, 32,252, 8, 4,248 -- dcb 252, 48, 80,140,252, 4, 4,252, 64, 60, 64,252, 64, 48, 8,252 -- dcb 120,132,132,132,120,252,144,144, 96,120,132,134,133,120,252,144 -- dcb 144,108, 68,164,164,152,128,252,128,248, 4, 4,248, 4, 8,240 -- dcb 224, 28, 16,224, 28, 16,224,204, 48, 48,204,140,148,164,196, 0 -- dcb 0,133, 41, 10, 28, 29, 63, 63, 63,136, 15, 10, 28, 29, 14, 27 -- dcb 63, 63, 63,132, 55, 17, 18, 28, 62, 18, 28, 62, 10,136, 27, 14 -- dcb 10, 21, 21, 34,143, 15, 10, 28, 29,142, 39, 40, 48, 50,149,145 -- dcb 10, 23, 13, 62, 23, 24, 32,136, 28, 24, 22, 14,136, 11, 14, 10 -- dcb 30, 29, 18, 15, 30, 21,128, 14, 15, 15, 14, 12, 29, 28, 63, 63 -- dcb 63,144,159,255, 55, 17, 18, 28, 62, 18, 28, 62, 10, 21, 21,129 -- dcb 15, 24, 27, 62, 23, 24, 32,136, 11, 34, 14, 63, 63, 63,141, 63 -- dcb 63, 63, 11, 34, 14,150,159,143, 11, 34, 62, 39, 48, 54, 38, 2 -- dcb 0, 0, 7, 63, 5, 63, 2, 9, 11, 34, 62, 39, 48, 54, 38, 2 -- dcb 0, 0, 7, 63, 5, 63, 2, 9, 11, 34, 62, 39, 48, 54, 38, 2 -- dcb 0, 0, 7, 63, 5, 63, 2, 9,143,159,255,169, 0,133, 42,169 -- dcb 1,133, 44,133, 45,169, 0,133, 32,169,160,133, 33,165, 42,133 -- dcb 43,162, 15,160, 15,145, 32, 24,101, 44,230, 44,136, 16,246,165 -- dcb 32, 24,105, 32,133, 32,165, 33,105, 0,133, 33,169, 1,133, 44 -- dcb 165, 43, 24,101, 45,133, 43,230, 45,202, 16,215,169, 0,133, 32 -- dcb 169,160,133, 33,169,224,133, 34,169, 3,133, 35,169, 0,133, 36 -- dcb 169, 4,133, 37,169,240,133, 38,169, 3,133, 39,169, 16,133, 40 -- dcb 169, 4,133, 41,169, 15,133, 46,160, 15,177, 32, 74, 74, 74, 74 -- dcb 170,189, 62, 11,209, 34,240, 18,145, 34,145, 36,170,152, 73, 15 -- dcb 168,138,145, 38,145, 40,152, 73, 15,168,136, 16,221,165, 32, 24 -- dcb 105, 32,133, 32,165, 33,105, 0,133, 33,165, 34, 24,105,224,133 -- dcb 34,165, 35,105,255,133, 35,165, 36, 24,105, 32,133, 36,165, 37 -- dcb 105, 0,133, 37,165, 38, 24,105,224,133, 38,165, 39,105,255,133 -- dcb 39,165, 40, 24,105, 32,133, 40,165, 41,105, 0,133, 41,198, 46 -- dcb 16,150,230, 42,165, 42, 41, 63,240, 3, 76, 95, 10, 96, 0, 11 -- dcb 12, 15, 1, 15, 12, 11, 0, 11, 12, 15, 1, 15, 12, 11, 0, 11 -- dcb 12, 15, 1, 15, 12, 11, 0, 11, 12, 15, 1, 15, 12, 11,169, 1 -- dcb 162,255,134, 16,162, 1,134, 17, 32, 3, 6,169, 2,162, 7,134 -- dcb 16,162, 2,134, 17, 32, 3, 6,169, 3,162, 7,134, 16,162, 3 -- dcb 134, 17, 32, 3, 6,169, 31,133, 66,169, 0,133, 70,133, 67,133 -- dcb 64,169, 1,141,109, 8,169, 0,141,114, 8,169,160,141,115, 8 -- dcb 169, 63,133, 48,169,128,133, 49,169, 3,141,109, 8,169, 0,170 -- dcb 157, 0,160,232,208,250, 32, 33, 6, 32,170, 6, 32, 6, 7, 32 -- dcb 21, 8,165, 66, 73, 31,208, 13,173,109, 8, 24,105, 2, 41, 3 -- dcb 105, 3,141,109, 8,165, 49,208,221,173, 17, 7, 73, 1,141, 17 -- dcb 7,165, 70,240,209, 32, 29, 12, 32, 91, 10,169, 31,133, 66,169 -- dcb 0,133, 70,133, 67,141,109, 8,169, 0,141,114, 8,169, 3,141 -- dcb 115, 8, 32, 29, 12, 32, 21, 8,165, 66, 73, 31,208,247,173,115 -- dcb 8, 73, 7,141,115, 8,165, 70,240,235, 76, 94, 11,169, 0,170 -- dcb 157, 0, 2,157, 0, 3,157, 0, 4,157, 0, 5,232,208,241, 96 -- diff --git a/pcr/amsynth/PKGBUILD b/pcr/amsynth/PKGBUILD index 58c097cf4..1cd3cccf6 100644 --- a/pcr/amsynth/PKGBUILD +++ b/pcr/amsynth/PKGBUILD @@ -1,26 +1,26 @@ -# Mantainer: Guest One <theguestone at gmail dot com> +# Maintainer : Guest One <theguestone at gmail dot com> pkgname=amsynth pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Analogue Modeling SYNTHesizer" -arch=('i686') +arch=('i686' 'x86_64') url="http://code.google.com/p/amsynth/" license=('GPL') -depends=('gtkmm' 'jack') -source=(http://amsynth.googlecode.com/files/amSynth-${pkgver}.tar.gz) +depends=('gtkmm' 'jack' 'liblo') +makedepends=('desktop-file-utils' 'dssi' 'libtool' 'ladspa') +install="$pkgname.install" +source=("http://amsynth.googlecode.com/files/amSynth-$pkgver.tar.gz") md5sums=('991329e433bb8c496f9ca5158faf0bca') build() { - cd ${srcdir}/amSynth-${pkgver} - - sed -i -e 's|/amSynth|/amsynth|' src/main.cc - - autoreconf --force --install + cd "$srcdir/amSynth-$pkgver" + libtoolize ./configure --prefix=/usr make +} - install -Dm755 src/amSynth ${pkgdir}/usr/bin/amSynth - mkdir -p ${pkgdir}/usr/share/${pkgname} - install -m644 skel/{Controllersrc,presets} ${pkgdir}/usr/share/${pkgname}/ +package() { + cd "$srcdir/amSynth-$pkgver" + make DESTDIR="$pkgdir/" install } diff --git a/pcr/amsynth/amsynth.install b/pcr/amsynth/amsynth.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/pcr/amsynth/amsynth.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/lua51-sql-mysql/PKGBUILD b/pcr/lua51-sql-mysql/PKGBUILD new file mode 100644 index 000000000..04ffee934 --- /dev/null +++ b/pcr/lua51-sql-mysql/PKGBUILD @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sébastien Luttringer <seblu@archlinux.org> +# Contributor: Anders Bergh <anders1@gmail.com> + +pkgname=lua51-sql-mysql +pkgdesc='MySQL module for Lua 5.1' +pkgver=2.2.0 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://www.keplerproject.org/luasql/' +license=('MIT') +depends=('lua51' 'libmariadbclient') +source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz") +md5sums=('59d72db444c6369c936d4f03694db6b7') + +build() { + cd luasql-$pkgver + sed -i '24s,$,/lua5.1,' config + msg2 'Building MySQL support' + make T=mysql PREFIX=/usr DRIVER_LIBS="$(mysql_config --libs)" \ + DRIVER_INCS="$(mysql_config --include) -fPIC" +} + +package() { + cd luasql-$pkgver + install -Dm644 src/mysql.so "$pkgdir/usr/lib/lua/5.1/luasql/mysql.so" + install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/nekobee/PKGBUILD b/pcr/nekobee/PKGBUILD index 164b50ac9..4e71ae93d 100644 --- a/pcr/nekobee/PKGBUILD +++ b/pcr/nekobee/PKGBUILD @@ -2,7 +2,7 @@ pkgname=nekobee pkgver=0.1.8 -pkgrel=1 +pkgrel=2 pkgdesc="A TB303-style synthesizer for DSSI" url="https://github.com/gordonjcp/nekobee" depends=('liblo' 'gtk2') @@ -19,5 +19,9 @@ cd $startdir/src/$pkgname-$pkgver patch -p1 -i $srcdir/$pkgname.patch ./waf configure --prefix=/usr ./waf -DESTDIR=$startdir/pkg ./waf install +} + +package() { +cd $startdir/src/$pkgname-$pkgver +DESTDIR=$pkgdir ./waf install } diff --git a/pcr/prboom/PKGBUILD b/pcr/prboom/PKGBUILD new file mode 100644 index 000000000..03f53784e --- /dev/null +++ b/pcr/prboom/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 77655 2012-10-13 11:44:28Z allan $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Thayer Williams <thayer@archlinux.org> +# Contributor: dale <dale@archlinux.org> + +pkgname=prboom +pkgver=2.5.0 +pkgrel=7 +pkgdesc='A game engine which provides a program to play Doom levels.' +url='http://prboom.sourceforge.net/' +license=('GPL2') +arch=('i686' 'x86_64' 'mips64el') +depends=('libpng' 'sdl_mixer' 'sdl_net' 'glu') +makedepends=('mesa') +source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz" + 'libpng-1.4.patch') +md5sums=('a8a15f61fa2626ab98051ab2703378c4' + 'ba53474db8e747035ca2320a445e4ae0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 < ../libpng-1.4.patch + + ./configure --prefix=/usr --disable-i386-asm + sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + diff --git a/pcr/prboom/libpng-1.4.patch b/pcr/prboom/libpng-1.4.patch new file mode 100644 index 000000000..a2215e37b --- /dev/null +++ b/pcr/prboom/libpng-1.4.patch @@ -0,0 +1,21 @@ +diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c +--- prboom-2.5.0-orig/src/SDL/i_sshot.c 2010-01-24 23:26:03.000000000 -0500 ++++ prboom-2.5.0/src/SDL/i_sshot.c 2010-01-24 23:28:42.000000000 -0500 +@@ -231,7 +231,7 @@ + if (fp) + { + png_struct *png_ptr = png_create_write_struct( +- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn); ++ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn); + + if (png_ptr) + { +@@ -279,7 +279,7 @@ + break; + } + } +- png_destroy_write_struct(&png_ptr, png_infopp_NULL); ++ png_destroy_write_struct(&png_ptr, NULL); + } + fclose(fp); + } diff --git a/pcr/python2-sfml2/PKGBUILD b/pcr/python2-sfml2/PKGBUILD index b612997f3..ed5249a25 100644 --- a/pcr/python2-sfml2/PKGBUILD +++ b/pcr/python2-sfml2/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> pkgname=python2-sfml2 -pkgver=1.2 +pkgver=master pkgrel=0 pkgdesc="Python 2 binding for SFML 2, written with Cython." arch=('i686' 'x86_64') -url="http://openhelbreath.net/python-sfml2" +url="http://python-sfml.org" license=('LGPL3') depends=('sfml' 'python2') makedepends=('sfml' 'cython2') conflicts=('python2-pysfml2' 'python2-pysfml2-git' 'python2-sfml2') -source=('https://github.com/Sonkun/python-sfml/archive/v1.2.zip') +source=('https://github.com/Sonkun/python-sfml/archive/master.zip') optdepends=('pyqt-common: To use pysfml with Qt') build() { @@ -37,4 +37,4 @@ package() { install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE fi } -sha256sums=('24bf5c29eed525f4e81a43c1700ae37f6582e653fcb7f58ee41144b8cf46ce29') +sha256sums=('01bb4a07c3100807163cd2ddcb1208794b1dbac19706eabea430e23fbf00414b') diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD index e01f42ef0..8bc928115 100644 --- a/pcr/ryzom-hg/PKGBUILD +++ b/pcr/ryzom-hg/PKGBUILD @@ -1,29 +1,45 @@ # Maintainer:Bjoern Bidar <theodorstormgrade@gmail.com -# Maintainer:Jorge Araya Navarro <jorgean@lavabit.com> #_gui_toolkit=qt # qt or gtk _build_server=false # set true to build server (default:false) _build_client=true # set false to don't build client (default:true) _CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF'.) # cmake arguments for server and client _CMAKE_SERVER_ARGS=('-DWITH_RYZOM_SERVER=ON' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' ) # cmake args for building server _CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' ) # cmake args for building client - if [ $_build_client = true ] ; then true && pkgname=( 'ryzom-client-hg' ) fi if [ $_build_server = true ] ; then true && pkgname=( 'ryzom-client-hg' 'ryzom-server-hg') -fi +fi +pkgbase=ryzom-hg +pkgname=ryzom-hg +pkgver=20130331 +pkgrel=1 +pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server or launch a server" +arch=('i686' 'x86_64') +url="http://www.ryzom.com/" +license=('AGPL3') +depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql') +conflicts=('ryzom-client-latest-hg') +groups=('ryzom') +makedepends=('mercurial' 'cpptest' 'cmake' 'bison') +provides=('ryzom') +source=( 'ryzom.sh' 'ryzom.desktop' ) +md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f' + '71d5136d40ec4e76c2ac2b0c9e506aef') + + case $_gui_toolkit in qt) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_QT=ON' ) ;; gtk) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_GTK=ON' ) ;; -esac +esac _hg_root='https://bitbucket.org/ryzom/ryzomcore' -_hg_name='ryzomcore' +_hg_name='ryzomcore' prepare() { if [ -d "$_hg_name" ] ; then # fetch sources @@ -33,84 +49,52 @@ prepare() { else hg clone "$_hg_root" fi - + msg2 "hg clone done or server timeout" } build() { cd $_hg_name - - if [ $_build_client = true ] ; then - + + if [ $_build_client = true ] ; then mkdir -p "$srcdir/build-client" cd "$srcdir/build-client" msg "client is $_build_client, building client" cmake -b "$srcdir/$_hg_name/code" ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin msg "Starting make, to build client" make - + fi - + if [ $_build_server = true ] ; then mkdir -p "$srcdir/build-server" cd "$srcdir/build-server" msg "client is $_build_server, building server" cmake -b "$srcdir/$_hg_name/code" ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_SERVER_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - msg "Starting make, to build server" - make - + msg "Starting make, to build server" + make fi - } -if [ $_build_client = true ] ; then +if [ $_build_client = true ] ; then + package_ryzom-client-hg() { pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server" depends=( 'curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'cmake' 'libpng' 'libjpeg' 'rrdtool' 'bison' 'libwww' 'boost' 'cpptest' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql' 'ryzom-data' ) cd "$srcdir/build-client" make DESTDIR="$pkgdir/" install - install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications + install -Dm 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script - cp ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom - chmod +x ${pkgdir}/usr/bin/ryzom - mkdir -p ${pkgdir}/usr/bin - + install -Dm755 ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom } - fi if [ $_build_server = true ] ; then - + package_ryzom-server-hg() { pkgdesc="Ryzom is a Free to Play MMORPG . This is the version to run a server" cd "$srcdir/build-server" - make DESTDIR="$pkgdir/" install - # install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications - # sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script - # cp ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom - #chmod +x ${pkgdir}/usr/bin/ryzom - mkdir -p ${pkgdir}/usr/bin - + make DESTDIR="$pkgdir/" install } - fi - - - -pkgname=ryzom-hg -pkgbase=ryzom-hg -pkgver=20130331 -pkgrel=1 -pkgdesc="An awesome free software 3D MMORPG game" -arch=('i686' 'x86_64') -url="http://www.ryzom.com/" -license=('AGPL3') -depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51') #'lua51-sql-mysql') -conflicts=('ryzom-client-latest-hg' 'ryzom-client' 'ryzom-hg') -groups=('ryzom') -makedepends=('mercurial' 'cpptest' 'cmake' 'bison') -provides=('ryzom') -source=( 'ryzom.sh' 'ryzom.desktop' ) -md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f' - '71d5136d40ec4e76c2ac2b0c9e506aef') |