diff options
65 files changed, 3125 insertions, 397 deletions
diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index d2259707f..906a82fcb 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74612 2012-07-31 19:55:33Z ebelanger $ +# $Id: PKGBUILD 76647 2012-09-25 15:44:46Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, @@ -6,7 +6,7 @@ pkgname=cegui pkgver=0.7.6 -pkgrel=5 +pkgrel=6 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64') url="http://crayzedsgui.sourceforge.net" diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index a67a10498..3d02d9512 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,10 +1,10 @@ -#$ID$ +$Id: PKGBUILD 76664 2012-09-25 22:41:38Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.6 -pkgrel=3 +pkgver=1.7 +pkgrel=1 pkgdesc="Wireless LAN network manager" url="http://connman.net/" arch=('i686' 'x86_64') @@ -18,9 +18,8 @@ options=('!libtool') source=('connmand-daemon' "http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'allow_group_network.diff') - md5sums=('88ece7cbf1d0d289545ce4f8553fdab8' - '317fc8603c15fba07478d71c1891e7cb' + '9c6cf5a95989ae72d90b270ac7c6e38c' 'a8d22ee089fb0ed725130d16ad393047') build() { diff --git a/community/dwb/PKGBUILD b/community/dwb/PKGBUILD new file mode 100644 index 000000000..5d8cd77f3 --- /dev/null +++ b/community/dwb/PKGBUILD @@ -0,0 +1,24 @@ +$Id: PKGBUILD 76661 2012-09-25 22:31:13Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: portix <portix at gmx.net> + +pkgname=dwb +pkgver=2012.08.22 +pkgrel=3 +pkgdesc="A webkit web browser with vi-like keyboard shortcuts, stable snapshot" +url="http://portix.bitbucket.org/dwb/" +arch=('i686' 'x86_64') +install=dwb.install +license=('GPL') +depends=('libwebkit' 'desktop-file-utils') +source=(https://bitbucket.org/portix/"${pkgname}"/downloads/"${pkgname}"-"${pkgver}".tar.gz) +md5sums=('5cdf3a2b3f8845071529b44e2d93d653') + +build() { + cd "${srcdir}"/"${pkgname}"-"${pkgver}" + make +} +package() { + cd "${srcdir}"/"${pkgname}"-"${pkgver}" + make DESTDIR=${pkgdir} install +} diff --git a/community/dwb/dwb.install b/community/dwb/dwb.install new file mode 100644 index 000000000..5a5553eba --- /dev/null +++ b/community/dwb/dwb.install @@ -0,0 +1,11 @@ +post_install(){ + update-desktop-database -q +} + +post_upgrade(){ + post_install +} + +post_remove(){ + post_install +} diff --git a/community/frei0r-plugins/PKGBUILD b/community/frei0r-plugins/PKGBUILD index 93a8d19f6..f248043ba 100644 --- a/community/frei0r-plugins/PKGBUILD +++ b/community/frei0r-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 65204 2012-02-20 10:14:02Z spupykin $ +# $Id: PKGBUILD 76620 2012-09-25 09:17:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=frei0r-plugins pkgver=1.3 -pkgrel=3 +pkgrel=4 pkgdesc="frei0r is a minimalistic plugin API for video sources and filters." arch=(i686 x86_64) url="http://www.piksel.org/frei0r" diff --git a/community/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD index 0eb595386..4398de8b7 100644 --- a/community/mediaproxy/PKGBUILD +++ b/community/mediaproxy/PKGBUILD @@ -1,24 +1,23 @@ -# $Id: PKGBUILD 56530 2011-10-07 21:31:08Z spupykin $ +# $Id: PKGBUILD 76639 2012-09-25 15:05:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=mediaproxy pkgver=2.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Open-source media proxy for OpenSER" url="http://mediaproxy.ag-projects.com/" arch=('i686' 'x86_64') license=('GPL') depends=('python2' 'libnetfilter_conntrack' 'iptables' 'python-application' 'python-cjson' 'python-gnutls') -backup=('opt/mediaproxy/config.ini') +#backup=('opt/mediaproxy/config.ini') source=("http://download.ag-projects.com/MediaProxy/mediaproxy-$pkgver.tar.gz" "mediaproxy.init") md5sums=('840de8f52e656991be728c15ec30bb5e' '64042f4686de69a9bdd27d51cbe8a548') -build() -{ +build() { cd $srcdir/mediaproxy-$pkgver install -D -m0755 $srcdir/mediaproxy.init $pkgdir/etc/rc.d/mediaproxy python2 setup.py install --root=$pkgdir diff --git a/community/mesa-dri1/PKGBUILD b/community/mesa-dri1/PKGBUILD index 4676e046a..f63f0d717 100644 --- a/community/mesa-dri1/PKGBUILD +++ b/community/mesa-dri1/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: ConnorBehan <connor.behan@gmail.com> pkgbase=mesa-dri1 -pkgname=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') +pkgname=('unichrome-dri' 'i810-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') pkgver=7.11.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.14' 'dri2proto' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'llvm' 'udev') @@ -18,7 +18,7 @@ build() { autoreconf -vfi ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-dri-drivers=unichrome,mach64,mga,r128,savage,sis,tdfx \ + --with-dri-drivers=unichrome,i810,mach64,mga,r128,savage,sis,tdfx \ --with-gallium-drivers= \ --disable-gallium-llvm \ --enable-glx-tls \ @@ -41,6 +41,13 @@ package_unichrome-dri() { make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install } +package_i810-dri() { + depends=("libgl") + pkgdesc="Mesa DRI drivers for Intel i810" + + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install +} + package_mach64-dri() { depends=("libgl") pkgdesc="Mesa DRI drivers for ATI Mach64" diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD index 17a0b9a57..694a30ae6 100644 --- a/community/mingw32-gcc-base/PKGBUILD +++ b/community/mingw32-gcc-base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72373 2012-06-13 10:03:53Z spupykin $ +# $Id: PKGBUILD 76624 2012-09-25 09:56:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> @@ -8,7 +8,7 @@ _w32apiver=3.17 _runtimever=3.20 _uprel=1 _upw32rel=1 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) pkgdesc="A C cross-compiler for building Windows executables on Linux" depends=(mingw32-binutils) diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD index af888b341..c86d93948 100644 --- a/community/mygui/PKGBUILD +++ b/community/mygui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69363 2012-04-14 17:09:46Z svenstaro $ +# $Id: PKGBUILD 76650 2012-09-25 16:18:14Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrew Belitsky <belitsky.a@gmail.com> pkgbase=mygui pkgname=('mygui' 'mygui-docs') pkgver=3.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="A multilayer and overlappable GUI System for OGRE" arch=('i686' 'x86_64') url="http://mygui.info/" @@ -24,6 +24,7 @@ build() { -e 's:"bin":"../opt/MYGUI":' \ CMake/InstallResources.cmake sed -i '71 i set(MYGUI_GCC_VISIBILITY_FLAGS "")' CMakeLists.txt + sed -i 's/\${OIS_LIBRARIES}/${OIS_LIBRARIES} boost_system/g' Common/CMakeLists.txt # get a clean build dir [[ -d build ]] && rm -rf build diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index 88c327e25..bf21eafb7 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 70836 2012-05-17 14:29:47Z spupykin $ +# $Id: PKGBUILD 76626 2012-09-25 10:38:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc -pkgver=5.1.11 -pkgrel=3 +pkgver=5.2.2 +pkgrel=1 pkgdesc="ODBC driver/connector for MySQL" arch=(i686 x86_64) url="http://dev.mysql.com/downloads/connector/odbc/" @@ -11,8 +11,8 @@ depends=('unixodbc' 'libmysqlclient') makedepends=('cmake') license=('GPL') options=('libtool') -source=("http://mysql.skynet.be/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-$pkgver-src.tar.gz") -md5sums=('1d868f404038bbce6623a28255c8a9f7') +source=("http://cdn.mysql.com/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-$pkgver-src.tar.gz") +md5sums=('bb7829c68338b99debe312839edb79ad') build() { cd $srcdir/mysql-connector-odbc-${pkgver}-src diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 9f9c329bb..67bbdf496 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74874 2012-08-08 06:49:13Z spupykin $ +# $Id: PKGBUILD 76652 2012-09-25 18:40:48Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -7,7 +7,7 @@ _cfgdir=/etc/nginx _tmpdir=/var/lib/nginx pkgname=nginx -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64') @@ -31,7 +31,7 @@ source=(http://nginx.org/download/nginx-$pkgver.tar.gz rc.d service nginx.logrotate) -md5sums=('0a986e60826d9e3b453dbefc36bf8f6c' +md5sums=('a7c9a515f632c8cbb07ab67392208088' 'f62c7c9b5a53471d4666a4c49ad363fb' '62d494d23aef31d0b867161f9fffa6eb' 'b38744739022876554a0444d92e6603b') diff --git a/gnome-unstable/at-spi2-atk/PKGBUILD b/gnome-unstable/at-spi2-atk/PKGBUILD index 2da779b91..a4cca4f26 100644 --- a/gnome-unstable/at-spi2-atk/PKGBUILD +++ b/gnome-unstable/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166839 2012-09-19 21:45:28Z jgc $ +# $Id: PKGBUILD 167111 2012-09-25 12:02:56Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-atk -pkgver=2.5.92 +pkgver=2.6.0 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool') install=at-spi2-atk.install options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('982345ab4ac150b99a80d678b48b072f73fb90b123807225c2d1ae2f9d1b5cdc') +sha256sums=('2cfcb5e29aa6db5e8982add072dffecadd81d6ef04845afa2336be1b515bdc1f') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/at-spi2-core/PKGBUILD b/gnome-unstable/at-spi2-core/PKGBUILD index fa145b403..851a3efd0 100644 --- a/gnome-unstable/at-spi2-core/PKGBUILD +++ b/gnome-unstable/at-spi2-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166841 2012-09-19 21:48:01Z jgc $ +# $Id: PKGBUILD 167110 2012-09-25 12:01:58Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-core -pkgver=2.5.92 +pkgver=2.6.0 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('35bcc57e4d62e174ad1456017a65a88313ad09bf0b00fc3cb5c8bfdbb8f6699f') +sha256sums=('8d7e685c7cda6e2831b31c66ec796dc344c5eb29d8311f69b0a47529194ec559') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/colord-gtk/PKGBUILD b/gnome-unstable/colord-gtk/PKGBUILD new file mode 100644 index 000000000..35de482ba --- /dev/null +++ b/gnome-unstable/colord-gtk/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 167097 2012-09-25 11:36:27Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> + +pkgname=colord-gtk +pkgver=0.1.23 +pkgrel=1 +pkgdesc="GTK integration for libcolord" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/software/colord" +license=('GPL2') +depends=('lcms2' 'gtk3' 'colord') +makedepends=('intltool' 'gobject-introspection' 'vala' 'gtk-doc') +source=($url/releases/$pkgname-$pkgver.tar.xz) +options=('!libtool') +sha1sums=('71fd56b34ba91ddf76c1ac394c2a31fa5e24770c') + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --sysconfdir=/etc --libexecdir=/usr/lib/colord \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/colord/PKGBUILD b/gnome-unstable/colord/PKGBUILD new file mode 100644 index 000000000..d51085cf5 --- /dev/null +++ b/gnome-unstable/colord/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 167094 2012-09-25 11:25:42Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> + +pkgname=colord +pkgver=0.1.23 +pkgrel=1 +pkgdesc="Color daemon" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/software/colord" +license=('GPL2') +depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite' 'udev') +makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') +source=($url/releases/$pkgname-$pkgver.tar.xz) +options=('!libtool') +sha1sums=('08019c86f89b1675e4e155772cc555ed748f319e') + +build() { + cd "$pkgname-$pkgver" + + # put udev files in /usr/lib + sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure + + ./configure --prefix=/usr \ + --sysconfdir=/etc --libexecdir=/usr/lib/colord \ + --localstatedir=/var --disable-static \ + --with-systemdsystemunitdir=/usr/lib/systemd/system + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install \ + bashcompletiondir=/usr/share/bash-completion/completions +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/devhelp/PKGBUILD b/gnome-unstable/devhelp/PKGBUILD index 8f2478893..c6aaf552f 100644 --- a/gnome-unstable/devhelp/PKGBUILD +++ b/gnome-unstable/devhelp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 167049 2012-09-24 20:56:42Z jgc $ +# $Id: PKGBUILD 167107 2012-09-25 11:54:01Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> pkgname=devhelp pkgver=3.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="API documentation browser for GNOME" arch=(i686 x86_64) license=('GPL') @@ -20,7 +20,8 @@ sha256sums=('bf0576d5d70496367ccb22be53be620bbfe341bd491c1d725cfb59d566769fe1') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static + --localstatedir=/var --disable-static \ + --with-webkit2 make } diff --git a/gnome-unstable/epiphany/PKGBUILD b/gnome-unstable/epiphany/PKGBUILD index d4170330b..c15e8c13a 100644 --- a/gnome-unstable/epiphany/PKGBUILD +++ b/gnome-unstable/epiphany/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166921 2012-09-22 08:46:35Z jgc $ +# $Id: PKGBUILD 167069 2012-09-25 09:09:57Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany -pkgver=3.5.92 +pkgver=3.6.0 pkgrel=1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine." @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('7977161aa82f29b24a7a8121a6b80c55483b1e1a6d516d6649d99b42fb5e63fe') +sha256sums=('54458b220e5f320b93f2f59840971627f43f2aa6b1ff5fa3e6a8fad5deef2207') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/evince/PKGBUILD b/gnome-unstable/evince/PKGBUILD index d7760f1d8..69115bd42 100644 --- a/gnome-unstable/evince/PKGBUILD +++ b/gnome-unstable/evince/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167028 2012-09-24 19:57:00Z jgc $ +# $Id: PKGBUILD 167083 2012-09-25 10:11:40Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.5.92 +pkgver=3.6.0 pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" @@ -15,7 +15,7 @@ groups=('gnome-extra') install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('47c5439fa2bac884881e23078d1055c5d8dee7fd93e5142b9d5545a095a166d6') +sha256sums=('8dfa7b9c2f0b910d06b1612ff445d3f3050c44d25f2e78718966374d30ab83f2') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/evolution/PKGBUILD b/gnome-unstable/evolution/PKGBUILD index b7a579c92..26faf8f35 100644 --- a/gnome-unstable/evolution/PKGBUILD +++ b/gnome-unstable/evolution/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166834 2012-09-19 19:34:06Z jgc $ +# $Id: PKGBUILD 167092 2012-09-25 11:22:48Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.5.92 +pkgver=3.6.0 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('dfead9f5bde36527ed4410e62004e42d4677e319d2c6e02d96ede5406516c25f') +sha256sums=('6163ef56a22ca7c605a89d774851c9988d7840a4dc5c73c546308e5380cfe7b4') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules new file mode 100644 index 000000000..a76c1e73c --- /dev/null +++ b/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules @@ -0,0 +1,11 @@ +# Get access to /dev/rfkill for users +# See https://bugzilla.redhat.com/show_bug.cgi?id=514798 +# +# Updated for udev >= 154 +# http://bugs.debian.org/582188 +# https://bugzilla.redhat.com/show_bug.cgi?id=588660 + +ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end" +ACTION!="add|change", GOTO="gnome_bluetooth_end" +KERNEL=="rfkill", TAG+="udev-acl" +LABEL="gnome_bluetooth_end" diff --git a/gnome-unstable/gnome-bluetooth/PKGBUILD b/gnome-unstable/gnome-bluetooth/PKGBUILD new file mode 100644 index 000000000..7437fc613 --- /dev/null +++ b/gnome-unstable/gnome-bluetooth/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 167079 2012-09-25 09:40:56Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Roman Kyrylych <roman@archlinux.org> + +pkgname=gnome-bluetooth +pkgver=3.5.92 +pkgrel=1 +pkgdesc="The GNOME Bluetooth Subsystem" +arch=('i686' 'x86_64') +url="http://live.gnome.org/GnomeBluetooth" +license=('GPL' 'LGPL') +depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify') +makedepends=('intltool' 'nautilus-sendto' 'gobject-introspection' 'itstool' 'docbook-xsl') +options=('!libtool' '!emptydirs') +install=gnome-bluetooth.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + 61-gnome-bluetooth-rfkill.rules) +sha256sums=('bb832118364be36510d32e6e33e90788c0f651c82c146f9abd800403f0a235f8' + 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-desktop-update \ + --disable-icon-update \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + install -m644 -D ../61-gnome-bluetooth-rfkill.rules \ + "$pkgdir/usr/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules" +} diff --git a/gnome-unstable/gnome-bluetooth/gnome-bluetooth.install b/gnome-unstable/gnome-bluetooth/gnome-bluetooth.install new file mode 100644 index 000000000..8c991877f --- /dev/null +++ b/gnome-unstable/gnome-bluetooth/gnome-bluetooth.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/gnome-control-center/PKGBUILD b/gnome-unstable/gnome-control-center/PKGBUILD new file mode 100644 index 000000000..b7792151a --- /dev/null +++ b/gnome-unstable/gnome-control-center/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 167087 2012-09-25 10:41:31Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-control-center +pkgver=3.6.0 +pkgrel=1 +pkgdesc="The Control Center for GNOME" +arch=('i686' 'x86_64') +depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' + 'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3' + 'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' 'libpwquality' 'libsystemd') +optdepends=('mesa-demos: provides glxinfo for graphics information' + 'gnome-color-manager: for color management tasks') +makedepends=('gnome-doc-utils' 'intltool' 'docbook-xsl') +url="http://www.gnome.org" +groups=('gnome') +install=gnome-control-center.install +license=('GPL') +options=('!libtool' '!emptydirs') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('7d58d0ccc3defe622f66f4ce8e1229e443f4f57c58f85eecde12b642b8a8e893') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-systemd --with-libsocialweb \ + --disable-update-mimedb \ + --without-cheese + + #https://bugzilla.gnome.org/show_bug.cgi?id=656229 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-control-center/gnome-control-center.install b/gnome-unstable/gnome-control-center/gnome-control-center.install new file mode 100644 index 000000000..079e0fa34 --- /dev/null +++ b/gnome-unstable/gnome-control-center/gnome-control-center.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/gnome-control-center/systemd-fallback.patch b/gnome-unstable/gnome-control-center/systemd-fallback.patch new file mode 100644 index 000000000..709e54019 --- /dev/null +++ b/gnome-unstable/gnome-control-center/systemd-fallback.patch @@ -0,0 +1,81 @@ +commit 9873a7536844f5c38c2a123be58175c2774e5dcc +Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +Date: Mon Mar 12 01:12:11 2012 +0100 + + Fallback to CK if systemd is not available + + Be nice to distributions where systemd is optional. This will select + the code path at runtime depending on whether the system was booted + using systemd. + +diff --git a/configure.ac b/configure.ac +index aee97ac..867f061 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd], + [with_systemd=$enableval], + [with_systemd=no]) + if test "$with_systemd" = "yes" ; then +- SYSTEMD=libsystemd-login ++ SYSTEMD="libsystemd-login libsystemd-daemon" + AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available]) + else + SYSTEMD= +diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c +index f027754..5ebbe29 100644 +--- a/panels/user-accounts/um-user.c ++++ b/panels/user-accounts/um-user.c +@@ -37,6 +37,11 @@ + + #include <gio/gunixoutputstream.h> + ++#ifdef HAVE_SYSTEMD ++# include <systemd/sd-login.h> ++# include <systemd/sd-daemon.h> ++#endif ++ + #include "um-user.h" + #include "um-account-type.h" + #include "um-utils.h" +@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser *user, + } + } + +-#ifdef HAVE_SYSTEMD +- +-#include <systemd/sd-login.h> +- + gboolean + um_user_is_logged_in (UmUser *user) + { +- int n_sessions; +- +- n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0; +- +- return n_sessions > 0; +-} ++#ifdef HAVE_SYSTEMD ++ if (sd_booted () > 0) { ++ int n_sessions; + +-#else ++ n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL); + +-gboolean +-um_user_is_logged_in (UmUser *user) +-{ ++ return n_sessions > 0; ++ } ++#endif + GVariant *result; + GVariantIter *iter; + gint n_sessions; +@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user) + return n_sessions > 0; + } + +-#endif +- + void + um_user_set_automatic_login (UmUser *user, + gboolean enabled) diff --git a/gnome-unstable/gnome-desktop/PKGBUILD b/gnome-unstable/gnome-desktop/PKGBUILD index fa843e6d9..6a2dcf0d6 100644 --- a/gnome-unstable/gnome-desktop/PKGBUILD +++ b/gnome-unstable/gnome-desktop/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167014 2012-09-24 18:39:41Z jgc $ +# $Id: PKGBUILD 167132 2012-09-25 21:08:02Z heftig $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.6.0 +pkgver=3.6.0.1 pkgrel=1 epoch=1 pkgdesc="Library with common API for various GNOME modules" @@ -13,8 +13,8 @@ makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool') url="http://www.gnome.org" groups=('gnome') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e6ea2c27b733cd562db8e648724ca907032ff330d5b2a1740c4685ed697bfa6a') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +sha256sums=('f3a3a7229426360d48677846bf7a674b12ef89b0a353044d7cc488c438d2ee5f') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/gnome-menus/PKGBUILD b/gnome-unstable/gnome-menus/PKGBUILD new file mode 100644 index 000000000..2a1fda39e --- /dev/null +++ b/gnome-unstable/gnome-menus/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 167081 2012-09-25 09:50:30Z jgc $ +# Maintainer: Jan de Groot <jan@archlinux.org> + +pkgname=gnome-menus +pkgver=3.5.92 +pkgrel=1 +pkgdesc="GNOME menu specifications" +arch=('i686' 'x86_64') +depends=('glib2' 'python2-gobject') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +license=('GPL' 'LGPL') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + menus.patch) +sha256sums=('e56022b4329e97fdcadf0c70212dba04c4da9c51be2036e6c931ab0fd48fef0f' + 'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc') + +build() { + cd "$pkgname-$pkgver" + + patch -Np0 -i "$srcdir/menus.patch" + + PYTHON=/usr/bin/python2 ./configure \ + --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package(){ + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + sed -i "1s|#!/usr/bin/env python$|&2|" \ + "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py" +} diff --git a/gnome-unstable/gnome-menus/menus.patch b/gnome-unstable/gnome-menus/menus.patch new file mode 100644 index 000000000..bf73e86cd --- /dev/null +++ b/gnome-unstable/gnome-menus/menus.patch @@ -0,0 +1,25 @@ +--- layout/applications.menu 2005-06-28 10:16:39.000000000 +0200 ++++ layout/applications.menu 2005-09-12 23:21:20.000000000 +0200 +@@ -7,7 +7,6 @@ + <Directory>Applications.directory</Directory> + + <!-- Scan legacy dirs first, as later items take priority --> +- <KDELegacyDirs/> + <LegacyDir>/etc/X11/applnk</LegacyDir> + <LegacyDir>/usr/share/gnome/apps</LegacyDir> + +@@ -18,6 +17,14 @@ + <!-- Read in overrides and child menus from applications-merged/ --> + <DefaultMergeDirs/> + ++ <!-- Archlinux submenu --> ++ <Menu> ++ <Name>Archlinux</Name> ++ <Directory>Archlinux.directory</Directory> ++ <Include> ++ <Category>Archlinux</Category> ++ </Include> ++ </Menu> <!-- End Archlinux --> + <!-- Accessories submenu --> + <Menu> + <Name>Accessories</Name> diff --git a/gnome-unstable/gnome-settings-daemon/PKGBUILD b/gnome-unstable/gnome-settings-daemon/PKGBUILD index fba231183..c90a2e254 100644 --- a/gnome-unstable/gnome-settings-daemon/PKGBUILD +++ b/gnome-unstable/gnome-settings-daemon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166875 2012-09-20 21:45:44Z jgc $ +# $Id: PKGBUILD 167077 2012-09-25 09:29:44Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.5.92 +pkgver=3.6.0 pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b77c9b36eccdfcdc25acc54e78dd2372970187dff67bf7c2022d3c43292b5979') +sha256sums=('6d516a6b9779545568b480b36d69a965c20f3b7b53edbd306527f6bc2a6478f3') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gnome-shell/PKGBUILD b/gnome-unstable/gnome-shell/PKGBUILD new file mode 100644 index 000000000..16f68f0f9 --- /dev/null +++ b/gnome-unstable/gnome-shell/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 167089 2012-09-25 10:46:37Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Flamelab <panosfilip@gmail.com + +pkgname=gnome-shell +pkgver=3.5.92 +pkgrel=1 +pkgdesc="The next generation GNOME Shell" +arch=('i686' 'x86_64') +url="http://live.gnome.org/GnomeShell" +license=('GPL2') +depends=('caribou' 'folks' 'gcr' 'gjs' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libcroco' 'libpulse' 'mutter' 'nautilus' 'networkmanager' 'telepathy-logger' 'telepathy-mission-control' 'unzip') +makedepends=('intltool' 'gnome-doc-utils') +optdepends=('network-manager-applet: shell integration for networkmanager') +options=('!libtool' '!emptydirs') +install=gnome-shell.install +groups=(gnome) +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('bf43ade818f2fd7631492a5eb61522524b7bdb84d3627a21bd4bde9100e0e6af') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gnome-shell \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-shell/gnome-shell.install b/gnome-unstable/gnome-shell/gnome-shell.install new file mode 100644 index 000000000..27d70b19d --- /dev/null +++ b/gnome-unstable/gnome-shell/gnome-shell.install @@ -0,0 +1,19 @@ +pkgname=gnome-shell + +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + gconfpkg --uninstall $pkgname + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-shell/recorder.patch b/gnome-unstable/gnome-shell/recorder.patch new file mode 100644 index 000000000..41134a31a --- /dev/null +++ b/gnome-unstable/gnome-shell/recorder.patch @@ -0,0 +1,28 @@ +From 915524e1ab7d2c5efb95985f30ee2f7c5ca69554 Mon Sep 17 00:00:00 2001 +From: Rui Matos <tiagomatos@gmail.com> +Date: Wed, 02 May 2012 14:44:40 +0000 +Subject: main: Close the recorder instead of pausing it + +Pausing means that we will continue to use the same output file when +the keybinding is activated again. While useful to record a single +video in chunks, it doesn't seem to be how most users understand the +keybinding. Closing the recorder will close the file and create a new +one the next time the keybinding is pressed. + +https://bugzilla.gnome.org/show_bug.cgi?id=675128 +--- +diff --git a/js/ui/main.js b/js/ui/main.js +index 3b80297..25ad8d8 100644 +--- a/js/ui/main.js ++++ b/js/ui/main.js +@@ -110,7 +110,7 @@ function _initRecorder() { + } + + if (recorder.is_recording()) { +- recorder.pause(); ++ recorder.close(); + Meta.enable_unredirect_for_screen(global.screen); + } else { + // read the parameters from GSettings always in case they have changed +-- +cgit v0.9.0.2 diff --git a/gnome-unstable/gnome-themes-standard/PKGBUILD b/gnome-unstable/gnome-themes-standard/PKGBUILD index eb04148ea..dd7438f20 100644 --- a/gnome-unstable/gnome-themes-standard/PKGBUILD +++ b/gnome-unstable/gnome-themes-standard/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166794 2012-09-19 09:49:03Z jgc $ +# $Id: PKGBUILD 167130 2012-09-25 20:56:36Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.5.92 +pkgver=3.6.0.2 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ groups=('gnome') replaces=('gnome-themes') conflicts=('gnome-themes') options=('!libtool') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('234507791a2d863a41c4e5439991afa95180a1d31c1f2bd4273d3b4a212aed2d') +source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +sha256sums=('3f3c0448d7cda9a9381570c9869df2a7b2ef8587d85817bc5bbcf24870244490') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gtk3/PKGBUILD b/gnome-unstable/gtk3/PKGBUILD index 6625a5a2a..c133420b8 100644 --- a/gnome-unstable/gtk3/PKGBUILD +++ b/gnome-unstable/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166786 2012-09-19 08:51:48Z jgc $ +# $Id: PKGBUILD 167066 2012-09-25 08:10:03Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.5.18 +pkgver=3.6.0 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini wacom.patch) -sha256sums=('2dc6779e447332b4963d4ef3ac673e590aaced5ea4e71998c063dc43dd866fad' +sha256sums=('e13f45225a795ebe9e4047486fa57b3232e6a21539983775db6cd4ae9046b049' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5') build() { diff --git a/gnome-unstable/libpwquality/PKGBUILD b/gnome-unstable/libpwquality/PKGBUILD new file mode 100644 index 000000000..b40a35d4b --- /dev/null +++ b/gnome-unstable/libpwquality/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libpwquality +pkgver=1.2.0 +pkgrel=1 +pkgdesc="Library for password quality checking and generating random passwords" +arch=('i686' 'x86_64') +url="https://fedorahosted.org/libpwquality/" +license=('GPL') +options=('!libtool') +depends=('cracklib') +optdepends=('python2: Python bindings') +makedepends=('python2') +source=(https://fedorahosted.org/releases/l/i/libpwquality/$pkgname-$pkgver.tar.bz2) +md5sums=('8827419118064539db70090cbed5cb21') + +build() { + cd "$pkgname-$pkgver" + sed -i -e 's/python setup.py/python2 setup.py/' python/Makefile.in + + PYTHON=python2 ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/libxklavier/PKGBUILD b/gnome-unstable/libxklavier/PKGBUILD new file mode 100644 index 000000000..94e99d10e --- /dev/null +++ b/gnome-unstable/libxklavier/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 167099 2012-09-25 11:40:49Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Arjan Timmerman <arjan@archlinux.org> + +pkgname=libxklavier +pkgver=5.3 +pkgrel=1 +pkgdesc="High-level API for X Keyboard Extension" +arch=(i686 x86_64) +license=('LGPL') +depends=('glib2' 'libxkbfile' 'libxml2' 'xkeyboard-config' 'libxi' 'iso-codes') +makedepends=('gobject-introspection') +options=('!libtool' '!emptydirs') +url="http://gswitchit.sourceforge.net" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +sha256sums=('ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --with-xkb-base=/usr/share/X11/xkb --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/nautilus-sendto/PKGBUILD b/gnome-unstable/nautilus-sendto/PKGBUILD new file mode 100644 index 000000000..01d5804e7 --- /dev/null +++ b/gnome-unstable/nautilus-sendto/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 167075 2012-09-25 09:23:58Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Eduardo Romero <eduardo@archlinux.org> +# Contributor: Tor Krill <tor@krill.nu> + +pkgname=nautilus-sendto +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Nautilus context menu for sending files." +arch=('i686' 'x86_64') +url="http://download.gnome.org/sources/nautilus-sendto/" +license=('GPL') +groups=('gnome-extra') +depends=('evolution-data-server' 'nautilus' 'dconf') +makedepends=('pidgin' 'gajim' 'gettext' 'intltool' 'gupnp') +options=('!libtool' '!emptydirs') +install=nautilus-sendto.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('5f90a1a7b054257545dc72fa3a63de8f5564815576f90a21c320ebb177b9268e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/nautilus-sendto/nautilus-sendto.install b/gnome-unstable/nautilus-sendto/nautilus-sendto.install new file mode 100644 index 000000000..d33a1b261 --- /dev/null +++ b/gnome-unstable/nautilus-sendto/nautilus-sendto.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/yelp/PKGBUILD b/gnome-unstable/yelp/PKGBUILD new file mode 100644 index 000000000..7dcd1c68c --- /dev/null +++ b/gnome-unstable/yelp/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 167105 2012-09-25 11:50:12Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=yelp +pkgver=3.6.0 +pkgrel=1 +pkgdesc="A help browser for GNOME" +arch=('i686' 'x86_64') +depends=('webkitgtk3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' + 'desktop-file-utils' 'dconf') +makedepends=('intltool' 'gtk-doc' 'itstool') +groups=('gnome') +license=('GPL') +options=('!emptydirs' '!libtool') +url="http://www.gnome.org" +install=yelp.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('966a513420674c488b18df0ffcf51f8b4687cdba04b1d1d5e76d59c0484ac048') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/yelp/yelp.install b/gnome-unstable/yelp/yelp.install new file mode 100644 index 000000000..2a1cb91e9 --- /dev/null +++ b/gnome-unstable/yelp/yelp.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/lib32-mesa-demos-libre/PKGBUILD b/libre/lib32-mesa-demos-libre/PKGBUILD new file mode 100644 index 000000000..1719f138d --- /dev/null +++ b/libre/lib32-mesa-demos-libre/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 94667 2010-10-09 11:21:35Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgbasename=mesa-demos-libre +pkgname=lib32-$_pkgbasename +pkgver=8.0.1 +pkgrel=2 +arch=(x86_64) +pkgdesc="Mesa demos and tools (32-bit), libre" +url="http://mesa3d.sourceforge.net" +license=('custom') +depends=('lib32-glew>=1.5.6' mesa-demos-libre) +provides=("lib32-mesa-demos=$pkgver") +replaces=('lib32-mesa-demos') +conflicts=('lib32-mesa-demos') +makedepends=(gcc-multilib) +source=(ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2 + mesa-demos-libre.patch) +md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4' + '1858e95d40ac9e5e0b59753ce9e673e3') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/mesa-demos-${pkgver}" + patch -Np1 -i "${srcdir}/mesa-demos-libre.patch" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/mesa-demos-${pkgver}" + make DESTDIR="${pkgdir}" install + + for i in "$pkgdir/usr/bin/"*; do + mv "$i" "$i"32 + done + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s mesa-demos "$pkgdir/usr/share/licenses/lib32-mesa-demos" +} diff --git a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch new file mode 100755 index 000000000..c5261f8e9 --- /dev/null +++ b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch @@ -0,0 +1,1192 @@ +diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//src/demos/Makefile.am +--- Desktop/mesa-demos-8.0.1//src/demos/Makefile.am 2010-07-13 14:46:40.000000000 -0400 ++++ mesa-demos-8.0.1/src/demos/Makefile.am 2011-06-04 15:34:18.000000000 -0400 +@@ -62,7 +62,6 @@ bin_PROGRAMS = \ + morph3d \ + multiarb \ + paltex \ +- pointblast \ + projtex \ + ray \ + readpix \ +@@ -71,7 +70,6 @@ bin_PROGRAMS = \ + shadowtex \ + singlebuffer \ + spectex \ +- spriteblast \ + stex3d \ + teapot \ + terrain \ +diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//src/demos/Makefile.in +--- Desktop/mesa-demos-8.0.1//src/demos/Makefile.in 2010-07-13 14:53:23.000000000 -0400 ++++ mesa-demos-8.0.1/src/demos/Makefile.in 2011-06-04 15:35:32.000000000 -0400 +@@ -73,11 +73,10 @@ host_triplet = @host@ + @HAVE_GLUT_TRUE@ ipers$(EXEEXT) isosurf$(EXEEXT) \ + @HAVE_GLUT_TRUE@ lodbias$(EXEEXT) morph3d$(EXEEXT) \ + @HAVE_GLUT_TRUE@ multiarb$(EXEEXT) paltex$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ pointblast$(EXEEXT) projtex$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ ray$(EXEEXT) readpix$(EXEEXT) reflect$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ renormal$(EXEEXT) shadowtex$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ singlebuffer$(EXEEXT) spectex$(EXEEXT) \ +-@HAVE_GLUT_TRUE@ spriteblast$(EXEEXT) stex3d$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \ ++@HAVE_GLUT_TRUE@ spectex$(EXEEXT) stex3d$(EXEEXT) \ + @HAVE_GLUT_TRUE@ teapot$(EXEEXT) terrain$(EXEEXT) \ + @HAVE_GLUT_TRUE@ tessdemo$(EXEEXT) texcyl$(EXEEXT) \ + @HAVE_GLUT_TRUE@ texenv$(EXEEXT) textures$(EXEEXT) \ +@@ -188,9 +187,6 @@ multiarb_DEPENDENCIES = ../util/libutil. + paltex_SOURCES = paltex.c + paltex_OBJECTS = paltex.$(OBJEXT) + paltex_LDADD = $(LDADD) +-pointblast_SOURCES = pointblast.c +-pointblast_OBJECTS = pointblast.$(OBJEXT) +-pointblast_LDADD = $(LDADD) + projtex_SOURCES = projtex.c + projtex_OBJECTS = projtex.$(OBJEXT) + projtex_DEPENDENCIES = ../util/libutil.la +@@ -215,9 +211,6 @@ singlebuffer_LDADD = $(LDADD) + spectex_SOURCES = spectex.c + spectex_OBJECTS = spectex.$(OBJEXT) + spectex_LDADD = $(LDADD) +-spriteblast_SOURCES = spriteblast.c +-spriteblast_OBJECTS = spriteblast.$(OBJEXT) +-spriteblast_LDADD = $(LDADD) + stex3d_SOURCES = stex3d.c + stex3d_OBJECTS = stex3d.$(OBJEXT) + stex3d_LDADD = $(LDADD) +@@ -285,21 +278,20 @@ SOURCES = arbfplight.c arbfslight.c arbo + fbo_firecube.c fbotexture.c fire.c fogcoord.c fplight.c \ + fslight.c gamma.c gearbox.c gears.c geartrain.c glinfo.c \ + gloss.c gltestperf.c ipers.c isosurf.c lodbias.c morph3d.c \ +- multiarb.c paltex.c pointblast.c projtex.c ray.c readpix.c \ +- reflect.c renormal.c shadowtex.c singlebuffer.c spectex.c \ +- spriteblast.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \ +- texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \ +- vao_demo.c winpos.c ++ multiarb.c paltex.c projtex.c ray.c readpix.c reflect.c \ ++ renormal.c shadowtex.c singlebuffer.c spectex.c stex3d.c \ ++ teapot.c terrain.c tessdemo.c texcyl.c texenv.c textures.c \ ++ trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c + DIST_SOURCES = arbfplight.c arbfslight.c arbocclude.c bounce.c \ + clearspd.c copypix.c cubemap.c dinoshade.c dissolve.c \ + drawpix.c engine.c fbo_firecube.c fbotexture.c fire.c \ + fogcoord.c fplight.c fslight.c gamma.c gearbox.c gears.c \ + geartrain.c glinfo.c gloss.c gltestperf.c ipers.c isosurf.c \ +- lodbias.c morph3d.c multiarb.c paltex.c pointblast.c projtex.c \ +- ray.c readpix.c reflect.c renormal.c shadowtex.c \ +- singlebuffer.c spectex.c spriteblast.c stex3d.c teapot.c \ +- terrain.c tessdemo.c texcyl.c texenv.c textures.c trispd.c \ +- $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c ++ lodbias.c morph3d.c multiarb.c paltex.c projtex.c ray.c \ ++ readpix.c reflect.c renormal.c shadowtex.c singlebuffer.c \ ++ spectex.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \ ++ texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \ ++ vao_demo.c winpos.c + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -653,9 +645,6 @@ multiarb$(EXEEXT): $(multiarb_OBJECTS) $ + paltex$(EXEEXT): $(paltex_OBJECTS) $(paltex_DEPENDENCIES) + @rm -f paltex$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(paltex_OBJECTS) $(paltex_LDADD) $(LIBS) +-pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) +- @rm -f pointblast$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS) + projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) + @rm -f projtex$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS) +@@ -680,9 +669,6 @@ singlebuffer$(EXEEXT): $(singlebuffer_OB + spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) + @rm -f spectex$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS) +-spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) +- @rm -f spriteblast$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS) + stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) + @rm -f stex3d$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS) +@@ -756,7 +742,6 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/morph3d.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@ +@@ -765,7 +750,6 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spriteblast.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@ +diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/pointblast.c mesa-demos-8.0.1//src/demos/pointblast.c +--- Desktop/mesa-demos-8.0.1//src/demos/pointblast.c 2010-07-07 13:57:15.000000000 -0400 ++++ mesa-demos-8.0.1/src/demos/pointblast.c 1969-12-31 19:00:00.000000000 -0500 +@@ -1,504 +0,0 @@ +- +-/* Copyright (c) Mark J. Kilgard, 1997. */ +- +-/* This program is freely distributable without licensing fees +- and is provided without guarantee or warrantee expressed or +- implied. This program is -not- in the public domain. */ +- +-/* This example demonstrates how to render particle effects +- with OpenGL. A cloud of pinkish/orange particles explodes with the +- particles bouncing off the ground. When the EXT_point_parameters +- is present , the particle size is attenuated based on eye distance. */ +- +- +-#include <stdio.h> +-#include <stdlib.h> +-#include <string.h> +-#include <math.h> /* for cos(), sin(), and sqrt() */ +-#ifdef _WIN32 +-#include <windows.h> +-#endif +-#include <GL/glew.h> +-#include <GL/glut.h> +- +-/* Some <math.h> files do not define M_PI... */ +-#ifndef M_PI +-#define M_PI 3.14159265 +-#endif +- +-#if 0 /* For debugging. */ +-#undef GL_EXT_point_parameters +-#endif +- +-static GLfloat angle = -150; /* in degrees */ +-static int spin = 0; +-static int moving, begin; +-static int newModel = 1; +-static float theTime; +-static int repeat = 1; +-static int blend = 1; +-int useMipmaps = 1; +-int linearFiltering = 1; +- +-static GLfloat constant[3] = { 1/5.0, 0.0, 0.0 }; +-static GLfloat linear[3] = { 0.0, 1/5.0, 0.0 }; +-static GLfloat theQuad[3] = { 0.25, 0.0, 1/60.0 }; +- +-#define MAX_POINTS 2000 +- +-static int numPoints = 200; +- +-static GLfloat pointList[MAX_POINTS][3]; +-static GLfloat pointTime[MAX_POINTS]; +-static GLfloat pointVelocity[MAX_POINTS][2]; +-static GLfloat pointDirection[MAX_POINTS][2]; +-static int colorList[MAX_POINTS]; +-static int animate = 1, motion = 0; +- +-static GLfloat colorSet[][4] = { +- /* Shades of red. */ +- { 0.7, 0.2, 0.4, 0.5 }, +- { 0.8, 0.0, 0.7, 0.5 }, +- { 1.0, 0.0, 0.0, 0.5 }, +- { 0.9, 0.3, 0.6, 0.5 }, +- { 1.0, 0.4, 0.0, 0.5 }, +- { 1.0, 0.0, 0.5, 0.5 }, +-}; +- +-#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0])) +- +-#define DEAD (NUM_COLORS+1) +- +- +-#if 0 /* drand48 might be better on Unix machines */ +-#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48()) +-#else +-static float float_rand(void) { return rand() / (float) RAND_MAX; } +-#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand()) +-#endif +- +-#define MEAN_VELOCITY 3.0 +-#define GRAVITY 2.0 +- +-/* Modeling units of ground extent in each X and Z direction. */ +-#define EDGE 12 +- +-static void +-makePointList(void) +-{ +- float angle, velocity, direction; +- int i; +- +- motion = 1; +- for (i=0; i<numPoints; i++) { +- pointList[i][0] = 0.0; +- pointList[i][1] = 0.0; +- pointList[i][2] = 0.0; +- pointTime[i] = 0.0; +- angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0; +- direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0; +- pointDirection[i][0] = cos(direction); +- pointDirection[i][1] = sin(direction); +- velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0); +- pointVelocity[i][0] = velocity * cos(angle); +- pointVelocity[i][1] = velocity * sin(angle); +- colorList[i] = rand() % NUM_COLORS; +- } +- theTime = 0.0; +-} +- +-static void +-updatePointList(void) +-{ +- float distance; +- int i; +- +- static double t0 = -1.; +- double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0; +- if (t0 < 0.0) +- t0 = t; +- dt = t - t0; +- t0 = t; +- +- motion = 0; +- for (i=0; i<numPoints; i++) { +- distance = pointVelocity[i][0] * theTime; +- +- /* X and Z */ +- pointList[i][0] = pointDirection[i][0] * distance; +- pointList[i][2] = pointDirection[i][1] * distance; +- +- /* Z */ +- pointList[i][1] = +- (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i]; +- +- /* If we hit the ground, bounce the point upward again. */ +- if (pointList[i][1] <= 0.0) { +- if (distance > EDGE) { +- /* Particle has hit ground past the distance duration of +- the particles. Mark particle as dead. */ +- colorList[i] = NUM_COLORS; /* Not moving. */ +- continue; +- } +- +- pointVelocity[i][1] *= 0.8; /* 80% of previous up velocity. */ +- pointTime[i] = 0.0; /* Reset the particles sense of up time. */ +- } +- motion = 1; +- pointTime[i] += dt; +- } +- theTime += dt; +- if (!motion && !spin) { +- if (repeat) { +- makePointList(); +- } else { +- glutIdleFunc(NULL); +- } +- } +-} +- +-static void +-idle(void) +-{ +- updatePointList(); +- if (spin) { +- angle += 0.3; +- newModel = 1; +- } +- glutPostRedisplay(); +-} +- +-static void +-visible(int vis) +-{ +- if (vis == GLUT_VISIBLE) { +- if (animate && (motion || spin)) { +- glutIdleFunc(idle); +- } +- } else { +- glutIdleFunc(NULL); +- } +-} +- +-static void +-recalcModelView(void) +-{ +- glPopMatrix(); +- glPushMatrix(); +- glRotatef(angle, 0.0, 1.0, 0.0); +- newModel = 0; +-} +- +-static void +-redraw(void) +-{ +- int i; +- +- glDepthMask(GL_TRUE); +- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); +- if (newModel) +- recalcModelView(); +- +- +- /* Draw the floor. */ +-/* glEnable(GL_TEXTURE_2D);*/ +- glColor3f(0.5, 1.0, 0.5); +- glBegin(GL_QUADS); +- glTexCoord2f(0.0, 0.0); +- glVertex3f(-EDGE, -0.05, -EDGE); +- glTexCoord2f(20.0, 0.0); +- glVertex3f(EDGE, -0.05, -EDGE); +- glTexCoord2f(20.0, 20.0); +- glVertex3f(EDGE, -0.05, EDGE); +- glTexCoord2f(0.0, 20.0); +- glVertex3f(-EDGE, -0.05, EDGE); +- glEnd(); +- +- /* Allow particles to blend with each other. */ +- glDepthMask(GL_FALSE); +- +- if (blend) +- glEnable(GL_BLEND); +- +- glDisable(GL_TEXTURE_2D); +- glBegin(GL_POINTS); +- for (i=0; i<numPoints; i++) { +- /* Draw alive particles. */ +- if (colorList[i] != DEAD) { +- glColor4fv(colorSet[colorList[i]]); +- glVertex3fv(pointList[i]); +- } +- } +- glEnd(); +- +- glDisable(GL_BLEND); +- +- glutSwapBuffers(); +-} +- +-/* ARGSUSED2 */ +-static void +-mouse(int button, int state, int x, int y) +-{ +- /* Scene can be spun around Y axis using left +- mouse button movement. */ +- if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) { +- moving = 1; +- begin = x; +- } +- if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) { +- moving = 0; +- } +-} +- +-/* ARGSUSED1 */ +-static void +-mouseMotion(int x, int y) +-{ +- if (moving) { +- angle = angle + (x - begin); +- begin = x; +- newModel = 1; +- glutPostRedisplay(); +- } +-} +- +-static void +-menu(int option) +-{ +- switch (option) { +- case 0: +- makePointList(); +- break; +-#ifdef GL_ARB_point_parameters +- case 1: +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant); +- break; +- case 2: +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear); +- break; +- case 3: +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); +- break; +-#endif +- case 4: +- blend = 1; +- break; +- case 5: +- blend = 0; +- break; +-#ifdef GL_ARB_point_parameters +- case 6: +- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0); +- break; +- case 7: +- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0); +- break; +-#endif +- case 8: +- glEnable(GL_POINT_SMOOTH); +- break; +- case 9: +- glDisable(GL_POINT_SMOOTH); +- break; +- case 10: +- glPointSize(2.0); +- break; +- case 11: +- glPointSize(4.0); +- break; +- case 12: +- glPointSize(8.0); +- break; +- case 13: +- spin = 1 - spin; +- if (animate && (spin || motion)) { +- glutIdleFunc(idle); +- } else { +- glutIdleFunc(NULL); +- } +- break; +- case 14: +- numPoints = 200; +- break; +- case 15: +- numPoints = 500; +- break; +- case 16: +- numPoints = 1000; +- break; +- case 17: +- numPoints = 2000; +- break; +- case 666: +- exit(0); +- } +- glutPostRedisplay(); +-} +- +-/* ARGSUSED1 */ +-static void +-key(unsigned char c, int x, int y) +-{ +- switch (c) { +- case 13: +- animate = 1 - animate; /* toggle. */ +- if (animate && (motion || spin)) { +- glutIdleFunc(idle); +- } else { +- glutIdleFunc(NULL); +- } +- break; +- case ' ': +- animate = 1; +- makePointList(); +- glutIdleFunc(idle); +- break; +- case 27: +- exit(0); +- } +-} +- +-/* Nice floor texture tiling pattern. */ +-static char *circles[] = { +- "....xxxx........", +- "..xxxxxxxx......", +- ".xxxxxxxxxx.....", +- ".xxx....xxx.....", +- "xxx......xxx....", +- "xxx......xxx....", +- "xxx......xxx....", +- "xxx......xxx....", +- ".xxx....xxx.....", +- ".xxxxxxxxxx.....", +- "..xxxxxxxx......", +- "....xxxx........", +- "................", +- "................", +- "................", +- "................", +-}; +- +-static void +-makeFloorTexture(void) +-{ +- GLubyte floorTexture[16][16][3]; +- GLubyte *loc; +- int s, t; +- +- /* Setup RGB image for the texture. */ +- loc = (GLubyte*) floorTexture; +- for (t = 0; t < 16; t++) { +- for (s = 0; s < 16; s++) { +- if (circles[t][s] == 'x') { +- /* Nice blue. */ +- loc[0] = 0x1f; +- loc[1] = 0x1f; +- loc[2] = 0x8f; +- } else { +- /* Light gray. */ +- loc[0] = 0xca; +- loc[1] = 0xca; +- loc[2] = 0xca; +- } +- loc += 3; +- } +- } +- +- glPixelStorei(GL_UNPACK_ALIGNMENT, 1); +- +- if (useMipmaps) { +- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, +- GL_LINEAR_MIPMAP_LINEAR); +- gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 16, 16, +- GL_RGB, GL_UNSIGNED_BYTE, floorTexture); +- } else { +- if (linearFiltering) { +- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); +- } else { +- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); +- } +- glTexImage2D(GL_TEXTURE_2D, 0, 3, 16, 16, 0, +- GL_RGB, GL_UNSIGNED_BYTE, floorTexture); +- } +-} +- +-int +-main(int argc, char **argv) +-{ +- int i; +- +- glutInitWindowSize(300, 300); +- glutInit(&argc, argv); +- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE); +- +- for (i=1; i<argc; i++) { +- if(!strcmp("-noms", argv[i])) { +- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); +- printf("forcing no multisampling\n"); +- } else if(!strcmp("-nomipmaps", argv[i])) { +- useMipmaps = 0; +- } else if(!strcmp("-nearest", argv[i])) { +- linearFiltering = 0; +- } +- } +- +- glutCreateWindow("point burst"); +- glewInit(); +- glutDisplayFunc(redraw); +- glutMouseFunc(mouse); +- glutMotionFunc(mouseMotion); +- glutVisibilityFunc(visible); +- glutKeyboardFunc(key); +- glutCreateMenu(menu); +- glutAddMenuEntry("Reset time", 0); +- glutAddMenuEntry("Constant", 1); +- glutAddMenuEntry("Linear", 2); +- glutAddMenuEntry("Quadratic", 3); +- glutAddMenuEntry("Blend on", 4); +- glutAddMenuEntry("Blend off", 5); +- glutAddMenuEntry("Threshold 1", 6); +- glutAddMenuEntry("Threshold 10", 7); +- glutAddMenuEntry("Point smooth on", 8); +- glutAddMenuEntry("Point smooth off", 9); +- glutAddMenuEntry("Point size 2", 10); +- glutAddMenuEntry("Point size 4", 11); +- glutAddMenuEntry("Point size 8", 12); +- glutAddMenuEntry("Toggle spin", 13); +- glutAddMenuEntry("200 points ", 14); +- glutAddMenuEntry("500 points ", 15); +- glutAddMenuEntry("1000 points ", 16); +- glutAddMenuEntry("2000 points ", 17); +- glutAddMenuEntry("Quit", 666); +- glutAttachMenu(GLUT_RIGHT_BUTTON); +- +- if (!glutExtensionSupported("GL_ARB_point_parameters")) { +- fprintf(stderr, "Sorry, GL_ARB_point_parameters is not supported.\n"); +- return -1; +- } +- +- glShadeModel(GL_FLAT); +- glEnable(GL_DEPTH_TEST); +- glEnable(GL_POINT_SMOOTH); +- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); +- glPointSize(8.0); +-#if GL_ARB_point_parameters +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); +-#endif +- glMatrixMode(GL_PROJECTION); +- gluPerspective( /* field of view in degree */ 40.0, +- /* aspect ratio */ 1.0, +- /* Z near */ 0.5, /* Z far */ 40.0); +- glMatrixMode(GL_MODELVIEW); +- gluLookAt(0.0, 1.0, 8.0, /* eye location */ +- 0.0, 1.0, 0.0, /* center is at (0,0,0) */ +- 0.0, 1.0, 0.); /* up is in postivie Y direction */ +- glPushMatrix(); /* dummy push so we can pop on model +- recalc */ +- +- makePointList(); +- makeFloorTexture(); +- +- glutMainLoop(); +- return 0; /* ANSI C requires main to return int. */ +-} +diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c mesa-demos-8.0.1//src/demos/spriteblast.c +--- Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c 2010-07-07 13:57:15.000000000 -0400 ++++ mesa-demos-8.0.1/src/demos/spriteblast.c 1969-12-31 19:00:00.000000000 -0500 +@@ -1,555 +0,0 @@ +- +-/* Copyright (c) Mark J. Kilgard, 1997. */ +- +-/* This program is freely distributable without licensing fees +- and is provided without guarantee or warrantee expressed or +- implied. This program is -not- in the public domain. */ +- +-/* This example demonstrates how to render particle effects +- with OpenGL. A cloud of pinkish/orange particles explodes with the +- particles bouncing off the ground. When the EXT_point_parameters +- is present , the particle size is attenuated based on eye distance. */ +- +- +-/* Modified by Brian Paul to test GL_ARB_point_sprite */ +- +- +-#include <stdio.h> +-#include <stdlib.h> +-#include <string.h> +-#include <math.h> /* for cos(), sin(), and sqrt() */ +-#ifdef _WIN32 +-#include <windows.h> +-#endif +-#include <GL/glew.h> +-#include <GL/glut.h> +- +-/* Some <math.h> files do not define M_PI... */ +-#ifndef M_PI +-#define M_PI 3.14159265 +-#endif +- +-#if 0 /* For debugging. */ +-#undef GL_EXT_point_parameters +-#endif +- +-static GLfloat angle = -150; /* in degrees */ +-static int spin = 0; +-static int moving, begin; +-static float theTime; +-static int repeat = 1; +-static int blend = 1; +-int useMipmaps = 1; +-int linearFiltering = 1; +- +-static GLfloat constant[3] = { .2, 0.0, 0.0 }; +-static GLfloat linear[3] = { .0, .1, 0.0 }; +-static GLfloat theQuad[3] = { .005, 0.1, 1/600.0 }; +- +-#define MAX_POINTS 2000 +- +-static int numPoints = 200; +- +-static GLfloat pointList[MAX_POINTS][3]; +-static GLfloat pointTime[MAX_POINTS]; +-static GLfloat pointVelocity[MAX_POINTS][2]; +-static GLfloat pointDirection[MAX_POINTS][2]; +-static int colorList[MAX_POINTS]; +-static int animate = 1, motion = 0, org = 0, sprite = 1, smooth = 1; +- +-static GLfloat colorSet[][4] = { +- /* Shades of red. */ +- { 0.7, 0.2, 0.4, 0.5 }, +- { 0.8, 0.0, 0.7, 0.5 }, +- { 1.0, 0.0, 0.0, 0.5 }, +- { 0.9, 0.3, 0.6, 0.5 }, +- { 1.0, 0.4, 0.0, 0.5 }, +- { 1.0, 0.0, 0.5, 0.5 }, +-}; +- +-#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0])) +- +-#define DEAD (NUM_COLORS+1) +- +- +-/* GL */ +-static GLint spritePattern[16][16] = { +- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, +- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, +- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, +- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 }, +- { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0 }, +- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0 }, +- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, +- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, +- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } +-}; +- +- +- +- +-#if 0 /* drand48 might be better on Unix machines */ +-#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48()) +-#else +-static float float_rand(void) { return rand() / (float) RAND_MAX; } +-#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand()) +-#endif +- +-#define MEAN_VELOCITY 3.0 +-#define GRAVITY 2.0 +- +-/* Modeling units of ground extent in each X and Z direction. */ +-#define EDGE 12 +- +-static void +-makePointList(void) +-{ +- float angle, velocity, direction; +- int i; +- +- motion = 1; +- for (i=0; i<numPoints; i++) { +- pointList[i][0] = 0.0; +- pointList[i][1] = 0.0; +- pointList[i][2] = 0.0; +- pointTime[i] = 0.0; +- angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0; +- direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0; +- pointDirection[i][0] = cos(direction); +- pointDirection[i][1] = sin(direction); +- velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0); +- pointVelocity[i][0] = velocity * cos(angle); +- pointVelocity[i][1] = velocity * sin(angle); +- colorList[i] = rand() % NUM_COLORS; +- } +- theTime = 0.0; +-} +- +-static void +-updatePointList(void) +-{ +- float distance; +- int i; +- +- static double t0 = -1.; +- double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0; +- if (t0 < 0.0) +- t0 = t; +- dt = t - t0; +- t0 = t; +- +- motion = 0; +- for (i=0; i<numPoints; i++) { +- distance = pointVelocity[i][0] * theTime; +- +- /* X and Z */ +- pointList[i][0] = pointDirection[i][0] * distance; +- pointList[i][2] = pointDirection[i][1] * distance; +- +- /* Z */ +- pointList[i][1] = +- (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i]; +- +- /* If we hit the ground, bounce the point upward again. */ +- if (pointList[i][1] <= 0.0) { +- if (distance > EDGE) { +- /* Particle has hit ground past the distance duration of +- the particles. Mark particle as dead. */ +- colorList[i] = NUM_COLORS; /* Not moving. */ +- continue; +- } +- +- pointVelocity[i][1] *= 0.8; /* 80% of previous up velocity. */ +- pointTime[i] = 0.0; /* Reset the particles sense of up time. */ +- } +- motion = 1; +- pointTime[i] += dt; +- } +- theTime += dt; +- if (!motion && !spin) { +- if (repeat) { +- makePointList(); +- } else { +- glutIdleFunc(NULL); +- } +- } +-} +- +-static void +-idle(void) +-{ +- updatePointList(); +- if (spin) { +- angle += 0.3; +- } +- glutPostRedisplay(); +-} +- +-static void +-visible(int vis) +-{ +- if (vis == GLUT_VISIBLE) { +- if (animate && (motion || spin)) { +- glutIdleFunc(idle); +- } +- } else { +- glutIdleFunc(NULL); +- } +-} +- +-static void +-redraw(void) +-{ +- int i; +- +- glDepthMask(GL_TRUE); +- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); +- +- glPushMatrix(); +- glRotatef(15.0, 1.0, 0.0, 0.0); +- glRotatef(angle, 0.0, 1.0, 0.0); +- +- +- /* Draw the floor. */ +-/* glEnable(GL_TEXTURE_2D);*/ +- glColor3f(0.1, 0.5, 1.0); +- glBegin(GL_QUADS); +- glTexCoord2f(0.0, 0.0); +- glVertex3f(-EDGE, -0.05, -EDGE); +- glTexCoord2f(20.0, 0.0); +- glVertex3f(EDGE, -0.05, -EDGE); +- glTexCoord2f(20.0, 20.0); +- glVertex3f(EDGE, -0.05, EDGE); +- glTexCoord2f(0.0, 20.0); +- glVertex3f(-EDGE, -0.05, EDGE); +- glEnd(); +- +- /* Allow particles to blend with each other. */ +- glDepthMask(GL_FALSE); +- +- if (blend) +- glEnable(GL_BLEND); +- +- if (sprite) { +- glEnable(GL_TEXTURE_2D); +-#ifdef GL_ARB_point_sprite +- glEnable(GL_POINT_SPRITE_ARB); +-#endif +- } +- +- glColor3f(1,1,1); +- glBegin(GL_POINTS); +- for (i=0; i<numPoints; i++) { +- /* Draw alive particles. */ +- if (colorList[i] != DEAD) { +- if (!sprite) glColor4fv(colorSet[colorList[i]]); +- glVertex3fv(pointList[i]); +- } +- } +- glEnd(); +- +- glDisable(GL_TEXTURE_2D); +-#ifdef GL_ARB_point_sprite +- glDisable(GL_POINT_SPRITE_ARB); +-#endif +- glDisable(GL_BLEND); +- +- glPopMatrix(); +- +- glutSwapBuffers(); +-} +- +-/* ARGSUSED2 */ +-static void +-mouse(int button, int state, int x, int y) +-{ +- /* Scene can be spun around Y axis using left +- mouse button movement. */ +- if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) { +- moving = 1; +- begin = x; +- } +- if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) { +- moving = 0; +- } +-} +- +-/* ARGSUSED1 */ +-static void +-mouseMotion(int x, int y) +-{ +- if (moving) { +- angle = angle + (x - begin); +- begin = x; +- glutPostRedisplay(); +- } +-} +- +-static void +-menu(int option) +-{ +- switch (option) { +- case 0: +- makePointList(); +- break; +-#ifdef GL_ARB_point_parameters +- case 1: +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant); +- break; +- case 2: +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear); +- break; +- case 3: +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); +- break; +-#endif +- case 4: +- blend = 1; +- break; +- case 5: +- blend = 0; +- break; +-#ifdef GL_ARB_point_parameters +- case 6: +- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0); +- break; +- case 7: +- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0); +- break; +-#endif +- case 8: +- glEnable(GL_POINT_SMOOTH); +- smooth = 1; +- break; +- case 9: +- glDisable(GL_POINT_SMOOTH); +- smooth = 0; +- break; +- case 10: +- glPointSize(16.0); +- break; +- case 11: +- glPointSize(32.0); +- break; +- case 12: +- glPointSize(64.0); +- break; +- case 13: +- spin = 1 - spin; +- if (animate && (spin || motion)) { +- glutIdleFunc(idle); +- } else { +- glutIdleFunc(NULL); +- } +- break; +- case 14: +- numPoints = 200; +- break; +- case 15: +- numPoints = 500; +- break; +- case 16: +- numPoints = 1000; +- break; +- case 17: +- numPoints = 2000; +- break; +- case 666: +- exit(0); +- } +- glutPostRedisplay(); +-} +- +-/* ARGSUSED1 */ +-static void +-key(unsigned char c, int x, int y) +-{ +- switch (c) { +- case 13: +- animate = 1 - animate; /* toggle. */ +- if (animate && (motion || spin)) { +- glutIdleFunc(idle); +- } else { +- glutIdleFunc(NULL); +- } +- break; +- case ' ': +- animate = 1; +- makePointList(); +- glutIdleFunc(idle); +- break; +- case 'o': +- case 'O': +- org ^= 1; +-#ifdef GL_VERSION_2_0 +-#ifdef GL_ARB_point_parameters +- glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, +- org ? GL_LOWER_LEFT : GL_UPPER_LEFT); +-#endif +-#endif +- glutPostRedisplay(); +- break; +- case 't': +- case 'T': +- sprite ^= 1; +- glutPostRedisplay(); +- break; +- case 's': +- case 'S': +- (smooth ^= 1) ? glEnable(GL_POINT_SMOOTH) : glDisable(GL_POINT_SMOOTH); +- glutPostRedisplay(); +- break; +- case '0': +- glPointSize(1.0); +- glutPostRedisplay(); +- break; +- case '1': +- glPointSize(16.0); +- glutPostRedisplay(); +- break; +- case '2': +- glPointSize(32.0); +- glutPostRedisplay(); +- break; +- case '3': +- glPointSize(64.0); +- glutPostRedisplay(); +- break; +- case '4': +- glPointSize(128.0); +- glutPostRedisplay(); +- break; +- case 27: +- exit(0); +- } +-} +- +- +- +-static void +-makeSprite(void) +-{ +- GLubyte texture[16][16][4]; +- int i, j; +- +- if (!glutExtensionSupported("GL_ARB_point_sprite")) { +- printf("Sorry, this demo requires GL_ARB_point_sprite.\n"); +- exit(0); +- } +- if (!glutExtensionSupported("GL_ARB_point_parameters")) { +- printf("Sorry, this demo requires GL_ARB_point_parameters.\n"); +- exit(0); +- } +- +- for (i = 0; i < 16; i++) { +- for (j = 0; j < 16; j++) { +- if (spritePattern[i][j]) { +- texture[i][j][0] = 255; +- texture[i][j][1] = 255; +- texture[i][j][2] = 255; +- texture[i][j][3] = 255; +- } +- else { +- texture[i][j][0] = 255; +- texture[i][j][1] = 0; +- texture[i][j][2] = 0; +- texture[i][j][3] = 0; +- } +- } +- } +- +- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, +- texture); +- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); +- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); +-#ifdef GL_ARB_point_sprite +- glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); +-#endif +-} +- +- +-static void +-reshape(int width, int height) +-{ +- GLfloat h = (GLfloat) height / (GLfloat) width; +- +- glViewport(0, 0, (GLint) width, (GLint) height); +- glMatrixMode(GL_PROJECTION); +- glLoadIdentity(); +- glFrustum(-1.0, 1.0, -h, h, 2.0, 30.0); +- glMatrixMode(GL_MODELVIEW); +- glLoadIdentity(); +- glTranslatef(0.0, 0.0, -10.0); +-} +- +-int +-main(int argc, char **argv) +-{ +- int i; +- +- glutInitWindowSize(600,300); +- glutInit(&argc, argv); +- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE); +- +- for (i=1; i<argc; i++) { +- if(!strcmp("-noms", argv[i])) { +- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); +- printf("forcing no multisampling\n"); +- } else if(!strcmp("-nomipmaps", argv[i])) { +- useMipmaps = 0; +- } else if(!strcmp("-nearest", argv[i])) { +- linearFiltering = 0; +- } +- } +- glutCreateWindow("sprite blast"); +- glewInit(); +- glutReshapeFunc(reshape); +- glutDisplayFunc(redraw); +- glutMouseFunc(mouse); +- glutMotionFunc(mouseMotion); +- glutVisibilityFunc(visible); +- glutKeyboardFunc(key); +- glutCreateMenu(menu); +- glutAddMenuEntry("Reset time", 0); +- glutAddMenuEntry("Constant", 1); +- glutAddMenuEntry("Linear", 2); +- glutAddMenuEntry("Quadratic", 3); +- glutAddMenuEntry("Blend on", 4); +- glutAddMenuEntry("Blend off", 5); +- glutAddMenuEntry("Threshold 1", 6); +- glutAddMenuEntry("Threshold 10", 7); +- glutAddMenuEntry("Point smooth on", 8); +- glutAddMenuEntry("Point smooth off", 9); +- glutAddMenuEntry("Point size 16", 10); +- glutAddMenuEntry("Point size 32", 11); +- glutAddMenuEntry("Point size 64", 12); +- glutAddMenuEntry("Toggle spin", 13); +- glutAddMenuEntry("200 points ", 14); +- glutAddMenuEntry("500 points ", 15); +- glutAddMenuEntry("1000 points ", 16); +- glutAddMenuEntry("2000 points ", 17); +- glutAddMenuEntry("Quit", 666); +- glutAttachMenu(GLUT_RIGHT_BUTTON); +- +- makePointList(); +- makeSprite(); +- +- glShadeModel(GL_FLAT); +- glEnable(GL_DEPTH_TEST); +- glEnable(GL_POINT_SMOOTH); +- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); +- glPointSize(32.0); +-#ifdef GL_ARB_point_parameters +- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad); +-#endif +- +- glutMainLoop(); +- return 0; /* ANSI C requires main to return int. */ +-} diff --git a/libre/lib32-sdl-libre/PKGBUILD b/libre/lib32-sdl-libre/PKGBUILD new file mode 100644 index 000000000..a1fa02a0a --- /dev/null +++ b/libre/lib32-sdl-libre/PKGBUILD @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgbasename=sdl-libre +pkgname=lib32-$_pkgbasename +pkgver=1.2.15 +pkgrel=3 +pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit)" +arch=('x86_64') +url="http://www.libsdl.org" +license=('LGPL') +provides=("lib32-sdl=${pkgver}") +conflicts=('lib32-sdl') +replaces=('lib32-sdl') +depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename) +makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib) +optdepends=('lib32-alsa-lib: ALSA audio driver' + 'lib32-libpulse: PulseAudio audio driver') +options=('!libtool') +source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz + sdl-1.2.14-fix-mouse-clicking.patch + sdl-1.2.14-disable-mmx.patch + fix_joystick_misc_axes.diff + libsdl-1.2.15-resizing.patch + libre.patch) +md5sums=('9d96df8417572a2afb781a7c4c811a85' + '04d8c179f125e04bcd4c9d60e013c2d7' + 'e5c16b7611f62c7cb25f0534eff68852' + '687586a108b597a2a6b73070c1d37e51' + '3dd50347d8856160a9cbd7f80383a1f8' + '5c665f72b8a2adc97a91f6db6f2da79a') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd SDL-$pkgver + patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch + patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch + patch -Np1 -i ../fix_joystick_misc_axes.diff + patch -Np1 -i ../libsdl-1.2.15-resizing.patch + patch -Np0 -i ../libre.patch + ./configure --prefix=/usr --disable-nasm --enable-alsa \ + --with-x --disable-rpath --disable-static --libdir=/usr/lib32 + make +} + +package() { + cd SDL-$pkgver + make DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/{include,share} + + cd "$pkgdir/usr/bin" + mv sdl-config sdl-config-32 +} diff --git a/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff b/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff new file mode 100644 index 000000000..75e3755c9 --- /dev/null +++ b/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff @@ -0,0 +1,13 @@ +diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c +index ee43974..80e46e4 100644 +--- a/src/joystick/linux/SDL_sysjoystick.c ++++ b/src/joystick/linux/SDL_sysjoystick.c +@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd) + ++joystick->nbuttons; + } + } +- for ( i=0; i<ABS_MISC; ++i ) { ++ for ( i=0; i<ABS_MAX; ++i ) { + /* Skip hats */ + if ( i == ABS_HAT0X ) { + i = ABS_HAT3Y; diff --git a/libre/lib32-sdl-libre/libre.patch b/libre/lib32-sdl-libre/libre.patch new file mode 100644 index 000000000..72f7da56a --- /dev/null +++ b/libre/lib32-sdl-libre/libre.patch @@ -0,0 +1,578 @@ +--- src/video/fbcon/riva_mmio.h 2012-01-19 04:30:06.000000000 -0200 ++++ /dev/null 2012-04-01 13:58:27.776718756 -0300 +@@ -1,449 +0,0 @@ +-/***************************************************************************\ +-|* *| +-|* Copyright 1993-1999 NVIDIA, Corporation. All rights reserved. *| +-|* *| +-|* NOTICE TO USER: The source code is copyrighted under U.S. and *| +-|* international laws. Users and possessors of this source code are *| +-|* hereby granted a nonexclusive, royalty-free copyright license to *| +-|* use this code in individual and commercial software. *| +-|* *| +-|* Any use of this source code must include, in the user documenta- *| +-|* tion and internal comments to the code, notices to the end user *| +-|* as follows: *| +-|* *| +-|* Copyright 1993-1999 NVIDIA, Corporation. All rights reserved. *| +-|* *| +-|* NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY *| +-|* OF THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" *| +-|* WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND. NVIDIA, CORPOR- *| +-|* ATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOURCE CODE, *| +-|* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE- *| +-|* MENT, AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL *| +-|* NVIDIA, CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT, INCI- *| +-|* DENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RE- *| +-|* SULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION *| +-|* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *| +-|* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. *| +-|* *| +-|* U.S. Government End Users. This source code is a "commercial *| +-|* item," as that term is defined at 48 C.F.R. 2.101 (OCT 1995), *| +-|* consisting of "commercial computer software" and "commercial *| +-|* computer software documentation," as such terms are used in *| +-|* 48 C.F.R. 12.212 (SEPT 1995) and is provided to the U.S. Govern- *| +-|* ment only as a commercial end item. Consistent with 48 C.F.R. *| +-|* 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (JUNE 1995), *| +-|* all U.S. Government End Users acquire the source code with only *| +-|* those rights set forth herein. *| +-|* *| +-\***************************************************************************/ +- +-#ifndef __RIVA_HW_H__ +-#define __RIVA_HW_H__ +-#define RIVA_SW_VERSION 0x00010003 +- +-/* +- * Typedefs to force certain sized values. +- */ +-typedef Uint8 U008; +-typedef Uint16 U016; +-typedef Uint32 U032; +- +-/* +- * HW access macros. +- */ +-#define NV_WR08(p,i,d) (((U008 *)(p))[i]=(d)) +-#define NV_RD08(p,i) (((U008 *)(p))[i]) +-#define NV_WR16(p,i,d) (((U016 *)(p))[(i)/2]=(d)) +-#define NV_RD16(p,i) (((U016 *)(p))[(i)/2]) +-#define NV_WR32(p,i,d) (((U032 *)(p))[(i)/4]=(d)) +-#define NV_RD32(p,i) (((U032 *)(p))[(i)/4]) +-#define VGA_WR08(p,i,d) NV_WR08(p,i,d) +-#define VGA_RD08(p,i) NV_RD08(p,i) +- +-/* +- * Define supported architectures. +- */ +-#define NV_ARCH_03 0x03 +-#define NV_ARCH_04 0x04 +-#define NV_ARCH_10 0x10 +-/***************************************************************************\ +-* * +-* FIFO registers. * +-* * +-\***************************************************************************/ +- +-/* +- * Raster OPeration. Windows style ROP3. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 Rop3; +-} RivaRop; +-/* +- * 8X8 Monochrome pattern. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BD]; +- U032 Shape; +- U032 reserved03[0x001]; +- U032 Color0; +- U032 Color1; +- U032 Monochrome[2]; +-} RivaPattern; +-/* +- * Scissor clip rectangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 TopLeft; +- U032 WidthHeight; +-} RivaClip; +-/* +- * 2D filled rectangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 Color; +- U032 reserved03[0x03E]; +- U032 TopLeft; +- U032 WidthHeight; +-} RivaRectangle; +-/* +- * 2D screen-screen BLT. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 TopLeftSrc; +- U032 TopLeftDst; +- U032 WidthHeight; +-} RivaScreenBlt; +-/* +- * 2D pixel BLT. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 TopLeft; +- U032 WidthHeight; +- U032 WidthHeightIn; +- U032 reserved02[0x03C]; +- U032 Pixels; +-} RivaPixmap; +-/* +- * Filled rectangle combined with monochrome expand. Useful for glyphs. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 reserved03[(0x040)-1]; +- U032 Color1A; +- struct +- { +- U032 TopLeft; +- U032 WidthHeight; +- } UnclippedRectangle[64]; +- U032 reserved04[(0x080)-3]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipB; +- U032 Color1B; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClippedRectangle[64]; +- U032 reserved05[(0x080)-5]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipC; +- U032 Color1C; +- U032 WidthHeightC; +- U032 PointC; +- U032 MonochromeData1C; +- U032 reserved06[(0x080)+121]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipD; +- U032 Color1D; +- U032 WidthHeightInD; +- U032 WidthHeightOutD; +- U032 PointD; +- U032 MonochromeData1D; +- U032 reserved07[(0x080)+120]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipE; +- U032 Color0E; +- U032 Color1E; +- U032 WidthHeightInE; +- U032 WidthHeightOutE; +- U032 PointE; +- U032 MonochromeData01E; +-} RivaBitmap; +-/* +- * 3D textured, Z buffered triangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BC]; +- U032 TextureOffset; +- U032 TextureFormat; +- U032 TextureFilter; +- U032 FogColor; +-/* This is a problem on LynxOS */ +-#ifdef Control +-#undef Control +-#endif +- U032 Control; +- U032 AlphaTest; +- U032 reserved02[0x339]; +- U032 FogAndIndex; +- U032 Color; +- float ScreenX; +- float ScreenY; +- float ScreenZ; +- float EyeM; +- float TextureS; +- float TextureT; +-} RivaTexturedTriangle03; +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 ColorKey; +- U032 TextureOffset; +- U032 TextureFormat; +- U032 TextureFilter; +- U032 Blend; +-/* This is a problem on LynxOS */ +-#ifdef Control +-#undef Control +-#endif +- U032 Control; +- U032 FogColor; +- U032 reserved02[0x39]; +- struct +- { +- float ScreenX; +- float ScreenY; +- float ScreenZ; +- float EyeM; +- U032 Color; +- U032 Specular; +- float TextureS; +- float TextureT; +- } Vertex[16]; +- U032 DrawTriangle3D; +-} RivaTexturedTriangle05; +-/* +- * 2D line. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 Color; /* source color 0304-0307*/ +- U032 Reserved02[0x03e]; +- struct { /* start aliased methods in array 0400- */ +- U032 point0; /* y_x S16_S16 in pixels 0- 3*/ +- U032 point1; /* y_x S16_S16 in pixels 4- 7*/ +- } Lin[16]; /* end of aliased methods in array -047f*/ +- struct { /* start aliased methods in array 0480- */ +- U032 point0X; /* in pixels, 0 at left 0- 3*/ +- U032 point0Y; /* in pixels, 0 at top 4- 7*/ +- U032 point1X; /* in pixels, 0 at left 8- b*/ +- U032 point1Y; /* in pixels, 0 at top c- f*/ +- } Lin32[8]; /* end of aliased methods in array -04ff*/ +- U032 PolyLin[32]; /* y_x S16_S16 in pixels 0500-057f*/ +- struct { /* start aliased methods in array 0580- */ +- U032 x; /* in pixels, 0 at left 0- 3*/ +- U032 y; /* in pixels, 0 at top 4- 7*/ +- } PolyLin32[16]; /* end of aliased methods in array -05ff*/ +- struct { /* start aliased methods in array 0600- */ +- U032 color; /* source color 0- 3*/ +- U032 point; /* y_x S16_S16 in pixels 4- 7*/ +- } ColorPolyLin[16]; /* end of aliased methods in array -067f*/ +-} RivaLine; +-/* +- * 2D/3D surfaces +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BE]; +- U032 Offset; +-} RivaSurface; +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BD]; +- U032 Pitch; +- U032 RenderBufferOffset; +- U032 ZBufferOffset; +-} RivaSurface3D; +- +-/***************************************************************************\ +-* * +-* Virtualized RIVA H/W interface. * +-* * +-\***************************************************************************/ +- +-struct _riva_hw_inst; +-struct _riva_hw_state; +-/* +- * Virtialized chip interface. Makes RIVA 128 and TNT look alike. +- */ +-typedef struct _riva_hw_inst +-{ +- /* +- * Chip specific settings. +- */ +- U032 Architecture; +- U032 Version; +- U032 CrystalFreqKHz; +- U032 RamAmountKBytes; +- U032 MaxVClockFreqKHz; +- U032 RamBandwidthKBytesPerSec; +- U032 EnableIRQ; +- U032 IO; +- U032 VBlankBit; +- U032 FifoFreeCount; +- U032 FifoEmptyCount; +- /* +- * Non-FIFO registers. +- */ +- volatile U032 *PCRTC; +- volatile U032 *PRAMDAC; +- volatile U032 *PFB; +- volatile U032 *PFIFO; +- volatile U032 *PGRAPH; +- volatile U032 *PEXTDEV; +- volatile U032 *PTIMER; +- volatile U032 *PMC; +- volatile U032 *PRAMIN; +- volatile U032 *FIFO; +- volatile U032 *CURSOR; +- volatile U032 *CURSORPOS; +- volatile U032 *VBLANKENABLE; +- volatile U032 *VBLANK; +- volatile U008 *PCIO; +- volatile U008 *PVIO; +- volatile U008 *PDIO; +- /* +- * Common chip functions. +- */ +- int (*Busy)(struct _riva_hw_inst *); +- void (*CalcStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *,int,int,int,int,int,int,int,int,int,int,int,int,int); +- void (*LoadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *); +- void (*UnloadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *); +- void (*SetStartAddress)(struct _riva_hw_inst *,U032); +- void (*SetSurfaces2D)(struct _riva_hw_inst *,U032,U032); +- void (*SetSurfaces3D)(struct _riva_hw_inst *,U032,U032); +- int (*ShowHideCursor)(struct _riva_hw_inst *,int); +- void (*LockUnlock)(struct _riva_hw_inst *, int); +- /* +- * Current extended mode settings. +- */ +- struct _riva_hw_state *CurrentState; +- /* +- * FIFO registers. +- */ +- RivaRop *Rop; +- RivaPattern *Patt; +- RivaClip *Clip; +- RivaPixmap *Pixmap; +- RivaScreenBlt *Blt; +- RivaBitmap *Bitmap; +- RivaLine *Line; +- RivaTexturedTriangle03 *Tri03; +- RivaTexturedTriangle05 *Tri05; +-} RIVA_HW_INST; +-/* +- * Extended mode state information. +- */ +-typedef struct _riva_hw_state +-{ +- U032 bpp; +- U032 width; +- U032 height; +- U032 repaint0; +- U032 repaint1; +- U032 screen; +- U032 pixel; +- U032 horiz; +- U032 arbitration0; +- U032 arbitration1; +- U032 vpll; +- U032 pllsel; +- U032 general; +- U032 config; +- U032 cursor0; +- U032 cursor1; +- U032 cursor2; +- U032 offset0; +- U032 offset1; +- U032 offset2; +- U032 offset3; +- U032 pitch0; +- U032 pitch1; +- U032 pitch2; +- U032 pitch3; +-} RIVA_HW_STATE; +- +-/* +- * FIFO Free Count. Should attempt to yield processor if RIVA is busy. +- */ +- +-#define RIVA_FIFO_FREE(hwptr,cnt) \ +-{ \ +- while (FifoFreeCount < (cnt)) \ +- FifoFreeCount = hwptr->FifoFree >> 2; \ +- FifoFreeCount -= (cnt); \ +-} +-#endif /* __RIVA_HW_H__ */ +- +--- src/video/fbcon/SDL_fbriva.c 2012-01-19 04:30:06.000000000 -0200 ++++ src/video/fbcon/SDL_fbriva.c 2012-04-01 15:10:10.108451467 -0300 +@@ -24,12 +24,10 @@ + #include "SDL_video.h" + #include "../SDL_blit.h" + #include "SDL_fbriva.h" +-#include "riva_mmio.h" + #include "riva_regs.h" + + + static int FifoEmptyCount = 0; +-static int FifoFreeCount = 0; + + /* Wait for vertical retrace */ + static void WaitVBL(_THIS) +@@ -41,20 +39,6 @@ + while ( !(*port & 0x08) ) + ; + } +-static void NV3WaitIdle(_THIS) +-{ +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); +- while ( (Rop->FifoFree < FifoEmptyCount) || +- (*(mapped_io + PGRAPH_OFFSET + 0x000006B0) & 0x01) ) +- ; +-} +-static void NV4WaitIdle(_THIS) +-{ +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); +- while ( (Rop->FifoFree < FifoEmptyCount) || +- (*(mapped_io + PGRAPH_OFFSET + 0x00000700) & 0x01) ) +- ; +-} + + #if 0 /* Not yet implemented? */ + /* Sets video mem colorkey and accelerated blit function */ +@@ -74,7 +58,6 @@ + { + int dstX, dstY; + int dstW, dstH; +- RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET); + + /* Don't blit to the display surface when switched away */ + if ( switched_away ) { +@@ -93,13 +76,6 @@ + dstX += rect->x; + dstY += rect->y; + +- RIVA_FIFO_FREE(Bitmap, 1); +- Bitmap->Color1A = color; +- +- RIVA_FIFO_FREE(Bitmap, 2); +- Bitmap->UnclippedRectangle[0].TopLeft = (dstX << 16) | dstY; +- Bitmap->UnclippedRectangle[0].WidthHeight = (dstW << 16) | dstH; +- + FB_AddBusySurface(dst); + + if ( dst == this->screen ) { +@@ -115,7 +91,6 @@ + int srcX, srcY; + int dstX, dstY; + int dstW, dstH; +- RivaScreenBlt *Blt = (RivaScreenBlt *)(mapped_io + BLT_OFFSET); + + /* FIXME: For now, only blit to display surface */ + if ( dst->pitch != SDL_VideoSurface->pitch ) { +@@ -142,11 +117,6 @@ + dstX += dstrect->x; + dstY += dstrect->y; + +- RIVA_FIFO_FREE(Blt, 3); +- Blt->TopLeftSrc = (srcY << 16) | srcX; +- Blt->TopLeftDst = (dstY << 16) | dstX; +- Blt->WidthHeight = (dstH << 16) | dstW; +- + FB_AddBusySurface(src); + FB_AddBusySurface(dst); + +@@ -185,23 +155,15 @@ + + void FB_RivaAccel(_THIS, __u32 card) + { +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); + + /* We have hardware accelerated surface functions */ + this->CheckHWBlit = CheckHWBlit; + wait_vbl = WaitVBL; + switch (card) { +- case FB_ACCEL_NV3: +- wait_idle = NV3WaitIdle; +- break; +- case FB_ACCEL_NV4: +- wait_idle = NV4WaitIdle; +- break; + default: + /* Hmm... FIXME */ + break; + } +- FifoEmptyCount = Rop->FifoFree; + + /* The Riva has an accelerated color fill */ + this->info.blit_fill = 1; +--- src/video/fbcon/SDL_fbvideo.c.orig 2011-09-08 17:30:03.670583685 +0200 ++++ src/video/fbcon/SDL_fbvideo.c 2011-09-08 17:30:24.230582737 +0200 +@@ -46,7 +46,6 @@ + #include "SDL_fbevents_c.h" + #include "SDL_fb3dfx.h" + #include "SDL_fbmatrox.h" +-#include "SDL_fbriva.h" + + /*#define FBCON_DEBUG*/ + +@@ -769,13 +768,6 @@ + #endif + FB_3DfxAccel(this, finfo.accel); + break; +- case FB_ACCEL_NV3: +- case FB_ACCEL_NV4: +-#ifdef FBACCEL_DEBUG +- printf("NVidia hardware accelerator!\n"); +-#endif +- FB_RivaAccel(this, finfo.accel); +- break; + default: + #ifdef FBACCEL_DEBUG + printf("Unknown hardware accelerator.\n"); diff --git a/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch b/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch new file mode 100644 index 000000000..0655a13e1 --- /dev/null +++ b/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch @@ -0,0 +1,63 @@ +Description: Revert change that breaks window corner resizing + http://bugzilla.libsdl.org/show_bug.cgi?id=1430 +Author: Andrew Caudwell <acaudwell@gmail.com> +Last-Update: 2012-04-10 +Bug-Debian: http://bugs.debian.org/665779 + +diff -r c787fb1b5699 src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 +@@ -57,12 +57,6 @@ + static SDLKey MISC_keymap[256]; + SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); + +-/* +- Pending resize target for ConfigureNotify (so outdated events don't +- cause inappropriate resize events) +-*/ +-int X11_PendingConfigureNotifyWidth = -1; +-int X11_PendingConfigureNotifyHeight = -1; + + #ifdef X_HAVE_UTF8_STRING + Uint32 Utf8ToUcs4(const Uint8 *utf8) +@@ -825,16 +819,6 @@ + #ifdef DEBUG_XEVENTS + printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); + #endif +- if ((X11_PendingConfigureNotifyWidth != -1) && +- (X11_PendingConfigureNotifyHeight != -1)) { +- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && +- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { +- /* Event is from before the resize, so ignore. */ +- break; +- } +- X11_PendingConfigureNotifyWidth = -1; +- X11_PendingConfigureNotifyHeight = -1; +- } + if ( SDL_VideoSurface ) { + if ((xevent.xconfigure.width != SDL_VideoSurface->w) || + (xevent.xconfigure.height != SDL_VideoSurface->h)) { +diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h +--- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 +@@ -27,8 +27,3 @@ + extern void X11_InitOSKeymap(_THIS); + extern void X11_PumpEvents(_THIS); + extern void X11_SetKeyboardState(Display *display, const char *key_vec); +- +-/* Variables to be exported */ +-extern int X11_PendingConfigureNotifyWidth; +-extern int X11_PendingConfigureNotifyHeight; +- +diff -r c787fb1b5699 src/video/x11/SDL_x11video.c +--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 +@@ -1182,8 +1182,6 @@ + current = NULL; + goto done; + } +- X11_PendingConfigureNotifyWidth = width; +- X11_PendingConfigureNotifyHeight = height; + } else { + if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { + current = NULL; diff --git a/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch new file mode 100644 index 000000000..1bb6e0e47 --- /dev/null +++ b/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch @@ -0,0 +1,13 @@ +# and another one from FS#26020 + +--- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 ++++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700 +@@ -89,6 +89,8 @@ + #include "SDL_yuvfuncs.h" + #include "SDL_yuv_sw_c.h" + ++#undef __OPTIMIZE__ ++ + /* The functions used to manipulate software video overlays */ + static struct private_yuvhwfuncs sw_yuvfuncs = { + SDL_LockYUV_SW, diff --git a/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch new file mode 100644 index 000000000..7d3e5acfc --- /dev/null +++ b/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch @@ -0,0 +1,23 @@ +--- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 ++++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 +@@ -423,12 +423,15 @@ + if ( xevent.xcrossing.mode == NotifyUngrab ) + printf("Mode: NotifyUngrab\n"); + #endif +- if ( this->input_grab == SDL_GRAB_OFF ) { +- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ if ( (xevent.xcrossing.mode != NotifyGrab) && ++ (xevent.xcrossing.mode != NotifyUngrab) ) { ++ if ( this->input_grab == SDL_GRAB_OFF ) { ++ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ } ++ posted = SDL_PrivateMouseMotion(0, 0, ++ xevent.xcrossing.x, ++ xevent.xcrossing.y); + } +- posted = SDL_PrivateMouseMotion(0, 0, +- xevent.xcrossing.x, +- xevent.xcrossing.y); + } + break; + diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD index c4eabb9db..9822d5df7 100644 --- a/libre/sdl-libre/PKGBUILD +++ b/libre/sdl-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165847 2012-09-01 12:22:15Z heftig $ +# $Id: PKGBUILD 166672 2012-09-15 09:39:11Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -8,7 +8,7 @@ pkgname=sdl-libre pkgver=1.2.15 -pkgrel=2 +pkgrel=3 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" arch=('i686' 'x86_64') url="http://www.libsdl.org" @@ -18,16 +18,20 @@ conflicts=('sdl') replaces=('sdl') depends=('glibc' 'libxext' 'libxrender' 'libx11') makedepends=('alsa-lib' 'mesa' 'libpulse') +optdepends=('alsa-lib: ALSA audio driver' + 'libpulse: PulseAudio audio driver') options=('!libtool') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz sdl-1.2.14-fix-mouse-clicking.patch sdl-1.2.14-disable-mmx.patch fix_joystick_misc_axes.diff + libsdl-1.2.15-resizing.patch libre.patch) md5sums=('9d96df8417572a2afb781a7c4c811a85' '04d8c179f125e04bcd4c9d60e013c2d7' 'e5c16b7611f62c7cb25f0534eff68852' '687586a108b597a2a6b73070c1d37e51' + '3dd50347d8856160a9cbd7f80383a1f8' '5c665f72b8a2adc97a91f6db6f2da79a') build() { @@ -35,8 +39,9 @@ build() { patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch patch -Np1 -i ../fix_joystick_misc_axes.diff + patch -Np1 -i ../libsdl-1.2.15-resizing.patch patch -Np0 -i ../libre.patch - ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \ + ./configure --prefix=/usr --disable-nasm --enable-alsa \ --with-x --disable-rpath --disable-static make } diff --git a/libre/sdl-libre/libsdl-1.2.15-resizing.patch b/libre/sdl-libre/libsdl-1.2.15-resizing.patch new file mode 100644 index 000000000..0655a13e1 --- /dev/null +++ b/libre/sdl-libre/libsdl-1.2.15-resizing.patch @@ -0,0 +1,63 @@ +Description: Revert change that breaks window corner resizing + http://bugzilla.libsdl.org/show_bug.cgi?id=1430 +Author: Andrew Caudwell <acaudwell@gmail.com> +Last-Update: 2012-04-10 +Bug-Debian: http://bugs.debian.org/665779 + +diff -r c787fb1b5699 src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 +@@ -57,12 +57,6 @@ + static SDLKey MISC_keymap[256]; + SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); + +-/* +- Pending resize target for ConfigureNotify (so outdated events don't +- cause inappropriate resize events) +-*/ +-int X11_PendingConfigureNotifyWidth = -1; +-int X11_PendingConfigureNotifyHeight = -1; + + #ifdef X_HAVE_UTF8_STRING + Uint32 Utf8ToUcs4(const Uint8 *utf8) +@@ -825,16 +819,6 @@ + #ifdef DEBUG_XEVENTS + printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); + #endif +- if ((X11_PendingConfigureNotifyWidth != -1) && +- (X11_PendingConfigureNotifyHeight != -1)) { +- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && +- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { +- /* Event is from before the resize, so ignore. */ +- break; +- } +- X11_PendingConfigureNotifyWidth = -1; +- X11_PendingConfigureNotifyHeight = -1; +- } + if ( SDL_VideoSurface ) { + if ((xevent.xconfigure.width != SDL_VideoSurface->w) || + (xevent.xconfigure.height != SDL_VideoSurface->h)) { +diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h +--- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 +@@ -27,8 +27,3 @@ + extern void X11_InitOSKeymap(_THIS); + extern void X11_PumpEvents(_THIS); + extern void X11_SetKeyboardState(Display *display, const char *key_vec); +- +-/* Variables to be exported */ +-extern int X11_PendingConfigureNotifyWidth; +-extern int X11_PendingConfigureNotifyHeight; +- +diff -r c787fb1b5699 src/video/x11/SDL_x11video.c +--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 +@@ -1182,8 +1182,6 @@ + current = NULL; + goto done; + } +- X11_PendingConfigureNotifyWidth = width; +- X11_PendingConfigureNotifyHeight = height; + } else { + if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { + current = NULL; diff --git a/multilib/lib32-gtk2/PKGBUILD b/multilib/lib32-gtk2/PKGBUILD index 65c4a1ca7..56e68297d 100644 --- a/multilib/lib32-gtk2/PKGBUILD +++ b/multilib/lib32-gtk2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76349 2012-09-16 10:33:37Z lcarlier $ +# $Id: PKGBUILD 76654 2012-09-25 20:31:20Z bluewind $ # Maintainer: Ionut Biru <ibiru@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> _pkgbasename=gtk2 pkgname=lib32-$_pkgbasename -pkgver=2.24.12 +pkgver=2.24.13 pkgrel=1 pkgdesc="The GTK+ Toolkit (v2) (32-bit)" arch=('x86_64') @@ -20,7 +20,7 @@ license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz xid-collision-debug.patch gtk-modules-32.patch) -sha256sums=('c5eba3b9259e4bf7554e9dc9db5d72038aa8b1bdd40fa0364b3705c226d11808' +sha256sums=('35e1a01e46b02970b02ee9f299390d0aa57c1215ad2667bcd584b72f4ea6513d' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' '2effb13404442ae266d4c663347e88cd1ca19e9a83b452da1743bac16af9c7b0') diff --git a/multilib/lib32-qt/PKGBUILD b/multilib/lib32-qt/PKGBUILD index 34fec0e0e..8eb2a911a 100644 --- a/multilib/lib32-qt/PKGBUILD +++ b/multilib/lib32-qt/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 74654 2012-08-01 08:56:28Z bluewind $ +# $Id: PKGBUILD 76658 2012-09-25 20:46:48Z bluewind $ # Maintainer: Florian Pritz <flo@xssn.at> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> _pkgbasename=qt pkgname=lib32-$_pkgbasename -pkgver=4.8.2 -pkgrel=2 +pkgver=4.8.3 +pkgrel=1 pkgdesc='A cross-platform application and UI framework (32-bit)' arch=('x86_64') url='http://qt-project.org/' @@ -20,7 +20,7 @@ makedepends=(cups gcc-multilib lib32-{mesa,libcups,libxfixes,gtk2}) options=('!libtool') _pkgfqn="${_pkgbasename}-everywhere-opensource-src-${pkgver}" source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz") -md5sums=('3c1146ddf56247e16782f96910a8423b') +md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b') build() { cd $srcdir/$_pkgfqn diff --git a/pcr/perl-expect/PKGBUILD b/pcr/perl-expect/PKGBUILD new file mode 100644 index 000000000..fefa03a0b --- /dev/null +++ b/pcr/perl-expect/PKGBUILD @@ -0,0 +1,52 @@ +# CPAN Name : Expect +# Contributor: Max Roder <maxroder@web.de> +# Contributor: DarkHeart +# Generator : CPANPLUS::Dist::Arch 1.19 +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname='perl-expect' +pkgver='1.21' +pkgrel='2' +pkgdesc="Perl version of Don Libes' Tcl-Expect" +arch=('any') +license=('PerlArtistic' 'GPL') +options=('!emptydirs') +depends=('perl-io-tty>=1.03') +makedepends=() +url='http://search.cpan.org/dist/Expect' +source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGIERSIG/Expect-1.21.tar.gz') +md5sums=('a151b0dc4d1a35c73941c65b7c26da5b') +sha512sums=('496716b9e6544e9d6809b7f704df8199291d18ec9ec9ebb4fd2b7b341aa10d9b03989335c1f22d1faddbff0974ceba5b2823685fa08ce6a75e2f3ccaeb944e74') +_distdir="${srcdir}/Expect-1.21" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + cd "$_distdir" + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + make test + ) +} + +package() { + cd "$_distdir" + make install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/pcr/perl-php-serialization/PKGBUILD b/pcr/perl-php-serialization/PKGBUILD new file mode 100644 index 000000000..f09269c92 --- /dev/null +++ b/pcr/perl-php-serialization/PKGBUILD @@ -0,0 +1,50 @@ +# Contributor: Justin Davis <jrcd83@gmail.com> +# Generator : CPANPLUS::Dist::Arch 1.18 +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname='perl-php-serialization' +pkgver='0.34' +pkgrel='1' +pkgdesc="simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa." +arch=('any') +license=('PerlArtistic' 'GPL') +options=('!emptydirs') +depends=('perl') +makedepends=() +url='http://search.cpan.org/dist/PHP-Serialization' +source=('http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz') +md5sums=('333af0848ad79931875a35cc61dc22e0') +sha512sums=('72218973f21ab71419751cf818e6bd998235aa74bf8ae60ec4a6080ba169d0d7fcefde4f433ce3f6f30ed3084a651deb8aa3a5dd818fc6ebf3fb6188def4efe7') +_distdir="${srcdir}/PHP-Serialization-0.34" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + cd "$_distdir" + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + make test + ) +} + +package() { + cd "$_distdir" + make install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD index 334d32325..91c6c9175 100644 --- a/pcr/zoneminder/PKGBUILD +++ b/pcr/zoneminder/PKGBUILD @@ -2,115 +2,114 @@ # Contributor: Jason Gardner <buhrietoe@gmail.com> # Contributor: Ross melin <rdmelin@gmail.com> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> + +# based of debian squeeze package pkgname=zoneminder pkgver=1.25.0 -pkgrel=14 -pkgdesc="Capture, analyse, record and monitor video security cameras" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.zoneminder.com" -license=('GPL') -depends=('cambozola' 'apache' 'php' 'php-gd' 'php-mcrypt' 'mysql' 'pcre' 'openssl' 'ffmpeg' 'perl-libwww' 'perl-date-manip' 'perl-unicode-map' 'perl-dbi' 'perl-dbd-mysql' 'perl-io-stringy' 'perl-mime-lite' 'perl-timedate' 'perl-x10' 'perl-time-modules' 'perl-net-smtp-ssl' 'perl-sys-mmap' 'perl-net-sftp-foreign' 'perl-mime-tools' 'perl-io-tty' 'libv4l' 'libjpeg' 'gnutls' 'php-apache') -makedepends=() -install=zoneminder.install -source=("http://www.zoneminder.com/downloads/ZoneMinder-${pkgver}.tar.gz" - zm.rc.d - Controls_Orbit.sql - zminit.arch - customdb - httpd-zm.conf - zmeventbackup - patch-ffmpeg-0.11.patch - patch-libavcodec-detection.patch - zoneminder-1.25.0-kernel35.patch - arm-context.patch) - -md5sums=('eaefa14befd482154970541252aa1a39' - '9fb81f81b056c18be6eef3f1c8e0dd6d' - '5033bc098bf497c8aed1fc1b3c9c5f9c' - 'f9720872736f26d17bc49d8725b75ae4' - '942f6641c744ffe7d64846a5c34d84f1' - 'e63262d1417105ae24c7a03d98b2c64c' - '1a6d7c43af79c786b27cc88f7ba7ed3e' - 'b872dd86926ab00c5d4733e7e38eaa9c' - '94bf5d95fe5429f7df458ddfbabf0c12' - '88bd124dfb841320cecb0a757b2a78c1' - 'b28c8eb392a7e7b6ef665817d7fe61f4') - +pkgrel=16 +pkgdesc='Capture, analyse, record and monitor video security cameras' +arch=(i686 x86_64 mips64el) +backup=(etc/zm.conf etc/httpd/conf/extra/httpd-zm.conf) +url=http://www.$pkgname.com +license=(GPL) +depends=( + apache cambozola ffmpeg gnutls mysql perl-archive-zip perl-date-manip + perl-dbd-mysql perl-dbi perl-expect perl-libwww perl-mime-lite + perl-mime-tools perl-php-serialization perl-net-sftp-foreign perl-sys-mmap + perl-time-modules perl-x10 php php-apache php-gd php-mcrypt +) +makedepends=(netpbm) +install=$pkgname.install +source=( + http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz + patch-ffmpeg-0.11.patch + patch-libavcodec-detection.patch + $pkgname-1.25.0-kernel35.patch + httpd-zm.conf + zm.rc.d + $pkgname.service +) +md5sums=( + eaefa14befd482154970541252aa1a39 + 81c8be870260142e2633eedf73c72040 + 94bf5d95fe5429f7df458ddfbabf0c12 + 48a3c48394e18bf072f7b32730db18df + 831e3538facff18e27d402e36dbd6b8d + 034b61cda8849fc3001849e76ef26041 + 7487cc72ead82aea0bc78f2e4106ae1a +) build() { - cd "$srcdir/ZoneMinder-$pkgver" + cd $srcdir/ZoneMinder-$pkgver + + export CPPFLAGS=-D__STDC_CONSTANT_MACROS \ + ZM_SSL_LIB=gnutls # Patch for GCC 4.7.x sed -i -e '1 s/^/#include <unistd.h>\n/;' src/zm_logger.cpp sed -i -e '1 s/^/#include <unistd.h>\n/;' src/zm_thread.h - # Patch for build/upgrade path - sed -i -e 's#ZM_PATH_BUILD=@PATH_BUILD@#ZM_PATH_BUILD=/srv/zoneminder/upgrade\nZM_PATH_UPDATE=/srv/zoneminder/upgrade#' zm.conf.in - # Patch for support new ffmpeg - patch -p1 < ../patch-ffmpeg-0.11.patch + patch -p1 < $srcdir/patch-ffmpeg-0.11.patch # Patch for correct libavcodec detection - patch -p0 < ../patch-libavcodec-detection.patch + patch -p0 < $srcdir/patch-libavcodec-detection.patch # Patch for type cast in kernel3.5 - patch -p0 < ../zoneminder-1.25.0-kernel35.patch - - # Patch for ARM - if test "$CARCH" == arm; then - patch -p0 < ../arm-context.patch - fi - - # Add some more configs into DB - cat ../Controls_Orbit.sql >> db/zm_create.sql.in + patch -p0 < $srcdir/$pkgname-1.25.0-kernel35.patch ./configure --prefix=/usr \ + --build \ + --enable-crashtrace=yes \ + --enable-debug=yes \ + --enable-mmap=yes \ + --mandir=/usr/share/man \ --sysconfdir=/etc \ - --with-webuser=http \ + --with-cgidir=/usr/lib/$pkgname/cgi-bin \ + --with-ffmpeg=/usr \ + --with-libarch=lib \ + --with-mysql=/usr \ + --with-webdir=/usr/share/$pkgname \ --with-webgroup=http \ - --with-mysql=/usr \ - --with-webdir=/srv/zoneminder/www \ - --with-cgidir=/srv/zoneminder/cgi-bin \ - --bindir=/srv/zoneminder/bin \ - ZM_SSL_LIB=openssl \ - CPPFLAGS=-D__STDC_CONSTANT_MACROS - - # chown line mucks everything up, we'll chown it in the install script - sed -i '/chown/d' Makefile - - # modify hard-coded paths - sed -i 's#/var/lib/zm#/srv/zoneminder/backup#' scripts/zmdbrestore.in - sed -i 's#/var/lib/zm#/srv/zoneminder/backup#' scripts/zmlogrotate.conf.in - sed -i 's#/var/lib/zm#/srv/zoneminder/backup#' scripts/zmdbbackup.in - - # Build it! - make || return 1 - make DESTDIR="$pkgdir" ZM_RUNDIR="$pkgdir/var/run" ZM_TMPDIR="$pkgdir/tmp" ZM_LOGDIR="$pkgdir/var/log" install || return 1 - - install -D -m 700 $startdir/src/zminit.arch $startdir/pkg/srv/zoneminder/bin/zminit - install -D -m 755 $startdir/src/zm.rc.d $startdir/pkg/etc/rc.d/zm - install -D -m 700 scripts/zmdbbackup $startdir/pkg/srv/zoneminder/bin/zmdbbackup - install -D -m 700 scripts/zmdbbackup $startdir/pkg/srv/zoneminder/bin/zmdbbackup - install -D -m 700 scripts/zmdbrestore $startdir/pkg/srv/zoneminder/bin/zmdbrestore - install -D -m 700 scripts/zmeventdump $startdir/pkg/srv/zoneminder/bin/zmeventdump - install -D -m 700 scripts/zmlogrotate.conf $startdir/pkg/etc/logrotate.d/zm - install -D -m 700 $startdir/src/zmeventbackup $startdir/pkg/etc/cron.hourly/zmeventbackup - - mkdir -p $startdir/pkg/etc/httpd/conf/extra/ - install -m 644 $startdir/src/httpd-zm.conf $startdir/pkg/etc/httpd/conf/extra/httpd-zm.conf - - install -D -m 700 $startdir/src/customdb $startdir/pkg/srv/zoneminder/upgrade/customdb - install -D db/zm*.sql $startdir/pkg/srv/zoneminder/upgrade/ - - mkdir -p $startdir/pkg/var/run/zm - - ### remove special files - find $startdir/pkg/ -name "perllocal.pod" \ - -o -name ".packlist" \ - -o -name "*.bs" \ - |xargs -i rm -f {} - + --with-webuser=http + make V=0 } -# vim:set ft=sh ts=2 sw=2 et: +package() { + cd $srcdir/ZoneMinder-$pkgver + + make DESTDIR=$pkgdir \ + ZM_LOGDIR=$pkgdir/var/log/zm \ + ZM_RUNDIR=$pkgdir/run \ + ZM_TMPDIR=$pkgdir/tmp \ + install + + rmdir $pkgdir/run + rmdir $pkgdir/tmp + + mkdir -p $pkgdir/etc/httpd/conf/extra + mkdir -p $pkgdir/etc/rc.d + mkdir -p $pkgdir/usr/lib/systemd/system + mkdir -p $pkgdir/usr/share/license/$pkgname + mkdir -p $pkgdir/usr/share/$pkgname/db + mkdir -p $pkgdir/var/cache/$pkgname + + for i in events images temp; do + mv $pkgdir/usr/share/$pkgname/$i $pkgdir/var/cache/$pkgname/$i + ln -s /var/cache/$pkgname/$i $pkgdir/usr/share/$pkgname/$i + done + + ln -s /usr/lib/$pkgname/cgi-bin $pkgdir/usr/share/$pkgname + ln -s /usr/share/cambozola/cambozola.jar $pkgdir/usr/share/$pkgname + + chown http.http $pkgdir/etc/zm.conf + chown -R http.http $pkgdir/var/cache/$pkgname + chown http.http $pkgdir/var/log/zm + + install -D -m 644 $srcdir/httpd-zm.conf $pkgdir/etc/httpd/conf/extra + install -D -m 644 $srcdir/zm.rc.d $pkgdir/etc/rc.d/zm + install -D -m 644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system + install -D -m 644 COPYING $pkgdir/usr/share/license/$pkgname + install -D -m 644 db/zm*.sql $pkgdir/usr/share/$pkgname/db +} diff --git a/pcr/zoneminder/httpd-zm.conf b/pcr/zoneminder/httpd-zm.conf index ad24cbbe4..e48ea9fc6 100644 --- a/pcr/zoneminder/httpd-zm.conf +++ b/pcr/zoneminder/httpd-zm.conf @@ -1,16 +1,18 @@ # /etc/httpd/conf/extra/httpd-zm.conf # Config for zoneminder web app -Alias /zm "/srv/zoneminder/www" -<Directory "/srv/zoneminder/www"> - Options -Indexes MultiViews FollowSymLinks - AllowOverride All - Order allow,deny - Allow from all +Alias /zm "/usr/share/zoneminder" +<Directory "/usr/share/zoneminder"> + Options -Indexes MultiViews FollowSymLinks + AllowOverride All + Order allow,deny + Allow from all + # The code unfortunately uses short tags in many places + php_value short_open_tag 1 </Directory> -ScriptAlias /cgi-bin "/srv/zoneminder/cgi-bin" -<Directory "/srv/zoneminder/cgi-bin"> +ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin" +<Directory "/usr/lib/zoneminder/cgi-bin"> AllowOverride All Options ExecCGI Order allow,deny diff --git a/pcr/zoneminder/patch-ffmpeg-0.11.patch b/pcr/zoneminder/patch-ffmpeg-0.11.patch index 8356fff83..ac56e4c69 100644 --- a/pcr/zoneminder/patch-ffmpeg-0.11.patch +++ b/pcr/zoneminder/patch-ffmpeg-0.11.patch @@ -2,7 +2,7 @@ diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp index 42927f6..61df606 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
-@@ -108,7 +108,7 @@ int FfmpegCamera::PrimeCapture()
+@@ -91,7 +91,7 @@ int FfmpegCamera::PrimeCapture()
Info( "Priming capture from %s", mPath.c_str() );
// Open the input, not necessarily a file
@@ -11,7 +11,7 @@ index 42927f6..61df606 100644 Fatal( "Unable to open input %s due to: %s", mPath.c_str(), strerror(errno) );
// Locate stream info from input
-@@ -139,7 +139,7 @@ int FfmpegCamera::PrimeCapture()
+@@ -122,7 +122,7 @@ int FfmpegCamera::PrimeCapture()
Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
// Open the codec
@@ -25,7 +25,7 @@ diff --git a/src/zm_mpeg.cpp b/src/zm_mpeg.cpp index f5de2a4..d614346 100644
--- a/src/zm_mpeg.cpp
+++ b/src/zm_mpeg.cpp
-@@ -167,10 +167,12 @@ void VideoStream::SetParameters()
+@@ -130,10 +130,12 @@ void VideoStream::SetParameters()
{
/* set the output parameters (must be done even if no
parameters). */
@@ -40,7 +40,7 @@ index f5de2a4..d614346 100644 //dump_format(ofc, 0, filename, 1);
}
-@@ -259,7 +261,7 @@ void VideoStream::OpenStream()
+@@ -222,7 +224,7 @@ void VideoStream::OpenStream()
if ( !(of->flags & AVFMT_NOFILE) )
{
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
@@ -49,7 +49,7 @@ index f5de2a4..d614346 100644 #else
if ( url_fopen(&ofc->pb, filename, URL_WRONLY) < 0 )
#endif
-@@ -278,7 +280,7 @@ void VideoStream::OpenStream()
+@@ -241,7 +243,7 @@ void VideoStream::OpenStream()
}
/* write the stream header, if any */
@@ -57,4 +57,4 @@ index f5de2a4..d614346 100644 + avformat_write_header(ofc, NULL);
}
- VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height )
\ No newline at end of file + VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height )
diff --git a/pcr/zoneminder/zm.rc.d b/pcr/zoneminder/zm.rc.d index 99a1f1f22..c4cbf4d3f 100644 --- a/pcr/zoneminder/zm.rc.d +++ b/pcr/zoneminder/zm.rc.d @@ -1,172 +1,63 @@ #!/bin/bash -# Source function library. +daemon_name=zm + . /etc/rc.conf . /etc/rc.d/functions -prog=ZoneMinder -ZM_VERSION="1.25.0" -ZM_PATH_BIN="/srv/zoneminder/bin" -ZM_CONFIG="/etc/zm.conf" -command="$ZM_PATH_BIN/zmpkg.pl" - -loadconf() -{ - if [ -f $ZM_CONFIG ]; then - . $ZM_CONFIG - else - echo "ERROR: $ZM_CONFIG not found. -" - return 1 - fi -} - -# Check for old config and update if needed -checkcfg() -{ - # Check config - if [ "$ZM_DB_HOST" = "" -o "$ZM_DB_NAME" = "" -o "$ZM_DB_USER" = "" -o "$ZM_DB_PASS" = "" ]; then - echo "In $ZM_CONFIG there should not be null values. -" - return 1 - loadconf - fi -} - -checkdb() -{ - # Check database exisits and version - GetVer="select Value from Config where Name='ZM_DYN_DB_VERSION'" - OLD_VERSION=`echo $GetVer | mysql -B -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'` - if [ "$OLD_VERSION" = "" ]; then - GetVer="select Value from Config where Name='ZM_DYN_CURR_VERSION'" - OLD_VERSION=`echo $GetVer | mysql -B -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'` - if [ "$OLD_VERSION" = "" ]; then - echo "You must run $ZM_PATH_BIN/zminit manually -" - return 1 - fi - fi - RETVAL=$? - - if [ $RETVAL != 0 ]; then - tbls=`mysql -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS -s -e 'show tables' $ZM_DB_NAME` - RETVAL=$? - if [ $RETVAL = 0 ]; then - echo "Initialize $prog database: -" - echo tbls | grep Config >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL != 0 ]; then - mysql -B -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME < $ZM_PATH_UPDATE/zm_create.sql - RETVAL=$? - [ $RETVAL = 0 ] && stat_done - [ $RETVAL != 0 ] && stat_fail - echo - return $RETVAL - fi - ( cd $ZM_PATH_UPDATE; perl $ZM_PATH_BIN/zmupdate.pl -f ) - RETVAL=$? - [ $RETVAL = 0 ] && stat_done - [ $RETVAL != 0 ] && stat_fail - echo - return $RETVAL - else - echo "No access to ZoneMinder database. -Run $ZM_PATH_BIN/zminit manually. -" - return $RETVAL - fi - else - [ "$ZM_VERSION" = "$OLD_VERSION" ] && return 0 - echo "Upgrade %s database: " "$prog" - $ZM_PATH_BIN/zmupdate.pl --version=$OLD_VERSION --noi && ( cd $ZM_PATH_UPDATE; perl $ZM_PATH_BIN/zmupdate.pl -f ) - RETVAL=$? - [ $RETVAL = 0 ] && stat_done - [ $RETVAL != 0 ] && stat_fail - echo - return $RETVAL - fi -} - -start() -{ - loadconf || return $? - checkcfg || return $? - checkdb || return $? - stat_busy "Starting $prog" - [ -d /var/run/zm ] || mkdir -m 774 /var/run/zm - chown -R $ZM_WEB_USER:$ZM_WEB_GROUP /var/run/zm - GetPath="select Value from Config where Name='ZM_PATH_SOCKS'" - ZM_PATH_SOCK=`echo $GetPath | mysql -B -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'` - [ -d $ZM_PATH_SOCK ] || mkdir -m 774 -p $ZM_PATH_SOCK - sudo -u $ZM_WEB_USER test -O $ZM_PATH_SOCK \ - || chown -R $ZM_WEB_USER:$ZM_WEB_GROUP $ZM_PATH_SOCK - # Setup the log dir - [ -d /var/log/zm ] || mkdir /var/log/zm - for logs in zmaudit.log zmdc.log zmfilter.log zmpkg.log zmupdate.log zmwatch.log; do - touch /var/log/zm/$logs - done - chown -R $ZM_WEB_USER:$ZM_WEB_GROUP /var/log/zm - $command start - RETVAL=$? - [ $RETVAL = 0 ] && stat_done && add_daemon zm - [ $RETVAL != 0 ] && stat_fail - #[ $RETVAL = 0 ] && touch /var/lock/subsys/zm - return $RETVAL -} - -stop() -{ - stat_busy "Stopping $prog" - $command stop - RETVAL=$? - [ $RETVAL = 0 ] && stat_done && rm_daemon zm - [ $RETVAL != 0 ] && stat_fail - #[ $RETVAL = 0 ] && rm -f /var/lock/subsys/zm -} - -status() -{ - result=`$command status` - if [ "$result" = "running" ]; then - echo "ZoneMinder is running -" - RETVAL=0 - else - echo "ZoneMinder is stopped -" - RETVAL=1 - fi -} - case "$1" in - 'start') - start - ;; - 'stop') - stop - ;; - 'restart') - stop - start - ;; - 'condrestart') - loadconf - checkcfg - result=`$ZM_PATH_BIN/zmdc.pl check` - if [ "$result" = "running" ]; then - $ZM_PATH_BIN/zmdc.pl shutdown > /dev/null - start - fi - ;; - 'status') - status - ;; - *) - echo "Usage: zm { start | stop | restart | condrestart | status } -" - RETVAL=1 - ;; + start) + stat_busy "Starting Zoneminder" + /usr/bin/zmfix -a + if /usr/bin/zmpkg.pl start >/dev/null ; then + add_daemon $daemon_name + stat_done + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping Zoneminder" + if /usr/bin/zmpkg.pl stop >/dev/null ; then + rm_daemon $daemon_name + stat_done + else + stat_fail + exit 1 + fi + ;; + + reload) + stat_busy "Reloading Zoneminder" + if /usr/bin/zmpkg.pl graceful >/dev/null ; then + add_daemon $daemon_name + stat_done + else + stat_fail + exit 1 + fi + ;; + + restart) + stat_busy "Restarting Zoneminder" + if /usr/bin/zmpkg.pl restart >/dev/null ; then + add_daemon $daemon_name + stat_done + else + stat_fail + exit 1 + fi + ;; + + status) + stat_busy "Checking Zoneminder status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|reload|restart|status}" esac -exit $RETVAL + +exit 0 diff --git a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch index 51bc1288d..9939dc5c3 100644 --- a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch +++ b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch @@ -1,7 +1,7 @@ diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp --- ./src/zm_local_camera.cpp.kernel35 2012-07-16 15:01:22.182614878 -0500 +++ ./src/zm_local_camera.cpp 2012-07-16 15:02:16.491941730 -0500 -@@ -740,7 +740,7 @@ void LocalCamera::Terminate() +@@ -739,7 +739,7 @@ void LocalCamera::Terminate() { Debug( 3, "Terminating video stream" ); //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; @@ -10,7 +10,7 @@ diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 ) Error( "Failed to stop capture stream: %s", strerror(errno) ); -@@ -1520,7 +1520,7 @@ int LocalCamera::PrimeCapture() +@@ -1519,7 +1519,7 @@ int LocalCamera::PrimeCapture() Debug( 3, "Starting video stream" ); //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install index be449a5ca..3ade5355e 100644 --- a/pcr/zoneminder/zoneminder.install +++ b/pcr/zoneminder/zoneminder.install @@ -1,57 +1,100 @@ -# zoneminder.install +pre_install() { + set -e + abort=false + if [ -L /usr/share/zoneminder/events ]; then + l=$(readlink /usr/share/zoneminder/events) + if [ $l != /var/cache/zoneminder/events ]; then + abort=true + fi + fi + if [ -L /usr/share/zoneminder/images ]; then + l=$(readlink /usr/share/zoneminder/images ) + if [ $l != /var/cache/zoneminder/images ]; then + abort=true + fi + fi + if [ $abort = true ]; then + cat >&2 << EOF +Aborting installation of zoneminder due to non-default symlinks in +/usr/share/zoneminder for the images and/or events directory, which could +result in loss of data. Please move your data in each of these directories to +/var/cache/zoneminder before installing zoneminder from the package. +EOF + exit 1 + fi + exit 0 +} -## arg 1: the new package version post_install() { - ln -s /usr/share/cambozola/cambozola.jar /srv/zoneminder/www/ - chown -R http.http /srv/zoneminder - chown http.http /etc/zm.conf - mkdir /srv/zoneminder/backup - mkdir /srv/zoneminder/socks + mkdir /usr/share/zoneminder/backup + mkdir /usr/share/zoneminder/socks cat << EOF Note: -==> To initialize the ZoneMinder database run (as root) -==> /srv/zoneminder/bin/zminit -EOF +==> To run Zoneminder, you must install the database running mysql service (as root): +==> "rc.d start mysqld" (in initscripts) or "systemctl start mysqld.service" (in systemd) +==> and add Zoneminder database typing: +==> mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload +==> cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p +==> echo 'grant lock tables, alter,select,insert,update,delete on zm.*'"\ +==> "' to 'zmuser'@localhost identified by "zmpass";' | +==> mysql --defaults-file=/etc/mysql/my.cnf -p mysql" - cat << EOF -==> Check /etc/php/php.ini and make sure these are uncommented -==> extension=gd.so -==> extension=gettext.so -==> extension=mcrypt.so -==> extension=mysql.so -==> extension=mysqli.so -==> extension=session.so -==> extension=sockets.so -EOF - cat << EOF -==> Check /etc/php/php.ini and make sure short_open_tag = On -EOF +Note: +==> You must uncomment that line in /etc/php/php.ini: +==> "extension=mysql.so" +==> check and make sure these are uncommented: +==> "extension=gd.so" +==> "extension=gettext.so" +==> "extension=mcrypt.so" +==> "extension=mysqli.so" +==> "extension=session.so" +==> "extension=sockets.so" +==> Check /etc/php/php.ini and make sure short_open_tag = On +==> or ZoneMinder will not work. - cat /etc/php/php.ini |grep "^open_basedir.*/etc/" | \ -grep "/srv/zoneminder/www">/dev/null || cat << EOF -==> You must edit /etc/php/php.ini and add to open_basedir "/etc/" and -==> "/srv/zoneminder/" like so -==> open_basedir = /home/:/tmp/:/usr/share/pear/:/etc/:/srv/zoneminder/ +==> You must edit /etc/php/php.ini and add to open_basedir "/etc" and +==> "/usr/share/zoneminder" like so +==> open_basedir = /home:/tmp:/usr/share/pear:/etc:/usr/share/zoneminder ==> Otherwise ZoneMinder will be unable to read /etc/zm.conf ==> or display its own web directory -EOF - cat << EOF Note: -==> You must edit /etc/httpd/conf/httpd.conf and uncomment/add the line +==> You must edit /etc/httpd/conf/httpd.conf and add the line: ==> LoadModule php5_module modules/libphp5.so -==> You must also add these lines: -==> Include conf/extra/php5_module.conf +==> and: ==> Include /etc/httpd/conf/extra/httpd-zm.conf EOF - touch /srv/zoneminder/zm_backup.sql } - -## arg 1: the new package version -## arg 2: the old package version post_upgrade() { - /srv/zoneminder/bin/zmupdate.pl -f >/dev/null + /usr/bin/zmupdate.pl -f >/dev/null +} + +post_remove() { + cat << EOF +Note: +==> To clean Zoneminder mysql database, run as root: +==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql" +==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql" +==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f drop zm" + +==> Disable http with php if it isn't needed with others servers, +==> comment or remove that lines in /etc/httpd/conf/httpd.conf: +==> "LoadModule php5_module modules/libphp5.so" +==> "Include /etc/httpd/conf/extra/httpd-zm.conf" + +==> Disable php with mysql if it isn't needed with others servers, +==> comment that lines in /etc/php/php.ini: +==> "extension=mysql.so" +==> "extension=gd.so" +==> "extension=gettext.so" +==> "extension=mcrypt.so" +==> "extension=mysqli.so" +==> "extension=session.so" +==> "extension=sockets.so" + +==> edit /etc/php/php.ini and remove "/etc" and "/usr/share/zoneminder" +==> in the open_basedir. +EOF } -# vim:set ts=2 sw=2 et: diff --git a/pcr/zoneminder/zoneminder.service b/pcr/zoneminder/zoneminder.service new file mode 100644 index 000000000..ba41e8926 --- /dev/null +++ b/pcr/zoneminder/zoneminder.service @@ -0,0 +1,14 @@ +[Unit] +Description=Capture, analyse, record and monitor video security cameras +After=network.target remote-fs.target +Required=mysqld.service + +[Service] +Type=forking +PIDFile=/run/zm.pid +ExecStart=/usr/bin/zmpkg.pl start +ExecRestart=/usr/bin/zmpkg.pl restart +ExecStop=/usr/bin/zmpkg.pl stop + +[Install] +WantedBy=multi-user.target diff --git a/testing/hwloc/PKGBUILD b/testing/hwloc/PKGBUILD new file mode 100644 index 000000000..79fd2f67d --- /dev/null +++ b/testing/hwloc/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 167124 2012-09-25 18:41:34Z stephane $ +# Maintainer : Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Sylvain HENRY <hsyl20@yahoo.fr> +# Contributor: Hervé YVIQUEL <elldekaa@gmail.com> + +pkgname=hwloc +pkgver=1.5 +pkgrel=1 +pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" +arch=('i686' 'x86_64') +url="http://www.open-mpi.org/projects/hwloc/" +license=('BSD') +depends=('sh' 'pciutils' 'cairo' 'libxml2') +makedepends=('pkg-config') +options=('!libtool' '!docs') +source=(http://www.open-mpi.org/software/hwloc/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('b2e60bd40cfc6ca79dde68b19a83e8a4719d6b14') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/openmpi/PKGBUILD b/testing/openmpi/PKGBUILD index 1ea67baaa..415e010a7 100644 --- a/testing/openmpi/PKGBUILD +++ b/testing/openmpi/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 165529 2012-08-22 22:11:14Z stephane $ +# $Id: PKGBUILD 167134 2012-09-26 01:37:00Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=openmpi -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc') makedepends=('inetutils') options=(!libtool) source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('1ccff71e3775c80c5a553f30104d663e1226baab') +sha1sums=('694fd3bac911cdb22f77175884d819b6fea871df') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/run-parts/PKGBUILD b/testing/run-parts/PKGBUILD index a9845c449..e27124c0a 100644 --- a/testing/run-parts/PKGBUILD +++ b/testing/run-parts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162728 2012-06-29 07:39:29Z pierre $ +# $Id: PKGBUILD 167126 2012-09-25 19:19:49Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=run-parts -pkgver=4.3.2 +pkgver=4.3.4 pkgrel=1 pkgdesc='run scripts or programs in a directory' arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url='http://packages.qa.debian.org/d/debianutils.html' license=('GPL') depends=('glibc') source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz") -sha256sums=('0062d774306a6acc34d3b855a5c4eeb845653b0cd34dbb5c13aa00b4ecb8af22') +sha256sums=('1739976cb62b85e641ee36859a87dfb8e4c3214e1043b6bb00b56b87e96a19f5') build() { cd $srcdir/debianutils-$pkgver diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index 9c6023a44..5e0421849 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=191 +pkgver=192 pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -11,20 +11,19 @@ license=('GPL2' 'LGPL2.1' 'MIT') makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers' 'pam' 'quota-tools' 'xz') +checkdepends=('python') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' - '0001-journal-bring-mmap-cache-prototype-in-sync.patch' 'use-split-usr-path.patch') -md5sums=('a5e4bfaf900a9e2480827feaf58556cb' +md5sums=('e8692055923e87f7f9cb634d44314edb' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - 'ab42d779d640c6f986f48d326b7f0555' 'fd5b5f04ab0a847373d357555129d4c0') build() { @@ -36,10 +35,6 @@ build() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" - # i686 build fail - # upstream commit: e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb - patch -Np1 <"$srcdir/0001-journal-bring-mmap-cache-prototype-in-sync.patch" - ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ @@ -55,6 +50,10 @@ build() { make } +check() { + make -C "$pkgname-$pkgver" check +} + package_systemd() { pkgdesc="system and service manager" depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' |