From 3faf011988bf1728989962e062a474aaa62b55f5 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 22 Apr 2013 00:46:42 -0700 Subject: Mon Apr 22 00:46:41 PDT 2013 --- community/alex/PKGBUILD | 8 +- community/aria2/PKGBUILD | 16 +- community/fdm/GNUmakefile.patch | 49 --- community/fdm/PKGBUILD | 36 +- community/fdm/fdm.conf | 2 - community/milkytracker/PKGBUILD | 27 +- community/milkytracker/arch.patch | 632 ---------------------------- community/milkytracker/milkytracker.install | 2 - community/milkytracker/milkytracker.patch | 632 ++++++++++++++++++++++++++++ community/pdf2djvu/PKGBUILD | 4 +- community/remind/PKGBUILD | 6 +- community/ruby-gtk2/PKGBUILD | 25 +- community/ruby-gtk3/PKGBUILD | 13 +- community/smalltalk/PKGBUILD | 13 +- community/supercollider/PKGBUILD | 11 +- community/tinyxml/PKGBUILD | 63 +-- community/tinyxml/tinyxml.pc | 10 + 17 files changed, 770 insertions(+), 779 deletions(-) delete mode 100644 community/fdm/GNUmakefile.patch delete mode 100644 community/fdm/fdm.conf delete mode 100644 community/milkytracker/arch.patch create mode 100644 community/milkytracker/milkytracker.patch create mode 100644 community/tinyxml/tinyxml.pc (limited to 'community') diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD index e48b9db79..93ca55e24 100644 --- a/community/alex/PKGBUILD +++ b/community/alex/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 83990 2013-02-08 04:15:22Z td123 $ +# $Id: PKGBUILD 88642 2013-04-20 22:36:02Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Sergej Pupykin # Contributor: Vesa Kaihlavirta # Contributor: Philip Nilsson pkgname=alex -pkgver=3.0.2 -pkgrel=4 +pkgver=3.0.5 +pkgrel=1 pkgdesc='Lexical analyser generator for Haskell' arch=('x86_64' 'i686') url='http://hackage.haskell.org/package/alex' @@ -14,7 +14,7 @@ license=('custom:BSD3') depends=('gmp') makedepends=('ghc=7.6.2-1' 'haskell-quickcheck>=2') source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") -sha256sums=('997e33342c3c6e0edfff862f051fc286bd661f442d09d1bc02cd6e9d22083164') +sha256sums=('c3326417a0538e355e5ad1871ab931b9c8145391e8b2ff79668eb643d9b99659') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 492116da8..4de1674c0 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86908 2013-03-24 10:25:05Z bpiotrowski $ +# $Id: PKGBUILD 88658 2013-04-21 10:47:57Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Angel Velasquez @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths pkgname=aria2 -pkgver=1.16.5 +pkgver=1.17.0 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ license=('GPL') depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates') checkdepends=('cppunit') source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.xz) -sha256sums=('00c5d9ef6ce584561e9ffc8626e03d1156073bf2ddcc10dc55750fb49626d1fe') +sha256sums=('e3b533a33d33ad2392acc37d4510e5cd660af8ac23943c6402a0172f4a347c9c') build() { cd $pkgname-$pkgver @@ -35,11 +35,11 @@ check() { package() { cd $pkgname-$pkgver - make DESTDIR=${pkgdir} install + make DESTDIR="$pkgdir" install # add bash completion (aria2 automatically installs to a temporary target directory) - install -d ${pkgdir}/usr/share/bash-completion/completions - install -m644 ${pkgdir}/usr/share/doc/aria2/bash_completion/aria2c \ - ${pkgdir}/usr/share/bash-completion/completions - rm -rf ${pkgdir}/usr/share/doc/aria2/bash_completion + install -d "$pkgdir"/usr/share/bash-completion/completions + install -m644 "$pkgdir"/usr/share/doc/aria2/bash_completion/aria2c \ + "$pkgdir"/usr/share/bash-completion/completions + rm -rf "$pkgdir"/usr/share/doc/aria2/bash_completion } diff --git a/community/fdm/GNUmakefile.patch b/community/fdm/GNUmakefile.patch deleted file mode 100644 index 8320b9af5..000000000 --- a/community/fdm/GNUmakefile.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- fdm-1,6/GNUmakefile 2008-12-22 21:50:05.000000000 +0530 -+++ fdm-1.6/GNUmakefile 2009-05-09 19:07:21.000000000 +0530 -@@ -8,10 +8,7 @@ - - #DEBUG= 1 - --PREFIX?= /usr/local -- --BIN_OWNER= bin --BIN_GROUP= root -+PREFIX?= /usr - - CC= gcc - -@@ -27,8 +24,8 @@ - endif - - INSTALLDIR= install -d --INSTALLBIN= install -g $(BIN_OWNER) -o $(BIN_GROUP) -m 555 --INSTALLMAN= install -g $(BIN_OWNER) -o $(BIN_GROUP) -m 444 -+INSTALLBIN= install -m 0755 -+INSTALLMAN= install -m 0644 - - SRCS= fdm.c \ - attach.c buffer.c cleanup.c command.c connect.c io.c log.c netrc.c \ -@@ -72,7 +69,7 @@ - endif - - OBJS= $(patsubst %.c,%.o,$(SRCS)) --CPPFLAGS+= $(DEFS) -I. -I- $(INCDIRS) -+CPPFLAGS+= $(DEFS) -I. -iquote. $(INCDIRS) - ifdef DEBUG - CFLAGS+= -g -ggdb -DDEBUG - LDFLAGS+= -rdynamic -@@ -115,10 +112,10 @@ - install: - $(INSTALLDIR) $(DESTDIR)$(PREFIX)/bin - $(INSTALLBIN) $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG) -- $(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man1 -- $(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/man/man1/$(PROG).1 -- $(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man5 -- $(INSTALLMAN) $(PROG).conf.5 $(DESTDIR)$(PREFIX)/man/man5/$(PROG).conf.5 -+ $(INSTALLDIR) $(DESTDIR)$(PREFIX)/share/man/man1 -+ $(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/share/man/man1/$(PROG).1 -+ $(INSTALLDIR) $(DESTDIR)$(PREFIX)/share/man/man5 -+ $(INSTALLMAN) $(PROG).conf.5 $(DESTDIR)$(PREFIX)/share/man/man5/$(PROG).conf.5 - - clean: - rm -f $(CLEANFILES) diff --git a/community/fdm/PKGBUILD b/community/fdm/PKGBUILD index 5546042ad..9cf7f7696 100644 --- a/community/fdm/PKGBUILD +++ b/community/fdm/PKGBUILD @@ -1,33 +1,35 @@ -# $Id: PKGBUILD 55396 2011-09-11 20:59:09Z bisson $ +# $Id: PKGBUILD 88671 2013-04-21 20:30:45Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau # Maintainer: Gaetan Bisson # Contributor: Jeff Mickey # Contributor: Grigorios Bouzakis pkgname=fdm -pkgver=1.6 -pkgrel=3 +pkgver=1.7 +pkgrel=1 pkgdesc='Program to fetch and deliver mail' +arch=('i686' 'x86_64') url='http://fdm.sourceforge.net/' license=('BSD') -arch=('i686' 'x86_64') -options=('!makeflags') depends=('openssl' 'tdb' 'zlib') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'GNUmakefile.patch') -sha1sums=('fb8042f2355062848ff142c9604069b6657e6a82' - '0bddf0b0403ccee62190355f43fae84932c37436') +makedepends=('patch' 'sed') +options=('!makeflags') +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz) +sha256sums=('484474094f124ce438c89dfab05519fe7b3aa8c8346d00f790a512ab950cef2a') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../GNUmakefile.patch - make + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure + make PREFIX=/usr MANDIR=/usr/share/man } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} PREFIX=/usr MANDIR=/usr/share/man install - install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" - sed '3,17p;d' fdm.c > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - mv examples "${pkgdir}/usr/share/doc/${pkgname}" + install -d ${pkgdir}/usr/share/{doc,licenses}/${pkgname} + sed '3,17p;d' fdm.c > ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + mv examples ${pkgdir}/usr/share/doc/${pkgname} } diff --git a/community/fdm/fdm.conf b/community/fdm/fdm.conf deleted file mode 100644 index ad58f3606..000000000 --- a/community/fdm/fdm.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Default system-wide configuration file for fdm. -# You probably want to make a ~/.fdm.conf, and not edit this file. diff --git a/community/milkytracker/PKGBUILD b/community/milkytracker/PKGBUILD index d869a8a31..711a96e51 100644 --- a/community/milkytracker/PKGBUILD +++ b/community/milkytracker/PKGBUILD @@ -1,32 +1,37 @@ -# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $ +# $Id: PKGBUILD 88664 2013-04-21 13:23:51Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Christopher O'Neill # Contributor: Maks Verver pkgname=milkytracker pkgver=0.90.85 -pkgrel=7 -pkgdesc="Fast Tracker II inspired music tracker" +pkgrel=8 +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' 'setconf' 'gendesk') -makedepends=('jack-audio-connection-kit') +depends=('sdl' 'alsa-lib' 'zlib' 'gcc-libs') +makedepends=('jack-audio-connection-kit' 'gendesk') optdepends=('jack-audio-connection-kit: JACK audio support') options=('docs' '!strip') -install=$pkgname.install +install="$pkgname.install" source=("http://milkytracker.org/files/$pkgname-$pkgver.tar.bz2" - 'arch.patch') + "$pkgname.patch") sha256sums=('59a0d294d63752be74b157e07b0c70252c9198c312d9b1ad0ca460129fe5bd80' - 'c0cf7adc0db78519644a64321c319b04a6ee6c26de1f0620b581137791f596c3') + '0b701bf97375343f13d1af8a30df052c85b526e527bf6402634c37c7e9fa5b42') _name=('MilkyTracker') +_categories=('AudioVideo;Audio;AudioVideoEditing;') -build() { +prepare() { cd "$srcdir" + gendesk -n - setconf "$pkgname.desktop" Categories 'AudioVideo;Audio;AudioVideoEditing;' + patch -p0 -i "$pkgname.patch" +} + +build() { cd "$pkgname-$pkgver" - patch -p1 -i ../arch.patch + ./configure --prefix=/usr --with-alsa --with-jack make } diff --git a/community/milkytracker/arch.patch b/community/milkytracker/arch.patch deleted file mode 100644 index f7ade306f..000000000 --- a/community/milkytracker/arch.patch +++ /dev/null @@ -1,632 +0,0 @@ -*** 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 (event.data1); -! p.y = reinterpret_cast (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 (event.data1); -! p.y = reinterpret_cast (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 (event.data1); -! pp_int32 volume = reinterpret_cast (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 (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 **** -
    - -
  1. -! Where can I find a list of all the effect codes? - -
    2. ---- 88,97 ---- -
      - -
    1. -! Where can I find a list of all the effect codes? - -
      2. -*************** -*** 99,105 **** - Where can I find a list of all the keyboard shortcuts? - - ---- 100,106 ---- - Where can I find a list of all the keyboard shortcuts? - - -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 **** - -

      MilkyTracker Manual v0.90.85

      -

      -! 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 MilkyTracker.net as well. -

      -

      Disclaimer:

      -

      ---- 183,189 ---- - -

      MilkyTracker Manual v0.90.85

      -

      -! 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 MilkyTracker.net as well. -

      -

      Disclaimer:

      -

      -*************** -*** 3111,3122 **** - and everybody who donated or dropped a letter. -

      -

      -! Special greetings to everyone at #MilkyTracker for making it a daily active channel. -

      - -

      10. Contact

      -

      -! You can contact the MilkyTracker team by email (), through the forum at http://www.milkytracker.net/?community or in IRC. To chat with the community live, you can connect to #MilkyTracker on EsperNet with your IRC client or use the java client on our website. -

      - - ---- 3111,3122 ---- - and everybody who donated or dropped a letter. -

      -

      -! Special greetings to everyone at #MilkyTracker for making it a daily active channel. -

      - -

      10. Contact

      -

      -! You can contact the MilkyTracker team by email (), through the forum at http://www.milkytracker.org/?community or in IRC. To chat with the community live, you can connect to #MilkyTracker on EsperNet with your IRC client or use the java client on our website. -

      - - -Only in milkytracker-0.90.85/docs/: MilkyTracker.rtf ---- x/src/compression/DecompressorGZIP.cpp 2012-08-28 17:54:46.000000000 +0200 -+++ y/src/compression/DecompressorGZIP.cpp 2012-08-28 17:55:21.000000000 +0200 -@@ -57,11 +57,11 @@ - - bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint) - { -- gzFile *gz_input_file = NULL; -+ gzFile gz_input_file = NULL; - int len = 0; - pp_uint8 *buf; - -- if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL) -+ if ((gz_input_file = gzopen (fileName.getStrBuffer(), "r")) == NULL) - return false; - - if ((buf = new pp_uint8[0x10000]) == NULL) -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 . -! 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.install b/community/milkytracker/milkytracker.install index aeef78890..f415655f7 100644 --- a/community/milkytracker/milkytracker.install +++ b/community/milkytracker/milkytracker.install @@ -1,6 +1,4 @@ post_upgrade() { - gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor - update-desktop-database -q echo 'If you wish to use jack (or jack2), use this command the first time' echo 'you start milkytracker: SDL_AUDIODRIVER=jack milkytracker' echo 'Then select the jack driver in milkytracker and connect the audio' diff --git a/community/milkytracker/milkytracker.patch b/community/milkytracker/milkytracker.patch new file mode 100644 index 000000000..ee292a87c --- /dev/null +++ b/community/milkytracker/milkytracker.patch @@ -0,0 +1,632 @@ +*** 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 (event.data1); +! p.y = reinterpret_cast (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 (event.data1); +! p.y = reinterpret_cast (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 (event.data1); +! pp_int32 volume = reinterpret_cast (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 (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 **** +
        + +
      1. +! Where can I find a list of all the effect codes? + +
        2. +--- 88,97 ---- +
          + +
        1. +! Where can I find a list of all the effect codes? + +
          2. +*************** +*** 99,105 **** + Where can I find a list of all the keyboard shortcuts? + + +--- 100,106 ---- + Where can I find a list of all the keyboard shortcuts? + + +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 **** + +

          MilkyTracker Manual v0.90.85

          +

          +! 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 MilkyTracker.net as well. +

          +

          Disclaimer:

          +

          +--- 183,189 ---- + +

          MilkyTracker Manual v0.90.85

          +

          +! 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 MilkyTracker.net as well. +

          +

          Disclaimer:

          +

          +*************** +*** 3111,3122 **** + and everybody who donated or dropped a letter. +

          +

          +! Special greetings to everyone at #MilkyTracker for making it a daily active channel. +

          + +

          10. Contact

          +

          +! You can contact the MilkyTracker team by email (), through the forum at http://www.milkytracker.net/?community or in IRC. To chat with the community live, you can connect to #MilkyTracker on EsperNet with your IRC client or use the java client on our website. +

          + + +--- 3111,3122 ---- + and everybody who donated or dropped a letter. +

          +

          +! Special greetings to everyone at #MilkyTracker for making it a daily active channel. +

          + +

          10. Contact

          +

          +! You can contact the MilkyTracker team by email (), through the forum at http://www.milkytracker.org/?community or in IRC. To chat with the community live, you can connect to #MilkyTracker on EsperNet with your IRC client or use the java client on our website. +

          + + +Only in milkytracker-0.90.85/docs/: MilkyTracker.rtf +--- milkytracker-0.90.85/src/compression/DecompressorGZIP.cpp 2012-08-28 17:54:46.000000000 +0200 ++++ milkytracker-trunk/src/compression/DecompressorGZIP.cpp 2012-08-28 17:55:21.000000000 +0200 +@@ -57,11 +57,11 @@ + + bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint) + { +- gzFile *gz_input_file = NULL; ++ gzFile gz_input_file = NULL; + int len = 0; + pp_uint8 *buf; + +- if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL) ++ if ((gz_input_file = gzopen (fileName.getStrBuffer(), "r")) == NULL) + return false; + + if ((buf = new pp_uint8[0x10000]) == NULL) +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 . +! 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/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 4d40f0ede..4f1fdfc4d 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88617 2013-04-20 16:45:11Z heftig $ +# $Id: PKGBUILD 88656 2013-04-21 08:48:16Z jelle $ # Contributor: Paulo Matias # Maintainer: Jelle van der Waa pkgname=pdf2djvu pkgver=0.7.16 -pkgrel=3 +pkgrel=4 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64') url="http://pdf2djvu.googlecode.com" diff --git a/community/remind/PKGBUILD b/community/remind/PKGBUILD index 3b98b5121..73cee013d 100644 --- a/community/remind/PKGBUILD +++ b/community/remind/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: Daniel J Griffiths pkgname=remind -pkgver=3.01.12 +pkgver=3.01.13 pkgrel=1 pkgdesc='A sophisticated calendar and alarm program.' arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ license=('GPL') depends=('tk' 'tcllib') source=("http://www.roaringpenguin.com/files/download/${pkgname}-0${pkgver}.tar.gz"{,.sig}) options=('!emptydirs') -md5sums=('de16cbfc3ee94defcb1abdf78b2ebcd1' - '4be6e58ad5117fe2299489b01db45d48') +md5sums=('9b746d257eccd5961d61c649cf48305c' + 'SKIP') build() { cd "${pkgname}-0${pkgver}" diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 23608ec6c..03d12f093 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87134 2013-03-27 19:44:03Z arodseth $ +# $Id: PKGBUILD 88649 2013-04-21 07:40:40Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -8,24 +8,33 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=1 arch=('x86_64' 'i686') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('9b956468446361b930bb5b10a518e1c59b4ce2dd2ea04ccc600d0259f1490429') +sha256sums=('1b685d47b04f0a670a22db2af126cd145300bc664c38ee530f459c251ce7481f') -build() { +prepare() { cd "$srcdir/ruby-gtk2-$pkgver" LANG="en_US.UTF-8" \ ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --vendor - mkdir -p "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" - mkdir -p "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" - mkdir -p "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" - mkdir -p "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" + mkdir -p \ + "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ + "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ + "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ + "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ + "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ + "$pkgdir/ruby-pango/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \ + "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" +} + +build() { + cd "$srcdir/ruby-gtk2-$pkgver" + make } diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD index 9251f7016..ec58a456d 100644 --- a/community/ruby-gtk3/PKGBUILD +++ b/community/ruby-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87329 2013-03-29 22:49:20Z arodseth $ +# $Id: PKGBUILD 88651 2013-04-21 08:01:04Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -8,19 +8,24 @@ pkgbase=ruby-gtk3 pkgname=('ruby-gtk3' 'ruby-gdk3') depends=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-glib2' 'ruby-pango') -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=1 arch=('x86_64' 'i686') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk3') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz") -sha256sums=('ecd3fde8e56442944a2b692c773081c553d48b621bb53c49b40b7575216f6c6a') +sha256sums=('105395100bcbcfe8fa3fd5a2963ded64092303da64f31400887dbcd6a84d1e1a') -build() { +prepare() { cd "$srcdir/ruby-gtk3-$pkgver" LANG="en_US.UTF-8" ruby extconf.rb gtk3 gdk3 --vendor +} + +build() { + cd "$srcdir/ruby-gtk3-$pkgver" + make } diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD index 611f57912..edc92f438 100644 --- a/community/smalltalk/PKGBUILD +++ b/community/smalltalk/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 81609 2012-12-25 00:34:14Z foutrelis $ +# $Id: PKGBUILD 88644 2013-04-20 23:03:17Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Kaiting Chen # Contributor: mrshpot # Contributor: Michael Fellinger pkgname=smalltalk -pkgver=3.2.4 -pkgrel=8 +pkgver=3.2.5 +pkgrel=1 pkgdesc='Implementation of Smalltalk-80' url='http://smalltalk.gnu.org/' license=('GPL' 'LGPL') @@ -14,9 +14,9 @@ arch=('x86_64' 'i686') options=('!libtool' '!emptydirs') depends=('gmp' 'libffi' 'libsigsegv' 'readline' 'libltdl') makedepends=('gdbm' 'gtk2' 'sqlite' 'tk>=8.6' 'zip') -install=smalltalk.install +install="$pkgname.install" source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") -sha256sums=('901cc7090a1fa44bc60900a970d207de4aa3bdfdce72bea55114e243bc1eb1b3') +sha256sums=('06e574e818ec49f0555d948ae53b1453d8c1df59ef597dad911a4fd1ffba1cce') optdepends=('tk: for gst-blox' 'sqlite: database in a file' 'sed: for examples' @@ -51,7 +51,8 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - # fix manpage symlink + + # Fix manpage symlink rm -f "$pkgdir/usr/share/man/man1/gst-reload.1" ln -s gst-load.1 "$pkgdir/usr/share/man/man1/gst-reload.1" } diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD index 0ad10ea27..1a66faf0f 100644 --- a/community/supercollider/PKGBUILD +++ b/community/supercollider/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86888 2013-03-23 23:10:51Z td123 $ +# $Id: PKGBUILD 88666 2013-04-21 13:40:47Z speps $ # Maintainer : speps # Contributor: _name=SuperCollider pkgname=supercollider -pkgver=3.6.3 -pkgrel=2 +pkgver=3.6.4 +pkgrel=1 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition" arch=('i686' 'x86_64') url="http://supercollider.sourceforge.net/" @@ -18,13 +18,14 @@ optdepends=('emacs: emacs interface' 'ruby: vim support') install="$pkgname.install" source=("http://download.sourceforge.net/project/$pkgname/Source/${pkgver%.*}/$_name-$pkgver-Source-linux.tar.bz2") -md5sums=('f6d8384eb076f3ccced5051abd2f33bf') +md5sums=('a6f0c1183f311ffcfbc143dce2332d74') build() { cd "$srcdir/$_name-Source" [ -d bld ] || mkdir bld && cd bld cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DLIBSCSYNTH=ON make } diff --git a/community/tinyxml/PKGBUILD b/community/tinyxml/PKGBUILD index 10c5091dc..a8f263f30 100644 --- a/community/tinyxml/PKGBUILD +++ b/community/tinyxml/PKGBUILD @@ -1,51 +1,62 @@ -# $Id: PKGBUILD 74688 2012-08-02 07:33:41Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 88660 2013-04-21 13:06:07Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Bartłomiej Piotrowski # Contributor: Larry Hajali # Contributor: Hubert Grzeskowiak pkgname=tinyxml pkgver=2.6.2 -pkgrel=2 -pkgdesc="A simple, small, C++ XML parser that can be easily integrated into other programs." -url='http://www.grinninglizard.com/tinyxml/' -arch=('i686' 'x86_64') +pkgrel=3 +pkgdesc='Simple, small, C++ XML parser that can be easily integrated into other programs' +url="http://www.grinninglizard.com/tinyxml/" +arch=('x86_64' 'i686') license=('zlib') depends=('gcc-libs') +makedepends=('setconf') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_${pkgver//./_}.tar.gz" 'entity.patch' - 'tinyxml-2.5.3-stl.patch') -md5sums=('c1b864c96804a10526540c664ade67f0' - 'b6cc2d9330707373d920f760793c6311' - '6db8334398e0cdad7e3c6406206ff42a') + "$pkgname-2.5.3-stl.patch" + "$pkgname.pc") +sha256sums=('15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593' + 'ef493209b0a51160171fd834a7ecdddd02679463b85fb89a2ea254213e47f99b' + '3baf2c4dbc2c8f54a151dac8860113d2f549174f83ed85d552b094dfaebb52af' + '0e37a568eaebb8f0644f148a3d3efa921ac518217e1c0de46c2859d26516bcc4') -build() { - cd "$srcdir"/$pkgname +prepare() { + cd "$srcdir/$pkgname" # Fix entity encoding. - patch -p0 < "$srcdir"/entity.patch + patch -p0 -i "$srcdir"/entity.patch # Make TINYXML_USE_STL permanently defined in tinyxml.h - patch -p1 < "$srcdir"/$pkgname-2.5.3-stl.patch + patch -p1 -i "$srcdir"/$pkgname-2.5.3-stl.patch # Fix Makefile - sed -i \ - -e '/^TINYXML_USE_STL/ s|=.*|=YES|' \ - -e "s|^RELEASE_CFLAGS.*|& ${CXXFLAGS} -fPIC|" Makefile + setconf Makefile TINYXML_USE_STL YES + setconf Makefile RELEASE_CFLAGS "$CXXFLAGS -fPIC" +} + +build() { + cd "$srcdir/$pkgname" make - g++ -fPIC ${CXXFLAGS} -shared -o lib${pkgname}.so.0.$pkgver \ - -Wl,-soname,lib${pkgname}.so.0 $(ls *.o | grep -v xmltest) + g++ -fPIC "$CXXFLAGS" -shared -o "lib${pkgname}.so.0.$pkgver" \ + -Wl,-soname,"lib${pkgname}.so.0" $(ls *.o | grep -v xmltest) } package() { - cd "$srcdir"/$pkgname + cd "$srcdir/$pkgname" install -d -m 0755 "$pkgdir"/usr/{lib,include} - install -m 0755 lib${pkgname}.so.0.$pkgver "$pkgdir"/usr/lib/ - install -m 0644 $pkgname.h tinystr.h "$pkgdir"/usr/include - - (cd "$pkgdir"/usr/lib - ln -s lib${pkgname}.so.0.$pkgver lib${pkgname}.so.0 - ln -s lib${pkgname}.so.0.$pkgver lib${pkgname}.so + install -m 0755 "lib${pkgname}.so.0.$pkgver" "$pkgdir"/usr/lib/ + install -m 0644 "$pkgname.h" tinystr.h "$pkgdir"/usr/include + install -Dm644 readme.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" + + (cd "$pkgdir/usr/lib" + ln -s "lib${pkgname}.so.0.$pkgver" "lib${pkgname}.so.0" + ln -s "lib${pkgname}.so.0.$pkgver" "lib${pkgname}.so" ) } + +# vim:set ts=2 sw=2 et: diff --git a/community/tinyxml/tinyxml.pc b/community/tinyxml/tinyxml.pc new file mode 100644 index 000000000..684b090cd --- /dev/null +++ b/community/tinyxml/tinyxml.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: TinyXml +Description: simple, small, C++ XML parser +Version: 2.6.2 +Libs: -L${libdir} -ltinyxml +Cflags: -I${includedir} -- cgit v1.2.3-54-g00ecf