[arch-commits] Commit in mariadb/trunk (8 files)

2013-02-23 Thread Bartłomiej Piotrowski
Date: Saturday, February 23, 2013 @ 09:22:59
  Author: bpiotrowski
Revision: 84710

upgpkg: mariadb 5.5.29-2

- remove useless directives from unit file
- MariaDB doesn't need network to run
- enable ARCHIVE and BLACKHOLE engines
- disable PBXT engine (it's not maintained anymore)
- add script delaying service start until databases are set up
- run mysql_install_db only if MariaDB datadir is not present
- move CFLAGS/CXXFLAGS to cmake parameters
- deprecate initscripts daemon

Added:
  mariadb/trunk/mariadb-post.sh
  mariadb/trunk/mariadb-tmpfile.conf
  mariadb/trunk/mariadb.service
(from rev 84707, mariadb/trunk/service)
Modified:
  mariadb/trunk/PKGBUILD
  mariadb/trunk/mariadb.install
Deleted:
  mariadb/trunk/rc.d
  mariadb/trunk/service
  mariadb/trunk/tmpfiles.conf

--+
 PKGBUILD |   98 +++--
 mariadb-post.sh  |8 
 mariadb-tmpfile.conf |1 
 mariadb.install  |   26 ++---
 mariadb.service  |   16 
 rc.d |   77 --
 service  |   21 --
 tmpfiles.conf|1 
 8 files changed, 85 insertions(+), 163 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 02:08:32 UTC (rev 84709)
+++ PKGBUILD2013-02-23 08:22:59 UTC (rev 84710)
@@ -4,34 +4,32 @@
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
 pkgver=5.5.29
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
-url=http://mariadb.org/;
+url='http://mariadb.org/'
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
 
source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz
-service rc.d tmpfiles.conf)
+mariadb.service
+mariadb-post.sh
+mariadb-tmpfile.conf)
 sha256sums=('b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74'
-'d9f3d0a897e2e8d5d07c19898ed4c1a4a1c08dfe09f6854f90e79e055e48c02e'
-'a0bfe75c035fa32a10d04238932f5e7ad11829b7fbdb1b8f8997ee645ae1b924'
-'08daa863ddd50aff0b608621ed26936919211e286440951dca5866141291004d')
+'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
+'368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
+'2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
 
 build() {
   cd $srcdir
   mkdir build
   cd build
 
-  # CFLAGS/CXXFLAGS as suggested upstream
-  CFLAGS=-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-fomit-frame-pointer \
-  CXXFLAGS=-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-felide-constructors -fno-rtti \
-
-  cmake ../${pkgbase}-${pkgver} \
+  cmake ../$pkgbase-$pkgver \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DSYSCONFDIR=/etc/mysql \
 -DMYSQL_DATADIR=/var/lib/mysql \
--DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
 -DDEFAULT_CHARSET=utf8 \
 -DDEFAULT_COLLATION=utf8_general_ci \
 -DENABLED_LOCAL_INFILE=ON \
@@ -49,36 +47,39 @@
 -DWITH_ZLIB=system \
 -DWITH_SSL=system \
 -DWITH_LIBWRAP=OFF \
--DWITH_MYSQLD_LDFLAGS=${LDFLAGS} \
 -DWITH_EXTRA_CHARSETS=complex \
 -DWITH_EMBEDDED_SERVER=ON \
+-DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+-DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
 -DWITH_INNOBASE_STORAGE_ENGINE=1 \
 -DWITH_PARTITION_STORAGE_ENGINE=1 \
--DWITH_PBXT_STORAGE_ENGINE=1 \
 -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
--DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
--DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
--DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+-DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+-DWITHOUT_PBXT_STORAGE_ENGINE=1 \
+-DCMAKE_C_FLAGS=-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-fomit-frame-pointer \
+-DCMAKE_CXX_FLAGS=-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-felide-constructors -fno-rtti \
+-DWITH_MYSQLD_LDFLAGS=${LDFLAGS}
 
+
   make
 }
 
