summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
Diffstat (limited to 'community')
-rw-r--r--community/gpsim/PKGBUILD14
-rw-r--r--community/lgi/PKGBUILD6
-rwxr-xr-xcommunity/lightdm-gtk2-greeter/PKGBUILD12
-rwxr-xr-xcommunity/lightdm-gtk3-greeter/PKGBUILD12
-rwxr-xr-xcommunity/lightdm/PKGBUILD21
-rwxr-xr-xcommunity/lightdm/lightdm-corrupt-x-authority.patch21
-rwxr-xr-xcommunity/lightdm/lightdm-default-config.patch16
-rwxr-xr-xcommunity/lightdm/lightdm-lock-screen-before-switch.patch55
-rwxr-xr-xcommunity/lightdm/lightdm-use-login1.patch505
-rw-r--r--community/nginx/PKGBUILD8
-rw-r--r--community/ogle/PKGBUILD44
-rw-r--r--community/ogle/dvdread-4.1.3.patch129
-rw-r--r--community/ogle/gcc34alsafix.patch15
-rw-r--r--community/ogle/gcc4.patch12
-rw-r--r--community/ogle/ogle-vuln-scripts-makefile.patch36
-rw-r--r--community/ogle/xvideofix.patch205
-rw-r--r--community/python-matplotlib/PKGBUILD6
-rw-r--r--community/python-psutil/PKGBUILD10
-rw-r--r--community/sk1/PKGBUILD6
-rw-r--r--community/stella/PKGBUILD4
20 files changed, 496 insertions, 641 deletions
diff --git a/community/gpsim/PKGBUILD b/community/gpsim/PKGBUILD
index 311a70a32..ebdf3d253 100644
--- a/community/gpsim/PKGBUILD
+++ b/community/gpsim/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 63608 2012-02-05 12:00:08Z ibiru $
+# $Id: PKGBUILD 98438 2013-10-10 13:31:09Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: mickael9 <mickael9 at gmail dot com>
pkgname=gpsim
-pkgver=0.26.1
-pkgrel=2
+pkgver=0.27.0
+pkgrel=1
pkgdesc="A full-featured software simulator for Microchip PIC microcontrollers"
arch=(i686 x86_64)
url="http://gpsim.sourceforge.net/"
license=(GPL)
depends=('gtk2+extra' 'popt')
-makedepends=('gtk2+extra')
+makedepends=('gtk2+extra' 'gputils')
options=('!libtool')
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c994c23d2d75056dbefcf5d1d63596d7')
+md5sums=('b3ded17f1c8c6134f2381d6e6925b231')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr
make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
}
diff --git a/community/lgi/PKGBUILD b/community/lgi/PKGBUILD
index 0c03956a1..4eb8fb661 100644
--- a/community/lgi/PKGBUILD
+++ b/community/lgi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 85686 2013-03-04 23:40:53Z seblu $
+# $Id: PKGBUILD 98427 2013-10-10 07:57:51Z seblu $
# Maintainer: speps <speps at aur dot archlinux dot org>
# Maintainer: Sébastien Luttringer
pkgbase=lgi
pkgname=(lua-lgi)
-pkgver=0.7.1
+pkgver=0.7.2
pkgrel=1
pkgdesc='Lua bindings for gnome/gobject using gobject-introspection library'
arch=(i686 x86_64)
@@ -14,7 +14,7 @@ depends=('glibc' 'glib2' 'libffi' 'lua' 'gobject-introspection')
replaces=('lgi')
conflicts=('lgi')
source=("$pkgbase-$pkgver.tar.gz::https://github.com/pavouk/$pkgbase/archive/$pkgver.tar.gz")
-md5sums=('de7367aee8e39f7df7c2229675c5ff2d')
+md5sums=('f41902695c3d8ef40312d7c654885bf3')
build() {
cd $pkgbase-$pkgver
diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD
index fe1c0a16e..0734e08f7 100755
--- a/community/lightdm-gtk2-greeter/PKGBUILD
+++ b/community/lightdm-gtk2-greeter/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 92267 2013-06-03 13:05:16Z alucryd $
+# $Id: PKGBUILD 98452 2013-10-10 20:04:45Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: Padfoot <padfoot@exemail.com.au>
pkgname=lightdm-gtk2-greeter
-pkgver=1.6.0
+pkgver=1.6.1
pkgrel=1
epoch=1
pkgdesc="GTK+ greeter for LightDM"
@@ -16,17 +16,17 @@ provides=("${pkgname/2/}")
conflicts=("${pkgname/2/3}")
backup=('etc/lightdm/lightdm-gtk-greeter.conf')
source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz")
-sha256sums=('69df6199a7e62b07a1865b0319a7c031abc2b06dc3eb193b8b7b453f536283ac')
+sha256sums=('1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9')
build() {
- cd "${srcdir}"/${pkgname/2/}-${pkgver}
+ cd ${pkgname/2/}-${pkgver}
- ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static --with-gtk2
+ ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' --libexecdir='/usr/lib/lightdm' --disable-static --with-gtk2
make
}
package() {
- cd "${srcdir}"/${pkgname/2/}-${pkgver}
+ cd ${pkgname/2/}-${pkgver}
make DESTDIR="${pkgdir}" install
}
diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD
index 6455f5383..974539f2b 100755
--- a/community/lightdm-gtk3-greeter/PKGBUILD
+++ b/community/lightdm-gtk3-greeter/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 92265 2013-06-03 12:53:06Z alucryd $
+# $Id: PKGBUILD 98450 2013-10-10 19:59:15Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: Padfoot <padfoot@exemail.com.au>
pkgname=lightdm-gtk3-greeter
-pkgver=1.6.0
+pkgver=1.6.1
pkgrel=1
epoch=1
pkgdesc="GTK+ greeter for LightDM"
@@ -16,17 +16,17 @@ provides=("${pkgname/3/}")
conflicts=("${pkgname/3/2}")
backup=('etc/lightdm/lightdm-gtk-greeter.conf')
source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz")
-sha256sums=('69df6199a7e62b07a1865b0319a7c031abc2b06dc3eb193b8b7b453f536283ac')
+sha256sums=('1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9')
build() {
- cd "${srcdir}"/${pkgname/3/}-${pkgver}
+ cd ${pkgname/3/}-${pkgver}
- ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static
+ ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' --libexecdir='/usr/lib/lightdm' --disable-static
make
}
package() {
- cd "${srcdir}"/${pkgname/3/}-${pkgver}
+ cd ${pkgname/3/}-${pkgver}
make DESTDIR="${pkgdir}" install
}
diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD
index 6f494e7e6..49b1e9cec 100755
--- a/community/lightdm/PKGBUILD
+++ b/community/lightdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 98119 2013-10-06 08:35:43Z alucryd $
+# $Id: PKGBUILD 98444 2013-10-10 16:19:18Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: Morfeo <morfeo89@hotmail.it>
pkgbase=lightdm
pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.8.1
+pkgrel=1
epoch=1
pkgdesc="A lightweight display manager"
arch=('i686' 'x86_64')
@@ -13,36 +13,27 @@ url="https://launchpad.net/lightdm"
license=('GPL3' 'LGPL3')
makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base')
options=('!libtool')
-source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz"
+source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz"
'lightdm.service'
'lightdm.tmpfiles'
'lightdm.pam'
'lightdm-autologin.pam'
'lightdm.rules'
- 'lightdm-corrupt-x-authority.patch'
'lightdm-default-config.patch'
- 'lightdm-lock-screen-before-switch.patch'
- 'lightdm-use-login1.patch'
'Xsession')
-sha256sums=('b0de1dc81bb5ce81800feafb9fbc7806ef4dfc83733f0df058568e55b8a045f3'
+sha256sums=('e749ea72ac2517f592a8dfcd8bbdf7aba6729cb75c569c03347751d87f99305a'
'0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a'
'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
'33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
- '420aac58151bc441696db0bf234123b934ca8a8798e90db8a59252258e82b5d5'
- '15f75ffe122fa86c0c4b3558b9d73e151ba89355093036ffc64110c5e306216b'
- '4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822'
- 'a760c7b4d8c0b54bb204b5d6e574c82360a90464ac06042409a17f950d2c1194'
+ '0b2f740616110887d5c8662e40f1a8350fc0dfa6c7e99f6e3a5636c6b0ca714f'
'7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
prepare() {
cd ${pkgbase}-${pkgver}
- patch -Np0 -i ../lightdm-corrupt-x-authority.patch
patch -Np1 -i ../lightdm-default-config.patch
- patch -Np1 -i ../lightdm-lock-screen-before-switch.patch
- patch -Np0 -i ../lightdm-use-login1.patch
}
build() {
diff --git a/community/lightdm/lightdm-corrupt-x-authority.patch b/community/lightdm/lightdm-corrupt-x-authority.patch
deleted file mode 100755
index f994b394c..000000000
--- a/community/lightdm/lightdm-corrupt-x-authority.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-=== modified file 'src/xauthority.c'
---- src/xauthority.c 2013-09-10 23:14:12 +0000
-+++ src/xauthority.c 2013-09-30 02:59:01 +0000
-@@ -237,7 +237,7 @@
- gboolean
- x_authority_write (XAuthority *auth, XAuthWriteMode mode, const gchar *filename, GError **error)
- {
-- gchar *input;
-+ gchar *input = NULL;
- gsize input_length = 0, input_offset = 0;
- GList *link, *records = NULL;
- XAuthority *a;
-@@ -328,6 +328,7 @@
- }
-
- errno = 0;
-+ result = TRUE;
- for (link = records; link && result; link = link->next)
- {
- XAuthority *a = link->data;
-
diff --git a/community/lightdm/lightdm-default-config.patch b/community/lightdm/lightdm-default-config.patch
index 7c7b421b6..54963c689 100755
--- a/community/lightdm/lightdm-default-config.patch
+++ b/community/lightdm/lightdm-default-config.patch
@@ -17,29 +17,29 @@
+log-directory=/var/log/lightdm
+run-directory=/run/lightdm
#cache-directory=/var/cache/lightdm
- #xsessions-directory=/usr/share/xsessions
+ #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions
#remote-sessions-directory=/usr/share/lightdm/remote-sessions
-@@ -71,7 +71,7 @@
- #xdmcp-manager=
- #xdmcp-port=177
+@@ -81,7 +81,7 @@
#xdmcp-key=
+ #unity-compositor-command=unity-system-compositor
+ #unity-compositor-timeout=60
-#greeter-session=example-gtk-gnome
+greeter-session=lightdm-gtk-greeter
#greeter-hide-users=false
#greeter-allow-guest=true
#greeter-show-manual-login=false
-@@ -79,7 +79,7 @@
+@@ -89,7 +89,7 @@
#user-session=default
#allow-guest=true
#guest-session=UNIMPLEMENTED
-#session-wrapper=lightdm-session
+session-wrapper=/etc/lightdm/Xsession
+ #greeter-wrapper=
#display-setup-script=
#greeter-setup-script=
- #session-setup-script=
-@@ -88,6 +88,7 @@
- #autologin-user=
+@@ -100,6 +100,7 @@
#autologin-user-timeout=0
+ #autologin-in-background=false
#autologin-session=UNIMPLEMENTED
+pam-service=lightdm-autologin
#exit-on-failure=false
diff --git a/community/lightdm/lightdm-lock-screen-before-switch.patch b/community/lightdm/lightdm-lock-screen-before-switch.patch
deleted file mode 100755
index b8b1d559c..000000000
--- a/community/lightdm/lightdm-lock-screen-before-switch.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-# HG changeset patch
-# Parent b329fa1badaa454239690c3feb93d53324134915
-try to lock the screen before switching users
-
-diff --git a/utils/gdmflexiserver b/utils/gdmflexiserver
---- a/utils/gdmflexiserver
-+++ b/utils/gdmflexiserver
-@@ -9,9 +9,47 @@
- #
- # See http://www.gnu.org/copyleft/gpl.html for the full text of the license.
-
-+PATH=/usr/local/bin:/bin:/usr/bin
-+export PATH
-+
- if [ -z "$XDG_SEAT_PATH" ]; then
- # something went wrong
- exit 1
- fi
-
-+find_command () {
-+ cmd="$1"
-+ oIFS="${IFS}"; IFS=:
-+ set -- ${PATH}
-+ IFS="${oIFS}"
-+
-+ for part; do
-+ [ -x "${part}/${cmd}" ] && return 0
-+ done
-+ return 1
-+}
-+
-+lock_screen () {
-+ for lock_cmd in \
-+ "xscreensaver-command -lock" \
-+ "gnome-screensaver-command --lock" \
-+ "dbus-send --session --dest=org.freedesktop.ScreenSaver --type=method_call /ScreenSaver org.freedesktop.ScreenSaver.Lock"
-+ do
-+ ${lock_cmd} >/dev/null 2>&1 && return
-+ done
-+
-+ for lock_cmd in \
-+ "slock" \
-+ "xlock -mode blank"
-+ do
-+ set -- ${lock_cmd}
-+ if find_command "$1"; then
-+ ${lock_cmd} >/dev/null 2>&1 &
-+ return
-+ fi
-+ done
-+}
-+
-+lock_screen
-+
- dbus-send --system --type=method_call --print-reply --dest=org.freedesktop.DisplayManager $XDG_SEAT_PATH org.freedesktop.DisplayManager.Seat.SwitchToGreeter
diff --git a/community/lightdm/lightdm-use-login1.patch b/community/lightdm/lightdm-use-login1.patch
deleted file mode 100755
index cc3d5a5fd..000000000
--- a/community/lightdm/lightdm-use-login1.patch
+++ /dev/null
@@ -1,505 +0,0 @@
-=== modified file 'liblightdm-gobject/power.c'
---- liblightdm-gobject/power.c 2013-01-31 20:56:09 +0000
-+++ liblightdm-gobject/power.c 2013-04-15 02:21:06 +0000
-@@ -17,6 +17,7 @@
-
- static GDBusProxy *upower_proxy = NULL;
- static GDBusProxy *ck_proxy = NULL;
-+static GDBusProxy *login1_proxy = NULL;
-
- static gboolean
- upower_call_function (const gchar *function, gboolean default_result, GError **error)
-@@ -109,11 +110,10 @@
- return upower_call_function ("Hibernate", TRUE, error);
- }
-
--static gboolean
--ck_call_function (const gchar *function, gboolean default_result, GError **error)
-+static GVariant *
-+ck_call_function (const gchar *function, GError **error)
- {
-- GVariant *result;
-- gboolean function_result = FALSE;
-+ GVariant *r;
-
- if (!ck_proxy)
- {
-@@ -129,22 +129,46 @@
- return FALSE;
- }
-
-- result = g_dbus_proxy_call_sync (ck_proxy,
-- function,
-- NULL,
-- G_DBUS_CALL_FLAGS_NONE,
-- -1,
-- NULL,
-- error);
--
-- if (!result)
-- return default_result;
--
-- if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(b)")))
-- g_variant_get (result, "(b)", &function_result);
--
-- g_variant_unref (result);
-- return function_result;
-+ r = g_dbus_proxy_call_sync (ck_proxy,
-+ function,
-+ NULL,
-+ G_DBUS_CALL_FLAGS_NONE,
-+ -1,
-+ NULL,
-+ error);
-+
-+ return r;
-+}
-+
-+static GVariant *
-+login1_call_function (const gchar *function, GVariant *parameters, GError **error)
-+{
-+ GVariant *r;
-+ gchar *str_result;
-+
-+ if (!login1_proxy)
-+ {
-+ login1_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+ G_DBUS_PROXY_FLAGS_NONE,
-+ NULL,
-+ "org.freedesktop.login1",
-+ "/org/freedesktop/login1",
-+ "org.freedesktop.login1.Manager",
-+ NULL,
-+ error);
-+ if (!login1_proxy)
-+ return NULL;
-+ }
-+
-+ r = g_dbus_proxy_call_sync (login1_proxy,
-+ function,
-+ parameters,
-+ G_DBUS_CALL_FLAGS_NONE,
-+ -1,
-+ NULL,
-+ error);
-+
-+ return r;
- }
-
- /**
-@@ -157,7 +181,29 @@
- gboolean
- lightdm_get_can_restart (void)
- {
-- return ck_call_function ("CanRestart", FALSE, NULL);
-+ gboolean can_restart = FALSE;
-+ GVariant *r;
-+
-+ r = login1_call_function ("CanReboot", NULL, NULL);
-+ if (r)
-+ {
-+ gchar *result;
-+ if (g_variant_is_of_type (r, G_VARIANT_TYPE ("(s)")))
-+ {
-+ g_variant_get (r, "(&s)", &result);
-+ can_restart = g_strcmp0 (result, "yes") == 0;
-+ }
-+ }
-+ else
-+ {
-+ r = ck_call_function ("CanRestart", NULL);
-+ if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)")))
-+ g_variant_get (r, "(b)", &can_restart);
-+ }
-+ if (r)
-+ g_variant_unref (r);
-+
-+ return can_restart;
- }
-
- /**
-@@ -171,7 +217,20 @@
- gboolean
- lightdm_restart (GError **error)
- {
-- return ck_call_function ("Restart", TRUE, error);
-+ GVariant *r;
-+ gboolean restarted;
-+
-+ r = login1_call_function ("Reboot", g_variant_new("(b)", FALSE), error);
-+ if (!r)
-+ {
-+ g_clear_error (error);
-+ r = ck_call_function ("Restart", error);
-+ }
-+ restarted = r != NULL;
-+ if (r)
-+ g_variant_unref (r);
-+
-+ return restarted;
- }
-
- /**
-@@ -184,7 +243,29 @@
- gboolean
- lightdm_get_can_shutdown (void)
- {
-- return ck_call_function ("CanStop", FALSE, NULL);
-+ gboolean can_shutdown = FALSE;
-+ GVariant *r;
-+
-+ r = login1_call_function ("CanPowerOff", NULL, NULL);
-+ if (r)
-+ {
-+ gchar *result;
-+ if (g_variant_is_of_type (r, G_VARIANT_TYPE ("(s)")))
-+ {
-+ g_variant_get (r, "(&s)", &result);
-+ can_shutdown = g_strcmp0 (result, "yes") == 0;
-+ }
-+ }
-+ else
-+ {
-+ r = ck_call_function ("CanStop", NULL);
-+ if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)")))
-+ g_variant_get (r, "(b)", &can_shutdown);
-+ }
-+ if (r)
-+ g_variant_unref (r);
-+
-+ return can_shutdown;
- }
-
- /**
-@@ -198,5 +279,18 @@
- gboolean
- lightdm_shutdown (GError **error)
- {
-- return ck_call_function ("Stop", TRUE, error);
-+ GVariant *r;
-+ gboolean shutdown;
-+
-+ r = login1_call_function ("PowerOff", g_variant_new("(b)", FALSE), error);
-+ if (!r)
-+ {
-+ g_clear_error (error);
-+ r = ck_call_function ("Stop", error);
-+ }
-+ shutdown = r != NULL;
-+ if (r)
-+ g_variant_unref (r);
-+
-+ return shutdown;
- }
-
-=== modified file 'liblightdm-qt/power.cpp'
---- liblightdm-qt/power.cpp 2013-02-06 14:08:25 +0000
-+++ liblightdm-qt/power.cpp 2013-04-14 23:00:34 +0000
-@@ -15,6 +15,7 @@
- #include <QtCore/QVariant>
- #include <QtDBus/QDBusInterface>
- #include <QtDBus/QDBusReply>
-+#include <QDebug>
-
- #include "config.h"
-
-@@ -26,11 +27,13 @@
- PowerInterfacePrivate();
- QScopedPointer<QDBusInterface> powerManagementInterface;
- QScopedPointer<QDBusInterface> consoleKitInterface;
-+ QScopedPointer<QDBusInterface> login1Interface;
- };
-
- PowerInterface::PowerInterfacePrivate::PowerInterfacePrivate() :
- powerManagementInterface(new QDBusInterface("org.freedesktop.UPower","/org/freedesktop/UPower", "org.freedesktop.UPower", QDBusConnection::systemBus())),
-- consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus()))
-+ consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus())),
-+ login1Interface(new QDBusInterface("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", QDBusConnection::systemBus()))
- {
- }
-
-@@ -80,34 +83,54 @@
-
- bool PowerInterface::canShutdown()
- {
-+ if (d->login1Interface->isValid()) {
-+ QDBusReply<QString> reply1 = d->login1Interface->call("CanPowerOff");
-+ if (reply1.isValid()) {
-+ return reply1.value() == "yes";
-+ }
-+ }
-+ qWarning() << d->login1Interface->lastError();
-+
- QDBusReply<bool> reply = d->consoleKitInterface->call("CanStop");
- if (reply.isValid()) {
- return reply.value();
- }
-- else {
-- return false;
-- }
-+
-+ return false;
- }
-
- void PowerInterface::shutdown()
- {
-- d->consoleKitInterface->call("Stop");
-+ if (d->login1Interface->isValid())
-+ d->login1Interface->call("PowerOff", false);
-+ else
-+ d->consoleKitInterface->call("Stop");
- }
-
- bool PowerInterface::canRestart()
- {
-+ if (d->login1Interface->isValid()) {
-+ QDBusReply<QString> reply1 = d->login1Interface->call("CanReboot");
-+ if (reply1.isValid()) {
-+ return reply1.value() == "yes";
-+ }
-+ }
-+ qWarning() << d->login1Interface->lastError();
-+
- QDBusReply<bool> reply = d->consoleKitInterface->call("CanRestart");
- if (reply.isValid()) {
- return reply.value();
- }
-- else {
-- return false;
-- }
-+
-+ return false;
- }
-
- void PowerInterface::restart()
- {
-- d->consoleKitInterface->call("Restart");
-+ if (d->login1Interface->isValid())
-+ d->login1Interface->call("Reboot", false);
-+ else
-+ d->consoleKitInterface->call("Restart");
- }
-
- #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-
-=== modified file 'tests/Makefile.am'
---- tests/Makefile.am 2013-04-12 03:46:06 +0000
-+++ tests/Makefile.am 2013-04-14 22:54:54 +0000
-@@ -135,6 +135,8 @@
- test-no-accounts-service \
- test-console-kit \
- test-no-console-kit \
-+ test-no-login1 \
-+ test-no-console-kit-or-login1 \
- test-open-file-descriptors \
- test-xdmcp-open-file-descriptors
-
-@@ -284,8 +286,10 @@
- scripts/no-accounts-service.conf \
- scripts/no-config.conf \
- scripts/no-console-kit.conf \
-+ scripts/no-console-kit-or-login1.conf \
- scripts/no-keyboard-layout.conf \
- scripts/no-language.conf \
-+ scripts/no-login1.conf \
- scripts/open-file-descriptors.conf \
- scripts/pam.conf \
- scripts/plymouth-active-vt.conf \
-
-=== added file 'tests/scripts/no-console-kit-or-login1.conf'
---- tests/scripts/no-console-kit-or-login1.conf 1970-01-01 00:00:00 +0000
-+++ tests/scripts/no-console-kit-or-login1.conf 2013-04-14 22:54:54 +0000
-@@ -0,0 +1,34 @@
-+#
-+# Check still works when neither ConsoleKit or login1 is available
-+#
-+
-+[test-runner-config]
-+disable-console-kit=true
-+disable-login1=true
-+
-+[LightDM]
-+minimum-display-number=50
-+
-+[SeatDefaults]
-+autologin-user=have-password1
-+
-+#?RUNNER DAEMON-START
-+
-+# X server starts
-+#?XSERVER :50 START
-+#?XSERVER :50 INDICATE-READY
-+
-+# LightDM connects to X server
-+#?XSERVER :50 ACCEPT-CONNECT
-+
-+# Session starts
-+#?SESSION :50 START USER=have-password1
-+#?XSERVER :50 ACCEPT-CONNECT
-+#?SESSION :50 CONNECT-XSERVER
-+
-+# Cleanup
-+#?*STOP-DAEMON
-+# Don't know what order they will terminate
-+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-+#?RUNNER DAEMON-EXIT STATUS=0
-
-=== added file 'tests/scripts/no-login1.conf'
---- tests/scripts/no-login1.conf 1970-01-01 00:00:00 +0000
-+++ tests/scripts/no-login1.conf 2013-04-14 22:54:54 +0000
-@@ -0,0 +1,33 @@
-+#
-+# Check still works when login1 is not available
-+#
-+
-+[test-runner-config]
-+disable-login1=true
-+
-+[LightDM]
-+minimum-display-number=50
-+
-+[SeatDefaults]
-+autologin-user=have-password1
-+
-+#?RUNNER DAEMON-START
-+
-+# X server starts
-+#?XSERVER :50 START
-+#?XSERVER :50 INDICATE-READY
-+
-+# LightDM connects to X server
-+#?XSERVER :50 ACCEPT-CONNECT
-+
-+# Session starts
-+#?SESSION :50 START USER=have-password1
-+#?XSERVER :50 ACCEPT-CONNECT
-+#?SESSION :50 CONNECT-XSERVER
-+
-+# Cleanup
-+#?*STOP-DAEMON
-+# Don't know what order they will terminate
-+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-+#?RUNNER DAEMON-EXIT STATUS=0
-
-=== modified file 'tests/src/test-runner.c'
---- tests/src/test-runner.c 2013-03-27 00:48:48 +0000
-+++ tests/src/test-runner.c 2013-04-14 22:54:54 +0000
-@@ -1464,6 +1464,101 @@ accounts_user_set_hidden (AccountsUser *
- }
-
- static void
-+handle_login1_call (GDBusConnection *connection,
-+ const gchar *sender,
-+ const gchar *object_path,
-+ const gchar *interface_name,
-+ const gchar *method_name,
-+ GVariant *parameters,
-+ GDBusMethodInvocation *invocation,
-+ gpointer user_data)
-+{
-+ if (strcmp (method_name, "CanReboot") == 0)
-+ g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", "yes"));
-+ else if (strcmp (method_name, "Reboot") == 0)
-+ {
-+ gboolean interactive;
-+ g_variant_get (parameters, "(b)", &interactive);
-+ g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
-+ }
-+ if (strcmp (method_name, "CanPowerOff") == 0)
-+ g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", "yes"));
-+ else if (strcmp (method_name, "PowerOff") == 0)
-+ {
-+ gboolean interactive;
-+ g_variant_get (parameters, "(b)", &interactive);
-+ g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
-+ }
-+ else
-+ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "No such method: %s", method_name);
-+}
-+
-+static void
-+login1_name_acquired_cb (GDBusConnection *connection,
-+ const gchar *name,
-+ gpointer user_data)
-+{
-+ const gchar *login1_interface =
-+ "<node>"
-+ " <interface name='org.freedesktop.login1.Manager'>"
-+ " <method name='CanReboot'>"
-+ " <arg name='result' direction='out' type='s'/>"
-+ " </method>"
-+ " <method name='Reboot'>"
-+ " <arg name='interactive' direction='in' type='b'/>"
-+ " </method>"
-+ " <method name='CanPowerOff'>"
-+ " <arg name='result' direction='out' type='s'/>"
-+ " </method>"
-+ " <method name='PowerOff'>"
-+ " <arg name='interactive' direction='in' type='b'/>"
-+ " </method>"
-+ " </interface>"
-+ "</node>";
-+ static const GDBusInterfaceVTable login1_vtable =
-+ {
-+ handle_login1_call,
-+ };
-+ GDBusNodeInfo *login1_info;
-+ GError *error = NULL;
-+
-+ login1_info = g_dbus_node_info_new_for_xml (login1_interface, &error);
-+ if (error)
-+ g_warning ("Failed to parse D-Bus interface: %s", error->message);
-+ g_clear_error (&error);
-+ if (!login1_info)
-+ return;
-+ g_dbus_connection_register_object (connection,
-+ "/org/freedesktop/login1",
-+ login1_info->interfaces[0],
-+ &login1_vtable,
-+ NULL, NULL,
-+ &error);
-+ if (error)
-+ g_warning ("Failed to register login1 service: %s", error->message);
-+ g_clear_error (&error);
-+ g_dbus_node_info_unref (login1_info);
-+
-+ service_count--;
-+ if (service_count == 0)
-+ run_lightdm ();
-+}
-+
-+static void
-+start_login1_daemon ()
-+{
-+ service_count++;
-+ g_bus_own_name (G_BUS_TYPE_SYSTEM,
-+ "org.freedesktop.login1",
-+ G_BUS_NAME_OWNER_FLAGS_NONE,
-+ login1_name_acquired_cb,
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL);
-+}
-+
-+static void
- load_passwd_file (void)
- {
- gchar *path, *data, **lines;
-
-=== added file 'tests/test-no-console-kit-or-login1'
---- tests/test-no-console-kit-or-login1 1970-01-01 00:00:00 +0000
-+++ tests/test-no-console-kit-or-login1 2013-04-14 22:54:54 +0000
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+./src/dbus-env ./src/test-runner no-console-kit-or-login1 test-gobject-greeter
-
-=== added file 'tests/test-no-login1'
---- tests/test-no-login1 1970-01-01 00:00:00 +0000
-+++ tests/test-no-login1 2013-04-14 22:54:54 +0000
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+./src/dbus-env ./src/test-runner no-login1 test-gobject-greeter
-
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index d5ac06175..a8f8a83b3 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 96815 2013-09-05 20:15:59Z seblu $
+# $Id: PKGBUILD 98429 2013-10-10 07:58:09Z seblu $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Maintainer: Sébastien Luttringer
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
pkgname=nginx
-pkgver=1.4.2
-pkgrel=4
+pkgver=1.4.3
+pkgrel=1
pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
arch=('i686' 'x86_64')
url='http://nginx.org'
@@ -26,7 +26,7 @@ install=install
source=("http://nginx.org/download/nginx-$pkgver.tar.gz"
'service'
'logrotate')
-sha256sums=('5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611'
+sha256sums=('ae123885c923a6c3f5bab0a8b7296ef21c4fdf6087834667ebbc16338177de84'
'05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
'272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98')
diff --git a/community/ogle/PKGBUILD b/community/ogle/PKGBUILD
new file mode 100644
index 000000000..8653aa453
--- /dev/null
+++ b/community/ogle/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 98421 2013-10-10 01:44:06Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=ogle
+pkgver=0.9.2
+pkgrel=13
+pkgdesc="A simple DVD player for Linux"
+arch=('i686' 'x86_64')
+url="http://www.dtek.chalmers.se/groups/dvd/"
+license=('GPL')
+depends=('sh' 'libxml2' 'libdvdread' 'libjpeg' 'libmad' 'libxinerama' 'libxv'
+ 'alsa-lib' 'a52dec' 'libxxf86vm')
+options=('!libtool')
+# http://www.dtek.chalmers.se/groups/dvd/dist/${pkgname}-${pkgver}.tar.gz
+source=(ftp://ftp.archlinux.org/other/ogle/${pkgname}-${pkgver}.tar.gz \
+ xvideofix.patch gcc34alsafix.patch gcc4.patch dvdread-4.1.3.patch \
+ ogle-vuln-scripts-makefile.patch)
+md5sums=('a76a9892bdb807a4bcf859d15a91f0f9'
+ '57f1cf36eed82c56f24e9c0fc25ce2b3'
+ '4ebc822b252fade6b53c5ceb5be45bf5'
+ 'd08cff87c5ec41a7eebc0d2384835688'
+ '597906c64ff7f5185de8430fdae3107d'
+ 'd052b01f293c61d399fdd0ac2abb1cf4')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p0 -i "${srcdir}/dvdread-4.1.3.patch"
+ patch -p1 -i "${srcdir}/xvideofix.patch"
+ patch -p1 -i "${srcdir}/gcc34alsafix.patch"
+ patch -p1 -i "${srcdir}/gcc4.patch"
+ patch -p0 -i "${srcdir}/ogle-vuln-scripts-makefile.patch"
+
+ # fix alsa detection - stolen from their cvs
+ sed -i 's|^.*MINOR\=\=5.*$|#if SND_LIB_MAJOR==0 && SND_LIB_MINOR<6|' configure
+ sed -i 's|__diga_end:|\0;|' libogleao/alsa_audio.c
+ ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --with-x
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ export LIBRARY_PATH="${pkgdir}/usr/lib/ogle"
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/community/ogle/dvdread-4.1.3.patch b/community/ogle/dvdread-4.1.3.patch
new file mode 100644
index 000000000..d928ac2aa
--- /dev/null
+++ b/community/ogle/dvdread-4.1.3.patch
@@ -0,0 +1,129 @@
+$NetBSD: patch-ad,v 1.1 2009/01/27 02:06:49 jmcneill Exp $
+
+--- vmg/ifo_dump.c.orig 2009-01-26 21:00:17.000000000 -0500
++++ vmg/ifo_dump.c 2009-01-26 21:00:33.000000000 -0500
+@@ -65,38 +65,38 @@ static void print_ifo(char *path, int ti
+ if(h->vmgi_mat != NULL) {
+
+ printf("VMG top level\n-------------\n");
+- ifoPrint_VMGI_MAT(h->vmgi_mat);
++ ifo_print_VMGI_MAT(h->vmgi_mat);
+
+ printf("\nFirst Play PGC\n--------------\n");
+- ifoPrint_PGC(h->first_play_pgc);
++ ifo_print_PGC(h->first_play_pgc);
+
+ printf("\nTitle Track search pointer table\n");
+ printf( "------------------------------------------------\n");
+- ifoPrint_TT_SRPT(h->tt_srpt);
++ ifo_print_TT_SRPT(h->tt_srpt);
+
+ printf("\nMenu PGCI Unit table\n");
+ printf( "--------------------\n");
+ if(h->vmgi_mat->vmgm_pgci_ut != 0) {
+- ifoPrint_PGCI_UT(h->pgci_ut);
++ ifo_print_PGCI_UT(h->pgci_ut);
+ } else
+ printf("No Menu PGCI Unit table present\n");
+
+ printf("\nParental Manegment Information table\n");
+ printf( "------------------------------------\n");
+ if(h->vmgi_mat->ptl_mait != 0) {
+- ifoPrint_PTL_MAIT(h->ptl_mait);
++ ifo_print_PTL_MAIT(h->ptl_mait);
+ } else
+ printf("No Parental Management Information present\n");
+
+ printf("\nVideo Title Set Attribute Table\n");
+ printf( "-------------------------------\n");
+- ifoPrint_VTS_ATRT(h->vts_atrt);
++ ifo_print_VTS_ATRT(h->vts_atrt);
+
+
+ printf("\nText Data Manager Information\n");
+ printf( "-----------------------------\n");
+ if(h->vmgi_mat->txtdt_mgi != 0) {
+- //ifoPrint_TXTDT_MGI(h->txtdt_mgi);
++ //ifo_print_TXTDT_MGI(h->txtdt_mgi);
+ printf("Can't print Text Data Manager Information yet\n");
+ } else
+ printf("No Text Data Manager Information present\n");
+@@ -106,14 +106,14 @@ static void print_ifo(char *path, int ti
+ printf("\nCell Address table\n");
+ printf( "-----------------\n");
+ if(h->vmgi_mat->vmgm_c_adt != 0) {
+- ifoPrint_C_ADT(h->menu_c_adt);
++ ifo_print_C_ADT(h->menu_c_adt);
+ } else
+ printf("No Cell Address table present\n");
+
+ printf("\nVideo Title set Menu VOBU address map\n");
+ printf( "-----------------\n");
+ if(h->vmgi_mat->vmgm_vobu_admap != 0) {
+- ifoPrint_VOBU_ADMAP(h->menu_vobu_admap);
++ ifo_print_VOBU_ADMAP(h->menu_vobu_admap);
+ } else
+ printf("No Menu VOBU address map present\n");
+ }
+@@ -122,20 +122,20 @@ static void print_ifo(char *path, int ti
+ if(h->vtsi_mat != NULL) {
+
+ printf("VTS top level\n-------------\n");
+- ifoPrint_VTSI_MAT(h->vtsi_mat);
++ ifo_print_VTSI_MAT(h->vtsi_mat);
+
+ printf("\nPart of title search pointer table information\n");
+ printf( "----------------------------------------------\n");
+- ifoPrint_VTS_PTT_SRPT(h->vts_ptt_srpt);
++ ifo_print_VTS_PTT_SRPT(h->vts_ptt_srpt);
+
+ printf("\nPGCI Unit table\n");
+ printf( "--------------------\n");
+- ifoPrint_PGCIT(h->vts_pgcit);
++ ifo_print_PGCIT(h->vts_pgcit);
+
+ printf("\nMenu PGCI Unit table\n");
+ printf( "--------------------\n");
+ if(h->vtsi_mat->vtsm_pgci_ut != 0) {
+- ifoPrint_PGCI_UT(h->pgci_ut);
++ ifo_print_PGCI_UT(h->pgci_ut);
+ } else
+ printf("No Menu PGCI Unit table present\n");
+
+@@ -144,31 +144,31 @@ static void print_ifo(char *path, int ti
+ printf("\nTime Map table\n");
+ printf( "-----------------\n");
+ if(h->vtsi_mat->vts_tmapt != 0) {
+- ifoPrint_VTS_TMAPT(h->vts_tmapt);
++ ifo_print_VTS_TMAPT(h->vts_tmapt);
+ } else
+ printf("No Time Map table present\n");
+
+ printf("\nMenu Cell Address table\n");
+ printf( "-----------------\n");
+ if(h->vtsi_mat->vtsm_c_adt != 0) {
+- ifoPrint_C_ADT(h->menu_c_adt);
++ ifo_print_C_ADT(h->menu_c_adt);
+ } else
+ printf("No Cell Address table present\n");
+
+ printf("\nVideo Title Set Menu VOBU address map\n");
+ printf( "-----------------\n");
+ if(h->vtsi_mat->vtsm_vobu_admap != 0) {
+- ifoPrint_VOBU_ADMAP(h->menu_vobu_admap);
++ ifo_print_VOBU_ADMAP(h->menu_vobu_admap);
+ } else
+ printf("No Menu VOBU address map present\n");
+
+ printf("\nCell Address table\n");
+ printf( "-----------------\n");
+- ifoPrint_C_ADT(h->vts_c_adt);
++ ifo_print_C_ADT(h->vts_c_adt);
+
+ printf("\nVideo Title Set VOBU address map\n");
+ printf( "-----------------\n");
+- ifoPrint_VOBU_ADMAP(h->vts_vobu_admap);
++ ifo_print_VOBU_ADMAP(h->vts_vobu_admap);
+
+ }
+ }
diff --git a/community/ogle/gcc34alsafix.patch b/community/ogle/gcc34alsafix.patch
new file mode 100644
index 000000000..76de3462d
--- /dev/null
+++ b/community/ogle/gcc34alsafix.patch
@@ -0,0 +1,15 @@
+--- ogle-0.9.2/libogleao/alsa_audio.c 2003-10-18 17:38:30.000000000 -0700
++++ ogle-0.9.2-patch/libogleao/alsa_audio.c 2005-04-22 18:21:23.000000000 -0700
+@@ -248,10 +248,9 @@
+ //Shouldn't ctl_handle be closed here?
+ }
+
+- snd_ctl_close(ctl_handle);
+-
+- __diga_end:
++ snd_ctl_close(ctl_handle);
+ }
++ __diga_end:
+
+ return 0;
+ }
diff --git a/community/ogle/gcc4.patch b/community/ogle/gcc4.patch
new file mode 100644
index 000000000..b6a10a325
--- /dev/null
+++ b/community/ogle/gcc4.patch
@@ -0,0 +1,12 @@
+diff -urN ogle-0.9.2-old/ac3/ac3dec_wrap.c ogle-0.9.2/ac3/ac3dec_wrap.c
+--- ogle-0.9.2-old/ac3/ac3dec_wrap.c 2003-03-02 15:50:03.000000000 +0000
++++ ogle-0.9.2/ac3/ac3dec_wrap.c 2005-09-30 17:07:27.000000000 +0000
+@@ -48,7 +48,7 @@
+ static void handle_events(MsgEventQ_t *q, MsgEvent_t *ev);
+
+
+-static char *program_name;
++char *program_name;
+
+ static FILE *outfile;
+
diff --git a/community/ogle/ogle-vuln-scripts-makefile.patch b/community/ogle/ogle-vuln-scripts-makefile.patch
new file mode 100644
index 000000000..f25964378
--- /dev/null
+++ b/community/ogle/ogle-vuln-scripts-makefile.patch
@@ -0,0 +1,36 @@
+This patch inhibits the installation of debug scripts vulnerable to a symlink
+attack, see bug 245921 for reference.
+
+--- scripts/Makefile.in.orig 2009-04-04 18:13:33.000000000 +0200
++++ scripts/Makefile.in 2009-04-04 18:15:46.000000000 +0200
+@@ -133,10 +133,10 @@
+ subdir = scripts
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES = ogle
+-SCRIPTS = $(bin_SCRIPTS) $(dist_pkglib_SCRIPTS)
++SCRIPTS = $(bin_SCRIPTS)
+
+ DIST_SOURCES =
+-DIST_COMMON = $(dist_pkglib_SCRIPTS) Makefile.am Makefile.in ogle.in
++DIST_COMMON = Makefile.am Makefile.in ogle.in
+ all: all-am
+
+ .SUFFIXES:
+@@ -279,7 +279,7 @@
+
+ install-data-am:
+
+-install-exec-am: install-binSCRIPTS install-dist_pkglibSCRIPTS
++install-exec-am: install-binSCRIPTS
+
+ install-info: install-info-am
+
+@@ -295,7 +295,7 @@
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkglibSCRIPTS \
++uninstall-am: uninstall-binSCRIPTS \
+ uninstall-info-am
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
diff --git a/community/ogle/xvideofix.patch b/community/ogle/xvideofix.patch
new file mode 100644
index 000000000..aafde447a
--- /dev/null
+++ b/community/ogle/xvideofix.patch
@@ -0,0 +1,205 @@
+--- ogle-0.9.2/mpeg2_video/video_output_x11.c 2003-11-04 04:02:10.000000000 -0800
++++ ogle-0.9.2-patch/mpeg2_video/video_output_x11.c 2005-04-22 18:37:56.000000000 -0700
+@@ -286,6 +286,7 @@
+ }
+ }
+
++
+ /* This section of the code looks for the Xv extension for hardware
+ * yuv->rgb and scaling. If it is not found, or any suitable adapter
+ * is not found, use_xv will be set to 0. Otherwise it allocates a
+@@ -299,121 +300,136 @@
+ {
+ int xv_found = 0;
+ #ifdef HAVE_XV
+- int i, j;
++ int i, j, k;
+ int result;
+
+ xv_port = 0; /* We have no port yet. */
+-
++
+ /* Check for the Xvideo extension */
+- result = XvQueryExtension(mydisplay, &xv_version, &xv_release,
+- &xv_request_base, &xv_event_base,
++ result = XvQueryExtension(mydisplay, &xv_version, &xv_release,
++ &xv_request_base, &xv_event_base,
+ &xv_error_base);
+ if(result != Success) {
+ WARNING("%s", "Xvideo extension not found\n");
+ use_xv = 0;
+ return;
+ }
+-
++
+ NOTE("Found Xv extension %d.%d, checking for suitable adaptors\n",
+ xv_version, xv_release);
+-
++
+ /* Check for available adaptors */
+- result = XvQueryAdaptors(mydisplay, DefaultRootWindow (mydisplay),
++ result = XvQueryAdaptors(mydisplay, DefaultRootWindow (mydisplay),
+ &xv_num_adaptors, &xv_adaptor_info);
+ if(result != Success) {
+ WARNING("%s", "No Xv adaptors found\n");
+ use_xv = 0;
+ return;
+ }
+-
++
+ /* Check adaptors */
+ for(i = 0; i < xv_num_adaptors; i++) {
+-
++
+ /* Is it usable for displaying XvImages */
+ if(!(xv_adaptor_info[i].type & XvInputMask) ||
+ !(xv_adaptor_info[i].type & XvImageMask))
+ continue;
+-
+- xv_port = xv_adaptor_info[i].base_id;
+-
+- /* Check image formats of adaptor */
+- xv_formats = XvListImageFormats(mydisplay, xv_port, &xv_num_formats);
+- for(j = 0; j < xv_num_formats; j++) {
+- if(xv_formats[j].id == 0x32315659) { /* YV12 */
+- //if(xv_formats[j].id == 0x30323449) { /* I420 */
+- xv_id = xv_formats[j].id;
+- break;
+- }
+- }
+- /* No matching format found */
+- if(j == xv_num_formats)
+- continue;
+-
+- NOTE("Xv adaptor \"%s\" port %li image format %i\n",
+- xv_adaptor_info[i].name, xv_port, xv_id);
+-
+- /* Allocate XvImages */
++
++ /* Check Available Ports */
++ for (j = 0; j < xv_adaptor_info[i].num_ports && !xv_port ; j++) {
++
++ /* Check Image formats of adaptor */
++ xv_formats = XvListImageFormats(mydisplay,xv_adaptor_info[i].base_id + j, &xv_num_formats);
++ for (k = 0; k < xv_num_formats; k ++) {
++
++ /* Check for proper format (YV12) and see if we can grab the port */
++ if ( (xv_formats[k].id == 0x32315659) && (XvGrabPort(mydisplay,xv_adaptor_info[i].base_id + j,0) == Success) ) {
++ xv_id = xv_formats[k].id;
++ xv_port = xv_adaptor_info[i].base_id + j;
++ break;
++ }
++
++ }
++
++ /* delete stuff nicely */
++ XFree(xv_formats);
++ }
++
++ /* Check next Adapter */
++ if (xv_port==0) continue;
++
++ /* Report what we found */
++ NOTE("Xv adaptor \"%s\" port %li image format %i\n", xv_adaptor_info[i].name, xv_port, xv_id);
++
++ /* Allocate XvImage */
+ xv_image = XvShmCreateImage(mydisplay, xv_port, xv_id, NULL,
+ padded_width,
+- padded_height,
++ padded_height,
+ &shm_info);
+-
+- /* Got an Image? */
++
++ /* Got an milk? */
+ if(xv_image == NULL)
+ continue;
+-
++
+ /* Test and see if we really got padded_width x padded_height */
+ if(xv_image->width != padded_width ||
+ xv_image->height != padded_height) {
+ FATAL("XvShmCreateImage got size: %d x %d\n",
+ xv_image->width, xv_image->height);
+ exit(1);
+- }
+-
++ }
++
++ /* Now Finish Up */
+ shm_info.shmid = picture_buffer_shmid;
+ shm_info.shmaddr = picture_buffer_addr;
+-
+- /* Set the data pointer to the decoders picture segment. */
++
++ /* Set the data pointer to the decoders picture segment. */
+ // xv_image->data = picture_data->y;
+ shm_info.readOnly = True;
+-
++
+ /* make sure we don't have any unhandled errors */
+ XSync(mydisplay, False);
+-
++
+ /* set error handler so we can check if xshmattach failed */
+ prev_xerrhandler = XSetErrorHandler(xshm_errorhandler);
+-
++
+ /* get the serial of the xshmattach request */
+ req_serial = NextRequest(mydisplay);
+-
++
+ /* try to attach */
+ XShmAttach(mydisplay, &shm_info);
+-
++
+ /* make sure xshmattach has been processed and any errors
+ have been returned to us */
+ XSync(mydisplay, False);
+-
++
+ /* revert to the previous xerrorhandler */
+ XSetErrorHandler(prev_xerrhandler);
+-
++
+ if(use_xshm) {
+ #if 0
+ shmctl(shm_info.shmid, IPC_RMID, 0); // only works on Linux..
+ #endif
+-
++
+ CompletionType = XShmGetEventBase(mydisplay) + ShmCompletion;
+ }
+ xv_found = 1;
+
+ /* All set up! */
+ break;
+- }
++ }
++
++ /* Clean up */
++ XvFreeAdaptorInfo(xv_adaptor_info);
++
+ #endif /* HAVE_XV */
++ /* In case we didn't find a working Xv */
+ if(!xv_found) {
+ use_xv = 0;
+- }
+-}
+-
++ }
++
++ }
++
+
+ /* This section of the code tries to use the MIT XShm extension for
+ * accellerated transfers to to X. XShm extension is need and only
+@@ -1726,6 +1742,8 @@
+
+ if(mydisplay) {
+ XSync(mydisplay,True);
++ if (use_xv)
++ XvUngrabPort(mydisplay,xv_port,CurrentTime);
+ if(use_xshm)
+ XShmDetach(mydisplay, &shm_info);
+ if(window.ximage != 0)
diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD
index 62f4e2f7a..d6c9dac0f 100644
--- a/community/python-matplotlib/PKGBUILD
+++ b/community/python-matplotlib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95128 2013-08-05 23:48:54Z eric $
+# $Id: PKGBUILD 98442 2013-10-10 15:29:19Z fyan $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
@@ -6,7 +6,7 @@
pkgbase=python-matplotlib
pkgname=('python2-matplotlib' 'python-matplotlib')
-pkgver=1.3.0
+pkgver=1.3.1
pkgrel=1
pkgdesc="A python plotting library, making publication quality plots"
arch=('i686' 'x86_64')
@@ -21,7 +21,6 @@ optdepends=('pygtk: for use with the GTK or GTKAgg backend'
'ghostscript: usetex dependencies'
'texlive-bin: usetex dependencies')
source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz")
-sha1sums=('4bcf177bbe2a1a576fbc0896e69c2de2cf7429ae')
prepare() {
cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py3
@@ -66,3 +65,4 @@ package_python-matplotlib() {
install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib
install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python-matplotlib
}
+sha512sums=('04877aa15b6d52a6f813e8377098d13c432f66ae2522c544575440180944c9b73a2164ae63edd3a0eff807883bf7b39cd55f28454ccee8c76146567ff4a6fd40')
diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD
index e2d673dc9..3e3408638 100644
--- a/community/python-psutil/PKGBUILD
+++ b/community/python-psutil/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 96120 2013-08-20 06:32:54Z lcarlier $
+# $Id: PKGBUILD 98418 2013-10-09 22:50:40Z seblu $
# Maintainer: Sébastien Luttringer
pkgbase=python-psutil
pkgname=('python-psutil' 'python2-psutil')
-pkgver=1.0.1
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
arch=('i686' 'x86_64')
url='http://code.google.com/p/psutil/'
license=('custom: BSD')
makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools')
-source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz")
-sha1sums=('3d3abb8b7a5479b7299a8d170ec25179410f24d1')
+source=("https://pypi.python.org/packages/source/p/psutil/psutil-$pkgver.tar.gz")
+md5sums=('24430ee6486be2f1a960d9ce4dc87ad0')
build() {
cd psutil-$pkgver
diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD
index cdba8f23c..ed0920ac3 100644
--- a/community/sk1/PKGBUILD
+++ b/community/sk1/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 97887 2013-09-30 13:21:30Z bgyorgy $
+# $Id: PKGBUILD 98434 2013-10-10 11:32:25Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: ConnorBehan <connor.behan@gmail.com>
pkgname=sk1
pkgver=0.9.1
-pkgrel=11
+pkgrel=12
pkgdesc="Fork of skencil with improved CMYK support"
arch=(i686 x86_64)
url="http://sk1project.org/modules.php?name=Products&product=sk1"
-depends=('tcl' 'tk' 'python2-lcms' 'python2-pillow' 'pyxml' 'zenity' 'sk1libs')
+depends=('tcl' 'tk' 'python2-lcms' 'python2-pillow' 'zenity' 'sk1libs')
license=('GPL' 'LGPL')
source=(http://sk1project.org/downloads/sk1/${pkgver}pre_rev905/sK1-${pkgver}pre_rev905.tar.gz
sk1.desktop
diff --git a/community/stella/PKGBUILD b/community/stella/PKGBUILD
index 9b903cd2c..ea68ee2ce 100644
--- a/community/stella/PKGBUILD
+++ b/community/stella/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
pkgname=stella
-pkgver=3.9
+pkgver=3.9.2
pkgrel=1
pkgdesc="A multi-platform Atari 2600 VCS emulator"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL')
depends=('sdl' 'hicolor-icon-theme' 'gtk-update-icon-cache')
install=$pkgname.install
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver-src.tar.gz)
-md5sums=('a0b1dbfef4f7b5e6ff9273c15cf4ba7d')
+md5sums=('49d2accab82601ad0ad04536e8400266')
build() {
cd "$srcdir"/$pkgname-$pkgver