summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-26 22:29:52 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-26 22:29:52 -0300
commit258bafde6bf3c83e4108230457073e8136719a73 (patch)
treea6132a3a8316be50ff77e3cfcf5c41f94747bd2c /community
parent9b703cb6980ff009ca181cecd900cb2e78f5d54e (diff)
parentf6a79a3f5989efc8db63af942851c56f0c462bb1 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/pigeonhole/PKGBUILD community/pv/PKGBUILD community/python-gnupginterface/PKGBUILD community/tdl/PKGBUILD extra/clisp/PKGBUILD extra/expect/PKGBUILD extra/gtkpod/PKGBUILD extra/hspell/PKGBUILD extra/id3lib/PKGBUILD extra/imake/PKGBUILD extra/libfontenc/PKGBUILD extra/libice/PKGBUILD extra/libsm/PKGBUILD extra/libspectre/PKGBUILD extra/libtasn1/PKGBUILD extra/libxau/PKGBUILD extra/libxaw/PKGBUILD extra/libxxf86dga/PKGBUILD extra/mp3splt/PKGBUILD extra/multitail/PKGBUILD extra/nss_ldap/PKGBUILD extra/pam_ldap/PKGBUILD extra/recode/PKGBUILD extra/ruby/PKGBUILD extra/squid/PKGBUILD extra/ssmtp/PKGBUILD extra/umfpack/PKGBUILD extra/xorg-xbacklight/PKGBUILD extra/xorg-xbiff/PKGBUILD extra/xorg-xcalc/PKGBUILD extra/xorg-xconsole/PKGBUILD extra/xorg-xedit/PKGBUILD extra/xorg-xeyes/PKGBUILD extra/xorg-xvinfo/PKGBUILD
Diffstat (limited to 'community')
-rw-r--r--community/bomberclone/PKGBUILD11
-rw-r--r--community/bomberclone/bomberclone-0.11.9-build-fix.patch444
-rw-r--r--community/fish/PKGBUILD4
-rw-r--r--community/gen2shp/PKGBUILD4
-rw-r--r--community/haskell-stm/PKGBUILD37
-rw-r--r--community/haskell-stm/haskell-stm.install18
-rw-r--r--community/haskell-syb/PKGBUILD37
-rw-r--r--community/haskell-syb/haskell-syb.install18
-rw-r--r--community/libnewt/PKGBUILD2
-rw-r--r--community/libraw/PKGBUILD10
-rw-r--r--community/libraw/libraw.changelog3
-rw-r--r--community/metakit/PKGBUILD4
-rw-r--r--community/milkytracker/PKGBUILD45
-rw-r--r--community/milkytracker/arch.patch645
-rw-r--r--community/milkytracker/milkytracker.desktop9
-rw-r--r--community/pam-krb5/PKGBUILD2
-rw-r--r--community/paraview/PKGBUILD16
-rw-r--r--community/paraview/ffmpeg-0.8.diff66
-rw-r--r--community/pigeonhole/PKGBUILD18
-rw-r--r--community/pv/PKGBUILD17
-rw-r--r--community/python-gnupginterface/PKGBUILD12
-rw-r--r--community/radvd/PKGBUILD4
-rw-r--r--community/tdl/PKGBUILD19
-rw-r--r--community/ucl/PKGBUILD11
-rw-r--r--community/udunits/PKGBUILD25
25 files changed, 1424 insertions, 57 deletions
diff --git a/community/bomberclone/PKGBUILD b/community/bomberclone/PKGBUILD
index 21d94a1da..8f7aae214 100644
--- a/community/bomberclone/PKGBUILD
+++ b/community/bomberclone/PKGBUILD
@@ -1,26 +1,31 @@
-# $Id$
+# $Id: PKGBUILD 66517 2012-02-25 22:47:19Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: arjan <arjan@archlinux.org>
# Contributor: Aurelien Foret <orelien@chez.com>
pkgname=bomberclone
pkgver=0.11.9
-pkgrel=1
+pkgrel=2
pkgdesc='A clone of the game AtomicBomberMan.'
arch=('i686' 'x86_64' 'mips64el')
url="http://www.bomberclone.de/"
license=('GPL')
depends=('sdl_mixer' 'sdl_image')
source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'bomberclone-0.11.9-build-fix.patch'
'bomberclone.desktop')
md5sums=('3edcfcf69b88dbd2eab42541f236e072'
+ '88def2b6faf7a6ac7acd96f617fc460e'
'2c0151859e7e9aebd1fc95a1455f0c3b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ # add build fix extracted from upstream CVS (fixes FS#26942)
+ patch -p0 -i ../bomberclone-0.11.9-build-fix.patch
+
./configure --prefix=/usr
- make
+ make AM_CFLAGS=-lm
}
package() {
diff --git a/community/bomberclone/bomberclone-0.11.9-build-fix.patch b/community/bomberclone/bomberclone-0.11.9-build-fix.patch
new file mode 100644
index 000000000..85522d821
--- /dev/null
+++ b/community/bomberclone/bomberclone-0.11.9-build-fix.patch
@@ -0,0 +1,444 @@
+Index: src/bomb.c
+===================================================================
+RCS file: /cvs/bomberclone/src/bomb.c,v
+retrieving revision 1.71
+retrieving revision 1.72
+diff -u -r1.71 -r1.72
+--- src/bomb.c 11 May 2009 20:51:25 -0000 1.71
++++ src/bomb.c 28 Jan 2012 21:53:19 -0000 1.72
+@@ -1,4 +1,4 @@
+-/* $Id: bomb.c,v 1.71 2009-05-11 20:51:25 stpohle Exp $ */
++/* $Id: bomb.c,v 1.72 2012-01-28 21:53:19 steffen Exp $ */
+ /* everything what have to do with the bombs */
+
+ #include "bomberclone.h"
+@@ -503,17 +503,12 @@
+ * the bomb was kicked.. so move the bomb in the right way..
+ */
+ void bomb_kicked (_bomb * bomb) {
+- float dist, dX, dY, pX, pY;
++ float dX, dY, pX, pY;
+
+ pX = dX = bomb->dest.x - bomb->source.x;
+ pY = dY = bomb->dest.y - bomb->source.y;
+ if (pX < 0.0f) pX = -dX;
+ if (pY < 0.0f) pY = -dY;
+- if (pX == 0.0f) dist = pY;
+- else if (pY == 0.0f) dist = pX;
+- else {
+- dist = sqrtf (powf (pX,2) + powf (pY,2));
+- }
+
+ bomb->fdata += timediff; // * (SPECIAL_KICK_MAXDIST / dist);
+ if (bomb->fdata >= 1.0f) {
+Index: src/gfx.c
+===================================================================
+RCS file: /cvs/bomberclone/src/gfx.c,v
+retrieving revision 1.42
+retrieving revision 1.43
+diff -u -r1.42 -r1.43
+--- src/gfx.c 10 Oct 2009 09:43:55 -0000 1.42
++++ src/gfx.c 28 Jan 2012 21:53:19 -0000 1.43
+@@ -1,4 +1,4 @@
+-/* $Id: gfx.c,v 1.42 2009-10-10 09:43:55 stpohle Exp $ */
++/* $Id: gfx.c,v 1.43 2012-01-28 21:53:19 steffen Exp $ */
+ /* gfx.c */
+
+ #include "bomberclone.h"
+@@ -37,8 +37,7 @@
+ void
+ gfx_load_players (int sx, int sy)
+ {
+- float sfkt,
+- ssfkt;
++ float sfkt;
+ char filename[255];
+ int i,
+ r,
+@@ -47,7 +46,6 @@
+ SDL_Surface *tmpimage,
+ *tmpimage1;
+ sfkt = ((float) sx) / ((float) GFX_IMGSIZE);
+- ssfkt = ((float) GFX_SMALLPLAYERIMGSIZE_X) / ((float) GFX_IMGSIZE);
+
+ d_printf ("gfx_load_players (%d, %d)\n", sx, sy);
+
+@@ -72,10 +70,10 @@
+ gfx.players[i].ani.image = SDL_DisplayFormat (tmpimage1);
+ SDL_FreeSurface (tmpimage1);
+
+- /* calculate the numbers of images for the animation */
+- gfx.players[i].offset.x = (sx - gfx.players[i].ani.w) / 2;
+- gfx.players[i].offset.y = -sy;
+- SDL_FreeSurface (tmpimage);
++ /* calculate the numbers of images for the animation */
++ gfx.players[i].offset.x = (sx - gfx.players[i].ani.w) / 2;
++ gfx.players[i].offset.y = -sy;
++ SDL_FreeSurface (tmpimage);
+ }
+ }
+
+Index: src/gfxpixelimage.c
+===================================================================
+RCS file: /cvs/bomberclone/src/gfxpixelimage.c,v
+retrieving revision 1.13
+retrieving revision 1.14
+diff -u -r1.13 -r1.14
+--- src/gfxpixelimage.c 9 Apr 2005 18:22:41 -0000 1.13
++++ src/gfxpixelimage.c 28 Jan 2012 21:53:19 -0000 1.14
+@@ -1,4 +1,4 @@
+-/* $Id: gfxpixelimage.c,v 1.13 2005-04-09 18:22:41 stpohle Exp $ */
++/* $Id: gfxpixelimage.c,v 1.14 2012-01-28 21:53:19 steffen Exp $ */
+ /* gfx pixel manipulation and image manipulation */
+
+ #include "bomberclone.h"
+@@ -285,10 +285,6 @@
+ SDL_Surface *
+ makegray_image (SDL_Surface * org)
+ {
+- Uint32 rmask,
+- gmask,
+- bmask,
+- amask;
+ Uint32 pixel,
+ transpixel = 0;
+ SDL_Surface *dest;
+@@ -300,18 +296,6 @@
+ b,
+ gray;
+
+-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+- rmask = 0xff000000;
+- gmask = 0x00ff0000;
+- bmask = 0x0000ff00;
+- amask = 0x000000ff;
+-#else /* */
+- rmask = 0x000000ff;
+- gmask = 0x0000ff00;
+- bmask = 0x00ff0000;
+- amask = 0xff000000;
+-#endif /* */
+-
+ dest = SDL_CreateRGBSurface (SDL_SWSURFACE, org->w, org->h, org->format->BitsPerPixel,
+ org->format->Rmask, org->format->Gmask,
+ org->format->Bmask, org->format->Amask);
+Index: src/keyb.c
+===================================================================
+RCS file: /cvs/bomberclone/src/keyb.c,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -r1.7 -r1.8
+--- src/keyb.c 27 Jul 2008 11:24:37 -0000 1.7
++++ src/keyb.c 28 Jan 2012 21:53:19 -0000 1.8
+@@ -1,4 +1,4 @@
+-/* $Id: keyb.c,v 1.7 2008-07-27 11:24:37 stpohle Exp $
++/* $Id: keyb.c,v 1.8 2012-01-28 21:53:19 steffen Exp $
+ * keyb.c
+ */
+
+@@ -180,19 +180,13 @@
+ void keyb_config_joypad (int key) {
+ unsigned int n = 0;
+ SDL_Event event;
+- Uint8 *keys;
+- int keypressed = 0, done = 0, eventstate = 0, reorder = 0, i, j;
++ int done = 0, eventstate = 0, reorder = 0, i, j;
+
+ if (joy[0] == NULL || key < 0 || key >= BCK_max) return;
+
+ SDL_JoystickUpdate ();
+
+ menu_displaytext ("Joypad Config", "Please press the new key\nfor this function.");
+-
+- keys = SDL_GetKeyState (NULL);
+- if (keys[SDLK_RETURN] || keys[SDLK_ESCAPE])
+- keypressed = 1;
+-
+ timestamp = SDL_GetTicks (); // needed for time sync.
+
+ while (!reorder && !done && bman.state != GS_quit) {
+@@ -205,7 +199,6 @@
+ reorder = 0;
+ }
+
+- // eventstate = s_fetchevent (&event);
+ SDL_JoystickEventState ( SDL_QUERY ); // js
+ SDL_JoystickUpdate ();
+
+@@ -245,9 +238,7 @@
+ void keyb_config_readkey (int key) {
+ int newkey;
+ SDL_Event event;
+- Uint8 *keys;
+- int keypressed = 0,
+- done = 0,
++ int done = 0,
+ eventstate = 0,
+ reorder = 0;
+ newkey = 0;
+@@ -257,11 +248,6 @@
+ return;
+
+ menu_displaytext ("Keyboard Config", "Please press the new key\nfor this function.");
+-
+- keys = SDL_GetKeyState (NULL);
+- if (keys[SDLK_RETURN] || keys[SDLK_ESCAPE])
+- keypressed = 1;
+-
+ timestamp = SDL_GetTicks (); // needed for time sync.
+
+ while (!reorder && !done && bman.state != GS_quit) {
+Index: src/mapmenu.c
+===================================================================
+RCS file: /cvs/bomberclone/src/mapmenu.c,v
+retrieving revision 1.27
+retrieving revision 1.28
+diff -u -r1.27 -r1.28
+--- src/mapmenu.c 30 Jul 2006 11:44:58 -0000 1.27
++++ src/mapmenu.c 28 Jan 2012 21:53:19 -0000 1.28
+@@ -1,4 +1,4 @@
+-/* $Id: mapmenu.c,v 1.27 2006-07-30 11:44:58 stpohle Exp $ */
++/* $Id: mapmenu.c,v 1.28 2012-01-28 21:53:19 steffen Exp $ */
+ /* map/tileset selection menu */
+
+ #include "bomberclone.h"
+@@ -174,15 +174,14 @@
+ {
+ _keybinput ki;
+ SDL_Event event;
+- int x,
+- y,
++ int y,
+ eventstate,
+ done = 0;
+ char text[255];
+
+ // draw_menubox (WIN_X, WIN_Y);
+
+- x = gfx.res.x / 2;
++// x = gfx.res.x / 2;
+ y = gfx.res.y / 2 - WIN_Y / 2;
+
+ sprintf (text, "Map Settings");
+Index: src/menu.c
+===================================================================
+RCS file: /cvs/bomberclone/src/menu.c,v
+retrieving revision 1.53
+retrieving revision 1.54
+diff -u -r1.53 -r1.54
+--- src/menu.c 6 Feb 2006 21:18:01 -0000 1.53
++++ src/menu.c 28 Jan 2012 21:53:19 -0000 1.54
+@@ -1,4 +1,4 @@
+-/* $Id: menu.c,v 1.53 2006-02-06 21:18:01 stpohle Exp $
++/* $Id: menu.c,v 1.54 2012-01-28 21:53:19 steffen Exp $
+ * Menuhandling */
+
+ #include "basic.h"
+@@ -591,11 +591,10 @@
+ menuselect;
+ _charlist *selfile = flist;
+ _menu *menu;
+- _menuitem *dirmi;
+
+ flcnt = menu_create_dirlist (path, dirflags, flist, MAX_DIRENTRYS);
+ menu = menu_new (title, 300, 300);
+- dirmi = menu_create_list (menu, "Dir", -1, 50, 200, 200, flist, &selfile, 1);
++ menu_create_list (menu, "Dir", -1, 50, 200, 200, flist, &selfile, 1);
+ menu_create_button (menu, "OK", -1, 270, 150, 0);
+ menu_focus_id (menu, 1);
+
+Index: src/netsrvlist.c
+===================================================================
+RCS file: /cvs/bomberclone/src/netsrvlist.c,v
+retrieving revision 1.17
+retrieving revision 1.18
+diff -u -r1.17 -r1.18
+--- src/netsrvlist.c 7 Aug 2005 17:46:21 -0000 1.17
++++ src/netsrvlist.c 28 Jan 2012 21:53:19 -0000 1.18
+@@ -1,4 +1,4 @@
+-/* $Id: netsrvlist.c,v 1.17 2005-08-07 17:46:21 stpohle Exp $
++/* $Id: netsrvlist.c,v 1.18 2012-01-28 21:53:19 steffen Exp $
+ * netsrvlist.c - shows a list of possible servers.*/
+
+ #include "basic.h"
+@@ -124,7 +124,6 @@
+ _charlist *sel_entry = &srvlst_text[0];
+ _menu *menu;
+ _menuitem *srvlst_listmenu;
+- _menuitem *srvlst_entry;
+ SDL_Event event;
+
+ d_printf ("net_getserver\n");
+@@ -137,7 +136,7 @@
+
+ menu = menu_new ("Join a Game", 500, 400);
+ srvlst_listmenu = menu_create_list (menu, "Host a Game", -1, 50, 475, 250, srvlst_text, &sel_entry, 1);
+- srvlst_entry = menu_create_entry (menu, "IP :", -1, 320, 475, bman.servername, LEN_SERVERNAME+LEN_PORT + 2, MENU_entrytext, 2);
++ menu_create_entry (menu, "IP :", -1, 320, 475, bman.servername, LEN_SERVERNAME+LEN_PORT + 2, MENU_entrytext, 2);
+ menu_create_button (menu, "OK", -1, 350, 150, 0);
+ menu_focus_id (menu, 1);
+
+Index: src/network.c
+===================================================================
+RCS file: /cvs/bomberclone/src/network.c,v
+retrieving revision 1.79
+retrieving revision 1.80
+diff -u -r1.79 -r1.80
+--- src/network.c 12 Jan 2007 22:42:31 -0000 1.79
++++ src/network.c 28 Jan 2012 21:53:19 -0000 1.80
+@@ -1,4 +1,4 @@
+-/* $Id: network.c,v 1.79 2007-01-12 22:42:31 stpohle Exp $ */
++/* $Id: network.c,v 1.80 2012-01-28 21:53:19 steffen Exp $ */
+ /*
+ network routines.
+ */
+@@ -460,7 +460,6 @@
+ net_transmit_gamedata ()
+ {
+ int done = 0,
+- keypressed = 0,
+ x,
+ y, // network upload status for one step
+ p,
+@@ -621,12 +620,10 @@
+ if (keys[SDLK_ESCAPE] && event.type == SDL_KEYDOWN) {
+ done = 1;
+ bman.p_nr = -1;
+- keypressed = 1;
+ bman.state = GS_startup;
+ }
+
+- if (event.type == SDL_KEYUP)
+- keypressed = 0;
++// if (event.type == SDL_KEYUP)
+ }
+
+ timestamp = SDL_GetTicks (); // needed for time sync.
+Index: src/player.c
+===================================================================
+RCS file: /cvs/bomberclone/src/player.c,v
+retrieving revision 1.108
+retrieving revision 1.109
+diff -u -r1.108 -r1.109
+--- src/player.c 11 Oct 2009 17:14:47 -0000 1.108
++++ src/player.c 28 Jan 2012 21:53:19 -0000 1.109
+@@ -1,4 +1,4 @@
+-/* $Id: player.c,v 1.108 2009-10-11 17:14:47 stpohle Exp $
++/* $Id: player.c,v 1.109 2012-01-28 21:53:19 steffen Exp $
+ * player.c - everything what have to do with the player */
+
+ #include <SDL.h>
+@@ -120,7 +120,6 @@
+ {
+ int i,
+ x,
+- xs,
+ xe,
+ y,
+ ys,
+@@ -155,7 +154,6 @@
+ if (ye >= map.size.y)
+ ye = map.size.y - 1;
+ // redrawing of the stone
+- xs = x;
+ for (; x <= xe; x++)
+ for (y = ys; y <= ye; y++)
+ stonelist_add (x, y);
+@@ -445,7 +443,7 @@
+ void
+ player_move (int pl_nr)
+ {
+- int oldd, coll_speed;
++ int oldd;
+ _player *p = &players[pl_nr];
+
+ if (p->tunnelto > 0.0f) {
+@@ -460,7 +458,6 @@
+ player_animation (p);
+ oldd = p->d;
+ p->stepsleft = p->speed * timefactor;
+- coll_speed = p->collect_shoes;
+ do {
+ p->d = oldd;
+ } while ((p->stepsleft = stepmove_player (pl_nr)) > 0);
+@@ -677,9 +674,7 @@
+ player_calcpos ()
+ {
+ _player *pl;
+- int oldm,
+- oldd,
+- p;
++ int p;
+ float oldspeed;
+
+ for (p = 0; p < MAX_PLAYERS; p++) {
+@@ -687,8 +682,6 @@
+ if (PS_IS_netplayer (pl->state) && PS_IS_alife (pl->state) && pl->m != 0) {
+ player_animation (pl);
+ oldspeed = pl->speed;
+- oldm = pl->m;
+- oldd = pl->d;
+ if (pl->speed > 0.0) {
+ pl->speed *= timefactor;
+ stepmove_player (p);
+Index: src/single.c
+===================================================================
+RCS file: /cvs/bomberclone/src/single.c,v
+retrieving revision 1.86
+retrieving revision 1.87
+diff -u -r1.86 -r1.87
+--- src/single.c 19 Aug 2006 23:41:47 -0000 1.86
++++ src/single.c 28 Jan 2012 21:53:19 -0000 1.87
+@@ -1,4 +1,4 @@
+-/* $Id: single.c,v 1.86 2006-08-19 23:41:47 stpohle Exp $ */
++/* $Id: single.c,v 1.87 2012-01-28 21:53:19 steffen Exp $ */
+ /* single player */
+
+ #include "basic.h"
+@@ -711,7 +711,6 @@
+ _charlist nrplayerlist[MAX_PLAYERS + 1];
+ _charlist *selnrplayer = &nrplayerlist[bman.ai_players];
+ _menu *menu;
+- _menuitem *aiplayer = NULL;
+ SDL_Event event;
+
+ /* fill in the nrplayerlist */
+@@ -729,7 +728,7 @@
+ menu = menu_new ("Single Game", 380,240);
+
+ menu_create_text (menu, "numpl", 20, 50, 12, 2, COLOR_yellow, "Number of\nAI Players");
+- aiplayer = menu_create_list (menu, "AI Players", 40, 90, 50, 100, nrplayerlist, &selnrplayer, 3);
++ menu_create_list (menu, "AI Players", 40, 90, 50, 100, nrplayerlist, &selnrplayer, 3);
+
+ menu_create_button (menu,"Change Playernames" ,160, 50, 210, 4);
+
+Index: src/tileset.c
+===================================================================
+RCS file: /cvs/bomberclone/src/tileset.c,v
+retrieving revision 1.16
+retrieving revision 1.17
+diff -u -r1.16 -r1.17
+--- src/tileset.c 26 Sep 2004 02:28:07 -0000 1.16
++++ src/tileset.c 28 Jan 2012 21:53:19 -0000 1.17
+@@ -1,4 +1,4 @@
+-/* $Id: tileset.c,v 1.16 2004-09-26 02:28:07 stpohle Exp $ */
++/* $Id: tileset.c,v 1.17 2012-01-28 21:53:19 steffen Exp $ */
+ /* load and select tilesets */
+
+ #include "bomberclone.h"
+@@ -72,7 +72,6 @@
+ char tileset[LEN_TILESETNAME];
+ SDL_Surface *tmpimage,
+ *tmpimage1;
+- float sfkt;
+
+ d_printf ("Loading Tileset: %s\n", tilesetname);
+ strncpy (tileset, tilesetname, LEN_TILESETNAME);
+@@ -101,7 +100,6 @@
+
+ /* create Table of points */
+ scale (gfx.postab, gfx.block.x, 256);
+- sfkt = ((float) gfx.block.x) / ((float) GFX_IMGSIZE);
+
+ /* calculating the best offset for the field on the screen */
+ gfx.offset.x = (gfx.res.x - (gfx.block.x * map.size.x)) / 2;
diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD
index 204b07db1..2fc566612 100644
--- a/community/fish/PKGBUILD
+++ b/community/fish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 39735 2011-02-15 21:06:59Z kchen $
+# $Id: PKGBUILD 66524 2012-02-25 23:19:41Z lfleischer $
# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
# Contributor: Eric Belanger <eric@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=fish
pkgver=1.23.1
-pkgrel=4
+pkgrel=5
pkgdesc="User friendly shell intended mostly for interactive use"
arch=('i686' 'x86_64' 'mips64el')
url="http://fishshell.com/"
diff --git a/community/gen2shp/PKGBUILD b/community/gen2shp/PKGBUILD
index 9b6efc712..f164dda17 100644
--- a/community/gen2shp/PKGBUILD
+++ b/community/gen2shp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 21508 2010-07-16 14:17:42Z tdziedzic $
+# $Id: PKGBUILD 66526 2012-02-25 23:23:48Z lfleischer $
# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
pkgname=gen2shp
pkgver=0.3.1
-pkgrel=5
+pkgrel=6
pkgdesc='Converts ArcInfo generate format to shapefile format'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.intevation.de/~jan/gen2shp/'
diff --git a/community/haskell-stm/PKGBUILD b/community/haskell-stm/PKGBUILD
new file mode 100644
index 000000000..fe62847d3
--- /dev/null
+++ b/community/haskell-stm/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+# Package generated by cabal2arch 0.7.5
+_hkgname=stm
+pkgname=haskell-stm
+pkgver=2.2.0.1
+pkgrel=2.1
+pkgdesc="A modular composable concurrency abstraction."
+url="http://hackage.haskell.org/package/stm"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.0.3-2' 'sh')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
+install=${pkgname}.install
+md5sums=('b1cf03ed315e00c33160746feeee8682')
+
+build() {
+ cd ${srcdir}/${_hkgname}-$pkgver
+ runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
+ --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+ runhaskell Setup build
+ runhaskell Setup haddock
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+ cd ${srcdir}/${_hkgname}-$pkgver
+ install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+ install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+ install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+ ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+ runhaskell Setup copy --destdir=${pkgdir}
+ install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-stm/haskell-stm.install b/community/haskell-stm/haskell-stm.install
new file mode 100644
index 000000000..0283c2fc5
--- /dev/null
+++ b/community/haskell-stm/haskell-stm.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-stm
+post_install() {
+ ${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+ ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+ ${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+ ${HS_DIR}/unregister.sh
+}
+post_remove() {
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD
new file mode 100644
index 000000000..64faf05ed
--- /dev/null
+++ b/community/haskell-syb/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Rémy Oudompheng <remy@archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+_hkgname=syb
+pkgname=haskell-syb
+pkgver=0.3
+pkgrel=2.1
+pkgdesc="A library for client-side HTTP"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.0.3-2' sh)
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('c4f6771fa32d467a029e6e813757a9fe')
+
+build() {
+ cd ${srcdir}/${_hkgname}-${pkgver}
+ runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
+ runhaskell Setup build
+ runhaskell Setup haddock
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+ cd ${srcdir}/${_hkgname}-${pkgver}
+ install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+ install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+ install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+ ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+ runhaskell Setup copy --destdir=${pkgdir}
+ install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
+
diff --git a/community/haskell-syb/haskell-syb.install b/community/haskell-syb/haskell-syb.install
new file mode 100644
index 000000000..080055165
--- /dev/null
+++ b/community/haskell-syb/haskell-syb.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-syb
+post_install() {
+ ${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+ ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+ ${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+ ${HS_DIR}/unregister.sh
+}
+post_remove() {
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/libnewt/PKGBUILD b/community/libnewt/PKGBUILD
index 0b924ad9e..b0493cd1f 100644
--- a/community/libnewt/PKGBUILD
+++ b/community/libnewt/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=libnewt
pkgver=0.52.12
-pkgrel=3
+pkgrel=4
pkgdesc="Not Erik's Windowing Toolkit - text mode windowing with slang"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.redhat.com"
diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD
index 38ba55565..a112d3534 100644
--- a/community/libraw/PKGBUILD
+++ b/community/libraw/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 60435 2011-12-13 20:54:21Z jlichtblau $
+# $Id: PKGBUILD 66498 2012-02-25 18:39:15Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
pkgname=libraw
-pkgver=0.14.4
+pkgver=0.14.5
pkgrel=1
pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('lcms')
options=('!makeflags')
changelog=$pkgname.changelog
source=(http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz)
-sha256sums=('795a8615381868942b27636ea83d741d7c8d17afa9f00b5b7fe26212c42ee59c')
+sha256sums=('f8b17f5fd0c2801f05dfb7cdee7c55e399094cdb53d521be0cd6d5317291f080')
build() {
cd ${srcdir}/LibRaw-${pkgver}
@@ -28,4 +28,8 @@ package() {
cd ${srcdir}/LibRaw-${pkgver}
make DESTDIR=${pkgdir} install
+
+#license
+ install -D -m644 ${srcdir}/LibRaw-${pkgver}/LICENSE.LibRaw.pdf \
+ ${pkgdir}/usr/share/licenses/libraw/LICENSE.LibRaw.pdf
}
diff --git a/community/libraw/libraw.changelog b/community/libraw/libraw.changelog
index 88d6be5d2..311ba4dbc 100644
--- a/community/libraw/libraw.changelog
+++ b/community/libraw/libraw.changelog
@@ -1,2 +1,5 @@
+2012-02-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * libraw 0.14.5-1
+
2011-12-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* libraw 0.14.4-1
diff --git a/community/metakit/PKGBUILD b/community/metakit/PKGBUILD
index b5f89e93c..87a34ad2c 100644
--- a/community/metakit/PKGBUILD
+++ b/community/metakit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 27187 2010-09-18 15:58:45Z schuay $
+# $Id: PKGBUILD 66530 2012-02-25 23:36:00Z lfleischer $
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=metakit
pkgver=2.4.9.7
-pkgrel=4
+pkgrel=5
pkgdesc='MetaKit is an efficient database library with a small footprint'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.equi4.com/metakit/'
diff --git a/community/milkytracker/PKGBUILD b/community/milkytracker/PKGBUILD
new file mode 100644
index 000000000..430a67ffa
--- /dev/null
+++ b/community/milkytracker/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Christopher O'Neill <milkytracker at chrisoneill co uk>
+
+pkgname=milkytracker
+pkgver=0.90.85
+pkgrel=3
+pkgdesc="Fast Tracker II inspired music tracker"
+arch=('x86_64' 'i686')
+url="http://www.milkytracker.org/"
+license=('GPL3')
+depends=('sdl>=1.2.0' 'alsa-lib' 'zlib' 'gcc-libs')
+optdepends=('jack-audio-connection-kit: JACK audio support')
+options=('docs')
+source=("http://milkytracker.org/files/$pkgname-$pkgver.tar.bz2"
+ 'arch.patch'
+ "$pkgname.desktop")
+sha256sums=('59a0d294d63752be74b157e07b0c70252c9198c312d9b1ad0ca460129fe5bd80'
+ 'cb9dfa99491d72eae7c09e7bae6c35871dddbc5b6a71730e772daa2f31f922bc'
+ 'c947a7b0689900c8ebfa29113553be87b7b151714c24f84f286ff81cd5e69063')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ patch -p1 -i ../arch.patch
+ ./configure --prefix=/usr --with-alsa
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+ mkdir -p "$pkgdir/usr/share/applications" \
+ "$pkgdir/usr/share/doc/milkytracker"
+ install -Dm644 resources/pictures/carton.png \
+ "$pkgdir/usr/share/pixmaps/milkytracker.png"
+ install -m644 "$srcdir/milkytracker.desktop" "$pkgdir/usr/share/applications"
+ install -m644 docs/ChangeLog.html "$pkgdir/usr/share/doc/milkytracker"
+ install -m644 docs/MilkyTracker.html "$pkgdir/usr/share/doc/milkytracker"
+ install -m644 docs/readme_unix "$pkgdir/usr/share/doc/milkytracker"
+ install -m644 docs/FAQ.html "$pkgdir/usr/share/doc/milkytracker"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/milkytracker/arch.patch b/community/milkytracker/arch.patch
new file mode 100644
index 000000000..3f5cb16cb
--- /dev/null
+++ b/community/milkytracker/arch.patch
@@ -0,0 +1,645 @@
+*** milkytracker-0.90.85/src/tracker/sdl/SDL_Main.cpp 2009-02-22 10:20:39.140388000 +0000
+--- milkytracker-trunk/src/tracker/sdl/SDL_Main.cpp 2010-01-03 18:11:52.541377210 +0000
+***************
+*** 751,758 ****
+ case SDLUserEventLMouseRepeat:
+ {
+ PPPoint p;
+! p.x = (pp_int32)event.data1;
+! p.y = (pp_int32)event.data2;
+ PPEvent myEvent(eLMouseRepeat, &p, sizeof(PPPoint));
+ RaiseEventSerialized(&myEvent);
+ break;
+--- 751,758 ----
+ case SDLUserEventLMouseRepeat:
+ {
+ PPPoint p;
+! p.x = reinterpret_cast<intptr_t> (event.data1);
+! p.y = reinterpret_cast<intptr_t> (event.data2);
+ PPEvent myEvent(eLMouseRepeat, &p, sizeof(PPPoint));
+ RaiseEventSerialized(&myEvent);
+ break;
+***************
+*** 761,768 ****
+ case SDLUserEventRMouseRepeat:
+ {
+ PPPoint p;
+! p.x = (pp_int32)event.data1;
+! p.y = (pp_int32)event.data2;
+ PPEvent myEvent(eRMouseRepeat, &p, sizeof(PPPoint));
+ RaiseEventSerialized(&myEvent);
+ break;
+--- 761,768 ----
+ case SDLUserEventRMouseRepeat:
+ {
+ PPPoint p;
+! p.x = reinterpret_cast<intptr_t> (event.data1);
+! p.y = reinterpret_cast<intptr_t> (event.data2);
+ PPEvent myEvent(eRMouseRepeat, &p, sizeof(PPPoint));
+ RaiseEventSerialized(&myEvent);
+ break;
+***************
+*** 770,777 ****
+
+ case SDLUserEventMidiKeyDown:
+ {
+! pp_int32 note = (pp_int32)event.data1;
+! pp_int32 volume = (pp_int32)event.data2;
+ globalMutex->lock();
+ myTracker->sendNoteDown(note, volume);
+ globalMutex->unlock();
+--- 770,777 ----
+
+ case SDLUserEventMidiKeyDown:
+ {
+! pp_int32 note = reinterpret_cast<intptr_t> (event.data1);
+! pp_int32 volume = reinterpret_cast<intptr_t> (event.data2);
+ globalMutex->lock();
+ myTracker->sendNoteDown(note, volume);
+ globalMutex->unlock();
+***************
+*** 780,786 ****
+
+ case SDLUserEventMidiKeyUp:
+ {
+! pp_int32 note = (pp_int32)event.data1;
+ globalMutex->lock();
+ myTracker->sendNoteUp(note);
+ globalMutex->unlock();
+--- 780,786 ----
+
+ case SDLUserEventMidiKeyUp:
+ {
+! pp_int32 note = reinterpret_cast<intptr_t> (event.data1);
+ globalMutex->lock();
+ myTracker->sendNoteUp(note);
+ globalMutex->unlock();
+diff -c -x .svn milkytracker-0.90.85/docs/FAQ.html milkytracker-trunk/docs/FAQ.html
+*** milkytracker-0.90.85/docs/FAQ.html 2010-01-01 23:00:57.183928000 +0000
+--- milkytracker-trunk/docs/FAQ.html 2010-01-05 10:34:37.212763931 +0000
+***************
+*** 49,65 ****
+ {
+ questions = document.getElementsByTagName('a');
+ answers = document.getElementsByTagName('ul');
+! for (i = 1; i <= questions.length; i++)
+ {
+! questions.item(i-1).id = "q"+i;
+! var question = questions.item(i-1).id;
+! document.getElementById(question).href="javascript:flip('a"+i+"')";
+ }
+! for (i = 1; i <= answers.length; i++)
+ {
+! answers.item(i-1).id = "a"+i;
+! var answer = answers.item(i-1).id;
+! document.getElementById(answer).style.display="none";
+ }
+ }
+ }
+--- 49,66 ----
+ {
+ questions = document.getElementsByTagName('a');
+ answers = document.getElementsByTagName('ul');
+! q = 0;
+! for (i = 0; i < questions.length; i++)
+ {
+! if(questions.item(i).href != "") continue;
+! questions.item(i).id = "q"+q;
+! questions.item(i).href="javascript:flip('a"+q+"')";
+! q++;
+ }
+! for (i = 0; i < answers.length; i++)
+ {
+! answers.item(i).id = "a"+i;
+! answers.item(i).style.display="none";
+ }
+ }
+ }
+***************
+*** 87,96 ****
+ <ol>
+
+ <li>
+! <a>Where can I find a list of all the effect codes?</a>
+ <ul>
+ <li>
+! Read the manual: <a href="milkytracker.html">milkytracker.html</a>
+ </li>
+ </ul>
+ </li>
+--- 88,97 ----
+ <ol>
+
+ <li>
+! <a id="question">Where can I find a list of all the effect codes?</a>
+ <ul>
+ <li>
+! Read the manual: <a href="MilkyTracker.html">milkytracker.html</a>
+ </li>
+ </ul>
+ </li>
+***************
+*** 99,105 ****
+ <a>Where can I find a list of all the keyboard shortcuts?</a>
+ <ul>
+ <li>
+! Read the manual: <a href="milkytracker.html">milkytracker.html</a>
+ </li>
+ </ul>
+
+--- 100,106 ----
+ <a>Where can I find a list of all the keyboard shortcuts?</a>
+ <ul>
+ <li>
+! Read the manual: <a href="MilkyTracker.html">milkytracker.html</a>
+ </li>
+ </ul>
+
+diff -c -x .svn milkytracker-0.90.85/docs/MilkyTracker.html milkytracker-trunk/docs/MilkyTracker.html
+*** milkytracker-0.90.85/docs/MilkyTracker.html 2010-01-01 23:00:57.183928000 +0000
+--- milkytracker-trunk/docs/MilkyTracker.html 2010-01-05 10:34:37.212763931 +0000
+***************
+*** 183,189 ****
+ <body>
+ <h1>MilkyTracker Manual <span id="version" style="font-size: 10pt; font-weight: normal;">v0.90.85</span></h1>
+ <p>
+! Hello and welcome to MilkyTracker, an open source multi-platform Fasttracker II compatible music tracker program. This document holds a lot of valuable information about the tracker but it's not a tracking manual. If you want to learn more about tracking and how it's done, the Internet is your friend. We host some resources on <a href="http://www.milkytracker.net/">MilkyTracker.net</a> as well.
+ </p>
+ <h4>Disclaimer:</h4>
+ <p>
+--- 183,189 ----
+ <body>
+ <h1>MilkyTracker Manual <span id="version" style="font-size: 10pt; font-weight: normal;">v0.90.85</span></h1>
+ <p>
+! Hello and welcome to MilkyTracker, an open source multi-platform Fasttracker II compatible music tracker program. This document holds a lot of valuable information about the tracker but it's not a tracking manual. If you want to learn more about tracking and how it's done, the Internet is your friend. We host some resources on <a href="http://www.milkytracker.org/">MilkyTracker.net</a> as well.
+ </p>
+ <h4>Disclaimer:</h4>
+ <p>
+***************
+*** 3111,3122 ****
+ and everybody who donated or dropped a letter.
+ </p>
+ <p>
+! Special greetings to everyone at <a href="http://www.milkytracker.net/?community">#MilkyTracker</a> for making it a daily active channel.
+ </p>
+
+ <h2><a id="contact">10. Contact</a></h2>
+ <p>
+! You can contact the MilkyTracker team by email (<span class="email">ten.rekcartyklim@troppus</span>), through the forum at <a href="http://www.milkytracker.net/?community">http://www.milkytracker.net/?community</a> or in IRC. To chat with the community live, you can connect to #MilkyTracker on <a href="http://www.esper.net/">EsperNet</a> with your IRC client or use the java client on our website.
+ </p>
+
+
+--- 3111,3122 ----
+ and everybody who donated or dropped a letter.
+ </p>
+ <p>
+! Special greetings to everyone at <a href="http://www.milkytracker.org/?community">#MilkyTracker</a> for making it a daily active channel.
+ </p>
+
+ <h2><a id="contact">10. Contact</a></h2>
+ <p>
+! You can contact the MilkyTracker team by email (<span class="email">ten.rekcartyklim@troppus</span>), through the forum at <a href="http://www.milkytracker.org/?community">http://www.milkytracker.org/?community</a> or in IRC. To chat with the community live, you can connect to #MilkyTracker on <a href="http://www.esper.net/">EsperNet</a> with your IRC client or use the java client on our website.
+ </p>
+
+
+Only in milkytracker-0.90.85/docs/: MilkyTracker.rtf
+--- milkytracker-0.90.85/src/compression/DecompressorGZIP.cpp 2009-04-17 22:34:16.000000000 +0200
++++ milkytracker-trunk/src/compression/DecompressorGZIP.cpp 2012-02-20 20:24:49.161937553 +0100
+@@ -61,7 +61,7 @@
+ int len = 0;
+ pp_uint8 *buf;
+
+- if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL)
++ if ((gz_input_file = (gzFile*)gzopen (fileName.getStrBuffer(), "r")) == NULL)
+ return false;
+
+ if ((buf = new pp_uint8[0x10000]) == NULL)
+@@ -71,7 +71,7 @@
+
+ while (true)
+ {
+- len = gzread (gz_input_file, buf, 0x10000);
++ len = gzread (*gz_input_file, buf, 0x10000);
+
+ if (len < 0)
+ {
+@@ -84,7 +84,7 @@
+ fOut.write(buf, 1, len);
+ }
+
+- if (gzclose (gz_input_file) != Z_OK)
++ if (gzclose (*gz_input_file) != Z_OK)
+ {
+ delete[] buf;
+ return false;
+diff -cx .svn milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp
+*** milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp 2009-03-28 11:19:41.392162000 +0000
+--- milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp 2010-01-03 18:48:15.616918068 +0000
+***************
+*** 102,124 ****
+ // Each function has to be cast.. surely there must be an easier way?
+ dlerror();
+ jack_port_get_buffer = (void* (*)(jack_port_t*, jack_nframes_t))
+! dlsym(libJack, "jack_port_get_buffer");
+ jack_client_new = (jack_client_t* (*)(const char*))
+! dlsym(libJack, "jack_client_new");
+ jack_port_register = (jack_port_t* (*)(jack_client_t*, const char*, const char*, long unsigned int, long unsigned int))
+! dlsym(libJack, "jack_port_register");
+ jack_set_process_callback = (int (*)(jack_client_t*, int (*)(jack_nframes_t, void*), void*))
+! dlsym(libJack, "jack_set_process_callback");
+ jack_get_buffer_size = (jack_nframes_t (*)(jack_client_t*))
+! dlsym(libJack, "jack_get_buffer_size");
+ jack_deactivate = (int (*)(jack_client_t*))
+! dlsym(libJack, "jack_deactivate");
+ jack_client_close = (int (*)(jack_client_t*))
+! dlsym(libJack, "jack_client_close");
+ jack_activate = (int (*)(jack_client_t*))
+! dlsym(libJack, "jack_activate");
+ jack_get_sample_rate = (jack_nframes_t (*)(jack_client_t *))
+! dlsym(libJack, "jack_get_sample_rate");
+ if(dlerror()) {
+ fprintf(stderr, "JACK: An error occured whilst loading symbols, aborting.\n");
+ return -1;
+--- 102,130 ----
+ // Each function has to be cast.. surely there must be an easier way?
+ dlerror();
+ jack_port_get_buffer = (void* (*)(jack_port_t*, jack_nframes_t))
+! dlsym(libJack, "jack_port_get_buffer");
+ jack_client_new = (jack_client_t* (*)(const char*))
+! dlsym(libJack, "jack_client_new");
+ jack_port_register = (jack_port_t* (*)(jack_client_t*, const char*, const char*, long unsigned int, long unsigned int))
+! dlsym(libJack, "jack_port_register");
+ jack_set_process_callback = (int (*)(jack_client_t*, int (*)(jack_nframes_t, void*), void*))
+! dlsym(libJack, "jack_set_process_callback");
+ jack_get_buffer_size = (jack_nframes_t (*)(jack_client_t*))
+! dlsym(libJack, "jack_get_buffer_size");
+ jack_deactivate = (int (*)(jack_client_t*))
+! dlsym(libJack, "jack_deactivate");
+ jack_client_close = (int (*)(jack_client_t*))
+! dlsym(libJack, "jack_client_close");
+ jack_activate = (int (*)(jack_client_t*))
+! dlsym(libJack, "jack_activate");
+ jack_get_sample_rate = (jack_nframes_t (*)(jack_client_t *))
+! dlsym(libJack, "jack_get_sample_rate");
+! jack_get_ports = (const char** (*)(jack_client_t *, const char *, const char *, unsigned long))
+! dlsym(libJack, "jack_get_ports");
+! jack_connect = (int (*)(jack_client_t *, const char *source_port, const char *destination_port))
+! dlsym(libJack, "jack_connect");
+! jack_port_name = (const char* (*)(const jack_port_t *))
+! dlsym(libJack, "jack_port_name");
+ if(dlerror()) {
+ fprintf(stderr, "JACK: An error occured whilst loading symbols, aborting.\n");
+ return -1;
+***************
+*** 179,184 ****
+--- 185,196 ----
+
+ mp_sint32 AudioDriver_JACK::start()
+ {
++ jack_get_ports = (const char** (*)(jack_client_t *, const char *, const char *, unsigned long))
++ dlsym(libJack, "jack_get_ports");
++ jack_connect = (int (*)(jack_client_t *, const char *source_port, const char *destination_port))
++ dlsym(libJack, "jack_connect");
++ jack_port_name = (const char* (*)(const jack_port_t *))
++ dlsym(libJack, "jack_port_name");
+ jack_activate(hJack);
+ deviceHasStarted = true;
+ return 0;
+diff -cx .svn milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.h milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.h
+*** milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.h 2009-03-28 11:19:41.392162000 +0000
+--- milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.h 2010-01-03 18:38:35.835648568 +0000
+***************
+*** 57,74 ****
+ jack_client_t *(*jack_client_new) (const char *client_name);
+ int (*jack_client_close) (jack_client_t *client);
+ int (*jack_set_process_callback) (jack_client_t *client,
+! JackProcessCallback process_callback,
+! void *arg);
+ int (*jack_activate) (jack_client_t *client);
+ int (*jack_deactivate) (jack_client_t *client);
+ jack_port_t *(*jack_port_register) (jack_client_t *client,
+! const char *port_name,
+! const char *port_type,
+! unsigned long flags,
+! unsigned long buffer_size);
+ void *(*jack_port_get_buffer) (jack_port_t *, jack_nframes_t);
+ jack_nframes_t (*jack_get_buffer_size) (jack_client_t *);
+ jack_nframes_t (*jack_get_sample_rate) (jack_client_t *);
+
+ public:
+ AudioDriver_JACK();
+--- 57,83 ----
+ jack_client_t *(*jack_client_new) (const char *client_name);
+ int (*jack_client_close) (jack_client_t *client);
+ int (*jack_set_process_callback) (jack_client_t *client,
+! JackProcessCallback process_callback,
+! void *arg);
+ int (*jack_activate) (jack_client_t *client);
+ int (*jack_deactivate) (jack_client_t *client);
+ jack_port_t *(*jack_port_register) (jack_client_t *client,
+! const char *port_name,
+! const char *port_type,
+! unsigned long flags,
+! unsigned long buffer_size);
+ void *(*jack_port_get_buffer) (jack_port_t *, jack_nframes_t);
+ jack_nframes_t (*jack_get_buffer_size) (jack_client_t *);
+ jack_nframes_t (*jack_get_sample_rate) (jack_client_t *);
++ const char ** (*jack_get_ports) (jack_client_t *,
++ const char *port_name_pattern,
++ const char *type_name_pattern,
++ unsigned long flags);
++ int (*jack_connect) (jack_client_t *,
++ const char *source_port,
++ const char *destination_port);
++ const char* (*jack_port_name) (const jack_port_t *);
++
+
+ public:
+ AudioDriver_JACK();
+*** milkytracker-0.90.85/configure.in 2009-09-17 20:35:47.231496000 +0100
+--- milkytracker-trunk/configure.in 2010-01-05 10:03:17.292774154 +0000
+***************
+*** 43,49 ****
+
+ AC_SEARCH_LIBS(gzopen, z, AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the 'libz' library.]),)
+ #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip"))
+! PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75])
+
+ SDL_VERSION=1.2.0
+ AM_PATH_SDL($SDL_VERSION,, AC_MSG_ERROR([Please install libSDL]))
+--- 43,49 ----
+
+ AC_SEARCH_LIBS(gzopen, z, AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the 'libz' library.]),)
+ #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip"))
+! #PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75])
+
+ SDL_VERSION=1.2.0
+ AM_PATH_SDL($SDL_VERSION,, AC_MSG_ERROR([Please install libSDL]))
+*** milkytracker-0.90.85/configure 2010-01-02 00:03:37.602601121 +0000
+--- milkytracker-trunk/configure 2010-01-05 10:03:38.372781464 +0000
+***************
+*** 599,607 ****
+ SDL_LIBS
+ SDL_CFLAGS
+ SDL_CONFIG
+- ZZIP_LIBS
+- ZZIP_CFLAGS
+- PKG_CONFIG
+ ALSA_LIBS
+ ALSA_CFLAGS
+ RTMIDI_DIR
+--- 599,604 ----
+***************
+*** 717,726 ****
+ CCC
+ CC
+ CFLAGS
+! CPP
+! PKG_CONFIG
+! ZZIP_CFLAGS
+! ZZIP_LIBS'
+
+
+ # Initialize some variables set by options.
+--- 714,720 ----
+ CCC
+ CC
+ CFLAGS
+! CPP'
+
+
+ # Initialize some variables set by options.
+***************
+*** 1363,1371 ****
+ CC C compiler command
+ CFLAGS C compiler flags
+ CPP C preprocessor
+- PKG_CONFIG path to pkg-config utility
+- ZZIP_CFLAGS C compiler flags for ZZIP, overriding pkg-config
+- ZZIP_LIBS linker flags for ZZIP, overriding pkg-config
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+--- 1357,1362 ----
+***************
+*** 5313,5524 ****
+ fi
+
+ #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip"))
+!
+!
+! if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+! if test -n "$ac_tool_prefix"; then
+! # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+! set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+! $as_echo_n "checking for $ac_word... " >&6; }
+! if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+! $as_echo_n "(cached) " >&6
+! else
+! case $PKG_CONFIG in
+! [\\/]* | ?:[\\/]*)
+! ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+! ;;
+! *)
+! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+! for as_dir in $PATH
+! do
+! IFS=$as_save_IFS
+! test -z "$as_dir" && as_dir=.
+! for ac_exec_ext in '' $ac_executable_extensions; do
+! if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+! ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+! break 2
+! fi
+! done
+! done
+! IFS=$as_save_IFS
+!
+! ;;
+! esac
+! fi
+! PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+! if test -n "$PKG_CONFIG"; then
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+! $as_echo "$PKG_CONFIG" >&6; }
+! else
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+! $as_echo "no" >&6; }
+! fi
+!
+!
+! fi
+! if test -z "$ac_cv_path_PKG_CONFIG"; then
+! ac_pt_PKG_CONFIG=$PKG_CONFIG
+! # Extract the first word of "pkg-config", so it can be a program name with args.
+! set dummy pkg-config; ac_word=$2
+! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+! $as_echo_n "checking for $ac_word... " >&6; }
+! if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+! $as_echo_n "(cached) " >&6
+! else
+! case $ac_pt_PKG_CONFIG in
+! [\\/]* | ?:[\\/]*)
+! ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+! ;;
+! *)
+! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+! for as_dir in $PATH
+! do
+! IFS=$as_save_IFS
+! test -z "$as_dir" && as_dir=.
+! for ac_exec_ext in '' $ac_executable_extensions; do
+! if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+! ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+! break 2
+! fi
+! done
+! done
+! IFS=$as_save_IFS
+!
+! ;;
+! esac
+! fi
+! ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+! if test -n "$ac_pt_PKG_CONFIG"; then
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+! $as_echo "$ac_pt_PKG_CONFIG" >&6; }
+! else
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+! $as_echo "no" >&6; }
+! fi
+!
+! if test "x$ac_pt_PKG_CONFIG" = x; then
+! PKG_CONFIG=""
+! else
+! case $cross_compiling:$ac_tool_warned in
+! yes:)
+! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+! ac_tool_warned=yes ;;
+! esac
+! PKG_CONFIG=$ac_pt_PKG_CONFIG
+! fi
+! else
+! PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+! fi
+!
+! fi
+! if test -n "$PKG_CONFIG"; then
+! _pkg_min_version=0.9.0
+! { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+! $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+! if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+! $as_echo "yes" >&6; }
+! else
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+! $as_echo "no" >&6; }
+! PKG_CONFIG=""
+! fi
+!
+! fi
+!
+! pkg_failed=no
+! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZZIP" >&5
+! $as_echo_n "checking for ZZIP... " >&6; }
+!
+! if test -n "$PKG_CONFIG"; then
+! if test -n "$ZZIP_CFLAGS"; then
+! pkg_cv_ZZIP_CFLAGS="$ZZIP_CFLAGS"
+! else
+! if test -n "$PKG_CONFIG" && \
+! { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib >= 0.10.75\""; } >&5
+! ($PKG_CONFIG --exists --print-errors "zziplib >= 0.10.75") 2>&5
+! ac_status=$?
+! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+! test $ac_status = 0; }; then
+! pkg_cv_ZZIP_CFLAGS=`$PKG_CONFIG --cflags "zziplib >= 0.10.75" 2>/dev/null`
+! else
+! pkg_failed=yes
+! fi
+! fi
+! else
+! pkg_failed=untried
+! fi
+! if test -n "$PKG_CONFIG"; then
+! if test -n "$ZZIP_LIBS"; then
+! pkg_cv_ZZIP_LIBS="$ZZIP_LIBS"
+! else
+! if test -n "$PKG_CONFIG" && \
+! { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib >= 0.10.75\""; } >&5
+! ($PKG_CONFIG --exists --print-errors "zziplib >= 0.10.75") 2>&5
+! ac_status=$?
+! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+! test $ac_status = 0; }; then
+! pkg_cv_ZZIP_LIBS=`$PKG_CONFIG --libs "zziplib >= 0.10.75" 2>/dev/null`
+! else
+! pkg_failed=yes
+! fi
+! fi
+! else
+! pkg_failed=untried
+! fi
+!
+!
+!
+! if test $pkg_failed = yes; then
+!
+! if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+! _pkg_short_errors_supported=yes
+! else
+! _pkg_short_errors_supported=no
+! fi
+! if test $_pkg_short_errors_supported = yes; then
+! ZZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "zziplib >= 0.10.75"`
+! else
+! ZZIP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "zziplib >= 0.10.75"`
+! fi
+! # Put the nasty error message in config.log where it belongs
+! echo "$ZZIP_PKG_ERRORS" >&5
+!
+! as_fn_error "Package requirements (zziplib >= 0.10.75) were not met:
+!
+! $ZZIP_PKG_ERRORS
+!
+! Consider adjusting the PKG_CONFIG_PATH environment variable if you
+! installed software in a non-standard prefix.
+!
+! Alternatively, you may set the environment variables ZZIP_CFLAGS
+! and ZZIP_LIBS to avoid the need to call pkg-config.
+! See the pkg-config man page for more details.
+! " "$LINENO" 5
+! elif test $pkg_failed = untried; then
+! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+! as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+! is in your PATH or set the PKG_CONFIG environment variable to the full
+! path to pkg-config.
+!
+! Alternatively, you may set the environment variables ZZIP_CFLAGS
+! and ZZIP_LIBS to avoid the need to call pkg-config.
+! See the pkg-config man page for more details.
+!
+! To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+! See \`config.log' for more details." "$LINENO" 5; }
+! else
+! ZZIP_CFLAGS=$pkg_cv_ZZIP_CFLAGS
+! ZZIP_LIBS=$pkg_cv_ZZIP_LIBS
+! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+! $as_echo "yes" >&6; }
+! :
+! fi
+
+ SDL_VERSION=1.2.0
+
+--- 5304,5310 ----
+ fi
+
+ #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip"))
+! #PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75])
+
+ SDL_VERSION=1.2.0
+
diff --git a/community/milkytracker/milkytracker.desktop b/community/milkytracker/milkytracker.desktop
new file mode 100644
index 000000000..0309121cc
--- /dev/null
+++ b/community/milkytracker/milkytracker.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=MilkyTracker
+Type=Application
+Comment=FastTracker 2 inspired music tracker
+Exec=milkytracker
+TryExec=milkytracker
+Icon=milkytracker.png
+Categories=AudioVideo;Audio;AudioVideoEditing;
diff --git a/community/pam-krb5/PKGBUILD b/community/pam-krb5/PKGBUILD
index 7447235c4..10a216da1 100644
--- a/community/pam-krb5/PKGBUILD
+++ b/community/pam-krb5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64590 2012-02-16 20:49:57Z kchen $
+# $Id: PKGBUILD 66533 2012-02-25 23:48:00Z lfleischer $
# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
# Contributor: Ryan Corder <ryanc@greengrey.org>
diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD
index 43fa10053..3e55bf594 100644
--- a/community/paraview/PKGBUILD
+++ b/community/paraview/PKGBUILD
@@ -4,12 +4,14 @@
pkgname=paraview
pkgver=3.14.0
-pkgrel=1
+pkgrel=2
pkgdesc='Parallel Visualization Application using VTK'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.paraview.org'
license=('custom')
depends=('qt' 'python2' 'libgl' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'libcgns2'
+ # export as avi support
+ 'ffmpeg'
# The following is a list of libraries we explicitly tell cmake to use the system library of
'hdf5' 'freetype2' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'expat' 'libxml2' 'libtheora'
)
@@ -17,17 +19,24 @@ makedepends=('cmake' 'desktop-file-utils' 'boost')
source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}-Source.tar.gz"
'paraview.png'
'paraview.desktop'
- 'fix-build-with-zlib-1.2.6.diff')
+ 'fix-build-with-zlib-1.2.6.diff'
+ 'ffmpeg-0.8.diff')
md5sums=('a260bd891fd75d0e276a581a3603edff'
'db623002bc71a257ddfdd0c9c7b14c3f'
'4e4b7172ed18171c37446fd7c4f1e8f5'
- 'e4506b4ed0d2ae60072388f098be6c33')
+ 'e4506b4ed0d2ae60072388f098be6c33'
+ 'e992321c9d1def6034d0fa6607b40c5a')
build() {
cd ${srcdir}/ParaView-${pkgver}-Source
+
# fix http://paraview.org/Bug/view.php?id=12924
patch -Np0 -i ${srcdir}/fix-build-with-zlib-1.2.6.diff
+ # fix http://www.vtk.org/Bug/view.php?id=12691
+ cd VTK
+ patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff
+
mkdir ${srcdir}/build
cd ${srcdir}/build
@@ -53,6 +62,7 @@ build() {
-DPARAVIEW_BUILD_QT_GUI:BOOL=ON \
-DPARAVIEW_USE_VISITBRIDGE:BOOL=ON \
-DVISIT_BUILD_READER_CGNS:BOOL=ON \
+ -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
${cmake_system_flags} \
${cmake_system_python_flags} \
../ParaView-${pkgver}-Source
diff --git a/community/paraview/ffmpeg-0.8.diff b/community/paraview/ffmpeg-0.8.diff
new file mode 100644
index 000000000..523919d6f
--- /dev/null
+++ b/community/paraview/ffmpeg-0.8.diff
@@ -0,0 +1,66 @@
+Description: Upstream changes introduced in version 5.6.1-6.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ vtk (5.6.1-6.1) unstable; urgency=low
+ .
+ [ Michael Schutte ]
+ * Non-maintainer upload.
+ * Remove absolute paths to required libraries from
+ /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes:
+ #506992. Due to the multiarch transition, the original behavior
+ frequently causes reverse build-deps to FTBFS. This change should
+ probably be reverted once all required libraries are multiarched.
+ .
+ [ Steve M. Robbins ]
+ * Override lintian diagnostic about embedded libraries ftgl and sqlite.
+ * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav
+ 0.7.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Steve M. Robbins <smr@debian.org>
+Bug-Debian: http://bugs.debian.org/506992
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx
++++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx
+@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start()
+ }
+
+ //choose avi media file format
+- this->avOutputFormat = guess_format("avi", NULL, NULL);
++ this->avOutputFormat = av_guess_format("avi", NULL, NULL);
+ if (!this->avOutputFormat)
+ {
+ vtkGenericWarningMacro (<< "Could not open the avi media file format.");
+@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start()
+ //Set up the codec.
+ AVCodecContext *c = this->avStream->codec;
+ c->codec_id = (CodecID)this->avOutputFormat->video_codec;
+- c->codec_type = CODEC_TYPE_VIDEO;
++ c->codec_type = AVMEDIA_TYPE_VIDEO;
+ c->width = this->Dim[0];
+ c->height = this->Dim[1];
+ c->pix_fmt = PIX_FMT_YUVJ420P;
+@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
+ pkt.stream_index = this->avStream->index;
+ if (cc->coded_frame->key_frame) //treat keyframes well
+ {
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ }
+ pkt.duration = 0; //presentation duration in time_base units or 0 if NA
+ pkt.pos = -1; //byte position in stream or -1 if NA
diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD
index f94cfaa42..a92054bdf 100644
--- a/community/pigeonhole/PKGBUILD
+++ b/community/pigeonhole/PKGBUILD
@@ -4,34 +4,34 @@
# 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.18
+_dcpkgver=2.1.1
# Make sure to bump pkgrel if changing this.
pkgname=pigeonhole
-pkgver=0.2.6
-pkgrel=1
-pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.0"
+pkgver=0.3.0
+pkgrel=2
+pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1"
arch=('i686' 'x86_64' 'mips64el')
url="http://pigeonhole.dovecot.org/"
license=('LGPL')
depends=('dovecot='$_dcpkgver)
-makedepends=()
conflicts=('dovecot-sieve' 'pigeonhole-hg')
-source=("http://www.rename-it.nl/dovecot/2.0/dovecot-2.0-$pkgname-$pkgver.tar.gz"
+source=("http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-$pkgname-$pkgver.tar.gz"{,.sig}
"dovecot.conf")
options=('!libtool')
-sha256sums=('49829e4aed763848b63b2bf9e288d4bc94020c924ce0621bc850e0a4bf4821ab'
+sha256sums=('2aeee8aa6dc700483b0a5a3d31f535abce71698ed1d467f11e931aeace2b0ada'
+ '181213cd4af854966ff5bb6b5052b49b0b40c0c21999939b8451658053fa396d'
'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858')
build() {
- cd "$srcdir/dovecot-2.0-$pkgname-$pkgver"
+ cd "$srcdir/dovecot-2.1-$pkgname-$pkgver"
./configure --prefix=/usr --with-dovecot=/usr/lib/dovecot
make
}
package() {
- cd "$srcdir/dovecot-2.0-$pkgname-$pkgver"
+ cd "$srcdir/dovecot-2.1-$pkgname-$pkgver"
make DESTDIR="$pkgdir/" install
diff --git a/community/pv/PKGBUILD b/community/pv/PKGBUILD
index 5d09b1152..a3315b1a3 100644
--- a/community/pv/PKGBUILD
+++ b/community/pv/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 37958 2011-01-19 05:59:36Z kchen $
+# $Id: PKGBUILD 66513 2012-02-25 22:25:20Z lfleischer $
# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
# Contributor: Aaron Schaefer <aaron@elasticdog.com>
pkgname=pv
pkgver=1.2.0
-pkgrel=1
-pkgdesc='A terminal-based tool for monitoring the progress of data through a pipeline'
+pkgrel=2
+pkgdesc='A terminal-based tool for monitoring the progress of data through a pipeline.'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.ivarch.com/programs/pv.shtml'
license=('custom:Artistic 2.0')
@@ -15,7 +15,14 @@ md5sums=('f7cc65c850ac98c6013cc448050eee4b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+
./configure --prefix=/usr --mandir=/usr/share/man
- make; make DESTDIR=$pkgdir install
- install -Dm644 doc/COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="$pkgdir" install
+ install -Dm0644 doc/COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
}
diff --git a/community/python-gnupginterface/PKGBUILD b/community/python-gnupginterface/PKGBUILD
index f4710d43c..61b6c09f1 100644
--- a/community/python-gnupginterface/PKGBUILD
+++ b/community/python-gnupginterface/PKGBUILD
@@ -1,15 +1,17 @@
-# Contributer: Aaron Schaefer <aaron@elasticdog.com>
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Aaron Schaefer <aaron@elasticdog.com>
+
pkgname=python-gnupginterface
pkgver=0.3.2
-pkgrel=5
-pkgdesc="A Python interface to GNU Privacy Guard (GnuPG)"
+pkgrel=6
+pkgdesc='A Python interface to GNU Privacy Guard (GnuPG).'
arch=('i686' 'x86_64' 'mips64el')
-url="http://py-gnupg.sourceforge.net/"
+url='http://py-gnupg.sourceforge.net/'
license=('GPL')
depends=('gnupg' 'python2')
provides=('gnupginterface')
replaces=('gnupginterface')
-source=(http://downloads.sourceforge.net/sourceforge/py-gnupg/GnuPGInterface-$pkgver.tar.gz)
+source=("http://downloads.sourceforge.net/sourceforge/py-gnupg/GnuPGInterface-$pkgver.tar.gz")
md5sums=('d4627d83446f96bd8c22f8d15db3f7c2')
build() {
diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD
index 29a200129..afe2ca3ec 100644
--- a/community/radvd/PKGBUILD
+++ b/community/radvd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56578 2011-10-09 01:59:34Z tdziedzic $
+# $Id: PKGBUILD 66535 2012-02-25 23:57:00Z lfleischer $
# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
# Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
pkgname=radvd
pkgver=1.8.2
-pkgrel=1
+pkgrel=2
pkgdesc='IPv6 Router Advertisement / Router Solicitation daemon'
url='http://www.litech.org/radvd/'
license=('custom')
diff --git a/community/tdl/PKGBUILD b/community/tdl/PKGBUILD
index 326787a77..96fa1fae0 100644
--- a/community/tdl/PKGBUILD
+++ b/community/tdl/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 7205 2010-01-03 08:15:43Z dgriffiths $
+# $Id: PKGBUILD 66539 2012-02-26 00:04:59Z lfleischer $
# Maintainer: Jeff Mickey <j@codemac.net>
# Contributor: Jeff "codemac" Mickey <j@codemac.net>
pkgname=tdl
pkgver=1.5.2
-pkgrel=4
-pkgdesc="tdl is a to-do list manager."
+pkgrel=5
+pkgdesc="A to-do list manager."
arch=('i686' 'x86_64' 'mips64el')
url="http://www.rc0.org.uk/tdl/"
license=('GPL')
depends=('ncurses')
-source=(http://www.rpcurnow.force9.co.uk/tdl/$pkgname-$pkgver.tar.gz)
+source=("http://www.rpcurnow.force9.co.uk/tdl/$pkgname-$pkgver.tar.gz")
md5sums=('620cb00bf99b7e786e2b54cda6339a1e')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd "$srcdir/$pkgname-$pkgver"
+
./configure --prefix=/usr --mandir=/usr/share/man
- make || return 1
- make DESTDIR=$pkgdir install
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
}
diff --git a/community/ucl/PKGBUILD b/community/ucl/PKGBUILD
index 0ac1bb6e1..8ea619f4a 100644
--- a/community/ucl/PKGBUILD
+++ b/community/ucl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 20705 2010-07-10 22:26:42Z cbrannon $
+# $Id: PKGBUILD 66541 2012-02-26 00:11:59Z lfleischer $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
# Previous Contributor: arjan <arjan@archlinux.org>
@@ -6,18 +6,23 @@
pkgname=ucl
pkgver=1.03
-pkgrel=4
+pkgrel=5
pkgdesc="Portable lossless data compression library written in ANSI C"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.oberhumer.com/opensource/ucl/"
options=(!libtool)
-source=(http://www.oberhumer.com/opensource/$pkgname/download/$pkgname-$pkgver.tar.gz)
+source=("http://www.oberhumer.com/opensource/$pkgname/download/$pkgname-$pkgver.tar.gz")
md5sums=('852bd691d8abc75b52053465846fba34')
build() {
cd "$srcdir/$pkgname-$pkgver"
+
./configure --prefix=/usr
make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
diff --git a/community/udunits/PKGBUILD b/community/udunits/PKGBUILD
index 782e4fd24..edf46032f 100644
--- a/community/udunits/PKGBUILD
+++ b/community/udunits/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44910 2011-04-12 18:07:39Z kchen $
+# $Id: PKGBUILD 66543 2012-02-26 00:22:29Z lfleischer $
# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
pkgname=udunits
-pkgver=2.1.22
-pkgrel=2
+pkgver=2.1.24
+pkgrel=1
pkgdesc='A tool for calculations of physical quantities'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.unidata.ucar.edu/software/udunits/'
@@ -14,20 +14,27 @@ depends=('glibc' 'expat')
provides=('udunits2')
install=udunits.install
source=("ftp://ftp.unidata.ucar.edu/pub/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('9a1972a1389a9a613beacd9b05aef6ed')
+md5sums=('6986545721747a51285c765644dcd9d8')
build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
# stupid workaround for broken make install
- install -dm755 $pkgdir/usr/share/doc/$pkgname
+ install -dm755 "$pkgdir/usr/share/doc/$pkgname"
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --disable-static
- make; make DESTDIR=$pkgdir install
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
for x in so so.0 so.0.1.0; do
- ln -s libudunits2.$x \
- $pkgdir/usr/lib/libudunits.$x
+ ln -s "libudunits2.$x" "$pkgdir/usr/lib/libudunits.$x"
done
- install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+ install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}