-package_libmariadbclient(){
+package_libmariadbclient() {
   pkgdesc=MariaDB client libraries
   depends=('openssl')
   conflicts=('libmysqlclient')
-  provides=(libmysqlclient=${pkgver})
+  provides=(libmysqlclient=$pkgver)
   
-  cd ${srcdir}/build
+  cd $srcdir/build
   for dir in include libmysql libmysqld libservices; do
-make -C ${dir} DESTDIR=${pkgdir} install
+make -C $dir DESTDIR=$pkgdir install
   done
 
-  install -d ${pkgdir}/usr/bin
-  install -m755 scripts/mysql_config ${pkgdir}/usr/bin/
-  install -d ${pkgdir}/usr/share/man/man1
+  install -d $pkgdir/usr/bin
+  install -m755 scripts/mysql_config $pkgdir/usr/bin/
+  install -d $pkgdir/usr/share/man/man1
   for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
-install -m644 ${srcdir}/${pkgbase}-${pkgver}/man/$man.1 
${pkgdir}/usr/share/man/man1/$man.1
+install -m644 

[arch-commits] Commit in mariadb/repos (12 files)

2013-02-23 Thread Bartłomiej Piotrowski
Date: Saturday, February 23, 2013 @ 09:23:21
  Author: bpiotrowski
Revision: 84711

archrelease: copy trunk to community-testing-i686, community-testing-x86_64

Added:
  mariadb/repos/community-testing-i686/
  mariadb/repos/community-testing-i686/PKGBUILD
(from rev 84710, mariadb/trunk/PKGBUILD)
  mariadb/repos/community-testing-i686/mariadb-post.sh
(from rev 84710, mariadb/trunk/mariadb-post.sh)
  mariadb/repos/community-testing-i686/mariadb-tmpfile.conf
(from rev 84710, mariadb/trunk/mariadb-tmpfile.conf)
  mariadb/repos/community-testing-i686/mariadb.install
(from rev 84710, mariadb/trunk/mariadb.install)
  mariadb/repos/community-testing-i686/mariadb.service
(from rev 84710, mariadb/trunk/mariadb.service)
  mariadb/repos/community-testing-x86_64/
  mariadb/repos/community-testing-x86_64/PKGBUILD
(from rev 84710, mariadb/trunk/PKGBUILD)
  mariadb/repos/community-testing-x86_64/mariadb-post.sh
(from rev 84710, mariadb/trunk/mariadb-post.sh)
  mariadb/repos/community-testing-x86_64/mariadb-tmpfile.conf
(from rev 84710, mariadb/trunk/mariadb-tmpfile.conf)
  mariadb/repos/community-testing-x86_64/mariadb.install
(from rev 84710, mariadb/trunk/mariadb.install)
  mariadb/repos/community-testing-x86_64/mariadb.service
(from rev 84710, mariadb/trunk/mariadb.service)

---+
 community-testing-i686/PKGBUILD   |  136 
 community-testing-i686/mariadb-post.sh|8 +
 community-testing-i686/mariadb-tmpfile.conf   |1 
 community-testing-i686/mariadb.install|   47 
 community-testing-i686/mariadb.service|   16 ++
 community-testing-x86_64/PKGBUILD |  136 
 community-testing-x86_64/mariadb-post.sh  |8 +
 community-testing-x86_64/mariadb-tmpfile.conf |1 
 community-testing-x86_64/mariadb.install  |   47 
 community-testing-x86_64/mariadb.service  |   16 ++
 10 files changed, 416 insertions(+)

Copied: mariadb/repos/community-testing-i686/PKGBUILD (from rev 84710, 
mariadb/trunk/PKGBUILD)
===
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2013-02-23 08:23:21 UTC (rev 84711)
@@ -0,0 +1,136 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski nos...@bpiotrowski.pl
+
+pkgbase=mariadb
+pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
+pkgver=5.5.29
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://mariadb.org/'
+makedepends=('cmake' 'openssl' 'zlib')
+options=('!libtool')
+source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz
+mariadb.service
+mariadb-post.sh
+mariadb-tmpfile.conf)
+sha256sums=('b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74'
+'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
+'368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
+'2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
+
+build() {
+  cd $srcdir
+  mkdir build
+  cd build
+
+  cmake ../$pkgbase-$pkgver \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DSYSCONFDIR=/etc/mysql \
+-DMYSQL_DATADIR=/var/lib/mysql \
+-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
+-DDEFAULT_CHARSET=utf8 \
+-DDEFAULT_COLLATION=utf8_general_ci \
+-DENABLED_LOCAL_INFILE=ON \
+-DINSTALL_INFODIR=share/mysql/docs \
+-DINSTALL_MANDIR=share/man \
+-DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
+-DINSTALL_SCRIPTDIR=bin \
+-DINSTALL_INCLUDEDIR=include/mysql \
+-DINSTALL_DOCREADMEDIR=share/mysql \
+-DINSTALL_SUPPORTFILESDIR=share/mysql \
+-DINSTALL_MYSQLSHAREDIR=share/mysql \
+-DINSTALL_DOCDIR=share/mysql/docs \
+-DINSTALL_SHAREDIR=share/mysql \
+-DWITH_READLINE=ON \
+-DWITH_ZLIB=system \
+-DWITH_SSL=system \
+-DWITH_LIBWRAP=OFF \
+-DWITH_EXTRA_CHARSETS=complex \
+-DWITH_EMBEDDED_SERVER=ON \
+-DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+-DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
+-DWITH_INNOBASE_STORAGE_ENGINE=1 \
+-DWITH_PARTITION_STORAGE_ENGINE=1 \
+-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+-DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+-DWITHOUT_PBXT_STORAGE_ENGINE=1 \
+-DCMAKE_C_FLAGS=-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-fomit-frame-pointer \
+-DCMAKE_CXX_FLAGS=-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-felide-constructors -fno-rtti \
+-DWITH_MYSQLD_LDFLAGS=${LDFLAGS}
+
+
+  make
+}
+
+package_libmariadbclient() {
+  pkgdesc=MariaDB client libraries
+  depends=('openssl')
+  conflicts=('libmysqlclient')
+  provides=(libmysqlclient=$pkgver)
+  
+  cd $srcdir/build
+  for dir in include libmysql libmysqld libservices; do
+make -C $dir DESTDIR=$pkgdir install
+  done
+
+  install -d 

[arch-commits] Commit in mesa/trunk (PKGBUILD)

2013-02-23 Thread Andreas Radke
Date: Saturday, February 23, 2013 @ 09:28:50
  Author: andyrtr
Revision: 178456

upgpkg: mesa 9.1-1

upstream update 9.1; drop some unneeded links when renaming libGL

Modified:
  mesa/trunk/PKGBUILD

--+
 PKGBUILD |   22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 08:07:00 UTC (rev 178455)
+++ PKGBUILD2013-02-23 08:28:50 UTC (rev 178456)
@@ -5,23 +5,23 @@
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=9.1
-pkgrel=0.2
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 
'libxxf86vm' 'libxdamage'
  'libvdpau' 'wayland' 'llvm-amdgpu-snapshot')
 url=http://mesa3d.sourceforge.net;
 license=('custom')
 options=('!libtool')
-source=(#ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-   ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # 
for RC testing
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+   #ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # 
for RC testing
 LICENSE)
-md5sums=('b6d3520e21f2cbe97284a155662b350d'
+md5sums=('d3891e02215422e120271d976ff1947e'
  '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
 cd ${srcdir}/?esa-*
 
-autoreconf -vfi
+autoreconf -vfi # our automake is far too new for their build system :)
 
 ./configure --prefix=/usr \
 --sysconfdir=/etc \
@@ -124,8 +124,8 @@
   # rename libgl.so to not conflict with blobs - may break gl.pc ?
   mv ${pkgdir}/usr/lib/libGL.so.1.2.0  ${pkgdir}/usr/lib/mesa-libGL.so.1.2.0
   rm ${pkgdir}/usr/lib/libGL.so{,.1}
-  ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so
-  ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1
+#  ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so
+#  ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1
 
   install -m755 -d ${pkgdir}/usr/share/licenses/mesa
   install -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/mesa/
@@ -142,9 +142,11 @@
   install -m755 -d ${pkgdir}/usr/lib/xorg/modules/extensions
   ln -s libglx.xorg ${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so
 
-  ln -s mesa-libGL.so   ${pkgdir}/usr/lib/libGL.so
-  ln -s mesa-libGL.so.1 ${pkgdir}/usr/lib/libGL.so.1
-  ln -s mesa-libGL.so.1.2.0${pkgdir}/usr/lib/libGL.so.1.2.0
+#  ln -s mesa-libGL.so   ${pkgdir}/usr/lib/libGL.so
+  ln -s mesa-libGL.so.1.2.0  ${pkgdir}/usr/lib/libGL.so
+#  ln -s mesa-libGL.so.1 ${pkgdir}/usr/lib/libGL.so.1
+  ln -s mesa-libGL.so.1.2.0  ${pkgdir}/usr/lib/libGL.so.1
+  ln -s mesa-libGL.so.1.2.0  ${pkgdir}/usr/lib/libGL.so.1.2.0
 
   install -m755 -d ${pkgdir}/usr/share/licenses/mesa-libgl
   install -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/mesa-libgl/



[arch-commits] Commit in mesa/repos (10 files)

2013-02-23 Thread Andreas Radke
Date: Saturday, February 23, 2013 @ 09:29:13
  Author: andyrtr
Revision: 178457

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  mesa/repos/testing-i686/LICENSE
(from rev 178456, mesa/trunk/LICENSE)
  mesa/repos/testing-i686/PKGBUILD
(from rev 178456, mesa/trunk/PKGBUILD)
  mesa/repos/testing-x86_64/LICENSE
(from rev 178456, mesa/trunk/LICENSE)
  mesa/repos/testing-x86_64/PKGBUILD
(from rev 178456, mesa/trunk/PKGBUILD)
Deleted:
  mesa/repos/testing-i686/LICENSE
  mesa/repos/testing-i686/PKGBUILD
  mesa/repos/testing-i686/llvm32.patch
  mesa/repos/testing-x86_64/LICENSE
  mesa/repos/testing-x86_64/PKGBUILD
  mesa/repos/testing-x86_64/llvm32.patch

-+
 testing-i686/LICENSE|  164 +++
 testing-i686/PKGBUILD   |  454 ++
 testing-i686/llvm32.patch   |  284 --
 testing-x86_64/LICENSE  |  164 +++
 testing-x86_64/PKGBUILD |  454 ++
 testing-x86_64/llvm32.patch |  284 --
 6 files changed, 470 insertions(+), 1334 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 178456:178457 to see the changes.


[arch-commits] Commit in acpid/trunk (2 files)

2013-02-23 Thread Sébastien Luttringer
Date: Saturday, February 23, 2013 @ 10:11:43
  Author: seblu
Revision: 84712

upgpkg: acpid 2.0.18-1

Modified:
  acpid/trunk/PKGBUILD
Deleted:
  acpid/trunk/0001-Fix-format-of-video-tabletmode-event-string.patch

+
 0001-Fix-format-of-video-tabletmode-event-string.patch |   45 ---
 PKGBUILD   |   15 ++---
 2 files changed, 6 insertions(+), 54 deletions(-)

Deleted: 0001-Fix-format-of-video-tabletmode-event-string.patch
===
--- 0001-Fix-format-of-video-tabletmode-event-string.patch  2013-02-23 
08:23:21 UTC (rev 84711)
+++ 0001-Fix-format-of-video-tabletmode-event-string.patch  2013-02-23 
09:11:43 UTC (rev 84712)
@@ -1,45 +0,0 @@
-From ddf5be1f8fc35c38dc241ca935bf4d408f2ff61d Mon Sep 17 00:00:00 2001
-From: Ted Felix t...@tedfelix.com
-Date: Thu, 17 Jan 2013 20:03:54 -0500
-Subject: [PATCH] Fix format of video/tabletmode event string
-
-The previous format caused Xorg's xserver to crash in
-lnxACPIGetEventFromOs() because it doesn't check for NULL
-returns from strtok().

- input_layer.c | 12 ++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/input_layer.c b/input_layer.c
-index 591ad64..db410c0 100644
 a/input_layer.c
-+++ b/input_layer.c
-@@ -56,6 +56,14 @@ struct evtab_entry {
-evtest.c, acpi_genl, or kacpimon to find new events to add to this
-table. */
- 
-+/*
-+ * The two numbers (e.g. 0080 ) in each string is a format
-+ * that Xorg and maybe others expect.
-+ *
-+ * See hw/xfree86/os-support/linux/lnx_acpi.c in xserver and specifically
-+ * lnxACPIGetEventFromOs().
-+ */
-+
- static struct evtab_entry evtab[] = {
- 
-   /*** COMMON EVENTS ***/
-@@ -66,8 +74,8 @@ static struct evtab_entry evtab[] = {
-   {{{0,0}, EV_KEY, KEY_SLEEP, 1}, button/sleep SBTN 0080 },
-   {{{0,0}, EV_SW, SW_LID, 1}, button/lid LID close},
-   {{{0,0}, EV_SW, SW_LID, 0}, button/lid LID open},
--  {{{0,0}, EV_SW, SW_TABLET_MODE, 0}, video/tabletmode TBLT off},
--  {{{0,0}, EV_SW, SW_TABLET_MODE, 1}, video/tabletmode TBLT on},
-+  {{{0,0}, EV_SW, SW_TABLET_MODE, 0}, video/tabletmode TBLT 008A 
},
-+  {{{0,0}, EV_SW, SW_TABLET_MODE, 1}, video/tabletmode TBLT 008A 
0001},
- 
- 
-   /*** VIDEO ***/
--- 
-1.8.1.1
-

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 08:23:21 UTC (rev 84711)
+++ PKGBUILD2013-02-23 09:11:43 UTC (rev 84712)
@@ -5,8 +5,8 @@
 # Contributor: Jonathan Schmidt j.schm...@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.17
-pkgrel=4
+pkgver=2.0.18
+pkgrel=1
 pkgdesc='A daemon for delivering ACPI power management events with netlink 
support'
 arch=('i686' 'x86_64')
 url='http://tedfelix.com/linux/acpid-netlink.html'
@@ -15,22 +15,19 @@
 optdepends=('perl: use perl based examples')
 replaces=('acpid2')
 backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything')
-source=(http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz;
+source=(http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.tar.xz;
 'acpid.socket'
 'acpid.service'
 'anything'
-'handler.sh'
-'0001-Fix-format-of-video-tabletmode-event-string.patch')
-md5sums=('d858729b7d984c5e3a0c7558e9de1584'
+'handler.sh')
+md5sums=('7c4ff315ae960c54eea303c71c49f152'
  'ee6cb99e50e580c50331a73045412ae9'
  '10290f69491206cd104654e5b900b661'
  '2d37b98d6e74bab815604b8b48c6cfd4'
- '47f44ff5f02685dce8bcdab8568f0c38'
- 'a813e00553104f2129f64cae95a7983f')
+ '47f44ff5f02685dce8bcdab8568f0c38')
 
 build() {
   cd $pkgname-$pkgver
-  patch -p1 -i $srcdir/0001-Fix-format-of-video-tabletmode-event-string.patch
   ./configure --prefix=/usr
   make
 }



[arch-commits] Commit in acpid/repos (22 files)

2013-02-23 Thread Sébastien Luttringer
Date: Saturday, February 23, 2013 @ 10:11:56
  Author: seblu
Revision: 84713

archrelease: copy trunk to community-i686, community-x86_64

Added:
  acpid/repos/community-i686/PKGBUILD
(from rev 84712, acpid/trunk/PKGBUILD)
  acpid/repos/community-i686/acpid.service
(from rev 84712, acpid/trunk/acpid.service)
  acpid/repos/community-i686/acpid.socket
(from rev 84712, acpid/trunk/acpid.socket)
  acpid/repos/community-i686/anything
(from rev 84712, acpid/trunk/anything)
  acpid/repos/community-i686/handler.sh
(from rev 84712, acpid/trunk/handler.sh)
  acpid/repos/community-x86_64/PKGBUILD
(from rev 84712, acpid/trunk/PKGBUILD)
  acpid/repos/community-x86_64/acpid.service
(from rev 84712, acpid/trunk/acpid.service)
  acpid/repos/community-x86_64/acpid.socket
(from rev 84712, acpid/trunk/acpid.socket)
  acpid/repos/community-x86_64/anything
(from rev 84712, acpid/trunk/anything)
  acpid/repos/community-x86_64/handler.sh
(from rev 84712, acpid/trunk/handler.sh)
Deleted:
  
acpid/repos/community-i686/0001-Fix-format-of-video-tabletmode-event-string.patch
  acpid/repos/community-i686/PKGBUILD
  acpid/repos/community-i686/acpid.service
  acpid/repos/community-i686/acpid.socket
  acpid/repos/community-i686/anything
  acpid/repos/community-i686/handler.sh
  
acpid/repos/community-x86_64/0001-Fix-format-of-video-tabletmode-event-string.patch
  acpid/repos/community-x86_64/PKGBUILD
  acpid/repos/community-x86_64/acpid.service
  acpid/repos/community-x86_64/acpid.socket
  acpid/repos/community-x86_64/anything
  acpid/repos/community-x86_64/handler.sh

-+
 community-i686/0001-Fix-format-of-video-tabletmode-event-string.patch   |   45 
--
 community-i686/PKGBUILD |  107 
+++---
 community-i686/acpid.service|   20 
-
 community-i686/acpid.socket |   16 
-
 community-i686/anything |6 
 community-i686/handler.sh   |  154 
+-
 community-x86_64/0001-Fix-format-of-video-tabletmode-event-string.patch |   45 
--
 community-x86_64/PKGBUILD   |  107 
+++---
 community-x86_64/acpid.service  |   20 
-
 community-x86_64/acpid.socket   |   16 
-
 community-x86_64/anything   |6 
 community-x86_64/handler.sh |  154 
+-
 12 files changed, 300 insertions(+), 396 deletions(-)

Deleted: community-i686/0001-Fix-format-of-video-tabletmode-event-string.patch
===
--- community-i686/0001-Fix-format-of-video-tabletmode-event-string.patch   
2013-02-23 09:11:43 UTC (rev 84712)
+++ community-i686/0001-Fix-format-of-video-tabletmode-event-string.patch   
2013-02-23 09:11:56 UTC (rev 84713)
@@ -1,45 +0,0 @@
-From ddf5be1f8fc35c38dc241ca935bf4d408f2ff61d Mon Sep 17 00:00:00 2001
-From: Ted Felix t...@tedfelix.com
-Date: Thu, 17 Jan 2013 20:03:54 -0500
-Subject: [PATCH] Fix format of video/tabletmode event string
-
-The previous format caused Xorg's xserver to crash in
-lnxACPIGetEventFromOs() because it doesn't check for NULL
-returns from strtok().

- input_layer.c | 12 ++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/input_layer.c b/input_layer.c
-index 591ad64..db410c0 100644
 a/input_layer.c
-+++ b/input_layer.c
-@@ -56,6 +56,14 @@ struct evtab_entry {
-evtest.c, acpi_genl, or kacpimon to find new events to add to this
-table. */
- 
-+/*
-+ * The two numbers (e.g. 0080 ) in each string is a format
-+ * that Xorg and maybe others expect.
-+ *
-+ * See hw/xfree86/os-support/linux/lnx_acpi.c in xserver and specifically
-+ * lnxACPIGetEventFromOs().
-+ */
-+
- static struct evtab_entry evtab[] = {
- 
-   /*** COMMON EVENTS ***/
-@@ -66,8 +74,8 @@ static struct evtab_entry evtab[] = {
-   {{{0,0}, EV_KEY, KEY_SLEEP, 1}, button/sleep SBTN 0080 },
-   {{{0,0}, EV_SW, SW_LID, 1}, button/lid LID close},
-   {{{0,0}, EV_SW, SW_LID, 0}, button/lid LID open},
--  {{{0,0}, EV_SW, SW_TABLET_MODE, 0}, video/tabletmode TBLT off},
--  {{{0,0}, EV_SW, SW_TABLET_MODE, 1}, video/tabletmode TBLT on},
-+  {{{0,0}, EV_SW, SW_TABLET_MODE, 0}, video/tabletmode TBLT 008A 
},
-+  {{{0,0}, EV_SW, SW_TABLET_MODE, 1}, video/tabletmode TBLT 008A 
0001},
- 
- 
-   /*** VIDEO ***/
--- 
-1.8.1.1
-

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-02-23 09:11:43 UTC (rev 84712)
+++ community-i686/PKGBUILD 2013-02-23 09:11:56 

[arch-commits] Commit in ranger/trunk (PKGBUILD)

2013-02-23 Thread Jakob Gruber
Date: Saturday, February 23, 2013 @ 10:56:35
  Author: schuay
Revision: 84714

ranger 1.6.0-1

Modified:
  ranger/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 09:11:56 UTC (rev 84713)
+++ PKGBUILD2013-02-23 09:56:35 UTC (rev 84714)
@@ -2,8 +2,8 @@
 # Previous maintainer: Roman Zimbelmann rom...@lavabit.com
 
 pkgname=ranger
-pkgver=1.5.5
-pkgrel=2
+pkgver=1.6.0
+pkgrel=1
 pkgdesc='A simple, vim-like file manager'
 arch=('any')
 url='http://ranger.nongnu.org'
@@ -20,4 +20,4 @@
   python setup.py -q install --root=${pkgdir} --optimize=1
 }
 
-md5sums=('b7fd3d146f580f42b9758db09d18ea4c')
+md5sums=('6ff9aaf00f0ddafd4b0e2dbc9b634e23')



[arch-commits] Commit in ranger/repos (community-i686 community-i686/PKGBUILD)

2013-02-23 Thread Jakob Gruber
Date: Saturday, February 23, 2013 @ 10:56:43
  Author: schuay
Revision: 84715

archrelease: copy trunk to community-i686

Added:
  ranger/repos/community-i686/
  ranger/repos/community-i686/PKGBUILD
(from rev 84714, ranger/trunk/PKGBUILD)

--+
 PKGBUILD |   23 +++
 1 file changed, 23 insertions(+)

Copied: ranger/repos/community-i686/PKGBUILD (from rev 84714, 
ranger/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-02-23 09:56:43 UTC (rev 84715)
@@ -0,0 +1,23 @@
+# Maintainer: schuay jakob.gru...@gmail.com
+# Previous maintainer: Roman Zimbelmann rom...@lavabit.com
+
+pkgname=ranger
+pkgver=1.6.0
+pkgrel=1
+pkgdesc='A simple, vim-like file manager'
+arch=('any')
+url='http://ranger.nongnu.org'
+license=('GPL')
+depends=('python')
+conflicts=('ranger-git')
+source=(http://ranger.nongnu.org/${pkgname}-${pkgver}.tar.gz;)
+
+package() { 
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # Replace python with the python binary you want ranger to use!
+  # (python 2.6 and =3.1 supported, below 2.6 will certainly not work.)
+  python setup.py -q install --root=${pkgdir} --optimize=1
+}
+
+md5sums=('6ff9aaf00f0ddafd4b0e2dbc9b634e23')



[arch-commits] Commit in synergy/trunk (synergys.rc)

2013-02-23 Thread Jelle van der Waa
Date: Saturday, February 23, 2013 @ 10:56:47
  Author: jelle
Revision: 84716

initscripts are depreacated

Deleted:
  synergy/trunk/synergys.rc

-+
 synergys.rc |   38 --
 1 file changed, 38 deletions(-)

Deleted: synergys.rc
===
--- synergys.rc 2013-02-23 09:56:43 UTC (rev 84715)
+++ synergys.rc 2013-02-23 09:56:47 UTC (rev 84716)
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-daemon_name=synergys
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/synergys`
-case $1 in
-  start)
-stat_busy Starting Synergy Server
-[ -z $PID ]  /usr/bin/synergys --config /etc/synergy.conf  /dev/null
-if [ $? -gt 0 ]; then
-  stat_fail
-else
-  add_daemon $daemon_name
-  stat_done
-fi
-;;
-  stop)
-stat_busy Stopping Synergy Server
-[ ! -z $PID ]  kill -9 $PID  /dev/null
-if [ $? -gt 0 ]; then
-  stat_fail
-else
-  rm_daemon $daemon_name
-  stat_done
-fi
-;;
-  restart)
-$0 stop
-sleep 1
-$0 start
-;;
-  *)
-echo usage: $0 {start|stop|restart}
-esac
-exit 0



[arch-commits] Commit in ranger/repos (community-x86_64 community-x86_64/PKGBUILD)

2013-02-23 Thread Jakob Gruber
Date: Saturday, February 23, 2013 @ 10:56:48
  Author: schuay
Revision: 84717

archrelease: copy trunk to community-x86_64

Added:
  ranger/repos/community-x86_64/
  ranger/repos/community-x86_64/PKGBUILD
(from rev 84715, ranger/trunk/PKGBUILD)

--+
 PKGBUILD |   23 +++
 1 file changed, 23 insertions(+)

Copied: ranger/repos/community-x86_64/PKGBUILD (from rev 84715, 
ranger/trunk/PKGBUILD)
===
--- community-x86_64/PKGBUILD   (rev 0)
+++ community-x86_64/PKGBUILD   2013-02-23 09:56:48 UTC (rev 84717)
@@ -0,0 +1,23 @@
+# Maintainer: schuay jakob.gru...@gmail.com
+# Previous maintainer: Roman Zimbelmann rom...@lavabit.com
+
+pkgname=ranger
+pkgver=1.6.0
+pkgrel=1
+pkgdesc='A simple, vim-like file manager'
+arch=('any')
+url='http://ranger.nongnu.org'
+license=('GPL')
+depends=('python')
+conflicts=('ranger-git')
+source=(http://ranger.nongnu.org/${pkgname}-${pkgver}.tar.gz;)
+
+package() { 
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # Replace python with the python binary you want ranger to use!
+  # (python 2.6 and =3.1 supported, below 2.6 will certainly not work.)
+  python setup.py -q install --root=${pkgdir} --optimize=1
+}
+
+md5sums=('6ff9aaf00f0ddafd4b0e2dbc9b634e23')



[arch-commits] Commit in ranger/repos/community-any (PKGBUILD PKGBUILD)

2013-02-23 Thread Jakob Gruber
Date: Saturday, February 23, 2013 @ 10:59:29
  Author: schuay
Revision: 84718

archrelease: copy trunk to community-any

Added:
  ranger/repos/community-any/PKGBUILD
(from rev 84717, ranger/trunk/PKGBUILD)
Deleted:
  ranger/repos/community-any/PKGBUILD

--+
 PKGBUILD |   46 +++---
 1 file changed, 23 insertions(+), 23 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-02-23 09:56:48 UTC (rev 84717)
+++ PKGBUILD2013-02-23 09:59:29 UTC (rev 84718)
@@ -1,23 +0,0 @@
-# Maintainer: schuay jakob.gru...@gmail.com
-# Previous maintainer: Roman Zimbelmann rom...@lavabit.com
-
-pkgname=ranger
-pkgver=1.5.5
-pkgrel=2
-pkgdesc='A simple, vim-like file manager'
-arch=('any')
-url='http://ranger.nongnu.org'
-license=('GPL')
-depends=('python')
-conflicts=('ranger-git')
-source=(http://ranger.nongnu.org/${pkgname}-${pkgver}.tar.gz;)
-
-build() { 
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # Replace python with the python binary you want ranger to use!
-  # (python 2.6 and =3.1 supported, below 2.6 will certainly not work.)
-  python setup.py -q install --root=${pkgdir} --optimize=1
-}
-
-md5sums=('b7fd3d146f580f42b9758db09d18ea4c')

Copied: ranger/repos/community-any/PKGBUILD (from rev 84717, 
ranger/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2013-02-23 09:59:29 UTC (rev 84718)
@@ -0,0 +1,23 @@
+# Maintainer: schuay jakob.gru...@gmail.com
+# Previous maintainer: Roman Zimbelmann rom...@lavabit.com
+
+pkgname=ranger
+pkgver=1.6.0
+pkgrel=1
+pkgdesc='A simple, vim-like file manager'
+arch=('any')
+url='http://ranger.nongnu.org'
+license=('GPL')
+depends=('python')
+conflicts=('ranger-git')
+source=(http://ranger.nongnu.org/${pkgname}-${pkgver}.tar.gz;)
+
+package() { 
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # Replace python with the python binary you want ranger to use!
+  # (python 2.6 and =3.1 supported, below 2.6 will certainly not work.)
+  python setup.py -q install --root=${pkgdir} --optimize=1
+}
+
+md5sums=('6ff9aaf00f0ddafd4b0e2dbc9b634e23')



[arch-commits] Commit in ranger/repos (community-i686 community-x86_64)

2013-02-23 Thread Jakob Gruber
Date: Saturday, February 23, 2013 @ 11:01:39
  Author: schuay
Revision: 84719

Delete incorrect ranger repos/ dirs

Deleted:
  ranger/repos/community-i686/
  ranger/repos/community-x86_64/



[arch-commits] Commit in cairo/trunk (PKGBUILD)

2013-02-23 Thread Andreas Radke
Date: Saturday, February 23, 2013 @ 11:06:24
  Author: andyrtr
Revision: 178458

upgpkg: cairo 1.12.14-2

fix deps for new unified Mesa 9.1

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 08:29:13 UTC (rev 178457)
+++ PKGBUILD2013-02-23 10:06:24 UTC (rev 178458)
@@ -4,14 +4,13 @@
 
 pkgname=cairo
 pkgver=1.12.14
-pkgrel=1
+pkgrel=2
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'sh'
- 'libgl' 'libegl')
-makedepends=('mesa' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 
'valgrind'
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'mesa' 'sh')
+makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind'
  # for the test suite:
  'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
 #optdepends=('xcb-util: for XCB backend') # really needed?



[arch-commits] Commit in cairo/repos (4 files)

2013-02-23 Thread Andreas Radke
Date: Saturday, February 23, 2013 @ 11:06:51
  Author: andyrtr
Revision: 178459

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cairo/repos/testing-i686/PKGBUILD
(from rev 178458, cairo/trunk/PKGBUILD)
  cairo/repos/testing-x86_64/PKGBUILD
(from rev 178458, cairo/trunk/PKGBUILD)
Deleted:
  cairo/repos/testing-i686/PKGBUILD
  cairo/repos/testing-x86_64/PKGBUILD

-+
 testing-i686/PKGBUILD   |  109 ++
 testing-x86_64/PKGBUILD |  109 ++
 2 files changed, 108 insertions(+), 110 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2013-02-23 10:06:24 UTC (rev 178458)
+++ testing-i686/PKGBUILD   2013-02-23 10:06:51 UTC (rev 178459)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Brice Carpentier br...@daknet.org
-
-pkgname=cairo
-pkgver=1.12.14
-pkgrel=1
-pkgdesc=Cairo vector graphics library
-arch=(i686 x86_64)
-license=('LGPL' 'MPL')
-url=http://cairographics.org/;
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'sh'
- 'libgl' 'libegl')
-makedepends=('mesa' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 
'valgrind'
- # for the test suite:
- 'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
-#optdepends=('xcb-util: for XCB backend') # really needed?
-provides=('cairo-xcb')
-replaces=('cairo-xcb')
-options=('!libtool')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
-sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr \
-   --sysconfdir=/etc \
-   --localstatedir=/var \
-   --disable-static \
-   --enable-tee \
-   --enable-gl \
-   --enable-egl \
-   --enable-svg \
-   --enable-ps \
-   --enable-pdf \
-   --enable-gobject #\
-   # --enable-test-surfaces
-   
-   #--disable-xlib-xcb \
-   # --enable-test-surfaces \ takes ages
-   #--enable-drm # breaks build
-   
-  make
-}
-
-#check() {
-#  cd $srcdir/$pkgname-$pkgver
-  #make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 
expected], 26 Skipped
-#  make test || /bin/true # 29 Passed, 464 Failed [460 crashed, 2 expected], 
26 Skipped
-#}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}

Copied: cairo/repos/testing-i686/PKGBUILD (from rev 178458, 
cairo/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-02-23 10:06:51 UTC (rev 178459)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Brice Carpentier br...@daknet.org
+
+pkgname=cairo
+pkgver=1.12.14
+pkgrel=2
+pkgdesc=Cairo vector graphics library
+arch=(i686 x86_64)
+license=('LGPL' 'MPL')
+url=http://cairographics.org/;
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'mesa' 'sh')
+makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind'
+ # for the test suite:
+ 'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
+#optdepends=('xcb-util: for XCB backend') # really needed?
+provides=('cairo-xcb')
+replaces=('cairo-xcb')
+options=('!libtool')
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
+sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr \
+   --sysconfdir=/etc \
+   --localstatedir=/var \
+   --disable-static \
+   --enable-tee \
+   --enable-gl \
+   --enable-egl \
+   --enable-svg \
+   --enable-ps \
+   --enable-pdf \
+   --enable-gobject #\
+   # --enable-test-surfaces
+   
+   #--disable-xlib-xcb \
+   # --enable-test-surfaces \ takes ages
+   #--enable-drm # breaks build
+   
+  make
+}
+
+#check() {
+#  cd $srcdir/$pkgname-$pkgver
+  #make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 
expected], 26 Skipped
+#  make test || /bin/true # 29 Passed, 464 Failed [460 crashed, 2 expected], 
26 Skipped
+#}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}

Deleted: testing-x86_64/PKGBUILD
===
--- testing-x86_64/PKGBUILD 2013-02-23 10:06:24 UTC (rev 178458)
+++ testing-x86_64/PKGBUILD 2013-02-23 10:06:51 UTC (rev 178459)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Brice Carpentier br...@daknet.org
-
-pkgname=cairo
-pkgver=1.12.14
-pkgrel=1
-pkgdesc=Cairo vector graphics library
-arch=(i686 x86_64)
-license=('LGPL' 'MPL')
-url=http://cairographics.org/;
-depends=('libpng' 

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2013-02-23 Thread Andreas Radke
Date: Saturday, February 23, 2013 @ 12:06:24
  Author: andyrtr
Revision: 178460

upgpkg: cairo 1.12.14-3

cairo truely needs libgl; move deps to package function to avoid pulling in old 
libgl/mesa before new makedeps

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 10:06:51 UTC (rev 178459)
+++ PKGBUILD2013-02-23 11:06:24 UTC (rev 178460)
@@ -4,13 +4,13 @@
 
 pkgname=cairo
 pkgver=1.12.14
-pkgrel=2
+pkgrel=3
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'mesa' 'sh')
-makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind'
+# depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 
'glib2' 'mesa=9.1' 'libgl' 'sh') 
+makedepends=('mesa=9.1' 'mesa-libgl=9.1' 'librsvg' 'gtk2' 'poppler-glib' 
'libspectre' 'gtk-doc' 'valgrind'
  # for the test suite:
  'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
 #optdepends=('xcb-util: for XCB backend') # really needed?
@@ -49,6 +49,8 @@
 #}
 
 package() {
+  depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 
'glib2' 'mesa=9.1' 'libgl' 'sh') 
+
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }



[arch-commits] Commit in cairo/repos (4 files)

2013-02-23 Thread Andreas Radke
Date: Saturday, February 23, 2013 @ 12:06:45
  Author: andyrtr
Revision: 178461

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cairo/repos/testing-i686/PKGBUILD
(from rev 178460, cairo/trunk/PKGBUILD)
  cairo/repos/testing-x86_64/PKGBUILD
(from rev 178460, cairo/trunk/PKGBUILD)
Deleted:
  cairo/repos/testing-i686/PKGBUILD
  cairo/repos/testing-x86_64/PKGBUILD

-+
 testing-i686/PKGBUILD   |  110 +++---
 testing-x86_64/PKGBUILD |  110 +++---
 2 files changed, 112 insertions(+), 108 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2013-02-23 11:06:24 UTC (rev 178460)
+++ testing-i686/PKGBUILD   2013-02-23 11:06:45 UTC (rev 178461)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Brice Carpentier br...@daknet.org
-
-pkgname=cairo
-pkgver=1.12.14
-pkgrel=2
-pkgdesc=Cairo vector graphics library
-arch=(i686 x86_64)
-license=('LGPL' 'MPL')
-url=http://cairographics.org/;
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'mesa' 'sh')
-makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind'
- # for the test suite:
- 'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
-#optdepends=('xcb-util: for XCB backend') # really needed?
-provides=('cairo-xcb')
-replaces=('cairo-xcb')
-options=('!libtool')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
-sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr \
-   --sysconfdir=/etc \
-   --localstatedir=/var \
-   --disable-static \
-   --enable-tee \
-   --enable-gl \
-   --enable-egl \
-   --enable-svg \
-   --enable-ps \
-   --enable-pdf \
-   --enable-gobject #\
-   # --enable-test-surfaces
-   
-   #--disable-xlib-xcb \
-   # --enable-test-surfaces \ takes ages
-   #--enable-drm # breaks build
-   
-  make
-}
-
-#check() {
-#  cd $srcdir/$pkgname-$pkgver
-  #make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 
expected], 26 Skipped
-#  make test || /bin/true # 29 Passed, 464 Failed [460 crashed, 2 expected], 
26 Skipped
-#}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}

Copied: cairo/repos/testing-i686/PKGBUILD (from rev 178460, 
cairo/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-02-23 11:06:45 UTC (rev 178461)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Brice Carpentier br...@daknet.org
+
+pkgname=cairo
+pkgver=1.12.14
+pkgrel=3
+pkgdesc=Cairo vector graphics library
+arch=(i686 x86_64)
+license=('LGPL' 'MPL')
+url=http://cairographics.org/;
+# depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 
'glib2' 'mesa=9.1' 'libgl' 'sh') 
+makedepends=('mesa=9.1' 'mesa-libgl=9.1' 'librsvg' 'gtk2' 'poppler-glib' 
'libspectre' 'gtk-doc' 'valgrind'
+ # for the test suite:
+ 'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
+#optdepends=('xcb-util: for XCB backend') # really needed?
+provides=('cairo-xcb')
+replaces=('cairo-xcb')
+options=('!libtool')
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
+sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr \
+   --sysconfdir=/etc \
+   --localstatedir=/var \
+   --disable-static \
+   --enable-tee \
+   --enable-gl \
+   --enable-egl \
+   --enable-svg \
+   --enable-ps \
+   --enable-pdf \
+   --enable-gobject #\
+   # --enable-test-surfaces
+   
+   #--disable-xlib-xcb \
+   # --enable-test-surfaces \ takes ages
+   #--enable-drm # breaks build
+   
+  make
+}
+
+#check() {
+#  cd $srcdir/$pkgname-$pkgver
+  #make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 
expected], 26 Skipped
+#  make test || /bin/true # 29 Passed, 464 Failed [460 crashed, 2 expected], 
26 Skipped
+#}
+
+package() {
+  depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 
'glib2' 'mesa=9.1' 'libgl' 'sh') 
+
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}

Deleted: testing-x86_64/PKGBUILD
===
--- testing-x86_64/PKGBUILD 2013-02-23 11:06:24 UTC (rev 178460)
+++ testing-x86_64/PKGBUILD 2013-02-23 11:06:45 UTC (rev 178461)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-# Contributor: Brice Carpentier br...@daknet.org
-
-pkgname=cairo
-pkgver=1.12.14
-pkgrel=2
-pkgdesc=Cairo 

[arch-commits] Commit in xorg-server/trunk (PKGBUILD)

2013-02-23 Thread Andreas Radke
Date: Saturday, February 23, 2013 @ 12:31:01
  Author: andyrtr
Revision: 178465

fix makedep for new Mesa

Modified:
  xorg-server/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 11:12:56 UTC (rev 178464)
+++ PKGBUILD2013-02-23 11:31:01 UTC (rev 178465)
@@ -8,10 +8,10 @@
 arch=('i686' 'x86_64')
 license=('custom')
 url=http://xorg.freedesktop.org;
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 
'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto'
+makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 
'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 
'videoproto'
  'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 
'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess'
  'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 
'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros'
- 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt')
+ 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt') 
 options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
 autoconfig-nvidia.patch



[arch-commits] Commit in getmail/trunk (PKGBUILD)

2013-02-23 Thread Andreas Radke
Date: Saturday, February 23, 2013 @ 13:05:44
  Author: andyrtr
Revision: 178466

upgpkg: getmail 4.39.0-1

upstream update 4.39.0

Modified:
  getmail/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 11:31:01 UTC (rev 178465)
+++ PKGBUILD2013-02-23 12:05:44 UTC (rev 178466)
@@ -3,7 +3,7 @@
 # Committer: Manolis Tzanidakis mano...@archlinux.org
 
 pkgname=getmail
-pkgver=4.38.0
+pkgver=4.39.0
 pkgrel=1
 pkgdesc=A POP3 mail retriever with reliable Maildir and command delivery.
 arch=(any)
@@ -11,7 +11,7 @@
 license=(GPL)
 depends=('python2')
 
source=(http://pyropus.ca/software/getmail/old-versions/$pkgname-$pkgver.tar.gz)
-md5sums=('0b320ffa9d9f00992fe7464693feb8be')
+md5sums=('1ca7e1bc034cf5578e8ceb251668962a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}



[arch-commits] Commit in getmail/repos/extra-any (PKGBUILD PKGBUILD)

2013-02-23 Thread Andreas Radke
Date: Saturday, February 23, 2013 @ 13:05:58
  Author: andyrtr
Revision: 178467

archrelease: copy trunk to extra-any

Added:
  getmail/repos/extra-any/PKGBUILD
(from rev 178466, getmail/trunk/PKGBUILD)
Deleted:
  getmail/repos/extra-any/PKGBUILD

--+
 PKGBUILD |   54 +++---
 1 file changed, 27 insertions(+), 27 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-02-23 12:05:44 UTC (rev 178466)
+++ PKGBUILD2013-02-23 12:05:58 UTC (rev 178467)
@@ -1,27 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke andy...@archlinux.org
-# Committer: Manolis Tzanidakis mano...@archlinux.org
-
-pkgname=getmail
-pkgver=4.38.0
-pkgrel=1
-pkgdesc=A POP3 mail retriever with reliable Maildir and command delivery.
-arch=(any)
-url=http://pyropus.ca/software/getmail;
-license=(GPL)
-depends=('python2')
-source=(http://pyropus.ca/software/getmail/old-versions/$pkgname-$pkgver.tar.gz)
-md5sums=('0b320ffa9d9f00992fe7464693feb8be')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python2 setup.py build
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python2 setup.py install --root=${pkgdir}
-  # fix some broken shebang calls
-  sed -i -e s|#![ ]*/usr/bin/env python|#!/usr/bin/env python2| 
$pkgdir/usr/lib/python2.7/site-packages/getmailcore/__init__.py
-  sed -i -e s|#![ ]*/usr/bin/env python2.3|#!/usr/bin/env python2| $(find 
$pkgdir -name '*.py')
-}

Copied: getmail/repos/extra-any/PKGBUILD (from rev 178466, 
getmail/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2013-02-23 12:05:58 UTC (rev 178467)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+# Committer: Manolis Tzanidakis mano...@archlinux.org
+
+pkgname=getmail
+pkgver=4.39.0
+pkgrel=1
+pkgdesc=A POP3 mail retriever with reliable Maildir and command delivery.
+arch=(any)
+url=http://pyropus.ca/software/getmail;
+license=(GPL)
+depends=('python2')
+source=(http://pyropus.ca/software/getmail/old-versions/$pkgname-$pkgver.tar.gz)
+md5sums=('1ca7e1bc034cf5578e8ceb251668962a')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  python2 setup.py build
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  python2 setup.py install --root=${pkgdir}
+  # fix some broken shebang calls
+  sed -i -e s|#![ ]*/usr/bin/env python|#!/usr/bin/env python2| 
$pkgdir/usr/lib/python2.7/site-packages/getmailcore/__init__.py
+  sed -i -e s|#![ ]*/usr/bin/env python2.3|#!/usr/bin/env python2| $(find 
$pkgdir -name '*.py')
+}



[arch-commits] Commit in lib32-mesa/trunk (PKGBUILD)

2013-02-23 Thread Laurent Carlier
Date: Saturday, February 23, 2013 @ 14:00:30
  Author: lcarlier
Revision: 84720

upgpkg: lib32-mesa 9.1-1

Sync with testing

Modified:
  lib32-mesa/trunk/PKGBUILD

--+
 PKGBUILD |  298 ++---
 1 file changed, 72 insertions(+), 226 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 10:01:39 UTC (rev 84719)
+++ PKGBUILD2013-02-23 13:00:30 UTC (rev 84720)
@@ -3,282 +3,128 @@
 # Contributor: Andreas Radke andy...@archlinux.org
 
 pkgbase=lib32-mesa
-pkgname=('lib32-libglapi' 'lib32-libgl' 'lib32-mesa' 'lib32-osmesa' 
'lib32-libgbm' 'lib32-libgles' 'lib32-libegl'
- 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
-#_git=true
-#_gitdate=20121005
-_git=false
-
-if [ ${_git} = true ]; then
-pkgver=8.99.git_$_gitdate
-  else
-pkgver=9.0.2
-fi
-
-pkgrel=4
+pkgname=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa' 
'lib32-mesa-libgl')
+pkgver=9.1
+pkgrel=1
 arch=('x86_64')
-makedepends=('glproto=1.4.16' 'lib32-libdrm=2.4.39' 
'lib32-libxxf86vm=1.1.2' 'lib32-libxdamage=1.1.3' 'lib32-expat=2.1.0'
- 'lib32-libx11=1.5.0' 'lib32-libxt=1.1.3' 
'lib32-gcc-libs=4.7.1-6' 'dri2proto=2.8' 'python2' 'libxml2'
- 'gcc-multilib' 'imake' 'lib32-llvm-amdgpu-snapshot' 
'lib32-systemd')
+makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 
'lib32-libdrm' 'dri2proto' 'lib32-libxxf86vm' 'lib32-libxdamage'
+ 'gcc-multilib' 'lib32-llvm-amdgpu-snapshot' 'lib32-systemd')
 url=http://mesa3d.sourceforge.net;
 license=('custom')
 options=('!libtool')
-source=(llvm32.patch)
-if [ ${_git} = true ]; then
-  # mesa git shot from 9.0 branch - see for state: 
http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
-  #source=(${source[@]} 
'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
-  source=(${source[@]} 
MesaLib-git${_gitdate}.zip::http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-542f6feda9bf18267dbd337943a5e871400d425a.tar.gz;)
-else
-  source=(${source[@]} 
ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2;)
-fi
-md5sums=('5fe9ad0c5beed19bc98d8c34aaad4ade'
- 'dc45d1192203e418163e0017640e1cfc')
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+)
+md5sums=('d3891e02215422e120271d976ff1947e')
 
 build() {
   export CC=gcc -m32
   export CXX=g++ -m32
   export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-  # for our llvm-config for 32 bit
   export LLVM_CONFIG=/usr/bin/llvm-config32
 
   cd ${srcdir}/?esa-*
 
-  patch -Np1 -i ${srcdir}/llvm32.patch
+  # our automake is far too new for their build system :)
+  autoreconf -vfi
 
-  COMMONOPTS=--prefix=/usr \
+  ./configure --enable-32-bit \
+--libdir=/usr/lib32 \
+--prefix=/usr \
 --sysconfdir=/etc \
 --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
 --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
 --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
 --enable-gallium-llvm \
 --enable-egl \
---enable-gallium-egl
+--enable-gallium-egl \
 --with-egl-platforms=x11,drm \
 --enable-shared-glapi \
+--enable-gbm \
 --enable-glx-tls \
 --enable-dri \
+--enable-glx \
+--enable-osmesa \
 --enable-gles1 \
 --enable-gles2 \
---enable-texture-float \
---enable-osmesa \
---enable-32-bit \
---libdir=/usr/lib32 
-
-  if [ ${_git} = true ]; then
-./autogen.sh \
-  $COMMONOPTS
-  else
-autoreconf -vfi
-./configure \
-  $COMMONOPTS
-  fi
-
-  # fix a build break with new llvm
-  sed -i s:-Werror=implicit-function-declaration:: 
src/gallium/drivers/r600/Makefile
-
+--enable-texture-float
+# --with-llvm-shared-libs \ # enabling this would force us to move 
lib32-llvm-amdgpu-snapshot from community to extra, delay it until llvm 3.3 / 
Mesa 9.2/10.0
   make
+
+  mkdir $srcdir/fakeinstall
+  make DESTDIR=${srcdir}/fakeinstall install
 }
 
-package_lib32-libglapi() {
-  depends=('lib32-glibc' 'libglapi')
-  pkgdesc=free implementation of the GL API -- shared library. The Mesa GL 
API module is responsible for dispatching all the gl* functions (32-bits)
-
-  cd ${srcdir}/?esa-*   
-
-  make -C src/mapi/shared-glapi DESTDIR=${pkgdir} install
-
-  install -m755 -d ${pkgdir}/usr/share/licenses/libglapi
-  ln -s libglapi ${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi
-}
-
-package_lib32-libgl() {
-  depends=('lib32-libdrm=2.4.39' 'lib32-libxxf86vm=1.1.2' 
'lib32-libxdamage=1.1.3' 'lib32-expat=2.1.0' 'lib32-libglapi'
-   'libgl')
-  pkgdesc=Mesa 3-D graphics library and DRI software rasterizer (32-bit)
-
-  cd ${srcdir}/?esa-*
-
-  # fix linking because of splitted package
-  make -C src/mapi/shared-glapi DESTDIR=${pkgdir} install
-
-  # libGL  libdricore
-  make -C src/glx DESTDIR=${pkgdir} install
-  make -C src/mesa/libdricore 

[arch-commits] Commit in lib32-mesa/repos (3 files)

2013-02-23 Thread Laurent Carlier
Date: Saturday, February 23, 2013 @ 14:00:37
  Author: lcarlier
Revision: 84721

archrelease: copy trunk to multilib-testing-x86_64

Added:
  lib32-mesa/repos/multilib-testing-x86_64/
  lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD
(from rev 84720, lib32-mesa/trunk/PKGBUILD)
  lib32-mesa/repos/multilib-testing-x86_64/llvm32.patch
(from rev 84720, lib32-mesa/trunk/llvm32.patch)

--+
 PKGBUILD |  130 ++
 llvm32.patch |  284 +
 2 files changed, 414 insertions(+)

Copied: lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD (from rev 84720, 
lib32-mesa/trunk/PKGBUILD)
===
--- multilib-testing-x86_64/PKGBUILD(rev 0)
+++ multilib-testing-x86_64/PKGBUILD2013-02-23 13:00:37 UTC (rev 84721)
@@ -0,0 +1,130 @@
+# $Id$
+# Contributor: Jan de Groot j...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+
+pkgbase=lib32-mesa
+pkgname=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa' 
'lib32-mesa-libgl')
+pkgver=9.1
+pkgrel=1
+arch=('x86_64')
+makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 
'lib32-libdrm' 'dri2proto' 'lib32-libxxf86vm' 'lib32-libxdamage'
+ 'gcc-multilib' 'lib32-llvm-amdgpu-snapshot' 'lib32-systemd')
+url=http://mesa3d.sourceforge.net;
+license=('custom')
+options=('!libtool')
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+)
+md5sums=('d3891e02215422e120271d976ff1947e')
+
+build() {
+  export CC=gcc -m32
+  export CXX=g++ -m32
+  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+  export LLVM_CONFIG=/usr/bin/llvm-config32
+
+  cd ${srcdir}/?esa-*
+
+  # our automake is far too new for their build system :)
+  autoreconf -vfi
+
+  ./configure --enable-32-bit \
+--libdir=/usr/lib32 \
+--prefix=/usr \
+--sysconfdir=/etc \
+--with-dri-driverdir=/usr/lib32/xorg/modules/dri \
+--with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
+--with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
+--enable-gallium-llvm \
+--enable-egl \
+--enable-gallium-egl \
+--with-egl-platforms=x11,drm \
+--enable-shared-glapi \
+--enable-gbm \
+--enable-glx-tls \
+--enable-dri \
+--enable-glx \
+--enable-osmesa \
+--enable-gles1 \
+--enable-gles2 \
+--enable-texture-float
+# --with-llvm-shared-libs \ # enabling this would force us to move 
lib32-llvm-amdgpu-snapshot from community to extra, delay it until llvm 3.3 / 
Mesa 9.2/10.0
+  make
+
+  mkdir $srcdir/fakeinstall
+  make DESTDIR=${srcdir}/fakeinstall install
+}
+
+package_lib32-ati-dri() {
+  pkgdesc=Mesa drivers for AMD/ATI Radeon (32-bit)
+  depends=(lib32-mesa-libgl=${pkgver} 'ati-dri')
+  conflicts=('xf86-video-ati6.9.0-6')
+
+  install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
+  mv -v 
${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so
 ${pkgdir}/usr/lib32/xorg/modules/dri/
+
+  install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe
+  mv -v 
${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_{r300,r600,radeonsi}* 
${pkgdir}/usr/lib32/gallium-pipe/
+  
+  install -m755 -d ${pkgdir}/usr/share/licenses/ati-dri
+  ln -s ati-dri $pkgdir/usr/share/licenses/ati-dri/lib32-ati-dri
+}
+
+package_lib32-intel-dri() {
+  pkgdesc=Mesa DRI drivers for Intel (32-bit)
+  depends=(lib32-mesa-libgl=${pkgver} 'intel-dri')
+
+  install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
+  mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{i915,i965}_dri.so 
${pkgdir}/usr/lib32/xorg/modules/dri/
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/intel-dri
+  ln -s intel-dri $pkgdir/usr/share/licenses/intel-dri/lib32-intel-dri
+}
+
+package_lib32-nouveau-dri() {
+  pkgdesc=Mesa drivers for Nouveau (32-bit)
+  depends=(lib32-mesa-libgl=${pkgver} 'nouveau-dri')
+
+  install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
+  mv -v 
${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/nouveau_{dri,vieux_dri}.so 
${pkgdir}/usr/lib32/xorg/modules/dri/
+
+  install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe
+  mv -v ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_nouveau* 
${pkgdir}/usr/lib32/gallium-pipe/
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/nouveau-dri
+  ln -s nouveau-dri $pkgdir/usr/share/licenses/nouveau-dri/lib32-nouveau-dri
+}
+
+package_lib32-mesa() {
+  pkgdesc=an open-source implementation of the OpenGL specification (32-bit)
+  depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 
'lib32-systemd' 'lib32-mesa')
+  optdepends=('opengl-man-pages: for the OpenGL API man pages')
+  provides=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 
'lib32-libegl')
+  conflicts=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 
'lib32-libegl')
+  replaces=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 

[arch-commits] Commit in lib32-mesa/trunk (PKGBUILD llvm32.patch)

2013-02-23 Thread Laurent Carlier
Date: Saturday, February 23, 2013 @ 16:26:23
  Author: lcarlier
Revision: 84722

upgpkg: lib32-mesa 9.1-1.1

Fix a typo in lib32-mesa dependencies

Modified:
  lib32-mesa/trunk/PKGBUILD
Deleted:
  lib32-mesa/trunk/llvm32.patch

--+
 PKGBUILD |   10 +-
 llvm32.patch |  284 -
 2 files changed, 5 insertions(+), 289 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 13:00:37 UTC (rev 84721)
+++ PKGBUILD2013-02-23 15:26:23 UTC (rev 84722)
@@ -5,7 +5,7 @@
 pkgbase=lib32-mesa
 pkgname=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa' 
'lib32-mesa-libgl')
 pkgver=9.1
-pkgrel=1
+pkgrel=1.1
 arch=('x86_64')
 makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 
'lib32-libdrm' 'dri2proto' 'lib32-libxxf86vm' 'lib32-libxdamage'
  'gcc-multilib' 'lib32-llvm-amdgpu-snapshot' 'lib32-systemd')
@@ -96,7 +96,7 @@
 
 package_lib32-mesa() {
   pkgdesc=an open-source implementation of the OpenGL specification (32-bit)
-  depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 
'lib32-systemd' 'lib32-mesa')
+  depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 
'lib32-systemd' 'mesa')
   optdepends=('opengl-man-pages: for the OpenGL API man pages')
   provides=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 
'lib32-libegl')
   conflicts=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 
'lib32-libegl')
@@ -121,9 +121,9 @@
 
   install -m755 -d ${pkgdir}/usr/lib32
 
-  ln -s mesa-libGL.so.1.2.0  ${pkgdir}/usr/lib32/libGL.so
-  ln -s mesa-libGL.so.1.2.0  ${pkgdir}/usr/lib32/libGL.so.1
-  ln -s mesa-libGL.so.1.2.0  ${pkgdir}/usr/lib32/libGL.so.1.2.0
+  ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so
+  ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1
+  ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1.2.0
 
   install -m755 -d ${pkgdir}/usr/share/licenses/libglapi
   ln -s libglapi ${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi

Deleted: llvm32.patch
===
--- llvm32.patch2013-02-23 13:00:37 UTC (rev 84721)
+++ llvm32.patch2013-02-23 15:26:23 UTC (rev 84722)
@@ -1,284 +0,0 @@
-From 8d9778589f4b3a174e884338adb0fe1bdeca5eb7 Mon Sep 17 00:00:00 2001
-From: Tom Stellard thomas.stell...@amd.com
-Date: Thu, 10 May 2012 14:21:54 +
-Subject: radeon: Support LLVM 3.2
-
-LLVM 3.2 and newer requires that the R600/SI backend be part of the
-LLVM tree.

-diff --git a/configure.ac b/configure.ac
-index 896f98a..32f412b 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -1661,6 +1661,7 @@ if test x$enable_gallium_llvm = xyes; then
- if $LLVM_CONFIG --components | grep -q '\mcjit\'; then
- LLVM_COMPONENTS=${LLVM_COMPONENTS} mcjit
- fi
-+LLVM_COMPONENTS=${LLVM_COMPONENTS} all-targets
- if test x$enable_opencl = xyes; then
- LLVM_COMPONENTS=${LLVM_COMPONENTS} ipo linker 
instrumentation
- fi
-@@ -1782,6 +1783,23 @@ gallium_require_drm_loader() {
- fi
- }
- 
-+radeon_llvm_check() {
-+LLVM_VERSION_MAJOR=`echo $LLVM_VERSION | cut -d. -f1`
-+if test $LLVM_VERSION_MAJOR -lt 3 -o x$LLVM_VERSION = x3.0; then
-+AC_MSG_ERROR([LLVM 3.1 or newer is required for the r600/radeonsi 
llvm compiler.])
-+fi
-+if test $LLVM_VERSION_MAJOR -ge 3 -a x$LLVM_VERSION != x3.1  
$LLVM_CONFIG --targets-built | grep -qv '\AMDGPU\' ; then
-+AC_MSG_ERROR([To use the r600/radeonsi LLVM backend with LLVM 3.2 and 
newer, you need to fetch the LLVM source from:
-+  git://people.freedesktop.org/~tstellar/llvm master
-+  and build with --enable-experimental-targets==AMDGPU])
-+fi
-+if test $LLVM_VERSION = 3.2; then
-+dnl LLVM 3.2 does not add experimental libraries to llvm-config's
-+dnl library list.
-+LLVM_LIBS=$LLVM_LIBS -lLLVMAMDGPUCodeGen -lLLVMAMDGPUDesc 
-lLLVMAMDGPUAsmPrinter -lLLVMAMDGPUInfo `$LLVM_CONFIG --libs mc`
-+fi
-+}
-+
- dnl Gallium drivers
- dnl Duplicates in GALLIUM_DRIVERS_DIRS are removed by sorting it after this 
block
- if test x$with_gallium_drivers != x; then
-@@ -1812,9 +1830,7 @@ if test x$with_gallium_drivers != x; then
- gallium_require_drm_loader
- GALLIUM_DRIVERS_DIRS=$GALLIUM_DRIVERS_DIRS r600
- if test x$enable_r600_llvm = xyes -o x$enable_opencl = xyes; 
then
--if test x$LLVM_VERSION != x3.1; then
--AC_MSG_ERROR([LLVM 3.1 is required for the r600 llvm 
compiler.])
--fi
-+radeon_llvm_check
- NEED_RADEON_GALLIUM=yes;
- fi
- if test x$enable_r600_llvm = xyes; then
-@@ -1829,9 +1845,7 @@ if test x$with_gallium_drivers != x; then
-

[arch-commits] Commit in lib32-mesa/repos/multilib-testing-x86_64 (3 files)

2013-02-23 Thread Laurent Carlier
Date: Saturday, February 23, 2013 @ 16:26:29
  Author: lcarlier
Revision: 84723

archrelease: copy trunk to multilib-testing-x86_64

Added:
  lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD
(from rev 84722, lib32-mesa/trunk/PKGBUILD)
Deleted:
  lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD
  lib32-mesa/repos/multilib-testing-x86_64/llvm32.patch

--+
 PKGBUILD |  260 ++--
 llvm32.patch |  284 -
 2 files changed, 130 insertions(+), 414 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-02-23 15:26:23 UTC (rev 84722)
+++ PKGBUILD2013-02-23 15:26:29 UTC (rev 84723)
@@ -1,130 +0,0 @@
-# $Id$
-# Contributor: Jan de Groot j...@archlinux.org
-# Contributor: Andreas Radke andy...@archlinux.org
-
-pkgbase=lib32-mesa
-pkgname=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa' 
'lib32-mesa-libgl')
-pkgver=9.1
-pkgrel=1
-arch=('x86_64')
-makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 
'lib32-libdrm' 'dri2proto' 'lib32-libxxf86vm' 'lib32-libxdamage'
- 'gcc-multilib' 'lib32-llvm-amdgpu-snapshot' 'lib32-systemd')
-url=http://mesa3d.sourceforge.net;
-license=('custom')
-options=('!libtool')
-source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-)
-md5sums=('d3891e02215422e120271d976ff1947e')
-
-build() {
-  export CC=gcc -m32
-  export CXX=g++ -m32
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-  export LLVM_CONFIG=/usr/bin/llvm-config32
-
-  cd ${srcdir}/?esa-*
-
-  # our automake is far too new for their build system :)
-  autoreconf -vfi
-
-  ./configure --enable-32-bit \
---libdir=/usr/lib32 \
---prefix=/usr \
---sysconfdir=/etc \
---with-dri-driverdir=/usr/lib32/xorg/modules/dri \
---with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
---with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
---enable-gallium-llvm \
---enable-egl \
---enable-gallium-egl \
---with-egl-platforms=x11,drm \
---enable-shared-glapi \
---enable-gbm \
---enable-glx-tls \
---enable-dri \
---enable-glx \
---enable-osmesa \
---enable-gles1 \
---enable-gles2 \
---enable-texture-float
-# --with-llvm-shared-libs \ # enabling this would force us to move 
lib32-llvm-amdgpu-snapshot from community to extra, delay it until llvm 3.3 / 
Mesa 9.2/10.0
-  make
-
-  mkdir $srcdir/fakeinstall
-  make DESTDIR=${srcdir}/fakeinstall install
-}
-
-package_lib32-ati-dri() {
-  pkgdesc=Mesa drivers for AMD/ATI Radeon (32-bit)
-  depends=(lib32-mesa-libgl=${pkgver} 'ati-dri')
-  conflicts=('xf86-video-ati6.9.0-6')
-
-  install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
-  mv -v 
${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so
 ${pkgdir}/usr/lib32/xorg/modules/dri/
-
-  install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe
-  mv -v 
${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_{r300,r600,radeonsi}* 
${pkgdir}/usr/lib32/gallium-pipe/
-  
-  install -m755 -d ${pkgdir}/usr/share/licenses/ati-dri
-  ln -s ati-dri $pkgdir/usr/share/licenses/ati-dri/lib32-ati-dri
-}
-
-package_lib32-intel-dri() {
-  pkgdesc=Mesa DRI drivers for Intel (32-bit)
-  depends=(lib32-mesa-libgl=${pkgver} 'intel-dri')
-
-  install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
-  mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{i915,i965}_dri.so 
${pkgdir}/usr/lib32/xorg/modules/dri/
-
-  install -m755 -d ${pkgdir}/usr/share/licenses/intel-dri
-  ln -s intel-dri $pkgdir/usr/share/licenses/intel-dri/lib32-intel-dri
-}
-
-package_lib32-nouveau-dri() {
-  pkgdesc=Mesa drivers for Nouveau (32-bit)
-  depends=(lib32-mesa-libgl=${pkgver} 'nouveau-dri')
-
-  install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
-  mv -v 
${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/nouveau_{dri,vieux_dri}.so 
${pkgdir}/usr/lib32/xorg/modules/dri/
-
-  install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe
-  mv -v ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_nouveau* 
${pkgdir}/usr/lib32/gallium-pipe/
-
-  install -m755 -d ${pkgdir}/usr/share/licenses/nouveau-dri
-  ln -s nouveau-dri $pkgdir/usr/share/licenses/nouveau-dri/lib32-nouveau-dri
-}
-
-package_lib32-mesa() {
-  pkgdesc=an open-source implementation of the OpenGL specification (32-bit)
-  depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 
'lib32-systemd' 'lib32-mesa')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  provides=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 
'lib32-libegl')
-  conflicts=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 
'lib32-libegl')
-  replaces=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 
'lib32-libegl')
-
-  mv -v ${srcdir}/fakeinstall/* ${pkgdir}
-  mv ${pkgdir}/usr/lib32/libGL.so.1.2.0 

[arch-commits] Commit in lib32-cairo/trunk (PKGBUILD)

2013-02-23 Thread Laurent Carlier
Date: Saturday, February 23, 2013 @ 18:23:46
  Author: lcarlier
Revision: 84724

upgpkg: lib32-cairo 1.12.14-3

Rebuild with new mesa-9.1 dependencies, force mesa-libgl to fix conflicts

Modified:
  lib32-cairo/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 15:26:29 UTC (rev 84723)
+++ PKGBUILD2013-02-23 17:23:46 UTC (rev 84724)
@@ -4,14 +4,12 @@
 _pkgbasename=cairo
 pkgname=lib32-$_pkgbasename
 pkgver=1.12.14
-pkgrel=2
+pkgrel=3
 pkgdesc=Cairo vector graphics library (32-bit)
 arch=('x86_64')
 url=http://cairographics.org/;
 license=('LGPL' 'MPL')
-depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig'
- 'lib32-pixman' 'lib32-glib2' 'lib32-libgl' 'lib32-libegl' 
${_pkgbasename})
-makedepends=('gcc-multilib' 'lib32-mesa')
+makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa=9.1' 
'lib32-mesa-libgl=9.1' 'mesa-libgl') # we need to avoid old libgl in [extra]
 source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz)
 sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15')
 
@@ -35,6 +33,9 @@
 }
 
 package() {
+  depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig'
+   'lib32-pixman' 'lib32-glib2' 'lib32-mesa=9.1' 'lib32-libgl' 
${_pkgbasename})
+
   cd ${srcdir}/${_pkgbasename}-${pkgver}
   make DESTDIR=${pkgdir} install
   rm -rf ${pkgdir}/usr/{include,share,bin}



[arch-commits] Commit in lib32-cairo/repos/multilib-testing-x86_64 (6 files)

2013-02-23 Thread Laurent Carlier
Date: Saturday, February 23, 2013 @ 18:23:56
  Author: lcarlier
Revision: 84725

archrelease: copy trunk to multilib-testing-x86_64

Added:
  lib32-cairo/repos/multilib-testing-x86_64/PKGBUILD
(from rev 84724, lib32-cairo/trunk/PKGBUILD)
  
lib32-cairo/repos/multilib-testing-x86_64/revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch
(from rev 84724, 
lib32-cairo/trunk/revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch)
  
lib32-cairo/repos/multilib-testing-x86_64/revert-xlib-map-to-image-requires-an-extents.patch
(from rev 84724, 
lib32-cairo/trunk/revert-xlib-map-to-image-requires-an-extents.patch)
Deleted:
  lib32-cairo/repos/multilib-testing-x86_64/PKGBUILD
  
lib32-cairo/repos/multilib-testing-x86_64/revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch
  
lib32-cairo/repos/multilib-testing-x86_64/revert-xlib-map-to-image-requires-an-extents.patch

---+
 PKGBUILD  |   83 +-
 revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch |  288 
+-
 revert-xlib-map-to-image-requires-an-extents.patch|   48 -
 3 files changed, 210 insertions(+), 209 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-02-23 17:23:46 UTC (rev 84724)
+++ PKGBUILD2013-02-23 17:23:56 UTC (rev 84725)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru ib...@archlinux.org
-
-_pkgbasename=cairo
-pkgname=lib32-$_pkgbasename
-pkgver=1.12.14
-pkgrel=2
-pkgdesc=Cairo vector graphics library (32-bit)
-arch=('x86_64')
-url=http://cairographics.org/;
-license=('LGPL' 'MPL')
-depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig'
- 'lib32-pixman' 'lib32-glib2' 'lib32-libgl' 'lib32-libegl' 
${_pkgbasename})
-makedepends=('gcc-multilib' 'lib32-mesa')
-source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz)
-sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15')
-
-build() {
-  export CC=gcc -m32
-  export CXX=g++ -m32
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-
-  ./configure --prefix=/usr \
-  --libdir=/usr/lib32 \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --disable-static \
-  --enable-tee \
-  --enable-gl \
-  --enable-egl
-  # --disable-xlib-xcb
-  make
-}
-
-package() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/{include,share,bin}
-}

Copied: lib32-cairo/repos/multilib-testing-x86_64/PKGBUILD (from rev 84724, 
lib32-cairo/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2013-02-23 17:23:56 UTC (rev 84725)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Ionut Biru ib...@archlinux.org
+
+_pkgbasename=cairo
+pkgname=lib32-$_pkgbasename
+pkgver=1.12.14
+pkgrel=3
+pkgdesc=Cairo vector graphics library (32-bit)
+arch=('x86_64')
+url=http://cairographics.org/;
+license=('LGPL' 'MPL')
+makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa=9.1' 
'lib32-mesa-libgl=9.1' 'mesa-libgl') # we need to avoid old libgl in [extra]
+source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz)
+sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15')
+
+build() {
+  export CC=gcc -m32
+  export CXX=g++ -m32
+  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+
+  cd ${srcdir}/${_pkgbasename}-${pkgver}
+
+  ./configure --prefix=/usr \
+  --libdir=/usr/lib32 \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --disable-static \
+  --enable-tee \
+  --enable-gl \
+  --enable-egl
+  # --disable-xlib-xcb
+  make
+}
+
+package() {
+  depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig'
+   'lib32-pixman' 'lib32-glib2' 'lib32-mesa=9.1' 'lib32-libgl' 
${_pkgbasename})
+
+  cd ${srcdir}/${_pkgbasename}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  rm -rf ${pkgdir}/usr/{include,share,bin}
+}

Deleted: revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch
===
--- revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch   
2013-02-23 17:23:46 UTC (rev 84724)
+++ revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch   
2013-02-23 17:23:56 UTC (rev 84725)
@@ -1,144 +0,0 @@
-From a73e7ff0186176bc82cd3ae1432c054c1fd3aebd Mon Sep 17 00:00:00 2001
-From: Chris Wilson ch...@chris-wilson.co.uk
-Date: Sun, 06 Jan 2013 11:29:27 +
-Subject: xlib: Simplify source creation by use of map-to-image
-
-We were open-coding the functionality of map-to-image inside the source
-creation routines. so refactor to actually use map-to-image instead.
-
-Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk

-diff --git a/src/cairo-xlib-source.c 

[arch-commits] Commit in ipset/trunk (PKGBUILD)

2013-02-23 Thread Sébastien Luttringer
Date: Saturday, February 23, 2013 @ 18:46:06
  Author: seblu
Revision: 84726

upgpkg: ipset 6.17-1

Modified:
  ipset/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 17:23:56 UTC (rev 84725)
+++ PKGBUILD2013-02-23 17:46:06 UTC (rev 84726)
@@ -2,8 +2,8 @@
 # Maintainer: Sébastien Luttringer
 
 pkgname=ipset
-pkgver=6.16.1
-pkgrel=2
+pkgver=6.17
+pkgrel=1
 pkgdesc='Administration tool for IP sets'
 arch=('i686' 'x86_64')
 url='http://ipset.netfilter.org'
@@ -14,7 +14,7 @@
 source=(http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2;
 $pkgname.systemd
 $pkgname.service)
-md5sums=('9fd70c825f052db7dc9d5ba0562b7083'
+md5sums=('9d439e279e02076f29fe7c9c059a5cae'
  '7daa4f163eef9db216cb4c428e0342a3'
  'b032241b96b5802975fe4321cc511c6b')
 



[arch-commits] Commit in ipset/repos (12 files)

2013-02-23 Thread Sébastien Luttringer
Date: Saturday, February 23, 2013 @ 18:46:16
  Author: seblu
Revision: 84727

archrelease: copy trunk to community-i686, community-x86_64

Added:
  ipset/repos/community-i686/PKGBUILD
(from rev 84726, ipset/trunk/PKGBUILD)
  ipset/repos/community-i686/ipset.service
(from rev 84726, ipset/trunk/ipset.service)
  ipset/repos/community-i686/ipset.systemd
(from rev 84726, ipset/trunk/ipset.systemd)
  ipset/repos/community-x86_64/PKGBUILD
(from rev 84726, ipset/trunk/PKGBUILD)
  ipset/repos/community-x86_64/ipset.service
(from rev 84726, ipset/trunk/ipset.service)
  ipset/repos/community-x86_64/ipset.systemd
(from rev 84726, ipset/trunk/ipset.systemd)
Deleted:
  ipset/repos/community-i686/PKGBUILD
  ipset/repos/community-i686/ipset.service
  ipset/repos/community-i686/ipset.systemd
  ipset/repos/community-x86_64/PKGBUILD
  ipset/repos/community-x86_64/ipset.service
  ipset/repos/community-x86_64/ipset.systemd

+
 community-i686/PKGBUILD|   90 +++
 community-i686/ipset.service   |   24 +-
 community-i686/ipset.systemd   |   42 +-
 community-x86_64/PKGBUILD  |   90 +++
 community-x86_64/ipset.service |   24 +-
 community-x86_64/ipset.systemd |   42 +-
 6 files changed, 156 insertions(+), 156 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-02-23 17:46:06 UTC (rev 84726)
+++ community-i686/PKGBUILD 2013-02-23 17:46:16 UTC (rev 84727)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer se...@aur.archlinux.org
-
-pkgname=ipset
-pkgver=6.16.1
-pkgrel=2
-pkgdesc='Administration tool for IP sets'
-arch=('i686' 'x86_64')
-url='http://ipset.netfilter.org'
-license=('GPL2')
-depends=('libmnl' 'bash')
-backup=(etc/$pkgname.conf)
-options=('!libtool')
-source=(http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2;
-$pkgname.systemd
-$pkgname.service)
-md5sums=('9fd70c825f052db7dc9d5ba0562b7083'
- '7daa4f163eef9db216cb4c428e0342a3'
- 'b032241b96b5802975fe4321cc511c6b')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --with-kmod=no
-  make
-}
-
-package() {
-  pushd $pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  # install doc
-  install -dm755 $pkgdir/usr/share/doc/$pkgname
-  install -m644 README UPGRADE ChangeLog $pkgdir/usr/share/doc/$pkgname
-  # install pkgconfig file
-  install -Dm644 lib/libipset.pc $pkgdir/usr/lib/pkgconfig/libipset.pc
-  popd
-  # systemd
-  install -Dm 755 $pkgname.systemd \
-$pkgdir/usr/lib/systemd/scripts/$pkgname
-  install -Dm 644 $pkgname.service \
-$pkgdir/usr/lib/systemd/system/$pkgname.service
-  # default config file
-  install -Dm 644 /dev/null $pkgdir/etc/$pkgname.conf
-}
-
-# vim:set ts=2 sw=2 et:

Copied: ipset/repos/community-i686/PKGBUILD (from rev 84726, 
ipset/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-02-23 17:46:16 UTC (rev 84727)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=ipset
+pkgver=6.17
+pkgrel=1
+pkgdesc='Administration tool for IP sets'
+arch=('i686' 'x86_64')
+url='http://ipset.netfilter.org'
+license=('GPL2')
+depends=('libmnl' 'bash')
+backup=(etc/$pkgname.conf)
+options=('!libtool')
+source=(http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2;
+$pkgname.systemd
+$pkgname.service)
+md5sums=('9d439e279e02076f29fe7c9c059a5cae'
+ '7daa4f163eef9db216cb4c428e0342a3'
+ 'b032241b96b5802975fe4321cc511c6b')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --with-kmod=no
+  make
+}
+
+package() {
+  pushd $pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  # install doc
+  install -dm755 $pkgdir/usr/share/doc/$pkgname
+  install -m644 README UPGRADE ChangeLog $pkgdir/usr/share/doc/$pkgname
+  # install pkgconfig file
+  install -Dm644 lib/libipset.pc $pkgdir/usr/lib/pkgconfig/libipset.pc
+  popd
+  # systemd
+  install -Dm 755 $pkgname.systemd \
+$pkgdir/usr/lib/systemd/scripts/$pkgname
+  install -Dm 644 $pkgname.service \
+$pkgdir/usr/lib/systemd/system/$pkgname.service
+  # default config file
+  install -Dm 644 /dev/null $pkgdir/etc/$pkgname.conf
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-i686/ipset.service
===
--- community-i686/ipset.service2013-02-23 17:46:06 UTC (rev 84726)
+++ community-i686/ipset.service2013-02-23 17:46:16 UTC (rev 84727)
@@ -1,12 +0,0 @@
-[Unit]
-Description=IP Sets
-Before=iptables.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/lib/systemd/scripts/ipset start
-ExecStop=/usr/lib/systemd/scripts/ipset stop
-
-[Install]
-WantedBy=multi-user.target

Copied: 

[arch-commits] Commit in allegro/trunk (PKGBUILD)

2013-02-23 Thread Alexander Rødseth
Date: Saturday, February 23, 2013 @ 18:57:52
  Author: arodseth
Revision: 84728

Preparation for mesa unification, not rebuilding, as recommended

Modified:
  allegro/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 17:46:16 UTC (rev 84727)
+++ PKGBUILD2013-02-23 17:57:52 UTC (rev 84728)
@@ -6,13 +6,13 @@
 
 pkgname=allegro
 pkgver=5.0.9
-pkgrel=1
+pkgrel=2
 pkgdesc='Portable library mainly aimed at video game and multimedia 
programming'
 arch=('x86_64' 'i686')
 url='http://alleg.sourceforge.net/'
 license=('custom')
+makedepends=('cmake' 'mesa-libgl' 'glu')
 depends=('jack' 'libxpm' 'libxxf86dga' 'libgl' 'physfs' 'gtk2' 'libpulse')
-makedepends=('cmake' 'mesa' 'glu')
 source=(http://downloads.sourceforge.net/alleg/$pkgname-$pkgver.tar.gz;)
 sha256sums=('ba28ac307023f1c756f1c421086f81d1e19ec5f09412d5848303c64177a20bd5')
 



[arch-commits] Commit in nginx/trunk (PKGBUILD logrotate nginx.install)

2013-02-23 Thread Bartłomiej Piotrowski
Date: Saturday, February 23, 2013 @ 21:47:17
  Author: bpiotrowski
Revision: 84729

upgpkg: nginx 1.2.7-3

I definitely wanted 640 here.

Modified:
  nginx/trunk/PKGBUILD
  nginx/trunk/logrotate
  nginx/trunk/nginx.install

---+
 PKGBUILD  |4 ++--
 logrotate |2 +-
 nginx.install |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 17:57:52 UTC (rev 84728)
+++ PKGBUILD2013-02-23 20:47:17 UTC (rev 84729)
@@ -8,7 +8,7 @@
 
 pkgname=nginx
 pkgver=1.2.7
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64')
 depends=('pcre' 'zlib' 'openssl' 'geoip')
@@ -31,7 +31,7 @@
logrotate)
 sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3'
 '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a'
-'b0ef6c00e0e94926588242ed910b387922e513d5152fcdb651dc06e2b84e7d85')
+'a21b564eaf83b4b4ce3a436e895bd37e000677fb314b89818f89f30caca6e6d9')
 
 build() {
cd $srcdir/$pkgname-$pkgver

Modified: logrotate
===
--- logrotate   2013-02-23 17:57:52 UTC (rev 84728)
+++ logrotate   2013-02-23 20:47:17 UTC (rev 84729)
@@ -1,6 +1,6 @@
 /var/log/nginx/*log {
missingok
-   create 750 root log
+   create 640 root log
sharedscripts
compress
postrotate

Modified: nginx.install
===
--- nginx.install   2013-02-23 17:57:52 UTC (rev 84728)
+++ nginx.install   2013-02-23 20:47:17 UTC (rev 84729)
@@ -1,12 +1,12 @@
 post_install() {
 if [[ -e var/log/nginx ]]; then
-chmod 750 var/log/nginx
+chmod 640 var/log/nginx
 chown root:log var/log/nginx
 fi
 }
 
 post_upgrade() {
-[[ $(vercmp $2 1.2.7-1) -le 0 ]]  post_install
+[[ $(vercmp $2 1.2.7-2) -le 0 ]]  post_install
 if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then
 echo   Since 1.2.1-2 several changes has been made in package:
 echo   - *.conf files have been moved to /etc/nginx



[arch-commits] Commit in nginx/repos (16 files)

2013-02-23 Thread Bartłomiej Piotrowski
Date: Saturday, February 23, 2013 @ 21:47:41
  Author: bpiotrowski
Revision: 84730

archrelease: copy trunk to community-i686, community-x86_64

Added:
  nginx/repos/community-i686/PKGBUILD
(from rev 84729, nginx/trunk/PKGBUILD)
  nginx/repos/community-i686/logrotate
(from rev 84729, nginx/trunk/logrotate)
  nginx/repos/community-i686/nginx.install
(from rev 84729, nginx/trunk/nginx.install)
  nginx/repos/community-i686/service
(from rev 84729, nginx/trunk/service)
  nginx/repos/community-x86_64/PKGBUILD
(from rev 84729, nginx/trunk/PKGBUILD)
  nginx/repos/community-x86_64/logrotate
(from rev 84729, nginx/trunk/logrotate)
  nginx/repos/community-x86_64/nginx.install
(from rev 84729, nginx/trunk/nginx.install)
  nginx/repos/community-x86_64/service
(from rev 84729, nginx/trunk/service)
Deleted:
  nginx/repos/community-i686/PKGBUILD
  nginx/repos/community-i686/logrotate
  nginx/repos/community-i686/nginx.install
  nginx/repos/community-i686/service
  nginx/repos/community-x86_64/PKGBUILD
  nginx/repos/community-x86_64/logrotate
  nginx/repos/community-x86_64/nginx.install
  nginx/repos/community-x86_64/service

+
 community-i686/PKGBUILD|  194 +++
 community-i686/logrotate   |   18 +--
 community-i686/nginx.install   |   38 +++
 community-i686/service |   28 ++---
 community-x86_64/PKGBUILD  |  194 +++
 community-x86_64/logrotate |   18 +--
 community-x86_64/nginx.install |   38 +++
 community-x86_64/service   |   28 ++---
 8 files changed, 278 insertions(+), 278 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-02-23 20:47:17 UTC (rev 84729)
+++ community-i686/PKGBUILD 2013-02-23 20:47:41 UTC (rev 84730)
@@ -1,97 +0,0 @@
-# $Id$
-# Maintainer:  Sergej Pupykin pupykin.s+a...@gmail.com
-# Maintainer:  Bartłomiej Piotrowski nos...@bpiotrowski.pl
-# Contributor: Miroslaw Szot m...@czlug.icis.pcz.pl
-
-_cfgdir=/etc/nginx
-_tmpdir=/var/lib/nginx
-
-pkgname=nginx
-pkgver=1.2.7
-pkgrel=2
-pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
-arch=('i686' 'x86_64')
-depends=('pcre' 'zlib' 'openssl' 'geoip')
-makedepends=('passenger')
-url=http://nginx.org;
-license=('custom')
-install=nginx.install
-backup=(${_cfgdir:1}/fastcgi.conf
-   ${_cfgdir:1}/fastcgi_params
-   ${_cfgdir:1}/koi-win
-   ${_cfgdir:1}/koi-utf
-   ${_cfgdir:1}/mime.types
-   ${_cfgdir:1}/nginx.conf
-   ${_cfgdir:1}/scgi_params
-   ${_cfgdir:1}/uwsgi_params
-   ${_cfgdir:1}/win-utf
-   etc/logrotate.d/nginx)
-source=(http://nginx.org/download/nginx-$pkgver.tar.gz
-   service
-   logrotate)
-sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3'
-'77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a'
-'b0ef6c00e0e94926588242ed910b387922e513d5152fcdb651dc06e2b84e7d85')
-
-build() {
-   cd $srcdir/$pkgname-$pkgver
-
-   ./configure \
---prefix=$_cfgdir \
---conf-path=$_cfgdir/nginx.conf \
---sbin-path=/usr/sbin/nginx \
---pid-path=/var/run/nginx.pid \
---lock-path=/var/lock/nginx.lock \
---user=http --group=http \
---http-log-path=/var/log/nginx/access.log \
---error-log-path=/var/log/nginx/error.log \
---http-client-body-temp-path=$_tmpdir/client-body \
---http-proxy-temp-path=$_tmpdir/proxy \
---http-fastcgi-temp-path=$_tmpdir/fastcgi \
---http-scgi-temp-path=$_tmpdir/scgi \
---http-uwsgi-temp-path=$_tmpdir/uwsgi \
---with-imap --with-imap_ssl_module \
---with-ipv6 --with-pcre-jit \
---with-file-aio \
---with-http_dav_module \
---with-http_geoip_module \
---with-http_gzip_static_module \
---with-http_realip_module \
---with-http_ssl_module \
---with-http_stub_status_module \
---add-module=/usr/lib/passenger/ext/nginx \
-#--with-http_mp4_module \
-#--with-http_addition_module \
-#--with-http_xslt_module \
-#--with-http_image_filter_module \
-#--with-http_sub_module \
-#--with-http_flv_module \
-#--with-http_random_index_module \
-#--with-http_secure_link_module \
-#--with-http_degradation_module \
-#--with-http_perl_module \
-
-   make
-}
-
-package() {
-   cd $srcdir/$pkgname-$pkgver
-   make DESTDIR=$pkgdir install
-
-   sed -e 's|\user\s\+\w\+;|user html;|g' \
-   -e '44s|html|/usr/share/nginx/html|' \
-   -e '54s|html|/usr/share/nginx/html|' \
-   -i $pkgdir/etc/nginx/nginx.conf
-   rm $pkgdir/etc/nginx/*.default
-
-   install -d 

[arch-commits] Commit in quagga/trunk (3 files)

2013-02-23 Thread Sébastien Luttringer
Date: Saturday, February 23, 2013 @ 21:56:19
  Author: seblu
Revision: 84731

upgpkg: quagga 0.99.22-1

Modified:
  quagga/trunk/PKGBUILD
Deleted:
  quagga/trunk/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch
  quagga/trunk/0002-CVE-2012-1820.patch

+
 0001-isisd-fix-typo-in-topology-generator-BZ-731.patch |   30 --
 0002-CVE-2012-1820.patch   |   74 ---
 PKGBUILD   |   14 +-
 3 files changed, 5 insertions(+), 113 deletions(-)

Deleted: 0001-isisd-fix-typo-in-topology-generator-BZ-731.patch
===
--- 0001-isisd-fix-typo-in-topology-generator-BZ-731.patch  2013-02-23 
20:47:41 UTC (rev 84730)
+++ 0001-isisd-fix-typo-in-topology-generator-BZ-731.patch  2013-02-23 
20:56:19 UTC (rev 84731)
@@ -1,30 +0,0 @@
-From a47c5838e9f445ab887ad927706b11ccbb181364 Mon Sep 17 00:00:00 2001
-From: David Lamparter equi...@opensourcerouting.org
-Date: Thu, 21 Jun 2012 09:55:38 +0200
-Subject: [PATCH] isisd: fix typo in topology generator (BZ#731)
-
-There was a lsp- missing before level in line 2416.
-(introduced by git commit e38e0df)
-
-Reported-by: Seblu se...@seblu.net
-Signed-off-by: David Lamparter equi...@opensourcerouting.org

- isisd/isis_lsp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
-index 5c1e993..082e9dc 100644
 a/isisd/isis_lsp.c
-+++ b/isisd/isis_lsp.c
-@@ -2413,7 +2413,7 @@ top_lsp_refresh (struct thread *thread)
-   isis_dynhn_insert (lsp-lsp_header-lsp_id, lsp-tlv_data.hostname,
-IS_LEVEL_1);
- 
--  lsp-lsp_header-lsp_bits = lsp_bits_generate (level,
-+  lsp-lsp_header-lsp_bits = lsp_bits_generate (lsp-level,
-  lsp-area-overload_bit);
-   rem_lifetime = lsp_rem_lifetime (lsp-area, IS_LEVEL_1);
-   lsp-lsp_header-rem_lifetime = htons (rem_lifetime);
--- 
-1.7.11
-

Deleted: 0002-CVE-2012-1820.patch
===
--- 0002-CVE-2012-1820.patch2013-02-23 20:47:41 UTC (rev 84730)
+++ 0002-CVE-2012-1820.patch2013-02-23 20:56:19 UTC (rev 84731)
@@ -1,74 +0,0 @@
-@@ -, +, @@ 
-bgpd: CVE-2012-1820, DoS in bgp_capability_orf()
-
-An ORF (code 3) capability TLV is defined to contain exactly one
-AFI/SAFI block. Function bgp_capability_orf(), which parses ORF
-capability TLV, uses do-while cycle to call its helper function
-bgp_capability_orf_entry(), which actually processes the AFI/SAFI data
-block. The call is made at least once and repeated as long as the input
-buffer has enough data for the next call.
-
-The helper function, bgp_capability_orf_entry(), uses Number of ORFs
-field of the provided AFI/SAFI block to verify, if it fits the input
-buffer. However, the check is made based on the total length of the ORF
-TLV regardless of the data already consumed by the previous helper
-function call(s). This way, the check condition is only valid for the
-first AFI/SAFI block inside an ORF capability TLV.
-
-For the subsequent calls of the helper function, if any are made, the
-check condition may erroneously tell, that the current Number of ORFs
-field fits the buffer boundary, where in fact it does not. This makes it
-possible to trigger an assertion by feeding an OPEN message with a
-specially-crafted malformed ORF capability TLV.
-
-This commit fixes the vulnerability by making the implementation follow
-the spec.
 a/bgpd/bgp_open.c  
-+++ a/bgpd/bgp_open.c  
-@@ -231,7 +231,7 @@ bgp_capability_orf_entry (struct peer *peer, struct 
capability_header *hdr)
- }
-   
-   /* validate number field */
--  if (sizeof (struct capability_orf_entry) + (entry.num * 2)  hdr-length)
-+  if (sizeof (struct capability_orf_entry) + (entry.num * 2) != hdr-length)
- {
-   zlog_info (%s ORF Capability entry length error,
-   Cap length %u, num %u,
-@@ -335,28 +335,6 @@ bgp_capability_orf_entry (struct peer *peer, struct 
capability_header *hdr)
- }
- 
- static int
--bgp_capability_orf (struct peer *peer, struct capability_header *hdr)
--{
--  struct stream *s = BGP_INPUT (peer);
--  size_t end = stream_get_getp (s) + hdr-length;
--  
--  assert (stream_get_getp(s) + sizeof(struct capability_orf_entry) = end);
--  
--  /* We must have at least one ORF entry, as the caller has already done
--   * minimum length validation for the capability code - for ORF there must
--   * at least one ORF entry (header and unknown number of pairs of bytes).
--   */
--  do
--{
--  if (bgp_capability_orf_entry (peer, hdr) == -1)
--return -1;
--} 
--  while (stream_get_getp(s) + sizeof(struct capability_orf_entry)  end);
--  
--  return 0;
--}
--
--static int
- bgp_capability_restart 

[arch-commits] Commit in quagga/repos (44 files)

2013-02-23 Thread Sébastien Luttringer
Date: Saturday, February 23, 2013 @ 21:56:41
  Author: seblu
Revision: 84732

archrelease: copy trunk to community-i686, community-x86_64

Added:
  quagga/repos/community-i686/PKGBUILD
(from rev 84731, quagga/trunk/PKGBUILD)
  quagga/repos/community-i686/babeld.service
(from rev 84731, quagga/trunk/babeld.service)
  quagga/repos/community-i686/bgpd.service
(from rev 84731, quagga/trunk/bgpd.service)
  quagga/repos/community-i686/isisd.service
(from rev 84731, quagga/trunk/isisd.service)
  quagga/repos/community-i686/ospf6d.service
(from rev 84731, quagga/trunk/ospf6d.service)
  quagga/repos/community-i686/ospfd.service
(from rev 84731, quagga/trunk/ospfd.service)
  quagga/repos/community-i686/quagga.install
(from rev 84731, quagga/trunk/quagga.install)
  quagga/repos/community-i686/ripd.service
(from rev 84731, quagga/trunk/ripd.service)
  quagga/repos/community-i686/ripngd.service
(from rev 84731, quagga/trunk/ripngd.service)
  quagga/repos/community-i686/zebra.service
(from rev 84731, quagga/trunk/zebra.service)
  quagga/repos/community-x86_64/PKGBUILD
(from rev 84731, quagga/trunk/PKGBUILD)
  quagga/repos/community-x86_64/babeld.service
(from rev 84731, quagga/trunk/babeld.service)
  quagga/repos/community-x86_64/bgpd.service
(from rev 84731, quagga/trunk/bgpd.service)
  quagga/repos/community-x86_64/isisd.service
(from rev 84731, quagga/trunk/isisd.service)
  quagga/repos/community-x86_64/ospf6d.service
(from rev 84731, quagga/trunk/ospf6d.service)
  quagga/repos/community-x86_64/ospfd.service
(from rev 84731, quagga/trunk/ospfd.service)
  quagga/repos/community-x86_64/quagga.install
(from rev 84731, quagga/trunk/quagga.install)
  quagga/repos/community-x86_64/ripd.service
(from rev 84731, quagga/trunk/ripd.service)
  quagga/repos/community-x86_64/ripngd.service
(from rev 84731, quagga/trunk/ripngd.service)
  quagga/repos/community-x86_64/zebra.service
(from rev 84731, quagga/trunk/zebra.service)
Deleted:
  
quagga/repos/community-i686/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch
  quagga/repos/community-i686/0002-CVE-2012-1820.patch
  quagga/repos/community-i686/PKGBUILD
  quagga/repos/community-i686/babeld.service
  quagga/repos/community-i686/bgpd.service
  quagga/repos/community-i686/isisd.service
  quagga/repos/community-i686/ospf6d.service
  quagga/repos/community-i686/ospfd.service
  quagga/repos/community-i686/quagga.install
  quagga/repos/community-i686/ripd.service
  quagga/repos/community-i686/ripngd.service
  quagga/repos/community-i686/zebra.service
  
quagga/repos/community-x86_64/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch
  quagga/repos/community-x86_64/0002-CVE-2012-1820.patch
  quagga/repos/community-x86_64/PKGBUILD
  quagga/repos/community-x86_64/babeld.service
  quagga/repos/community-x86_64/bgpd.service
  quagga/repos/community-x86_64/isisd.service
  quagga/repos/community-x86_64/ospf6d.service
  quagga/repos/community-x86_64/ospfd.service
  quagga/repos/community-x86_64/quagga.install
  quagga/repos/community-x86_64/ripd.service
  quagga/repos/community-x86_64/ripngd.service
  quagga/repos/community-x86_64/zebra.service

-+
 community-i686/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch   |   30 
-
 community-i686/0002-CVE-2012-1820.patch |   74 

 community-i686/PKGBUILD |  164 
--
 community-i686/babeld.service   |   24 
-
 community-i686/bgpd.service |   24 
-
 community-i686/isisd.service|   24 
-
 community-i686/ospf6d.service   |   24 
-
 community-i686/ospfd.service|   24 
-
 community-i686/quagga.install   |   72 
++--
 community-i686/ripd.service |   24 
-
 community-i686/ripngd.service   |   24 
-
 community-i686/zebra.service|   24 
-
 community-x86_64/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch |   30 
-
 community-x86_64/0002-CVE-2012-1820.patch   |   74 

 community-x86_64/PKGBUILD   |  164 
--
 community-x86_64/babeld.service |   24 
-
 community-x86_64/bgpd.service   |   24 
-
 community-x86_64/isisd.service  |   24 
-
 community-x86_64/ospf6d.service |   24 
-
 community-x86_64/ospfd.service  |   24 
-
 

[arch-commits] Commit in mariadb/trunk (PKGBUILD mariadb.install)

2013-02-23 Thread Bartłomiej Piotrowski
Date: Saturday, February 23, 2013 @ 22:31:40
  Author: bpiotrowski
Revision: 84733

upgpkg: mariadb 5.5.29-3

- don't try to assign $datadir if package wasn't installed

Modified:
  mariadb/trunk/PKGBUILD
  mariadb/trunk/mariadb.install

-+
 PKGBUILD|2 +-
 mariadb.install |9 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 20:56:41 UTC (rev 84732)
+++ PKGBUILD2013-02-23 21:31:40 UTC (rev 84733)
@@ -4,7 +4,7 @@
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
 pkgver=5.5.29
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'

Modified: mariadb.install
===
--- mariadb.install 2013-02-23 20:56:41 UTC (rev 84732)
+++ mariadb.install 2013-02-23 21:31:40 UTC (rev 84733)
@@ -1,7 +1,7 @@
-datadir=$(my_print_defaults mysqld | sed -n s/^--datadir=//p)
-[[ -z $datadir ]]  datadir=/var/lib/mysql
+post_install(){
+  datadir=$(my_print_defaults mysqld | sed -n s/^--datadir=//p)
+  [[ -z $datadir ]]  datadir=/var/lib/mysql
 
-post_install(){
   groupadd -g 89 mysql /dev/null
   useradd -u 89 -g mysql -d $datadir -s /bin/false mysql /dev/null
 
@@ -15,6 +15,9 @@
 }
 
 post_upgrade(){
+  datadir=$(my_print_defaults mysqld | sed -n s/^--datadir=//p)
+  [[ -z $datadir ]]  datadir=/var/lib/mysql
+
   getent group mysql /dev/null 21 || groupadd -g 89 mysql /dev/null
   getent passwd mysql /dev/null 21 || useradd -u 89 -g mysql -d $datadir -s 
/bin/false mysql /dev/null
 



[arch-commits] Commit in mariadb/repos (20 files)

2013-02-23 Thread Bartłomiej Piotrowski
Date: Saturday, February 23, 2013 @ 22:33:37
  Author: bpiotrowski
Revision: 84734

archrelease: copy trunk to community-testing-i686, community-testing-x86_64

Added:
  mariadb/repos/community-testing-i686/PKGBUILD
(from rev 84733, mariadb/trunk/PKGBUILD)
  mariadb/repos/community-testing-i686/mariadb-post.sh
(from rev 84733, mariadb/trunk/mariadb-post.sh)
  mariadb/repos/community-testing-i686/mariadb-tmpfile.conf
(from rev 84733, mariadb/trunk/mariadb-tmpfile.conf)
  mariadb/repos/community-testing-i686/mariadb.install
(from rev 84733, mariadb/trunk/mariadb.install)
  mariadb/repos/community-testing-i686/mariadb.service
(from rev 84733, mariadb/trunk/mariadb.service)
  mariadb/repos/community-testing-x86_64/PKGBUILD
(from rev 84733, mariadb/trunk/PKGBUILD)
  mariadb/repos/community-testing-x86_64/mariadb-post.sh
(from rev 84733, mariadb/trunk/mariadb-post.sh)
  mariadb/repos/community-testing-x86_64/mariadb-tmpfile.conf
(from rev 84733, mariadb/trunk/mariadb-tmpfile.conf)
  mariadb/repos/community-testing-x86_64/mariadb.install
(from rev 84733, mariadb/trunk/mariadb.install)
  mariadb/repos/community-testing-x86_64/mariadb.service
(from rev 84733, mariadb/trunk/mariadb.service)
Deleted:
  mariadb/repos/community-testing-i686/PKGBUILD
  mariadb/repos/community-testing-i686/mariadb-post.sh
  mariadb/repos/community-testing-i686/mariadb-tmpfile.conf
  mariadb/repos/community-testing-i686/mariadb.install
  mariadb/repos/community-testing-i686/mariadb.service
  mariadb/repos/community-testing-x86_64/PKGBUILD
  mariadb/repos/community-testing-x86_64/mariadb-post.sh
  mariadb/repos/community-testing-x86_64/mariadb-tmpfile.conf
  mariadb/repos/community-testing-x86_64/mariadb.install
  mariadb/repos/community-testing-x86_64/mariadb.service

---+
 community-testing-i686/PKGBUILD   |  272 
 community-testing-i686/mariadb-post.sh|   16 -
 community-testing-i686/mariadb-tmpfile.conf   |2 
 community-testing-i686/mariadb.install|   97 
 community-testing-i686/mariadb.service|   32 +-
 community-testing-x86_64/PKGBUILD |  272 
 community-testing-x86_64/mariadb-post.sh  |   16 -
 community-testing-x86_64/mariadb-tmpfile.conf |2 
 community-testing-x86_64/mariadb.install  |   97 
 community-testing-x86_64/mariadb.service  |   32 +-
 10 files changed, 422 insertions(+), 416 deletions(-)

Deleted: community-testing-i686/PKGBUILD
===
--- community-testing-i686/PKGBUILD 2013-02-23 21:31:40 UTC (rev 84733)
+++ community-testing-i686/PKGBUILD 2013-02-23 21:33:37 UTC (rev 84734)
@@ -1,136 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski nos...@bpiotrowski.pl
-
-pkgbase=mariadb
-pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
-pkgver=5.5.29
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://mariadb.org/'
-makedepends=('cmake' 'openssl' 'zlib')
-options=('!libtool')
-source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz
-mariadb.service
-mariadb-post.sh
-mariadb-tmpfile.conf)
-sha256sums=('b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74'
-'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
-'368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
-'2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
-
-build() {
-  cd $srcdir
-  mkdir build
-  cd build
-
-  cmake ../$pkgbase-$pkgver \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr \
--DSYSCONFDIR=/etc/mysql \
--DMYSQL_DATADIR=/var/lib/mysql \
--DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
--DDEFAULT_CHARSET=utf8 \
--DDEFAULT_COLLATION=utf8_general_ci \
--DENABLED_LOCAL_INFILE=ON \
--DINSTALL_INFODIR=share/mysql/docs \
--DINSTALL_MANDIR=share/man \
--DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
--DINSTALL_SCRIPTDIR=bin \
--DINSTALL_INCLUDEDIR=include/mysql \
--DINSTALL_DOCREADMEDIR=share/mysql \
--DINSTALL_SUPPORTFILESDIR=share/mysql \
--DINSTALL_MYSQLSHAREDIR=share/mysql \
--DINSTALL_DOCDIR=share/mysql/docs \
--DINSTALL_SHAREDIR=share/mysql \
--DWITH_READLINE=ON \
--DWITH_ZLIB=system \
--DWITH_SSL=system \
--DWITH_LIBWRAP=OFF \
--DWITH_EXTRA_CHARSETS=complex \
--DWITH_EMBEDDED_SERVER=ON \
--DWITH_ARCHIVE_STORAGE_ENGINE=1 \
--DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
--DWITH_INNOBASE_STORAGE_ENGINE=1 \
--DWITH_PARTITION_STORAGE_ENGINE=1 \
--DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
--DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
--DWITHOUT_PBXT_STORAGE_ENGINE=1 \
--DCMAKE_C_FLAGS=-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-fomit-frame-pointer \
--DCMAKE_CXX_FLAGS=-fPIC 

[arch-commits] Commit in bitlbee/trunk (PKGBUILD rc.d)

2013-02-23 Thread Dave Reisner
Date: Sunday, February 24, 2013 @ 00:49:37
  Author: dreisner
Revision: 178468

remove rc.d script

Modified:
  bitlbee/trunk/PKGBUILD
Deleted:
  bitlbee/trunk/rc.d

--+
 PKGBUILD |2 --
 rc.d |   49 -
 2 files changed, 51 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 12:05:58 UTC (rev 178467)
+++ PKGBUILD2013-02-23 23:49:37 UTC (rev 178468)
@@ -21,7 +21,6 @@
 'xinetd: to run bitlbee through xinetd')
 source=(http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz;
 'xinetd'
-'rc.d'
 'bitlbee.tmpfiles')
 sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e'
   '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
@@ -58,6 +57,5 @@
 
   install -o65 -g65 -dm770 $pkgdir/var/lib/bitlbee
   install -Dm644 $srcdir/xinetd $pkgdir/etc/xinetd.d/bitlbee
-  install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/bitlbee
   install -Dm644 $srcdir/bitlbee.tmpfiles 
$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf
 }

Deleted: rc.d
===
--- rc.d2013-02-23 12:05:58 UTC (rev 178467)
+++ rc.d2013-02-23 23:49:37 UTC (rev 178468)
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/bitlbee/bitlbee.pid
-if [[ -r $pidfile ]]; then
-  read -r PID  $pidfile
-  if [[ ! -d /proc/$PID ]]; then
-# stale pidfile
-unset PID
-rm -f $pidfile
-  fi
-fi
-
-case $1 in
-  start)
-stat_busy Starting bitlbee daemon
-if [[ $PID ]] || ! su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee; then
-  stat_fail
-  exit 1
-else
-  add_daemon bitlbee
-  stat_done
-fi
-;;
-  stop)
-stat_busy Stopping bitlbee daemon
-if [[ -z $PID ]] || ! kill $PID /dev/null; then
-  stat_fail
-  exit 1
-else
-  rm -f $pidfile
-  rm_daemon bitlbee
-  stat_done
-fi
-;;
-  restart)
-$0 stop
-sleep 3
-$0 start
-;;
-  *)
-echo usage: $0 {start|stop|restart}
-exit 1
-;;
-esac
-
-# vim: set ft=sh et ts=2 sw=2:



[arch-commits] Commit in syslog-ng/trunk (PKGBUILD syslog-ng.conf.d syslog-ng.rc)

2013-02-23 Thread Dave Reisner
Date: Sunday, February 24, 2013 @ 00:53:14
  Author: dreisner
Revision: 178469

remove rc.d script

Modified:
  syslog-ng/trunk/PKGBUILD
Deleted:
  syslog-ng/trunk/syslog-ng.conf.d
  syslog-ng/trunk/syslog-ng.rc

--+
 PKGBUILD |   11 +---
 syslog-ng.conf.d |   10 ---
 syslog-ng.rc |   67 -
 3 files changed, 2 insertions(+), 86 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 23:49:37 UTC (rev 178468)
+++ PKGBUILD2013-02-23 23:53:14 UTC (rev 178469)
@@ -17,19 +17,14 @@
 backup=('etc/syslog-ng/modules.conf'
 'etc/syslog-ng/scl.conf'
 'etc/syslog-ng/syslog-ng.conf'
-'etc/conf.d/syslog-ng'
 'etc/logrotate.d/syslog-ng')
 install=$pkgname.install
 
source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz;
 syslog-ng.conf
-syslog-ng.conf.d
-syslog-ng.logrotate
-syslog-ng.rc)
+syslog-ng.logrotate)
 sha1sums=('e75892262863b77f74a401d19661164154f716e7'
   '0aaf695ea6756b59198ff2e4af237b4a6186525d'
-  '9b2eb6ea9e27c9f1b6c1c855be211ec3da51d3c8'
-  '949128fe3d7f77a7aab99048061f885bc758000c'
-  '94af81a84e3add6653755122cdd5080694de059d')
+  '949128fe3d7f77a7aab99048061f885bc758000c')
 
 build() {
   cd $pkgname-$pkgver
@@ -54,6 +49,4 @@
   install -dm755 $pkgdir/var/lib/syslog-ng 
$pkgdir/etc/syslog-ng/patterndb.d
   install -Dm644 $srcdir/syslog-ng.conf 
$pkgdir/etc/syslog-ng/syslog-ng.conf
   install -Dm644 $srcdir/syslog-ng.logrotate 
$pkgdir/etc/logrotate.d/syslog-ng
-  install -Dm755 $srcdir/syslog-ng.rc $pkgdir/etc/rc.d/syslog-ng
-  install -Dm644 $srcdir/syslog-ng.conf.d $pkgdir/etc/conf.d/syslog-ng
 }

Deleted: syslog-ng.conf.d
===
--- syslog-ng.conf.d2013-02-23 23:49:37 UTC (rev 178468)
+++ syslog-ng.conf.d2013-02-23 23:53:14 UTC (rev 178469)
@@ -1,10 +0,0 @@
-#
-# /etc/conf.d/syslog-ng
-#
-
-# passed to syslog-ng on config check
-SYSLOG_NG_CHECKOPTS=()
-
-# passed to syslog-ng at startup
-SYSLOG_NG_OPTS=()
-

Deleted: syslog-ng.rc
===
--- syslog-ng.rc2013-02-23 23:49:37 UTC (rev 178468)
+++ syslog-ng.rc2013-02-23 23:53:14 UTC (rev 178469)
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/syslog-ng
-
-checkconfig() {
-  if ! syslog-ng -s ${SYSLOG_NG_CHECKOPTS[@]}; then
-stat_fail
-exit 1
-  fi
-}
-
-pidfile=/run/syslog-ng.pid
-if [[ -r $pidfile ]]; then
-  read -r PID  $pidfile
-  if [[ $PID  ! -d /proc/$PID ]]; then
-# stale pidfile
-unset PID
-rm -f $pidfile
-  fi
-fi
-
-case $1 in
-  start)
-stat_busy Starting Syslog-NG
-checkconfig
-if [[ -z $PID ]]  /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS[@]}; then
-  add_daemon syslog-ng
-  stat_done
-else
-  stat_fail
-  exit 1
-fi
-;;
-  stop)
-stat_busy Stopping Syslog-NG
-if [[ $PID ]]  kill $PID /dev/null; then
-  rm_daemon syslog-ng
-  stat_done
-else
-  stat_fail
-  exit 1
-fi
-;;
-  reload)
-stat_busy Reloading Syslog-NG configuration and re-opening log files
-if [[ -z $PID ]]; then
-  stat_fail
-else
-  checkconfig
-  if kill -HUP $PID /dev/null; then
-stat_done
-  else
-stat_fail
-exit 1
-  fi
-fi
-;;
-  restart)
-$0 stop
-sleep 1
-$0 start
-;;
-  *)
-echo usage: $0 {start|stop|restart|reload}
-esac



[arch-commits] Commit in nginx/trunk (PKGBUILD nginx.install)

2013-02-23 Thread Evangelos Foutras
Date: Sunday, February 24, 2013 @ 00:53:48
  Author: foutrelis
Revision: 84735

upgpkg: nginx 1.2.7-4

Change /var/log/nginx permissions back to 750.

Modified:
  nginx/trunk/PKGBUILD
  nginx/trunk/nginx.install

---+
 PKGBUILD  |2 +-
 nginx.install |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 21:33:37 UTC (rev 84734)
+++ PKGBUILD2013-02-23 23:53:48 UTC (rev 84735)
@@ -8,7 +8,7 @@
 
 pkgname=nginx
 pkgver=1.2.7
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64')
 depends=('pcre' 'zlib' 'openssl' 'geoip')

Modified: nginx.install
===
--- nginx.install   2013-02-23 21:33:37 UTC (rev 84734)
+++ nginx.install   2013-02-23 23:53:48 UTC (rev 84735)
@@ -1,12 +1,12 @@
 post_install() {
 if [[ -e var/log/nginx ]]; then
-chmod 640 var/log/nginx
+chmod 750 var/log/nginx
 chown root:log var/log/nginx
 fi
 }
 
 post_upgrade() {
-[[ $(vercmp $2 1.2.7-2) -le 0 ]]  post_install
+[[ $(vercmp $2 1.2.7-3) -le 0 ]]  post_install
 if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then
 echo   Since 1.2.1-2 several changes has been made in package:
 echo   - *.conf files have been moved to /etc/nginx



[arch-commits] Commit in dnsmasq/trunk (PKGBUILD dnsmasq.confd rc.dnsmasq)

2013-02-23 Thread Dave Reisner
Date: Sunday, February 24, 2013 @ 00:55:27
  Author: dreisner
Revision: 178470

remove rc.d script

Modified:
  dnsmasq/trunk/PKGBUILD
Deleted:
  dnsmasq/trunk/dnsmasq.confd
  dnsmasq/trunk/rc.dnsmasq

---+
 PKGBUILD  |7 --
 dnsmasq.confd |9 ---
 rc.dnsmasq|   64 
 3 files changed, 80 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 23:53:14 UTC (rev 178469)
+++ PKGBUILD2013-02-23 23:55:27 UTC (rev 178470)
@@ -15,12 +15,8 @@
 backup=('etc/dnsmasq.conf'
 'etc/conf.d/dnsmasq')
 source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz;
-'dnsmasq.confd'
-'rc.dnsmasq'
 'dnsmasq.service')
 md5sums=('a91534a5d6f053d5c80f67ef502afa34'
- '66479e99123faeab83ebaed709ef95b5'
- '819fbdf6440d710616e6df5f8ca9cdba'
  '7ac45726cabef4145db40d758cc7fedf')
 
 build() {
@@ -38,9 +34,6 @@
 
   make BINDIR=/usr/bin PREFIX=/usr DESTDIR=$pkgdir install
 
-  install -Dm755 $srcdir/rc.dnsmasq $pkgdir/etc/rc.d/dnsmasq
-  install -Dm644 $srcdir/dnsmasq.confd $pkgdir/etc/conf.d/dnsmasq
-
   install -Dm644 dbus/dnsmasq.conf $pkgdir/etc/dbus-1/system.d/dnsmasq.conf
   install -Dm644 dnsmasq.conf.example $pkgdir/etc/dnsmasq.conf
   install -Dm644 $srcdir/dnsmasq.service 
$pkgdir/usr/lib/systemd/system/dnsmasq.service

Deleted: dnsmasq.confd
===
--- dnsmasq.confd   2013-02-23 23:53:14 UTC (rev 178469)
+++ dnsmasq.confd   2013-02-23 23:55:27 UTC (rev 178470)
@@ -1,9 +0,0 @@
-#
-# runtime config for dnsmasq
-#
-
-# if unset, dnsmasq will run as nobody.
-DNSMASQ_USER=dnsmasq
-
-# other runtime options. treated as an array.
-DNSMASQ_OPTS=()

Deleted: rc.dnsmasq
===
--- rc.dnsmasq  2013-02-23 23:53:14 UTC (rev 178469)
+++ rc.dnsmasq  2013-02-23 23:55:27 UTC (rev 178470)
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dnsmasq
-
-checkconfig() {
-  local testout
-
-  if ! testout=$(/usr/bin/dnsmasq --test 21); then
-echo $testout
-return 1
-  fi
-
-  return 0
-}
-
-pidfile=/run/dnsmasq.pid
-if [[ -r $pidfile ]]; then
-  read -r PID  $pidfile
-  if [[ ! -d /proc/$PID ]]; then
-# stale pidfile
-unset PID
-rm -f $pidfile
-  fi
-fi
-
-case $1 in
-  start)
-stat_busy Starting DNS/DHCP daemon
-if [[ -z $PID ]]  checkconfig 
-/usr/bin/dnsmasq --user=${DNSMASQ_USER:-nobody} \
-  --pid-file=$pidfile \
-  ${DNSMASQ_OPTS[@]}; then
-  add_daemon dnsmasq
-  stat_done
-else
-  stat_fail
-fi
-;;
-  stop)
-stat_busy Stopping DNS/DHCP daemon
-if [[ $PID ]]  kill $PID  /dev/null; then
-  # dnsmasq doesn't clean up after itself
-  rm -f $pidfile
-  rm_daemon dnsmasq
-  stat_done
-else
-  stat_fail
-fi
-;;
-  restart)
-$0 stop
-sleep 1
-$0 start
-;;
-  checkconfig)
-# diagnostics will be printed, with zero/non-zero exit
-/usr/bin/dnsmasq --test
-;;
-  *)
-echo usage: $0 start|stop|restart|checkconfig
-esac
-



[arch-commits] Commit in steam/trunk (PKGBUILD alsa_sdl_audiodriver.patch)

2013-02-23 Thread Daniel Wallace
Date: Sunday, February 24, 2013 @ 01:12:23
  Author: dwallace
Revision: 84736

upgpkg: steam 1.0.0.31-1

upgpkg: steam 1.0.0.31-1

Modified:
  steam/trunk/PKGBUILD
  steam/trunk/alsa_sdl_audiodriver.patch

+
 PKGBUILD   |   23 ---
 alsa_sdl_audiodriver.patch |2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 23:53:48 UTC (rev 84735)
+++ PKGBUILD2013-02-24 00:12:23 UTC (rev 84736)
@@ -2,9 +2,9 @@
 # Maintainer: Daniel Wallace danielwallace at gtmanfred dot com
 # Contributor: K900 k0009...@gmail.com
 pkgname=steam
-pkgver=1.0.0.28
-pkgrel=3
-pkgdesc=Digital distribution client - open beta - bootstrap package
+pkgver=1.0.0.31
+pkgrel=1
+pkgdesc=Digital distribution client bootstrap package
 arch=(i686 x86_64)
 url=http://steampowered.com/;
 license=('custom')
@@ -23,26 +23,27 @@
   'lib32-flashplugin: for flash video'
   )
 build() {
-patch -d $pkgname-$pkgver -Np1 -i $srcdir/lib32-flashplugin-path.patch
-patch -d $pkgname-$pkgver -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
+patch -d $pkgname -Np1 -i $srcdir/lib32-flashplugin-path.patch
+#patch -d $pkgname -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
 }
 else
 optdepends=('flashplugin: for flash videos')
-build() {
-patch -d $pkgname-$pkgver -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
-}
+#build() {
+#patch -d $pkgname -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
+#}
 fi
 install=steam.install
 
source=(http://repo.steampowered.com/$pkgname/pool/$pkgname/s/$pkgname/${pkgname}_$pkgver.tar.gz;
 'lib32-flashplugin-path.patch'
 'alsa_sdl_audiodriver.patch')
-md5sums=('5d7b7e12dd0d513d3f7191872fa596cd'
+md5sums=('887501c662554fffdb6809dd0d39f968'
  '1d83a1df55d677f35ce415e0750f4448'
- 'd47c1acf365336290eaba8ca845248a4')
+ 'ac0e03d70f1101331598b2b32ed9bac3')
+
 package() {
 
   # Install license
-  make -C $pkgname-$pkgver DESTDIR=$pkgdir install
+  make -C $pkgname DESTDIR=$pkgdir install
   
   install -Dm644 $pkgdir/usr/share/doc/steam/steam_install_agreement.txt 
$pkgdir/usr/share/licenses/steam/LICENSE
 

Modified: alsa_sdl_audiodriver.patch
===
--- alsa_sdl_audiodriver.patch  2013-02-23 23:53:48 UTC (rev 84735)
+++ alsa_sdl_audiodriver.patch  2013-02-24 00:12:23 UTC (rev 84736)
@@ -5,7 +5,7 @@
  export TEXTDOMAIN=steam
  
 +# check if pulseaudio is installed and if it isn't, use alsa for 
SDL_AUDIODRIVER
-+if ! pacman -T pulseaudio /dev/null; then
++if ! pulseaudio --check /dev/null; then
 +export SDL_AUDIODRIVER=alsa
 +fi
 +



[arch-commits] Commit in steam/repos/multilib-x86_64 (PKGBUILD)

2013-02-23 Thread Daniel Wallace
Date: Sunday, February 24, 2013 @ 01:12:50
  Author: dwallace
Revision: 84737

archrelease: copy trunk to multilib-x86_64

Deleted:
  steam/repos/multilib-x86_64/PKGBUILD

--+
 PKGBUILD |   46 --
 1 file changed, 46 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-02-24 00:12:23 UTC (rev 84736)
+++ PKGBUILD2013-02-24 00:12:50 UTC (rev 84737)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Daniel Wallace danielwallace at gtmanfred dot com
-# Contributor: K900 k0009...@gmail.com
-pkgname=steam
-pkgver=1.0.0.28
-pkgrel=2
-pkgdesc=Digital distribution client - open beta - bootstrap package
-arch=(i686 x86_64)
-url=http://steampowered.com/;
-license=('custom')
-depends=(
-  'bash' 'desktop-file-utils' 'hicolor-icon-theme' 'curl'
-  'dbus' 'freetype2'  'gdk-pixbuf2' 'ttf-font' 'zenity'
-  )
-if [[ $CARCH == x86_64 ]]; then
-  depends+=(lib32-libgl lib32-gcc-libs lib32-libx11)
-  optdepends=(
-  'lib32-ati-dri: for open source ATI driver users'
-  'lib32-catalyst-utils: for AMD Catalyst users'
-  'lib32-intel-dri: for open source Intel driver users'
-  'lib32-nouveau-dri: for Nouveau users'
-  'lib32-nvidia-utils: for NVIDIA proprietary blob users'
-  'lib32-flashplugin: for flash video'
-  )
-build() {
-patch -d $pkgname-$pkgver -Np1 -i $srcdir/lib32-flashplugin-path.patch
-}
-else
-optdepends=('flashplugin: for flash videos')
-fi
-install=steam.install
-source=(http://repo.steampowered.com/$pkgname/pool/$pkgname/s/$pkgname/${pkgname}_$pkgver.tar.gz;
-'lib32-flashplugin-path.patch')
-md5sums=('5d7b7e12dd0d513d3f7191872fa596cd'
- '1d83a1df55d677f35ce415e0750f4448')
-package() {
-
-  # Install license
-  make -C $pkgname-$pkgver DESTDIR=$pkgdir install
-  
-  install -Dm644 $pkgdir/usr/share/doc/steam/steam_install_agreement.txt 
$pkgdir/usr/share/licenses/steam/LICENSE
-
-  # blank steamdeps because apt-get
-  ln -sf /bin/true $pkgdir/usr/bin/steamdeps
-}
-#vim: set ft=PKGBUILD sw=2 ts=2 et



[arch-commits] Commit in nginx/repos (16 files)

2013-02-23 Thread Evangelos Foutras
Date: Sunday, February 24, 2013 @ 01:14:35
  Author: foutrelis
Revision: 84738

archrelease: copy trunk to community-i686, community-x86_64

Added:
  nginx/repos/community-i686/PKGBUILD
(from rev 84737, nginx/trunk/PKGBUILD)
  nginx/repos/community-i686/logrotate
(from rev 84737, nginx/trunk/logrotate)
  nginx/repos/community-i686/nginx.install
(from rev 84737, nginx/trunk/nginx.install)
  nginx/repos/community-i686/service
(from rev 84737, nginx/trunk/service)
  nginx/repos/community-x86_64/PKGBUILD
(from rev 84737, nginx/trunk/PKGBUILD)
  nginx/repos/community-x86_64/logrotate
(from rev 84737, nginx/trunk/logrotate)
  nginx/repos/community-x86_64/nginx.install
(from rev 84737, nginx/trunk/nginx.install)
  nginx/repos/community-x86_64/service
(from rev 84737, nginx/trunk/service)
Deleted:
  nginx/repos/community-i686/PKGBUILD
  nginx/repos/community-i686/logrotate
  nginx/repos/community-i686/nginx.install
  nginx/repos/community-i686/service
  nginx/repos/community-x86_64/PKGBUILD
  nginx/repos/community-x86_64/logrotate
  nginx/repos/community-x86_64/nginx.install
  nginx/repos/community-x86_64/service

+
 community-i686/PKGBUILD|  194 +++
 community-i686/logrotate   |   18 +--
 community-i686/nginx.install   |   38 +++
 community-i686/service |   28 ++---
 community-x86_64/PKGBUILD  |  194 +++
 community-x86_64/logrotate |   18 +--
 community-x86_64/nginx.install |   38 +++
 community-x86_64/service   |   28 ++---
 8 files changed, 278 insertions(+), 278 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-02-24 00:12:50 UTC (rev 84737)
+++ community-i686/PKGBUILD 2013-02-24 00:14:35 UTC (rev 84738)
@@ -1,97 +0,0 @@
-# $Id$
-# Maintainer:  Sergej Pupykin pupykin.s+a...@gmail.com
-# Maintainer:  Bartłomiej Piotrowski nos...@bpiotrowski.pl
-# Contributor: Miroslaw Szot m...@czlug.icis.pcz.pl
-
-_cfgdir=/etc/nginx
-_tmpdir=/var/lib/nginx
-
-pkgname=nginx
-pkgver=1.2.7
-pkgrel=3
-pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
-arch=('i686' 'x86_64')
-depends=('pcre' 'zlib' 'openssl' 'geoip')
-makedepends=('passenger')
-url=http://nginx.org;
-license=('custom')
-install=nginx.install
-backup=(${_cfgdir:1}/fastcgi.conf
-   ${_cfgdir:1}/fastcgi_params
-   ${_cfgdir:1}/koi-win
-   ${_cfgdir:1}/koi-utf
-   ${_cfgdir:1}/mime.types
-   ${_cfgdir:1}/nginx.conf
-   ${_cfgdir:1}/scgi_params
-   ${_cfgdir:1}/uwsgi_params
-   ${_cfgdir:1}/win-utf
-   etc/logrotate.d/nginx)
-source=(http://nginx.org/download/nginx-$pkgver.tar.gz
-   service
-   logrotate)
-sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3'
-'77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a'
-'a21b564eaf83b4b4ce3a436e895bd37e000677fb314b89818f89f30caca6e6d9')
-
-build() {
-   cd $srcdir/$pkgname-$pkgver
-
-   ./configure \
---prefix=$_cfgdir \
---conf-path=$_cfgdir/nginx.conf \
---sbin-path=/usr/sbin/nginx \
---pid-path=/var/run/nginx.pid \
---lock-path=/var/lock/nginx.lock \
---user=http --group=http \
---http-log-path=/var/log/nginx/access.log \
---error-log-path=/var/log/nginx/error.log \
---http-client-body-temp-path=$_tmpdir/client-body \
---http-proxy-temp-path=$_tmpdir/proxy \
---http-fastcgi-temp-path=$_tmpdir/fastcgi \
---http-scgi-temp-path=$_tmpdir/scgi \
---http-uwsgi-temp-path=$_tmpdir/uwsgi \
---with-imap --with-imap_ssl_module \
---with-ipv6 --with-pcre-jit \
---with-file-aio \
---with-http_dav_module \
---with-http_geoip_module \
---with-http_gzip_static_module \
---with-http_realip_module \
---with-http_ssl_module \
---with-http_stub_status_module \
---add-module=/usr/lib/passenger/ext/nginx \
-#--with-http_mp4_module \
-#--with-http_addition_module \
-#--with-http_xslt_module \
-#--with-http_image_filter_module \
-#--with-http_sub_module \
-#--with-http_flv_module \
-#--with-http_random_index_module \
-#--with-http_secure_link_module \
-#--with-http_degradation_module \
-#--with-http_perl_module \
-
-   make
-}
-
-package() {
-   cd $srcdir/$pkgname-$pkgver
-   make DESTDIR=$pkgdir install
-
-   sed -e 's|\user\s\+\w\+;|user html;|g' \
-   -e '44s|html|/usr/share/nginx/html|' \
-   -e '54s|html|/usr/share/nginx/html|' \
-   -i $pkgdir/etc/nginx/nginx.conf
-   rm $pkgdir/etc/nginx/*.default
-
-   install -d 

[arch-commits] Commit in steam/repos/community-i686 (PKGBUILD)

2013-02-23 Thread Daniel Wallace
Date: Sunday, February 24, 2013 @ 01:15:03
  Author: dwallace
Revision: 84739

archrelease: copy trunk to community-i686

Deleted:
  steam/repos/community-i686/PKGBUILD

--+
 PKGBUILD |   46 --
 1 file changed, 46 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-02-24 00:14:35 UTC (rev 84738)
+++ PKGBUILD2013-02-24 00:15:03 UTC (rev 84739)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Daniel Wallace danielwallace at gtmanfred dot com
-# Contributor: K900 k0009...@gmail.com
-pkgname=steam
-pkgver=1.0.0.28
-pkgrel=2
-pkgdesc=Digital distribution client - open beta - bootstrap package
-arch=(i686 x86_64)
-url=http://steampowered.com/;
-license=('custom')
-depends=(
-  'bash' 'desktop-file-utils' 'hicolor-icon-theme' 'curl'
-  'dbus' 'freetype2'  'gdk-pixbuf2' 'ttf-font' 'zenity'
-  )
-if [[ $CARCH == x86_64 ]]; then
-  depends+=(lib32-libgl lib32-gcc-libs lib32-libx11)
-  optdepends=(
-  'lib32-ati-dri: for open source ATI driver users'
-  'lib32-catalyst-utils: for AMD Catalyst users'
-  'lib32-intel-dri: for open source Intel driver users'
-  'lib32-nouveau-dri: for Nouveau users'
-  'lib32-nvidia-utils: for NVIDIA proprietary blob users'
-  'lib32-flashplugin: for flash video'
-  )
-build() {
-patch -d $pkgname-$pkgver -Np1 -i $srcdir/lib32-flashplugin-path.patch
-}
-else
-optdepends=('flashplugin: for flash videos')
-fi
-install=steam.install
-source=(http://repo.steampowered.com/$pkgname/pool/$pkgname/s/$pkgname/${pkgname}_$pkgver.tar.gz;
-'lib32-flashplugin-path.patch')
-md5sums=('5d7b7e12dd0d513d3f7191872fa596cd'
- '1d83a1df55d677f35ce415e0750f4448')
-package() {
-
-  # Install license
-  make -C $pkgname-$pkgver DESTDIR=$pkgdir install
-  
-  install -Dm644 $pkgdir/usr/share/doc/steam/steam_install_agreement.txt 
$pkgdir/usr/share/licenses/steam/LICENSE
-
-  # blank steamdeps because apt-get
-  ln -sf /bin/true $pkgdir/usr/bin/steamdeps
-}
-#vim: set ft=PKGBUILD sw=2 ts=2 et



[arch-commits] Commit in steam/repos (11 files)

2013-02-23 Thread Daniel Wallace
Date: Sunday, February 24, 2013 @ 01:21:30
  Author: dwallace
Revision: 84740

archrelease: copy trunk to community-i686, community-x86_64

Added:
  steam/repos/community-i686/PKGBUILD
(from rev 84739, steam/trunk/PKGBUILD)
  steam/repos/community-i686/alsa_sdl_audiodriver.patch
(from rev 84739, steam/trunk/alsa_sdl_audiodriver.patch)
  steam/repos/community-i686/lib32-flashplugin-path.patch
(from rev 84739, steam/trunk/lib32-flashplugin-path.patch)
  steam/repos/community-i686/steam.install
(from rev 84739, steam/trunk/steam.install)
  steam/repos/community-x86_64/
  steam/repos/community-x86_64/PKGBUILD
(from rev 84739, steam/trunk/PKGBUILD)
  steam/repos/community-x86_64/alsa_sdl_audiodriver.patch
(from rev 84739, steam/trunk/alsa_sdl_audiodriver.patch)
  steam/repos/community-x86_64/lib32-flashplugin-path.patch
(from rev 84739, steam/trunk/lib32-flashplugin-path.patch)
  steam/repos/community-x86_64/steam.install
(from rev 84739, steam/trunk/steam.install)
Deleted:
  steam/repos/community-i686/lib32-flashplugin-path.patch
  steam/repos/community-i686/steam.install

---+
 community-i686/PKGBUILD   |   53 
 community-i686/alsa_sdl_audiodriver.patch |   14 ++
 community-i686/lib32-flashplugin-path.patch   |   20 -
 community-i686/steam.install  |   52 +++
 community-x86_64/PKGBUILD |   53 
 community-x86_64/alsa_sdl_audiodriver.patch   |   14 ++
 community-x86_64/lib32-flashplugin-path.patch |   10 
 community-x86_64/steam.install|   26 +++
 8 files changed, 206 insertions(+), 36 deletions(-)

Copied: steam/repos/community-i686/PKGBUILD (from rev 84739, 
steam/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-02-24 00:21:30 UTC (rev 84740)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Daniel Wallace danielwallace at gtmanfred dot com
+# Contributor: K900 k0009...@gmail.com
+pkgname=steam
+pkgver=1.0.0.31
+pkgrel=1
+pkgdesc=Digital distribution client bootstrap package
+arch=(i686 x86_64)
+url=http://steampowered.com/;
+license=('custom')
+depends=(
+  'bash' 'desktop-file-utils' 'hicolor-icon-theme' 'curl'
+  'dbus' 'freetype2'  'gdk-pixbuf2' 'ttf-font' 'zenity'
+  )
+if [[ $CARCH == x86_64 ]]; then
+  depends+=(lib32-libgl lib32-gcc-libs lib32-libx11)
+  optdepends=(
+  'lib32-ati-dri: for open source ATI driver users'
+  'lib32-catalyst-utils: for AMD Catalyst users'
+  'lib32-intel-dri: for open source Intel driver users'
+  'lib32-nouveau-dri: for Nouveau users'
+  'lib32-nvidia-utils: for NVIDIA proprietary blob users'
+  'lib32-flashplugin: for flash video'
+  )
+build() {
+patch -d $pkgname -Np1 -i $srcdir/lib32-flashplugin-path.patch
+#patch -d $pkgname -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
+}
+else
+optdepends=('flashplugin: for flash videos')
+#build() {
+#patch -d $pkgname -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
+#}
+fi
+install=steam.install
+source=(http://repo.steampowered.com/$pkgname/pool/$pkgname/s/$pkgname/${pkgname}_$pkgver.tar.gz;
+'lib32-flashplugin-path.patch'
+'alsa_sdl_audiodriver.patch')
+md5sums=('887501c662554fffdb6809dd0d39f968'
+ '1d83a1df55d677f35ce415e0750f4448'
+ 'ac0e03d70f1101331598b2b32ed9bac3')
+
+package() {
+
+  # Install license
+  make -C $pkgname DESTDIR=$pkgdir install
+  
+  install -Dm644 $pkgdir/usr/share/doc/steam/steam_install_agreement.txt 
$pkgdir/usr/share/licenses/steam/LICENSE
+
+  # blank steamdeps because apt-get
+  ln -sf /bin/true $pkgdir/usr/bin/steamdeps
+}
+#vim: set ft=PKGBUILD sw=2 ts=2 et

Copied: steam/repos/community-i686/alsa_sdl_audiodriver.patch (from rev 84739, 
steam/trunk/alsa_sdl_audiodriver.patch)
===
--- community-i686/alsa_sdl_audiodriver.patch   (rev 0)
+++ community-i686/alsa_sdl_audiodriver.patch   2013-02-24 00:21:30 UTC (rev 
84740)
@@ -0,0 +1,14 @@
+--- a/steam2013-02-15 14:43:40.0 -0500
 b/steam2013-02-17 23:26:31.951179106 -0500
+@@ -17,6 +17,11 @@
+ # Set up domain for script localization
+ export TEXTDOMAIN=steam
+ 
++# check if pulseaudio is installed and if it isn't, use alsa for 
SDL_AUDIODRIVER
++if ! pulseaudio --check /dev/null; then
++export SDL_AUDIODRIVER=alsa
++fi
++
+ function show_message()
+ {
+   style=$1

Deleted: community-i686/lib32-flashplugin-path.patch
===
--- community-i686/lib32-flashplugin-path.patch 2013-02-24 00:15:03 UTC (rev 
84739)
+++ community-i686/lib32-flashplugin-path.patch 2013-02-24 00:21:30 UTC (rev 
84740)
@@ -1,10 +0,0 @@
 a/steam2013-02-14 14:03:49.0 

[arch-commits] Commit in steam/repos/multilib-x86_64 (6 files)

2013-02-23 Thread Daniel Wallace
Date: Sunday, February 24, 2013 @ 01:24:51
  Author: dwallace
Revision: 84741

archrelease: copy trunk to multilib-x86_64

Added:
  steam/repos/multilib-x86_64/PKGBUILD
(from rev 84740, steam/trunk/PKGBUILD)
  steam/repos/multilib-x86_64/alsa_sdl_audiodriver.patch
(from rev 84740, steam/trunk/alsa_sdl_audiodriver.patch)
  steam/repos/multilib-x86_64/lib32-flashplugin-path.patch
(from rev 84740, steam/trunk/lib32-flashplugin-path.patch)
  steam/repos/multilib-x86_64/steam.install
(from rev 84740, steam/trunk/steam.install)
Deleted:
  steam/repos/multilib-x86_64/lib32-flashplugin-path.patch
  steam/repos/multilib-x86_64/steam.install

--+
 PKGBUILD |   53 +
 alsa_sdl_audiodriver.patch   |   14 ++
 lib32-flashplugin-path.patch |   20 +++
 steam.install|   52 
 4 files changed, 103 insertions(+), 36 deletions(-)

Copied: steam/repos/multilib-x86_64/PKGBUILD (from rev 84740, 
steam/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2013-02-24 00:24:51 UTC (rev 84741)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Daniel Wallace danielwallace at gtmanfred dot com
+# Contributor: K900 k0009...@gmail.com
+pkgname=steam
+pkgver=1.0.0.31
+pkgrel=1
+pkgdesc=Digital distribution client bootstrap package
+arch=(i686 x86_64)
+url=http://steampowered.com/;
+license=('custom')
+depends=(
+  'bash' 'desktop-file-utils' 'hicolor-icon-theme' 'curl'
+  'dbus' 'freetype2'  'gdk-pixbuf2' 'ttf-font' 'zenity'
+  )
+if [[ $CARCH == x86_64 ]]; then
+  depends+=(lib32-libgl lib32-gcc-libs lib32-libx11)
+  optdepends=(
+  'lib32-ati-dri: for open source ATI driver users'
+  'lib32-catalyst-utils: for AMD Catalyst users'
+  'lib32-intel-dri: for open source Intel driver users'
+  'lib32-nouveau-dri: for Nouveau users'
+  'lib32-nvidia-utils: for NVIDIA proprietary blob users'
+  'lib32-flashplugin: for flash video'
+  )
+build() {
+patch -d $pkgname -Np1 -i $srcdir/lib32-flashplugin-path.patch
+#patch -d $pkgname -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
+}
+else
+optdepends=('flashplugin: for flash videos')
+#build() {
+#patch -d $pkgname -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
+#}
+fi
+install=steam.install
+source=(http://repo.steampowered.com/$pkgname/pool/$pkgname/s/$pkgname/${pkgname}_$pkgver.tar.gz;
+'lib32-flashplugin-path.patch'
+'alsa_sdl_audiodriver.patch')
+md5sums=('887501c662554fffdb6809dd0d39f968'
+ '1d83a1df55d677f35ce415e0750f4448'
+ 'ac0e03d70f1101331598b2b32ed9bac3')
+
+package() {
+
+  # Install license
+  make -C $pkgname DESTDIR=$pkgdir install
+  
+  install -Dm644 $pkgdir/usr/share/doc/steam/steam_install_agreement.txt 
$pkgdir/usr/share/licenses/steam/LICENSE
+
+  # blank steamdeps because apt-get
+  ln -sf /bin/true $pkgdir/usr/bin/steamdeps
+}
+#vim: set ft=PKGBUILD sw=2 ts=2 et

Copied: steam/repos/multilib-x86_64/alsa_sdl_audiodriver.patch (from rev 84740, 
steam/trunk/alsa_sdl_audiodriver.patch)
===
--- alsa_sdl_audiodriver.patch  (rev 0)
+++ alsa_sdl_audiodriver.patch  2013-02-24 00:24:51 UTC (rev 84741)
@@ -0,0 +1,14 @@
+--- a/steam2013-02-15 14:43:40.0 -0500
 b/steam2013-02-17 23:26:31.951179106 -0500
+@@ -17,6 +17,11 @@
+ # Set up domain for script localization
+ export TEXTDOMAIN=steam
+ 
++# check if pulseaudio is installed and if it isn't, use alsa for 
SDL_AUDIODRIVER
++if ! pulseaudio --check /dev/null; then
++export SDL_AUDIODRIVER=alsa
++fi
++
+ function show_message()
+ {
+   style=$1

Deleted: lib32-flashplugin-path.patch
===
--- lib32-flashplugin-path.patch2013-02-24 00:21:30 UTC (rev 84740)
+++ lib32-flashplugin-path.patch2013-02-24 00:24:51 UTC (rev 84741)
@@ -1,10 +0,0 @@
 a/steam2013-02-14 14:03:49.0 -0500
-+++ b/steam2013-02-14 15:48:06.766152022 -0500
-@@ -51,6 +51,7 @@
- 
- function setup_variables()
- {
-+MOZ_PLUGIN_PATH=/usr/lib32/mozilla/plugins/
-   STEAMPACKAGE=${0##*/}
-   STEAMCONFIG=~/.steam
-   STEAMDATALINK=$STEAMCONFIG/$STEAMPACKAGE

Copied: steam/repos/multilib-x86_64/lib32-flashplugin-path.patch (from rev 
84740, steam/trunk/lib32-flashplugin-path.patch)
===
--- lib32-flashplugin-path.patch(rev 0)
+++ lib32-flashplugin-path.patch2013-02-24 00:24:51 UTC (rev 84741)
@@ -0,0 +1,10 @@
+--- a/steam2013-02-14 14:03:49.0 -0500
 b/steam2013-02-14 15:48:06.766152022 -0500
+@@ -51,6 +51,7 @@
+ 
+ function setup_variables()
+ {
++MOZ_PLUGIN_PATH=/usr/lib32/mozilla/plugins/
+   

[arch-commits] Commit in steam/trunk (PKGBUILD)

2013-02-23 Thread Daniel Wallace
Date: Sunday, February 24, 2013 @ 01:28:56
  Author: dwallace
Revision: 84742

upgpkg: steam 1.0.0.31-2

upgpkg: steam 1.0.0.31-2

Modified:
  steam/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-24 00:24:51 UTC (rev 84741)
+++ PKGBUILD2013-02-24 00:28:56 UTC (rev 84742)
@@ -3,7 +3,7 @@
 # Contributor: K900 k0009...@gmail.com
 pkgname=steam
 pkgver=1.0.0.31
-pkgrel=1
+pkgrel=2
 pkgdesc=Digital distribution client bootstrap package
 arch=(i686 x86_64)
 url=http://steampowered.com/;
@@ -24,13 +24,13 @@
   )
 build() {
 patch -d $pkgname -Np1 -i $srcdir/lib32-flashplugin-path.patch
-#patch -d $pkgname -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
+patch -d $pkgname -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
 }
 else
 optdepends=('flashplugin: for flash videos')
-#build() {
-#patch -d $pkgname -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
-#}
+build() {
+patch -d $pkgname -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
+}
 fi
 install=steam.install
 
source=(http://repo.steampowered.com/$pkgname/pool/$pkgname/s/$pkgname/${pkgname}_$pkgver.tar.gz;



[arch-commits] Commit in steam/repos (13 files)

2013-02-23 Thread Daniel Wallace
Date: Sunday, February 24, 2013 @ 01:29:37
  Author: dwallace
Revision: 84743

archrelease: copy trunk to community-testing-i686, community-testing-x86_64

Added:
  steam/repos/community-testing-i686/PKGBUILD
(from rev 84742, steam/trunk/PKGBUILD)
  steam/repos/community-testing-i686/alsa_sdl_audiodriver.patch
(from rev 84742, steam/trunk/alsa_sdl_audiodriver.patch)
  steam/repos/community-testing-i686/lib32-flashplugin-path.patch
(from rev 84742, steam/trunk/lib32-flashplugin-path.patch)
  steam/repos/community-testing-i686/steam.install
(from rev 84742, steam/trunk/steam.install)
  steam/repos/community-testing-x86_64/
  steam/repos/community-testing-x86_64/PKGBUILD
(from rev 84742, steam/trunk/PKGBUILD)
  steam/repos/community-testing-x86_64/alsa_sdl_audiodriver.patch
(from rev 84742, steam/trunk/alsa_sdl_audiodriver.patch)
  steam/repos/community-testing-x86_64/lib32-flashplugin-path.patch
(from rev 84742, steam/trunk/lib32-flashplugin-path.patch)
  steam/repos/community-testing-x86_64/steam.install
(from rev 84742, steam/trunk/steam.install)
Deleted:
  steam/repos/community-testing-i686/PKGBUILD
  steam/repos/community-testing-i686/alsa_sdl_audiodriver.patch
  steam/repos/community-testing-i686/lib32-flashplugin-path.patch
  steam/repos/community-testing-i686/steam.install

---+
 community-testing-i686/PKGBUILD   |  105 
 community-testing-i686/alsa_sdl_audiodriver.patch |   28 ++--
 community-testing-i686/lib32-flashplugin-path.patch   |   20 +--
 community-testing-i686/steam.install  |   52 +++
 community-testing-x86_64/PKGBUILD |   53 
 community-testing-x86_64/alsa_sdl_audiodriver.patch   |   14 ++
 community-testing-x86_64/lib32-flashplugin-path.patch |   10 +
 community-testing-x86_64/steam.install|   26 +++
 8 files changed, 206 insertions(+), 102 deletions(-)

Deleted: community-testing-i686/PKGBUILD
===
--- community-testing-i686/PKGBUILD 2013-02-24 00:28:56 UTC (rev 84742)
+++ community-testing-i686/PKGBUILD 2013-02-24 00:29:37 UTC (rev 84743)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Daniel Wallace danielwallace at gtmanfred dot com
-# Contributor: K900 k0009...@gmail.com
-pkgname=steam
-pkgver=1.0.0.28
-pkgrel=3
-pkgdesc=Digital distribution client - open beta - bootstrap package
-arch=(i686 x86_64)
-url=http://steampowered.com/;
-license=('custom')
-depends=(
-  'bash' 'desktop-file-utils' 'hicolor-icon-theme' 'curl'
-  'dbus' 'freetype2'  'gdk-pixbuf2' 'ttf-font' 'zenity'
-  )
-if [[ $CARCH == x86_64 ]]; then
-  depends+=(lib32-libgl lib32-gcc-libs lib32-libx11)
-  optdepends=(
-  'lib32-ati-dri: for open source ATI driver users'
-  'lib32-catalyst-utils: for AMD Catalyst users'
-  'lib32-intel-dri: for open source Intel driver users'
-  'lib32-nouveau-dri: for Nouveau users'
-  'lib32-nvidia-utils: for NVIDIA proprietary blob users'
-  'lib32-flashplugin: for flash video'
-  )
-build() {
-patch -d $pkgname-$pkgver -Np1 -i $srcdir/lib32-flashplugin-path.patch
-patch -d $pkgname-$pkgver -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
-}
-else
-optdepends=('flashplugin: for flash videos')
-build() {
-patch -d $pkgname-$pkgver -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
-}
-fi
-install=steam.install
-source=(http://repo.steampowered.com/$pkgname/pool/$pkgname/s/$pkgname/${pkgname}_$pkgver.tar.gz;
-'lib32-flashplugin-path.patch'
-'alsa_sdl_audiodriver.patch')
-md5sums=('5d7b7e12dd0d513d3f7191872fa596cd'
- '1d83a1df55d677f35ce415e0750f4448'
- 'd47c1acf365336290eaba8ca845248a4')
-package() {
-
-  # Install license
-  make -C $pkgname-$pkgver DESTDIR=$pkgdir install
-  
-  install -Dm644 $pkgdir/usr/share/doc/steam/steam_install_agreement.txt 
$pkgdir/usr/share/licenses/steam/LICENSE
-
-  # blank steamdeps because apt-get
-  ln -sf /bin/true $pkgdir/usr/bin/steamdeps
-}
-#vim: set ft=PKGBUILD sw=2 ts=2 et

Copied: steam/repos/community-testing-i686/PKGBUILD (from rev 84742, 
steam/trunk/PKGBUILD)
===
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2013-02-24 00:29:37 UTC (rev 84743)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Daniel Wallace danielwallace at gtmanfred dot com
+# Contributor: K900 k0009...@gmail.com
+pkgname=steam
+pkgver=1.0.0.31
+pkgrel=2
+pkgdesc=Digital distribution client bootstrap package
+arch=(i686 x86_64)
+url=http://steampowered.com/;
+license=('custom')
+depends=(
+  'bash' 'desktop-file-utils' 'hicolor-icon-theme' 'curl'
+  'dbus' 'freetype2'  'gdk-pixbuf2' 'ttf-font' 'zenity'
+  )
+if [[ $CARCH == x86_64 ]]; then
+  depends+=(lib32-libgl lib32-gcc-libs lib32-libx11)
+  optdepends=(
+  'lib32-ati-dri: for open source ATI 

[arch-commits] Commit in steam/repos/multilib-testing-x86_64 (8 files)

2013-02-23 Thread Daniel Wallace
Date: Sunday, February 24, 2013 @ 01:30:28
  Author: dwallace
Revision: 84744

archrelease: copy trunk to multilib-testing-x86_64

Added:
  steam/repos/multilib-testing-x86_64/PKGBUILD
(from rev 84743, steam/trunk/PKGBUILD)
  steam/repos/multilib-testing-x86_64/alsa_sdl_audiodriver.patch
(from rev 84743, steam/trunk/alsa_sdl_audiodriver.patch)
  steam/repos/multilib-testing-x86_64/lib32-flashplugin-path.patch
(from rev 84743, steam/trunk/lib32-flashplugin-path.patch)
  steam/repos/multilib-testing-x86_64/steam.install
(from rev 84743, steam/trunk/steam.install)
Deleted:
  steam/repos/multilib-testing-x86_64/PKGBUILD
  steam/repos/multilib-testing-x86_64/alsa_sdl_audiodriver.patch
  steam/repos/multilib-testing-x86_64/lib32-flashplugin-path.patch
  steam/repos/multilib-testing-x86_64/steam.install

--+
 PKGBUILD |  105 -
 alsa_sdl_audiodriver.patch   |   28 +-
 lib32-flashplugin-path.patch |   20 +++
 steam.install|   52 ++--
 4 files changed, 103 insertions(+), 102 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-02-24 00:29:37 UTC (rev 84743)
+++ PKGBUILD2013-02-24 00:30:28 UTC (rev 84744)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Daniel Wallace danielwallace at gtmanfred dot com
-# Contributor: K900 k0009...@gmail.com
-pkgname=steam
-pkgver=1.0.0.28
-pkgrel=3
-pkgdesc=Digital distribution client - open beta - bootstrap package
-arch=(i686 x86_64)
-url=http://steampowered.com/;
-license=('custom')
-depends=(
-  'bash' 'desktop-file-utils' 'hicolor-icon-theme' 'curl'
-  'dbus' 'freetype2'  'gdk-pixbuf2' 'ttf-font' 'zenity'
-  )
-if [[ $CARCH == x86_64 ]]; then
-  depends+=(lib32-libgl lib32-gcc-libs lib32-libx11)
-  optdepends=(
-  'lib32-ati-dri: for open source ATI driver users'
-  'lib32-catalyst-utils: for AMD Catalyst users'
-  'lib32-intel-dri: for open source Intel driver users'
-  'lib32-nouveau-dri: for Nouveau users'
-  'lib32-nvidia-utils: for NVIDIA proprietary blob users'
-  'lib32-flashplugin: for flash video'
-  )
-build() {
-patch -d $pkgname-$pkgver -Np1 -i $srcdir/lib32-flashplugin-path.patch
-patch -d $pkgname-$pkgver -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
-}
-else
-optdepends=('flashplugin: for flash videos')
-build() {
-patch -d $pkgname-$pkgver -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
-}
-fi
-install=steam.install
-source=(http://repo.steampowered.com/$pkgname/pool/$pkgname/s/$pkgname/${pkgname}_$pkgver.tar.gz;
-'lib32-flashplugin-path.patch'
-'alsa_sdl_audiodriver.patch')
-md5sums=('5d7b7e12dd0d513d3f7191872fa596cd'
- '1d83a1df55d677f35ce415e0750f4448'
- 'd47c1acf365336290eaba8ca845248a4')
-package() {
-
-  # Install license
-  make -C $pkgname-$pkgver DESTDIR=$pkgdir install
-  
-  install -Dm644 $pkgdir/usr/share/doc/steam/steam_install_agreement.txt 
$pkgdir/usr/share/licenses/steam/LICENSE
-
-  # blank steamdeps because apt-get
-  ln -sf /bin/true $pkgdir/usr/bin/steamdeps
-}
-#vim: set ft=PKGBUILD sw=2 ts=2 et

Copied: steam/repos/multilib-testing-x86_64/PKGBUILD (from rev 84743, 
steam/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2013-02-24 00:30:28 UTC (rev 84744)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Daniel Wallace danielwallace at gtmanfred dot com
+# Contributor: K900 k0009...@gmail.com
+pkgname=steam
+pkgver=1.0.0.31
+pkgrel=2
+pkgdesc=Digital distribution client bootstrap package
+arch=(i686 x86_64)
+url=http://steampowered.com/;
+license=('custom')
+depends=(
+  'bash' 'desktop-file-utils' 'hicolor-icon-theme' 'curl'
+  'dbus' 'freetype2'  'gdk-pixbuf2' 'ttf-font' 'zenity'
+  )
+if [[ $CARCH == x86_64 ]]; then
+  depends+=(lib32-libgl lib32-gcc-libs lib32-libx11)
+  optdepends=(
+  'lib32-ati-dri: for open source ATI driver users'
+  'lib32-catalyst-utils: for AMD Catalyst users'
+  'lib32-intel-dri: for open source Intel driver users'
+  'lib32-nouveau-dri: for Nouveau users'
+  'lib32-nvidia-utils: for NVIDIA proprietary blob users'
+  'lib32-flashplugin: for flash video'
+  )
+build() {
+patch -d $pkgname -Np1 -i $srcdir/lib32-flashplugin-path.patch
+patch -d $pkgname -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
+}
+else
+optdepends=('flashplugin: for flash videos')
+build() {
+patch -d $pkgname -Np1 -i $srcdir/alsa_sdl_audiodriver.patch
+}
+fi
+install=steam.install
+source=(http://repo.steampowered.com/$pkgname/pool/$pkgname/s/$pkgname/${pkgname}_$pkgver.tar.gz;
+'lib32-flashplugin-path.patch'
+'alsa_sdl_audiodriver.patch')
+md5sums=('887501c662554fffdb6809dd0d39f968'
+ '1d83a1df55d677f35ce415e0750f4448'
+ 'ac0e03d70f1101331598b2b32ed9bac3')
+
+package() {
+
+  # Install license
+  make -C $pkgname DESTDIR=$pkgdir 

[arch-commits] Commit in youtube-dl/trunk (PKGBUILD)

2013-02-23 Thread Eric Bélanger
Date: Sunday, February 24, 2013 @ 02:02:58
  Author: eric
Revision: 84745

upgpkg: youtube-dl 2013.02.22-1

Upstream update

Modified:
  youtube-dl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-24 00:30:28 UTC (rev 84744)
+++ PKGBUILD2013-02-24 01:02:58 UTC (rev 84745)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=youtube-dl
-pkgver=2013.02.19
+pkgver=2013.02.22
 pkgrel=1
 pkgdesc=A small command-line program to download videos from YouTube.com and 
a few more sites
 arch=('any')
@@ -11,8 +11,8 @@
 depends=('python')
 makedepends=('python-distribute')
 
source=(http://youtube-dl.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.gz{,.sig})
-sha1sums=('b49c6dae84efe8d836de731a5c01a129a5498537'
-  '220ca0300932022dc0eca921466c6a1af94cdeb5')
+sha1sums=('d9c8a206ab402204772d6316653a81b0683b7b91'
+  '4f804cb0bd493f189d8596ffbafc62e4a6cbf403')
 
 package() {
   cd ${srcdir}/${pkgname}



[arch-commits] Commit in youtube-dl/repos/community-any (PKGBUILD PKGBUILD)

2013-02-23 Thread Eric Bélanger
Date: Sunday, February 24, 2013 @ 02:03:38
  Author: eric
Revision: 84746

archrelease: copy trunk to community-any

Added:
  youtube-dl/repos/community-any/PKGBUILD
(from rev 84745, youtube-dl/trunk/PKGBUILD)
Deleted:
  youtube-dl/repos/community-any/PKGBUILD

--+
 PKGBUILD |   46 +++---
 1 file changed, 23 insertions(+), 23 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-02-24 01:02:58 UTC (rev 84745)
+++ PKGBUILD2013-02-24 01:03:38 UTC (rev 84746)
@@ -1,23 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger e...@archlinux.org
-
-pkgname=youtube-dl
-pkgver=2013.02.19
-pkgrel=1
-pkgdesc=A small command-line program to download videos from YouTube.com and 
a few more sites
-arch=('any')
-url=http://rg3.github.com/youtube-dl/;
-license=('custom')
-depends=('python')
-makedepends=('python-distribute')
-source=(http://youtube-dl.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.gz{,.sig})
-sha1sums=('b49c6dae84efe8d836de731a5c01a129a5498537'
-  '220ca0300932022dc0eca921466c6a1af94cdeb5')
-
-package() {
-  cd ${srcdir}/${pkgname}
-  sed -i -e 's|etc/bash_completion.d|share/bash-completion/completions|' \
- -e 's|youtube-dl.bash-completion|youtube-dl|' setup.py
-  python setup.py install --root=${pkgdir}/ --optimize=1
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: youtube-dl/repos/community-any/PKGBUILD (from rev 84745, 
youtube-dl/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2013-02-24 01:03:38 UTC (rev 84746)
@@ -0,0 +1,23 @@
+# $Id$
+# Maintainer: Eric Bélanger e...@archlinux.org
+
+pkgname=youtube-dl
+pkgver=2013.02.22
+pkgrel=1
+pkgdesc=A small command-line program to download videos from YouTube.com and 
a few more sites
+arch=('any')
+url=http://rg3.github.com/youtube-dl/;
+license=('custom')
+depends=('python')
+makedepends=('python-distribute')
+source=(http://youtube-dl.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.gz{,.sig})
+sha1sums=('d9c8a206ab402204772d6316653a81b0683b7b91'
+  '4f804cb0bd493f189d8596ffbafc62e4a6cbf403')
+
+package() {
+  cd ${srcdir}/${pkgname}
+  sed -i -e 's|etc/bash_completion.d|share/bash-completion/completions|' \
+ -e 's|youtube-dl.bash-completion|youtube-dl|' setup.py
+  python setup.py install --root=${pkgdir}/ --optimize=1
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}



[arch-commits] Commit in mythtv/trunk (PKGBUILD)

2013-02-23 Thread Jonathan Conder
Date: Sunday, February 24, 2013 @ 04:34:04
  Author: jconder
Revision: 84747

upgpkg: mythtv 1:0.26.0-7

rebuild for mesa and qt, remove initscripts

Modified:
  mythtv/trunk/PKGBUILD

--+
 PKGBUILD |   12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-24 01:03:38 UTC (rev 84746)
+++ PKGBUILD2013-02-24 03:34:04 UTC (rev 84747)
@@ -7,7 +7,7 @@
 
 pkgname=mythtv
 pkgver=0.26.0
-pkgrel=6
+pkgrel=7
 epoch=1
 pkgdesc=A Homebrew PVR project
 arch=('i686' 'x86_64')
@@ -16,9 +16,9 @@
 depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883'
  'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils'
 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6'
-'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber'
+'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qt4' 'urlgrabber'
 'x264')
-makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'openssl' 'yasm')
+makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'mesa-libgl' 'openssl' 'yasm')
 optdepends=('glew: for GPU commercial flagging'
 'libcec: for consumer electronics control capabilities'
'libxml2: to read blu-ray metadata'
@@ -30,14 +30,10 @@
 install='mythtv.install'
 source=(ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2;
 'alsa.patch'
-'mythbackend.rc'
-'mythbackend.conf'
'mythbackend.service'

'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.patch')
 md5sums=('f57066bf75e6f14824c494d41639f4f9'
  'f64b8219e3d27a2edf96733b851e576b'
- 'c8f935d42fb8617e9279bd539811ca5f'
- 'ab962d83614cbd0ac11ce3fcc929829d'
  'e4d572dcc307d6d8ae26bee5aebf9f3a'
  '6e156c9fc0b369346d93ccafad46cba3')
 
@@ -67,8 +63,6 @@
   cd $srcdir/$pkgname-$pkgver
   make INSTALL_ROOT=$pkgdir install
 
-  install -D -m755 $srcdir/mythbackend.rc $pkgdir/etc/rc.d/mythbackend
-  install -D -m644 $srcdir/mythbackend.conf $pkgdir/etc/conf.d/mythbackend
   install -D -m644 $srcdir/mythbackend.service 
$pkgdir/usr/lib/systemd/system/mythbackend.service
   install -D -m644 'database/mc.sql' $pkgdir/usr/share/mythtv/mc.sql
 



[arch-commits] Commit in mythtv/repos (14 files)

2013-02-23 Thread Jonathan Conder
Date: Sunday, February 24, 2013 @ 04:36:38
  Author: jconder
Revision: 84748

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  mythtv/repos/community-staging-i686/
  mythtv/repos/community-staging-i686/PKGBUILD
(from rev 84747, mythtv/trunk/PKGBUILD)
  mythtv/repos/community-staging-i686/alsa.patch
(from rev 84747, mythtv/trunk/alsa.patch)
  mythtv/repos/community-staging-i686/mythbackend.conf
(from rev 84747, mythtv/trunk/mythbackend.conf)
  mythtv/repos/community-staging-i686/mythbackend.rc
(from rev 84747, mythtv/trunk/mythbackend.rc)
  mythtv/repos/community-staging-i686/mythbackend.service
(from rev 84747, mythtv/trunk/mythbackend.service)
  mythtv/repos/community-staging-i686/mythtv.install
(from rev 84747, mythtv/trunk/mythtv.install)
  mythtv/repos/community-staging-x86_64/
  mythtv/repos/community-staging-x86_64/PKGBUILD
(from rev 84747, mythtv/trunk/PKGBUILD)
  mythtv/repos/community-staging-x86_64/alsa.patch
(from rev 84747, mythtv/trunk/alsa.patch)
  mythtv/repos/community-staging-x86_64/mythbackend.conf
(from rev 84747, mythtv/trunk/mythbackend.conf)
  mythtv/repos/community-staging-x86_64/mythbackend.rc
(from rev 84747, mythtv/trunk/mythbackend.rc)
  mythtv/repos/community-staging-x86_64/mythbackend.service
(from rev 84747, mythtv/trunk/mythbackend.service)
  mythtv/repos/community-staging-x86_64/mythtv.install
(from rev 84747, mythtv/trunk/mythtv.install)

--+
 community-staging-i686/PKGBUILD  |   72 
 community-staging-i686/alsa.patch|   66 ++
 community-staging-i686/mythbackend.conf  |   53 ++
 community-staging-i686/mythbackend.rc|   73 +
 community-staging-i686/mythbackend.service   |   14 
 community-staging-i686/mythtv.install|   22 +++
 community-staging-x86_64/PKGBUILD|   72 
 community-staging-x86_64/alsa.patch  |   66 ++
 community-staging-x86_64/mythbackend.conf|   53 ++
 community-staging-x86_64/mythbackend.rc  |   73 +
 community-staging-x86_64/mythbackend.service |   14 
 community-staging-x86_64/mythtv.install  |   22 +++
 12 files changed, 600 insertions(+)

Copied: mythtv/repos/community-staging-i686/PKGBUILD (from rev 84747, 
mythtv/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-02-24 03:36:38 UTC (rev 84748)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Jonathan Conder jonno.con...@gmail.com
+# Contributor: Giovanni Scafora giova...@archlinux.org
+# Contributor: Juergen Hoetzel juer...@archlinux.org
+# Contributor: kleptophob...@gmail.com
+# Contributor: dorphell dorph...@archlinux.org
+
+pkgname=mythtv
+pkgver=0.26.0
+pkgrel=7
+epoch=1
+pkgdesc=A Homebrew PVR project
+arch=('i686' 'x86_64')
+url=http://www.mythtv.org/;
+license=('GPL')
+depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883'
+ 'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils'
+'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6'
+'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qt4' 'urlgrabber'
+'x264')
+makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'mesa-libgl' 'openssl' 'yasm')
+optdepends=('glew: for GPU commercial flagging'
+'libcec: for consumer electronics control capabilities'
+   'libxml2: to read blu-ray metadata'
+   'openssl: for AirTunes (RAOP) support'
+'xmltv: to download tv listings')
+conflicts=('myththemes' 'mythplugins-mythvideo')
+replaces=('myththemes' 'mythplugins-mythvideo')
+backup=('etc/conf.d/mythbackend')
+install='mythtv.install'
+source=(ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2;
+'alsa.patch'
+   'mythbackend.service'
+   
'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.patch')
+md5sums=('f57066bf75e6f14824c494d41639f4f9'
+ 'f64b8219e3d27a2edf96733b851e576b'
+ 'e4d572dcc307d6d8ae26bee5aebf9f3a'
+ '6e156c9fc0b369346d93ccafad46cba3')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  find 'bindings/python' 'contrib' -type f | xargs sed -i 
's@^#!.*python$@#!/usr/bin/python2@'
+
+  patch -Np1 -i $srcdir/alsa.patch
+  patch -Np2 -i $srcdir/libcec-2-support.patch
+
+  ARCH=${CARCH/_/-}
+  ./configure --prefix=/usr \
+  --cpu=$ARCH \
+ --disable-altivec \
+ --disable-audio-jack \
+ --disable-ccache \
+ --disable-distcc \
+ --enable-libfftw3 \
+ --enable-libmp3lame \
+ --enable-libx264 \
+ --enable-vaapi \
+ --python=python2
+  make
+}
+

[arch-commits] Commit in mythtv/trunk (mythbackend.conf mythbackend.rc)

2013-02-23 Thread Jonathan Conder
Date: Sunday, February 24, 2013 @ 04:57:26
  Author: jconder
Revision: 84749

remove initscripts

Deleted:
  mythtv/trunk/mythbackend.conf
  mythtv/trunk/mythbackend.rc

--+
 mythbackend.conf |   53 --
 mythbackend.rc   |   73 -
 2 files changed, 126 deletions(-)

Deleted: mythbackend.conf
===
--- mythbackend.conf2013-02-24 03:36:38 UTC (rev 84748)
+++ mythbackend.conf2013-02-24 03:57:26 UTC (rev 84749)
@@ -1,53 +0,0 @@
-#
-# Copyright (c) by the MythTV Development Team.
-#
-# Derived from work by:
-#
-# Michael Thomson linux at m-thomson dot net
-# Stu Tomlinson stu at nosnilmot dot com
-# Axel Thimm axel.thimm at atrpms dot net
-# Adopted for ArchLinux:
-# Jürgen Hoetzel juer...@archinux.org
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-###
-#
-# User who should start the mythbackend process
-#
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can 
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# MBE_USER='root'
-
-#
-# Startup options for mythbackend (see 'mythbackend --help' for a list).
-#
-# MBE_OPTS=''
-
-#
-# Directory holding the mythbackend log file
-#
-# LOG_PATH='/var/log/mythtv'
-
-#
-# Logging options for mythbackend (see 'mythbackend -v help' for a list)
-#
-# LOG_OPTS=''

Deleted: mythbackend.rc
===
--- mythbackend.rc  2013-02-24 03:36:38 UTC (rev 84748)
+++ mythbackend.rc  2013-02-24 03:57:26 UTC (rev 84749)
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/profile
-
-###
-# Default values to use if none are supplied in the config file.
-#
-# User who should start the mythbackend process
-MBE_USER='mythtv'
-
-# Startup options for mythbackend
-MBE_OPTS=''
-
-# Directory holding the mythbackend log file
-LOG_PATH='/var/log/mythtv'
-
-# Logging options for mythbackend
-LOG_OPTS=''
-###
-
-CONFIG_FILE=/etc/conf.d/mythbackend
-PIDFILE=/var/run/mythbackend.pid
-
-if [[ -r $CONFIG_FILE ]]; then
-  . $CONFIG_FILE
-fi
-
-PID=$(cat $PIDFILE 2 /dev/null || pidof mythbackend)
-export HOME=$(getent passwd $MBE_USER | cut -d : -f 6)
-
-case $1 in
-  start)
-stat_busy Starting MythTV Backend
-
-if [[ $PID -gt 0 ]]  kill -0 $PID; then
-  stat_fail
-  exit 0
-fi
-
-touch $PIDFILE
-chown $MBE_USER $PIDFILE $LOG_PATH
-
-MBE_CMD=/usr/bin/mythbackend --daemon \
-  --logpath $LOG_PATH $LOG_OPTS \
-  --pidfile $PIDFILE $MBE_OPTS
-if su $MBE_USER -c $MBE_CMD; then
-  add_daemon mythbackend
-  stat_done
-else
-  stat_fail
-fi
-;;
-  stop)
-stat_busy Stopping MythTV Backend
-if [[ $PID -gt 0 ]]  kill $PID  /dev/null; then
-  rm_daemon mythbackend
-  stat_done
-  rm -f $PIDFILE
-else
-  stat_fail
-fi
-;;
-  restart)
-$0 stop
-$0 start
-;;
-  *)
-echo usage: $0 (start|stop|restart)
-;;
-esac
-exit 0



[arch-commits] Commit in mythplugins/trunk (PKGBUILD)

2013-02-23 Thread Jonathan Conder
Date: Sunday, February 24, 2013 @ 04:59:40
  Author: jconder
Revision: 84750

fix build for mesa 9.1

Modified:
  mythplugins/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-24 03:57:26 UTC (rev 84749)
+++ PKGBUILD2013-02-24 03:59:40 UTC (rev 84750)
@@ -20,7 +20,7 @@
 url=http://www.mythtv.org;
 license=('GPL')
 makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif'
- 'libvorbis' 'mesa' 'mplayer' 'mythtv'
+ 'libvorbis' 'mesa' 'mesa-libgl' 'mplayer' 'mythtv'
 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size'
 'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax'
 'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging'



[arch-commits] Commit in podofo/trunk (PKGBUILD)

2013-02-23 Thread Giovanni Scafora
Date: Sunday, February 24, 2013 @ 06:43:32
  Author: giovanni
Revision: 84751

upgpkg: podofo 0.9.2-1

upstream release

Modified:
  podofo/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-24 03:59:40 UTC (rev 84750)
+++ PKGBUILD2013-02-24 05:43:32 UTC (rev 84751)
@@ -4,16 +4,16 @@
 # Contributor: Preecha Patumchareonpol yumyai at gmail.com 
 
 pkgname=podofo
-pkgver=0.9.1
-pkgrel=3
+pkgver=0.9.2
+pkgrel=1
 pkgdesc=A C++ library to work with the PDF file format
 arch=('i686' 'x86_64')
 url=http://podofo.sourceforge.net;
 license=('GPL')
-depends=( 'gcc-libs' 'fontconfig' 'libpng' 'libtiff')
+depends=('openssl' 'libidn' 'lua51' 'fontconfig' 'libpng' 'libtiff')
 makedepends=('cmake')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('cec586ab69f92bc88d38b5d4b8eee5a0')
+md5sums=('41966c57fa4266ac5cef80bfade0c8e7')
 
 build() {
   cd ${pkgname}-${pkgver}



[arch-commits] Commit in podofo/repos (4 files)

2013-02-23 Thread Giovanni Scafora
Date: Sunday, February 24, 2013 @ 06:43:40
  Author: giovanni
Revision: 84752

archrelease: copy trunk to community-i686, community-x86_64

Added:
  podofo/repos/community-i686/PKGBUILD
(from rev 84751, podofo/trunk/PKGBUILD)
  podofo/repos/community-x86_64/PKGBUILD
(from rev 84751, podofo/trunk/PKGBUILD)
Deleted:
  podofo/repos/community-i686/PKGBUILD
  podofo/repos/community-x86_64/PKGBUILD

---+
 community-i686/PKGBUILD   |   68 ++--
 community-x86_64/PKGBUILD |   68 ++--
 2 files changed, 68 insertions(+), 68 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-02-24 05:43:32 UTC (rev 84751)
+++ community-i686/PKGBUILD 2013-02-24 05:43:40 UTC (rev 84752)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora giova...@archlinux.org
-# Contributor: BlackEagle  ike DOT devolder AT gmail DOT com 
-# Contributor: Preecha Patumchareonpol yumyai at gmail.com 
-
-pkgname=podofo
-pkgver=0.9.1
-pkgrel=3
-pkgdesc=A C++ library to work with the PDF file format
-arch=('i686' 'x86_64')
-url=http://podofo.sourceforge.net;
-license=('GPL')
-depends=( 'gcc-libs' 'fontconfig' 'libpng' 'libtiff')
-makedepends=('cmake')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('cec586ab69f92bc88d38b5d4b8eee5a0')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
--DPODOFO_BUILD_SHARED=1 \
--DPODOFO_HAVE_JPEG_LIB=1 \
--DPODOFO_HAVE_PNG_LIB=1 \
--DPODOFO_HAVE_TIFF_LIB=1
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}/build
-  make DESTDIR=$pkgdir install
-}

Copied: podofo/repos/community-i686/PKGBUILD (from rev 84751, 
podofo/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-02-24 05:43:40 UTC (rev 84752)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Giovanni Scafora giova...@archlinux.org
+# Contributor: BlackEagle  ike DOT devolder AT gmail DOT com 
+# Contributor: Preecha Patumchareonpol yumyai at gmail.com 
+
+pkgname=podofo
+pkgver=0.9.2
+pkgrel=1
+pkgdesc=A C++ library to work with the PDF file format
+arch=('i686' 'x86_64')
+url=http://podofo.sourceforge.net;
+license=('GPL')
+depends=('openssl' 'libidn' 'lua51' 'fontconfig' 'libpng' 'libtiff')
+makedepends=('cmake')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
+md5sums=('41966c57fa4266ac5cef80bfade0c8e7')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  mkdir build
+  cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
+-DPODOFO_BUILD_SHARED=1 \
+-DPODOFO_HAVE_JPEG_LIB=1 \
+-DPODOFO_HAVE_PNG_LIB=1 \
+-DPODOFO_HAVE_TIFF_LIB=1
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}/build
+  make DESTDIR=$pkgdir install
+}

Deleted: community-x86_64/PKGBUILD
===
--- community-x86_64/PKGBUILD   2013-02-24 05:43:32 UTC (rev 84751)
+++ community-x86_64/PKGBUILD   2013-02-24 05:43:40 UTC (rev 84752)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora giova...@archlinux.org
-# Contributor: BlackEagle  ike DOT devolder AT gmail DOT com 
-# Contributor: Preecha Patumchareonpol yumyai at gmail.com 
-
-pkgname=podofo
-pkgver=0.9.1
-pkgrel=3
-pkgdesc=A C++ library to work with the PDF file format
-arch=('i686' 'x86_64')
-url=http://podofo.sourceforge.net;
-license=('GPL')
-depends=( 'gcc-libs' 'fontconfig' 'libpng' 'libtiff')
-makedepends=('cmake')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('cec586ab69f92bc88d38b5d4b8eee5a0')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
--DPODOFO_BUILD_SHARED=1 \
--DPODOFO_HAVE_JPEG_LIB=1 \
--DPODOFO_HAVE_PNG_LIB=1 \
--DPODOFO_HAVE_TIFF_LIB=1
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}/build
-  make DESTDIR=$pkgdir install
-}

Copied: podofo/repos/community-x86_64/PKGBUILD (from rev 84751, 
podofo/trunk/PKGBUILD)
===
--- community-x86_64/PKGBUILD   (rev 0)
+++ community-x86_64/PKGBUILD   2013-02-24 05:43:40 UTC (rev 84752)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Giovanni Scafora giova...@archlinux.org
+# Contributor: BlackEagle  ike DOT devolder AT gmail DOT com 
+# Contributor: Preecha Patumchareonpol yumyai at gmail.com 
+
+pkgname=podofo
+pkgver=0.9.2
+pkgrel=1
+pkgdesc=A C++ library to work with the PDF file format
+arch=('i686' 'x86_64')
+url=http://podofo.sourceforge.net;
+license=('GPL')
+depends=('openssl' 'libidn' 'lua51' 'fontconfig' 'libpng' 'libtiff')
+makedepends=('cmake')