diff options
23 files changed, 788 insertions, 240 deletions
diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD index aa7b0a90d..b8797505e 100644 --- a/community/cdfs/PKGBUILD +++ b/community/cdfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58212 2011-11-08 22:41:05Z ibiru $ +# $Id: PKGBUILD 62176 2012-01-17 14:45:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> pkgname=cdfs pkgver=2.6.27 -pkgrel=17 +pkgrel=18 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/community/cdfs/cdfs.install b/community/cdfs/cdfs.install index 3693d60ed..d20b4c664 100644 --- a/community/cdfs/cdfs.install +++ b/community/cdfs/cdfs.install @@ -1,11 +1,14 @@ post_install() { - /sbin/depmod -a + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_upgrade() { - /sbin/depmod -a + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - /sbin/depmod -a + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index bb0935d2c..be3e3c257 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61388 2011-12-30 00:12:01Z giovanni $ +# $Id: PKGBUILD 62171 2012-01-17 08:26:12Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: archtux <antonio.arias99999 at gmail.com> pkgname=converseen -pkgver=0.4.7 -pkgrel=2 +pkgver=0.4.8 +pkgrel=1 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64') url="http://converseen.sourceforge.net/" @@ -13,7 +13,7 @@ depends=('imagemagick' 'qt' 'libwmf' 'openexr') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('d21cb571b268ddf4bcdc395d01c0dc49') +md5sums=('65cdb89445a3063b9c8362b411d3e3ef') build() { cd "${srcdir}" diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index a346dceac..f504cd36b 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58407 2011-11-12 17:17:53Z ibiru $ +# $Id: PKGBUILD 62167 2012-01-17 08:00:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -6,7 +6,7 @@ pkgname=minidlna pkgver=1.0.22 -pkgrel=4 +pkgrel=5 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/minidlna/" @@ -19,7 +19,7 @@ changelog=changelog source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz minidlna.rc) md5sums=('3de2f6b54f43bb998dfad3c8fa75cef3' - '8b064a6c344a3ad8029e2619dfe07b77') + 'b64b8b749f1c23b3f1a2ee6d6ded07fd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/minidlna/minidlna.rc b/community/minidlna/minidlna.rc index df44a549f..6e6f88f35 100755 --- a/community/minidlna/minidlna.rc +++ b/community/minidlna/minidlna.rc @@ -2,46 +2,65 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/minidlna.conf . /etc/conf.d/minidlna -PID=`pidof -o %PPID /usr/sbin/minidlna` +daemon_name=minidlna + +get_pid() { + pidof -o %PPID /usr/sbin/minidlna +} case "$1" in start) stat_busy "Starting minidlna" - [ -z "$PID" ] && su -s /bin/sh -l -c /usr/sbin/minidlna - $MINIDLNA_USER - if [ $? -gt 0 ]; then - stat_fail + PID=$(get_pid) + if [[ -z "$PID" ]]; then + rm -f /var/run/$daemon_name.pid + touch /var/run/$daemon_name.pid && chown $MINIDLNA_USER:$MINIDLNA_USER /var/run/$daemon_name.pid + su -s /bin/sh -l -c /usr/sbin/minidlna - $MINIDLNA_USER + if [[ $? -gt 0 ]]; then + stat_fail + exit 1 + else + add_daemon $daemon_name + stat_done + fi else - add_daemon minidlna - stat_done + stat_fail + exit 1 fi ;; + stop) stat_busy "Stopping minidlna" - [ ! -z "$PID" ] && kill $PID &> /dev/null + PID=$(get_pid) + [[ -n $PID ]] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail + exit 1 else + rm -f /var/run/$daemon_name.pid &> /dev/null rm_daemon minidlna stat_done fi ;; + clean) - $0 stop - sleep 1 - stat_busy "Cleaning minidlna cache" - [ -z $db_dir ] || rm -r $db_dir/* - stat_done - sleep 1 - $0 start - ;; + $0 stop + sleep 1 + stat_busy "Cleaning minidlna cache" + [ -z $db_dir ] || rm -r $db_dir/* + stat_done + sleep 1 + $0 start + ;; + restart) $0 stop sleep 1 $0 start ;; + *) echo "usage: $0 {start|stop|restart|clean}" esac diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD index 09c8dee1f..4807e3623 100644 --- a/community/open-vm-tools-modules/PKGBUILD +++ b/community/open-vm-tools-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61571 2012-01-03 12:07:32Z spupykin $ +# $Id: PKGBUILD 62178 2012-01-17 14:46:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools-modules pkgver=2011.12.20 _pkgsubver=562307 -pkgrel=1 +pkgrel=2 pkgdesc="kernel modules for the open source implementation of VMware Tools" arch=('i686' 'x86_64') url="http://open-vm-tools.sourceforge.net/" @@ -43,7 +43,6 @@ package() { for MOD in `find -type f -name '*.ko'`; do install -Dm644 $MOD $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/ done - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='$KERNEL_VERSION'/" $startdir/$pkgname.install gzip $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/*.ko install -D -m 644 ${srcdir}/modprobe.conf ${pkgdir}/etc/modprobe.d/${pkgname}.conf diff --git a/community/open-vm-tools-modules/open-vm-tools-modules.install b/community/open-vm-tools-modules/open-vm-tools-modules.install index 187dfb1bb..ba2f9ddc2 100644 --- a/community/open-vm-tools-modules/open-vm-tools-modules.install +++ b/community/open-vm-tools-modules/open-vm-tools-modules.install @@ -1,8 +1,6 @@ -KERNEL_VERSION='3.1.0-4-ARCH' - post_install() { - depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 - + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) echo ">>> Enabling vmxnet driver in /etc/modprobe.d/open-vm-tools-modules.conf" echo ">>> (this will disable pcnet32 driver)" echo ">>>" @@ -12,12 +10,13 @@ post_install() { } post_upgrade() { - depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 - + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) echo ">>>" echo ">>> Remember to un-blacklist pcnet32 driver" echo ">>>" diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index 2b9f4ec71..fdd3acd26 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,9 +1,9 @@ # $Id$ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=quagga pkgver=0.99.20 -pkgrel=1 +pkgrel=2 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') url='http://www.quagga.net' diff --git a/community/quagga/quagga.install b/community/quagga/quagga.install index 058f4f1d7..c5d88b976 100644 --- a/community/quagga/quagga.install +++ b/community/quagga/quagga.install @@ -1,22 +1,36 @@ +infodir=/usr/share/info +filelist=(quagga.info quagga.info-1 quagga.info-2) + post_install() { groupadd -r quagga useradd -MNr -s /bin/false -d /run/quagga -g quagga quagga && passwd -l quagga &>/dev/null install -d -m 750 -o quagga -g quagga /{run,etc,var/log}/quagga - : + post_upgrade +} + +post_upgrade() { + if [[ -x /usr/bin/install-info ]]; then + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done + fi } pre_remove() { for d in zebra ripd ripngd bgpd ospfd ospf6d isisd; do /etc/rc.d/$d stop &>/dev/null done - : + if [[ -x /usr/bin/install-info ]]; then + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done + fi } post_remove() { userdel quagga &>/dev/null groupdel quagga &>/dev/null rmdir /{etc,var/log}/quagga - : } # vim: ft=sh ts=2 sw=2 et: diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD index d4415aee5..1f03ee557 100644 --- a/extra/audacity/PKGBUILD +++ b/extra/audacity/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144994 2011-12-13 19:14:03Z eric $ +# $Id: PKGBUILD 146761 2012-01-17 05:11:17Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=audacity pkgver=1.3.14 -pkgrel=1 +pkgrel=2 pkgdesc="A program that lets you manipulate digital audio waveforms" arch=('i686' 'x86_64') url="http://audacity.sourceforge.net/" @@ -15,11 +15,11 @@ install=audacity.install source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2 \ audacity-1.3.13-ffmpeg.patch) sha1sums=('a0fb22a0cfbb8a72abac8bbc01b3ad8b0bb7e11e' - '26c2ad8e611705b2762a318e66312169f59cc218') + '67f209d362ece6961b154a7c62e23ac856c2fa94') build() { cd "${srcdir}/${pkgname}-src-${pkgver}-beta" - patch -p1 -i "${srcdir}/audacity-1.3.13-ffmpeg.patch" + patch -p0 -i "${srcdir}/audacity-1.3.13-ffmpeg.patch" WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \ --with-portaudio --with-libsamplerate \ --without-libresample --with-libmad \ diff --git a/extra/audacity/audacity-1.3.13-ffmpeg.patch b/extra/audacity/audacity-1.3.13-ffmpeg.patch index 675470913..e76d2422b 100644 --- a/extra/audacity/audacity-1.3.13-ffmpeg.patch +++ b/extra/audacity/audacity-1.3.13-ffmpeg.patch @@ -1,164 +1,404 @@ ---- audacity-src-1.3.13-beta.orig/src/export/ExportFFmpeg.cpp -+++ audacity-src-1.3.13-beta/src/export/ExportFFmpeg.cpp -@@ -352,7 +352,7 @@ - avcodec_get_context_defaults(mEncAudioCodecCtx); - - mEncAudioCodecCtx->codec_id = ExportFFmpegOptions::fmts[mSubFormat].codecid; -- mEncAudioCodecCtx->codec_type = CODEC_TYPE_AUDIO; -+ mEncAudioCodecCtx->codec_type = AVMEDIA_TYPE_AUDIO; - mEncAudioCodecCtx->codec_tag = av_codec_get_tag((const AVCodecTag **)mEncFormatCtx->oformat->codec_tag,mEncAudioCodecCtx->codec_id); - mSampleRate = (int)project->GetRate(); - mEncAudioCodecCtx->global_quality = -99999; //quality mode is off by default; -@@ -403,7 +403,6 @@ - mEncAudioCodecCtx->flags2 = 0; - if (gPrefs->Read(wxT("/FileFormats/FFmpegBitReservoir"),true)) mEncAudioCodecCtx->flags2 |= CODEC_FLAG2_BIT_RESERVOIR; - if (gPrefs->Read(wxT("/FileFormats/FFmpegVariableBlockLen"),true)) mEncAudioCodecCtx->flags2 |= 0x0004; //WMA only? -- mEncAudioCodecCtx->use_lpc = gPrefs->Read(wxT("/FileFormats/FFmpegUseLPC"),true); - mEncAudioCodecCtx->compression_level = gPrefs->Read(wxT("/FileFormats/FFmpegCompLevel"),-1); - mEncAudioCodecCtx->frame_size = gPrefs->Read(wxT("/FileFormats/FFmpegFrameSize"),(long)0); - mEncAudioCodecCtx->lpc_coeff_precision = gPrefs->Read(wxT("/FileFormats/FFmpegLPCCoefPrec"),(long)0); -@@ -569,7 +569,7 @@ - pkt.stream_index = mEncAudioStream->index; - pkt.data = mEncAudioEncodedBuf; - pkt.size = nEncodedBytes; -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - - // Set presentation time of frame (currently in the codec's timebase) in the stream timebase. - if(mEncAudioCodecCtx->coded_frame && mEncAudioCodecCtx->coded_frame->pts != int64_t(AV_NOPTS_VALUE)) -@@ -656,7 +656,7 @@ - - pkt.stream_index = mEncAudioStream->index; - pkt.data = mEncAudioEncodedBuf; -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - - // Write the encoded audio frame to the output file. - if ((ret = av_interleaved_write_frame(mEncFormatCtx, &pkt)) != 0) ---- audacity-src-1.3.13-beta.orig/src/export/ExportFFmpegDialogs.cpp -+++ audacity-src-1.3.13-beta/src/export/ExportFFmpegDialogs.cpp -@@ -1288,7 +1288,7 @@ - while ((codec = av_codec_next(codec))) - { - // We're only interested in audio and only in encoders -- if (codec->type == CODEC_TYPE_AUDIO && codec->encode) -+ if (codec->type == AVMEDIA_TYPE_AUDIO && codec->encode) - { - mCodecNames.Add(wxString::FromUTF8(codec->name)); - mCodecLongNames.Add(wxString::Format(wxT("%s - %s"),mCodecNames.Last().c_str(),wxString::FromUTF8(codec->long_name).c_str())); -@@ -1528,7 +1528,7 @@ - // Find the codec, that is claimed to be compatible - AVCodec *codec = avcodec_find_encoder(CompatibilityList[i].codec); - // If it exists, is audio and has encoder -- if (codec != NULL && (codec->type == CODEC_TYPE_AUDIO) && codec->encode) -+ if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && codec->encode) - { - // If it was selected - remember it's new index - if ((id >= 0) && codec->id == id) index = mShownCodecNames.GetCount(); -@@ -1543,7 +1543,7 @@ - AVCodec *codec = NULL; - while ((codec = av_codec_next(codec))) - { -- if (codec->type == CODEC_TYPE_AUDIO && codec->encode) -+ if (codec->type == AVMEDIA_TYPE_AUDIO && codec->encode) - { - if (mShownCodecNames.Index(wxString::FromUTF8(codec->name)) < 0) - { -@@ -1563,7 +1563,7 @@ - if (format != NULL) - { - AVCodec *codec = avcodec_find_encoder(format->audio_codec); -- if (codec != NULL && (codec->type == CODEC_TYPE_AUDIO) && codec->encode) -+ if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && codec->encode) - { - if ((id >= 0) && codec->id == id) index = mShownCodecNames.GetCount(); - mShownCodecNames.Add(wxString::FromUTF8(codec->name)); ---- audacity-src-1.3.13-beta.orig/src/FFmpeg.cpp -+++ audacity-src-1.3.13-beta/src/FFmpeg.cpp -@@ -316,7 +316,7 @@ - pd.buf_size = 0; - pd.buf = (unsigned char *) av_malloc(PROBE_BUF_MAX + AVPROBE_PADDING_SIZE); - if (pd.buf == NULL) { -- err = AVERROR_NOMEM; -+ err = AVERROR(ENOMEM); - goto fail; - } - -@@ -381,7 +381,7 @@ - - // Didn't find a suitable format, so bail - if (!fmt) { -- err = AVERROR_NOFMT; -+ err = AVERROR(EILSEQ); - goto fail; - } - -@@ -855,7 +855,6 @@ - FFMPEG_INITDYN(codec, avcodec_find_decoder); - FFMPEG_INITDYN(codec, avcodec_get_context_defaults); - FFMPEG_INITDYN(codec, avcodec_open); -- FFMPEG_INITDYN(codec, avcodec_decode_audio2); - FFMPEG_INITDYN(codec, avcodec_decode_audio3); - FFMPEG_INITDYN(codec, avcodec_encode_audio); - FFMPEG_INITDYN(codec, avcodec_close); ---- audacity-src-1.3.13-beta.orig/src/FFmpeg.h -+++ audacity-src-1.3.13-beta/src/FFmpeg.h -@@ -559,7 +559,11 @@ - FFMPEG_FUNCTION_WITH_RETURN( - void*, - av_fast_realloc, -+#if LIBAVUTIL_VERSION_MAJOR < 51 - (void *ptr, unsigned int *size, unsigned int min_size), -+#else -+ (void *ptr, unsigned int *size, size_t min_size), -+#endif - (ptr, size, min_size) - ); - FFMPEG_FUNCTION_WITH_RETURN( -@@ -747,7 +751,11 @@ - FFMPEG_FUNCTION_WITH_RETURN( - void*, - av_malloc, -+#if LIBAVUTIL_VERSION_MAJOR < 51 - (unsigned int size), -+#else -+ (size_t size), -+#endif - (size) - ); - FFMPEG_FUNCTION_NO_RETURN( ---- audacity-src-1.3.13-beta.orig/src/import/ImportFFmpeg.cpp -+++ audacity-src-1.3.13-beta/src/import/ImportFFmpeg.cpp -@@ -416,7 +416,7 @@ - // Fill the stream contexts - for (unsigned int i = 0; i < mFormatContext->nb_streams; i++) - { -- if (mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) -+ if (mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) - { - //Create a context - streamContext *sc = new streamContext; ---- audacity-src-1.3.13-beta.orig/src/ondemand/ODDecodeFFmpegTask.cpp -+++ audacity-src-1.3.13-beta/src/ondemand/ODDecodeFFmpegTask.cpp -@@ -156,7 +156,7 @@ - //test the audio stream(s) - for (unsigned int i = 0; i < ic->nb_streams; i++) - { -- if (ic->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) -+ if (ic->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) - { - audioStreamExists = true; - st = ic->streams[i]; -@@ -573,10 +573,10 @@ - } - } - -- // avcodec_decode_audio2() expects the size of the output buffer as the 3rd parameter but -+ // avcodec_decode_audio3() expects the size of the output buffer as the 3rd parameter but - // also returns the number of bytes it decoded in the same parameter. - sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz; -- nBytesDecoded = avcodec_decode_audio2(sc->m_codecCtx, -+ nBytesDecoded = avcodec_decode_audio3(sc->m_codecCtx, - sc->m_decodedAudioSamples, // out - &sc->m_decodedAudioSamplesValidSiz, // in/out - pDecode, nDecodeSiz); // in +Index: src/FFmpeg.h
+===================================================================
+--- src/FFmpeg.h (revision 11286)
++++ src/FFmpeg.h (working copy)
+@@ -47,6 +47,21 @@
+ #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 94, 1)
+ #define AVSampleFormat SampleFormat
+ #endif
++
++ #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 120, 0)
++ #define CodecType AVMediaType
++ #define CODEC_TYPE_UNKNOWN AVMEDIA_TYPE_UNKNOWN
++ #define CODEC_TYPE_VIDEO AVMEDIA_TYPE_VIDEO
++ #define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
++ #define CODEC_TYPE_DATA AVMEDIA_TYPE_DATA
++ #define CODEC_TYPE_SUBTITLE AVMEDIA_TYPE_SUBTITLE
++ #define CODEC_TYPE_ATTACHMENT AVMEDIA_TYPE_ATTACHMENT
++ #define CODEC_TYPE_NB AVMEDIA_TYPE_NB
++ #endif
++
++ #ifndef PKT_FLAG_KEY
++ #define PKT_FLAG_KEY AV_PKT_FLAG_KEY
++ #endif
+ }
+ #endif
+
+@@ -505,20 +520,23 @@
+ (AVCodecContext *avctx, AVCodec *codec),
+ (avctx, codec);
+ );
++#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
+ FFMPEG_FUNCTION_WITH_RETURN(
+ int,
++ avcodec_decode_audio3,
++ (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, AVPacket *avpkt),
++ (avctx, samples, frame_size_ptr, avpkt)
++ );
++#else
++ FFMPEG_FUNCTION_WITH_RETURN(
++ int,
+ avcodec_decode_audio2,
+ (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, const uint8_t *buf, int buf_size),
+ (avctx, samples, frame_size_ptr, buf, buf_size)
+ );
++#endif
+ FFMPEG_FUNCTION_WITH_RETURN(
+ int,
+- avcodec_decode_audio3,
+- (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, AVPacket *avpkt),
+- (avctx, samples, frame_size_ptr, avpkt)
+- );
+- FFMPEG_FUNCTION_WITH_RETURN(
+- int,
+ avcodec_encode_audio,
+ (AVCodecContext *avctx, uint8_t *buf, int buf_size, const short *samples),
+ (avctx, buf, buf_size, samples)
+@@ -556,13 +574,22 @@
+ (void),
+ ()
+ );
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 0, 0)
+ FFMPEG_FUNCTION_WITH_RETURN(
+ void*,
+ av_fast_realloc,
+ (void *ptr, unsigned int *size, unsigned int min_size),
+ (ptr, size, min_size)
+ );
++#else
+ FFMPEG_FUNCTION_WITH_RETURN(
++ void*,
++ av_fast_realloc,
++ (void *ptr, unsigned int *size, size_t min_size),
++ (ptr, size, min_size)
++ );
++#endif
++ FFMPEG_FUNCTION_WITH_RETURN(
+ int,
+ av_open_input_stream,
+ (AVFormatContext **ic_ptr, AVIOContext *pb, const char *filename, AVInputFormat *fmt, AVFormatParameters *ap),
+@@ -744,12 +771,21 @@
+ (AVFifoBuffer *f),
+ (f)
+ );
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 0, 0)
+ FFMPEG_FUNCTION_WITH_RETURN(
+ void*,
+ av_malloc,
+ (unsigned int size),
+ (size)
+ );
++#else
++ FFMPEG_FUNCTION_WITH_RETURN(
++ void*,
++ av_malloc,
++ (size_t size),
++ (size)
++ );
++#endif
+ FFMPEG_FUNCTION_NO_RETURN(
+ av_freep,
+ (void *ptr),
+@@ -761,11 +797,16 @@
+ (int64_t a, AVRational bq, AVRational cq),
+ (a, bq, cq)
+ );
++
++#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(52, 31, 0)
+ FFMPEG_FUNCTION_NO_RETURN(
+ av_free_packet,
+ (AVPacket *pkt),
+ (pkt)
+ );
++#endif
++
++#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
+ FFMPEG_FUNCTION_WITH_RETURN(
+ AVFifoBuffer*,
+ av_fifo_alloc,
+@@ -778,8 +819,22 @@
+ (AVFifoBuffer *f, void *buf, int buf_size, void (*func)(void*, void*, int)),
+ (f, buf, buf_size, func)
+ );
++#else
+ FFMPEG_FUNCTION_WITH_RETURN(
+ int,
++ av_fifo_init,
++ (AVFifoBuffer *f, unsigned int size),
++ (f, size)
++ );
++ FFMPEG_FUNCTION_WITH_RETURN(
++ int,
++ av_fifo_generic_read,
++ (AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest),
++ (f, buf_size, func, dest)
++ );
++#endif
++ FFMPEG_FUNCTION_WITH_RETURN(
++ int,
+ av_fifo_realloc2,
+ (AVFifoBuffer *f, unsigned int size),
+ (f, size)
+Index: src/FFmpeg.cpp
+===================================================================
+--- src/FFmpeg.cpp (revision 11286)
++++ src/FFmpeg.cpp (working copy)
+@@ -186,9 +186,15 @@
+ return AVERROR(ENOMEM);
+ }
+
+- if (flags & URL_RDWR) {
++ // LLL: These really should be logical AND tests, but on 2011/04/28, the URL_ open flags
++ // changed in the FFmpeg source to values that were not compatible with previous
++ // values.
++ //
++ // Since Audacity doesn't use any other open flags (there aren't any others defined
++ // anyway), making equality tests works for older and new FFmpeg headers.
++ if (flags == URL_RDWR) {
+ mode = wxFile::read_write;
+- } else if (flags & URL_WRONLY) {
++ } else if (flags == URL_WRONLY) {
+ mode = wxFile::write;
+ } else {
+ mode = wxFile::read;
+@@ -222,6 +228,10 @@
+ {
+ wxSeekMode mode = wxFromStart;
+
++#if !defined(AVSEEK_FORCE)
++#define AVSEEK_FORCE 0
++#endif
++
+ switch (whence & ~AVSEEK_FORCE)
+ {
+ case (SEEK_SET):
+@@ -316,7 +326,7 @@
+ pd.buf_size = 0;
+ pd.buf = (unsigned char *) av_malloc(PROBE_BUF_MAX + AVPROBE_PADDING_SIZE);
+ if (pd.buf == NULL) {
+- err = AVERROR_NOMEM;
++ err = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+@@ -381,7 +391,7 @@
+
+ // Didn't find a suitable format, so bail
+ if (!fmt) {
+- err = AVERROR_NOFMT;
++ err = AVERROR(EILSEQ);
+ goto fail;
+ }
+
+@@ -847,39 +857,53 @@
+ FFMPEG_INITALT(avformat, av_guess_format, guess_format);
+ FFMPEG_INITALT(avformat, av_match_ext, match_ext);
+
+- FFMPEG_INITDYN(codec, av_init_packet);
+- FFMPEG_INITDYN(codec, av_free_packet);
+- FFMPEG_INITDYN(codec, avcodec_init);
+- FFMPEG_INITDYN(codec, avcodec_find_encoder);
+- FFMPEG_INITDYN(codec, avcodec_find_encoder_by_name);
+- FFMPEG_INITDYN(codec, avcodec_find_decoder);
+- FFMPEG_INITDYN(codec, avcodec_get_context_defaults);
+- FFMPEG_INITDYN(codec, avcodec_open);
+- FFMPEG_INITDYN(codec, avcodec_decode_audio2);
+- FFMPEG_INITDYN(codec, avcodec_decode_audio3);
+- FFMPEG_INITDYN(codec, avcodec_encode_audio);
+- FFMPEG_INITDYN(codec, avcodec_close);
+- FFMPEG_INITDYN(codec, avcodec_register_all);
+- FFMPEG_INITDYN(codec, avcodec_version);
+- FFMPEG_INITDYN(codec, av_fast_realloc);
+- FFMPEG_INITDYN(codec, av_codec_next);
+- FFMPEG_INITDYN(codec, av_get_bits_per_sample_format);
++#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 58, 0)
++ FFMPEG_INITDYN(avcodec, av_init_packet);
++#else
++ FFMPEG_INITDYN(avformat, av_init_packet);
++#endif
+
++#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(52, 31, 0)
++ FFMPEG_INITDYN(avcodec, av_free_packet);
++#endif
++ FFMPEG_INITDYN(avcodec, avcodec_init);
++ FFMPEG_INITDYN(avcodec, avcodec_find_encoder);
++ FFMPEG_INITDYN(avcodec, avcodec_find_encoder_by_name);
++ FFMPEG_INITDYN(avcodec, avcodec_find_decoder);
++ FFMPEG_INITDYN(avcodec, avcodec_get_context_defaults);
++ FFMPEG_INITDYN(avcodec, avcodec_open);
++#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
++ FFMPEG_INITDYN(avcodec, avcodec_decode_audio3);
++#else
++ FFMPEG_INITDYN(avcodec, avcodec_decode_audio2);
++#endif
++ FFMPEG_INITDYN(avcodec, avcodec_encode_audio);
++ FFMPEG_INITDYN(avcodec, avcodec_close);
++ FFMPEG_INITDYN(avcodec, avcodec_register_all);
++ FFMPEG_INITDYN(avcodec, avcodec_version);
++ FFMPEG_INITDYN(avcodec, av_fast_realloc);
++ FFMPEG_INITDYN(avcodec, av_codec_next);
++ FFMPEG_INITDYN(avcodec, av_get_bits_per_sample_format);
++
+ FFMPEG_INITALT(avcodec, av_get_bits_per_sample_fmt, av_get_bits_per_sample_format);
+
+- FFMPEG_INITDYN(util, av_free);
+- FFMPEG_INITDYN(util, av_log_set_callback);
+- FFMPEG_INITDYN(util, av_log_default_callback);
+- FFMPEG_INITDYN(util, av_fifo_alloc);
+- FFMPEG_INITDYN(util, av_fifo_generic_read);
+- FFMPEG_INITDYN(util, av_fifo_realloc2);
+- FFMPEG_INITDYN(util, av_fifo_free);
+- FFMPEG_INITDYN(util, av_fifo_size);
+- FFMPEG_INITDYN(util, av_malloc);
+- FFMPEG_INITDYN(util, av_fifo_generic_write);
+- FFMPEG_INITDYN(util, av_freep);
+- FFMPEG_INITDYN(util, av_rescale_q);
+- FFMPEG_INITDYN(util, avutil_version);
++ FFMPEG_INITDYN(avutil, av_free);
++ FFMPEG_INITDYN(avutil, av_log_set_callback);
++ FFMPEG_INITDYN(avutil, av_log_default_callback);
++#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
++ FFMPEG_INITDYN(avutil, av_fifo_alloc);
++#else
++ FFMPEG_INITDYN(avutil, av_fifo_init);
++#endif
++ FFMPEG_INITDYN(avutil, av_fifo_generic_read);
++ FFMPEG_INITDYN(avutil, av_fifo_realloc2);
++ FFMPEG_INITDYN(avutil, av_fifo_free);
++ FFMPEG_INITDYN(avutil, av_fifo_size);
++ FFMPEG_INITDYN(avutil, av_malloc);
++ FFMPEG_INITDYN(avutil, av_fifo_generic_write);
++ FFMPEG_INITDYN(avutil, av_freep);
++ FFMPEG_INITDYN(avutil, av_rescale_q);
++ FFMPEG_INITDYN(avutil, avutil_version);
+
+ //FFmpeg initialization
+ wxLogMessage(wxT("All symbols loaded successfully. Initializing the library."));
+Index: src/import/ImportFFmpeg.cpp
+===================================================================
+--- src/import/ImportFFmpeg.cpp (revision 11286)
++++ src/import/ImportFFmpeg.cpp (working copy)
+@@ -808,9 +808,12 @@
+ }
+ }
+
++
++ sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;
++
++#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
+ // avcodec_decode_audio3() expects the size of the output buffer as the 3rd parameter but
+ // also returns the number of bytes it decoded in the same parameter.
+- sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;
+ AVPacket avpkt;
+ av_init_packet(&avpkt);
+ avpkt.data = pDecode;
+@@ -820,7 +823,16 @@
+ (int16_t *)sc->m_decodedAudioSamples, // out
+ &sc->m_decodedAudioSamplesValidSiz, // in/out
+ &avpkt); // in
+-
++#else
++ // avcodec_decode_audio2() expects the size of the output buffer as the 3rd parameter but
++ // also returns the number of bytes it decoded in the same parameter.
++ nBytesDecoded =
++ avcodec_decode_audio2(sc->m_codecCtx,
++ (int16_t *) sc->m_decodedAudioSamples, // out
++ &sc->m_decodedAudioSamplesValidSiz, // in/out
++ pDecode, // in
++ nDecodeSiz); // in
++#endif
+ if (nBytesDecoded < 0)
+ {
+ // Decoding failed. Don't stop.
+Index: src/export/ExportFFmpeg.cpp
+===================================================================
+--- src/export/ExportFFmpeg.cpp (revision 11286)
++++ src/export/ExportFFmpeg.cpp (working copy)
+@@ -154,6 +154,10 @@
+ AVFifoBuffer * mEncAudioFifo; // FIFO to write incoming audio samples into
+ uint8_t * mEncAudioFifoOutBuf; // buffer to read _out_ of the FIFO into
+
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 0, 0)
++ AVFifoBuffer mEncAudioFifoBuffer; // FIFO to write incoming audio samples into
++#endif
++
+ wxString mName;
+
+ int mSubFormat;
+@@ -174,6 +178,11 @@
+ #define MAX_AUDIO_PACKET_SIZE (128 * 1024)
+ mEncAudioEncodedBufSiz = 4*MAX_AUDIO_PACKET_SIZE;
+ mEncAudioFifoOutBuf = NULL; // buffer to read _out_ of the FIFO into
++
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 0, 0)
++ mEncAudioFifo = &mEncAudioFifoBuffer;
++#endif
++
+ mSampleRate = 0;
+ mSupportsUTF8 = true;
+
+@@ -350,7 +359,6 @@
+ mEncAudioCodecCtx = mEncAudioStream->codec;
+
+ avcodec_get_context_defaults(mEncAudioCodecCtx);
+-
+ mEncAudioCodecCtx->codec_id = ExportFFmpegOptions::fmts[mSubFormat].codecid;
+ mEncAudioCodecCtx->codec_type = CODEC_TYPE_AUDIO;
+ mEncAudioCodecCtx->codec_tag = av_codec_get_tag((const AVCodecTag **)mEncFormatCtx->oformat->codec_tag,mEncAudioCodecCtx->codec_id);
+@@ -403,7 +411,9 @@
+ mEncAudioCodecCtx->flags2 = 0;
+ if (gPrefs->Read(wxT("/FileFormats/FFmpegBitReservoir"),true)) mEncAudioCodecCtx->flags2 |= CODEC_FLAG2_BIT_RESERVOIR;
+ if (gPrefs->Read(wxT("/FileFormats/FFmpegVariableBlockLen"),true)) mEncAudioCodecCtx->flags2 |= 0x0004; //WMA only?
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 0, 0)
+ mEncAudioCodecCtx->use_lpc = gPrefs->Read(wxT("/FileFormats/FFmpegUseLPC"),true);
++#endif
+ mEncAudioCodecCtx->compression_level = gPrefs->Read(wxT("/FileFormats/FFmpegCompLevel"),-1);
+ mEncAudioCodecCtx->frame_size = gPrefs->Read(wxT("/FileFormats/FFmpegFrameSize"),(long)0);
+ mEncAudioCodecCtx->lpc_coeff_precision = gPrefs->Read(wxT("/FileFormats/FFmpegLPCCoefPrec"),(long)0);
+@@ -487,7 +497,11 @@
+ // The encoder may require a minimum number of raw audio samples for each encoding but we can't
+ // guarantee we'll get this minimum each time an audio frame is decoded from the input file so
+ // we use a FIFO to store up incoming raw samples until we have enough for one call to the codec.
++#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
+ mEncAudioFifo = av_fifo_alloc(1024);
++#else
++ av_fifo_init(mEncAudioFifo, 1024);
++#endif
+
+ // Allocate a buffer to read OUT of the FIFO into. The FIFO maintains its own buffer internally.
+ if ((mEncAudioFifoOutBuf = (uint8_t*)av_malloc(2*MAX_AUDIO_PACKET_SIZE)) == NULL)
+@@ -544,7 +558,11 @@
+ nFifoBytes, mEncAudioCodecCtx->frame_size);
+
+ // Pull the bytes out from the FIFO and feed them to the encoder.
++#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
+ if (av_fifo_generic_read(mEncAudioFifo, mEncAudioFifoOutBuf, nFifoBytes, NULL) == 0)
++#else
++ if (av_fifo_generic_read(mEncAudioFifo, nFifoBytes, NULL, mEncAudioFifoOutBuf) == 0)
++#endif
+ {
+ if (mEncAudioCodecCtx->frame_size != 1)
+ nEncodedBytes = avcodec_encode_audio(mEncAudioCodecCtx, mEncAudioEncodedBuf, mEncAudioEncodedBufSiz, (int16_t*)mEncAudioFifoOutBuf);
+@@ -609,7 +627,10 @@
+ av_free(mEncAudioFifoOutBuf);
+
+ av_fifo_free(mEncAudioFifo);
++
++#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
+ mEncAudioFifo = NULL;
++#endif
+
+ return true;
+ }
+@@ -635,7 +656,11 @@
+ // Read raw audio samples out of the FIFO in nAudioFrameSizeOut byte-sized groups to encode.
+ while ((ret = av_fifo_size(mEncAudioFifo)) >= nAudioFrameSizeOut)
+ {
++#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
+ ret = av_fifo_generic_read(mEncAudioFifo, mEncAudioFifoOutBuf, nAudioFrameSizeOut, NULL);
++#else
++ ret = av_fifo_generic_read(mEncAudioFifo, nAudioFrameSizeOut, NULL, mEncAudioFifoOutBuf);
++#endif
+
+ av_init_packet(&pkt);
+
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index b158cec54..873778ad0 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 144475 2011-12-06 14:25:28Z ibiru $ +# $Id: PKGBUILD 146778 2012-01-17 13:36:48Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord -pkgver=0.1.15 -pkgrel=3 +pkgver=0.1.16 +pkgrel=1 pkgdesc="Color daemon" arch=('i686' 'x86_64') url="http://www.freedesktop.org/software/colord" license=('GPL2') depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev') makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') -source=($url/releases/$pkgname-$pkgver.tar.xz - scan_only_color_profile_dir.patch) +source=($url/releases/$pkgname-$pkgver.tar.xz) options=('!libtool') -sha1sums=('e83a68add3fac9c677829925794ee353743dc9c8' - 'b4b8ea1008ecfdc1084ec69d647127587a2a87f7') +sha1sums=('bd2fbad0043d2c1f55ab7ff8cb5e261b684e699c') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/scan_only_color_profile_dir.patch" ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/colord \ --localstatedir=/var --disable-static diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD new file mode 100644 index 000000000..45abe2ae6 --- /dev/null +++ b/extra/oxygen-gtk2/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 146767 2012-01-17 08:05:03Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: birdflesh <antkoul at gmail dot com> + +pkgname=oxygen-gtk2 +pkgver=1.2.0 +pkgrel=1 +pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2" +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/' +license=('LGPL') +depends=('gtk2' 'dbus-glib') +conflicts=('oxygen-gtk') +replaces=('oxygen-gtk') +makedepends=('cmake') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('975dfef679436c849a649c9d5d9ae0d3') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD new file mode 100644 index 000000000..ef62d5108 --- /dev/null +++ b/extra/oxygen-gtk3/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 146769 2012-01-17 08:13:40Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=oxygen-gtk3 +pkgver=1.0.0 +pkgrel=1 +pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3" +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/' +license=('LGPL') +depends=('gtk3' 'dbus-glib') +makedepends=('cmake') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('029571469ea3436d47cdac20b2069fed') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD index 25c82c7e0..5127dcbf7 100644 --- a/extra/perl-dbd-mysql/PKGBUILD +++ b/extra/perl-dbd-mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143774 2011-11-29 02:55:27Z kevin $ +# $Id: PKGBUILD 146787 2012-01-18 02:09:02Z allan $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=perl-dbd-mysql _realname=DBD-mysql pkgver=4.020 -pkgrel=1 +pkgrel=2 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') diff --git a/extra/wipe/PKGBUILD b/extra/wipe/PKGBUILD index 95767e587..b876b0dca 100644 --- a/extra/wipe/PKGBUILD +++ b/extra/wipe/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 103446 2010-12-19 16:53:45Z andrea $ -# Maintainer: +# $Id: PKGBUILD 146765 2012-01-17 07:13:10Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=wipe pkgver=2.3.1 -pkgrel=1 -pkgdesc="A file and block device wiping utility - a secure rm" -arch=('i686' 'x86_64') -url="http://wipe.sourceforge.net/" +pkgrel=2 +pkgdesc='Secure file wiping utility' +url='http://wipe.sourceforge.net/' license=('GPL') -depends=('glibc') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('3aed00711e0490edbec115bc283b8544') +arch=('i686' 'x86_64') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('72aa8bcbeb54deb676ae08af78401132860703de') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr \ - --mandir=/usr/share/man - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man + make } package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}"/usr mandir="${pkgdir}"/usr/share/man install } diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD index 4c4c8d244..559e63924 100644 --- a/extra/xf86-input-wacom/PKGBUILD +++ b/extra/xf86-input-wacom/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142834 2011-11-16 13:12:15Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 146763 2012-01-17 05:32:23Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: M Rawash <mrawash@gmail.com> pkgname=xf86-input-wacom -pkgver=0.12.0 +pkgver=0.13.0 pkgrel=1 pkgdesc="X.Org Wacom tablet driver" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ conflicts=('xorg-server<1.11.0') options=(!libtool) source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 70-wacom.rules) -md5sums=('e1c41d143d5040982ae050c7ef9039e3' +md5sums=('4a426535989e84c4161e3607ea851654' '10db4f8272286690255c1bcc18bfdd92') build() { diff --git a/multilib-testing/lib32-libxcb/PKGBUILD b/multilib-testing/lib32-libxcb/PKGBUILD new file mode 100644 index 000000000..42d8435a5 --- /dev/null +++ b/multilib-testing/lib32-libxcb/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 62186 2012-01-17 19:44:58Z bluewind $ +# Maintainer: Alexander Baldeck <alexander@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +_pkgbasename=libxcb +pkgname=lib32-$_pkgbasename +pkgver=1.8 +pkgrel=1 +pkgdesc="X11 client-side library (32-bit)" +arch=(x86_64) +url="http://xcb.freedesktop.org/" +depends=('xcb-proto>=1.7' 'lib32-libxdmcp' 'lib32-libxau' + $_pkgbasename) +makedepends=('pkgconfig' 'libxslt' 'python2' 'gcc-multilib' + 'autoconf') +options=('!libtool') +license=('custom') +source=(${url}/dist/${_pkgbasename}-${pkgver}.tar.bz2 + libxcb-1.1-no-pthread-stubs.patch) +sha1sums=('18b76759d5bbb863777f37bf3aec23ebaa31d5be' + '3455e84642283bc91c8313af319002a20bbcbdf4') + +build() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch" + + export CC="gcc -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput --libdir=/usr/lib32 + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}"/usr/{include,share} + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch b/multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch new file mode 100644 index 000000000..f17de1b1d --- /dev/null +++ b/multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch @@ -0,0 +1,12 @@ +diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac +--- libxcb-1.1/configure.ac.pthread-stubs 2007-11-04 18:17:11.000000000 -0500 ++++ libxcb-1.1/configure.ac 2007-11-12 10:27:06.000000000 -0500 +@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT) + + # Checks for pkg-config packages + PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6) +-NEEDED="pthread-stubs xau >= 0.99.2" ++NEEDED="xau >= 0.99.2" + PKG_CHECK_MODULES(NEEDED, $NEEDED) + + have_xdmcp="no" diff --git a/testing/libxcb/PKGBUILD b/testing/libxcb/PKGBUILD new file mode 100644 index 000000000..f973a828a --- /dev/null +++ b/testing/libxcb/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 146773 2012-01-17 13:02:00Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +pkgname=libxcb +pkgver=1.8 +pkgrel=1 +pkgdesc="X11 client-side library" +arch=(i686 x86_64) +url="http://xcb.freedesktop.org/" +depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau') +makedepends=('pkgconfig' 'libxslt' 'python2') +options=('!libtool') +license=('custom') +source=($url/dist/$pkgname-$pkgver.tar.bz2 + libxcb-1.1-no-pthread-stubs.patch) +sha1sums=('18b76759d5bbb863777f37bf3aec23ebaa31d5be' + '3455e84642283bc91c8313af319002a20bbcbdf4') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch" + PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" + install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch b/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch new file mode 100644 index 000000000..f17de1b1d --- /dev/null +++ b/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch @@ -0,0 +1,12 @@ +diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac +--- libxcb-1.1/configure.ac.pthread-stubs 2007-11-04 18:17:11.000000000 -0500 ++++ libxcb-1.1/configure.ac 2007-11-12 10:27:06.000000000 -0500 +@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT) + + # Checks for pkg-config packages + PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6) +-NEEDED="pthread-stubs xau >= 0.99.2" ++NEEDED="xau >= 0.99.2" + PKG_CHECK_MODULES(NEEDED, $NEEDED) + + have_xdmcp="no" diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD new file mode 100644 index 000000000..7c8032fc7 --- /dev/null +++ b/testing/sqlite3/PKGBUILD @@ -0,0 +1,88 @@ +# $Id: PKGBUILD 146781 2012-01-17 16:20:13Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgbase="sqlite3" +pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') +_amalgamationver=3071000 +_amalgamationver2=${_amalgamationver/00/} +_docver=${_amalgamationver} #3070700 +#pkgver=${_amalgamationver2//0/.} +pkgver=3.7.10 +pkgrel=1 +pkgdesc="A C library that implements an SQL database engine" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.sqlite.org/" +makedepends=('tcl' 'readline>=6.0.00') +source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) + http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz + #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip + http://www.sqlite.org/sqlite-doc-${_docver}.zip + license.txt) +options=('!libtool' '!emptydirs') +md5sums=('9ed2ca93577b58cfa0d01f64b9312ab9' + 'd4c8070ea2cec54b77002c265e680b0f' + 'c1cdbc5544034d9012e421e75a5e4890') + +build() { + export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" + + # build sqlite + cd "$srcdir"/sqlite-autoconf-$_amalgamationver + ./configure --prefix=/usr \ + --disable-static + make + + # build the tcl extension + cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea + ./configure --prefix=/usr \ + --with-system-sqlite + make + +} + +package_sqlite3() { + + pkgdesc="A C library that implements an SQL database engine" + depends=('readline>=6.0.00') + conflicts=('sqlite') + replaces=('sqlite') + + cd ${srcdir}/sqlite-autoconf-$_amalgamationver + make DESTDIR=${pkgdir} install + + # license + install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt +} + +package_sqlite3-tcl() { + + pkgdesc="sqlite3 Tcl Extension Architecture (TEA)" + depends=('sqlite3>=3.7.5') + + cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea + make DESTDIR=${pkgdir} install +} + +package_sqlite3-doc() { + pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation" + #arch=('any') - not yet supported + + #cd ${srcdir}/sqlite-doc-${_amalgamationver} + cd ${srcdir}/sqlite-doc-${_docver} + mkdir -p ${pkgdir}/usr/share/doc/${pkgbase} + cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/ + + # fix permissions and remove obsolete files; https://bugs.archlinux.org/task/24605 + find ${pkgdir} -type f -perm 755 -exec ls -lha {} \; + find ${pkgdir} -type f -perm 755 -exec chmod 644 {} \; + + find ${pkgdir} -type f -name '*~' -exec ls -lha {} \; + find ${pkgdir} -type d -name '*~' -exec ls -lha {} \; + find ${pkgdir} -name '*~' -exec rm -f {} \; + + find ${pkgdir} -type f -name '.~*' -exec ls -lha {} \; # /build/pkg/sqlite3-doc/usr/share/doc/sqlite3/images/fileformat/.~lock.indexpage.odg# + find ${pkgdir} -type d -name '.~*' -exec ls -lha {} \; + find ${pkgdir} -name '.~*' -exec rm -f {} \; +} diff --git a/testing/sqlite3/license.txt b/testing/sqlite3/license.txt new file mode 100644 index 000000000..118c5d5e6 --- /dev/null +++ b/testing/sqlite3/license.txt @@ -0,0 +1,33 @@ +SQLite Copyright +SQLite is in the +Public Domain + + +All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. + +The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. + +All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. +Obtaining An Explicit License To Use SQLite + +Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: +You are using SQLite in a jurisdiction that does not recognize the public domain. +You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. +You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. +Your legal department tells you that you have to purchase a license. + +If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. +Contributed Code + +In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: +The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. + +We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to: +Hwaci +6200 Maple Cove Lane +Charlotte, NC 28269 +USA + +A template copyright release is available in PDF or HTML. You can use this release to make future changes. + +see http://www.sqlite.org/copyright.html
\ No newline at end of file |