From ebfbe6aa4a09806147654dd9e8d512cd68921e0d Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 9 Jan 2014 03:58:56 +0000 Subject: Thu Jan 9 03:54:24 UTC 2014 --- extra/libdrm/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extra/libdrm') diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 917431975..e5c9232ed 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 200740 2013-12-03 19:25:26Z lcarlier $ +# $Id: PKGBUILD 203374 2014-01-08 20:56:58Z lcarlier $ # Maintainer: Jan de Groot pkgname=libdrm -pkgver=2.4.50 +pkgver=2.4.51 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) @@ -14,7 +14,7 @@ replaces=('libdrm-new' 'libdrm-nouveau') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 COPYING) -sha256sums=('3823d24cda800c2cd36995e01830b890edb8fb1bebf97d5ea4318b8c3933b045' +sha256sums=('0bb75284ff56e1188cd2d0721f7cb8830aafcea5c6ca72dfd7b947ea652b951c' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') build() { -- cgit v1.2.3-54-g00ecf From c9e4976968b0f847cc693453df1e947531af2e76 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 22 Jan 2014 03:54:26 +0000 Subject: Wed Jan 22 03:51:02 UTC 2014 --- community/i3-wm/PKGBUILD | 6 +- community/linux-tools/01-fix-perf-python.patch | 12 + community/linux-tools/PKGBUILD | 118 +++- community/luafilesystem/PKGBUILD | 22 +- community/luakit/PKGBUILD | 23 +- community/lxtask/PKGBUILD | 25 +- community/pidgin-toobars/PKGBUILD | 17 +- community/roxterm/PKGBUILD | 15 +- core/lvm2/PKGBUILD | 6 +- extra/bluez/PKGBUILD | 11 +- extra/dbus-python/PKGBUILD | 28 +- extra/libdrm/PKGBUILD | 6 +- libre-testing/libretools/PKGBUILD | 91 --- libre-testing/libretools/libretools.install | 72 --- libre/dpkg/PKGBUILD | 185 +++--- libre/dpkg/dpkg-gzip-rsyncable.patch | 19 +- libre/libretools/PKGBUILD | 16 +- libre/libretools/libretools.install | 64 ++- libre/linux-libre-tools/01-fix-perf-python.patch | 12 + libre/linux-libre-tools/PKGBUILD | 121 +++- libre/ogre-libre/PKGBUILD | 32 +- libre/ogre-libre/libre.patch | 694 +++++++++++++++++++++++ libre/xbmc-libre/PKGBUILD | 12 +- libre/xbmc-libre/polkit.rules | 19 +- libre/xbmc-libre/xbmc.install | 11 +- pcr/econnman/PKGBUILD | 22 +- pcr/jitsi/PKGBUILD | 24 +- pcr/plowshare/PKGBUILD | 4 +- pcr/python-efl/PKGBUILD | 33 ++ pcr/python2-e_dbus/PKGBUILD | 27 - pcr/python2-ecore/PKGBUILD | 29 - pcr/python2-edje/PKGBUILD | 29 - pcr/python2-elementary/PKGBUILD | 29 - pcr/python2-evas/PKGBUILD | 28 - pcr/youtube-dl-current/PKGBUILD | 4 +- 35 files changed, 1279 insertions(+), 587 deletions(-) create mode 100644 community/linux-tools/01-fix-perf-python.patch delete mode 100644 libre-testing/libretools/PKGBUILD delete mode 100644 libre-testing/libretools/libretools.install create mode 100644 libre/linux-libre-tools/01-fix-perf-python.patch create mode 100644 libre/ogre-libre/libre.patch create mode 100644 pcr/python-efl/PKGBUILD delete mode 100644 pcr/python2-e_dbus/PKGBUILD delete mode 100644 pcr/python2-ecore/PKGBUILD delete mode 100644 pcr/python2-edje/PKGBUILD delete mode 100644 pcr/python2-elementary/PKGBUILD delete mode 100644 pcr/python2-evas/PKGBUILD (limited to 'extra/libdrm') diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index a7e08bae5..382982548 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102909 2013-12-23 21:00:35Z ttoepper $ +# $Id: PKGBUILD 104492 2014-01-21 20:50:05Z ttoepper $ # Maintainer: Thorsten Töpper pkgname=i3-wm _pkgsourcename=i3 -pkgver=4.7 +pkgver=4.7.1 pkgrel=1 pkgdesc='An improved dynamic tiling window manager' arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ optdepends=('dmenu: As menu.' options=('docs' '!strip') source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2" "http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2.asc") -md5sums=('34dade2bc69e241ab3e3ffaa81122266' +md5sums=('7e25d9198bbbe4d0c0e3d2c6eba6980b' 'SKIP') build() { diff --git a/community/linux-tools/01-fix-perf-python.patch b/community/linux-tools/01-fix-perf-python.patch new file mode 100644 index 000000000..d46bd773c --- /dev/null +++ b/community/linux-tools/01-fix-perf-python.patch @@ -0,0 +1,12 @@ +--- a/tools/perf/config/feature-checks/Makefile 2014-01-21 01:58:25.444339009 +0100 ++++ b/tools/perf/config/feature-checks/Makefile 2014-01-21 01:46:58.081780576 +0100 +@@ -103,9 +103,6 @@ + test-libperl: + $(BUILD) $(FLAGS_PERL_EMBED) + +-override PYTHON := python +-override PYTHON_CONFIG := python-config +- + escape-for-shell-sq = $(subst ','\'',$(1)) + shell-sq = '$(escape-for-shell-sq)' + diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index 9a061562f..bce68a7bd 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,15 +1,20 @@ -# $Id: PKGBUILD 102150 2013-12-05 21:53:38Z seblu $ +# $Id: PKGBUILD 104448 2014-01-21 01:11:29Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=linux-tools -pkgname=('linux-tools-meta' - 'libtraceevent' - 'perf' - 'cpupower' - 'x86_energy_perf_policy' - 'usbip') -pkgver=3.12 -pkgrel=2 +pkgname=( + 'acpidump' + 'cgroup_event_listener' + 'cpupower' + 'libtraceevent' + 'linux-tools-meta' + 'perf' + 'tmon' + 'usbip' + 'x86_energy_perf_policy' +) +pkgver=3.13 +pkgrel=1 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' @@ -18,63 +23,67 @@ options=('!strip') # kernel source deps makedepends=('asciidoc' 'xmlto') # perf deps -makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind') +makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'numactl') # cpupower deps makedepends+=('pciutils') # usbip deps makedepends+=('glib2' 'sysfsutils') +# tmon deps +makedepends+=('ncurses') groups=("$pkgbase") source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz" - "http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.3.xz" + #"http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.3.xz" 'cpupower.default' 'cpupower.systemd' 'cpupower.service' - 'usbipd.service') + 'usbipd.service' + '01-fix-perf-python.patch') # http://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc -sha256sums=('2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02' - '22f2f3249e9014693a487c9734dc4142d89ed8bd9e3b2a74128208f5ea7e47d6' +sha256sums=('4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' - '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f') + '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f' + 'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a') -#prepare() { -# # apply stable patching set -# cd linux-$pkgver -# patch -N -p1 -i "$srcdir/patch-$pkgver.5" -#} +prepare() { + cd linux-$pkgver + #patch -N -p1 -i "$srcdir/patch-$pkgver.5" + patch -N -p1 -i "$srcdir/01-fix-perf-python.patch" +} build() { - msg2 'Build libtraceevent' + msg2 'libtraceevent' pushd linux-$pkgver/tools/lib/traceevent make popd - msg2 'Build perf' + msg2 'perf' pushd linux-$pkgver/tools/perf make \ WERROR=0 \ DESTDIR="$pkgdir/usr" \ perfexecdir='lib/perf' \ PYTHON=python2 \ + PYTHON_CONFIG=python2-config \ NO_GTK2=1 \ PERF_VERSION=$pkgver-$pkgrel \ all man popd - msg2 'Build cpupower' + msg2 'cpupower' pushd linux-$pkgver/tools/power/cpupower # we cannot use --as-needed - LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"} + #LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"} make VERSION=$pkgver-$pkgrel popd - msg2 'Build x86_energy_perf_policy' + msg2 'x86_energy_perf_policy' pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy make popd - msg2 'Build usbip' + msg2 'usbip' pushd linux-$pkgver/drivers/staging/usbip/userspace # fix missing man page sed -i 's/usbip_bind_driver.8//' Makefile.am @@ -82,12 +91,37 @@ build() { ./configure --prefix=/usr --sbindir=/usr/bin make popd + + msg2 'tmon' + pushd linux-$pkgver/tools/thermal/tmon + make + popd + + msg2 'acpidump' + pushd linux-$pkgver/tools/power/acpi + make + popd + + msg2 'cgroup_event_listener' + pushd linux-$pkgver/tools/cgroup + make + popd } package_linux-tools-meta() { pkgdesc='Linux kernel tools meta package' groups=() - depends=('libtraceevent' 'perf' 'cpupower' 'x86_energy_perf_policy' 'usbip') + depends=( + 'acpidump' + 'cgroup_event_listener' + 'cpupower' + 'libtraceevent' + 'linux-tools-meta' + 'perf' + 'tmon' + 'usbip' + 'x86_energy_perf_policy' + ) } package_libtraceevent() { @@ -101,7 +135,8 @@ package_libtraceevent() { package_perf() { pkgdesc='Linux kernel performance auditing tool' - depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils') + depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils' + 'numactl') cd linux-$pkgver/tools/perf make \ @@ -109,6 +144,7 @@ package_perf() { DESTDIR="$pkgdir/usr" \ perfexecdir='lib/perf' \ PYTHON=python2 \ + PYTHON_CONFIG=python2-config \ NO_GTK2=1 \ PERF_VERSION=$pkgver-$pkgrel \ install install-man @@ -163,4 +199,30 @@ package_usbip() { install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service" } +package_tmon() { + pkgdesc='Monitoring and Testing Tool for Linux kernel thermal subsystem' + depends=('glibc' 'ncurses') + + cd linux-$pkgver/tools/thermal/tmon + make install INSTALL_ROOT="$pkgdir" +} + +package_acpidump() { + pkgdesc='Dump system ACPI tables to an ASCII file' + depends=('glibc') + conflicts=('iasl') + + cd linux-$pkgver/tools/power/acpi + install -Dm755 acpidump "$pkgdir/usr/bin/acpidump" + install -Dm644 acpidump.8 "$pkgdir/usr/share/man/man8/acpidump.8" +} + +package_cgroup_event_listener() { + pkgdesc='Simple listener of cgroup events' + depends=('glibc') + + cd linux-$pkgver/tools/cgroup + install -Dm755 cgroup_event_listener "$pkgdir/usr/bin/cgroup_event_listener" +} + # vim:set ts=2 sw=2 et: diff --git a/community/luafilesystem/PKGBUILD b/community/luafilesystem/PKGBUILD index d4237e35a..29c11845b 100644 --- a/community/luafilesystem/PKGBUILD +++ b/community/luafilesystem/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 81391 2012-12-19 13:27:48Z seblu $ -# Maintainer: Chris Brannon +# $Id: PKGBUILD 104485 2014-01-21 17:41:26Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Chris Brannon # Contributor: Paulo Matias # Contributor: Anders Bergh pkgbase=luafilesystem pkgname=(lua-filesystem lua51-filesystem) pkgver=1.6.2 -pkgrel=2 +pkgrel=3 pkgdesc='File System Library for the Lua Programming Language' arch=('i686' 'x86_64') url='http://www.keplerproject.org/luafilesystem/' @@ -18,12 +19,13 @@ md5sums=('4e7ec93678c760c4e42cea7d28aafa13' 'beb2b58c4b5c2782304a5b0267a5651b') build() { - msg2 "Building $pkgbase with lua 5.1" + msg2 "Building $pkgbase with Lua 5.1" cp -a $pkgbase-$pkgver $pkgbase-$pkgver-51 cd $pkgbase-$pkgver-51 make LUA_INC=/usr/include/lua5.1 - msg2 "Building $pkgbase with lua 5.2" - cd "$srcdir/$pkgbase-$pkgver" + + msg2 "Building $pkgbase with Lua 5.2" + cd "$srcdir"/$pkgbase-$pkgver make } @@ -31,8 +33,8 @@ package_lua-filesystem() { depends=('lua') cd $pkgbase-$pkgver - make PREFIX=$pkgdir/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.2' install - install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + make PREFIX="$pkgdir"/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.2' install + install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } package_lua51-filesystem() { @@ -41,6 +43,6 @@ package_lua51-filesystem() { replaces=('luafilesystem') cd $pkgbase-$pkgver-51 - make PREFIX=$pkgdir/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.1' install - install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + make PREFIX="$pkgdir"/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.1' install + install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD index ca99340cb..4a24f7182 100644 --- a/community/luakit/PKGBUILD +++ b/community/luakit/PKGBUILD @@ -1,35 +1,36 @@ -# $Id: PKGBUILD 81116 2012-12-12 00:49:28Z eric $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 104487 2014-01-21 17:50:07Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: J. W. Birdsong pkgname=luakit pkgver=2012.09.13.r1 _pkgver=2012.09.13-r1 -pkgrel=5 -pkgdesc='Fast, small, webkit based browser framework extensible by Lua' +pkgrel=6 +pkgdesc='Fast, small, Webkit based browser framework extensible by Lua' arch=('i686' 'x86_64') url='http://mason-larobina.github.com/luakit/' license=('GPL3') -depends=('libwebkit' 'lua51-filesystem' 'libunique' 'desktop-file-utils' 'luajit') -makedepends=('git' 'help2man') +depends=('webkitgtk2' 'lua51-filesystem' 'libunique' 'desktop-file-utils' 'luajit') +makedepends=('help2man') options=(!makeflags) install='luakit.install' source=($pkgname-$pkgver.tar.gz::https://github.com/mason-larobina/luakit/tarball/$_pkgver) md5sums=('77b02e6d19ba021409f1778fddd94a42') -build() { +prepare() { cd mason-larobina-luakit-* - - # use luajit to run script needed at build sed -i '1s,lua,luajit,' build-utils/gentokens.lua +} +build() { + cd mason-larobina-luakit-* make USE_LUAJIT=1 PREFIX=/usr all } package() { cd mason-larobina-luakit-* - make PREFIX=/usr DESTDIR=$pkgdir install + make PREFIX=/usr DESTDIR="$pkgdir" install - chmod -x $pkgdir/usr/share/pixmaps/luakit.png # FS#32938 + chmod -x "$pkgdir"/usr/share/pixmaps/luakit.png # FS#32938 } diff --git a/community/lxtask/PKGBUILD b/community/lxtask/PKGBUILD index db8d97ae5..c1c6bf5e4 100644 --- a/community/lxtask/PKGBUILD +++ b/community/lxtask/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 56901 2011-10-16 07:43:53Z bpiotrowski $ -# Maintainer: Angel Velasquez +# $Id: PKGBUILD 104479 2014-01-21 17:24:15Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Angel Velasquez # Contributor: Geoffroy Carrier + pkgname=lxtask pkgver=0.1.4 -pkgrel=3 -pkgdesc="Task manager of the LXDE Desktop" +pkgrel=4 +pkgdesc='Task manager of the LXDE Desktop' arch=('i686' 'x86_64') license=('GPL2') -url="http://lxde.org/" +url='http://lxde.org/' groups=('lxde') depends=('gtk2') makedepends=('pkgconfig' 'intltool') -source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) +source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz) md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f') build() { - cd "$srcdir/$pkgname-$pkgver" - autoreconf - ./configure --sysconfdir=/etc --prefix=/usr - make + cd $pkgname-$pkgver + ./configure --sysconfdir=/etc --prefix=/usr + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/pidgin-toobars/PKGBUILD b/community/pidgin-toobars/PKGBUILD index b15d80bc0..fd9825abe 100644 --- a/community/pidgin-toobars/PKGBUILD +++ b/community/pidgin-toobars/PKGBUILD @@ -1,25 +1,26 @@ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 104483 2014-01-21 17:38:13Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski # Contributor: JokerBoy pkgname=pidgin-toobars pkgver=1.14 -pkgrel=1 -pkgdesc="Pidgin plugin that adds a toolbar and status bar to the buddy list" +pkgrel=2 +pkgdesc='Pidgin plugin that adds a toolbar and status bar to the buddy list' arch=('i686' 'x86_64') -url="http://vayurik.ru/wordpress/en/toobars/" +url='http://vayurik.ru/wordpress/en/toobars/' license=('GPL') depends=('pidgin') makedepends=('intltool') -source=("http://vayurik.ru/wordpress/wp-content/uploads/toobars/${pkgver}/${pkgname}-${pkgver}.tar.gz") +source=(http://vayurik.ru/wordpress/wp-content/uploads/toobars/$pkgver/$pkgname-$pkgver.tar.gz) md5sums=('0b9255902c10ec1b171329474bd69e82') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index 23f41b0d2..f34ac22f1 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 92214 2013-06-02 21:00:23Z ttoepper $ +# $Id: PKGBUILD 104490 2014-01-21 20:41:40Z ttoepper $ # Maintainer: Thorsten Töpper # Contributor: Alexander Fehr pkgname=roxterm -pkgver=2.7.2 +pkgver=2.8.1 pkgrel=1 pkgdesc='Tabbed, VTE-based terminal emulator' arch=('i686' 'x86_64') url='http://roxterm.sourceforge.net/' license=('GPL3') -depends=('dbus-glib' 'vte3' 'hicolor-icon-theme') +depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm') makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg') install=roxterm.install -source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2") -md5sums=('8ef80f9a5e0aea659b1f9cd6de9869b4') -sha1sums=('fa32ceeb19a097d5fb8a54c24cb7a6f1b957e74d') +source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2" + "http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2.sign") +md5sums=('cf5aa488cc382ec0df8b3a856707d245' + 'SKIP') +sha1sums=('45535957cec6936d259dc8ae693f2ab4b148bde6' + 'SKIP') build() { diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index e31f8a81e..6aba96ed0 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 199802 2013-11-16 17:53:26Z thomas $ +# $Id: PKGBUILD 204497 2014-01-21 09:38:00Z thomas $ # Maintainer: Eric Bélanger # Maintainer: Thomas Bächler pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.104 +pkgver=2.02.105 pkgrel=1 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" @@ -22,7 +22,7 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} lvm-monitoring.service lvmetad.service lvmetad.socket) -sha1sums=('4c296453e10deafe02004fde40075cdb3792eeb2' +sha1sums=('796163e766480cdc427cd443dc1336ae8e8e3bd7' 'SKIP' '76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f' 'ff0fdf0a3005a41acd4b36865056109effc3474b' diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 5ad0117fa..df2c01a52 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 202773 2013-12-27 22:14:31Z andyrtr $ +# $Id: PKGBUILD 204503 2014-01-21 12:45:19Z andyrtr $ # Maintainer: Tom Gundersen # Contributor: Andrea Scarpino # Contributor: Geoffroy Carrier pkgbase=bluez pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins') -pkgver=5.13 +pkgver=5.14 pkgrel=1 url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -14,9 +14,10 @@ makedepends=('dbus' 'libical' 'systemd') source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.xz 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch bluetooth.modprobe) -md5sums=('c68f8cb270110256a684403ee43b5f79' - 'ec97f23123456900446e8ab17361d6c2' - '671c15e99d7154c2df987b71c5851b3d') +# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc +sha256sums=('5a485837c215f3093d3a98cb412dc99e1139f88a66c8809bdf183ad5e676395f' + '896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b' + '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4') prepare() { cd $pkgname-$pkgver diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD index 80d014a20..98fc6a508 100644 --- a/extra/dbus-python/PKGBUILD +++ b/extra/dbus-python/PKGBUILD @@ -1,27 +1,31 @@ -# $Id: PKGBUILD 197906 2013-10-30 11:36:04Z allan $ +# $Id: PKGBUILD 204499 2014-01-21 10:11:01Z jgc $ # Maintainer: Jan de Groot pkgbase=dbus-python pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common') pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for DBUS" arch=('i686' 'x86_64') license=('GPL' 'LGPL') url="http://www.freedesktop.org/wiki/Software/DBusBindings" makedepends=('docutils' 'dbus-glib' 'python' 'python2') -source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz) -md5sums=('b09cd2d1a057cc432ce944de3fc06bf7') +source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz{,.asc}) +md5sums=('b09cd2d1a057cc432ce944de3fc06bf7' + 'SKIP') -build() { - cd "${srcdir}" +prepare() { mkdir build-python2 build-python3 - cd "${srcdir}/build-python2" + cd $pkgbase-$pkgver + autoreconf -fi +} + +build() { + cd build-python2 PYTHON=python2 ../${pkgbase}-${pkgver}/configure --prefix=/usr make - - cd "${srcdir}/build-python3" + cd ../build-python3 ../${pkgbase}-${pkgver}/configure --prefix=/usr make } @@ -30,7 +34,7 @@ package_python-dbus-common() { pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus" conflicts=('dbus-python<1.1.0') - cd "${srcdir}/build-python3" + cd build-python3 make DESTDIR="${pkgdir}" install-data rm -rf "${pkgdir}"/usr/lib/python* } @@ -40,7 +44,7 @@ package_python-dbus() { optdepends=('dbus-glib: glib mainloop support') pkgdesc="Python 3.3 bindings for DBUS" - cd "${srcdir}/build-python3" + cd build-python3 make DESTDIR="${pkgdir}" install rm -rf "${pkgdir}/usr/share" @@ -56,7 +60,7 @@ package_python2-dbus() { conflicts=('dbus-python') provides=("dbus-python=$pkgver") - cd "${srcdir}/build-python2" + cd build-python2 make DESTDIR="${pkgdir}" install rm -rf "${pkgdir}/usr/share" diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index e5c9232ed..84713ea18 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 203374 2014-01-08 20:56:58Z lcarlier $ +# $Id: PKGBUILD 204511 2014-01-21 18:58:35Z lcarlier $ # Maintainer: Jan de Groot pkgname=libdrm -pkgver=2.4.51 +pkgver=2.4.52 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) @@ -14,7 +14,7 @@ replaces=('libdrm-new' 'libdrm-nouveau') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 COPYING) -sha256sums=('0bb75284ff56e1188cd2d0721f7cb8830aafcea5c6ca72dfd7b947ea652b951c' +sha256sums=('fa693c2f1f61befcefbdcc396673e38481110bac9db610afa4b8afb2be0218c1' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') build() { diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD deleted file mode 100644 index 51d33f1cd..000000000 --- a/libre-testing/libretools/PKGBUILD +++ /dev/null @@ -1,91 +0,0 @@ -# Maintainer: Luke Shumaker -# Contributor: Joshua Haase -# Contributor: Márcio Silva - -pkgbase=libretools -pkgname=(libretools libretools-mips64el librelib gitget) -pkgdesc="Programs for Parabola development" -url="https://projects.parabolagnulinux.org/packages/libretools.git/" -license=('GPL3' 'GPL2') - -pkgver=20140120.1 -_libretools_commit=641002eff37a30eb2b8237b15b74cc15b4d9f822 -_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd - -_packages_url=https://projects.parabolagnulinux.org/packages -source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 - $_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2) - -pkgrel=1 -arch=('any') -makedepends=(emacs ronn) # emacs --batch is used during the build to process text -checkdepends=(sh-roundup) - -build() { - cd "$srcdir" - ln -sf devtools-par-$_devtools_commit devtools-par - cd "$srcdir/$pkgbase-$_libretools_commit" - make build-libretools build-libretools-mips64el build-librelib build-doc -} - -check() { - cd "$srcdir/$pkgbase-$_libretools_commit" - - SUDO_USER= make check TESTENVFLAGS='--no-network --no-sudo' -} - -package_librelib() { - pkgdesc="Shell library portion of libretools" - depends=( - wget # `aur` and `lib/blacklist.sh` - ) - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-librelib DESTDIR="$pkgdir" -} - -package_gitget() { - depends=("librelib=$pkgver" git) - - provides=("libregit=$pkgver") - conflicts=("libregit") - replaces=("libregit") - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-gitget DESTDIR="$pkgdir" -} - -package_libretools() { - backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) - install=libretools.install - replaces=(chroottools) - conflicts=(devtools) - - depends=( - "librelib=$pkgver" - "gitget=$pkgver" # `createworkdir` - arch-install-scripts # `archroot` uses `pacstrap` - openssh # `librerelease` - rsync # `librerelease` and `makechrootpkg.sh` - subversion # `diff-unfree` - tokyocabinet # `treepkg` - ) - optdepends=('namcap: to check package files') - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-libretools install-doc DESTDIR="$pkgdir" -} - -package_libretools-mips64el() { - pkgdesc="Scripts for Parabola development (for mips64el architecture)" - depends=("$pkgbase=$pkgver" - git # mips-add - ) - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-libretools-mips64el DESTDIR="$pkgdir" -} - -md5sums=('8991b27aed494b60f33c84dd48aea874' - 'ec69dffa68829f063224de19bbd55fa9') diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install deleted file mode 100644 index 35edf68c7..000000000 --- a/libre-testing/libretools/libretools.install +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh - -_edit_code=" 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'" -_edit_cmnt='#%s # commented out by the libretools post_install script' - -_add_cmnt='# The following line is added by the libretools post_install script' -_add_code='DLAGENTS+=({https,libre}'\''::/usr/bin/librefetch -p "$BUILDFILE" -- %u %o'\'')' - -# These lines were installed by previous versions of this script -_old_code=( - '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' - '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")' - 'DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p $(printf "%q" "$BUILDFILE") -- %u %o")' -) - -# has_line $line -has_line() { grep -Fxq -- "$1" etc/makepkg.conf; } -# add_line $line -add_line() { printf '%s\n' "$1" >> etc/makepkg.conf; } -# del_line $line -del_line() { - local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1)) - if [[ "${#lineno[@]}" -gt 0 ]]; then - sed -i "$(printf '%dd;' "${lineno[@]}")" etc/makepkg.conf; - fi -} -# rep_line $orig $replacement_bre -rep_line() { - local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1)) - if [[ "${#lineno[@]}" == 1 ]]; then - sed -i "${lineno}s|.*|${2//|/\\|}|" etc/makepkg.conf; - fi -} - -# arg 1: the new package version -post_install() { - if grep -q 'librefetch' etc/makepkg.conf; then - libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf" - local line del=false - for line in "${_old_code[@]}"; do - if has_line "$line"; then - pre_remove - post_install - return $? - fi - done - else - libremessages msg2 "libretools: adding librefetch to /etc/makepkg.conf" - rep_line "$_edit_code" "$(printf "$_edit_cmnt" '&')" - add_line "$_add_cmnt" - add_line "$_add_code" - fi -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - post_install -} - -pre_remove() { - libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" - - rep_line "$(printf "$_edit_cmnt" "$_edit_code")" "$_edit_code" - del_line "$_add_cmnt" - del_line "$_add_code" - - local line - for line in "${_old_code[@]}"; do - del_line "$line" - done -} diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD index 806194577..99681df3e 100644 --- a/libre/dpkg/PKGBUILD +++ b/libre/dpkg/PKGBUILD @@ -12,20 +12,38 @@ pkgname=(dpkg-devtools perl-dpkg) pkgdesc="Debian Package manager and utilities" license=('GPL2') -pkgver=1.16.10 +pkgver=1.17.6 url="http://packages.debian.org/source/sid/dpkg" -_debrepo=http://ftp.debian.org/debian/pool/main - -pkgrel=1.3 -arch=('i686' 'x86_64' 'mips64el') -depends=('bzip2' 'xz' 'zlib' 'ncurses') -checkdepends=('perl-test-pod') -makedepends=('perl-io-string' 'perl-timedate') +pkgrel=1 +options=('staticlibs') + +if ! type in_array &>/dev/null; then + in_array() { + local i + for i in "${@:2}"; do [[ $i = "$1" ]] && return 0; done + return 1 + } +fi + +# The architecture dependent bits aren't packaged with the reduced pkgname +arch=('any') +for _pkg in dpkg dselect libdpkg; do + if in_array "$_pkg" "${pkgname[@]}"; then + arch=('i686' 'x86_64' 'mips64el') + fi +done +unset _pkg + +makedepends=('bzip2' 'xz' 'zlib' 'ncurses') +checkdepends=('gzip' 'perl-test-pod' 'perl-io-string' 'perl-timedate') -_debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; } -source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz" +_debrepo=http://ftp.debian.org/debian/pool/main +_debfile() { echo "${_debrepo}/${1:0:1}/${1%_*}/${1}"; } +source=("$(_debfile ${pkgbase}_${pkgver}).tar.xz" dpkg-gzip-rsyncable.patch) +md5sums=('c87f2ae291d460015353e01d121bea85' + '9c77a553e3219dcd29b7ff44b89d718d') ###################################################################### @@ -34,97 +52,104 @@ source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz" # Shame on the dpkg developers for not putting that logic into the build system. _destdir="$pkgbase-$pkgver/debian/pkg-makepkg" _debhelper_install() { - local debname=$1 - cd "$srcdir/$_destdir" - - # main files - sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \ - | while read pattern dest; do - if [[ -z $dest ]]; then - for file in $pattern; do - install -d "$pkgdir/${file%/*}" - cp -a "$file" "$pkgdir/$file" || true - done - else - install -d "$pkgdir/$dest/" - cp -a "$pattern" "$pkgdir/$dest/" || true - fi - done - - # manpages - sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null \ - | while read pattern; do - for file in $pattern; do - install -d "$pkgdir/${file%/*}" - cp -a "$file" "$pkgdir/$file" || true - done - done - - # other documentation - install -d "$pkgdir/usr/share/doc/$pkgname/" - sed '/^\s*$/d' ../$debname.docs 2>/dev/null \ - | while read file; do - gzip \ - < "$srcdir/$pkgbase-$pkgver/$file" \ - > "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz" - done - - # symlinks - sed '/^\s*$/d' ../$debname.links 2>/dev/null \ - | while read file link; do - ln -s "/$file" "$pkgdir/$link" - done + local debname=$1 + cd "$srcdir/$_destdir" + + # main files + sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install | + while read pattern dest; do + if [[ -z $dest ]]; then + for file in $pattern; do + install -d "$pkgdir/${file%/*}" + cp -a "$file" "$pkgdir/$file" || true + done + else + install -d "$pkgdir/$dest/" + cp -a "$pattern" "$pkgdir/$dest/" || true + fi + done + + # manpages + sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null | + while read pattern; do + for file in $pattern; do + install -d "$pkgdir/${file%/*}" + cp -a "$file" "$pkgdir/$file" || true + done + done + + # other documentation + sed '/^\s*$/d' ../$debname.docs 2>/dev/null | + while read file; do + install -d "$pkgdir/usr/share/doc/$pkgname/" + gzip \ + < "$srcdir/$pkgbase-$pkgver/$file" \ + > "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz" + done + + # symlinks + sed '/^\s*$/d' ../$debname.links 2>/dev/null | + while read file link; do + ln -s "/$file" "$pkgdir/$link" + done } ###################################################################### -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - patch -Np0 -i "${srcdir}/dpkg-gzip-rsyncable.patch" +prepare() { + cd "${srcdir}/${pkgbase}-${pkgver}" + # {Arch Linux,Parabola}'s gzip doesn't support --rsyncable + patch -Np1 -i "${srcdir}/dpkg-gzip-rsyncable.patch" +} - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma - make - make DESTDIR="$srcdir/$_destdir" install +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --sysconfdir=/etc \ + --sbindir=/sbin \ + --localstatedir=/var \ + --with-zlib \ + --with-liblzma \ + --with-bz2 + make + make DESTDIR="$srcdir/$_destdir" install } check() { - cd "${srcdir}/${pkgbase}-${pkgver}" - make check + cd "${srcdir}/${pkgbase}-${pkgver}" + make check } package_dpkg() { - pkgdesc="Debian Package manager" - provides+=(start-stop-daemon) - conflicts+=(start-stop-daemon) - _debhelper_install dpkg + pkgdesc="Debian Package manager" + depends=('zlib' 'xz' 'bzip2') + _debhelper_install dpkg } package_dpkg-devtools() { - pkgdesc="Debian Package development tools" - arch=(any) - depends+=(perl-dpkg) - _debhelper_install dpkg-dev + pkgdesc="Debian Package development tools" + arch=('any') + depends=('perl-dpkg') + _debhelper_install dpkg-dev } package_dselect() { - pkgdesc="Debian Package manager high-level interface" - _debhelper_install dselect + pkgdesc="Debian Package manager high-level interface" + depends=('dpkg' 'perl' 'ncurses') + _debhelper_install dselect } package_libdpkg() { - pkgdesc="Debian Package manager library (static)" - _debhelper_install libdpkg-dev + pkgdesc="Debian Package manager library (static)" + _debhelper_install libdpkg-dev } package_perl-dpkg() { - pkgdesc="Debian Package perl modules" - arch=(any) - _debhelper_install libdpkg-perl + pkgdesc="Debian Package Perl modules" + arch=('any') + depends=('perl-timedate' 'gzip' 'bzip2' 'xz') + _debhelper_install libdpkg-perl } - -md5sums=('4df9319b2d17e19cdb6fe94dacee44da' - '5ab63758999e9bb10f84bce79a0307b2' - '74b7ce3045690a8fc290104f10cf8d42') -md5sums=('a20a06a5272717274a8b009368f237da' - '5ab63758999e9bb10f84bce79a0307b2') diff --git a/libre/dpkg/dpkg-gzip-rsyncable.patch b/libre/dpkg/dpkg-gzip-rsyncable.patch index 3daf6d76e..187633874 100644 --- a/libre/dpkg/dpkg-gzip-rsyncable.patch +++ b/libre/dpkg/dpkg-gzip-rsyncable.patch @@ -1,11 +1,12 @@ ---- ./scripts/Dpkg/Compression.pm.orig 2012-04-27 04:49:02.000000000 +0200 -+++ ./scripts/Dpkg/Compression.pm 2012-05-27 22:23:18.530628795 +0200 -@@ -52,7 +52,7 @@ +diff -ruN dpkg-1.17.6.orig/scripts/Dpkg/Compression.pm dpkg-1.17.6/scripts/Dpkg/Compression.pm +--- dpkg-1.17.6.orig/scripts/Dpkg/Compression.pm 2014-01-15 09:02:16.000000000 -0500 ++++ dpkg-1.17.6/scripts/Dpkg/Compression.pm 2014-01-19 23:22:39.771215424 -0500 +@@ -50,7 +50,7 @@ my $COMP = { - "gzip" => { - "file_ext" => "gz", -- "comp_prog" => [ "gzip", "--no-name", "--rsyncable" ], -+ "comp_prog" => [ "gzip", "--no-name" ], - "decomp_prog" => [ "gunzip" ], - "default_level" => 9, + gzip => { + file_ext => 'gz', +- comp_prog => [ 'gzip', '--no-name', '--rsyncable' ], ++ comp_prog => [ 'gzip', '--no-name' ], + decomp_prog => [ 'gunzip' ], + default_level => 9, }, diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 569706f80..51d33f1cd 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Joshua Haase +# Maintainer: Luke Shumaker +# Contributor: Joshua Haase # Contributor: Márcio Silva @@ -9,9 +9,9 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20131112 -_libretools_commit=0f03eb7ac94ad72f551eb1b2470b850d6bcf8bf0 -_devtools_commit=021653a0acecc8763e1bbe90dbb770b4e6df4390 +pkgver=20140120.1 +_libretools_commit=641002eff37a30eb2b8237b15b74cc15b4d9f822 +_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd _packages_url=https://projects.parabolagnulinux.org/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 @@ -64,8 +64,8 @@ package_libretools() { depends=( "librelib=$pkgver" + "gitget=$pkgver" # `createworkdir` arch-install-scripts # `archroot` uses `pacstrap` - git # `createworkdir` openssh # `librerelease` rsync # `librerelease` and `makechrootpkg.sh` subversion # `diff-unfree` @@ -87,5 +87,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('81e6d3d6fe1964a407a4520ce0916c0d' - '656008e8e35e6adba527b7bfc367b9f7') +md5sums=('8991b27aed494b60f33c84dd48aea874' + 'ec69dffa68829f063224de19bbd55fa9') diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index d46990da8..35edf68c7 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -1,14 +1,54 @@ #!/bin/sh -_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' +_edit_code=" 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'" +_edit_cmnt='#%s # commented out by the libretools post_install script' + +_add_cmnt='# The following line is added by the libretools post_install script' +_add_code='DLAGENTS+=({https,libre}'\''::/usr/bin/librefetch -p "$BUILDFILE" -- %u %o'\'')' + +# These lines were installed by previous versions of this script +_old_code=( + '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' + '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")' + 'DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p $(printf "%q" "$BUILDFILE") -- %u %o")' +) + +# has_line $line +has_line() { grep -Fxq -- "$1" etc/makepkg.conf; } +# add_line $line +add_line() { printf '%s\n' "$1" >> etc/makepkg.conf; } +# del_line $line +del_line() { + local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1)) + if [[ "${#lineno[@]}" -gt 0 ]]; then + sed -i "$(printf '%dd;' "${lineno[@]}")" etc/makepkg.conf; + fi +} +# rep_line $orig $replacement_bre +rep_line() { + local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1)) + if [[ "${#lineno[@]}" == 1 ]]; then + sed -i "${lineno}s|.*|${2//|/\\|}|" etc/makepkg.conf; + fi +} # arg 1: the new package version post_install() { - if grep -q 'libre::' etc/makepkg.conf; then + if grep -q 'librefetch' etc/makepkg.conf; then libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf" + local line del=false + for line in "${_old_code[@]}"; do + if has_line "$line"; then + pre_remove + post_install + return $? + fi + done else - libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf" - printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf + libremessages msg2 "libretools: adding librefetch to /etc/makepkg.conf" + rep_line "$_edit_code" "$(printf "$_edit_cmnt" '&')" + add_line "$_add_cmnt" + add_line "$_add_code" fi } @@ -19,10 +59,14 @@ post_upgrade() { } pre_remove() { - if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then - libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" - sed -i '/libre::/d' etc/makepkg.conf - else - libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it" - fi + libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" + + rep_line "$(printf "$_edit_cmnt" "$_edit_code")" "$_edit_code" + del_line "$_add_cmnt" + del_line "$_add_code" + + local line + for line in "${_old_code[@]}"; do + del_line "$line" + done } diff --git a/libre/linux-libre-tools/01-fix-perf-python.patch b/libre/linux-libre-tools/01-fix-perf-python.patch new file mode 100644 index 000000000..d46bd773c --- /dev/null +++ b/libre/linux-libre-tools/01-fix-perf-python.patch @@ -0,0 +1,12 @@ +--- a/tools/perf/config/feature-checks/Makefile 2014-01-21 01:58:25.444339009 +0100 ++++ b/tools/perf/config/feature-checks/Makefile 2014-01-21 01:46:58.081780576 +0100 +@@ -103,9 +103,6 @@ + test-libperl: + $(BUILD) $(FLAGS_PERL_EMBED) + +-override PYTHON := python +-override PYTHON_CONFIG := python-config +- + escape-for-shell-sq = $(subst ','\'',$(1)) + shell-sq = '$(escape-for-shell-sq)' + diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 78c0f4ea2..060d84bf2 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -1,19 +1,24 @@ -# $Id: PKGBUILD 102149 2013-12-05 21:51:01Z seblu $ +# $Id: PKGBUILD 104447 2014-01-21 01:10:56Z seblu $ # Maintainer: Sébastien Luttringer # Maintainer (Parabola): André Silva pkgbase=linux-libre-tools -pkgname=('linux-libre-tools-meta' - 'libtraceevent-libre' - 'perf-libre' - 'cpupower-libre' - 'x86_energy_perf_policy-libre' - 'usbip-libre') -_basekernel=3.12 -_sublevel=3 -_pkgver=$_basekernel.$_sublevel +pkgname=( + 'acpidump-libre' + 'cgroup_event_listener-libre' + 'cpupower-libre' + 'libtraceevent-libre' + 'linux-libre-tools-meta' + 'perf-libre' + 'tmon-libre' + 'usbip-libre' + 'x86_energy_perf_policy-libre' +) +_basekernel=3.13 +#_sublevel=3 +#_pkgver=$_basekernel.$_sublevel pkgver=$_basekernel -pkgrel=2 +pkgrel=1 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -22,24 +27,28 @@ options=('!strip') # kernel source deps makedepends=('asciidoc' 'xmlto') # perf-libre deps -makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind') +makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'numactl') # cpupower-libre deps makedepends+=('pciutils') # usbip-libre deps makedepends+=('glib2' 'sysfsutils') +# tmon-libre deps +makedepends+=('ncurses') groups=("$pkgbase") source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/linux-libre-$_basekernel-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz" + #"http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz" 'cpupower.default' 'cpupower.systemd' 'cpupower.service' - 'usbipd.service') -sha256sums=('66c1fa816cb4a3b2f6078e1f6256133697ca4cc4186758c58c2b4d0153ed3237' - '561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb' + 'usbipd.service' + '01-fix-perf-python.patch') +sha256sums=('6e68eef826b17ae9d7df01ac13e46ef5d978670071d1b05aed775bdbff8fed96' + #'561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' - '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f') + '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f' + 'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a') prepare() { # apply stable patching set @@ -52,36 +61,37 @@ prepare() { } build() { - msg2 'Build libtraceevent-libre' + msg2 'libtraceevent-libre' pushd linux-$pkgver/tools/lib/traceevent make popd - msg2 'Build perf-libre' + msg2 'perf-libre' pushd linux-$pkgver/tools/perf make \ WERROR=0 \ DESTDIR="$pkgdir/usr" \ perfexecdir='lib/perf' \ PYTHON=python2 \ + PYTHON_CONFIG=python2-config \ NO_GTK2=1 \ PERF_VERSION=$pkgver-$pkgrel \ all man popd - msg2 'Build cpupower-libre' + msg2 'cpupower-libre' pushd linux-$pkgver/tools/power/cpupower # we cannot use --as-needed - LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"} + #LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"} make VERSION=$pkgver-$pkgrel popd - msg2 'Build x86_energy_perf_policy-libre' + msg2 'x86_energy_perf_policy-libre' pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy make popd - msg2 'Build usbip-libre' + msg2 'usbip-libre' pushd linux-$pkgver/drivers/staging/usbip/userspace # fix missing man page sed -i 's/usbip_bind_driver.8//' Makefile.am @@ -89,12 +99,37 @@ build() { ./configure --prefix=/usr --sbindir=/usr/bin make popd + + msg2 'tmon-libre' + pushd linux-$pkgver/tools/thermal/tmon + make + popd + + msg2 'acpidump-libre' + pushd linux-$pkgver/tools/power/acpi + make + popd + + msg2 'cgroup_event_listener-libre' + pushd linux-$pkgver/tools/cgroup + make + popd } package_linux-libre-tools-meta() { pkgdesc='Linux kernel tools meta package' groups=() - depends=('libtraceevent-libre' 'perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre') + depends=( + 'acpidump-libre' + 'cgroup_event_listener-libre' + 'cpupower-libre' + 'libtraceevent-libre' + 'linux-libre-tools-meta' + 'perf-libre' + 'tmon-libre' + 'usbip-libre' + 'x86_energy_perf_policy-libre' + ) replaces=('linux-tools-meta') conflicts=('linux-tools-meta') provides=("linux-tools-meta=$pkgver") @@ -114,7 +149,8 @@ package_libtraceevent-libre() { package_perf-libre() { pkgdesc='Linux kernel performance auditing tool' - depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils') + depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils' + 'numactl') replaces=('perf') conflicts=('perf') provides=("perf=$pkgver") @@ -125,6 +161,7 @@ package_perf-libre() { DESTDIR="$pkgdir/usr" \ perfexecdir='lib/perf' \ PYTHON=python2 \ + PYTHON_CONFIG=python2-config \ NO_GTK2=1 \ PERF_VERSION=$pkgver-$pkgrel \ install install-man @@ -186,4 +223,38 @@ package_usbip-libre() { install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service" } +package_tmon-libre() { + pkgdesc='Monitoring and Testing Tool for Linux kernel thermal subsystem' + depends=('glibc' 'ncurses') + replaces=('tmon') + conflicts=('tmon') + provides=("tmon=$pkgver") + + cd linux-$pkgver/tools/thermal/tmon + make install INSTALL_ROOT="$pkgdir" +} + +package_acpidump-libre() { + pkgdesc='Dump system ACPI tables to an ASCII file' + depends=('glibc') + replaces=('acpidump') + conflicts=('acpidump' 'iasl') + provides=("acpidump=$pkgver") + + cd linux-$pkgver/tools/power/acpi + install -Dm755 acpidump "$pkgdir/usr/bin/acpidump" + install -Dm644 acpidump.8 "$pkgdir/usr/share/man/man8/acpidump.8" +} + +package_cgroup_event_listener-libre() { + pkgdesc='Simple listener of cgroup events' + depends=('glibc') + replaces=('cgroup_event_listener') + conflicts=('cgroup_event_listener') + provides=("cgroup_event_listener=$pkgver") + + cd linux-$pkgver/tools/cgroup + install -Dm755 cgroup_event_listener "$pkgdir/usr/bin/cgroup_event_listener" +} + # vim:set ts=2 sw=2 et: diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD index 57c001e61..9648e5f24 100644 --- a/libre/ogre-libre/PKGBUILD +++ b/libre/ogre-libre/PKGBUILD @@ -43,16 +43,44 @@ makedepends=( mercurial ttf-dejavu ) -source=( +mksource=( ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-} + libre.patch ) -sha512sums=( +source=( + https://repo.parabolagnulinux.org/other/$pkgbase/$pkgbase-libre-$pkgver.tar.xz +) +mksha512sums=( SKIP + e668b39e4784e4b1b17ec6e21b5cef45f29a8d8e73288817ce7832d1fe24527d5e0d4fd67b8f756db301e4211ceac2d5c387c1599e799ca41de0593457204767 +) +sha512sums=( + 9be9dbd78e09c8c50cf833004bfa3fbb7b3cd2a0f52a4e8c4beb1eb30357625455d65906bd007be6c2be9cf90a0e335d5ad7c5011e038c3d0754d5b3b18c4a2a ) +mksource() { + cd ${pkgbase} + + # remove nonfree files + rm -v RenderSystems/GL/include/GL/{gl{,ext},wglext,glx{tokens,ext}}.h + rm -v RenderSystems/GL3Plus/include/GL/glxtokens-backup.h + rm -rv Samples/Media/materials/textures/nvidia + rm -v Samples/Media/packs/chiropteraDM.{pk3,txt} + rm -v CMake/Templates/quakemap{,_d}.cfg.in + patch -Np1 -i $srcdir/libre.patch +} + build() { cd ${pkgbase} + # add symlinks to point to mesa header files + cd RenderSystems/GL/include/GL + ln -sv /usr/include/GL/gl.h gl.h + ln -sv /usr/include/GL/glext.h glext.h + ln -sv /usr/include/GL/wglext.h wglext.h + ln -sv /usr/include/GL/glxtokens.h glxtokens.h + ln -sv /usr/include/GL/glxext.h glxext.h + # get a clean build dir [[ -d build ]] && rm -vrf build mkdir -v build && cd build diff --git a/libre/ogre-libre/libre.patch b/libre/ogre-libre/libre.patch new file mode 100644 index 000000000..77c32c8d4 --- /dev/null +++ b/libre/ogre-libre/libre.patch @@ -0,0 +1,694 @@ +diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cmake +--- ogre.orig/CMake/InstallResources.cmake 2014-01-15 01:56:25.549401653 -0200 ++++ ogre/CMake/InstallResources.cmake 2014-01-21 21:24:52.510763877 -0200 +@@ -116,9 +116,6 @@ + # create plugins.cfg + configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg) + configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg) +-# create quakemap.cfg +-configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg) +-configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg) + # create samples.cfg + configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg) + configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg) +@@ -219,11 +216,6 @@ + configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/release/plugins.cfg) + configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/plugins.cfg) + configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/plugins.cfg) +- # create quakemap.cfg +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/quakemap_d.cfg) +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/release/quakemap.cfg) +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/quakemap.cfg) +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/quakemap.cfg) + # create samples.cfg + configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/samples_d.cfg) + configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/release/samples.cfg) +diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demomedia.wxi.in +--- ogre.orig/CMake/Templates/demomedia.wxi.in 2014-01-15 01:56:25.652728172 -0200 ++++ ogre/CMake/Templates/demomedia.wxi.in 2014-01-21 21:49:24.962291640 -0200 +@@ -295,13 +295,6 @@ + + + +- +- +- +- +- +- +- + + + +@@ -328,8 +321,6 @@ + + + +- +- + + + +@@ -1338,29 +1329,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -1444,12 +1412,6 @@ + + + +- +- +- +- +- +- + + + +@@ -1794,4 +1756,4 @@ + + + +- +\ No newline at end of file ++ +diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-01-15 01:56:25.872713663 -0200 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-01-21 22:20:00.343185180 -0200 +@@ -555,48 +555,6 @@ + false + false + +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- + + false + false +@@ -3671,15 +3629,6 @@ + false + false + +- +- false +- true +- false +- true +- true +- false +- false +- + + false + true +@@ -4867,20 +4816,6 @@ + false + false + +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- + + false + false +@@ -4893,4 +4828,4 @@ + + + +- +\ No newline at end of file ++ +diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-01-15 01:56:25.872713663 -0200 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-01-21 22:20:41.517291770 -0200 +@@ -628,9 +628,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1075,9 +1072,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1105,12 +1099,6 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1168,24 +1156,12 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1492,9 +1468,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1658,4 +1631,4 @@ + Assets\media + + +- +\ No newline at end of file ++ +diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-01-15 01:56:25.896045457 -0200 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-01-21 21:53:56.997551091 -0200 +@@ -4356,21 +4356,6 @@ + false + false + +- +- true +- false +- false +- false +- false +- false +- false +- false +- false +- false +- false +- false +- false +- + + true + false +@@ -6443,96 +6428,6 @@ + false + false + +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- + + false + false +@@ -9014,36 +8909,6 @@ + false + false + +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- + + false + false +@@ -9264,4 +9129,4 @@ + + + +- +\ No newline at end of file ++ +diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters +--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-01-15 01:56:25.899378571 -0200 ++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-01-21 21:54:56.166945128 -0200 +@@ -731,9 +731,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1154,9 +1151,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1184,12 +1178,6 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1247,24 +1235,12 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1571,9 +1547,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1775,4 +1748,4 @@ + Assets\for WMAppManifest + + +- +\ No newline at end of file ++ +diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt +--- ogre.orig/Samples/CMakeLists.txt 2014-01-15 01:56:25.932709706 -0200 ++++ ogre/Samples/CMakeLists.txt 2014-01-21 21:23:53.145016405 -0200 +@@ -238,7 +238,6 @@ + set(OGRE_MEDIA_DIR_TMP ${OGRE_MEDIA_DIR_REL}) + set(OGRE_MEDIA_DIR_REL "Media") + configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg @ONLY) +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/quakemap.cfg @ONLY) + # restore + set(OGRE_MEDIA_DIR_REL ${OGRE_MEDIA_DIR_TMP}) + add_custom_target(demo_installer +diff -Nur ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h ogre/Samples/EndlessWorld/include/EndlessWorld.h +--- ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h 2014-01-15 01:56:26.186026332 -0200 ++++ ogre/Samples/EndlessWorld/include/EndlessWorld.h 2014-01-21 21:51:44.043058960 -0200 +@@ -304,17 +304,6 @@ + defaultimp.inputScale = 600; + defaultimp.minBatchSize = 33; + defaultimp.maxBatchSize = 65; +- // textures +- defaultimp.layerList.resize(3); +- defaultimp.layerList[0].worldSize = 100; +- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); +- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); +- defaultimp.layerList[1].worldSize = 30; +- defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); +- defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); +- defaultimp.layerList[2].worldSize = 200; +- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); +- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); + } + + /*----------------------------------------------------------------------------- +diff -Nur ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material ogre/Samples/Media/volumeTerrain/triplanarReference.material +--- ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material 2014-01-15 01:56:27.849249967 -0200 ++++ ogre/Samples/Media/volumeTerrain/triplanarReference.material 2014-01-21 22:24:19.433708607 -0200 +@@ -11,36 +11,6 @@ + fragment_program_ref TriplanarReferenceHigh_PS + { + } +- texture_unit +- { +- texture_alias fromX +- texture dirt_grayrocky_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromXNormal +- texture dirt_grayrocky_normalheight.dds +- } +- texture_unit +- { +- texture_alias fromY +- texture grass_green-01_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromYNormal +- texture grass_green-01_normalheight.dds +- } +- texture_unit +- { +- texture_alias fromZ +- texture growth_weirdfungus-03_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromZNormal +- texture growth_weirdfungus-03_normalheight.dds +- } + } + } + } +@@ -57,36 +27,6 @@ + fragment_program_ref TriplanarReferenceLow_PS + { + } +- texture_unit +- { +- texture_alias fromX +- texture dirt_grayrocky_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromXNormal +- texture dirt_grayrocky_normalheight.dds +- } +- texture_unit +- { +- texture_alias fromY +- texture grass_green-01_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromYNormal +- texture grass_green-01_normalheight.dds +- } +- texture_unit +- { +- texture_alias fromZ +- texture growth_weirdfungus-03_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromZNormal +- texture growth_weirdfungus-03_normalheight.dds +- } + } + } + } +@@ -101,4 +41,4 @@ + diffuse 1.0 1.0 1.0 + } + } +-} +\ No newline at end of file ++} +diff -Nur ogre.orig/Samples/Terrain/include/Terrain.h ogre/Samples/Terrain/include/Terrain.h +--- ogre.orig/Samples/Terrain/include/Terrain.h 2014-01-15 01:56:28.209226225 -0200 ++++ ogre/Samples/Terrain/include/Terrain.h 2014-01-21 21:55:51.099952029 -0200 +@@ -533,17 +533,6 @@ + defaultimp.inputScale = 600; + defaultimp.minBatchSize = 33; + defaultimp.maxBatchSize = 65; +- // textures +- defaultimp.layerList.resize(3); +- defaultimp.layerList[0].worldSize = 100; +- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); +- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); +- defaultimp.layerList[1].worldSize = 30; +- defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); +- defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); +- defaultimp.layerList[2].worldSize = 200; +- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); +- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); + + + } +diff -Nur ogre.orig/Tests/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen.cpp +--- ogre.orig/Tests/PlayPen/src/PlayPen.cpp 2014-01-15 01:56:28.309219629 -0200 ++++ ogre/Tests/PlayPen/src/PlayPen.cpp 2014-01-21 22:31:02.415114645 -0200 +@@ -411,16 +411,6 @@ + // mTerrain->update(); + // updateDelay = 0.3; + // } +-// /* +-// if (mKeyboard->isKeyDown(OIS::KC_M) && updateDelay <= 0) +-// { +-// StringVector texNames; +-// texNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); +-// texNames.push_back("growth_weirdfungus-03_normalheight.dds"); +-// mTerrain->addLayer(500, &texNames); +-// updateDelay = 0.3; +-// } +-// */ + // updateDelay -= evt.timeSinceLastFrame; + // } + //#endif +@@ -8185,17 +8175,6 @@ + // imp.inputScale = 600; + // imp.minBatchSize = 33; + // imp.maxBatchSize = 65; +-// // textures +-// imp.layerList.resize(3); +-// imp.layerList[0].worldSize = 100; +-// imp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); +-// imp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); +-// imp.layerList[1].worldSize = 30; +-// imp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); +-// imp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); +-// imp.layerList[2].worldSize = 200; +-// imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); +-// imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); + // terrain->prepare(imp); + // terrain->load(); + // diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index 17917185e..7055b9d4f 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103998 2014-01-14 14:56:47Z spupykin $ +# $Id: PKGBUILD 104461 2014-01-21 08:35:40Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Brad Fanella # Contributor: [vEX] @@ -11,7 +11,7 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=12.3 _codename=Frodo -pkgrel=6 +pkgrel=7 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -27,7 +27,7 @@ makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libc optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' 'lirc-libre: remote controller support' 'udisks: automount external drives' - 'upower: used to trigger suspend functionality' + 'upower: used to trigger power management functionality' 'libarchive: access compressed files without unpacking them' 'xorg-xinit: autostart xbmc') install="${_pkgname}.install" @@ -40,7 +40,7 @@ source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285") md5sums=('7ae385ebf8e5cfcb917393235e6efbdb' '8312d6d4ac5d7c3d9eed40ab08a17d3b' - 'd4cbb6609c8e7b713c714241f529000e' + '02f7951824ee13103344f36009c0ef2a' '7fd6399d2ffbdf06b724f0cc2efa0784') prepare() { @@ -121,7 +121,7 @@ package() { done install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service - install -Dm0644 $srcdir/polkit.rules $pkgdir/etc/polkit-1/rules.d/10-xbmc.rules - chmod 0700 $pkgdir/etc/polkit-1/rules.d/ + install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules + chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/ } # vim:set ts=2 sw=2 et: diff --git a/libre/xbmc-libre/polkit.rules b/libre/xbmc-libre/polkit.rules index 5bc7e69f5..4b6d0fda0 100644 --- a/libre/xbmc-libre/polkit.rules +++ b/libre/xbmc-libre/polkit.rules @@ -1,11 +1,12 @@ polkit.addRule(function(action, subject) { - if (action.id.match("org.freedesktop.login1.") && subject.isInGroup("power")) { - return polkit.Result.YES; - } -}); - -polkit.addRule(function(action, subject) { - if (action.id.indexOf("org.freedesktop.udisks") == 0 && subject.isInGroup("storage")) { - return polkit.Result.YES; - } + if (subject.user == "xbmc") { + polkit.log("action=" + action); + polkit.log("subject=" + subject); + if (action.id.indexOf("org.freedesktop.login1.") == 0) { + return polkit.Result.YES; + } + if (action.id.indexOf("org.freedesktop.udisks.") == 0) { + return polkit.Result.YES; + } + } }); diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install index 04396af45..7fc45751a 100644 --- a/libre/xbmc-libre/xbmc.install +++ b/libre/xbmc-libre/xbmc.install @@ -1,10 +1,10 @@ post_install() { [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications - getent group xbmc > /dev/null || groupadd xbmc - getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc + getent group xbmc > /dev/null || groupadd -r xbmc + getent passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc - chown -R 102:0 etc/polkit-1 + chown -R xbmc:xbmc var/lib/xbmc } post_upgrade() { @@ -12,6 +12,7 @@ post_upgrade() { } post_remove() { - post_install $1 - echo "You may want to remove xbmc user and group" + [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor + [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications + getent passwd xbmc > /dev/null || userdel xbmc } diff --git a/pcr/econnman/PKGBUILD b/pcr/econnman/PKGBUILD index a6419abc0..70d27ec71 100644 --- a/pcr/econnman/PKGBUILD +++ b/pcr/econnman/PKGBUILD @@ -1,24 +1,21 @@ # Maintainer: Doug Newgard pkgname=econnman -pkgver=1 +pkgver=1.1 pkgrel=1 pkgdesc="Enlightenment ConnMan user interface" arch=('any') url="http://www.enlightenment.org" license=('LGPL3') -depends=('python2-elementary' 'python2-e_dbus' 'python2-edje' 'python2-ecore' 'connman') -conflicts=('econnman-svn') -source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('cec2bd0aaf9d8975dd69ac6b5a4e638e') +depends=('python-efl' 'connman') +source=("http://download.enlightenment.org/rel/apps/$pkgname/$pkgname-$pkgver.tar.gz") +sha256sums=('60f30748b2642b83763fe1e00f6a54ff27425c761633bb8cc0396fba15e7f714') build() { cd "$srcdir/$pkgname-$pkgver" - sed -i 's:/usr/bin/python:/usr/bin/python2:g' econnman-bin.in - - PYTHON=/usr/bin/python2 \ - ./configure --prefix=/usr + ./configure \ + --prefix=/usr make } @@ -27,5 +24,12 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install + +# install text files + install -Dm644 AUTHORS "$pkgdir/usr/share/doc/$pkgname/AUTHORS" + install -Dm644 ChangeLog "$pkgdir/usr/share/doc/$pkgname/ChangeLog" + install -Dm644 NEWS "$pkgdir/usr/share/doc/$pkgname/NEWS" + install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" } + diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD index e0fe27d2e..2ff97dc46 100644 --- a/pcr/jitsi/PKGBUILD +++ b/pcr/jitsi/PKGBUILD @@ -4,8 +4,8 @@ # Contributor (Parabola): Márcio Silva pkgname=jitsi -pkgver=2.2.4603.9615 -pkgrel=2 +pkgver=2.4.4997 +pkgrel=1 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)" arch=('i686' 'x86_64' 'mips64el') url="http://jitsi.org" @@ -17,13 +17,13 @@ source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip" jitsi.desktop jitsi.sh drop-open-term-on-index-jn-html.patch) -sha256sums=('6ec46cc8f2306f5542c65fc637f70a7fe348b309ecc70a2483e05a745487ad41' +sha256sums=('f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825' '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d' '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5' 'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631') prepare() { - cd $srcdir/$pkgname-src-$pkgver + cd $srcdir/$pkgname # append the build revision to the jitsi version sed -i "s|0.build.by.SVN|build.$pkgver|" src/net/java/sip/communicator/impl/version/NightlyBuildID.java @@ -66,22 +66,18 @@ prepare() { } build() { - cd $srcdir/$pkgname-src-$pkgver + cd $srcdir/$pkgname . /etc/profile.d/apache-ant.sh ant rebuild } package() { - cd $srcdir/$pkgname-src-$pkgver - find lib/ lib/bundle/ -maxdepth 1 -type f \ - -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \; - find lib/os-specific/linux/ -maxdepth 1 -type f \ - -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \; + cd $srcdir/$pkgname + find lib/ lib/bundle/ -maxdepth 1 -type f -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \; +# find lib/os-specific/linux/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \; shopt -sq extglob - find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f \ - -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \; - find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f \ - -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \; + find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \; + find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \; install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" diff --git a/pcr/plowshare/PKGBUILD b/pcr/plowshare/PKGBUILD index 11291ef4a..9856e4d7c 100644 --- a/pcr/plowshare/PKGBUILD +++ b/pcr/plowshare/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: breakdown pkgname=plowshare -pkgver=snapshot_git20131130.3c63b19 +pkgver=snapshot_git20140112.7ad41c8 pkgrel=1 pkgdesc="Command-line downloader and uploader for Rapidshare, Mediafire and other file sharing websites." arch=('any') @@ -31,4 +31,4 @@ package() { } # vim:set ts=2 sw=2 et: -md5sums=('1e2468cad043a7225c3092290d844163') +md5sums=('9c31c7f13b41d01bf90563ed25484678') diff --git a/pcr/python-efl/PKGBUILD b/pcr/python-efl/PKGBUILD new file mode 100644 index 000000000..d805e49ca --- /dev/null +++ b/pcr/python-efl/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Doug Newgard + +_python=python +pkgname=$_python-efl +_pkgname=python-efl +pkgver=1.8.1 +pkgrel=1 +pkgdesc="$_python bindings for the Enlightenment Foundataion Libraries" +arch=('i686' 'x86_64') +url="http://www.enlightenment.org" +license=('LGPL3' 'GPL3') +depends=('elementary' "$_python-dbus") +provides=("$_python-ecore" "$_python-edje" "$_python-elementary" "$_python-emotion" "$_python-evas" "$_python-e_dbus") +conflicts=("$_python-ecore" "$_python-edje" "$_python-elementary" "$_python-emotion" "$_python-evas" "$_python-e_dbus") +source=("http://download.enlightenment.org/rel/bindings/python/$_pkgname-$pkgver.tar.bz2") +sha1sums=('82b34b9336d517537b2a4032dff9d1e2de8b8dd8') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + $_python setup.py build +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + $_python setup.py install --root="$pkgdir" + +# install text files + install -Dm644 AUTHORS "$pkgdir/usr/share/doc/$pkgname/AUTHORS" + install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" + install -Dm644 changes.html "$pkgdir/usr/share/doc/$pkgname/changes.html" +} diff --git a/pcr/python2-e_dbus/PKGBUILD b/pcr/python2-e_dbus/PKGBUILD deleted file mode 100644 index 0cff13210..000000000 --- a/pcr/python2-e_dbus/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Doug Newgard - -pkgname=python2-e_dbus -_pkgname=python-e_dbus -pkgver=1.7.0 -pkgrel=1 -pkgdesc="Python2 bindings for E_Dbus" -arch=('i686' 'x86_64') -url="http://www.enlightenment.org" -license=('LGPL2.1') -depends=('e_dbus' 'python2' 'python2-dbus') -options=('!libtool' '!emptydirs') -source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2") -md5sums=('40b479444bb06147429a276127981890') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - PYTHON=/usr/bin/python2 \ - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} diff --git a/pcr/python2-ecore/PKGBUILD b/pcr/python2-ecore/PKGBUILD deleted file mode 100644 index e4837c704..000000000 --- a/pcr/python2-ecore/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Doug Newgard - -pkgname=python2-ecore -_pkgname=python-ecore -pkgver=1.7.0 -pkgrel=1 -pkgdesc="Python2 bindings for Ecore" -arch=('i686' 'x86_64') -url="http://www.enlightenment.org" -license=('LGPL2.1') -depends=('ecore' 'python2-evas') -makedepends=('cython2') -options=('!libtool' '!emptydirs') -source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2") -md5sums=('15dd908b71d09ef30f7e758739f3b6fd') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - PYTHON=/usr/bin/python2 \ - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} - diff --git a/pcr/python2-edje/PKGBUILD b/pcr/python2-edje/PKGBUILD deleted file mode 100644 index 5a63b993f..000000000 --- a/pcr/python2-edje/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Doug Newgard - -pkgname=python2-edje -_pkgname=python-edje -pkgver=1.7.0 -pkgrel=1 -pkgdesc="Python2 bindings for Edje" -arch=('i686' 'x86_64') -url="http://www.enlightenment.org" -license=('LGPL2.1') -depends=('edje' 'python2-evas') -makedepends=('cython2') -options=('!libtool' '!emptydirs') -source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2") -md5sums=('1e0d7a4a4504298caaad0cee476e4edb') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - PYTHON=/usr/bin/python2 \ - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} - diff --git a/pcr/python2-elementary/PKGBUILD b/pcr/python2-elementary/PKGBUILD deleted file mode 100644 index 9372e9445..000000000 --- a/pcr/python2-elementary/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Doug Newgard - -pkgname=python2-elementary -_pkgname=python-elementary -pkgver=1.7.0 -pkgrel=1 -pkgdesc="Python2 bindings for Elementary" -arch=('i686' 'x86_64') -url="http://www.enlightenment.org" -license=('LGPL2.1') -depends=('elementary' 'python2-evas') -makedepends=('cython2') -options=('!libtool' '!emptydirs') -source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2") -md5sums=('38c8b2ac508ab4e1d12f1557a12169c9') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - PYTHON=/usr/bin/python2 \ - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} - diff --git a/pcr/python2-evas/PKGBUILD b/pcr/python2-evas/PKGBUILD deleted file mode 100644 index 7f66df658..000000000 --- a/pcr/python2-evas/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Doug Newgard - -pkgname=python2-evas -_pkgname=python-evas -pkgver=1.7.0 -pkgrel=1 -pkgdesc="Python2 bindings for Evas" -arch=('i686' 'x86_64') -url="http://www.enlightenment.org" -license=('LGPL2.1') -depends=('evas' 'python2') -makedepends=('cython2') -options=('!libtool' '!emptydirs') -source=("http://download.enlightenment.org/releases/BINDINGS/python/$_pkgname-$pkgver.tar.bz2") -md5sums=('c3fda2025171f5e3d2bc224e8bae88e5') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - PYTHON=/usr/bin/python2 \ - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index cb75f9bd3..66488d7de 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2014.01.17.2 +pkgver=2014.01.21.1 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -28,5 +28,5 @@ package() { "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('7b508642c3703f117bd6a5d9cf324356' +md5sums=('0860b9fde30b412df9b3c4d4ede50708' 'SKIP') -- cgit v1.2.3-54-g00ecf