From 2586a8c75ef351dbd1b31605644e101e92d2c280 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 5 Jan 2013 00:38:32 -0800 Subject: Sat Jan 5 00:38:32 PST 2013 --- community/cdemu-daemon/PKGBUILD | 80 ++--- community/cdemu-daemon/cdemu-daemon-dbus.conf | 24 ++ community/cdemu-daemon/cdemu-daemon.conf | 8 + community/cdemu-daemon/cdemu-daemon.install | 37 ++- community/cdemu-daemon/cdemu-daemon.service | 2 +- community/cdemu-daemon/system.patch | 29 +- community/cmus/PKGBUILD | 26 +- community/cmus/cmus-2.5.0-opus-support.patch | 417 ++++++++++++++++++++++++++ community/cython/PKGBUILD | 6 +- community/libmirage/PKGBUILD | 35 ++- community/libmirage/libmirage.install | 11 + community/libmirage/soname.diff | 10 + community/opus-tools/PKGBUILD | 29 ++ community/recorditnow/PKGBUILD | 46 +++ community/recorditnow/cmake.patch | 13 + community/recorditnow/recorditnow.install | 11 + core/krb5/PKGBUILD | 9 +- core/krb5/krb5-config_LDFLAGS.patch | 12 + extra/opencv/PKGBUILD | 12 +- libre/calibre-libre/PKGBUILD | 6 +- libre/liferea-libre/PKGBUILD | 8 +- 21 files changed, 715 insertions(+), 116 deletions(-) create mode 100644 community/cdemu-daemon/cdemu-daemon-dbus.conf create mode 100644 community/cdemu-daemon/cdemu-daemon.conf create mode 100644 community/cmus/cmus-2.5.0-opus-support.patch create mode 100644 community/libmirage/libmirage.install create mode 100644 community/libmirage/soname.diff create mode 100644 community/opus-tools/PKGBUILD create mode 100644 community/recorditnow/PKGBUILD create mode 100644 community/recorditnow/cmake.patch create mode 100644 community/recorditnow/recorditnow.install create mode 100644 core/krb5/krb5-config_LDFLAGS.patch diff --git a/community/cdemu-daemon/PKGBUILD b/community/cdemu-daemon/PKGBUILD index 4dec04ed8..33839da24 100644 --- a/community/cdemu-daemon/PKGBUILD +++ b/community/cdemu-daemon/PKGBUILD @@ -1,63 +1,73 @@ -# $Id: PKGBUILD 73196 2012-07-03 19:16:11Z dreisner $ -# Maintainer: Ray Rashif +# $Id: PKGBUILD 81966 2013-01-05 03:16:00Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Ray Rashif # Contributor: Mateusz Herych # Contributor: Charles Lindsay pkgname=cdemu-daemon -pkgver=1.5.0 -pkgrel=6 +pkgver=2.0.0 +pkgrel=1 pkgdesc="CD/DVD-ROM device emulator daemon" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://cdemu.sourceforge.net/" -license=('GPL') -depends=('dbus' 'vhba-module>=20110915-5' 'libao' "libmirage=$pkgver") +license=(GPL) +depends=(dbus "vhba-module>=20110915-5" libao "libmirage>=2.0.0") +makedepends=(cmake) optdepends=('alsa-lib: to enable the ALSA audio driver' 'pulseaudio: to enable the PA audio driver') -backup=('etc/conf.d/cdemud' - 'etc/dbus-1/system.d/cdemud-dbus.conf') +backup=('etc/conf.d/cdemu-daemon' + 'etc/dbus-1/system.d/cdemu-daemon-dbus.conf') install=$pkgname.install source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" - 'cdemud.conf' 'cdemud.rc' 'system.patch' 'cdemu-daemon.service' - 'cdemud-dbus.conf') -md5sums=('5ba780caa26d855942512b5b3c22405a' + 'cdemu-daemon.conf' 'system.patch' 'cdemu-daemon.service' + 'cdemu-daemon-dbus.conf') +md5sums=('8f6ad3a9f758938e1572046bccc30417' '6f31ad7a64d320cf4d6820432184070b' - 'cbc0937ef4ac50db3ce5cdbbe2e17a3b' - '90a2516639c05737fa10a110a1cba467' - 'be9a8f50da3f42129c0a0e3dea8cd56c' - 'afbf24bcdec382f58d95ba5de29bff71') + '60c41731d4dce7b67e1a30dc42d2f274' + '99f35b4640529d30ea40224386dd6f4f' + '55619a492de4ef06b0759b5e4358bcbb') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver - # make things Arch-friendly - patch -Np1 -i "$srcdir/system.patch" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/$pkgname + mkdir build; cd build + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_INSTALL_LIBEXECDIR=lib/$pkgname \ + -DSYSTEM_BUS_SERVICE=on # This is disabled by default. Should we even ship it? make } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver/build make DESTDIR="$pkgdir" install + install -d "$pkgdir/usr/lib/modules-load.d" + echo vhba > "$pkgdir/usr/lib/modules-load.d/cdemu.conf" + + # + # All the following stuff concerns the system bus service + # + + cd ../.. + + # make things Arch-friendly + patch "$pkgdir/usr/lib/cdemu-daemon/cdemu-daemon-system.sh" system.patch + # Custom dbus policy, tightening security to console and 'cdemu' group - install -m644 "$srcdir/cdemud-dbus.conf" \ - "$pkgdir/etc/dbus-1/system.d/cdemud-dbus.conf" + install -m644 cdemu-daemon-dbus.conf \ + "$pkgdir/etc/dbus-1/system.d/cdemu-daemon-dbus.conf" - # the init stuff - install -Dm644 "$srcdir/cdemud.conf" "$pkgdir/etc/conf.d/cdemud" - install -Dm755 "$srcdir/cdemud.rc" "$pkgdir/etc/rc.d/cdemud" - install -d "$pkgdir/usr/lib/modules-load.d" - echo "vhba" > "$pkgdir/usr/lib/modules-load.d/cdemu.conf" + # the system daemon configuration + install -Dm644 cdemu-daemon.conf "$pkgdir/etc/conf.d/cdemu-daemon" # for systemd - install -Dm644 "$srcdir/cdemu-daemon.service" \ + install -Dm644 cdemu-daemon.service \ "$pkgdir/usr/lib/systemd/system/cdemu-daemon.service" - echo "SystemdService=cdemu-daemon.service" >> \ - "$pkgdir/usr/share/dbus-1/system-services/net.sf.cdemu.CDEMUD_Daemon.service" + echo SystemdService=cdemu-daemon.service >> \ + "$pkgdir/usr/share/dbus-1/system-services/net.sf.cdemu.CDEmuDaemon.service" } # vim:set ts=2 sw=2 et: diff --git a/community/cdemu-daemon/cdemu-daemon-dbus.conf b/community/cdemu-daemon/cdemu-daemon-dbus.conf new file mode 100644 index 000000000..ed14c6e39 --- /dev/null +++ b/community/cdemu-daemon/cdemu-daemon-dbus.conf @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/community/cdemu-daemon/cdemu-daemon.conf b/community/cdemu-daemon/cdemu-daemon.conf new file mode 100644 index 000000000..1d8c55fe6 --- /dev/null +++ b/community/cdemu-daemon/cdemu-daemon.conf @@ -0,0 +1,8 @@ +# how many optical drives to emulate +NUM_DEVICES=2 + +# audio backend (null, alsa or pulse) +AUDIO_DRIVER=null + +# log file +LOG_FILE=/var/log/cdemud.log diff --git a/community/cdemu-daemon/cdemu-daemon.install b/community/cdemu-daemon/cdemu-daemon.install index ba34d1ea0..7a2384b47 100644 --- a/community/cdemu-daemon/cdemu-daemon.install +++ b/community/cdemu-daemon/cdemu-daemon.install @@ -1,25 +1,38 @@ post_install () { cat < The daemon is automatically started, but can be manually - started via /etc/rc.d/cdemud or cdemu-daemon.service. - > See /etc/conf.d/cdemud for further configuration. + > Only users with at a physical terminal or in the 'cdemu' + group can communicate with the system daemon or make use + of a session daemon. - > Only users at the console or in the 'cdemu' group can - communicate with the system daemon or use a session - daemon. + > If you want to output CD-Audio you need to use a session + daemon, e.g. via "cdemu -b session". If you use ALSA and + not PulseAudio, echo AUDIO_DRIVER=alsa > ~/.cdemu-daemon + + > The daemons are usually started on-demand, but a system + daemon can be manually started via cdemu-daemon.service. + See /etc/conf.d/cdemu-daemon for further configuration. - > If you want to output CD-Audio, write AUDIO_DRIVER=pulse or - AUDIO_DRIVER=alsa to ~/.cdemud and use "cdemu -b session" - to control a session daemon. MSG + post_upgrade $1 $1 + return 0 } post_upgrade () { - # Repeat install message due to policy changes - # Added on 2012-06-19, remove after a grace period - post_install + if (( $(vercmp $2 2.0.0) < 0)); then + cat < Configuration files and log files have been renamed in + order to bring Arch closer to upstream. In particular, + this affects: + /etc/conf.d/cdemud --> /etc/conf.d/cdemu-daemon + /var/log/cdemud.log --> /var/log/cdemu-daemon.log + ~/.cdemud --> ~/.cdemu-daemon + ~/.cdemud.log --> ~/.cdemu-daemon.log + Please move your configuration. + +MSG + fi return 0 } diff --git a/community/cdemu-daemon/cdemu-daemon.service b/community/cdemu-daemon/cdemu-daemon.service index 9879a3e6f..ab4834f60 100644 --- a/community/cdemu-daemon/cdemu-daemon.service +++ b/community/cdemu-daemon/cdemu-daemon.service @@ -3,7 +3,7 @@ Description=CDEmu Daemon [Service] Type=dbus -BusName=net.sf.cdemu.CDEMUD_Daemon +BusName=net.sf.cdemu.CDEmuDaemon ExecStart=/usr/lib/cdemu-daemon/cdemu-daemon-system.sh [Install] diff --git a/community/cdemu-daemon/system.patch b/community/cdemu-daemon/system.patch index 3c3d4b221..42812f6cf 100644 --- a/community/cdemu-daemon/system.patch +++ b/community/cdemu-daemon/system.patch @@ -1,26 +1,3 @@ -diff -aur cdemu-daemon-1.5.0.orig/session/cdemu-daemon-session.sh cdemu-daemon-1.5.0/session/cdemu-daemon-session.sh ---- cdemu-daemon-1.5.0.orig/session/cdemu-daemon-session.sh 2012-03-25 16:35:40.577837996 +0800 -+++ cdemu-daemon-1.5.0/session/cdemu-daemon-session.sh 2012-03-25 16:39:12.180024983 +0800 -@@ -1,15 +1,15 @@ - #!/bin/sh - # Starts the CDEmu daemon instance on D-Bus *session* bus. Optional - # configuration (number of devices, audio driver, log file) are read --# from ~/.cdemu-daemon -+# from ~/.cdemud - - # Default settings - NUM_DEVICES=2 --AUDIO_DRIVER=pulse --LOG_FILE=~/.cdemu-daemon.log -+AUDIO_DRIVER=null -+LOG_FILE=~/.cdemud.log - - # Read the settings --CONFIG_FILE=~/.cdemu-daemon -+CONFIG_FILE=~/.cdemud - - if [ -f ${CONFIG_FILE} ]; then - . ${CONFIG_FILE}; diff -aur cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh --- cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh 2012-03-25 16:35:40.581171312 +0800 +++ cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh 2012-03-25 16:36:48.810801678 +0800 @@ -29,17 +6,17 @@ diff -aur cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh cdemu-daemon-1.5 # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional # configuration (number of devices, audio driver, log file) are read -# from /etc/sysconfig/cdemu-daemon -+# from /etc/conf.d/cdemud ++# from /etc/conf.d/cdemu-daemon # Default settings NUM_DEVICES=2 AUDIO_DRIVER=null -LOG_FILE=/tmp/cdemu-daemon.log -+LOG_FILE=/var/log/cdemud.log ++LOG_FILE=/var/log/cdemu-daemon.log # Read the settings -CONFIG_FILE=/etc/sysconfig/cdemu-daemon -+CONFIG_FILE=/etc/conf.d/cdemud ++CONFIG_FILE=/etc/conf.d/cdemu-daemon if [ -f ${CONFIG_FILE} ]; then . ${CONFIG_FILE}; diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD index 140d046ee..62e7e99bf 100644 --- a/community/cmus/PKGBUILD +++ b/community/cmus/PKGBUILD @@ -1,35 +1,39 @@ -# $Id: PKGBUILD 79561 2012-11-07 13:48:29Z bpiotrowski $ +# $Id: PKGBUILD 81962 2013-01-04 20:16:47Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Aaron Griffin # Contributor: dorphell pkgname=cmus pkgver=2.5.0 -pkgrel=1 +pkgrel=2 pkgdesc='Very feature-rich ncurses-based music player' arch=('i686' 'x86_64') url="http://cmus.sourceforge.net/" license=('GPL') depends=('ncurses') -makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' - 'libvorbis' 'libpulse' 'wavpack' 'libmp4v2') +makedepends=('faad2' 'ffmpeg' 'flac' 'libao' 'libmad' 'libmodplug' + 'libmp4v2' 'libmpcdec' 'libpulse' 'libvorbis' 'opusfile' 'wavpack') optdepends=('alsa-lib: for ALSA output plugin support' 'libao: for AO output plugin support' 'libpulse: for PulseAudio output plugin support' + 'faad2: for AAC input plugin support' 'ffmpeg: for ffmpeg input plugin support' - 'libmodplug: for modplug input plugin support' - 'faad2: for input AAC plugin support' + 'flac: for flac input plugin support' 'libmad: for mp3 input plugin support' + 'libmodplug: for modplug input plugin support' + 'libmp4v2: for mp4 input plugin support' 'libmpcdec: for musepack input plugin support' - 'wavpack: for wavpack input plugin support' 'libvorbis: for vorbis input plugin support' - 'flac: for flac input plugin support' - 'libmp4v2: for mp4 input plugin support') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2) -sha1sums=('244975a5ff642567acb047f6bd518e4a3271c25b') + 'opusfile: for opus input plugin support' + 'wavpack: for wavpack input plugin support') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2 + cmus-2.5.0-opus-support.patch) +sha1sums=('244975a5ff642567acb047f6bd518e4a3271c25b' + '5e524f54d565dfa30760562c223bc0e2e8ed00a0') build() { cd $srcdir/$pkgname-v$pkgver + patch -Np1 -i $srcdir/cmus-2.5.0-opus-support.patch ./configure prefix=/usr make } diff --git a/community/cmus/cmus-2.5.0-opus-support.patch b/community/cmus/cmus-2.5.0-opus-support.patch new file mode 100644 index 000000000..80692e9da --- /dev/null +++ b/community/cmus/cmus-2.5.0-opus-support.patch @@ -0,0 +1,417 @@ +diff -rupN cmus-v2.5.0/Makefile cmus/Makefile +--- cmus-v2.5.0/Makefile 2012-11-07 09:46:17.000000000 +0100 ++++ cmus/Makefile 2013-01-04 07:15:35.293069953 +0100 +@@ -74,6 +74,7 @@ mikmod-objs := mikmod.lo + modplug-objs := modplug.lo + mpc-objs := mpc.lo + vorbis-objs := vorbis.lo ++opus-objs := opus.lo + wavpack-objs := wavpack.lo + wav-objs := wav.lo + mp4-objs := mp4.lo +@@ -88,6 +89,7 @@ ip-$(CONFIG_MIKMOD) += mikmod.so + ip-$(CONFIG_MODPLUG) += modplug.so + ip-$(CONFIG_MPC) += mpc.so + ip-$(CONFIG_VORBIS) += vorbis.so ++ip-$(CONFIG_OPUS) += opus.so + ip-$(CONFIG_WAVPACK) += wavpack.so + ip-$(CONFIG_WAV) += wav.so + ip-$(CONFIG_MP4) += mp4.so +@@ -102,6 +104,7 @@ $(mikmod-objs): CFLAGS += $(MIKMOD_CFLA + $(modplug-objs): CFLAGS += $(MODPLUG_CFLAGS) + $(mpc-objs): CFLAGS += $(MPC_CFLAGS) + $(vorbis-objs): CFLAGS += $(VORBIS_CFLAGS) ++$(opus-objs): CFLAGS += $(OPUS_CFLAGS) + $(wavpack-objs): CFLAGS += $(WAVPACK_CFLAGS) + $(mp4-objs): CFLAGS += $(MP4_CFLAGS) + $(aac-objs): CFLAGS += $(AAC_CFLAGS) +@@ -129,6 +132,9 @@ mpc.so: $(mpc-objs) $(libcmus-y) + vorbis.so: $(vorbis-objs) $(libcmus-y) + $(call cmd,ld_dl,$(VORBIS_LIBS)) + ++opus.so: $(opus-objs) $(libcmus-y) ++ $(call cmd,ld_dl,$(OPUS_LIBS)) ++ + wavpack.so: $(wavpack-objs) $(libcmus-y) + $(call cmd,ld_dl,$(WAVPACK_LIBS)) + +diff -rupN cmus-v2.5.0/configure cmus/configure +--- cmus-v2.5.0/configure 2012-11-07 09:46:17.000000000 +0100 ++++ cmus/configure 2013-01-04 07:15:35.293069953 +0100 +@@ -228,6 +228,12 @@ check_vorbis() + fi + } + ++check_opus() ++{ ++ pkg_config OPUS "opusfile" ++ return $? ++} ++ + check_wavpack() + { + pkg_config WAVPACK "wavpack" "" "-lwavpack" +@@ -425,6 +431,7 @@ Optional Features: y/n + CONFIG_MPC libmpcdec (Musepack .mpc, .mpp, .mp+) [auto] + CONFIG_VORBIS Ogg/Vorbis (.ogg, application/ogg, audio/x-ogg) [auto] + CONFIG_TREMOR Use Tremor as Ogg/Vorbis input plugin [n] ++ CONFIG_OPUS Opus (.opus) [auto] + CONFIG_WAV WAV [y] + CONFIG_WAVPACK WavPack (.wv, audio/x-wavpack) [auto] + CONFIG_MP4 MPEG-4 AAC (.mp4, .m4a, .m4b) [auto] +@@ -485,6 +492,7 @@ check check_mikmod CONFIG_MIKMOD + check check_modplug CONFIG_MODPLUG + check check_mpc CONFIG_MPC + check check_vorbis CONFIG_VORBIS ++check check_opus CONFIG_OPUS + check check_wavpack CONFIG_WAVPACK + check check_mp4 CONFIG_MP4 + check check_aac CONFIG_AAC +@@ -534,7 +542,7 @@ config_header config/cue.h CONFIG_CUE + CFLAGS="${CFLAGS} -DHAVE_CONFIG" + + makefile_vars bindir datadir libdir mandir exampledir +-makefile_vars CONFIG_CDIO CONFIG_FLAC CONFIG_MAD CONFIG_MIKMOD CONFIG_MODPLUG CONFIG_MPC CONFIG_VORBIS CONFIG_WAVPACK CONFIG_WAV CONFIG_MP4 CONFIG_AAC CONFIG_FFMPEG CONFIG_CUE ++makefile_vars CONFIG_CDIO CONFIG_FLAC CONFIG_MAD CONFIG_MIKMOD CONFIG_MODPLUG CONFIG_MPC CONFIG_VORBIS CONFIG_OPUS CONFIG_WAVPACK CONFIG_WAV CONFIG_MP4 CONFIG_AAC CONFIG_FFMPEG CONFIG_CUE + makefile_vars CONFIG_ROAR CONFIG_PULSE CONFIG_ALSA CONFIG_AO CONFIG_ARTS CONFIG_OSS CONFIG_SUN CONFIG_WAVEOUT + + generate_config_mk +diff -rupN cmus-v2.5.0/opus.c cmus/opus.c +--- cmus-v2.5.0/opus.c 1970-01-01 01:00:00.000000000 +0100 ++++ cmus/opus.c 2013-01-04 07:15:35.493069945 +0100 +@@ -0,0 +1,335 @@ ++/* ++ * Copyright 2008-2012 Various Authors ++ * Copyright 2004-2005 Timo Hirvonen ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, see . ++ */ ++ ++#include "ip.h" ++#include "xmalloc.h" ++#include "read_wrapper.h" ++#include "debug.h" ++#include "comment.h" ++ ++#include ++ ++#include ++#include ++#include ++#include ++ ++#define SAMPLING_RATE 48000 ++#define CHANNELS 2 ++ ++struct opus_private { ++ OggOpusFile *of; ++ int current_link; ++}; ++ ++static int read_func(void *datasource, unsigned char *ptr, int size) ++{ ++ struct input_plugin_data *ip_data = datasource; ++ return read_wrapper(ip_data, ptr, size); ++} ++ ++static int seek_func(void *datasource, opus_int64 offset, int whence) ++{ ++ struct input_plugin_data *ip_data = datasource; ++ return lseek(ip_data->fd, offset, whence); ++} ++ ++static int close_func(void *datasource) ++{ ++ struct input_plugin_data *ip_data; ++ int rc; ++ ++ ip_data = datasource; ++ rc = close(ip_data->fd); ++ ip_data->fd = -1; ++ return rc; ++} ++ ++static opus_int64 tell_func(void *datasource) ++{ ++ struct input_plugin_data *ip_data = datasource; ++ return lseek(ip_data->fd, 0, SEEK_CUR); ++} ++ ++static OpusFileCallbacks callbacks = { ++ .read = read_func, ++ .seek = seek_func, ++ .tell = tell_func, ++ .close = close_func ++}; ++ ++static int opus_open(struct input_plugin_data *ip_data) ++{ ++ struct opus_private *priv; ++ int rc; ++ void *source; ++ ++ priv = xnew(struct opus_private, 1); ++ priv->current_link = -1; ++ priv->of = NULL; ++ ++ source = op_fdopen(&callbacks, ip_data->fd, "r"); ++ if (source == NULL) { ++ free(priv); ++ return -IP_ERROR_INTERNAL; ++ } ++ ++ priv->of = op_open_callbacks(source, &callbacks, NULL, 0, &rc); ++ if (rc != 0) { ++ d_print("op_open_callbacks failed: %d:%s\n", rc, strerror(rc)); ++ free(priv); ++ /* ogg is a container format, so it is likely to contain ++ * something else if it isn't opus */ ++ return -IP_ERROR_UNSUPPORTED_FILE_TYPE; ++ } ++ ip_data->private = priv; ++ ++ ip_data->sf = sf_rate(SAMPLING_RATE) ++ | sf_channels(CHANNELS) ++ | sf_bits(16) ++ | sf_signed(1); ++#ifdef WORDS_BIGENDIAN ++ ip_data->sf |= sf_bigendian(1); ++#endif ++ return 0; ++} ++ ++static int opus_close(struct input_plugin_data *ip_data) ++{ ++ struct opus_private *priv = ip_data->private; ++ /* this closes ip_data->fd! */ ++ op_free(priv->of); ++ ip_data->fd = -1; ++ free(priv); ++ ip_data->private = NULL; ++ return 0; ++} ++ ++/* ++ * -n ++ * indicates error ++ * 0 ++ * indicates EOF ++ * n ++ * indicates actual number of bytes read ++ */ ++static int opus_read(struct input_plugin_data *ip_data, char *buffer, int count) ++{ ++ struct opus_private *priv; ++ int samples, current_link, rc; ++ ++ priv = ip_data->private; ++ ++ /* samples = number of samples read per channel */ ++ samples = op_read_stereo(priv->of, (opus_int16*)buffer, ++ count / sizeof(opus_int16)); ++ if (samples < 0) { ++ switch (samples) { ++ case OP_HOLE: ++ errno = EAGAIN; ++ rc = -1; ++ break; ++ case OP_EREAD: ++ errno = EINVAL; ++ rc = -1; ++ break; ++ case OP_EFAULT: ++ errno = EINVAL; ++ rc = -1; ++ break; ++ case OP_EIMPL: ++ rc = -IP_ERROR_FUNCTION_NOT_SUPPORTED; ++ break; ++ case OP_EINVAL: ++ errno = EINVAL; ++ rc = -1; ++ break; ++ case OP_ENOTFORMAT: ++ rc = -IP_ERROR_FILE_FORMAT; ++ break; ++ case OP_EBADHEADER: ++ rc = -IP_ERROR_FILE_FORMAT; ++ break; ++ case OP_EVERSION: ++ rc = -IP_ERROR_FILE_FORMAT; ++ break; ++ case OP_EBADPACKET: ++ errno = EINVAL; ++ rc = -1; ++ break; ++ case OP_EBADLINK: ++ errno = EINVAL; ++ rc = -1; ++ break; ++ case OP_EBADTIMESTAMP: ++ rc = -IP_ERROR_FILE_FORMAT; ++ break; ++ default: ++ d_print("error: %d\n", samples); ++ rc = -IP_ERROR_FILE_FORMAT; ++ } ++ } else if (samples == 0) { ++ /* EOF or buffer too small */ ++ rc = 0; ++ } else { ++ current_link = op_current_link(priv->of); ++ if (current_link < 0) { ++ d_print("error: %d\n", current_link); ++ rc = -1; ++ } else { ++ if (ip_data->remote && current_link != priv->current_link) { ++ ip_data->metadata_changed = 1; ++ priv->current_link = current_link; ++ } ++ ++ /* bytes = samples * channels * sample_size */ ++ rc = samples * CHANNELS * sizeof(opus_int16); ++ } ++ } ++ ++ return rc; ++} ++ ++static int opus_seek(struct input_plugin_data *ip_data, double offset) ++{ ++ struct opus_private *priv; ++ int rc; ++ ++ priv = ip_data->private; ++ ++ rc = op_pcm_seek(priv->of, offset * SAMPLING_RATE); ++ switch (rc) { ++ case OP_ENOSEEK: ++ return -IP_ERROR_FUNCTION_NOT_SUPPORTED; ++ case OP_EINVAL: ++ return -IP_ERROR_INTERNAL; ++ case OP_EREAD: ++ return -IP_ERROR_INTERNAL; ++ case OP_EFAULT: ++ return -IP_ERROR_INTERNAL; ++ case OP_EBADLINK: ++ return -IP_ERROR_INTERNAL; ++ } ++ return 0; ++} ++ ++static int opus_read_comments(struct input_plugin_data *ip_data, ++ struct keyval **comments) ++{ ++ GROWING_KEYVALS(c); ++ struct opus_private *priv; ++ const OpusTags *ot; ++ int i; ++ ++ priv = ip_data->private; ++ ++ ot = op_tags(priv->of, -1); ++ if (ot == NULL) { ++ d_print("ot == NULL\n"); ++ *comments = keyvals_new(0); ++ return 0; ++ } ++ ++ for (i = 0; i < ot->comments; i++) { ++ const char *str = ot->user_comments[i]; ++ const char *eq = strchr(str, '='); ++ char *key; ++ ++ if (!eq) { ++ d_print("invalid comment: '%s' ('=' expected)\n", str); ++ continue; ++ } ++ ++ key = xstrndup(str, eq - str); ++ comments_add_const(&c, key, eq + 1); ++ free(key); ++ } ++ keyvals_terminate(&c); ++ *comments = c.keyvals; ++ return 0; ++} ++ ++static int opus_duration(struct input_plugin_data *ip_data) ++{ ++ struct opus_private *priv; ++ ogg_int64_t samples; ++ ++ priv = ip_data->private; ++ ++ samples = op_pcm_total(priv->of, -1); ++ if (samples < 0) ++ return -IP_ERROR_FUNCTION_NOT_SUPPORTED; ++ ++ return samples / SAMPLING_RATE; ++} ++ ++static long opus_bitrate(struct input_plugin_data *ip_data) ++{ ++ struct opus_private *priv; ++ opus_int32 bitrate; ++ ++ priv = ip_data->private; ++ ++ bitrate = op_bitrate(priv->of, -1); ++ if (bitrate < 0) ++ return -IP_ERROR_FUNCTION_NOT_SUPPORTED; ++ else ++ return bitrate; ++} ++ ++static long opus_current_bitrate(struct input_plugin_data *ip_data) ++{ ++ struct opus_private *priv; ++ opus_int32 bitrate; ++ ++ priv = ip_data->private; ++ ++ bitrate = op_bitrate_instant(priv->of); ++ if (bitrate < 0) ++ return -IP_ERROR_FUNCTION_NOT_SUPPORTED; ++ else ++ return bitrate; ++} ++ ++static char *opus_codec(struct input_plugin_data *ip_data) ++{ ++ return xstrdup("opus"); ++} ++ ++static char *opus_codec_profile(struct input_plugin_data *ip_data) ++{ ++ return NULL; ++} ++ ++const struct input_plugin_ops ip_ops = { ++ .open = opus_open, ++ .close = opus_close, ++ .read = opus_read, ++ .seek = opus_seek, ++ .read_comments = opus_read_comments, ++ .duration = opus_duration, ++ .bitrate = opus_bitrate, ++ .bitrate_current = opus_current_bitrate, ++ .codec = opus_codec, ++ .codec_profile = opus_codec_profile ++}; ++ ++const int ip_priority = 50; ++const char * const ip_extensions[] = { "opus", NULL }; ++const char * const ip_mime_types[] = { NULL }; ++const char * const ip_options[] = { NULL }; diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index 53bc70047..cf925db51 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81893 2013-01-03 10:03:19Z spupykin $ +# $Id: PKGBUILD 81958 2013-01-04 19:09:03Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Igor Scabini pkgname=('cython' 'cython2') pkgbase=cython -pkgver=0.17.3 +pkgver=0.17.4 pkgrel=1 pkgdesc="C-Extensions for Python " arch=(i686 x86_64) @@ -12,7 +12,7 @@ url="http://www.cython.org" license=('APACHE') makedepends=('python-distribute' 'python2-distribute') source=("http://cython.org/release/Cython-$pkgver.tar.gz") -md5sums=('683241fee8f51a08acd42ab1deea0857') +md5sums=('cb11463e3a0c8d063e578db64ff61dde') build() { true diff --git a/community/libmirage/PKGBUILD b/community/libmirage/PKGBUILD index 0238a6320..e1ee19405 100644 --- a/community/libmirage/PKGBUILD +++ b/community/libmirage/PKGBUILD @@ -1,27 +1,36 @@ -# $Id: PKGBUILD 66729 2012-02-27 20:41:55Z heftig $ -# Maintainer: Mateusz Herych +# $Id: PKGBUILD 81967 2013-01-05 03:16:01Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Mateusz Herych # Contributor: Charles Lindsay pkgname=libmirage -pkgver=1.5.0 +pkgver=2.0.0 pkgrel=1 pkgdesc="CD-ROM image (B6T/CCD/CDI/CUE/ISO/MDS/NRG/TOC) access library" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://cdemu.sourceforge.net/" -license=('GPL') -depends=('glib2' 'libsndfile' 'zlib') -makedepends=('bison' 'flex' 'gtk-doc') -source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2) +license=(GPL) +depends=(glib2 libsndfile zlib bzip2 shared-mime-info) +makedepends=(bison flex gtk-doc cmake gobject-introspection) options=(!libtool) -md5sums=('b60d9baa754efee6e0f6a584ec033fff') +install=libmirage.install +source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2 + soname.diff) +md5sums=('72007f3364cbf3aea782aaa1fdade238' + '72b5af3d5baf8e9b1ec6afa629373799') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --disable-static + cd $pkgname-$pkgver + patch -Np2 -i ../soname.diff # Produce correct symlinks + mkdir build; cd build + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver/build + make DESTDIR="$pkgdir" install } diff --git a/community/libmirage/libmirage.install b/community/libmirage/libmirage.install new file mode 100644 index 000000000..78659c470 --- /dev/null +++ b/community/libmirage/libmirage.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/libmirage/soname.diff b/community/libmirage/soname.diff new file mode 100644 index 000000000..213f788ef --- /dev/null +++ b/community/libmirage/soname.diff @@ -0,0 +1,10 @@ +--- a/libmirage/CMakeLists.txt ++++ b/libmirage/CMakeLists.txt +@@ -112,7 +112,8 @@ + COMPILE_DEFINITIONS "${mirage_DEFS}" + LINK_FLAGS ${mirage_LDFLAGS_STR} + LIBRARY_OUTPUT_NAME mirage +- SOVERSION ${MIRAGE_SOVERSION} ++ VERSION ${MIRAGE_SOVERSION} ++ SOVERSION ${MIRAGE_LT_CURRENT} + ) diff --git a/community/opus-tools/PKGBUILD b/community/opus-tools/PKGBUILD new file mode 100644 index 000000000..b711af87f --- /dev/null +++ b/community/opus-tools/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 81947 2013-01-04 06:03:54Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Michael Düll +# Contributor: pumbur + +pkgname=opus-tools +pkgver=0.1.6 +pkgrel=1 +pkgdesc='Collection of tools for Opus audio codec' +arch=('i686' 'x86_64') +url='http://wiki.xiph.org/Opus-tools' +license=('BSD') +depends=('opus' 'libogg') +source=(http://downloads.xiph.org/releases/opus/$pkgname-$pkgver.tar.gz) + +build(){ + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +sha512sums=('547828082c4838643eeda513f65316b60b0e44c4a0826ef39cbfa3fe81df71b30651c03ceee7729aeb74258c259014bf95ca5f01aba097a4de8334e58c8e7ce6') diff --git a/community/recorditnow/PKGBUILD b/community/recorditnow/PKGBUILD new file mode 100644 index 000000000..c50ff5d41 --- /dev/null +++ b/community/recorditnow/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 81949 2013-01-04 08:45:38Z fyan $ +# Maintainer: Felix Yan +# Contributor: Yichao Yu +# Contributor: Weng Xuetian +# Contributor: Adrià Arrufat +# Contributor: Callea Gaetano Andrea + +pkgname=recorditnow +pkgver=0.8.1 +pkgrel=4 +pkgdesc="A plugin based desktop recorder for KDE SC 4" +arch=('i686' 'x86_64') +url="http://kde-apps.org/content/show.php/RecordItNow?content=114610" +license=('GPL') +depends=('kdebase-runtime' 'recordmydesktop' 'ffmpeg' 'xdg-utils') +makedepends=('cmake' 'automoc4') +optdepends=('mencoder: for mencoder encoder plugin') +provides=('recorditnow' 'joschy') +conflicts=('joschy-git') +install=recorditnow.install +source=("http://downloads.sourceforge.net/project/recorditnow/${pkgname}-${pkgver}.tar.bz2" + "cmake.patch") +md5sums=('6619b4048545adbab1d13a790189e80f' + '74ea0ababc2291e2a62e5d045c62616a') + +build() { + cd "${srcdir}/$pkgname-$pkgver" + patch -i "${srcdir}/cmake.patch" -p0 + + mkdir -p build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ + -DLINGUAS="de hu cs pt_BR fr it" .. + make +} + +package() { + cd "${srcdir}/$pkgname-$pkgver/build" + make DESTDIR="${pkgdir}" install + + if [[ "$CARCH" == "x86_64" ]]; then + cd "$pkgdir/usr" + mv lib64/* lib + rmdir lib64 + fi +} diff --git a/community/recorditnow/cmake.patch b/community/recorditnow/cmake.patch new file mode 100644 index 000000000..c9f067646 --- /dev/null +++ b/community/recorditnow/cmake.patch @@ -0,0 +1,13 @@ +--- src/CMakeLists.txt.orig 2012-03-17 19:36:44.834973898 +0800 ++++ src/CMakeLists.txt 2012-03-17 19:40:00.894972395 +0800 +@@ -121,6 +121,10 @@ + recorditnow_recorder + recorditnow_encoder + recorditnow_keymon ++ recorditnow_plugin ++ ${X11_X11_LIB} ++ ${X11_Xext_LIB} ++ ${X11_Xfixes_LIB} + ${X11_Xcursor_LIB}) + + if (BUILD_WITH_JOSCHY) diff --git a/community/recorditnow/recorditnow.install b/community/recorditnow/recorditnow.install new file mode 100644 index 000000000..c0797237a --- /dev/null +++ b/community/recorditnow/recorditnow.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index 4bae8a3b7..1562d2bb3 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173666 2012-12-20 14:18:03Z stephane $ +# $Id: PKGBUILD 174452 2013-01-04 16:47:52Z stephane $ # Maintainer: Stéphane Gaudreault pkgname=krb5 pkgver=1.11 -pkgrel=1 +pkgrel=2 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64') url="http://web.mit.edu/kerberos/" @@ -12,6 +12,7 @@ depends=('e2fsprogs' 'libldap' 'keyutils') makedepends=('perl') backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-signed.tar + krb5-config_LDFLAGS.patch krb5-kadmind krb5-kadmind.service krb5-kdc @@ -21,6 +22,7 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-si krb5-kpropd@.service krb5-kpropd.socket) sha1sums=('dcdc305bd2b63cf8b8cb698cb9ea28f0a6282136' + '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' @@ -35,6 +37,9 @@ build() { tar zxvf ${pkgname}-${pkgver}.tar.gz cd "${srcdir}/${pkgname}-${pkgver}/src" + # cf https://bugs.gentoo.org/show_bug.cgi?id=448778 + patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch + rm lib/krb5/krb/deltat.c # FS#25384 diff --git a/core/krb5/krb5-config_LDFLAGS.patch b/core/krb5/krb5-config_LDFLAGS.patch new file mode 100644 index 000000000..0b300cb44 --- /dev/null +++ b/core/krb5/krb5-config_LDFLAGS.patch @@ -0,0 +1,12 @@ +Bug #448778 +--- krb5-1.11/src/krb5-config.in 2012-12-18 02:47:04.000000000 +0000 ++++ krb5-1.11/src/krb5-config.in 2012-12-28 07:13:16.582693363 +0000 +@@ -217,7 +217,7 @@ + -e 's#\$(PROG_RPATH)#'$libdir'#' \ + -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ + -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ +- -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ ++ -e 's#\$(LDFLAGS)##' \ + -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ + -e 's#\$(CFLAGS)##'` + diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 60b93e686..de8eab1ad 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171611 2012-11-20 13:12:19Z schiv $ +# $Id: PKGBUILD 174304 2013-01-04 05:15:04Z schiv $ # Maintainer: Ray Rashif # Contributor: Tobias Powalowski @@ -6,19 +6,18 @@ pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.4.3 -pkgrel=3 +pkgrel=4 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') url="http://opencv.org/" -depends=('jasper' 'gstreamer0.10-base' 'intel-tbb' +depends=('jasper' 'gstreamer0.10-base' 'intel-tbb' 'libcl' 'xine-lib' 'libdc1394' 'openexr' 'gtkglext') -makedepends=('cmake' 'python2-numpy' 'eigen2' - 'libcl' 'opencl-headers' 'mesa') +makedepends=('cmake' 'python2-numpy' 'mesa' + 'opencl-headers' 'eigen2') optdepends=('opencv-docs' 'opencv-samples' 'eigen2' - 'libcl' 'python2-numpy: Python 2.x interface') source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2" 'pkgconfig.patch' @@ -107,6 +106,7 @@ package_opencv-samples() { mkdir -p "$pkgdir/usr/share/opencv" cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" + # Do we really need licenses for these minor splits? # install license file #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ # "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index dd5233b0e..52c390c3a 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.11 +pkgver=0.9.13 pkgrel=1 pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-imaging' 'shared-mime-info' 'python2-dnspython' 'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' 'python2-netifaces' 'python2-cssselect') -makedepends=('python2-pycountry') +makedepends=('python2-pycountry' 'qt-private-headers') optdepends=('ipython2: to use calibre-debug') replaces=$_pkgname conflicts=$_pkgname @@ -27,7 +27,7 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('07e620aed65d7bae2a27ccea123da4c9' +md5sums=('3ad062f85eca072c3990c766bc05412a' '42c07b43d575b5e7e7524bd7b9528f0e' '675cd87d41342119827ef706055491e7') diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 01ea9167c..84e095db4 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 170013 2012-10-31 00:54:28Z eric $ +# $Id: PKGBUILD 174301 2013-01-04 04:58:49Z eric $ # Maintainer: Eric Bélanger # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.10 -pkgrel=1.1 +pkgver=1.8.12 +pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs" arch=('i686' 'x86_64') url="http://liferea.sourceforge.net/" @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('1e71c56f4eb8ea7941fce53ced433491d0dd7c4d' +sha1sums=('f40c453af577e2870bc12981ef4df6418a627f78' '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { -- cgit v1.2.3-54-g00ecf