diff options
58 files changed, 1783 insertions, 151 deletions
diff --git a/community-staging/vdrift/PKGBUILD b/community-staging/vdrift/PKGBUILD new file mode 100644 index 000000000..dd662a775 --- /dev/null +++ b/community-staging/vdrift/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 61757 2012-01-07 12:47:59Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Anton Bazhenov <anton.bazhenov at gmail> +# Contributor: Lone_Wolf lonewolf@xs4all.nl + +pkgname=vdrift +pkgver=2011.10.22 +pkgrel=2 +pkgdesc="An open source driving simulation made with drift racing in mind" +arch=('i686' 'x86_64') +url="http://vdrift.net/" +license=('GPL') +depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data') +makedepends=('scons' 'boost' 'asio') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2) +md5sums=('6f8806ab1be303e9e1e47522c9eee890') +install=vdrift.install + +build() { + cd "$srcdir"/$pkgname-${pkgver//./-} + + # select arch + if [ `uname -m` = "x86_64" ]; then + _sconsarch="a64" + else + _sconsarch="686" + fi + + #sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp + #sed -i '/types.h/d' src/http.h + + # build and install + scons $MAKEFLAGS \ + "destdir"="$pkgdir" \ + "arch"=$_sconsarch \ + "release"=1 \ + "force_feedback"=1 \ + "prefix"=/usr \ + "datadir"=share/$pkgname/ \ + "extbullet"=1 +} + +package() { + cd "$srcdir"/$pkgname-${pkgver//./-} + + scons install + + # install .desktop file + install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop + + # install icons + install -Dm644 data/textures/icons/vdrift-16x16.png \ + "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png + install -Dm644 data/textures/icons/vdrift-32x32.png \ + "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png + install -Dm644 data/textures/icons/vdrift-64x64.png \ + "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png + + rm -r $pkgdir/usr/share/vdrift +} +# vim: sw=2:ts=2 et: diff --git a/community-staging/vdrift/vdrift.desktop b/community-staging/vdrift/vdrift.desktop new file mode 100644 index 000000000..7078f0d9c --- /dev/null +++ b/community-staging/vdrift/vdrift.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Name=VDrift +Version=2009-06-15 +GenericName=Racing Simulation +Comment=An open source driving simulation made with drift racing in mind +Exec=vdrift +Icon=vdrift.png +Terminal=false +Categories=Game;Simulation; diff --git a/community-staging/vdrift/vdrift.install b/community-staging/vdrift/vdrift.install new file mode 100644 index 000000000..868f6717b --- /dev/null +++ b/community-staging/vdrift/vdrift.install @@ -0,0 +1,11 @@ +post_upgrade() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community-testing/gogglesmm/PKGBUILD b/community-testing/gogglesmm/PKGBUILD new file mode 100644 index 000000000..c73bd1ae6 --- /dev/null +++ b/community-testing/gogglesmm/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 61727 2012-01-07 05:10:55Z ebelanger $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sander Jansen <sander@knology.net> + +pkgname=gogglesmm +pkgver=0.12.5 +pkgrel=2 +pkgdesc="Music Manager and Player" +arch=('i686' 'x86_64') +url="http://code.google.com/p/gogglesmm/" +license=('GPL3') +install=gogglesmm.install +depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite3>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt') +makedepends=('pkgconfig' 'glproto' 'dri2proto') +replaces=('musicmanager') +conflicts=('musicmanager') +source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2) +md5sums=('07e92bcf2daf39d6b380590816edd013') + +build() { + cd $srcdir/gogglesmm-$pkgver + patch configure <<EOF +diff gogglesmm-0.12.5/configure gogglesmm-0.12.5.my/configure +206,207c206,207 +< XINE_MINOR=\${XINE_MINOR:-1} +< XINE_LEVEL=\${XINE_LEVEL:-16} +--- +> XINE_MINOR=\${XINE_MINOR:-2} +> XINE_LEVEL=\${XINE_LEVEL:-0} +EOF + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/gogglesmm-$pkgver + mkdir -p $pkgdir/usr/bin + make DESTDIR=$pkgdir install +} diff --git a/community-testing/gogglesmm/gogglesmm.install b/community-testing/gogglesmm/gogglesmm.install new file mode 100644 index 000000000..04c026840 --- /dev/null +++ b/community-testing/gogglesmm/gogglesmm.install @@ -0,0 +1,11 @@ +post_install() { + which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/me-tv/PKGBUILD b/community-testing/me-tv/PKGBUILD new file mode 100644 index 000000000..4a97fb410 --- /dev/null +++ b/community-testing/me-tv/PKGBUILD @@ -0,0 +1,42 @@ +#Maintainer: jakob gruber <jakob.gruber@gmail.com> +#Contributor: gborzi +#Previous Contributor: Vinzenz Vietzke <vinz@archlinux.us> +#Previous Contributor: Heiko Baums <heiko@baums-on-web.de> +#Previous Contributor: Jeff Bailes <thepizzaking@gmail.com> + +pkgname=me-tv +pkgver=2.0.1 +pkgrel=3 +pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard" +arch=('i686' 'x86_64') +url="https://launchpad.net/me-tv" +license=('GPL') +depends=('glibmm' 'gtkmm' 'gconfmm' 'glib2' 'xine-lib' 'sqlite3' 'linuxtv-dvb-apps' 'libunique' 'libxml++' 'vlc' 'gstreamer0.10-base') +makedepends=('intltool') +install='me-tv.install' +source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") +options=('!emptydirs') +md5sums=('7cda820b795f2fea522ba3de5e312483') + +build() { + + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure CXXFLAGS="$CXXFLAGS -D__KERNEL_STRICT_NAMES" --prefix=/usr + make + +} + +package() { + + cd "${srcdir}/${pkgname}-${pkgver}" + + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \ + --domain me-tv "${pkgdir}/usr/etc/gconf/schemas/${pkgname}.schemas" + + rm -rf "${pkgdir}/usr/etc/" + +} diff --git a/community-testing/me-tv/me-tv.install b/community-testing/me-tv/me-tv.install new file mode 100644 index 000000000..f701b4754 --- /dev/null +++ b/community-testing/me-tv/me-tv.install @@ -0,0 +1,17 @@ +pkgname=me-tv + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} diff --git a/community-testing/openscenegraph/PKGBUILD b/community-testing/openscenegraph/PKGBUILD new file mode 100644 index 000000000..d81e08908 --- /dev/null +++ b/community-testing/openscenegraph/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 61731 2012-01-07 05:11:14Z ebelanger $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Hans Janssen <janserv@gmail.com> +# Contributor: my64 <packages@obordes.com> +# Contributor: Colin Pitrat <colin.pitrat@gmail.com> + +pkgname=openscenegraph +pkgver=3.0.1 +pkgrel=3 +pkgdesc="An Open Source, high performance real-time graphics toolkit" +arch=('i686' 'x86_64') +license=('custom:OSGPL') +url="http://www.openscenegraph.org" +depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth') +makedepends=('cmake' 'libvncserver') +optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib') +conflicts=('openthreads') +provides=('openthreads') +source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip + osg-xine-1.2.patch) +#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip") +md5sums=('c43a25d023e635c3566b2083d8e6d956' + 'b05a486fdc2aaf06b29efb5e0714672e') + +build() { + cd OpenSceneGraph-$pkgver + [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp + patch -p1 <$srcdir/osg-xine-1.2.patch + make +} + +package() { + cd OpenSceneGraph-$pkgver + make DESTDIR="$pkgdir" install + install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true +} diff --git a/community-testing/openscenegraph/osg-xine-1.2.patch b/community-testing/openscenegraph/osg-xine-1.2.patch new file mode 100644 index 000000000..c73b588dc --- /dev/null +++ b/community-testing/openscenegraph/osg-xine-1.2.patch @@ -0,0 +1,14 @@ +diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c +--- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20 14:46:20.000000000 +0300 ++++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c 2012-01-05 02:15:38.000000000 +0400 +@@ -2769,8 +2769,8 @@ + clear(rgb_class, sizeof(rgbout_class_t)); + + rgb_class->driver_class.open_plugin = open_plugin; +- rgb_class->driver_class.get_identifier = get_identifier; +- rgb_class->driver_class.get_description = get_description; ++ rgb_class->driver_class.identifier = get_identifier(NULL); ++ rgb_class->driver_class.description = get_description(NULL); + rgb_class->driver_class.dispose = dispose_class; + + return(rgb_class); diff --git a/community-testing/vdrift/PKGBUILD b/community-testing/vdrift/PKGBUILD index ee0fb7ffc..297df9eb7 100644 --- a/community-testing/vdrift/PKGBUILD +++ b/community-testing/vdrift/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61624 2012-01-04 22:46:02Z ebelanger $ +# $Id: PKGBUILD 61760 2012-01-07 13:17:55Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift pkgver=2011.10.22 -pkgrel=2 +pkgrel=3 pkgdesc="An open source driving simulation made with drift racing in mind" arch=('i686' 'x86_64') url="http://vdrift.net/" diff --git a/community-testing/xfmedia/PKGBUILD b/community-testing/xfmedia/PKGBUILD new file mode 100644 index 000000000..f2b4b3b97 --- /dev/null +++ b/community-testing/xfmedia/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 61733 2012-01-07 05:11:32Z ebelanger $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer : Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer : Tom Killian <tomk@runbox.com> +# Contributor: Spider.007 <archPackage@spider007.net> + +pkgname=xfmedia +pkgver=0.9.2 +pkgrel=10 +pkgdesc="xfce media player" +arch=('i686' 'x86_64') +license=('GPL') +url="http://spuriousinterrupt.org/projects/xfmedia/" +depends=('xine-lib' 'taglib' 'exo' 'libxtst' 'libxss' 'libxfcegui4' 'dbus-glib') +makedepends=('intltool' 'libxt') +install=xfmedia.install +source=(http://spuriousinterrupt.org/files/$pkgname/$pkgname-$pkgver.tar.bz2 + xfmedia-dbus-0.6-support.patch + xfmedia-empty-prev-next-fix.patch + xfmedia-exo-0.6.patch + xfmedia-xine-1.2.0.patch) +md5sums=('6eb8bd1f67201f829e0f45e733c02bd5' + '8f2aa12eea584de65d8ed28179e56b51' + '650f8cb9e2ddd9a8a2a03748b8757110' + 'f5e17fcdf2056dcc8ca8aae8600c0132' + '934603c7d3a1a0a66edb847bcb930df1') + +build() { + cd ${srcdir}/$pkgname-$pkgver + patch -Np1 -i ../xfmedia-dbus-0.6-support.patch + patch -Np1 -i ../xfmedia-empty-prev-next-fix.patch + patch -Np1 -i ../xfmedia-exo-0.6.patch + patch -Np1 -i ../xfmedia-xine-1.2.0.patch + LDFLAGS="$LDFLAGS -lXext -lm" ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch b/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch new file mode 100644 index 000000000..9b1eb3678 --- /dev/null +++ b/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch @@ -0,0 +1,14 @@ +diff -Naur xfmedia-0.9.1.orig/src/remote.c xfmedia-0.9.1/src/remote.c +--- xfmedia-0.9.1.orig/src/remote.c 2005-09-05 00:56:37.000000000 -0400 ++++ xfmedia-0.9.1/src/remote.c 2006-04-08 00:27:18.000000000 -0400 +@@ -55,6 +55,10 @@ + #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER DBUS_SERVICE_REPLY_PRIMARY_OWNER + #endif + ++#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT ++#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT DBUS_NAME_FLAG_DO_NOT_QUEUE ++#endif ++ + #endif /* HAVE_DBUS */ + + #include <libxfce4util/libxfce4util.h> diff --git a/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch b/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch new file mode 100644 index 000000000..e2d0d8166 --- /dev/null +++ b/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch @@ -0,0 +1,25 @@ +diff -wbBur xfmedia-0.9.2/src/mainwin.c xfmedia-0.9.2.my/src/mainwin.c +--- xfmedia-0.9.2/src/mainwin.c 2006-11-27 07:21:23.000000000 +0000 ++++ xfmedia-0.9.2.my/src/mainwin.c 2010-11-01 13:01:17.000000000 +0000 +@@ -1865,6 +1865,10 @@ + gboolean use_playlist_q = xfmedia_playlist_queue_n_entries(mwin->playlist_q); + gboolean ret = FALSE; + ++ if(xfmedia_playlist_get_n_entries(mwin->plist) == 0) ++// if(xfmedia_playlist_queue_is_empty(mwin->plist)) ++ return; ++ + if(mwin->cur_playing + && xfmedia_settings_get_bool("/xfmedia/playlist/shuffle") + && !use_playlist_q ) +@@ -1899,6 +1903,10 @@ + { + gint tot_items, idx = -1; + ++ if(xfmedia_playlist_get_n_entries(mwin->plist) == 0) ++// if(xfmedia_playlist_queue_is_empty(mwin->plist)) ++ return; ++ + if(xfmedia_settings_get_bool("/xfmedia/playlist/shuffle")) { + XfmediaPlaylistEntryRef *ref = NULL; + gboolean playing = FALSE; diff --git a/community-testing/xfmedia/xfmedia-exo-0.6.patch b/community-testing/xfmedia/xfmedia-exo-0.6.patch new file mode 100644 index 000000000..1de611c82 --- /dev/null +++ b/community-testing/xfmedia/xfmedia-exo-0.6.patch @@ -0,0 +1,196 @@ +diff -wbBur xfmedia-0.9.2/configure xfmedia-0.9.2.my/configure +--- xfmedia-0.9.2/configure 2006-11-27 20:20:59.000000000 +0000 ++++ xfmedia-0.9.2.my/configure 2011-01-31 17:15:58.000000000 +0000 +@@ -27417,7 +27417,7 @@ + + + if test x"$xdt_cv_EXO_check" = x"yes"; then +- if $PKG_CONFIG --exists "exo-0.3 >= 0.3.0" >/dev/null 2>&1; then ++ if $PKG_CONFIG --exists "exo-1 >= 0.3.0" >/dev/null 2>&1; then + + + # minimum supported version of pkg-config +@@ -27501,22 +27501,22 @@ + fi + + +- { echo "$as_me:$LINENO: checking for exo-0.3 >= 0.3.0" >&5 +-echo $ECHO_N "checking for exo-0.3 >= 0.3.0... $ECHO_C" >&6; } +- if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then +- EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"` ++ { echo "$as_me:$LINENO: checking for exo-1 >= 0.3.0" >&5 ++echo $ECHO_N "checking for exo-1 >= 0.3.0... $ECHO_C" >&6; } ++ if $PKG_CONFIG "--atleast-version=0.3.0" "exo-1" >/dev/null 2>&1; then ++ EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"` + { echo "$as_me:$LINENO: result: $EXO_VERSION" >&5 + echo "${ECHO_T}$EXO_VERSION" >&6; } + + { echo "$as_me:$LINENO: checking EXO_CFLAGS" >&5 + echo $ECHO_N "checking EXO_CFLAGS... $ECHO_C" >&6; } +- EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"` ++ EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"` + { echo "$as_me:$LINENO: result: $EXO_CFLAGS" >&5 + echo "${ECHO_T}$EXO_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking EXO_LIBS" >&5 + echo $ECHO_N "checking EXO_LIBS... $ECHO_C" >&6; } +- EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"` ++ EXO_LIBS=`$PKG_CONFIG --libs "exo-1"` + { echo "$as_me:$LINENO: result: $EXO_LIBS" >&5 + echo "${ECHO_T}$EXO_LIBS" >&6; } + +@@ -27535,15 +27535,15 @@ + + EXO_FOUND="yes" + +- elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then +- xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"` ++ elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then ++ xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"` + { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5 + echo "${ECHO_T}found, but $xdt_cv_version" >&6; } + + +- echo "*** The required package exo-0.3 was found on your system," ++ echo "*** The required package exo-1 was found on your system," + echo "*** but the installed version ($xdt_cv_version) is too old." +- echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust" ++ echo "*** Please upgrade exo-1 to atleast version 0.3.0, or adjust" + echo "*** the PKG_CONFIG_PATH environment variable if you installed" + echo "*** the new version of the package in a nonstandard prefix so" + echo "*** pkg-config is able to find it." +@@ -27554,8 +27554,8 @@ + echo "${ECHO_T}not found" >&6; } + + +- echo "*** The required package exo-0.3 was not found on your system." +- echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust" ++ echo "*** The required package exo-1 was not found on your system." ++ echo "*** Please install exo-1 (atleast version 0.3.0) or adjust" + echo "*** the PKG_CONFIG_PATH environment variable if you" + echo "*** installed the package in a nonstandard prefix so that" + echo "*** pkg-config is able to find it." +@@ -27564,14 +27564,14 @@ + fi + + else +- { echo "$as_me:$LINENO: checking for optional package exo-0.3 >= 0.3.0" >&5 +-echo $ECHO_N "checking for optional package exo-0.3 >= 0.3.0... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: checking for optional package exo-1 >= 0.3.0" >&5 ++echo $ECHO_N "checking for optional package exo-1 >= 0.3.0... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: not found" >&5 + echo "${ECHO_T}not found" >&6; } + fi + else +- { echo "$as_me:$LINENO: checking for optional package exo-0.3" >&5 +-echo $ECHO_N "checking for optional package exo-0.3... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: checking for optional package exo-1" >&5 ++echo $ECHO_N "checking for optional package exo-1... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: disabled" >&5 + echo "${ECHO_T}disabled" >&6; } + fi +diff -wbBur xfmedia-0.9.2/src/main.c xfmedia-0.9.2.my/src/main.c +--- xfmedia-0.9.2/src/main.c 2006-11-27 07:21:23.000000000 +0000 ++++ xfmedia-0.9.2.my/src/main.c 2011-02-01 11:08:02.000000000 +0000 +@@ -388,6 +388,23 @@ + return optind; + } + ++/** ++ * exo_str_get_md5_str: ++ * @contents : The string to create a digest of. ++ * ++ * Creates a character array MD5 digestof the string ++ * @contents. ++ * ++ * Return value: A newly-allocated character array which ++ * should be free with g_free() when no ++ * longer needed. ++ **/ ++gchar* ++exo_str_get_md5_str (const gchar *contents) ++{ ++ return g_compute_checksum_for_string (G_CHECKSUM_MD5, contents, -1); ++} ++ + int + main(int argc, char **argv) + { +diff -wbBur xfmedia-0.9.2/src/mediamarks.c xfmedia-0.9.2.my/src/mediamarks.c +--- xfmedia-0.9.2/src/mediamarks.c 2006-11-27 07:21:23.000000000 +0000 ++++ xfmedia-0.9.2.my/src/mediamarks.c 2011-02-01 11:04:42.000000000 +0000 +@@ -684,9 +684,9 @@ + + render = exo_cell_renderer_ellipsized_text_new(); + if(gtk_major_version == 2 && gtk_minor_version >= 6) +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + else { +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, NULL); + } + gtk_tree_view_column_pack_start(col, render, TRUE); +@@ -1693,9 +1693,9 @@ + + render = exo_cell_renderer_ellipsized_text_new(); + if(gtk_major_version == 2 && gtk_minor_version >= 6) +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + else { +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, NULL); + } + gtk_tree_view_column_pack_start(col, render, TRUE); +@@ -1705,9 +1705,9 @@ + + render = exo_cell_renderer_ellipsized_text_new(); + if(gtk_major_version == 2 && gtk_minor_version >= 6) +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + else { +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, NULL); + } + col = gtk_tree_view_column_new_with_attributes(_("Location"), render, +diff -wbBur xfmedia-0.9.2/src/playlist.c xfmedia-0.9.2.my/src/playlist.c +--- xfmedia-0.9.2/src/playlist.c 2006-11-27 07:21:22.000000000 +0000 ++++ xfmedia-0.9.2.my/src/playlist.c 2011-02-01 11:04:47.000000000 +0000 +@@ -1409,9 +1409,9 @@ + + render = exo_cell_renderer_ellipsized_text_new(); + if(gtk_major_version == 2 && gtk_minor_version >= 6) +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + else { +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, NULL); + } + col = gtk_tree_view_column_new_with_attributes(_("Title"), render, "text", +diff -wbBur xfmedia-0.9.2/src/settings-dialog.c xfmedia-0.9.2.my/src/settings-dialog.c +--- xfmedia-0.9.2/src/settings-dialog.c 2006-11-27 07:21:23.000000000 +0000 ++++ xfmedia-0.9.2.my/src/settings-dialog.c 2011-02-01 11:04:53.000000000 +0000 +@@ -552,7 +552,7 @@ + render = exo_cell_renderer_ellipsized_text_new(); + col = gtk_tree_view_column_new_with_attributes("name", render, + "text", PLUGINS_NAME, NULL); +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col); + +diff -wbBur xfmedia-0.9.2/src/xfmedia-playlist-queue.c xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c +--- xfmedia-0.9.2/src/xfmedia-playlist-queue.c 2006-11-27 07:21:22.000000000 +0000 ++++ xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c 2011-02-01 11:04:57.000000000 +0000 +@@ -171,7 +171,7 @@ + + render = exo_cell_renderer_ellipsized_text_new(); + g_object_set(G_OBJECT(render), +- "ellipsize", EXO_PANGO_ELLIPSIZE_END, ++ "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, + NULL); + col = gtk_tree_view_column_new_with_attributes("display-name", render, diff --git a/community-testing/xfmedia/xfmedia-xine-1.2.0.patch b/community-testing/xfmedia/xfmedia-xine-1.2.0.patch new file mode 100644 index 000000000..2e04ac80a --- /dev/null +++ b/community-testing/xfmedia/xfmedia-xine-1.2.0.patch @@ -0,0 +1,34 @@ +diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.c xfmedia-0.9.2.my/src/xfmedia-xine.c +--- xfmedia-0.9.2/src/xfmedia-xine.c 2006-11-27 10:21:23.000000000 +0300 ++++ xfmedia-0.9.2.my/src/xfmedia-xine.c 2012-01-05 01:23:21.000000000 +0400 +@@ -1450,17 +1450,6 @@ + } + + gboolean +-xfmedia_xine_trick_mode(XfmediaXine * xfx, gint mode, gint value) +-{ +- +- g_return_val_if_fail(xfx != NULL, 0); +- g_return_val_if_fail(XFMEDIA_IS_XINE(xfx), 0); +- g_return_val_if_fail(xfx->priv->stream != NULL, 0); +- +- return xine_trick_mode(xfx->priv->stream, mode, value); +-} +- +-gboolean + xfmedia_xine_get_pos_length(XfmediaXine *xfx, gint *pos_stream, + gint *pos_time, gint *length_time) + { +diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.h xfmedia-0.9.2.my/src/xfmedia-xine.h +--- xfmedia-0.9.2/src/xfmedia-xine.h 2006-11-27 10:21:23.000000000 +0300 ++++ xfmedia-0.9.2.my/src/xfmedia-xine.h 2012-01-05 01:20:47.000000000 +0400 +@@ -87,9 +87,6 @@ + gboolean xfmedia_xine_play (XfmediaXine *xfx, + gint pos, + gint start_time); +-gboolean xfmedia_xine_trick_mode (XfmediaXine *xfx, +- gint mode, +- gint value); + gint xfmedia_xine_get_stream_info (XfmediaXine *xfx, + gint info); + G_CONST_RETURN gchar *xfmedia_xine_get_meta_info (XfmediaXine *xfx, diff --git a/community-testing/xfmedia/xfmedia.install b/community-testing/xfmedia/xfmedia.install new file mode 100644 index 000000000..b95cc069d --- /dev/null +++ b/community-testing/xfmedia/xfmedia.install @@ -0,0 +1,11 @@ +post_install() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true +} diff --git a/community/cuda-toolkit/PKGBUILD b/community/cuda-toolkit/PKGBUILD index 2fc1d6366..a37c7f8a8 100644 --- a/community/cuda-toolkit/PKGBUILD +++ b/community/cuda-toolkit/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=cuda-toolkit pkgver=4.1.21 -pkgrel=2 +pkgrel=3 _fedver=14 pkgdesc="NVIDIA's GPU programming toolkit" arch=('i686' 'x86_64') url="http://www.nvidia.com/object/cuda_home.html" license=('custom') -depends=('gcc-libs') +depends=('gcc-libs' 'opencl-nvidia') if [ "$CARCH" = "i686" ]; then _arch=32 md5sums=('930b7bfd1a162335b909f119a004f6d7' diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 72565b6d2..427a2caed 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61445 2011-12-31 14:02:12Z lcarlier $ +# $Id: PKGBUILD 61783 2012-01-07 19:54:03Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -13,7 +13,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -402,16 +402,21 @@ package_gambas3-gb-eval-highlight() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp make DESTDIR="${pkgdir}" install ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-z]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-z]* + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-d]*,[f-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-d]*,[f-z]*} + rm -r ${pkgdir}/usr/share/gambas3/control ## } diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD index d251f7ac9..59b346dac 100644 --- a/community/knemo/PKGBUILD +++ b/community/knemo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57927 2011-11-04 15:11:18Z lcarlier $ +# $Id: PKGBUILD 61797 2012-01-07 22:46:40Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com> pkgname=knemo -pkgver=0.7.2 -pkgrel=2 +pkgver=0.7.3 +pkgrel=1 pkgdesc="The KDE Network Monitor" arch=('i686' 'x86_64') url="http://www.kde-apps.org/content/show.php?content=12956" @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install options=('libtool') source=("http://www.kde-apps.org/CONTENT/content-files/12956-${pkgname}-${pkgver}.tar.bz2") -md5sums=('4f90d81e2d0980ed3ae4e4fefc4bf20b') +md5sums=('24b5ec27b862ed7026ff643193952b78') build() { cd ${srcdir} diff --git a/community/libcgns/PKGBUILD b/community/libcgns/PKGBUILD new file mode 100644 index 000000000..02f225b6a --- /dev/null +++ b/community/libcgns/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Klimov Max <cleemmi@gmail.com> + +pkgname=libcgns +_basever=3.1.3 +_relver=3 +pkgver=${_basever}.${_relver} +pkgrel=1 +pkgdesc='General purpose library for the storage and retrieval of computational fluid dynamics analysis data by CGNS standard' +arch=('i686' 'x86_64') +url='http://www.cgns.org' +license=('custom') +makedepends=('cmake') +source=("http://downloads.sourceforge.net/project/cgns/cgnslib_${_basever:0:3}/cgnslib_${_basever}-${_relver}.tar.gz") +md5sums=('8d19e0c69779d7ea74b1731e09a96b9d') + +# need to tell cmake when to build 64bit version +[[ "$CARCH" == "i686" ]] && _64bits=OFF +[[ "$CARCH" == "x86_64" ]] && _64bits=ON + +build() { + mkdir build + cd build + + cmake \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DENABLE_64BIT:BOOL=${_64bits} \ + -DENABLE_TESTS:BOOL=ON \ + ../cgnslib_${_basever} + + make +} + +check() { + cd build + + make test +} + +package() { + cd build + + make DESTDIR=${pkgdir} install + + # install license + install -d ${pkgdir}/usr/share/licenses/libcgns + install -m644 ${srcdir}/cgnslib_${_basever}/license.txt \ + ${pkgdir}/usr/share/licenses/libcgns +} diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD index 6b5d3069d..f8cb26dd4 100644 --- a/community/murmur/PKGBUILD +++ b/community/murmur/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 44592 2011-04-09 11:22:35Z svenstaro $ +# $Id: PKGBUILD 61765 2012-01-07 13:49:52Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com> # Contributor: Malte Rabenseifner <malte@zearan.de> pkgname=murmur pkgver=1.2.3 -pkgrel=3 +pkgrel=4 pkgdesc="The voice chat application server for Mumble" arch=('i686' 'x86_64') url="http://mumble.sourceforge.net" diff --git a/community/murmur/murmur.install b/community/murmur/murmur.install index 1f49aa53b..478f40a0e 100644 --- a/community/murmur/murmur.install +++ b/community/murmur/murmur.install @@ -1,15 +1,13 @@ post_install() { - # bug: dbus reload here doesn't work # workaround: it seems to work if you do it a few seconds later, manually /etc/rc.d/dbus reload > /dev/null - /usr/bin/getent group murmur > /dev/null || /usr/sbin/groupadd murmur - /usr/bin/getent passwd murmur > /dev/null || \ - /usr/sbin/useradd -d /var/lib/murmur -g murmur -s /bin/false murmur + getent group murmur > /dev/null || groupadd -r -g 86 murmur 1>/dev/null + getent passwd murmur > /dev/null || useradd -r -u 86 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null - chown -R murmur:murmur /var/lib/murmur - chown -R murmur:murmur /var/log/murmur + chown -R 86:86 /var/lib/murmur + chown -R 86:86 /var/log/murmur echo echo '==> Set the SuperUser password with (as root):' @@ -28,5 +26,6 @@ pre_remove() { post_remove() { /etc/rc.d/dbus reload > /dev/null - /usr/sbin/userdel murmur > /dev/null + getent passwd murmur > /dev/null && userdel murmur 1>/dev/null + getent group murmur > /dev/null && groupdel murmur 1>/dev/null } diff --git a/community/ncmpcpp/PKGBUILD b/community/ncmpcpp/PKGBUILD index ea5fd713c..ecbf1b845 100644 --- a/community/ncmpcpp/PKGBUILD +++ b/community/ncmpcpp/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 56902 2011-10-16 07:46:55Z bpiotrowski $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# $Id: PKGBUILD 61735 2012-01-07 09:31:06Z bpiotrowski $ +# Maintainer: Mateusz Herych <heniekk@gmail.com> +# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Army <uli[dot]armbruster[at]gmail[dot]com> pkgname=ncmpcpp pkgver=0.5.8 -pkgrel=1 +pkgrel=2 pkgdesc="An almost exact clone of ncmpc with some new features." arch=('i686' 'x86_64') url="http://unkart.ovh.org/ncmpcpp/" @@ -18,8 +19,9 @@ build() { cd "$srcdir/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --enable-unicode \ - --enable-clock \ - --with-taglib \ + --enable-clock \ + --with-taglib \ + --enable-outputs \ --with-curl make } diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 8ea545187..bae6527de 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.6.6 -pkgrel=3 +pkgver=0.6.7 +pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') url='http://nodejs.org/' @@ -17,7 +17,7 @@ checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('43836ebd6e8e9059c4584e3b5ab50009') +md5sums=('e7b238356ea7fb230b956010931ca468') build() { cd node-v${pkgver} diff --git a/community/ozerocdoff/PKGBUILD b/community/ozerocdoff/PKGBUILD index a4b81b407..a8a42445f 100644 --- a/community/ozerocdoff/PKGBUILD +++ b/community/ozerocdoff/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61135 2011-12-22 10:38:39Z spupykin $ +# $Id: PKGBUILD 61756 2012-01-07 11:39:19Z spupykin $ # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> pkgname=ozerocdoff pkgver=2 -pkgrel=5 +pkgrel=6 pkgdesc="Userspace driver for Option High Speed Mobile Devices" arch=('i686' 'x86_64') url="http://www.pharscape.org/ozerocdoff.html" @@ -13,7 +13,7 @@ options=('!emptydirs') source=(udev.tar.gz::"http://www.pharscape.org/forum/index.php?action=dlattach;topic=545.0;attach=4" "remove-old-rules.patch") md5sums=('88a78f9380d9591f8d20a657b72e3e5c' - '213737cfccde2fe49a334db2b681c3f5') + '28ed1afd16fdec92de3baf66b32b0b12') build() { cd "${srcdir}/udev" @@ -27,4 +27,6 @@ package() { make DESTDIR="${pkgdir}" install rm -rf $pkgdir/usr/lib/hal rm -rf $pkgdir/usr/share/hal + mkdir -p $pkgdir/lib + mv $pkgdir/etc/udev $pkgdir/lib } diff --git a/community/ozerocdoff/remove-old-rules.patch b/community/ozerocdoff/remove-old-rules.patch index c395280cb..3a95877e2 100644 --- a/community/ozerocdoff/remove-old-rules.patch +++ b/community/ozerocdoff/remove-old-rules.patch @@ -1,6 +1,6 @@ diff -wbBur udev/hso.udev udev.my/hso.udev --- udev/hso.udev 2008-06-19 14:34:07.000000000 +0400 -+++ udev.my/hso.udev 2011-12-22 14:31:29.000000000 +0400 ++++ udev.my/hso.udev 2012-01-07 15:31:02.000000000 +0400 @@ -1,8 +1,5 @@ ACTION!="add", GOTO="hso_end" @@ -10,7 +10,7 @@ diff -wbBur udev/hso.udev udev.my/hso.udev ############################### NEW SYNTAX ############################### LABEL="hso_new_syntax" -@@ -63,60 +60,6 @@ +@@ -63,65 +60,11 @@ SUBSYSTEM=="tty", SUBSYSTEMS=="usb", ATTR{hsotype}=="PCSC", SYMLINK+="wpcsc0" GOTO="hso_tty_permission" @@ -71,3 +71,9 @@ diff -wbBur udev/hso.udev udev.my/hso.udev ############################### COMMON SYNTAX ############################### LABEL="hso_tty_permission" + # setup group proper group rights +-KERNEL=="ttyHS[0-9]*", NAME="%k", GROUP="dialout", MODE="0660" ++KERNEL=="ttyHS[0-9]*", GROUP="network", MODE="0660" + + + SUBSYSTEM!="usb", GOTO="hso_end" diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD index 97a294e2d..a596884ae 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -1,78 +1,64 @@ -# $Id: PKGBUILD 61087 2011-12-21 20:51:56Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Michele Mocciola <mickele> # Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name> pkgname=paraview -pkgver=3.10.1 -pkgrel=5 +pkgver=3.12.0 +pkgrel=1 pkgdesc='Parallel Visualization Application using VTK' arch=('i686' 'x86_64') url='http://www.paraview.org' license=('custom') -depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' - 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5' -makedepends=('cmake' 'desktop-file-utils') +depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns') +makedepends=('cmake' 'desktop-file-utils' 'boost') source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" 'paraview.png' 'paraview.desktop' - 'fixkernelversioncheck.diff') -md5sums=('d8a9d4a997a720589ffd57568bcdd449' + 'fix-boost-graph-api-changes.diff') +md5sums=('8feabc6261e2060648eaac593d85b1de' 'db623002bc71a257ddfdd0c9c7b14c3f' '4e4b7172ed18171c37446fd7c4f1e8f5' - '9e137af23701f76fc727222ebac23389') + '2aa5b98288cadd201ffbd057f18929b0') build() { - cd ParaView-${pkgver} + cd ParaView-${pkgver}/VTK + # fix http://www.vtk.org/Bug/view.php?id=12772 remove on next pkgver bump + patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff - # patch vtk to fix http://www.vtk.org/Bug/view.php?id=12568 - # remove next pkgver bump - cd VTK - patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff - cd .. + mkdir ${srcdir}/build + cd ${srcdir}/build - sed -i '20 i#include <stddef.h>' VTK/Utilities/vtkmetaio/metaUtils.cxx - sed -i 's/stddef.h/cstddef/' VTK/Wrapping/Python/vtkPythonUtil.cxx - sed -i '36 i#include <vtksys/cstddef>' VTK/Wrapping/Python/PyVTKObject.cxx + # flags to enable using system libs + local cmake_system_flags="" + for lib in HDF5 FREETYPE JPEG PNG TIFF ZLIB EXPAT LIBXML2; do + cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON " + done - # Paraview wants to be built out of source - mkdir -p build - cd build + # flags to use python2 instead of python which is 3.x.x on archlinux + local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so" - # use -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ to fix make install error: http://www.cmake.org/pipermail/paraview/2011-February/020268.html + # enable when http://paraview.org/Bug/view.php?id=12718 gets fixed + #-DCMAKE_SKIP_RPATH:BOOL=YES \ + # the following flags enable the feature request at https://bugs.archlinux.org/task/27525 + # -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON -DVISIT_BUILD_READER_CGNS:BOOL=ON cmake \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_USE_PTHREADS:BOOL=ON \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_SKIP_RPATH:BOOL=YES \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \ - -DCMAKE_COLOR_MAKEFILE:BOOL=TRUE \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DBUILD_DOCUMENTATION:BOOL=OFF \ - -DBUILD_EXAMPLES:BOOL=OFF \ - -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ - -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ - -DVTK_USE_SYSTEM_PNG:BOOL=ON \ - -DVTK_USE_SYSTEM_TIFF:BOOL=ON \ - -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ - -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ - -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \ - -DVTK_USE_BOOST:BOOL=OFF \ - -DVTK_USE_OFFSCREEN=TRUE \ - -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \ + -DVTK_USE_BOOST:BOOL=ON \ -DPARAVIEW_USE_MPI:BOOL=ON \ -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \ -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \ - -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ - -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ - .. + -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON \ + -DVISIT_BUILD_READER_CGNS:BOOL=ON \ + ${cmake_system_flags} \ + ${cmake_system_python_flags} \ + ../ParaView-${pkgver} make } package() { - cd ParaView-${pkgver}/build + cd build make DESTDIR=${pkgdir} install @@ -82,7 +68,4 @@ package() { # Install desktop shortcuts install -Dm644 ${srcdir}/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/paraview.desktop - - # Removes VTK plugin for designer - if you need, you can install vtk - #rm -rf ${pkgdir}/opt/paraview/plugins } diff --git a/community/paraview/fix-boost-graph-api-changes.diff b/community/paraview/fix-boost-graph-api-changes.diff new file mode 100644 index 000000000..37d78665b --- /dev/null +++ b/community/paraview/fix-boost-graph-api-changes.diff @@ -0,0 +1,42 @@ +commit d3ecc2c459dd1df937fc97887581ace1036da533 +Author: Marcus D. Hanwell <marcus.hanwell@kitware.com> +Date: Tue Dec 13 15:36:06 2011 -0500 + + BUG: 12772 fixes for change in Boost graph API + + This fixes bug 12772, where an API change in Boost was causing + compilation failures using Boost 1.38. Thanks to Orion Poplawski for + reporting the issue and posting the patch. + + Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06 + +diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +index c789f6b..cf7cd47 100644 +--- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx ++++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +@@ -47,6 +47,15 @@ using namespace boost; + vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); + + ++namespace { ++ vtkIdType unwrap_edge_id(vtkEdgeType const &e) { ++ return e.Id; ++ } ++ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { ++ return e.underlying_desc.Id; ++ } ++} ++ + // Redefine the bfs visitor, the only visitor we + // are using is the tree_edge visitor. + template <typename IdMap> +@@ -95,7 +104,8 @@ public: + + // Copy the vertex and edge data from the graph to the tree. + tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); +- tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); ++ tree->GetEdgeData()->CopyData(graph->GetEdgeData(), ++ unwrap_edge_id(e), tree_e.Id); + } + + private: diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index 5ee2550fd..745d29a9c 100644 --- a/community/pigeonhole/PKGBUILD +++ b/community/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.0.16 +_dcpkgver=2.0.17 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.0" arch=('i686' 'x86_64') url="http://pigeonhole.dovecot.org/" diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 5589facb8..1c4d2107e 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142912 2011-11-18 08:18:50Z andyrtr $ +# $Id: PKGBUILD 146277 2012-01-07 21:39:13Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> pkgname=dovecot -pkgver=2.0.16 +pkgver=2.0.17 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') @@ -25,7 +25,7 @@ backup=(etc/dovecot/dovecot.conf etc/ssl/dovecot-openssl.cnf) install=$pkgname.install source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh) -md5sums=('e01a29a355afefcb9fb5f8b7a54e1a14' +md5sums=('41c10dffa56e228b9176833db2efaac5' '587159e84e2da6f83d70b3c706ba87cc') build() { diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 19e5f58c1..550c9a728 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146077 2012-01-05 09:04:51Z andyrtr $ +# $Id: PKGBUILD 146275 2012-01-07 21:32:08Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=3.0.10 +pkgver=3.0.11 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit') makedepends=('valgrind') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz) -md5sums=('6d92a1e154833a70a21e771f41e5c512') +md5sums=('ca3370b39f7910538a0d6c02bec7a142') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -21,7 +21,7 @@ build() { --with-zlib \ --disable-static \ --disable-guile \ - --disable-valgrind-tests # x86_64 test are all passed. some fail in i686 chroot + --enable-valgrind-tests # x86_64 test are all passed. some fail in i686 chroot make } diff --git a/extra/perl-async-interrupt/PKGBUILD b/extra/perl-async-interrupt/PKGBUILD new file mode 100644 index 000000000..33fa2afb4 --- /dev/null +++ b/extra/perl-async-interrupt/PKGBUILD @@ -0,0 +1,48 @@ +# Packager: Justin Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 146271 2012-01-07 18:45:53Z juster $ + +pkgname=perl-async-interrupt +pkgver=1.05 +pkgrel=1 +pkgdesc="allow C/XS libraries to interrupt perl asynchronously" +arch=(i686 x86_64) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl-common-sense') +url=https://metacpan.org/release/Async-Interrupt +source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Async-Interrupt-${pkgver}.tar.gz") +md5sums=(48efb6982dab8d33241061dba65776a8) +sha512sums=(8b7c74f03b36e1d0ab40124a36c073daa06ea68d6087d809f5c9d60ca07a14505d67599f24d73f1ec5eb13259a732b0c67a07a2fff47f35e04c6b8a50c526d91) +_distdir="${srcdir}/Async-Interrupt-${pkgver}" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/extra/perl-ev/PKGBUILD b/extra/perl-ev/PKGBUILD new file mode 100644 index 000000000..29cf92abd --- /dev/null +++ b/extra/perl-ev/PKGBUILD @@ -0,0 +1,48 @@ +# Packager: Justin Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 146268 2012-01-07 18:43:52Z juster $ + +pkgname=perl-ev +pkgver=4.03 +pkgrel=1 +pkgdesc="perl interface to libev, a high performance full-featured event loop" +arch=(i686 x86_64) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl-common-sense') +url=https://metacpan.org/release/EV +source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/EV-${pkgver}.tar.gz") +md5sums=(33088705bc34bf66bccde50205c15e9f) +sha512sums=(fecf2014e89c37ca90d61e432d4020b4c59af3877e1c423693f4a86ed0c66325053737ad1c4e20c2c85b1ca65717c811f54fc596da32a853ad142bd7f60c8e03) +_distdir="${srcdir}/EV-${pkgver}" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/extra/perl-guard/PKGBUILD b/extra/perl-guard/PKGBUILD new file mode 100644 index 000000000..e72b6e71e --- /dev/null +++ b/extra/perl-guard/PKGBUILD @@ -0,0 +1,48 @@ +# Packager: Justin Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 146269 2012-01-07 18:44:39Z juster $ + +pkgname=perl-guard +pkgver=1.022 +pkgrel=1 +pkgdesc="safe cleanup blocks" +arch=(i686 x86_64) +license=(custom:unknown) +options=(!emptydirs) +depends=('perl') +url=https://metacpan.org/release/Guard +source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Guard-${pkgver}.tar.gz") +md5sums=(8d1d8b942fd5d0240f47906a6d6fac8c) +sha512sums=(9eb1c4fa29f6190115fe11215ff5d27bb3e7f5ab60c7f40c4142ad9ff8aad91b0b169204e4d0f1b1638381c0c99e6a0b5627b8b6d60fad62f1392a9d1e49751e) +_distdir="${srcdir}/Guard-${pkgver}" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/multilib-testing/lib32-libdrm/PKGBUILD b/multilib-testing/lib32-libdrm/PKGBUILD index 3de818449..d5c5c69f7 100644 --- a/multilib-testing/lib32-libdrm/PKGBUILD +++ b/multilib-testing/lib32-libdrm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60770 2011-12-17 17:08:38Z lcarlier $ +# $Id: PKGBUILD 61806 2012-01-07 23:05:50Z lcarlier $ # Contributor: Jan de Groot <jgc@archlinux.org> _pkgbasename=libdrm pkgname=lib32-$_pkgbasename -pkgver=2.4.29 +pkgver=2.4.30 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services (32-bit)" arch=(x86_64) @@ -13,11 +13,10 @@ makedepends=(gcc-multilib) options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2 - no-pthread-stubs.patch - git_fixes.diff) -md5sums=('96d5e3e9edd55f4b016fe3b5dd0a1953' - 'c722c8406507b7e3a8da7a3030d1d9cf' - 'aebd5336568090b8ec084fabcfb08071') + no-pthread-stubs.patch) +# git_fixes.diff) +md5sums=('9f57a68b2c0836b55ebcbc241f6ca175' + '0c423f6f886a3a8d6a8834224de95bcf') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" @@ -29,7 +28,7 @@ build() { patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" # git fixes - currently none - patch -Np1 -i ${srcdir}/git_fixes.diff + # patch -Np1 -i ${srcdir}/git_fixes.diff # libtoolize --force autoreconf --force --install diff --git a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch b/multilib-testing/lib32-libdrm/no-pthread-stubs.patch index 348c2a795..6ad4a48ee 100644 --- a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch +++ b/multilib-testing/lib32-libdrm/no-pthread-stubs.patch @@ -14,7 +14,7 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac AC_SUBST(PCIACCESS_LIBS) --- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 -@@ -26,14 +26,13 @@ +@@ -26,7 +26,6 @@ $(WARN_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/intel \ @@ -22,14 +22,14 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac $(PCIACCESS_CFLAGS) \ -I$(top_srcdir)/include/drm - libdrm_intel_la_LTLIBRARIES = libdrm_intel.la +@@ -34,7 +33,6 @@ libdrm_intel_ladir = $(libdir) libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@ -+libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@ + libdrm_intel_la_LIBADD = ../libdrm.la \ +- @PTHREADSTUBS_LIBS@ \ + @PCIACCESS_LIBS@ \ + @CLOCK_LIB@ - libdrm_intel_la_SOURCES = \ - intel_bufmgr.c \ --- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000 @@ -26,13 +26,12 @@ diff --git a/multilib/lib32-qt/PKGBUILD b/multilib/lib32-qt/PKGBUILD index 90518ecf5..df9d41c2e 100644 --- a/multilib/lib32-qt/PKGBUILD +++ b/multilib/lib32-qt/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 55134 2011-09-03 13:56:53Z bluewind $ +# $Id: PKGBUILD 61795 2012-01-07 22:38:21Z bluewind $ # Maintainer: Florian Pritz <flo@xssn.at> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> _pkgbasename=qt pkgname=lib32-$_pkgbasename -pkgver=4.7.4 +pkgver=4.8.0 pkgrel=1 pkgdesc='A cross-platform application and UI framework (32-bit)' arch=('x86_64') -url='http://qt.nokia.com/' +url='http://qt-project.org/' license=('GPL3' 'LGPL') depends=(lib32-{fontconfig,sqlite3,alsa-lib,glib2,dbus-core,openssl} lib32-lib{png,tiff,mng,gl,sm,xrandr,xv,xi} $_pkgbasename) @@ -18,19 +18,24 @@ optdepends=('lib32-libxinerama: Xinerama support' 'lib32-libxfixes: Xfixes support') makedepends=(cups gcc-multilib lib32-{mesa,libcups,libxfixes,gtk2}) options=('!libtool') -_pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz") -md5sums=('ddf7d83f912cf1283aa066368464fa22') +_pkgfqn="${_pkgbasename}-everywhere-opensource-src-${pkgver}" +source=("ftp://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz") +md5sums=('e8a5fdbeba2927c948d9f477a6abe904') build() { - unset QMAKESPEC + cd $srcdir/$_pkgfqn + export QT4DIR=$srcdir/$_pkgfqn - export PATH=${QT4DIR}/bin:${PATH} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - cd $srcdir/$_pkgfqn - + # some of those are likely unnecessary, but I'm too lazy to find and remove them + sed -i "/^QMAKE_LINK\s/s|g++|g++ -m32|g" mkspecs/common/g++-base.conf + sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/g++-base.conf + sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/gcc-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS} -m32|g" mkspecs/common/gcc-base.conf + sed -i "s|-Wl,-O1|-m32 -Wl,-O1|" mkspecs/common/g++-unix.conf sed -e "s|-O2|$CXXFLAGS -m32|" \ -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \ -e "/^QMAKE_LINK\s/s|g++|g++ -m32|g" \ @@ -45,34 +50,21 @@ build() { -datadir /usr/share/qt \ -translationdir /usr/share/qt/translations \ -sysconfdir /etc \ - -largefile \ -system-sqlite \ - -xmlpatterns \ -no-phonon \ -no-phonon-backend \ - -svg \ - -webkit \ - -script \ - -scripttools \ - -system-zlib \ - -system-libtiff \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ + -no-webkit \ + -graphicssystem raster \ + -openssl-linked \ -nomake demos \ -nomake examples \ -nomake docs \ -nomake tools \ - -no-rpath \ - -openssl-linked \ -optimized-qmake \ - -dbus \ + -no-rpath \ + -dbus-linked \ -reduce-relocations \ - -no-separate-debug-info \ - -gtkstyle \ - -opengl \ - -no-openvg \ - -glib + -no-openvg make } diff --git a/testing/k9copy/PKGBUILD b/testing/k9copy/PKGBUILD new file mode 100644 index 000000000..e4ca2bf0b --- /dev/null +++ b/testing/k9copy/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 146245 2012-01-07 05:13:20Z eric $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com> + +pkgname=k9copy +pkgver=2.3.8 +pkgrel=2 +pkgdesc="A small utility which allows the copy of DVD under Linux" +arch=('i686' 'x86_64') +url="http://k9copy.sourceforge.net" +license=('GPL') +depends=('kdebase-runtime' 'libmpeg2' 'xine-lib' 'dvd+rw-tools' 'dvdauthor') +makedepends=('automoc4' 'cmake') +install=k9copy.install +source=("http://downloads.sourceforge.net/project/${pkgname}/k9copy-kde4/${pkgver}/${pkgname}-${pkgver}-Source.tar.gz") +md5sums=('584f6cc50f28befbeb0d5c1ec9476456') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-Source" + + sed -i -e "s:Name=k9copy:Name=K9copy:g" k9copy.desktop k9copy_assistant.desktop + + cmake -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-Source" + + make DESTDIR="${pkgdir}" install +} diff --git a/testing/k9copy/k9copy.install b/testing/k9copy/k9copy.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/k9copy/k9copy.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/kaffeine/PKGBUILD b/testing/kaffeine/PKGBUILD new file mode 100644 index 000000000..0cd53aea7 --- /dev/null +++ b/testing/kaffeine/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 146247 2012-01-07 05:13:23Z eric $ +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kaffeine +pkgver=1.2.2 +pkgrel=2 +pkgdesc='KDE media player' +license=('GPL') +arch=('i686' 'x86_64') +url="http://kaffeine.kde.org" +depends=('kdelibs' 'kdebase-runtime' 'xine-lib') +makedepends=('pkg-config' 'cmake' 'automoc4') +install=kaffeine.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('690e48d2e5fe123887109aa9b1bc1c31') + +build() { + cd "$srcdir" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install +} diff --git a/testing/kaffeine/kaffeine.install b/testing/kaffeine/kaffeine.install new file mode 100644 index 000000000..5c501dc49 --- /dev/null +++ b/testing/kaffeine/kaffeine.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/kdebase-runtime/PKGBUILD b/testing/kdebase-runtime/PKGBUILD new file mode 100644 index 000000000..56c5e03ca --- /dev/null +++ b/testing/kdebase-runtime/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 146249 2012-01-07 05:13:26Z eric $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdebase-runtime +pkgver=4.7.4 +pkgrel=3 +pkgdesc="KDE Base Runtime Environment" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' + 'xorg-xauth' 'hicolor-icon-theme') +makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib') +optdepends=('htdig: to build the search index in khelpcenter' + 'rarian: needed by khelpcenter' + 'gdb: drkonq crash handler') +install="${pkgname}.install" +source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2" + 'libqzeitgeist08.patch') +sha1sums=('bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6' + '164c9e4305029cb68a2101cfeeb76c7066c2fd39') + +build() { + cd "${srcdir}"/kde-runtime-${pkgver} + patch -p1 -i "${srcdir}"/libqzeitgeist08.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../kde-runtime-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install + rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme" + ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" +} diff --git a/testing/kdebase-runtime/kdebase-runtime.install b/testing/kdebase-runtime/kdebase-runtime.install new file mode 100644 index 000000000..3f06b8deb --- /dev/null +++ b/testing/kdebase-runtime/kdebase-runtime.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/kdebase-runtime/libqzeitgeist08.patch b/testing/kdebase-runtime/libqzeitgeist08.patch new file mode 100644 index 000000000..f832cd8b2 --- /dev/null +++ b/testing/kdebase-runtime/libqzeitgeist08.patch @@ -0,0 +1,102 @@ +--- kde-runtime-4.7.2/activitymanager/CMakeLists.txt~ 2011-10-29 15:46:55.003710230 +0000 ++++ kde-runtime-4.7.2/activitymanager/CMakeLists.txt 2011-10-29 15:47:28.910716093 +0000 +@@ -21,7 +21,7 @@ + ) + endif(Nepomuk_FOUND) + +-# Checking for QtZeitgeist ++# Checking for QZeitgeist + macro_optional_find_package(QZeitgeist) + + if (QZEITGEIST_INCLUDE_DIR) +@@ -30,8 +30,8 @@ + + macro_log_feature( + QZeitgeist_FOUND +- "QtZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE "" +- "RECOMMENDED: Zeitgeist and QtZeitgeist is needed for resource tracking") ++ "QZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE "" ++ "RECOMMENDED: Zeitgeist and QZeitgeist is needed for resource tracking") + if (QZeitgeist_FOUND) + set(HAVE_QZEITGEIST 1) + include_directories(${QZEITGEIST_INCLUDE_DIR}) +--- kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp~ 2011-10-29 15:47:40.960836591 +0000 ++++ kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp 2011-10-29 15:48:57.034930073 +0000 +@@ -21,31 +21,31 @@ + + #ifndef HAVE_QZEITGEIST + #ifdef __GNUC__ +- #warning "No QtZeitgeist, disabling desktop events processing" ++ #warning "No QZeitgeist, disabling desktop events processing" + #endif + + #else // HAVE_QZEITGEIST + + #include "ZeitgeistEventBackend.h" + +-#include <QtZeitgeist/QtZeitgeist> +-#include <QtZeitgeist/Interpretation> +-#include <QtZeitgeist/Manifestation> ++#include <QZeitgeist/QZeitgeist> ++#include <QZeitgeist/Interpretation> ++#include <QZeitgeist/Manifestation> + + static QString eventInterpretation(Event::Type type) + { + switch (type) { + case Event::Accessed: +- return QtZeitgeist::Interpretation::Event::ZGAccessEvent; ++ return QZeitgeist::Interpretation::Event::ZGAccessEvent; + + case Event::Opened: +- return QtZeitgeist::Interpretation::Event::ZGAccessEvent; ++ return QZeitgeist::Interpretation::Event::ZGAccessEvent; + + case Event::Modified: +- return QtZeitgeist::Interpretation::Event::ZGModifyEvent; ++ return QZeitgeist::Interpretation::Event::ZGModifyEvent; + + case Event::Closed: +- return QtZeitgeist::Interpretation::Event::ZGLeaveEvent; ++ return QZeitgeist::Interpretation::Event::ZGLeaveEvent; + + } + +@@ -57,23 +57,23 @@ + { + switch (reason) { + case Event::User: +- return QtZeitgeist::Manifestation::Event::ZGUserActivity; ++ return QZeitgeist::Manifestation::Event::ZGUserActivity; + + case Event::Heuristic: +- return QtZeitgeist::Manifestation::Event::ZGHeuristicActivity; ++ return QZeitgeist::Manifestation::Event::ZGHeuristicActivity; + + case Event::Scheduled: +- return QtZeitgeist::Manifestation::Event::ZGScheduledActivity; ++ return QZeitgeist::Manifestation::Event::ZGScheduledActivity; + + case Event::System: +- return QtZeitgeist::Manifestation::Event::ZGSystemNotification; ++ return QZeitgeist::Manifestation::Event::ZGSystemNotification; + + case Event::World: +- return QtZeitgeist::Manifestation::Event::ZGWorldActivity; ++ return QZeitgeist::Manifestation::Event::ZGWorldActivity; + } + + // shut up GCC +- return QtZeitgeist::Manifestation::Event::ZGUserActivity; ++ return QZeitgeist::Manifestation::Event::ZGUserActivity; + } + + static QString applicationUri(const QString & application) +@@ -84,7 +84,6 @@ + + ZeitgeistEventBackend::ZeitgeistEventBackend() + { +- QtZeitgeist::init(); + } + + void ZeitgeistEventBackend::addEvents(const EventList & events) diff --git a/testing/kdelibs/PKGBUILD b/testing/kdelibs/PKGBUILD index d0b93d61c..019a971bf 100644 --- a/testing/kdelibs/PKGBUILD +++ b/testing/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145215 2011-12-19 18:03:56Z andrea $ +# $Id: PKGBUILD 145730 2011-12-29 13:52:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdelibs pkgver=4.7.4 -pkgrel=2 +pkgrel=5 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -18,10 +18,13 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell') replaces=('kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch' 'archlinux-menu.patch') + 'kde-applications-menu.patch' 'archlinux-menu.patch' + 'fix-knotify-filepath.patch' 'kdelibs-4.7.4-xinelib12x.patch') sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67') + '63a850ab4196b9d06934f2b4a13acd9f7739bc67' + '3312f6005aa56a9b992c74008fe5b314f1c8ffba' + '9cb83cb7f6394549354c6837977f9e9529127041') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -31,6 +34,11 @@ build() { # add Archlinux menu entry patch -p1 -i "${srcdir}"/archlinux-menu.patch + # https://bugs.kde.org/show_bug.cgi?id=285028 + patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch + + patch -p1 -i "${srcdir}"/kdelibs-4.7.4-xinelib12x.patch + cd "${srcdir}" mkdir build cd build diff --git a/testing/kdelibs/fix-knotify-filepath.patch b/testing/kdelibs/fix-knotify-filepath.patch new file mode 100644 index 000000000..2cd995e97 --- /dev/null +++ b/testing/kdelibs/fix-knotify-filepath.patch @@ -0,0 +1,13 @@ +diff --git a/knotify/config/knotifyconfigactionswidget.cpp b/knotify/config/knotifyconfigactionswidget.cpp +index 88d18b6..0e76658 100644 +--- a/knotify/config/knotifyconfigactionswidget.cpp ++++ b/knotify/config/knotifyconfigactionswidget.cpp +@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay( ) + KUrl soundURL = m_ui.Sound_select->url(); + if ( soundURL.isRelative() ) + { +- QString soundString = soundURL.toLocalFile(); ++ QString soundString = m_ui.Sound_select->text(); + // we need a way to get the application name in order to ba able to do this : + /*QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile); + search = KGlobal::mainComponent().dirs()->findResource("data", search); diff --git a/testing/kdelibs/kdelibs-4.7.4-xinelib12x.patch b/testing/kdelibs/kdelibs-4.7.4-xinelib12x.patch new file mode 100644 index 000000000..bdcd39a6c --- /dev/null +++ b/testing/kdelibs/kdelibs-4.7.4-xinelib12x.patch @@ -0,0 +1,32 @@ +From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001 +From: Johannes Huber <johu@gentoo.org> +Date: Thu, 5 Jan 2012 10:06:05 +0100 +Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2. + +--- + cmake/modules/FindXine.cmake | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake +index 37c58c6..d71969a 100644 +--- a/cmake/modules/FindXine.cmake ++++ b/cmake/modules/FindXine.cmake +@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine + ${PC_LIBXINE_LIBRARY_DIRS} + ) + +-find_program(XINECONFIG_EXECUTABLE NAMES xine-config ++find_program(XINECONFIG_EXECUTABLE NAMES pkg-config + HINTS + ${PC_LIBXINE_PREFIX}/bin + ) + + if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) +- exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) ++ exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) + if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER) is new since cmake 2.6.2 + set(XINE_VERSION_OK TRUE) + string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) +-- +1.7.8.2 + diff --git a/testing/libdrm/PKGBUILD b/testing/libdrm/PKGBUILD index 3212d196e..e60ca25f3 100644 --- a/testing/libdrm/PKGBUILD +++ b/testing/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 145126 2011-12-17 09:08:44Z andyrtr $ +# $Id: PKGBUILD 146279 2012-01-07 22:21:14Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.29 +pkgver=2.4.30 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) @@ -14,18 +14,18 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch COPYING - git_fixes.diff) -md5sums=('96d5e3e9edd55f4b016fe3b5dd0a1953' - 'c722c8406507b7e3a8da7a3030d1d9cf' - 'ba65e71c481b94ef0fb6c23c7f21ffa1' - 'aebd5336568090b8ec084fabcfb08071') +# git_fixes.diff +) +md5sums=('9f57a68b2c0836b55ebcbc241f6ca175' + 'fb8a15bf4aff5646c517373e8277f440' + 'ba65e71c481b94ef0fb6c23c7f21ffa1') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" # git fixes - currently none - patch -Np1 -i ${srcdir}/git_fixes.diff +# patch -Np1 -i ${srcdir}/git_fixes.diff #libtoolize --force autoreconf --force --install diff --git a/testing/libdrm/no-pthread-stubs.patch b/testing/libdrm/no-pthread-stubs.patch index 348c2a795..03bb66953 100644 --- a/testing/libdrm/no-pthread-stubs.patch +++ b/testing/libdrm/no-pthread-stubs.patch @@ -14,7 +14,7 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac AC_SUBST(PCIACCESS_LIBS) --- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 -@@ -26,14 +26,13 @@ +@@ -26,7 +26,6 @@ $(WARN_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/intel \ @@ -22,14 +22,14 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac $(PCIACCESS_CFLAGS) \ -I$(top_srcdir)/include/drm - libdrm_intel_la_LTLIBRARIES = libdrm_intel.la +@@ -34,7 +33,6 @@ libdrm_intel_ladir = $(libdir) libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@ -+libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@ + libdrm_intel_la_LIBADD = ../libdrm.la \ +- @PTHREADSTUBS_LIBS@ \ + @PCIACCESS_LIBS@ \ + @CLOCK_LIB@ - libdrm_intel_la_SOURCES = \ - intel_bufmgr.c \ --- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000 @@ -26,13 +26,12 @@ diff --git a/testing/opencv/PKGBUILD b/testing/opencv/PKGBUILD new file mode 100644 index 000000000..e0c769e07 --- /dev/null +++ b/testing/opencv/PKGBUILD @@ -0,0 +1,119 @@ +# $Id: PKGBUILD 146253 2012-01-07 05:13:32Z eric $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +pkgbase=opencv +pkgname=('opencv' 'opencv-docs' 'opencv-samples') +_realname=OpenCV +pkgver=2.3.1_a +_realver=2.3.1 +pkgrel=3 +pkgdesc="Open Source Computer Vision Library" +arch=('i686' 'x86_64') +license=('BSD') +url="http://opencv.willowgarage.com/" +depends=('jasper' 'gstreamer0.10-base' 'openexr' + 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') +makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') +optdepends=('opencv-docs' + 'opencv-samples' + 'eigen2' + 'python2-numpy: Python 2.x interface') +options=('!libtool') +source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_realver}a.tar.bz2") +md5sums=('82e4b6bfa349777233eea09b075e931e') + +_cmakeopts=('-D CMAKE_BUILD_TYPE=Release' + '-D CMAKE_INSTALL_PREFIX=/usr' + '-D CMAKE_SKIP_RPATH=ON' + '-D BUILD_TESTS=OFF' + '-D ENABLE_SSE=ON' + '-D ENABLE_SSE2=ON' + '-D ENABLE_SSE3=OFF' + '-D ENABLE_SSSE3=OFF' + '-D ENABLE_SSE41=OFF' + '-D ENABLE_SSE42=OFF' + '-D BUILD_EXAMPLES=ON' + '-D INSTALL_C_EXAMPLES=ON' + '-D INSTALL_PYTHON_EXAMPLES=ON' + '-D WITH_XINE=ON' + '-D WITH_QT=OFF' + '-D WITH_QT_OPENGL=OFF' + '-D WITH_UNICAP=OFF' + '-D WITH_PVAPI=OFF' + '-D WITH_OPENNI=OFF' + '-D WITH_TBB=OFF' + '-D WITH_IPP=OFF' + '-D WITH_CUDA=OFF' + '-D USE_FAST_MATH=ON') + +build() { + cd "$srcdir/$_realname-$_realver" + + # x64, i.e "Athlon64" and upwards, can use SSE3 + [ $CARCH = x86_64 ] && \ + _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} + + cmake ${_cmakeopts[@]} . + + make +} + +package_opencv() { + cd "$srcdir/$_realname-$_realver" + + make DESTDIR="$pkgdir" install + + # install license file + install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + cd "$pkgdir/usr/share" + + # prepare FSH-friendly dirs + if [ -d OpenCV ]; then + mv opencv/samples OpenCV/ + rm -r opencv + mv OpenCV opencv + fi + + # separate docs package; also be -R friendly + [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc" + + # separate samples package + [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples" +} + +package_opencv-docs() { + pkgdesc+=" (documentation)" + unset depends + unset optdepends + options=('docs') + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/doc" + cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" + + # install license file + install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_opencv-samples() { + pkgdesc+=" (samples)" + depends=('bash') + unset optdepends + unset options + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/opencv" + cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" + + # install license file + install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/oxine/PKGBUILD b/testing/oxine/PKGBUILD new file mode 100644 index 000000000..6ccda1c01 --- /dev/null +++ b/testing/oxine/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 146255 2012-01-07 05:13:36Z eric $ +# Maintainer: Alexander Baldeck <alexander@archlinux.org> +# Contributor: Rouslan Solomakhin <rouslan@localnet.com> +# Contributor: dorphell <dorphell@archlinux.org> + +pkgname=oxine +pkgver=0.7.1 +pkgrel=5 +pkgdesc="A lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems" +arch=('i686' 'x86_64') +url="http://oxine.sourceforge.net/" +license=('GPL') +depends=('xine-lib' 'libexif' 'eject' 'libcdio' 'curl' 'libxtst') +source=(http://downloads.sourceforge.net/sourceforge/oxine/${pkgname}-${pkgver}.tar.gz) +md5sums=('2a2d05ee21892624e35cf539e532c0dd') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|#include <curl/types.h>||' configure src/download.c + ./configure --prefix=/usr --disable-hal --without-jsw --disable-extractor \ + --without-imagemagick --disable-gdkpixbuf --disable-weather + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/xine-lib/PKGBUILD b/testing/xine-lib/PKGBUILD new file mode 100644 index 000000000..b0075a03a --- /dev/null +++ b/testing/xine-lib/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 146257 2012-01-07 05:13:38Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=xine-lib +pkgver=1.2.0 +pkgrel=1 +pkgdesc="A multimedia playback engine" +arch=('i686' 'x86_64') +url="http://www.xine-project.org" +license=('LGPL' 'GPL') +depends=('libxvmc' 'ffmpeg' 'libxinerama') +makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug' + 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' + 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs') +optdepends=('imagemagick: for using the imagemagick plugin' \ + 'jack: for using the jack plugin' \ + 'vcdimager: for using the vcd plugin' \ + 'mesa: for using the opengl plugin' \ + 'wavpack: for using the wavpack plugin' \ + 'faad2: for using the faad plugin' \ + 'libmng: for using the mng plugin' \ + 'aalib: for using the aalib plugin' \ + 'libmodplug: for using the modplug plugin' \ + 'libdca: for using the dca plugin' \ + 'a52dec: for using the a52 plugin' \ + 'libmad: for using the mp3 plugin' \ + 'libmpcdec: for using the musepack plugin' \ + 'libcaca: for using the caca plugin' \ + 'libbluray: for using the bluray plugin' \ + 'gnome-vfs: for using the gnome-vfs plugin') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz) +sha1sums=('5d5385f2a0c3bb7beaba1079cd9b62c4c92a301d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/xine-ui/PKGBUILD b/testing/xine-ui/PKGBUILD new file mode 100644 index 000000000..aae7761e5 --- /dev/null +++ b/testing/xine-ui/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 146259 2012-01-07 05:13:42Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=xine-ui +pkgver=0.99.6 +pkgrel=4 +pkgdesc="A free video player for Unix" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.xine-project.org" +depends=('xine-lib' 'curl' 'libpng' 'libxft' 'libxxf86vm' + 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme' + 'desktop-file-utils' 'lirc-utils') +makedepends=('libxt') +options=('!strip') +install=xine-ui.install +source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz + lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch + fix_lirc.diff xine-ui-xdg.diff) +sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e' + 'b2df43ede3a9d1a34b80139704a4cbbc7295c584' + '8bbd39f61de7b6991385457a4944b8ea104da88b' + '2361df9ddad59c426b0f863414c6d527b463a38a' + '9c70c6543dae6815710b239b4638ffe3843bac86') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 < "${srcdir}/lirc-check-a89347673097.patch" + patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch" + patch -p1 < "${srcdir}/fix_lirc.diff" + patch -p1 < "${srcdir}/xine-ui-xdg.diff" + sed -i '/\#include <curl\/types.h>/d' src/xitk/download.c + autoconf + ./configure --prefix=/usr --mandir=/usr/share/man \ + --with-x --enable-lirc --without-aalib --enable-debug + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" desktopdir=/usr/share/applications install +} diff --git a/testing/xine-ui/fix_lirc.diff b/testing/xine-ui/fix_lirc.diff new file mode 100644 index 000000000..93890cb5c --- /dev/null +++ b/testing/xine-ui/fix_lirc.diff @@ -0,0 +1,13 @@ +diff --git a/m4/_xine.m4 b/m4/_xine.m4 +--- a/m4/_xine.m4 ++++ b/m4/_xine.m4 +@@ -46,7 +46,8 @@ AC_DEFUN([AC_CHECK_LIRC], + fi + for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do + AC_CHECK_FILE(["$llirc/liblirc_client.so"], +- [LIRC_LIBS="$llirc/liblirc_client.so"] ++ [LIRC_LIBS="$llirc/liblirc_client.so" ++ found_lirc=yes] + AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]), + AC_CHECK_FILE(["$llirc/liblirc_client.a"], + [LIRC_LIBS="$llirc/liblirc_client.a" diff --git a/testing/xine-ui/lirc-check-a89347673097.patch b/testing/xine-ui/lirc-check-a89347673097.patch new file mode 100644 index 000000000..c1c8d2614 --- /dev/null +++ b/testing/xine-ui/lirc-check-a89347673097.patch @@ -0,0 +1,64 @@ + +# HG changeset patch +# User Darren Salt <linux@youmustbejoking.demon.co.uk> +# Date 1268754560 0 +# Node ID a89347673097053d89675e991ab403cda04d94cd +# Parent ed3079d668ed5291d1daf7096d6b42c90ee06e11 +Resync LIRC check with gxine; no longer fails if liblircclient0.pc is missing. + +--- a/m4/_xine.m4 Sun Mar 14 18:04:46 2010 +0000 ++++ b/m4/_xine.m4 Tue Mar 16 15:49:20 2010 +0000 +@@ -25,14 +25,14 @@ + dnl + AC_DEFUN([AC_CHECK_LIRC], + [AC_ARG_ENABLE(lirc, +- [ --disable-lirc Turn off LIRC support.], +- [], enable_lirc=yes) ++ [AS_HELP_STRING([--disable-lirc], [turn off LIRC support])], ++ [given=Y], [given=N; enable_lirc=yes]) + + found_lirc=no + if test x"$enable_lirc" = xyes; then + have_lirc=yes +- PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], []) +- if test "$LIRC_CFLAGS" != ''; then ++ PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [:]) ++ if test "$found_lirc" = yes; then + LIRC_INCLUDE="$LIRC_CFLAGS" + else + AC_REQUIRE_CPP +@@ -42,15 +42,20 @@ + + if test x"$LIRC_PREFIX" != "x"; then + lirc_libprefix="$LIRC_PREFIX/lib" +- LIRC_INCLUDE="-I$LIRC_PREFIX/include" ++ LIRC_INCLUDE="-I$LIRC_PREFIX/include" + fi + for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do +- AC_CHECK_FILE(["$llirc/liblirc_client.a"], +- [LIRC_LIBS="$llirc/liblirc_client.a" +- found_lirc=yes],,) ++ AC_CHECK_FILE(["$llirc/liblirc_client.so"], ++ [LIRC_LIBS="$llirc/liblirc_client.so"] ++ AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]), ++ AC_CHECK_FILE(["$llirc/liblirc_client.a"], ++ [LIRC_LIBS="$llirc/liblirc_client.a" ++ found_lirc=yes],,) ++ ) + done + else +- AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]); ++ test $given = Y && AC_MSG_ERROR([LIRC client support requested but not available]) ++ AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]) + fi + fi + fi +@@ -59,7 +64,6 @@ + fi + AC_SUBST(LIRC_LIBS) + AC_SUBST(LIRC_INCLUDE) +- AM_CONDITIONAL([HAVE_LIRC], [test "x$have_lirc" = "xyes"]) + ]) + + dnl AC_C_ATTRIBUTE_ALIGNED + diff --git a/testing/xine-ui/lirc-makefile-a68dd15ff7ae.patch b/testing/xine-ui/lirc-makefile-a68dd15ff7ae.patch new file mode 100644 index 000000000..daad4f03a --- /dev/null +++ b/testing/xine-ui/lirc-makefile-a68dd15ff7ae.patch @@ -0,0 +1,19 @@ + +# HG changeset patch +# User Darren Salt <linux@youmustbejoking.demon.co.uk> +# Date 1268758696 0 +# Node ID a68dd15ff7ae4be65c2ace25ef66966d7c272514 +# Parent 882c464d4a650d09da37ade366face74452c1897 +Restore definition of HAVE_LIRC for use in makefiles. + +--- a/m4/_xine.m4 Mon Mar 15 12:03:01 2010 -0700 ++++ b/m4/_xine.m4 Tue Mar 16 16:58:16 2010 +0000 +@@ -62,6 +62,7 @@ + if test "$found_lirc" = yes; then + AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]) + fi ++ AM_CONDITIONAL([HAVE_LIRC], [test "$found_lirc" = yes]) + AC_SUBST(LIRC_LIBS) + AC_SUBST(LIRC_INCLUDE) + ]) + diff --git a/testing/xine-ui/xine-ui-xdg.diff b/testing/xine-ui/xine-ui-xdg.diff new file mode 100644 index 000000000..959d674b2 --- /dev/null +++ b/testing/xine-ui/xine-ui-xdg.diff @@ -0,0 +1,206 @@ +--- xine-ui-0.99.6.orig/src/xitk/common.h ++++ xine-ui-0.99.6/src/xitk/common.h +@@ -331,6 +331,5 @@ typedef struct { + int use_root_window; + + int ssaver_enabled; +- int ssaver_timeout; + + int skip_by_chapter; +--- xine-ui-0.99.6.orig/src/xitk/main.c ++++ xine-ui-0.99.6/src/xitk/main.c +@@ -1383,6 +1383,8 @@ int main(int argc, char *argv[]) { + if (sigprocmask (SIG_BLOCK, &vo_mask, NULL)) + fprintf (stderr, "sigprocmask() failed.\n"); + ++ signal(SIGCHLD, SIG_IGN); ++ + gGui = (gGui_t *) calloc(1, sizeof(gGui_t)); + + gGui->stream = NULL; +--- xine-ui-0.99.6.orig/src/xitk/panel.c ++++ xine-ui-0.99.6/src/xitk/panel.c +@@ -356,7 +356,6 @@ void panel_update_runtime_display(void) + * Update slider thread. + */ + static void *slider_loop(void *dummy) { +- int screensaver_timer = 0; + int status, speed; + int pos, secs; + int i = 0; +@@ -441,20 +440,7 @@ static void *slider_loop(void *dummy) { + else + video_window_set_mrl((char *)gGui->mmk.mrl); + +- if(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)) { +- +- if(gGui->ssaver_timeout) { +- +- if(!(i % 2)) +- screensaver_timer++; +- +- if(screensaver_timer >= gGui->ssaver_timeout) { +- screensaver_timer = 0; +- video_window_reset_ssaver(); +- +- } +- } +- } ++ video_window_suspend_ssaver(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)); + + if(gGui->logo_mode == 0) { + +@@ -494,6 +480,8 @@ static void *slider_loop(void *dummy) { + stream_infos_update_infos(); + + } ++ } else { ++ video_window_suspend_ssaver(0); + } + } + +--- xine-ui-0.99.6.orig/src/xitk/videowin.c ++++ xine-ui-0.99.6/src/xitk/videowin.c +@@ -1087,6 +1087,9 @@ static void video_window_adapt_size (voi + + /* The old window should be destroyed now */ + if(old_video_window != None) { ++ /* Screensaver control is tied to our window id */ ++ video_window_suspend_ssaver(0); ++ + XDestroyWindow(gGui->video_display, old_video_window); + + if(gGui->cursor_grabbed) +@@ -2261,69 +2264,34 @@ static void video_window_handle_event (X + + } + +-void video_window_reset_ssaver(void) { ++void video_window_suspend_ssaver(int do_suspend) { ++ static int was_suspended; + +- if(gGui->ssaver_enabled && (xitk_get_last_keypressed_time() >= (long int) gGui->ssaver_timeout)) { ++ do_suspend = do_suspend && gGui->ssaver_enabled; + +-#ifdef HAVE_XTESTEXTENSION +- if(gVw.have_xtest == True) { +- +- gVw.fake_key_cur++; +- +- if(gVw.fake_key_cur >= 2) +- gVw.fake_key_cur = 0; +- +- XLockDisplay(gGui->video_display); +- XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], True, CurrentTime); +- XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], False, CurrentTime); +- XSync(gGui->video_display, False); +- XUnlockDisplay(gGui->video_display); ++ if(was_suspended != do_suspend) { ++ if(fork() == 0) { ++ char window_id[30]; ++ char *args[] = { "xdg-screensaver", NULL, window_id, NULL }; ++ int fd; ++ ++ for(fd = 3; fd < 256; fd++) ++ close(fd); ++ ++ args[1] = do_suspend ? "suspend" : "resume"; ++ sprintf(window_id, "%lu", (unsigned long)gGui->video_window); ++ execvp(args[0], args); ++ _exit(0); + } +- else +-#endif +- { +- /* Reset the gnome screensaver. Look up the command in PATH only once to save time, */ +- /* assuming its location and permission will not change during run time of xine-ui. */ +- { +- static char *const gssaver_args[] = { "gnome-screensaver-command", "--poke", NULL }; +- static char *gssaver_path = NULL; +- +- if(!gssaver_path) { +- char *path = getenv("PATH"); +- +- if(!path) +- path = "/usr/local/bin:/usr/bin"; +- do { +- char *p, *pbuf; +- int plen; +- +- for(p = path; *path && *path != ':'; path++) +- ; +- if(p == path) +- plen = 1, p = "."; +- else +- plen = path - p; +- asprintf(&pbuf, "%.*s/%s", plen, p, gssaver_args[0]); +- if ( access(pbuf, X_OK) ) { +- free(pbuf); +- gssaver_path = ""; +- } else +- gssaver_path = pbuf; +- } while(!gssaver_path[0] && *path++); +- } +- if(gssaver_path[0] && (fork() == 0)) { +- execv(gssaver_path, gssaver_args); +- exit(0); +- } +- } + +- XLockDisplay(gGui->video_display); +- XResetScreenSaver(gGui->video_display); +- XUnlockDisplay(gGui->video_display); +- } ++ was_suspended = do_suspend; + } + } + ++void video_window_reset_ssaver(void) { ++ video_window_suspend_ssaver(1); ++} ++ + void video_window_get_frame_size(int *w, int *h) { + if(w) + *w = gVw.frame_width; +--- xine-ui-0.99.6.orig/src/xitk/videowin.h ++++ xine-ui-0.99.6/src/xitk/videowin.h +@@ -81,6 +81,7 @@ void video_window_get_mag (float *xmag, + void video_window_update_logo(void); + void video_window_change_skins(int); + ++void video_window_suspend_ssaver(int do_suspend); + void video_window_reset_ssaver(void); + + void video_window_get_frame_size(int *w, int *h); +--- xine-ui-0.99.6.orig/src/xitk/event.c ++++ xine-ui-0.99.6/src/xitk/event.c +@@ -135,9 +135,6 @@ static void skip_by_chapter_cb(void *dat + gGui->skip_by_chapter = cfg->num_value; + panel_update_nextprev_tips(); + } +-static void ssaver_timeout_cb(void *data, xine_cfg_entry_t *cfg) { +- gGui->ssaver_timeout = cfg->num_value; +-} + + static void visual_anim_cb(void *data, xine_cfg_entry_t *cfg) { + +@@ -1614,14 +1611,6 @@ void gui_init (int nfiles, char *filenam + snapshot_loc_cb, + CONFIG_NO_DATA); + +- gGui->ssaver_timeout = +- xine_config_register_num (__xineui_global_xine_instance, "gui.screensaver_timeout", 10, +- _("Screensaver reset interval (s)"), +- _("Time, in seconds, between two faked events to keep a screensaver quiet, 0 to disable."), +- CONFIG_LEVEL_ADV, +- ssaver_timeout_cb, +- CONFIG_NO_DATA); +- + gGui->skip_by_chapter = + xine_config_register_bool (__xineui_global_xine_instance, "gui.skip_by_chapter", 1, + _("Chapter hopping"), + + + + + diff --git a/testing/xine-ui/xine-ui.install b/testing/xine-ui/xine-ui.install new file mode 100644 index 000000000..3b3aff7d9 --- /dev/null +++ b/testing/xine-ui/xine-ui.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} |