diff options
Diffstat (limited to 'community')
24 files changed, 783 insertions, 28 deletions
diff --git a/community/alsa-tools/PKGBUILD b/community/alsa-tools/PKGBUILD index 1e097048e..c49246f5d 100644 --- a/community/alsa-tools/PKGBUILD +++ b/community/alsa-tools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 59642 2011-11-28 23:44:29Z seblu $ +# $Id: PKGBUILD 62752 2012-01-25 20:12:30Z seblu $ #Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> #Contributor: Jochen Immend�rfer <jochen dot immendoerfer at gmail dot com> pkgname=alsa-tools -pkgver=1.0.24.1 +pkgver=1.0.25 pkgrel=1 pkgdesc='ALSA tools package' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL2') depends=('fltk' 'alsa-lib' 'gtk2') options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2") -md5sums=('08fe93a12006093e590d7ecc02b119dd') +md5sums=('57bfec98a814d12e0f7ab379aaeccd87') build() { for f in $(find "$srcdir/$pkgname-$pkgver" -type f -name configure ); do diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index 1320b04d8..1ea5f1978 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58389 2011-11-12 17:16:28Z ibiru $ +# $Id: PKGBUILD 62726 2012-01-25 08:16:40Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef pkgver=0.5.1 -pkgrel=3 +pkgrel=4 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64') url='http://deadbeef.sourceforge.net' @@ -32,11 +32,18 @@ optdepends=('libsamplerate: for Resampler plugin' 'libzip: for vfs_zip plugin') options=('!libtool') install='deadbeef.install' -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "ffmpeg.patch") +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch' + 'deadbeef-0.5.1-ffmpeg-version-check-fix.patch') +md5sums=('be8359d1bd9cf7679cf2ca748996e726' + 'd1c913c0ccefef33012732cf0ae49f7f' + '6d22855f61f4d2fea4b343dca76d5e85') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i $srcdir/ffmpeg.patch + + patch -Np1 -i ../deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch + patch -Np1 -i ../deadbeef-0.5.1-ffmpeg-version-check-fix.patch ./configure --prefix=/usr make @@ -47,5 +54,3 @@ package () { make prefix="${pkgdir}/usr" install } -md5sums=('be8359d1bd9cf7679cf2ca748996e726' - '6cc7623734af310095534c361c9f64e8') diff --git a/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch b/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch new file mode 100644 index 000000000..db1c79638 --- /dev/null +++ b/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch @@ -0,0 +1,118 @@ +From 2bb5828e58fa8c187377f8ba75f8eb73a53ed7ca Mon Sep 17 00:00:00 2001 +From: Igor Murzov <e-mail@date.by> +Date: Mon, 4 Jul 2011 16:47:25 +0400 +Subject: [PATCH 1/2] ffmpeg: define fallback macro AV_VERSION_INT() + +For ffmpeg < 0.5. Copied from libavutil 0.5. + +ffmpeg: don't use deprecated CODEC_TYPE_AUDIO with new lavc + +fixes build with lavc 53. + +ffmpeg: fix erroneous version comparisons + +Comparing versions this way: (x.y < x1.y1) is obviously equivalent to +(x < x1 || (x == x1 && y < y1)), not to (x <= x1 && y < y1). + +ffmpeg: use av_register_protocol2() if available + +fixes usage with ffmpeg-0.8 +--- + plugins/ffmpeg/ffmpeg.c | 37 ++++++++++++++++++++++++++++++------- + 1 files changed, 30 insertions(+), 7 deletions(-) + +diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c +index cd7edf4..0cb9955 100644 +--- a/plugins/ffmpeg/ffmpeg.c ++++ b/plugins/ffmpeg/ffmpeg.c +@@ -44,6 +44,10 @@ + #define av_register_protocol register_protocol + #endif + ++#ifndef AV_VERSION_INT ++#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c) ++#endif ++ + #endif + + //#define trace(...) { fprintf(stderr, __VA_ARGS__); } +@@ -140,7 +144,12 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) { + for (i = 0; i < info->fctx->nb_streams; i++) + { + info->ctx = info->fctx->streams[i]->codec; +- if (info->ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (info->ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + info->codec = avcodec_find_decoder (info->ctx->codec_id); + if (info->codec != NULL) { +@@ -279,10 +288,10 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) { + int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; + int len; + //trace ("in: out_size=%d(%d), size=%d\n", out_size, AVCODEC_MAX_AUDIO_FRAME_SIZE, size); +-#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 25) +- len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size); +-#else ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0) + len = avcodec_decode_audio3 (info->ctx, (int16_t *)info->buffer, &out_size, &info->pkt); ++#else ++ len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size); + #endif + trace ("out: out_size=%d, len=%d\n", out_size, len); + if (len <= 0) { +@@ -418,7 +427,7 @@ static const char *map[] = { + + static int + ffmpeg_read_metadata_internal (DB_playItem_t *it, AVFormatContext *fctx) { +-#if LIBAVFORMAT_VERSION_MAJOR <= 52 && LIBAVFORMAT_VERSION_MINOR < 43 ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,43,0) + if (!strlen (fctx->title)) { + // title is empty, this call will set track title to filename without extension + deadbeef->pl_add_meta (it, "title", NULL); +@@ -490,7 +499,12 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) { + for (i = 0; i < fctx->nb_streams; i++) + { + ctx = fctx->streams[i]->codec; +- if (ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + codec = avcodec_find_decoder(ctx->codec_id); + if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams +@@ -704,7 +718,11 @@ ffmpeg_start (void) { + ffmpeg_init_exts (); + avcodec_init (); + av_register_all (); ++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ av_register_protocol2 (&vfswrapper, sizeof(vfswrapper)); ++#else + av_register_protocol (&vfswrapper); ++#endif + return 0; + } + +@@ -745,7 +763,12 @@ ffmpeg_read_metadata (DB_playItem_t *it) { + for (i = 0; i < fctx->nb_streams; i++) + { + ctx = fctx->streams[i]->codec; +- if (ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + codec = avcodec_find_decoder(ctx->codec_id); + if (codec != NULL) +-- +1.7.8.4 + diff --git a/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch b/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch new file mode 100644 index 000000000..af8c282c0 --- /dev/null +++ b/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch @@ -0,0 +1,25 @@ +From 9cbd09b81028679a507f751c206e8f6769fd450c Mon Sep 17 00:00:00 2001 +From: Igor Murzov <e-mail@date.by> +Date: Thu, 7 Jul 2011 22:31:44 +0400 +Subject: [PATCH 2/2] ffmpeg: version check fix + +--- + plugins/ffmpeg/ffmpeg.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c +index 0cb9955..37c7e80 100644 +--- a/plugins/ffmpeg/ffmpeg.c ++++ b/plugins/ffmpeg/ffmpeg.c +@@ -718,7 +718,7 @@ ffmpeg_start (void) { + ffmpeg_init_exts (); + avcodec_init (); + av_register_all (); +-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 69, 0) + av_register_protocol2 (&vfswrapper, sizeof(vfswrapper)); + #else + av_register_protocol (&vfswrapper); +-- +1.7.8.4 + diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD index da38ae549..7cccb9b67 100644 --- a/community/electricsheep/PKGBUILD +++ b/community/electricsheep/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 58393 2011-11-12 17:16:52Z ibiru $ +# $Id: PKGBUILD 62754 2012-01-25 20:28:55Z ebelanger $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=electricsheep pkgver=2.7b12 -pkgrel=4 +pkgrel=5 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" arch=('i686' 'x86_64') url="http://community.electricsheep.org/" license=('GPL') -depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade') +depends=('curl' 'flam3' 'ffmpeg' 'mplayer' 'libglade') makedepends=('xscreensaver') optdepends=('xscreensaver: to use electricsheep with xscreensaver') source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - electricsheep-ffmpeg.patch) + electricsheep-ffmpeg.patch electricsheep-pref-segfault.patch) sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32' - 'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825') + 'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825' + 'bdf0f66fdbb5741671e8bb127bd76ef236d0e44a') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i "${srcdir}/electricsheep-ffmpeg.patch" + patch -p1 -i "${srcdir}/electricsheep-pref-segfault.patch" ./configure --prefix=/usr make } diff --git a/community/electricsheep/PKGBUILD.svn b/community/electricsheep/PKGBUILD.svn new file mode 100644 index 000000000..2fc8a26ff --- /dev/null +++ b/community/electricsheep/PKGBUILD.svn @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 57680 2011-11-01 05:03:57Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Contributor: Alexander Rødseth <rodseth@gmail.com> +pkgname=electricsheep +pkgver=2.7b34 +pkgrel=1 +pkgdesc="Screensaver that realize the collective dream of computers all over the internet" +arch=('x86_64' 'i686') +url="http://community.electricsheep.org/" +license=('GPL') +depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade' 'tinyxml' 'boost' 'gtk2' 'lua') +#subversion libgtk2.0 libgl1-mesa libavcodec libavformat libswscale liblua5 libcurl4-openssl libxml2 libjpeg8 libgtop2 libboost libboost-filesystem libboost-thread libtinyxml libglut3 +makedepends=('xscreensaver') +optdepends=('xscreensaver: to use electricsheep with xscreensaver') +_fixed_revision=107 + +build() { + cd "$srcdir" + + msg2 "Checking out svn revision $_fixed_revision (in lack of a Linux release for $pkgver)..." + if [[ -d "$pkgname/.svn" ]]; then + (cd "$pkgname" && svn up -r $_fixed_revision) + else + svn co \ + http://electricsheep.googlecode.com/svn/trunk/ \ + --config-dir ./ -r $_fixed_revision "$pkgname" + fi + + msg2 "Setting up build directory..." + rm -rf "$srcdir/$pkgname-build" + cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build" + cd "$srcdir/$pkgname-build/client_generic" + + #patch -p1 -i ../electricsheep-ffmpeg.patch + msg2 "Configuring..." + ./autogen.sh + ./configure --prefix=/usr + + msg2 "Compiling..." + make +} + +package() { + cd "$srcdir/$pkgname-build/client_generic" + + install -d "$pkgdir/usr/share/applications/screensavers" + install -d "$pkgdir/usr/lib/gnome-screensaver/gnome-screensaver" + make DESTDIR="$pkgdir" \ + GNOME_SCREENSAVER_DATADIR="$pkgdir/usr/share/applications/screensavers" \ + GNOME_SCREENSAVER_PRIVEXEDIR="$pkgdir/usr/lib/gnome-screensaver/gnome-screensaver" \ + install + install -Dm644 electricsheep.desktop.kde \ + "$pkgdir/usr/share/kde4/services/ScreenSavers/electricsheep.desktop" + install -Dm644 electricsheep.xml \ + "$pkgdir/usr/share/xscreensaver/config/electricsheep.xml" + install -Dm755 electricsheep-saver \ + "$pkgdir/usr/bin/electricsheep-saver" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/electricsheep/electricsheep-pref-segfault.patch b/community/electricsheep/electricsheep-pref-segfault.patch new file mode 100644 index 000000000..83bcd8a0f --- /dev/null +++ b/community/electricsheep/electricsheep-pref-segfault.patch @@ -0,0 +1,270 @@ +diff -Naur electricsheep-2.7b12/electricsheep.c electricsheep-2.7~b12+svn20091224/electricsheep.c +--- electricsheep-2.7b12/electricsheep.c 2009-07-09 04:10:05.000000000 -0400 ++++ electricsheep-2.7~b12+svn20091224/electricsheep.c 2009-12-24 18:03:01.000000000 -0500 +@@ -564,6 +566,12 @@ + n++; + } + } ++ if (n < 1) { ++ if (debug) { ++ fprintf(logout, "median rank undefined\n"); ++ } ++ return; ++ } + qsort(tms, n, sizeof(int), compare_ints); + if (0 && debug) { + for (i = 0; i < n; i++) +@@ -1915,7 +1923,7 @@ + if (-1 == (decoder_pid = fork())) { + perror("decoder fork"); + } else if (0 == decoder_pid) { +- char *argv[20]; ++ char *argv[25]; + int c = 0; + /* child */ + snprintf(fps, 24, "%g", prefs.frame_rate); +@@ -1934,6 +1942,7 @@ + cleanup_and_exit(1); + } + argv[c++] = "mplayer"; ++ argv[c++] = "-nolirc"; + argv[c++] = "-cache"; + argv[c++] = "8192"; + argv[c++] = "-really-quiet"; +diff -Naur electricsheep-2.7b12/electricsheep.h electricsheep-2.7~b12+svn20091224/electricsheep.h +--- electricsheep-2.7b12/electricsheep.h 2009-07-09 04:10:05.000000000 -0400 ++++ electricsheep-2.7~b12+svn20091224/electricsheep.h 2009-12-24 18:03:01.000000000 -0500 +@@ -74,4 +74,4 @@ + void init_list_cmd (char *buf); + void get_end_element(void *userData, const char *name); + void character_handler(void *userData, const XML_Char *s, int len); +-char *encry(char *pw); ++char *encry(char *pw, char *nick); +diff -Naur electricsheep-2.7b12/electricsheep-preferences.c electricsheep-2.7~b12+svn20091224/electricsheep-preferences.c +--- electricsheep-2.7b12/electricsheep-preferences.c 2009-07-09 04:10:05.000000000 -0400 ++++ electricsheep-2.7~b12+svn20091224/electricsheep-preferences.c 2009-12-24 18:03:01.000000000 -0500 +@@ -108,8 +108,9 @@ + prefs.password = strdup(""); + } else { + char *pw = (char*)gtk_entry_get_text(password_entry); ++ pw = strdup(pw); + if (strcmp(pw, pw_marker)) +- prefs.password = encry(pw); ++ prefs.password = encry(pw, prefs.nick); + } + prefs.video_driver = (char*)gtk_entry_get_text(video_driver_entry); + prefs.frame_rate = gtk_spin_button_get_value(frame_rate_spin); +@@ -207,72 +208,72 @@ + void get_widgets(GladeXML *xml) { + title_label = (GtkLabel *) glade_xml_get_widget(xml, "titleLabel"); + if (NULL == title_label) { +- fprintf(stderr, "titleLabel not found\n"); ++ fprintf(logout, "titleLabel not found\n"); + exit(1); + } + test_label = (GtkLabel *) glade_xml_get_widget(xml, "testLabel"); + if (NULL == test_label) { +- fprintf(stderr, "testLabel not found\n"); ++ fprintf(logout, "testLabel not found\n"); + exit(1); + } + test_button = (GtkButton *) glade_xml_get_widget(xml, "testButton"); + if (NULL == test_button) { +- fprintf(stderr, "testButton not found\n"); ++ fprintf(logout, "testButton not found\n"); + exit(1); + } + nick_entry = (GtkEntry *) glade_xml_get_widget(xml, "nickEntry"); + if (NULL == nick_entry) { +- fprintf(stderr, "nickEntry not found\n"); ++ fprintf(logout, "nickEntry not found\n"); + exit(1); + } + url_entry = (GtkEntry *) glade_xml_get_widget(xml, "urlEntry"); + if (NULL == url_entry) { +- fprintf(stderr, "urlEntry not found\n"); ++ fprintf(logout, "urlEntry not found\n"); + exit(1); + } + password_entry = (GtkEntry *) glade_xml_get_widget(xml, "passEntry"); + if (NULL == password_entry) { +- fprintf(stderr, "passEntry not found\n"); ++ fprintf(logout, "passEntry not found\n"); + exit(1); + } + video_driver_entry = (GtkEntry *) glade_xml_get_widget(xml, "vdEntry"); + if (NULL == video_driver_entry) { +- fprintf(stderr, "vdEntry not found\n"); ++ fprintf(logout, "vdEntry not found\n"); + exit(1); + } + frame_rate_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "frameSpin"); + if (NULL == frame_rate_spin) { +- fprintf(stderr, "frameSpin not found\n"); ++ fprintf(logout, "frameSpin not found\n"); + exit(1); + } + nrepeats_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "repeatSpin"); + if (NULL == nrepeats_spin) { +- fprintf(stderr, "repeatSpin not found\n"); ++ fprintf(logout, "repeatSpin not found\n"); + exit(1); + } + cache_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "cacheSpin"); + if (NULL == cache_spin) { +- fprintf(stderr, "cacheSpin not found\n"); ++ fprintf(logout, "cacheSpin not found\n"); + exit(1); + } + no_animation_check = (GtkCheckButton *) glade_xml_get_widget(xml, "noanimCheck"); + if (NULL == no_animation_check) { +- fprintf(stderr, "noanimCheck not found\n"); ++ fprintf(logout, "noanimCheck not found\n"); + exit(1); + } + standalone_check = (GtkCheckButton *) glade_xml_get_widget(xml, "standaloneCheck"); + if (NULL == standalone_check) { +- fprintf(stderr, "standaloneCheck not found\n"); ++ fprintf(logout, "standaloneCheck not found\n"); + exit(1); + } + hide_errors_check = (GtkCheckButton *) glade_xml_get_widget(xml, "hideCheck"); + if (NULL == hide_errors_check) { +- fprintf(stderr, "hideCheck not found\n"); ++ fprintf(logout, "hideCheck not found\n"); + exit(1); + } + save_frames_check = (GtkCheckButton *) glade_xml_get_widget(xml, "saveCheck"); + if (NULL == save_frames_check) { +- fprintf(stderr, "saveCheck not found\n"); ++ fprintf(logout, "saveCheck not found\n"); + exit(1); + } + } +diff -Naur electricsheep-2.7b12/utils.c electricsheep-2.7~b12+svn20091224/utils.c +--- electricsheep-2.7b12/utils.c 2009-07-09 04:10:05.000000000 -0400 ++++ electricsheep-2.7~b12+svn20091224/utils.c 2009-12-24 18:03:01.000000000 -0500 +@@ -69,19 +70,23 @@ + } + } + +-char *encry(char *pw) { ++ ++char *encry(char *pw, char *nick) { ++ static char *salt = "sh33p"; + unsigned char digest[16]; + char md5_pw[33]; ++ char *pw_salted = malloc(strlen(pw) + strlen(salt) + strlen(nick) + 1); + int i, j; +- md5_buffer(pw, strlen(pw), digest); ++ sprintf(pw_salted, "%s%s%s", pw, salt, nick); ++ md5_buffer(pw_salted, strlen(pw_salted), digest); + for (i = 0, j = 0; i < sizeof(digest); i++) { + char *hex_digits = "0123456789ABCDEF"; +- + md5_pw[j++] = hex_digits[digest[i] >> 4]; + md5_pw[j++] = hex_digits[digest[i] & 0x0F]; + } + md5_pw[j] = 0; + free(pw); ++ free(pw_salted); + return strdup(md5_pw); + } + +@@ -97,10 +102,11 @@ + free(prefs->url); + prefs->url = strdup(atts[i+1]); + } else if (!strcmp("password", atts[i])) { +- free(prefs->password); +- prefs->password = encry(strdup(atts[i+1])); ++ free(prefs->password); ++ /* assume nick comes before pw in the xml XXX */ ++ prefs->password = encry(strdup(atts[i+1]), prefs->nick); + } else if (!strcmp("password_md5", atts[i])) { +- free(prefs->password); ++ free(prefs->password); + prefs->password = strdup(atts[i+1]); + } else if (!strcmp("video_driver", atts[i])) { + free(prefs->video_driver); +@@ -133,7 +139,7 @@ + } else if (!strcmp("version", atts[i])) { + // nothing to check + } else { +- fprintf(stderr, "ignoring attribute %s\n", atts[i]); ++ fprintf(logout, "ignoring attribute %s\n", atts[i]); + } + i += 2; + } +@@ -146,7 +152,7 @@ + if (argc > 2) + strcpy(rc_file, argv[2]); + else { +- fprintf(stderr, ++ fprintf(logout, + "%s: --preferences option requires a file name argument.\n", + argv[0]); + exit(1); +@@ -155,7 +161,7 @@ + } + hom = getenv("HOME"); + if (!hom) { +- fprintf(stderr, "%s: HOME envar not defined\n", argv[0]); ++ fprintf(logout, "%s: HOME envar not defined\n", argv[0]); + exit(1); + } + snprintf(rc_file, PATH_MAX, "%s/.electricsheep/preferences.xml", hom); +@@ -281,15 +287,15 @@ + + int mysystem(char *cmd, char *msg) { + int n; +- if (0) fprintf(stderr, "subprocess; (%s)\n", cmd); ++ if (0) fprintf(logout, "subprocess; (%s)\n", cmd); + if (0 != (n = interruptable_system(cmd))) { + if (SIGINT != n) { + if (!prefs.hide_errors) +- fprintf(stderr, "subprocess error: %s, %d=%d<<8+%d\n", ++ fprintf(logout, "subprocess error: %s, %d=%d<<8+%d\n", + msg, n, n>>8, n&255); + return 1; + } +- fprintf(stderr, "control-c during %s, exiting\n", msg); ++ fprintf(logout, "control-c during %s, exiting\n", msg); + cleanup_and_exit(1); + } + return 0; +@@ -325,7 +331,7 @@ + int bytes_read; + void *buff = XML_GetBuffer(parser, XML_BUFF_SIZE); + if (buff == NULL) { +- fprintf(stderr, "unable to allocate buffer.\n"); ++ fprintf(logout, "unable to allocate buffer.\n"); + exit(1); + } + +@@ -334,7 +340,7 @@ + break; + + if (! XML_ParseBuffer(parser, bytes_read, bytes_read == 0)) { +- fprintf(stderr, "parse error.\n"); ++ fprintf(logout, "parse error.\n"); + exit(1); + } + } +@@ -441,7 +447,7 @@ + + void init_curl_cmd(int registration) { + +- if (debug) fprintf(stderr, "init_curl_cmd %d\n", registration); ++ if (debug) fprintf(logout, "init_curl_cmd %d\n", registration); + + if (prefs.proxy_name) { + snprintf(curl_cmd, MAXBUF, "nice -n %d curl --location --proxy %s", +@@ -472,7 +478,7 @@ + } + } + server = dream_server; +- if (debug) fprintf(stderr, "curl_cmd = %s\nserver = %s\n", curl_cmd, server); ++ if (debug) fprintf(logout, "curl_cmd = %s\nserver = %s\n", curl_cmd, server); + } + + void init_list_cmd (char *buf) { diff --git a/community/fceux/PKGBUILD b/community/fceux/PKGBUILD new file mode 100644 index 000000000..fcfe064ee --- /dev/null +++ b/community/fceux/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 57567 2011-10-30 20:09:10Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Jo Christian Bergskås <jcberg@gmail.com> +pkgname=fceux +pkgver=2.1.5 +pkgrel=3 +arch=('x86_64' 'i686') +url="http://fceux.com/" +pkgdesc="Fast and ultra-compatible NES/Famicom emulator" +license=('GPL') +depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils') +makedepends=('scons' 'mesa' 'lua') +optdepends=('xchm: for viewing the manual') +provides=('fceu' 'gfceux') +replaces=('fceu' 'gfceux') +install=fceux.install +source=("http://downloads.sourceforge.net/fceultra/$pkgname-$pkgver.src.tar.bz2" + "fceux.desktop" + "fceux.png") +md5sums=('e8b20e62bbbb061b1a59d51b47c827bd' + '3c6a259d88825ff1b9387d191a6c970e' + '3fe753731ac46b5fee528b1f73abd3e3') + +build() { + cd "$srcdir/fceu${pkgver}" + + sed -i "s|/usr/local|$pkgdir/usr|" SConstruct + scons OPENGL=0 install +} + +package() { + cd "$srcdir/fceu${pkgver}" + + install -Dm644 bin/$pkgname.chm \ + "$pkgdir/usr/share/doc/$pkgname/$pkgname.chm" + install -Dm644 $srcdir/fceux.desktop \ + "$pkgdir/usr/share/applications/fceux.desktop" + install -Dm644 $srcdir/fceux.png \ + "$pkgdir/usr/share/pixmaps/fceux.png" + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/fceux/fceux.desktop b/community/fceux/fceux.desktop new file mode 100644 index 000000000..c20271a77 --- /dev/null +++ b/community/fceux/fceux.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Fceux +GenericName=NES/Famicom emulator +Exec=fceux +Icon=fceux +Type=Application +Categories=Game;Emulator; +Encoding=UTF-8 +MimeType=application/x-nes;application/x-nes-rom diff --git a/community/fceux/fceux.install b/community/fceux/fceux.install new file mode 100644 index 000000000..ad97d7bab --- /dev/null +++ b/community/fceux/fceux.install @@ -0,0 +1,13 @@ +post_upgrade() { + update-desktop-database -q +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/fceux/fceux.png b/community/fceux/fceux.png Binary files differnew file mode 100644 index 000000000..1cf27b1fd --- /dev/null +++ b/community/fceux/fceux.png diff --git a/community/libee/PKGBUILD b/community/libee/PKGBUILD new file mode 100644 index 000000000..dec3ed023 --- /dev/null +++ b/community/libee/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 62738 2012-01-25 15:37:48Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Brian Knox <taotetek@gmail.com> + +pkgname=libee +pkgver=0.3.1 +pkgrel=3 +pkgdesc="event expression library inspired by CEE" +url="http://www.libee.org/" +arch=('i686' 'x86_64') +license=('LGPL2.1') +depends=('libestr') +makedepends=() +optdepends=() +options=(!libtool) +source=("http://www.libee.org/files/download/libee-$pkgver.tar.gz") +md5sums=('61403a9a62b984381cf48454664f915e') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make -j1 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} +} diff --git a/community/libestr/PKGBUILD b/community/libestr/PKGBUILD new file mode 100644 index 000000000..adb612d56 --- /dev/null +++ b/community/libestr/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 62740 2012-01-25 15:38:28Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Brian Knox <taotetek@gmail.com> + +pkgname=libestr +pkgver=0.1.2 +pkgrel=2 +pkgdesc="essentials for string handling (and a bit more)" +url="http://libestr.adiscon.com/" +arch=('i686' 'x86_64') +license=('LGPL2.1') +depends=() +options=(!libtool) +source=("http://libestr.adiscon.com/files/download/libestr-$pkgver.tar.gz") +md5sums=('30ec4054155dc7d7e9b06418181c4f12') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} +} diff --git a/community/mednafen/ChangeLog b/community/mednafen/ChangeLog new file mode 100644 index 000000000..a3097076c --- /dev/null +++ b/community/mednafen/ChangeLog @@ -0,0 +1,6 @@ +2011-05-17 Angel Velasquez <angvp@archlinux.org> + * Updated to 0.8.D.3 + * Removed fix_build patch + * Cleaned PKGBUILD + * Adding ChangeLog + diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD new file mode 100755 index 000000000..88e469afc --- /dev/null +++ b/community/mednafen/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> +# Contributor: kagan <juanynie@mi.madritel.es> +pkgname=mednafen +pkgver=0.8.D.3 +pkgrel=1 +pkgdesc="A command-line multi-system gaming emulator" +url="http://mednafen.sourceforge.net/" +license=(GPL) +arch=('i686' 'x86_64') +depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') +makedepends=('pkgconfig' 'mesa') +changelog=ChangeLog +source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2) +md5sums=('57d22805071becd81858b0c088a275e5') + +build() { + cd $srcdir/$pkgname + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname + make DESTDIR=$pkgdir install +} diff --git a/community/nestopia/ChangeLog b/community/nestopia/ChangeLog new file mode 100644 index 000000000..5077d00b2 --- /dev/null +++ b/community/nestopia/ChangeLog @@ -0,0 +1,12 @@ +2008-12-16 Tiago Pierezan Camargo <tcamargo@gmail.com> + + * PKGBUILD: Minor corrections. + +2008-12-04 Tiago Pierezan Camargo <tcamargo@gmail.com> + + * PKGBUILD (source): Package adopted. + Variable/version cleanup. + Patch to remove bogus error messages on program exit. + New dependency: mesa. + Renamed executable to nestopia. + diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD new file mode 100644 index 000000000..0cff030f3 --- /dev/null +++ b/community/nestopia/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 53185 2011-07-31 19:02:49Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com> +# Contributor: robb_force <robb_force@holybuffalo.net> + +pkgname=nestopia +pkgver=1.40h +pkgrel=4 +pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.' +url='http://rbelmont.mameworld.info/?page_id=200' +license=('GPL') +arch=('i686' 'x86_64') +depends=('sdl>=1.2.12' 'alsa-lib' 'gtk2>=2.4' 'mesa') +makedepends=('unzip') +# rbelmont.mameworld.info blocks some user-agents +DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --user-agent=Mozilla/5.0 -O %o %u' + 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') +source=("https://downloads.sourceforge.net/project/nestopia/Nestopia/v${pkgver//[a-z]/}/Nestopia${pkgver//[.a-z]/}src.zip" + "http://rbelmont.mameworld.info/nst${pkgver//[a.a-z]/}_lnx_release_${pkgver:${#pkgver}-1:1}.zip" + "nestopia" + "nestopia_bogus_error_on_save_settings.patch") +md5sums=('526c99a06d2b257135e7047b0ed95ae0' + 'f9a9a905bada67e11dac1364612d0b35' + 'abc2f030dd291f58d65c9095ef024225' + '0160078c9afcbb1a6ac389c3989929f7') + +build() { + cd ${srcdir} + # remove a bogus error message on exit + patch -p0 < nestopia_bogus_error_on_save_settings.patch + make -j1 + + # Install the nestopia script that copies required files to ~/.nestopia + install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/usr/bin/${pkgname} + + # Older releases used a .sh file. Make a symlink to make everyone happy + cd ${pkgdir}/usr/bin + ln -s ${pkgname} ${pkgname}.sh + + # Install the required files and executable in /usr/share + cd ${srcdir} + install -Dm755 nst ${pkgdir}/usr/bin/${pkgname}-bin + install -dm775 ${pkgdir}/usr/share/${pkgname}/ + install -m644 nstcontrols ${pkgdir}/usr/share/${pkgname}/ + install -m644 NstDatabase.xml ${pkgdir}/usr/share/${pkgname}/ +} diff --git a/community/nestopia/nestopia b/community/nestopia/nestopia new file mode 100644 index 000000000..52bd2b2b3 --- /dev/null +++ b/community/nestopia/nestopia @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ ! -e $HOME/.nestopia ]; then + echo "Running NEStopia for the first time..." + echo "Copying required files to ~/.nestopia..." + mkdir $HOME/.nestopia + cp /usr/share/nestopia/{nstcontrols,NstDatabase.xml} $HOME/.nestopia/ +fi + +nestopia-bin "$@" diff --git a/community/nestopia/nestopia_bogus_error_on_save_settings.patch b/community/nestopia/nestopia_bogus_error_on_save_settings.patch new file mode 100644 index 000000000..63f33bc72 --- /dev/null +++ b/community/nestopia/nestopia_bogus_error_on_save_settings.patch @@ -0,0 +1,11 @@ +--- source/linux/settings.cpp.old 2008-10-23 05:45:58.000000000 +0200 ++++ source/linux/settings.cpp 2008-12-04 23:17:59.000000000 +0100 +@@ -16,7 +16,7 @@ + using namespace LinuxNst; + + #define READ_SETTING(x) fread(&x, sizeof(x), 1, f) +-#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != sizeof(x)) std::cout << "Error writing setting!\n" ++#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != 1) std::cout << "Error writing setting!\n" + + static int rates[4] = { 11025, 22050, 44100, 48000 }; + diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 7c6f440b5..0f0d9d4be 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58586 2011-11-16 05:16:04Z spupykin $ +# $Id: PKGBUILD 62750 2012-01-25 18:56:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributer: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=3.10.0 -_rel=devel -#_rel=stable +pkgver=4.0.0 +#_rel=devel +_rel=stable pkgrel=2 pkgdesc="standalone virtual machine that can be used to execute bytecode compiled dynamic languages" arch=(i686 x86_64) @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=(!emptydirs !makeflags) source=(ftp://ftp.parrot.org/pub/parrot/releases/${_rel}/$pkgver/parrot-$pkgver.tar.gz) -md5sums=('36a839beaef511f178b0607a03f1ff0f') +md5sums=('fc613c41771baf79307c519072302299') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 7d098c9b6..f91a9e5d5 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 58329 2011-11-11 14:26:11Z spupykin $ +# $Id: PKGBUILD 62742 2012-01-25 15:39:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=5.8.6 +pkgver=6.2.0 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') license=('GPL3') -depends=('zlib') +depends=('zlib' 'libestr' 'libee') makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls') optdepends=('postgresql-libs: PostgreSQL Database Support' 'libmysqlclient: MySQL Database Support' 'net-snmp' 'gnutls') -backup=('etc/rsyslog.conf' \ +backup=('etc/rsyslog.conf' 'etc/logrotate.d/rsyslog' 'etc/conf.d/rsyslog') options=('strip' 'zipman' '!libtool') @@ -22,13 +22,14 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' 'rsyslog.conf.d') -md5sums=('c46db0496066b82faf735bd4222208d7' +md5sums=('03e237abaa5d47f92c6e655f92f22532' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' '1a0cd4530dd5d1439456d5ae230574d9') build() { cd ${srcdir}/${pkgname}-${pkgver} + export LDFLAGS="-lestr" ./configure --prefix=/usr \ --enable-mysql \ --enable-pgsql \ diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index e8dcf7cec..7c1f188be 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $ +# $Id: PKGBUILD 62734 2012-01-25 13:50:09Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=setconf pkgver=0.3.2 -pkgrel=1 -pkgdesc="Utility to easily change settings in Makefiles and other configuration files" +pkgrel=3 +pkgdesc="Utility to easily change settings in Makefiles and configuration files" arch=('x86_64' 'i686') url="http://setconf.roboticoverlords.org/" license=('GPL') depends=('pcre' 'gc') -makedepends=('shedskin>=0.1.2') +makedepends=('shedskin>=0.9.1') source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2") sha256sums=('8b18e11da7adf78f2e21c39cfa949b178fa1b2f85e691b85be123023b7303f03') diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD new file mode 100644 index 000000000..9bb33a812 --- /dev/null +++ b/community/vidalia/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 62747 2012-01-25 18:13:51Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Rorschach <r0rschach@lavabit.com> + +pkgname=vidalia +pkgver=0.2.15 +pkgrel=1 +pkgdesc="Controller GUI for Tor" +url="https://www.torproject.org/vidalia" +arch=('i686' 'x86_64') +license=('GPL') +depends=('qt' 'tor') +makedepends=('cmake') +install=vidalia.install +source=("https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz") +md5sums=(845b627eb2534aa5da29efd6c8d30978) + +build() { + [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh + + cd "$srcdir" + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr ../$pkgname-$pkgver + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir/" install + install -Dm644 ../$pkgname-$pkgver/doc/vidalia.1 "$pkgdir"/usr/share/man/man1/vidalia.1 || return 1 +} diff --git a/community/vidalia/vidalia.install b/community/vidalia/vidalia.install new file mode 100644 index 000000000..58b897a0a --- /dev/null +++ b/community/vidalia/vidalia.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} |
