diff options
| author | root <root@rshg054.dnsready.net> | 2012-10-13 00:57:48 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-10-13 00:57:48 -0700 |
| commit | 21c295a86a10a3cd59802b2cf3ab7c24ebf0c608 (patch) | |
| tree | ef49797b1f76586e9f8281e301a4923d90f29aa7 /testing | |
| parent | 3cfedd8a4ed1e5464ef328d91b1a224aedc07960 (diff) | |
Sat Oct 13 00:57:48 PDT 2012
Diffstat (limited to 'testing')
52 files changed, 1938 insertions, 14 deletions
diff --git a/testing/celestia/PKGBUILD b/testing/celestia/PKGBUILD new file mode 100644 index 000000000..492b6565b --- /dev/null +++ b/testing/celestia/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 168482 2012-10-12 16:54:10Z andyrtr $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor : Damir Perisa <damir.perisa@bluewin.ch> + +pkgname=celestia +pkgver=1.6.1 +pkgrel=3 +pkgdesc="Real-time space simulation" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.shatters.net/celestia/" +depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg') +options=('!makeflags') +source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz" + 'celestia-1.6.1-gcc46.patch' + 'celestia-1.6.1-libpng15.patch' + 'celestia-1.6.1-linking.patch' + 'gcc-4.7-fixes.diff') +sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7' + '7c08ca391603806d788cb8f3342acedafc924eef' + '46ecc4e10b24191384bc848c206652498843adf0' + '534c8eee18d13a868c91f0b870ebecc05f3e7ae1' + '582f9eed93eca02a16350f02c29e2ea6f69aa869') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # build patch + patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch" + patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch" + patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch" + patch -Np1 -i "${srcdir}/gcc-4.7-fixes.diff" + + # This version of Celestia has a bug in the font rendering and requires -fsigned-char + export CFLAGS="$CFLAGS -fsigned-char" + export CXXFLAGS="$CXXFLAGS -fsigned-char" + + autoreconf + ./configure --prefix=/usr \ + --with-lua=/usr \ + --datadir=/usr/share \ + --with-gtk \ + --disable-rpath \ + --with-lua + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} + diff --git a/testing/celestia/celestia-1.5.1-gcc44.patch b/testing/celestia/celestia-1.5.1-gcc44.patch new file mode 100644 index 000000000..b1ee896f0 --- /dev/null +++ b/testing/celestia/celestia-1.5.1-gcc44.patch @@ -0,0 +1,20 @@ +--- src/celengine/overlay.h.orig 2009-07-08 02:27:08.000000000 -0400 ++++ src/celengine/overlay.h 2009-07-08 02:27:28.000000000 -0400 +@@ -10,6 +10,7 @@ + #ifndef _OVERLAY_H_ + #define _OVERLAY_H_ + ++#include <cstdio> + #include <string> + #include <iostream> + #include <celtxf/texturefont.h> +--- src/celengine/star.cpp.orig 2009-07-08 02:40:52.000000000 -0400 ++++ src/celengine/star.cpp 2009-07-08 02:41:08.000000000 -0400 +@@ -8,6 +8,7 @@ + // of the License, or (at your option) any later version. + + #include <celmath/mathlib.h> ++#include <cstdio> + #include <cstring> + #include <cassert> + #include "celestia.h" diff --git a/testing/celestia/celestia-1.6.1-gcc46.patch b/testing/celestia/celestia-1.6.1-gcc46.patch new file mode 100644 index 000000000..ddf4036f2 --- /dev/null +++ b/testing/celestia/celestia-1.6.1-gcc46.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/show_bug.cgi?id=366073 + +Patch written by Nils Larsson <ni1s@nerdshack.com> +--- src/celengine/frametree.h ++++ src/celengine/frametree.h +@@ -14,6 +14,7 @@ + #define _CELENGINE_FRAMETREE_H_ + + #include <vector> ++#include <cstddef> + + class Star; + class Body; diff --git a/testing/celestia/celestia-1.6.1-gentoo.patch b/testing/celestia/celestia-1.6.1-gentoo.patch new file mode 100644 index 000000000..57fffe159 --- /dev/null +++ b/testing/celestia/celestia-1.6.1-gentoo.patch @@ -0,0 +1,23 @@ +--- src/celestia/Makefile.am 2011-06-07 19:15:51.502000147 +0200 ++++ src/celestia/Makefile.am.new 2011-06-07 19:15:47.208000302 +0200 +@@ -15,6 +15,7 @@ + if ENABLE_GTK + SUBDIRS += gtk + celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a ++LIBS += $(GTK_LIBS) + endif + + COMMONSOURCES = \ + +Index: src/celengine/frametree.h +=================================================================== +--- src/celengine/frametree.h (revision 5163) ++++ src/celengine/frametree.h (arbetskopia) +@@ -14,6 +14,7 @@ + #define _CELENGINE_FRAMETREE_H_ + + #include <vector> ++#include <cstddef> + + class Star; + class Body; diff --git a/testing/celestia/celestia-1.6.1-libpng15.patch b/testing/celestia/celestia-1.6.1-libpng15.patch new file mode 100644 index 000000000..5dffbab24 --- /dev/null +++ b/testing/celestia/celestia-1.6.1-libpng15.patch @@ -0,0 +1,14 @@ +imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope + +--- src/celestia/imagecapture.cpp ++++ src/celestia/imagecapture.cpp +@@ -31,6 +31,9 @@ + #include "png.h" + #endif + ++// Z_BEST_COMPRESSION ++#include <zlib.h> ++ + // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng + #ifndef png_jmpbuf + #define png_jmpbuf(png_ptr) png_ptr->jmpbuf diff --git a/testing/celestia/celestia-1.6.1-linking.patch b/testing/celestia/celestia-1.6.1-linking.patch new file mode 100644 index 000000000..d610d5243 --- /dev/null +++ b/testing/celestia/celestia-1.6.1-linking.patch @@ -0,0 +1,54 @@ +Fix linking issues: + * underlinking GLUT (bug #372123, #387609) + * as-needed (bug #281258) + +--- a/src/celestia/Makefile.am ++++ b/src/celestia/Makefile.am +@@ -7,14 +7,15 @@ + + if ENABLE_KDE + SUBDIRS += kde +-celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \ +- $(LIBSOCKET) -lDCOP kde/libkdegui.a ++celestiaKDELIBS = kde/libkdegui.a + celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP + endif + + if ENABLE_GTK + SUBDIRS += gtk +-celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a ++celestiaGTKLIBS = gtk/libgtkgui.a ++LIBS += $(GTK_LIBS) + endif + + COMMONSOURCES = \ +@@ -62,6 +63,7 @@ + + if ENABLE_GLUT + GLUTSOURCES = glutmain.cpp ++GLUTLIBS = -lGL + endif + + if ENABLE_THEORA +@@ -80,15 +82,16 @@ + celestia_LDADD = \ + $(celestiaKDELIBS) \ + $(celestiaGTKLIBS) \ +- $(DL_LIBS) \ +- $(LUA_LIBS) \ +- $(THEORA_LIBS) \ + ../celengine/libcelengine.a \ + ../celtxf/libceltxf.a \ + ../cel3ds/libcel3ds.a \ + ../celmath/libcelmath.a \ + ../celutil/libcelutil.a \ +- $(SPICE_LIBS) ++ $(LUA_LIBS) \ ++ $(THEORA_LIBS) \ ++ $(GLUTLIBS) \ ++ $(SPICE_LIBS) \ ++ $(DL_LIBS) + + noinst_HEADERS = $(wildcard *.h) + noinst_DATA = ../../celestia diff --git a/testing/celestia/gcc-4.7-fixes.diff b/testing/celestia/gcc-4.7-fixes.diff new file mode 100644 index 000000000..9ca09e03f --- /dev/null +++ b/testing/celestia/gcc-4.7-fixes.diff @@ -0,0 +1,10 @@ +--- a/src/celmath/intersect.h ++++ b/src/celmath/intersect.h +@@ -15,6 +15,7 @@ + #include "ray.h" + #include "sphere.h" + #include "ellipsoid.h" ++#include "mathlib.h" + + + template<class T> bool testIntersection(const Ray3<T>& ray, diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD new file mode 100644 index 000000000..f10dee80a --- /dev/null +++ b/testing/gnome-games/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 168505 2012-10-13 00:06:42Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-games +pkgver=3.4.2 +pkgrel=2 +pkgdesc="Some Games for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'glu' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') +makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala') +options=('!emptydirs' '!libtool') +install=gnome-games.install +url="http://www.gnome.org" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('25676285fad33a39da7fc26b5b1dc751c7981ae778b8fe82e8b7c0a367e5117c') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static --disable-schemas-compile \ + --with-scores-user=root --with-scores-group=games \ + --enable-introspection=yes + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # Remove all scores, we generate them from postinstall + rm -rf "$pkgdir/var" + + sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku" +} diff --git a/testing/gnome-games/gnome-games.install b/testing/gnome-games/gnome-games.install new file mode 100644 index 000000000..aaa36a896 --- /dev/null +++ b/testing/gnome-games/gnome-games.install @@ -0,0 +1,122 @@ +_scores=(glines.Large.scores + glines.Medium.scores + glines.Small.scores + gnibbles.1.0.scores + gnibbles.1.1.scores + gnibbles.2.0.scores + gnibbles.2.1.scores + gnibbles.3.0.scores + gnibbles.3.1.scores + gnibbles.4.0.scores + gnibbles.4.1.scores + gnobots2.classic_robots-safe.scores + gnobots2.classic_robots-super-safe.scores + gnobots2.classic_robots.scores + gnobots2.nightmare-safe.scores + gnobots2.nightmare-super-safe.scores + gnobots2.nightmare.scores + gnobots2.robots2-safe.scores + gnobots2.robots2-super-safe.scores + gnobots2.robots2.scores + gnobots2.robots2_easy-safe.scores + gnobots2.robots2_easy-super-safe.scores + gnobots2.robots2_easy.scores + gnobots2.robots_with_safe_teleport-safe.scores + gnobots2.robots_with_safe_teleport-super-safe.scores + gnobots2.robots_with_safe_teleport.scores + gnomine.Custom.scores + gnomine.Large.scores + gnomine.Medium.scores + gnomine.Small.scores + gnotravex.2x2.scores + gnotravex.3x3.scores + gnotravex.4x4.scores + gnotravex.5x5.scores + gnotravex.6x6.scores + gnotski.1.scores + gnotski.10.scores + gnotski.11.scores + gnotski.12.scores + gnotski.13.scores + gnotski.14.scores + gnotski.15.scores + gnotski.16.scores + gnotski.17.scores + gnotski.18.scores + gnotski.19.scores + gnotski.2.scores + gnotski.20.scores + gnotski.21.scores + gnotski.22.scores + gnotski.23.scores + gnotski.24.scores + gnotski.25.scores + gnotski.26.scores + gnotski.27.scores + gnotski.28.scores + gnotski.29.scores + gnotski.3.scores + gnotski.30.scores + gnotski.31.scores + gnotski.32.scores + gnotski.33.scores + gnotski.34.scores + gnotski.35.scores + gnotski.36.scores + gnotski.37.scores + gnotski.4.scores + gnotski.5.scores + gnotski.6.scores + gnotski.7.scores + gnotski.8.scores + gnotski.9.scores + gtali.Colors.scores + gtali.Regular.scores + mahjongg.bridges.scores + mahjongg.cloud.scores + mahjongg.confounding.scores + mahjongg.difficult.scores + mahjongg.dragon.scores + mahjongg.easy.scores + mahjongg.pyramid.scores + mahjongg.tictactoe.scores + mahjongg.ziggurat.scores + swell-foop.Large.scores + swell-foop.Medium.scores + swell-foop.Small.scores + quadrapassel.scores) + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + + for score in "${_scores[@]}" ; do + if [ -e "var/games/$score" ]; then + continue + fi + + touch "var/games/$score" + chown root:games "var/games/$score" + chmod 664 "var/games/$score" + done +} + +pre_upgrade() { + (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games + return 0 +} + +post_upgrade() { + post_install +} + +post_remove() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -f -t usr/share/icons/hicolor + + for score in "${_scores[@]}" ; do + rm -f "var/games/$score" + done +} diff --git a/testing/gtkglext/PKGBUILD b/testing/gtkglext/PKGBUILD new file mode 100644 index 000000000..c5b2f7937 --- /dev/null +++ b/testing/gtkglext/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 168484 2012-10-12 16:59:46Z andyrtr $ +# Maintainer: +# Contributor: Ben <ben@benmazer.net> + +pkgname=gtkglext +pkgver=1.2.0 +pkgrel=8 +pkgdesc="opengl extensions for gtk2" +arch=('i686' 'x86_64') +url="http://gtkglext.sourceforge.net/" +license=('LGPL') +depends=('gtk2' 'glu' 'libxmu') +makedepends=('mesa') +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2" + 'gtk2.20.patch') +md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4' + 'e5a87ec3f2d0e616c6f32f90c3f7237f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/gtk2.20.patch" + sed '/AC_PATH_XTRA/d' -i configure.in + + autoreconf --force --install + ./configure --prefix=/usr \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gtkglext/gtk2.20.patch b/testing/gtkglext/gtk2.20.patch new file mode 100644 index 000000000..54b34c11e --- /dev/null +++ b/testing/gtkglext/gtk2.20.patch @@ -0,0 +1,77 @@ +diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c +--- gtkglext-1.2.0.orig/gtk/gtkglwidget.c 2004-02-20 11:38:36.000000000 +0200 ++++ gtkglext-1.2.0/gtk/gtkglwidget.c 2010-04-20 19:29:42.941917275 +0300 +@@ -127,7 +127,7 @@ + * Synchronize OpenGL and window resizing request streams. + */ + +- if (GTK_WIDGET_REALIZED (widget) && private->is_realized) ++ if (gtk_widget_get_realized (widget) && private->is_realized) + { + gldrawable = gdk_window_get_gl_drawable (widget->window); + gdk_gl_drawable_wait_gdk (gldrawable); +@@ -154,7 +154,7 @@ + * Remove OpenGL-capability from widget->window. + */ + +- if (GTK_WIDGET_REALIZED (widget)) ++ if (gtk_widget_get_realized (widget)) + gdk_window_unset_gl_capability (widget->window); + + private->is_realized = FALSE; +@@ -174,7 +174,7 @@ + */ + + toplevel = gtk_widget_get_toplevel (widget); +- if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel)) ++ if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel)) + { + GTK_GL_NOTE (MISC, + g_message (" - Install colormap to the top-level window.")); +@@ -194,7 +194,7 @@ + * Set a background of "None" on window to avoid AIX X server crash. + */ + +- if (GTK_WIDGET_REALIZED (widget)) ++ if (gtk_widget_get_realized (widget)) + { + GTK_GL_NOTE (MISC, + g_message (" - window->bg_pixmap = %p", +@@ -250,8 +250,8 @@ + GTK_GL_NOTE_FUNC (); + + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); +- g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE); +- g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE); ++ g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE); ++ g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE); + g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE); + + /* +@@ -432,7 +432,7 @@ + GTK_GL_NOTE_FUNC (); + + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); + + gldrawable = gdk_window_get_gl_drawable (widget->window); + if (gldrawable == NULL) +@@ -474,7 +474,7 @@ + GLWidgetPrivate *private; + + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); + + private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private); + if (private == NULL) +@@ -501,7 +501,7 @@ + gtk_widget_get_gl_window (GtkWidget *widget) + { + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); +- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); ++ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); + + return gdk_window_get_gl_window (widget->window); + } diff --git a/testing/gtkglextmm/PKGBUILD b/testing/gtkglextmm/PKGBUILD new file mode 100644 index 000000000..e3a098e14 --- /dev/null +++ b/testing/gtkglextmm/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 168486 2012-10-12 17:14:06Z andyrtr $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Bastien Bouclet <bastien.bouclet@gmail.com> +# Contributor: SpepS <dreamspepser at yahoo dot it> + +pkgname=gtkglextmm +pkgver=1.2.0 +pkgrel=9 +pkgdesc="Cpp C++ bindings for gtkglext" +arch=('i686' 'x86_64') +url="http://gtkglext.sourceforge.net/" +depends=('gtkmm' 'gtkglext') +makedepends=('mesa') +options=('!libtool') +license=('GPL') +source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2" + 'gdkspanfunc.patch') +md5sums=('27c05f4d45c5fd07b6fb0f044add3056' + 'd7c8ea33c748a6857ee629c16b2d9bff') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # FS#24706 + patch -Np1 -i "${srcdir}/gdkspanfunc.patch" + + # automake 1.8 fix + sed -i "s|\(AC_DEFUN(\)\(AC_.*_MULTIHEAD\)|\1[\2]|" m4macros/gtkglextmm.m4 + + ./configure --prefix=/usr \ + --disable-gtkglext-test \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gtkglextmm/gdkspanfunc.patch b/testing/gtkglextmm/gdkspanfunc.patch new file mode 100644 index 000000000..ae5672a8c --- /dev/null +++ b/testing/gtkglextmm/gdkspanfunc.patch @@ -0,0 +1,13 @@ +--- a/gtkglext/gtkmm/gl/widget.cc 2004-05-18 03:01:50.000000000 -0300 ++++ b/gtkglext/gtkmm/gl/widget.cc 2011-06-12 17:57:13.075541070 -0300 +@@ -17,9 +17,8 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-#include <gtk/gtkglwidget.h> +- + #include "widget.h" ++#include <gtk/gtkglwidget.h> + + namespace Gtk + { diff --git a/testing/libvisual-plugins/02_64-bit_JESS_fix.patch b/testing/libvisual-plugins/02_64-bit_JESS_fix.patch new file mode 100644 index 000000000..1d7f99e56 --- /dev/null +++ b/testing/libvisual-plugins/02_64-bit_JESS_fix.patch @@ -0,0 +1,58 @@ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c +--- libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c 2006-02-06 05:47:26.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c 2007-07-04 18:12:58.000000000 +1000 +@@ -282,7 +282,7 @@ + + void render_deformation(JessPrivate *priv, int defmode) + { +- uint32_t bmax; ++ intptr_t bmax; + uint32_t *tab1 = NULL, *tab2, *tab3, *tab4, i; + uint8_t *pix = priv->pixel, *buf = priv->buffer, *aux; + +@@ -294,7 +294,7 @@ + tab2 = priv->table2; + tab3 = priv->table3; + tab4 = priv->table4; +- bmax = priv->resx * priv->resy + (uint32_t) priv->pixel; ++ bmax = priv->resx * priv->resy + (intptr_t) priv->pixel; + + switch(defmode) + { +@@ -352,7 +352,7 @@ + } + for (i = 0; i < priv->resy * priv->resx; i++) + { +- aux = (uint8_t *) ((*(tab1) << 2 ) + (uint32_t) priv->buffer); ++ aux = (uint8_t *) ((*(tab1) << 2 ) + (intptr_t) priv->buffer); + *(pix++) = *(aux++) ; + *(pix++) = *(aux++); + *(pix++) = *(aux); +@@ -373,7 +373,8 @@ + /* j'ai mis pixel par defaut... */ + + uint8_t *pix = priv->pixel; +- uint32_t bmax,pitch_4; ++ intptr_t bmax; ++ uint32_t pitch_4; + + pix = priv->pixel; + if (priv->pixel == NULL) +@@ -387,7 +388,7 @@ + if (priv->video == 8) + { + if (visual_cpu_get_mmx ()) { +- bmax = priv->resx * (priv->resy-1) + (uint32_t) priv->pixel; ++ bmax = priv->resx * (priv->resy-1) + (intptr_t) priv->pixel; + #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64) + __asm __volatile + ("\n\t pxor %%mm6, %%mm6" +@@ -423,7 +424,7 @@ + else + { + pitch_4 = priv->pitch+4; +- bmax = priv->pitch*(priv->resy-1) + (uint32_t) priv->pixel; ++ bmax = priv->pitch*(priv->resy-1) + (intptr_t) priv->pixel; + + if (visual_cpu_get_mmx ()) { + #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64) diff --git a/testing/libvisual-plugins/03_build_against_gl_fixes.patch b/testing/libvisual-plugins/03_build_against_gl_fixes.patch new file mode 100644 index 000000000..b21558232 --- /dev/null +++ b/testing/libvisual-plugins/03_build_against_gl_fixes.patch @@ -0,0 +1,372 @@ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am 2006-02-23 20:03:24.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,13 +2,12 @@ + + actor_plugin_LTLIBRARIES = actor_bumpscope.la + +-LIBS += $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + actor_bumpscope_la_LDFLAGS = -module -avoid-version ++actor_bumpscope_la_LIBADD = $(LIBVISUAL_LIBS) + + actor_bumpscope_la_SOURCES = actor_bumpscope.c \ + actor_bumpscope.h \ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am 2006-02-23 20:03:24.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,13 +2,12 @@ + + actor_plugin_LTLIBRARIES = actor_corona.la + +-LIBS += $(LIBVISUAL_LIBS) +- + AM_CXXFLAGS = $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + actor_corona_la_LDFLAGS = -module -avoid-version ++actor_corona_la_LIBADD = $(LIBVISUAL_LIBS) + + actor_corona_la_SOURCES = actor_corona.cpp \ + autopal.h \ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am 2006-02-24 00:34:48.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,13 +2,12 @@ + + actor_plugin_LTLIBRARIES = actor_gdkpixbuf.la + +-LIBS += $(LIBVISUAL_LIBS) $(GTK_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GTK_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + actor_gdkpixbuf_la_LDFLAGS = -module -avoid-version ++actor_gdkpixbuf_la_LIBADD = $(LIBVISUAL_LIBS) $(GTK_LIBS) + + actor_gdkpixbuf_la_SOURCES = actor_gdkpixbuf.c + +diff -Nur libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am 2006-02-23 20:03:27.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,14 +2,13 @@ + + actor_plugin_LTLIBRARIES = actor_gstreamer.la + +-LIBS += $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GSTREAMER_CFLAGS) + + INCLUDES = $(all_includes) \ + -I$(top_srcdir) + + actor_gstreamer_la_LDFLAGS = -module -avoid-version ++actor_gstreamer_la_LIBADD = $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS) + + actor_gstreamer_la_SOURCES = actor_gstreamer.c + +diff -Nur libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am 2006-02-23 20:03:27.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,13 +2,12 @@ + + actor_plugin_LTLIBRARIES = actor_infinite.la + +-LIBS += $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + actor_infinite_la_LDFLAGS = -module -avoid-version ++actor_infinite_la_LIBADD = $(LIBVISUAL_LIBS) + + actor_infinite_la_SOURCES = compute.c compute.h \ + display.c display.h \ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am 2006-02-23 20:03:28.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,13 +2,12 @@ + + actor_plugin_LTLIBRARIES = actor_jakdaw.la + +-LIBS += $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + actor_jakdaw_la_LDFLAGS = -module -avoid-version ++actor_jakdaw_la_LIBADD = $(LIBVISUAL_LIBS) + + actor_jakdaw_la_SOURCES = actor_jakdaw.c \ + actor_jakdaw.h \ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am 2006-02-23 20:03:24.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,13 +2,12 @@ + + actor_plugin_LTLIBRARIES = actor_JESS.la + +-LIBS += $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + actor_JESS_la_LDFLAGS = -module -avoid-version ++actor_JESS_la_LIBADD = $(LIBVISUAL_LIBS) + + actor_JESS_la_SOURCES = analyser.c analyser.h analyser_struct.h\ + distorsion.c distorsion.h\ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am 2006-02-23 20:03:28.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,14 +2,13 @@ + + actor_plugin_LTLIBRARIES = actor_lv_analyzer.la + +-LIBS += $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) \ + -I$(top_srcdir) + + actor_lv_analyzer_la_LDFLAGS = -module -avoid-version ++actor_lv_analyzer_la_LIBADD = $(LIBVISUAL_LIBS) + + actor_lv_analyzer_la_SOURCES = actor_lv_analyzer.c + +diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am 2006-02-24 22:24:49.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -4,5 +4,5 @@ + + actor_lv_gltest_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS) + actor_lv_gltest_la_LDFLAGS = -module -avoid-version +-actor_lv_gltest_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU ++actor_lv_gltest_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU + actor_lv_gltest_la_SOURCES = actor_lv_gltest.c +diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am 2006-02-23 20:03:29.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,13 +2,12 @@ + + actor_plugin_LTLIBRARIES = actor_lv_scope.la + +-LIBS += $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + actor_lv_scope_la_LDFLAGS = -module -avoid-version ++actor_lv_scope_la_LIBADD = $(LIBVISUAL_LIBS) + + actor_lv_scope_la_SOURCES = actor_lv_scope.c + +diff -Nur libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am 2006-02-24 22:24:49.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -10,5 +10,5 @@ + + actor_madspin_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) -DSTAR_DIR=\""$(imagesdir)/"\" + actor_madspin_la_LDFLAGS = -module -avoid-version +-actor_madspin_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL ++actor_madspin_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL + actor_madspin_la_SOURCES = madspin.c +diff -Nur libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am 2006-02-24 22:24:50.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -4,5 +4,5 @@ + + actor_nastyfft_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS) + actor_nastyfft_la_LDFLAGS = -module -avoid-version +-actor_nastyfft_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU ++actor_nastyfft_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU + actor_nastyfft_la_SOURCES = actor_nastyfft.c +diff -Nur libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am 2006-02-23 20:03:31.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,13 +2,12 @@ + + actor_plugin_LTLIBRARIES = actor_oinksie.la + +-LIBS += $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + actor_oinksie_la_LDFLAGS = -module -avoid-version ++actor_oinksie_la_LIBADD = $(LIBVISUAL_LIBS) + + actor_oinksie_la_SOURCES = actor_oinksie.c\ + oinksie.c oinksie.h\ +diff -Nur libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am +--- libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am 2006-03-09 00:06:58.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -4,7 +4,7 @@ + + actor_flower_la_LDFLAGS = -module -avoid-version + actor_flower_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS) +-actor_flower_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU ++actor_flower_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU + + actor_flower_la_SOURCES = \ + actor_flower.c \ +diff -Nur libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am +--- libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am 2006-02-23 20:03:35.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,12 +2,11 @@ + + input_plugin_LTLIBRARIES = input_alsa.la + +-LIBS += $(ALSA_LIBS) $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(ALSA_CFLAGS) $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) + + input_alsa_la_LDFLAGS = -module -avoid-version ++input_alsa_la_LIBADD = $(ALSA_LIBS) $(LIBVISUAL_LIBS) + + input_alsa_la_SOURCES = input_alsa.c +diff -Nur libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am +--- libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am 2006-02-23 20:03:36.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,11 +2,10 @@ + + input_plugin_LTLIBRARIES = input_debug.la + +-LIBS += $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) + + input_debug_la_LDFLAGS = -module -avoid-version ++input_debug_la_LIBADD = $(LIBVISUAL_LIBS) + input_debug_la_SOURCES = input_debug.c +diff -Nur libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am +--- libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am 2006-02-23 20:03:37.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,11 +2,10 @@ + + input_plugin_LTLIBRARIES = input_esd.la + +-LIBS += $(LIBESD_LIBS) $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBESD_CFLAGS) $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + input_esd_la_LDFLAGS = -module -avoid-version ++input_esd_la_LIBADD = $(LIBESD_LIBS) $(LIBVISUAL_LIBS) + input_esd_la_SOURCES = input_esd.c +diff -Nur libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am +--- libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am 2006-02-23 20:03:37.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,13 +2,12 @@ + + input_plugin_LTLIBRARIES = input_jack.la + +-LIBS += $(LIBJACK_LIBS) $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBJACK_CFLAGS) $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + input_jack_la_LDFLAGS = -module -avoid-version ++input_jack_la_LIBADD = $(LIBJACK_LIBS) $(LIBVISUAL_LIBS) + + input_jack_la_SOURCES = input_jack.c + +diff -Nur libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am +--- libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am 2006-02-23 20:03:38.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,12 +2,11 @@ + + input_plugin_LTLIBRARIES = input_mplayer.la + +-LIBS += $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + input_mplayer_la_LDFLAGS = -module -avoid-version ++input_mplayer_la_LIBADD = $(LIBVISUAL_LIBS) + input_mplayer_la_SOURCES = input_mplayer.c + +diff -Nur libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am +--- libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am 2006-02-23 20:03:38.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,11 +2,10 @@ + + morph_plugin_LTLIBRARIES = morph_alphablend.la + +-LIBS += $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + morph_alphablend_la_LDFLAGS = -module -avoid-version ++morph_alphablend_la_LIBADD = $(LIBVISUAL_LIBS) + morph_alphablend_la_SOURCES = morph_alphablend.c +diff -Nur libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am +--- libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am 2006-02-23 20:03:39.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,11 +2,10 @@ + + morph_plugin_LTLIBRARIES = morph_flash.la + +-LIBS += $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + morph_flash_la_LDFLAGS = -module -avoid-version ++morph_flash_la_LIBADD = $(LIBVISUAL_LIBS) + morph_flash_la_SOURCES = morph_flash.c +diff -Nur libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am +--- libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am 2006-02-23 20:03:39.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,11 +2,10 @@ + + morph_plugin_LTLIBRARIES = morph_slide.la + +-LIBS += $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + morph_slide_la_LDFLAGS = -module -avoid-version ++morph_slide_la_LIBADD = $(LIBVISUAL_LIBS) + morph_slide_la_SOURCES = morph_slide.c +diff -Nur libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am +--- libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am 2006-02-23 20:03:39.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am 2007-07-04 18:19:43.000000000 +1000 +@@ -2,11 +2,10 @@ + + morph_plugin_LTLIBRARIES = morph_tentacle.la + +-LIBS += $(LIBVISUAL_LIBS) +- + AM_CFLAGS = $(LIBVISUAL_CFLAGS) + + INCLUDES = $(all_includes) -I$(top_srcdir) + + morph_tentacle_la_LDFLAGS = -module -avoid-version ++morph_tentacle_la_LIBADD = $(LIBVISUAL_LIBS) + morph_tentacle_la_SOURCES = morph_tentacle.c diff --git a/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch b/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch new file mode 100644 index 000000000..1fc5f7fc7 --- /dev/null +++ b/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch @@ -0,0 +1,12 @@ +diff -Nur libvisual-plugins-0.4.0/configure.ac libvisual-plugins-0.4.0.new/configure.ac +--- libvisual-plugins-0.4.0/configure.ac 2006-03-17 03:50:41.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/configure.ac 2007-07-04 18:22:38.000000000 +1000 +@@ -361,7 +361,7 @@ + [ENABLE_ANALYZER=$enableval], + [ENABLE_ANALYZER=yes]) + +-if test "$ENABLE_ANALYZER" = xyes; then ++if test "$ENABLE_ANALYZER" = "yes"; then + build_actor_plugins="$build_actor_plugins lv_analyzer" + fi + diff --git a/testing/libvisual-plugins/050_all_automagic.patch b/testing/libvisual-plugins/050_all_automagic.patch new file mode 100644 index 000000000..9c25fac72 --- /dev/null +++ b/testing/libvisual-plugins/050_all_automagic.patch @@ -0,0 +1,50 @@ +--- configure.ac.old 2007-02-24 23:09:08.000000000 +0100 ++++ configure.ac 2007-02-24 23:13:15.000000000 +0100 +@@ -89,7 +89,18 @@ + + dnl Libraries + ++dnl List of plugins to build ++build_input_plugins="" ++build_actor_plugins="" ++build_morph_plugins="" ++ + dnl EsounD ++AC_ARG_ENABLE([esd], AS_HELP_STRING([--disable-esd], ++ [Do not build esound input plugin @<:@default=enabled@:>@]), ++ [ENABLE_INPUT_ESD=$enableval], ++ [ENABLE_INPUT_ESD=yes]) ++ ++if test "$ENABLE_INPUT_ESD" = "yes"; then + PKG_CHECK_MODULES([LIBESD], [esound >= esound_required_version], + [HAVE_ESD="yes"], [HAVE_ESD="no"]) + +@@ -98,8 +109,15 @@ + else + AC_MSG_WARN([*** EsounD not found or too old. The EsounD input plugin won't be built]) + fi ++fi + + dnl JACK ++AC_ARG_ENABLE([jack], AS_HELP_STRING([--disable-jack], ++ [Do not build jack input plugin @<:@default=enabled@:>@]), ++ [ENABLE_INPUT_JACK=$enableval], ++ [ENABLE_INPUT_JACK=yes]) ++ ++if test "$ENABLE_INPUT_JACK" = "yes"; then + PKG_CHECK_MODULES([LIBJACK], [jack >= jack_required_version], [HAVE_JACK="yes"], [HAVE_JACK="no"]) + if test "$HAVE_JACK" = "yes"; then + build_input_plugins="$build_input_plugins jack" +@@ -107,11 +125,7 @@ + AC_MSG_WARN([*** libjack is too old. You can download a newer version at + http://jackit.sf.net/. The jackit input plugin won't be built]) + fi +- +-dnl List of plugins to build +-build_input_plugins="" +-build_actor_plugins="" +-build_morph_plugins="" ++fi + + dnl GdkPixbuf + AC_ARG_ENABLE([gdkpixbuf-plugin], diff --git a/testing/libvisual-plugins/05_fix_po.patch b/testing/libvisual-plugins/05_fix_po.patch new file mode 100644 index 000000000..a5413ef1b --- /dev/null +++ b/testing/libvisual-plugins/05_fix_po.patch @@ -0,0 +1,127 @@ +diff -Nur libvisual-plugins-0.4.0/po/Makefile.in.in libvisual-plugins-0.4.0.new/po/Makefile.in.in +--- libvisual-plugins-0.4.0/po/Makefile.in.in 2006-03-21 05:48:28.000000000 +1100 ++++ libvisual-plugins-0.4.0.new/po/Makefile.in.in 2007-07-09 21:50:13.000000000 +1000 +@@ -28,7 +28,7 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ ++MKINSTALLDIRS = mkinstalldirs + mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) + + GMSGFMT = @GMSGFMT@ +diff -Nur libvisual-plugins-0.4.0/po/mkinstalldirs libvisual-plugins-0.4.0.new/po/mkinstalldirs +--- libvisual-plugins-0.4.0/po/mkinstalldirs 1970-01-01 10:00:00.000000000 +1000 ++++ libvisual-plugins-0.4.0.new/po/mkinstalldirs 2006-03-21 05:48:42.000000000 +1100 +@@ -0,0 +1,111 @@ ++#! /bin/sh ++# mkinstalldirs --- make directory hierarchy ++# Author: Noah Friedman <friedman@prep.ai.mit.edu> ++# Created: 1993-05-16 ++# Public domain ++ ++errstatus=0 ++dirmode="" ++ ++usage="\ ++Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." ++ ++# process command line arguments ++while test $# -gt 0 ; do ++ case $1 in ++ -h | --help | --h*) # -h for help ++ echo "$usage" 1>&2 ++ exit 0 ++ ;; ++ -m) # -m PERM arg ++ shift ++ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } ++ dirmode=$1 ++ shift ++ ;; ++ --) # stop option processing ++ shift ++ break ++ ;; ++ -*) # unknown option ++ echo "$usage" 1>&2 ++ exit 1 ++ ;; ++ *) # first non-opt arg ++ break ++ ;; ++ esac ++done ++ ++for file ++do ++ if test -d "$file"; then ++ shift ++ else ++ break ++ fi ++done ++ ++case $# in ++ 0) exit 0 ;; ++esac ++ ++case $dirmode in ++ '') ++ if mkdir -p -- . 2>/dev/null; then ++ echo "mkdir -p -- $*" ++ exec mkdir -p -- "$@" ++ fi ++ ;; ++ *) ++ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then ++ echo "mkdir -m $dirmode -p -- $*" ++ exec mkdir -m "$dirmode" -p -- "$@" ++ fi ++ ;; ++esac ++ ++for file ++do ++ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ++ shift ++ ++ pathcomp= ++ for d ++ do ++ pathcomp="$pathcomp$d" ++ case $pathcomp in ++ -*) pathcomp=./$pathcomp ;; ++ esac ++ ++ if test ! -d "$pathcomp"; then ++ echo "mkdir $pathcomp" ++ ++ mkdir "$pathcomp" || lasterr=$? ++ ++ if test ! -d "$pathcomp"; then ++ errstatus=$lasterr ++ else ++ if test ! -z "$dirmode"; then ++ echo "chmod $dirmode $pathcomp" ++ lasterr="" ++ chmod "$dirmode" "$pathcomp" || lasterr=$? ++ ++ if test ! -z "$lasterr"; then ++ errstatus=$lasterr ++ fi ++ fi ++ fi ++ fi ++ ++ pathcomp="$pathcomp/" ++ done ++done ++ ++exit $errstatus ++ ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 2 ++# End: ++# mkinstalldirs ends here diff --git a/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch b/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch new file mode 100644 index 000000000..8e54e02cb --- /dev/null +++ b/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch @@ -0,0 +1,18 @@ +The static VisPluginInfo in nastyfft was declared as const, but libvisual write +to its refcount when it visual_object_unref()s it (nasty!). This is broken at +various levels: libvisual shouldn't be writing to this static plugin which is +allocated by a dlopen()ed plugin, and it should also honor the "const +VisPluginInfo" API... Anyway, nastyfft was the only occurrence and this fixes +the crash for now; LP: #287448. + +--- libvisual-plugins-0.4.0.dfsg.1.orig/plugins/actor/nastyfft/actor_nastyfft.c ++++ libvisual-plugins-0.4.0.dfsg.1/plugins/actor/nastyfft/actor_nastyfft.c +@@ -80,7 +80,7 @@ + .vidoptions.depth = VISUAL_VIDEO_DEPTH_GL + }}; + +- static const VisPluginInfo info[] = {{ ++ static VisPluginInfo info[] = {{ + .type = VISUAL_PLUGIN_TYPE_ACTOR, + + .plugname = N_("nastyfft"), diff --git a/testing/libvisual-plugins/PKGBUILD b/testing/libvisual-plugins/PKGBUILD new file mode 100644 index 000000000..df8684ed6 --- /dev/null +++ b/testing/libvisual-plugins/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 168488 2012-10-12 17:38:33Z andyrtr $ +# Maintainer: damir <damir@archlinux.org> + +pkgname=libvisual-plugins +pkgver=0.4.0 +pkgrel=7 +pkgdesc="plugins for libvisual" +arch=("i686" "x86_64") +license=('GPL') +url="http://www.localhost.nl/~synap/libvisual/" +depends=('libvisual' 'gtk2' 'glu' 'alsa-lib' 'jack') +makedepends=('mesa') +options=(!libtool) +source=(http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins-${pkgver}.tar.gz + 02_64-bit_JESS_fix.patch + 03_build_against_gl_fixes.patch + 04_lv_analyzer_build_fix.patch + 05_fix_po.patch + 050_all_automagic.patch + 60_no-const-vispluginfo-in-nastyfft.patch) +md5sums=('4330e9287f9d6fae02f482f428a1e77b' + 'f9cfb607bfcbfef60830fae4e7dc6963' + '116701408747dbb87dc134434478ebe2' + '01678a8f1584c76a44e59d81003a1109' + '6189b7427c4e11c8b8d6c6266d6a1629' + 'b50ae94c424a5f0af235deffa8451eb6' + '7012518727cb072a7e90a826a5577cc6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/02_64-bit_JESS_fix.patch" + patch -Np1 -i "${srcdir}/03_build_against_gl_fixes.patch" + patch -Np1 -i "${srcdir}/04_lv_analyzer_build_fix.patch" + patch -Np0 -i "${srcdir}/050_all_automagic.patch" + patch -Np1 -i "${srcdir}/60_no-const-vispluginfo-in-nastyfft.patch" + + autoreconf -fi + # Apply later as autoreconf overwrites po/Makefile.in.in + patch -Np1 -i "${srcdir}/05_fix_po.patch" + + ./configure --prefix=/usr \ + --disable-gstreamer-plugin \ + --disable-gforce \ + --disable-esd + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/octave/PKGBUILD b/testing/octave/PKGBUILD new file mode 100644 index 000000000..cc4149860 --- /dev/null +++ b/testing/octave/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 168503 2012-10-12 21:20:37Z andyrtr $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor : shining <shiningxc.at.gmail.com> +# Contributor : cyberdune <cyberdune@gmail.com> + +pkgname=octave +pkgver=3.6.2 +pkgrel=2 +pkgdesc="A high-level language, primarily intended for numerical computations." +arch=('i686' 'x86_64') +url="http://www.octave.org" +license=('GPL') +depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull' 'fltk' 'suitesparse') +makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'suitesparse' 'texlive-core') +optdepends=('texinfo: for help-support in octave' + 'gnuplot: alternative plotting') +source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2" + buildfix.diff + octave-gethelp.patch) +options=('!emptydirs') +install=octave.install +sha1sums=('145fef0122268086727a60e1c33e29d56fd546d7' + 'a7cdba1e05fbdd182facdd804aeec37729255551' + 'd39d54763ac86114029f8bc5d60763d2adce27bb') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # patch by Gentoo http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-gets.patch?view=log + patch -Np0 -i ${srcdir}/buildfix.diff + # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-help.patch?view=log + patch -Np0 -i ${srcdir}/octave-gethelp.patch + + autoreconf -vfi + + # http://www.nabble.com/Random-rounding-errors-td16010966.html + FFLAGS="-O -ffloat-store" \ + + ./configure --prefix=/usr --libexecdir=/usr/lib \ + --enable-shared --disable-static \ + --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html + + LANG=C make +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install + + # add octave library path to ld.so.conf.d + install -d ${pkgdir}/etc/ld.so.conf.d + echo "/usr/lib/${pkgname}/${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf +} diff --git a/testing/octave/buildfix.diff b/testing/octave/buildfix.diff new file mode 100644 index 000000000..8288b7bec --- /dev/null +++ b/testing/octave/buildfix.diff @@ -0,0 +1,85 @@ +--- libgnu/stdio.in.h.origs 2012-05-24 12:46:13.000000000 -0600 ++++ libgnu/stdio.in.h 2012-05-24 16:29:54.813734894 -0600 +@@ -1,12 +1,10 @@ +-/* -*- buffer-read-only: t -*- vi: set ro: */ +-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ + /* A GNU-like <stdio.h>. + + Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc. + + 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 3, or (at your option) ++ the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, +@@ -15,8 +13,7 @@ + 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ ++ along with this program; if not, see <http://www.gnu.org/licenses/>. */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +@@ -55,7 +52,8 @@ + #include <stddef.h> + + /* Get off_t and ssize_t. Needed on many systems, including glibc 2.8 +- and eglibc 2.11.2. */ ++ and eglibc 2.11.2. ++ May also define off_t to a 64-bit type on native Windows. */ + #include <sys/types.h> + + /* The __attribute__ feature is available in gcc versions 2.5 and later. +@@ -701,22 +699,11 @@ _GL_WARN_ON_USE (getline, "getline is un + # endif + #endif + +-#if @GNULIB_GETS@ +-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef gets +-# define gets rpl_gets +-# endif +-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); +-_GL_CXXALIAS_RPL (gets, char *, (char *s)); +-# else +-_GL_CXXALIAS_SYS (gets, char *, (char *s)); +-# undef gets +-# endif +-_GL_CXXALIASWARN (gets); + /* It is very rare that the developer ever has full control of stdin, +- so any use of gets warrants an unconditional warning. Assume it is +- always declared, since it is required by C89. */ ++ so any use of gets warrants an unconditional warning; besides, C11 ++ removed it. */ ++#undef gets ++#if HAVE_RAW_DECL_GETS + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + #endif + +@@ -781,7 +768,7 @@ _GL_CXXALIASWARN (pclose); + #elif defined GNULIB_POSIXCHECK + # undef pclose + # if HAVE_RAW_DECL_PCLOSE +-_GL_WARN_ON_USE (pclose, "popen is unportable - " ++_GL_WARN_ON_USE (pclose, "pclose is unportable - " + "use gnulib module pclose for more portability"); + # endif + #endif +@@ -1056,9 +1043,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is + # endif + #endif + +-/* Some people would argue that sprintf should be handled like gets +- (for example, OpenBSD issues a link warning for both functions), +- since both can cause security holes due to buffer overruns. ++/* Some people would argue that all sprintf uses should be warned about ++ (for example, OpenBSD issues a link warning for it), ++ since it can cause security holes due to buffer overruns. + However, we believe that sprintf can be used safely, and is more + efficient than snprintf in those safe cases; and as proof of our + belief, we use sprintf in several gnulib modules. So this header diff --git a/testing/octave/curlfix.patch b/testing/octave/curlfix.patch new file mode 100644 index 000000000..26f3d92f9 --- /dev/null +++ b/testing/octave/curlfix.patch @@ -0,0 +1,10 @@ +--- src/DLD-FUNCTIONS/urlwrite.cc.old 2011-07-02 16:39:22.466603778 +0200 ++++ src/DLD-FUNCTIONS/urlwrite.cc 2011-07-02 16:39:54.543269859 +0200 +@@ -52,7 +52,6 @@ + + #include <curl/curl.h> + #include <curl/curlver.h> +-#include <curl/types.h> + #include <curl/easy.h> + + static int diff --git a/testing/octave/imread.patch b/testing/octave/imread.patch new file mode 100644 index 000000000..4a7b73ea0 --- /dev/null +++ b/testing/octave/imread.patch @@ -0,0 +1,29 @@ +--- src/DLD-FUNCTIONS/__magick_read__.cc.orig 2010-03-06 08:05:25.000000000 +0000 ++++ src/DLD-FUNCTIONS/__magick_read__.cc 2009-08-25 09:26:01.000000000 +0100 +@@ -30,6 +30,7 @@ + #include "defun-dld.h" + #include "error.h" + #include "ov-struct.h" ++#include "oct-env.h" + + #ifdef HAVE_MAGICK + +@@ -359,6 +358,18 @@ + + #ifdef HAVE_MAGICK + ++ static bool initialized = false; ++ ++ if (! initialized) ++ { ++ std::string program_name = octave_env::get_program_invocation_name (); ++ ++ Magick::InitializeMagick (program_name.c_str ()); ++ ++ initialized = true; ++ } ++ ++ + if (args.length () > 2 || args.length () < 1 || ! args(0).is_string () + || nargout > 3) + { diff --git a/testing/octave/octave-3.4.0-gcc46.patch b/testing/octave/octave-3.4.0-gcc46.patch new file mode 100644 index 000000000..c174204ac --- /dev/null +++ b/testing/octave/octave-3.4.0-gcc46.patch @@ -0,0 +1,24 @@ +diff -up octave-3.4.0/liboctave/oct-alloc.h.gcc46 octave-3.4.0/liboctave/oct-alloc.h +--- octave-3.4.0/liboctave/oct-alloc.h.gcc46 2011-02-08 03:00:51.000000000 -0700 ++++ octave-3.4.0/liboctave/oct-alloc.h 2011-02-08 09:41:23.984081687 -0700 +@@ -23,6 +23,8 @@ along with Octave; see the file COPYING. + #if !defined (octave_oct_alloc_h) + #define octave_oct_alloc_h 1 + ++#include <cstddef> ++ + class + OCTAVE_API + octave_allocator +diff -up octave-3.4.0/src/pr-output.cc.gcc46 octave-3.4.0/src/pr-output.cc +--- octave-3.4.0/src/pr-output.cc.gcc46 2011-02-08 03:00:52.000000000 -0700 ++++ octave-3.4.0/src/pr-output.cc 2011-02-08 09:55:16.149662744 -0700 +@@ -3024,7 +3024,7 @@ abs (T x) + } + + #define INSTANTIATE_ABS(T) \ +- template /* static */ inline T abs (T) ++ template /* static */ T abs (T) + + INSTANTIATE_ABS(signed char); + INSTANTIATE_ABS(short); diff --git a/testing/octave/octave-gethelp.patch b/testing/octave/octave-gethelp.patch new file mode 100644 index 000000000..c0e693abc --- /dev/null +++ b/testing/octave/octave-gethelp.patch @@ -0,0 +1,13 @@ +Help parallel compilation +patch by Sebastien Fabbro +--- scripts/Makefile.am.orig 2011-06-09 22:27:22.688268651 +0100 ++++ scripts/Makefile.am 2011-02-08 10:00:51.000000000 +0000 +@@ -316,7 +316,7 @@ + + gethelp_SOURCES = gethelp.cc + +-.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile ++.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile gethelp + @$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT) + if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \ + cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \ diff --git a/testing/octave/octave.install b/testing/octave/octave.install new file mode 100644 index 000000000..8ee77c430 --- /dev/null +++ b/testing/octave/octave.install @@ -0,0 +1,18 @@ +info_dir=/usr/share/info +info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5) + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/testing/pam/PKGBUILD b/testing/pam/PKGBUILD index b01833990..8c82ad970 100644 --- a/testing/pam/PKGBUILD +++ b/testing/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160722 2012-06-04 15:56:13Z dreisner $ +# $Id: PKGBUILD 168471 2012-10-12 09:19:17Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=pam -pkgver=1.1.5 -pkgrel=4 +pkgver=1.1.6 +pkgrel=1 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64') license=('GPL2') @@ -14,28 +14,34 @@ makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl') backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/default/passwd etc/environment) source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2 #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 - ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2) + ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2 + pam_unix2-glibc216.patch + pam_namespace-build-1.1.6.patch) options=('!libtool' '!emptydirs') -md5sums=('927ee5585bdec5256c75117e9348aa47' - 'e2788389a6c59224110a45fcff30e02b') +md5sums=('7b73e58b7ce79ffa321d408de06db2c4' + 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555' + 'dac109f68e04a4df37575fda6001ea17' + '440a510164ba5eb69bf41e129746ff44') build() { cd $srcdir/Linux-PAM-$pkgver ./configure --libdir=/usr/lib + patch -Np0 -i ../pam_namespace-build-1.1.6.patch make - cd $srcdir/pam_unix2-2.6 + cd $srcdir/pam_unix2-2.9.1 + patch -Np1 -i ../pam_unix2-glibc216.patch ./configure --libdir=/usr/lib make } package() { cd $srcdir/Linux-PAM-$pkgver - make DESTDIR=$pkgdir install + make DESTDIR=$pkgdir SCONFIGDIR=/etc/security install # build pam_unix2 module # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2 - cd $srcdir/pam_unix2-2.6 + cd $srcdir/pam_unix2-2.9.1 make DESTDIR=$pkgdir install # add the realtime permissions for audio users diff --git a/testing/pam/pam_namespace-build-1.1.6.patch b/testing/pam/pam_namespace-build-1.1.6.patch new file mode 100644 index 000000000..aeabc234c --- /dev/null +++ b/testing/pam/pam_namespace-build-1.1.6.patch @@ -0,0 +1,11 @@ +--- modules/pam_namespace/Makefile~ 2012-10-12 10:59:13.557550706 +0200 ++++ modules/pam_namespace/Makefile 2012-10-12 10:59:13.564217270 +0200 +@@ -869,7 +869,7 @@ + + + install-data-local: +- mkdir -p $(namespaceddir) ++ mkdir -p $(DESTDIR)$(namespaceddir) + README: pam_namespace.8.xml namespace.conf.5.xml + -include $(top_srcdir)/Make.xml.rules + diff --git a/testing/pam/pam_unix2-glibc216.patch b/testing/pam/pam_unix2-glibc216.patch new file mode 100644 index 000000000..faa6a235f --- /dev/null +++ b/testing/pam/pam_unix2-glibc216.patch @@ -0,0 +1,20 @@ +Index: pam_unix2-2.9.1/src/read-files.c +=================================================================== +--- pam_unix2-2.9.1.orig/src/read-files.c ++++ pam_unix2-2.9.1/src/read-files.c +@@ -30,8 +30,14 @@ + #include <errno.h> + #include <fcntl.h> + #include <nss.h> +-#include <bits/libc-lock.h> ++#include <pthread.h> + #define __libc_lock_t pthread_mutex_t ++#define __libc_lock_define_initialized(CLASS,NAME) \ ++ CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER; ++#define __libc_lock_lock(NAME) \ ++ pthread_mutex_lock, (&(NAME)) ++#define __libc_lock_unlock(NAME) \ ++ pthread_mutex_unlock, (&(NAME)) + + #include "read-files.h" + diff --git a/testing/qtiplot/PKGBUILD b/testing/qtiplot/PKGBUILD new file mode 100644 index 000000000..d4779fcb7 --- /dev/null +++ b/testing/qtiplot/PKGBUILD @@ -0,0 +1,94 @@ +# $Id: PKGBUILD 168491 2012-10-12 17:58:46Z andyrtr $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: damir <damir.archlinux.org> +# Contributor: Gergely Imreh <imrehg@gmail.com> + +pkgname=qtiplot +pkgver=0.9.8.9 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://soft.proindependent.com/qtiplot.html" +pkgdesc="Data analysis and scientific plotting - free clone of Origin" +depends=('muparser' 'gsl' 'python2-pyqt' 'boost-libs' 'shared-mime-info' 'glu' 'liborigin2' 'qt-assistant-compat' 'tamu-anova') +# build against qwtplot3d provided in the package ... +# build against qwt provided in the package ... +# as systemwide one doesn't provide all needed functions +makedepends=('pkg-config' 'boost' 'mesa') +license=('GPL2') +install=${pkgname}.install +source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2 + $pkgname.desktop + $pkgname.png + build.conf.archlinux + qwtplot3d_gcc.patch + qtiplot.xml + qtiplot-0.9.8.6-gold.patch + qtiplot-0.9.8.6-kde.patch + qtiplot-0.9.8.6-tamuanova.patch + qwtplot3d-qt-4.8.0.patch + qwtplot3d-libpng15.patch) +sha1sums=('73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30' + '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8' + '4301cb2a36024a10108b689990d28c4fe5c7416e' + '326ee6bc623a637d058ab7ee9f65fede40a23a09' + '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909' + '285f57d865956d93250ec548288c5bface096b6b' + 'b534a609f317cf3117d6495909854cdacea20124' + 'a1d4bec744c9b8fe29bf177851e66c97cdd9d975' + '830b518e3ef63625df84363a8047417124f243b0' + '3d4c471dda29a04d432f8e0a4c5b977068cdae72' + '4a45ee21f028f34da75d83c0d3e1d08c5f928892') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # gentoo fixes + patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-gold.patch" + patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-kde.patch" +# patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-tamuanova.patch" + + # build also static qwtplot3d lib + echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro + + # install build configuration file + install -Dm644 "${srcdir}/build.conf.archlinux" build.conf + + # Make qwt + sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp + patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch" + cd ./3rdparty/qwt + qmake + make + + # Make qwtplot3d + cd ../qwtplot3d + patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch" + patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch" + qmake + make + + # Make qtiplot + cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" + + # fix stuff + sed -i 's|/usr/local/|/usr/share/|' qtiplot.pro + sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' src/core/ApplicationWindow.cpp + sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp + + qmake qtiplot.pro QMAKESPEC=linux-g++ + make QTDIR=/usr/ QMAKESPEC=linux-g++ +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" + + INSTALL_ROOT="${pkgdir}" make install + + # make it nice: + install -D -m644 "${srcdir}/${pkgname}.png" \ + "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + install -D -m644 "${srcdir}/${pkgname}.desktop" \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -D -m644 "${srcdir}/${pkgname}.xml" \ + "${pkgdir}/usr/share/mime/packages/${pkgname}.xml" +} diff --git a/testing/qtiplot/build.conf.archlinux b/testing/qtiplot/build.conf.archlinux new file mode 100644 index 000000000..7ccded7fa --- /dev/null +++ b/testing/qtiplot/build.conf.archlinux @@ -0,0 +1,32 @@ +isEmpty( QTI_ROOT ) { + message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" ) +} + +SYS_INCLUDEPATH = /usr/include +SYS_LIBS = -L/usr/lib -lGLU + +MUPARSER_LIBS = -lmuparser +GSL_LIBS = -lgsl -lgslcblas +BOOST_INCLUDEPATH = /usr/include/boost +BOOST_LIBS = -lboost_date_time -lboost_thread +QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src +QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a +QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include +QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a +LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2 +LIB_ORIGIN_LIBS = -lorigin2 +QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine +TAMUANOVA_LIBS = -ltamuanova +TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova +LIBPNG_LIBS = -lpng + +PYTHON = python2 +LUPDATE = lupdate +LRELEASE = lrelease + +SCRIPTING_LANGS += muParser +SCRIPTING_LANGS += Python + +CONFIG += CustomInstall +DEFINES += SCRIPTING_CONSOLE + diff --git a/testing/qtiplot/qtiplot-0.9.8.6-gold.patch b/testing/qtiplot/qtiplot-0.9.8.6-gold.patch new file mode 100644 index 000000000..3b6757533 --- /dev/null +++ b/testing/qtiplot/qtiplot-0.9.8.6-gold.patch @@ -0,0 +1,15 @@ + qtiplot/qtiplot.pro | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro +index 99e0e36..b7cf373 100755 +--- a/qtiplot/qtiplot.pro ++++ b/qtiplot/qtiplot.pro +@@ -20,6 +20,7 @@ LIBS += $$MUPARSER_LIBS + LIBS += $$QWT_LIBS + LIBS += $$QWT3D_LIBS + LIBS += $$GSL_LIBS ++LIBS += -lz + + ############################################################################# + ###################### BASIC PROJECT PROPERTIES ############################# diff --git a/testing/qtiplot/qtiplot-0.9.8.6-kde.patch b/testing/qtiplot/qtiplot-0.9.8.6-kde.patch new file mode 100644 index 000000000..919ec6cc2 --- /dev/null +++ b/testing/qtiplot/qtiplot-0.9.8.6-kde.patch @@ -0,0 +1,15 @@ + qtiplot/src/plot2D/Graph.cpp | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp +index 626172a..d4eab1b 100755 +--- a/qtiplot/src/plot2D/Graph.cpp ++++ b/qtiplot/src/plot2D/Graph.cpp +@@ -73,6 +73,7 @@ + #include <PatternBox.h> + #include <SymbolBox.h> + ++#include <QPaintEngine> + #include <QApplication> + #include <QBitmap> + #include <QClipboard> diff --git a/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch b/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch new file mode 100644 index 000000000..1644266d1 --- /dev/null +++ b/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch @@ -0,0 +1,26 @@ +diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro +index 95a5f0c..72e99ab 100755 +--- a/qtiplot/qtiplot.pro ++++ b/qtiplot/qtiplot.pro +@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) { + !isEmpty(TAMUANOVA_LIBS) { + DEFINES += HAVE_TAMUANOVA + INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH +- #LIBS += $$TAMUANOVA_LIBS +- +- HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h +- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c +- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c ++ LIBS += $$TAMUANOVA_LIBS + } + + ############################################################### + + # At the very end: add global include- and lib path +-#unix:INCLUDEPATH += $$SYS_INCLUDEPATH +-#unix:LIBS += $$SYS_LIBS ++unix:INCLUDEPATH += $$SYS_INCLUDEPATH ++unix:LIBS += $$SYS_LIBS + + ############################################################### + ############### Building QtiPlot as a browser plugin ########## diff --git a/testing/qtiplot/qtiplot.desktop b/testing/qtiplot/qtiplot.desktop new file mode 100644 index 000000000..ab64b3852 --- /dev/null +++ b/testing/qtiplot/qtiplot.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Exec=qtiplot +Comment=An application for plotting and analysis of data sets and functions +Comment[de]=Ein Programm zum Plotten und analysieren von Daten und Funktionen +Terminal=false +Name=QtiPlot +Protocols=file +Icon=/usr/share/pixmaps/qtiplot.png +# Categories=QT;KDE;Science;Utility;X-KDE-More +# Categories=Qt;KDE;Math;Education +Categories=Science;X-Plotting; diff --git a/testing/qtiplot/qtiplot.install b/testing/qtiplot/qtiplot.install new file mode 100644 index 000000000..66631520d --- /dev/null +++ b/testing/qtiplot/qtiplot.install @@ -0,0 +1,12 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove () { + post_install +} + diff --git a/testing/qtiplot/qtiplot.png b/testing/qtiplot/qtiplot.png Binary files differnew file mode 100644 index 000000000..5b4b87b21 --- /dev/null +++ b/testing/qtiplot/qtiplot.png diff --git a/testing/qtiplot/qtiplot.xml b/testing/qtiplot/qtiplot.xml new file mode 100644 index 000000000..7ad4c4aa0 --- /dev/null +++ b/testing/qtiplot/qtiplot.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> + <mime-type type="application/x-qtiplot-project"> + <sub-class-of type="text/plain"/> + <comment>QtiPlot project file</comment> + <glob pattern="*.qti" /> + </mime-type> + <mime-type type="application/x-qtiplot-project-compressed"> + <comment>Compressed QtiPlot project file</comment> + <glob pattern="*.qti.gz" /> + </mime-type> + <mime-type type="application/x-qtiplot-project-backup"> + <sub-class-of type="text/plain"/> + <comment>QtiPlot project file backup</comment> + <glob pattern="*.qti~" /> + </mime-type> +</mime-info> diff --git a/testing/qtiplot/qwtplot3d-libpng15.patch b/testing/qtiplot/qwtplot3d-libpng15.patch new file mode 100644 index 000000000..828f0c6d8 --- /dev/null +++ b/testing/qtiplot/qwtplot3d-libpng15.patch @@ -0,0 +1,10 @@ +--- 3rdparty/gl2ps/gl2ps.c.orig 2012-01-29 18:15:34.000000000 -0500 ++++ 3rdparty/gl2ps/gl2ps.c 2012-01-29 18:16:08.000000000 -0500 +@@ -47,6 +47,7 @@ + #endif + + #if defined(GL2PS_HAVE_LIBPNG) ++#include <zlib.h> + #include <png.h> + #endif + diff --git a/testing/qtiplot/qwtplot3d-qt-4.8.0.patch b/testing/qtiplot/qwtplot3d-qt-4.8.0.patch new file mode 100644 index 000000000..9d30f6b7b --- /dev/null +++ b/testing/qtiplot/qwtplot3d-qt-4.8.0.patch @@ -0,0 +1,34 @@ +diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h +--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h 2012-01-29 17:42:01.000000000 -0500 ++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h 2012-01-29 17:58:30.000000000 -0500 +@@ -2,12 +2,7 @@ + #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code + + #include <time.h> +- +-#if QT_VERSION < 0x040000 +-#include <qgl.h> +-#else +-#include <QtOpenGL/qgl.h> +-#endif ++#include <QtOpenGL> + + #include "qwt3d_types.h" + #include "qwt3d_io.h" +diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h +--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-01-29 17:42:01.000000000 -0500 ++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-01-29 17:57:21.000000000 -0500 +@@ -2,11 +2,8 @@ + #define __openglhelper_2003_06_06_15_49__ + + #include "qglobal.h" +-#if QT_VERSION < 0x040000 +-#include <qgl.h> +-#else +-#include <QtOpenGL/qgl.h> +-#endif ++#include <QtOpenGL> ++#include <GL/glu.h> + + namespace Qwt3D + { diff --git a/testing/qtiplot/qwtplot3d_gcc.patch b/testing/qtiplot/qwtplot3d_gcc.patch new file mode 100644 index 000000000..06aeb50f5 --- /dev/null +++ b/testing/qtiplot/qwtplot3d_gcc.patch @@ -0,0 +1,9 @@ +--- a/3rdparty/qwtplot3d/src/qwt3d_function.cpp 2009-07-25 20:03:28.000000000 -0700 ++++ b/3rdparty/qwtplot3d/src/qwt3d_function.cpp 2009-07-25 20:03:28.000000000 -0700 +@@ -1,5 +1,6 @@ + #include "qwt3d_surfaceplot.h" + #include "qwt3d_function.h" ++#include <cstdio> + + using namespace Qwt3D; + diff --git a/testing/qtiplot/sip.patch b/testing/qtiplot/sip.patch new file mode 100644 index 000000000..146f4c277 --- /dev/null +++ b/testing/qtiplot/sip.patch @@ -0,0 +1,13 @@ +--- qtiplot/src/scripting/scripting.pri.bak 2009-09-09 07:18:51.000000000 +0800 ++++ qtiplot/src/scripting/scripting.pri 2009-11-08 12:45:03.000000000 +0800 +@@ -80,7 +80,9 @@ + $${SIP_DIR}/sipqtiPythonScript.cpp\
+ $${SIP_DIR}/sipqtiPythonScripting.cpp\
+ $${SIP_DIR}/sipqtiFolder.cpp\
+- $${SIP_DIR}/sipqtiQList.cpp\
++ $${SIP_DIR}/sipqtiQList0101Folder.cpp \
++ $${SIP_DIR}/sipqtiQList0101Graph.cpp \
++ $${SIP_DIR}/sipqtiQList0101MdiSubWindow.cpp \
+ $${SIP_DIR}/sipqtiFit.cpp \
+ $${SIP_DIR}/sipqtiExponentialFit.cpp \
+ $${SIP_DIR}/sipqtiTwoExpFit.cpp \
diff --git a/testing/ruby/PKGBUILD b/testing/ruby/PKGBUILD new file mode 100644 index 000000000..0732107ea --- /dev/null +++ b/testing/ruby/PKGBUILD @@ -0,0 +1,69 @@ +# Maintainer: Thomas Dziedzic <gostrc@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> +# Contributor: Jeramy Rutley <jrutley@gmail.com> + +pkgname=('ruby' 'ruby-docs') +pkgver=1.9.3_p286 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.ruby-lang.org/en/' +license=('BSD' 'custom') +makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') +options=('!emptydirs' '!makeflags') +source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" + 'gemrc') +md5sums=('2278eff4cfed3cbc0653bc73085caa34' + '6fb8e7a09955e0f64be3158fb4a27e7a') + +build() { + cd ruby-${pkgver//_/-} + + PKG_CONFIG=/usr/bin/pkg-config ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-shared \ + --enable-pthread \ + --disable-rpath + + make +} + +check() { + cd ruby-${pkgver//_/-} + + make test +} + +package_ruby() { + pkgdesc='An object-oriented language for quick and easy programming' + depends=('openssl' 'libffi' 'libyaml') + optdepends=('tk: for Ruby/TK' + 'ruby-docs: Ruby documentation') + provides=('rubygems' 'rake') + conflicts=('rake') + backup=('etc/gemrc') + install='ruby.install' + + cd ruby-${pkgver//_/-} + + make DESTDIR="${pkgdir}" install-nodoc + + install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc" + + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL" +} + +package_ruby-docs() { + pkgdesc='Documentation files for ruby' + + cd ruby-${pkgver//_/-} + + make DESTDIR="${pkgdir}" install-doc install-capi + + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL" +} +md5sums=('e76848a86606a4fd5dcf14fc4b4e755e' + '6fb8e7a09955e0f64be3158fb4a27e7a') diff --git a/testing/ruby/gemrc b/testing/ruby/gemrc new file mode 100644 index 000000000..3d11de1ec --- /dev/null +++ b/testing/ruby/gemrc @@ -0,0 +1,5 @@ +# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11 + +# --user-install is used to install to $HOME/.gem/ by default since we want to separate +# pacman installed gems and gem installed gems +gem: --user-install diff --git a/testing/ruby/ruby.install b/testing/ruby/ruby.install new file mode 100644 index 000000000..ce78e96ec --- /dev/null +++ b/testing/ruby/ruby.install @@ -0,0 +1,22 @@ +#!/bin/sh + +print_gem_default_target() { + echo 'The default location of gem installs is $HOME/.gem/ruby' + echo 'Add the following line to your PATH if you plan to install using gem' + echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin' + echo 'If you want to install to the system wide location, you must either:' + echo 'edit /etc/gemrc or run gem with the --no-user-install flag.' +} + +# arg 1: the new package version +post_install() { + print_gem_default_target +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then + print_gem_default_target + fi +} diff --git a/testing/stellarium/PKGBUILD b/testing/stellarium/PKGBUILD new file mode 100644 index 000000000..05a16e1e5 --- /dev/null +++ b/testing/stellarium/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 168495 2012-10-12 19:14:51Z andyrtr $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> + +pkgname=stellarium +pkgver=0.11.4 +pkgrel=2 +pkgdesc="A stellarium with great graphics and a nice database of sky-objects" +arch=("i686" "x86_64") +url="http://stellarium.free.fr/" +license=('GPL2') +depends=('libpng' 'glu' 'libgl' 'freetype2' 'qt' 'openssl') +makedepends=('cmake' 'boost' 'mesa') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + stellarium.desktop + stellarium.png) +sha1sums=('5b8bfd71b4c3eabbc1db64b71221eeebe6785dbf' + 'c9cc79212542238227b5bd6af99f60fe056f4ab2' + 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + + # install desktop file & pixmap + install -Dm644 ${srcdir}/stellarium.desktop \ + ${pkgdir}/usr/share/applications/stellarium.desktop + install -Dm644 ${srcdir}/stellarium.png \ + ${pkgdir}/usr/share/pixmaps/stellarium.png +} diff --git a/testing/stellarium/libpng14.patch b/testing/stellarium/libpng14.patch new file mode 100644 index 000000000..7ed1da689 --- /dev/null +++ b/testing/stellarium/libpng14.patch @@ -0,0 +1,21 @@ +diff -Naur stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp stellarium-0.10.2/src/core/StelTextureMgr.cpp +--- stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp 2010-01-21 17:04:57.000000000 -0500 ++++ stellarium-0.10.2/src/core/StelTextureMgr.cpp 2010-01-21 17:06:55.000000000 -0500 +@@ -513,7 +513,7 @@ + fread (magic, 1, sizeof (magic), fp); + + /* check for valid magic number */ +- if (!png_check_sig (magic, sizeof (magic))) ++ if (png_sig_cmp (magic, 0, sizeof (magic))) + { + qWarning() << "error: \"" << filename << "\" is not a valid PNG image!"; + fclose (fp); +@@ -576,7 +576,7 @@ + /* convert 1-2-4 bits grayscale images to 8 bits + grayscale. */ + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) +- png_set_gray_1_2_4_to_8 (png_ptr); ++ png_set_expand_gray_1_2_4_to_8 (png_ptr); + + if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha (png_ptr); diff --git a/testing/stellarium/stellarium.desktop b/testing/stellarium/stellarium.desktop new file mode 100644 index 000000000..1b82b18bd --- /dev/null +++ b/testing/stellarium/stellarium.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Stellarium nightsky renderer +GenericName=Nightsky renderer +Comment=A real-time nightsky renderer +Categories=Education;Science;Astronomy; +Icon=stellarium +Exec=stellarium +Terminal=false +Type=Application diff --git a/testing/stellarium/stellarium.png b/testing/stellarium/stellarium.png Binary files differnew file mode 100644 index 000000000..08bce127c --- /dev/null +++ b/testing/stellarium/stellarium.png diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index f895939ef..f6660eec5 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=194 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -135,8 +135,9 @@ package_systemd() { package_systemd-sysvcompat() { pkgdesc="sysvinit compat for systemd" + groups=('base') conflicts=('sysvinit') - depends=('sysvinit-tools') + depends=('sysvinit-tools' 'systemd') mv "$srcdir/_sysvcompat"/* "$pkgdir" diff --git a/testing/sysvinit/PKGBUILD b/testing/sysvinit/PKGBUILD index b7499bd73..9772bf6a5 100644 --- a/testing/sysvinit/PKGBUILD +++ b/testing/sysvinit/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 166146 2012-09-04 17:22:19Z tomegun $ +# $Id: PKGBUILD 168493 2012-10-12 19:09:19Z thomas $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgbase=sysvinit pkgname=('sysvinit-tools' 'sysvinit') pkgver=2.88 -pkgrel=8 +pkgrel=9 arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/sysvinit" license=('GPL') -groups=('base') depends=('util-linux' 'coreutils' 'glibc' 'awk') source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgbase}-${pkgver}dsf.tar.bz2 "0001-simplify-writelog.patch" |
